Commit 8427c27c 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 1d142682
......@@ -571,7 +571,7 @@ Name[fa]=حرکت غیر‌قانونی
Name[fi]=Virheellinen siirto
Name[fr]=Déplacement interdit
Name[ga]=Beart Neamhcheadaithe
Name[gl]=Movemento inaceptábel
Name[he]=מהלך לא חוקי
Name[hne]=अवैध चाल
Name[hr]=Nepravilan potez
......@@ -630,7 +630,7 @@ Comment[fa]=حرکت غیر‌قانونی
Comment[fi]=Virheellinen siirto
Comment[fr]=Déplacement interdit
Comment[ga]=Beart neamhcheadaithe
Comment[gl]=Movemento ilegal
Comment[gl]=Movemento inaceptábel
Comment[he]=מהלך לא חוקי
Comment[hne]=अवैध चाल
Comment[hr]=Nepravilan potez
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