andrius
/
kpmcore
1
0
Fork 0
Code Pull Requests Releases Activity

SVN_SILENT made messages (.desktop file) - always resolve ours 

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-04-06 05:23:24 +02:00
parent c1f4b36305
commit 6eab8757b5
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/dummy/pmdummybackendplugin.json
View File

@ -19,6 +19,7 @@
"Description[sv]": "Ett bakgrundsprogram till KDE:s partitionshanterare i testsyfte.",
"Description[uk]": "Тестовий додаток сервера Керування розділами KDE.",
"Description[x-test]": "xxA KDE Partition Manager dummy backend for testing purposes.xx",
"Description[zh_CN]": "测试用的 KDE 分区管理器的虚拟后端",
"EnabledByDefault": true,
"Icon": "preferences-plugin",
"Id": "pmdummybackendplugin",
@ -40,6 +41,7 @@
"Name[sv]": "KDE:s partitionshanterare bakgrundsprogram för test",
"Name[uk]": "Тестовий додаток сервера Керування розділами KDE",
"Name[x-test]": "xxKDE Partition Manager Dummy Backendxx",
"Name[zh_CN]": "KDE 分区管理器虚拟后端",
"ServiceTypes": [
"PartitionManager/Plugin"
],

2
src/plugins/libparted/pmlibpartedbackendplugin.json
View File

@ -19,6 +19,7 @@
"Description[sv]": "LibParted bakgrundsprogrammet till KDE:s partitionshanterare",
"Description[uk]": "Сервер LibParted для Керування розділами KDE",
"Description[x-test]": "xxThe LibParted backend for KDE Partition Managerxx",
"Description[zh_CN]": "KDE 分区管理器的 LibParted 后端",
"EnabledByDefault": true,
"Icon": "preferences-plugin",
"Id": "pmlibpartedbackendplugin",
@ -40,6 +41,7 @@
"Name[sv]": "KDE:s partitionshanterare LibParted bakgrundsprogram",
"Name[uk]": "Сервер LibParted Керування розділами KDE",
"Name[x-test]": "xxKDE Partition Manager LibParted Backendxx",
"Name[zh_CN]": "KDE 分区管理器 LibParted 后端",
"ServiceTypes": [
"PartitionManager/Plugin"
],