From a8834dcbc3382b06b54de7a5522d5d614f068b8b Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 21 Sep 2016 11:54:11 +0000 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" --- .../kdeconnect_sendnotifications_config.desktop | 1 + 1 file changed, 1 insertion(+) diff --git a/plugins/sendnotifications/kdeconnect_sendnotifications_config.desktop b/plugins/sendnotifications/kdeconnect_sendnotifications_config.desktop index 7bfab0e50..45463b70d 100644 --- a/plugins/sendnotifications/kdeconnect_sendnotifications_config.desktop +++ b/plugins/sendnotifications/kdeconnect_sendnotifications_config.desktop @@ -9,6 +9,7 @@ Name=Notification synchronization plugin settings Name[ca]=Ajustament del connector Sincronitza les notificacions Name[ca@valencia]=Ajustament del connector Sincronitza les notificacions Name[cs]=Nastavení modulu synchronizace upozornění +Name[de]=Einstellungen für Benachrichtigungsabgleich-Modul Name[en_GB]=Notification synchronisation plugin settings Name[es]=Preferencias del complemento de sincronización de notificaciones Name[et]=Märguande sünkroonimise plugina seaditused