Commit 0742e0ce 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 61a316af
......@@ -19,6 +19,7 @@ Name[ga]=Kubrick
Name[gl]=Kubrick
Name[hne]=कुबरिक
Name[hu]=Kubrick
Name[id]=Kubrick
Name[it]=Kubrick
Name[ja]=Kubrick
Name[kk]=Kubrick
......@@ -72,6 +73,7 @@ GenericName[ga]=Cluiche 3T bunaithe ar Chiúb Rubik
GenericName[gl]=Xogo en tres dimensións baseado no cubo de Rubik
GenericName[hne]=रुबिक क्यूब मं आधारित ३ डी खेल
GenericName[hu]=A Rubik kockán alapuló 3D-s játék
GenericName[id]=Permainan 3-D pada Rubik's Cube
GenericName[it]=Gioco 3-D basato sul cubo di Rubik
GenericName[ja]=Rubik's Cube を元にした 3-D ゲーム
GenericName[kk]=Рубик текшесін негіздеген кеңістікті ойын
......@@ -118,6 +120,7 @@ Comment[ga]=Cluiche 3T bunaithe ar Chiúb Rubik
Comment[gl]=Un xogo en tres dimensións baseado no cubo de Rubik
Comment[hne]=रुबिक क्यूब मं आधारित ३ डी खेल
Comment[hu]=Térbeli játék a bűvös kockával
Comment[id]=Sebuah permainan 3-D pada Rubik's Cube
Comment[it]=Un gioco 3-D basato sul cubo di Rubik
Comment[ja]=Rubik's Cube を元にした 3-D ゲーム
Comment[kk]=Рубик текшесін негіздеген кеңістікті ойын
......
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