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:
parent
dc6ed38a98
commit
be74067885
2 changed files with 2 additions and 0 deletions
|
@ -8,6 +8,7 @@ Name[da]=Send fil via KDE Connect-tjeneste
|
|||
Name[de]=Datei mit KDE-Connect -Dienst versenden
|
||||
Name[en_GB]=Send file via KDE Connect service
|
||||
Name[es]=Enviar archivo a través del servicio KDE Connect
|
||||
Name[eu]=Bidali fitxategia KDE Connect zerbitzuaren bidez
|
||||
Name[fi]=Lähetä tiedosto KDE Connect -palvelulla
|
||||
Name[fr]=Envoyer un fichier via le service KDE Connect
|
||||
Name[gl]=Enviar o ficheiro polo servizo de KDE Connect
|
||||
|
|
|
@ -48,6 +48,7 @@
|
|||
"Description[de]": "Benachrichtigungen für Anrufe und SMS anzeigen",
|
||||
"Description[en_GB]": "Show notifications for calls and SMS",
|
||||
"Description[es]": "Mostrar notificaciones para llamadas y SMS",
|
||||
"Description[eu]": "Erakutsi deien eta SMS mezuen jakinarazpenak",
|
||||
"Description[fi]": "Näytä puhelujen ja tekstiviestien ilmoitukset",
|
||||
"Description[fr]": "Affichez les notifications pour les appels et les SMS",
|
||||
"Description[gl]": "Mostrar notificacións de chamadas e mensaxes SMS.",
|
||||
|
|
Loading…
Reference in a new issue