Commit e1359e4a authored by Script Kiddy's avatar Script Kiddy

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 42c2207f
......@@ -66,6 +66,7 @@ Name[uz@cyrillic]=KReversi
Name[vi]=KReversi
Name[wa]=KReversi
Name[xh]=KReversi
Name[x-test]=xxKReversixx
Name[zh_CN]=KReversi
Name[zh_TW]=KReversi 黑白棋
Type=Application
......@@ -131,6 +132,7 @@ GenericName[tr]=Reversi Tahta Oyunu
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
......
......@@ -42,6 +42,7 @@ Name[sr@latin]=Podrazumevana tema K‑reversija
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
......
......@@ -43,6 +43,7 @@ Comment[sr@latin]=K‑reversi
Comment[sv]=Spelet Othello
Comment[tr]=Reversi Oyunu
Comment[uk]=Гра KReversi
Comment[x-test]=xxKReversi Gamexx
Comment[zh_CN]=KReversi 游戏
Comment[zh_TW]=黑白棋棋盤遊戲
......@@ -111,6 +112,7 @@ Name[tr]=Tık
Name[ug]=چەك
Name[uk]=Клац
Name[wa]=Clitchî
Name[x-test]=xxClickxx
Name[zh_CN]=单击
Name[zh_TW]=點擊
Comment=Click
......@@ -176,6 +178,7 @@ Comment[tr]=Tık
Comment[ug]=چەك
Comment[uk]=Клац
Comment[wa]=Clitchî
Comment[x-test]=xxClickxx
Comment[zh_CN]=单击
Comment[zh_TW]=點擊
Action=Sound
......@@ -233,6 +236,7 @@ Name[sv]=Du vann spelet
Name[te]=ఆట నెగ్గావు
Name[tr]=Oyun Kazanıldı
Name[uk]=Гру виграно
Name[x-test]=xxGame Wonxx
Name[zh_CN]=赢了游戏
Name[zh_TW]=您贏了
Comment=Game won
......@@ -296,6 +300,7 @@ Comment[tg]=Дар бозӣ ғолиб омадед
Comment[tr]=Oyun Kazanıldı
Comment[ug]=ئويۇن ئۇتتى
Comment[uk]=Гру виграно
Comment[x-test]=xxGame wonxx
Comment[zh_CN]=赢了游戏
Comment[zh_TW]=您贏了
Action=Sound
......@@ -353,6 +358,7 @@ Name[sv]=Du förlorade spelet
Name[te]=ఆట ఓడిపొయావు
Name[tr]=Oyun Kaybedildi
Name[uk]=Гру програно
Name[x-test]=xxGame Lostxx
Name[zh_CN]=输了游戏
Name[zh_TW]=您輸了
Comment=Game lost
......@@ -415,6 +421,7 @@ Comment[te]=ఆట ఓడిపొయావు
Comment[tg]=Дар бозӣ мағлуб шудед
Comment[tr]=Oyun kaybedildi
Comment[uk]=Гру програно
Comment[x-test]=xxGame lostxx
Comment[zh_CN]=输了游戏
Comment[zh_TW]=您輸了
Action=None
......@@ -480,6 +487,7 @@ Name[tg]=Кашидан
Name[tr]=Berabere
Name[ug]=سىز
Name[uk]=Нічия
Name[x-test]=xxDrawxx
Name[zh_CN]=绘制
Name[zh_TW]=發牌
Comment=Draw
......@@ -542,6 +550,7 @@ Comment[tg]=Кашидан
Comment[tr]=Beraberlik
Comment[ug]=سىز
Comment[uk]=Нічия
Comment[x-test]=xxDrawxx
Comment[zh_CN]=平局
Comment[zh_TW]=發牌
Action=None
......@@ -604,6 +613,7 @@ Name[ta]=நிகழ்ச்சியை வெளிப்படுத்த
Name[tg]=Ҳаракати Нодуруст
Name[tr]=Geçersiz Hamle
Name[uk]=Недозволений хід
Name[x-test]=xxIllegal Movexx
Name[zh_CN]=无效移动
Name[zh_TW]=移動不合法
Comment=Illegal move
......@@ -662,6 +672,7 @@ Comment[sv]=Felaktigt drag
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