tristan/kdeconnect-kde
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SVN_SILENT made messages (.desktop file) - always resolve ours

Browse source 
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"
This commit is contained in:
l10n daemon script 2017-04-14 04:59:04 +02:00
parent 69985f6d0c
commit 0072a6fb27
4 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
plugins/kdeconnect.notifyrc
View file

@ -113,6 +113,7 @@ Comment[pt]=Pedido de emparelhamento recebido de um dispositivo
Comment[pt_BR]=Solicitação de emparelhamento recebida de um dispositivo
Comment[sk]=Požiadavka na spárovanie prijatá zo zariadenia
Comment[sv]=Begäran om ihopparning mottagen från en apparat
Comment[tr]=Bir cihazdan alınan eşleştirme isteği
Comment[uk]=Від пристрою отримано запит щодо пов’язування
Comment[x-test]=xxPairing request received from a devicexx
Comment[zh_CN]=收到来自一个设备的配对请求

1
plugins/remotecommands/kdeconnect_remotecommands.json
View file

@ -25,6 +25,7 @@
"Description[pt]": "Despoletar os comandos predefinidos para o dispositivo remoto",
"Description[sk]": "Vyvolať príkazy preddefinované na vzdialenom zariadení",
"Description[sv]": "Utför kommandon fördefinierade på den andra apparaten",
"Description[tr]": "Uzak aygıta önceden tanımlanmış komutları tetikleyin",
"Description[uk]": "Запуск команд, попередньо визначених на віддаленому пристрої",
"Description[x-test]": "xxTrigger commands predefined on the remote devicexx",
"Description[zh_CN]": "出发远程设备的预设命令",

1
plugins/sendnotifications/kdeconnect_sendnotifications.json
View file

@ -26,6 +26,7 @@
"Description[pt]": "Difunde as notificações deste computador, para que possam ser apresentadas noutros dispositivos.",
"Description[sk]": "Vysielať upozornenia tohto počítača, aby sa zobrazili na druhom zariadení.",
"Description[sv]": "Sänd ut datorns underrättelser så att de kan visas på andra enheter.",
"Description[tr]": "Bu bilgisayarın bildirimlerini yayınlayın, böylece diğer cihazlarda gösterilebilirler.",
"Description[uk]": "Транслювати сповіщення з цього комп’ютера так, щоб їх було показано на інших пристроях.",
"Description[x-test]": "xxBroadcast this computer's notifications, so they can be shown on other devices.xx",
"Description[zh_CN]": "广播此计算机的通知，以被其他设备显示。",

1
plugins/sendnotifications/kdeconnect_sendnotifications_config.desktop
View file

@ -24,6 +24,7 @@ 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[tr]=Bildirim eşitleme eklentisi ayarları
Name[uk]=Параметри додатка синхронізації сповіщень
Name[x-test]=xxNotification synchronization plugin settingsxx
Name[zh_CN]=通知同步插件设置