From 49e74ea38862716dde07b52ee18c546d9a789824 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 24 Dec 2015 09:01:18 +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" --- plugins/notifications/kdeconnect_notifications_config.desktop | 1 + 1 file changed, 1 insertion(+) diff --git a/plugins/notifications/kdeconnect_notifications_config.desktop b/plugins/notifications/kdeconnect_notifications_config.desktop index 12e06b6a3..333e66477 100644 --- a/plugins/notifications/kdeconnect_notifications_config.desktop +++ b/plugins/notifications/kdeconnect_notifications_config.desktop @@ -12,6 +12,7 @@ Name[en_GB]=Notification synchronisation plugin settings Name[es]=Preferencias del complemento de sincronización de notificaciones Name[fi]=Ilmoitusten synkronointiliitännäisen asetukset Name[gl]=Configuración do complemento de sincronización de notificacións +Name[it]=Impostazioni dell'estensione di sincronizzazione delle notifiche Name[nl]=Instellingen van plug-in voor synchronisatie van meldingen Name[pl]=Ustawienia wtyczki synchronizującej powiadomienia Name[pt]=Configuração do 'plugin' de sincronização das notificações