Commit 954581e5 authored by Script Kiddy's avatar Script Kiddy

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 8bb3c9fc
......@@ -58,7 +58,7 @@ Name[nb]=(3) Delrutiner
Name[nds]=(3) Funkschonen
Name[ne]=(३) सहायक कार्यतालिका
Name[nl]=(3) Subroutines
Name[nn]=(3) Subrutinar
Name[nn]=(3) Underrutinar
Name[or]=(3) Subroutines
Name[pa]=(3) ਸਬ-ਰੂਟੀਨ
Name[pl]=(3) Podprogramy
......
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