Commit 002c1320 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 23f8d75e
Pipeline #90836 skipped
......@@ -9,6 +9,7 @@
"Description[es]": "Sintaxis de LaTeX para símbolos Unicode",
"Description[fr]": "Syntaxe LaTeX pour les symboles Unicode",
"Description[ia]": "Syntaxe de LaTeX per symbolos de unicode",
"Description[it]": "Sintassi LaTeX per i simboli unicode",
"Description[nl]": "LaTeX syntaxis voor unicode symbolen",
"Description[pl]": "Składnia LaTeX dla symboli unikodu",
"Description[sl]": "LaTeXova sintaksa simbolov unicode",
......@@ -27,6 +28,7 @@
"Name[es]": "Terminación de LaTeX",
"Name[fr]": "Complètement LaTeX",
"Name[ia]": "Completion de LaTeX",
"Name[it]": "Completamento LaTeX",
"Name[nl]": "LaTeX-aanvulling",
"Name[pl]": "Uzupełnianie LaTeX",
"Name[sl]": "Kompletiranje LaTeXa",
......
......@@ -37,7 +37,7 @@
"Name[fi]": "Tiedostovaihto",
"Name[fr]": "Commutateur de documents",
"Name[ia]": "Commutator de documento",
"Name[it]": "Scambiatore di documenti",
"Name[it]": "Selettore di documenti",
"Name[ko]": "문서 전환기",
"Name[my]": "မှတ်တမ်းပုံနှိပ်မူ ပြောင်းလဲကိရိယာ",
"Name[nl]": "Documentenwisselaar",
......
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