Commit aa1b9257 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 0a53db15
......@@ -48,6 +48,7 @@ Name[tr]=KBlocks
Name[ug]=KBlocks
Name[uk]=KBlocks
Name[wa]=KBlocks
Name[x-test]=xxKBlocksxx
Name[zh_CN]=KBlocks
Name[zh_TW]=KBlocks
Icon=kblocks
......@@ -98,6 +99,7 @@ GenericName[tr]=Sütun Düşürme Oyunu
GenericName[ug]=چۈشۈۋاتقان بۆلەك ئويۇنى
GenericName[uk]=Гра з блоками, що падають
GenericName[wa]=On djeu avou des blokes ki tcheyèt
GenericName[x-test]=xxFalling Blocks Gamexx
GenericName[zh_CN]=俄罗斯方块游戏
GenericName[zh_TW]=類似俄羅斯方塊遊戲
StartupNotify=true
......
......@@ -44,6 +44,7 @@ Name[tr]=Mısırlı
Name[ug]=مىسىرلىق
Name[uk]=Єгиптянин
Name[wa]=Edjipcyin
Name[x-test]=xxEgyptianxx
Name[zh_CN]=埃及
Name[zh_TW]=埃及式
Description=KBlocks, Egyptian style.
......@@ -87,6 +88,7 @@ Description[sv]=Kblock, egyptisk stil.
Description[tr]=KBlocks, Mısırlı stili.
Description[uk]=KBlocks, єгипетський стиль.
Description[wa]=KBlocks, edjipcyin stîle.
Description[x-test]=xxKBlocks, Egyptian style.xx
Description[zh_CN]=KBlocks 埃及风格。
Description[zh_TW]=KBlocks,埃及風格
VersionFormat=1
......
......@@ -52,6 +52,7 @@ Name[tr]=Oxygen
Name[ug]=ئوكسېگىن
Name[uk]=Oxygen
Name[wa]=Ocsidjinne
Name[x-test]=xxOxygenxx
Name[zh_CN]=Oxygen
Name[zh_TW]=Oxygen
Description=KBlocks Oxygen theme for KDE 4
......@@ -100,6 +101,7 @@ Description[sv]=Oxygen-tema för Kblock i KDE 4
Description[tr]=KDE 4 için KBlocks Oxygen Teması
Description[uk]=Тема KBlocks Oxygen для KDE 4
Description[wa]=Tinme Ocsidjinne di KBlocks po KDE 4
Description[x-test]=xxKBlocks Oxygen theme for KDE 4xx
Description[zh_CN]=为 KDE 4 设计的 KBlocks 绿氧主题
Description[zh_TW]=KBlocks KDE4 Oxygen 外觀主題
VersionFormat=1
......
Supports Markdown
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