Commit 24270245 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 01939d76
......@@ -2,7 +2,6 @@
Exec=kreversi -qwindowtitle %c
Name=KReversi
Name[af]=Kreversi
Name[ast]=KReversi
Name[be]=Рэверсі
Name[bn]=কে-রিভার্সি
Name[br]=KReversi
......@@ -72,7 +71,6 @@ Name[zh_TW]=KReversi 黑白棋
Type=Application
X-DocPath=kreversi/index.html
GenericName=Reversi Board Game
GenericName[ast]=Xuegu de tableru Reversi
GenericName[be]=Настольная гульня ў рэверсі
GenericName[bn]=ছককেন্দ্রিক খেলা রিভার্সি
GenericName[br]=Ur c'hoari taolenn Reversi
......
......@@ -47,7 +47,6 @@ Comment[zh_TW]=黑白棋棋盤遊戲
[Event/click]
Name=Click
Name[ast]=Calcar
Name[be]=Пстрычка
Name[bn]=ক্লিক
Name[br]=Klik
......@@ -114,7 +113,6 @@ Name[x-test]=xxClickxx
Name[zh_CN]=单击
Name[zh_TW]=點擊
Comment=Click
Comment[ast]=Calcar
Comment[be]=Пстрычка
Comment[bn]=ক্লিক
Comment[br]=Klik
......@@ -184,7 +182,6 @@ Sound=reversi-click.wav
[Event/won]
Name=Game Won
Name[ast]=Partida ganada
Name[be]=Перамога
Name[bs]=Pobjeda
Name[ca]=Partida guanyada
......@@ -238,7 +235,6 @@ Name[x-test]=xxGame Wonxx
Name[zh_CN]=赢了游戏
Name[zh_TW]=您贏了
Comment=Game won
Comment[ast]=Partida ganada
Comment[be]=Перамога
Comment[bn]=খেল খতম
Comment[br]=Gounezet eo ar c'hoari
......@@ -306,7 +302,6 @@ Sound=reversi-won.wav
[Event/lost]
Name=Game Lost
Name[ast]=Partida perdida
Name[bs]=Poraz
Name[ca]=Partida perduda
Name[ca@valencia]=Partida perduda
......@@ -360,7 +355,6 @@ Name[x-test]=xxGame Lostxx
Name[zh_CN]=输了游戏
Name[zh_TW]=您輸了
Comment=Game lost
Comment[ast]=Partida perdida
Comment[be]=Параза
Comment[bn]=খেলায় হেরে গিয়েছেন
Comment[br]=Koll eo ar c'hoari
......@@ -426,7 +420,6 @@ Action=None
[Event/draw]
Name=Draw
Name[ast]=Dibuxar
Name[be]=Нічыя
Name[bn]=অমীমাংসিত
Name[br]=Tresañ
......@@ -489,7 +482,6 @@ Name[x-test]=xxDrawxx
Name[zh_CN]=平局
Name[zh_TW]=發牌
Comment=Draw
Comment[ast]=Dibuxar
Comment[be]=Нічыя
Comment[bn]=অমীমাংসিত
Comment[br]=Tresañ
......@@ -555,7 +547,6 @@ Action=None
[Event/illegal_move]
Name=Illegal Move
Name[ast]=Movimientu illegal
Name[be]=Няправільны ход
Name[bn]=অবৈধ চাল
Name[bs]=Nedozvoljen potez
......@@ -615,7 +606,6 @@ Name[x-test]=xxIllegal Movexx
Name[zh_CN]=无效移动
Name[zh_TW]=移動不合法
Comment=Illegal move
Comment[ast]=Movimientu illegal
Comment[be]=Няправільны ход
Comment[bn]=অবৈধ চাল
Comment[bs]=Nedozvoljen 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