Commit 492e3377 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 112041a7
......@@ -65,7 +65,6 @@ Name[uk]=KJumpingCube
Name[vi]=KJumpingCube
Name[wa]=KJumpingCube
Name[xh]=Ityhubhu yeKJumping
Name[x-test]=xxKJumpingCubexx
Name[zh_CN]=KJumpingCube
Name[zh_TW]=KJumpingCube 跳躍立方體
Exec=kjumpingcube -qwindowtitle %c
......@@ -117,7 +116,6 @@ GenericName[sv]=Terrängerövring
GenericName[tr]=Bölge Ele Geçirme Oyunu
GenericName[ug]=تېررىتورىيە ئىگىلەش ئويۇنى
GenericName[uk]=Гра на захоплення територій
GenericName[x-test]=xxTerritory Capture Gamexx
GenericName[zh_CN]=版块占领游戏
GenericName[zh_TW]=領土爭奪戰
Comment=Territory Capture Game
......@@ -150,7 +148,6 @@ Comment[sr@latin]=Igra zauzimanja teritorije
Comment[sv]=Territorium-erövringsspel
Comment[tr]=Bölge Ele Geçirme Oyunu
Comment[uk]=Гра на захоплення територій
Comment[x-test]=xxTerritory Capture Gamexx
Comment[zh_CN]=版块占领游戏
Comment[zh_TW]=領土爭奪戰
Terminal=false
......
......@@ -47,7 +47,6 @@ Name[sv]=Hoppande kuben förval
Name[tr]=KJumpingCube Öntanımlı
Name[uk]=Типова KJumpingCube
Name[wa]=KJumpingCube Prémetou
Name[x-test]=xxKJumpingCube Defaultxx
Name[zh_CN]=KJumpingCube 默认
Name[zh_TW]=KJumpingCube 預設
Description=A simple set of cubes for KDE4
......@@ -96,7 +95,6 @@ Description[sr@latin]=Jednostavan komplet kockica za KDE4
Description[sv]=En enkel uppsättning kuber för KDE4
Description[tr]=KDE 4 için basit bir küp seti
Description[uk]=Простий набір клітинок для KDE4
Description[x-test]=xxA simple set of cubes for KDE4xx
Description[zh_CN]=KDE 4下的简单方块组合
Description[zh_TW]=KDE 4 簡單的立方體集合
Author=Ian Wadham, Eugene Trounev
......
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