From 888dca550197f42e90103afb9d8cddb30f1928e2 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 21 Aug 2016 09:22:10 +0000 Subject: [PATCH] SVN_SILENT made messages (.desktop file) - always resolve ours In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop" --- src/plasma/data/servicetypes/plasma-lookandfeel.desktop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plasma/data/servicetypes/plasma-lookandfeel.desktop b/src/plasma/data/servicetypes/plasma-lookandfeel.desktop index 2ead56852..d1fe1b142 100644 --- a/src/plasma/data/servicetypes/plasma-lookandfeel.desktop +++ b/src/plasma/data/servicetypes/plasma-lookandfeel.desktop @@ -22,7 +22,7 @@ Name[it]=Aspetto di Plasma Name[ko]=Plasma 모습과 느낌 Name[nb]=Plasma utseende og oppførsel Name[nds]=Utsehn un Bedenen vun Plasma -Name[nl]=Plasma Look-and-Feel +Name[nl]=Plasma uiterlijk en gedrag Name[nn]=Utsjånad for Plasma Name[pa]=ਪਲਾਜ਼ਮਾ ਦਿੱਖ ਤੇ ਪਰਭਾਵ Name[pl]=Odczucia i wygląd Plazmy