Commit bc5b9dd8 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 0ae0ddd9
...@@ -130,6 +130,7 @@ Comment[sv]=Sammanbind punkterna för att skapa fyrkanter ...@@ -130,6 +130,7 @@ Comment[sv]=Sammanbind punkterna för att skapa fyrkanter
Comment[tr]=Noktaları birleştirerek kare yap Comment[tr]=Noktaları birleştirerek kare yap
Comment[uk]=З’єднайте точки, щоб створити квадрати Comment[uk]=З’єднайте точки, щоб створити квадрати
Comment[x-test]=xxConnect the dots to create squaresxx Comment[x-test]=xxConnect the dots to create squaresxx
Comment[zh_CN]=通过点连接创建方形
Comment[zh_TW]=將點連起來組成方塊 Comment[zh_TW]=將點連起來組成方塊
Terminal=false Terminal=false
Categories=Game;BoardGame;Qt;KDE; Categories=Game;BoardGame;Qt;KDE;
......
Supports Markdown
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