From c8e7b59cba588c5fd3e604fa7cbf7b2c63d2519f Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 5 Jun 2016 09:40: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" --- kmail/src/data/org.kde.kmail.desktop | 2 ++ 1 file changed, 2 insertions(+) diff --git a/kmail/src/data/org.kde.kmail.desktop b/kmail/src/data/org.kde.kmail.desktop index d8a5875271..3565b65675 100755 --- a/kmail/src/data/org.kde.kmail.desktop +++ b/kmail/src/data/org.kde.kmail.desktop @@ -196,6 +196,7 @@ Actions=Composer;CheckMail; [Desktop Action Composer] Name=New Message Name[ca]=Missatge nou +Name[ca@valencia]=Missatge nou Name[de]=Neue Nachricht Name[nl]=Nieuw bericht Name[pl]=Nowa wiadomość @@ -209,6 +210,7 @@ Exec=kmail --composer [Desktop Action CheckMail] Name=Check Mail Name[ca]=Comprova el correu +Name[ca@valencia]=Comprova el correu Name[de]=Nach E-Mail sehen Name[nl]=E-mail controleren Name[pl]=Sprawdź pocztę -- 2.11.4.GIT