Commit 0a9a8e0e authored by Script Kiddy's avatar Script Kiddy

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"
parent cf38a212
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
"Description[sv]": "Importerar och redigerar Meson-projekt", "Description[sv]": "Importerar och redigerar Meson-projekt",
"Description[uk]": "Імпортує і дає змогу редагувати проекти Meson", "Description[uk]": "Імпортує і дає змогу редагувати проекти Meson",
"Description[x-test]": "xxImports and edits Meson projectsxx", "Description[x-test]": "xxImports and edits Meson projectsxx",
"Description[zh_CN]": "倒入并编辑 Meson 工程",
"Icon": "meson", "Icon": "meson",
"Id": "KDevMesonManager", "Id": "KDevMesonManager",
"Name": "Meson Project Manager", "Name": "Meson Project Manager",
...@@ -27,6 +28,7 @@ ...@@ -27,6 +28,7 @@
"Name[sv]": "Meson projekthanterare", "Name[sv]": "Meson projekthanterare",
"Name[uk]": "Керування проектами Meson", "Name[uk]": "Керування проектами Meson",
"Name[x-test]": "xxMeson Project Managerxx", "Name[x-test]": "xxMeson Project Managerxx",
"Name[zh_CN]": "Meson 工程管理器",
"ServiceTypes": [ "ServiceTypes": [
"KDevelop/Plugin" "KDevelop/Plugin"
] ]
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment