Commit 7d769304 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 ea2e4d46
......@@ -16,6 +16,7 @@
"Name[gl]": "Complemento de arquivo RAR",
"Name[he]": "תוסף ארכיוני RAR",
"Name[it]": "Estensione per archivi RAR",
"Name[ja]": "RAR アーカイブ用プラグイン",
"Name[nb]": "Programtillegg for RAR-arkiv",
"Name[nl]": "RAR-archiefplug-in",
"Name[nn]": "RAR-arkivtillegg",
......
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