From 966b92eecf9b4b61f3df3b951bd22abbbcc3052c Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Fri, 12 Aug 2016 09:32:14 +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/data/org.kde.kmail.desktop | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/data/org.kde.kmail.desktop b/src/data/org.kde.kmail.desktop index 3a7f09039..2b115bed9 100755 --- a/src/data/org.kde.kmail.desktop +++ b/src/data/org.kde.kmail.desktop @@ -199,6 +199,7 @@ Name=New Message Name[ca]=Missatge nou Name[ca@valencia]=Missatge nou Name[cs]=Nová zpráva +Name[da]=Nyt brev Name[de]=Neue Nachricht Name[en_GB]=New Message Name[es]=Mensaje nuevo @@ -225,6 +226,7 @@ Name=Check Mail Name[ca]=Comprova el correu Name[ca@valencia]=Comprova el correu Name[cs]=Zkontrolovat poštu +Name[da]=Tjek e-mail Name[de]=Nach E-Mail sehen Name[en_GB]=Check Mail Name[es]=Comprobar correo