From 1d3368532a3f0e9b2e3b8022985a00bb5ce8149b Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 26 Feb 2019 05:29:15 +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" --- app/org.kde.kdeconnect.app.desktop | 2 +- daemon/kdeconnect.desktop | 2 +- indicator/org.kde.kdeconnect.nonplasma.desktop | 2 +- kcm/kcm_kdeconnect.desktop | 2 +- plugins/kdeconnect.notifyrc | 4 ++-- .../findmyphone/plasma-runner-kdeconnect-findmyphone.desktop | 2 ++ .../plasma-runner-kdeconnect-remotecommands.desktop | 2 ++ 7 files changed, 10 insertions(+), 6 deletions(-) diff --git a/app/org.kde.kdeconnect.app.desktop b/app/org.kde.kdeconnect.app.desktop index 2d72145a6..3e3d82ebd 100644 --- a/app/org.kde.kdeconnect.app.desktop +++ b/app/org.kde.kdeconnect.app.desktop @@ -92,7 +92,7 @@ Comment[gl]=Unifique os seus dispositivos. Comment[he]=הפוך את כך ההתקנים שלך לאחד Comment[hu]=Egyesítse eszközeit Comment[id]=Membuat semua perangkatmu menyatu -Comment[it]=Fai di tutti i tuoi dispositivi un solo dispositivo +Comment[it]=Unisce tutti i tuoi dispositivi Comment[ko]=모든 장치를 하나로 동기화 Comment[nl]=Al uw apparaten een maken Comment[nn]=Slå alle einingane dine saman diff --git a/daemon/kdeconnect.desktop b/daemon/kdeconnect.desktop index 1bfdd1400..ffe896785 100644 --- a/daemon/kdeconnect.desktop +++ b/daemon/kdeconnect.desktop @@ -70,7 +70,7 @@ Comment[gl]=Conectar KDE co seu teléfono móbil. Comment[he]=חבר את KDE לפלאפון החכם שלך Comment[hu]=A KDE csatlakoztatása az okostelefonnal Comment[id]=Koneksikan KDE dengan smartphone-mu -Comment[it]=Connetti KDE con il tuo smartphone +Comment[it]=Connette KDE al tuo smartphone Comment[ko]=KDE와 스마트폰 연결 Comment[nl]=KDE met uw smartphone verbinden Comment[nn]=Kopla KDE til smarttelefonen din diff --git a/indicator/org.kde.kdeconnect.nonplasma.desktop b/indicator/org.kde.kdeconnect.nonplasma.desktop index 90b77ecac..e1fb7f4dd 100644 --- a/indicator/org.kde.kdeconnect.nonplasma.desktop +++ b/indicator/org.kde.kdeconnect.nonplasma.desktop @@ -50,7 +50,7 @@ Comment[gl]=Mostrar información sobre os dispositivos Comment[he]=הצג מידע עך ההתקנים שלך Comment[hu]=Információk megjelenítése az eszközeiről Comment[id]=Displaikan informasi tentang perangkatmu -Comment[it]=Visualizza informazioni sui tuoi dispositivi +Comment[it]=Visualizza le informazioni sui tuoi dispositivi Comment[ko]=장치 정보 표시 Comment[nl]=Toon informatie over uw apparaten Comment[nn]=Vis informasjon om einingane dine diff --git a/kcm/kcm_kdeconnect.desktop b/kcm/kcm_kdeconnect.desktop index 0204436db..ae27c997e 100755 --- a/kcm/kcm_kdeconnect.desktop +++ b/kcm/kcm_kdeconnect.desktop @@ -69,7 +69,7 @@ Comment[gl]=Conecte e sincronice os seus dispositivos. Comment[he]=חבר וסנכרן את ההתקנים שלך Comment[hu]=Csatlakoztassa és szinkronizálja eszközeit Comment[id]=Koneksikan dan sinkronkan perangkatmu -Comment[it]=Connetti e sincronizza i tuoi dispositivi +Comment[it]=Connette e sincronizza i tuoi dispositivi Comment[ko]=내 장치에 연결하고 동기화 Comment[nl]=Uw apparaten verbinden en synchroniseren Comment[nn]=Kopla til og synkroniser einingar diff --git a/plugins/kdeconnect.notifyrc b/plugins/kdeconnect.notifyrc index eadb0fca2..26336fa5b 100644 --- a/plugins/kdeconnect.notifyrc +++ b/plugins/kdeconnect.notifyrc @@ -261,7 +261,7 @@ Name[gl]=Chamada perdida Name[he]=שיחה שלא נענתה Name[hu]=Nem fogadott hívás Name[id]=Panggilan Tidak Terjawab -Name[it]=Chiamate perse +Name[it]=Chiamata persa Name[ko]=부재 중 전화 Name[nl]=Gemiste oproep Name[nn]=Tapt oppringing @@ -462,7 +462,7 @@ Comment[gl]=A batería está nas últimas. Comment[he]=הבטריה שלך הולכת להגמר Comment[hu]=Az akkumulátora feszültsége alacsony Comment[id]=Bateraimu dalam keadaan lemah -Comment[it]=La tua batteria è al livello basso +Comment[it]=La batteria è al livello basso Comment[ko]=배터리가 부족함 Comment[nl]=Uw batterij is bijna leeg Comment[nn]=Det er lite batteri att diff --git a/runners/findmyphone/plasma-runner-kdeconnect-findmyphone.desktop b/runners/findmyphone/plasma-runner-kdeconnect-findmyphone.desktop index c2d3d3660..f73be6e94 100644 --- a/runners/findmyphone/plasma-runner-kdeconnect-findmyphone.desktop +++ b/runners/findmyphone/plasma-runner-kdeconnect-findmyphone.desktop @@ -5,6 +5,7 @@ Name[ca@valencia]= Troba el meu dispositiu Name[cs]= Najít moje zařízení Name[es]=Encontrar mi dispositivo Name[gl]=Atopar o meu dispositivo +Name[it]= Trova il mio dispositivo Name[nl]= Zoek mijn apparaat Name[pt]= Procurar o meu dispositivo Name[pt_BR]= Localizar meu dispositivo @@ -18,6 +19,7 @@ Comment[ca@valencia]=Fa sonar als dispositius connectats Comment[cs]=Prozvonit připojená zařízení Comment[es]=Hacer sonar los dispositivos conectados Comment[gl]=Facer soar os dispositivos conectados +Comment[it]=Fa squillare i dispositivi connessi Comment[nl]=Bel verbonden apparaten Comment[pt]=Tocar os dispositivos ligados Comment[pt_BR]=Toca os dispositivos conectados diff --git a/runners/remotecommands/plasma-runner-kdeconnect-remotecommands.desktop b/runners/remotecommands/plasma-runner-kdeconnect-remotecommands.desktop index 17c0050ce..3e4b740c7 100644 --- a/runners/remotecommands/plasma-runner-kdeconnect-remotecommands.desktop +++ b/runners/remotecommands/plasma-runner-kdeconnect-remotecommands.desktop @@ -5,6 +5,7 @@ Name[ca@valencia]=Executa una ordre Name[cs]=Spustit příkaz Name[es]=Ejecutar orden Name[gl]=Executar unha orde +Name[it]=Esegui comando Name[nl]=Commando uitvoeren Name[pt]=Executar um comando Name[pt_BR]=Executar comando @@ -18,6 +19,7 @@ Comment[ca@valencia]=Executa les ordres als dispositius connectats Comment[cs]=Spustit příkazy na připojených zařízeních Comment[es]=Ejecutar órdenes en los dispositivos conectados Comment[gl]=Executar ordes nos dispositivos conectados +Comment[it]=Esegue dei comandi sui dispositivi connessi Comment[nl]=Commando's op verbonden apparaten uitvoeren Comment[pt]=Executar comandos nos dispositivos ligados Comment[pt_BR]=Executa comandos nos dispositivos conectados