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-01-13 09:40:45 +01:00
parent 5c9eb6e60a
commit 176d03610d
6 changed files with 8 additions and 0 deletions

View file

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

@ -11,6 +11,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
@ -38,6 +39,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

@ -272,6 +272,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]=부재중 전화

View file

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

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

@ -11,6 +11,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ė