Commit 65cd416a 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 0c9c0ff7
......@@ -65,6 +65,7 @@ Name[tr]=Bovo
Name[ug]=Bovo
Name[uk]=Бово
Name[wa]=Bovo
Name[x-test]=xxBovoxx
Name[zh_CN]=Bovo
Name[zh_TW]=Bovo
GenericName=Five-in-a-row Board Game
......@@ -119,5 +120,6 @@ GenericName[tr]=Bir-satırda-beş Tahta Oyunu
GenericName[ug]=بىر-قۇردا-بەش تاختا ئويۇنى
GenericName[uk]=Гра на дошці (п'ять-в-рядку)
GenericName[wa]=Djeu «cénk e roye»
GenericName[x-test]=xxFive-in-a-row Board Gamexx
GenericName[zh_CN]=五子棋游戏
GenericName[zh_TW]=五子棋棋盤遊戲
......@@ -50,6 +50,7 @@ Name[te]=గొమొకు
Name[tr]=Gomoku
Name[uk]=Гомоку
Name[wa]=Gomoku
Name[x-test]=xxGomokuxx
Name[zh_CN]=五目连珠
Name[zh_TW]=Gomoku
Comment=A classic Japanese theme
......@@ -98,6 +99,7 @@ Comment[sv]=Ett klassiskt japanskt tema
Comment[tr]=Bir klasik Japonca teması
Comment[uk]=Класична японська тема
Comment[wa]=On tinme classike djaponès
Comment[x-test]=xxA classic Japanese themexx
Comment[zh_CN]=经典的和风主题
Comment[zh_TW]=傳統的日式主題
......
......@@ -54,6 +54,7 @@ Name[tr]=Yüksek Kontrast
Name[ug]=يۇقىرى ئاق-قارىلىقى
Name[uk]=Висока контрастність
Name[wa]=Bråmint do contrasse
Name[x-test]=xxHigh Contrastxx
Name[zh_CN]=高对比度
Name[zh_TW]=高對比
Comment=A theme with a lot of contrast
......@@ -105,6 +106,7 @@ Comment[sv]=Ett tema med mycket kontrast
Comment[tr]=Bir yüksek kontrast teması
Comment[uk]=Тема з високою контрастністю
Comment[wa]=On tinme avou bråmint do contrasse
Comment[x-test]=xxA theme with a lot of contrastxx
Comment[zh_CN]=一种对比度强烈的主题
Comment[zh_TW]=高對比主題
......
......@@ -50,6 +50,7 @@ Name[te]=స్క్రిబ్బిల్
Name[tr]=Scribble
Name[uk]=Шкрябанина
Name[wa]=Scribble
Name[x-test]=xxScribblexx
Name[zh_CN]=涂鸦
Name[zh_TW]=Scribble
Comment=A pen and paper theme
......@@ -101,6 +102,7 @@ Comment[sv]=Ett penna och papper-tema
Comment[tr]=Bir kağıt kalem oyunu
Comment[uk]=Тема паперу і ручки
Comment[wa]=On tinme creyon et papî
Comment[x-test]=xxA pen and paper themexx
Comment[zh_CN]=一张纸一支笔的主题
Comment[zh_TW]=紙筆式的主題
......
......@@ -49,6 +49,7 @@ Name[sv]=Rymd
Name[te]=స్పేసి
Name[tr]=Spacy
Name[uk]=Космічна
Name[x-test]=xxSpacyxx
Name[zh_CN]=空间
Name[zh_TW]=Spacy
Comment=A theme from outer space
......@@ -100,6 +101,7 @@ Comment[sr@latin]=Tema iz dalekog svemira
Comment[sv]=Ett tema från yttre rymden
Comment[tr]=Uzayın derinliklerinden bir tema
Comment[uk]=Космічна тема
Comment[x-test]=xxA theme from outer spacexx
Comment[zh_CN]=外太空主题
Comment[zh_TW]=外太空式的主題
......
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