From 38fed324bf7e5121a672d84f098299005c542c90 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 21 Nov 2018 05:40:27 +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" --- data/kdeconnect-thunar.desktop | 1 + plugins/battery/kdeconnect_battery.json | 2 +- plugins/contacts/kdeconnect_contacts.json | 2 +- .../findthisdevice/kdeconnect_findthisdevice_config.desktop | 2 +- plugins/pausemusic/kdeconnect_pausemusic.json | 4 ++-- plugins/pausemusic/kdeconnect_pausemusic_config.desktop | 2 +- plugins/remotecommands/kdeconnect_remotecommands.json | 2 +- plugins/remotesystemvolume/kdeconnect_remotesystemvolume.json | 2 ++ plugins/runcommand/kdeconnect_runcommand.json | 2 +- plugins/runcommand/kdeconnect_runcommand_config.desktop | 2 +- .../screensaver-inhibit/kdeconnect_screensaver_inhibit.json | 2 +- plugins/sftp/kdeconnect_sftp.json | 2 +- plugins/share/kdeconnect_share.json | 2 +- plugins/share/kdeconnect_share_config.desktop | 2 +- plugins/sms/kdeconnect_sms.json | 2 +- plugins/telephony/kdeconnect_telephony.json | 2 +- 16 files changed, 18 insertions(+), 15 deletions(-) diff --git a/data/kdeconnect-thunar.desktop b/data/kdeconnect-thunar.desktop index f26146679..4cf64f0a5 100644 --- a/data/kdeconnect-thunar.desktop +++ b/data/kdeconnect-thunar.desktop @@ -11,6 +11,7 @@ Name[cs]=Poslat přes KDE Connect Name[de]=Mit KDE-Connect versenden Name[es]=Enviar via KDE Connect Name[gl]=Enviar mediante KDE Connect +Name[it]=Invia tramite KDE Connect Name[nl]=Via KDE Connect versturen Name[nn]=Send via KDE Connect Name[pt]=Enviar pelo KDE Connect diff --git a/plugins/battery/kdeconnect_battery.json b/plugins/battery/kdeconnect_battery.json index 04406835c..30d5561e3 100644 --- a/plugins/battery/kdeconnect_battery.json +++ b/plugins/battery/kdeconnect_battery.json @@ -57,7 +57,7 @@ "Description[gl]": "Mostra o nivel de batería do teléfono canda o nivel de batería do computador.", "Description[hu]": "A telefon akkumulátorának megjelenítése a számítógépé mellett", "Description[id]": "Tampilkan baterai teleponmu di sebelah baterai komputermu", - "Description[it]": "Mostra la batteria del telefono accanto alla batteria del computer", + "Description[it]": "Mostra la batteria del telefono accanto a quella del computer", "Description[ko]": "컴퓨터 배터리와 함께 휴대폰 배터리 표시", "Description[nl]": "Uw telefoonbatterij naast uw computerbatterij tonen", "Description[nn]": "Vis telefonbatteriet ved sida av datamaskinbatteriet", diff --git a/plugins/contacts/kdeconnect_contacts.json b/plugins/contacts/kdeconnect_contacts.json index 09330f2e1..9f45c9d1b 100644 --- a/plugins/contacts/kdeconnect_contacts.json +++ b/plugins/contacts/kdeconnect_contacts.json @@ -39,7 +39,7 @@ "Description[fr]": "Synchroniser les contacts entre l'ordinateur et le périphérique connecté", "Description[gl]": "Sincronizar contactos entre o escritorio e o dispositivo conectado", "Description[id]": "Sinkronkan Kontak Antara Desktop dengan Perangkat Tersambung", - "Description[it]": "Sincronizza contatti tra il desktop e il dispositivo connesso", + "Description[it]": "Sincronizza i contatti tra il desktop e il dispositivo connesso", "Description[ko]": "데스크톱과 연결된 장치간 연락처 동기화", "Description[nl]": "Contactpersonen synchroniseren tussen het bureaublad en het verbonden apparaat", "Description[nn]": "Synkroniser kontaktar mellom skrivebordet og tilkopla eining", diff --git a/plugins/findthisdevice/kdeconnect_findthisdevice_config.desktop b/plugins/findthisdevice/kdeconnect_findthisdevice_config.desktop index a5eeaf6f7..a90a8e47f 100644 --- a/plugins/findthisdevice/kdeconnect_findthisdevice_config.desktop +++ b/plugins/findthisdevice/kdeconnect_findthisdevice_config.desktop @@ -16,7 +16,7 @@ Name[fi]=Etsi tämä laite -liitännäisen asetukset Name[fr]=Paramètres du module Trouver ce périphérique Name[gl]=Configuración do complemento de atopar o dispositivo Name[id]=Setelan plugin Temukan Perangkat Ini -Name[it]=Impostazioni estensione Trova questo dispositivo +Name[it]=Impostazioni dell'estensione Trova questo dispositivo Name[ko]=이 장치 플러그인 설정 찾기 Name[nl]=Plug-in-instellingen van dit apparaat zoeken Name[nn]=Innstillingar for einingsfinning diff --git a/plugins/pausemusic/kdeconnect_pausemusic.json b/plugins/pausemusic/kdeconnect_pausemusic.json index 520824ff7..06ad0208c 100644 --- a/plugins/pausemusic/kdeconnect_pausemusic.json +++ b/plugins/pausemusic/kdeconnect_pausemusic.json @@ -57,7 +57,7 @@ "Description[gl]": "Deter a reprodución de música ou vídeos durante as chamadas.", "Description[hu]": "A médialejátszás szüneteltetése telefonhívások közben", "Description[id]": "Jeda musik/video selagi panggilan telepon", - "Description[it]": "Sospendi musica/video durante una chiamata", + "Description[it]": "Sospende la musica e i video durante una chiamata", "Description[ko]": "휴대폰 통화 중 음악/동영상 일시 정지", "Description[nl]": "Muziek/video's pauzeren tijdens een telefoongesprek", "Description[nn]": "Set avspeling på pause ved oppringingar", @@ -97,7 +97,7 @@ "Name[gl]": "Deter a reprodución durante as chamadas.", "Name[hu]": "Médialejátszás felfüggesztése", "Name[id]": "Pause media during calls", - "Name[it]": "Sospendi i lettori multimediali durante le chiamate", + "Name[it]": "Sospendi i contenuti multimediali durante le chiamate", "Name[ko]": "통화 중 미디어 일시 정지", "Name[nl]": "Media pauzeren tijdens oproepen", "Name[nn]": "Set avspeling på pause ved oppringingar", diff --git a/plugins/pausemusic/kdeconnect_pausemusic_config.desktop b/plugins/pausemusic/kdeconnect_pausemusic_config.desktop index 2812e46f5..e60c9568d 100644 --- a/plugins/pausemusic/kdeconnect_pausemusic_config.desktop +++ b/plugins/pausemusic/kdeconnect_pausemusic_config.desktop @@ -25,7 +25,7 @@ Name[gl]=Configuración do complemento para deter a música Name[he]=הגדרות התוספת השהיית המוזיקה Name[hu]=Zene szüneteltetése bővítmény beállításai Name[id]=Setelan plugin Pause Music -Name[it]=Impostazioni estensione Sospendi musica +Name[it]=Impostazioni dell'estensione Sospendi musica Name[ko]=음악 일시 정지 플러그인 설정 Name[nl]=Plug-in-instellingen voor muziek pauzeren Name[nn]=Innstillingar for pausing av musikk diff --git a/plugins/remotecommands/kdeconnect_remotecommands.json b/plugins/remotecommands/kdeconnect_remotecommands.json index ff99304ef..68c66aab4 100644 --- a/plugins/remotecommands/kdeconnect_remotecommands.json +++ b/plugins/remotecommands/kdeconnect_remotecommands.json @@ -56,7 +56,7 @@ "Description[fr]": "Exécuter des commandes prédéfinies sur le périphérique distant", "Description[gl]": "Provocar ordes predefinidas no dispositivo remoto.", "Description[id]": "Pemicu perintah yang telah ditetapkan sebelumnya pada perangkat jarak jauh", - "Description[it]": "Innesca comandi predefiniti sul dispositivo remoto", + "Description[it]": "Innesca i comandi predefiniti sul dispositivo remoto", "Description[ko]": "원격 장치에 미리 정의한 트리거 명령", "Description[nl]": "Start commando's voorgedefinieerd op het apparaat op afstand", "Description[nn]": "Løys ut ferdigdefinerte kommandoar på eininga", diff --git a/plugins/remotesystemvolume/kdeconnect_remotesystemvolume.json b/plugins/remotesystemvolume/kdeconnect_remotesystemvolume.json index 32b10d086..ed904b110 100644 --- a/plugins/remotesystemvolume/kdeconnect_remotesystemvolume.json +++ b/plugins/remotesystemvolume/kdeconnect_remotesystemvolume.json @@ -30,6 +30,7 @@ "Description[ca]": "Controla el volum del dispositiu connectat", "Description[cs]": "Ovládejte hlasitost připojeného zařízení", "Description[gl]": "Controlar o volume do dispositivo conectado", + "Description[it]": "Controlla il volume del dispositivo connesso", "Description[nl]": "Bestuur het volume van het verbonden apparaat", "Description[nn]": "Juster lydstyrken til ekstern eining", "Description[pt]": "Controle o volume do dispositivo ligado", @@ -45,6 +46,7 @@ "Name[ca]": "Volum del sistema remot", "Name[cs]": "Hlasitost vzdáleného systému", "Name[gl]": "Volume de sistema remoto", + "Name[it]": "Volume del sistema remoto", "Name[nl]": "Systeemvolume op afstand", "Name[nn]": "Ekstern lydstyrke", "Name[pt]": "Volume do sistema remoto", diff --git a/plugins/runcommand/kdeconnect_runcommand.json b/plugins/runcommand/kdeconnect_runcommand.json index 9fbaaaa94..e62ed2f19 100644 --- a/plugins/runcommand/kdeconnect_runcommand.json +++ b/plugins/runcommand/kdeconnect_runcommand.json @@ -95,7 +95,7 @@ "Description[fr]": "Exécute des commandes console à distance", "Description[gl]": "Executar ordes de consola remotamente.", "Description[id]": "Eksekusikan perintah konsole secara jarak jauh", - "Description[it]": "Esegui da remoto comandi della console", + "Description[it]": "Esegue i comandi della console da remoto", "Description[ko]": "원격으로 콘솔 명령 실행", "Description[nl]": "Commando's in de terminal op afstand laten uitvoeren", "Description[nn]": "Køyr konsollkommandoar på eininga", diff --git a/plugins/runcommand/kdeconnect_runcommand_config.desktop b/plugins/runcommand/kdeconnect_runcommand_config.desktop index 4d1d66892..edc5e2d52 100644 --- a/plugins/runcommand/kdeconnect_runcommand_config.desktop +++ b/plugins/runcommand/kdeconnect_runcommand_config.desktop @@ -22,7 +22,7 @@ Name[fr]=Configuration du module externe d'exécution de commande Name[gl]=Configuración do complemento de orde de executar Name[he]=הגדרת התוסף הרץ פקודה Name[id]=Setelan plugin Run Command -Name[it]=Impostazioni estensione Esegui comando +Name[it]=Impostazioni dell'estensione Esegui comando Name[ko]=명령 실행 플러그인 설정 Name[nl]=Plug-in-instellingen van commando Uitvoeren Name[nn]=Innstillingar for kommandokøyring diff --git a/plugins/screensaver-inhibit/kdeconnect_screensaver_inhibit.json b/plugins/screensaver-inhibit/kdeconnect_screensaver_inhibit.json index 81ce20cd3..4c454f767 100644 --- a/plugins/screensaver-inhibit/kdeconnect_screensaver_inhibit.json +++ b/plugins/screensaver-inhibit/kdeconnect_screensaver_inhibit.json @@ -57,7 +57,7 @@ "Description[gl]": "Desactivar o salvapantallas mentres o dispositivo estea conectado.", "Description[hu]": "A képernyővédő kikapcsolása, ha az eszköz csatlakoztatva van", "Description[id]": "Hambat screensaver ketika perangkat telah tersambung", - "Description[it]": "Impedisci il salvaschermo quando il dispositivo è connesso", + "Description[it]": "Impedisce il salvaschermo quando il dispositivo è connesso", "Description[ko]": "장치가 연결되었을 때 화면 보호기 실행 중지", "Description[nl]": "Houdt de schermbeveiliging tegen wanneer het apparaat is verbonden", "Description[nn]": "Hindra pauseskjermen i å starta når eininga er kopla til", diff --git a/plugins/sftp/kdeconnect_sftp.json b/plugins/sftp/kdeconnect_sftp.json index 26fc503d0..6a2d5467b 100644 --- a/plugins/sftp/kdeconnect_sftp.json +++ b/plugins/sftp/kdeconnect_sftp.json @@ -97,7 +97,7 @@ "Name[gl]": "Navegador do sistema de ficheiros remoto.", "Name[hu]": "Távoli fájlrendszer-böngésző", "Name[id]": "Remote filesystem browser", - "Name[it]": "Navigazione del filesystem remoto", + "Name[it]": "Sfoglia il filesystem remoto", "Name[ko]": "원격 파일 시스템 탐색기", "Name[nl]": "Bestandssysteembrowser op afstand", "Name[nn]": "Bla gjennom eksternt filsystem", diff --git a/plugins/share/kdeconnect_share.json b/plugins/share/kdeconnect_share.json index 0c5d6f85d..1a23ad6a7 100644 --- a/plugins/share/kdeconnect_share.json +++ b/plugins/share/kdeconnect_share.json @@ -57,7 +57,7 @@ "Description[gl]": "Comparta e reciba con facilidade ficheiros, enderezos URL ou texto simple.", "Description[hu]": "Fájlok, URL-ek és szöveg fogadása és küldése", "Description[id]": "Terima dan kirim file, URL atau teks plain secara mudah", - "Description[it]": "Ricevi e invia facilmente file, URL o testo semplice", + "Description[it]": "Riceve e invia facilmente file, URL o testo semplice", "Description[ko]": "파일, URL, 일반 텍스트 공유하고 받기", "Description[nl]": "Bestanden, URL's of platte tekst gemakkelijk ontvangen en verzenden", "Description[nn]": "Ta imot og send filer, nettadresser og tekst på ein enkel måte", diff --git a/plugins/share/kdeconnect_share_config.desktop b/plugins/share/kdeconnect_share_config.desktop index 9aede2b6f..040f1ae66 100644 --- a/plugins/share/kdeconnect_share_config.desktop +++ b/plugins/share/kdeconnect_share_config.desktop @@ -25,7 +25,7 @@ Name[gl]=Configuración do complemento de compartir Name[he]=שתף את הגדרות התוספים Name[hu]=Megosztás bővítmény beállításai Name[id]=Setelan plugin Share -Name[it]=Impostazioni estensione Condivisione +Name[it]=Impostazioni dell'estensione Condivisione Name[ko]=공유 플러그인 설정 Name[nl]=Plug-in-instellingen van delen Name[nn]=Innstillingar for deling diff --git a/plugins/sms/kdeconnect_sms.json b/plugins/sms/kdeconnect_sms.json index d5fe80c1b..99f0127a1 100644 --- a/plugins/sms/kdeconnect_sms.json +++ b/plugins/sms/kdeconnect_sms.json @@ -36,7 +36,7 @@ "Description[es]": "Enviar y recibir SMS", "Description[fr]": "Envoyer et recevoir des SMS", "Description[gl]": "Enviar e recibir SMS", - "Description[it]": "Invia e ricevi SMS", + "Description[it]": "Invia e riceve SMS", "Description[nl]": "SMS verzenden en ontvangen", "Description[nn]": "Send og ta imot SMS-ar", "Description[pt]": "Enviar e receber SMS's", diff --git a/plugins/telephony/kdeconnect_telephony.json b/plugins/telephony/kdeconnect_telephony.json index 7cef1a5c3..c867787b2 100644 --- a/plugins/telephony/kdeconnect_telephony.json +++ b/plugins/telephony/kdeconnect_telephony.json @@ -56,7 +56,7 @@ "Description[fr]": "Affichez les notifications pour les appels et les SMS", "Description[gl]": "Mostrar notificacións de chamadas e mensaxes SMS.", "Description[id]": "Tampilkan notifikasi untuk panggilan dan SMS", - "Description[it]": "Mostra notifiche per le chiamate e per gli SMS", + "Description[it]": "Mostra notifiche per chiamate ed SMS", "Description[ko]": "통화와 SMS 알림 표시", "Description[nl]": "Meldingen tonen van oproepen en SMSjes", "Description[nn]": "Vis varslingar for oppringingar og SMS",