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 2023-01-19 01:59:08 +00:00
parent abbaa1575b
commit 7c588d4984
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

@ -490,7 +490,7 @@ Comment[sr@ijekavianlatin]=Vaša baterija je na izdisaju
Comment[sr@latin]=Vaša baterija je na izdisaju Comment[sr@latin]=Vaša baterija je na izdisaju
Comment[sv]=Batteriet är nästan slut Comment[sv]=Batteriet är nästan slut
Comment[ta]=உங்கள் மின்கலத்தில் ஆற்றல் குறைவாக உள்ளது Comment[ta]=உங்கள் மின்கலத்தில் ஆற்றல் குறைவாக உள்ளது
Comment[tr]=Pilinizin seviyesi düşük Comment[tr]=Pilinizin düzeyi düşük
Comment[uk]=Рівень заряду акумулятора є низьким Comment[uk]=Рівень заряду акумулятора є низьким
Comment[x-test]=xxYour battery is in low statexx Comment[x-test]=xxYour battery is in low statexx
Comment[zh_CN]=您的电池电量低 Comment[zh_CN]=您的电池电量低