From bda80ab112dd7ea06cd2d57ffaf55c17d81a65d0 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 9 Oct 2017 06:34:28 +0200 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/kmail_config_plugins.desktop | 1 + src/data/org.kde.kmail2.desktop | 2 ++ 2 files changed, 3 insertions(+) diff --git a/src/data/kmail_config_plugins.desktop b/src/data/kmail_config_plugins.desktop index 94e9b0a21..fbf3cd4d5 100644 --- a/src/data/kmail_config_plugins.desktop +++ b/src/data/kmail_config_plugins.desktop @@ -98,6 +98,7 @@ Comment[it]=Estensioni per le impostazioni Comment[nl]=Plug-ins voor instellingen Comment[pl]=Wtyczki ustawień Comment[pt]='Plugins' de Configuração +Comment[ru]=Настройка модулей Comment[sk]=Pluginy nastavení Comment[sl]=Nastavi vstavke Comment[sr]=Прикључци за поставке diff --git a/src/data/org.kde.kmail2.desktop b/src/data/org.kde.kmail2.desktop index 74d0d2e81..fd5147463 100755 --- a/src/data/org.kde.kmail2.desktop +++ b/src/data/org.kde.kmail2.desktop @@ -210,6 +210,7 @@ Name[it]=Nuovo messaggio Name[nl]=Nieuw bericht Name[pl]=Nowa wiadomość Name[pt]=Nova Mensagem +Name[ru]=Написать письмо Name[sk]=Nová správa Name[sl]=Novo sporočilo Name[sr]=Нова порука @@ -240,6 +241,7 @@ Name[it]=Controlla posta Name[nl]=E-mail controleren Name[pl]=Sprawdź pocztę Name[pt]=Verificar o Correio +Name[ru]=Проверить почту Name[sk]=S&kontrolovať poštu Name[sl]=Preveri pošto Name[sr]=Провери пошту