X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fresources%2Fsomeplayer_ru.ts;h=026e2a4f21cbbf8e5b5a70b3d146024a5186918f;hb=54025469e03ce2ef4b94670c73af126de647bc93;hp=bed389ec86cc74daec712fec19f0769e80923088;hpb=3381c79d73ddf486c06dc7ee9d6dc06b80ca3b44;p=someplayer

diff --git a/src/resources/someplayer_ru.ts b/src/resources/someplayer_ru.ts
index bed389e..026e2a4 100644
--- a/src/resources/someplayer_ru.ts
+++ b/src/resources/someplayer_ru.ts
@@ -9,38 +9,43 @@
         <translation>О SomePlayer</translation>
     </message>
     <message>
-        <location filename="../ui/aboutform.ui" line="103"/>
-        <source>&lt;b&gt;SomePlayer 1.5.0&lt;/b&gt; </source>
-        <translation>&lt;b&gt;SomePlayer 1.5.0&lt;/b&gt;</translation>
+        <location filename="../ui/aboutform.ui" line="120"/>
+        <source>&lt;b&gt;SomePlayer&lt;/b&gt; </source>
+        <translation>&lt;b&gt;SomePlayer&lt;/b&gt;</translation>
     </message>
     <message>
-        <location filename="../ui/aboutform.ui" line="128"/>
+        <location filename="../ui/aboutform.ui" line="130"/>
+        <source>&gt;&lt;</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../ui/aboutform.ui" line="165"/>
         <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>
-        <location filename="../ui/aboutform.ui" line="151"/>
+        <location filename="../ui/aboutform.ui" line="188"/>
         <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;
 Автор: Николай Тищенко (somebody)&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;&lt;b&gt;SomePlayer&lt;/b&gt; это попытка полностью заменить стандартный аудиоплеер в Maemo 5, привнеся поддержку многих других вещей: эквалайзер, пользовательские плейлисты, составленные из файлов, продвинутый случайный режим, более гибкая медиабиблиотека и продвинутый алгоритм поиска обложек для альбомов.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../ui/aboutform.ui" line="175"/>
+        <location filename="../ui/aboutform.ui" line="212"/>
         <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;
-&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"/>
+        <location filename="../ui/aboutform.ui" line="226"/>
         <source>Online help</source>
         <translation>Онлайн справка</translation>
     </message>
     <message>
-        <location filename="../ui/aboutform.ui" line="196"/>
+        <location filename="../ui/aboutform.ui" line="233"/>
         <source>Donate</source>
         <translation>Donate</translation>
     </message>
@@ -58,12 +63,12 @@ MrClon (maemoworld.ru)&lt;br /&gt;hxka (maemoworld.ru)&lt;br /&gt;jerich0 (maemo
         <translation>Аудиоклипы</translation>
     </message>
     <message>
-        <location filename="../directoryview.cpp" line="309"/>
-        <source>Inner memory</source>
+        <location filename="../directoryview.cpp" line="310"/>
+        <source>Internal memory</source>
         <translation>Внутренняя память</translation>
     </message>
     <message>
-        <location filename="../directoryview.cpp" line="311"/>
+        <location filename="../directoryview.cpp" line="312"/>
         <source>Memory card</source>
         <translation>Карта памяти</translation>
     </message>
@@ -407,47 +412,57 @@ MrClon (maemoworld.ru)&lt;br /&gt;hxka (maemoworld.ru)&lt;br /&gt;jerich0 (maemo
         <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>
-        <location filename="../ui/mainwindow.ui" line="76"/>
+        <location filename="../ui/mainwindow.ui" line="83"/>
         <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>
-        <location filename="../ui/mainwindow.ui" line="86"/>
+        <location filename="../ui/mainwindow.ui" line="93"/>
         <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>
-        <location filename="../ui/mainwindow.ui" line="96"/>
+        <location filename="../ui/mainwindow.ui" line="103"/>
         <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>
-        <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="224"/>
         <source>Clear playlist?</source>
         <translation>Очистить плейлист?</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="264"/>
+        <location filename="../mainwindow.cpp" line="270"/>
         <source>Music off: </source>
         <translation>Отключение: </translation>
     </message>
@@ -491,12 +506,12 @@ MrClon (maemoworld.ru)&lt;br /&gt;hxka (maemoworld.ru)&lt;br /&gt;jerich0 (maemo
     </message>
     <message>
         <location filename="../managelibraryform.cpp" line="145"/>
-        <source>Update selected directories? It may takes several minutes</source>
+        <source>Update selected directories? It may take several minutes</source>
         <translation>Обновить выбранные директории? Это может занять несколько минут</translation>
     </message>
     <message>
         <location filename="../managelibraryform.cpp" line="165"/>
-        <source>Update all library? It may takes a long time</source>
+        <source>Update the entire library? It may take a long time</source>
         <translation>Обновить всю библиотеку? Это может занять длительное время</translation>
     </message>
 </context>
@@ -535,45 +550,45 @@ MrClon (maemoworld.ru)&lt;br /&gt;hxka (maemoworld.ru)&lt;br /&gt;jerich0 (maemo
     </message>
     <message>
         <location filename="../playerform.cpp" line="91"/>
-        <location filename="../playerform.cpp" line="771"/>
+        <location filename="../playerform.cpp" line="783"/>
         <source>Clear playlist</source>
         <translation>Очистить плейлист</translation>
     </message>
     <message>
         <location filename="../playerform.cpp" line="92"/>
-        <location filename="../playerform.cpp" line="772"/>
+        <location filename="../playerform.cpp" line="784"/>
         <source>Delete</source>
         <translation>Удалить</translation>
     </message>
     <message>
         <location filename="../playerform.cpp" line="93"/>
-        <location filename="../playerform.cpp" line="239"/>
-        <location filename="../playerform.cpp" line="279"/>
-        <location filename="../playerform.cpp" line="773"/>
+        <location filename="../playerform.cpp" line="242"/>
+        <location filename="../playerform.cpp" line="282"/>
+        <location filename="../playerform.cpp" line="785"/>
         <source>Add to favorites</source>
         <translation>В избранное</translation>
     </message>
     <message>
         <location filename="../playerform.cpp" line="94"/>
-        <location filename="../playerform.cpp" line="774"/>
+        <location filename="../playerform.cpp" line="786"/>
         <source>Enqueue</source>
         <translation>В очередь</translation>
     </message>
     <message>
         <location filename="../playerform.cpp" line="95"/>
-        <location filename="../playerform.cpp" line="775"/>
+        <location filename="../playerform.cpp" line="787"/>
         <source>Add to playlists</source>
         <translation>Добавить в плейлисты</translation>
     </message>
     <message>
         <location filename="../playerform.cpp" line="96"/>
-        <location filename="../playerform.cpp" line="776"/>
+        <location filename="../playerform.cpp" line="788"/>
         <source>Edit tags</source>
         <translation>Редактировать теги</translation>
     </message>
     <message>
-        <location filename="../playerform.cpp" line="239"/>
-        <location filename="../playerform.cpp" line="279"/>
+        <location filename="../playerform.cpp" line="242"/>
+        <location filename="../playerform.cpp" line="282"/>
         <source>Remove from favorites</source>
         <translation>Удалить из избранного</translation>
     </message>
@@ -624,7 +639,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"/>
-        <location filename="../ui/settingsform.ui" line="706"/>
+        <location filename="../ui/settingsform.ui" line="671"/>
         <source>Settings</source>
         <translation>Настройки</translation>
     </message>
@@ -645,11 +660,13 @@ MrClon (maemoworld.ru)&lt;br /&gt;hxka (maemoworld.ru)&lt;br /&gt;jerich0 (maemo
     </message>
     <message>
         <location filename="../ui/settingsform.ui" line="129"/>
+        <location filename="../ui/settingsform.ui" line="235"/>
         <source>White</source>
         <translation>Белые</translation>
     </message>
     <message>
         <location filename="../ui/settingsform.ui" line="136"/>
+        <location filename="../ui/settingsform.ui" line="240"/>
         <source>Black</source>
         <translation>Чёрные</translation>
     </message>
@@ -660,15 +677,15 @@ MrClon (maemoworld.ru)&lt;br /&gt;hxka (maemoworld.ru)&lt;br /&gt;jerich0 (maemo
     </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="488"/>
+        <location filename="../ui/settingsform.ui" line="575"/>
         <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="495"/>
+        <location filename="../ui/settingsform.ui" line="582"/>
         <source>No</source>
         <translation>Нет</translation>
     </message>
@@ -678,87 +695,87 @@ MrClon (maemoworld.ru)&lt;br /&gt;hxka (maemoworld.ru)&lt;br /&gt;jerich0 (maemo
         <translation>Цвет текущего трека:</translation>
     </message>
     <message>
-        <location filename="../ui/settingsform.ui" line="222"/>
-        <source>blue</source>
-        <translation>голубой</translation>
-    </message>
-    <message>
-        <location filename="../ui/settingsform.ui" line="232"/>
-        <source>magenta</source>
-        <translation>фиолетовый</translation>
+        <location filename="../ui/settingsform.ui" line="215"/>
+        <source>Blue</source>
+        <translation>Голубой</translation>
     </message>
     <message>
-        <location filename="../ui/settingsform.ui" line="242"/>
-        <source>red</source>
-        <translation>красный</translation>
+        <location filename="../ui/settingsform.ui" line="220"/>
+        <source>Magenta</source>
+        <translation>Фиолетовый</translation>
     </message>
     <message>
-        <location filename="../ui/settingsform.ui" line="252"/>
-        <source>yellow</source>
-        <translation>жёлтый</translation>
+        <location filename="../ui/settingsform.ui" line="225"/>
+        <source>Red</source>
+        <translation>Красный</translation>
     </message>
     <message>
-        <location filename="../ui/settingsform.ui" line="262"/>
-        <source>white</source>
-        <translation>белый</translation>
+        <location filename="../ui/settingsform.ui" line="230"/>
+        <source>Yellow</source>
+        <translation>Жёлтый</translation>
     </message>
     <message>
-        <location filename="../ui/settingsform.ui" line="272"/>
-        <source>black</source>
-        <translation>чёрный</translation>
+        <location filename="../ui/settingsform.ui" line="245"/>
+        <source>Light</source>
+        <translation>Светлый</translation>
     </message>
     <message>
-        <location filename="../ui/settingsform.ui" line="282"/>
-        <source>light</source>
-        <translation>светлый</translation>
+        <location filename="../ui/settingsform.ui" line="250"/>
+        <source>Dark</source>
+        <translation>Тёмный</translation>
     </message>
     <message>
-        <location filename="../ui/settingsform.ui" line="292"/>
-        <source>dark</source>
-        <translation>тёмный</translation>
+        <location filename="../ui/settingsform.ui" line="340"/>
+        <source>Italiano</source>
+        <translation>Italiano</translation>
     </message>
     <message>
-        <location filename="../ui/settingsform.ui" line="452"/>
+        <location filename="../ui/settingsform.ui" line="417"/>
         <source>Sort album:</source>
         <translation>Сортировка альбомов:</translation>
     </message>
     <message>
-        <location filename="../ui/settingsform.ui" line="478"/>
+        <location filename="../ui/settingsform.ui" line="443"/>
         <source>Alphabetical</source>
         <translation>По алфавиту</translation>
     </message>
     <message>
-        <location filename="../ui/settingsform.ui" line="485"/>
+        <location filename="../ui/settingsform.ui" line="450"/>
         <source>By date</source>
         <translation>По дате</translation>
     </message>
     <message>
-        <location filename="../ui/settingsform.ui" line="629"/>
+        <location filename="../ui/settingsform.ui" line="462"/>
+        <source>Show track length in library view:</source>
+        <translation>Показывать длину трека:</translation>
+    </message>
+    <message>
+        <location filename="../ui/settingsform.ui" line="594"/>
         <source>Use hardware keys</source>
         <translation>Аппаратные кнопки</translation>
     </message>
     <message>
-        <location filename="../ui/settingsform.ui" line="650"/>
+        <location filename="../ui/settingsform.ui" line="615"/>
         <source>Zoom keys control:</source>
         <translation>«Качелька» управляет:</translation>
     </message>
     <message>
-        <location filename="../ui/settingsform.ui" line="659"/>
+        <location filename="../ui/settingsform.ui" line="624"/>
         <source>Volume</source>
         <translation>Звуком</translation>
     </message>
     <message>
-        <location filename="../ui/settingsform.ui" line="666"/>
+        <location filename="../ui/settingsform.ui" line="631"/>
         <source>Tracks</source>
         <translation>Треками</translation>
     </message>
     <message>
-        <location filename="../ui/settingsform.ui" line="678"/>
+        <location filename="../ui/settingsform.ui" line="643"/>
         <source>Use FMTX</source>
         <translation>Включить FMTX</translation>
     </message>
     <message>
-        <location filename="../ui/settingsform.ui" line="304"/>
+        <location filename="../ui/settingsform.ui" line="261"/>
         <source>Orientation:</source>
         <translation>Ориентация:</translation>
     </message>
@@ -768,42 +785,27 @@ MrClon (maemoworld.ru)&lt;br /&gt;hxka (maemoworld.ru)&lt;br /&gt;jerich0 (maemo
         <translation>Система</translation>
     </message>
     <message>
-        <location filename="../ui/settingsform.ui" line="330"/>
+        <location filename="../ui/settingsform.ui" line="287"/>
         <source>Landscape</source>
         <translation>Ландшафтный</translation>
     </message>
     <message>
-        <location filename="../ui/settingsform.ui" line="337"/>
+        <location filename="../ui/settingsform.ui" line="294"/>
         <source>Portrait</source>
         <translation>Портретный</translation>
     </message>
     <message>
-        <location filename="../ui/settingsform.ui" line="344"/>
+        <location filename="../ui/settingsform.ui" line="301"/>
         <source>Auto</source>
         <translation>Авто</translation>
     </message>
     <message>
-        <location filename="../ui/settingsform.ui" line="497"/>
-        <source>Show track lenght in library view:</source>
-        <translation>Показывать длину трека:</translation>
-    </message>
-    <message>
-        <location filename="../ui/settingsform.ui" line="356"/>
+        <location filename="../ui/settingsform.ui" line="313"/>
         <source>Language:</source>
         <translation>Язык:</translation>
     </message>
     <message>
-        <location filename="../ui/settingsform.ui" line="382"/>
-        <source>English</source>
-        <translation>Английский</translation>
-    </message>
-    <message>
-        <location filename="../ui/settingsform.ui" line="389"/>
-        <source>Russian</source>
-        <translation>Русский</translation>
-    </message>
-    <message>
-        <location filename="../ui/settingsform.ui" line="590"/>
+        <location filename="../ui/settingsform.ui" line="555"/>
         <source>Pause when headphones unplugged:</source>
         <translation>Пауза при отключении наушников:</translation>
     </message>