From bc01302fc669966e3b8bfb2f6b11d4b397d0f49b Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Fri, 12 May 2017 04:23:41 +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 | 2 ++ src/data/org.kde.kmail2.desktop | 2 ++ 2 files changed, 4 insertions(+) diff --git a/src/data/kmail_config_plugins.desktop b/src/data/kmail_config_plugins.desktop index 45ba3e762..1c9e3abca 100644 --- a/src/data/kmail_config_plugins.desktop +++ b/src/data/kmail_config_plugins.desktop @@ -93,6 +93,7 @@ Comment[en_GB]=Settings Plugins Comment[es]=Preferencias de complementos Comment[et]=Seadistusplugin Comment[fi]=Asetusliitännäiset +Comment[fr]=Modules de paramètres Comment[it]=Estensioni per le impostazioni Comment[nl]=Plug-ins voor instellingen Comment[pl]=Wtyczki ustawień @@ -118,6 +119,7 @@ X-KDE-Keywords[en_GB]=kmail,plugins X-KDE-Keywords[es]=kmail,complementos X-KDE-Keywords[et]=kmail,pluginad X-KDE-Keywords[fi]=kmail,liitännäiset +X-KDE-Keywords[fr]=kmail,modules X-KDE-Keywords[it]=kmail,estensioni X-KDE-Keywords[nl]=kmail,plug-ins X-KDE-Keywords[pl]=kmail,wtyczki diff --git a/src/data/org.kde.kmail2.desktop b/src/data/org.kde.kmail2.desktop index da91e5c50..74d0d2e81 100755 --- a/src/data/org.kde.kmail2.desktop +++ b/src/data/org.kde.kmail2.desktop @@ -205,6 +205,7 @@ Name[en_GB]=New Message Name[es]=Mensaje nuevo Name[et]=Uus kiri Name[fi]=Uusi viesti +Name[fr]=Nouveau message Name[it]=Nuovo messaggio Name[nl]=Nieuw bericht Name[pl]=Nowa wiadomość @@ -234,6 +235,7 @@ Name[en_GB]=Check Mail Name[es]=Comprobar correo Name[et]=E-posti kontrollimine Name[fi]=Tarkista posti +Name[fr]=Relever le courriel Name[it]=Controlla posta Name[nl]=E-mail controleren Name[pl]=Sprawdź pocztę