articleview.cc            |    7 ----

 goldendict.pro            |    4 +-

 locale/ru_RU.ts           |   89 ++++++++++++++++++++++++---------------------

 3 files changed, 50 insertions(+), 50 deletions(-)

diff --git a/articleview.cc b/articleview.cc

index 396e125..6388bfb 100644

--- a/articleview.cc

+++ b/articleview.cc

@@ -21,15 +21,8 @@

 #endif

 #include <QBuffer>

-// Phonon headers are a mess. How to include them properly? Send patches if you

-// know.

-#ifdef __WIN32

 #include <Phonon/AudioOutput>

 #include <Phonon/MediaObject>

-#else

-#include <phonon/audiooutput.h>

-#include <phonon/mediaobject.h>

-#endif

 using std::map;

 using std::list;

diff --git a/goldendict.pro b/goldendict.pro

index 4f358a6..4e44853 100644

--- a/goldendict.pro

+++ b/goldendict.pro

@@ -61,9 +61,9 @@ unix {

         -lXtst

     PREFIX = $$(PREFIX)

     isEmpty( PREFIX ):PREFIX = /usr/local

-    DEFINES += PROGRAM_DATA_DIR=\\\"$$PREFIX/share/apps/goldendict/\\\"

+    DEFINES += PROGRAM_DATA_DIR=\\\"$$PREFIX/share/goldendict/\\\"

     target.path = $$PREFIX/bin/

-    locale.path = $$PREFIX/share/apps/goldendict/locale/

+    locale.path = $$PREFIX/share/goldendict/locale/

     locale.files = locale/*.qm

     INSTALLS += target \

         locale

diff --git a/locale/ru_RU.ts b/locale/ru_RU.ts

index 373c7cc..b79dbf1 100644

--- a/locale/ru_RU.ts

+++ b/locale/ru_RU.ts

@@ -125,81 +125,81 @@

 <context>

     <name>ArticleView</name>

     <message>

-        <location filename="../articleview.cc" line="705"/>

-        <location filename="../articleview.cc" line="1054"/>

-        <location filename="../articleview.cc" line="1072"/>

-        <location filename="../articleview.cc" line="1082"/>

-        <location filename="../articleview.cc" line="1105"/>

+        <location filename="../articleview.cc" line="698"/>

+        <location filename="../articleview.cc" line="1047"/>

+        <location filename="../articleview.cc" line="1065"/>

+        <location filename="../articleview.cc" line="1075"/>

+        <location filename="../articleview.cc" line="1098"/>

         <source>GoldenDict</source>

         <translation>GoldenDict</translation>

     </message>

     <message>

-        <location filename="../articleview.cc" line="705"/>

+        <location filename="../articleview.cc" line="698"/>

         <source>The referenced resource doesn&apos;t exist.</source>

         <translation>п≈п╟п©я─п╬я┬п╣п╫п╫я▀п╧ я─п╣я│я┐я─я│ п╫п╣ п╫п╟п╧п╢п╣п╫.</translation>

     </message>

     <message>

-        <location filename="../articleview.cc" line="810"/>

+        <location filename="../articleview.cc" line="803"/>

         <source>&amp;Open Link</source>

         <translation>&amp;п·я┌п╨я─я▀я┌я▄ я│я│я▀п╩п╨я┐</translation>

     </message>

     <message>

-        <location filename="../articleview.cc" line="816"/>

+        <location filename="../articleview.cc" line="809"/>

         <source>Open Link in New &amp;Tab</source>

         <translation>п·я┌п╨я─я▀я┌я▄ я│я│я▀п╩п╨я┐ п╡ п╫п╬п╡п╬п╧ &amp;п╡п╨п╩п╟п╢п╨п╣</translation>

     </message>

     <message>

-        <location filename="../articleview.cc" line="823"/>

+        <location filename="../articleview.cc" line="816"/>

         <source>Open Link in &amp;External Browser</source>

         <translation>п·я┌п╨я─я▀я┌я▄ я│я│я▀п╩п╨я┐ п╡п╬ п╡п╫п╣я┬п╫п╣п╪ &amp;п╠я─п╟я┐п╥п╣я─п╣</translation>

     </message>

     <message>

-        <location filename="../articleview.cc" line="836"/>

+        <location filename="../articleview.cc" line="829"/>

         <source>&amp;Look up &quot;%1&quot;</source>

         <translation>&amp;п÷п╬п╦я│п╨ б╚%1б╩</translation>

     </message>

     <message>

-        <location filename="../articleview.cc" line="844"/>

+        <location filename="../articleview.cc" line="837"/>

         <source>Look up &quot;%1&quot; in &amp;New Tab</source>

         <translation>п÷п╬п╦я│п╨ б╚%1б╩ п╡ &amp;п╫п╬п╡п╬п╧ п╡п╨п╩п╟п╢п╨п╣</translation>

     </message>

     <message>

-        <location filename="../articleview.cc" line="859"/>

+        <location filename="../articleview.cc" line="852"/>

         <source>Look up &quot;%1&quot; in %2</source>

         <translation>п÷п╬п╦я│п╨ б╚%1б╩ п╡ %2</translation>

     </message>

     <message>

-        <location filename="../articleview.cc" line="867"/>

+        <location filename="../articleview.cc" line="860"/>

         <source>Look up &quot;%1&quot; in %2 in &amp;New Tab</source>

         <translation>п÷п╬п╦я│п╨ б╚%1б╩ п╡ %2 п╡ &amp;п╫п╬п╡п╬п╧ п╡п╨п╩п╟п╢п╨п╣</translation>

     </message>

     <message>

-        <location filename="../articleview.cc" line="1002"/>

+        <location filename="../articleview.cc" line="995"/>

         <source>Playing a non-WAV file</source>

         <translation>п÷я─п╬п╦пЁя─я▀п╡п╟п╫п╦п╣ п╬я┌п╩п╦я┤п╫п╬пЁп╬ п╬я┌ WAV я└п╟п╧п╩п╟</translation>

     </message>

     <message>

-        <location filename="../articleview.cc" line="1003"/>

+        <location filename="../articleview.cc" line="996"/>

         <source>To enable playback of files different than WAV, please go to Edit|Preferences, choose the Audio tab and select &quot;Play via DirectShow&quot; there.</source>

         <translation>п╖я┌п╬п╠я▀ п╡п╨п╩я▌я┤п╦я┌я▄ п╡п╬п╥п╪п╬п╤п╫п╬я│я┌я▄ п©я─п╬п╦пЁя─я▀п╡п╟п╫п╦я▐ я└п╟п╧п╩п╬п╡ я┌п╦п©п╬п╡, п╬я┌п╩п╦я┤п╫я▀я┘ п╬я┌ WAV, п©п╬п╤п╟п╩я┐п╧я│я┌п╟ п╥п╟п╧п╢п╦я┌п╣ п╡ п÷я─п╟п╡п╨п╟|п÷п╟я─п╟п╪п╣я┌я─я▀, п╡я▀п╠п╣я─п╦я┌п╣ п╡п╨п╩п╟п╢п╨я┐ п░я┐п╢п╦п╬ п╦ п╡я▀п╠п╣я─п╦я┌п╣ я─п╣п╤п╦п╪ &quot;п▓я▀п╡п╬п╢ п╥п╡я┐п╨п╟ я┤п╣я─п╣п╥ DirectShow&quot;.</translation>

     </message>

     <message>

-        <location filename="../articleview.cc" line="1054"/>

+        <location filename="../articleview.cc" line="1047"/>

         <source>Failed to run a player to play sound file: %1</source>

         <translation>п²п╣п╡п╬п╥п╪п╬п╤п╫п╬ п╥п╟п©я┐я│я┌п╦я┌я▄ п©я─п╬п╦пЁя─я▀п╡п╟я┌п╣п╩я▄ п╥п╡я┐п╨п╬п╡п╬пЁп╬ я└п╟п╧п╩п╟: %1</translation>

     </message>

     <message>

-        <location filename="../articleview.cc" line="1072"/>

+        <location filename="../articleview.cc" line="1065"/>

         <source>Failed to create temporary file.</source>

         <translation>п·я┬п╦п╠п╨п╟ я│п╬п╥п╢п╟п╫п╦я▐ п╡я─п╣п╪п╣п╫п╫п╬пЁп╬ я└п╟п╧п╩п╟.</translation>

     </message>

     <message>

-        <location filename="../articleview.cc" line="1082"/>

+        <location filename="../articleview.cc" line="1075"/>

         <source>Failed to auto-open resource file, try opening manually: %1.</source>

         <translation>п·я┬п╦п╠п╨п╟ п╬я┌п╨я─я▀я┌п╦я▐ я└п╟п╧п╩п╟ я─п╣я│я┐я─я│п╟, п©п╬п©я─п╬п╠я┐п╧я┌п╣ п╬я┌п╨я─я▀я┌я▄ п╡я─я┐я┤п╫я┐я▌: %1.</translation>

     </message>

     <message>

-        <location filename="../articleview.cc" line="1105"/>

+        <location filename="../articleview.cc" line="1098"/>

         <source>The referenced resource failed to download.</source>

         <translation>п²п╣п╡п╬п╥п╪п╬п╤п╫п╬ п╥п╟пЁя─я┐п╥п╦я┌я▄ я┐п╨п╟п╥п╟п╫п╫я▀п╧ я─п╣я│я┐я─я│.</translation>

     </message>

@@ -294,7 +294,7 @@

     <message>

         <location filename="../groups_widgets.cc" line="89"/>

         <source>Can&apos;t read the specified image file.</source>

-        <translation>п²п╣п╡п╬п╥п╪п╬п╤п╫п╬ п©я─п╬я┤п╦я┌п╟я┌я▄ п╡я▀п╠я─п╟п╫п╫я▀п╧ я└п╟п╧п╩ п╦п╥п╬п╠я─п╟п╤п╣п╫п╦я▐</translation>

+        <translation>п²п╣п╡п╬п╥п╪п╬п╤п╫п╬ п©я─п╬я┤п╦я┌п╟я┌я▄ п╡я▀п╠я─п╟п╫п╫я▀п╧ я└п╟п╧п╩ п╦п╥п╬п╠я─п╟п╤п╣п╫п╦я▐.</translation>

     </message>

 </context>

 <context>

@@ -379,37 +379,37 @@

 <context>

     <name>Forvo::ForvoArticleRequest</name>

     <message>

-        <location filename="../forvo.cc" line="203"/>

+        <location filename="../forvo.cc" line="216"/>

         <source>XML parse error: %1 at %2,%3</source>

         <translation>п·я┬п╦п╠п╨п╟ я─п╟п╥п╠п╬я─п╟ XML: %1 п╫п╟ я│я┌я─п╬п╨п╣ %2, я│я┌п╬п╩п╠я├п╣ %3</translation>

     </message>

     <message>

-        <location filename="../forvo.cc" line="279"/>

+        <location filename="../forvo.cc" line="292"/>

         <source>Added %1</source>

         <translation>п■п╬п╠п╟п╡п╩п╣п╫п╬ %1</translation>

     </message>

     <message>

-        <location filename="../forvo.cc" line="282"/>

+        <location filename="../forvo.cc" line="295"/>

         <source>by</source>

         <translation>п╬я┌</translation>

     </message>

     <message>

-        <location filename="../forvo.cc" line="286"/>

+        <location filename="../forvo.cc" line="299"/>

         <source>Male</source>

-        <translation>п°я┐п╤я┤п╦п╫п╟</translation>

+        <translation>п╪я┐п╤я┤п╦п╫п╟</translation>

     </message>

     <message>

-        <location filename="../forvo.cc" line="286"/>

+        <location filename="../forvo.cc" line="299"/>

         <source>Female</source>

-        <translation>п√п╣п╫я┴п╦п╫п╟</translation>

+        <translation>п╤п╣п╫я┴п╦п╫п╟</translation>

     </message>

     <message>

-        <location filename="../forvo.cc" line="288"/>

+        <location filename="../forvo.cc" line="301"/>

         <source>from</source>

         <translation>п╦п╥</translation>

     </message>

     <message>

-        <location filename="../forvo.cc" line="326"/>

+        <location filename="../forvo.cc" line="339"/>

         <source>Go to Edit|Dictionaries|Sources|Forvo and apply for our own API key to make this error disappear.</source>

         <translation>п÷п╣я─п╣п╧п╢п╦я┌п╣ п╡ п÷я─п╟п╡п╨п╟|п║п╩п╬п╡п╟я─п╦|п≤я│я┌п╬я┤п╫п╦п╨п╦|Forvo п╦ п©п╬п╢п╟п╧я┌п╣ п╥п╟я▐п╡п╨я┐ п╫п╟ я│п╡п╬п╧ я│п╬п╠я│я┌п╡п╣п╫п╫я▀п╧ п╨п╩я▌я┤ API, я┤я┌п╬п╠я▀ я┐я│я┌я─п╟п╫п╦я┌я▄ п╢п╟п╫п╫я┐я▌ п©я─п╬п╠п╩п╣п╪я┐.</translation>

     </message>

@@ -425,7 +425,7 @@

 <context>

     <name>GreekTranslit</name>

     <message>

-        <location filename="../greektranslit.cc" line="651"/>

+        <location filename="../greektranslit.cc" line="839"/>

         <source>Greek Transliteration</source>

         <translation>п╒я─п╟п╫я│п╩п╦я┌п╣я─п╟я├п╦я▐ (п⌠я─п╣я┤п╣я│п╨п╦п╧)</translation>

     </message>

@@ -587,7 +587,7 @@

     <message>

         <location filename="../groups.ui" line="194"/>

         <source>Drag&amp;drop dictionaries to and from the groups, move them inside the groups, reorder the groups using your mouse.</source>

-        <translation>п÷п╣я─п╣я┌п╟я│п╨п╦п╡п╟п╧я┌п╣ я│п╩п╬п╡п╟я─п╦ п╡ пЁя─я┐п©п©я▀ п╦п╥ я│п©п╦я│п╨п╟ п╢п╬я│я┌я┐п©п╫я▀я┘ я│п╩п╬п╡п╟я─п╣п╧, п╦п╥п╪п╣п╫я▐п╧я┌п╣ п©п╬я─я▐п╢п╬п╨ пЁя─я┐п©п©, п╦я│п©п╬п╩я▄п╥я┐я▐ п╪я▀я┬я▄.</translation>

+        <translation>п÷я─п╦ п©п╬п╪п╬я┴п╦ п╪я▀я┬п╦ п©п╣я─п╣&amp;я┌п╟я│п╨п╦п╡п╟п╧я┌п╣ я│п╩п╬п╡п╟я─п╦ п╡ пЁя─я┐п©п©я▀ п╦ п╦п╥ п╫п╦я┘, п©п╣я─п╣п╢п╡п╦пЁп╟п╧я┌п╣ п╦я┘ п╡п╫я┐я┌я─п╦ пЁя─я┐п©п©, п╦п╥п╪п╣п╫я▐п╧я┌п╣ п©п╬я─я▐п╢п╬п╨ пЁя─я┐п©п©.</translation>

     </message>

 </context>

 <context>

@@ -2517,27 +2517,27 @@ GoldenDict. п∙я│п╩п╦ п╫п╬п╡п╟я▐ п╡п╣я─я│п╦я▐ п©п╬я▐п╡п╦п╩п╟я│я▄, п©я─п╬пЁя─п╟п╪

         <translation>п÷п╬ я┐п╪п╬п╩я┤п╟п╫п╦я▌</translation>

     </message>

     <message>

-        <location filename="../preferences.cc" line="73"/>

+        <location filename="../preferences.cc" line="77"/>

         <source>Default</source>

         <translation>п÷п╬ я┐п╪п╬п╩я┤п╟п╫п╦я▌</translation>

     </message>

     <message>

-        <location filename="../preferences.cc" line="74"/>

+        <location filename="../preferences.cc" line="78"/>

         <source>Lingvo</source>

         <translation>Lingvo</translation>

     </message>

     <message>

-        <location filename="../preferences.cc" line="131"/>

+        <location filename="../preferences.cc" line="135"/>

         <source>Play via DirectShow</source>

         <translation>п▓п╬я│п©я─п╬п╦п╥п╡п╣п╢п╣п╫п╦п╣ я┤п╣я─п╣п╥ DirectShow</translation>

     </message>

     <message>

-        <location filename="../preferences.cc" line="310"/>

+        <location filename="../preferences.cc" line="314"/>

         <source>Changing Language</source>

         <translation>п║п╪п╣п╫п╟ я▐п╥я▀п╨п╟</translation>

     </message>

     <message>

-        <location filename="../preferences.cc" line="311"/>

+        <location filename="../preferences.cc" line="315"/>

         <source>Restart the program to apply the language change.</source>

         <translation>п÷п╣я─п╣п╥п╟п©я┐я│я┌п╦я┌п╣ п©я─п╬пЁя─п╟п╪п╪я┐, я┤я┌п╬п╠я▀ п╦п╥п╪п╣п╫п╣п╫п╦п╣ я▐п╥я▀п╨п╟ п╡п╬я┬п╩п╬ п╡ я│п╦п╩я┐.</translation>

     </message>

@@ -2782,10 +2782,10 @@ of the appropriate groups to use them.</source>

         <source>Use of Forvo currently requires an API key. Leave this field

 blank to use the default key, which may become unavailable

 in the future, or register on the site to get your own key.</source>

-        <translation>п≤я│п©п╬п╩я▄п╥п╬п╡п╟п╫п╦я▐ я│п╟п╧я┌п╟ Forvo я┌я─п╣п╠я┐п╣я┌ п╫п╟п╩п╦я┤п╦п╣ п╨п╩я▌я┤п╟ API. п·я│я┌п╟п╡я▄я┌п╣

-п╢п╟п╫п╫п╬п╣ п©п╬п╩п╣ п©я┐я│я┌я▀п╪, я┤я┌п╬п╠я▀ п╦я│п©п╬п╩я▄п╥п╬п╡п╟я┌я▄ п╨п╩я▌я┤ п©п╬ я┐п╪п╬п╩я┤п╟п╫п╦я▌, п╨п╬я┌п╬я─я▀п╧

-п╪п╬п╤п╣я┌ п©п╣я─п╣я│я┌п╟я┌я▄ я─п╟п╠п╬я┌п╟я┌я▄ п╡ п╠я┐п╢я┐я┴п╣п╪, п╦п╩п╦ п╤п╣ п╥п╟я─п╣пЁп╦я│я┌я─п╦я─я┐п╧я┌п╣я│я▄ п╫п╟

-я│п╟п╧я┌п╣, я┤я┌п╬п╠я▀ п©п╬п╩я┐я┤п╦я┌я▄ я│п╡п╬п╧ я│п╬п╠я│я┌п╡п╣п╫п╫я▀п╧ п╨п╩я▌я┤.</translation>

+        <translation>п≤я│п©п╬п╩я▄п╥п╬п╡п╟п╫п╦п╣ я│п╟п╧я┌п╟ Forvo я┌я─п╣п╠я┐п╣я┌ п╫п╟п╩п╦я┤п╦я▐ п╨п╩я▌я┤п╟ API. п·я│я┌п╟п╡я▄я┌п╣

+п╢п╟п╫п╫п╬п╣ п©п╬п╩п╣ п©я┐я│я┌я▀п╪, я┤я┌п╬п╠я▀ п╦я│п©п╬п╩я▄п╥п╬п╡п╟я┌я▄ п╨п╩я▌я┤ п©п╬ я┐п╪п╬п╩я┤п╟п╫п╦я▌, п╬п╢п╫п╟п╨п╬, п╡ п╠я┐п╢я┐я┴п╣п╪ я┌п╟п╨п╬п╧ п╨п╩я▌я┤

+п╪п╬п╤п╣я┌ п©п╣я─п╣я│я┌п╟я┌я▄ п╢п╣п╧я│я┌п╡п╬п╡п╟я┌я▄. п╒п╟п╨п╤п╣ п▓я▀ п╪п╬п╤п╣я┌п╣ п╥п╟я─п╣пЁп╦я│я┌я─п╦я─п╬п╡п╟я┌я▄я│я▐ п╫п╟

+я│п╟п╧я┌п╣ п╦ п©п╬п╩я┐я┤п╦я┌я▄ п©п╣я─я│п╬п╫п╟п╩я▄п╫я▀п╧ п╨п╩я▌я┤.</translation>

     </message>

     <message>

         <location filename="../sources.ui" line="430"/>

@@ -2797,7 +2797,14 @@ p, li { white-space: pre-wrap; }

 <tr>

 <td style="border: none;">

 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Get your own key &lt;a href=&quot;http://api.forvo.com/key/&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0057ae;&quot;&gt;here&lt;/span&gt;&lt;/a&gt;, or leave blank to use the default one.&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/body&gt;&lt;/html&gt;</source>

-        <translation>п÷п╬п╩я┐я┤п╦я┌п╣ п╡п╟я┬ п╨п╩я▌я┤ &lt;a href=&quot;http://api.forvo.com/key/&quot;&gt;п╥п╢п╣я│я▄&lt;/a&gt;, п╦п╩п╦ п╬я│я┌п╟п╡я▄я┌п╣ п©я┐я│я┌я▀п╪ п╢п╩я▐ п╦я│п©п╬п╩я▄п╥п╬п╡п╟п╫п╦я▐ п╨п╩я▌я┤п╟ п©п╬ я┐п╪п╬п╩я┤п╟п╫п╦я▌.</translation>

+        <translation>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;

+<html><head><meta name="qrichtext" content="1" /><style type="text/css">

+p, li { white-space: pre-wrap; }

+</style></head><body style=" font-family:'DejaVu Sans'; font-size:9pt; font-weight:400; font-style:normal;">

+<table style="-qt-table-type: root; margin-top:4px; margin-bottom:4px; margin-left:4px; margin-right:4px;">

+<tr>

+<td style="border: none;">

+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;п÷п╬п╩я┐я┤п╦я┌п╣ п©п╣я─я│п╬п╫п╟п╩я▄п╫я▀п╧ п╨п╩я▌я┤ &lt;a href=&quot;http://api.forvo.com/key/&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0057ae;&quot;&gt;п╥п╢п╣я│я▄&lt;/span&gt;&lt;/a&gt;, п╦п╩п╦ п╫п╣ п╥п╟п©п╬п╩п╫я▐п╧я┌п╣ п©п╬п╩п╣, я┤я┌п╬п╠я▀ п╦я│п©п╬п╩я▄п╥п╬п╡п╟я┌я▄ п╨п╩я▌я┤ п©п╬ я┐п╪п╬п╩я┤п╟п╫п╦я▌.&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/body&gt;&lt;/html&gt;</translation>

     </message>

     <message>

         <location filename="../sources.ui" line="450"/>

diff --git a/redist/goldendict.desktop b/redist/goldendict.desktop

old mode 100755

new mode 100644