From 19694537655655504d491cfbb0c2663650dac139 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 28 Jul 2019 05:17:21 +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 | 1 + 1 file changed, 1 insertion(+) diff --git a/kmail-refresh-settings/org.kde.kmail-refresh-settings.desktop b/kmail-refresh-settings/org.kde.kmail-refresh-settings.desktop index 207456eec..3606553c0 100755 --- a/kmail-refresh-settings/org.kde.kmail-refresh-settings.desktop +++ b/kmail-refresh-settings/org.kde.kmail-refresh-settings.desktop @@ -30,6 +30,7 @@ GenericName[x-test]=xxKMail refresh settingsxx Comment=Refresh KMail settings Comment[ca]=Actualitza els ajustaments del KMail Comment[es]=Refrescar preferencias de KMail +Comment[it]=Rinnova le impostazioni di KMail Comment[nl]=KMail-instellingen vernieuwen Comment[pl]=Ustawienia odświeżania KMaila Comment[pt]=Actualizar a configuração do KMail