Commit 870dfe7e 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 daf29db0
......@@ -56,6 +56,7 @@ Name[tr]=Öntanımlı
Name[ug]=كۆڭۈلدىكى
Name[uk]=Типова
Name[wa]=Prémetou
Name[x-test]=xxDefaultxx
Name[zh_CN]=默认
Name[zh_TW]=預設
Description=Kigo Default theme for KDE 4
......@@ -99,6 +100,7 @@ Description[sr@latin]=Podrazumevana tema Kigoa za KDE4
Description[sv]=Standardtema för Kigo i KDE 4
Description[tr]=KDE4 için Öntanımlı Kigo teması
Description[uk]=Типова тема Kigo для KDE 4
Description[x-test]=xxKigo Default theme for KDE 4xx
Description[zh_CN]=Kigo 在 KDE 4 中的默认主题
Description[zh_TW]=Kigo KDE4 預設主題
VersionFormat=1
......
......@@ -41,6 +41,7 @@ Name[sv]=Enkelt
Name[tr]=Düz
Name[ug]=تەكشىلىك
Name[uk]=Проста
Name[x-test]=xxPlainxx
Name[zh_CN]=纯色
Name[zh_TW]=樸素
Description=Plain Kigo theme based on Default theme by Arturo Silva
......@@ -82,6 +83,7 @@ Description[sr@latin]=Obična tema za Kigo na osnovu podrazumevane Artura Silve
Description[sv]=Enkelt Kigo-tema baserat på standardtemat av Arturo Silva
Description[tr]=Düz Kigo teması Arturo Silva'nın Öntanımlı teması üzerinedir
Description[uk]=Проста тема Kigo, заснована на типовій темі, створеній Arturo Silva
Description[x-test]=xxPlain Kigo theme based on Default theme by Arturo Silvaxx
Description[zh_CN]=基于默认主题的普通 Kigo 主题,由 Arturo Silva 创作
Description[zh_TW]=基於 Arturo Silva 所做的預設主題修改而成的樸素 Kigo 主題
VersionFormat=1
......
......@@ -51,6 +51,7 @@ Name[sv]=Kigo
Name[tr]=Kigo
Name[ug]=Kigo
Name[uk]=Kigo
Name[x-test]=xxKigoxx
Name[zh_CN]=Kigo
Name[zh_TW]=Kigo
......@@ -96,6 +97,7 @@ GenericName[sv]=Brädspelet Go
GenericName[tr]=Go Masaüstü Oyunu
GenericName[ug]=Go تاختا ئويۇنى
GenericName[uk]=Гра у го на дошці
GenericName[x-test]=xxGo Board Gamexx
GenericName[zh_CN]=围棋游戏
GenericName[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