copy 1.2 branch to trunk

git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@7772 90c681e8-e032-0410-971d-27865f9a5e38

1 files changed, 13 insertions, 13 deletions

diff --git a/src/plugins/Input/flac/translations/flac_plugin_ru.ts b/src/plugins/Input/flac/translations/flac_plugin_ru.ts
index 03e076f15..9fedc74cb 100644
--- a/src/plugins/Input/flac/translations/flac_plugin_ru.ts
+++ b/src/plugins/Input/flac/translations/flac_plugin_ru.ts
@@ -4,27 +4,27 @@
 <context>
     <name>DecoderFLACFactory</name>
     <message>
-        <location filename="../decoderflacfactory.cpp" line="56"/>
+        <location filename="../decoderflacfactory.cpp" line="53"/>
         <source>FLAC Plugin</source>
         <translation>Модуль FLAC</translation>
     </message>
     <message>
-        <location filename="../decoderflacfactory.cpp" line="58"/>
+        <location filename="../decoderflacfactory.cpp" line="55"/>
         <source>FLAC Files</source>
         <translation>Файлы FLAC</translation>
     </message>
     <message>
-        <location filename="../decoderflacfactory.cpp" line="199"/>
+        <location filename="../decoderflacfactory.cpp" line="186"/>
         <source>About FLAC Audio Plugin</source>
         <translation>Об аудио-модуле FLAC</translation>
     </message>
     <message>
-        <location filename="../decoderflacfactory.cpp" line="200"/>
+        <location filename="../decoderflacfactory.cpp" line="187"/>
         <source>Qmmp FLAC Audio Plugin</source>
         <translation>Аудио-модуль FLAC для Qmmp</translation>
     </message>
     <message>
-        <location filename="../decoderflacfactory.cpp" line="201"/>
+        <location filename="../decoderflacfactory.cpp" line="188"/>
         <source>Written by: Ilya Kotov &lt;forkotov02@ya.ru&gt;</source>
         <translation>Разработчик: Илья Котов &lt;forkotov02@ya.ru&gt;</translation>
     </message>
@@ -32,42 +32,42 @@
 <context>
     <name>FLACMetaDataModel</name>
     <message>
-        <location filename="../flacmetadatamodel.cpp" line="92"/>
+        <location filename="../flacmetadatamodel.cpp" line="89"/>
         <source>Length</source>
         <translation>Длительность</translation>
     </message>
     <message>
-        <location filename="../flacmetadatamodel.cpp" line="93"/>
+        <location filename="../flacmetadatamodel.cpp" line="90"/>
         <source>Sample rate</source>
         <translation>Дискретизация</translation>
     </message>
     <message>
-        <location filename="../flacmetadatamodel.cpp" line="93"/>
+        <location filename="../flacmetadatamodel.cpp" line="90"/>
         <source>Hz</source>
         <translation>Гц</translation>
     </message>
     <message>
-        <location filename="../flacmetadatamodel.cpp" line="94"/>
+        <location filename="../flacmetadatamodel.cpp" line="91"/>
         <source>Channels</source>
         <translation>Каналов</translation>
     </message>
     <message>
-        <location filename="../flacmetadatamodel.cpp" line="95"/>
+        <location filename="../flacmetadatamodel.cpp" line="92"/>
         <source>Bitrate</source>
         <translation>Битовая частота</translation>
     </message>
     <message>
-        <location filename="../flacmetadatamodel.cpp" line="95"/>
+        <location filename="../flacmetadatamodel.cpp" line="92"/>
         <source>kbps</source>
         <translation>кбит/с</translation>
     </message>
     <message>
-        <location filename="../flacmetadatamodel.cpp" line="96"/>
+        <location filename="../flacmetadatamodel.cpp" line="93"/>
         <source>File size</source>
         <translation>Размер файла</translation>
     </message>
     <message>
-        <location filename="../flacmetadatamodel.cpp" line="96"/>
+        <location filename="../flacmetadatamodel.cpp" line="93"/>
         <source>KB</source>
         <translation>КБ</translation>
     </message>