Commit 0039ff4a authored by Script Kiddy's avatar Script Kiddy

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 18001c29
......@@ -100,7 +100,7 @@ Name[vi]=Màu sắc
Name[wa]=Coleurs
Name[xh]=Imibala
Name[x-test]=xxColorsxx
Name[zh_CN]=色彩
Name[zh_CN]=颜色
Name[zh_TW]=顏色
Comment=Choose color scheme
......
......@@ -88,7 +88,7 @@ Name[vi]=Màu sắc
Name[wa]=Coleurs
Name[xh]=Imibala
Name[x-test]=xxColorsxx
Name[zh_CN]=色彩
Name[zh_CN]=颜色
Name[zh_TW]=顏色
Comment=Choose color scheme
Comment[ca]=Trieu l'esquema de colors
......
......@@ -30,6 +30,7 @@ Comment[ru]=Калибровка игрового контроллера
Comment[sv]=Kalibrera spelkontroll
Comment[uk]=Калібрувати ігровий контролер
Comment[x-test]=xxCalibrate Game Controllerxx
Comment[zh_CN]=校准游戏控制器
Comment[zh_TW]=校準遊戲控制器
Name=Game Controller
Name[ca]=Controlador de jocs
......@@ -47,6 +48,7 @@ Name[ru]=Игровой контроллер
Name[sv]=Spelkontroll
Name[uk]=Ігровий контролер
Name[x-test]=xxGame Controllerxx
Name[zh_CN]=游戏控制器
Name[zh_TW]=遊戲控制器
X-KDE-Keywords=joystick,gamepad,controller
......
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