tristan/kdeconnect-kde
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SVN_SILENT made messages (.desktop file) - always resolve ours

Browse source 
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 2016-12-17 05:47:06 +01:00
parent e59fd940d6
commit ec3ded5abf
2 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
plugins/remotecommands/kdeconnect_remotecommands.json
View file

@ -42,6 +42,7 @@
"Name[da]": "Vært for eksterne kommandoer", "Name[da]": "Vært for eksterne kommandoer",
"Name[el]": "Απομακρυσμένη εκτέλεση εντολών", "Name[el]": "Απομακρυσμένη εκτέλεση εντολών",
"Name[es]": "Órdenes en servidor remoto", "Name[es]": "Órdenes en servidor remoto",
"Name[et]": "Kaugkäsud",
"Name[fi]": "Etäkomennot", "Name[fi]": "Etäkomennot",
"Name[it]": "Comandi remoti host", "Name[it]": "Comandi remoti host",
"Name[nl]": "Host voor commando's op afstand", "Name[nl]": "Host voor commando's op afstand",

1
plugins/telephony/kdeconnect_telephony.json
View file

@ -17,6 +17,7 @@
"Description[de]": "Benachrichtigungen für Anrufe und SMS anzeigen", "Description[de]": "Benachrichtigungen für Anrufe und SMS anzeigen",
"Description[el]": "Εμφάνιση ειδοποιήσεων για κλήσεις και SMS", "Description[el]": "Εμφάνιση ειδοποιήσεων για κλήσεις και SMS",
"Description[es]": "Mostrar notificaciones de llamadas y SMS", "Description[es]": "Mostrar notificaciones de llamadas y SMS",
"Description[et]": "Kõnede ja SMS-ide märguannete näitamine",
"Description[fi]": "Näytä puhelujen ja tekstiviestien ilmoitukset", "Description[fi]": "Näytä puhelujen ja tekstiviestien ilmoitukset",
"Description[it]": "Mostra notifiche per le chiamate e per gli SMS", "Description[it]": "Mostra notifiche per le chiamate e per gli SMS",
"Description[nl]": "Meldingen tonen van oproepen en SMSjes", "Description[nl]": "Meldingen tonen van oproepen en SMSjes",