now it is all working well - banners have been added; localisation files have been...

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

diff --git a/data/locale/en_GB.po b/data/locale/en_GB.po
index 6dad29c..93d1c6d 100644 (file)
--- a/data/locale/en_GB.po
+++ b/data/locale/en_GB.po
@@ -1,6 +1,6 @@
 # Copyright (C) 2006
 # This file is distributed under the same license as the PACKAGE package.
-# Anna Gadomska R <Anna.Gadomska@comarch.pl>, 2006.
+# Anna Gadomska <Anna.Gadomska@comarch.pl>, 2006.
 #
 #, fuzzy
 msgid ""
@@ -15,49 +15,14 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../gui/src/qs_gui.c:39
-msgid "ws_check"
-msgstr "OK"
-
 #: ../gui/src/ws_gui_layout.c:42
 msgid "ws_ni_welcome"
-msgstr "Welcome to WhiteStork Dictionary!"
-
-#: ../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 "Welcome to mDictionary!"
 
 #: ../gui/src/ws_gui_layout.c:174 ../gui/src/ws_gui_layout.c:351
 msgid "ws_me_search_find"
 msgstr "Find"
 
-#: ../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 "Dictionaries"
@@ -116,7 +81,7 @@ msgstr "Add Bookmark"
 
 #: ../gui/src/ws_gui_layout.c:309
 msgid "ws_me_bookmarks_remove"
-msgstr "Remove bookmark"
+msgstr "Remove Bookmark"
 
 #: ../gui/src/ws_gui_layout.c:321
 msgid "ws_me_edit_copy"
@@ -144,7 +109,7 @@ msgstr "Zoom out"
 
 #: ../gui/src/ws_gui_layout.c:340
 msgid "ws_me_view_fullscreen"
-msgstr "Fullscreen"
+msgstr "Full screen"
 
 #: ../gui/src/ws_gui_layout.c:353
 msgid "ws_me_search_find_next"
@@ -158,24 +123,6 @@ msgstr "Find previous"
 msgid "ws_me_search_stop"
 msgstr "Stop"
 
-#: ../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 "Search"
@@ -208,22 +155,10 @@ msgstr "Zoom in"
 msgid "ws_mp_zoom_out"
 msgstr "Zoom out"
 
-#: ../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 "Choose dictionaries"
 
-#: ../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 ../gui/src/ws_gui_layout.c:1432
@@ -236,18 +171,6 @@ msgstr "Cancel"
 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 "There are no dictionaries to optimize."
@@ -256,14 +179,6 @@ msgstr "There are no dictionaries to optimize."
 msgid "ws_ti_load_dictionary_title"
 msgstr "Load dictionary"
 
-#: ../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 "Would you like to start using this dictionary now?"
@@ -284,10 +199,6 @@ msgstr "Wrong dictionary file."
 msgid "ws_ti_remove_dictionaries_title"
 msgstr "Remove dictionaries"
 
-#: ../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 "remove selected"
@@ -296,44 +207,9 @@ msgstr "remove selected"
 msgid "ws_ti_about_title"
 msgstr "About ..."
 
-#: ../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:1339
+msgid "ws_ib_dictionary_removed"
+msgstr "Dictionary has been removed"
 
 #: ../gui/src/ws_gui_layout.c:1401
 msgid "ws_ti_add_bookmark"
@@ -343,18 +219,6 @@ msgstr "Add bookmark"
 msgid "ws_ti_bookmarks_add_question"
 msgstr "Add to bookmarks?"
 
-#: ../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 "Bookmark has been added"
@@ -371,18 +235,6 @@ msgstr "Remove bookmark"
 msgid "ws_ni_remove_bookmark_question"
 msgstr "Remove from bookmarks?"
 
-#: ../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 "Bookmark has been removed"
@@ -391,24 +243,10 @@ msgstr "Bookmark has been removed"
 msgid "ws_ni_bookmark_not_removed"
 msgstr "Bookmark could not be removed"
 
-#: ../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 "An error occured"
 
-#: ../gui/src/ws_gui_callbacks.c:119
-msgid "response"
-msgstr ""
-
 #: ../gui/src/ws_gui_callbacks.c:133
 msgid "ws_ni_no_dictionary_available"
 msgstr "There is no dictionary available"
@@ -421,36 +259,15 @@ msgstr "Caching ..."
 msgid "ws_ni_dictionary_unavailable"
 msgstr "Dictionary unavailable."
 
-#: ../gui/src/ws_gui_callbacks.c:267
-msgid "ws_ni_bookmarks_unavailable"
-msgstr "Bookmarks could not be loaded.\nPlease install libsqlite0 2.8.13-2"
-
 #: ../gui/src/ws_gui_callbacks.c:289
 #: ../gui/src/ws_gui_layout.c:1534
 msgid "ws_ni_no_words_found"
 msgstr "No words found"
 
-#: ../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 "No text selected"
 
-#: ../gui/src/ws_gui_callbacks.c:913
-msgid "\n"
-msgstr ""
-
 #: ../gui/src/ws_gui_callbacks.c:970
 msgid "ws_ab_searching"
 msgstr "Searching ..."
@@ -463,95 +280,6 @@ msgstr "No word typed."
 msgid "ws_ni_search_aborted"
 msgstr "Search has been aborted."
 
-#: ../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:1345
-#, c-format
-msgid ".::GUI::. Zawartosc RAW to: \"%s\""
-msgstr ""
-
-#: ../gui/src/ws_gui_callbacks.c:1362 ../gui/src/ws_gui_callbacks.c:1384
-msgid "/bookmarks"
-msgstr ""
-
-#: ../gui/src/ws_gui_callbacks.c:1362 ../gui/src/ws_gui_callbacks.c:1384
-msgid "active"
-msgstr ""
-
-#: ../gui/src/ws_gui_callbacks.c:1366
-msgid ""
-"\n"
-".::GUI::. Bookmark mode on\n"
-msgstr ""
-
-#: ../gui/src/ws_gui_callbacks.c:1388
-msgid ""
-"\n"
-".::GUI::. Bookmark mode off\n"
-msgstr ""
-
-#: ../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:1412
 msgid "ws_ni_select_word_to_add"
 msgstr "Select word to add."
@@ -559,3 +287,27 @@ msgstr "Select word to add."
 #: ../gui/src/ws_gui_callbacks.c:1436
 msgid "ws_ni_select_word_to_remove"
 msgstr "Select word to remove."
+
+#: ../gui/src/ws_gui_callbacks.c:1128
+msgid "ws_ib_max_zoom"
+msgstr "Max zoom level reached"
+
+#: ../gui/src/ws_gui_callbacks.c:1152
+msgid "ws_ib_min_zoom"
+msgstr "Min zoom level reached"
+
+#: ../gui/src/ws_gui_callbacks.c:1161
+msgid "ws_ib_zoom_in"
+msgstr "Zooming in"
+
+#: ../gui/src/ws_gui_callbacks.c:1134
+msgid "ws_ib_zoom_out"
+msgstr "Zooming out"
+
+#: ../gui/src/ws_gui_callbacks.c:1018
+msgid "ws_ib_fullscreen_on"
+msgstr "Fullscreen mode on"
+
+#: ../gui/src/ws_gui_callbacks.c:1029
+msgid "ws_ib_fullscreen_off"
+msgstr "Fullscreen mode off"
\ No newline at end of file

diff --git a/po/en_GB.po b/po/en_GB.po
index dbfbf5e..93d1c6d 100644 (file)
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -19,41 +19,10 @@ msgstr ""
 msgid "ws_ni_welcome"
 msgstr "Welcome to mDictionary!"
 
-#: ../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 ""
-
 #: ../gui/src/ws_gui_layout.c:174 ../gui/src/ws_gui_layout.c:351
 msgid "ws_me_search_find"
 msgstr "Find"
 
-#: ../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 "Dictionaries"
@@ -154,24 +123,6 @@ msgstr "Find previous"
 msgid "ws_me_search_stop"
 msgstr "Stop"
 
-#: ../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 "Search"
@@ -204,22 +155,10 @@ msgstr "Zoom in"
 msgid "ws_mp_zoom_out"
 msgstr "Zoom out"
 
-#: ../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 "Choose dictionaries"
 
-#: ../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 ../gui/src/ws_gui_layout.c:1432
@@ -232,18 +171,6 @@ msgstr "Cancel"
 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 "There are no dictionaries to optimize."
@@ -252,14 +179,6 @@ msgstr "There are no dictionaries to optimize."
 msgid "ws_ti_load_dictionary_title"
 msgstr "Load dictionary"
 
-#: ../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 "Would you like to start using this dictionary now?"
@@ -280,10 +199,6 @@ msgstr "Wrong dictionary file."
 msgid "ws_ti_remove_dictionaries_title"
 msgstr "Remove dictionaries"
 
-#: ../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 "remove selected"
@@ -292,50 +207,10 @@ msgstr "remove selected"
 msgid "ws_ti_about_title"
 msgstr "About ..."
 
-#: ../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:1339
 msgid "ws_ib_dictionary_removed"
 msgstr "Dictionary has been removed"
 
-
 #: ../gui/src/ws_gui_layout.c:1401
 msgid "ws_ti_add_bookmark"
 msgstr "Add bookmark"
@@ -344,18 +219,6 @@ msgstr "Add bookmark"
 msgid "ws_ti_bookmarks_add_question"
 msgstr "Add to bookmarks?"
 
-#: ../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 "Bookmark has been added"
@@ -372,18 +235,6 @@ msgstr "Remove bookmark"
 msgid "ws_ni_remove_bookmark_question"
 msgstr "Remove from bookmarks?"
 
-#: ../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 "Bookmark has been removed"
@@ -392,24 +243,10 @@ msgstr "Bookmark has been removed"
 msgid "ws_ni_bookmark_not_removed"
 msgstr "Bookmark could not be removed"
 
-#: ../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 "An error occured"
 
-#: ../gui/src/ws_gui_callbacks.c:119
-msgid "response"
-msgstr ""
-
 #: ../gui/src/ws_gui_callbacks.c:133
 msgid "ws_ni_no_dictionary_available"
 msgstr "There is no dictionary available"
@@ -427,27 +264,10 @@ msgstr "Dictionary unavailable."
 msgid "ws_ni_no_words_found"
 msgstr "No words found"
 
-#: ../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 "No text selected"
 
-#: ../gui/src/ws_gui_callbacks.c:913
-msgid "\n"
-msgstr ""
-
 #: ../gui/src/ws_gui_callbacks.c:970
 msgid "ws_ab_searching"
 msgstr "Searching ..."
@@ -460,95 +280,6 @@ msgstr "No word typed."
 msgid "ws_ni_search_aborted"
 msgstr "Search has been aborted."
 
-#: ../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:1345
-#, c-format
-msgid ".::GUI::. Zawartosc RAW to: \"%s\""
-msgstr ""
-
-#: ../gui/src/ws_gui_callbacks.c:1362 ../gui/src/ws_gui_callbacks.c:1384
-msgid "/bookmarks"
-msgstr ""
-
-#: ../gui/src/ws_gui_callbacks.c:1362 ../gui/src/ws_gui_callbacks.c:1384
-msgid "active"
-msgstr ""
-
-#: ../gui/src/ws_gui_callbacks.c:1366
-msgid ""
-"\n"
-".::GUI::. Bookmark mode on\n"
-msgstr ""
-
-#: ../gui/src/ws_gui_callbacks.c:1388
-msgid ""
-"\n"
-".::GUI::. Bookmark mode off\n"
-msgstr ""
-
-#: ../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:1412
 msgid "ws_ni_select_word_to_add"
 msgstr "Select word to add."
@@ -556,3 +287,27 @@ msgstr "Select word to add."
 #: ../gui/src/ws_gui_callbacks.c:1436
 msgid "ws_ni_select_word_to_remove"
 msgstr "Select word to remove."
+
+#: ../gui/src/ws_gui_callbacks.c:1128
+msgid "ws_ib_max_zoom"
+msgstr "Max zoom level reached"
+
+#: ../gui/src/ws_gui_callbacks.c:1152
+msgid "ws_ib_min_zoom"
+msgstr "Min zoom level reached"
+
+#: ../gui/src/ws_gui_callbacks.c:1161
+msgid "ws_ib_zoom_in"
+msgstr "Zooming in"
+
+#: ../gui/src/ws_gui_callbacks.c:1134
+msgid "ws_ib_zoom_out"
+msgstr "Zooming out"
+
+#: ../gui/src/ws_gui_callbacks.c:1018
+msgid "ws_ib_fullscreen_on"
+msgstr "Fullscreen mode on"
+
+#: ../gui/src/ws_gui_callbacks.c:1029
+msgid "ws_ib_fullscreen_off"
+msgstr "Fullscreen mode off"
\ No newline at end of file

diff --git a/src/gui/include/ws_gui.h b/src/gui/include/ws_gui.h
index 6ef4b0e..97db697 100644 (file)
--- a/src/gui/include/ws_gui.h
+++ b/src/gui/include/ws_gui.h
@@ -52,6 +52,9 @@ extern "C" {
 #include <gconf/gconf.h>
 #include <gconf/gconf-client.h>
 
+#define ZOOM_MIN 1
+#define ZOOM_MAX 4
+#define ZOOM_STEP 0.1
 #define PRESS_TIME 1.0
 #define HISTORY_LEN 5
 #define SCROLL_STEP_H 50
@@ -249,6 +252,7 @@ struct WSGuiAppData {
        gchar *last_word; ///< stores last choosen word on the words list (necessary for bookmarks)
        GString *raw_translation; ///< stores current translation, if user wants to add it to bookmarks
        gchar *last_searched;
+       gdouble zoom;
 
 };
 

diff --git a/src/gui/src/ws_gui_callbacks.c b/src/gui/src/ws_gui_callbacks.c
index f73004b..39044f4 100644 (file)
--- a/src/gui/src/ws_gui_callbacks.c
+++ b/src/gui/src/ws_gui_callbacks.c
@@ -1014,6 +1014,8 @@ void ws_gui_full_screen(GtkMenuItem *menuitem, gpointer user_data)
                               ws_gui_app->ws_gui_menu->ws_gui_menu_full_screen),
                               TRUE);
                 ws_gui_app->ws_gui_full_screen_flag = TRUE;
+               gtk_infoprint(GTK_WINDOW(ws_gui_app->ws_gui_hildon_window),
+                                 _("ws_ib_fullscreen_on"));
         }
         else 
         {
@@ -1023,6 +1025,8 @@ void ws_gui_full_screen(GtkMenuItem *menuitem, gpointer user_data)
                               ws_gui_app->ws_gui_menu->ws_gui_menu_full_screen),
                               FALSE);
                 ws_gui_app->ws_gui_full_screen_flag = FALSE;
+               gtk_infoprint(GTK_WINDOW(ws_gui_app->ws_gui_hildon_window),
+                                 _("ws_ib_fullscreen_off"));
         }
 }
 
@@ -1118,7 +1122,22 @@ void ws_gui_html_paste(GtkMenuItem *menuitem, gpointer user_data)
 void ws_gui_html_zoom_in(GtkMenuItem *menuitem, gpointer user_data)
 {
         WSGuiApp* ws_gui_app = (WSGuiApp*)user_data;
-        gtk_html_zoom_in(GTK_HTML(ws_gui_app->ws_gui_html));
+        //gtk_html_zoom_in(GTK_HTML(ws_gui_app->ws_gui_html));
+       ws_gui_app->zoom = ws_gui_app->zoom + ZOOM_STEP;
+       if (ws_gui_app->zoom > ZOOM_MAX)
+       {
+               ws_gui_app->zoom = ws_gui_app->zoom - ZOOM_STEP;
+               gtk_infoprint(GTK_WINDOW(
+                                      ws_gui_app->ws_gui_hildon_window),
+                                      _("ws_ib_max_zoom"));
+       }
+       else
+       {
+       gtk_html_set_magnification(GTK_HTML(ws_gui_app->ws_gui_html), 
+                                           ws_gui_app->zoom);
+       gtk_infoprint(GTK_WINDOW(ws_gui_app->ws_gui_hildon_window),
+                                 _("ws_ib_zoom_in"));
+       }
 }
 
 /** zoom out text in translation (html) area
@@ -1130,7 +1149,22 @@ void ws_gui_html_zoom_in(GtkMenuItem *menuitem, gpointer user_data)
 void ws_gui_html_zoom_out(GtkMenuItem *menuitem, gpointer user_data)
 {
        WSGuiApp* ws_gui_app = (WSGuiApp*)user_data;
-        gtk_html_zoom_out(GTK_HTML(ws_gui_app->ws_gui_html));
+        //gtk_html_zoom_out(GTK_HTML(ws_gui_app->ws_gui_html));
+       ws_gui_app->zoom = ws_gui_app->zoom - ZOOM_STEP;
+       if (ws_gui_app->zoom < ZOOM_MIN)
+       {
+               ws_gui_app->zoom = ws_gui_app->zoom + ZOOM_STEP;
+               gtk_infoprint(GTK_WINDOW(
+                                      ws_gui_app->ws_gui_hildon_window),
+                                      _("ws_ib_min_zoom"));
+       }
+       else
+       {
+       gtk_html_set_magnification(GTK_HTML(ws_gui_app->ws_gui_html), 
+                                           ws_gui_app->zoom);
+       gtk_infoprint(GTK_WINDOW(ws_gui_app->ws_gui_hildon_window),
+                                 _("ws_ib_zoom_out"));
+       }
 }
 
 /** start searching, send typed word to DBUS and query for words

diff --git a/src/gui/src/ws_gui_layout.c b/src/gui/src/ws_gui_layout.c
index 9a92c81..6686a40 100644 (file)
--- a/src/gui/src/ws_gui_layout.c
+++ b/src/gui/src/ws_gui_layout.c
@@ -51,6 +51,8 @@ void ws_gui_create_window(gpointer user_data)
         ws_gui_app->ws_gui_sel_flag = FALSE;
        ws_gui_app->bookmark_mode = FALSE;
        ws_gui_app->bookmark_avail = TRUE;
+       
+       ws_gui_app->zoom = 1;
 
         ws_gui_app->timer = g_timer_new();
         g_timer_stop(ws_gui_app->timer);
@@ -126,6 +128,8 @@ void ws_gui_create_window(gpointer user_data)
         gtk_html_load_from_string(GTK_HTML(ws_gui_app->ws_gui_html),
                         ws_gui_app->ws_gui_w_list->ws_gui_list_item_data_string,
                         -1);
+       
+       gtk_html_set_magnification(GTK_HTML(ws_gui_app->ws_gui_html), ws_gui_app->zoom);
 
        /*gtk_html_load_from_string(GTK_HTML(ws_gui_app->ws_gui_html),
                         _("WhiteStork_Welcome_Note"),