Commit 3ed9d869 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 b4801200
......@@ -67,7 +67,6 @@ 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
......@@ -133,7 +132,6 @@ 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
......
......@@ -41,7 +41,6 @@ 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
......@@ -41,7 +41,6 @@ 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]
......@@ -110,7 +109,7 @@ Name[ug]=چەك
Name[uk]=Клац
Name[wa]=Clitchî
Name[x-test]=xxClickxx
Name[zh_CN]=
Name[zh_CN]=
Name[zh_TW]=點擊
Comment=Click
Comment[ast]=Calcar
......@@ -176,7 +175,7 @@ Comment[ug]=چەك
Comment[uk]=Клац
Comment[wa]=Clitchî
Comment[x-test]=xxClickxx
Comment[zh_CN]=
Comment[zh_CN]=
Comment[zh_TW]=點擊
Action=Sound
Sound=reversi-click.wav
......@@ -485,7 +484,6 @@ Name[tr]=Berabere
Name[ug]=سىز
Name[uk]=Нічия
Name[x-test]=xxDrawxx
Name[zh_CN]=平局
Name[zh_TW]=發牌
Comment=Draw
Comment[ast]=Dibuxar
......@@ -548,7 +546,6 @@ Comment[tr]=Beraberlik
Comment[ug]=سىز
Comment[uk]=Нічия
Comment[x-test]=xxDrawxx
Comment[zh_CN]=平局
Comment[zh_TW]=發牌
Action=None
......@@ -611,7 +608,6 @@ 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
......@@ -670,6 +666,5 @@ 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