From 567b98c6faa46d4edd15bfde79007bd8f16af301 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Enrico=20Tr=C3=83=C2=B6ger?= <enrico@xfce.org>
Date: Tue, 22 Apr 2008 19:11:25 +0000
Subject: [PATCH] Update of German translation. Issued make update-po.

(Old svn revision: 4658)
---
 po/ChangeLog             |   5 +
 po/ca.po                 | 413 +++++++++++++++++++++++++-------------
 po/cs.po                 | 396 ++++++++++++++++++++++++-------------
 po/de.po                 | 417 +++++++++++++++++++++++++--------------
 po/en_GB.po              | 392 +++++++++++++++++++++++-------------
 po/eu.po                 | 390 +++++++++++++++++++++++-------------
 po/fr.po                 | 415 +++++++++++++++++++++++++-------------
 po/hu.po                 | 405 ++++++++++++++++++++++++-------------
 po/lv.po                 | 390 +++++++++++++++++++++++-------------
 po/pl.po                 | 390 +++++++++++++++++++++++-------------
 po/pt_BR.po              | 409 +++++++++++++++++++++++++-------------
 po/pt_PT.po              | 413 +++++++++++++++++++++++++-------------
 po/uk.po                 | 395 +++++++++++++++++++++++-------------
 po/ur.po                 | 390 +++++++++++++++++++++++-------------
 po/xfce4-dict-plugin.pot | 214 --------------------
 15 files changed, 3446 insertions(+), 1988 deletions(-)
 delete mode 100644 po/xfce4-dict-plugin.pot

diff --git a/po/ChangeLog b/po/ChangeLog
index a89e5ea..8248b75 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,8 @@
+2008-04-22  Enrico TrÃ¶ger <enrico(dot)troeger(at)uvena(dot)de>
+
+	* de.po: Update of German translation.
+	* xfce4-dict.pot, *.po: Issued make update-po.
+
 2008-03-30  Mike Massonnet <mmassonnet@xfce.org>
 
 	* ca.po: Update Catalan translation,
diff --git a/po/ca.po b/po/ca.po
index 8fc5730..e3cb792 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-dict-plugin 0.3.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-08 17:08+0100\n"
+"POT-Creation-Date: 2008-04-22 13:11+0200\n"
 "PO-Revision-Date: 2008-03-21 20:40+0100\n"
 "Last-Translator: Carles MuÃ±oz Gorriz <carlesmu@internautas.org>\n"
 "Language-Team: Catalan <xfce-i18n@xfce.org>\n"
@@ -18,205 +18,342 @@ msgstr ""
 "Plural-Forms: Plural-Forms: nplurals=2; plural=(n > 1);\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
-#: ../panel-plugin/dict.c:358 ../panel-plugin/dict.c:822
+#: ../panel-plugin/xfce4-dict-plugin.desktop.in.in.h:1
+#, fuzzy
+msgid "A plugin to query different dictionaries."
+msgstr "Un connector per consultar servidors Â«DictÂ» (diccionaris)."
+
+#: ../panel-plugin/xfce4-dict-plugin.desktop.in.in.h:2
+#, fuzzy
+msgid "Dictionary"
+msgstr "Diccionari:"
+
+#: ../panel-plugin/xfce4-dict-plugin.c:370
+msgid "Look up a word"
+msgstr "Cerca una paraula"
+
+#: ../panel-plugin/xfce4-dict-plugin.c:429 ../src/xfce4-dict.c:206
+#: ../lib/aspell.c:198 ../lib/dictd.c:138 ../lib/gui.c:96
+msgid "Ready."
+msgstr "Llest."
+
+#. Note for translators: run xfce4-dict --help and copy the help text for "--help" into this one
+#: ../src/xfce4-dict.c:54
+msgid "Show help options"
+msgstr ""
+
+#: ../src/xfce4-dict.c:56
+msgid "Search the given text using a Dict server(RFC 2229)"
+msgstr ""
+
+#: ../src/xfce4-dict.c:57
+msgid "Search the given text using a web-based search engine"
+msgstr ""
+
+#: ../src/xfce4-dict.c:58
+msgid "Check the given text with a spellchecker"
+msgstr ""
+
+#: ../src/xfce4-dict.c:59
+#, fuzzy
+msgid "Grab the focus on the text field in the panel"
+msgstr "    -t, --text-field    pren l'enfocament del camp de text del plafÃ³\n"
+
+#: ../src/xfce4-dict.c:60
+msgid "Start stand-alone application even if the panel plugin is loaded"
+msgstr ""
+
+#: ../src/xfce4-dict.c:61
+msgid "Show version information"
+msgstr ""
+
+#: ../src/xfce4-dict.c:134
+msgid "[TEXT]"
+msgstr ""
+
+#: ../src/xfce4-dict.c:158
+#, c-format
+msgid "(built on %s with GTK %d.%d.%d, GLib %d.%d.%d)"
+msgstr ""
+
+#: ../src/xfce4-dict.desktop.in.h:1 ../lib/gui.c:339
+msgid "A client program to query different dictionaries."
+msgstr ""
+
+#: ../src/xfce4-dict.desktop.in.h:2
+#, fuzzy
+msgid "Dictionary Client"
+msgstr "Connector de diccionaris"
+
+#: ../src/xfce4-dict.desktop.in.h:3 ../lib/gui.c:189 ../lib/prefs.c:212
+#, fuzzy
+msgid "Xfce4 Dictionary"
+msgstr "Diccionari:"
+
+#: ../lib/aspell.c:75
+#, fuzzy, c-format
+msgid "%d suggestion found."
+msgid_plural "%d suggestions found."
+msgstr[0] "Nombre de definicions: %d."
+msgstr[1] "Nombre de definicions: %d."
+
+#: ../lib/aspell.c:79
+#, c-format
+msgid "Suggestions for \"%s\":"
+msgstr ""
+
+#: ../lib/aspell.c:90
+#, c-format
+msgid "\"%s\" is spelled correctly."
+msgstr ""
+
+#: ../lib/aspell.c:96
+#, fuzzy, c-format
+msgid "No suggestions could be found for \"%s\"."
+msgstr "No hi ha cap coincidÃ¨ncia per Â«%sÂ»."
+
+#. translation hint:
+#. * Error while executing <spell command, e.g. "aspell"> (<error message>)
+#: ../lib/aspell.c:122
+#, c-format
+msgid "Error while executing \"%s\" (%s)."
+msgstr ""
+
+#: ../lib/aspell.c:158
+msgid "Please set the aspell command in the preferences dialog."
+msgstr ""
+
+#: ../lib/aspell.c:164 ../lib/common.c:200
+msgid "Invalid input."
+msgstr "L'entrada no Ã©s vÃ lida."
+
+#: ../lib/aspell.c:202
+#, c-format
+msgid "Process failed (%s)"
+msgstr ""
+
+#: ../lib/common.c:171
+msgid "Browser could not be opened. Please check your preferences."
+msgstr "No es pt obrir el navegador. Comproveu les vostres preferÃ¨ncies."
+
+#: ../lib/common.c:210
+msgid "Invalid non-UTF8 input."
+msgstr "Entrada no UTF8 invÃ lida."
+
+#: ../lib/dictd.c:112 ../lib/dictd.c:375
 msgid "Could not connect to server."
 msgstr "No s'ha pogut connectar al servidor."
 
-#: ../panel-plugin/dict.c:365 ../panel-plugin/dict.c:390
-#: ../panel-plugin/dict.c:844
+#: ../lib/dictd.c:119 ../lib/dictd.c:157 ../lib/dictd.c:397
 msgid "Unknown error while quering the server."
 msgstr "Error desconegut al fer la consulta al servidor."
 
-#: ../panel-plugin/dict.c:373
+#: ../lib/dictd.c:127
 msgid "Server not ready."
 msgstr "El servidor estÃ  disponible."
 
-#: ../panel-plugin/dict.c:384
+#: ../lib/dictd.c:140
 #, c-format
 msgid "No matches could be found for \"%s\"."
 msgstr "No hi ha cap coincidÃ¨ncia per Â«%sÂ»."
 
-#: ../panel-plugin/dict.c:395
-#, c-format
-msgid "%d definition(s) found."
-msgstr "Nombre de definicions: %d."
+#: ../lib/dictd.c:162
+#, fuzzy, c-format
+msgid "%d definition found."
+msgid_plural "%d definitions found."
+msgstr[0] "Nombre de definicions: %d."
+msgstr[1] "Nombre de definicions: %d."
 
-#: ../panel-plugin/dict.c:512
-#, c-format
-msgid "Querying the server %s..."
+#: ../lib/dictd.c:352
+#, fuzzy, c-format
+msgid "Querying %s..."
 msgstr "Consultant al servidor %sâ€¦"
 
-#: ../panel-plugin/dict.c:565
-msgid "Invalid input."
-msgstr "L'entrada no Ã©s vÃ lida."
+#: ../lib/dictd.c:392
+msgid "The server doesn't offer any databases."
+msgstr "El servidor no ha ofert cap base de dades."
 
-#: ../panel-plugin/dict.c:575
-msgid "Invalid non-UTF8 input."
-msgstr "Entrada no UTF8 invÃ lida."
+#: ../lib/gui.c:146
+msgid "_File"
+msgstr ""
 
-#: ../panel-plugin/dict.c:637
-msgid "Browser could not be opened. Please check your preferences."
-msgstr "No es pt obrir el navegador. Comproveu les vostres preferÃ¨ncies."
+#: ../lib/gui.c:162
+msgid "_Help"
+msgstr ""
 
-#: ../panel-plugin/dict.c:839
-msgid "The server doesn't offer any databases."
-msgstr "El servidor no ha ofert cap base de dades."
+#: ../lib/gui.c:212
+msgid "Text to search:"
+msgstr "Text a cercar:"
+
+#: ../lib/gui.c:258
+msgid "Search with:"
+msgstr "Cerca amb:"
 
-#: ../panel-plugin/dict.c:894
+#: ../lib/gui.c:262 ../lib/prefs.c:247 ../lib/prefs.c:341
+msgid "Dict"
+msgstr "Dict"
+
+#: ../lib/gui.c:268 ../lib/prefs.c:256 ../lib/prefs.c:448
+msgid "Web"
+msgstr "Web"
+
+#: ../lib/gui.c:274 ../lib/prefs.c:265
+msgid "Spellcheck"
+msgstr "Corrector"
+
+#: ../lib/gui.c:343
+msgid "Developer"
+msgstr "Desenvolupador"
+
+#: ../lib/prefs.c:107
 msgid "You have chosen an invalid dictionary entry."
 msgstr "Heu triat una entrada de diccionari invÃ lida."
 
-#: ../panel-plugin/dict.c:1009
-msgid "Properties"
-msgstr "Propietats"
+#: ../lib/prefs.c:172
+msgid "dict.leo.org - German <-> English"
+msgstr "dict.leo.org - Alemany <-> AnglÃ¨s"
 
-#: ../panel-plugin/dict.c:1025
-msgid "Dictionary plugin"
-msgstr "Connector de diccionaris"
+#: ../lib/prefs.c:173
+msgid "dict.leo.org - German <-> French"
+msgstr "dict.leo.org - Alemany <-> FrancÃ¨s"
+
+#: ../lib/prefs.c:174
+msgid "dict.leo.org - German <-> Spanish"
+msgstr "dict.leo.org - Alemany <-> Espanyol"
+
+#: ../lib/prefs.c:175
+#, fuzzy
+msgid "dict.leo.org - German <-> Italian"
+msgstr "dict.leo.org - Alemany <-> AnglÃ¨s"
+
+#: ../lib/prefs.c:176
+#, fuzzy
+msgid "dict.leo.org - German <-> Chinese"
+msgstr "dict.leo.org - Alemany <-> AnglÃ¨s"
+
+#: ../lib/prefs.c:177
+#, fuzzy
+msgid "dist.cc - Dictionary"
+msgstr "Diccionari:"
+
+#: ../lib/prefs.c:178
+#, fuzzy
+msgid "Dictionary.com"
+msgstr "Diccionari:"
+
+#: ../lib/prefs.c:179
+#, fuzzy
+msgid "TheFreeDictionary.com"
+msgstr "Diccionari:"
+
+#: ../lib/prefs.c:180
+msgid "Clear"
+msgstr ""
+
+#: ../lib/prefs.c:239
+msgid "General"
+msgstr ""
+
+#: ../lib/prefs.c:241
+msgid "<b>Default search method:</b>"
+msgstr ""
+
+#: ../lib/prefs.c:274
+msgid "Last used method"
+msgstr ""
+
+#: ../lib/prefs.c:288
+msgid "<b>Panel text field:</b>"
+msgstr ""
+
+#: ../lib/prefs.c:294
+msgid "Show text field in the panel"
+msgstr "Mostra el text al quadre"
+
+#. panel entry size
+#: ../lib/prefs.c:301
+msgid "Text field size:"
+msgstr "Mida del camp de text:"
 
 #. server address
-#: ../panel-plugin/dict.c:1042
+#: ../lib/prefs.c:344
 msgid "Server:"
 msgstr "Servidor:"
 
 #. server port
-#: ../panel-plugin/dict.c:1054
+#: ../lib/prefs.c:356
 msgid "Server Port:"
 msgstr "Port del servidor:"
 
 #. dictionary
-#: ../panel-plugin/dict.c:1062 ../panel-plugin/dict.c:1222
+#: ../lib/prefs.c:364 ../lib/prefs.c:508
 msgid "Dictionary:"
 msgstr "Diccionari:"
 
-#: ../panel-plugin/dict.c:1066
+#: ../lib/prefs.c:368
 msgid "* (use all)"
 msgstr "* (empra'ls tots)"
 
-#: ../panel-plugin/dict.c:1068
+#: ../lib/prefs.c:370
 msgid "! (use all, stop after first match)"
 msgstr "! (empra'ls tots, atura desprÃ©s de la primera coincidÃ¨ncia)"
 
-#: ../panel-plugin/dict.c:1128
-msgid "Use a DICT server"
-msgstr "Empra un servidor DICT"
-
-#: ../panel-plugin/dict.c:1147
-msgid "dict.leo.org - German <-> English"
-msgstr "dict.leo.org - Alemany <-> AnglÃ¨s"
-
-#: ../panel-plugin/dict.c:1155
-msgid "dict.leo.org - German <-> French"
-msgstr "dict.leo.org - Alemany <-> FrancÃ¨s"
-
-#: ../panel-plugin/dict.c:1163
-msgid "dict.leo.org - German <-> Spanish"
-msgstr "dict.leo.org - Alemany <-> Espanyol"
-
-#: ../panel-plugin/dict.c:1170
-msgid "Use another website"
-msgstr "Empra un altre lloc web"
+#: ../lib/prefs.c:450
+msgid "<b>Web search URL:</b>"
+msgstr ""
 
-#: ../panel-plugin/dict.c:1178
+#: ../lib/prefs.c:456
 msgid "URL:"
 msgstr "URL:"
 
-#: ../panel-plugin/dict.c:1191
+#: ../lib/prefs.c:476
+#, fuzzy
 msgid ""
-"Enter an URL to a web site which offer translation services.\n"
+"Enter an URL to a web site which offer translation or dictionary services.\n"
 "Use {word} as placeholder for the searched word."
 msgstr ""
 "IntroduÃ¯u una url d'un lloc web que ofereixi un servei de traducciÃ³.\n"
 "Empreu {word} com com a parÃ metre de substituciÃ³ per la paraula a cercar."
 
-#: ../panel-plugin/dict.c:1197
-msgid "Use a web site"
-msgstr "Empra un lloc web"
+#: ../lib/prefs.c:495
+#, fuzzy
+msgid "Aspell"
+msgstr "Empra Â«aspellÂ»"
 
-#: ../panel-plugin/dict.c:1211
+#: ../lib/prefs.c:497
 msgid "Aspell program:"
 msgstr "programa Â«aspellÂ»:"
 
-#: ../panel-plugin/dict.c:1252
-msgid "Use Aspell"
-msgstr "Empra Â«aspellÂ»"
+#~ msgid "Properties"
+#~ msgstr "Propietats"
 
-#: ../panel-plugin/dict.c:1266
-msgid "Show text field in the panel"
-msgstr "Mostra el text al quadre"
+#~ msgid "Use a DICT server"
+#~ msgstr "Empra un servidor DICT"
 
-#: ../panel-plugin/dict.c:1269
-msgid ""
-"This option can only be used when the panel has a horizontal orientation."
-msgstr ""
-"Aquesta opciÃ³ es tant sols es pot emprar quan el quadre estÃ  orientat "
-"horitzontalment."
+#~ msgid "Use another website"
+#~ msgstr "Empra un altre lloc web"
 
-#. panel entry size
-#: ../panel-plugin/dict.c:1275
-msgid "Text field size:"
-msgstr "Mida del camp de text:"
+#~ msgid "Use a web site"
+#~ msgstr "Empra un lloc web"
 
-#: ../panel-plugin/dict.c:1335 ../panel-plugin/dict.c:1663
-msgid "Ready."
-msgstr "Llest."
+#~ msgid ""
+#~ "This option can only be used when the panel has a horizontal orientation."
+#~ msgstr ""
+#~ "Aquesta opciÃ³ es tant sols es pot emprar quan el quadre estÃ  orientat "
+#~ "horitzontalment."
 
-#: ../panel-plugin/dict.c:1408
-msgid "Text to search:"
-msgstr "Text a cercar:"
+#~ msgid "Usage: %s [options]\n"
+#~ msgstr "Ãšs: %s [OPCIONS]\n"
 
-#: ../panel-plugin/dict.c:1455
-msgid "Search with:"
-msgstr "Cerca amb:"
+#~ msgid "Options:\n"
+#~ msgstr "Opcions:\n"
 
-#: ../panel-plugin/dict.c:1459 ../panel-plugin/dict.desktop.in.in.h:2
-msgid "Dict"
-msgstr "Dict"
+#~ msgid "    -h, --help          show this help and exit\n"
+#~ msgstr "    -h, --help          mostra aquesta ajuda i surt\n"
 
-#: ../panel-plugin/dict.c:1465
-msgid "Web"
-msgstr "Web"
-
-#: ../panel-plugin/dict.c:1471
-msgid "Spellcheck"
-msgstr "Corrector"
-
-#: ../panel-plugin/dict.c:1513 ../panel-plugin/dict.desktop.in.in.h:1
-msgid "A plugin to query a Dict server."
-msgstr "Un connector per consultar servidors Â«DictÂ» (diccionaris)."
-
-#: ../panel-plugin/dict.c:1517
-msgid "Developer"
-msgstr "Desenvolupador"
-
-#: ../panel-plugin/dict.c:1615
-msgid "Look up a word"
-msgstr "Cerca una paraula"
-
-#: ../panel-plugin/xfce4-popup-dict.c:97
-#, c-format
-msgid "Usage: %s [options]\n"
-msgstr "Ãšs: %s [OPCIONS]\n"
-
-#: ../panel-plugin/xfce4-popup-dict.c:98
-#, c-format
-msgid "Options:\n"
-msgstr "Opcions:\n"
-
-#: ../panel-plugin/xfce4-popup-dict.c:99
-#, c-format
-msgid "    -t, --text-field    grap the focus on the text field in the panel\n"
-msgstr "    -t, --text-field    pren l'enfocament del camp de text del plafÃ³\n"
-
-#: ../panel-plugin/xfce4-popup-dict.c:100
-#, c-format
-msgid "    -h, --help          show this help and exit\n"
-msgstr "    -h, --help          mostra aquesta ajuda i surt\n"
-
-#: ../panel-plugin/xfce4-popup-dict.c:101
-#, c-format
-msgid ""
-"If called without any options, the xfce4-dict-plugin main window is shown.\n"
-msgstr ""
-"Si es crida sense opcins, es mostra la finestra principal de l'xfce4-dict-"
-"plugin.\n"
+#~ msgid ""
+#~ "If called without any options, the xfce4-dict-plugin main window is "
+#~ "shown.\n"
+#~ msgstr ""
+#~ "Si es crida sense opcins, es mostra la finestra principal de l'xfce4-dict-"
+#~ "plugin.\n"
diff --git a/po/cs.po b/po/cs.po
index ce6dbfa..b3bf42f 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-dict-plugin 0.3.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-08 17:08+0100\n"
+"POT-Creation-Date: 2008-04-22 13:11+0200\n"
 "PO-Revision-Date: 2007-12-18 22:41+0100\n"
 "Last-Translator: Michal VÃ¡rady <miko.vaji@gmail.com>\n"
 "Language-Team: Czech <xfce-i18n@xfce.org>\n"
@@ -16,201 +16,327 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: ../panel-plugin/dict.c:358 ../panel-plugin/dict.c:822
-msgid "Could not connect to server."
-msgstr "Nelze se pÅ™ipojit k serveru"
+#: ../panel-plugin/xfce4-dict-plugin.desktop.in.in.h:1
+#, fuzzy
+msgid "A plugin to query different dictionaries."
+msgstr "ZÃ¡suvnÃ½ modul pro dotaz serveru Dict."
 
-#: ../panel-plugin/dict.c:365 ../panel-plugin/dict.c:390
-#: ../panel-plugin/dict.c:844
-msgid "Unknown error while quering the server."
-msgstr "PÅ™i dotazu na server nastala neznÃ¡mÃ¡ chyba."
+#: ../panel-plugin/xfce4-dict-plugin.desktop.in.in.h:2
+#, fuzzy
+msgid "Dictionary"
+msgstr "SlovnÃk:"
 
-#: ../panel-plugin/dict.c:373
-msgid "Server not ready."
-msgstr "Server nenÃ pÅ™ipraven."
+#: ../panel-plugin/xfce4-dict-plugin.c:370
+msgid "Look up a word"
+msgstr "Vyhledat slovo"
+
+#: ../panel-plugin/xfce4-dict-plugin.c:429 ../src/xfce4-dict.c:206
+#: ../lib/aspell.c:198 ../lib/dictd.c:138 ../lib/gui.c:96
+msgid "Ready."
+msgstr "PÅ™ipraven."
+
+#. Note for translators: run xfce4-dict --help and copy the help text for "--help" into this one
+#: ../src/xfce4-dict.c:54
+msgid "Show help options"
+msgstr ""
+
+#: ../src/xfce4-dict.c:56
+msgid "Search the given text using a Dict server(RFC 2229)"
+msgstr ""
+
+#: ../src/xfce4-dict.c:57
+msgid "Search the given text using a web-based search engine"
+msgstr ""
+
+#: ../src/xfce4-dict.c:58
+msgid "Check the given text with a spellchecker"
+msgstr ""
+
+#: ../src/xfce4-dict.c:59
+#, fuzzy
+msgid "Grab the focus on the text field in the panel"
+msgstr "Zobrazit textovÃ© pole v panelu"
 
-#: ../panel-plugin/dict.c:384
+#: ../src/xfce4-dict.c:60
+msgid "Start stand-alone application even if the panel plugin is loaded"
+msgstr ""
+
+#: ../src/xfce4-dict.c:61
+msgid "Show version information"
+msgstr ""
+
+#: ../src/xfce4-dict.c:134
+msgid "[TEXT]"
+msgstr ""
+
+#: ../src/xfce4-dict.c:158
 #, c-format
-msgid "No matches could be found for \"%s\"."
-msgstr "Pro \"%s\" nebyly nalezeny Å¾Ã¡dnÃ© shody."
+msgid "(built on %s with GTK %d.%d.%d, GLib %d.%d.%d)"
+msgstr ""
+
+#: ../src/xfce4-dict.desktop.in.h:1 ../lib/gui.c:339
+msgid "A client program to query different dictionaries."
+msgstr ""
 
-#: ../panel-plugin/dict.c:395
+#: ../src/xfce4-dict.desktop.in.h:2
+#, fuzzy
+msgid "Dictionary Client"
+msgstr "ZÃ¡suvnÃ½ modul slovnÃk"
+
+#: ../src/xfce4-dict.desktop.in.h:3 ../lib/gui.c:189 ../lib/prefs.c:212
+#, fuzzy
+msgid "Xfce4 Dictionary"
+msgstr "SlovnÃk:"
+
+#: ../lib/aspell.c:75
+#, fuzzy, c-format
+msgid "%d suggestion found."
+msgid_plural "%d suggestions found."
+msgstr[0] "Nalezebo %d definicÃ."
+msgstr[1] "Nalezebo %d definicÃ."
+msgstr[2] "Nalezebo %d definicÃ."
+
+#: ../lib/aspell.c:79
 #, c-format
-msgid "%d definition(s) found."
-msgstr "Nalezebo %d definicÃ."
+msgid "Suggestions for \"%s\":"
+msgstr ""
 
-#: ../panel-plugin/dict.c:512
+#: ../lib/aspell.c:90
 #, c-format
-msgid "Querying the server %s..."
-msgstr "PosÃlÃ¡m dotaz na server %s..."
+msgid "\"%s\" is spelled correctly."
+msgstr ""
+
+#: ../lib/aspell.c:96
+#, fuzzy, c-format
+msgid "No suggestions could be found for \"%s\"."
+msgstr "Pro \"%s\" nebyly nalezeny Å¾Ã¡dnÃ© shody."
+
+#. translation hint:
+#. * Error while executing <spell command, e.g. "aspell"> (<error message>)
+#: ../lib/aspell.c:122
+#, c-format
+msgid "Error while executing \"%s\" (%s)."
+msgstr ""
+
+#: ../lib/aspell.c:158
+msgid "Please set the aspell command in the preferences dialog."
+msgstr ""
 
-#: ../panel-plugin/dict.c:565
+#: ../lib/aspell.c:164 ../lib/common.c:200
 msgid "Invalid input."
 msgstr "NeplatnÃ½ vstup."
 
-#: ../panel-plugin/dict.c:575
-msgid "Invalid non-UTF8 input."
-msgstr "NeplatnÃ½ vstup v kÃ³dovÃ¡nÃ jinÃ©m neÅ¾ UTF8."
+#: ../lib/aspell.c:202
+#, c-format
+msgid "Process failed (%s)"
+msgstr ""
 
-#: ../panel-plugin/dict.c:637
+#: ../lib/common.c:171
 msgid "Browser could not be opened. Please check your preferences."
 msgstr "Nelze otevÅ™Ãt prohlÃÅ¾eÄ. OvÄ›Å™te nastavenÃ."
 
-#: ../panel-plugin/dict.c:839
+#: ../lib/common.c:210
+msgid "Invalid non-UTF8 input."
+msgstr "NeplatnÃ½ vstup v kÃ³dovÃ¡nÃ jinÃ©m neÅ¾ UTF8."
+
+#: ../lib/dictd.c:112 ../lib/dictd.c:375
+msgid "Could not connect to server."
+msgstr "Nelze se pÅ™ipojit k serveru"
+
+#: ../lib/dictd.c:119 ../lib/dictd.c:157 ../lib/dictd.c:397
+msgid "Unknown error while quering the server."
+msgstr "PÅ™i dotazu na server nastala neznÃ¡mÃ¡ chyba."
+
+#: ../lib/dictd.c:127
+msgid "Server not ready."
+msgstr "Server nenÃ pÅ™ipraven."
+
+#: ../lib/dictd.c:140
+#, c-format
+msgid "No matches could be found for \"%s\"."
+msgstr "Pro \"%s\" nebyly nalezeny Å¾Ã¡dnÃ© shody."
+
+#: ../lib/dictd.c:162
+#, fuzzy, c-format
+msgid "%d definition found."
+msgid_plural "%d definitions found."
+msgstr[0] "Nalezebo %d definicÃ."
+msgstr[1] "Nalezebo %d definicÃ."
+msgstr[2] "Nalezebo %d definicÃ."
+
+#: ../lib/dictd.c:352
+#, fuzzy, c-format
+msgid "Querying %s..."
+msgstr "PosÃlÃ¡m dotaz na server %s..."
+
+#: ../lib/dictd.c:392
 msgid "The server doesn't offer any databases."
 msgstr "Server nenabÃzÃ Å¾Ã¡dnÃ© databÃ¡ze."
 
-#: ../panel-plugin/dict.c:894
-msgid "You have chosen an invalid dictionary entry."
-msgstr "Zvolili jste neplatnou poloÅ¾ku slovnÃku."
+#: ../lib/gui.c:146
+msgid "_File"
+msgstr ""
 
-#: ../panel-plugin/dict.c:1009
-msgid "Properties"
-msgstr "Vlastnosti"
+#: ../lib/gui.c:162
+msgid "_Help"
+msgstr ""
 
-#: ../panel-plugin/dict.c:1025
-msgid "Dictionary plugin"
-msgstr "ZÃ¡suvnÃ½ modul slovnÃk"
+#: ../lib/gui.c:212
+msgid "Text to search:"
+msgstr "Text pro vyhledÃ¡nÃ:"
 
-#. server address
-#: ../panel-plugin/dict.c:1042
-msgid "Server:"
-msgstr "Server:"
+#: ../lib/gui.c:258
+msgid "Search with:"
+msgstr "Hledat pomocÃ:"
 
-#. server port
-#: ../panel-plugin/dict.c:1054
-msgid "Server Port:"
-msgstr "Port serveru:"
+#: ../lib/gui.c:262 ../lib/prefs.c:247 ../lib/prefs.c:341
+msgid "Dict"
+msgstr "Dict"
 
-#. dictionary
-#: ../panel-plugin/dict.c:1062 ../panel-plugin/dict.c:1222
-msgid "Dictionary:"
-msgstr "SlovnÃk:"
+#: ../lib/gui.c:268 ../lib/prefs.c:256 ../lib/prefs.c:448
+msgid "Web"
+msgstr "Web"
 
-#: ../panel-plugin/dict.c:1066
-msgid "* (use all)"
-msgstr "* (pouÅ¾Ãt vÅ¡e)"
+#: ../lib/gui.c:274 ../lib/prefs.c:265
+msgid "Spellcheck"
+msgstr "Kontrola pravopisu"
 
-#: ../panel-plugin/dict.c:1068
-msgid "! (use all, stop after first match)"
-msgstr "! (pouÅ¾Ãt vÅ¡e, zastavit pÅ™i prvnÃ shodÄ›)"
+#: ../lib/gui.c:343
+msgid "Developer"
+msgstr "VÃ½vojÃ¡Å™"
 
-#: ../panel-plugin/dict.c:1128
-msgid "Use a DICT server"
-msgstr "PouÅ¾Ãt server DICT"
+#: ../lib/prefs.c:107
+msgid "You have chosen an invalid dictionary entry."
+msgstr "Zvolili jste neplatnou poloÅ¾ku slovnÃku."
 
-#: ../panel-plugin/dict.c:1147
+#: ../lib/prefs.c:172
 msgid "dict.leo.org - German <-> English"
 msgstr "dict.leo.org - NÄ›mÄina <-> AngliÄtina"
 
-#: ../panel-plugin/dict.c:1155
+#: ../lib/prefs.c:173
 msgid "dict.leo.org - German <-> French"
 msgstr "dict.leo.org - NÄ›mÄina <-> FrancouzÅ¡tina"
 
-#: ../panel-plugin/dict.c:1163
+#: ../lib/prefs.c:174
 msgid "dict.leo.org - German <-> Spanish"
 msgstr "dict.leo.org - NÄ›mÄina <-> Å panÄ›lstina"
 
-#: ../panel-plugin/dict.c:1170
-msgid "Use another website"
-msgstr "PouÅ¾Ãt jinou webovou strÃ¡nku"
+#: ../lib/prefs.c:175
+#, fuzzy
+msgid "dict.leo.org - German <-> Italian"
+msgstr "dict.leo.org - NÄ›mÄina <-> AngliÄtina"
 
-#: ../panel-plugin/dict.c:1178
-msgid "URL:"
-msgstr "Adresa URL:"
+#: ../lib/prefs.c:176
+#, fuzzy
+msgid "dict.leo.org - German <-> Chinese"
+msgstr "dict.leo.org - NÄ›mÄina <-> AngliÄtina"
 
-#: ../panel-plugin/dict.c:1191
-msgid ""
-"Enter an URL to a web site which offer translation services.\n"
-"Use {word} as placeholder for the searched word."
+#: ../lib/prefs.c:177
+#, fuzzy
+msgid "dist.cc - Dictionary"
+msgstr "SlovnÃk:"
+
+#: ../lib/prefs.c:178
+#, fuzzy
+msgid "Dictionary.com"
+msgstr "SlovnÃk:"
+
+#: ../lib/prefs.c:179
+#, fuzzy
+msgid "TheFreeDictionary.com"
+msgstr "SlovnÃk:"
+
+#: ../lib/prefs.c:180
+msgid "Clear"
 msgstr ""
-"Zadejte adresu URL webovÃ© strÃ¡nky, kterÃ¡ nabÃzÃ pÅ™ekladatelskÃ©\n"
-"sloÅ¾ky. PouÅ¾ijte {word} jako zÃ¡stupnÃ½ Å™etÄ›zec pro hledanÃ© slovo."
 
-#: ../panel-plugin/dict.c:1197
-msgid "Use a web site"
-msgstr "PouÅ¾Ãt webovou strÃ¡nku"
+#: ../lib/prefs.c:239
+msgid "General"
+msgstr ""
 
-#: ../panel-plugin/dict.c:1211
-msgid "Aspell program:"
-msgstr "Aplikace Aspell:"
+#: ../lib/prefs.c:241
+msgid "<b>Default search method:</b>"
+msgstr ""
 
-#: ../panel-plugin/dict.c:1252
-msgid "Use Aspell"
-msgstr "PouÅ¾Ãt aplikaci Aspell"
+#: ../lib/prefs.c:274
+msgid "Last used method"
+msgstr ""
+
+#: ../lib/prefs.c:288
+msgid "<b>Panel text field:</b>"
+msgstr ""
 
-#: ../panel-plugin/dict.c:1266
+#: ../lib/prefs.c:294
 msgid "Show text field in the panel"
 msgstr "Zobrazit textovÃ© pole v panelu"
 
-#: ../panel-plugin/dict.c:1269
-msgid ""
-"This option can only be used when the panel has a horizontal orientation."
-msgstr "Tuto moÅ¾nost lze pouÅ¾Ãt pouze tehdy, je-li panel ve vodorovnÃ© pozici."
-
 #. panel entry size
-#: ../panel-plugin/dict.c:1275
+#: ../lib/prefs.c:301
 msgid "Text field size:"
 msgstr "Velikost textovÃ©ho pole:"
 
-#: ../panel-plugin/dict.c:1335 ../panel-plugin/dict.c:1663
-msgid "Ready."
-msgstr "PÅ™ipraven."
+#. server address
+#: ../lib/prefs.c:344
+msgid "Server:"
+msgstr "Server:"
 
-#: ../panel-plugin/dict.c:1408
-msgid "Text to search:"
-msgstr "Text pro vyhledÃ¡nÃ:"
+#. server port
+#: ../lib/prefs.c:356
+msgid "Server Port:"
+msgstr "Port serveru:"
 
-#: ../panel-plugin/dict.c:1455
-msgid "Search with:"
-msgstr "Hledat pomocÃ:"
+#. dictionary
+#: ../lib/prefs.c:364 ../lib/prefs.c:508
+msgid "Dictionary:"
+msgstr "SlovnÃk:"
 
-#: ../panel-plugin/dict.c:1459 ../panel-plugin/dict.desktop.in.in.h:2
-msgid "Dict"
-msgstr "Dict"
+#: ../lib/prefs.c:368
+msgid "* (use all)"
+msgstr "* (pouÅ¾Ãt vÅ¡e)"
 
-#: ../panel-plugin/dict.c:1465
-msgid "Web"
-msgstr "Web"
+#: ../lib/prefs.c:370
+msgid "! (use all, stop after first match)"
+msgstr "! (pouÅ¾Ãt vÅ¡e, zastavit pÅ™i prvnÃ shodÄ›)"
 
-#: ../panel-plugin/dict.c:1471
-msgid "Spellcheck"
-msgstr "Kontrola pravopisu"
+#: ../lib/prefs.c:450
+msgid "<b>Web search URL:</b>"
+msgstr ""
 
-#: ../panel-plugin/dict.c:1513 ../panel-plugin/dict.desktop.in.in.h:1
-msgid "A plugin to query a Dict server."
-msgstr "ZÃ¡suvnÃ½ modul pro dotaz serveru Dict."
+#: ../lib/prefs.c:456
+msgid "URL:"
+msgstr "Adresa URL:"
 
-#: ../panel-plugin/dict.c:1517
-msgid "Developer"
-msgstr "VÃ½vojÃ¡Å™"
+#: ../lib/prefs.c:476
+#, fuzzy
+msgid ""
+"Enter an URL to a web site which offer translation or dictionary services.\n"
+"Use {word} as placeholder for the searched word."
+msgstr ""
+"Zadejte adresu URL webovÃ© strÃ¡nky, kterÃ¡ nabÃzÃ pÅ™ekladatelskÃ©\n"
+"sloÅ¾ky. PouÅ¾ijte {word} jako zÃ¡stupnÃ½ Å™etÄ›zec pro hledanÃ© slovo."
 
-#: ../panel-plugin/dict.c:1615
-msgid "Look up a word"
-msgstr "Vyhledat slovo"
+#: ../lib/prefs.c:495
+#, fuzzy
+msgid "Aspell"
+msgstr "PouÅ¾Ãt aplikaci Aspell"
 
-#: ../panel-plugin/xfce4-popup-dict.c:97
-#, c-format
-msgid "Usage: %s [options]\n"
-msgstr ""
+#: ../lib/prefs.c:497
+msgid "Aspell program:"
+msgstr "Aplikace Aspell:"
 
-#: ../panel-plugin/xfce4-popup-dict.c:98
-#, c-format
-msgid "Options:\n"
-msgstr ""
+#~ msgid "Properties"
+#~ msgstr "Vlastnosti"
 
-#: ../panel-plugin/xfce4-popup-dict.c:99
-#, c-format
-msgid "    -t, --text-field    grap the focus on the text field in the panel\n"
-msgstr ""
+#~ msgid "Use a DICT server"
+#~ msgstr "PouÅ¾Ãt server DICT"
 
-#: ../panel-plugin/xfce4-popup-dict.c:100
-#, c-format
-msgid "    -h, --help          show this help and exit\n"
-msgstr ""
+#~ msgid "Use another website"
+#~ msgstr "PouÅ¾Ãt jinou webovou strÃ¡nku"
 
-#: ../panel-plugin/xfce4-popup-dict.c:101
-#, c-format
-msgid ""
-"If called without any options, the xfce4-dict-plugin main window is shown.\n"
-msgstr ""
+#~ msgid "Use a web site"
+#~ msgstr "PouÅ¾Ãt webovou strÃ¡nku"
+
+#~ msgid ""
+#~ "This option can only be used when the panel has a horizontal orientation."
+#~ msgstr ""
+#~ "Tuto moÅ¾nost lze pouÅ¾Ãt pouze tehdy, je-li panel ve vodorovnÃ© pozici."
diff --git a/po/de.po b/po/de.po
index f590648..2f39a1e 100644
--- a/po/de.po
+++ b/po/de.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-dict-plugin 0.3.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-08 17:08+0100\n"
-"PO-Revision-Date: 2008-01-04 17:12+0100\n"
+"POT-Creation-Date: 2008-04-22 13:11+0200\n"
+"PO-Revision-Date: 2008-04-21 23:39+0100\n"
 "Last-Translator: Enrico TrÃ¶ger <enrico.troeger@uvena.de>\n"
 "Language-Team: German <xfce-i18n@xfce.org>\n"
 "MIME-Version: 1.0\n"
@@ -17,219 +17,338 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Poedit-Country: GERMANY\n"
 "X-Poedit-SourceCharset: utf-8\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../panel-plugin/dict.c:358 ../panel-plugin/dict.c:822
-msgid "Could not connect to server."
-msgstr "Konnte keine Verbindung zum Server herstellen."
+#: ../panel-plugin/xfce4-dict-plugin.desktop.in.in.h:1
+msgid "A plugin to query different dictionaries."
+msgstr "Ein Plugin zum Abfragen verschiedener WÃ¶rterbÃ¼cher."
 
-#: ../panel-plugin/dict.c:365 ../panel-plugin/dict.c:390
-#: ../panel-plugin/dict.c:844
-msgid "Unknown error while quering the server."
-msgstr "Unbekannter Fehler beim Abfragen des Servers."
+#: ../panel-plugin/xfce4-dict-plugin.desktop.in.in.h:2
+msgid "Dictionary"
+msgstr "WÃ¶rterbuch"
 
-#: ../panel-plugin/dict.c:373
-msgid "Server not ready."
-msgstr "Server ist nicht bereit."
+#: ../panel-plugin/xfce4-dict-plugin.c:370
+msgid "Look up a word"
+msgstr "Ein Wort nachschlagen"
+
+#: ../panel-plugin/xfce4-dict-plugin.c:429 ../src/xfce4-dict.c:206
+#: ../lib/aspell.c:198 ../lib/dictd.c:138 ../lib/gui.c:96
+msgid "Ready."
+msgstr "Fertig."
+
+#. Note for translators: run xfce4-dict --help and copy the help text for "--help" into this one
+#: ../src/xfce4-dict.c:54
+msgid "Show help options"
+msgstr "Hilfeoptionen anzeigen"
+
+#: ../src/xfce4-dict.c:56
+msgid "Search the given text using a Dict server(RFC 2229)"
+msgstr ""
+"Den angegebenen Text mithilfe eines Dict Servers (nach RFC 2229) suchen"
+
+#: ../src/xfce4-dict.c:57
+msgid "Search the given text using a web-based search engine"
+msgstr "Den angegebenen Text mithilfe eines Webdienstes suchen"
+
+#: ../src/xfce4-dict.c:58
+msgid "Check the given text with a spellchecker"
+msgstr "Den angegebenen Text mit einer RechtschreibprÃ¼fung kontrollieren"
+
+#: ../src/xfce4-dict.c:59
+msgid "Grab the focus on the text field in the panel"
+msgstr "Setzt den Fokus auf das Eingabefeld in der Leiste"
+
+#: ../src/xfce4-dict.c:60
+msgid "Start stand-alone application even if the panel plugin is loaded"
+msgstr ""
+"Als eigenstÃ¤ndiges Programm starten auch wenn das Leisten-Plugin geladen ist"
+
+#: ../src/xfce4-dict.c:61
+msgid "Show version information"
+msgstr "Versionsinformationen anzeigen"
 
-#: ../panel-plugin/dict.c:384
+#: ../src/xfce4-dict.c:134
+msgid "[TEXT]"
+msgstr "[TEXT]"
+
+#: ../src/xfce4-dict.c:158
 #, c-format
-msgid "No matches could be found for \"%s\"."
-msgstr "Keine Treffer fÃ¼r Â»%sÂ« gefunden."
+msgid "(built on %s with GTK %d.%d.%d, GLib %d.%d.%d)"
+msgstr "(kompiliert am %s mit GTK %d.%d.%d, GLib %d.%d.%d)"
+
+#: ../src/xfce4-dict.desktop.in.h:1 ../lib/gui.c:339
+msgid "A client program to query different dictionaries."
+msgstr "Ein Programm zum Abfragen verschiedener WÃ¶rterbÃ¼cher."
+
+#: ../src/xfce4-dict.desktop.in.h:2
+msgid "Dictionary Client"
+msgstr "WÃ¶rterbuchprogramm"
 
-#: ../panel-plugin/dict.c:395
+#: ../src/xfce4-dict.desktop.in.h:3 ../lib/gui.c:189 ../lib/prefs.c:212
+msgid "Xfce4 Dictionary"
+msgstr "Xfce4 WÃ¶rterbuch"
+
+#: ../lib/aspell.c:75
 #, c-format
-msgid "%d definition(s) found."
-msgstr "%d Definition(en) gefunden."
+msgid "%d suggestion found."
+msgid_plural "%d suggestions found."
+msgstr[0] "%d Vorschlag gefunden."
+msgstr[1] "%d VorschlÃ¤ge gefunden."
 
-#: ../panel-plugin/dict.c:512
+#: ../lib/aspell.c:79
 #, c-format
-msgid "Querying the server %s..."
-msgstr "Frage Server %s ab..."
+msgid "Suggestions for \"%s\":"
+msgstr "VorschlÃ¤ge fÃ¼r Â»%sÂ«:"
 
-#: ../panel-plugin/dict.c:565
+#: ../lib/aspell.c:90
+#, c-format
+msgid "\"%s\" is spelled correctly."
+msgstr "Â»%sÂ« ist richtig geschrieben."
+
+#: ../lib/aspell.c:96
+#, c-format
+msgid "No suggestions could be found for \"%s\"."
+msgstr "Keine VorschlÃ¤ge fÃ¼r Â»%sÂ« gefunden."
+
+#. translation hint:
+#. * Error while executing <spell command, e.g. "aspell"> (<error message>)
+#: ../lib/aspell.c:122
+#, c-format
+msgid "Error while executing \"%s\" (%s)."
+msgstr "Fehler beim AusfÃ¼hren von Â»%sÂ« (%s)."
+
+#: ../lib/aspell.c:158
+msgid "Please set the aspell command in the preferences dialog."
+msgstr ""
+"Bitte geben Sie zuerst einen Befehl fÃ¼r aspell im Einstellungsdialog an."
+
+#: ../lib/aspell.c:164 ../lib/common.c:200
 msgid "Invalid input."
 msgstr "UngÃ¼ltige Eingabe."
 
-#: ../panel-plugin/dict.c:575
-msgid "Invalid non-UTF8 input."
-msgstr "UngÃ¼ltige Eingabe: kein UTF8-Format."
+#: ../lib/aspell.c:202
+#, c-format
+msgid "Process failed (%s)"
+msgstr "Prozess fehlgeschlagen (%s)"
 
-#: ../panel-plugin/dict.c:637
+#: ../lib/common.c:171
 msgid "Browser could not be opened. Please check your preferences."
 msgstr ""
 "Es konnte kein Browser geÃ¶ffnet werden. Biite Ã¼berprÃ¼fen Sie Ihre "
 "Einstellungen."
 
-#: ../panel-plugin/dict.c:839
+#: ../lib/common.c:210
+msgid "Invalid non-UTF8 input."
+msgstr "UngÃ¼ltige Eingabe: kein UTF8-Format."
+
+#: ../lib/dictd.c:112 ../lib/dictd.c:375
+msgid "Could not connect to server."
+msgstr "Konnte keine Verbindung zum Server herstellen."
+
+#: ../lib/dictd.c:119 ../lib/dictd.c:157 ../lib/dictd.c:397
+msgid "Unknown error while quering the server."
+msgstr "Unbekannter Fehler beim Abfragen des Servers."
+
+#: ../lib/dictd.c:127
+msgid "Server not ready."
+msgstr "Server ist nicht bereit."
+
+#: ../lib/dictd.c:140
+#, c-format
+msgid "No matches could be found for \"%s\"."
+msgstr "Keine Treffer fÃ¼r Â»%sÂ« gefunden."
+
+#: ../lib/dictd.c:162
+#, c-format
+msgid "%d definition found."
+msgid_plural "%d definitions found."
+msgstr[0] "%d Definition gefunden."
+msgstr[1] "%d Definitionen gefunden."
+
+#: ../lib/dictd.c:352
+#, c-format
+msgid "Querying %s..."
+msgstr "Frage Server %s ab..."
+
+#: ../lib/dictd.c:392
 msgid "The server doesn't offer any databases."
 msgstr "Der Server bietet keine Datenbanken an."
 
-#: ../panel-plugin/dict.c:894
-msgid "You have chosen an invalid dictionary entry."
-msgstr "Sie haben einen ungÃ¼ltigen Eintrag ausgewÃ¤hlt."
+#: ../lib/gui.c:146
+msgid "_File"
+msgstr "_Datei"
 
-#: ../panel-plugin/dict.c:1009
-msgid "Properties"
-msgstr "Einstellungen"
+#: ../lib/gui.c:162
+msgid "_Help"
+msgstr "_Hilfe"
 
-#: ../panel-plugin/dict.c:1025
-msgid "Dictionary plugin"
-msgstr "WÃ¶rterbuch-Plugin"
+#: ../lib/gui.c:212
+msgid "Text to search:"
+msgstr "Suchwort:"
 
-#. server address
-#: ../panel-plugin/dict.c:1042
-msgid "Server:"
-msgstr "Server:"
+#: ../lib/gui.c:258
+msgid "Search with:"
+msgstr "Suchen mit:"
 
-#. server port
-#: ../panel-plugin/dict.c:1054
-msgid "Server Port:"
-msgstr "Server-Port:"
+#: ../lib/gui.c:262 ../lib/prefs.c:247 ../lib/prefs.c:341
+msgid "Dict"
+msgstr "Dict"
 
-#. dictionary
-#: ../panel-plugin/dict.c:1062 ../panel-plugin/dict.c:1222
-msgid "Dictionary:"
-msgstr "WÃ¶rterbuch:"
+#: ../lib/gui.c:268 ../lib/prefs.c:256 ../lib/prefs.c:448
+msgid "Web"
+msgstr "Web"
 
-#: ../panel-plugin/dict.c:1066
-msgid "* (use all)"
-msgstr "* (alle benutzen)"
+#: ../lib/gui.c:274 ../lib/prefs.c:265
+msgid "Spellcheck"
+msgstr "RechtschreibprÃ¼fung"
 
-#: ../panel-plugin/dict.c:1068
-msgid "! (use all, stop after first match)"
-msgstr "! (alle benutzen, aber nach dem ersten Treffer aufhÃ¶ren)"
+#: ../lib/gui.c:343
+msgid "Developer"
+msgstr "Entwickler"
 
-#: ../panel-plugin/dict.c:1128
-msgid "Use a DICT server"
-msgstr "DICT-Server benutzen"
+#: ../lib/prefs.c:107
+msgid "You have chosen an invalid dictionary entry."
+msgstr "Sie haben einen ungÃ¼ltigen Eintrag ausgewÃ¤hlt."
 
-#: ../panel-plugin/dict.c:1147
+#: ../lib/prefs.c:172
 msgid "dict.leo.org - German <-> English"
 msgstr "dict.leo.org - Deutsch <-> Englisch"
 
-#: ../panel-plugin/dict.c:1155
+#: ../lib/prefs.c:173
 msgid "dict.leo.org - German <-> French"
 msgstr "dict.leo.org - Deutsch <-> FranzÃ¶sisch"
 
-#: ../panel-plugin/dict.c:1163
+#: ../lib/prefs.c:174
 msgid "dict.leo.org - German <-> Spanish"
 msgstr "dict.leo.org - Deutsch <-> Spanisch"
 
-#: ../panel-plugin/dict.c:1170
-msgid "Use another website"
-msgstr "Andere Webseite benutzen"
+#: ../lib/prefs.c:175
+msgid "dict.leo.org - German <-> Italian"
+msgstr "dict.leo.org - Deutsch <-> Italienisch"
 
-#: ../panel-plugin/dict.c:1178
-msgid "URL:"
-msgstr "URL:"
+#: ../lib/prefs.c:176
+msgid "dict.leo.org - German <-> Chinese"
+msgstr "dict.leo.org - Deutsch <-> Chinesisch"
 
-#: ../panel-plugin/dict.c:1191
-msgid ""
-"Enter an URL to a web site which offer translation services.\n"
-"Use {word} as placeholder for the searched word."
-msgstr ""
-"Geben Sie eine URL fÃ¼r eine Webseite an, die Ãœbersetzungsdienste anbietet.\n"
-"Benutzen Sie {word} als Platzhalter fÃ¼r das zu Ã¼bersetzende Wort."
+#: ../lib/prefs.c:177
+msgid "dist.cc - Dictionary"
+msgstr "dist.cc - WÃ¶rterbuch"
 
-#: ../panel-plugin/dict.c:1197
-msgid "Use a web site"
-msgstr "Webseite benutzen"
+#: ../lib/prefs.c:178
+msgid "Dictionary.com"
+msgstr "Dictionary.com"
 
-#: ../panel-plugin/dict.c:1211
-msgid "Aspell program:"
-msgstr "Aspell Programm:"
+#: ../lib/prefs.c:179
+msgid "TheFreeDictionary.com"
+msgstr "TheFreeDictionary.com"
 
-#: ../panel-plugin/dict.c:1252
-msgid "Use Aspell"
-msgstr "Aspell benutzen"
+#: ../lib/prefs.c:180
+msgid "Clear"
+msgstr "Leeren"
 
-#: ../panel-plugin/dict.c:1266
+#: ../lib/prefs.c:239
+msgid "General"
+msgstr "Allgemein"
+
+#: ../lib/prefs.c:241
+msgid "<b>Default search method:</b>"
+msgstr "<b>Standard Suchmethode:</b>"
+
+#: ../lib/prefs.c:274
+msgid "Last used method"
+msgstr "Zuletzt benutze Suchmethode"
+
+#: ../lib/prefs.c:288
+msgid "<b>Panel text field:</b>"
+msgstr "<b>Textfeld in der Leiste:</b>"
+
+#: ../lib/prefs.c:294
 msgid "Show text field in the panel"
 msgstr "Zeige Textfeld in der Leiste"
 
-#: ../panel-plugin/dict.c:1269
-msgid ""
-"This option can only be used when the panel has a horizontal orientation."
-msgstr ""
-"Diese Option kann nur benutzt werden, wenn die Leiste horizontal "
-"ausgerichtet ist."
-
 #. panel entry size
-#: ../panel-plugin/dict.c:1275
+#: ../lib/prefs.c:301
 msgid "Text field size:"
 msgstr "TextfeldgrÃ¶ÃŸe:"
 
-#: ../panel-plugin/dict.c:1335 ../panel-plugin/dict.c:1663
-msgid "Ready."
-msgstr "Fertig."
-
-#: ../panel-plugin/dict.c:1408
-msgid "Text to search:"
-msgstr "Suchwort:"
+#. server address
+#: ../lib/prefs.c:344
+msgid "Server:"
+msgstr "Server:"
 
-#: ../panel-plugin/dict.c:1455
-msgid "Search with:"
-msgstr "Suchen mit:"
+#. server port
+#: ../lib/prefs.c:356
+msgid "Server Port:"
+msgstr "Server-Port:"
 
-#: ../panel-plugin/dict.c:1459 ../panel-plugin/dict.desktop.in.in.h:2
-msgid "Dict"
-msgstr "Dict"
+#. dictionary
+#: ../lib/prefs.c:364 ../lib/prefs.c:508
+msgid "Dictionary:"
+msgstr "WÃ¶rterbuch:"
 
-#: ../panel-plugin/dict.c:1465
-msgid "Web"
-msgstr "Web"
+#: ../lib/prefs.c:368
+msgid "* (use all)"
+msgstr "* (alle benutzen)"
 
-#: ../panel-plugin/dict.c:1471
-msgid "Spellcheck"
-msgstr "RechtschreibprÃ¼fung"
+#: ../lib/prefs.c:370
+msgid "! (use all, stop after first match)"
+msgstr "! (alle benutzen, aber nach dem ersten Treffer aufhÃ¶ren)"
 
-#: ../panel-plugin/dict.c:1513 ../panel-plugin/dict.desktop.in.in.h:1
-msgid "A plugin to query a Dict server."
-msgstr "Plugin zum Abfragen eines Dict-Servers."
+#: ../lib/prefs.c:450
+msgid "<b>Web search URL:</b>"
+msgstr "<b>URL fÃ¼r die Websuche:</b>"
 
-#: ../panel-plugin/dict.c:1517
-msgid "Developer"
-msgstr "Entwickler"
+#: ../lib/prefs.c:456
+msgid "URL:"
+msgstr "URL:"
 
-#: ../panel-plugin/dict.c:1615
-msgid "Look up a word"
-msgstr "Ein Wort nachschlagen"
+#: ../lib/prefs.c:476
+msgid ""
+"Enter an URL to a web site which offer translation or dictionary services.\n"
+"Use {word} as placeholder for the searched word."
+msgstr ""
+"Geben Sie eine URL fÃ¼r eine Webseite an, die Ãœbersetzungs- oder "
+"WÃ¶rterbuchdienste anbietet.\n"
+"Benutzen Sie {word} als Platzhalter fÃ¼r das zu Ã¼bersetzende Wort."
 
-#: ../panel-plugin/xfce4-popup-dict.c:97
-#, c-format
-msgid "Usage: %s [options]\n"
-msgstr "Verwendung: %s [Optionen]\n"
+#: ../lib/prefs.c:495
+msgid "Aspell"
+msgstr "Aspell"
 
-#: ../panel-plugin/xfce4-popup-dict.c:98
-#, c-format
-msgid "Options:\n"
-msgstr "Optionen:\n"
+#: ../lib/prefs.c:497
+msgid "Aspell program:"
+msgstr "Aspell Programm:"
 
-#: ../panel-plugin/xfce4-popup-dict.c:99
-#, c-format
-msgid "    -t, --text-field    grap the focus on the text field in the panel\n"
-msgstr ""
-"    -t, --text-field    setzt den Fokus auf das Eingabefeld in der Leiste\n"
+#~ msgid "    -h, --help          show this help and exit\n"
+#~ msgstr "    -h, --help          diese Hilfe anzeigen und beenden\n"
 
-#: ../panel-plugin/xfce4-popup-dict.c:100
-#, c-format
-msgid "    -h, --help          show this help and exit\n"
-msgstr "    -h, --help          diese Hilfe anzeigen und beenden\n"
+#~ msgid ""
+#~ "If called without any options, the xfce4-dict-plugin main window is "
+#~ "shown.\n"
+#~ msgstr ""
+#~ "Bei Aufruf ohne Argumente wird das Hauptfenster des xfce4-dict-plugins "
+#~ "angezeigt.\n"
 
-#: ../panel-plugin/xfce4-popup-dict.c:101
-#, c-format
-msgid ""
-"If called without any options, the xfce4-dict-plugin main window is shown.\n"
-msgstr ""
-"Bei Aufruf ohne Argumente wird das Hauptfenster des xfce4-dict-plugins "
-"angezeigt.\n"
+#~ msgid "Options:\n"
+#~ msgstr "Optionen:\n"
 
-#~ msgid "Input is too long."
-#~ msgstr "Eingabe ist zu lang."
+#~ msgid "Properties"
+#~ msgstr "Einstellungen"
 
-#~ msgid "Answer was too long, it has been truncated (%d definition(s) found)."
+#~ msgid ""
+#~ "This option can only be used when the panel has a horizontal orientation."
 #~ msgstr ""
-#~ "Die Antwort war zu lang, sie wurde gekÃ¼rzt (%d Definition(en) gefunden)."
+#~ "Diese Option kann nur benutzt werden, wenn die Leiste horizontal "
+#~ "ausgerichtet ist."
+
+#~ msgid "Usage: %s [options]\n"
+#~ msgstr "Verwendung: %s [Optionen]\n"
+
+#~ msgid "Use a DICT server"
+#~ msgstr "DICT-Server benutzen"
+
+#~ msgid "Use a web site"
+#~ msgstr "Webseite benutzen"
 
-#~ msgid "-- The received list was too long. It has been truncated."
-#~ msgstr "-- Die empfangene Liste ist zu lang, sie wurde gekÃ¼rzt."
+#~ msgid "Use another website"
+#~ msgstr "Andere Webseite benutzen"
diff --git a/po/en_GB.po b/po/en_GB.po
index a140590..0775fb2 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-dict-plugin 0.3.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-08 17:08+0100\n"
+"POT-Creation-Date: 2008-04-22 13:11+0200\n"
 "PO-Revision-Date: 2007-03-30 21:27+1000\n"
 "Last-Translator: Jeff Bailes <thepizzaking@gmail.com>\n"
 "Language-Team: English/GB\n"
@@ -17,206 +17,328 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../panel-plugin/dict.c:358 ../panel-plugin/dict.c:822
-msgid "Could not connect to server."
-msgstr "Could not connect to server."
+#: ../panel-plugin/xfce4-dict-plugin.desktop.in.in.h:1
+#, fuzzy
+msgid "A plugin to query different dictionaries."
+msgstr "A plugin to query a Dict server."
 
-#: ../panel-plugin/dict.c:365 ../panel-plugin/dict.c:390
-#: ../panel-plugin/dict.c:844
-msgid "Unknown error while quering the server."
-msgstr "Unknown error while quering the server."
+#: ../panel-plugin/xfce4-dict-plugin.desktop.in.in.h:2
+#, fuzzy
+msgid "Dictionary"
+msgstr "Dictionary :"
 
-#: ../panel-plugin/dict.c:373
-msgid "Server not ready."
-msgstr "Server not ready."
+#: ../panel-plugin/xfce4-dict-plugin.c:370
+msgid "Look up a word"
+msgstr "Look up a word"
+
+#: ../panel-plugin/xfce4-dict-plugin.c:429 ../src/xfce4-dict.c:206
+#: ../lib/aspell.c:198 ../lib/dictd.c:138 ../lib/gui.c:96
+msgid "Ready."
+msgstr "Ready."
+
+#. Note for translators: run xfce4-dict --help and copy the help text for "--help" into this one
+#: ../src/xfce4-dict.c:54
+msgid "Show help options"
+msgstr ""
+
+#: ../src/xfce4-dict.c:56
+msgid "Search the given text using a Dict server(RFC 2229)"
+msgstr ""
+
+#: ../src/xfce4-dict.c:57
+msgid "Search the given text using a web-based search engine"
+msgstr ""
+
+#: ../src/xfce4-dict.c:58
+msgid "Check the given text with a spellchecker"
+msgstr ""
+
+#: ../src/xfce4-dict.c:59
+#, fuzzy
+msgid "Grab the focus on the text field in the panel"
+msgstr "Show text field in the panel"
+
+#: ../src/xfce4-dict.c:60
+msgid "Start stand-alone application even if the panel plugin is loaded"
+msgstr ""
+
+#: ../src/xfce4-dict.c:61
+msgid "Show version information"
+msgstr ""
 
-#: ../panel-plugin/dict.c:384
+#: ../src/xfce4-dict.c:134
+msgid "[TEXT]"
+msgstr ""
+
+#: ../src/xfce4-dict.c:158
 #, c-format
-msgid "No matches could be found for \"%s\"."
-msgstr "No matches could be found for \"%s\"."
+msgid "(built on %s with GTK %d.%d.%d, GLib %d.%d.%d)"
+msgstr ""
+
+#: ../src/xfce4-dict.desktop.in.h:1 ../lib/gui.c:339
+msgid "A client program to query different dictionaries."
+msgstr ""
+
+#: ../src/xfce4-dict.desktop.in.h:2
+#, fuzzy
+msgid "Dictionary Client"
+msgstr "Dictionary plugin"
+
+#: ../src/xfce4-dict.desktop.in.h:3 ../lib/gui.c:189 ../lib/prefs.c:212
+#, fuzzy
+msgid "Xfce4 Dictionary"
+msgstr "Dictionary :"
+
+#: ../lib/aspell.c:75
+#, fuzzy, c-format
+msgid "%d suggestion found."
+msgid_plural "%d suggestions found."
+msgstr[0] "%d definition(s) found."
+msgstr[1] "%d definition(s) found."
 
-#: ../panel-plugin/dict.c:395
+#: ../lib/aspell.c:79
 #, c-format
-msgid "%d definition(s) found."
-msgstr "%d definition(s) found."
+msgid "Suggestions for \"%s\":"
+msgstr ""
 
-#: ../panel-plugin/dict.c:512
+#: ../lib/aspell.c:90
 #, c-format
-msgid "Querying the server %s..."
-msgstr "Querying the server %s..."
+msgid "\"%s\" is spelled correctly."
+msgstr ""
+
+#: ../lib/aspell.c:96
+#, fuzzy, c-format
+msgid "No suggestions could be found for \"%s\"."
+msgstr "No matches could be found for \"%s\"."
+
+#. translation hint:
+#. * Error while executing <spell command, e.g. "aspell"> (<error message>)
+#: ../lib/aspell.c:122
+#, c-format
+msgid "Error while executing \"%s\" (%s)."
+msgstr ""
+
+#: ../lib/aspell.c:158
+msgid "Please set the aspell command in the preferences dialog."
+msgstr ""
 
-#: ../panel-plugin/dict.c:565
+#: ../lib/aspell.c:164 ../lib/common.c:200
 msgid "Invalid input."
 msgstr "Invalid input."
 
-#: ../panel-plugin/dict.c:575
-msgid "Invalid non-UTF8 input."
-msgstr "Invalid non-UTF8 input."
+#: ../lib/aspell.c:202
+#, c-format
+msgid "Process failed (%s)"
+msgstr ""
 
-#: ../panel-plugin/dict.c:637
+#: ../lib/common.c:171
 msgid "Browser could not be opened. Please check your preferences."
 msgstr "Browser could not be opened. Please check your preferences."
 
-#: ../panel-plugin/dict.c:839
+#: ../lib/common.c:210
+msgid "Invalid non-UTF8 input."
+msgstr "Invalid non-UTF8 input."
+
+#: ../lib/dictd.c:112 ../lib/dictd.c:375
+msgid "Could not connect to server."
+msgstr "Could not connect to server."
+
+#: ../lib/dictd.c:119 ../lib/dictd.c:157 ../lib/dictd.c:397
+msgid "Unknown error while quering the server."
+msgstr "Unknown error while quering the server."
+
+#: ../lib/dictd.c:127
+msgid "Server not ready."
+msgstr "Server not ready."
+
+#: ../lib/dictd.c:140
+#, c-format
+msgid "No matches could be found for \"%s\"."
+msgstr "No matches could be found for \"%s\"."
+
+#: ../lib/dictd.c:162
+#, fuzzy, c-format
+msgid "%d definition found."
+msgid_plural "%d definitions found."
+msgstr[0] "%d definition(s) found."
+msgstr[1] "%d definition(s) found."
+
+#: ../lib/dictd.c:352
+#, fuzzy, c-format
+msgid "Querying %s..."
+msgstr "Querying the server %s..."
+
+#: ../lib/dictd.c:392
 msgid "The server doesn't offer any databases."
 msgstr "The server doesn't offer any databases."
 
-#: ../panel-plugin/dict.c:894
-msgid "You have chosen an invalid dictionary entry."
-msgstr "You have chosen an invalid dictionary entry."
+#: ../lib/gui.c:146
+msgid "_File"
+msgstr ""
 
-#: ../panel-plugin/dict.c:1009
-msgid "Properties"
-msgstr "Properties"
+#: ../lib/gui.c:162
+msgid "_Help"
+msgstr ""
 
-#: ../panel-plugin/dict.c:1025
-msgid "Dictionary plugin"
-msgstr "Dictionary plugin"
+#: ../lib/gui.c:212
+msgid "Text to search:"
+msgstr "Text to search:"
 
-#. server address
-#: ../panel-plugin/dict.c:1042
-#, fuzzy
-msgid "Server:"
-msgstr "Server :"
+#: ../lib/gui.c:258
+msgid "Search with:"
+msgstr ""
 
-#. server port
-#: ../panel-plugin/dict.c:1054
-#, fuzzy
-msgid "Server Port:"
-msgstr "Server Port :"
+#: ../lib/gui.c:262 ../lib/prefs.c:247 ../lib/prefs.c:341
+msgid "Dict"
+msgstr "Dict"
 
-#. dictionary
-#: ../panel-plugin/dict.c:1062 ../panel-plugin/dict.c:1222
-#, fuzzy
-msgid "Dictionary:"
-msgstr "Dictionary :"
+#: ../lib/gui.c:268 ../lib/prefs.c:256 ../lib/prefs.c:448
+msgid "Web"
+msgstr ""
 
-#: ../panel-plugin/dict.c:1066
-msgid "* (use all)"
-msgstr "* (use all)"
+#: ../lib/gui.c:274 ../lib/prefs.c:265
+msgid "Spellcheck"
+msgstr ""
 
-#: ../panel-plugin/dict.c:1068
-msgid "! (use all, stop after first match)"
-msgstr "! (use all, stop after first match)"
+#: ../lib/gui.c:343
+msgid "Developer"
+msgstr "Developer"
 
-#: ../panel-plugin/dict.c:1128
-msgid "Use a DICT server"
-msgstr "Use a DICT server"
+#: ../lib/prefs.c:107
+msgid "You have chosen an invalid dictionary entry."
+msgstr "You have chosen an invalid dictionary entry."
 
-#: ../panel-plugin/dict.c:1147
+#: ../lib/prefs.c:172
 msgid "dict.leo.org - German <-> English"
 msgstr "dict.leo.org - German <-> English"
 
-#: ../panel-plugin/dict.c:1155
+#: ../lib/prefs.c:173
 msgid "dict.leo.org - German <-> French"
 msgstr "dict.leo.org - German <-> French"
 
-#: ../panel-plugin/dict.c:1163
+#: ../lib/prefs.c:174
 msgid "dict.leo.org - German <-> Spanish"
 msgstr "dict.leo.org - German <-> Spanish"
 
-#: ../panel-plugin/dict.c:1170
-msgid "Use another website"
-msgstr "Use another website"
+#: ../lib/prefs.c:175
+#, fuzzy
+msgid "dict.leo.org - German <-> Italian"
+msgstr "dict.leo.org - German <-> English"
 
-#: ../panel-plugin/dict.c:1178
-msgid "URL:"
-msgstr "URL:"
+#: ../lib/prefs.c:176
+#, fuzzy
+msgid "dict.leo.org - German <-> Chinese"
+msgstr "dict.leo.org - German <-> English"
 
-#: ../panel-plugin/dict.c:1191
-msgid ""
-"Enter an URL to a web site which offer translation services.\n"
-"Use {word} as placeholder for the searched word."
+#: ../lib/prefs.c:177
+#, fuzzy
+msgid "dist.cc - Dictionary"
+msgstr "Dictionary :"
+
+#: ../lib/prefs.c:178
+#, fuzzy
+msgid "Dictionary.com"
+msgstr "Dictionary :"
+
+#: ../lib/prefs.c:179
+#, fuzzy
+msgid "TheFreeDictionary.com"
+msgstr "Dictionary :"
+
+#: ../lib/prefs.c:180
+msgid "Clear"
 msgstr ""
-"Enter an URL to a web site which offer translation services.\n"
-"Use {word} as placeholder for the searched word."
 
-#: ../panel-plugin/dict.c:1197
-msgid "Use a web site"
-msgstr "Use a web site"
+#: ../lib/prefs.c:239
+msgid "General"
+msgstr ""
 
-#: ../panel-plugin/dict.c:1211
-msgid "Aspell program:"
+#: ../lib/prefs.c:241
+msgid "<b>Default search method:</b>"
+msgstr ""
+
+#: ../lib/prefs.c:274
+msgid "Last used method"
 msgstr ""
 
-#: ../panel-plugin/dict.c:1252
-msgid "Use Aspell"
+#: ../lib/prefs.c:288
+msgid "<b>Panel text field:</b>"
 msgstr ""
 
-#: ../panel-plugin/dict.c:1266
+#: ../lib/prefs.c:294
 msgid "Show text field in the panel"
 msgstr "Show text field in the panel"
 
-#: ../panel-plugin/dict.c:1269
-msgid ""
-"This option can only be used when the panel has a horizontal orientation."
-msgstr ""
-"This option can only be used when the panel has a horizontal orientation."
-
 #. panel entry size
-#: ../panel-plugin/dict.c:1275
+#: ../lib/prefs.c:301
 #, fuzzy
 msgid "Text field size:"
 msgstr "Text field size :"
 
-#: ../panel-plugin/dict.c:1335 ../panel-plugin/dict.c:1663
-msgid "Ready."
-msgstr "Ready."
+#. server address
+#: ../lib/prefs.c:344
+#, fuzzy
+msgid "Server:"
+msgstr "Server :"
 
-#: ../panel-plugin/dict.c:1408
-msgid "Text to search:"
-msgstr "Text to search:"
+#. server port
+#: ../lib/prefs.c:356
+#, fuzzy
+msgid "Server Port:"
+msgstr "Server Port :"
 
-#: ../panel-plugin/dict.c:1455
-msgid "Search with:"
-msgstr ""
+#. dictionary
+#: ../lib/prefs.c:364 ../lib/prefs.c:508
+#, fuzzy
+msgid "Dictionary:"
+msgstr "Dictionary :"
 
-#: ../panel-plugin/dict.c:1459 ../panel-plugin/dict.desktop.in.in.h:2
-msgid "Dict"
-msgstr "Dict"
+#: ../lib/prefs.c:368
+msgid "* (use all)"
+msgstr "* (use all)"
 
-#: ../panel-plugin/dict.c:1465
-msgid "Web"
-msgstr ""
+#: ../lib/prefs.c:370
+msgid "! (use all, stop after first match)"
+msgstr "! (use all, stop after first match)"
 
-#: ../panel-plugin/dict.c:1471
-msgid "Spellcheck"
+#: ../lib/prefs.c:450
+msgid "<b>Web search URL:</b>"
 msgstr ""
 
-#: ../panel-plugin/dict.c:1513 ../panel-plugin/dict.desktop.in.in.h:1
-msgid "A plugin to query a Dict server."
-msgstr "A plugin to query a Dict server."
-
-#: ../panel-plugin/dict.c:1517
-msgid "Developer"
-msgstr "Developer"
-
-#: ../panel-plugin/dict.c:1615
-msgid "Look up a word"
-msgstr "Look up a word"
+#: ../lib/prefs.c:456
+msgid "URL:"
+msgstr "URL:"
 
-#: ../panel-plugin/xfce4-popup-dict.c:97
-#, c-format
-msgid "Usage: %s [options]\n"
+#: ../lib/prefs.c:476
+#, fuzzy
+msgid ""
+"Enter an URL to a web site which offer translation or dictionary services.\n"
+"Use {word} as placeholder for the searched word."
 msgstr ""
+"Enter an URL to a web site which offer translation services.\n"
+"Use {word} as placeholder for the searched word."
 
-#: ../panel-plugin/xfce4-popup-dict.c:98
-#, c-format
-msgid "Options:\n"
+#: ../lib/prefs.c:495
+msgid "Aspell"
 msgstr ""
 
-#: ../panel-plugin/xfce4-popup-dict.c:99
-#, c-format
-msgid "    -t, --text-field    grap the focus on the text field in the panel\n"
+#: ../lib/prefs.c:497
+msgid "Aspell program:"
 msgstr ""
 
-#: ../panel-plugin/xfce4-popup-dict.c:100
-#, c-format
-msgid "    -h, --help          show this help and exit\n"
-msgstr ""
+#~ msgid "Properties"
+#~ msgstr "Properties"
 
-#: ../panel-plugin/xfce4-popup-dict.c:101
-#, c-format
-msgid ""
-"If called without any options, the xfce4-dict-plugin main window is shown.\n"
-msgstr ""
+#~ msgid "Use a DICT server"
+#~ msgstr "Use a DICT server"
+
+#~ msgid "Use another website"
+#~ msgstr "Use another website"
+
+#~ msgid "Use a web site"
+#~ msgstr "Use a web site"
+
+#~ msgid ""
+#~ "This option can only be used when the panel has a horizontal orientation."
+#~ msgstr ""
+#~ "This option can only be used when the panel has a horizontal orientation."
diff --git a/po/eu.po b/po/eu.po
index 9613f1d..8b52498 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-dict-plugin 0.3.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-08 17:08+0100\n"
+"POT-Creation-Date: 2008-04-22 13:11+0200\n"
 "PO-Revision-Date: 2007-09-12 12:20+0200\n"
 "Last-Translator: Piarres Beobide <pi@beobide.net>\n"
 "Language-Team: Euskara <Librezale@librezale.org>\n"
@@ -16,205 +16,327 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: ../panel-plugin/dict.c:358 ../panel-plugin/dict.c:822
-msgid "Could not connect to server."
-msgstr "Ezin da zerbitzarira konektatu."
+#: ../panel-plugin/xfce4-dict-plugin.desktop.in.in.h:1
+#, fuzzy
+msgid "A plugin to query different dictionaries."
+msgstr "Hiztegi zerbitzari ba galdekatzeko Plugina."
 
-#: ../panel-plugin/dict.c:365 ../panel-plugin/dict.c:390
-#: ../panel-plugin/dict.c:844
-msgid "Unknown error while quering the server."
-msgstr "Errore ezezaguna zerbitzaria galdekatzerakoan."
+#: ../panel-plugin/xfce4-dict-plugin.desktop.in.in.h:2
+#, fuzzy
+msgid "Dictionary"
+msgstr "Hiztegia:"
 
-#: ../panel-plugin/dict.c:373
-msgid "Server not ready."
-msgstr "Zerbitzaria ez dago prest."
+#: ../panel-plugin/xfce4-dict-plugin.c:370
+msgid "Look up a word"
+msgstr "hitz bat bilatu"
+
+#: ../panel-plugin/xfce4-dict-plugin.c:429 ../src/xfce4-dict.c:206
+#: ../lib/aspell.c:198 ../lib/dictd.c:138 ../lib/gui.c:96
+msgid "Ready."
+msgstr "Prest."
+
+#. Note for translators: run xfce4-dict --help and copy the help text for "--help" into this one
+#: ../src/xfce4-dict.c:54
+msgid "Show help options"
+msgstr ""
+
+#: ../src/xfce4-dict.c:56
+msgid "Search the given text using a Dict server(RFC 2229)"
+msgstr ""
+
+#: ../src/xfce4-dict.c:57
+msgid "Search the given text using a web-based search engine"
+msgstr ""
+
+#: ../src/xfce4-dict.c:58
+msgid "Check the given text with a spellchecker"
+msgstr ""
+
+#: ../src/xfce4-dict.c:59
+#, fuzzy
+msgid "Grab the focus on the text field in the panel"
+msgstr "Testu eremua panelean ikusi"
+
+#: ../src/xfce4-dict.c:60
+msgid "Start stand-alone application even if the panel plugin is loaded"
+msgstr ""
+
+#: ../src/xfce4-dict.c:61
+msgid "Show version information"
+msgstr ""
 
-#: ../panel-plugin/dict.c:384
+#: ../src/xfce4-dict.c:134
+msgid "[TEXT]"
+msgstr ""
+
+#: ../src/xfce4-dict.c:158
 #, c-format
-msgid "No matches could be found for \"%s\"."
-msgstr "Ez  da parekatzerik aurkitu \"%s\"-rentzat."
+msgid "(built on %s with GTK %d.%d.%d, GLib %d.%d.%d)"
+msgstr ""
+
+#: ../src/xfce4-dict.desktop.in.h:1 ../lib/gui.c:339
+msgid "A client program to query different dictionaries."
+msgstr ""
+
+#: ../src/xfce4-dict.desktop.in.h:2
+#, fuzzy
+msgid "Dictionary Client"
+msgstr "Hiztegi Plugina"
+
+#: ../src/xfce4-dict.desktop.in.h:3 ../lib/gui.c:189 ../lib/prefs.c:212
+#, fuzzy
+msgid "Xfce4 Dictionary"
+msgstr "Hiztegia:"
+
+#: ../lib/aspell.c:75
+#, fuzzy, c-format
+msgid "%d suggestion found."
+msgid_plural "%d suggestions found."
+msgstr[0] "%d definizio aurkitu dira"
+msgstr[1] "%d definizio aurkitu dira"
 
-#: ../panel-plugin/dict.c:395
+#: ../lib/aspell.c:79
 #, c-format
-msgid "%d definition(s) found."
-msgstr "%d definizio aurkitu dira"
+msgid "Suggestions for \"%s\":"
+msgstr ""
 
-#: ../panel-plugin/dict.c:512
+#: ../lib/aspell.c:90
 #, c-format
-msgid "Querying the server %s..."
-msgstr "%s zerbitzaria galdekatzen..."
+msgid "\"%s\" is spelled correctly."
+msgstr ""
 
-#: ../panel-plugin/dict.c:565
+#: ../lib/aspell.c:96
+#, fuzzy, c-format
+msgid "No suggestions could be found for \"%s\"."
+msgstr "Ez  da parekatzerik aurkitu \"%s\"-rentzat."
+
+#. translation hint:
+#. * Error while executing <spell command, e.g. "aspell"> (<error message>)
+#: ../lib/aspell.c:122
+#, c-format
+msgid "Error while executing \"%s\" (%s)."
+msgstr ""
+
+#: ../lib/aspell.c:158
+msgid "Please set the aspell command in the preferences dialog."
+msgstr ""
+
+#: ../lib/aspell.c:164 ../lib/common.c:200
 msgid "Invalid input."
 msgstr "Sarrera baliogabea."
 
-#: ../panel-plugin/dict.c:575
-msgid "Invalid non-UTF8 input."
-msgstr "Ez-UTF8 sarrera baliogabea"
+#: ../lib/aspell.c:202
+#, c-format
+msgid "Process failed (%s)"
+msgstr ""
 
-#: ../panel-plugin/dict.c:637
+#: ../lib/common.c:171
 msgid "Browser could not be opened. Please check your preferences."
 msgstr "Nabigatzailea ezin da ireki. Mesedez egiaztatu zure hobespenak."
 
-#: ../panel-plugin/dict.c:839
+#: ../lib/common.c:210
+msgid "Invalid non-UTF8 input."
+msgstr "Ez-UTF8 sarrera baliogabea"
+
+#: ../lib/dictd.c:112 ../lib/dictd.c:375
+msgid "Could not connect to server."
+msgstr "Ezin da zerbitzarira konektatu."
+
+#: ../lib/dictd.c:119 ../lib/dictd.c:157 ../lib/dictd.c:397
+msgid "Unknown error while quering the server."
+msgstr "Errore ezezaguna zerbitzaria galdekatzerakoan."
+
+#: ../lib/dictd.c:127
+msgid "Server not ready."
+msgstr "Zerbitzaria ez dago prest."
+
+#: ../lib/dictd.c:140
+#, c-format
+msgid "No matches could be found for \"%s\"."
+msgstr "Ez  da parekatzerik aurkitu \"%s\"-rentzat."
+
+#: ../lib/dictd.c:162
+#, fuzzy, c-format
+msgid "%d definition found."
+msgid_plural "%d definitions found."
+msgstr[0] "%d definizio aurkitu dira"
+msgstr[1] "%d definizio aurkitu dira"
+
+#: ../lib/dictd.c:352
+#, fuzzy, c-format
+msgid "Querying %s..."
+msgstr "%s zerbitzaria galdekatzen..."
+
+#: ../lib/dictd.c:392
 msgid "The server doesn't offer any databases."
 msgstr "Zerbitzariak ez du datubaserik eskaintzen."
 
-#: ../panel-plugin/dict.c:894
-msgid "You have chosen an invalid dictionary entry."
-msgstr "Hiztegi sarrera baliogabe bat hautatu duzu."
+#: ../lib/gui.c:146
+msgid "_File"
+msgstr ""
 
-#: ../panel-plugin/dict.c:1009
-msgid "Properties"
-msgstr "Propietateak"
+#: ../lib/gui.c:162
+msgid "_Help"
+msgstr ""
 
-#: ../panel-plugin/dict.c:1025
-msgid "Dictionary plugin"
-msgstr "Hiztegi Plugina"
+#: ../lib/gui.c:212
+msgid "Text to search:"
+msgstr "Bilatzeko Testua:"
 
-#. server address
-#: ../panel-plugin/dict.c:1042
-#, fuzzy
-msgid "Server:"
-msgstr "Zerbitzaria:"
+#: ../lib/gui.c:258
+msgid "Search with:"
+msgstr ""
 
-#. server port
-#: ../panel-plugin/dict.c:1054
-#, fuzzy
-msgid "Server Port:"
-msgstr "Zerbitzari ataka:"
+#: ../lib/gui.c:262 ../lib/prefs.c:247 ../lib/prefs.c:341
+msgid "Dict"
+msgstr "Dict"
 
-#. dictionary
-#: ../panel-plugin/dict.c:1062 ../panel-plugin/dict.c:1222
-#, fuzzy
-msgid "Dictionary:"
-msgstr "Hiztegia:"
+#: ../lib/gui.c:268 ../lib/prefs.c:256 ../lib/prefs.c:448
+msgid "Web"
+msgstr ""
 
-#: ../panel-plugin/dict.c:1066
-msgid "* (use all)"
-msgstr "* (dena erabili)"
+#: ../lib/gui.c:274 ../lib/prefs.c:265
+msgid "Spellcheck"
+msgstr ""
 
-#: ../panel-plugin/dict.c:1068
-msgid "! (use all, stop after first match)"
-msgstr "! (dena erabili, lehen parekatzean gelditu)"
+#: ../lib/gui.c:343
+msgid "Developer"
+msgstr "Garatzailea"
 
-#: ../panel-plugin/dict.c:1128
-msgid "Use a DICT server"
-msgstr "DICT zerbitzari bat erabili"
+#: ../lib/prefs.c:107
+msgid "You have chosen an invalid dictionary entry."
+msgstr "Hiztegi sarrera baliogabe bat hautatu duzu."
 
-#: ../panel-plugin/dict.c:1147
+#: ../lib/prefs.c:172
 msgid "dict.leo.org - German <-> English"
 msgstr "dict.leo.org - Alemaniera <-> Ingelesa"
 
-#: ../panel-plugin/dict.c:1155
+#: ../lib/prefs.c:173
 msgid "dict.leo.org - German <-> French"
 msgstr "dict.leo.org - Alemaniera <-> Frantsesa"
 
-#: ../panel-plugin/dict.c:1163
+#: ../lib/prefs.c:174
 msgid "dict.leo.org - German <-> Spanish"
 msgstr "dict.leo.org - Alemaniera <-> Gaztelania"
 
-#: ../panel-plugin/dict.c:1170
-msgid "Use another website"
-msgstr "Beste webgune bat erabili"
+#: ../lib/prefs.c:175
+#, fuzzy
+msgid "dict.leo.org - German <-> Italian"
+msgstr "dict.leo.org - Alemaniera <-> Ingelesa"
 
-#: ../panel-plugin/dict.c:1178
-msgid "URL:"
-msgstr "URL-a:"
+#: ../lib/prefs.c:176
+#, fuzzy
+msgid "dict.leo.org - German <-> Chinese"
+msgstr "dict.leo.org - Alemaniera <-> Ingelesa"
 
-#: ../panel-plugin/dict.c:1191
-msgid ""
-"Enter an URL to a web site which offer translation services.\n"
-"Use {word} as placeholder for the searched word."
+#: ../lib/prefs.c:177
+#, fuzzy
+msgid "dist.cc - Dictionary"
+msgstr "Hiztegia:"
+
+#: ../lib/prefs.c:178
+#, fuzzy
+msgid "Dictionary.com"
+msgstr "Hiztegia:"
+
+#: ../lib/prefs.c:179
+#, fuzzy
+msgid "TheFreeDictionary.com"
+msgstr "Hiztegia:"
+
+#: ../lib/prefs.c:180
+msgid "Clear"
 msgstr ""
-"Idatzi itzulpen zerbitzuak eskeintzen dituen webgunearen URL-a.\n"
-"Erabili {hitza} bilaketa hitzaren kokalekuan."
 
-#: ../panel-plugin/dict.c:1197
-msgid "Use a web site"
-msgstr "Webgune bat erabili"
+#: ../lib/prefs.c:239
+msgid "General"
+msgstr ""
 
-#: ../panel-plugin/dict.c:1211
-msgid "Aspell program:"
+#: ../lib/prefs.c:241
+msgid "<b>Default search method:</b>"
+msgstr ""
+
+#: ../lib/prefs.c:274
+msgid "Last used method"
 msgstr ""
 
-#: ../panel-plugin/dict.c:1252
-msgid "Use Aspell"
+#: ../lib/prefs.c:288
+msgid "<b>Panel text field:</b>"
 msgstr ""
 
-#: ../panel-plugin/dict.c:1266
+#: ../lib/prefs.c:294
 msgid "Show text field in the panel"
 msgstr "Testu eremua panelean ikusi"
 
-#: ../panel-plugin/dict.c:1269
-msgid ""
-"This option can only be used when the panel has a horizontal orientation."
-msgstr "Aukera hau panela horizontalean dagoenean bakarrik erabili daiteke."
-
 #. panel entry size
-#: ../panel-plugin/dict.c:1275
+#: ../lib/prefs.c:301
 #, fuzzy
 msgid "Text field size:"
 msgstr "Testu eremu tamaina:"
 
-#: ../panel-plugin/dict.c:1335 ../panel-plugin/dict.c:1663
-msgid "Ready."
-msgstr "Prest."
+#. server address
+#: ../lib/prefs.c:344
+#, fuzzy
+msgid "Server:"
+msgstr "Zerbitzaria:"
 
-#: ../panel-plugin/dict.c:1408
-msgid "Text to search:"
-msgstr "Bilatzeko Testua:"
+#. server port
+#: ../lib/prefs.c:356
+#, fuzzy
+msgid "Server Port:"
+msgstr "Zerbitzari ataka:"
 
-#: ../panel-plugin/dict.c:1455
-msgid "Search with:"
-msgstr ""
+#. dictionary
+#: ../lib/prefs.c:364 ../lib/prefs.c:508
+#, fuzzy
+msgid "Dictionary:"
+msgstr "Hiztegia:"
 
-#: ../panel-plugin/dict.c:1459 ../panel-plugin/dict.desktop.in.in.h:2
-msgid "Dict"
-msgstr "Dict"
+#: ../lib/prefs.c:368
+msgid "* (use all)"
+msgstr "* (dena erabili)"
 
-#: ../panel-plugin/dict.c:1465
-msgid "Web"
-msgstr ""
+#: ../lib/prefs.c:370
+msgid "! (use all, stop after first match)"
+msgstr "! (dena erabili, lehen parekatzean gelditu)"
 
-#: ../panel-plugin/dict.c:1471
-msgid "Spellcheck"
+#: ../lib/prefs.c:450
+msgid "<b>Web search URL:</b>"
 msgstr ""
 
-#: ../panel-plugin/dict.c:1513 ../panel-plugin/dict.desktop.in.in.h:1
-msgid "A plugin to query a Dict server."
-msgstr "Hiztegi zerbitzari ba galdekatzeko Plugina."
-
-#: ../panel-plugin/dict.c:1517
-msgid "Developer"
-msgstr "Garatzailea"
-
-#: ../panel-plugin/dict.c:1615
-msgid "Look up a word"
-msgstr "hitz bat bilatu"
+#: ../lib/prefs.c:456
+msgid "URL:"
+msgstr "URL-a:"
 
-#: ../panel-plugin/xfce4-popup-dict.c:97
-#, c-format
-msgid "Usage: %s [options]\n"
+#: ../lib/prefs.c:476
+#, fuzzy
+msgid ""
+"Enter an URL to a web site which offer translation or dictionary services.\n"
+"Use {word} as placeholder for the searched word."
 msgstr ""
+"Idatzi itzulpen zerbitzuak eskeintzen dituen webgunearen URL-a.\n"
+"Erabili {hitza} bilaketa hitzaren kokalekuan."
 
-#: ../panel-plugin/xfce4-popup-dict.c:98
-#, c-format
-msgid "Options:\n"
+#: ../lib/prefs.c:495
+msgid "Aspell"
 msgstr ""
 
-#: ../panel-plugin/xfce4-popup-dict.c:99
-#, c-format
-msgid "    -t, --text-field    grap the focus on the text field in the panel\n"
+#: ../lib/prefs.c:497
+msgid "Aspell program:"
 msgstr ""
 
-#: ../panel-plugin/xfce4-popup-dict.c:100
-#, c-format
-msgid "    -h, --help          show this help and exit\n"
-msgstr ""
+#~ msgid "Properties"
+#~ msgstr "Propietateak"
 
-#: ../panel-plugin/xfce4-popup-dict.c:101
-#, c-format
-msgid ""
-"If called without any options, the xfce4-dict-plugin main window is shown.\n"
-msgstr ""
+#~ msgid "Use a DICT server"
+#~ msgstr "DICT zerbitzari bat erabili"
+
+#~ msgid "Use another website"
+#~ msgstr "Beste webgune bat erabili"
+
+#~ msgid "Use a web site"
+#~ msgstr "Webgune bat erabili"
+
+#~ msgid ""
+#~ "This option can only be used when the panel has a horizontal orientation."
+#~ msgstr "Aukera hau panela horizontalean dagoenean bakarrik erabili daiteke."
diff --git a/po/fr.po b/po/fr.po
index 7147080..7fdf8f2 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-dict-plugin 0.3.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-08 17:08+0100\n"
+"POT-Creation-Date: 2008-04-22 13:11+0200\n"
 "PO-Revision-Date: 2008-03-08 18:13+0100\n"
 "Last-Translator: Maximilian Schleiss <maximilian@xfce.org>\n"
 "Language-Team: French <xfce-i18n@xfce.org>\n"
@@ -17,204 +17,345 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../panel-plugin/dict.c:358 ../panel-plugin/dict.c:822
-msgid "Could not connect to server."
-msgstr "Impossible de se connecter au serveur."
+#: ../panel-plugin/xfce4-dict-plugin.desktop.in.in.h:1
+#, fuzzy
+msgid "A plugin to query different dictionaries."
+msgstr "Un greffon pour accÃ©der Ã  un serveur Dict."
 
-#: ../panel-plugin/dict.c:365 ../panel-plugin/dict.c:390
-#: ../panel-plugin/dict.c:844
-msgid "Unknown error while quering the server."
-msgstr "Erreur inconnue pendant une demande au serveur"
+#: ../panel-plugin/xfce4-dict-plugin.desktop.in.in.h:2
+#, fuzzy
+msgid "Dictionary"
+msgstr "Dictionnaire :"
 
-#: ../panel-plugin/dict.c:373
-msgid "Server not ready."
-msgstr "Le serveur n'est pas prÃªt."
+#: ../panel-plugin/xfce4-dict-plugin.c:370
+msgid "Look up a word"
+msgstr "Rechercher un mot"
+
+#: ../panel-plugin/xfce4-dict-plugin.c:429 ../src/xfce4-dict.c:206
+#: ../lib/aspell.c:198 ../lib/dictd.c:138 ../lib/gui.c:96
+msgid "Ready."
+msgstr "PrÃªt."
+
+#. Note for translators: run xfce4-dict --help and copy the help text for "--help" into this one
+#: ../src/xfce4-dict.c:54
+msgid "Show help options"
+msgstr ""
+
+#: ../src/xfce4-dict.c:56
+msgid "Search the given text using a Dict server(RFC 2229)"
+msgstr ""
+
+#: ../src/xfce4-dict.c:57
+msgid "Search the given text using a web-based search engine"
+msgstr ""
+
+#: ../src/xfce4-dict.c:58
+msgid "Check the given text with a spellchecker"
+msgstr ""
+
+#: ../src/xfce4-dict.c:59
+#, fuzzy
+msgid "Grab the focus on the text field in the panel"
+msgstr ""
+"    -t, --text-field    placer le focus sur le champ de texte dans le "
+"panneau\n"
 
-#: ../panel-plugin/dict.c:384
+#: ../src/xfce4-dict.c:60
+msgid "Start stand-alone application even if the panel plugin is loaded"
+msgstr ""
+
+#: ../src/xfce4-dict.c:61
+msgid "Show version information"
+msgstr ""
+
+#: ../src/xfce4-dict.c:134
+msgid "[TEXT]"
+msgstr ""
+
+#: ../src/xfce4-dict.c:158
 #, c-format
-msgid "No matches could be found for \"%s\"."
-msgstr "Aucune rÃ©ponse n'a pu Ãªtre trouvÃ©e pour \"%s\"."
+msgid "(built on %s with GTK %d.%d.%d, GLib %d.%d.%d)"
+msgstr ""
+
+#: ../src/xfce4-dict.desktop.in.h:1 ../lib/gui.c:339
+msgid "A client program to query different dictionaries."
+msgstr ""
 
-#: ../panel-plugin/dict.c:395
+#: ../src/xfce4-dict.desktop.in.h:2
+#, fuzzy
+msgid "Dictionary Client"
+msgstr "Greffon de dictionnaire"
+
+#: ../src/xfce4-dict.desktop.in.h:3 ../lib/gui.c:189 ../lib/prefs.c:212
+#, fuzzy
+msgid "Xfce4 Dictionary"
+msgstr "Dictionnaire :"
+
+#: ../lib/aspell.c:75
+#, fuzzy, c-format
+msgid "%d suggestion found."
+msgid_plural "%d suggestions found."
+msgstr[0] "%d dÃ©finition(s) trouvÃ©e(s)."
+msgstr[1] "%d dÃ©finition(s) trouvÃ©e(s)."
+
+#: ../lib/aspell.c:79
 #, c-format
-msgid "%d definition(s) found."
-msgstr "%d dÃ©finition(s) trouvÃ©e(s)."
+msgid "Suggestions for \"%s\":"
+msgstr ""
 
-#: ../panel-plugin/dict.c:512
+#: ../lib/aspell.c:90
 #, c-format
-msgid "Querying the server %s..."
-msgstr "Demande au serveur %s..."
+msgid "\"%s\" is spelled correctly."
+msgstr ""
 
-#: ../panel-plugin/dict.c:565
+#: ../lib/aspell.c:96
+#, fuzzy, c-format
+msgid "No suggestions could be found for \"%s\"."
+msgstr "Aucune rÃ©ponse n'a pu Ãªtre trouvÃ©e pour \"%s\"."
+
+#. translation hint:
+#. * Error while executing <spell command, e.g. "aspell"> (<error message>)
+#: ../lib/aspell.c:122
+#, c-format
+msgid "Error while executing \"%s\" (%s)."
+msgstr ""
+
+#: ../lib/aspell.c:158
+msgid "Please set the aspell command in the preferences dialog."
+msgstr ""
+
+#: ../lib/aspell.c:164 ../lib/common.c:200
 msgid "Invalid input."
 msgstr "EntrÃ©e invalide."
 
-#: ../panel-plugin/dict.c:575
-msgid "Invalid non-UTF8 input."
-msgstr "EntrÃ©e non-UTF8 invalide."
+#: ../lib/aspell.c:202
+#, c-format
+msgid "Process failed (%s)"
+msgstr ""
 
-#: ../panel-plugin/dict.c:637
+#: ../lib/common.c:171
 msgid "Browser could not be opened. Please check your preferences."
 msgstr ""
 "Le navigateur n'a pas pu Ãªtre ouvert. Veuillez vÃ©rifier vos prÃ©fÃ©rences."
 
-#: ../panel-plugin/dict.c:839
+#: ../lib/common.c:210
+msgid "Invalid non-UTF8 input."
+msgstr "EntrÃ©e non-UTF8 invalide."
+
+#: ../lib/dictd.c:112 ../lib/dictd.c:375
+msgid "Could not connect to server."
+msgstr "Impossible de se connecter au serveur."
+
+#: ../lib/dictd.c:119 ../lib/dictd.c:157 ../lib/dictd.c:397
+msgid "Unknown error while quering the server."
+msgstr "Erreur inconnue pendant une demande au serveur"
+
+#: ../lib/dictd.c:127
+msgid "Server not ready."
+msgstr "Le serveur n'est pas prÃªt."
+
+#: ../lib/dictd.c:140
+#, c-format
+msgid "No matches could be found for \"%s\"."
+msgstr "Aucune rÃ©ponse n'a pu Ãªtre trouvÃ©e pour \"%s\"."
+
+#: ../lib/dictd.c:162
+#, fuzzy, c-format
+msgid "%d definition found."
+msgid_plural "%d definitions found."
+msgstr[0] "%d dÃ©finition(s) trouvÃ©e(s)."
+msgstr[1] "%d dÃ©finition(s) trouvÃ©e(s)."
+
+#: ../lib/dictd.c:352
+#, fuzzy, c-format
+msgid "Querying %s..."
+msgstr "Demande au serveur %s..."
+
+#: ../lib/dictd.c:392
 msgid "The server doesn't offer any databases."
 msgstr "Le serveur ne fournit aucune base de donnÃ©es."
 
-#: ../panel-plugin/dict.c:894
-msgid "You have chosen an invalid dictionary entry."
-msgstr "Vous avez choisi une entrÃ©e au dictionnaire invalide."
+#: ../lib/gui.c:146
+msgid "_File"
+msgstr ""
 
-#: ../panel-plugin/dict.c:1009
-msgid "Properties"
-msgstr "PropriÃ©tÃ©s"
+#: ../lib/gui.c:162
+msgid "_Help"
+msgstr ""
 
-#: ../panel-plugin/dict.c:1025
-msgid "Dictionary plugin"
-msgstr "Greffon de dictionnaire"
+#: ../lib/gui.c:212
+msgid "Text to search:"
+msgstr "Le texte Ã   rechercher"
 
-#. server address
-#: ../panel-plugin/dict.c:1042
-msgid "Server:"
-msgstr "ServeurÂ :"
+#: ../lib/gui.c:258
+msgid "Search with:"
+msgstr "Chercher avec :"
 
-#. server port
-#: ../panel-plugin/dict.c:1054
-msgid "Server Port:"
-msgstr "Port du serveurÂ :"
+#: ../lib/gui.c:262 ../lib/prefs.c:247 ../lib/prefs.c:341
+msgid "Dict"
+msgstr "Serveur de dictionnaire Dict"
 
-#. dictionary
-#: ../panel-plugin/dict.c:1062 ../panel-plugin/dict.c:1222
-msgid "Dictionary:"
-msgstr "Dictionnaire :"
+#: ../lib/gui.c:268 ../lib/prefs.c:256 ../lib/prefs.c:448
+msgid "Web"
+msgstr "Site Web"
 
-#: ../panel-plugin/dict.c:1066
-msgid "* (use all)"
-msgstr "* (tous)"
+#: ../lib/gui.c:274 ../lib/prefs.c:265
+msgid "Spellcheck"
+msgstr "VÃ©rificateur orthographique"
 
-#: ../panel-plugin/dict.c:1068
-msgid "! (use all, stop after first match)"
-msgstr "! (tous, s'arrÃªte Ã  la premiÃ¨re rÃ©ponse)"
+#: ../lib/gui.c:343
+msgid "Developer"
+msgstr "DÃ©veloppeur"
 
-#: ../panel-plugin/dict.c:1128
-msgid "Use a DICT server"
-msgstr "Utiliser un serveur Dict"
+#: ../lib/prefs.c:107
+msgid "You have chosen an invalid dictionary entry."
+msgstr "Vous avez choisi une entrÃ©e au dictionnaire invalide."
 
-#: ../panel-plugin/dict.c:1147
+#: ../lib/prefs.c:172
 msgid "dict.leo.org - German <-> English"
 msgstr "dict.leo.org - Allemand <-> Anglais"
 
-#: ../panel-plugin/dict.c:1155
+#: ../lib/prefs.c:173
 msgid "dict.leo.org - German <-> French"
 msgstr "dict.leo.org - Allemand <-> FranÃ§ais"
 
-#: ../panel-plugin/dict.c:1163
+#: ../lib/prefs.c:174
 msgid "dict.leo.org - German <-> Spanish"
 msgstr "dict.leo.org - Allemand <-> Espagnol"
 
-#: ../panel-plugin/dict.c:1170
-msgid "Use another website"
-msgstr "Utiliser un autre site Web"
+#: ../lib/prefs.c:175
+#, fuzzy
+msgid "dict.leo.org - German <-> Italian"
+msgstr "dict.leo.org - Allemand <-> Anglais"
 
-#: ../panel-plugin/dict.c:1178
-msgid "URL:"
-msgstr "URL :"
+#: ../lib/prefs.c:176
+#, fuzzy
+msgid "dict.leo.org - German <-> Chinese"
+msgstr "dict.leo.org - Allemand <-> Anglais"
 
-#: ../panel-plugin/dict.c:1191
-msgid ""
-"Enter an URL to a web site which offer translation services.\n"
-"Use {word} as placeholder for the searched word."
+#: ../lib/prefs.c:177
+#, fuzzy
+msgid "dist.cc - Dictionary"
+msgstr "Dictionnaire :"
+
+#: ../lib/prefs.c:178
+#, fuzzy
+msgid "Dictionary.com"
+msgstr "Dictionnaire :"
+
+#: ../lib/prefs.c:179
+#, fuzzy
+msgid "TheFreeDictionary.com"
+msgstr "Dictionnaire :"
+
+#: ../lib/prefs.c:180
+msgid "Clear"
 msgstr ""
-"Inscrivez l'adresse d'un site Web offrant un service de traduction. "
-"Utilisez {word} comme paramÃ¨tre fictif pour le mot recherchÃ©.\nPar exemple : "
-"Â« http://www.google.fr/search?q={word} Â»."
 
-#: ../panel-plugin/dict.c:1197
-msgid "Use a web site"
-msgstr "Utiliser un site Web"
+#: ../lib/prefs.c:239
+msgid "General"
+msgstr ""
 
-#: ../panel-plugin/dict.c:1211
-msgid "Aspell program:"
-msgstr "Programme Aspell :"
+#: ../lib/prefs.c:241
+msgid "<b>Default search method:</b>"
+msgstr ""
 
-#: ../panel-plugin/dict.c:1252
-msgid "Use Aspell"
-msgstr "Utiliser un vÃ©rificateur orthographique Aspell"
+#: ../lib/prefs.c:274
+msgid "Last used method"
+msgstr ""
 
-#: ../panel-plugin/dict.c:1266
+#: ../lib/prefs.c:288
+msgid "<b>Panel text field:</b>"
+msgstr ""
+
+#: ../lib/prefs.c:294
 msgid "Show text field in the panel"
 msgstr "Montrer le champ de texte dans le panneau"
 
-#: ../panel-plugin/dict.c:1269
-msgid ""
-"This option can only be used when the panel has a horizontal orientation."
-msgstr ""
-"Cette option ne s'utilise que si le panneau est orientÃ© horizontalement."
-
 #. panel entry size
-#: ../panel-plugin/dict.c:1275
+#: ../lib/prefs.c:301
 msgid "Text field size:"
 msgstr "Taille du champ de texte :"
 
-#: ../panel-plugin/dict.c:1335 ../panel-plugin/dict.c:1663
-msgid "Ready."
-msgstr "PrÃªt."
+#. server address
+#: ../lib/prefs.c:344
+msgid "Server:"
+msgstr "ServeurÂ :"
 
-#: ../panel-plugin/dict.c:1408
-msgid "Text to search:"
-msgstr "Le texte Ã   rechercher"
+#. server port
+#: ../lib/prefs.c:356
+msgid "Server Port:"
+msgstr "Port du serveurÂ :"
 
-#: ../panel-plugin/dict.c:1455
-msgid "Search with:"
-msgstr "Chercher avec :"
+#. dictionary
+#: ../lib/prefs.c:364 ../lib/prefs.c:508
+msgid "Dictionary:"
+msgstr "Dictionnaire :"
 
-#: ../panel-plugin/dict.c:1459 ../panel-plugin/dict.desktop.in.in.h:2
-msgid "Dict"
-msgstr "Serveur de dictionnaire Dict"
+#: ../lib/prefs.c:368
+msgid "* (use all)"
+msgstr "* (tous)"
 
-#: ../panel-plugin/dict.c:1465
-msgid "Web"
-msgstr "Site Web"
+#: ../lib/prefs.c:370
+msgid "! (use all, stop after first match)"
+msgstr "! (tous, s'arrÃªte Ã  la premiÃ¨re rÃ©ponse)"
 
-#: ../panel-plugin/dict.c:1471
-msgid "Spellcheck"
-msgstr "VÃ©rificateur orthographique"
+#: ../lib/prefs.c:450
+msgid "<b>Web search URL:</b>"
+msgstr ""
 
-#: ../panel-plugin/dict.c:1513 ../panel-plugin/dict.desktop.in.in.h:1
-msgid "A plugin to query a Dict server."
-msgstr "Un greffon pour accÃ©der Ã  un serveur Dict."
+#: ../lib/prefs.c:456
+msgid "URL:"
+msgstr "URL :"
 
-#: ../panel-plugin/dict.c:1517
-msgid "Developer"
-msgstr "DÃ©veloppeur"
+#: ../lib/prefs.c:476
+#, fuzzy
+msgid ""
+"Enter an URL to a web site which offer translation or dictionary services.\n"
+"Use {word} as placeholder for the searched word."
+msgstr ""
+"Inscrivez l'adresse d'un site Web offrant un service de traduction. Utilisez "
+"{word} comme paramÃ¨tre fictif pour le mot recherchÃ©.\n"
+"Par exemple : Â« http://www.google.fr/search?q={word} Â»."
 
-#: ../panel-plugin/dict.c:1615
-msgid "Look up a word"
-msgstr "Rechercher un mot"
+#: ../lib/prefs.c:495
+#, fuzzy
+msgid "Aspell"
+msgstr "Utiliser un vÃ©rificateur orthographique Aspell"
 
-#: ../panel-plugin/xfce4-popup-dict.c:97
-#, c-format
-msgid "Usage: %s [options]\n"
-msgstr "Usage : %s [options]\n"
+#: ../lib/prefs.c:497
+msgid "Aspell program:"
+msgstr "Programme Aspell :"
 
-#: ../panel-plugin/xfce4-popup-dict.c:98
-#, c-format
-msgid "Options:\n"
-msgstr "Options :\n"
+#~ msgid "Properties"
+#~ msgstr "PropriÃ©tÃ©s"
 
-#: ../panel-plugin/xfce4-popup-dict.c:99
-#, c-format
-msgid "    -t, --text-field    grap the focus on the text field in the panel\n"
-msgstr "    -t, --text-field    placer le focus sur le champ de texte dans le panneau\n"
+#~ msgid "Use a DICT server"
+#~ msgstr "Utiliser un serveur Dict"
 
-#: ../panel-plugin/xfce4-popup-dict.c:100
-#, c-format
-msgid "    -h, --help          show this help and exit\n"
-msgstr "    -h, --help          afficher cette aide et quitter\n"
+#~ msgid "Use another website"
+#~ msgstr "Utiliser un autre site Web"
 
-#: ../panel-plugin/xfce4-popup-dict.c:101
-#, c-format
-msgid ""
-"If called without any options, the xfce4-dict-plugin main window is shown.\n"
-msgstr "Si appelÃ© sans options, la fenÃªtre principale de xfce4-dict-plugin est affichÃ©e.\n"
+#~ msgid "Use a web site"
+#~ msgstr "Utiliser un site Web"
+
+#~ msgid ""
+#~ "This option can only be used when the panel has a horizontal orientation."
+#~ msgstr ""
+#~ "Cette option ne s'utilise que si le panneau est orientÃ© horizontalement."
+
+#~ msgid "Usage: %s [options]\n"
+#~ msgstr "Usage : %s [options]\n"
+
+#~ msgid "Options:\n"
+#~ msgstr "Options :\n"
+
+#~ msgid "    -h, --help          show this help and exit\n"
+#~ msgstr "    -h, --help          afficher cette aide et quitter\n"
+
+#~ msgid ""
+#~ "If called without any options, the xfce4-dict-plugin main window is "
+#~ "shown.\n"
+#~ msgstr ""
+#~ "Si appelÃ© sans options, la fenÃªtre principale de xfce4-dict-plugin est "
+#~ "affichÃ©e.\n"
diff --git a/po/hu.po b/po/hu.po
index b42a49f..33a32db 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-dict-plugin 0.3.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-08 17:08+0100\n"
+"POT-Creation-Date: 2008-04-22 13:11+0200\n"
 "PO-Revision-Date: 2008-01-25 23:38+0100\n"
 "Last-Translator: SZERVÃC Attila <sas@321.hu>\n"
 "Language-Team: Hungarian\n"
@@ -18,204 +18,341 @@ msgstr ""
 "X-Poedit-Country: HUNGARY\n"
 "X-Poedit-Language: Hungarian\n"
 
-#: ../panel-plugin/dict.c:358 ../panel-plugin/dict.c:822
+#: ../panel-plugin/xfce4-dict-plugin.desktop.in.in.h:1
+#, fuzzy
+msgid "A plugin to query different dictionaries."
+msgstr "Dict kiszolgÃ¡lÃ³ beillesztÃ©s"
+
+#: ../panel-plugin/xfce4-dict-plugin.desktop.in.in.h:2
+#, fuzzy
+msgid "Dictionary"
+msgstr "SzÃ³tÃ¡r:"
+
+#: ../panel-plugin/xfce4-dict-plugin.c:370
+msgid "Look up a word"
+msgstr "Egy szÃ³ keresÃ©se"
+
+#: ../panel-plugin/xfce4-dict-plugin.c:429 ../src/xfce4-dict.c:206
+#: ../lib/aspell.c:198 ../lib/dictd.c:138 ../lib/gui.c:96
+msgid "Ready."
+msgstr "KÃ©sz."
+
+#. Note for translators: run xfce4-dict --help and copy the help text for "--help" into this one
+#: ../src/xfce4-dict.c:54
+msgid "Show help options"
+msgstr ""
+
+#: ../src/xfce4-dict.c:56
+msgid "Search the given text using a Dict server(RFC 2229)"
+msgstr ""
+
+#: ../src/xfce4-dict.c:57
+msgid "Search the given text using a web-based search engine"
+msgstr ""
+
+#: ../src/xfce4-dict.c:58
+msgid "Check the given text with a spellchecker"
+msgstr ""
+
+#: ../src/xfce4-dict.c:59
+#, fuzzy
+msgid "Grab the focus on the text field in the panel"
+msgstr "    -t, --text-field    a szÃ¶vegmezÅ‘re viszi a fÃ³kuszt a panelban\n"
+
+#: ../src/xfce4-dict.c:60
+msgid "Start stand-alone application even if the panel plugin is loaded"
+msgstr ""
+
+#: ../src/xfce4-dict.c:61
+msgid "Show version information"
+msgstr ""
+
+#: ../src/xfce4-dict.c:134
+msgid "[TEXT]"
+msgstr ""
+
+#: ../src/xfce4-dict.c:158
+#, c-format
+msgid "(built on %s with GTK %d.%d.%d, GLib %d.%d.%d)"
+msgstr ""
+
+#: ../src/xfce4-dict.desktop.in.h:1 ../lib/gui.c:339
+msgid "A client program to query different dictionaries."
+msgstr ""
+
+#: ../src/xfce4-dict.desktop.in.h:2
+#, fuzzy
+msgid "Dictionary Client"
+msgstr "SzÃ³tÃ¡r beillesztÃ©s"
+
+#: ../src/xfce4-dict.desktop.in.h:3 ../lib/gui.c:189 ../lib/prefs.c:212
+#, fuzzy
+msgid "Xfce4 Dictionary"
+msgstr "SzÃ³tÃ¡r:"
+
+#: ../lib/aspell.c:75
+#, fuzzy, c-format
+msgid "%d suggestion found."
+msgid_plural "%d suggestions found."
+msgstr[0] "%d talÃ¡lat"
+msgstr[1] "%d talÃ¡lat"
+
+#: ../lib/aspell.c:79
+#, c-format
+msgid "Suggestions for \"%s\":"
+msgstr ""
+
+#: ../lib/aspell.c:90
+#, c-format
+msgid "\"%s\" is spelled correctly."
+msgstr ""
+
+#: ../lib/aspell.c:96
+#, fuzzy, c-format
+msgid "No suggestions could be found for \"%s\"."
+msgstr "Nincs talÃ¡lat \"%s\" kifejezÃ©sre"
+
+#. translation hint:
+#. * Error while executing <spell command, e.g. "aspell"> (<error message>)
+#: ../lib/aspell.c:122
+#, c-format
+msgid "Error while executing \"%s\" (%s)."
+msgstr ""
+
+#: ../lib/aspell.c:158
+msgid "Please set the aspell command in the preferences dialog."
+msgstr ""
+
+#: ../lib/aspell.c:164 ../lib/common.c:200
+msgid "Invalid input."
+msgstr "Ã‰rvÃ©nytelen bemenet"
+
+#: ../lib/aspell.c:202
+#, c-format
+msgid "Process failed (%s)"
+msgstr ""
+
+#: ../lib/common.c:171
+msgid "Browser could not be opened. Please check your preferences."
+msgstr "A bÃ¶ngÃ©szÅ‘ nem nyithatÃ³ meg. EllenÅ‘rizd a beÃ¡llÃtÃ¡sokat"
+
+#: ../lib/common.c:210
+msgid "Invalid non-UTF8 input."
+msgstr "Ã‰rvÃ©nytelen nem-UTF8 bemenet"
+
+#: ../lib/dictd.c:112 ../lib/dictd.c:375
 msgid "Could not connect to server."
 msgstr "Sikertelen kapcsolÃ³dÃ¡s a kiszolgÃ¡lÃ³hoz"
 
-#: ../panel-plugin/dict.c:365 ../panel-plugin/dict.c:390
-#: ../panel-plugin/dict.c:844
+#: ../lib/dictd.c:119 ../lib/dictd.c:157 ../lib/dictd.c:397
 msgid "Unknown error while quering the server."
 msgstr "Ismeretlen hiba a kiszolgÃ¡lÃ³ lekÃ©rdezÃ©sekor"
 
-#: ../panel-plugin/dict.c:373
+#: ../lib/dictd.c:127
 msgid "Server not ready."
 msgstr "A kiszolgÃ¡lÃ³ nem Ã©rhetÅ‘ el"
 
-#: ../panel-plugin/dict.c:384
+#: ../lib/dictd.c:140
 #, c-format
 msgid "No matches could be found for \"%s\"."
 msgstr "Nincs talÃ¡lat \"%s\" kifejezÃ©sre"
 
-#: ../panel-plugin/dict.c:395
-#, c-format
-msgid "%d definition(s) found."
-msgstr "%d talÃ¡lat"
+#: ../lib/dictd.c:162
+#, fuzzy, c-format
+msgid "%d definition found."
+msgid_plural "%d definitions found."
+msgstr[0] "%d talÃ¡lat"
+msgstr[1] "%d talÃ¡lat"
 
-#: ../panel-plugin/dict.c:512
-#, c-format
-msgid "Querying the server %s..."
+#: ../lib/dictd.c:352
+#, fuzzy, c-format
+msgid "Querying %s..."
 msgstr "%s kiszolgÃ¡lÃ³ lekÃ©rdezÃ©se..."
 
-#: ../panel-plugin/dict.c:565
-msgid "Invalid input."
-msgstr "Ã‰rvÃ©nytelen bemenet"
+#: ../lib/dictd.c:392
+msgid "The server doesn't offer any databases."
+msgstr "A kiszolgÃ¡lÃ³ nem Ã©r el adatbÃ¡zist"
 
-#: ../panel-plugin/dict.c:575
-msgid "Invalid non-UTF8 input."
-msgstr "Ã‰rvÃ©nytelen nem-UTF8 bemenet"
+#: ../lib/gui.c:146
+msgid "_File"
+msgstr ""
 
-#: ../panel-plugin/dict.c:637
-msgid "Browser could not be opened. Please check your preferences."
-msgstr "A bÃ¶ngÃ©szÅ‘ nem nyithatÃ³ meg. EllenÅ‘rizd a beÃ¡llÃtÃ¡sokat"
+#: ../lib/gui.c:162
+msgid "_Help"
+msgstr ""
 
-#: ../panel-plugin/dict.c:839
-msgid "The server doesn't offer any databases."
-msgstr "A kiszolgÃ¡lÃ³ nem Ã©r el adatbÃ¡zist"
+#: ../lib/gui.c:212
+msgid "Text to search:"
+msgstr "KeresendÅ‘ szÃ¶veg:"
+
+#: ../lib/gui.c:258
+msgid "Search with:"
+msgstr "KeresÃ©s ezzel:"
+
+#: ../lib/gui.c:262 ../lib/prefs.c:247 ../lib/prefs.c:341
+msgid "Dict"
+msgstr "Dict"
 
-#: ../panel-plugin/dict.c:894
+#: ../lib/gui.c:268 ../lib/prefs.c:256 ../lib/prefs.c:448
+msgid "Web"
+msgstr "Web"
+
+#: ../lib/gui.c:274 ../lib/prefs.c:265
+msgid "Spellcheck"
+msgstr "HelyesÃrÃ¡s"
+
+#: ../lib/gui.c:343
+msgid "Developer"
+msgstr "FejlesztÅ‘"
+
+#: ../lib/prefs.c:107
 msgid "You have chosen an invalid dictionary entry."
 msgstr "Ã‰rvÃ©nytelen szÃ³tÃ¡r bejegyzÃ©st vÃ¡lasztottÃ¡l"
 
-#: ../panel-plugin/dict.c:1009
-msgid "Properties"
-msgstr "TulajdonsÃ¡gok"
+#: ../lib/prefs.c:172
+msgid "dict.leo.org - German <-> English"
+msgstr "dict.leo.org - NÃ©met <-> Angol"
 
-#: ../panel-plugin/dict.c:1025
-msgid "Dictionary plugin"
-msgstr "SzÃ³tÃ¡r beillesztÃ©s"
+#: ../lib/prefs.c:173
+msgid "dict.leo.org - German <-> French"
+msgstr "dict.leo.org - NÃ©met <-> Francia"
+
+#: ../lib/prefs.c:174
+msgid "dict.leo.org - German <-> Spanish"
+msgstr "dict.leo.org - NÃ©met <-> Spanyol"
+
+#: ../lib/prefs.c:175
+#, fuzzy
+msgid "dict.leo.org - German <-> Italian"
+msgstr "dict.leo.org - NÃ©met <-> Angol"
+
+#: ../lib/prefs.c:176
+#, fuzzy
+msgid "dict.leo.org - German <-> Chinese"
+msgstr "dict.leo.org - NÃ©met <-> Angol"
+
+#: ../lib/prefs.c:177
+#, fuzzy
+msgid "dist.cc - Dictionary"
+msgstr "SzÃ³tÃ¡r:"
+
+#: ../lib/prefs.c:178
+#, fuzzy
+msgid "Dictionary.com"
+msgstr "SzÃ³tÃ¡r:"
+
+#: ../lib/prefs.c:179
+#, fuzzy
+msgid "TheFreeDictionary.com"
+msgstr "SzÃ³tÃ¡r:"
+
+#: ../lib/prefs.c:180
+msgid "Clear"
+msgstr ""
+
+#: ../lib/prefs.c:239
+msgid "General"
+msgstr ""
+
+#: ../lib/prefs.c:241
+msgid "<b>Default search method:</b>"
+msgstr ""
+
+#: ../lib/prefs.c:274
+msgid "Last used method"
+msgstr ""
+
+#: ../lib/prefs.c:288
+msgid "<b>Panel text field:</b>"
+msgstr ""
+
+#: ../lib/prefs.c:294
+msgid "Show text field in the panel"
+msgstr "SzÃ¶veg mezÅ‘ a panelon"
+
+#. panel entry size
+#: ../lib/prefs.c:301
+msgid "Text field size:"
+msgstr "SzÃ¶veg mezÅ‘ mÃ©rete:"
 
 #. server address
-#: ../panel-plugin/dict.c:1042
+#: ../lib/prefs.c:344
 msgid "Server:"
 msgstr "KiszolgÃ¡lÃ³:"
 
 #. server port
-#: ../panel-plugin/dict.c:1054
+#: ../lib/prefs.c:356
 msgid "Server Port:"
 msgstr "KiszolgÃ¡lÃ³ port:"
 
 #. dictionary
-#: ../panel-plugin/dict.c:1062 ../panel-plugin/dict.c:1222
+#: ../lib/prefs.c:364 ../lib/prefs.c:508
 msgid "Dictionary:"
 msgstr "SzÃ³tÃ¡r:"
 
-#: ../panel-plugin/dict.c:1066
+#: ../lib/prefs.c:368
 msgid "* (use all)"
 msgstr "* (mindet hasznÃ¡lja)"
 
-#: ../panel-plugin/dict.c:1068
+#: ../lib/prefs.c:370
 msgid "! (use all, stop after first match)"
 msgstr "! (mindet hasznÃ¡lja, az elsÅ‘nÃ©l megÃ¡ll)"
 
-#: ../panel-plugin/dict.c:1128
-msgid "Use a DICT server"
-msgstr "DICT kiszolgÃ¡lÃ³ hasznÃ¡lata"
-
-#: ../panel-plugin/dict.c:1147
-msgid "dict.leo.org - German <-> English"
-msgstr "dict.leo.org - NÃ©met <-> Angol"
-
-#: ../panel-plugin/dict.c:1155
-msgid "dict.leo.org - German <-> French"
-msgstr "dict.leo.org - NÃ©met <-> Francia"
-
-#: ../panel-plugin/dict.c:1163
-msgid "dict.leo.org - German <-> Spanish"
-msgstr "dict.leo.org - NÃ©met <-> Spanyol"
-
-#: ../panel-plugin/dict.c:1170
-msgid "Use another website"
-msgstr "MÃ¡s kiszolgÃ¡lÃ³"
+#: ../lib/prefs.c:450
+msgid "<b>Web search URL:</b>"
+msgstr ""
 
-#: ../panel-plugin/dict.c:1178
+#: ../lib/prefs.c:456
 msgid "URL:"
 msgstr "URL:"
 
-#: ../panel-plugin/dict.c:1191
+#: ../lib/prefs.c:476
+#, fuzzy
 msgid ""
-"Enter an URL to a web site which offer translation services.\n"
+"Enter an URL to a web site which offer translation or dictionary services.\n"
 "Use {word} as placeholder for the searched word."
 msgstr ""
 "Adj meg egy fordÃtÃ¡s-szolgÃ¡ltatÃ¡st nyÃºjtÃ³ web-lap URL-t.\n"
 "HasznÃ¡ld a {szÃ³}-t a keresett szÃ³hoz."
 
-#: ../panel-plugin/dict.c:1197
-msgid "Use a web site"
-msgstr "Egy weblap hasznÃ¡lata"
+#: ../lib/prefs.c:495
+#, fuzzy
+msgid "Aspell"
+msgstr "Aspell hasznÃ¡lata"
 
-#: ../panel-plugin/dict.c:1211
+#: ../lib/prefs.c:497
 msgid "Aspell program:"
 msgstr "Aspell program:"
 
-#: ../panel-plugin/dict.c:1252
-msgid "Use Aspell"
-msgstr "Aspell hasznÃ¡lata"
-
-#: ../panel-plugin/dict.c:1266
-msgid "Show text field in the panel"
-msgstr "SzÃ¶veg mezÅ‘ a panelon"
-
-#: ../panel-plugin/dict.c:1269
-msgid ""
-"This option can only be used when the panel has a horizontal orientation."
-msgstr "A lehetÅ‘sÃ©g csak a panel vÃzszintes fekvÃ©sÃ©nÃ©l hasznÃ¡lhatÃ³."
-
-#. panel entry size
-#: ../panel-plugin/dict.c:1275
-msgid "Text field size:"
-msgstr "SzÃ¶veg mezÅ‘ mÃ©rete:"
-
-#: ../panel-plugin/dict.c:1335 ../panel-plugin/dict.c:1663
-msgid "Ready."
-msgstr "KÃ©sz."
-
-#: ../panel-plugin/dict.c:1408
-msgid "Text to search:"
-msgstr "KeresendÅ‘ szÃ¶veg:"
-
-#: ../panel-plugin/dict.c:1455
-msgid "Search with:"
-msgstr "KeresÃ©s ezzel:"
-
-#: ../panel-plugin/dict.c:1459 ../panel-plugin/dict.desktop.in.in.h:2
-msgid "Dict"
-msgstr "Dict"
+#~ msgid "Properties"
+#~ msgstr "TulajdonsÃ¡gok"
 
-#: ../panel-plugin/dict.c:1465
-msgid "Web"
-msgstr "Web"
-
-#: ../panel-plugin/dict.c:1471
-msgid "Spellcheck"
-msgstr "HelyesÃrÃ¡s"
-
-#: ../panel-plugin/dict.c:1513 ../panel-plugin/dict.desktop.in.in.h:1
-msgid "A plugin to query a Dict server."
-msgstr "Dict kiszolgÃ¡lÃ³ beillesztÃ©s"
+#~ msgid "Use a DICT server"
+#~ msgstr "DICT kiszolgÃ¡lÃ³ hasznÃ¡lata"
 
-#: ../panel-plugin/dict.c:1517
-msgid "Developer"
-msgstr "FejlesztÅ‘"
+#~ msgid "Use another website"
+#~ msgstr "MÃ¡s kiszolgÃ¡lÃ³"
 
-#: ../panel-plugin/dict.c:1615
-msgid "Look up a word"
-msgstr "Egy szÃ³ keresÃ©se"
+#~ msgid "Use a web site"
+#~ msgstr "Egy weblap hasznÃ¡lata"
 
-#: ../panel-plugin/xfce4-popup-dict.c:97
-#, c-format
-msgid "Usage: %s [options]\n"
-msgstr "HasznÃ¡lat: %s [opciÃ³k]\n"
+#~ msgid ""
+#~ "This option can only be used when the panel has a horizontal orientation."
+#~ msgstr "A lehetÅ‘sÃ©g csak a panel vÃzszintes fekvÃ©sÃ©nÃ©l hasznÃ¡lhatÃ³."
 
-#: ../panel-plugin/xfce4-popup-dict.c:98
-#, c-format
-msgid "Options:\n"
-msgstr "OpciÃ³k:\n"
+#~ msgid "Usage: %s [options]\n"
+#~ msgstr "HasznÃ¡lat: %s [opciÃ³k]\n"
 
-#: ../panel-plugin/xfce4-popup-dict.c:99
-#, c-format
-msgid "    -t, --text-field    grap the focus on the text field in the panel\n"
-msgstr "    -t, --text-field    a szÃ¶vegmezÅ‘re viszi a fÃ³kuszt a panelban\n"
+#~ msgid "Options:\n"
+#~ msgstr "OpciÃ³k:\n"
 
-#: ../panel-plugin/xfce4-popup-dict.c:100
-#, c-format
-msgid "    -h, --help          show this help and exit\n"
-msgstr "    -h, --help          kiÃrja e sÃºgÃ³t Ã©s kilÃ©p\n"
+#~ msgid "    -h, --help          show this help and exit\n"
+#~ msgstr "    -h, --help          kiÃrja e sÃºgÃ³t Ã©s kilÃ©p\n"
 
-#: ../panel-plugin/xfce4-popup-dict.c:101
-#, c-format
-msgid ""
-"If called without any options, the xfce4-dict-plugin main window is shown.\n"
-msgstr "OpciÃ³k nÃ©lkÃ¼l ay xfce4-dict-plugin fÅ‘ ablak jelenik meg.\n"
+#~ msgid ""
+#~ "If called without any options, the xfce4-dict-plugin main window is "
+#~ "shown.\n"
+#~ msgstr "OpciÃ³k nÃ©lkÃ¼l ay xfce4-dict-plugin fÅ‘ ablak jelenik meg.\n"
 
 #~ msgid "Input is too long."
 #~ msgstr "TÃºl hosszÃº bevitel"
diff --git a/po/lv.po b/po/lv.po
index 8710063..7e9387c 100644
--- a/po/lv.po
+++ b/po/lv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-dict-plugin 0.3.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-08 17:08+0100\n"
+"POT-Creation-Date: 2008-04-22 13:11+0200\n"
 "PO-Revision-Date: 2007-11-16 22:02+0300\n"
 "Last-Translator: Rihards PriedÄ«tis <rprieditis@inbox.lv>\n"
 "Language-Team: Latvian <rprieditis@inbox.lv>\n"
@@ -15,205 +15,327 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../panel-plugin/dict.c:358 ../panel-plugin/dict.c:822
-msgid "Could not connect to server."
-msgstr "NevarÄ“ju savienoties ar serveri"
+#: ../panel-plugin/xfce4-dict-plugin.desktop.in.in.h:1
+#, fuzzy
+msgid "A plugin to query different dictionaries."
+msgstr "Spraudnis Dict serveru vaicÄÅ¡anai."
 
-#: ../panel-plugin/dict.c:365 ../panel-plugin/dict.c:390
-#: ../panel-plugin/dict.c:844
-msgid "Unknown error while quering the server."
-msgstr "NezinÄma kÄ¼Å«da vaicÄjot serveri."
+#: ../panel-plugin/xfce4-dict-plugin.desktop.in.in.h:2
+#, fuzzy
+msgid "Dictionary"
+msgstr "VÄrdnÄ«ca :"
 
-#: ../panel-plugin/dict.c:373
-msgid "Server not ready."
-msgstr "Serveris nav gatavs."
+#: ../panel-plugin/xfce4-dict-plugin.c:370
+msgid "Look up a word"
+msgstr "MeklÄ“t vÄrdu"
+
+#: ../panel-plugin/xfce4-dict-plugin.c:429 ../src/xfce4-dict.c:206
+#: ../lib/aspell.c:198 ../lib/dictd.c:138 ../lib/gui.c:96
+msgid "Ready."
+msgstr "Gatavs."
+
+#. Note for translators: run xfce4-dict --help and copy the help text for "--help" into this one
+#: ../src/xfce4-dict.c:54
+msgid "Show help options"
+msgstr ""
+
+#: ../src/xfce4-dict.c:56
+msgid "Search the given text using a Dict server(RFC 2229)"
+msgstr ""
+
+#: ../src/xfce4-dict.c:57
+msgid "Search the given text using a web-based search engine"
+msgstr ""
+
+#: ../src/xfce4-dict.c:58
+msgid "Check the given text with a spellchecker"
+msgstr ""
+
+#: ../src/xfce4-dict.c:59
+#, fuzzy
+msgid "Grab the focus on the text field in the panel"
+msgstr "RÄdit teksta lauku panelÄ«."
+
+#: ../src/xfce4-dict.c:60
+msgid "Start stand-alone application even if the panel plugin is loaded"
+msgstr ""
+
+#: ../src/xfce4-dict.c:61
+msgid "Show version information"
+msgstr ""
 
-#: ../panel-plugin/dict.c:384
+#: ../src/xfce4-dict.c:134
+msgid "[TEXT]"
+msgstr ""
+
+#: ../src/xfce4-dict.c:158
 #, c-format
-msgid "No matches could be found for \"%s\"."
-msgstr "Nekas netika atrasts uz \"%s\""
+msgid "(built on %s with GTK %d.%d.%d, GLib %d.%d.%d)"
+msgstr ""
+
+#: ../src/xfce4-dict.desktop.in.h:1 ../lib/gui.c:339
+msgid "A client program to query different dictionaries."
+msgstr ""
+
+#: ../src/xfce4-dict.desktop.in.h:2
+#, fuzzy
+msgid "Dictionary Client"
+msgstr "VÄrdnÄ«cu spraudnis"
+
+#: ../src/xfce4-dict.desktop.in.h:3 ../lib/gui.c:189 ../lib/prefs.c:212
+#, fuzzy
+msgid "Xfce4 Dictionary"
+msgstr "VÄrdnÄ«ca :"
+
+#: ../lib/aspell.c:75
+#, fuzzy, c-format
+msgid "%d suggestion found."
+msgid_plural "%d suggestions found."
+msgstr[0] "%d definÄ«cija(as) atrasta(as)."
+msgstr[1] "%d definÄ«cija(as) atrasta(as)."
 
-#: ../panel-plugin/dict.c:395
+#: ../lib/aspell.c:79
 #, c-format
-msgid "%d definition(s) found."
-msgstr "%d definÄ«cija(as) atrasta(as)."
+msgid "Suggestions for \"%s\":"
+msgstr ""
 
-#: ../panel-plugin/dict.c:512
+#: ../lib/aspell.c:90
 #, c-format
-msgid "Querying the server %s..."
-msgstr "VaicÄju serverim %s..."
+msgid "\"%s\" is spelled correctly."
+msgstr ""
 
-#: ../panel-plugin/dict.c:565
+#: ../lib/aspell.c:96
+#, fuzzy, c-format
+msgid "No suggestions could be found for \"%s\"."
+msgstr "Nekas netika atrasts uz \"%s\""
+
+#. translation hint:
+#. * Error while executing <spell command, e.g. "aspell"> (<error message>)
+#: ../lib/aspell.c:122
+#, c-format
+msgid "Error while executing \"%s\" (%s)."
+msgstr ""
+
+#: ../lib/aspell.c:158
+msgid "Please set the aspell command in the preferences dialog."
+msgstr ""
+
+#: ../lib/aspell.c:164 ../lib/common.c:200
 msgid "Invalid input."
 msgstr "NederÄ«gs ievads"
 
-#: ../panel-plugin/dict.c:575
-msgid "Invalid non-UTF8 input."
-msgstr "NederÄ«gs ne-UTF8 ievads."
+#: ../lib/aspell.c:202
+#, c-format
+msgid "Process failed (%s)"
+msgstr ""
 
-#: ../panel-plugin/dict.c:637
+#: ../lib/common.c:171
 msgid "Browser could not be opened. Please check your preferences."
 msgstr "PÄrlÅ«ks nav atverams. LÅ«dzu pÄrbaudiet uzstÄdÄ«jumus."
 
-#: ../panel-plugin/dict.c:839
+#: ../lib/common.c:210
+msgid "Invalid non-UTF8 input."
+msgstr "NederÄ«gs ne-UTF8 ievads."
+
+#: ../lib/dictd.c:112 ../lib/dictd.c:375
+msgid "Could not connect to server."
+msgstr "NevarÄ“ju savienoties ar serveri"
+
+#: ../lib/dictd.c:119 ../lib/dictd.c:157 ../lib/dictd.c:397
+msgid "Unknown error while quering the server."
+msgstr "NezinÄma kÄ¼Å«da vaicÄjot serveri."
+
+#: ../lib/dictd.c:127
+msgid "Server not ready."
+msgstr "Serveris nav gatavs."
+
+#: ../lib/dictd.c:140
+#, c-format
+msgid "No matches could be found for \"%s\"."
+msgstr "Nekas netika atrasts uz \"%s\""
+
+#: ../lib/dictd.c:162
+#, fuzzy, c-format
+msgid "%d definition found."
+msgid_plural "%d definitions found."
+msgstr[0] "%d definÄ«cija(as) atrasta(as)."
+msgstr[1] "%d definÄ«cija(as) atrasta(as)."
+
+#: ../lib/dictd.c:352
+#, fuzzy, c-format
+msgid "Querying %s..."
+msgstr "VaicÄju serverim %s..."
+
+#: ../lib/dictd.c:392
 msgid "The server doesn't offer any databases."
 msgstr "Serveris nepiedÄvÄ nevienu datubÄzi."
 
-#: ../panel-plugin/dict.c:894
-msgid "You have chosen an invalid dictionary entry."
-msgstr "JÅ«s esat izvÄ“lÄ“jies nederÄ«gu vÄrdnÄ«cas ierakstu."
+#: ../lib/gui.c:146
+msgid "_File"
+msgstr ""
 
-#: ../panel-plugin/dict.c:1009
-msgid "Properties"
-msgstr "RekvizÄ«ti"
+#: ../lib/gui.c:162
+msgid "_Help"
+msgstr ""
 
-#: ../panel-plugin/dict.c:1025
-msgid "Dictionary plugin"
-msgstr "VÄrdnÄ«cu spraudnis"
+#: ../lib/gui.c:212
+msgid "Text to search:"
+msgstr "MeklÄ“jamais teksts:"
 
-#. server address
-#: ../panel-plugin/dict.c:1042
-#, fuzzy
-msgid "Server:"
-msgstr "Serveris :"
+#: ../lib/gui.c:258
+msgid "Search with:"
+msgstr ""
 
-#. server port
-#: ../panel-plugin/dict.c:1054
-#, fuzzy
-msgid "Server Port:"
-msgstr "Servera Ports :"
+#: ../lib/gui.c:262 ../lib/prefs.c:247 ../lib/prefs.c:341
+msgid "Dict"
+msgstr "VÄrdnÄ«ca"
 
-#. dictionary
-#: ../panel-plugin/dict.c:1062 ../panel-plugin/dict.c:1222
-#, fuzzy
-msgid "Dictionary:"
-msgstr "VÄrdnÄ«ca :"
+#: ../lib/gui.c:268 ../lib/prefs.c:256 ../lib/prefs.c:448
+msgid "Web"
+msgstr ""
 
-#: ../panel-plugin/dict.c:1066
-msgid "* (use all)"
-msgstr "* (izmanto visu)"
+#: ../lib/gui.c:274 ../lib/prefs.c:265
+msgid "Spellcheck"
+msgstr ""
 
-#: ../panel-plugin/dict.c:1068
-msgid "! (use all, stop after first match)"
-msgstr "! (izmantot visu, apstÄties pie pirmÄ rezultÄta)"
+#: ../lib/gui.c:343
+msgid "Developer"
+msgstr "IzstrÄdÄja"
 
-#: ../panel-plugin/dict.c:1128
-msgid "Use a DICT server"
-msgstr "Izmantot DICT serveri"
+#: ../lib/prefs.c:107
+msgid "You have chosen an invalid dictionary entry."
+msgstr "JÅ«s esat izvÄ“lÄ“jies nederÄ«gu vÄrdnÄ«cas ierakstu."
 
-#: ../panel-plugin/dict.c:1147
+#: ../lib/prefs.c:172
 msgid "dict.leo.org - German <-> English"
 msgstr "dict.leo.org - VÄcu <-> AngÄ¼u"
 
-#: ../panel-plugin/dict.c:1155
+#: ../lib/prefs.c:173
 msgid "dict.leo.org - German <-> French"
 msgstr "dict.leo.org - VÄcu <-> FranÄu"
 
-#: ../panel-plugin/dict.c:1163
+#: ../lib/prefs.c:174
 msgid "dict.leo.org - German <-> Spanish"
 msgstr "dict.leo.org - VÄcu <-> SpÄÅ†u"
 
-#: ../panel-plugin/dict.c:1170
-msgid "Use another website"
-msgstr "Izmantot citu mÄjas lapu"
+#: ../lib/prefs.c:175
+#, fuzzy
+msgid "dict.leo.org - German <-> Italian"
+msgstr "dict.leo.org - VÄcu <-> AngÄ¼u"
 
-#: ../panel-plugin/dict.c:1178
-msgid "URL:"
-msgstr "URL:"
+#: ../lib/prefs.c:176
+#, fuzzy
+msgid "dict.leo.org - German <-> Chinese"
+msgstr "dict.leo.org - VÄcu <-> AngÄ¼u"
 
-#: ../panel-plugin/dict.c:1191
-msgid ""
-"Enter an URL to a web site which offer translation services.\n"
-"Use {word} as placeholder for the searched word."
+#: ../lib/prefs.c:177
+#, fuzzy
+msgid "dist.cc - Dictionary"
+msgstr "VÄrdnÄ«ca :"
+
+#: ../lib/prefs.c:178
+#, fuzzy
+msgid "Dictionary.com"
+msgstr "VÄrdnÄ«ca :"
+
+#: ../lib/prefs.c:179
+#, fuzzy
+msgid "TheFreeDictionary.com"
+msgstr "VÄrdnÄ«ca :"
+
+#: ../lib/prefs.c:180
+msgid "Clear"
 msgstr ""
-"Ievadiet URL uz mÄjas lapu, kura piedÄvÄ tÅ«lkoÅ¡anas pakalpojumus\n"
-"Izmantojiet {word}, kÄ aizvietotÄju meklÄ“jamajam vÄrdam."
 
-#: ../panel-plugin/dict.c:1197
-msgid "Use a web site"
-msgstr "Izmantot mÄjas lapu"
+#: ../lib/prefs.c:239
+msgid "General"
+msgstr ""
 
-#: ../panel-plugin/dict.c:1211
-msgid "Aspell program:"
+#: ../lib/prefs.c:241
+msgid "<b>Default search method:</b>"
+msgstr ""
+
+#: ../lib/prefs.c:274
+msgid "Last used method"
 msgstr ""
 
-#: ../panel-plugin/dict.c:1252
-msgid "Use Aspell"
+#: ../lib/prefs.c:288
+msgid "<b>Panel text field:</b>"
 msgstr ""
 
-#: ../panel-plugin/dict.c:1266
+#: ../lib/prefs.c:294
 msgid "Show text field in the panel"
 msgstr "RÄdit teksta lauku panelÄ«."
 
-#: ../panel-plugin/dict.c:1269
-msgid ""
-"This option can only be used when the panel has a horizontal orientation."
-msgstr "Å o opciju var izmantot tikai ar horezontÄlu paneÄ¼a orentÄciju."
-
 #. panel entry size
-#: ../panel-plugin/dict.c:1275
+#: ../lib/prefs.c:301
 #, fuzzy
 msgid "Text field size:"
 msgstr "Teksta lauka izmÄ“rs :"
 
-#: ../panel-plugin/dict.c:1335 ../panel-plugin/dict.c:1663
-msgid "Ready."
-msgstr "Gatavs."
+#. server address
+#: ../lib/prefs.c:344
+#, fuzzy
+msgid "Server:"
+msgstr "Serveris :"
 
-#: ../panel-plugin/dict.c:1408
-msgid "Text to search:"
-msgstr "MeklÄ“jamais teksts:"
+#. server port
+#: ../lib/prefs.c:356
+#, fuzzy
+msgid "Server Port:"
+msgstr "Servera Ports :"
 
-#: ../panel-plugin/dict.c:1455
-msgid "Search with:"
-msgstr ""
+#. dictionary
+#: ../lib/prefs.c:364 ../lib/prefs.c:508
+#, fuzzy
+msgid "Dictionary:"
+msgstr "VÄrdnÄ«ca :"
 
-#: ../panel-plugin/dict.c:1459 ../panel-plugin/dict.desktop.in.in.h:2
-msgid "Dict"
-msgstr "VÄrdnÄ«ca"
+#: ../lib/prefs.c:368
+msgid "* (use all)"
+msgstr "* (izmanto visu)"
 
-#: ../panel-plugin/dict.c:1465
-msgid "Web"
-msgstr ""
+#: ../lib/prefs.c:370
+msgid "! (use all, stop after first match)"
+msgstr "! (izmantot visu, apstÄties pie pirmÄ rezultÄta)"
 
-#: ../panel-plugin/dict.c:1471
-msgid "Spellcheck"
+#: ../lib/prefs.c:450
+msgid "<b>Web search URL:</b>"
 msgstr ""
 
-#: ../panel-plugin/dict.c:1513 ../panel-plugin/dict.desktop.in.in.h:1
-msgid "A plugin to query a Dict server."
-msgstr "Spraudnis Dict serveru vaicÄÅ¡anai."
-
-#: ../panel-plugin/dict.c:1517
-msgid "Developer"
-msgstr "IzstrÄdÄja"
-
-#: ../panel-plugin/dict.c:1615
-msgid "Look up a word"
-msgstr "MeklÄ“t vÄrdu"
+#: ../lib/prefs.c:456
+msgid "URL:"
+msgstr "URL:"
 
-#: ../panel-plugin/xfce4-popup-dict.c:97
-#, c-format
-msgid "Usage: %s [options]\n"
+#: ../lib/prefs.c:476
+#, fuzzy
+msgid ""
+"Enter an URL to a web site which offer translation or dictionary services.\n"
+"Use {word} as placeholder for the searched word."
 msgstr ""
+"Ievadiet URL uz mÄjas lapu, kura piedÄvÄ tÅ«lkoÅ¡anas pakalpojumus\n"
+"Izmantojiet {word}, kÄ aizvietotÄju meklÄ“jamajam vÄrdam."
 
-#: ../panel-plugin/xfce4-popup-dict.c:98
-#, c-format
-msgid "Options:\n"
+#: ../lib/prefs.c:495
+msgid "Aspell"
 msgstr ""
 
-#: ../panel-plugin/xfce4-popup-dict.c:99
-#, c-format
-msgid "    -t, --text-field    grap the focus on the text field in the panel\n"
+#: ../lib/prefs.c:497
+msgid "Aspell program:"
 msgstr ""
 
-#: ../panel-plugin/xfce4-popup-dict.c:100
-#, c-format
-msgid "    -h, --help          show this help and exit\n"
-msgstr ""
+#~ msgid "Properties"
+#~ msgstr "RekvizÄ«ti"
 
-#: ../panel-plugin/xfce4-popup-dict.c:101
-#, c-format
-msgid ""
-"If called without any options, the xfce4-dict-plugin main window is shown.\n"
-msgstr ""
+#~ msgid "Use a DICT server"
+#~ msgstr "Izmantot DICT serveri"
+
+#~ msgid "Use another website"
+#~ msgstr "Izmantot citu mÄjas lapu"
+
+#~ msgid "Use a web site"
+#~ msgstr "Izmantot mÄjas lapu"
+
+#~ msgid ""
+#~ "This option can only be used when the panel has a horizontal orientation."
+#~ msgstr "Å o opciju var izmantot tikai ar horezontÄlu paneÄ¼a orentÄciju."
diff --git a/po/pl.po b/po/pl.po
index 9faa789..70da1d7 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-dict-plugin 0.3.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-08 17:08+0100\n"
+"POT-Creation-Date: 2008-04-22 13:11+0200\n"
 "PO-Revision-Date: 2007-03-02 14:12+0200\n"
 "Last-Translator: Piotr MaliÅ„ski <riklaunim@gmail.com>\n"
 "Language-Team: Polish <xfce-i18n@xfce.org>\n"
@@ -15,205 +15,327 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../panel-plugin/dict.c:358 ../panel-plugin/dict.c:822
-msgid "Could not connect to server."
-msgstr "Nie moÅ¼na poÅ‚Ä…czyÄ‡ siÄ™ z serwerem."
+#: ../panel-plugin/xfce4-dict-plugin.desktop.in.in.h:1
+#, fuzzy
+msgid "A plugin to query different dictionaries."
+msgstr "Wtyczka do odpytywania serwera Dict."
 
-#: ../panel-plugin/dict.c:365 ../panel-plugin/dict.c:390
-#: ../panel-plugin/dict.c:844
-msgid "Unknown error while quering the server."
-msgstr "Nieznany bÅ‚Ä…d odpytywania serwera.."
+#: ../panel-plugin/xfce4-dict-plugin.desktop.in.in.h:2
+#, fuzzy
+msgid "Dictionary"
+msgstr "SÅ‚ownik :"
 
-#: ../panel-plugin/dict.c:373
-msgid "Server not ready."
-msgstr "Serwer nie jest gotowy."
+#: ../panel-plugin/xfce4-dict-plugin.c:370
+msgid "Look up a word"
+msgstr "Wyszukaj sÅ‚owa"
+
+#: ../panel-plugin/xfce4-dict-plugin.c:429 ../src/xfce4-dict.c:206
+#: ../lib/aspell.c:198 ../lib/dictd.c:138 ../lib/gui.c:96
+msgid "Ready."
+msgstr "Gotowy."
+
+#. Note for translators: run xfce4-dict --help and copy the help text for "--help" into this one
+#: ../src/xfce4-dict.c:54
+msgid "Show help options"
+msgstr ""
+
+#: ../src/xfce4-dict.c:56
+msgid "Search the given text using a Dict server(RFC 2229)"
+msgstr ""
+
+#: ../src/xfce4-dict.c:57
+msgid "Search the given text using a web-based search engine"
+msgstr ""
+
+#: ../src/xfce4-dict.c:58
+msgid "Check the given text with a spellchecker"
+msgstr ""
+
+#: ../src/xfce4-dict.c:59
+#, fuzzy
+msgid "Grab the focus on the text field in the panel"
+msgstr "PokaÅ¼ pole tekstowe w panelu"
+
+#: ../src/xfce4-dict.c:60
+msgid "Start stand-alone application even if the panel plugin is loaded"
+msgstr ""
+
+#: ../src/xfce4-dict.c:61
+msgid "Show version information"
+msgstr ""
 
-#: ../panel-plugin/dict.c:384
+#: ../src/xfce4-dict.c:134
+msgid "[TEXT]"
+msgstr ""
+
+#: ../src/xfce4-dict.c:158
 #, c-format
-msgid "No matches could be found for \"%s\"."
-msgstr "Brak trafieÅ„ dla \"%s\"."
+msgid "(built on %s with GTK %d.%d.%d, GLib %d.%d.%d)"
+msgstr ""
+
+#: ../src/xfce4-dict.desktop.in.h:1 ../lib/gui.c:339
+msgid "A client program to query different dictionaries."
+msgstr ""
+
+#: ../src/xfce4-dict.desktop.in.h:2
+#, fuzzy
+msgid "Dictionary Client"
+msgstr "Wtyczka sÅ‚ownika"
+
+#: ../src/xfce4-dict.desktop.in.h:3 ../lib/gui.c:189 ../lib/prefs.c:212
+#, fuzzy
+msgid "Xfce4 Dictionary"
+msgstr "SÅ‚ownik :"
+
+#: ../lib/aspell.c:75
+#, fuzzy, c-format
+msgid "%d suggestion found."
+msgid_plural "%d suggestions found."
+msgstr[0] "%d definicji znaleziono."
+msgstr[1] "%d definicji znaleziono."
 
-#: ../panel-plugin/dict.c:395
+#: ../lib/aspell.c:79
 #, c-format
-msgid "%d definition(s) found."
-msgstr "%d definicji znaleziono."
+msgid "Suggestions for \"%s\":"
+msgstr ""
 
-#: ../panel-plugin/dict.c:512
+#: ../lib/aspell.c:90
 #, c-format
-msgid "Querying the server %s..."
-msgstr "OdpytujÄ™ serwer %s..."
+msgid "\"%s\" is spelled correctly."
+msgstr ""
 
-#: ../panel-plugin/dict.c:565
+#: ../lib/aspell.c:96
+#, fuzzy, c-format
+msgid "No suggestions could be found for \"%s\"."
+msgstr "Brak trafieÅ„ dla \"%s\"."
+
+#. translation hint:
+#. * Error while executing <spell command, e.g. "aspell"> (<error message>)
+#: ../lib/aspell.c:122
+#, c-format
+msgid "Error while executing \"%s\" (%s)."
+msgstr ""
+
+#: ../lib/aspell.c:158
+msgid "Please set the aspell command in the preferences dialog."
+msgstr ""
+
+#: ../lib/aspell.c:164 ../lib/common.c:200
 msgid "Invalid input."
 msgstr "BÅ‚Ä™dne dane."
 
-#: ../panel-plugin/dict.c:575
-msgid "Invalid non-UTF8 input."
-msgstr "BÅ‚edne danej wejÅ›ciowe o nie-UTF8 kodowaniu."
+#: ../lib/aspell.c:202
+#, c-format
+msgid "Process failed (%s)"
+msgstr ""
 
-#: ../panel-plugin/dict.c:637
+#: ../lib/common.c:171
 msgid "Browser could not be opened. Please check your preferences."
 msgstr "Nie moÅ¼na otworzyÄ‡ przeglÄ…darki, sprawdÅº swoje ustawienia."
 
-#: ../panel-plugin/dict.c:839
+#: ../lib/common.c:210
+msgid "Invalid non-UTF8 input."
+msgstr "BÅ‚edne danej wejÅ›ciowe o nie-UTF8 kodowaniu."
+
+#: ../lib/dictd.c:112 ../lib/dictd.c:375
+msgid "Could not connect to server."
+msgstr "Nie moÅ¼na poÅ‚Ä…czyÄ‡ siÄ™ z serwerem."
+
+#: ../lib/dictd.c:119 ../lib/dictd.c:157 ../lib/dictd.c:397
+msgid "Unknown error while quering the server."
+msgstr "Nieznany bÅ‚Ä…d odpytywania serwera.."
+
+#: ../lib/dictd.c:127
+msgid "Server not ready."
+msgstr "Serwer nie jest gotowy."
+
+#: ../lib/dictd.c:140
+#, c-format
+msgid "No matches could be found for \"%s\"."
+msgstr "Brak trafieÅ„ dla \"%s\"."
+
+#: ../lib/dictd.c:162
+#, fuzzy, c-format
+msgid "%d definition found."
+msgid_plural "%d definitions found."
+msgstr[0] "%d definicji znaleziono."
+msgstr[1] "%d definicji znaleziono."
+
+#: ../lib/dictd.c:352
+#, fuzzy, c-format
+msgid "Querying %s..."
+msgstr "OdpytujÄ™ serwer %s..."
+
+#: ../lib/dictd.c:392
 msgid "The server doesn't offer any databases."
 msgstr "Serwer nie oferuje Å¼adnych baz danych."
 
-#: ../panel-plugin/dict.c:894
-msgid "You have chosen an invalid dictionary entry."
-msgstr "WybraÅ‚eÅ› bÅ‚edny wpis sÅ‚ownika."
+#: ../lib/gui.c:146
+msgid "_File"
+msgstr ""
 
-#: ../panel-plugin/dict.c:1009
-msgid "Properties"
-msgstr "WÅ‚aÅ›ciwoÅ›ci"
+#: ../lib/gui.c:162
+msgid "_Help"
+msgstr ""
 
-#: ../panel-plugin/dict.c:1025
-msgid "Dictionary plugin"
-msgstr "Wtyczka sÅ‚ownika"
+#: ../lib/gui.c:212
+msgid "Text to search:"
+msgstr "Fraza do wyszukania:"
 
-#. server address
-#: ../panel-plugin/dict.c:1042
-#, fuzzy
-msgid "Server:"
-msgstr "Serwer :"
+#: ../lib/gui.c:258
+msgid "Search with:"
+msgstr ""
 
-#. server port
-#: ../panel-plugin/dict.c:1054
-#, fuzzy
-msgid "Server Port:"
-msgstr "Port Serwera :"
+#: ../lib/gui.c:262 ../lib/prefs.c:247 ../lib/prefs.c:341
+msgid "Dict"
+msgstr "SÅ‚ownik"
 
-#. dictionary
-#: ../panel-plugin/dict.c:1062 ../panel-plugin/dict.c:1222
-#, fuzzy
-msgid "Dictionary:"
-msgstr "SÅ‚ownik :"
+#: ../lib/gui.c:268 ../lib/prefs.c:256 ../lib/prefs.c:448
+msgid "Web"
+msgstr ""
 
-#: ../panel-plugin/dict.c:1066
-msgid "* (use all)"
-msgstr "* (uÅ¼yj wszystkich)"
+#: ../lib/gui.c:274 ../lib/prefs.c:265
+msgid "Spellcheck"
+msgstr ""
 
-#: ../panel-plugin/dict.c:1068
-msgid "! (use all, stop after first match)"
-msgstr "! (uÅ¼yj wszystkich, przerwij przy pierwszym trafieniu)"
+#: ../lib/gui.c:343
+msgid "Developer"
+msgstr "TwÃ³rca"
 
-#: ../panel-plugin/dict.c:1128
-msgid "Use a DICT server"
-msgstr "UÅ¼yj serwera DICT"
+#: ../lib/prefs.c:107
+msgid "You have chosen an invalid dictionary entry."
+msgstr "WybraÅ‚eÅ› bÅ‚edny wpis sÅ‚ownika."
 
-#: ../panel-plugin/dict.c:1147
+#: ../lib/prefs.c:172
 msgid "dict.leo.org - German <-> English"
 msgstr "dict.leo.org - Niemiecki <-> Angielski"
 
-#: ../panel-plugin/dict.c:1155
+#: ../lib/prefs.c:173
 msgid "dict.leo.org - German <-> French"
 msgstr "dict.leo.org - Niemiecki <-> Francuski"
 
-#: ../panel-plugin/dict.c:1163
+#: ../lib/prefs.c:174
 msgid "dict.leo.org - German <-> Spanish"
 msgstr "dict.leo.org - Niemiecki <-> HiszpaÅ„ski"
 
-#: ../panel-plugin/dict.c:1170
-msgid "Use another website"
-msgstr "UÅ¼yj innego serwisu"
+#: ../lib/prefs.c:175
+#, fuzzy
+msgid "dict.leo.org - German <-> Italian"
+msgstr "dict.leo.org - Niemiecki <-> Angielski"
 
-#: ../panel-plugin/dict.c:1178
-msgid "URL:"
-msgstr "URL:"
+#: ../lib/prefs.c:176
+#, fuzzy
+msgid "dict.leo.org - German <-> Chinese"
+msgstr "dict.leo.org - Niemiecki <-> Angielski"
 
-#: ../panel-plugin/dict.c:1191
-msgid ""
-"Enter an URL to a web site which offer translation services.\n"
-"Use {word} as placeholder for the searched word."
+#: ../lib/prefs.c:177
+#, fuzzy
+msgid "dist.cc - Dictionary"
+msgstr "SÅ‚ownik :"
+
+#: ../lib/prefs.c:178
+#, fuzzy
+msgid "Dictionary.com"
+msgstr "SÅ‚ownik :"
+
+#: ../lib/prefs.c:179
+#, fuzzy
+msgid "TheFreeDictionary.com"
+msgstr "SÅ‚ownik :"
+
+#: ../lib/prefs.c:180
+msgid "Clear"
 msgstr ""
-"Podaj adres URL do strony oferujÄ…cej usÅ‚ugi tÅ‚umacza.\n"
-"UÅ¼yj {word} jako zmiennÄ… przechowujÄ…cÄ… sÅ‚owo do tÅ‚umaczenia."
 
-#: ../panel-plugin/dict.c:1197
-msgid "Use a web site"
-msgstr "UÅ¼yj strony"
+#: ../lib/prefs.c:239
+msgid "General"
+msgstr ""
 
-#: ../panel-plugin/dict.c:1211
-msgid "Aspell program:"
+#: ../lib/prefs.c:241
+msgid "<b>Default search method:</b>"
+msgstr ""
+
+#: ../lib/prefs.c:274
+msgid "Last used method"
 msgstr ""
 
-#: ../panel-plugin/dict.c:1252
-msgid "Use Aspell"
+#: ../lib/prefs.c:288
+msgid "<b>Panel text field:</b>"
 msgstr ""
 
-#: ../panel-plugin/dict.c:1266
+#: ../lib/prefs.c:294
 msgid "Show text field in the panel"
 msgstr "PokaÅ¼ pole tekstowe w panelu"
 
-#: ../panel-plugin/dict.c:1269
-msgid ""
-"This option can only be used when the panel has a horizontal orientation."
-msgstr "Ta opcja moÅ¼e byÄ‡ uÅ¼yta gdy panel uÅ‚oÅ¼ony jest poziomo."
-
 #. panel entry size
-#: ../panel-plugin/dict.c:1275
+#: ../lib/prefs.c:301
 #, fuzzy
 msgid "Text field size:"
 msgstr "Rozmiar pola :"
 
-#: ../panel-plugin/dict.c:1335 ../panel-plugin/dict.c:1663
-msgid "Ready."
-msgstr "Gotowy."
+#. server address
+#: ../lib/prefs.c:344
+#, fuzzy
+msgid "Server:"
+msgstr "Serwer :"
 
-#: ../panel-plugin/dict.c:1408
-msgid "Text to search:"
-msgstr "Fraza do wyszukania:"
+#. server port
+#: ../lib/prefs.c:356
+#, fuzzy
+msgid "Server Port:"
+msgstr "Port Serwera :"
 
-#: ../panel-plugin/dict.c:1455
-msgid "Search with:"
-msgstr ""
+#. dictionary
+#: ../lib/prefs.c:364 ../lib/prefs.c:508
+#, fuzzy
+msgid "Dictionary:"
+msgstr "SÅ‚ownik :"
 
-#: ../panel-plugin/dict.c:1459 ../panel-plugin/dict.desktop.in.in.h:2
-msgid "Dict"
-msgstr "SÅ‚ownik"
+#: ../lib/prefs.c:368
+msgid "* (use all)"
+msgstr "* (uÅ¼yj wszystkich)"
 
-#: ../panel-plugin/dict.c:1465
-msgid "Web"
-msgstr ""
+#: ../lib/prefs.c:370
+msgid "! (use all, stop after first match)"
+msgstr "! (uÅ¼yj wszystkich, przerwij przy pierwszym trafieniu)"
 
-#: ../panel-plugin/dict.c:1471
-msgid "Spellcheck"
+#: ../lib/prefs.c:450
+msgid "<b>Web search URL:</b>"
 msgstr ""
 
-#: ../panel-plugin/dict.c:1513 ../panel-plugin/dict.desktop.in.in.h:1
-msgid "A plugin to query a Dict server."
-msgstr "Wtyczka do odpytywania serwera Dict."
-
-#: ../panel-plugin/dict.c:1517
-msgid "Developer"
-msgstr "TwÃ³rca"
-
-#: ../panel-plugin/dict.c:1615
-msgid "Look up a word"
-msgstr "Wyszukaj sÅ‚owa"
+#: ../lib/prefs.c:456
+msgid "URL:"
+msgstr "URL:"
 
-#: ../panel-plugin/xfce4-popup-dict.c:97
-#, c-format
-msgid "Usage: %s [options]\n"
+#: ../lib/prefs.c:476
+#, fuzzy
+msgid ""
+"Enter an URL to a web site which offer translation or dictionary services.\n"
+"Use {word} as placeholder for the searched word."
 msgstr ""
+"Podaj adres URL do strony oferujÄ…cej usÅ‚ugi tÅ‚umacza.\n"
+"UÅ¼yj {word} jako zmiennÄ… przechowujÄ…cÄ… sÅ‚owo do tÅ‚umaczenia."
 
-#: ../panel-plugin/xfce4-popup-dict.c:98
-#, c-format
-msgid "Options:\n"
+#: ../lib/prefs.c:495
+msgid "Aspell"
 msgstr ""
 
-#: ../panel-plugin/xfce4-popup-dict.c:99
-#, c-format
-msgid "    -t, --text-field    grap the focus on the text field in the panel\n"
+#: ../lib/prefs.c:497
+msgid "Aspell program:"
 msgstr ""
 
-#: ../panel-plugin/xfce4-popup-dict.c:100
-#, c-format
-msgid "    -h, --help          show this help and exit\n"
-msgstr ""
+#~ msgid "Properties"
+#~ msgstr "WÅ‚aÅ›ciwoÅ›ci"
 
-#: ../panel-plugin/xfce4-popup-dict.c:101
-#, c-format
-msgid ""
-"If called without any options, the xfce4-dict-plugin main window is shown.\n"
-msgstr ""
+#~ msgid "Use a DICT server"
+#~ msgstr "UÅ¼yj serwera DICT"
+
+#~ msgid "Use another website"
+#~ msgstr "UÅ¼yj innego serwisu"
+
+#~ msgid "Use a web site"
+#~ msgstr "UÅ¼yj strony"
+
+#~ msgid ""
+#~ "This option can only be used when the panel has a horizontal orientation."
+#~ msgstr "Ta opcja moÅ¼e byÄ‡ uÅ¼yta gdy panel uÅ‚oÅ¼ony jest poziomo."
diff --git a/po/pt_BR.po b/po/pt_BR.po
index afa3d71..d26c3e8 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-dict-plugin 0.3.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-08 17:08+0100\n"
+"POT-Creation-Date: 2008-04-22 13:11+0200\n"
 "PO-Revision-Date: 2008-01-21 13:19-0300\n"
 "Last-Translator: FÃ¡bio Nogueira <deb-user-ba@ubuntu.com>\n"
 "Language-Team: Brazilian Portuguese <ldp-br@bazar2.conectiva.com.br>\n"
@@ -18,204 +18,341 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../panel-plugin/dict.c:358 ../panel-plugin/dict.c:822
+#: ../panel-plugin/xfce4-dict-plugin.desktop.in.in.h:1
+#, fuzzy
+msgid "A plugin to query different dictionaries."
+msgstr "Um plug-in para consultar um servidor de dicionÃ¡rio."
+
+#: ../panel-plugin/xfce4-dict-plugin.desktop.in.in.h:2
+#, fuzzy
+msgid "Dictionary"
+msgstr "DicionÃ¡rio:"
+
+#: ../panel-plugin/xfce4-dict-plugin.c:370
+msgid "Look up a word"
+msgstr "Procurar uma palavra"
+
+#: ../panel-plugin/xfce4-dict-plugin.c:429 ../src/xfce4-dict.c:206
+#: ../lib/aspell.c:198 ../lib/dictd.c:138 ../lib/gui.c:96
+msgid "Ready."
+msgstr "Pronto."
+
+#. Note for translators: run xfce4-dict --help and copy the help text for "--help" into this one
+#: ../src/xfce4-dict.c:54
+msgid "Show help options"
+msgstr ""
+
+#: ../src/xfce4-dict.c:56
+msgid "Search the given text using a Dict server(RFC 2229)"
+msgstr ""
+
+#: ../src/xfce4-dict.c:57
+msgid "Search the given text using a web-based search engine"
+msgstr ""
+
+#: ../src/xfce4-dict.c:58
+msgid "Check the given text with a spellchecker"
+msgstr ""
+
+#: ../src/xfce4-dict.c:59
+#, fuzzy
+msgid "Grab the focus on the text field in the panel"
+msgstr "    -t, --text-field    manter o foco no campo de texto no painel\n"
+
+#: ../src/xfce4-dict.c:60
+msgid "Start stand-alone application even if the panel plugin is loaded"
+msgstr ""
+
+#: ../src/xfce4-dict.c:61
+msgid "Show version information"
+msgstr ""
+
+#: ../src/xfce4-dict.c:134
+msgid "[TEXT]"
+msgstr ""
+
+#: ../src/xfce4-dict.c:158
+#, c-format
+msgid "(built on %s with GTK %d.%d.%d, GLib %d.%d.%d)"
+msgstr ""
+
+#: ../src/xfce4-dict.desktop.in.h:1 ../lib/gui.c:339
+msgid "A client program to query different dictionaries."
+msgstr ""
+
+#: ../src/xfce4-dict.desktop.in.h:2
+#, fuzzy
+msgid "Dictionary Client"
+msgstr "Plug-in de dicionÃ¡rio"
+
+#: ../src/xfce4-dict.desktop.in.h:3 ../lib/gui.c:189 ../lib/prefs.c:212
+#, fuzzy
+msgid "Xfce4 Dictionary"
+msgstr "DicionÃ¡rio:"
+
+#: ../lib/aspell.c:75
+#, fuzzy, c-format
+msgid "%d suggestion found."
+msgid_plural "%d suggestions found."
+msgstr[0] "%d definiÃ§Ã£o(Ãµes) encontrada(s)."
+msgstr[1] "%d definiÃ§Ã£o(Ãµes) encontrada(s)."
+
+#: ../lib/aspell.c:79
+#, c-format
+msgid "Suggestions for \"%s\":"
+msgstr ""
+
+#: ../lib/aspell.c:90
+#, c-format
+msgid "\"%s\" is spelled correctly."
+msgstr ""
+
+#: ../lib/aspell.c:96
+#, fuzzy, c-format
+msgid "No suggestions could be found for \"%s\"."
+msgstr "Nenhum resultado encontrado para \"%s\"."
+
+#. translation hint:
+#. * Error while executing <spell command, e.g. "aspell"> (<error message>)
+#: ../lib/aspell.c:122
+#, c-format
+msgid "Error while executing \"%s\" (%s)."
+msgstr ""
+
+#: ../lib/aspell.c:158
+msgid "Please set the aspell command in the preferences dialog."
+msgstr ""
+
+#: ../lib/aspell.c:164 ../lib/common.c:200
+msgid "Invalid input."
+msgstr "Entrada invÃ¡lida."
+
+#: ../lib/aspell.c:202
+#, c-format
+msgid "Process failed (%s)"
+msgstr ""
+
+#: ../lib/common.c:171
+msgid "Browser could not be opened. Please check your preferences."
+msgstr ""
+"NÃ£o foi possÃvel abrir o navegador. Por favor verifique suas preferÃªncias."
+
+#: ../lib/common.c:210
+msgid "Invalid non-UTF8 input."
+msgstr "Entrada nÃ£o-UTF8 invÃ¡lida."
+
+#: ../lib/dictd.c:112 ../lib/dictd.c:375
 msgid "Could not connect to server."
 msgstr "NÃ£o foi possÃvel conectar ao servidor."
 
-#: ../panel-plugin/dict.c:365 ../panel-plugin/dict.c:390
-#: ../panel-plugin/dict.c:844
+#: ../lib/dictd.c:119 ../lib/dictd.c:157 ../lib/dictd.c:397
 msgid "Unknown error while quering the server."
 msgstr "Erro desconhecido ao consultar o servidor."
 
-#: ../panel-plugin/dict.c:373
+#: ../lib/dictd.c:127
 msgid "Server not ready."
 msgstr "O servidor nÃ£o estÃ¡ pronto."
 
-#: ../panel-plugin/dict.c:384
+#: ../lib/dictd.c:140
 #, c-format
 msgid "No matches could be found for \"%s\"."
 msgstr "Nenhum resultado encontrado para \"%s\"."
 
-#: ../panel-plugin/dict.c:395
-#, c-format
-msgid "%d definition(s) found."
-msgstr "%d definiÃ§Ã£o(Ãµes) encontrada(s)."
+#: ../lib/dictd.c:162
+#, fuzzy, c-format
+msgid "%d definition found."
+msgid_plural "%d definitions found."
+msgstr[0] "%d definiÃ§Ã£o(Ãµes) encontrada(s)."
+msgstr[1] "%d definiÃ§Ã£o(Ãµes) encontrada(s)."
 
-#: ../panel-plugin/dict.c:512
-#, c-format
-msgid "Querying the server %s..."
+#: ../lib/dictd.c:352
+#, fuzzy, c-format
+msgid "Querying %s..."
 msgstr "Consultando o servidor %s..."
 
-#: ../panel-plugin/dict.c:565
-msgid "Invalid input."
-msgstr "Entrada invÃ¡lida."
+#: ../lib/dictd.c:392
+msgid "The server doesn't offer any databases."
+msgstr "O servidor nÃ£o oferece nenhum banco de dados."
 
-#: ../panel-plugin/dict.c:575
-msgid "Invalid non-UTF8 input."
-msgstr "Entrada nÃ£o-UTF8 invÃ¡lida."
+#: ../lib/gui.c:146
+msgid "_File"
+msgstr ""
 
-#: ../panel-plugin/dict.c:637
-msgid "Browser could not be opened. Please check your preferences."
+#: ../lib/gui.c:162
+msgid "_Help"
 msgstr ""
-"NÃ£o foi possÃvel abrir o navegador. Por favor verifique suas preferÃªncias."
 
-#: ../panel-plugin/dict.c:839
-msgid "The server doesn't offer any databases."
-msgstr "O servidor nÃ£o oferece nenhum banco de dados."
+#: ../lib/gui.c:212
+msgid "Text to search:"
+msgstr "Texto a procurar:"
+
+#: ../lib/gui.c:258
+msgid "Search with:"
+msgstr "Pesquisar:"
+
+#: ../lib/gui.c:262 ../lib/prefs.c:247 ../lib/prefs.c:341
+msgid "Dict"
+msgstr "DicionÃ¡rio"
+
+#: ../lib/gui.c:268 ../lib/prefs.c:256 ../lib/prefs.c:448
+msgid "Web"
+msgstr "Internet"
+
+#: ../lib/gui.c:274 ../lib/prefs.c:265
+msgid "Spellcheck"
+msgstr "Corretor ortogrÃ¡fico"
+
+#: ../lib/gui.c:343
+msgid "Developer"
+msgstr "Desenvolvedor"
 
-#: ../panel-plugin/dict.c:894
+#: ../lib/prefs.c:107
 msgid "You have chosen an invalid dictionary entry."
 msgstr "VocÃª selecionou uma entrada invÃ¡lida no dicionÃ¡rio."
 
-#: ../panel-plugin/dict.c:1009
-msgid "Properties"
-msgstr "Propriedades"
+#: ../lib/prefs.c:172
+msgid "dict.leo.org - German <-> English"
+msgstr "dict.leo.org - AlemÃ£o <-> InglÃªs"
 
-#: ../panel-plugin/dict.c:1025
-msgid "Dictionary plugin"
-msgstr "Plug-in de dicionÃ¡rio"
+#: ../lib/prefs.c:173
+msgid "dict.leo.org - German <-> French"
+msgstr "dict.leo.org - AlemÃ£o <-> FrancÃªs"
+
+#: ../lib/prefs.c:174
+msgid "dict.leo.org - German <-> Spanish"
+msgstr "dict.leo.org - AlemÃ£o <-> Espanhol"
+
+#: ../lib/prefs.c:175
+#, fuzzy
+msgid "dict.leo.org - German <-> Italian"
+msgstr "dict.leo.org - AlemÃ£o <-> InglÃªs"
+
+#: ../lib/prefs.c:176
+#, fuzzy
+msgid "dict.leo.org - German <-> Chinese"
+msgstr "dict.leo.org - AlemÃ£o <-> InglÃªs"
+
+#: ../lib/prefs.c:177
+#, fuzzy
+msgid "dist.cc - Dictionary"
+msgstr "DicionÃ¡rio:"
+
+#: ../lib/prefs.c:178
+#, fuzzy
+msgid "Dictionary.com"
+msgstr "DicionÃ¡rio:"
+
+#: ../lib/prefs.c:179
+#, fuzzy
+msgid "TheFreeDictionary.com"
+msgstr "DicionÃ¡rio:"
+
+#: ../lib/prefs.c:180
+msgid "Clear"
+msgstr ""
+
+#: ../lib/prefs.c:239
+msgid "General"
+msgstr ""
+
+#: ../lib/prefs.c:241
+msgid "<b>Default search method:</b>"
+msgstr ""
+
+#: ../lib/prefs.c:274
+msgid "Last used method"
+msgstr ""
+
+#: ../lib/prefs.c:288
+msgid "<b>Panel text field:</b>"
+msgstr ""
+
+#: ../lib/prefs.c:294
+msgid "Show text field in the panel"
+msgstr "Mostrar um campo de texto no painel"
+
+#. panel entry size
+#: ../lib/prefs.c:301
+msgid "Text field size:"
+msgstr "Tamanho do campo de texto:"
 
 #. server address
-#: ../panel-plugin/dict.c:1042
+#: ../lib/prefs.c:344
 msgid "Server:"
 msgstr "Servidor:"
 
 #. server port
-#: ../panel-plugin/dict.c:1054
+#: ../lib/prefs.c:356
 msgid "Server Port:"
 msgstr "Porta do Servidor:"
 
 #. dictionary
-#: ../panel-plugin/dict.c:1062 ../panel-plugin/dict.c:1222
+#: ../lib/prefs.c:364 ../lib/prefs.c:508
 msgid "Dictionary:"
 msgstr "DicionÃ¡rio:"
 
-#: ../panel-plugin/dict.c:1066
+#: ../lib/prefs.c:368
 msgid "* (use all)"
 msgstr "* (usar todos)"
 
-#: ../panel-plugin/dict.c:1068
+#: ../lib/prefs.c:370
 msgid "! (use all, stop after first match)"
 msgstr "! (usar todos, parar apÃ³s primeiro resultado)"
 
-#: ../panel-plugin/dict.c:1128
-msgid "Use a DICT server"
-msgstr "Usar um servidor de DICIONÃRIO"
-
-#: ../panel-plugin/dict.c:1147
-msgid "dict.leo.org - German <-> English"
-msgstr "dict.leo.org - AlemÃ£o <-> InglÃªs"
-
-#: ../panel-plugin/dict.c:1155
-msgid "dict.leo.org - German <-> French"
-msgstr "dict.leo.org - AlemÃ£o <-> FrancÃªs"
-
-#: ../panel-plugin/dict.c:1163
-msgid "dict.leo.org - German <-> Spanish"
-msgstr "dict.leo.org - AlemÃ£o <-> Espanhol"
-
-#: ../panel-plugin/dict.c:1170
-msgid "Use another website"
-msgstr "Usar outro site"
+#: ../lib/prefs.c:450
+msgid "<b>Web search URL:</b>"
+msgstr ""
 
-#: ../panel-plugin/dict.c:1178
+#: ../lib/prefs.c:456
 msgid "URL:"
 msgstr "URL:"
 
-#: ../panel-plugin/dict.c:1191
+#: ../lib/prefs.c:476
+#, fuzzy
 msgid ""
-"Enter an URL to a web site which offer translation services.\n"
+"Enter an URL to a web site which offer translation or dictionary services.\n"
 "Use {word} as placeholder for the searched word."
 msgstr ""
 "Inserir um URL de um site que ofereÃ§a serviÃ§os de traduÃ§Ã£o.\n"
 "Usar {word} como um espaÃ§o reservado para a palavra pesquisada."
 
-#: ../panel-plugin/dict.c:1197
-msgid "Use a web site"
-msgstr "Usar um site"
+#: ../lib/prefs.c:495
+#, fuzzy
+msgid "Aspell"
+msgstr "Utilizar o Aspell"
 
-#: ../panel-plugin/dict.c:1211
+#: ../lib/prefs.c:497
 msgid "Aspell program:"
 msgstr "Programa Aspell:"
 
-#: ../panel-plugin/dict.c:1252
-msgid "Use Aspell"
-msgstr "Utilizar o Aspell"
+#~ msgid "Properties"
+#~ msgstr "Propriedades"
 
-#: ../panel-plugin/dict.c:1266
-msgid "Show text field in the panel"
-msgstr "Mostrar um campo de texto no painel"
+#~ msgid "Use a DICT server"
+#~ msgstr "Usar um servidor de DICIONÃRIO"
 
-#: ../panel-plugin/dict.c:1269
-msgid ""
-"This option can only be used when the panel has a horizontal orientation."
-msgstr "Essa opÃ§Ã£o sÃ³ pode ser usada quando o painel estiver na horizontal."
+#~ msgid "Use another website"
+#~ msgstr "Usar outro site"
 
-#. panel entry size
-#: ../panel-plugin/dict.c:1275
-msgid "Text field size:"
-msgstr "Tamanho do campo de texto:"
+#~ msgid "Use a web site"
+#~ msgstr "Usar um site"
 
-#: ../panel-plugin/dict.c:1335 ../panel-plugin/dict.c:1663
-msgid "Ready."
-msgstr "Pronto."
+#~ msgid ""
+#~ "This option can only be used when the panel has a horizontal orientation."
+#~ msgstr "Essa opÃ§Ã£o sÃ³ pode ser usada quando o painel estiver na horizontal."
 
-#: ../panel-plugin/dict.c:1408
-msgid "Text to search:"
-msgstr "Texto a procurar:"
+#~ msgid "Usage: %s [options]\n"
+#~ msgstr "Uso: %s [options]\n"
 
-#: ../panel-plugin/dict.c:1455
-msgid "Search with:"
-msgstr "Pesquisar:"
+#~ msgid "Options:\n"
+#~ msgstr "OpÃ§Ãµes:\n"
 
-#: ../panel-plugin/dict.c:1459 ../panel-plugin/dict.desktop.in.in.h:2
-msgid "Dict"
-msgstr "DicionÃ¡rio"
+#~ msgid "    -h, --help          show this help and exit\n"
+#~ msgstr "    -h, --help          mostra esta ajuda e sai\n"
 
-#: ../panel-plugin/dict.c:1465
-msgid "Web"
-msgstr "Internet"
-
-#: ../panel-plugin/dict.c:1471
-msgid "Spellcheck"
-msgstr "Corretor ortogrÃ¡fico"
-
-#: ../panel-plugin/dict.c:1513 ../panel-plugin/dict.desktop.in.in.h:1
-msgid "A plugin to query a Dict server."
-msgstr "Um plug-in para consultar um servidor de dicionÃ¡rio."
-
-#: ../panel-plugin/dict.c:1517
-msgid "Developer"
-msgstr "Desenvolvedor"
-
-#: ../panel-plugin/dict.c:1615
-msgid "Look up a word"
-msgstr "Procurar uma palavra"
-
-#: ../panel-plugin/xfce4-popup-dict.c:97
-#, c-format
-msgid "Usage: %s [options]\n"
-msgstr "Uso: %s [options]\n"
-
-#: ../panel-plugin/xfce4-popup-dict.c:98
-#, c-format
-msgid "Options:\n"
-msgstr "OpÃ§Ãµes:\n"
-
-#: ../panel-plugin/xfce4-popup-dict.c:99
-#, c-format
-msgid "    -t, --text-field    grap the focus on the text field in the panel\n"
-msgstr "    -t, --text-field    manter o foco no campo de texto no painel\n"
-
-#: ../panel-plugin/xfce4-popup-dict.c:100
-#, c-format
-msgid "    -h, --help          show this help and exit\n"
-msgstr "    -h, --help          mostra esta ajuda e sai\n"
-
-#: ../panel-plugin/xfce4-popup-dict.c:101
-#, c-format
-msgid ""
-"If called without any options, the xfce4-dict-plugin main window is shown.\n"
-msgstr ""
-"Se chamado sem nenhuma opÃ§Ã£o, a janela principal do xfce4-dict-plugin serÃ¡ "
-"exibida.\n"
+#~ msgid ""
+#~ "If called without any options, the xfce4-dict-plugin main window is "
+#~ "shown.\n"
+#~ msgstr ""
+#~ "Se chamado sem nenhuma opÃ§Ã£o, a janela principal do xfce4-dict-plugin "
+#~ "serÃ¡ exibida.\n"
diff --git a/po/pt_PT.po b/po/pt_PT.po
index 75354d8..f8579dd 100644
--- a/po/pt_PT.po
+++ b/po/pt_PT.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-dict-plugin 0.3.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-08 17:08+0100\n"
+"POT-Creation-Date: 2008-04-22 13:11+0200\n"
 "PO-Revision-Date: 2008-03-18 15:04+0100\n"
 "Last-Translator: Nuno Miguel <nunis@netcabo.pt>\n"
 "Language-Team: \n"
@@ -15,206 +15,341 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../panel-plugin/dict.c:358
-#: ../panel-plugin/dict.c:822
-msgid "Could not connect to server."
-msgstr "NÃ£o foi possÃvel ligar ao servidor."
+#: ../panel-plugin/xfce4-dict-plugin.desktop.in.in.h:1
+#, fuzzy
+msgid "A plugin to query different dictionaries."
+msgstr "Um plugin para encontrar palavras em servidores Dict."
 
-#: ../panel-plugin/dict.c:365
-#: ../panel-plugin/dict.c:390
-#: ../panel-plugin/dict.c:844
-msgid "Unknown error while quering the server."
-msgstr "Erro desconhecido enquanto o servidor era acedido."
+#: ../panel-plugin/xfce4-dict-plugin.desktop.in.in.h:2
+#, fuzzy
+msgid "Dictionary"
+msgstr "DicionÃ¡rio:"
 
-#: ../panel-plugin/dict.c:373
-msgid "Server not ready."
-msgstr "O servidor nÃ£o estÃ¡ pronto."
+#: ../panel-plugin/xfce4-dict-plugin.c:370
+msgid "Look up a word"
+msgstr "Encontrar uma palavra"
+
+#: ../panel-plugin/xfce4-dict-plugin.c:429 ../src/xfce4-dict.c:206
+#: ../lib/aspell.c:198 ../lib/dictd.c:138 ../lib/gui.c:96
+msgid "Ready."
+msgstr "Pronto."
+
+#. Note for translators: run xfce4-dict --help and copy the help text for "--help" into this one
+#: ../src/xfce4-dict.c:54
+msgid "Show help options"
+msgstr ""
+
+#: ../src/xfce4-dict.c:56
+msgid "Search the given text using a Dict server(RFC 2229)"
+msgstr ""
+
+#: ../src/xfce4-dict.c:57
+msgid "Search the given text using a web-based search engine"
+msgstr ""
+
+#: ../src/xfce4-dict.c:58
+msgid "Check the given text with a spellchecker"
+msgstr ""
+
+#: ../src/xfce4-dict.c:59
+#, fuzzy
+msgid "Grab the focus on the text field in the panel"
+msgstr "  -t, --text-field    captura o foco do campo de texto do painel\n"
 
-#: ../panel-plugin/dict.c:384
+#: ../src/xfce4-dict.c:60
+msgid "Start stand-alone application even if the panel plugin is loaded"
+msgstr ""
+
+#: ../src/xfce4-dict.c:61
+msgid "Show version information"
+msgstr ""
+
+#: ../src/xfce4-dict.c:134
+msgid "[TEXT]"
+msgstr ""
+
+#: ../src/xfce4-dict.c:158
 #, c-format
-msgid "No matches could be found for \"%s\"."
-msgstr "Nenhuma entrada encontrada para \"%s\"."
+msgid "(built on %s with GTK %d.%d.%d, GLib %d.%d.%d)"
+msgstr ""
+
+#: ../src/xfce4-dict.desktop.in.h:1 ../lib/gui.c:339
+msgid "A client program to query different dictionaries."
+msgstr ""
 
-#: ../panel-plugin/dict.c:395
+#: ../src/xfce4-dict.desktop.in.h:2
+#, fuzzy
+msgid "Dictionary Client"
+msgstr "Plugin de dicionÃ¡rio"
+
+#: ../src/xfce4-dict.desktop.in.h:3 ../lib/gui.c:189 ../lib/prefs.c:212
+#, fuzzy
+msgid "Xfce4 Dictionary"
+msgstr "DicionÃ¡rio:"
+
+#: ../lib/aspell.c:75
+#, fuzzy, c-format
+msgid "%d suggestion found."
+msgid_plural "%d suggestions found."
+msgstr[0] "%d definiÃ§Ãµes encontradas."
+msgstr[1] "%d definiÃ§Ãµes encontradas."
+
+#: ../lib/aspell.c:79
 #, c-format
-msgid "%d definition(s) found."
-msgstr "%d definiÃ§Ãµes encontradas."
+msgid "Suggestions for \"%s\":"
+msgstr ""
 
-#: ../panel-plugin/dict.c:512
+#: ../lib/aspell.c:90
 #, c-format
-msgid "Querying the server %s..."
-msgstr "Perguntando ao servidor %s..."
+msgid "\"%s\" is spelled correctly."
+msgstr ""
 
-#: ../panel-plugin/dict.c:565
+#: ../lib/aspell.c:96
+#, fuzzy, c-format
+msgid "No suggestions could be found for \"%s\"."
+msgstr "Nenhuma entrada encontrada para \"%s\"."
+
+#. translation hint:
+#. * Error while executing <spell command, e.g. "aspell"> (<error message>)
+#: ../lib/aspell.c:122
+#, c-format
+msgid "Error while executing \"%s\" (%s)."
+msgstr ""
+
+#: ../lib/aspell.c:158
+msgid "Please set the aspell command in the preferences dialog."
+msgstr ""
+
+#: ../lib/aspell.c:164 ../lib/common.c:200
 msgid "Invalid input."
 msgstr "Entrada invÃ¡lida."
 
-#: ../panel-plugin/dict.c:575
+#: ../lib/aspell.c:202
+#, c-format
+msgid "Process failed (%s)"
+msgstr ""
+
+#: ../lib/common.c:171
+msgid "Browser could not be opened. Please check your preferences."
+msgstr ""
+"Um navegador nÃ£o pÃ´de ser aberto. Por favor verifique as suas preferÃªncias."
+
+#: ../lib/common.c:210
 msgid "Invalid non-UTF8 input."
 msgstr "Entrada nÃ£o estÃ¡ em UTF8."
 
-#: ../panel-plugin/dict.c:637
-msgid "Browser could not be opened. Please check your preferences."
-msgstr "Um navegador nÃ£o pÃ´de ser aberto. Por favor verifique as suas preferÃªncias."
+#: ../lib/dictd.c:112 ../lib/dictd.c:375
+msgid "Could not connect to server."
+msgstr "NÃ£o foi possÃvel ligar ao servidor."
+
+#: ../lib/dictd.c:119 ../lib/dictd.c:157 ../lib/dictd.c:397
+msgid "Unknown error while quering the server."
+msgstr "Erro desconhecido enquanto o servidor era acedido."
+
+#: ../lib/dictd.c:127
+msgid "Server not ready."
+msgstr "O servidor nÃ£o estÃ¡ pronto."
+
+#: ../lib/dictd.c:140
+#, c-format
+msgid "No matches could be found for \"%s\"."
+msgstr "Nenhuma entrada encontrada para \"%s\"."
+
+#: ../lib/dictd.c:162
+#, fuzzy, c-format
+msgid "%d definition found."
+msgid_plural "%d definitions found."
+msgstr[0] "%d definiÃ§Ãµes encontradas."
+msgstr[1] "%d definiÃ§Ãµes encontradas."
+
+#: ../lib/dictd.c:352
+#, fuzzy, c-format
+msgid "Querying %s..."
+msgstr "Perguntando ao servidor %s..."
 
-#: ../panel-plugin/dict.c:839
+#: ../lib/dictd.c:392
 msgid "The server doesn't offer any databases."
 msgstr "O servidor nÃ£o oferece nenhuma base de dados."
 
-#: ../panel-plugin/dict.c:894
-msgid "You have chosen an invalid dictionary entry."
-msgstr "Seleccionou uma entrada invÃ¡lida no dicionÃ¡rio."
+#: ../lib/gui.c:146
+msgid "_File"
+msgstr ""
 
-#: ../panel-plugin/dict.c:1009
-msgid "Properties"
-msgstr "Propriedades"
+#: ../lib/gui.c:162
+msgid "_Help"
+msgstr ""
 
-#: ../panel-plugin/dict.c:1025
-msgid "Dictionary plugin"
-msgstr "Plugin de dicionÃ¡rio"
+#: ../lib/gui.c:212
+msgid "Text to search:"
+msgstr "Texto a procurar:"
 
-#. server address
-#: ../panel-plugin/dict.c:1042
-msgid "Server:"
-msgstr "Servidor:"
+#: ../lib/gui.c:258
+msgid "Search with:"
+msgstr "Procurar com:"
 
-#. server port
-#: ../panel-plugin/dict.c:1054
-msgid "Server Port:"
-msgstr "Porta do Servidor:"
+#: ../lib/gui.c:262 ../lib/prefs.c:247 ../lib/prefs.c:341
+msgid "Dict"
+msgstr "DicionÃ¡rio"
 
-#. dictionary
-#: ../panel-plugin/dict.c:1062
-#: ../panel-plugin/dict.c:1222
-msgid "Dictionary:"
-msgstr "DicionÃ¡rio:"
+#: ../lib/gui.c:268 ../lib/prefs.c:256 ../lib/prefs.c:448
+msgid "Web"
+msgstr "Web"
 
-#: ../panel-plugin/dict.c:1066
-msgid "* (use all)"
-msgstr "* (usar todos)"
+#: ../lib/gui.c:274 ../lib/prefs.c:265
+msgid "Spellcheck"
+msgstr "Verificador ortogrÃ¡fico"
 
-#: ../panel-plugin/dict.c:1068
-msgid "! (use all, stop after first match)"
-msgstr "! (usar todos, pÃ¡ra no primeiro encontrado)"
+#: ../lib/gui.c:343
+msgid "Developer"
+msgstr "Desenvolvedor"
 
-#: ../panel-plugin/dict.c:1128
-msgid "Use a DICT server"
-msgstr "Use um servidor DICT"
+#: ../lib/prefs.c:107
+msgid "You have chosen an invalid dictionary entry."
+msgstr "Seleccionou uma entrada invÃ¡lida no dicionÃ¡rio."
 
-#: ../panel-plugin/dict.c:1147
+#: ../lib/prefs.c:172
 msgid "dict.leo.org - German <-> English"
 msgstr "dict.leo.org - AlemÃ£o <-> InglÃªs"
 
-#: ../panel-plugin/dict.c:1155
+#: ../lib/prefs.c:173
 msgid "dict.leo.org - German <-> French"
 msgstr "dict.leo.org - AlemÃ£o <-> FrancÃªs"
 
-#: ../panel-plugin/dict.c:1163
+#: ../lib/prefs.c:174
 msgid "dict.leo.org - German <-> Spanish"
 msgstr "dict.leo.org - AlemÃ£o <-> Espanhol"
 
-#: ../panel-plugin/dict.c:1170
-msgid "Use another website"
-msgstr "Usar outro website"
+#: ../lib/prefs.c:175
+#, fuzzy
+msgid "dict.leo.org - German <-> Italian"
+msgstr "dict.leo.org - AlemÃ£o <-> InglÃªs"
 
-#: ../panel-plugin/dict.c:1178
-msgid "URL:"
-msgstr "URL"
+#: ../lib/prefs.c:176
+#, fuzzy
+msgid "dict.leo.org - German <-> Chinese"
+msgstr "dict.leo.org - AlemÃ£o <-> InglÃªs"
 
-#: ../panel-plugin/dict.c:1191
-msgid ""
-"Enter an URL to a web site which offer translation services.\n"
-"Use {word} as placeholder for the searched word."
+#: ../lib/prefs.c:177
+#, fuzzy
+msgid "dist.cc - Dictionary"
+msgstr "DicionÃ¡rio:"
+
+#: ../lib/prefs.c:178
+#, fuzzy
+msgid "Dictionary.com"
+msgstr "DicionÃ¡rio:"
+
+#: ../lib/prefs.c:179
+#, fuzzy
+msgid "TheFreeDictionary.com"
+msgstr "DicionÃ¡rio:"
+
+#: ../lib/prefs.c:180
+msgid "Clear"
 msgstr ""
-"Informe uma URL para um website que oferece serviÃ§os de traduÃ§Ã£o.\n"
-" Use {word} como um substituto para a palavra pesquisada."
 
-#: ../panel-plugin/dict.c:1197
-msgid "Use a web site"
-msgstr "Utilizar um website"
+#: ../lib/prefs.c:239
+msgid "General"
+msgstr ""
 
-#: ../panel-plugin/dict.c:1211
-msgid "Aspell program:"
-msgstr "Programa Aspell:"
+#: ../lib/prefs.c:241
+msgid "<b>Default search method:</b>"
+msgstr ""
 
-#: ../panel-plugin/dict.c:1252
-msgid "Use Aspell"
-msgstr "Usar Aspell"
+#: ../lib/prefs.c:274
+msgid "Last used method"
+msgstr ""
+
+#: ../lib/prefs.c:288
+msgid "<b>Panel text field:</b>"
+msgstr ""
 
-#: ../panel-plugin/dict.c:1266
+#: ../lib/prefs.c:294
 msgid "Show text field in the panel"
 msgstr "Mostrar um campo de texto no painel"
 
-#: ../panel-plugin/dict.c:1269
-msgid "This option can only be used when the panel has a horizontal orientation."
-msgstr "Esta opÃ§Ã£o sÃ³ pode ser usada quando o painel estÃ¡ na horizontal."
-
 #. panel entry size
-#: ../panel-plugin/dict.c:1275
+#: ../lib/prefs.c:301
 msgid "Text field size:"
 msgstr "Tamanho do campo de texto:"
 
-#: ../panel-plugin/dict.c:1335
-#: ../panel-plugin/dict.c:1663
-msgid "Ready."
-msgstr "Pronto."
+#. server address
+#: ../lib/prefs.c:344
+msgid "Server:"
+msgstr "Servidor:"
 
-#: ../panel-plugin/dict.c:1408
-msgid "Text to search:"
-msgstr "Texto a procurar:"
+#. server port
+#: ../lib/prefs.c:356
+msgid "Server Port:"
+msgstr "Porta do Servidor:"
 
-#: ../panel-plugin/dict.c:1455
-msgid "Search with:"
-msgstr "Procurar com:"
+#. dictionary
+#: ../lib/prefs.c:364 ../lib/prefs.c:508
+msgid "Dictionary:"
+msgstr "DicionÃ¡rio:"
 
-#: ../panel-plugin/dict.c:1459
-#: ../panel-plugin/dict.desktop.in.in.h:2
-msgid "Dict"
-msgstr "DicionÃ¡rio"
+#: ../lib/prefs.c:368
+msgid "* (use all)"
+msgstr "* (usar todos)"
 
-#: ../panel-plugin/dict.c:1465
-msgid "Web"
-msgstr "Web"
+#: ../lib/prefs.c:370
+msgid "! (use all, stop after first match)"
+msgstr "! (usar todos, pÃ¡ra no primeiro encontrado)"
 
-#: ../panel-plugin/dict.c:1471
-msgid "Spellcheck"
-msgstr "Verificador ortogrÃ¡fico"
+#: ../lib/prefs.c:450
+msgid "<b>Web search URL:</b>"
+msgstr ""
 
-#: ../panel-plugin/dict.c:1513
-#: ../panel-plugin/dict.desktop.in.in.h:1
-msgid "A plugin to query a Dict server."
-msgstr "Um plugin para encontrar palavras em servidores Dict."
+#: ../lib/prefs.c:456
+msgid "URL:"
+msgstr "URL"
 
-#: ../panel-plugin/dict.c:1517
-msgid "Developer"
-msgstr "Desenvolvedor"
+#: ../lib/prefs.c:476
+#, fuzzy
+msgid ""
+"Enter an URL to a web site which offer translation or dictionary services.\n"
+"Use {word} as placeholder for the searched word."
+msgstr ""
+"Informe uma URL para um website que oferece serviÃ§os de traduÃ§Ã£o.\n"
+" Use {word} como um substituto para a palavra pesquisada."
 
-#: ../panel-plugin/dict.c:1615
-msgid "Look up a word"
-msgstr "Encontrar uma palavra"
+#: ../lib/prefs.c:495
+#, fuzzy
+msgid "Aspell"
+msgstr "Usar Aspell"
 
-#: ../panel-plugin/xfce4-popup-dict.c:97
-#, c-format
-msgid "Usage: %s [options]\n"
-msgstr "Uso:  %s [options]\n"
+#: ../lib/prefs.c:497
+msgid "Aspell program:"
+msgstr "Programa Aspell:"
 
-#: ../panel-plugin/xfce4-popup-dict.c:98
-#, c-format
-msgid "Options:\n"
-msgstr "OpÃ§Ãµes:\n"
+#~ msgid "Properties"
+#~ msgstr "Propriedades"
 
-#: ../panel-plugin/xfce4-popup-dict.c:99
-#, c-format
-msgid "    -t, --text-field    grap the focus on the text field in the panel\n"
-msgstr "  -t, --text-field    captura o foco do campo de texto do painel\n"
+#~ msgid "Use a DICT server"
+#~ msgstr "Use um servidor DICT"
 
-#: ../panel-plugin/xfce4-popup-dict.c:100
-#, c-format
-msgid "    -h, --help          show this help and exit\n"
-msgstr "    -h, --help          mostra esta ajuda e sai\n"
+#~ msgid "Use another website"
+#~ msgstr "Usar outro website"
 
-#: ../panel-plugin/xfce4-popup-dict.c:101
-#, c-format
-msgid "If called without any options, the xfce4-dict-plugin main window is shown.\n"
-msgstr "Se chamada sem opÃ§Ãµes, a janela principal do xfce4-dict-plugin Ã© mostrada.\n"
+#~ msgid "Use a web site"
+#~ msgstr "Utilizar um website"
+
+#~ msgid ""
+#~ "This option can only be used when the panel has a horizontal orientation."
+#~ msgstr "Esta opÃ§Ã£o sÃ³ pode ser usada quando o painel estÃ¡ na horizontal."
+
+#~ msgid "Usage: %s [options]\n"
+#~ msgstr "Uso:  %s [options]\n"
+
+#~ msgid "Options:\n"
+#~ msgstr "OpÃ§Ãµes:\n"
+
+#~ msgid "    -h, --help          show this help and exit\n"
+#~ msgstr "    -h, --help          mostra esta ajuda e sai\n"
 
+#~ msgid ""
+#~ "If called without any options, the xfce4-dict-plugin main window is "
+#~ "shown.\n"
+#~ msgstr ""
+#~ "Se chamada sem opÃ§Ãµes, a janela principal do xfce4-dict-plugin Ã© "
+#~ "mostrada.\n"
diff --git a/po/uk.po b/po/uk.po
index 8374c14..9452bc0 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-dict-plugin 0.3.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-08 17:08+0100\n"
+"POT-Creation-Date: 2008-04-22 13:11+0200\n"
 "PO-Revision-Date: 2007-03-08 01:35+0200\n"
 "Last-Translator: Dmitry Nikitin <luckas_fb@mail.ru>\n"
 "Language-Team: Ukrainian <xfce-i18n@xfce.org>\n"
@@ -18,206 +18,331 @@ msgstr ""
 "Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
 "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: ../panel-plugin/dict.c:358 ../panel-plugin/dict.c:822
-msgid "Could not connect to server."
-msgstr "ÐÐµÐ¼Ð¾Ð¶Ð»Ð¸Ð²Ð¾ Ð·'Ñ”Ð´Ð½Ð°Ñ‚Ð¸ÑÑ Ð· ÑÐµÑ€Ð²ÐµÑ€Ð¾Ð¼"
+#: ../panel-plugin/xfce4-dict-plugin.desktop.in.in.h:1
+#, fuzzy
+msgid "A plugin to query different dictionaries."
+msgstr "Ð Ð¾Ð·ÑˆÐ¸Ñ€ÐµÐ½Ð½Ñ Ð´Ð»Ñ Ð·Ð°Ð¿Ð¸Ñ‚Ñƒ Dict ÑÐµÑ€Ð²ÐµÑ€Ñƒ."
 
-#: ../panel-plugin/dict.c:365 ../panel-plugin/dict.c:390
-#: ../panel-plugin/dict.c:844
-msgid "Unknown error while quering the server."
-msgstr "ÐÐµÐ²Ñ–Ð´Ð¾Ð¼Ð° Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ° Ð¿Ñ€Ð¸ Ð·Ð°Ð¿Ð¸Ñ‚Ñ– ÑÐµÑ€Ð²ÐµÑ€Ð°"
+#: ../panel-plugin/xfce4-dict-plugin.desktop.in.in.h:2
+#, fuzzy
+msgid "Dictionary"
+msgstr "Ð¡Ð»Ð¾Ð²Ð½Ð¸Ðº :"
 
-#: ../panel-plugin/dict.c:373
-msgid "Server not ready."
-msgstr "Ð¡ÐµÑ€Ð²ÐµÑ€ Ð½Ðµ Ð³Ð¾Ñ‚Ð¾Ð²Ð¸Ð¹."
+#: ../panel-plugin/xfce4-dict-plugin.c:370
+msgid "Look up a word"
+msgstr "Ð”Ð¸Ð²Ð¸ÑÑŒ Ð²Ð¸Ñ‰Ðµ ÑÐ»Ð¾Ð²Ð¾"
+
+#: ../panel-plugin/xfce4-dict-plugin.c:429 ../src/xfce4-dict.c:206
+#: ../lib/aspell.c:198 ../lib/dictd.c:138 ../lib/gui.c:96
+msgid "Ready."
+msgstr "Ð“Ð¾Ñ‚Ð¾Ð²Ð¾."
+
+#. Note for translators: run xfce4-dict --help and copy the help text for "--help" into this one
+#: ../src/xfce4-dict.c:54
+msgid "Show help options"
+msgstr ""
+
+#: ../src/xfce4-dict.c:56
+msgid "Search the given text using a Dict server(RFC 2229)"
+msgstr ""
+
+#: ../src/xfce4-dict.c:57
+msgid "Search the given text using a web-based search engine"
+msgstr ""
+
+#: ../src/xfce4-dict.c:58
+msgid "Check the given text with a spellchecker"
+msgstr ""
+
+#: ../src/xfce4-dict.c:59
+#, fuzzy
+msgid "Grab the focus on the text field in the panel"
+msgstr "ÐŸÐ¾ÐºÐ°Ð·ÑƒÐ²Ð°Ñ‚Ð¸ Ñ‚ÐµÐºÑÑ‚Ð¾Ð²Ðµ Ð¿Ð¾Ð»Ðµ Ð² Ð¿Ð°Ð½ÐµÐ»Ñ–"
+
+#: ../src/xfce4-dict.c:60
+msgid "Start stand-alone application even if the panel plugin is loaded"
+msgstr ""
+
+#: ../src/xfce4-dict.c:61
+msgid "Show version information"
+msgstr ""
 
-#: ../panel-plugin/dict.c:384
+#: ../src/xfce4-dict.c:134
+msgid "[TEXT]"
+msgstr ""
+
+#: ../src/xfce4-dict.c:158
 #, c-format
-msgid "No matches could be found for \"%s\"."
-msgstr "ÐÐµ Ð·Ð½Ð°Ð¹Ð´ÐµÐ½Ð¾ Ð²Ñ–Ð´Ð¿Ð¾Ð²Ñ–Ð´Ð½Ð¾ÑÑ‚ÐµÐ¹ Ð´Ð»Ñ \"%s\"."
+msgid "(built on %s with GTK %d.%d.%d, GLib %d.%d.%d)"
+msgstr ""
+
+#: ../src/xfce4-dict.desktop.in.h:1 ../lib/gui.c:339
+msgid "A client program to query different dictionaries."
+msgstr ""
+
+#: ../src/xfce4-dict.desktop.in.h:2
+#, fuzzy
+msgid "Dictionary Client"
+msgstr "Ð Ð¾Ð·ÑˆÐ¸Ñ€ÐµÐ½Ð½Ñ ÑÐ»Ð¾Ð²Ð½Ð¸ÐºÐ°"
+
+#: ../src/xfce4-dict.desktop.in.h:3 ../lib/gui.c:189 ../lib/prefs.c:212
+#, fuzzy
+msgid "Xfce4 Dictionary"
+msgstr "Ð¡Ð»Ð¾Ð²Ð½Ð¸Ðº :"
+
+#: ../lib/aspell.c:75
+#, fuzzy, c-format
+msgid "%d suggestion found."
+msgid_plural "%d suggestions found."
+msgstr[0] "%d Ð²Ñ–Ð´Ð¿Ð¾Ð²Ñ–Ð´Ð½Ð¾ÑÑ‚Ñ–(Ñ‚ÐµÐ¹) Ð·Ð½Ð°Ð¹Ð´ÐµÐ½Ð¾."
+msgstr[1] "%d Ð²Ñ–Ð´Ð¿Ð¾Ð²Ñ–Ð´Ð½Ð¾ÑÑ‚Ñ–(Ñ‚ÐµÐ¹) Ð·Ð½Ð°Ð¹Ð´ÐµÐ½Ð¾."
+msgstr[2] "%d Ð²Ñ–Ð´Ð¿Ð¾Ð²Ñ–Ð´Ð½Ð¾ÑÑ‚Ñ–(Ñ‚ÐµÐ¹) Ð·Ð½Ð°Ð¹Ð´ÐµÐ½Ð¾."
 
-#: ../panel-plugin/dict.c:395
+#: ../lib/aspell.c:79
 #, c-format
-msgid "%d definition(s) found."
-msgstr "%d Ð²Ñ–Ð´Ð¿Ð¾Ð²Ñ–Ð´Ð½Ð¾ÑÑ‚Ñ–(Ñ‚ÐµÐ¹) Ð·Ð½Ð°Ð¹Ð´ÐµÐ½Ð¾."
+msgid "Suggestions for \"%s\":"
+msgstr ""
 
-#: ../panel-plugin/dict.c:512
+#: ../lib/aspell.c:90
 #, c-format
-msgid "Querying the server %s..."
-msgstr "Ð—Ð°Ð¿Ð¸Ñ‚ÑƒÑ”Ñ‚ÑŒÑÑ ÑÐµÑ€Ð²ÐµÑ€ %s..."
+msgid "\"%s\" is spelled correctly."
+msgstr ""
 
-#: ../panel-plugin/dict.c:565
+#: ../lib/aspell.c:96
+#, fuzzy, c-format
+msgid "No suggestions could be found for \"%s\"."
+msgstr "ÐÐµ Ð·Ð½Ð°Ð¹Ð´ÐµÐ½Ð¾ Ð²Ñ–Ð´Ð¿Ð¾Ð²Ñ–Ð´Ð½Ð¾ÑÑ‚ÐµÐ¹ Ð´Ð»Ñ \"%s\"."
+
+#. translation hint:
+#. * Error while executing <spell command, e.g. "aspell"> (<error message>)
+#: ../lib/aspell.c:122
+#, c-format
+msgid "Error while executing \"%s\" (%s)."
+msgstr ""
+
+#: ../lib/aspell.c:158
+msgid "Please set the aspell command in the preferences dialog."
+msgstr ""
+
+#: ../lib/aspell.c:164 ../lib/common.c:200
 msgid "Invalid input."
 msgstr "ÐÐµÐ¿Ñ€Ð°Ð²Ð¸Ð»ÑŒÐ½Ð¸Ð¹ Ð²Ð²Ñ–Ð´."
 
-#: ../panel-plugin/dict.c:575
-msgid "Invalid non-UTF8 input."
-msgstr "ÐÐµÐ¿Ñ€Ð°Ð²Ð¸Ð»ÑŒÐ½Ð¸Ð¹ Ð½Ðµ-UTF8 Ð²Ð²Ñ–Ð´."
+#: ../lib/aspell.c:202
+#, c-format
+msgid "Process failed (%s)"
+msgstr ""
 
-#: ../panel-plugin/dict.c:637
+#: ../lib/common.c:171
 msgid "Browser could not be opened. Please check your preferences."
 msgstr "Ð‘Ñ€Ð°ÑƒÐ·ÐµÑ€ Ð½Ðµ Ð²Ð´Ð°Ð»Ð¾ÑÑŒ Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ð¸. Ð‘ÑƒÐ´ÑŒ-Ð»Ð°ÑÐºÐ° Ð¿ÐµÑ€ÐµÐ²Ñ–Ñ€Ñ‚Ðµ Ð’Ð°ÑˆÑ– Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ."
 
-#: ../panel-plugin/dict.c:839
+#: ../lib/common.c:210
+msgid "Invalid non-UTF8 input."
+msgstr "ÐÐµÐ¿Ñ€Ð°Ð²Ð¸Ð»ÑŒÐ½Ð¸Ð¹ Ð½Ðµ-UTF8 Ð²Ð²Ñ–Ð´."
+
+#: ../lib/dictd.c:112 ../lib/dictd.c:375
+msgid "Could not connect to server."
+msgstr "ÐÐµÐ¼Ð¾Ð¶Ð»Ð¸Ð²Ð¾ Ð·'Ñ”Ð´Ð½Ð°Ñ‚Ð¸ÑÑ Ð· ÑÐµÑ€Ð²ÐµÑ€Ð¾Ð¼"
+
+#: ../lib/dictd.c:119 ../lib/dictd.c:157 ../lib/dictd.c:397
+msgid "Unknown error while quering the server."
+msgstr "ÐÐµÐ²Ñ–Ð´Ð¾Ð¼Ð° Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ° Ð¿Ñ€Ð¸ Ð·Ð°Ð¿Ð¸Ñ‚Ñ– ÑÐµÑ€Ð²ÐµÑ€Ð°"
+
+#: ../lib/dictd.c:127
+msgid "Server not ready."
+msgstr "Ð¡ÐµÑ€Ð²ÐµÑ€ Ð½Ðµ Ð³Ð¾Ñ‚Ð¾Ð²Ð¸Ð¹."
+
+#: ../lib/dictd.c:140
+#, c-format
+msgid "No matches could be found for \"%s\"."
+msgstr "ÐÐµ Ð·Ð½Ð°Ð¹Ð´ÐµÐ½Ð¾ Ð²Ñ–Ð´Ð¿Ð¾Ð²Ñ–Ð´Ð½Ð¾ÑÑ‚ÐµÐ¹ Ð´Ð»Ñ \"%s\"."
+
+#: ../lib/dictd.c:162
+#, fuzzy, c-format
+msgid "%d definition found."
+msgid_plural "%d definitions found."
+msgstr[0] "%d Ð²Ñ–Ð´Ð¿Ð¾Ð²Ñ–Ð´Ð½Ð¾ÑÑ‚Ñ–(Ñ‚ÐµÐ¹) Ð·Ð½Ð°Ð¹Ð´ÐµÐ½Ð¾."
+msgstr[1] "%d Ð²Ñ–Ð´Ð¿Ð¾Ð²Ñ–Ð´Ð½Ð¾ÑÑ‚Ñ–(Ñ‚ÐµÐ¹) Ð·Ð½Ð°Ð¹Ð´ÐµÐ½Ð¾."
+msgstr[2] "%d Ð²Ñ–Ð´Ð¿Ð¾Ð²Ñ–Ð´Ð½Ð¾ÑÑ‚Ñ–(Ñ‚ÐµÐ¹) Ð·Ð½Ð°Ð¹Ð´ÐµÐ½Ð¾."
+
+#: ../lib/dictd.c:352
+#, fuzzy, c-format
+msgid "Querying %s..."
+msgstr "Ð—Ð°Ð¿Ð¸Ñ‚ÑƒÑ”Ñ‚ÑŒÑÑ ÑÐµÑ€Ð²ÐµÑ€ %s..."
+
+#: ../lib/dictd.c:392
 msgid "The server doesn't offer any databases."
 msgstr "Ð¡ÐµÑ€Ð²ÐµÑ€ Ð½Ðµ Ð¿Ñ–Ð´Ñ‚Ñ€Ð¸Ð¼ÑƒÑ” Ð¶Ð¾Ð´Ð½Ð¸Ñ… Ð±Ð°Ð· Ð´Ð°Ð½Ð¸Ñ…."
 
-#: ../panel-plugin/dict.c:894
-msgid "You have chosen an invalid dictionary entry."
-msgstr "Ð’Ð¸ Ð²Ð¸Ð±Ñ€Ð°Ð»Ð¸ Ð½ÐµÐ¿Ñ€Ð°Ð²Ð¸Ð»ÑŒÐ½Ð¸Ð¹ ÐµÐ»ÐµÐ¼ÐµÐ½Ñ‚ ÑÐ»Ð¾Ð²Ð½Ð¸ÐºÐ°."
+#: ../lib/gui.c:146
+msgid "_File"
+msgstr ""
 
-#: ../panel-plugin/dict.c:1009
-msgid "Properties"
-msgstr "Ð’Ð»Ð°ÑÑ‚Ð¸Ð²Ð¾ÑÑ‚Ñ–"
+#: ../lib/gui.c:162
+msgid "_Help"
+msgstr ""
 
-#: ../panel-plugin/dict.c:1025
-msgid "Dictionary plugin"
-msgstr "Ð Ð¾Ð·ÑˆÐ¸Ñ€ÐµÐ½Ð½Ñ ÑÐ»Ð¾Ð²Ð½Ð¸ÐºÐ°"
+#: ../lib/gui.c:212
+msgid "Text to search:"
+msgstr "Ð¢ÐµÐºÑÑ‚ Ð´Ð»Ñ Ð¿Ð¾ÑˆÑƒÐºÑƒ:"
 
-#. server address
-#: ../panel-plugin/dict.c:1042
-#, fuzzy
-msgid "Server:"
-msgstr "Ð¡ÐµÑ€Ð²ÐµÑ€ :"
+#: ../lib/gui.c:258
+msgid "Search with:"
+msgstr ""
 
-#. server port
-#: ../panel-plugin/dict.c:1054
-#, fuzzy
-msgid "Server Port:"
-msgstr "ÐŸÐ¾Ñ€Ñ‚ ÑÐµÑ€Ð²ÐµÑ€Ð° :"
+#: ../lib/gui.c:262 ../lib/prefs.c:247 ../lib/prefs.c:341
+msgid "Dict"
+msgstr "Ð¡Ð»Ð¾Ð²Ð½Ð¸Ðº"
 
-#. dictionary
-#: ../panel-plugin/dict.c:1062 ../panel-plugin/dict.c:1222
-#, fuzzy
-msgid "Dictionary:"
-msgstr "Ð¡Ð»Ð¾Ð²Ð½Ð¸Ðº :"
+#: ../lib/gui.c:268 ../lib/prefs.c:256 ../lib/prefs.c:448
+msgid "Web"
+msgstr ""
 
-#: ../panel-plugin/dict.c:1066
-msgid "* (use all)"
-msgstr "* (Ð²Ð¸ÐºÐ¾Ñ€Ð¸ÑÑ‚Ð¾Ð²ÑƒÐ²Ð°Ñ‚Ð¸ Ð²ÑÐµ)"
+#: ../lib/gui.c:274 ../lib/prefs.c:265
+msgid "Spellcheck"
+msgstr ""
 
-#: ../panel-plugin/dict.c:1068
-msgid "! (use all, stop after first match)"
-msgstr "! (Ð²Ð¸ÐºÐ¾Ñ€Ð¸ÑÑ‚Ð¾Ð²ÑƒÐ²Ð°Ñ‚Ð¸ Ð²ÑÐµ, Ð·ÑƒÐ¿Ð¸Ð½ÑÑ‚Ð¸ÑÑŒ Ð½Ð° Ð¿ÐµÑ€ÑˆÐ¾Ð¼Ñƒ Ð·Ð±Ñ–Ð³Ð¾Ð²Ñ–)"
+#: ../lib/gui.c:343
+msgid "Developer"
+msgstr "Ð Ð¾Ð·Ñ€Ð¾Ð±Ð½Ð¸Ðº"
 
-#: ../panel-plugin/dict.c:1128
-msgid "Use a DICT server"
-msgstr "Ð’Ð¸ÐºÐ¾Ñ€Ð¸ÑÑ‚Ð¾Ð²ÑƒÐ²Ð°Ñ‚Ð¸ DICT ÑÐµÑ€Ð²ÐµÑ€"
+#: ../lib/prefs.c:107
+msgid "You have chosen an invalid dictionary entry."
+msgstr "Ð’Ð¸ Ð²Ð¸Ð±Ñ€Ð°Ð»Ð¸ Ð½ÐµÐ¿Ñ€Ð°Ð²Ð¸Ð»ÑŒÐ½Ð¸Ð¹ ÐµÐ»ÐµÐ¼ÐµÐ½Ñ‚ ÑÐ»Ð¾Ð²Ð½Ð¸ÐºÐ°."
 
-#: ../panel-plugin/dict.c:1147
+#: ../lib/prefs.c:172
 msgid "dict.leo.org - German <-> English"
 msgstr "dict.leo.org - ÐÑ–Ð¼ÐµÑ†ÑŒÐºÐ¾ <-> ÐÐ½Ð³Ð»Ñ–Ð¹ÑÑŒÐºÐ¸Ð¹"
 
-#: ../panel-plugin/dict.c:1155
+#: ../lib/prefs.c:173
 msgid "dict.leo.org - German <-> French"
 msgstr "dict.leo.org - ÐÑ–Ð¼ÐµÑ†ÑŒÐºÐ¾ <-> Ð¤Ñ€Ð°Ð½Ñ†ÑƒÐ·ÑŒÐºÐ¸Ð¹"
 
-#: ../panel-plugin/dict.c:1163
+#: ../lib/prefs.c:174
 msgid "dict.leo.org - German <-> Spanish"
 msgstr "dict.leo.org - ÐÑ–Ð¼ÐµÑ†ÑŒÐºÐ¾ <-> Ð†ÑÐ¿Ð°Ð½ÑÑŒÐºÐ¸Ð¹"
 
-#: ../panel-plugin/dict.c:1170
-msgid "Use another website"
-msgstr "Ð’Ð¸ÐºÐ¾Ñ€Ð¸ÑÑ‚Ð¾Ð²ÑƒÐ²Ð°Ñ‚Ð¸ Ñ–Ð½ÑˆÐ¸Ð¹ ÑÐ°Ð¹Ñ‚"
+#: ../lib/prefs.c:175
+#, fuzzy
+msgid "dict.leo.org - German <-> Italian"
+msgstr "dict.leo.org - ÐÑ–Ð¼ÐµÑ†ÑŒÐºÐ¾ <-> ÐÐ½Ð³Ð»Ñ–Ð¹ÑÑŒÐºÐ¸Ð¹"
 
-#: ../panel-plugin/dict.c:1178
-msgid "URL:"
-msgstr "ÐŸÐ¾ÑÐ¸Ð»Ð°Ð½Ð½Ñ:"
+#: ../lib/prefs.c:176
+#, fuzzy
+msgid "dict.leo.org - German <-> Chinese"
+msgstr "dict.leo.org - ÐÑ–Ð¼ÐµÑ†ÑŒÐºÐ¾ <-> ÐÐ½Ð³Ð»Ñ–Ð¹ÑÑŒÐºÐ¸Ð¹"
 
-#: ../panel-plugin/dict.c:1191
-msgid ""
-"Enter an URL to a web site which offer translation services.\n"
-"Use {word} as placeholder for the searched word."
+#: ../lib/prefs.c:177
+#, fuzzy
+msgid "dist.cc - Dictionary"
+msgstr "Ð¡Ð»Ð¾Ð²Ð½Ð¸Ðº :"
+
+#: ../lib/prefs.c:178
+#, fuzzy
+msgid "Dictionary.com"
+msgstr "Ð¡Ð»Ð¾Ð²Ð½Ð¸Ðº :"
+
+#: ../lib/prefs.c:179
+#, fuzzy
+msgid "TheFreeDictionary.com"
+msgstr "Ð¡Ð»Ð¾Ð²Ð½Ð¸Ðº :"
+
+#: ../lib/prefs.c:180
+msgid "Clear"
+msgstr ""
+
+#: ../lib/prefs.c:239
+msgid "General"
 msgstr ""
-"Ð’Ð²ÐµÐ´Ñ–Ñ‚ÑŒ Ð¿Ð¾ÑÐ¸Ð»Ð°Ð½Ð½Ñ Ð½Ð° ÑÐ°Ð¹Ñ‚ Ð· Ð¿Ð¾ÑÐ»ÑƒÐ³Ð°Ð¼Ð¸ Ð¿ÐµÑ€ÐµÐºÐ»Ð°Ð´Ñƒ.\n"
-"Ð’Ð¸ÐºÐ¾Ñ€Ð¸ÑÑ‚Ð¾Ð²ÑƒÐ¹Ñ‚Ðµ {ÑÐ»Ð¾Ð²Ð¾} ÑÐº Ð¼Ð°ÐºÐµÑ‚ Ð´Ð»Ñ Ð¿Ð¾ÑˆÑƒÐºÑƒ ÑÐ»Ð¾Ð²Ð°."
 
-#: ../panel-plugin/dict.c:1197
-msgid "Use a web site"
-msgstr "Ð’Ð¸ÐºÐ¾Ñ€Ð¸ÑÑ‚Ð¾Ð²ÑƒÐ²Ð°Ñ‚Ð¸ ÑÐ°Ð¹Ñ‚"
+#: ../lib/prefs.c:241
+msgid "<b>Default search method:</b>"
+msgstr ""
 
-#: ../panel-plugin/dict.c:1211
-msgid "Aspell program:"
+#: ../lib/prefs.c:274
+msgid "Last used method"
 msgstr ""
 
-#: ../panel-plugin/dict.c:1252
-msgid "Use Aspell"
+#: ../lib/prefs.c:288
+msgid "<b>Panel text field:</b>"
 msgstr ""
 
-#: ../panel-plugin/dict.c:1266
+#: ../lib/prefs.c:294
 msgid "Show text field in the panel"
 msgstr "ÐŸÐ¾ÐºÐ°Ð·ÑƒÐ²Ð°Ñ‚Ð¸ Ñ‚ÐµÐºÑÑ‚Ð¾Ð²Ðµ Ð¿Ð¾Ð»Ðµ Ð² Ð¿Ð°Ð½ÐµÐ»Ñ–"
 
-#: ../panel-plugin/dict.c:1269
-msgid ""
-"This option can only be used when the panel has a horizontal orientation."
-msgstr ""
-"Ð¦ÐµÐ¹ Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€ Ð¼Ð¾Ð¶Ð½Ð° Ð²Ð¸ÐºÐ¾Ñ€Ð¸ÑÑ‚Ð°Ñ‚Ð¸ Ñ‚Ð¾Ð´Ñ–, ÐºÐ¾Ð»Ð¸ Ð¿Ð°Ð½ÐµÐ»ÑŒ Ð¼Ð°Ñ” Ð³Ð¾Ñ€Ð¸Ð·Ð¾Ð½Ñ‚Ð°Ð»ÑŒÐ½Ñƒ Ð¾Ñ€Ñ–Ñ”Ð½Ñ‚Ð°Ñ†Ñ–ÑŽ"
-
 #. panel entry size
-#: ../panel-plugin/dict.c:1275
+#: ../lib/prefs.c:301
 #, fuzzy
 msgid "Text field size:"
 msgstr "Ð Ð¾Ð·Ð¼Ñ–Ñ€ Ñ‚ÐµÐºÑÑ‚Ð¾Ð²Ð¾Ð³Ð¾ Ð¿Ð¾Ð»Ñ :"
 
-#: ../panel-plugin/dict.c:1335 ../panel-plugin/dict.c:1663
-msgid "Ready."
-msgstr "Ð“Ð¾Ñ‚Ð¾Ð²Ð¾."
+#. server address
+#: ../lib/prefs.c:344
+#, fuzzy
+msgid "Server:"
+msgstr "Ð¡ÐµÑ€Ð²ÐµÑ€ :"
 
-#: ../panel-plugin/dict.c:1408
-msgid "Text to search:"
-msgstr "Ð¢ÐµÐºÑÑ‚ Ð´Ð»Ñ Ð¿Ð¾ÑˆÑƒÐºÑƒ:"
+#. server port
+#: ../lib/prefs.c:356
+#, fuzzy
+msgid "Server Port:"
+msgstr "ÐŸÐ¾Ñ€Ñ‚ ÑÐµÑ€Ð²ÐµÑ€Ð° :"
 
-#: ../panel-plugin/dict.c:1455
-msgid "Search with:"
-msgstr ""
+#. dictionary
+#: ../lib/prefs.c:364 ../lib/prefs.c:508
+#, fuzzy
+msgid "Dictionary:"
+msgstr "Ð¡Ð»Ð¾Ð²Ð½Ð¸Ðº :"
 
-#: ../panel-plugin/dict.c:1459 ../panel-plugin/dict.desktop.in.in.h:2
-msgid "Dict"
-msgstr "Ð¡Ð»Ð¾Ð²Ð½Ð¸Ðº"
+#: ../lib/prefs.c:368
+msgid "* (use all)"
+msgstr "* (Ð²Ð¸ÐºÐ¾Ñ€Ð¸ÑÑ‚Ð¾Ð²ÑƒÐ²Ð°Ñ‚Ð¸ Ð²ÑÐµ)"
 
-#: ../panel-plugin/dict.c:1465
-msgid "Web"
-msgstr ""
+#: ../lib/prefs.c:370
+msgid "! (use all, stop after first match)"
+msgstr "! (Ð²Ð¸ÐºÐ¾Ñ€Ð¸ÑÑ‚Ð¾Ð²ÑƒÐ²Ð°Ñ‚Ð¸ Ð²ÑÐµ, Ð·ÑƒÐ¿Ð¸Ð½ÑÑ‚Ð¸ÑÑŒ Ð½Ð° Ð¿ÐµÑ€ÑˆÐ¾Ð¼Ñƒ Ð·Ð±Ñ–Ð³Ð¾Ð²Ñ–)"
 
-#: ../panel-plugin/dict.c:1471
-msgid "Spellcheck"
+#: ../lib/prefs.c:450
+msgid "<b>Web search URL:</b>"
 msgstr ""
 
-#: ../panel-plugin/dict.c:1513 ../panel-plugin/dict.desktop.in.in.h:1
-msgid "A plugin to query a Dict server."
-msgstr "Ð Ð¾Ð·ÑˆÐ¸Ñ€ÐµÐ½Ð½Ñ Ð´Ð»Ñ Ð·Ð°Ð¿Ð¸Ñ‚Ñƒ Dict ÑÐµÑ€Ð²ÐµÑ€Ñƒ."
-
-#: ../panel-plugin/dict.c:1517
-msgid "Developer"
-msgstr "Ð Ð¾Ð·Ñ€Ð¾Ð±Ð½Ð¸Ðº"
-
-#: ../panel-plugin/dict.c:1615
-msgid "Look up a word"
-msgstr "Ð”Ð¸Ð²Ð¸ÑÑŒ Ð²Ð¸Ñ‰Ðµ ÑÐ»Ð¾Ð²Ð¾"
+#: ../lib/prefs.c:456
+msgid "URL:"
+msgstr "ÐŸÐ¾ÑÐ¸Ð»Ð°Ð½Ð½Ñ:"
 
-#: ../panel-plugin/xfce4-popup-dict.c:97
-#, c-format
-msgid "Usage: %s [options]\n"
+#: ../lib/prefs.c:476
+#, fuzzy
+msgid ""
+"Enter an URL to a web site which offer translation or dictionary services.\n"
+"Use {word} as placeholder for the searched word."
 msgstr ""
+"Ð’Ð²ÐµÐ´Ñ–Ñ‚ÑŒ Ð¿Ð¾ÑÐ¸Ð»Ð°Ð½Ð½Ñ Ð½Ð° ÑÐ°Ð¹Ñ‚ Ð· Ð¿Ð¾ÑÐ»ÑƒÐ³Ð°Ð¼Ð¸ Ð¿ÐµÑ€ÐµÐºÐ»Ð°Ð´Ñƒ.\n"
+"Ð’Ð¸ÐºÐ¾Ñ€Ð¸ÑÑ‚Ð¾Ð²ÑƒÐ¹Ñ‚Ðµ {ÑÐ»Ð¾Ð²Ð¾} ÑÐº Ð¼Ð°ÐºÐµÑ‚ Ð´Ð»Ñ Ð¿Ð¾ÑˆÑƒÐºÑƒ ÑÐ»Ð¾Ð²Ð°."
 
-#: ../panel-plugin/xfce4-popup-dict.c:98
-#, c-format
-msgid "Options:\n"
+#: ../lib/prefs.c:495
+msgid "Aspell"
 msgstr ""
 
-#: ../panel-plugin/xfce4-popup-dict.c:99
-#, c-format
-msgid "    -t, --text-field    grap the focus on the text field in the panel\n"
+#: ../lib/prefs.c:497
+msgid "Aspell program:"
 msgstr ""
 
-#: ../panel-plugin/xfce4-popup-dict.c:100
-#, c-format
-msgid "    -h, --help          show this help and exit\n"
-msgstr ""
+#~ msgid "Properties"
+#~ msgstr "Ð’Ð»Ð°ÑÑ‚Ð¸Ð²Ð¾ÑÑ‚Ñ–"
 
-#: ../panel-plugin/xfce4-popup-dict.c:101
-#, c-format
-msgid ""
-"If called without any options, the xfce4-dict-plugin main window is shown.\n"
-msgstr ""
+#~ msgid "Use a DICT server"
+#~ msgstr "Ð’Ð¸ÐºÐ¾Ñ€Ð¸ÑÑ‚Ð¾Ð²ÑƒÐ²Ð°Ñ‚Ð¸ DICT ÑÐµÑ€Ð²ÐµÑ€"
+
+#~ msgid "Use another website"
+#~ msgstr "Ð’Ð¸ÐºÐ¾Ñ€Ð¸ÑÑ‚Ð¾Ð²ÑƒÐ²Ð°Ñ‚Ð¸ Ñ–Ð½ÑˆÐ¸Ð¹ ÑÐ°Ð¹Ñ‚"
+
+#~ msgid "Use a web site"
+#~ msgstr "Ð’Ð¸ÐºÐ¾Ñ€Ð¸ÑÑ‚Ð¾Ð²ÑƒÐ²Ð°Ñ‚Ð¸ ÑÐ°Ð¹Ñ‚"
+
+#~ msgid ""
+#~ "This option can only be used when the panel has a horizontal orientation."
+#~ msgstr ""
+#~ "Ð¦ÐµÐ¹ Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€ Ð¼Ð¾Ð¶Ð½Ð° Ð²Ð¸ÐºÐ¾Ñ€Ð¸ÑÑ‚Ð°Ñ‚Ð¸ Ñ‚Ð¾Ð´Ñ–, ÐºÐ¾Ð»Ð¸ Ð¿Ð°Ð½ÐµÐ»ÑŒ Ð¼Ð°Ñ” Ð³Ð¾Ñ€Ð¸Ð·Ð¾Ð½Ñ‚Ð°Ð»ÑŒÐ½Ñƒ "
+#~ "Ð¾Ñ€Ñ–Ñ”Ð½Ñ‚Ð°Ñ†Ñ–ÑŽ"
diff --git a/po/ur.po b/po/ur.po
index 6e7c544..32c23fd 100644
--- a/po/ur.po
+++ b/po/ur.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-dict-plugin 0.3.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-08 17:08+0100\n"
+"POT-Creation-Date: 2008-04-22 13:11+0200\n"
 "PO-Revision-Date: 2007-10-26 20:47+0500\n"
 "Last-Translator: Muhammad Ali Makki <makk.ma@gmail.com>\n"
 "Language-Team: Urdu <makki.ma@gmail.com>\n"
@@ -18,205 +18,327 @@ msgstr ""
 "X-Poedit-Country: PAKISTAN\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
-#: ../panel-plugin/dict.c:358 ../panel-plugin/dict.c:822
-msgid "Could not connect to server."
-msgstr "Ø³Ø±ÙˆØ± Ø³Û’ Ø±Ø§Ø¨Ø·Û Ù†ÛÛŒÚº ÛÙˆØ³Ú©Ø§."
+#: ../panel-plugin/xfce4-dict-plugin.desktop.in.in.h:1
+#, fuzzy
+msgid "A plugin to query different dictionaries."
+msgstr "Dict Ø³Ø±ÙˆØ± Ø³Û’ Ú©ÛŒÙˆØ±ÛŒ Ú©Ø§ Ù¾Ù„Ú¯ Ø§Ù†."
 
-#: ../panel-plugin/dict.c:365 ../panel-plugin/dict.c:390
-#: ../panel-plugin/dict.c:844
-msgid "Unknown error while quering the server."
-msgstr "Ø³Ø±ÙˆØ± Ø³Û’ Ø§Ø³ØªÙØ³Ø§Ø± Ú©Û’ Ø¯ÙˆØ±Ø§Ù† Ù†Ø§ Ù…Ø¹Ù„ÙˆÙ…  ØºÙ„Ø·ÛŒ."
+#: ../panel-plugin/xfce4-dict-plugin.desktop.in.in.h:2
+#, fuzzy
+msgid "Dictionary"
+msgstr "ÚˆÚ©Ø´Ù†Ø±ÛŒ:"
 
-#: ../panel-plugin/dict.c:373
-msgid "Server not ready."
-msgstr "Ø³Ø±ÙˆØ± ØªÛŒØ§Ø± Ù†ÛÛŒÚº."
+#: ../panel-plugin/xfce4-dict-plugin.c:370
+msgid "Look up a word"
+msgstr "Ø¬Ù…Ù„Û ØªÙ„Ø§Ø´ Ú©Ø±ÛŒÚº"
+
+#: ../panel-plugin/xfce4-dict-plugin.c:429 ../src/xfce4-dict.c:206
+#: ../lib/aspell.c:198 ../lib/dictd.c:138 ../lib/gui.c:96
+msgid "Ready."
+msgstr "ØªÛŒØ§Ø±."
+
+#. Note for translators: run xfce4-dict --help and copy the help text for "--help" into this one
+#: ../src/xfce4-dict.c:54
+msgid "Show help options"
+msgstr ""
+
+#: ../src/xfce4-dict.c:56
+msgid "Search the given text using a Dict server(RFC 2229)"
+msgstr ""
+
+#: ../src/xfce4-dict.c:57
+msgid "Search the given text using a web-based search engine"
+msgstr ""
+
+#: ../src/xfce4-dict.c:58
+msgid "Check the given text with a spellchecker"
+msgstr ""
+
+#: ../src/xfce4-dict.c:59
+#, fuzzy
+msgid "Grab the focus on the text field in the panel"
+msgstr "Ù…ØªÙ† ÙÛŒÙ„Úˆ Ù¾ÛŒÙ†Ù„ Ù…ÛŒÚº Ø¸Ø§ÛØ± Ú©Ø±ÛŒÚº"
+
+#: ../src/xfce4-dict.c:60
+msgid "Start stand-alone application even if the panel plugin is loaded"
+msgstr ""
+
+#: ../src/xfce4-dict.c:61
+msgid "Show version information"
+msgstr ""
 
-#: ../panel-plugin/dict.c:384
+#: ../src/xfce4-dict.c:134
+msgid "[TEXT]"
+msgstr ""
+
+#: ../src/xfce4-dict.c:158
 #, c-format
-msgid "No matches could be found for \"%s\"."
-msgstr "\"%s\" Ú©Ø§ Ú©ÙˆØ¦ÛŒ Ø¨Ú¾ÛŒ Ù…ÛŒÚ† Ù†ÛÛŒÚº Ù¾Ø§ÛŒØ§ Ú¯ÛŒØ§."
+msgid "(built on %s with GTK %d.%d.%d, GLib %d.%d.%d)"
+msgstr ""
+
+#: ../src/xfce4-dict.desktop.in.h:1 ../lib/gui.c:339
+msgid "A client program to query different dictionaries."
+msgstr ""
+
+#: ../src/xfce4-dict.desktop.in.h:2
+#, fuzzy
+msgid "Dictionary Client"
+msgstr "ÚˆÚ©Ø´Ù†Ø±ÛŒ Ù¾Ù„Ú¯ Ø§Ù†"
+
+#: ../src/xfce4-dict.desktop.in.h:3 ../lib/gui.c:189 ../lib/prefs.c:212
+#, fuzzy
+msgid "Xfce4 Dictionary"
+msgstr "ÚˆÚ©Ø´Ù†Ø±ÛŒ:"
+
+#: ../lib/aspell.c:75
+#, fuzzy, c-format
+msgid "%d suggestion found."
+msgid_plural "%d suggestions found."
+msgstr[0] "%d ÚˆÛŒÙÛŒÙ†ÛŒØ´Ù† Ù…Ù„ÛŒ ÛÛŒÚº."
+msgstr[1] "%d ÚˆÛŒÙÛŒÙ†ÛŒØ´Ù† Ù…Ù„ÛŒ ÛÛŒÚº."
 
-#: ../panel-plugin/dict.c:395
+#: ../lib/aspell.c:79
 #, c-format
-msgid "%d definition(s) found."
-msgstr "%d ÚˆÛŒÙÛŒÙ†ÛŒØ´Ù† Ù…Ù„ÛŒ ÛÛŒÚº."
+msgid "Suggestions for \"%s\":"
+msgstr ""
 
-#: ../panel-plugin/dict.c:512
+#: ../lib/aspell.c:90
 #, c-format
-msgid "Querying the server %s..."
-msgstr "Ø³Ø±ÙˆØ± %s Ú©Ùˆ Ø¯ÛŒÚ©Ú¾Ø§ Ø¬Ø§Ø±ÛØ§ ÛÛ’..."
+msgid "\"%s\" is spelled correctly."
+msgstr ""
 
-#: ../panel-plugin/dict.c:565
+#: ../lib/aspell.c:96
+#, fuzzy, c-format
+msgid "No suggestions could be found for \"%s\"."
+msgstr "\"%s\" Ú©Ø§ Ú©ÙˆØ¦ÛŒ Ø¨Ú¾ÛŒ Ù…ÛŒÚ† Ù†ÛÛŒÚº Ù¾Ø§ÛŒØ§ Ú¯ÛŒØ§."
+
+#. translation hint:
+#. * Error while executing <spell command, e.g. "aspell"> (<error message>)
+#: ../lib/aspell.c:122
+#, c-format
+msgid "Error while executing \"%s\" (%s)."
+msgstr ""
+
+#: ../lib/aspell.c:158
+msgid "Please set the aspell command in the preferences dialog."
+msgstr ""
+
+#: ../lib/aspell.c:164 ../lib/common.c:200
 msgid "Invalid input."
 msgstr "Ù†Ø§Ù…ÙˆØ²ÙˆÚº Ù…Ø§Ø¯Ø§Ø®Ù„ (Ø§Ù† Ù¾Ù¹)."
 
-#: ../panel-plugin/dict.c:575
-msgid "Invalid non-UTF8 input."
-msgstr "Ù†Ø§Ù…ÙˆØ²ÙˆÚº non-UTF8 Ù…Ø§Ø¯Ø§Ø®Ù„ (Ø§Ù† Ù¾Ù¹)."
+#: ../lib/aspell.c:202
+#, c-format
+msgid "Process failed (%s)"
+msgstr ""
 
-#: ../panel-plugin/dict.c:637
+#: ../lib/common.c:171
 msgid "Browser could not be opened. Please check your preferences."
 msgstr "Ø¨Ø±Ø§Ø¤Ø²Ø± Ù†ÛÛŒÚº Ú©Ú¾Ù„ Ø³Ú©ØªØ§. Ø§Ù¾Ù†ÛŒ ØªØ±Ø¬ÛŒØØ§Øª Ú†ÛŒÚ© Ú©Ø±ÛŒÚº."
 
-#: ../panel-plugin/dict.c:839
+#: ../lib/common.c:210
+msgid "Invalid non-UTF8 input."
+msgstr "Ù†Ø§Ù…ÙˆØ²ÙˆÚº non-UTF8 Ù…Ø§Ø¯Ø§Ø®Ù„ (Ø§Ù† Ù¾Ù¹)."
+
+#: ../lib/dictd.c:112 ../lib/dictd.c:375
+msgid "Could not connect to server."
+msgstr "Ø³Ø±ÙˆØ± Ø³Û’ Ø±Ø§Ø¨Ø·Û Ù†ÛÛŒÚº ÛÙˆØ³Ú©Ø§."
+
+#: ../lib/dictd.c:119 ../lib/dictd.c:157 ../lib/dictd.c:397
+msgid "Unknown error while quering the server."
+msgstr "Ø³Ø±ÙˆØ± Ø³Û’ Ø§Ø³ØªÙØ³Ø§Ø± Ú©Û’ Ø¯ÙˆØ±Ø§Ù† Ù†Ø§ Ù…Ø¹Ù„ÙˆÙ…  ØºÙ„Ø·ÛŒ."
+
+#: ../lib/dictd.c:127
+msgid "Server not ready."
+msgstr "Ø³Ø±ÙˆØ± ØªÛŒØ§Ø± Ù†ÛÛŒÚº."
+
+#: ../lib/dictd.c:140
+#, c-format
+msgid "No matches could be found for \"%s\"."
+msgstr "\"%s\" Ú©Ø§ Ú©ÙˆØ¦ÛŒ Ø¨Ú¾ÛŒ Ù…ÛŒÚ† Ù†ÛÛŒÚº Ù¾Ø§ÛŒØ§ Ú¯ÛŒØ§."
+
+#: ../lib/dictd.c:162
+#, fuzzy, c-format
+msgid "%d definition found."
+msgid_plural "%d definitions found."
+msgstr[0] "%d ÚˆÛŒÙÛŒÙ†ÛŒØ´Ù† Ù…Ù„ÛŒ ÛÛŒÚº."
+msgstr[1] "%d ÚˆÛŒÙÛŒÙ†ÛŒØ´Ù† Ù…Ù„ÛŒ ÛÛŒÚº."
+
+#: ../lib/dictd.c:352
+#, fuzzy, c-format
+msgid "Querying %s..."
+msgstr "Ø³Ø±ÙˆØ± %s Ú©Ùˆ Ø¯ÛŒÚ©Ú¾Ø§ Ø¬Ø§Ø±ÛØ§ ÛÛ’..."
+
+#: ../lib/dictd.c:392
 msgid "The server doesn't offer any databases."
 msgstr "Ø³Ø±ÙˆØ± Ú©ÙˆØ¦ÛŒ ÚˆÛŒÙ¹Ø§ Ø¨ÛŒØ³ Ù¾ÛŒØ´ Ù†ÛÛŒÚº Ú©Ø±ØªØ§."
 
-#: ../panel-plugin/dict.c:894
-msgid "You have chosen an invalid dictionary entry."
-msgstr "Ø¢Ù¾ Ù†Û’ ØºÙ„Ø· ÚˆÚ©Ø´Ù†Ø±ÛŒ Ø§Ù†Ù¹Ø±ÛŒ Ù…Ù†ØªØ®Ø¨ Ú©ÛŒ ÛÛ’."
+#: ../lib/gui.c:146
+msgid "_File"
+msgstr ""
 
-#: ../panel-plugin/dict.c:1009
-msgid "Properties"
-msgstr "Ø®ØµÙˆØµÛŒØ§Øª"
+#: ../lib/gui.c:162
+msgid "_Help"
+msgstr ""
 
-#: ../panel-plugin/dict.c:1025
-msgid "Dictionary plugin"
-msgstr "ÚˆÚ©Ø´Ù†Ø±ÛŒ Ù¾Ù„Ú¯ Ø§Ù†"
+#: ../lib/gui.c:212
+msgid "Text to search:"
+msgstr "Ù…ØªÙ† Ø¨Ø±Ø§Ø¦Û’ ØªÙ„Ø§Ø´:"
 
-#. server address
-#: ../panel-plugin/dict.c:1042
-#, fuzzy
-msgid "Server:"
-msgstr "Ø³Ø±ÙˆØ±:"
+#: ../lib/gui.c:258
+msgid "Search with:"
+msgstr ""
 
-#. server port
-#: ../panel-plugin/dict.c:1054
-#, fuzzy
-msgid "Server Port:"
-msgstr "Ø³Ø±ÙˆØ± Ù¾ÙˆØ±Ù¹:"
+#: ../lib/gui.c:262 ../lib/prefs.c:247 ../lib/prefs.c:341
+msgid "Dict"
+msgstr "Dict"
 
-#. dictionary
-#: ../panel-plugin/dict.c:1062 ../panel-plugin/dict.c:1222
-#, fuzzy
-msgid "Dictionary:"
-msgstr "ÚˆÚ©Ø´Ù†Ø±ÛŒ:"
+#: ../lib/gui.c:268 ../lib/prefs.c:256 ../lib/prefs.c:448
+msgid "Web"
+msgstr ""
 
-#: ../panel-plugin/dict.c:1066
-msgid "* (use all)"
-msgstr "* (Ø³Ø¨ Ø§Ø³ØªØ¹Ù…Ø§Ù„ Ú©Ø±ÛŒÚº)"
+#: ../lib/gui.c:274 ../lib/prefs.c:265
+msgid "Spellcheck"
+msgstr ""
 
-#: ../panel-plugin/dict.c:1068
-msgid "! (use all, stop after first match)"
-msgstr "! (Ø³Ø¨  Ø§Ø³ØªØ¹Ù…Ø§Ù„ Ú©Ø±ÛŒÚºØŒ Ù¾ÛÙ„Û’ Ù…ÛŒÚ† Ú©Û’ Ø¨Ø¹Ø¯ Ø±ÙˆÚ© Ø¯ÛŒÚº)"
+#: ../lib/gui.c:343
+msgid "Developer"
+msgstr "ÚˆÛŒÙˆÙ„Ù¾Ø±"
 
-#: ../panel-plugin/dict.c:1128
-msgid "Use a DICT server"
-msgstr "DICT Ø³Ø±ÙˆØ± Ø§Ø³ØªØ¹Ù…Ø§Ù„ Ú©Ø±ÛŒÚº"
+#: ../lib/prefs.c:107
+msgid "You have chosen an invalid dictionary entry."
+msgstr "Ø¢Ù¾ Ù†Û’ ØºÙ„Ø· ÚˆÚ©Ø´Ù†Ø±ÛŒ Ø§Ù†Ù¹Ø±ÛŒ Ù…Ù†ØªØ®Ø¨ Ú©ÛŒ ÛÛ’."
 
-#: ../panel-plugin/dict.c:1147
+#: ../lib/prefs.c:172
 msgid "dict.leo.org - German <-> English"
 msgstr "dict.leo.org - German <-> English"
 
-#: ../panel-plugin/dict.c:1155
+#: ../lib/prefs.c:173
 msgid "dict.leo.org - German <-> French"
 msgstr "dict.leo.org - German <-> French"
 
-#: ../panel-plugin/dict.c:1163
+#: ../lib/prefs.c:174
 msgid "dict.leo.org - German <-> Spanish"
 msgstr "dict.leo.org - German <-> Spanish"
 
-#: ../panel-plugin/dict.c:1170
-msgid "Use another website"
-msgstr "Ø¯ÙˆØ³Ø±ÛŒ ÙˆÛŒØ¨ Ø³Ø§Ø¦Ù¹"
+#: ../lib/prefs.c:175
+#, fuzzy
+msgid "dict.leo.org - German <-> Italian"
+msgstr "dict.leo.org - German <-> English"
 
-#: ../panel-plugin/dict.c:1178
-msgid "URL:"
-msgstr "URL:"
+#: ../lib/prefs.c:176
+#, fuzzy
+msgid "dict.leo.org - German <-> Chinese"
+msgstr "dict.leo.org - German <-> English"
 
-#: ../panel-plugin/dict.c:1191
-msgid ""
-"Enter an URL to a web site which offer translation services.\n"
-"Use {word} as placeholder for the searched word."
+#: ../lib/prefs.c:177
+#, fuzzy
+msgid "dist.cc - Dictionary"
+msgstr "ÚˆÚ©Ø´Ù†Ø±ÛŒ:"
+
+#: ../lib/prefs.c:178
+#, fuzzy
+msgid "Dictionary.com"
+msgstr "ÚˆÚ©Ø´Ù†Ø±ÛŒ:"
+
+#: ../lib/prefs.c:179
+#, fuzzy
+msgid "TheFreeDictionary.com"
+msgstr "ÚˆÚ©Ø´Ù†Ø±ÛŒ:"
+
+#: ../lib/prefs.c:180
+msgid "Clear"
 msgstr ""
-"ØªØ±Ø¬Ù…Û Ø®Ø¯Ù…Ø§Øª Ù¾ÛŒØ´ Ú©Ø±Ù†Û’ ÙˆØ§Ù„ÛŒ ÙˆÛŒØ¨ Ø³Ø§Ø¦Ù¹ Ú©Ø§ Ù¾ØªÛ Ù„Ú©Ú¾ÛŒÚº.\n"
-"ØªÙ„Ø§Ø´ Ú©Ø±Ø¯Û Ø¬Ù…Ù„Û Ú©Û’ Ù„ÛŒÛ’ {word} Ø¨Ø·ÙˆØ± placeholder Ø§Ø³ØªØ¹Ù…Ø§Ù„ Ú©Ø±ÛŒÚº."
 
-#: ../panel-plugin/dict.c:1197
-msgid "Use a web site"
-msgstr "ÙˆÛŒØ¨ Ø³Ø§Ø¦Ù¹ Ø§Ø³ØªØ¹Ù…Ø§Ù„ Ú©Ø±ÛŒÚº"
+#: ../lib/prefs.c:239
+msgid "General"
+msgstr ""
 
-#: ../panel-plugin/dict.c:1211
-msgid "Aspell program:"
+#: ../lib/prefs.c:241
+msgid "<b>Default search method:</b>"
+msgstr ""
+
+#: ../lib/prefs.c:274
+msgid "Last used method"
 msgstr ""
 
-#: ../panel-plugin/dict.c:1252
-msgid "Use Aspell"
+#: ../lib/prefs.c:288
+msgid "<b>Panel text field:</b>"
 msgstr ""
 
-#: ../panel-plugin/dict.c:1266
+#: ../lib/prefs.c:294
 msgid "Show text field in the panel"
 msgstr "Ù…ØªÙ† ÙÛŒÙ„Úˆ Ù¾ÛŒÙ†Ù„ Ù…ÛŒÚº Ø¸Ø§ÛØ± Ú©Ø±ÛŒÚº"
 
-#: ../panel-plugin/dict.c:1269
-msgid ""
-"This option can only be used when the panel has a horizontal orientation."
-msgstr "ÛŒÛ Ø¢Ù¾Ø´Ù† ØµØ±Ù ØªØ¨ Ø§Ø³ØªØ¹Ù…Ø§Ù„ ÛÙˆØªØ§ ÛÛ’ Ø¬Ø¨ Ù¾ÛŒÙ†Ù„ Ø§ÙÙ‚ÛŒ Ø¬ÛØªÛŒØ§Ø¨ÛŒ Ø±Ú©Ú¾ØªØ§ ÛÙˆ."
-
 #. panel entry size
-#: ../panel-plugin/dict.c:1275
+#: ../lib/prefs.c:301
 #, fuzzy
 msgid "Text field size:"
 msgstr "Ù…ØªÙ† ÙÛŒÙ„Úˆ ØØ¬Ù…:"
 
-#: ../panel-plugin/dict.c:1335 ../panel-plugin/dict.c:1663
-msgid "Ready."
-msgstr "ØªÛŒØ§Ø±."
+#. server address
+#: ../lib/prefs.c:344
+#, fuzzy
+msgid "Server:"
+msgstr "Ø³Ø±ÙˆØ±:"
 
-#: ../panel-plugin/dict.c:1408
-msgid "Text to search:"
-msgstr "Ù…ØªÙ† Ø¨Ø±Ø§Ø¦Û’ ØªÙ„Ø§Ø´:"
+#. server port
+#: ../lib/prefs.c:356
+#, fuzzy
+msgid "Server Port:"
+msgstr "Ø³Ø±ÙˆØ± Ù¾ÙˆØ±Ù¹:"
 
-#: ../panel-plugin/dict.c:1455
-msgid "Search with:"
-msgstr ""
+#. dictionary
+#: ../lib/prefs.c:364 ../lib/prefs.c:508
+#, fuzzy
+msgid "Dictionary:"
+msgstr "ÚˆÚ©Ø´Ù†Ø±ÛŒ:"
 
-#: ../panel-plugin/dict.c:1459 ../panel-plugin/dict.desktop.in.in.h:2
-msgid "Dict"
-msgstr "Dict"
+#: ../lib/prefs.c:368
+msgid "* (use all)"
+msgstr "* (Ø³Ø¨ Ø§Ø³ØªØ¹Ù…Ø§Ù„ Ú©Ø±ÛŒÚº)"
 
-#: ../panel-plugin/dict.c:1465
-msgid "Web"
-msgstr ""
+#: ../lib/prefs.c:370
+msgid "! (use all, stop after first match)"
+msgstr "! (Ø³Ø¨  Ø§Ø³ØªØ¹Ù…Ø§Ù„ Ú©Ø±ÛŒÚºØŒ Ù¾ÛÙ„Û’ Ù…ÛŒÚ† Ú©Û’ Ø¨Ø¹Ø¯ Ø±ÙˆÚ© Ø¯ÛŒÚº)"
 
-#: ../panel-plugin/dict.c:1471
-msgid "Spellcheck"
+#: ../lib/prefs.c:450
+msgid "<b>Web search URL:</b>"
 msgstr ""
 
-#: ../panel-plugin/dict.c:1513 ../panel-plugin/dict.desktop.in.in.h:1
-msgid "A plugin to query a Dict server."
-msgstr "Dict Ø³Ø±ÙˆØ± Ø³Û’ Ú©ÛŒÙˆØ±ÛŒ Ú©Ø§ Ù¾Ù„Ú¯ Ø§Ù†."
-
-#: ../panel-plugin/dict.c:1517
-msgid "Developer"
-msgstr "ÚˆÛŒÙˆÙ„Ù¾Ø±"
-
-#: ../panel-plugin/dict.c:1615
-msgid "Look up a word"
-msgstr "Ø¬Ù…Ù„Û ØªÙ„Ø§Ø´ Ú©Ø±ÛŒÚº"
+#: ../lib/prefs.c:456
+msgid "URL:"
+msgstr "URL:"
 
-#: ../panel-plugin/xfce4-popup-dict.c:97
-#, c-format
-msgid "Usage: %s [options]\n"
+#: ../lib/prefs.c:476
+#, fuzzy
+msgid ""
+"Enter an URL to a web site which offer translation or dictionary services.\n"
+"Use {word} as placeholder for the searched word."
 msgstr ""
+"ØªØ±Ø¬Ù…Û Ø®Ø¯Ù…Ø§Øª Ù¾ÛŒØ´ Ú©Ø±Ù†Û’ ÙˆØ§Ù„ÛŒ ÙˆÛŒØ¨ Ø³Ø§Ø¦Ù¹ Ú©Ø§ Ù¾ØªÛ Ù„Ú©Ú¾ÛŒÚº.\n"
+"ØªÙ„Ø§Ø´ Ú©Ø±Ø¯Û Ø¬Ù…Ù„Û Ú©Û’ Ù„ÛŒÛ’ {word} Ø¨Ø·ÙˆØ± placeholder Ø§Ø³ØªØ¹Ù…Ø§Ù„ Ú©Ø±ÛŒÚº."
 
-#: ../panel-plugin/xfce4-popup-dict.c:98
-#, c-format
-msgid "Options:\n"
+#: ../lib/prefs.c:495
+msgid "Aspell"
 msgstr ""
 
-#: ../panel-plugin/xfce4-popup-dict.c:99
-#, c-format
-msgid "    -t, --text-field    grap the focus on the text field in the panel\n"
+#: ../lib/prefs.c:497
+msgid "Aspell program:"
 msgstr ""
 
-#: ../panel-plugin/xfce4-popup-dict.c:100
-#, c-format
-msgid "    -h, --help          show this help and exit\n"
-msgstr ""
+#~ msgid "Properties"
+#~ msgstr "Ø®ØµÙˆØµÛŒØ§Øª"
 
-#: ../panel-plugin/xfce4-popup-dict.c:101
-#, c-format
-msgid ""
-"If called without any options, the xfce4-dict-plugin main window is shown.\n"
-msgstr ""
+#~ msgid "Use a DICT server"
+#~ msgstr "DICT Ø³Ø±ÙˆØ± Ø§Ø³ØªØ¹Ù…Ø§Ù„ Ú©Ø±ÛŒÚº"
+
+#~ msgid "Use another website"
+#~ msgstr "Ø¯ÙˆØ³Ø±ÛŒ ÙˆÛŒØ¨ Ø³Ø§Ø¦Ù¹"
+
+#~ msgid "Use a web site"
+#~ msgstr "ÙˆÛŒØ¨ Ø³Ø§Ø¦Ù¹ Ø§Ø³ØªØ¹Ù…Ø§Ù„ Ú©Ø±ÛŒÚº"
+
+#~ msgid ""
+#~ "This option can only be used when the panel has a horizontal orientation."
+#~ msgstr "ÛŒÛ Ø¢Ù¾Ø´Ù† ØµØ±Ù ØªØ¨ Ø§Ø³ØªØ¹Ù…Ø§Ù„ ÛÙˆØªØ§ ÛÛ’ Ø¬Ø¨ Ù¾ÛŒÙ†Ù„ Ø§ÙÙ‚ÛŒ Ø¬ÛØªÛŒØ§Ø¨ÛŒ Ø±Ú©Ú¾ØªØ§ ÛÙˆ."
diff --git a/po/xfce4-dict-plugin.pot b/po/xfce4-dict-plugin.pot
deleted file mode 100644
index 2610840..0000000
--- a/po/xfce4-dict-plugin.pot
+++ /dev/null
@@ -1,214 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-08 17:08+0100\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: ../panel-plugin/dict.c:358 ../panel-plugin/dict.c:822
-msgid "Could not connect to server."
-msgstr ""
-
-#: ../panel-plugin/dict.c:365 ../panel-plugin/dict.c:390
-#: ../panel-plugin/dict.c:844
-msgid "Unknown error while quering the server."
-msgstr ""
-
-#: ../panel-plugin/dict.c:373
-msgid "Server not ready."
-msgstr ""
-
-#: ../panel-plugin/dict.c:384
-#, c-format
-msgid "No matches could be found for \"%s\"."
-msgstr ""
-
-#: ../panel-plugin/dict.c:395
-#, c-format
-msgid "%d definition(s) found."
-msgstr ""
-
-#: ../panel-plugin/dict.c:512
-#, c-format
-msgid "Querying the server %s..."
-msgstr ""
-
-#: ../panel-plugin/dict.c:565
-msgid "Invalid input."
-msgstr ""
-
-#: ../panel-plugin/dict.c:575
-msgid "Invalid non-UTF8 input."
-msgstr ""
-
-#: ../panel-plugin/dict.c:637
-msgid "Browser could not be opened. Please check your preferences."
-msgstr ""
-
-#: ../panel-plugin/dict.c:839
-msgid "The server doesn't offer any databases."
-msgstr ""
-
-#: ../panel-plugin/dict.c:894
-msgid "You have chosen an invalid dictionary entry."
-msgstr ""
-
-#: ../panel-plugin/dict.c:1009
-msgid "Properties"
-msgstr ""
-
-#: ../panel-plugin/dict.c:1025
-msgid "Dictionary plugin"
-msgstr ""
-
-#. server address
-#: ../panel-plugin/dict.c:1042
-msgid "Server:"
-msgstr ""
-
-#. server port
-#: ../panel-plugin/dict.c:1054
-msgid "Server Port:"
-msgstr ""
-
-#. dictionary
-#: ../panel-plugin/dict.c:1062 ../panel-plugin/dict.c:1222
-msgid "Dictionary:"
-msgstr ""
-
-#: ../panel-plugin/dict.c:1066
-msgid "* (use all)"
-msgstr ""
-
-#: ../panel-plugin/dict.c:1068
-msgid "! (use all, stop after first match)"
-msgstr ""
-
-#: ../panel-plugin/dict.c:1128
-msgid "Use a DICT server"
-msgstr ""
-
-#: ../panel-plugin/dict.c:1147
-msgid "dict.leo.org - German <-> English"
-msgstr ""
-
-#: ../panel-plugin/dict.c:1155
-msgid "dict.leo.org - German <-> French"
-msgstr ""
-
-#: ../panel-plugin/dict.c:1163
-msgid "dict.leo.org - German <-> Spanish"
-msgstr ""
-
-#: ../panel-plugin/dict.c:1170
-msgid "Use another website"
-msgstr ""
-
-#: ../panel-plugin/dict.c:1178
-msgid "URL:"
-msgstr ""
-
-#: ../panel-plugin/dict.c:1191
-msgid ""
-"Enter an URL to a web site which offer translation services.\n"
-"Use {word} as placeholder for the searched word."
-msgstr ""
-
-#: ../panel-plugin/dict.c:1197
-msgid "Use a web site"
-msgstr ""
-
-#: ../panel-plugin/dict.c:1211
-msgid "Aspell program:"
-msgstr ""
-
-#: ../panel-plugin/dict.c:1252
-msgid "Use Aspell"
-msgstr ""
-
-#: ../panel-plugin/dict.c:1266
-msgid "Show text field in the panel"
-msgstr ""
-
-#: ../panel-plugin/dict.c:1269
-msgid ""
-"This option can only be used when the panel has a horizontal orientation."
-msgstr ""
-
-#. panel entry size
-#: ../panel-plugin/dict.c:1275
-msgid "Text field size:"
-msgstr ""
-
-#: ../panel-plugin/dict.c:1335 ../panel-plugin/dict.c:1663
-msgid "Ready."
-msgstr ""
-
-#: ../panel-plugin/dict.c:1408
-msgid "Text to search:"
-msgstr ""
-
-#: ../panel-plugin/dict.c:1455
-msgid "Search with:"
-msgstr ""
-
-#: ../panel-plugin/dict.c:1459 ../panel-plugin/dict.desktop.in.in.h:2
-msgid "Dict"
-msgstr ""
-
-#: ../panel-plugin/dict.c:1465
-msgid "Web"
-msgstr ""
-
-#: ../panel-plugin/dict.c:1471
-msgid "Spellcheck"
-msgstr ""
-
-#: ../panel-plugin/dict.c:1513 ../panel-plugin/dict.desktop.in.in.h:1
-msgid "A plugin to query a Dict server."
-msgstr ""
-
-#: ../panel-plugin/dict.c:1517
-msgid "Developer"
-msgstr ""
-
-#: ../panel-plugin/dict.c:1615
-msgid "Look up a word"
-msgstr ""
-
-#: ../panel-plugin/xfce4-popup-dict.c:97
-#, c-format
-msgid "Usage: %s [options]\n"
-msgstr ""
-
-#: ../panel-plugin/xfce4-popup-dict.c:98
-#, c-format
-msgid "Options:\n"
-msgstr ""
-
-#: ../panel-plugin/xfce4-popup-dict.c:99
-#, c-format
-msgid "    -t, --text-field    grap the focus on the text field in the panel\n"
-msgstr ""
-
-#: ../panel-plugin/xfce4-popup-dict.c:100
-#, c-format
-msgid "    -h, --help          show this help and exit\n"
-msgstr ""
-
-#: ../panel-plugin/xfce4-popup-dict.c:101
-#, c-format
-msgid ""
-"If called without any options, the xfce4-dict-plugin main window is shown.\n"
-msgstr ""
-- 
GitLab