From 933cbd5bfdf3c507bccb61b8052e003ce0797721 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 13 Sep 2015 10:31:01 +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" --- app/org.kde.kdeconnect.app.desktop | 3 +++ kcm/kcm_kdeconnect.desktop | 1 + kcm/kdeconnect.desktop | 3 +++ kdeconnect-non-plasma.desktop | 4 ++++ plugins/findmyphone/kdeconnect_findmyphone.json | 12 ++++++++++++ plugins/lockdevice/kdeconnect_lockdevice.json | 2 ++ plugins/mprisremote/kdeconnect_mprisremote.json | 2 ++ plugins/notifications/kdeconnect_notifications.json | 1 + plugins/remotecontrol/kdeconnect_remotecontrol.json | 2 ++ plugins/runcommand/kdeconnect_runcommand.json | 12 ++++++------ 10 files changed, 36 insertions(+), 6 deletions(-) diff --git a/app/org.kde.kdeconnect.app.desktop b/app/org.kde.kdeconnect.app.desktop index 55b780bbe..8a91ee419 100644 --- a/app/org.kde.kdeconnect.app.desktop +++ b/app/org.kde.kdeconnect.app.desktop @@ -3,6 +3,7 @@ Name=KDE Connect Application Name[ca]=Aplicació KDE Connect Name[cs]=Aplikace KDE Connect Name[de]=KDE-Connect-Anwendung +Name[en_GB]=KDE Connect Application Name[es]=Aplicación KDE Connect Name[fi]=KDE Connect -sovellus Name[gl]=Programa de KDE Connect @@ -23,6 +24,7 @@ GenericName=Device Synchronization GenericName[ca]=Sincronització de dispositius GenericName[cs]=Synchronizace zařízení GenericName[de]=Geräteabgleich +GenericName[en_GB]=Device Synchronisation GenericName[es]=Sincronización de dispositivos GenericName[fi]=Laitteiden synkronointi GenericName[gl]=Sincronización de dispositivos @@ -43,6 +45,7 @@ Comment=Make all your devices one Comment[ca]=Fa que tots els vostres dispositius siguin un Comment[cs]=Sjednoťte svá zařízení Comment[de]=Gleichen Sie alle Ihre Geräte ab +Comment[en_GB]=Make all your devices one Comment[es]=Convertir todos sus dispositivos en uno Comment[fi]=Yhdistä kaikki laitteesi toisiinsa Comment[gl]=Unifique os seus dispositivos. diff --git a/kcm/kcm_kdeconnect.desktop b/kcm/kcm_kdeconnect.desktop index b111a64fc..d670bd1fd 100755 --- a/kcm/kcm_kdeconnect.desktop +++ b/kcm/kcm_kdeconnect.desktop @@ -43,6 +43,7 @@ Comment=Connect and sync your devices Comment[ca]=Connecta i sincronitza els vostres dispositius Comment[cs]=Připojte a synchronizujte svá zařízení Comment[de]=Verbinden und Abgleichen Ihrer Geräte +Comment[en_GB]=Connect and sync your devices Comment[es]=Conectar y sincronizar sus dispositivos Comment[fi]=Yhdistä ja synkronoi laitteitasi Comment[gl]=Conecte e sincronice os seus dispositivos. diff --git a/kcm/kdeconnect.desktop b/kcm/kdeconnect.desktop index 078694b47..cad173e80 100755 --- a/kcm/kdeconnect.desktop +++ b/kcm/kdeconnect.desktop @@ -6,6 +6,7 @@ Exec=kcmshell5 kcm_kdeconnect Name=KDE Connect Settings Name[ca]=Arranjament del KDE Connect Name[cs]=Nastavení KDE Connect +Name[en_GB]=KDE Connect Settings Name[es]=Ajustes de KDE Connect Name[fi]=KDE Connectin asetukset Name[hu]=A KDE Connect beállításai @@ -17,10 +18,12 @@ Name[sv]=Inställning av KDE-anslut Name[tr]=KDE Bağlantı Ayarları Name[uk]=Параметри KDE Connect Name[x-test]=xxKDE Connect Settingsxx +Name[zh_CN]=KDE Connect 设置 GenericName=Connect and sync your devices GenericName[ca]=Connecta i sincronitza els vostres dispositius GenericName[cs]=Připojte a synchronizujte svá zařízení GenericName[de]=Verbinden und Abgleichen Ihrer Geräte +GenericName[en_GB]=Connect and sync your devices GenericName[es]=Conectar y sincronizar sus dispositivos GenericName[fi]=Yhdistä ja synkronoi laitteitasi GenericName[gl]=Conecte e sincronice os seus dispositivos diff --git a/kdeconnect-non-plasma.desktop b/kdeconnect-non-plasma.desktop index 4bbd85ddc..2a0707490 100755 --- a/kdeconnect-non-plasma.desktop +++ b/kdeconnect-non-plasma.desktop @@ -2,6 +2,7 @@ Name=KDE Connect Monitor Name[ca]=Controlador del KDE Connect Name[cs]=Monitor KDE Connect +Name[en_GB]=KDE Connect Monitor Name[es]=Monitor de KDE Connect Name[fi]=KDE Connect -valvonta Name[hu]=KDE Connect monitor @@ -13,9 +14,11 @@ Name[sv]=KDE-anslut övervakning Name[tr]=KDE Bağlantı İzleyicisi Name[uk]=Монітор KDE Connect Name[x-test]=xxKDE Connect Monitorxx +Name[zh_CN]=KDE Connect 监视器 Comment=Display information about your devices Comment[ca]=Mostra la informació dels vostres dispositius Comment[cs]=Zobrazit informace o vašich zařízeních +Comment[en_GB]=Display information about your devices Comment[es]=Mostrar información sobre sus dispositivos Comment[fi]=Näyttää tietoa laitteistasi Comment[hu]=Információk megjelenítése az eszközeiről @@ -27,6 +30,7 @@ Comment[sv]=Visa information om enheter Comment[tr]=Aygıtlarınız hakkında bilgi görüntüleyin Comment[uk]=Показати дані щодо ваших пристроїв Comment[x-test]=xxDisplay information about your devicesxx +Comment[zh_CN]=显示您设备的信息 Exec=plasmawindowed org.kde.kdeconnect --statusnotifier Icon=kdeconnect Type=Application diff --git a/plugins/findmyphone/kdeconnect_findmyphone.json b/plugins/findmyphone/kdeconnect_findmyphone.json index 731f7d5a7..9d6f9edfc 100644 --- a/plugins/findmyphone/kdeconnect_findmyphone.json +++ b/plugins/findmyphone/kdeconnect_findmyphone.json @@ -11,12 +11,24 @@ } ], "Description": "Find your lost phone by making it play an alarm sound ", + "Description[en_GB]": "Find your lost phone by making it play an alarm sound ", + "Description[pt_BR]": "Encontre seu telefone fazendo ele tocar um som ", + "Description[sv]": "Hitta din förlorade telefon genom att få den att spela ett alarmljud ", + "Description[uk]": "Знайти загублений телефон, наказавши йому відтворити дзвінок", + "Description[x-test]": "xxFind your lost phone by making it play an alarm sound xx", + "Description[zh_CN]": "通过播放闹铃声来找到您的手机", "EnabledByDefault": true, "Encoding": "UTF-8", "Icon": "edit-find", "Id": "kdeconnect_findmyphone", "License": "GPL", "Name": "Find My Phone", + "Name[en_GB]": "Find My Phone", + "Name[pt_BR]": "Encontrar meu telefone", + "Name[sv]": "Hitta min telefon", + "Name[uk]": "Знайти телефон", + "Name[x-test]": "xxFind My Phonexx", + "Name[zh_CN]": "找到我的手机", "ServiceTypes": [ "KdeConnect/Plugin" ], diff --git a/plugins/lockdevice/kdeconnect_lockdevice.json b/plugins/lockdevice/kdeconnect_lockdevice.json index c8b5360bb..b16473a1f 100644 --- a/plugins/lockdevice/kdeconnect_lockdevice.json +++ b/plugins/lockdevice/kdeconnect_lockdevice.json @@ -11,6 +11,7 @@ "Description[ca]": "Bloqueja els vostres sistemes", "Description[cs]": "Zamkne vaše systémy", "Description[de]": "Sperrt Ihre Systeme", + "Description[en_GB]": "Locks your systems", "Description[es]": "Bloquear sus sistemas", "Description[fi]": "Lukitsee järjestelmäsi", "Description[gl]": "Bloquea os seus sistemas.", @@ -34,6 +35,7 @@ "Name[ca]": "Bloqueja el dispositiu", "Name[cs]": "Uzamknout zařízení", "Name[de]": "Gerätesperrung", + "Name[en_GB]": "LockDevice", "Name[es]": "Bloquear dispositivo", "Name[fi]": "Lukitse laite", "Name[gl]": "Bloqueo do dispositivo", diff --git a/plugins/mprisremote/kdeconnect_mprisremote.json b/plugins/mprisremote/kdeconnect_mprisremote.json index ed0bdc04c..a806d4695 100644 --- a/plugins/mprisremote/kdeconnect_mprisremote.json +++ b/plugins/mprisremote/kdeconnect_mprisremote.json @@ -11,6 +11,7 @@ "Description[ca]": "Serveis de control del MPRIS", "Description[cs]": "Ovládejte služby MPRIS", "Description[de]": "Steuerung von MPRIS-Diensten", + "Description[en_GB]": "Control MPRIS services", "Description[es]": "Controlar los servicios MPRIS", "Description[fi]": "Ohjaa MPRIS-palveluita", "Description[gl]": "Controle servizos de MPRIS.", @@ -34,6 +35,7 @@ "Name[ca]": "MprisRemote", "Name[cs]": "MprisRemote", "Name[de]": "MprisRemote", + "Name[en_GB]": "MprisRemote", "Name[es]": "MprisRemote", "Name[fi]": "MPRIS-kauko-ohjain", "Name[gl]": "MprisRemote", diff --git a/plugins/notifications/kdeconnect_notifications.json b/plugins/notifications/kdeconnect_notifications.json index 2292f752d..20eb9fff8 100644 --- a/plugins/notifications/kdeconnect_notifications.json +++ b/plugins/notifications/kdeconnect_notifications.json @@ -11,6 +11,7 @@ "Description[ca]": "Mostra les notificacions del telèfon a l'ordinador i les manté sincronitzades", "Description[cs]": "Zobrazit upozornění telefonu v počítači a udržovat je synchronizovaná", "Description[de]": "Benachrichtigungen auf Ihren Rechner anzeigen und abgleichen", + "Description[en_GB]": "Show phone notifications on your computer and keep them in sync", "Description[es]": "Mostrar notificaciones del teléfono en su equipo y mantenerlas en sincronía", "Description[fi]": "Näytä puhelimen ilmoitukset tietokoneellasi ja pidä ne ajan tasalla", "Description[gl]": "Mostre notificacións dun teléfono móbil no computador e deixe que as notificacións se sincronicen co teléfono.", diff --git a/plugins/remotecontrol/kdeconnect_remotecontrol.json b/plugins/remotecontrol/kdeconnect_remotecontrol.json index 4c37bb6b0..655860b62 100644 --- a/plugins/remotecontrol/kdeconnect_remotecontrol.json +++ b/plugins/remotecontrol/kdeconnect_remotecontrol.json @@ -10,6 +10,7 @@ "Description": "Control Remote systems", "Description[ca]": "Sistemes de control remot", "Description[cs]": "Ovládejte vzdálené systémy", + "Description[en_GB]": "Control Remote systems", "Description[es]": "Controlar sistemas remotos", "Description[fi]": "Ohjaa järjestelmiä etänä", "Description[gl]": "Controla sistemas remotos.", @@ -32,6 +33,7 @@ "Name": "RemoteControl", "Name[ca]": "Control remot", "Name[cs]": "Dálkové ovládání", + "Name[en_GB]": "RemoteControl", "Name[es]": "Control remoto", "Name[fi]": "Kauko-ohjain", "Name[gl]": "Mando a distancia", diff --git a/plugins/runcommand/kdeconnect_runcommand.json b/plugins/runcommand/kdeconnect_runcommand.json index ed2042ab7..c31741242 100644 --- a/plugins/runcommand/kdeconnect_runcommand.json +++ b/plugins/runcommand/kdeconnect_runcommand.json @@ -5,18 +5,18 @@ { "Email": "albertvaka@gmail.com", "Name": "Albert Vaca" - }, + }, { "Email": "david@davidedmundson.co.uk", "Name": "David Edmundson" } ], - "Description": "Execute console commands remotely", + "Description": "Execute console commands remotely", "EnabledByDefault": true, - "Icon": "system-run", - "Id": "kdeconnect_runcommand", + "Icon": "system-run", + "Id": "kdeconnect_runcommand", "License": "GPL", - "Name": "Run commands", + "Name": "Run commands", "ServiceTypes": [ "KdeConnect/Plugin" ], @@ -29,4 +29,4 @@ "X-KdeConnect-SupportedPackageType": [ "kdeconnect.runcommand" ] -} +} \ No newline at end of file