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-02-13 09:43:43 +00:00
parent a9670e5a81
commit 7f668b59a3
1 changed files with 1 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
plugins/kdeconnect.notifyrc
View file

@ -99,6 +99,7 @@ Comment[ca]=Les sol·licituds d'aparellament rebudes des d'un dispositiu
Comment[ca@valencia]=Les sol·licituds d'aparellament rebudes des d'un dispositiu
Comment[de]=Verbindungsanfrage von einem Gerät erhalten
Comment[el]=Λήφθηκε αίτημα σύζευξης από μια συσκευή
Comment[es]=Petición de vinculación recibida desde un dispositivo
Comment[fi]=Saatiin paripyyntö laitteelta
Comment[gl]=Recibiuse unha solicitude de emparellamento dun dispositivo.
Comment[nl]=Verzoek om een paar te maken ontvangen van apparaten