Commit 9020665c 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 7165f3ea
Pipeline #29089 skipped
......@@ -6,6 +6,7 @@
"Name[ca@valencia]": "Importador de l'Evolution",
"Name[ca]": "Importador de l'Evolution",
"Name[cs]": "Importér Evolution1",
"Name[da]": "Evolution1-importør",
"Name[de]": "Import-Modul für Evolution1",
"Name[en_GB]": "Evolution1 Importer",
"Name[es]": "Importador Evolution1",
......
......@@ -6,6 +6,7 @@
"Name[ca@valencia]": "Importador de l'Evolution2",
"Name[ca]": "Importador de l'Evolution2",
"Name[cs]": "Importér Evolution2",
"Name[da]": "Evolution2-importør",
"Name[de]": "Import-Modul für Evolution2",
"Name[en_GB]": "Evolution2 Importer",
"Name[es]": "Importador Evolution2",
......
......@@ -6,6 +6,7 @@
"Name[ca@valencia]": "Importador del Geary",
"Name[ca]": "Importador del Geary",
"Name[cs]": "Importér Geary",
"Name[da]": "Geary-importør",
"Name[de]": "Import-Modul für Geary",
"Name[en_GB]": "Geary Importer",
"Name[es]": "Importador Geary",
......
......@@ -6,6 +6,7 @@
"Name[ca@valencia]": "Importador del MailApp",
"Name[ca]": "Importador del MailApp",
"Name[cs]": "Importér MailApp",
"Name[da]": "MailApp-importør",
"Name[de]": "Import-Modul für MailApp",
"Name[en_GB]": "MailApp Importer",
"Name[es]": "Importador MailApp",
......
......@@ -6,6 +6,7 @@
"Name[ca@valencia]": "Importador del Nylas Mail",
"Name[ca]": "Importador del Nylas Mail",
"Name[cs]": "Importér Nylas Mail",
"Name[da]": "Nylas Mail-importør",
"Name[de]": "Import-Modul für Nylas Mail",
"Name[en_GB]": "Nylas Mail Importer",
"Name[es]": "Importador de correo Nylas",
......
......@@ -6,6 +6,7 @@
"Name[ca@valencia]": "Importador de l'OE",
"Name[ca]": "Importador de l'OE",
"Name[cs]": "Importér OE",
"Name[da]": "OE-importør",
"Name[de]": "Import-Modul für OE",
"Name[en_GB]": "OE Importer",
"Name[es]": "Importador OE",
......
......@@ -6,6 +6,7 @@
"Name[ca@valencia]": "Importador de l'Opera",
"Name[ca]": "Importador de l'Opera",
"Name[cs]": "Importér Opera",
"Name[da]": "Opera-importør",
"Name[de]": "Import-Modul für Opera",
"Name[en_GB]": "Opera Importer",
"Name[es]": "Importador Opera",
......
......@@ -6,6 +6,7 @@
"Name[ca@valencia]": "Importador del PMail",
"Name[ca]": "Importador del PMail",
"Name[cs]": "Importér PMail",
"Name[da]": "PMail-importør",
"Name[de]": "Import-Modul für PMail",
"Name[en_GB]": "PMail Importer",
"Name[es]": "Importador PMail",
......
......@@ -6,6 +6,7 @@
"Name[ca@valencia]": "Importador del TheBat",
"Name[ca]": "Importador del TheBat",
"Name[cs]": "Importér TheBat",
"Name[da]": "TheBat-importør",
"Name[de]": "Import-Modul für TheBat",
"Name[en_GB]": "TheBat Importer",
"Name[es]": "Importador TheBat",
......
......@@ -38,6 +38,7 @@
"Name[ca@valencia]": "Comprova el «Gravatar»",
"Name[ca]": "Comprova el «Gravatar»",
"Name[cs]": "Zkontrolovat Gravatar",
"Name[da]": "Tjek gravatar",
"Name[de]": "Gravatar überprüfen",
"Name[en_GB]": "Check Gravatar",
"Name[es]": "Comprobar Gravatar",
......
......@@ -32,6 +32,7 @@
"Name[ca@valencia]": "Markdown",
"Name[ca]": "Markdown",
"Name[cs]": "Markdown",
"Name[da]": "Markdown",
"Name[de]": "Markdown",
"Name[en_GB]": "Markdown",
"Name[es]": "Marcado",
......
......@@ -38,6 +38,7 @@
"Name[ca@valencia]": "Obri un editor extern",
"Name[ca]": "Obre un editor extern",
"Name[cs]": "Otevřít externí editor",
"Name[da]": "Åbn ekstern brevskriver",
"Name[de]": "Externen E-Mail-Editor öffnen",
"Name[en_GB]": "Open external composer",
"Name[es]": "Abrir editor externo",
......
......@@ -37,6 +37,7 @@
"Name[ca@valencia]": "Correcció automàtica",
"Name[ca]": "Correcció automàtica",
"Name[cs]": "Automatická oprava",
"Name[da]": "Autokorrektur",
"Name[de]": "Autokorrektur",
"Name[en_GB]": "Autocorrection",
"Name[es]": "Autocorrección",
......
......@@ -37,6 +37,7 @@
"Name[ca@valencia]": "Inserció d'un espai no divisible",
"Name[ca]": "Inserció d'un espai no divisible",
"Name[cs]": "Vložit nezlomitelnou mezeru",
"Name[da]": "Indsæt mellemrum uden linjeskift",
"Name[de]": "Geschütztes Leerzeichen einfügen",
"Name[en_GB]": "Insert Non Breaking Space",
"Name[es]": "Insertar espacio no divisible",
......
......@@ -31,6 +31,7 @@
"Name[ca@valencia]": "Comparteix el text",
"Name[ca]": "Comparteix el text",
"Name[cs]": "Sdílet text",
"Name[da]": "Del tekst",
"Name[de]": "Text weitergeben",
"Name[en_GB]": "Share Text",
"Name[es]": "Compartir texto",
......
......@@ -30,6 +30,7 @@
"Name": "French Grammar Checker",
"Name[ca@valencia]": "Comprova la gramàtica en francés",
"Name[ca]": "Comprova la gramàtica en francès",
"Name[da]": "Fransk grammatikkontrol",
"Name[de]": "Französische Grammatikprüfung",
"Name[en_GB]": "French Grammar Checker",
"Name[es]": "Corrector de gramática francesa",
......
......@@ -30,6 +30,7 @@
"Name": "Grammar Checker (LanguageTool)",
"Name[ca@valencia]": "Comprova la gramàtica (LanguageTool)",
"Name[ca]": "Comprova la gramàtica (LanguageTool)",
"Name[da]": "Grammatikkontrol (LanguageTool)",
"Name[de]": "Grammatikprüfung (LanguageTool)",
"Name[en_GB]": "Grammar Checker (LanguageTool)",
"Name[es]": "Corrector gramatical (LanguageTool)",
......
......@@ -37,6 +37,7 @@
"Name[ca@valencia]": "Contra el correu brossa",
"Name[ca]": "Contra el correu brossa",
"Name[cs]": "Antispam",
"Name[da]": "Antispam",
"Name[de]": "Anti-Spam",
"Name[en_GB]": "Antispam",
"Name[es]": "Anti correo basura",
......
......@@ -37,6 +37,7 @@
"Name[ca@valencia]": "Contra els virus",
"Name[ca]": "Contra els virus",
"Name[cs]": "Antivirus",
"Name[da]": "Antivirus",
"Name[de]": "Anti-Virus",
"Name[en_GB]": "Antivirus",
"Name[es]": "Antivirus",
......
......@@ -35,6 +35,7 @@
"Name[ar]": "ملحقة الخبراء",
"Name[ca@valencia]": "Connector expert",
"Name[ca]": "Connector expert",
"Name[da]": "Ekspert-plugin",
"Name[de]": "Experten-Modul",
"Name[en_GB]": "Expert Plugin",
"Name[es]": "Complemento experto",
......
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