Commit 74805192 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 e03d66ed
......@@ -5,7 +5,6 @@ Icon=ksnakeduel
X-DocPath=ksnakeduel/index.html
Terminal=false
Name=KSnakeDuel
Name[ast]=KSnakeDuel
Name[bs]=KSnakeDuel
Name[ca]=KSnakeDuel
Name[ca@valencia]=KSnakeDuel
......@@ -51,7 +50,6 @@ Name[x-test]=xxKSnakeDuelxx
Name[zh_CN]=KSnakeDuel
Name[zh_TW]=KSnakeDuel
GenericName=A race in hyperspace
GenericName[ast]=Una carrera nel hiperespaciu
GenericName[ca]=Una carrera a l'hiperespai
GenericName[ca@valencia]=Una carrera a l'hiperespai
GenericName[da]=Et ræs i hyperspace
......
[KGameTheme]
VersionFormat=1
Name=Default Theme
Name[ast]=Tema por defeutu
Name[bs]=Podrazumijevana tema
Name[ca]=Tema predeterminat
Name[ca@valencia]=Tema predeterminat
......@@ -46,7 +45,6 @@ Name[x-test]=xxDefault Themexx
Name[zh_CN]=默认主题
Name[zh_TW]=預設主題
Description=Default theme.
Description[ast]=Tema por defeutu.
Description[bs]=Podrazumijevana tema
Description[ca]=Tema predeterminat.
Description[ca@valencia]=Tema predeterminat.
......
[KGameTheme]
VersionFormat=1
Name=Neon
Name[ast]=Neon
Name[bs]=Neon
Name[ca]=Neó
Name[ca@valencia]=Neó
......@@ -47,7 +46,6 @@ 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.
Description[bs]=Retro tema sa osjećajem ranih pedesetih.
Description[ca]=Un tema retro amb un toc distintiu dels anys 50.
Description[ca@valencia]=Un tema retro amb un toc distintiu dels anys 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