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"
2022-08-24 01:49:19 +00:00 · 2022-08-24 01:49:19 +00:00 · 3819d96ee1
commit 3819d96ee1
parent 46b5d6cdbc
11 changed files with 18 additions and 0 deletions
--- a/app/org.kde.kdeconnect.app.desktop
+++ b/app/org.kde.kdeconnect.app.desktop
@ -22,6 +22,7 @@ Name[he]=KDE Connect
 Name[hu]=KDE Connect
 Name[ia]=KDE Connect
 Name[id]=KDE Connect
 Name[is]=KDE Connect
 Name[it]=KDE Connect
 Name[ja]=KDE Connect
 Name[ko]=KDE Connect
@ -69,6 +70,7 @@ GenericName[he]=סנכרון התקן
 GenericName[hu]=Eszközszinkronizáció
 GenericName[ia]=Synchronisation de dispositivo
 GenericName[id]=Sinkronisasi Perangkat
 GenericName[is]=Samstilling tækja
 GenericName[it]=Sincronizzazione dispositivo
 GenericName[ja]=デバイス同期
 GenericName[ko]=장치 동기화
--- a/daemon/org.kde.kdeconnect.daemon.desktop.cmake
+++ b/daemon/org.kde.kdeconnect.daemon.desktop.cmake
@ -31,6 +31,7 @@ Name[he]=KDE Connect
 Name[hu]=KDE Connect
 Name[ia]=KDE Connect
 Name[id]=KDE Connect
 Name[is]=KDE Connect
 Name[it]=KDE Connect
 Name[ja]=KDE Connect
 Name[ko]=KDE Connect
--- a/data/kdeconnect-dde.desktop
+++ b/data/kdeconnect-dde.desktop
@ -24,6 +24,7 @@ Name[gl]=Enviar por KDE Connect
 Name[hu]=Küldés a KDE Connecttel
 Name[ia]=Invia via KDE Connect
 Name[id]=Kirim via KDE Connect
 Name[is]=Senda með KDE Connect
 Name[it]=Invia tramite KDE Connect
 Name[ja]=KDE Connect を経由して送信
 Name[ko]=KDE Connect로 통해 보내기
--- a/data/kdeconnect-thunar.desktop
+++ b/data/kdeconnect-thunar.desktop
@ -24,6 +24,7 @@ Name[gl]=Enviar por KDE Connect
 Name[hu]=Küldés a KDE Connecttel
 Name[ia]=Invia via KDE Connect
 Name[id]=Kirim via KDE Connect
 Name[is]=Senda með KDE Connect
 Name[it]=Invia tramite KDE Connect
 Name[ja]=KDE Connect を経由して送信
 Name[ko]=KDE Connect로 통해 보내기
--- a/kcm/kcm_kdeconnect.desktop
+++ b/kcm/kcm_kdeconnect.desktop
@ -33,6 +33,7 @@ Name[he]=KDE Connect
 Name[hu]=KDE Connect
 Name[ia]=KDE Connect
 Name[id]=KDE Connect
 Name[is]=KDE Connect
 Name[it]=KDE Connect
 Name[ja]=KDE Connect
 Name[ko]=KDE Connect
--- a/plasmoid/package/metadata.desktop
+++ b/plasmoid/package/metadata.desktop
@ -22,6 +22,7 @@ Name[he]=KDE Connect
 Name[hu]=KDE Connect
 Name[ia]=KDE Connect
 Name[id]=KDE Connect
 Name[is]=KDE Connect
 Name[it]=KDE Connect
 Name[ja]=KDE Connect
 Name[ko]=KDE Connect
--- a/plugins/kdeconnect.notifyrc
+++ b/plugins/kdeconnect.notifyrc
@ -23,6 +23,7 @@ Name[he]=KDE Connect
 Name[hu]=KDE Connect
 Name[ia]=KDE Connect
 Name[id]=KDE Connect
 Name[is]=KDE Connect
 Name[it]=KDE Connect
 Name[ja]=KDE Connect
 Name[ko]=KDE Connect
@ -119,6 +120,7 @@ Name[he]=בקשת התאמה
 Name[hu]=Párosítási kérés
 Name[ia]=Requesta de association
 Name[id]=Minta Sandingkan
 Name[is]=Beiðni um pörun
 Name[it]=Richiesta di associazione
 Name[ja]=ペアリング要求
 Name[ko]=페어링 요청
@ -165,6 +167,7 @@ Comment[he]=התקבלה בקשת התאמה מהתקן
 Comment[hu]=Párosítási kérés érkezett egy eszköztől
 Comment[ia]=Requesta de association recipite ex un dispositivo
 Comment[id]=Diterima permintaan sandingan dari sebuah perangkat
 Comment[is]=Tók við beiðni um pörun frá tæki
 Comment[it]=Richiesta di associazione ricevuta da un dispositivo
 Comment[ja]=デバイスからのペアリング要求を受信しました
 Comment[ko]=장치에서 수신된 페어링 요청
@ -215,6 +218,7 @@ Name[he]=שיחה נכנסת
 Name[hu]=Bejövő hívás
 Name[ia]=Appello in arrivata
 Name[id]=Panggilan Masuk
 Name[is]=Innhringing
 Name[it]=Chiamata in ingresso
 Name[ja]=着信
 Name[ko]=수신 전화
@ -311,6 +315,7 @@ Name[he]=שיחה שלא נענתה
 Name[hu]=Nem fogadott hívás
 Name[ia]=Appello perdite
 Name[id]=Panggilan Tidak Terjawab
 Name[is]=Ósvarað símtal
 Name[it]=Chiamata persa
 Name[ja]=不在着信
 Name[ko]=부재중 전화
--- a/runners/findmyphone/plasma-runner-kdeconnect-findmyphone.desktop
+++ b/runners/findmyphone/plasma-runner-kdeconnect-findmyphone.desktop
@ -19,6 +19,7 @@ Name[gl]=Atopar o meu dispositivo
 Name[hu]= Eszköz keresése
 Name[ia]=Trova mi dispositivo
 Name[id]=Temukan perangkatku
 Name[is]= Finna tækið mitt
 Name[it]= Trova il mio dispositivo
 Name[ja]=デバイスを探す
 Name[ko]= 내 장치 찾기
@ -59,6 +60,7 @@ Comment[gl]=Facer soar os dispositivos conectados
 Comment[hu]=Csatlakoztatott eszközök csengetése
 Comment[ia]=Sona dispositivos connectite
 Comment[id]=Deringkan perangkat yang terkoneksi
 Comment[is]=Hringja í tengd tæki
 Comment[it]=Fa squillare i dispositivi connessi
 Comment[ja]=接続されたデバイスを鳴らす
 Comment[ko]=연결된 장치 벨소리 울리기
--- a/runners/remotecommands/plasma-runner-kdeconnect-remotecommands.desktop
+++ b/runners/remotecommands/plasma-runner-kdeconnect-remotecommands.desktop
@ -19,6 +19,7 @@ Name[gl]=Executar unha orde
 Name[hu]=Parancs futtatása
 Name[ia]=Executa Commando
 Name[id]=Jalankan perintah
 Name[is]=Keyra skipun
 Name[it]=Esegui comando
 Name[ja]=コマンドを実行
 Name[ko]=명령 실행
--- a/settings/org.kde.kdeconnect-settings.desktop
+++ b/settings/org.kde.kdeconnect-settings.desktop
@ -25,6 +25,7 @@ Name[he]=הגדרות KDE Connect
 Name[hu]=A KDE Connect beállításai
 Name[ia]=Preferentias de KDE Connect
 Name[id]=Pengaturan KDE Connect
 Name[is]=Stillingar KDE Connect
 Name[it]=Impostazioni di KDE Connect
 Name[ja]=KDE Connect の設定
 Name[ko]=KDE Connect 설정
--- a/smsapp/org.kde.kdeconnect.sms.desktop
+++ b/smsapp/org.kde.kdeconnect.sms.desktop
@ -61,6 +61,7 @@ GenericName[gl]=SMS
 GenericName[hu]=SMS
 GenericName[ia]=SMS
 GenericName[id]=SMS
 GenericName[is]=SMS
 GenericName[it]=SMS
 GenericName[ja]=SMS
 GenericName[ko]=SMS
@ -102,6 +103,7 @@ Comment[gl]=Mensaxaría de texto.
 Comment[hu]=Szöveges üzenetküldés
 Comment[ia]=Messageria de texto
 Comment[id]=Perpesanan Teks
 Comment[is]=Textaskilaboð
 Comment[it]=Messaggi di testo
 Comment[ja]=テキストメッセージング
 Comment[ko]=문자 메시지