Commit 984e0148 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 57ea1283
Pipeline #164917 skipped
......@@ -52,7 +52,7 @@
"Description[ia]": "Le menu que normalmente monstra sur le pression dextere",
"Description[id]": "Menu yang biasanya tampil saat klik-kanan",
"Description[it]": "Il menu che normalmente appare al clic destro",
"Description[ko]": "오른쪽 단추를 눌렀을 때 나타나는 메뉴",
"Description[ko]": "오른쪽 단추를 클릭했을 때 나타나는 메뉴",
"Description[lt]": "Meniu, kuris įprastai rodomas spustelėjus dešiniuoju pelės mygtuku",
"Description[nl]": "Het menu dat normaal verschijnt bij rechtsklikken",
"Description[nn]": "Menyen som vanlegvis vert vist ved høgreklikking",
......
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