From dbf8b07cab985aa4f3689832623c454669e0352d Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Fri, 23 Sep 2022 01:43:42 +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" --- plugins/battery/kdeconnect_battery.json | 1 + plugins/connectivity-report/kdeconnect_connectivity_report.json | 1 + plugins/contacts/kdeconnect_contacts.json | 1 + plugins/findmyphone/kdeconnect_findmyphone.json | 1 + plugins/findthisdevice/kdeconnect_findthisdevice.json | 1 + plugins/mpriscontrol/kdeconnect_mpriscontrol.json | 1 + plugins/notifications/kdeconnect_notifications.json | 1 + plugins/pausemusic/kdeconnect_pausemusic.json | 1 + plugins/remotecommands/kdeconnect_remotecommands.json | 1 + plugins/remotekeyboard/kdeconnect_remotekeyboard.json | 1 + plugins/telephony/kdeconnect_telephony.json | 1 + 11 files changed, 11 insertions(+) diff --git a/plugins/battery/kdeconnect_battery.json b/plugins/battery/kdeconnect_battery.json index 2ccb84a70..2c8881c3d 100644 --- a/plugins/battery/kdeconnect_battery.json +++ b/plugins/battery/kdeconnect_battery.json @@ -70,6 +70,7 @@ "Description[hu]": "A telefon akkumulátorának megjelenítése a számítógépé mellett", "Description[ia]": "Monstra batteria de tu telephono proxime a tu batteria de computator", "Description[id]": "Tampilkan baterai teleponmu di sebelah baterai komputermu", + "Description[is]": "Birtu ástand símarafhlöðunnar við hlið rafhlöðu tölvunnar", "Description[it]": "Mostra la batteria del telefono accanto a quella del computer", "Description[ja]": "コンピュータのバッテリの次に端末のバッテリーを表示", "Description[ko]": "컴퓨터 배터리와 휴대폰 배터리 같이 표시", diff --git a/plugins/connectivity-report/kdeconnect_connectivity_report.json b/plugins/connectivity-report/kdeconnect_connectivity_report.json index 961883c9b..9b3cf54da 100644 --- a/plugins/connectivity-report/kdeconnect_connectivity_report.json +++ b/plugins/connectivity-report/kdeconnect_connectivity_report.json @@ -58,6 +58,7 @@ "Description[hu]": "A telefon hálózati jelerősségének megjelenítése", "Description[ia]": "Monstra fortia de signal de rete de tu telephono", "Description[id]": "Tampilkan kekuatan sinyal teleponmu", + "Description[is]": "Sýndu styrk merkis fyrir netsamband símans", "Description[it]": "Mostra la potenza del segnale di rete del tuo telefono", "Description[ko]": "내 휴대폰의 네트워크 신호 세기 표시", "Description[lt]": "Rodyti jūsų telefono tinklo signalo stiprumą", diff --git a/plugins/contacts/kdeconnect_contacts.json b/plugins/contacts/kdeconnect_contacts.json index 9ba7a37f0..dbb6d2a11 100644 --- a/plugins/contacts/kdeconnect_contacts.json +++ b/plugins/contacts/kdeconnect_contacts.json @@ -56,6 +56,7 @@ "Description[es]": "Sincronizar contactos desde el dispositivo conectado al equipo de escritorio", "Description[eu]": "Sinkronizatu kontaktuak konektatutako gailutik mahaigainera", "Description[fr]": "Synchroniser les contacts du périphérique connecté avec ceux du bureau", + "Description[is]": "Samstilltu tengiliði af tengda tækinu yfir á tölvuna", "Description[it]": "Sincronizza i contatti dal dispositivo connesso al desktop", "Description[ko]": "연결된 장치에서 데스크톱으로 연락처 동기화", "Description[lt]": "Sinchronizuoti adresatus iš prijungto įrenginio į darbalaukį", diff --git a/plugins/findmyphone/kdeconnect_findmyphone.json b/plugins/findmyphone/kdeconnect_findmyphone.json index dfc3c3d2c..eaf606746 100644 --- a/plugins/findmyphone/kdeconnect_findmyphone.json +++ b/plugins/findmyphone/kdeconnect_findmyphone.json @@ -116,6 +116,7 @@ "Description[hu]": "Elveszett telefon keresése és riasztóhang lejátszása", "Description[ia]": "Trova tu telephono perdite per facer lo sonar con un sono de alarma", "Description[id]": "Temukan teleponmu yang ketlingsut dengan membuatnya membunyikan suara alarm", + "Description[is]": "Finndu týnda símann þinn með því að láta hann spila aðvörunarhljóð", "Description[it]": "Trova il tuo telefono smarrito facendogli suonare un allarme sonoro", "Description[ja]": "アラーム音を鳴らしてあなたがなくした端末を探します", "Description[ko]": "알람 소리를 울려서 잃어버린 휴대폰 찾기", diff --git a/plugins/findthisdevice/kdeconnect_findthisdevice.json b/plugins/findthisdevice/kdeconnect_findthisdevice.json index 36117b583..bb5a43da5 100644 --- a/plugins/findthisdevice/kdeconnect_findthisdevice.json +++ b/plugins/findthisdevice/kdeconnect_findthisdevice.json @@ -65,6 +65,7 @@ "Description[hu]": "Eszköz keresése és riasztóhang lejátszása azon", "Description[ia]": "Trova iste dispositivo per facer lo sonar con un sono de alarma", "Description[id]": "Temukan peranti ini dengan membuatnya membunyikan suara alarm", + "Description[is]": "Finndu þetta tæki með því að láta það spila aðvörunarhljóð", "Description[it]": "Trova questo dispositivo facendogli suonare un allarme sonoro", "Description[ja]": "アラーム音を鳴らしてあなたのデバイスを探します", "Description[ko]": "알람 소리를 울려서 이 장치 찾기", diff --git a/plugins/mpriscontrol/kdeconnect_mpriscontrol.json b/plugins/mpriscontrol/kdeconnect_mpriscontrol.json index 41f2f4d24..0fcf608a9 100644 --- a/plugins/mpriscontrol/kdeconnect_mpriscontrol.json +++ b/plugins/mpriscontrol/kdeconnect_mpriscontrol.json @@ -70,6 +70,7 @@ "Description[hu]": "A zene- és videolejátszás irányítása távolról", "Description[ia]": "Controlo remote de tu musica e videos", "Description[id]": "Kendalikan jarak jauh musik dan videomu", + "Description[is]": "Fjarstýrðu tónlistinni þinni og myndskeiðum", "Description[it]": "Controlla da remoto la tua musica e i video", "Description[ja]": "あなたの音楽や動画を外部からコントロール", "Description[ko]": "음악과 동영상 원격 제어", diff --git a/plugins/notifications/kdeconnect_notifications.json b/plugins/notifications/kdeconnect_notifications.json index 17a87a5ab..d11cbbbd3 100644 --- a/plugins/notifications/kdeconnect_notifications.json +++ b/plugins/notifications/kdeconnect_notifications.json @@ -70,6 +70,7 @@ "Description[hu]": "Az eszköz értesítéseinek megjelenítése a számítógépen és azok szinkronizációja", "Description[ia]": "Monstra notificationes de dispositivo sur iste computator e manene los in synchro", "Description[id]": "Tampilkan notifikasi peranti pada komputer ini dan menjaganya tetap tersinkron", + "Description[is]": "Birtu tilkynningar tækisins á þessari tölvu og haltu þeim samstilltum", "Description[it]": "Mostra le notifiche del telefono sul tuo computer e tienile sincronizzate", "Description[ko]": "휴대폰 알림을 컴퓨터에 표시하고 동기화하기", "Description[lt]": "Rodyti įrenginio pranešimus šiame kompiuteryje ir išlaikyti juos sinchronizuotus", diff --git a/plugins/pausemusic/kdeconnect_pausemusic.json b/plugins/pausemusic/kdeconnect_pausemusic.json index baa2408c5..017d3d912 100644 --- a/plugins/pausemusic/kdeconnect_pausemusic.json +++ b/plugins/pausemusic/kdeconnect_pausemusic.json @@ -70,6 +70,7 @@ "Description[hu]": "A médialejátszás szüneteltetése telefonhívások közben", "Description[ia]": "Pausa musica/videos durante un telephonata", "Description[id]": "Jeda musik/video selagi panggilan telepon", + "Description[is]": "Gerðu hlé á tónlist/myndskeiðum á meðan símtali stendur", "Description[it]": "Sospende la musica e i video durante una chiamata", "Description[ko]": "휴대폰 통화 중 음악/동영상 일시 정지", "Description[lt]": "Pristabdyti muziką/vaizdo įrašus skambučių metu", diff --git a/plugins/remotecommands/kdeconnect_remotecommands.json b/plugins/remotecommands/kdeconnect_remotecommands.json index e545d6dad..a857b9337 100644 --- a/plugins/remotecommands/kdeconnect_remotecommands.json +++ b/plugins/remotecommands/kdeconnect_remotecommands.json @@ -116,6 +116,7 @@ "Name[hu]": "Távoli parancsok szolgáltatás", "Name[ia]": "Commandos remote de hospite", "Name[id]": "Host remote commands", + "Name[is]": "Skipanir á fjartengdri vél", "Name[it]": "Comandi remoti host", "Name[ko]": "호스트 원격 명령", "Name[lt]": "Vykdyti nuotolines komandas", diff --git a/plugins/remotekeyboard/kdeconnect_remotekeyboard.json b/plugins/remotekeyboard/kdeconnect_remotekeyboard.json index ca4d02030..984aa63f2 100644 --- a/plugins/remotekeyboard/kdeconnect_remotekeyboard.json +++ b/plugins/remotekeyboard/kdeconnect_remotekeyboard.json @@ -118,6 +118,7 @@ "Name[hu]": "Távoli billentyűzet az asztaláról", "Name[ia]": "Claviero remote ab le scriptorio", "Name[id]": "Remote keyboard from the desktop", + "Name[is]": "Fjartengt lyklaborð af vinnutölvunni", "Name[it]": "Tastiera remota dal desktop", "Name[ja]": "デスクトップからのリモートキーボード", "Name[ko]": "데스크톱에서 제어하는 원격 키보드", diff --git a/plugins/telephony/kdeconnect_telephony.json b/plugins/telephony/kdeconnect_telephony.json index 1efafe9ab..af0c5d475 100644 --- a/plugins/telephony/kdeconnect_telephony.json +++ b/plugins/telephony/kdeconnect_telephony.json @@ -113,6 +113,7 @@ "Name[hu]": "Telefonintegráció", "Name[ia]": "Integration de telephonia", "Name[id]": "Telephony integration", + "Name[is]": "Samþætting símkerfis", "Name[it]": "Integrazione telefonica", "Name[ja]": "電話の統合", "Name[ko]": "전화 통합",