From f3c17e11bbdae6179717c79a3de21ed984027e83 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 1 Aug 2019 04:58:44 +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 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/kmail-refresh-settings/org.kde.kmail-refresh-settings.desktop b/kmail-refresh-settings/org.kde.kmail-refresh-settings.desktop index 3606553c0..3ad272e78 100755 --- a/kmail-refresh-settings/org.kde.kmail-refresh-settings.desktop +++ b/kmail-refresh-settings/org.kde.kmail-refresh-settings.desktop @@ -2,6 +2,7 @@ Name=KMail Refresh Settings Name[ca]=Actualització dels ajustaments del KMail Name[es]=Preferencias de refresco de KMail +Name[fi]=KMailin asetusten virkistys Name[it]=Rinnovo delle impostazioni di KMail Name[nl]=Vernieuwen van instellingen van KMail Name[pl]=Odświeżanie ustawień KMaila @@ -18,6 +19,7 @@ X-DocPath=kmail2/index.html GenericName=KMail refresh settings GenericName[ca]=Actualització dels ajustaments del KMail GenericName[es]=Preferencias de refresco de KMail +GenericName[fi]=KMailin asetusten virkistys GenericName[it]=Rinnovo delle impostazioni di KMail GenericName[nl]=Instellingen van vernieuwen KMail GenericName[pl]=Odświeżanie ustawień KMaila @@ -30,6 +32,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[fi]=Virkistä KMail-asetukset Comment[it]=Rinnova le impostazioni di KMail Comment[nl]=KMail-instellingen vernieuwen Comment[pl]=Ustawienia odświeżania KMaila