Commit ab04f0ac 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 6b36eee0
......@@ -2,6 +2,12 @@
"KPlugin": {
"Id": "balsaimporter",
"Name": "Balsa Importer",
"Name[ca]": "Importador del Balsa",
"Name[nl]": "Balsa-importeur",
"Name[pl]": "Importer Balsa",
"Name[pt]": "Importador do Balsa",
"Name[uk]": "Засіб імпортування з Balsa",
"Name[x-test]": "xxBalsa Importerxx",
"ServiceTypes": [
"ImportWizard/PluginMailImporter"
],
......
......@@ -2,6 +2,12 @@
"KPlugin": {
"Id": "clawsmailimporter",
"Name": "ClawsMail Importer",
"Name[ca]": "Importador del ClawsMail",
"Name[nl]": "ClawsMail-importeur",
"Name[pl]": "Importer ClawsMail",
"Name[pt]": "Importador do ClawsMail",
"Name[uk]": "Засіб імпортування з ClawsMail",
"Name[x-test]": "xxClawsMail Importerxx",
"ServiceTypes": [
"ImportWizard/PluginMailImporter"
],
......
......@@ -2,6 +2,12 @@
"KPlugin": {
"Id": "gearyimporter",
"Name": "Geary Importer",
"Name[ca]": "Importador del Geary",
"Name[nl]": "Geary-importeur",
"Name[pl]": "Importer Geary",
"Name[pt]": "Importador do Geary",
"Name[uk]": "Засіб імпортування з Geary",
"Name[x-test]": "xxGeary Importerxx",
"ServiceTypes": [
"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