Commit 7ea264d6 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 df9947f8
Pipeline #80491 skipped
......@@ -6,6 +6,7 @@
"Description[ia]": "Syntaxe de LaTeX per symbolos de unicode",
"Description[nl]": "LaTeX syntaxis voor unicode symbolen",
"Description[pl]": "Składnia LaTeX dla symboli unikodu",
"Description[sl]": "LaTeXova sintaksa simbolov unicode",
"Description[sv]": "Latex-syntax för Unicode-symboler",
"Description[uk]": "Синтаксис LaTeX для символів Unicode",
"Description[x-test]": "xxLaTeX syntax for unicode symbolsxx",
......@@ -15,6 +16,7 @@
"Name[ia]": "Completion de LaTeX",
"Name[nl]": "LaTeX-aanvulling",
"Name[pl]": "Uzupełnianie LaTeX",
"Name[sl]": "Kompletiranje LaTeXa",
"Name[sv]": "Latex-komplettering",
"Name[uk]": "Доповнення LaTeX",
"Name[x-test]": "xxLaTeX completionxx",
......
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