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 2018-01-29 05:02:00 +01:00
parent ab006521f8
commit 83158aac7a
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
plugins/kdeconnect.notifyrc
View file

@ -459,7 +459,7 @@ Comment[et]=Aku täituvus on madal
Comment[eu]=Zure bateria egoera baxuan dago Comment[eu]=Zure bateria egoera baxuan dago
Comment[fi]=Akkusi virta on vähissä Comment[fi]=Akkusi virta on vähissä
Comment[fr]=Votre batterie est faible Comment[fr]=Votre batterie est faible
Comment[gl]=A batería está esgotándose. Comment[gl]=A batería está nas últimas.
Comment[he]=הבטריה שלך הולכת להגמר Comment[he]=הבטריה שלך הולכת להגמר
Comment[hu]=Az akkumulátora feszültsége alacsony Comment[hu]=Az akkumulátora feszültsége alacsony
Comment[it]=La tua batteria è al livello basso Comment[it]=La tua batteria è al livello basso