From abce7a194c6f01a152b1497e13490f81ef6f9e07 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 25 Mar 2019 05:51:13 +0100 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/photo/kdeconnect_photo.json | 4 ++++ plugins/telephony/kdeconnect_telephony.json | 2 ++ .../findmyphone/plasma-runner-kdeconnect-findmyphone.desktop | 4 ++++ .../plasma-runner-kdeconnect-remotecommands.desktop | 4 ++++ 4 files changed, 14 insertions(+) diff --git a/plugins/photo/kdeconnect_photo.json b/plugins/photo/kdeconnect_photo.json index bbf1b6599..793c2de97 100644 --- a/plugins/photo/kdeconnect_photo.json +++ b/plugins/photo/kdeconnect_photo.json @@ -32,7 +32,9 @@ "Description": "Use a connected device to take a photo", "Description[ca@valencia]": "Usa un dispositiu connectat per fer una fotografia", "Description[ca]": "Usa un dispositiu connectat per fer una fotografia", + "Description[en_GB]": "Use a connected device to take a photo", "Description[es]": "Usar un dispositivo conectado para tomar una fotografía", + "Description[fr]": "Utiliser un périphérique connecté pour prendre une photo", "Description[gl]": "Usar un dispositivo conectado para sacar unha foto", "Description[nl]": "Gebruik een verbonden apparaat om een foto te nemen", "Description[nn]": "Bruk tilkopla eining til å ta eit bilete", @@ -49,7 +51,9 @@ "Name": "Photo", "Name[ca@valencia]": "Fotografia", "Name[ca]": "Fotografia", + "Name[en_GB]": "Photo", "Name[es]": "Fotografía", + "Name[fr]": "Photo", "Name[gl]": "Foto", "Name[nl]": "Foto", "Name[nn]": "Foto", diff --git a/plugins/telephony/kdeconnect_telephony.json b/plugins/telephony/kdeconnect_telephony.json index 3adee0b48..45f682422 100644 --- a/plugins/telephony/kdeconnect_telephony.json +++ b/plugins/telephony/kdeconnect_telephony.json @@ -42,11 +42,13 @@ ], "Description": "Show notifications for incoming calls", "Description[ca]": "Mostra les notificacions de les trucades entrants", + "Description[en_GB]": "Show notifications for incoming calls", "Description[gl]": "Mostrar notificacións de chamadas entrantes", "Description[nl]": "Meldingen tonen van inkomende oproepen", "Description[sv]": "Visa underrättelser om inkommande samtal", "Description[uk]": "Показ сповіщень щодо вхідних дзвінків", "Description[x-test]": "xxShow notifications for incoming callsxx", + "Description[zh_TW]": "顯示來電通知", "EnabledByDefault": true, "Icon": "call-start", "Id": "kdeconnect_telephony", diff --git a/runners/findmyphone/plasma-runner-kdeconnect-findmyphone.desktop b/runners/findmyphone/plasma-runner-kdeconnect-findmyphone.desktop index 96ab3254e..a5ef8edc2 100644 --- a/runners/findmyphone/plasma-runner-kdeconnect-findmyphone.desktop +++ b/runners/findmyphone/plasma-runner-kdeconnect-findmyphone.desktop @@ -3,7 +3,9 @@ Name= Find my device Name[ca]= Troba el meu dispositiu Name[ca@valencia]= Troba el meu dispositiu Name[cs]= Najít moje zařízení +Name[en_GB]= Find my device Name[es]=Encontrar mi dispositivo +Name[fr]= Trouver mon appareil Name[gl]=Atopar o meu dispositivo Name[it]= Trova il mio dispositivo Name[nl]= Zoek mijn apparaat @@ -19,7 +21,9 @@ Comment=Ring connected devices Comment[ca]=Fa sonar als dispositius connectats Comment[ca@valencia]=Fa sonar als dispositius connectats Comment[cs]=Prozvonit připojená zařízení +Comment[en_GB]=Ring connected devices Comment[es]=Hacer sonar los dispositivos conectados +Comment[fr]=Faire sonner les appareils connectés Comment[gl]=Facer soar os dispositivos conectados Comment[it]=Fa squillare i dispositivi connessi Comment[nl]=Bel verbonden apparaten diff --git a/runners/remotecommands/plasma-runner-kdeconnect-remotecommands.desktop b/runners/remotecommands/plasma-runner-kdeconnect-remotecommands.desktop index 5ee3fa20e..fb0f03306 100644 --- a/runners/remotecommands/plasma-runner-kdeconnect-remotecommands.desktop +++ b/runners/remotecommands/plasma-runner-kdeconnect-remotecommands.desktop @@ -3,7 +3,9 @@ Name=Run command Name[ca]=Executa una ordre Name[ca@valencia]=Executa una ordre Name[cs]=Spustit příkaz +Name[en_GB]=Run command Name[es]=Ejecutar orden +Name[fr]=Exécuter une commande Name[gl]=Executar unha orde Name[it]=Esegui comando Name[nl]=Commando uitvoeren @@ -19,7 +21,9 @@ Comment=Run commands on connected devices Comment[ca]=Executa les ordres als dispositius connectats Comment[ca@valencia]=Executa les ordres als dispositius connectats Comment[cs]=Spustit příkazy na připojených zařízeních +Comment[en_GB]=Run commands on connected devices Comment[es]=Ejecutar órdenes en los dispositivos conectados +Comment[fr]=Exécuter des commandes sur les périphériques connectés Comment[gl]=Executar ordes nos dispositivos conectados Comment[it]=Esegue dei comandi sui dispositivi connessi Comment[nl]=Commando's op verbonden apparaten uitvoeren