Commit 8ad58850 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 cb558930
......@@ -31,7 +31,7 @@ Name[ga]=(2) Glaonna ar an chóras
Name[gl]=(2) Chamadas do sistema
Name[gu]=(૨) સિસ્ટમ કૉલ્સ
Name[he]=קריאות מערכת (2)
Name[hi]=(2) सिस्टम काल्स
Name[hi]=(2) तंत्र काल्स
Name[hne]=(2) सिसटम काल्स
Name[hr]=(2) Sistemski pozivi
Name[hsb]=(2) Systemowe přikazy
......
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