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 2019-01-25 05:33:10 +01:00
parent 3b92b0de1d
commit 864c83ffd0
7 changed files with 15 additions and 0 deletions

View file

@ -12,11 +12,13 @@ Name[de]=Mit KDE-Connect versenden
Name[en_GB]=Send via KDE Connect
Name[es]=Enviar via KDE Connect
Name[eu]=Bidali KDE Connect bidez
Name[fi]=Lähetä tiedosto KDE Connectilla
Name[fr]=Envoyer via KDE Connect
Name[gl]=Enviar mediante KDE Connect
Name[it]=Invia tramite KDE Connect
Name[nl]=Via KDE Connect versturen
Name[nn]=Send via KDE Connect
Name[pl]=Wyślij przez KDE Connect
Name[pt]=Enviar pelo KDE Connect
Name[pt_BR]=Enviar via KDE Connect
Name[sv]=Skicka via KDE-anslut

View file

@ -21,6 +21,7 @@ Name[it]=Impostazioni dell'estensione Trova questo dispositivo
Name[ko]=
Name[nl]=Plug-in-instellingen van dit apparaat zoeken
Name[nn]=Innstillingar for einingsfinning
Name[pl]=Ustawienia wtyczki znajdowania tego urządzenia
Name[pt]=Configuração do 'plugin' para Procurar Este Dispositivo
Name[pt_BR]=Configurações do plugin Procurar Este Dispositivo
Name[sv]=Inställningar av insticksprogrammet Hitta apparaten

View file

@ -11,6 +11,7 @@
"Name[en_GB]": "Nicolas Fella",
"Name[es]": "Nicolas Fella",
"Name[eu]": "Nicolas Fella",
"Name[fi]": "Nicolas Fella",
"Name[fr]": "Nicolas Fella",
"Name[gl]": "Nicolas Fella",
"Name[it]": "Nicolas Fella",
@ -35,6 +36,7 @@
"Description[en_GB]": "Control the volume of the connected device",
"Description[es]": "Controle el volumen del dispositivo conectado",
"Description[eu]": "Kontrolatu konektatutako gailuaren bolumena",
"Description[fi]": "Säädä kytketyn laitteen äänenvoimakkuutta",
"Description[fr]": "Contrôler le volume du périphérique connecté",
"Description[gl]": "Controlar o volume do dispositivo conectado",
"Description[it]": "Controlla il volume del dispositivo connesso",
@ -60,6 +62,7 @@
"Name[en_GB]": "Remote system volume",
"Name[es]": "Volumen del sistema remoto",
"Name[eu]": "Urruneko sistemaren bolumena",
"Name[fi]": "Etäjärjestelmän äänenvoimakkuus",
"Name[fr]": "Volume du système distant",
"Name[gl]": "Volume de sistema remoto",
"Name[it]": "Volume del sistema remoto",

View file

@ -37,6 +37,7 @@
"Description[en_GB]": "Send and receive SMS",
"Description[es]": "Enviar y recibir SMS",
"Description[eu]": "Bidali eta jaso SMSak",
"Description[fi]": "Lähetä ja vastaanota tekstiviestejä",
"Description[fr]": "Envoyer et recevoir des SMS",
"Description[gl]": "Enviar e recibir SMS",
"Description[it]": "Invia e riceve SMS",
@ -62,6 +63,7 @@
"Name[en_GB]": "SMS",
"Name[es]": "SMS",
"Name[eu]": "SMS",
"Name[fi]": "Tekstiviesti",
"Name[fr]": "SMS",
"Name[gl]": "SMS",
"Name[it]": "SMS",

View file

@ -12,6 +12,7 @@
"Name[en_GB]": "Nicolas Fella",
"Name[es]": "Nicolas Fella",
"Name[eu]": "Nicolas Fella",
"Name[fi]": "Nicolas Fella",
"Name[fr]": "Nicolas Fella",
"Name[gl]": "Nicolas Fella",
"Name[it]": "Nicolas Fella",
@ -36,6 +37,7 @@
"Description[en_GB]": "Control the system volume from your phone",
"Description[es]": "Controle el volumen del sistema desde su teléfono",
"Description[eu]": "Kontrolatu sistemaren bolumena zure telefonotik",
"Description[fi]": "Säädä järjestelmän äänenvoimakkuutta puhelimestasi",
"Description[fr]": "Contrôler le volume du système depuis votre téléphone",
"Description[gl]": "Controlar o volume do sistema desde o teléfono",
"Description[it]": "Controlla il volume di sistema dal tuo telefono",
@ -62,6 +64,7 @@
"Name[en_GB]": "System volume",
"Name[es]": "Volumen del sistema",
"Name[eu]": "Sistemaren bolumena",
"Name[fi]": "Järjestelmän äänenvoimakkuus",
"Name[fr]": "Volume du système",
"Name[gl]": "Volume do sistema",
"Name[it]": "Volume di sistema",

View file

@ -15,6 +15,7 @@ Name[it]=KDE Connect SMS
Name[ko]=KDE Connect SMS
Name[nl]=KDE Connect SMS
Name[nn]=KDE Connect-SMS
Name[pl]=KDE Connect SMS
Name[pt]=SMS do KDE Connect
Name[pt_BR]=KDE Connect SMS
Name[sv]=KDE-anslut SMS
@ -38,6 +39,7 @@ GenericName[it]=SMS
GenericName[ko]=SMS
GenericName[nl]=SMS
GenericName[nn]=SMS
GenericName[pl]=SMS
GenericName[pt]=SMS
GenericName[pt_BR]=SMS
GenericName[sv]=SMS
@ -61,6 +63,7 @@ Comment[it]=Messaggi di testo
Comment[ko]=
Comment[nl]=Tekstberichten versturen
Comment[nn]=Tekstmeldingar
Comment[pl]=Wiadomości tekstowe
Comment[pt]=Mensagem de Texto
Comment[pt_BR]=Mensagem de texto
Comment[sv]=Textmeddelanden

View file

@ -9,6 +9,7 @@ Name[el]=KDE Connect χειριστής URL για σύνδεση τηλεφών
Name[en_GB]=KDE Connect Phone URL Handler
Name[es]=Controlador de URL de teléfonos de KDE Connect
Name[eu]=KDE Connect-en telefono-URL-kudeatzailea
Name[fi]=KDE Connectin puhelinverkko-osoitekäsittelijä
Name[fr]=Gestionnaire d'URL téléphoniques de KDE Connect
Name[gl]=Manexador de URL de teléfono de KDE Connect
Name[id]=Penanganan URL Phone KDE Connect