Commit aef817e7 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 752070ad
Pipeline #25671 skipped
......@@ -13,6 +13,7 @@
"Name[fi]": "Aditya Mehra",
"Name[fr]": "Aditya Mehra",
"Name[it]": "Aditya Mehra",
"Name[ko]": "Aditya Mehra",
"Name[lt]": "Aditya Mehra",
"Name[nl]": "Aditya Mehra",
"Name[nn]": "Aditya Mehra",
......@@ -35,6 +36,7 @@
"Description[fi]": "Bigscreen-liitännäinen",
"Description[fr]": "Module externe « Bigscreen »",
"Description[it]": "Estensione Bigscreen",
"Description[ko]": "큰 화면 플러그인",
"Description[lt]": "Bigscreen papildinys",
"Description[nl]": "Bigscreen plug-in",
"Description[nn]": "Bigscreen-tillegg",
......@@ -59,6 +61,7 @@
"Name[fi]": "Bigscreen",
"Name[fr]": "Bigscreen",
"Name[it]": "Bigscreen",
"Name[ko]": "큰 화면",
"Name[lt]": "Bigscreen",
"Name[nl]": "Bigscreen",
"Name[nn]": "Bigscreen",
......
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