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_fi.ts b/src/plugins/Input/flac/translations/flac_plugin_fi.ts
index 6ca4765f8..3d9cab792 100644
--- a/src/plugins/Input/flac/translations/flac_plugin_fi.ts
+++ b/src/plugins/Input/flac/translations/flac_plugin_fi.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-liitännäinen</translation>
     </message>
     <message>
-        <location filename="../decoderflacfactory.cpp" line="58"/>
+        <location filename="../decoderflacfactory.cpp" line="55"/>
         <source>FLAC Files</source>
         <translation>FLAC-tiedostot</translation>
     </message>
     <message>
-        <location filename="../decoderflacfactory.cpp" line="199"/>
+        <location filename="../decoderflacfactory.cpp" line="186"/>
         <source>About FLAC Audio Plugin</source>
         <translation>Tietoja - FLAC-ääniliitännäinen</translation>
     </message>
     <message>
-        <location filename="../decoderflacfactory.cpp" line="200"/>
+        <location filename="../decoderflacfactory.cpp" line="187"/>
         <source>Qmmp FLAC Audio Plugin</source>
         <translation>Qmmp:n FLAC-ääniliitännäinen</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>Toteuttanut: Ilya Kotov &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>Kesto</translation>
     </message>
     <message>
-        <location filename="../flacmetadatamodel.cpp" line="93"/>
+        <location filename="../flacmetadatamodel.cpp" line="90"/>
         <source>Sample rate</source>
         <translation>Näytteenottotaajuus</translation>
     </message>
     <message>
-        <location filename="../flacmetadatamodel.cpp" line="93"/>
+        <location filename="../flacmetadatamodel.cpp" line="90"/>
         <source>Hz</source>
         <translation>Hz</translation>
     </message>
     <message>
-        <location filename="../flacmetadatamodel.cpp" line="94"/>
+        <location filename="../flacmetadatamodel.cpp" line="91"/>
         <source>Channels</source>
         <translation>Kanavat</translation>
     </message>
     <message>
-        <location filename="../flacmetadatamodel.cpp" line="95"/>
+        <location filename="../flacmetadatamodel.cpp" line="92"/>
         <source>Bitrate</source>
         <translation>Bittinopeus</translation>
     </message>
     <message>
-        <location filename="../flacmetadatamodel.cpp" line="95"/>
+        <location filename="../flacmetadatamodel.cpp" line="92"/>
         <source>kbps</source>
         <translation>kbps</translation>
     </message>
     <message>
-        <location filename="../flacmetadatamodel.cpp" line="96"/>
+        <location filename="../flacmetadatamodel.cpp" line="93"/>
         <source>File size</source>
         <translation>Tiedostokoko</translation>
     </message>
     <message>
-        <location filename="../flacmetadatamodel.cpp" line="96"/>
+        <location filename="../flacmetadatamodel.cpp" line="93"/>
         <source>KB</source>
         <translation>kt</translation>
     </message>