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"
This commit is contained in:
l10n daemon script 2022-11-17 01:47:30 +00:00
parent 9c6f0b4a06
commit e712748881
40 changed files with 59 additions and 0 deletions

View file

@ -21,6 +21,7 @@ Name[he]=KDE Connect
Name[hu]=KDE Connect
Name[ia]=KDE Connect
Name[id]=KDE Connect
Name[ie]=KDE Connect
Name[is]=KDE Connect
Name[it]=KDE Connect
Name[ja]=KDE Connect
@ -69,6 +70,7 @@ GenericName[he]=סנכרון התקן
GenericName[hu]=Eszközszinkronizáció
GenericName[ia]=Synchronisation de dispositivo
GenericName[id]=Sinkronisasi Peranti
GenericName[ie]=Sincronisation del aparate
GenericName[is]=Samstilling tækja
GenericName[it]=Sincronizzazione dispositivo
GenericName[ja]=

View file

@ -30,6 +30,7 @@ Name[he]=KDE Connect
Name[hu]=KDE Connect
Name[ia]=KDE Connect
Name[id]=KDE Connect
Name[ie]=KDE Connect
Name[is]=KDE Connect
Name[it]=KDE Connect
Name[ja]=KDE Connect

View file

@ -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[ie]=Inviar per KDE Connect
Name[is]=Senda með KDE Connect
Name[it]=Invia tramite KDE Connect
Name[ja]=KDE Connect

View file

@ -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[ie]=Inviar per KDE Connect
Name[is]=Senda með KDE Connect
Name[it]=Invia tramite KDE Connect
Name[ja]=KDE Connect

View file

@ -65,6 +65,7 @@
"Name[hu]": "Fájl küldése a KDE Connecttel",
"Name[ia]": "Invia file via KDE Connect",
"Name[id]": "Send file via KDE Connect",
"Name[ie]": "Inviar un file per KDE Connect",
"Name[is]": "Sendu skrá með KDE Connect",
"Name[it]": "Invia file tramite KDE Connect",
"Name[ka]": "KDE Connect-ით ფაილების გაგზავნა",

View file

@ -32,6 +32,7 @@ Name[he]=KDE Connect
Name[hu]=KDE Connect
Name[ia]=KDE Connect
Name[id]=KDE Connect
Name[ie]=KDE Connect
Name[is]=KDE Connect
Name[it]=KDE Connect
Name[ja]=KDE Connect

View file

@ -21,6 +21,7 @@ Name[he]=KDE Connect
Name[hu]=KDE Connect
Name[ia]=KDE Connect
Name[id]=KDE Connect
Name[ie]=KDE Connect
Name[is]=KDE Connect
Name[it]=KDE Connect
Name[ja]=KDE Connect

View file

@ -23,6 +23,7 @@
"Name[hu]": "Albert Vaca",
"Name[ia]": "Albert Vaca",
"Name[id]": "Albert Vaca",
"Name[ie]": "Albert Vaca",
"Name[is]": "Albert Vaca",
"Name[it]": "Albert Vaca",
"Name[ko]": "Albert Vaca",
@ -116,6 +117,7 @@
"Name[hu]": "Akkufigyelő",
"Name[ia]": "Controlator de batteria",
"Name[id]": "Battery monitor",
"Name[ie]": "Monitor del batterie",
"Name[is]": "Rafhlöðuvöktun",
"Name[it]": "Monitor della batteria",
"Name[ja]": "バッテリーモニター",

View file

@ -22,6 +22,7 @@
"Name[hu]": "Aditya Mehra",
"Name[ia]": "Aditya Mehra",
"Name[id]": "Aditya Mehra",
"Name[ie]": "Aditya Mehra",
"Name[is]": "Aditya Mehra",
"Name[it]": "Aditya Mehra",
"Name[ko]": "Aditya Mehra",

View file

@ -23,6 +23,7 @@
"Name[hu]": "Albert Vaca",
"Name[ia]": "Albert Vaca",
"Name[id]": "Albert Vaca",
"Name[ie]": "Albert Vaca",
"Name[is]": "Albert Vaca",
"Name[it]": "Albert Vaca",
"Name[ko]": "Albert Vaca",
@ -116,6 +117,7 @@
"Name[hu]": "Vágólap",
"Name[ia]": "Area de transferentia",
"Name[id]": "Clipboard",
"Name[ie]": "Paperiere",
"Name[is]": "Klippispjald",
"Name[it]": "Appunti",
"Name[ja]": "クリップボード",

View file

@ -20,6 +20,7 @@
"Name[hu]": "David Shlemayev",
"Name[ia]": "David Shlemayev",
"Name[id]": "David Shlemayev",
"Name[ie]": "David Shlemayev",
"Name[is]": "David Shlemayev",
"Name[it]": "David Shlemayev",
"Name[ko]": "David Shlemayev",

View file

@ -24,6 +24,7 @@
"Name[hu]": "Simon Redman",
"Name[ia]": "Simon Redman",
"Name[id]": "Simon Redman",
"Name[ie]": "Simon Redman",
"Name[is]": "Simon Redman",
"Name[it]": "Simon Redman",
"Name[ko]": "Simon Redman",
@ -97,6 +98,7 @@
"Name[hu]": "Névjegyek",
"Name[ia]": "Contactos",
"Name[id]": "Contacts",
"Name[ie]": "Contactes",
"Name[is]": "Tengiliðir",
"Name[it]": "Contatti",
"Name[ka]": "კონტაქტები",

View file

@ -23,6 +23,7 @@
"Name[hu]": "Apoorv Parle",
"Name[ia]": "Apoorv Parle",
"Name[id]": "Apoorv Parle",
"Name[ie]": "Apoorv Parle",
"Name[is]": "Apoorv Parle",
"Name[it]": "Apoorv Parle",
"Name[ko]": "Apoorv Parle",
@ -69,6 +70,7 @@
"Name[hu]": "David Edmundson",
"Name[ia]": "David Edmundson",
"Name[id]": "David Edmundson",
"Name[ie]": "David Edmundson",
"Name[is]": "David Edmundson",
"Name[it]": "David Edmundson",
"Name[ka]": "დავიდ ედმუნდსონი",
@ -163,6 +165,7 @@
"Name[hu]": "Telefon megcsörgetése",
"Name[ia]": "Sona mi telephono",
"Name[id]": "Ring my phone",
"Name[ie]": "Sonar mi telefon",
"Name[is]": "Hringja í símann minn",
"Name[it]": "Fai squillare il mio telefono",
"Name[ja]": "端末を鳴らす",

View file

@ -23,6 +23,7 @@
"Name[hu]": "Friedrich W. H. Kossebau",
"Name[ia]": "Friedrich W. H. Kossebau",
"Name[id]": "Friedrich W. H. Kossebau",
"Name[ie]": "Friedrich W. H. Kossebau",
"Name[is]": "Friedrich W. H. Kossebau",
"Name[it]": "Friedrich W. H. Kossebau",
"Name[ka]": "ფრიდრიჰ კოსებაუ",
@ -109,6 +110,7 @@
"Name[hu]": "Eszköz keresése",
"Name[ia]": "Trova iste dispositivo",
"Name[id]": "Find this device",
"Name[ie]": "Trovar ti aparate",
"Name[is]": "Finna þetta tæki",
"Name[it]": "Trova questo dispositivo",
"Name[ja]": "デバイスを探す",

View file

@ -22,6 +22,7 @@ Name[he]=KDE Connect
Name[hu]=KDE Connect
Name[ia]=KDE Connect
Name[id]=KDE Connect
Name[ie]=KDE Connect
Name[is]=KDE Connect
Name[it]=KDE Connect
Name[ja]=KDE Connect
@ -121,6 +122,7 @@ Name[he]=בקשת התאמה
Name[hu]=Párosítási kérés
Name[ia]=Requesta de association
Name[id]=Minta Sandingkan
Name[ie]=Demande de acuplation
Name[is]=Beiðni um pörun
Name[it]=Richiesta di associazione
Name[ja]=ペアリング要求
@ -168,6 +170,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 peranti
Comment[ie]=Demande de acuplation recivet de un aparate
Comment[is]=Tók við beiðni um pörun frá tæki
Comment[it]=Richiesta di associazione ricevuta da un dispositivo
Comment[ja]=デバイスからのペアリング要求を受信しました
@ -218,6 +221,7 @@ Name[he]=שיחה נכנסת
Name[hu]=Bejövő hívás
Name[ia]=Appello in arrivata
Name[id]=Panggilan Masuk
Name[ie]=Telefonada intrant
Name[is]=Innhringing
Name[it]=Chiamata in ingresso
Name[ja]=着信
@ -266,6 +270,7 @@ Comment[he]=מישהו מתקשר אילך
Comment[hu]=Valaki hívja önt
Comment[ia]=Alcun es appellante te
Comment[id]=Seseorang memanggilmu
Comment[ie]=Alcun telefona vos
Comment[is]=Einhver er að hringja í þig
Comment[it]=Chiamata in arrivo
Comment[ja]=誰かがあなたを呼んでいます
@ -316,6 +321,7 @@ Name[he]=שיחה שלא נענתה
Name[hu]=Nem fogadott hívás
Name[ia]=Appello perdite
Name[id]=Panggilan Tidak Terjawab
Name[ie]=Telefonada ne atinget
Name[is]=Ósvarað símtal
Name[it]=Chiamata persa
Name[ja]=不在着信
@ -413,6 +419,7 @@ Name[gl]=Batería baixa
Name[hu]=Alacsony töltöttség
Name[ia]=Batteria basse
Name[id]=Baterai Lemah
Name[ie]=Batterie exhauste
Name[is]=Lítil hleðsla á rafhlöðu
Name[it]=Batteria a livello basso
Name[ja]=バッテリー残量低下
@ -608,6 +615,7 @@ Name[he]=התראה כללית
Name[hu]=Általános értesítés
Name[ia]=Notification generic
Name[id]=Notifikasi Umum
Name[ie]=Géneric notification
Name[is]=Almenn tilkynning
Name[it]=Notifica generica
Name[ja]=通常の通知

View file

@ -23,6 +23,7 @@
"Name[hu]": "Aleix Pol",
"Name[ia]": "Aleix Pol",
"Name[id]": "Aleix Pol",
"Name[ie]": "Aleix Pol",
"Name[is]": "Aleix Pol",
"Name[it]": "Aleix Pol",
"Name[ka]": "ალის პოლი",

View file

@ -23,6 +23,7 @@
"Name[hu]": "Ahmed I. Khalil",
"Name[ia]": "Ahmed I. Khalil",
"Name[id]": "Ahmed I. Khalil",
"Name[ie]": "Ahmed I. Khalil",
"Name[is]": "Ahmed I. Khalil",
"Name[it]": "Ahmed I. Khalil",
"Name[ko]": "Ahmed I. Khalil",

View file

@ -23,6 +23,7 @@
"Name[hu]": "Albert Vaca",
"Name[ia]": "Albert Vaca",
"Name[id]": "Albert Vaca",
"Name[ie]": "Albert Vaca",
"Name[is]": "Albert Vaca",
"Name[it]": "Albert Vaca",
"Name[ko]": "Albert Vaca",

View file

@ -23,6 +23,7 @@
"Name[hu]": "Aleix Pol",
"Name[ia]": "Aleix Pol",
"Name[id]": "Aleix Pol",
"Name[ie]": "Aleix Pol",
"Name[is]": "Aleix Pol",
"Name[it]": "Aleix Pol",
"Name[ka]": "ალის პოლი",
@ -116,6 +117,7 @@
"Name[hu]": "MprisRemote",
"Name[ia]": "MprisRemote",
"Name[id]": "MprisRemote",
"Name[ie]": "MprisRemote",
"Name[is]": "MprisRemote",
"Name[it]": "MprisRemote",
"Name[ko]": "MprisRemote",

View file

@ -23,6 +23,7 @@
"Name[hu]": "Albert Vaca",
"Name[ia]": "Albert Vaca",
"Name[id]": "Albert Vaca",
"Name[ie]": "Albert Vaca",
"Name[is]": "Albert Vaca",
"Name[it]": "Albert Vaca",
"Name[ko]": "Albert Vaca",

View file

@ -23,6 +23,7 @@
"Name[hu]": "Albert Vaca",
"Name[ia]": "Albert Vaca",
"Name[id]": "Albert Vaca",
"Name[ie]": "Albert Vaca",
"Name[is]": "Albert Vaca",
"Name[it]": "Albert Vaca",
"Name[ko]": "Albert Vaca",

View file

@ -23,6 +23,7 @@
"Name[hu]": "Nicolas Fella",
"Name[ia]": "Nicolas Fella",
"Name[id]": "Nicolas Fella",
"Name[ie]": "Nicolas Fella",
"Name[is]": "Nicolas Fella",
"Name[it]": "Nicolas Fella",
"Name[ka]": "Nicolas Fella",
@ -108,6 +109,7 @@
"Name[hu]": "Fénykép",
"Name[ia]": "Photo",
"Name[id]": "Photo",
"Name[ie]": "Foto",
"Name[is]": "Ljósmynd",
"Name[it]": "Foto",
"Name[ka]": "სურათი",

View file

@ -23,6 +23,7 @@
"Name[hu]": "Albert Vaca",
"Name[ia]": "Albert Vaca",
"Name[id]": "Albert Vaca",
"Name[ie]": "Albert Vaca",
"Name[is]": "Albert Vaca",
"Name[it]": "Albert Vaca",
"Name[ko]": "Albert Vaca",

View file

@ -23,6 +23,7 @@
"Name[hu]": "Aleix Pol",
"Name[ia]": "Aleix Pol",
"Name[id]": "Aleix Pol",
"Name[ie]": "Aleix Pol",
"Name[is]": "Aleix Pol",
"Name[it]": "Aleix Pol",
"Name[ka]": "ალის პოლი",

View file

@ -23,6 +23,7 @@
"Name[hu]": "Aleix Pol",
"Name[ia]": "Aleix Pol",
"Name[id]": "Aleix Pol",
"Name[ie]": "Aleix Pol",
"Name[is]": "Aleix Pol",
"Name[it]": "Aleix Pol",
"Name[ka]": "ალის პოლი",

View file

@ -23,6 +23,7 @@
"Name[hu]": "Aleix Pol",
"Name[ia]": "Aleix Pol",
"Name[id]": "Aleix Pol",
"Name[ie]": "Aleix Pol",
"Name[is]": "Aleix Pol",
"Name[it]": "Aleix Pol",
"Name[ka]": "ალის პოლი",

View file

@ -23,6 +23,7 @@
"Name[hu]": "Holger Kaelberer",
"Name[ia]": "Holger Kaelberer",
"Name[id]": "Holger Kaelberer",
"Name[ie]": "Holger Kaelberer",
"Name[is]": "Holger Kaelberer",
"Name[it]": "Holger Kaelberer",
"Name[ko]": "Holger Kaelberer",

View file

@ -23,6 +23,7 @@
"Name[hu]": "Nicolas Fella",
"Name[ia]": "Nicolas Fella",
"Name[id]": "Nicolas Fella",
"Name[ie]": "Nicolas Fella",
"Name[is]": "Nicolas Fella",
"Name[it]": "Nicolas Fella",
"Name[ka]": "Nicolas Fella",

View file

@ -23,6 +23,7 @@
"Name[hu]": "Albert Vaca",
"Name[ia]": "Albert Vaca",
"Name[id]": "Albert Vaca",
"Name[ie]": "Albert Vaca",
"Name[is]": "Albert Vaca",
"Name[it]": "Albert Vaca",
"Name[ko]": "Albert Vaca",
@ -69,6 +70,7 @@
"Name[hu]": "David Edmundson",
"Name[ia]": "David Edmundson",
"Name[id]": "David Edmundson",
"Name[ie]": "David Edmundson",
"Name[is]": "David Edmundson",
"Name[it]": "David Edmundson",
"Name[ka]": "დავიდ ედმუნდსონი",

View file

@ -23,6 +23,7 @@
"Name[hu]": "Pramod Dematagoda",
"Name[ia]": "Pramod Dematagoda",
"Name[id]": "Pramod Dematagoda",
"Name[ie]": "Pramod Dematagoda",
"Name[is]": "Pramod Dematagoda",
"Name[it]": "Pramod Dematagoda",
"Name[ko]": "Pramod Dematagoda",

View file

@ -23,6 +23,7 @@
"Name[hu]": "Samoilenko Yuri",
"Name[ia]": "Samoilenko Yuri",
"Name[id]": "Samoilenko Yuri",
"Name[ie]": "Samoilenko Yuri",
"Name[is]": "Samoilenko Yuri",
"Name[it]": "Samoilenko Yuri",
"Name[ko]": "Samoilenko Yuri",

View file

@ -23,6 +23,7 @@
"Name[hu]": "Albert Vaca",
"Name[ia]": "Albert Vaca",
"Name[id]": "Albert Vaca",
"Name[ie]": "Albert Vaca",
"Name[is]": "Albert Vaca",
"Name[it]": "Albert Vaca",
"Name[ko]": "Albert Vaca",

View file

@ -23,6 +23,7 @@
"Name[hu]": "Simon Redman",
"Name[ia]": "Simon Redman",
"Name[id]": "Simon Redman",
"Name[ie]": "Simon Redman",
"Name[is]": "Simon Redman",
"Name[it]": "Simon Redman",
"Name[ko]": "Simon Redman",
@ -108,6 +109,7 @@
"Name[hu]": "SMS",
"Name[ia]": "SMS",
"Name[id]": "SMS",
"Name[ie]": "SMS",
"Name[is]": "SMS",
"Name[it]": "SMS",
"Name[ja]": "SMS",

View file

@ -24,6 +24,7 @@
"Name[hu]": "Nicolas Fella",
"Name[ia]": "Nicolas Fella",
"Name[id]": "Nicolas Fella",
"Name[ie]": "Nicolas Fella",
"Name[is]": "Nicolas Fella",
"Name[it]": "Nicolas Fella",
"Name[ka]": "Nicolas Fella",

View file

@ -23,6 +23,7 @@
"Name[hu]": "Albert Vaca",
"Name[ia]": "Albert Vaca",
"Name[id]": "Albert Vaca",
"Name[ie]": "Albert Vaca",
"Name[is]": "Albert Vaca",
"Name[it]": "Albert Vaca",
"Name[ko]": "Albert Vaca",

View file

@ -17,6 +17,7 @@
"Name[fi]": "Aleix Pol i Gonzalez",
"Name[fr]": "Aleix Pol i Gonzalez",
"Name[ia]": "Aleix Pol i Gonzalez",
"Name[ie]": "Aleix Pol i Gonzalez",
"Name[is]": "Aleix Pol i Gonzalez",
"Name[it]": "Aleix Pol i Gonzalez",
"Name[ka]": "Aleix Pol i Gonzalez",

View file

@ -19,6 +19,7 @@ Name[gl]=Atopar o meu dispositivo
Name[hu]= Eszköz keresése
Name[ia]=Trova mi dispositivo
Name[id]=Temukan perantiku
Name[ie]= Trovar mi aparate
Name[is]= Finna tækið mitt
Name[it]= Trova il mio dispositivo
Name[ja]=
@ -61,6 +62,7 @@ Comment[gl]=Facer soar os dispositivos conectados
Comment[hu]=Csatlakoztatott eszközök csengetése
Comment[ia]=Sona dispositivos connectite
Comment[id]=Deringkan peranti yang terkoneksi
Comment[ie]=Sonar conexet aparates
Comment[is]=Hringja í tengd tæki
Comment[it]=Fa squillare i dispositivi connessi
Comment[ja]=

View file

@ -19,6 +19,7 @@ Name[gl]=Executar unha orde
Name[hu]=Parancs futtatása
Name[ia]=Executa Commando
Name[id]=Jalankan perintah
Name[ie]=Lansar un comande
Name[is]=Keyra skipun
Name[it]=Esegui comando
Name[ja]=

View file

@ -61,6 +61,7 @@ GenericName[gl]=SMS
GenericName[hu]=SMS
GenericName[ia]=SMS
GenericName[id]=SMS
GenericName[ie]=SMS
GenericName[is]=SMS
GenericName[it]=SMS
GenericName[ja]=SMS

View file

@ -21,6 +21,7 @@ Name[he]=KDE Connect
Name[hu]=KDE Connect
Name[ia]=KDE Connect
Name[id]=KDE Connect
Name[ie]=KDE Connect
Name[is]=KDE Connect
Name[it]=KDE Connect
Name[ja]=KDE Connect