New icon, version bump, updated translations

diff --git a/debian/changelog b/debian/changelog
index e8d8207..98d305e 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,14 @@
-someplayer (1.5.1-1) unstable; urgency=low
+someplayer (1.5.2-1) unstable; urgency=low

 
   * Possible fix of optify problem, also fixed disapeared eq settings
 
   * Possible fix of optify problem, also fixed disapeared eq settings

+  * Applied WMA and ASF patch to TagLib
+  * Fixed bug with double adding directory to cur.playlist
+  * Fixed issue with silent phone profile
+  * Dublicated online help button in main menu
+  * Added m4a files to filter
+  * Contolling via keyboard
+  * New icon
+  * Chinese translations

 
  -- somebody Nikolay Tischenko <niktischenko@gmail.com>  Sun, 27 Feb 2011 16:40:36 +0600
 
 
  -- somebody Nikolay Tischenko <niktischenko@gmail.com>  Sun, 27 Feb 2011 16:40:36 +0600
 

diff --git a/debian/control b/debian/control
index 61ca2b3..85c55e3 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -14,61 +14,155 @@ Description: Alternate audioplayer for Maemo 5
  supports mp3, flac, ogg, wma, aac, asf, ape, wav, m4a formats
 XSBC-Maemo-Display-Name: SomePlayer
 XSBC-Bugtracker: http://someplayer.some-body.ru/bt/
  supports mp3, flac, ogg, wma, aac, asf, ape, wav, m4a formats
 XSBC-Maemo-Display-Name: SomePlayer
 XSBC-Bugtracker: http://someplayer.some-body.ru/bt/

-XB-Maemo-Icon-26: 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
- AAAASUVORK5CYII= 
+XB-Maemo-Icon-26: iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAYAAAHdbkFIAAAACXBIWXMAAAsTAAALEwEAmpwYAAAK
+ TWlDQ1BQaG90b3Nob3AgSUNDIHByb2ZpbGUAAHjanVN3WJP3Fj7f92UPVkLY8LGXbIEAIiOsCMgQ
+ WaIQkgBhhBASQMWFiApWFBURnEhVxILVCkidiOKgKLhnQYqIWotVXDjuH9yntX167+3t+9f7vOec
+ 5/zOec8PgBESJpHmomoAOVKFPDrYH49PSMTJvYACFUjgBCAQ5svCZwXFAADwA3l4fnSwP/wBr28A
+ AgBw1S4kEsfh/4O6UCZXACCRAOAiEucLAZBSAMguVMgUAMgYALBTs2QKAJQAAGx5fEIiAKoNAOz0
+ ST4FANipk9wXANiiHKkIAI0BAJkoRyQCQLsAYFWBUiwCwMIAoKxAIi4EwK4BgFm2MkcCgL0FAHaO
+ WJAPQGAAgJlCLMwAIDgCAEMeE80DIEwDoDDSv+CpX3CFuEgBAMDLlc2XS9IzFLiV0Bp38vDg4iHi
+ wmyxQmEXKRBmCeQinJebIxNI5wNMzgwAABr50cH+OD+Q5+bk4eZm52zv9MWi/mvwbyI+IfHf/ryM
+ AgQAEE7P79pf5eXWA3DHAbB1v2upWwDaVgBo3/ldM9sJoFoK0Hr5i3k4/EAenqFQyDwdHAoLC+0l
+ YqG9MOOLPv8z4W/gi372/EAe/tt68ABxmkCZrcCjg/1xYW52rlKO58sEQjFu9+cj/seFf/2OKdHi
+ NLFcLBWK8ViJuFAiTcd5uVKRRCHJleIS6X8y8R+W/QmTdw0ArIZPwE62B7XLbMB+7gECiw5Y0nYA
+ QH7zLYwaC5EAEGc0Mnn3AACTv/mPQCsBAM2XpOMAALzoGFyolBdMxggAAESggSqwQQcMwRSswA6c
+ wR28wBcCYQZEQAwkwDwQQgbkgBwKoRiWQRlUwDrYBLWwAxqgEZrhELTBMTgN5+ASXIHrcBcGYBie
+ whi8hgkEQcgIE2EhOogRYo7YIs4IF5mOBCJhSDSSgKQg6YgUUSLFyHKkAqlCapFdSCPyLXIUOY1c
+ QPqQ28ggMor8irxHMZSBslED1AJ1QLmoHxqKxqBz0XQ0D12AlqJr0Rq0Hj2AtqKn0UvodXQAfYqO
+ Y4DRMQ5mjNlhXIyHRWCJWBomxxZj5Vg1Vo81Yx1YN3YVG8CeYe8IJAKLgBPsCF6EEMJsgpCQR1hM
+ WEOoJewjtBK6CFcJg4Qxwicik6hPtCV6EvnEeGI6sZBYRqwm7iEeIZ4lXicOE1+TSCQOyZLkTgoh
+ JZAySQtJa0jbSC2kU6Q+0hBpnEwm65Btyd7kCLKArCCXkbeQD5BPkvvJw+S3FDrFiOJMCaIkUqSU
+ Eko1ZT/lBKWfMkKZoKpRzame1AiqiDqfWkltoHZQL1OHqRM0dZolzZsWQ8ukLaPV0JppZ2n3aC/p
+ dLoJ3YMeRZfQl9Jr6Afp5+mD9HcMDYYNg8dIYigZaxl7GacYtxkvmUymBdOXmchUMNcyG5lnmA+Y
+ b1VYKvYqfBWRyhKVOpVWlX6V56pUVXNVP9V5qgtUq1UPq15WfaZGVbNQ46kJ1Bar1akdVbupNq7O
+ UndSj1DPUV+jvl/9gvpjDbKGhUaghkijVGO3xhmNIRbGMmXxWELWclYD6yxrmE1iW7L57Ex2Bfsb
+ di97TFNDc6pmrGaRZp3mcc0BDsax4PA52ZxKziHODc57LQMtPy2x1mqtZq1+rTfaetq+2mLtcu0W
+ 7eva73VwnUCdLJ31Om0693UJuja6UbqFutt1z+o+02PreekJ9cr1Dund0Uf1bfSj9Rfq79bv0R83
+ MDQINpAZbDE4Y/DMkGPoa5hpuNHwhOGoEctoupHEaKPRSaMnuCbuh2fjNXgXPmasbxxirDTeZdxr
+ PGFiaTLbpMSkxeS+Kc2Ua5pmutG003TMzMgs3KzYrMnsjjnVnGueYb7ZvNv8jYWlRZzFSos2i8eW
+ 2pZ8ywWWTZb3rJhWPlZ5VvVW16xJ1lzrLOtt1ldsUBtXmwybOpvLtqitm63Edptt3xTiFI8p0in1
+ U27aMez87ArsmuwG7Tn2YfYl9m32zx3MHBId1jt0O3xydHXMdmxwvOuk4TTDqcSpw+lXZxtnoXOd
+ 8zUXpkuQyxKXdpcXU22niqdun3rLleUa7rrStdP1o5u7m9yt2W3U3cw9xX2r+00umxvJXcM970H0
+ 8PdY4nHM452nm6fC85DnL152Xlle+70eT7OcJp7WMG3I28Rb4L3Le2A6Pj1l+s7pAz7GPgKfep+H
+ vqa+It89viN+1n6Zfgf8nvs7+sv9j/i/4XnyFvFOBWABwQHlAb2BGoGzA2sDHwSZBKUHNQWNBbsG
+ Lww+FUIMCQ1ZH3KTb8AX8hv5YzPcZyya0RXKCJ0VWhv6MMwmTB7WEY6GzwjfEH5vpvlM6cy2CIjg
+ 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

diff --git a/src/resources/someplayer.desktop b/src/resources/someplayer.desktop
index b83419f..80a765f 100644 (file)
--- a/src/resources/someplayer.desktop
+++ b/src/resources/someplayer.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Encoding=UTF-8
 [Desktop Entry]
 Encoding=UTF-8

-Version=1.5.0
+Version=1.5.2

 Type=Application
 Name=SomePlayer
 X-Text-Domain=someplayer
 Type=Application
 Name=SomePlayer
 X-Text-Domain=someplayer

diff --git a/src/resources/someplayer.old.png b/src/resources/someplayer.old.png
new file mode 100644 (file)
index 0000000..31dcd75
Binary files /dev/null and b/src/resources/someplayer.old.png differ

diff --git a/src/resources/someplayer.png b/src/resources/someplayer.png
index 31dcd75..7d240e0 100644 (file)
Binary files a/src/resources/someplayer.png and b/src/resources/someplayer.png differ

diff --git a/src/resources/someplayer_cn.ts b/src/resources/someplayer_cn.ts
new file mode 100644 (file)
index 0000000..4acd3b7
--- /dev/null
+++ b/src/resources/someplayer_cn.ts
@@ -0,0 +1,930 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.0" language="zh_CN">
+<context>
+    <name>AboutForm</name>
+    <message>
+        <source>Online help</source>
+        <translation>在线帮助</translation>
+    </message>
+    <message>
+        <source>Donate</source>
+        <translation>捐赠</translation>
+    </message>
+    <message>
+        <source>About SomePlayer</source>
+        <translation>关于SomePlayer</translation>
+    </message>
+    <message>
+        <source>&lt;p align=&quot;center&quot;&gt;Alternative music player for Maemo 5. It includes media-library, playlists, equalizer, and supports many other things.&lt;/p&gt;</source>
+        <translation>&lt;p align=&quot;center&quot;&gt;替代Maemo 5的音乐播放器.它包括媒体库,播放列表,均衡器,并支持许多其他的事情.&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;p align=&quot;center&quot;&gt;Licensed under GPLv2&lt;br&gt;
+By Nikolay Tischenko (somebody)&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;&lt;b&gt;SomePlayer&lt;/b&gt; tries to be a full replacement of standard music player for Maemo5 with many other features such as equalizer, custom playlists, smarter random mode, more flexible media-library and improved algorithm for cover searching.&lt;/p&gt;</source>
+        <translation>&lt;p align=&quot;center&quot;&gt;GPLv2许可协议&lt;br&gt;
+By Nikolay Tischenko (somebody)&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;&lt;b&gt;SomePlayer&lt;/b&gt; tries to be a full replacement of standard music player for Maemo5 with many other features such as equalizer, custom playlists, smarter random mode, more flexible media-library and improved algorithm for cover searching.&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;SomePlayer 1.5.2&lt;/b&gt; </source>
+        <translation>&lt;b&gt;SomePlayer 1.5.2&lt;/b&gt; </translation>
+    </message>
+    <message>
+        <source>&lt;p align=&quot;center&quot;&gt;
+&lt;b&gt;Thanks to:&lt;/b&gt;&lt;br&gt;
+MrClon (maemoworld.ru)&lt;br /&gt;hxka (maemoworld.ru)&lt;br /&gt;jerich0 (maemoworld.ru)&lt;br /&gt;lknfox (maemoworld.ru)&lt;br /&gt;fab (maemoworld.ru)&lt;br /&gt;Pantera1989m (github.com)&lt;br /&gt;willkr (maemo.org)&lt;br /&gt;and other people who tested this player and helped in development&lt;/p&gt;</source>
+        <translation>&lt;p align=&quot;center&quot;&gt;
+&lt;b&gt;感谢:&lt;/b&gt;&lt;br&gt;
+MrClon (maemoworld.ru)&lt;br /&gt;hxka (maemoworld.ru)&lt;br /&gt;jerich0 (maemoworld.ru)&lt;br /&gt;lknfox (maemoworld.ru)&lt;br /&gt;fab (maemoworld.ru)&lt;br /&gt;Pantera1989m (github.com)&lt;br /&gt;willkr (maemo.org)&lt;br /&gt;and other people who tested this player and helped in development&lt;br /&gt;willkr(blog.sina.com.cn/willkr)&lt;/p&gt;</translation>
+    </message>
+</context>
+<context>
+    <name>DirectoryView</name>
+    <message>
+        <source>Audioclips</source>
+        <translation>音频剪辑</translation>
+    </message>
+    <message>
+        <source>Inner memory</source>
+        <translation>内置存储器</translation>
+    </message>
+    <message>
+        <source>Memory card</source>
+        <translation>外置存储器</translation>
+    </message>
+    <message>
+        <source>Directories</source>
+        <translation>目录</translation>
+    </message>
+</context>
+<context>
+    <name>EditTagsDialog</name>
+    <message>
+        <source>Edit tags</source>
+        <translation>编辑标签</translation>
+    </message>
+    <message>
+        <source>Album:</source>
+        <translation>专辑:</translation>
+    </message>
+    <message>
+        <source>Title:</source>
+        <translation>标题:</translation>
+    </message>
+    <message>
+        <source>Artist:</source>
+        <translation>艺术家:</translation>
+    </message>
+</context>
+<context>
+    <name>EqualizerDialog</name>
+    <message>
+        <source>Save</source>
+        <translation>保存</translation>
+    </message>
+    <message>
+        <source>+12dB</source>
+        <translation>+12dB</translation>
+    </message>
+    <message>
+        <source>-12dB</source>
+        <translation>-12dB</translation>
+    </message>
+    <message>
+        <source>Enable</source>
+        <translation>启用</translation>
+    </message>
+    <message>
+        <source>Equalizer</source>
+        <translation>均衡器</translation>
+    </message>
+</context>
+<context>
+    <name>FmtxSettingsDialog</name>
+    <message>
+        <source>00</source>
+        <translation>00</translation>
+    </message>
+    <message>
+        <source>05</source>
+        <translation>05</translation>
+    </message>
+    <message>
+        <source>10</source>
+        <translation>10</translation>
+    </message>
+    <message>
+        <source>15</source>
+        <translation>15</translation>
+    </message>
+    <message>
+        <source>20</source>
+        <translation>20</translation>
+    </message>
+    <message>
+        <source>25</source>
+        <translation>25</translation>
+    </message>
+    <message>
+        <source>30</source>
+        <translation>30</translation>
+    </message>
+    <message>
+        <source>35</source>
+        <translation>35</translation>
+    </message>
+    <message>
+        <source>40</source>
+        <translation>40</translation>
+    </message>
+    <message>
+        <source>45</source>
+        <translation>45</translation>
+    </message>
+    <message>
+        <source>50</source>
+        <translation>50</translation>
+    </message>
+    <message>
+        <source>55</source>
+        <translation>55</translation>
+    </message>
+    <message>
+        <source>60</source>
+        <translation>60</translation>
+    </message>
+    <message>
+        <source>65</source>
+        <translation>65</translation>
+    </message>
+    <message>
+        <source>70</source>
+        <translation>70</translation>
+    </message>
+    <message>
+        <source>75</source>
+        <translation>75</translation>
+    </message>
+    <message>
+        <source>80</source>
+        <translation>80</translation>
+    </message>
+    <message>
+        <source>85</source>
+        <translation>85</translation>
+    </message>
+    <message>
+        <source>88</source>
+        <translation>88</translation>
+    </message>
+    <message>
+        <source>89</source>
+        <translation>89</translation>
+    </message>
+    <message>
+        <source>90</source>
+        <translation>90</translation>
+    </message>
+    <message>
+        <source>91</source>
+        <translation>91</translation>
+    </message>
+    <message>
+        <source>92</source>
+        <translation>92</translation>
+    </message>
+    <message>
+        <source>93</source>
+        <translation>93</translation>
+    </message>
+    <message>
+        <source>94</source>
+        <translation>94</translation>
+    </message>
+    <message>
+        <source>95</source>
+        <translation>95</translation>
+    </message>
+    <message>
+        <source>96</source>
+        <translation>96</translation>
+    </message>
+    <message>
+        <source>97</source>
+        <translation>97</translation>
+    </message>
+    <message>
+        <source>98</source>
+        <translation>98</translation>
+    </message>
+    <message>
+        <source>99</source>
+        <translation>99</translation>
+    </message>
+    <message>
+        <source>100</source>
+        <translation>100</translation>
+    </message>
+    <message>
+        <source>101</source>
+        <translation>101</translation>
+    </message>
+    <message>
+        <source>102</source>
+        <translation>102</translation>
+    </message>
+    <message>
+        <source>103</source>
+        <translation>103</translation>
+    </message>
+    <message>
+        <source>104</source>
+        <translation>104</translation>
+    </message>
+    <message>
+        <source>105</source>
+        <translation>105</translation>
+    </message>
+    <message>
+        <source>106</source>
+        <translation>106</translation>
+    </message>
+    <message>
+        <source>107</source>
+        <translation>107</translation>
+    </message>
+    <message>
+        <source>FMTX Settings</source>
+        <translation>调频发射器设置</translation>
+    </message>
+    <message>
+        <source>Frequency:</source>
+        <translation>频率:</translation>
+    </message>
+    <message>
+        <source>Station:</source>
+        <translation>电台:</translation>
+    </message>
+</context>
+<context>
+    <name>LibraryForm</name>
+    <message>
+        <source>Library</source>
+        <translation>音乐库</translation>
+    </message>
+    <message>
+        <source>All tracks by &quot;%1&quot;</source>
+        <translation>全部音轨以 &quot;%1&quot;</translation>
+    </message>
+    <message>
+        <source>Artists</source>
+        <translation>艺术家</translation>
+    </message>
+    <message>
+        <source>Playlists</source>
+        <translation>播放清单</translation>
+    </message>
+    <message>
+        <source>Search in library</source>
+        <translation>在音乐库中搜索</translation>
+    </message>
+    <message>
+        <source>Tracks from &quot;%1&quot; by &quot;%2&quot;</source>
+        <translation>音轨来自 &quot;%1&quot; 以 &quot;%2&quot;</translation>
+    </message>
+    <message>
+        <source>Albums by &quot;%1&quot;</source>
+        <translation>专辑以 &quot;%1&quot;</translation>
+    </message>
+    <message>
+        <source>Dynamic playlists</source>
+        <translation>动态播放清单</translation>
+    </message>
+    <message>
+        <source>Tracks in playlist &quot;%1&quot;</source>
+        <translation>音轨在播放清单 &quot;%1&quot;</translation>
+    </message>
+</context>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>Main</source>
+        <translation>主界面</translation>
+    </message>
+    <message>
+        <source>About</source>
+        <translation>关于</translation>
+    </message>
+    <message>
+        <source>Tools</source>
+        <translation>工具</translation>
+    </message>
+    <message>
+        <source>Library</source>
+        <translation>音乐库</translation>
+    </message>
+    <message>
+        <source>Clear playlist?</source>
+        <translation>清除播放清单?</translation>
+    </message>
+    <message>
+        <source>Ctrl+S</source>
+        <translation>Ctrl+S</translation>
+    </message>
+    <message>
+        <source>Music off: </source>
+        <translation>音乐关闭: </translation>
+    </message>
+    <message>
+        <source>Player</source>
+        <translation>播放器</translation>
+    </message>
+    <message>
+        <source>Set timer</source>
+        <translation>设置计时器</translation>
+    </message>
+    <message>
+        <source>SomePlayer</source>
+        <translation>SomePlayer</translation>
+    </message>
+    <message>
+        <source>Manage library</source>
+        <translation>音乐库管理</translation>
+    </message>
+    <message>
+        <source>Save playlist</source>
+        <translation>保存播放清单</translation>
+    </message>
+    <message>
+        <source>Equalizer</source>
+        <translation>均衡器</translation>
+    </message>
+    <message>
+        <source>Settings</source>
+        <translation>设置</translation>
+    </message>
+    <message>
+        <source>Help</source>
+        <translation>在线帮助</translation>
+    </message>
+    <message>
+        <source>Online help</source>
+        <translation>在线帮助</translation>
+    </message>
+</context>
+<context>
+    <name>ManageLibraryForm</name>
+    <message>
+        <source>Select directory</source>
+        <translation>选择目录</translation>
+    </message>
+    <message>
+        <source>Delete selected directories?</source>
+        <translation>删除选择的目录?</translation>
+    </message>
+    <message>
+        <source>Update selected directories? It may takes several minutes</source>
+        <translation>更新删除选择的目录? 这需要一些时间</translation>
+    </message>
+    <message>
+        <source>0 albums</source>
+        <translation>0 专辑</translation>
+    </message>
+    <message>
+        <source>0 tracks</source>
+        <translation>0 音轨</translation>
+    </message>
+    <message>
+        <source>0 artitst</source>
+        <translation>0 艺术家</translation>
+    </message>
+    <message>
+        <source>Added directories:</source>
+        <translation>添加目录:</translation>
+    </message>
+    <message>
+        <source>Update all library? It may takes a long time</source>
+        <translation>更新全部音乐库?这需要很长时间</translation>
+    </message>
+    <message>
+        <source>Manage library</source>
+        <translation>音乐库管理</translation>
+    </message>
+</context>
+<context>
+    <name>PlayerForm</name>
+    <message>
+        <source>0/0</source>
+        <translation>0/0</translation>
+    </message>
+    <message>
+        <source>00:00</source>
+        <translation>00:00</translation>
+    </message>
+    <message>
+        <source>Clear playlist</source>
+        <translation>清除播放清单</translation>
+    </message>
+    <message>
+        <source>Edit tags</source>
+        <translation>编辑标签</translation>
+    </message>
+    <message>
+        <source>Remove from favorites</source>
+        <translation>从收藏中删除</translation>
+    </message>
+    <message>
+        <source>Music off: 00:00:00</source>
+        <translation>音乐关闭: 00:00:00</translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation>删除</translation>
+    </message>
+    <message>
+        <source>&lt;h3&gt;Title&lt;/h3&gt;</source>
+        <translation>&lt;h3&gt;标题&lt;/h3&gt;</translation>
+    </message>
+    <message>
+        <source>SomePlayer</source>
+        <translation>SomePlayer</translation>
+    </message>
+    <message>
+        <source>Enqueue</source>
+        <translation>插入</translation>
+    </message>
+    <message>
+        <source>Add to favorites</source>
+        <translation>添加到收藏</translation>
+    </message>
+    <message>
+        <source>Add to playlists</source>
+        <translation>添加到播放清单</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Artist&lt;/b&gt;&lt;br/&gt;album</source>
+        <translation>&lt;b&gt;艺术家&lt;/b&gt;&lt;br/&gt;专辑</translation>
+    </message>
+</context>
+<context>
+    <name>PlaylistDialog</name>
+    <message>
+        <source>Dialog</source>
+        <translation>对话</translation>
+    </message>
+</context>
+<context>
+    <name>PlaylistSortForm</name>
+    <message>
+        <source>Sorting</source>
+        <translation>排序</translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>All tracks</source>
+        <translation>全部音轨</translation>
+    </message>
+</context>
+<context>
+    <name>SavePlaylistDialog</name>
+    <message>
+        <source>New: </source>
+        <translation>新建:</translation>
+    </message>
+    <message>
+        <source>Existed playlists:</source>
+        <translation>现有播放清单:</translation>
+    </message>
+    <message>
+        <source>Save playlist</source>
+        <translation>保存播放清单</translation>
+    </message>
+</context>
+<context>
+    <name>SettingsForm</name>
+    <message>
+        <source>No</source>
+        <translation>不</translation>
+    </message>
+    <message>
+        <source>UI</source>
+        <translation>界面</translation>
+    </message>
+    <message>
+        <source>Yes</source>
+        <translation>是</translation>
+    </message>
+    <message>
+        <source>red</source>
+        <translation>红色</translation>
+    </message>
+    <message>
+        <source>Auto</source>
+        <translation>自动</translation>
+    </message>
+    <message>
+        <source>blue</source>
+        <translation>蓝色</translation>
+    </message>
+    <message>
+        <source>dark</source>
+        <translation>深色</translation>
+    </message>
+    <message>
+        <source>Black</source>
+        <translation>黑色</translation>
+    </message>
+    <message>
+        <source>White</source>
+        <translation>白色</translation>
+    </message>
+    <message>
+        <source>black</source>
+        <translation>黑色</translation>
+    </message>
+    <message>
+        <source>light</source>
+        <translation>浅色</translation>
+    </message>
+    <message>
+        <source>white</source>
+        <translation>白色</translation>
+    </message>
+    <message>
+        <source>Show track lenght in library view:</source>
+        <translation>在库视图中显示音轨长度:</translation>
+    </message>
+    <message>
+        <source>Library</source>
+        <translation>音乐库</translation>
+    </message>
+    <message>
+        <source>Icons theme:</source>
+        <translation>图标主题:</translation>
+    </message>
+    <message>
+        <source>magenta</source>
+        <translation>品红</translation>
+    </message>
+    <message>
+        <source>Zoom keys control:</source>
+        <translation>缩放键控制:</translation>
+    </message>
+    <message>
+        <source>Landscape</source>
+        <translation>横屏</translation>
+    </message>
+    <message>
+        <source>Language:</source>
+        <translation>语言:</translation>
+    </message>
+    <message>
+        <source>System</source>
+        <translation>系统</translation>
+    </message>
+    <message>
+        <source>Tracks</source>
+        <translation>音轨</translation>
+    </message>
+    <message>
+        <source>Volume</source>
+        <translation>音量</translation>
+    </message>
+    <message>
+        <source>Sort album:</source>
+        <translation>专辑排序:</translation>
+    </message>
+    <message>
+        <source>Active track color:</source>
+        <translation>当前音轨颜色:</translation>
+    </message>
+    <message>
+        <source>Portrait</source>
+        <translation>竖屏</translation>
+    </message>
+    <message>
+        <source>Use hardware keys</source>
+        <translation>使用物理键</translation>
+    </message>
+    <message>
+        <source>yellow</source>
+        <translation>黄色</translation>
+    </message>
+    <message>
+        <source>Use FMTX</source>
+        <translation>使用调频发射器</translation>
+    </message>
+    <message>
+        <source>By date</source>
+        <translation>日期</translation>
+    </message>
+    <message>
+        <source>Russian</source>
+        <translation>俄语</translation>
+    </message>
+    <message>
+        <source>Use gradient in portrait mode:</source>
+        <translation>在竖屏模式使用渐变:</translation>
+    </message>
+    <message>
+        <source>Alphabetical</source>
+        <translation>字母</translation>
+    </message>
+    <message>
+        <source>English</source>
+        <translation>英语</translation>
+    </message>
+    <message>
+        <source>Settings</source>
+        <translation>设置</translation>
+    </message>
+    <message>
+        <source>Pause when headphones unplugged:</source>
+        <translation>耳机拔出时暂停:</translation>
+    </message>
+    <message>
+        <source>Orientation:</source>
+        <translation>方向:</translation>
+    </message>
+    <message>
+        <source>Chinese</source>
+        <translation>Chinese</translation>
+    </message>
+</context>
+<context>
+    <name>TimerDialog</name>
+    <message>
+        <source>:</source>
+        <translation>:</translation>
+    </message>
+    <message>
+        <source>00</source>
+        <translation>00</translation>
+    </message>
+    <message>
+        <source>01</source>
+        <translation>01</translation>
+    </message>
+    <message>
+        <source>02</source>
+        <translation>02</translation>
+    </message>
+    <message>
+        <source>03</source>
+        <translation>03</translation>
+    </message>
+    <message>
+        <source>04</source>
+        <translation>04</translation>
+    </message>
+    <message>
+        <source>05</source>
+        <translation>05</translation>
+    </message>
+    <message>
+        <source>06</source>
+        <translation>06</translation>
+    </message>
+    <message>
+        <source>07</source>
+        <translation>07</translation>
+    </message>
+    <message>
+        <source>08</source>
+        <translation>08</translation>
+    </message>
+    <message>
+        <source>09</source>
+        <translation>09</translation>
+    </message>
+    <message>
+        <source>10</source>
+        <translation>10</translation>
+    </message>
+    <message>
+        <source>11</source>
+        <translation>11</translation>
+    </message>
+    <message>
+        <source>12</source>
+        <translation>12</translation>
+    </message>
+    <message>
+        <source>13</source>
+        <translation>13</translation>
+    </message>
+    <message>
+        <source>14</source>
+        <translation>14</translation>
+    </message>
+    <message>
+        <source>15</source>
+        <translation>15</translation>
+    </message>
+    <message>
+        <source>16</source>
+        <translation>16</translation>
+    </message>
+    <message>
+        <source>17</source>
+        <translation>17</translation>
+    </message>
+    <message>
+        <source>18</source>
+        <translation>18</translation>
+    </message>
+    <message>
+        <source>19</source>
+        <translation>19</translation>
+    </message>
+    <message>
+        <source>20</source>
+        <translation>20</translation>
+    </message>
+    <message>
+        <source>21</source>
+        <translation>21</translation>
+    </message>
+    <message>
+        <source>22</source>
+        <translation>22</translation>
+    </message>
+    <message>
+        <source>23</source>
+        <translation>23</translation>
+    </message>
+    <message>
+        <source>24</source>
+        <translation>24</translation>
+    </message>
+    <message>
+        <source>25</source>
+        <translation>25</translation>
+    </message>
+    <message>
+        <source>26</source>
+        <translation>26</translation>
+    </message>
+    <message>
+        <source>27</source>
+        <translation>27</translation>
+    </message>
+    <message>
+        <source>28</source>
+        <translation>28</translation>
+    </message>
+    <message>
+        <source>29</source>
+        <translation>29</translation>
+    </message>
+    <message>
+        <source>30</source>
+        <translation>30</translation>
+    </message>
+    <message>
+        <source>31</source>
+        <translation>31</translation>
+    </message>
+    <message>
+        <source>32</source>
+        <translation>32</translation>
+    </message>
+    <message>
+        <source>33</source>
+        <translation>33</translation>
+    </message>
+    <message>
+        <source>34</source>
+        <translation>34</translation>
+    </message>
+    <message>
+        <source>35</source>
+        <translation>35</translation>
+    </message>
+    <message>
+        <source>36</source>
+        <translation>36</translation>
+    </message>
+    <message>
+        <source>37</source>
+        <translation>37</translation>
+    </message>
+    <message>
+        <source>38</source>
+        <translation>38</translation>
+    </message>
+    <message>
+        <source>39</source>
+        <translation>39</translation>
+    </message>
+    <message>
+        <source>40</source>
+        <translation>40</translation>
+    </message>
+    <message>
+        <source>41</source>
+        <translation>41</translation>
+    </message>
+    <message>
+        <source>42</source>
+        <translation>42</translation>
+    </message>
+    <message>
+        <source>43</source>
+        <translation>43</translation>
+    </message>
+    <message>
+        <source>44</source>
+        <translation>44</translation>
+    </message>
+    <message>
+        <source>45</source>
+        <translation>45</translation>
+    </message>
+    <message>
+        <source>46</source>
+        <translation>46</translation>
+    </message>
+    <message>
+        <source>47</source>
+        <translation>47</translation>
+    </message>
+    <message>
+        <source>48</source>
+        <translation>48</translation>
+    </message>
+    <message>
+        <source>49</source>
+        <translation>49</translation>
+    </message>
+    <message>
+        <source>50</source>
+        <translation>50</translation>
+    </message>
+    <message>
+        <source>51</source>
+        <translation>51</translation>
+    </message>
+    <message>
+        <source>52</source>
+        <translation>52</translation>
+    </message>
+    <message>
+        <source>53</source>
+        <translation>53</translation>
+    </message>
+    <message>
+        <source>54</source>
+        <translation>54</translation>
+    </message>
+    <message>
+        <source>55</source>
+        <translation>55</translation>
+    </message>
+    <message>
+        <source>56</source>
+        <translation>56</translation>
+    </message>
+    <message>
+        <source>57</source>
+        <translation>57</translation>
+    </message>
+    <message>
+        <source>58</source>
+        <translation>58</translation>
+    </message>
+    <message>
+        <source>59</source>
+        <translation>59</translation>
+    </message>
+    <message>
+        <source>Hours</source>
+        <translation>时</translation>
+    </message>
+    <message>
+        <source>Minutes</source>
+        <translation>分</translation>
+    </message>
+    <message>
+        <source>Set timer</source>
+        <translation>设置计时器</translation>
+    </message>
+    <message>
+        <source>Seconds</source>
+        <translation>秒</translation>
+    </message>
+    <message>
+        <source>Disable</source>
+        <translation>禁用</translation>
+    </message>
+</context>
+<context>
+    <name>ToolsWidget</name>
+    <message>
+        <source>Form</source>
+        <translation>来自</translation>
+    </message>
+</context>
+</TS>

diff --git a/src/resources/someplayer_ru.ts b/src/resources/someplayer_ru.ts
index 108c66d..b8494ee 100644 (file)
--- a/src/resources/someplayer_ru.ts
+++ b/src/resources/someplayer_ru.ts
@@ -10,8 +10,8 @@
     </message>
     <message>
         <location filename="../ui/aboutform.ui" line="103"/>
     </message>
     <message>
         <location filename="../ui/aboutform.ui" line="103"/>

-        <source>&lt;b&gt;SomePlayer 1.5.1&lt;/b&gt; </source>
-        <translation>&lt;b&gt;SomePlayer 1.5.1&lt;/b&gt;</translation>
+        <source>&lt;b&gt;SomePlayer 1.5.2&lt;/b&gt; </source>
+        <translation>&lt;b&gt;SomePlayer 1.5.2&lt;/b&gt; </translation>

     </message>
     <message>
         <location filename="../ui/aboutform.ui" line="128"/>
     </message>
     <message>
         <location filename="../ui/aboutform.ui" line="128"/>

@@ -29,10 +29,10 @@ By Nikolay Tischenko (somebody)&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;&lt;b
         <location filename="../ui/aboutform.ui" line="175"/>
         <source>&lt;p align=&quot;center&quot;&gt;
 &lt;b&gt;Thanks to:&lt;/b&gt;&lt;br&gt;
         <location filename="../ui/aboutform.ui" line="175"/>
         <source>&lt;p align=&quot;center&quot;&gt;
 &lt;b&gt;Thanks to:&lt;/b&gt;&lt;br&gt;

-MrClon (maemoworld.ru)&lt;br /&gt;hxka (maemoworld.ru)&lt;br /&gt;jerich0 (maemoworld.ru)&lt;br /&gt;lknfox (maemoworld.ru)&lt;br /&gt;fab (maemoworld.ru)&lt;br /&gt;Pantera1989m (github.com)&lt;br /&gt;and other people who tested this player and helped in development&lt;/p&gt;</source>
+MrClon (maemoworld.ru)&lt;br /&gt;hxka (maemoworld.ru)&lt;br /&gt;jerich0 (maemoworld.ru)&lt;br /&gt;lknfox (maemoworld.ru)&lt;br /&gt;fab (maemoworld.ru)&lt;br /&gt;Pantera1989m (github.com)&lt;br /&gt;willkr (maemo.org)&lt;br /&gt;and other people who tested this player and helped in development&lt;/p&gt;</source>

         <translation>&lt;p align=&quot;center&quot;&gt;
         <translation>&lt;p align=&quot;center&quot;&gt;

-&lt;b&gt;Автор благодарен:&lt;/b&gt;&lt;br&gt;
-MrClon (maemoworld.ru)&lt;br /&gt;hxka (maemoworld.ru)&lt;br /&gt;jerich0 (maemoworld.ru)&lt;br /&gt;lknfox (maemoworld.ru)&lt;br /&gt;fab (maemoworld.ru)&lt;br /&gt;Pantera1989m (github.com)&lt;br /&gt;и всем кто помогал в разработке и тестировании плеера&lt;/p&gt;</translation>
+&lt;b&gt;Спасибо:&lt;/b&gt;&lt;br&gt;
+MrClon (maemoworld.ru)&lt;br /&gt;hxka (maemoworld.ru)&lt;br /&gt;jerich0 (maemoworld.ru)&lt;br /&gt;lknfox (maemoworld.ru)&lt;br /&gt;fab (maemoworld.ru)&lt;br /&gt;Pantera1989m (github.com)&lt;br /&gt;willkr (maemo.org)&lt;br /&gt;и всем остальным кто участвовал в разработке и тестировании плеера&lt;/p&gt;</translation>

     </message>
     <message>
         <location filename="../ui/aboutform.ui" line="189"/>
     </message>
     <message>
         <location filename="../ui/aboutform.ui" line="189"/>

@@ -407,47 +407,57 @@ MrClon (maemoworld.ru)&lt;br /&gt;hxka (maemoworld.ru)&lt;br /&gt;jerich0 (maemo
         <translation>Плеер</translation>
     </message>
     <message>
         <translation>Плеер</translation>
     </message>
     <message>

-        <location filename="../ui/mainwindow.ui" line="71"/>
+        <location filename="../ui/mainwindow.ui" line="66"/>
+        <source>Help</source>
+        <translation>Помощь</translation>
+    </message>
+    <message>
+        <location filename="../ui/mainwindow.ui" line="78"/>

         <source>About</source>
         <translation>О программе</translation>
     </message>
     <message>
         <source>About</source>
         <translation>О программе</translation>
     </message>
     <message>

-        <location filename="../ui/mainwindow.ui" line="76"/>
+        <location filename="../ui/mainwindow.ui" line="83"/>

         <source>Settings</source>
         <translation>Настройки</translation>
     </message>
     <message>
         <source>Settings</source>
         <translation>Настройки</translation>
     </message>
     <message>

-        <location filename="../ui/mainwindow.ui" line="81"/>
+        <location filename="../ui/mainwindow.ui" line="88"/>

         <source>Manage library</source>
         <translation>Управление библиотекой</translation>
     </message>
     <message>
         <source>Manage library</source>
         <translation>Управление библиотекой</translation>
     </message>
     <message>

-        <location filename="../ui/mainwindow.ui" line="86"/>
+        <location filename="../ui/mainwindow.ui" line="93"/>

         <source>Equalizer</source>
         <translation>Эквалайзер</translation>
     </message>
     <message>
         <source>Equalizer</source>
         <translation>Эквалайзер</translation>
     </message>
     <message>

-        <location filename="../ui/mainwindow.ui" line="91"/>
+        <location filename="../ui/mainwindow.ui" line="98"/>

         <source>Set timer</source>
         <translation>Установить таймер</translation>
     </message>
     <message>
         <source>Set timer</source>
         <translation>Установить таймер</translation>
     </message>
     <message>

-        <location filename="../ui/mainwindow.ui" line="96"/>
+        <location filename="../ui/mainwindow.ui" line="103"/>

         <source>Save playlist</source>
         <translation>Сохранить плейлист</translation>
     </message>
     <message>
         <source>Save playlist</source>
         <translation>Сохранить плейлист</translation>
     </message>
     <message>

-        <location filename="../ui/mainwindow.ui" line="99"/>
+        <location filename="../ui/mainwindow.ui" line="106"/>

         <source>Ctrl+S</source>
         <translation>Ctrl+S</translation>
     </message>
     <message>
         <source>Ctrl+S</source>
         <translation>Ctrl+S</translation>
     </message>
     <message>

-        <location filename="../mainwindow.cpp" line="218"/>
+        <location filename="../ui/mainwindow.ui" line="111"/>
+        <source>Online help</source>
+        <translation>Онлайн справка</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="226"/>

         <source>Clear playlist?</source>
         <translation>Очистить плейлист?</translation>
     </message>
     <message>
         <source>Clear playlist?</source>
         <translation>Очистить плейлист?</translation>
     </message>
     <message>

-        <location filename="../mainwindow.cpp" line="264"/>
+        <location filename="../mainwindow.cpp" line="272"/>

         <source>Music off: </source>
         <translation>Отключение: </translation>
     </message>
         <source>Music off: </source>
         <translation>Отключение: </translation>
     </message>

@@ -624,7 +634,7 @@ MrClon (maemoworld.ru)&lt;br /&gt;hxka (maemoworld.ru)&lt;br /&gt;jerich0 (maemo
     <name>SettingsForm</name>
     <message>
         <location filename="../ui/settingsform.ui" line="14"/>
     <name>SettingsForm</name>
     <message>
         <location filename="../ui/settingsform.ui" line="14"/>

-        <location filename="../ui/settingsform.ui" line="706"/>
+        <location filename="../ui/settingsform.ui" line="713"/>

         <source>Settings</source>
         <translation>Настройки</translation>
     </message>
         <source>Settings</source>
         <translation>Настройки</translation>
     </message>

@@ -660,15 +670,15 @@ MrClon (maemoworld.ru)&lt;br /&gt;hxka (maemoworld.ru)&lt;br /&gt;jerich0 (maemo
     </message>
     <message>
         <location filename="../ui/settingsform.ui" line="174"/>
     </message>
     <message>
         <location filename="../ui/settingsform.ui" line="174"/>

-        <location filename="../ui/settingsform.ui" line="523"/>
-        <location filename="../ui/settingsform.ui" line="610"/>
+        <location filename="../ui/settingsform.ui" line="530"/>
+        <location filename="../ui/settingsform.ui" line="617"/>

         <source>Yes</source>
         <translation>Да</translation>
     </message>
     <message>
         <location filename="../ui/settingsform.ui" line="181"/>
         <source>Yes</source>
         <translation>Да</translation>
     </message>
     <message>
         <location filename="../ui/settingsform.ui" line="181"/>

-        <location filename="../ui/settingsform.ui" line="530"/>
-        <location filename="../ui/settingsform.ui" line="617"/>
+        <location filename="../ui/settingsform.ui" line="537"/>
+        <location filename="../ui/settingsform.ui" line="624"/>

         <source>No</source>
         <translation>Нет</translation>
     </message>
         <source>No</source>
         <translation>Нет</translation>
     </message>

@@ -718,42 +728,47 @@ MrClon (maemoworld.ru)&lt;br /&gt;hxka (maemoworld.ru)&lt;br /&gt;jerich0 (maemo
         <translation>тёмный</translation>
     </message>
     <message>
         <translation>тёмный</translation>
     </message>
     <message>

-        <location filename="../ui/settingsform.ui" line="452"/>
+        <location filename="../ui/settingsform.ui" line="396"/>
+        <source>Chinese</source>
+        <translation>Китайский</translation>
+    </message>
+    <message>
+        <location filename="../ui/settingsform.ui" line="459"/>

         <source>Sort album:</source>
         <translation>Сортировка альбомов:</translation>
     </message>
     <message>
         <source>Sort album:</source>
         <translation>Сортировка альбомов:</translation>
     </message>
     <message>

-        <location filename="../ui/settingsform.ui" line="478"/>
+        <location filename="../ui/settingsform.ui" line="485"/>

         <source>Alphabetical</source>
         <translation>По алфавиту</translation>
     </message>
     <message>
         <source>Alphabetical</source>
         <translation>По алфавиту</translation>
     </message>
     <message>

-        <location filename="../ui/settingsform.ui" line="485"/>
+        <location filename="../ui/settingsform.ui" line="492"/>

         <source>By date</source>
         <translation>По дате</translation>
     </message>
     <message>
         <source>By date</source>
         <translation>По дате</translation>
     </message>
     <message>

-        <location filename="../ui/settingsform.ui" line="629"/>
+        <location filename="../ui/settingsform.ui" line="636"/>

         <source>Use hardware keys</source>
         <translation>Аппаратные кнопки</translation>
     </message>
     <message>
         <source>Use hardware keys</source>
         <translation>Аппаратные кнопки</translation>
     </message>
     <message>

-        <location filename="../ui/settingsform.ui" line="650"/>
+        <location filename="../ui/settingsform.ui" line="657"/>

         <source>Zoom keys control:</source>
         <translation>«Качелька» управляет:</translation>
     </message>
     <message>
         <source>Zoom keys control:</source>
         <translation>«Качелька» управляет:</translation>
     </message>
     <message>

-        <location filename="../ui/settingsform.ui" line="659"/>
+        <location filename="../ui/settingsform.ui" line="666"/>

         <source>Volume</source>
         <translation>Звуком</translation>
     </message>
     <message>
         <source>Volume</source>
         <translation>Звуком</translation>
     </message>
     <message>

-        <location filename="../ui/settingsform.ui" line="666"/>
+        <location filename="../ui/settingsform.ui" line="673"/>

         <source>Tracks</source>
         <translation>Треками</translation>
     </message>
     <message>
         <source>Tracks</source>
         <translation>Треками</translation>
     </message>
     <message>

-        <location filename="../ui/settingsform.ui" line="678"/>
+        <location filename="../ui/settingsform.ui" line="685"/>

         <source>Use FMTX</source>
         <translation>Включить FMTX</translation>
     </message>
         <source>Use FMTX</source>
         <translation>Включить FMTX</translation>
     </message>

@@ -783,7 +798,7 @@ MrClon (maemoworld.ru)&lt;br /&gt;hxka (maemoworld.ru)&lt;br /&gt;jerich0 (maemo
         <translation>Авто</translation>
     </message>
     <message>
         <translation>Авто</translation>
     </message>
     <message>

-        <location filename="../ui/settingsform.ui" line="497"/>
+        <location filename="../ui/settingsform.ui" line="504"/>

         <source>Show track lenght in library view:</source>
         <translation>Показывать длину трека:</translation>
     </message>
         <source>Show track lenght in library view:</source>
         <translation>Показывать длину трека:</translation>
     </message>

@@ -803,7 +818,7 @@ MrClon (maemoworld.ru)&lt;br /&gt;hxka (maemoworld.ru)&lt;br /&gt;jerich0 (maemo
         <translation>Русский</translation>
     </message>
     <message>
         <translation>Русский</translation>
     </message>
     <message>

-        <location filename="../ui/settingsform.ui" line="590"/>
+        <location filename="../ui/settingsform.ui" line="597"/>

         <source>Pause when headphones unplugged:</source>
         <translation>Пауза при отключении наушников:</translation>
     </message>
         <source>Pause when headphones unplugged:</source>
         <translation>Пауза при отключении наушников:</translation>
     </message>

diff --git a/src/settingsform.cpp b/src/settingsform.cpp
index a922f32..0e33687 100644 (file)
--- a/src/settingsform.cpp
+++ b/src/settingsform.cpp
@@ -73,6 +73,9 @@ SettingsForm::SettingsForm(QWidget *parent) :
        if (language == "ru") {
                ui->ruLangButton->setChecked(true);
        }
        if (language == "ru") {
                ui->ruLangButton->setChecked(true);
        }

+       if (language == "cn") {
+               ui->cnLangButton->setChecked(true);
+       }

        if (track_color == "black") {
                ui->cBlackButton->setChecked(true);
        } else if (track_color == "magenta") {
        if (track_color == "black") {
                ui->cBlackButton->setChecked(true);
        } else if (track_color == "magenta") {

@@ -126,6 +129,7 @@ SettingsForm::SettingsForm(QWidget *parent) :
        connect (ui->gradientYButton, SIGNAL(toggled(bool)), this, SLOT(_set_gradient_yes(bool)));
        connect (ui->engLangButton, SIGNAL(toggled(bool)), this, SLOT(_set_lang_en(bool)));
        connect (ui->ruLangButton, SIGNAL(toggled(bool)), this, SLOT(_set_lang_ru(bool)));
        connect (ui->gradientYButton, SIGNAL(toggled(bool)), this, SLOT(_set_gradient_yes(bool)));
        connect (ui->engLangButton, SIGNAL(toggled(bool)), this, SLOT(_set_lang_en(bool)));
        connect (ui->ruLangButton, SIGNAL(toggled(bool)), this, SLOT(_set_lang_ru(bool)));

+       connect (ui->cnLangButton, SIGNAL(toggled(bool)), this, SLOT(_set_lang_cn(bool)));

        connect (ui->cBlackButton, SIGNAL(toggled(bool)), this, SLOT(_set_color_black(bool)));
        connect (ui->cBlueButton, SIGNAL(toggled(bool)), this, SLOT(_set_color_blue(bool)));
        connect (ui->cDarkButton, SIGNAL(toggled(bool)), this, SLOT(_set_color_dark(bool)));
        connect (ui->cBlackButton, SIGNAL(toggled(bool)), this, SLOT(_set_color_black(bool)));
        connect (ui->cBlueButton, SIGNAL(toggled(bool)), this, SLOT(_set_color_blue(bool)));
        connect (ui->cDarkButton, SIGNAL(toggled(bool)), this, SLOT(_set_color_dark(bool)));

@@ -301,6 +305,13 @@ void SettingsForm::_set_lang_ru(bool checked) {
        emit translationChanged();
 }
 
        emit translationChanged();
 }
 

+void SettingsForm::_set_lang_cn(bool checked) {
+       if (!checked) return;
+       Config config;
+       config.setValue("ui/language", "cn");
+       emit translationChanged();
+}
+

 void SettingsForm::_set_pause_hp_no(bool checked) {
        if (!checked) return;
        Config config;
 void SettingsForm::_set_pause_hp_no(bool checked) {
        if (!checked) return;
        Config config;

diff --git a/src/settingsform.h b/src/settingsform.h
index 817d9f5..1354abe 100644 (file)
--- a/src/settingsform.h
+++ b/src/settingsform.h
@@ -67,6 +67,7 @@ private slots:
        void _set_gradient_no(bool);
        void _set_lang_en(bool);
        void _set_lang_ru(bool);
        void _set_gradient_no(bool);
        void _set_lang_en(bool);
        void _set_lang_ru(bool);

+       void _set_lang_cn(bool);

        void _set_color_blue(bool);
        void _set_color_magenta(bool);
        void _set_color_red(bool);
        void _set_color_blue(bool);
        void _set_color_magenta(bool);
        void _set_color_red(bool);

diff --git a/src/someplayer.h b/src/someplayer.h
index 0b94676..85c2666 100644 (file)
--- a/src/someplayer.h
+++ b/src/someplayer.h
@@ -48,7 +48,7 @@ namespace SomePlayer {
 #include "config.h"
 
 #define _DYNAMIC_PLAYLIST_MAX_COUNT_ 50
 #include "config.h"
 
 #define _DYNAMIC_PLAYLIST_MAX_COUNT_ 50

-#define _SOMEPLAYER_VERSION_ "1.5.1"
+#define _SOMEPLAYER_VERSION_ "1.5.2"

 #define NDEBUG
 
 #define _SERVICE_NAME_ "ru.somebody.someplayer"
 #define NDEBUG
 
 #define _SERVICE_NAME_ "ru.somebody.someplayer"

diff --git a/src/src.pro b/src/src.pro
index 1e29b66..8f1d58f 100644 (file)
--- a/src/src.pro
+++ b/src/src.pro
@@ -286,7 +286,8 @@ OTHER_FILES += \
     AUTHORS.TagLib \
     COPYING.LGPL
 
     AUTHORS.TagLib \
     COPYING.LGPL
 

-TRANSLATIONS   =  resources/someplayer_ru.ts
+TRANSLATIONS   =  resources/someplayer_ru.ts \
+    resources/someplayer_cn.ts

 
 unix {
        #VARIABLES
 
 unix {
        #VARIABLES

diff --git a/src/ui/aboutform.ui b/src/ui/aboutform.ui
index 66c01f1..f3388d6 100644 (file)
--- a/src/ui/aboutform.ui
+++ b/src/ui/aboutform.ui
@@ -32,9 +32,9 @@
       <property name="geometry">
        <rect>
         <x>0</x>
       <property name="geometry">
        <rect>
         <x>0</x>

-        <y>0</y>
+        <y>-208</y>

         <width>550</width>
         <width>550</width>

-        <height>547</height>
+        <height>562</height>

        </rect>
       </property>
       <layout class="QVBoxLayout" name="verticalLayout">
        </rect>
       </property>
       <layout class="QVBoxLayout" name="verticalLayout">

@@ -100,7 +100,7 @@
          <item row="1" column="0" colspan="3">
           <widget class="QLabel" name="nameLabel">
            <property name="text">
          <item row="1" column="0" colspan="3">
           <widget class="QLabel" name="nameLabel">
            <property name="text">

-            <string>&lt;b&gt;SomePlayer 1.5.1&lt;/b&gt; </string>
+            <string>&lt;b&gt;SomePlayer 1.5.2&lt;/b&gt; </string>

            </property>
            <property name="alignment">
             <set>Qt::AlignCenter</set>
            </property>
            <property name="alignment">
             <set>Qt::AlignCenter</set>

@@ -174,7 +174,7 @@ By Nikolay Tischenko (somebody)&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;&lt;b
          <property name="text">
           <string>&lt;p align=&quot;center&quot;&gt;
 &lt;b&gt;Thanks to:&lt;/b&gt;&lt;br&gt;
          <property name="text">
           <string>&lt;p align=&quot;center&quot;&gt;
 &lt;b&gt;Thanks to:&lt;/b&gt;&lt;br&gt;

-MrClon (maemoworld.ru)&lt;br /&gt;hxka (maemoworld.ru)&lt;br /&gt;jerich0 (maemoworld.ru)&lt;br /&gt;lknfox (maemoworld.ru)&lt;br /&gt;fab (maemoworld.ru)&lt;br /&gt;Pantera1989m (github.com)&lt;br /&gt;and other people who tested this player and helped in development&lt;/p&gt;</string>
+MrClon (maemoworld.ru)&lt;br /&gt;hxka (maemoworld.ru)&lt;br /&gt;jerich0 (maemoworld.ru)&lt;br /&gt;lknfox (maemoworld.ru)&lt;br /&gt;fab (maemoworld.ru)&lt;br /&gt;Pantera1989m (github.com)&lt;br /&gt;willkr (maemo.org)&lt;br /&gt;and other people who tested this player and helped in development&lt;/p&gt;</string>

          </property>
          <property name="wordWrap">
           <bool>true</bool>
          </property>
          <property name="wordWrap">
           <bool>true</bool>

diff --git a/src/ui/settingsform.ui b/src/ui/settingsform.ui
index 7d35f7f..ee092eb 100644 (file)
--- a/src/ui/settingsform.ui
+++ b/src/ui/settingsform.ui
@@ -66,7 +66,7 @@
    <item>
     <widget class="QStackedWidget" name="stackedWidget">
      <property name="currentIndex">
    <item>
     <widget class="QStackedWidget" name="stackedWidget">
      <property name="currentIndex">

-      <number>2</number>
+      <number>0</number>

      </property>
      <widget class="QWidget" name="stackedWidgetPage1">
       <layout class="QVBoxLayout" name="verticalLayout_13">
      </property>
      <widget class="QWidget" name="stackedWidgetPage1">
       <layout class="QVBoxLayout" name="verticalLayout_13">

@@ -390,6 +390,13 @@
                   </property>
                  </widget>
                 </item>
                   </property>
                  </widget>
                 </item>

+                <item>
+                 <widget class="QRadioButton" name="cnLangButton">
+                  <property name="text">
+                   <string>Chinese</string>
+                  </property>
+                 </widget>
+                </item>

                </layout>
               </item>
               <item>
                </layout>
               </item>
               <item>