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"
2020-07-23 09:50:37 +02:00 · 2020-07-23 09:50:37 +02:00 · 10de7b3763
commit 10de7b3763
parent f212df93b6
13 changed files with 22 additions and 0 deletions
--- a/app/org.kde.kdeconnect.app.desktop
+++ b/app/org.kde.kdeconnect.app.desktop
@ -19,6 +19,7 @@ Name[fr]=KDE Connect
 Name[gl]=KDE Connect
 Name[he]=KDE Connect
 Name[hu]=KDE Connect
+Name[ia]=KDE Connect
 Name[id]=KDE Connect
 Name[it]=KDE Connect
 Name[ko]=KDE Connect
--- a/daemon/org.kde.kdeconnect.daemon.desktop.cmake
+++ b/daemon/org.kde.kdeconnect.daemon.desktop.cmake
@ -29,6 +29,7 @@ Name[fr]=KDE Connect
 Name[gl]=KDE Connect
 Name[he]=KDE Connect
 Name[hu]=KDE Connect
+Name[ia]=KDE Connect
 Name[id]=KDE Connect
 Name[it]=KDE Connect
 Name[ko]=KDE Connect
--- a/data/kdeconnect-dde.desktop
+++ b/data/kdeconnect-dde.desktop
@ -18,6 +18,7 @@ Name[fi]=Lähetä tiedosto KDE Connectilla
 Name[fr]=Envoyer via KDE Connect
 Name[gl]=Enviar por KDE Connect
 Name[hu]=Küldés a KDE Connecttel
+Name[ia]=Invia via KDE Connect
 Name[it]=Invia tramite KDE Connect
 Name[ko]=KDE Connect로 통해 보내기
 Name[lt]=Siųsti per KDE Connect
--- a/data/kdeconnect-thunar.desktop
+++ b/data/kdeconnect-thunar.desktop
@ -18,6 +18,7 @@ Name[fi]=Lähetä tiedosto KDE Connectilla
 Name[fr]=Envoyer via KDE Connect
 Name[gl]=Enviar por KDE Connect
 Name[hu]=Küldés a KDE Connecttel
+Name[ia]=Invia via KDE Connect
 Name[it]=Invia tramite KDE Connect
 Name[ko]=KDE Connect로 통해 보내기
 Name[lt]=Siųsti per KDE Connect
--- a/data/org.kde.kdeconnect_open.desktop
+++ b/data/org.kde.kdeconnect_open.desktop
@ -13,6 +13,7 @@ GenericName[fi]=Avaa kytkettyyn laitteeseen KDE Connectilla
 GenericName[fr]=Ouvrir sur un appareil connecté via KDE Connect
 GenericName[gl]=Abrir no dispositivo conectado por KDE Connect
 GenericName[hu]=Megnyitás a csatlakoztatott eszközön a KDE Connecttel
+GenericName[ia]=Aperi sur dispositivo connectite via KDE Connect
 GenericName[it]=Apri nel dispositivo connesso tramite KDE Connect
 GenericName[ko]=KDE Connect로 연결된 장치에서 열기
 GenericName[lt]=Atverti prijungtame įrenginyje per KDE Connect
@ -43,6 +44,7 @@ Name[fi]=Avaa kytkettyyn laitteeseen KDE Connectilla
 Name[fr]=Ouvrir sur un appareil connecté via KDE Connect
 Name[gl]=Abrir no dispositivo conectado por KDE Connect
 Name[hu]=Megnyitás a csatlakoztatott eszközön a KDE Connecttel
+Name[ia]=Aperi sur dispositivo connectite via KDE Connect
 Name[it]=Apri nel dispositivo connesso tramite KDE Connect
 Name[ko]=KDE Connect로 연결된 장치에서 열기
 Name[lt]=Atverti prijungtame įrenginyje per KDE Connect
--- a/kcm/kcm_kdeconnect.desktop
+++ b/kcm/kcm_kdeconnect.desktop
@ -30,6 +30,7 @@ Name[fr]=KDE Connect
 Name[gl]=KDE Connect
 Name[he]=KDE Connect
 Name[hu]=KDE Connect
+Name[ia]=KDE Connect
 Name[id]=KDE Connect
 Name[it]=KDE Connect
 Name[ko]=KDE Connect
--- a/plasmoid/package/metadata.desktop
+++ b/plasmoid/package/metadata.desktop
@ -19,6 +19,7 @@ Name[fr]=KDE Connect
 Name[gl]=KDE Connect
 Name[he]=KDE Connect
 Name[hu]=KDE Connect
+Name[ia]=KDE Connect
 Name[id]=KDE Connect
 Name[it]=KDE Connect
 Name[ko]=KDE Connect
--- a/plugins/kdeconnect.notifyrc
+++ b/plugins/kdeconnect.notifyrc
@ -20,6 +20,7 @@ Name[fr]=KDE Connect
 Name[gl]=KDE Connect
 Name[he]=KDE Connect
 Name[hu]=KDE Connect
+Name[ia]=KDE Connect
 Name[id]=KDE Connect
 Name[it]=KDE Connect
 Name[ko]=KDE Connect
@ -279,6 +280,7 @@ Name[fr]=Appel manqué
 Name[gl]=Chamada perdida
 Name[he]=שיחה שלא נענתה
 Name[hu]=Nem fogadott hívás
+Name[ia]=Appello perdite
 Name[id]=Panggilan Tidak Terjawab
 Name[it]=Chiamata persa
 Name[ko]=부재중 전화
@ -452,6 +454,7 @@ Name[fr]=Ping reçu
 Name[gl]=Recibiuse un ping
 Name[he]=התקבל פינג
 Name[hu]=Ping érkezett
+Name[ia]=Ping Recipite
 Name[id]=Diterima Ping
 Name[it]=Ping ricevuto
 Name[ko]=핑 수신
@ -494,6 +497,7 @@ Comment[fr]=Ping reçu
 Comment[gl]=Recibiuse un “ping”.
 Comment[he]=התקבל פינג
 Comment[hu]=Ping érkezett
+Comment[ia]=Ping recipite
 Comment[id]=Diterima ping
 Comment[it]=Hai ricevuto un ping
 Comment[ko]=핑 수신
@ -539,6 +543,7 @@ Name[fr]=Notification
 Name[gl]=Notificación xenérica
 Name[he]=התראה כללית
 Name[hu]=Általános értesítés
+Name[ia]=Notification generic
 Name[id]=Notifikasi Umum
 Name[it]=Notifica generica
 Name[ko]=일반 알림
@ -581,6 +586,7 @@ Comment[fr]=Notification reçue
 Comment[gl]=Recibiuse unha notificación.
 Comment[he]=התראה התקבלה
 Comment[hu]=Értesítés érkezett
+Comment[ia]=Notification recipite
 Comment[id]=Diterima notifikasi
 Comment[it]=Hai ricevuto una notifica
 Comment[ko]=수신된 알림
--- a/runners/findmyphone/plasma-runner-kdeconnect-findmyphone.desktop
+++ b/runners/findmyphone/plasma-runner-kdeconnect-findmyphone.desktop
@ -12,6 +12,7 @@ Name[eu]= Bilatu nire gailua
 Name[fi]=Etsi laite
 Name[fr]= Trouver mon appareil
 Name[gl]=Atopar o meu dispositivo
+Name[ia]=Trova mi dispositivo
 Name[it]= Trova il mio dispositivo
 Name[ko]= 내 장치 찾기
 Name[lt]= Rasti savo įrenginį
--- a/runners/remotecommands/plasma-runner-kdeconnect-remotecommands.desktop
+++ b/runners/remotecommands/plasma-runner-kdeconnect-remotecommands.desktop
@ -12,6 +12,7 @@ Name[eu]=Exekutatu komandoa
 Name[fi]=Suorita komento
 Name[fr]=Exécuter une commande
 Name[gl]=Executar unha orde
+Name[ia]=Executa Commando
 Name[it]=Esegui comando
 Name[ko]=명령 실행
 Name[lt]=Vykdyti komandą
--- a/settings/org.kde.kdeconnect.settings.desktop
+++ b/settings/org.kde.kdeconnect.settings.desktop
@ -21,6 +21,7 @@ Name[fr]=Paramètres de KDE Connect
 Name[gl]=Configuración de KDE Connect
 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[it]=Impostazioni di KDE Connect
 Name[ko]=KDE Connect 설정
@ -60,6 +61,7 @@ GenericName[fr]=Connectez et synchronisez vos périphériques
 GenericName[gl]=Conecte e sincronice os seus dispositivos
 GenericName[he]=Connect and sync your devices
 GenericName[hu]=Csatlakoztassa és szinkronizálja eszközeit
+GenericName[ia]=Connecte e synchronisa tu dispositivos
 GenericName[id]=Koneksikan dan sinkronkan perangkatmu
 GenericName[it]=Connetti e sincronizza i tuoi dispositivi
 GenericName[ko]=내 장치에 연결하고 동기화
--- a/smsapp/org.kde.kdeconnect.sms.desktop
+++ b/smsapp/org.kde.kdeconnect.sms.desktop
@ -14,6 +14,7 @@ Name[fi]=KDE Connectin tekstiviestit
 Name[fr]=KDE Connect SMS
 Name[gl]=SMS de KDE Connect
 Name[hu]=KDE Connect SMS
+Name[ia]=KDE Connect SMS
 Name[id]=SMS KDE Connect
 Name[it]=KDE Connect SMS
 Name[ko]=KDE Connect SMS
@ -46,6 +47,7 @@ GenericName[fi]=Tekstiviesti
 GenericName[fr]=SMS
 GenericName[gl]=SMS
 GenericName[hu]=SMS
+GenericName[ia]=SMS
 GenericName[id]=SMS
 GenericName[it]=SMS
 GenericName[ko]=SMS
@ -77,6 +79,7 @@ Comment[eu]=Testu mezularitza
 Comment[fi]=Tekstiviestit
 Comment[fr]=Messagerie texte
 Comment[gl]=Mensaxaría de texto.
+Comment[ia]=Messageria de texto
 Comment[id]=Perpesanan Teks
 Comment[it]=Messaggi di testo
 Comment[ko]=문자 메시지
--- a/urlhandler/org.kde.kdeconnect.handler.desktop
+++ b/urlhandler/org.kde.kdeconnect.handler.desktop
@ -7,6 +7,7 @@ Name[da]=URL-håndtering til KDE Connect
 Name[es]=Controlador de URL de KDE Connect
 Name[fi]=KDE Connectin verkko-osoitekäsittelijä
 Name[fr]=Gestionnaire d'URL de KDE Connect
+Name[ia]=Gerente de URL de KDE Connect
 Name[it]=Gestore URL di KDE Connect
 Name[nl]=URL behandelaar van KDE-Connect
 Name[nn]=KDE Connect adressehandsamar