From 2cff3fb405bf24b58c9686c886fb6fc704b2d8c7 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 8 May 2019 08:49:45 +0200 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" --- daemon/kdeconnect.desktop | 2 +- daemon/kdeconnectd.desktop.cmake | 2 +- .../kdeconnectsendfile.desktop | 1 + plugins/kdeconnect.notifyrc | 24 +++++++++---------- plugins/kdeconnect_plugin.desktop | 2 +- 5 files changed, 16 insertions(+), 15 deletions(-) diff --git a/daemon/kdeconnect.desktop b/daemon/kdeconnect.desktop index ffe896785..738c049be 100644 --- a/daemon/kdeconnect.desktop +++ b/daemon/kdeconnect.desktop @@ -71,7 +71,7 @@ Comment[he]=חבר את KDE לפלאפון החכם שלך Comment[hu]=A KDE csatlakoztatása az okostelefonnal Comment[id]=Koneksikan KDE dengan smartphone-mu Comment[it]=Connette KDE al tuo smartphone -Comment[ko]=KDE와 스마트폰 연결 +Comment[ko]=내 스마트폰과 KDE 연결 Comment[nl]=KDE met uw smartphone verbinden Comment[nn]=Kopla KDE til smarttelefonen din Comment[pl]=Podłącz swój smartfon do KDE diff --git a/daemon/kdeconnectd.desktop.cmake b/daemon/kdeconnectd.desktop.cmake index 862d2fff8..885f75348 100644 --- a/daemon/kdeconnectd.desktop.cmake +++ b/daemon/kdeconnectd.desktop.cmake @@ -27,7 +27,7 @@ Name[he]=דמון KDEConnect Name[hu]=KDEConnect szolgáltatás Name[id]=Daemon KDEConnect Name[it]=Demone KDE Connect -Name[ko]=KDE Connect 데몬 +Name[ko]=KDE 연결 데몬 Name[nl]=KDEConnect-daemon Name[nn]=KDEConnect-teneste Name[pl]=Usługa KDEConnect diff --git a/fileitemactionplugin/kdeconnectsendfile.desktop b/fileitemactionplugin/kdeconnectsendfile.desktop index 51fdf3ec0..120107a08 100644 --- a/fileitemactionplugin/kdeconnectsendfile.desktop +++ b/fileitemactionplugin/kdeconnectsendfile.desktop @@ -10,6 +10,7 @@ Name[fi]=Lähetä tiedosto KDE Connect -palvelulla Name[fr]=Envoyer un fichier via le service KDE Connect Name[gl]=Enviar o ficheiro mediante o servizo de KDE Connect Name[it]=Invia il file tramite il servizio KDE Connect +Name[ko]=KDE Connect 서비스로 파일 보내기 Name[nl]=Bestand via KDE Connect-service versturen Name[nn]=Send fil med KDE Connect-tenesta Name[pt]=Enviar o ficheiro pelo serviços KDE Connect diff --git a/plugins/kdeconnect.notifyrc b/plugins/kdeconnect.notifyrc index 26336fa5b..ec598d011 100644 --- a/plugins/kdeconnect.notifyrc +++ b/plugins/kdeconnect.notifyrc @@ -61,7 +61,7 @@ Comment[he]=התראות מההתקן שלך Comment[hu]=Az eszközökről származó értesítések Comment[id]=Notifikasi dari perangkatmu Comment[it]=Notifiche dai tuoi dispositivi -Comment[ko]=장치에 표시된 알림 +Comment[ko]=장치에서 알림 Comment[nl]=Meldingen van uw apparaten Comment[nn]=Varslingar frå einingane dine Comment[pl]=Powiadomienia z urządzeń @@ -103,7 +103,7 @@ Name[he]=בקשת התאמה Name[hu]=Párosítási kérés Name[id]=Minta Sandingkan Name[it]=Richiesta di associazione -Name[ko]=연결 요청 +Name[ko]=페어링 요청 Name[nl]=Verzoek om een paar te maken Name[nn]=Paringsførespurnad Name[pl]=Żądanie parowania @@ -139,7 +139,7 @@ Comment[gl]=Recibiuse unha solicitude de emparellamento dun dispositivo. Comment[he]=התקבלה בקשת התאמה מהתקן Comment[id]=Diterima permintaan sandingan dari sebuah perangkat Comment[it]=Richiesta di associazione ricevuta da un dispositivo -Comment[ko]=장치에서 연결 요청을 받음 +Comment[ko]=장치에서 수신된 페어링 요청 Comment[nl]=Verzoek om een paar te maken ontvangen van apparaten Comment[nn]=Fekk paringsførespurnad frå eining Comment[pl]=Otrzymano żądanie parowania z urządzenia @@ -220,7 +220,7 @@ Comment[he]=מישהו מתקשר אילך Comment[hu]=Valaki hívja önt Comment[id]=Seseorang memanggilmu Comment[it]=Chiamata in arrivo -Comment[ko]=누군가가 전화를 걸었음 +Comment[ko]=누군가 전화를 걸었습니다 Comment[nl]=Iemand belt u op Comment[nn]=Nokon ringjer deg Comment[pl]=Ktoś do ciebie dzwoni @@ -262,7 +262,7 @@ Name[he]=שיחה שלא נענתה Name[hu]=Nem fogadott hívás Name[id]=Panggilan Tidak Terjawab Name[it]=Chiamata persa -Name[ko]=부재 중 전화 +Name[ko]=부재중 전화 Name[nl]=Gemiste oproep Name[nn]=Tapt oppringing Name[pl]=Połączenie nieodebrane @@ -301,7 +301,7 @@ Comment[he]=יש לך שיחה שלא נענטה Comment[hu]=Nem fogadott hívása van Comment[id]=Kamu memiliki panggilan tak terjawab Comment[it]=Hai una chiamata persa -Comment[ko]=부재 중 전화가 있음 +Comment[ko]=부재중 전화가 있습니다 Comment[nl]=U hebt een gemiste oproep Comment[nn]=Du har ei tapt oppringing Comment[pl]=Nie odebrałeś połączenia @@ -343,7 +343,7 @@ Name[he]=התקבלה הודעת SMS Name[hu]=SMS érkezett Name[id]=Diterima SMS Name[it]=SMS ricevuto -Name[ko]=SMS 받음 +Name[ko]=SMS 수신 Name[nl]=SMS ontvangen Name[nn]=SMS motteken Name[pl]=Otrzymano SMSa @@ -382,7 +382,7 @@ Comment[he]=מישהו שלח לך SMS Comment[hu]=Valaki SMS-t küldött önnek Comment[id]=Seseorang memangirimmu sebuah SMS Comment[it]=Hai ricevuto un SMS -Comment[ko]=누군가가 문자 메시지를 보냄 +Comment[ko]=누군가 SMS를 보냈습니다 Comment[nl]=Iemand heeft u een SMS gestuurd Comment[nn]=Nokon sende deg ein SMS Comment[pl]=Ktoś do ciebie wysłał SMSa @@ -463,7 +463,7 @@ Comment[he]=הבטריה שלך הולכת להגמר Comment[hu]=Az akkumulátora feszültsége alacsony Comment[id]=Bateraimu dalam keadaan lemah Comment[it]=La batteria è al livello basso -Comment[ko]=배터리가 부족함 +Comment[ko]=배터리가 부족한 상태입니다 Comment[nl]=Uw batterij is bijna leeg Comment[nn]=Det er lite batteri att Comment[pl]=Twoja bateria ma niski poziom naładowania @@ -505,7 +505,7 @@ Name[he]=התקבל פינג Name[hu]=Ping érkezett Name[id]=Diterima Ping Name[it]=Ping ricevuto -Name[ko]=핑 받음 +Name[ko]=핑 수신 Name[nl]=Ping ontvangen Name[nn]=Pingsignal motteke Name[pl]=Otrzymano ping @@ -544,7 +544,7 @@ Comment[he]=התקבל פינג Comment[hu]=Ping érkezett Comment[id]=Diterima ping Comment[it]=Hai ricevuto un ping -Comment[ko]=핑 받음 +Comment[ko]=핑 수신 Comment[nl]=Ping ontvangen Comment[nn]=Pingsignal motteke Comment[pl]=Otrzymano ping @@ -625,7 +625,7 @@ Comment[he]=התראה התקבלה Comment[hu]=Értesítés érkezett Comment[id]=Diterima notifikasi Comment[it]=Hai ricevuto una notifica -Comment[ko]=알림 받음 +Comment[ko]=수신된 알림 Comment[nl]=Melding ontvangen Comment[nn]=Varsling motteken Comment[pl]=Otrzymano powiadomienie diff --git a/plugins/kdeconnect_plugin.desktop b/plugins/kdeconnect_plugin.desktop index cba0aba6e..709310735 100644 --- a/plugins/kdeconnect_plugin.desktop +++ b/plugins/kdeconnect_plugin.desktop @@ -23,7 +23,7 @@ Name[he]=תוספי KDEConnect Name[hu]=KDEConnect bővítmény Name[id]=Plugin KDEConnect Name[it]=Estensione KDEConnect -Name[ko]=KDEConnect 플러그인 +Name[ko]=KDE Connect 플러그인 Name[nl]=Plug-in van KDEConnect Name[nn]=KDEConnect-tillegg Name[pl]=Wtyczka KDEConnect