Commit 97fa9031 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 d16092bd
[KGameTheme]
Name=KJumpingCube Default
Name[bs]=KJumpingCube Default
Name[ca]=Predeterminat de KJumpingCube
Name[ca@valencia]=Predeterminat de KJumpingCube
Name[ca]=Predeterminat del KJumpingCube
Name[ca@valencia]=Predeterminat del KJumpingCube
Name[cs]=Výchozí pro KJumpingCube
Name[da]=Standard for KJumpingCube
Name[de]=Standard
......@@ -52,8 +52,8 @@ Name[zh_CN]=KJumpingCube 默认
Name[zh_TW]=KJumpingCube 預設
Description=A simple set of cubes for KDE4
Description[bs]=Jednostavan komplet kocki za KDE4
Description[ca]=Un conjunt simple de cubs per al KDE 4
Description[ca@valencia]=Un conjunt simple de cubs per al KDE 4
Description[ca]=Un conjunt senzill de cubs per al KDE 4
Description[ca@valencia]=Un conjunt senzill de cubs per al KDE 4
Description[da]=Et simpelt sæt af terninger til KDE4
Description[de]=Ein einfacher Satz Würfel für KDE4.
Description[el]=Ένα απλό σύνολο κύβων για το KDE4
......
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