Commit 5f46f462 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 4514db3d
......@@ -48,7 +48,6 @@ 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
GenericName[ast]=Una carrera nel hiperespaciu
......@@ -75,6 +74,7 @@ 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
Categories=Qt;KDE;Game;ArcadeGame;
......
......@@ -43,7 +43,6 @@ Name[tr]=Öntanımlı Tema
Name[ug]=كۆڭۈلدىكى ئۆرنەك
Name[uk]=Типова тема
Name[x-test]=xxDefault Themexx
Name[zh_CN]=默认主题
Name[zh_TW]=預設主題
Description=Default theme.
Description[ast]=Tema por defeutu.
......
......@@ -44,7 +44,6 @@ Name[tr]=Neon
Name[ug]=نېئون
Name[uk]=Неон
Name[x-test]=xxNeonxx
Name[zh_CN]=霓虹灯
Name[zh_TW]=Neon
Description=A retro theme with a distinctive touch of early 50s.
Description[ast]=Un tema retro con un toque distintivu de los años 50.
......
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