From 36fff2276be52922bd282eab08c14f6b88d6973f Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 11 Jan 2016 13:02:16 +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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/notifications/kdeconnect_notifications_config.desktop b/plugins/notifications/kdeconnect_notifications_config.desktop index 333e66477..6fd58baf2 100644 --- a/plugins/notifications/kdeconnect_notifications_config.desktop +++ b/plugins/notifications/kdeconnect_notifications_config.desktop @@ -6,7 +6,7 @@ X-KDE-Library=kdeconnect_notifications_config X-KDE-ParentComponents=kdeconnect_notifications Name=Notification synchronization plugin settings -Name[ca]=Ajustament del connector per a la sincronització de les notificacions +Name[ca]=Ajustament del connector Sincronitza les notificacions Name[ca@valencia]=Ajustament del connector per a la sincronització de les notificacions Name[en_GB]=Notification synchronisation plugin settings Name[es]=Preferencias del complemento de sincronización de notificaciones