Commit e5c79905 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 9d6019e7
......@@ -67,6 +67,7 @@ Name[vi]=KReversi
Name[wa]=KReversi
Name[xh]=KReversi
Name[x-test]=xxKReversixx
Name[zh_CN]=KReversi
Name[zh_TW]=KReversi 黑白棋
Type=Application
X-DocPath=kreversi/index.html
......@@ -132,6 +133,7 @@ GenericName[ug]=Reversi تاختا ئويۇنى
GenericName[uk]=Гра на дошці (реверсі)
GenericName[wa]=Djeu d' platea Reversi
GenericName[x-test]=xxReversi Board Gamexx
GenericName[zh_CN]=黑白棋游戏
GenericName[zh_TW]=黑白棋棋盤遊戲
Terminal=false
Icon=kreversi
......
......@@ -42,6 +42,7 @@ Name[sv]=Othello standardtema
Name[tr]=KReversi Öntanımlı Teması
Name[uk]=Типова тема KReversi
Name[x-test]=xxKReversi Default Themexx
Name[zh_CN]=KReversi 默认主题
Name[zh_TW]=KReversi 預設主題
FileName=default_theme.svgz
Author=Mauricio Piacentini
......@@ -42,6 +42,7 @@ Comment[sv]=Spelet Othello
Comment[tr]=Reversi Oyunu
Comment[uk]=Гра KReversi
Comment[x-test]=xxKReversi Gamexx
Comment[zh_CN]=KReversi 游戏
Comment[zh_TW]=黑白棋棋盤遊戲
[Event/click]
......@@ -611,6 +612,7 @@ Name[tg]=Ҳаракати Нодуруст
Name[tr]=Geçersiz Hamle
Name[uk]=Недозволений хід
Name[x-test]=xxIllegal Movexx
Name[zh_CN]=无效移动
Name[zh_TW]=移動不合法
Comment=Illegal move
Comment[ast]=Movimientu illegal
......@@ -669,5 +671,6 @@ Comment[ta]=தவறான நகர்த்தல்
Comment[tr]=Geçersiz hamle
Comment[uk]=Недозволений хід
Comment[x-test]=xxIllegal movexx
Comment[zh_CN]=无效移动
Comment[zh_TW]=移動不合法
Action=None
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