localisation improved;

git-svn-id: file:///svnroot/mdictionary/trunk@56 5bde0345-f819-0410-ac75-e5045f9217cc

diff --git a/data/locale/en_GB.po b/data/locale/en_GB.po
index cc5b19b..c2d454f 100644 (file)
--- a/data/locale/en_GB.po
+++ b/data/locale/en_GB.po
@@ -19,7 +19,6 @@ msgstr ""
 msgid "ws_check"
 msgstr "OK"
 
-
 #: ../gui/src/ws_gui_layout.c:42
 msgid "ws_ni_welcome"
 msgstr "Welcome to mDictionary!"

diff --git a/data/locale/pl_PL.po b/data/locale/pl_PL.po
index 305a92a..17da4de 100644 (file)
--- a/data/locale/pl_PL.po
+++ b/data/locale/pl_PL.po
@@ -15,46 +15,18 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: ../gui/src/ws_gui.c:49
+msgid "ws_check"
+msgstr "OK"
+
 #: ../gui/src/ws_gui_layout.c:42
 msgid "ws_ni_welcome"
-msgstr "<font size=+2><center><br>Witamy w słowniku<br><b>WhiteStork</b><br>"
-       "</font><br><IMG SRC=file:/usr/share/pixmaps/whitestork.png></center>"
-
-#: ../gui/src/ws_gui_layout.c:45 ../gui/src/ws_gui_callbacks.c:143
-#: ../gui/src/ws_gui_callbacks.c:854 ../gui/src/ws_gui_callbacks.c:980
-msgid " "
-msgstr ""
-
-#: ../gui/src/ws_gui_layout.c:63 ../gui/src/ws_gui_layout.c:1318
-msgid "WhiteStork"
-msgstr ""
-
-#: ../gui/src/ws_gui_layout.c:111 ../gui/src/ws_gui_layout.c:1328
-#: ../gui/src/ws_gui_layout.c:1335
-msgid "Tahoma 12"
-msgstr ""
-
-#: ../gui/src/ws_gui_layout.c:116
-msgid "url_requested"
-msgstr ""
+msgstr "Witamy w mDictionary!"
 
 #: ../gui/src/ws_gui_layout.c:174 ../gui/src/ws_gui_layout.c:351
 msgid "ws_me_search_find"
 msgstr "Znajdz"
 
-#: ../gui/src/ws_gui_layout.c:212
-msgid "search"
-msgstr ""
-
-#: ../gui/src/ws_gui_layout.c:217
-msgid "toggled"
-msgstr ""
-
-#: ../gui/src/ws_gui_layout.c:222 ../gui/src/ws_gui_layout.c:227
-#: ../gui/src/ws_gui_layout.c:231
-msgid "clicked"
-msgstr ""
-
 #: ../gui/src/ws_gui_layout.c:266
 msgid "ws_me_dictionaries"
 msgstr "Slowniki"
@@ -155,24 +127,6 @@ msgstr "Znajdź poprzedni"
 msgid "ws_me_search_stop"
 msgstr "Zatrzymaj"
 
-#: ../gui/src/ws_gui_layout.c:410 ../gui/src/ws_gui_layout.c:415
-#: ../gui/src/ws_gui_layout.c:420 ../gui/src/ws_gui_layout.c:425
-#: ../gui/src/ws_gui_layout.c:429 ../gui/src/ws_gui_layout.c:434
-#: ../gui/src/ws_gui_layout.c:439 ../gui/src/ws_gui_layout.c:444
-#: ../gui/src/ws_gui_layout.c:449 ../gui/src/ws_gui_layout.c:454
-#: ../gui/src/ws_gui_layout.c:459 ../gui/src/ws_gui_layout.c:464
-#: ../gui/src/ws_gui_layout.c:469 ../gui/src/ws_gui_layout.c:474
-#: ../gui/src/ws_gui_layout.c:479 ../gui/src/ws_gui_layout.c:484
-#: ../gui/src/ws_gui_layout.c:489 ../gui/src/ws_gui_layout.c:494
-#: ../gui/src/ws_gui_layout.c:499 ../gui/src/ws_gui_layout.c:504
-#: ../gui/src/ws_gui_layout.c:509 ../gui/src/ws_gui_layout.c:515
-#: ../gui/src/ws_gui_layout.c:521 ../gui/src/ws_gui_layout.c:621
-#: ../gui/src/ws_gui_layout.c:626 ../gui/src/ws_gui_layout.c:631
-#: ../gui/src/ws_gui_layout.c:636 ../gui/src/ws_gui_layout.c:641
-#: ../gui/src/ws_gui_layout.c:645
-msgid "activate"
-msgstr ""
-
 #: ../gui/src/ws_gui_layout.c:560
 msgid "ws_mp_search"
 msgstr "Znajdź"
@@ -201,22 +155,10 @@ msgstr "Powiększ"
 msgid "ws_mp_zoom_out"
 msgstr "Pomniejsz"
 
-#: ../gui/src/ws_gui_layout.c:708 ../gui/src/ws_gui_layout.c:868
-#: ../gui/src/ws_gui_layout.c:1185
-msgid ""
-"\n"
-".::GUI::. /apps/WhiteStork/Dictionaries does not exist!!"
-msgstr ""
-
 #: ../gui/src/ws_gui_layout.c:712 ../gui/src/ws_gui_layout.c:904
 msgid "ws_ti_choose_dictionaries_title"
 msgstr "Wybierz słowniki"
 
-#: ../gui/src/ws_gui_layout.c:741 ../gui/src/ws_gui_layout.c:794
-#: ../gui/src/ws_gui_layout.c:811 ../gui/src/ws_gui_layout.c:1065
-msgid "/active"
-msgstr ""
-
 #: ../gui/src/ws_gui_layout.c:767 ../gui/src/ws_gui_layout.c:941
 #: ../gui/src/ws_gui_layout.c:1233 ../gui/src/ws_gui_layout.c:1427
 #: ../gui/src/ws_gui_layout.c:1488
@@ -228,18 +170,6 @@ msgstr "Anuluj"
 msgid "ws_db_ok"
 msgstr "OK"
 
-#: ../gui/src/ws_gui_layout.c:792 ../gui/src/ws_gui_layout.c:809
-#: ../gui/src/ws_gui_layout.c:966 ../gui/src/ws_gui_layout.c:986
-#: ../gui/src/ws_gui_layout.c:1055 ../gui/src/ws_gui_layout.c:1063
-#: ../gui/src/ws_gui_layout.c:1097 ../gui/src/ws_gui_layout.c:1257
-msgid "/"
-msgstr ""
-
-#: ../gui/src/ws_gui_layout.c:876 ../gui/src/ws_gui_layout.c:968
-#: ../gui/src/ws_gui_layout.c:988 ../gui/src/ws_gui_layout.c:1099
-msgid "/optimized"
-msgstr ""
-
 #: ../gui/src/ws_gui_layout.c:892
 msgid "ws_ni_no_dictionaries_to_optimize"
 msgstr "Brak słowników do zoptymalizowania."
@@ -248,21 +178,13 @@ msgstr "Brak słowników do zoptymalizowania."
 msgid "ws_ti_load_dictionary_title"
 msgstr "Załaduj słownik"
 
-#: ../gui/src/ws_gui_layout.c:1051
-msgid ".xdxf"
-msgstr ""
-
-#: ../gui/src/ws_gui_layout.c:1055
-msgid "/path"
-msgstr ""
-
 #: ../gui/src/ws_gui_layout.c:1074
 msgid "ws_ni_dictionaries_activation_question"
 msgstr "Czy chcesz zacząć używać ten słownik już teraz?"
 
 #: ../gui/src/ws_gui_layout.c:1106
 msgid "ws_ni_dictionaries_optimalization_question"
-msgstr ""
+msgstr "Czy chcesz zoptymalizowac ten słownik teraz?"
 
 #: ../gui/src/ws_gui_layout.c:1131
 msgid "ws_ni_dictionary_added"
@@ -276,10 +198,6 @@ msgstr "Zły plik słownika."
 msgid "ws_ti_remove_dictionaries_title"
 msgstr "Usuń słowniki"
 
-#: ../gui/src/ws_gui_layout.c:1226
-msgid "bookmarks"
-msgstr ""
-
 #: ../gui/src/ws_gui_layout.c:1239
 msgid "ws_bd_remove_dictionaries_remove_selected"
 msgstr "usuń zaznaczone"
@@ -288,45 +206,6 @@ msgstr "usuń zaznaczone"
 msgid "ws_ti_about_title"
 msgstr "O Programie ..."
 
-#: ../gui/src/ws_gui_layout.c:1315
-msgid "/usr/share/pixmaps/whitestork.png"
-msgstr ""
-
-#: ../gui/src/ws_gui_layout.c:1319
-msgid "Tahoma 18"
-msgstr ""
-
-#: ../gui/src/ws_gui_layout.c:1321
-msgid "__________"
-msgstr ""
-
-#: ../gui/src/ws_gui_layout.c:1324
-msgid ""
-"Maemo Multilingual Dictionary\n"
-"ver. "
-msgstr ""
-
-#: ../gui/src/ws_gui_layout.c:1333
-msgid ""
-"Copyright 2006, ComArch S.A\n"
-"All rightsreserved"
-msgstr ""
-
-#: ../gui/src/ws_gui_layout.c:1355
-msgid "Tahoma 10"
-msgstr ""
-
-#: ../gui/src/ws_gui_layout.c:1363
-msgid ""
-"The following third party\n"
-"components may be\n"
-"included depending \n"
-"on your system configuration:\n"
-"\n"
-"D-BUS - License information:\n"
-"http://opensource.org/licenses/academic.php"
-msgstr ""
-
 #: ../gui/src/ws_gui_layout.c:1401
 msgid "ws_ti_add_bookmark"
 msgstr "Dodaj do zakładek"
@@ -335,18 +214,6 @@ msgstr "Dodaj do zakładek"
 msgid "ws_ti_bookmarks_add_question"
 msgstr "Dodać do zakładek?"
 
-#: ../gui/src/ws_gui_layout.c:1437
-msgid ""
-"\n"
-".::GUI::. Bookmark added, happy days! :D\n"
-msgstr ""
-
-#: ../gui/src/ws_gui_layout.c:1444
-msgid ""
-"\n"
-".::GUI::. Sorry ;-("
-msgstr ""
-
 #: ../gui/src/ws_gui_layout.c:1449
 msgid "ws_ni_bookmark_added"
 msgstr "Zakładka została dodana"
@@ -364,19 +231,6 @@ msgstr "Usuń zakładkę"
 msgid "ws_ni_remove_bookmark_question"
 msgstr "Usunąć z zakładek?"
 
-#: ../gui/src/ws_gui_layout.c:1498
-msgid ""
-"\n"
-".::GUI::. Bookmark removed, well done! :D\n"
-msgstr ""
-
-#: ../gui/src/ws_gui_layout.c:1504
-msgid ""
-"\n"
-".::GUI::. Sorry\n"
-msgstr ""
-
-
 #: ../gui/src/ws_gui_layout.c:1515
 msgid "ws_ni_bookmark_removed"
 msgstr "Zakładkę usunieto."
@@ -385,16 +239,6 @@ msgstr "Zakładkę usunieto."
 msgid "ws_ni_bookmark_not_removed"
 msgstr "Zakładka nie mogła zostać usunięta"
 
-#: ../gui/src/ws_gui_callbacks.c:44
-#, c-format
-msgid "XDXF->%s() start counting time for function '%s()'.\n"
-msgstr ""
-
-#: ../gui/src/ws_gui_callbacks.c:74
-#, c-format
-msgid "XDXF->%s() function '%s()' was working for: %g [s] or %ld [us].\n"
-msgstr ""
-
 #: ../gui/src/ws_gui_callbacks.c:114
 msgid "ws_ni_error_occured"
 msgstr "Wystąpił błąd."
@@ -419,27 +263,10 @@ msgstr "Słownik niedostępny."
 msgid "ws_ni_no_words_found"
 msgstr "Nie znaleziono słów."
 
-#: ../gui/src/ws_gui_callbacks.c:758
-msgid "Name"
-msgstr ""
-
-#: ../gui/src/ws_gui_callbacks.c:760
-msgid "text"
-msgstr ""
-
-#: ../gui/src/ws_gui_callbacks.c:857 ../gui/src/ws_gui_callbacks.c:909
-#: ../gui/src/ws_gui_callbacks.c:915 ../gui/src/ws_gui_callbacks.c:960
-msgid "prefix"
-msgstr ""
-
 #: ../gui/src/ws_gui_callbacks.c:867
 msgid "ws_ni_no_text_selected"
 msgstr "Zaznacz tekst."
 
-#: ../gui/src/ws_gui_callbacks.c:913
-msgid "\n"
-msgstr ""
-
 #: ../gui/src/ws_gui_callbacks.c:970
 msgid "ws_ab_searching"
 msgstr "Wyszukiwanie ..."
@@ -452,99 +279,39 @@ msgstr "Nie wpisano słowa."
 msgid "ws_ni_search_aborted"
 msgstr "Wyszukiwanie zostało przerwane."
 
-#: ../gui/src/ws_gui_callbacks.c:1112
-msgid "file:"
-msgstr ""
-
-#: ../gui/src/ws_gui_callbacks.c:1160
-msgid "button-press-event"
-msgstr ""
-
-#: ../gui/src/ws_gui_callbacks.c:1268 ../gui/src/ws_gui_callbacks.c:1270
-#: ../gui/src/ws_gui_callbacks.c:1283
-msgid "<PATTERN_OPEN>"
-msgstr ""
-
-#: ../gui/src/ws_gui_callbacks.c:1277
-msgid ""
-"<html><head></head><body><center><table width=\"95%\"><tr><td><table "
-"border=1 width=100%><tr><th background=\"file:/usr/share/pixmaps/ws_top.png"
-"\"><img align=left src=\"file:/usr/share/pixmaps/engine_xdxf_icon.png"
-"\"><font color=\"#eeeeee\">"
-msgstr ""
-
-#: ../gui/src/ws_gui_callbacks.c:1289 ../gui/src/ws_gui_callbacks.c:1291
-#: ../gui/src/ws_gui_callbacks.c:1299
-msgid "<PATTERN_CLOSED>"
-msgstr ""
-
-#: ../gui/src/ws_gui_callbacks.c:1297
-msgid "</font></th></tr></table>"
-msgstr ""
-
-#: ../gui/src/ws_gui_callbacks.c:1305 ../gui/src/ws_gui_callbacks.c:1307
-#: ../gui/src/ws_gui_callbacks.c:1316
-msgid "<TRANSLATION_OPEN>"
-msgstr ""
-
-#: ../gui/src/ws_gui_callbacks.c:1313
-msgid ""
-"<table border=1 width=100%><tr><td background=\"file:/usr/share/pixmaps/"
-"ws_tra.png\">"
-msgstr ""
-
-#: ../gui/src/ws_gui_callbacks.c:1322 ../gui/src/ws_gui_callbacks.c:1324
-#: ../gui/src/ws_gui_callbacks.c:1332
-msgid "<TRANSLATION_CLOSED>"
-msgstr ""
-
-#: ../gui/src/ws_gui_callbacks.c:1330
-msgid "</td></tr></table></center><br>"
-msgstr ""
-
-#: ../gui/src/ws_gui_callbacks.c:1339
-msgid "</td></tr></table></body></html>"
-msgstr ""
-
-#: ../gui/src/ws_gui_callbacks.c:1341
-#, c-format
-msgid ".::GUI::. Zawartosc stringa to: \"%s\""
-msgstr ""
+#: ../gui/src/ws_gui_callbacks.c:1412
+msgid "ws_ni_select_word_to_add"
+msgstr "Wybierz słowo do dodania."
 
-#: ../gui/src/ws_gui_callbacks.c:1345
-#, c-format
-msgid ".::GUI::. Zawartosc RAW to: \"%s\""
-msgstr ""
+#: ../gui/src/ws_gui_callbacks.c:1436
+msgid "ws_ni_select_word_to_remove"
+msgstr "Wybierz słowo do usunięcia."
 
-#: ../gui/src/ws_gui_callbacks.c:1362 ../gui/src/ws_gui_callbacks.c:1384
-msgid "/bookmarks"
-msgstr ""
+#: ../gui/src/ws_gui_callbacks.c:1128
+msgid "ws_ib_max_zoom"
+msgstr "Nie można bardziej powiększyć"
 
-#: ../gui/src/ws_gui_callbacks.c:1362 ../gui/src/ws_gui_callbacks.c:1384
-msgid "active"
-msgstr ""
+#: ../gui/src/ws_gui_callbacks.c:1152
+msgid "ws_ib_min_zoom"
+msgstr "Nie można bardziej pomniejszyć"
 
-#: ../gui/src/ws_gui_callbacks.c:1366
-msgid ""
-"\n"
-".::GUI::. Bookmark mode on\n"
-msgstr ""
+#: ../gui/src/ws_gui_callbacks.c:1161
+msgid "ws_ib_zoom_in"
+msgstr "Powiększenie"
 
-#: ../gui/src/ws_gui_callbacks.c:1388
-msgid ""
-"\n"
-".::GUI::. Bookmark mode off\n"
-msgstr ""
+#: ../gui/src/ws_gui_callbacks.c:1134
+msgid "ws_ib_zoom_out"
+msgstr "Pomniejszenie"
 
-#: ../gui/src/ws_gui_callbacks.c:1402 ../gui/src/ws_gui_callbacks.c:1426
-#, c-format
-msgid ".::GUI::. LAST_WORD: \"%s\""
-msgstr ""
+#: ../gui/src/ws_gui_callbacks.c:1018
+msgid "ws_ib_fullscreen_on"
+msgstr "Pełen ekran włączony"
 
-#: ../gui/src/ws_gui_callbacks.c:1412
-msgid "ws_ni_select_word_to_add"
-msgstr "Wybierz słowo do dodania."
+#: ../gui/src/ws_gui_callbacks.c:1029
+msgid "ws_ib_fullscreen_off"
+msgstr "Pełen ekran wyłączony"
 
-#: ../gui/src/ws_gui_callbacks.c:1436
-msgid "ws_ni_select_word_to_remove"
-msgstr "Wybierz słowo do usunięcia."
+#: ../gui/src/ws_gui_callbacks.c:1124
+#: ../gui/src/ws_gui_callbacks.c:1157
+msgid "ws_ib_zoom_default"
+msgstr "Domyślna wartość powiększenia"

diff --git a/src/gui/include/ws_gui.h b/src/gui/include/ws_gui.h
index 7e1c1a5..0dda49b 100644 (file)
--- a/src/gui/include/ws_gui.h
+++ b/src/gui/include/ws_gui.h
@@ -55,6 +55,7 @@ extern "C" {
 #define ZOOM_MIN 1
 #define ZOOM_MAX 4
 #define ZOOM_STEP 0.1
+#define ZOOM_DEFAULT 1.5
 #define PRESS_TIME 1.0
 #define HISTORY_LEN 5
 #define SCROLL_STEP_H 50

diff --git a/src/gui/src/ws_gui_callbacks.c b/src/gui/src/ws_gui_callbacks.c
index d06e7cc..e4fba67 100644 (file)
--- a/src/gui/src/ws_gui_callbacks.c
+++ b/src/gui/src/ws_gui_callbacks.c
@@ -1117,6 +1117,12 @@ void ws_gui_html_zoom_in(GtkMenuItem *menuitem, gpointer user_data)
        gtk_infoprint(GTK_WINDOW(ws_gui_app->ws_gui_hildon_window),
                                  _("ws_ib_zoom_in"));
        }
+       
+       if (ws_gui_app->zoom == ZOOM_DEFAULT)
+       {
+               gtk_infoprint(GTK_WINDOW(ws_gui_app->ws_gui_hildon_window),
+                                 _("ws_ib_zoom_default"));
+       }
 }
 
 /** zoom out text in translation (html) area
@@ -1144,6 +1150,12 @@ void ws_gui_html_zoom_out(GtkMenuItem *menuitem, gpointer user_data)
        gtk_infoprint(GTK_WINDOW(ws_gui_app->ws_gui_hildon_window),
                                  _("ws_ib_zoom_out"));
        }
+
+       if (ws_gui_app->zoom == ZOOM_DEFAULT)
+       {
+               gtk_infoprint(GTK_WINDOW(ws_gui_app->ws_gui_hildon_window),
+                                 _("ws_ib_zoom_default"));
+       }
 }
 
 /** start searching, send typed word to DBUS and query for words
@@ -1599,6 +1611,12 @@ void ws_gui_dictionary_open_bookmark(GtkMenuItem *menuitem, gpointer user_data)
                                       NULL);
        ws_dbus_notify(ws_gui_app->dbus_data, WS_DBUS_BOOKMARK_MODE_ON);
        
+       ws_gui_app->ws_gui_history = g_array_remove_range (ws_gui_app->ws_gui_history, 0, ws_gui_app->ws_gui_history->len);
+       ws_gui_app->ws_gui_history_list = g_array_remove_range (ws_gui_app->ws_gui_history_list, 0, ws_gui_app->ws_gui_history_list->len);
+       ws_gui_app->ws_gui_history_iter = g_array_remove_range (ws_gui_app->ws_gui_history_iter, 0, ws_gui_app->ws_gui_history_iter->len);
+       ws_gui_app->ws_gui_history_cur_pos = -1;
+       ws_gui_check_history(ws_gui_app);
+       
        ws_gui_fill_html(" ", ws_gui_app);
        //ws_dbus_client_find_word(ws_gui_app->dbus_data, "*");
        ws_gui_search(NULL, ws_gui_app);
@@ -1623,6 +1641,14 @@ void ws_gui_dictionary_close_bookmark(GtkMenuItem *menuitem, gpointer user_data)
         ws_gui_app->bookmark_mode = FALSE;
        ws_gui_set_bookmarks_sensitivity(ws_gui_app);   
        ws_dbus_notify(ws_gui_app->dbus_data, WS_DBUS_BOOKMARK_MODE_OFF);
+
+       ws_gui_app->ws_gui_history = g_array_remove_range (ws_gui_app->ws_gui_history, 0, ws_gui_app->ws_gui_history->len);
+       ws_gui_app->ws_gui_history_list = g_array_remove_range (ws_gui_app->ws_gui_history_list, 0, ws_gui_app->ws_gui_history_list->len);
+       ws_gui_app->ws_gui_history_iter = g_array_remove_range (ws_gui_app->ws_gui_history_iter, 0, ws_gui_app->ws_gui_history_iter->len);
+       ws_gui_app->ws_gui_history_cur_pos = -1;
+       ws_gui_check_history(ws_gui_app);
+       
+
        ws_gui_fill_html(" ", ws_gui_app);
        g_strstrip(ws_gui_app->last_searched);
        if (ws_gui_app->last_searched != NULL) 
@@ -1671,8 +1697,6 @@ void ws_gui_dictionary_add_bookmark(GtkMenuItem *menuitem, gpointer user_data)
                               GTK_WINDOW(ws_gui_app->ws_gui_hildon_window),
                               _("ws_ni_select_word_to_add"));
        }
-       
-       
 }
 
 /** removes bookmark from bookmarks database 

diff --git a/src/gui/src/ws_gui_layout.c b/src/gui/src/ws_gui_layout.c
index 7a1185f..66c5222 100644 (file)
--- a/src/gui/src/ws_gui_layout.c
+++ b/src/gui/src/ws_gui_layout.c
@@ -52,7 +52,7 @@ void ws_gui_create_window(gpointer user_data)
        ws_gui_app->bookmark_mode = FALSE;
        ws_gui_app->bookmark_avail = TRUE;
        
-       ws_gui_app->zoom = 1;
+       ws_gui_app->zoom = ZOOM_DEFAULT;
 
         ws_gui_app->timer = g_timer_new();
         g_timer_stop(ws_gui_app->timer);
@@ -904,9 +904,12 @@ void ws_gui_dictionary_chooser(GtkMenuItem *menuitem, gpointer user_data)
        
                ws_dbus_notify(ws_gui_app->dbus_data, 
                                WS_DBUS_INFO_CONFIG_CHANGED);
-               //g_array_free(ws_gui_app->ws_gui_history, TRUE);
-       
-               //ws_gui_app->ws_gui_history = g_array_remove_range (ws_gui_app->ws_gui_history, 0, ws_gui_app->ws_gui_history->len);
+
+               ws_gui_app->ws_gui_history = g_array_remove_range (ws_gui_app->ws_gui_history, 0, ws_gui_app->ws_gui_history->len);
+               ws_gui_app->ws_gui_history_list = g_array_remove_range (ws_gui_app->ws_gui_history_list, 0, ws_gui_app->ws_gui_history_list->len);
+               ws_gui_app->ws_gui_history_iter = g_array_remove_range (ws_gui_app->ws_gui_history_iter, 0, ws_gui_app->ws_gui_history_iter->len);
+               ws_gui_app->ws_gui_history_cur_pos = -1;
+               ws_gui_check_history(ws_gui_app);
        
                gtk_widget_destroy (dialog1);
        }
@@ -1106,27 +1109,12 @@ void ws_gui_dictionary_loader(GtkMenuItem *menuitem, gpointer user_data)
         WSGuiApp* ws_gui_app=(WSGuiApp*)user_data;
 
         GtkWidget *dialog;
-        GtkWidget *dialog2;
-
-        /*dialog = gtk_file_chooser_dialog_new(_("ws_ti_load_dictionary_title"),
-                                   GTK_WINDOW(ws_gui_app->ws_gui_hildon_window),
-                                   GTK_FILE_CHOOSER_ACTION_SAVE, GTK_STOCK_OK,
-                                   GTK_RESPONSE_OK,
-                                   GTK_STOCK_CANCEL,
-                                   GTK_RESPONSE_CANCEL,
-                                   NULL);*/
-       
+        GtkWidget *dialog2;    
 
        dialog = hildon_file_chooser_dialog_new(
                                GTK_WINDOW(ws_gui_app->ws_gui_hildon_window),
                                GTK_FILE_CHOOSER_ACTION_OPEN);
  
-
-       /*dialog = hildon_file_chooser_dialog_new(
-               GTK_WINDOW(ws_gui_app->ws_gui_hildon_window), 
-                          GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER);
-       */
-
        gtk_window_set_default_size(GTK_WINDOW (dialog), 200, 200);
         gtk_file_chooser_set_local_only (GTK_FILE_CHOOSER(dialog), FALSE);
 
@@ -1141,14 +1129,15 @@ void ws_gui_dictionary_loader(GtkMenuItem *menuitem, gpointer user_data)
                 gchar *filepath;
 
                 gchar* tmp;
-
+               
                 filename = gtk_file_chooser_get_filename(
                                                      GTK_FILE_CHOOSER (dialog));
                 name = g_path_get_basename(filename);
                 len = strlen(filename) - strlen(name) -1;
                 tmp = g_strndup (filename, len);
-
+                               
                 tmp = g_path_get_basename(tmp);
+               //gchar *tmp2 = g_strndup(name, (g_strrstr(name, ".") - name));
 
                 if (g_str_has_suffix(name, ".xdxf") 
                        || g_str_has_suffix(name, ".idx")