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 2020-04-06 06:09:41 +02:00
parent ba76d449f9
commit b83a028435
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/battery/kdeconnect_battery.json
View file

@ -62,7 +62,7 @@
"Description[id]": "Tampilkan baterai teleponmu di sebelah baterai komputermu",
"Description[it]": "Mostra la batteria del telefono accanto a quella del computer",
"Description[ja]": "コンピュータのバッテリの次に端末のバッテリーを表示",
"Description[ko]": "컴퓨터 배터리와 함께 휴대폰 배터리 표시",
"Description[ko]": "컴퓨터 배터리와 휴대폰 배터리 같이 표시",
"Description[lt]": "Rodyti telefono akumuliatorių šalia kompiuterio akumuliatoriaus",
"Description[nl]": "Uw telefoonbatterij naast uw computerbatterij tonen",
"Description[nn]": "Vis telefonbatteriet ved sida av datamaskinbatteriet",