Commit 8d35a77b 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 10049631
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
"Name[sv]": "Nylas Mail-importverktyg", "Name[sv]": "Nylas Mail-importverktyg",
"Name[uk]": "Засіб імпортування з Nylas", "Name[uk]": "Засіб імпортування з Nylas",
"Name[x-test]": "xxNylas Mail Importerxx", "Name[x-test]": "xxNylas Mail Importerxx",
"Name[zh_CN]": "Nylas 邮件导入器",
"ServiceTypes": [ "ServiceTypes": [
"ImportWizard/PluginMailImporter" "ImportWizard/PluginMailImporter"
], ],
......
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