From c7f28b669361fb1dd1c9ff0c4631e15423094350 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 18 Jul 2019 05:25:26 +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" --- kmail-refresh-settings/org.kde.kmail-refresh-settings.desktop | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/kmail-refresh-settings/org.kde.kmail-refresh-settings.desktop b/kmail-refresh-settings/org.kde.kmail-refresh-settings.desktop index e02e9aac4..a2f69181a 100755 --- a/kmail-refresh-settings/org.kde.kmail-refresh-settings.desktop +++ b/kmail-refresh-settings/org.kde.kmail-refresh-settings.desktop @@ -4,6 +4,7 @@ Name[ca]=Actualització dels ajustaments del KMail Name[it]=Rinnovo delle impostazioni di KMail Name[nl]=Vernieuwen van instellingen van KMail Name[pt]=Actualização da Configuração do KMail +Name[pt_BR]=Atualizar configurações do KMail Name[sk]=KMail Obnoviť Nastavenia Name[sv]=Kmail uppdatera inställningar Name[uk]=Оновлення параметрів KMail @@ -17,6 +18,7 @@ GenericName[ca]=Actualització dels ajustaments del KMail GenericName[it]=Rinnovo delle impostazioni di KMail GenericName[nl]=Instellingen van vernieuwen KMail GenericName[pt]=Actualização da Configuração do KMail +GenericName[pt_BR]=Atualizar configurações do KMail GenericName[sk]=KMail obnoviť nastavenia GenericName[sv]=Kmail uppdatera inställningar GenericName[uk]=Оновити параметри KMail @@ -25,6 +27,8 @@ Comment=Refresh KMail settings Comment[ca]=Actualitza els ajustaments del KMail Comment[nl]=KMail-instellingen vernieuwen Comment[pt]=Actualizar a configuração do KMail +Comment[pt_BR]=Atualizar configurações do KMail +Comment[sk]=Obnoviť nastavenia KMail Comment[sv]=Uppdatera Kmail-inställningar Comment[uk]=Оновлення параметрів KMail Comment[x-test]=xxRefresh KMail settingsxx