Commit f575f789 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 9e50f11e
Pipeline #31928 skipped
[Desktop Entry]
Name=KMail Import Wizard
Name[ar]=مرشد استيراد «بريدك»
Name[az]=KMail İdxal Bələdçisi
Name[bs]=Čarobnjak za KMAIL uvoz
Name[ca]=Assistent d'importació del KMail
Name[ca@valencia]=Assistent d'importació del KMail
......@@ -47,6 +48,7 @@ Icon=kontact-import-wizard
X-DocPath=importwizard/index.html
Comment=Launch the import wizard to migrate data from mailer as thunderbird/evolution etc.
Comment[ar]=أطلِق مرشد الاستيراد لنقل البيانات من عميل بريد مثل «ثَندربيرد» أو «إڤلوشن» أو غيرها.
Comment[az]=Verilənlərin thunderbird/evolution və b. bu kimi poçt proqramlarından miqrasiya edilməsi üçün idxal bələdçisini işə salmaq.
Comment[bs]=Pokrenite i uvedite čarobnjaka za pomjeranje podataka iz mailera kao thunderbird/evolution etc.
Comment[ca]=Llança l'assistent d'importació per a migrar les dades dels agents de correus com el Thunderbird/Evolution, etc.
Comment[ca@valencia]=Llança l'assistent d'importació per a migrar les dades dels agents de correus com el Thunderbird/Evolution, etc.
......
......@@ -3,6 +3,7 @@
"Id": "balsaimporter",
"Name": "Balsa Importer",
"Name[ar]": "مستورد Balsa",
"Name[az]": "Balsadan idxal",
"Name[ca@valencia]": "Importador del Balsa",
"Name[ca]": "Importador del Balsa",
"Name[cs]": "Importér Balsa",
......
......@@ -3,6 +3,7 @@
"Id": "clawsmailimporter",
"Name": "ClawsMail Importer",
"Name[ar]": "مستورد «بريد كلاوس»",
"Name[az]": "ClawsMail-dən idxal",
"Name[ca@valencia]": "Importador del ClawsMail",
"Name[ca]": "Importador del ClawsMail",
"Name[cs]": "Importér ClawsMail",
......
......@@ -3,6 +3,7 @@
"Id": "evolution3importer",
"Name": "Evolution3 Importer",
"Name[ar]": "مستورد «إڤلوشن٣»",
"Name[az]": "Evolution3-dən idxal",
"Name[ca@valencia]": "Importador de l'Evolution3",
"Name[ca]": "Importador de l'Evolution3",
"Name[cs]": "Importér Evolution3",
......
......@@ -3,6 +3,7 @@
"Id": "icedoveimporter",
"Name": "Icedove Importer",
"Name[ar]": "مستورد «آيس‌دوڤ»",
"Name[az]": "İcedove-dən idxal",
"Name[ca@valencia]": "Importador de l'Icedove",
"Name[ca]": "Importador de l'Icedove",
"Name[cs]": "Importér Icedove",
......
......@@ -3,6 +3,7 @@
"Id": "seamonkeyimporter",
"Name": "SeaMonkey Importer",
"Name[ar]": "مستورد «سي‌مَنكي»",
"Name[az]": "SeaMonkey-dən idxal",
"Name[ca@valencia]": "Importador del SeaMonkey",
"Name[ca]": "Importador del SeaMonkey",
"Name[cs]": "Importér SeaMonkey",
......
......@@ -3,6 +3,7 @@
"Id": "sylpheedimporter",
"Name": "Sylpheed Importer",
"Name[ar]": "مستورد Sylpheed",
"Name[az]": "Sylpheed-dən idxal",
"Name[ca@valencia]": "Importador del Sylpheed",
"Name[ca]": "Importador del Sylpheed",
"Name[cs]": "Importér Sylpheed",
......
......@@ -3,6 +3,7 @@
"Id": "thunderbirdimporter",
"Name": "Thunderbird Importer",
"Name[ar]": "مستورد «ثَندربيرد»",
"Name[az]": "Thunderbird-dən idxal",
"Name[ca@valencia]": "Importador del Thunderbird",
"Name[ca]": "Importador del Thunderbird",
"Name[cs]": "Importér Thunderbird",
......
......@@ -3,6 +3,7 @@
"Id": "trojitaimporter",
"Name": "Trojita Importer",
"Name[ar]": "مستورد «تروجيتا»",
"Name[az]": "Trojita-dan idxal",
"Name[ca@valencia]": "Importador del Trojita",
"Name[ca]": "Importador del Trojita",
"Name[cs]": "Importér Trojitá",
......
Supports Markdown
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