Commit f3236b0b authored by Script Kiddy's avatar Script Kiddy
Browse files

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 d9d3c5d4
...@@ -2,6 +2,11 @@ ...@@ -2,6 +2,11 @@
"KPlugin": { "KPlugin": {
"Id": "regexpeditorlineedit", "Id": "regexpeditorlineedit",
"Name": "RegexpEditorLineEdit", "Name": "RegexpEditorLineEdit",
"Name[ca@valencia]": "EditaLíniaEditorExpReg",
"Name[ca]": "EditaLíniaEditorExpReg",
"Name[sv]": "Radeditor för reguljära uttryck",
"Name[uk]": "Редактор формальних виразів",
"Name[x-test]": "xxRegexpEditorLineEditxx",
"ServiceTypes": [ "ServiceTypes": [
"LibKSieve/RegexpEditorLineEdit" "LibKSieve/RegexpEditorLineEdit"
], ],
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