Commit 7baa4221 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 6b9a40ff
......@@ -127,6 +127,7 @@ Comment[sr@ijekavian]=Спајајте тачке и освајајте поља
Comment[sr@ijekavianlatin]=Spajajte tačke i osvajajte polja
Comment[sr@latin]=Spajajte tačke i osvajajte polja
Comment[sv]=Sammanbind punkterna för att skapa fyrkanter
Comment[tr]=Noktaları birleştirerek kare yap
Comment[uk]=З’єднайте точки, щоб створити квадрати
Comment[x-test]=xxConnect the dots to create squaresxx
Terminal=false
......
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