alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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-09-23 06:25:34 +02:00
parent ff5ed26f21
commit 6885e1176b
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/plasma/data/servicetypes/plasma-scriptengine.desktop
View File

@ -45,7 +45,7 @@ Comment[tg]=Васеъшавии забони намоишнома барои Pl
Comment[tr]=Plasma için betik dili eklentisi
Comment[ug]=Plasma نىڭ قوليازما تىل كېڭەيتىلمىسى
Comment[uk]=Розширення скриптових мов для Плазми
Comment[vi]=Phần mở rộng ngôn ngữ kịch bản cho Plasma
Comment[vi]=Phần mở rộng "Ngôn ngữ kịch bản" cho Plasma
Comment[x-test]=xxScripting language extension for Plasmaxx
Comment[zh_CN]=Plasma 的脚本语言扩展
Comment[zh_TW]=Plasma 文稿語言延伸