From a794d51c4e461e7581b4839fa6e2bf03ff24b3be Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 21 Jul 2015 15:07:44 +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" --- kcm/kcm_kdeconnect.desktop | 2 +- plugins/battery/kdeconnect_battery.json | 1 + plugins/clipboard/kdeconnect_clipboard.json | 1 + plugins/notifications/kdeconnect_notifications.json | 1 + 4 files changed, 4 insertions(+), 1 deletion(-) diff --git a/kcm/kcm_kdeconnect.desktop b/kcm/kcm_kdeconnect.desktop index 09d519a3b..874e3eceb 100755 --- a/kcm/kcm_kdeconnect.desktop +++ b/kcm/kcm_kdeconnect.desktop @@ -75,7 +75,7 @@ X-KDE-Keywords[nl]=Netwerk,Android,Apparaten X-KDE-Keywords[pl]=Sieć,Android,Urządzenia X-KDE-Keywords[pt]=Rede,Android,Dispositivos X-KDE-Keywords[pt_BR]=Rede,Android,Dispositivos -X-KDE-Keywords[ru]=Network,Android,Devices,сеть,Андроид, устройства +X-KDE-Keywords[ru]=Network,Android,Devices,сеть,Андроид,устройства X-KDE-Keywords[sk]=Sieť,Android,Zariadenia X-KDE-Keywords[sv]=Nätverk, Android, apparater X-KDE-Keywords[tr]=Ağ,Android,Cihazlar,Aygıtlar diff --git a/plugins/battery/kdeconnect_battery.json b/plugins/battery/kdeconnect_battery.json index 98410fe1e..bb29e1813 100644 --- a/plugins/battery/kdeconnect_battery.json +++ b/plugins/battery/kdeconnect_battery.json @@ -45,6 +45,7 @@ "Name[pl]": "Monitor baterii", "Name[pt]": "Monitor da bateria", "Name[pt_BR]": "Monitor de bateria", + "Name[ru]": "Индикатор батареи", "Name[sk]": "Monitor batérie", "Name[sv]": "Batteriövervakare", "Name[tr]": "Pil izleyici", diff --git a/plugins/clipboard/kdeconnect_clipboard.json b/plugins/clipboard/kdeconnect_clipboard.json index d2bc73c68..4bb854188 100644 --- a/plugins/clipboard/kdeconnect_clipboard.json +++ b/plugins/clipboard/kdeconnect_clipboard.json @@ -45,6 +45,7 @@ "Name[pl]": "Schowek", "Name[pt]": "Área de Transferência", "Name[pt_BR]": "Área de transferência", + "Name[ru]": "Буфер обмена", "Name[sk]": "Schránka", "Name[sv]": "Klippbord", "Name[tr]": "Geçici taşıma panosu", diff --git a/plugins/notifications/kdeconnect_notifications.json b/plugins/notifications/kdeconnect_notifications.json index f36afadb1..cdf9dfead 100644 --- a/plugins/notifications/kdeconnect_notifications.json +++ b/plugins/notifications/kdeconnect_notifications.json @@ -42,6 +42,7 @@ "Name[pl]": "Powiadomienia synchronizacji", "Name[pt]": "Sincronização de notificações", "Name[pt_BR]": "Sincronização de notificações", + "Name[ru]": "Синхронизация уведомлений", "Name[sk]": "Synchronizácia pripomienok", "Name[sv]": "Underrättelsesynkronisering", "Name[tr]": "Bildirim eşitleme",