Commit 04b54a25 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 a1391f60
Pipeline #82036 skipped
......@@ -3,6 +3,7 @@
"Id": "evolution1importer",
"Name": "Evolution1 Importer",
"Name[ar]": "مستورد «إڤلوشن١»",
"Name[az]": "Evolution1 idxalçısı",
"Name[ca@valencia]": "Importador de l'Evolution",
"Name[ca]": "Importador de l'Evolution",
"Name[cs]": "Importér Evolution1",
......
......@@ -3,6 +3,7 @@
"Id": "evolution2importer",
"Name": "Evolution2 Importer",
"Name[ar]": "مستورد «إڤلوشن٢»",
"Name[az]": "Evolution2 idxalçısı",
"Name[ca@valencia]": "Importador de l'Evolution2",
"Name[ca]": "Importador de l'Evolution2",
"Name[cs]": "Importér Evolution2",
......
......@@ -3,6 +3,7 @@
"Id": "gearyimporter",
"Name": "Geary Importer",
"Name[ar]": "مستورد Geary",
"Name[az]": "Geary idxalçısı",
"Name[ca@valencia]": "Importador del Geary",
"Name[ca]": "Importador del Geary",
"Name[cs]": "Importér Geary",
......
......@@ -3,6 +3,7 @@
"Id": "mailappimporter",
"Name": "MailApp Importer",
"Name[ar]": "مستورد MailApp",
"Name[az]": "MailApp idxalçısı",
"Name[ca@valencia]": "Importador del MailApp",
"Name[ca]": "Importador del MailApp",
"Name[cs]": "Importér MailApp",
......
......@@ -3,6 +3,7 @@
"Id": "nylasmailimporter",
"Name": "Nylas Mail Importer",
"Name[ar]": "مستورد «بريد نايلِس»",
"Name[az]": "Nylas Mail idxalçısı",
"Name[ca@valencia]": "Importador del Nylas Mail",
"Name[ca]": "Importador del Nylas Mail",
"Name[cs]": "Importér Nylas Mail",
......
......@@ -3,6 +3,7 @@
"Id": "oeimporter",
"Name": "OE Importer",
"Name[ar]": "مستورد OE",
"Name[az]": "OE idxalçısı",
"Name[ca@valencia]": "Importador de l'OE",
"Name[ca]": "Importador de l'OE",
"Name[cs]": "Importér OE",
......
......@@ -3,6 +3,7 @@
"Id": "operaimporter",
"Name": "Opera Importer",
"Name[ar]": "مستورد «أوپرا»",
"Name[az]": "Opera idxalçısı",
"Name[ca@valencia]": "Importador de l'Opera",
"Name[ca]": "Importador de l'Opera",
"Name[cs]": "Importér Opera",
......
......@@ -3,6 +3,7 @@
"Id": "pmailimporter",
"Name": "PMail Importer",
"Name[ar]": "مستورد PMail",
"Name[az]": "PMail idxalçısı",
"Name[ca@valencia]": "Importador del PMail",
"Name[ca]": "Importador del PMail",
"Name[cs]": "Importér PMail",
......
......@@ -3,6 +3,7 @@
"Id": "thebatimporter",
"Name": "TheBat Importer",
"Name[ar]": "مستورد TheBat",
"Name[az]": "TheBat idxalçısı",
"Name[ca@valencia]": "Importador del TheBat",
"Name[ca]": "Importador del TheBat",
"Name[cs]": "Importér TheBat",
......
[Desktop Entry]
Name=Example
Name[ar]=مثال
Name[az]=Nümunə
Name[ca]=Exemple
Name[ca@valencia]=Exemple
Name[cs]=Příklad
......@@ -31,6 +32,7 @@ Name[zh_CN]=示例
Name[zh_TW]=範例
Description=Example theme for header.
Description[ar]=سمة مثال للتّرويسة.
Description[az]=Başlıq üçün mövzu nümunəsi.
Description[ca]=Tema d'exemple per a la capçalera.
Description[ca@valencia]=Tema d'exemple per a la capçalera.
Description[da]=Eksempeltema på header.
......
[Desktop Entry]
Name=Example fancy
Name[ar]=مثال عن الخياليّة
Name[az]=Gözəl görüntü nümunəsi
Name[ca]=Exemple elegant
Name[ca@valencia]=Exemple elegant
Name[da]=Eksempel på flot
......@@ -30,6 +31,7 @@ Name[zh_CN]=华丽主题示例
Name[zh_TW]=Example fancy
Description=Create fancy theme with grantlee.
Description[ar]=أنشئ سمة خياليّة بِ‍«غرانتلي».
Description[az]=Grantlee ilə gözəl görünən mövzu yaradın
Description[ca]=Crea un tema elegant amb les Grantlee.
Description[ca@valencia]=Crea un tema elegant amb les Grantlee.
Description[da]=Opret flot tema med grantlee.
......
......@@ -2,6 +2,7 @@
"KPlugin": {
"Description": "This plugin allows you to import/export CSV.",
"Description[ar]": "تتيح لك هذه الملحقة استيراد وتصدير CSV.",
"Description[az]": "Bu əlavə, sizə CSV-ləri idxal/ixrac etməyə imkan verir.",
"Description[ca@valencia]": "Aquest connector permet importar o exportar els CSV.",
"Description[ca]": "Aquest connector permet importar o exportar els CSV.",
"Description[cs]": "Tento modul umožňuje import/export CSV.",
......@@ -35,6 +36,7 @@
"Id": "kaddressbookimportexportcsv",
"Name": "Import/Export CSV",
"Name[ar]": "استيراد/تصدير CSV",
"Name[az]": "CSV idxal/ixrac",
"Name[ca@valencia]": "Importa/exporta el CSV",
"Name[ca]": "Importa/exporta el CSV",
"Name[cs]": "Importovat/Exportovat CSV",
......
......@@ -2,6 +2,7 @@
"KPlugin": {
"Description": "This plugin allows you to import/export GMX.",
"Description[ar]": "تتيح لك هذه الملحقة استيراد وتصدير GMX.",
"Description[az]": "Bu əlavə, sizə GMX-ləri idxal/ixrac etməyə imkan verir.",
"Description[ca@valencia]": "Aquest connector permet importar o exportar els GMX.",
"Description[ca]": "Aquest connector permet importar o exportar els GMX.",
"Description[cs]": "Tento modul umožňuje import/export GMX.",
......@@ -35,6 +36,7 @@
"Id": "kaddressbookimportexportgmx",
"Name": "Import Export GMX",
"Name[ar]": "استيراد وتصدير GMX",
"Name[az]": "GMX idxal/ixrac",
"Name[ca@valencia]": "Importa/exporta el GMX",
"Name[ca]": "Importa/exporta el GMX",
"Name[cs]": "Importovat/Exportovat GMX",
......
......@@ -2,6 +2,7 @@
"KPlugin": {
"Description": "This plugin allows you to import/export LDAP contacts.",
"Description[ar]": "تتيح لك هذه الملحقة استيراد وتصدير متراسلي LDAP.",
"Description[az]": "Bu əlavə, sizə LDAP-ları idxal/ixrac etməyə imkan verir.",
"Description[ca@valencia]": "Aquest connector permet importar o exportar els contactes LDAP.",
"Description[ca]": "Aquest connector permet importar o exportar els contactes LDAP.",
"Description[cs]": "Tento modul umožňuje import/export kontaktů LDAP.",
......@@ -35,6 +36,7 @@
"Id": "kaddressbookimportexportldap",
"Name": "Import/Export LDAP Contacts",
"Name[ar]": "استيراد/تصدير متراسلو LDAP",
"Name[az]": "LDAP idxal/ixrac",
"Name[ca@valencia]": "Importa/exporta els contactes LDAP",
"Name[ca]": "Importa/exporta els contactes LDAP",
"Name[cs]": "Importovat/Exportovat kontakty LDAP",
......
......@@ -2,6 +2,7 @@
"KPlugin": {
"Description": "This plugin allows you to import/export LDIF.",
"Description[ar]": "تتيح لك هذه الملحقة استيراد وتصدير LDIF.",
"Description[az]": "Bu əlavə, sizə LDİF-ləri idxal/ixrac etməyə imkan verir.",
"Description[ca@valencia]": "Aquest connector permet importar o exportar els LDIF.",
"Description[ca]": "Aquest connector permet importar o exportar els LDIF.",
"Description[cs]": "Tento modul umožňuje import/export LDIF.",
......@@ -35,6 +36,7 @@
"Id": "kaddressbookimportexportldif",
"Name": "Import/Export LDIF",
"Name[ar]": "استيراد/تصدير LDIF",
"Name[az]": "LDİF idxal/ixrac",
"Name[ca@valencia]": "Importa/exporta el LDIF",
"Name[ca]": "Importa/exporta el LDIF",
"Name[cs]": "Importovat/Exportovat LDIF",
......
......@@ -2,6 +2,7 @@
"KPlugin": {
"Description": "This plugin allows you to import/export vCards.",
"Description[ar]": "تتيح لك هذه الملحقة استيراد وتصدير بطاقات vCard.",
"Description[az]": "Bu əlavə, sizə vCard-ları idxal/ixrac etməyə imkan verir.",
"Description[ca@valencia]": "Aquest connector permet importar o exportar les vCard.",
"Description[ca]": "Aquest connector permet importar o exportar les vCard.",
"Description[cs]": "Tento modul umožňuje import/export vizitek.",
......@@ -35,6 +36,7 @@
"Id": "kaddressbookimportexportvcard",
"Name": "Import/Export vCard",
"Name[ar]": "استيراد/تصدير vCard",
"Name[az]": "vCard idxal/ixrac",
"Name[ca@valencia]": "Importa/exporta la vCard",
"Name[ca]": "Importa/exporta la vCard",
"Name[cs]": "Importovat/Exportovat vCard",
......
{
"KPlugin": {
"Description": "This plugin allows you to import/export Windows Contacts.",
"Description[az]": "Bu əlavə, sizə Windows Əlaqələrini idxal/ixrac etməyə imkan verir.",
"Description[ca@valencia]": "Aquest connector permet importar/exportar els contactes de Windows.",
"Description[ca]": "Aquest connector permet importar/exportar els contactes de Windows.",
"Description[cs]": "Tento modul umožňuje import/export kontaktů Windows.",
......@@ -24,6 +25,7 @@
"EnabledByDefault": "false",
"Id": "kaddressbookimportexportwindowscontact",
"Name": "Import/Export Windows Contact",
"Name[az]": "Windows əlaqə idxal/ixrac",
"Name[ca@valencia]": "Importa/exporta un Contact del Windows",
"Name[ca]": "Importa/exporta un Contact del Windows",
"Name[cs]": "Importovat/Exportovat kontakty Windows",
......
......@@ -2,6 +2,7 @@
"KPlugin": {
"Description": "This plugin allows you to check the Gravatar images.",
"Description[ar]": "تتيح لك هذه الملحقة فحص صور «غراڤاتار».",
"Description[az]": "Bu əlavə, sizə Gravatar şəkillərini istifadə etməyə imkan verir.",
"Description[ca@valencia]": "Aquest connector permet comprovar les imatges «Gravatar».",
"Description[ca]": "Aquest connector permet comprovar les imatges «Gravatar».",
"Description[cs]": "Tento modul umožňuje kontrolovat obrázky Gravatar.",
......@@ -35,6 +36,7 @@
"Id": "kaddressbookcheckgravatar",
"Name": "Check Gravatar",
"Name[ar]": "فحص «غراڤاتار»",
"Name[az]": "Gravatar ilə inteqrasiya",
"Name[ca@valencia]": "Comprova el «Gravatar»",
"Name[ca]": "Comprova el «Gravatar»",
"Name[cs]": "Zkontrolovat Gravatar",
......
......@@ -2,6 +2,7 @@
"KPlugin": {
"Description": "This plugin allows you to merge contacts.",
"Description[ar]": "تتيح لك هذه الملحقة دمج المتراسلين.",
"Description[az]": "Bu əlavə, sizə əlaqələri birləşdirməyə icazə verir.",
"Description[ca@valencia]": "Aquest connector permet fusionar contactes.",
"Description[ca]": "Aquest connector permet fusionar contactes.",
"Description[cs]": "Tento modul umožňuje sloučit kontakty.",
......@@ -35,6 +36,7 @@
"Id": "kaddressbookmergecontact",
"Name": "Merge Contacts",
"Name[ar]": "دمج المتراسلين",
"Name[az]": "Əlaqələri birləşdirin",
"Name[ca@valencia]": "Fusiona els contactes",
"Name[ca]": "Fusiona els contactes",
"Name[cs]": "Sloučit kontakty",
......
......@@ -2,6 +2,7 @@
"KPlugin": {
"Description": "This plugin allows you to search duplicate contacts.",
"Description[ar]": "تتيح لك هذه الملحقة البحث عن المتراسلين المتكرّرين.",
"Description[az]": "Bu əlavə, sizə əlaqələrin təkrarlarını axtarmağa imkan verir.",
"Description[ca@valencia]": "Aquest connector permet cercar contactes duplicats.",
"Description[ca]": "Aquest connector permet cercar contactes duplicats.",
"Description[cs]": "Tento modul umožňuje hledat duplicitní kontakt.",
......@@ -35,6 +36,7 @@
"Id": "kaddressbooksearchduplicatecontacts",
"Name": "Search Duplicate Contacts",
"Name[ar]": "البحث عن المتراسلين المتكرّرين",
"Name[az]": "Əlaqərin dublikatlarını axtarın",
"Name[ca@valencia]": "Cerca els contactes duplicats",
"Name[ca]": "Cerca els contactes duplicats",
"Name[cs]": "Hledat duplicitní kontakty",
......
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