Merge branch 'stardict' of ssh://drop.maemo.org/git/mdictionary into stardict

Conflicts:
	src/plugins/stardict/StarDialog.cpp
	src/plugins/stardict/StarDictPlugin.cpp
	src/plugins/stardict/en_US.ts
	src/plugins/stardict/pl_PL.ts

diff --cc src/plugins/stardict/StarDialog.cpp
index 8f608f2,c3b6131..da50275
--- 1/src/plugins/stardict/StarDialog.cpp
--- 2/src/plugins/stardict/StarDialog.cpp
+++ b/src/plugins/stardict/StarDialog.cpp
@@@ -40,17 -60,23 +40,20 @@@ void StarDialog::initializeUI() 
      mainVerticalLayout = new QVBoxLayout;
      widget = new QWidget;
      widget->setLayout(mainVerticalLayout);
 -
      infoLabel = new QLabel;
      infoLabel->setWordWrap(true);
+     QVBoxLayout* buttonLayout = new QVBoxLayout;
  
      if(type == New) {
 -        setWindowTitle(tr("Add new StarDict dictionary"));
 -
          browseLayout = new QHBoxLayout;
          browseButton = new QPushButton(tr("Browse"));
- 
+         browseButton->setMaximumWidth(150);
+         infoLabel->setText(tr("Dictionary file: not selected"));
 -
 +        setWindowTitle(tr("Add new StarDict dictionary"));
 +        infoLabel->setText(tr("Dictionary file: not selected"));
          browseLayout->addWidget(infoLabel, 0, Qt::AlignLeft);
+         browseLayout->addLayout(buttonLayout);
          browseLayout->addWidget(browseButton, 0, Qt::AlignRight);
 -
          mainVerticalLayout->addLayout(browseLayout);
      }
      else {

diff --cc src/plugins/stardict/StarDictPlugin.cpp
Simple merge

diff --cc src/plugins/stardict/en_US.ts
index f7b5541,06f924d..f04d8ed
--- 1/src/plugins/stardict/en_US.ts
--- 2/src/plugins/stardict/en_US.ts
+++ b/src/plugins/stardict/en_US.ts
@@@ -8,23 -8,118 +8,122 @@@
          <source>Strip accents (searching takes more time, but spelling doesn&apos;t have to be exact)</source>
          <translation type="unfinished"></translation>
      </message>
+     <message>
+         <location filename="StarDialog.cpp" line="68"/>
+         <source>Add new StarDict dictionary</source>
+         <translation type="unfinished"></translation>
+     </message>
 +</context>
 +<context>
 +    <name>StarDictPlugin</name>
      <message>
-         <location filename="StarDictPlugin.cpp" line="353"/>
-         <source>StarDict dictionary cannot be read from file</source>
+         <location filename="StarDialog.cpp" line="71"/>
+         <source>Browse</source>
+         <translation type="unfinished"></translation>
+     </message>
+     <message>
+         <location filename="StarDialog.cpp" line="72"/>
+         <source>Dictionary file: not selected</source>
+         <translation type="unfinished"></translation>
+     </message>
+     <message>
+         <location filename="StarDialog.cpp" line="80"/>
+         <source>StarDict Settings</source>
+         <translation type="unfinished"></translation>
+     </message>
+     <message>
+         <location filename="StarDialog.cpp" line="82"/>
+         <source>Plugin: </source>
+         <translation type="unfinished"></translation>
+     </message>
+     <message>
+         <location filename="StarDialog.cpp" line="83"/>
+         <source>Book name: </source>
+         <translation type="unfinished"></translation>
+     </message>
+     <message>
+         <location filename="StarDialog.cpp" line="85"/>
+         <source>Version: </source>
+         <translation type="unfinished"></translation>
+     </message>
+     <message>
+         <location filename="StarDialog.cpp" line="86"/>
+         <source>Word count: </source>
+         <translation type="unfinished"></translation>
+     </message>
+     <message>
+         <location filename="StarDialog.cpp" line="88"/>
+         <source>Author: </source>
+         <translation type="unfinished"></translation>
+     </message>
+     <message>
+         <location filename="StarDialog.cpp" line="89"/>
+         <source>E-mail: </source>
+         <translation type="unfinished"></translation>
+     </message>
+     <message>
+         <location filename="StarDialog.cpp" line="90"/>
+         <source>Website: </source>
+         <translation type="unfinished"></translation>
+     </message>
+     <message>
+         <location filename="StarDialog.cpp" line="91"/>
+         <source>Description: </source>
+         <translation type="unfinished"></translation>
+     </message>
+     <message>
+         <location filename="StarDialog.cpp" line="93"/>
+         <source>Date: </source>
+         <translation type="unfinished"></translation>
+     </message>
+     <message>
+         <location filename="StarDialog.cpp" line="98"/>
+         <source>Strip accents</source>
+         <translation type="unfinished"></translation>
+     </message>
+     <message>
+         <location filename="StarDialog.cpp" line="137"/>
+         <source>Add</source>
+         <translation type="unfinished"></translation>
+     </message>
+     <message>
+         <location filename="StarDialog.cpp" line="140"/>
+         <source>Save settings</source>
+         <translation type="unfinished"></translation>
+     </message>
+     <message>
+         <location filename="StarDialog.cpp" line="182"/>
+         <source>Select dictionary file</source>
+         <translation type="unfinished"></translation>
+     </message>
+     <message>
+         <location filename="StarDialog.cpp" line="184"/>
+         <source>StarDict Files (*.dict *dict.dz *.idx *idx.gz *.ifo)</source>
+         <translation type="unfinished"></translation>
+     </message>
+     <message>
+         <location filename="StarDialog.cpp" line="189"/>
+         <source>Dictionary file: %1</source>
+         <translation type="unfinished"></translation>
+     </message>
+     <message>
+         <location filename="StarDialog.cpp" line="230"/>
+         <source>File path is not set</source>
+         <translation type="unfinished"></translation>
+     </message>
+     <message>
+         <location filename="StarDialog.cpp" line="236"/>
+         <source>Dictionary files are not complete</source>
          <translation type="unfinished"></translation>
      </message>
  </context>
  <context>
-     <name>XdxfCachingDialog</name>
-     <message numerus="yes">
-         <source>%n second(s)</source>
-         <translation type="obsolete">
-             <numerusform>%n second</numerusform>
-             <numerusform>%n seconds</numerusform>
-         </translation>
+     <name>StarDictPlugin</name>
+     <message>
+         <location filename="StarDictPlugin.cpp" line="352"/>
+         <source>StarDict dictionary cannot be read from file</source>
+         <translation type="unfinished"></translation>
++>>>>>>> 7dd7dae9cc55a957c22cd4c3dd93d32d1deb5328
      </message>
  </context>
  </TS>

diff --cc src/plugins/stardict/pl_PL.ts
index 40a705b,e330f57..6a89422
--- 1/src/plugins/stardict/pl_PL.ts
--- 2/src/plugins/stardict/pl_PL.ts
+++ b/src/plugins/stardict/pl_PL.ts
@@@ -4,138 -4,122 +4,126 @@@
  <context>
      <name>StarDialog</name>
      <message>
-         <location filename="StarDialog.cpp" line="33"/>
+         <location filename="StarDialog.cpp" line="35"/>
          <source>Strip accents (searching takes more time, but spelling doesn&apos;t have to be exact)</source>
-         <translation type="unfinished">Usuń akcenty (wyszukiwanie trwa dłużej, ale szukane słowo nie musi być wpisane dokładnie)</translation>
+         <translation>Usuń akcenty (wyszukiwanie trwa dłużej, ale szukane słowo nie musi być wpisane dokładnie)</translation>
      </message>
- </context>
- <context>
-     <name>StarDictPlugin</name>
      <message>
-         <location filename="StarDictPlugin.cpp" line="353"/>
-         <source>StarDict dictionary cannot be read from file</source>
-         <translation type="unfinished"></translation>
+         <location filename="StarDialog.cpp" line="68"/>
+         <source>Add new StarDict dictionary</source>
+         <translation>Dodaj nowy słownik StarDict</translation>
      </message>
- </context>
- <context>
-     <name>XdxfCachingDialog</name>
      <message>
-         <source>Caching dictionary, please wait</source>
-         <translation type="obsolete">Optymalizacja słownika, proszę czekać</translation>
+         <location filename="StarDialog.cpp" line="71"/>
+         <source>Browse</source>
+         <translation>Przeglądaj</translation>
      </message>
      <message>
-         <source>Cancel</source>
-         <translation type="obsolete">Anuluj</translation>
+         <location filename="StarDialog.cpp" line="72"/>
+         <source>Dictionary file: not selected</source>
+         <translation>Plik ze słownikiem nie został wybrany</translation>
      </message>
      <message>
-         <source>Estimated time left: </source>
-         <translation type="obsolete">Pozostały czas: </translation>
+         <location filename="StarDialog.cpp" line="80"/>
+         <source>StarDict Settings</source>
+         <translation>Ustawienia StarDict</translation>
      </message>
-     <message numerus="yes">
-         <source>%n second(s)</source>
-         <translation type="obsolete">
-             <numerusform>%n sekunda</numerusform>
-             <numerusform>%n sekundy</numerusform>
-             <numerusform>%n sekund</numerusform>
-         </translation>
-     </message>
- </context>
- <context>
-     <name>XdxfDialog</name>
      <message>
-         <source>Optimize for quicker searches (may take some time)</source>
-         <translation type="obsolete">Optymalizuj dla szybszego wyszukiwania (może zająć trochę czasu)</translation>
+         <location filename="StarDialog.cpp" line="82"/>
+         <source>Plugin: </source>
+         <translation type="unfinished"></translation>
      </message>
      <message>
-         <source>Strip accents (searching takes more time, but spelling doesn&apos;t have to be exact)</source>
-         <translation type="obsolete">Usuń akcenty (wyszukiwanie trwa dłużej, ale szukane słowo nie musi być wpisane dokładnie)</translation>
+         <location filename="StarDialog.cpp" line="83"/>
+         <source>Book name: </source>
+         <translation>Słownik:</translation>
      </message>
      <message>
-         <source>Add new XDXF dictionary</source>
-         <translation type="obsolete">Dodaj nowy słownik XDXF</translation>
+         <location filename="StarDialog.cpp" line="85"/>
+         <source>Version: </source>
+         <translation>Wersja:</translation>
      </message>
      <message>
-         <source>Browse</source>
-         <translation type="obsolete">Przeglądaj</translation>
+         <location filename="StarDialog.cpp" line="86"/>
+         <source>Word count: </source>
+         <translation>Liczba słów:</translation>
      </message>
      <message>
-         <source>Dictionary file: not selected</source>
-         <translation type="obsolete">Plik ze słownikiem nie został wybrany</translation>
+         <location filename="StarDialog.cpp" line="88"/>
+         <source>Author: </source>
+         <translation>Autor:</translation>
      </message>
      <message>
-         <source>XDXF Settings</source>
-         <translation type="obsolete">Ustawienia XDXF</translation>
+         <location filename="StarDialog.cpp" line="89"/>
+         <source>E-mail: </source>
+         <translation type="unfinished"></translation>
      </message>
      <message>
-         <source>From: </source>
-         <translation type="obsolete">Z: </translation>
+         <location filename="StarDialog.cpp" line="90"/>
+         <source>Website: </source>
+         <translation>Strona:</translation>
      </message>
      <message>
-         <source>To: </source>
-         <translation type="obsolete">Na: </translation>
+         <location filename="StarDialog.cpp" line="91"/>
+         <source>Description: </source>
+         <translation>Opis:</translation>
      </message>
      <message>
-         <source>Description: </source>
-         <translation type="obsolete">Opis: </translation>
+         <location filename="StarDialog.cpp" line="93"/>
+         <source>Date: </source>
+         <translation>Data:</translation>
      </message>
      <message>
+         <location filename="StarDialog.cpp" line="98"/>
          <source>Strip accents</source>
 -        <translation>Usuń akcenty</translation>
 +        <translation type="obsolete">Usuń akcenty</translation>
 +    </message>
 +    <message>
 +        <source>Optimize</source>
 +        <translation type="obsolete">Optymalizuj</translation>
      </message>
      <message>
+         <location filename="StarDialog.cpp" line="137"/>
          <source>Add</source>
 -        <translation>Dodaj</translation>
 +        <translation type="obsolete">Dodaj</translation>
      </message>
      <message>
+         <location filename="StarDialog.cpp" line="140"/>
          <source>Save settings</source>
 -        <translation>Zapisz ustawienia</translation>
 +        <translation type="obsolete">Zapisz ustawienia</translation>
      </message>
      <message>
+         <location filename="StarDialog.cpp" line="182"/>
          <source>Select dictionary file</source>
 -        <translation>Wybierz plik ze słownikiem</translation>
 +        <translation type="obsolete">Wybierz plik ze słownikiem</translation>
      </message>
      <message>
-         <source>XDXF Files (*.xdxf)</source>
-         <translation type="obsolete">Pliki XDXF (*.xdxf)</translation>
+         <location filename="StarDialog.cpp" line="184"/>
+         <source>StarDict Files (*.dict *dict.dz *.idx *idx.gz *.ifo)</source>
+         <translation>Pliki StarDict (*.dict *dict.dz *.idx *idx.gz *.ifo)</translation>
      </message>
      <message>
+         <location filename="StarDialog.cpp" line="189"/>
          <source>Dictionary file: %1</source>
 -        <translation>Plik ze słownikiem: %1</translation>
 +        <translation type="obsolete">Plik ze słownikiem: %1</translation>
      </message>
      <message>
+         <location filename="StarDialog.cpp" line="230"/>
          <source>File path is not set</source>
 -        <translation>Ścieżka do pliku nie jest ustawiona</translation>
 +        <translation type="obsolete">Ścieżka do pliku nie jest ustawiona</translation>
      </message>
- </context>
- <context>
-     <name>XdxfPlugin</name>
-     <message>
-         <source>Cache database cannot be opened for %1 dictionary. Searching in XDXF file. You may want to recache.</source>
-         <translation type="obsolete">Nie można otworzyć bazy danych dla słownika %1. Szukanie w pliku XDXF. Możesz spróbować ponownie włączyć optymalizację.</translation>
-     </message>
-     <message>
-         <source>XDXF file cannot be read for %1</source>
-         <translation type="obsolete">Nie można odczytać pliku XDXF dla %1</translation>
-     </message>
      <message>
-         <source>XDXF file is in wrong format</source>
-         <translation type="obsolete">Niewłaściwy format pliku XDXF</translation>
-     </message>
-     <message>
-         <source>XDXF dictionary cannot be read from file</source>
-         <translation type="obsolete">Nie można odczytać słownika XDXF z pliku</translation>
-     </message>
-     <message>
-         <source>XDXF file cannot be read for %1 dictionary</source>
-         <translation type="obsolete">Nie mozna odczytać pliku XDXF dla słownika %1</translation>
+         <location filename="StarDialog.cpp" line="236"/>
+         <source>Dictionary files are not complete</source>
+         <translation>Brak części plików słownika</translation>
      </message>
+ </context>
+ <context>
+     <name>StarDictPlugin</name>
      <message>
-         <source>Database caching error, please try again.</source>
-         <translation type="obsolete">Błąd optymalizacji, proszę spróbować ponownie.</translation>
+         <location filename="StarDictPlugin.cpp" line="352"/>
+         <source>StarDict dictionary cannot be read from file</source>
+         <translation>Nie można odczytać słownika StarDict z pliku</translation>
      </message>
  </context>
  </TS>