From 8f55e2f7354717c9d72dedebfac9c13b5fa31f18 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 26 Jul 2016 13:47:03 +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 | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/kmail/src/data/org.kde.kmail.desktop b/kmail/src/data/org.kde.kmail.desktop index 4da831b77c..48afde4460 100755 --- a/kmail/src/data/org.kde.kmail.desktop +++ b/kmail/src/data/org.kde.kmail.desktop @@ -208,6 +208,10 @@ Name[pl]=Nowa wiadomość Name[pt]=Nova Mensagem Name[sk]=Nová správa Name[sl]=Novo sporočilo +Name[sr]=Нова порука +Name[sr@ijekavian]=Нова порука +Name[sr@ijekavianlatin]=Nova poruka +Name[sr@latin]=Nova poruka Name[sv]=Nytt brev Name[uk]=Нове повідомлення Name[x-test]=xxNew Messagexx @@ -228,6 +232,10 @@ Name[pl]=Sprawdź pocztę Name[pt]=Verificar o Correio Name[sk]=S&kontrolovať poštu Name[sl]=Preveri pošto +Name[sr]=Провери пошту +Name[sr@ijekavian]=Провери пошту +Name[sr@ijekavianlatin]=Proveri poštu +Name[sr@latin]=Proveri poštu Name[sv]=Kontrollera brev Name[uk]=Перевірити пошту Name[x-test]=xxCheck Mailxx -- 2.11.4.GIT