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 2020-06-07 08:58:38 +02:00
parent b06162acfe
commit 046a572542
11 changed files with 15 additions and 0 deletions

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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
@ -42,6 +43,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

View file

@ -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

View file

@ -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

View file

@ -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
@ -273,6 +274,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]=부재중 전화
@ -738,6 +740,7 @@ Comment[fr]=Fichier entrant
Comment[gl]=Ficheiro entrante
Comment[he]=קובץ מגיע
Comment[hu]=Bejövő fájl
Comment[ia]=File in arrivata
Comment[id]=File masuk
Comment[it]=File in ingresso
Comment[ko]=파일 수신

View file

@ -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ą

View file

@ -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

View file

@ -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
@ -45,6 +46,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

View file

@ -12,6 +12,7 @@ Name[eu]=KDE Connecten SMSen URL maneiatzailea
Name[fi]=KDE Connectin tekstiviestiosoitekäsittelijä
Name[fr]=Gestionnaire d'URL SMS de KDE Connect
Name[gl]=Xestor de URL de SMS de KDE Connect
Name[ia]=Maneator de URL SMS de KDE Connect
Name[it]=Gestore URL SMS di KDE Connect
Name[ko]=KDE Connect SMS URL
Name[lt]=KDE Connect SMS URL doroklė