From 446afc06191283e4e107eb0f201183f41026c6ba Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 21 Dec 2015 09:59:24 +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 26ac4c0aa..12e06b6a3 100644 --- a/plugins/notifications/kdeconnect_notifications_config.desktop +++ b/plugins/notifications/kdeconnect_notifications_config.desktop @@ -16,6 +16,7 @@ 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 Name[pt_BR]=Configuração do plugin de sincronização das notificações +Name[sk]=Nastavenia pluginu notifikácií synchronizácie Name[sv]=Inställningar av insticksprogram för underrättelsesynkronisering Name[uk]=Параметри додатка синхронізації сповіщень Name[x-test]=xxNotification synchronization plugin settingsxx