Commit 1b83bb9a 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 56ac557c
......@@ -46,6 +46,7 @@ Name[sv]=Ormspel
Name[tr]=KSnakeDuel
Name[ug]=KSnakeDuel
Name[uk]=KSnakeDuel
Name[x-test]=xxKSnakeDuelxx
Name[zh_CN]=KSnakeDuel
Name[zh_TW]=KSnakeDuel
GenericName=A race in hyperspace
......@@ -75,6 +76,7 @@ GenericName[sr@latin]=Trka kroz hipersvemir
GenericName[sv]=En kapplöpning i hyperrymden
GenericName[tr]=Sonsuz uzayda bir yarış
GenericName[uk]=Перегони у гіперпросторі
GenericName[x-test]=xxA race in hyperspacexx
GenericName[zh_CN]=超空间竞速
GenericName[zh_TW]=超空間競賽
X-KDE-StartupNotify=true
......
......@@ -41,6 +41,7 @@ Name[sv]=Standardtema
Name[tr]=Öntanımlı Tema
Name[ug]=كۆڭۈلدىكى ئۆرنەك
Name[uk]=Типова тема
Name[x-test]=xxDefault Themexx
Name[zh_CN]=默认主题
Name[zh_TW]=預設主題
Description=Default theme.
......@@ -84,6 +85,7 @@ Description[sv]=Standardtema.
Description[tr]=Öntanımlı tema.
Description[ug]=كۆڭۈلدىكى ئۆرنەك.
Description[uk]=Типова тема.
Description[x-test]=xxDefault theme.xx
Description[zh_CN]=默认主题
Description[zh_TW]=預設主題。
FileName=default.svgz
......
......@@ -42,6 +42,7 @@ Name[sv]=Neon
Name[tr]=Neon
Name[ug]=نېئون
Name[uk]=Неон
Name[x-test]=xxNeonxx
Name[zh_CN]=Neon
Name[zh_TW]=Neon
Description=A retro theme with a distinctive touch of early 50s.
......@@ -83,6 +84,7 @@ Description[sr@latin]=Retro tema sa notom ranih pedesetih.
Description[sv]=Ett gammaldags tema med en distinkt känsla av tidigt 50-tal.
Description[tr]=50'lerin tipik dokunuşlarıyla bir nostaljik tema
Description[uk]=Ретро-тема з невловимим присмаком ранніх 50-их.
Description[x-test]=xxA retro theme with a distinctive touch of early 50s.xx
Description[zh_CN]=加上了 50 年代早期的风韵的重制版主题。
Description[zh_TW]=Neon 外觀主題,加上 50 年代早期的特色。
FileName=neon.svg
......
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