diff -Nru glosung-3.6.1~jaunty/build/download.c glosung-3.6.2~jaunty/build/download.c --- glosung-3.6.1~jaunty/build/download.c 2010-08-04 20:02:51.000000000 +0000 +++ glosung-3.6.2~jaunty/build/download.c 2010-11-01 19:47:49.000000000 +0000 @@ -351,10 +351,9 @@ break; default: g_message ("unknown source type '%s'", cs->name); - return -1; + error = -100; } - error = 5; return error; } /* download */ diff -Nru glosung-3.6.1~jaunty/build/glosung.c glosung-3.6.2~jaunty/build/glosung.c --- glosung-3.6.1~jaunty/build/glosung.c 2010-10-21 18:33:40.000000000 +0000 +++ glosung-3.6.2~jaunty/build/glosung.c 2010-11-01 19:43:11.000000000 +0000 @@ -688,7 +688,7 @@ GtkBuilder* builder = gtk_builder_new (); gtk_builder_set_translation_domain (builder, PACKAGE); - gchar *ui_file = find_ui_file ("preferences.ui"); + gchar *ui_file = find_ui_file ("preferences.glade"); guint build = gtk_builder_add_from_file (builder, ui_file,NULL); g_free (ui_file); if (! build) { @@ -1167,7 +1167,7 @@ GtkBuilder* builder = gtk_builder_new (); gtk_builder_set_translation_domain (builder, PACKAGE); - gchar *ui_file = find_ui_file ("add_language.ui"); + gchar *ui_file = find_ui_file ("add_language.glade"); guint build = gtk_builder_add_from_file (builder, ui_file, NULL); g_free (ui_file); if (! build) { @@ -1208,23 +1208,6 @@ gtk_container_add (GTK_CONTAINER (year_frame), GTK_WIDGET (year_combo)); gtk_widget_set_sensitive (GTK_WIDGET (year_combo), FALSE); - time_t t; - struct tm now; - - t = time (NULL); - now = *localtime (&t); - gint this_year = now.tm_year + 1900; - if (now.tm_mon >= 10) { - // in November and December offer - // download next year's texts - this_year++; - } -/* - for (i = this_year; i >= this_year - 2; i--) { - gchar *year = g_strdup_printf ("%d", i); - gtk_combo_box_append_text (year_combo, year); - } -*/ gtk_combo_box_set_active (year_combo, 0); g_signal_connect (G_OBJECT (source_combo), "changed", @@ -1248,11 +1231,11 @@ langu = g_ptr_array_index (langs, index); GPtrArray *vc_s = source_get_collections (server_list, langu); - gint i = 0; + gint i = gtk_combo_box_get_active (GTK_COMBO_BOX (year_combo)); guint year = VC (g_ptr_array_index (vc_s, i))->year; if (! is_hide_warning ()) { - ui_file = find_ui_file ("warning_dialog.ui"); + ui_file = find_ui_file ("warning_dialog.glade"); gtk_builder_add_from_file (builder, ui_file, NULL); g_free (ui_file); gtk_builder_connect_signals (builder, NULL); diff -Nru glosung-3.6.1~jaunty/ChangeLog glosung-3.6.2~jaunty/ChangeLog --- glosung-3.6.1~jaunty/ChangeLog 2010-10-27 20:00:26.000000000 +0000 +++ glosung-3.6.2~jaunty/ChangeLog 2010-11-01 19:54:24.000000000 +0000 @@ -1,3 +1,9 @@ +2010-11-01 eicke + + * release 3.6.2 + * fix error reporting problem after download (proxy) + * fix translation problem + 2010-10-27 eicke * release 3.6.1 diff -Nru glosung-3.6.1~jaunty/config.log glosung-3.6.2~jaunty/config.log --- glosung-3.6.1~jaunty/config.log 2010-10-27 20:12:15.000000000 +0000 +++ glosung-3.6.2~jaunty/config.log 2010-11-01 20:04:02.000000000 +0000 @@ -16,7 +16,7 @@ | scons: Configure: ".sconf_temp/conftest_0.o" is up to date. scons: Configure: The original builder output was: - |gcc -o .sconf_temp/conftest_0.o -c -O2 -std=c99 -Wall -g -Wl,--export-dynamic -DVERSION=\"3.6.1\" -DGLOSUNG_DATA_DIR=\"/usr/share/glosung\" -DPACKAGE_PIXMAPS_DIR=\"/usr/share/glosung/\" -DG_DISABLE_ASSERT -pthread -DORBIT2=1 -I. -Ibuild -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/gio-unix-2.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng12 -I/usr/include/libxml2 -I/usr/include/gconf/2 -I/usr/include/orbit-2.0 .sconf_temp/conftest_0.c + |gcc -o .sconf_temp/conftest_0.o -c -O2 -std=c99 -Wall -g -Wl,--export-dynamic -DVERSION=\"3.6.2\" -DGLOSUNG_DATA_DIR=\"/usr/share/glosung\" -DPACKAGE_PIXMAPS_DIR=\"/usr/share/glosung/\" -DG_DISABLE_ASSERT -pthread -DORBIT2=1 -I. -Ibuild -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/gio-unix-2.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng12 -I/usr/include/libxml2 -I/usr/include/gconf/2 -I/usr/include/orbit-2.0 .sconf_temp/conftest_0.c | scons: Configure: ".sconf_temp/conftest_0" is up to date. scons: Configure: The original builder output was: diff -Nru glosung-3.6.1~jaunty/debian/changelog glosung-3.6.2~jaunty/debian/changelog --- glosung-3.6.1~jaunty/debian/changelog 2010-10-27 20:12:12.000000000 +0000 +++ glosung-3.6.2~jaunty/debian/changelog 2010-11-01 20:03:59.000000000 +0000 @@ -1,4 +1,11 @@ -glosung (3.6.1~jaunty) jaunty; urgency=low +glosung (3.6.2~jaunty) jaunty; urgency=low + + * fix error reporting problem after download (proxy) + * fix translation problem + + -- Eicke Godehardt Mon, 01 Nov 2010 20:52:54 +0100 + +glosung (3.6.1~maverick) maverick; urgency=low * fix XML handling, as file format was slightly by losungen.de * add [control] modifier to scroll wheel to navigate monthly Binary files /tmp/x_nd_e9lso/glosung-3.6.1~jaunty/debian/.changelog.swp and /tmp/fw6hlKkLfU/glosung-3.6.2~jaunty/debian/.changelog.swp differ diff -Nru glosung-3.6.1~jaunty/debian/glosung.files glosung-3.6.2~jaunty/debian/glosung.files --- glosung-3.6.1~jaunty/debian/glosung.files 2010-10-21 18:18:54.000000000 +0000 +++ glosung-3.6.2~jaunty/debian/glosung.files 2010-11-01 19:31:23.000000000 +0000 @@ -1,9 +1,9 @@ /usr/bin/glosung /usr/bin/losung /usr/share/applications/glosung.desktop -/usr/share/glosung/add_language.ui -/usr/share/glosung/preferences.ui -/usr/share/glosung/warning_dialog.ui +/usr/share/glosung/add_language.glade +/usr/share/glosung/preferences.glade +/usr/share/glosung/warning_dialog.glade /usr/share/glosung/herrnhut.png /usr/share/glosung/glosung.png /usr/share/glosung/glosung-big.png diff -Nru glosung-3.6.1~jaunty/debian/.svn/all-wcprops glosung-3.6.2~jaunty/debian/.svn/all-wcprops --- glosung-3.6.1~jaunty/debian/.svn/all-wcprops 2010-10-27 20:07:39.000000000 +0000 +++ glosung-3.6.2~jaunty/debian/.svn/all-wcprops 2010-11-01 20:03:01.000000000 +0000 @@ -7,7 +7,7 @@ K 25 svn:wc:ra_dav:version-url V 64 -/svnroot/glosung/!svn/ver/290/trunk/glosung/debian/glosung.files +/svnroot/glosung/!svn/ver/293/trunk/glosung/debian/glosung.files END control K 25 @@ -19,7 +19,7 @@ K 25 svn:wc:ra_dav:version-url V 60 -/svnroot/glosung/!svn/ver/292/trunk/glosung/debian/changelog +/svnroot/glosung/!svn/ver/294/trunk/glosung/debian/changelog END copyright K 25 diff -Nru glosung-3.6.1~jaunty/debian/.svn/entries glosung-3.6.2~jaunty/debian/.svn/entries --- glosung-3.6.1~jaunty/debian/.svn/entries 2010-10-27 20:07:39.000000000 +0000 +++ glosung-3.6.2~jaunty/debian/.svn/entries 2010-11-01 20:03:01.000000000 +0000 @@ -28,14 +28,14 @@ glosung.files file -290 +293 -2010-10-21T18:18:54.000000Z -02568a820aaca026699797416b36178f -2010-10-21T18:21:30.788788Z -290 +2010-11-01T19:31:23.000000Z +aa12d769dfa39ba905fb87563acefd1b +2010-11-01T19:59:58.894084Z +293 eicke @@ -58,7 +58,7 @@ -782 +791 control file @@ -96,14 +96,14 @@ changelog file -292 +294 -2010-10-27T19:55:12.000000Z -0b49bae29308cce91d844a9c7fba0971 -2010-10-27T20:07:37.188193Z -292 +2010-11-01T20:00:58.000000Z +55a4fcd6890055ee1233bbf71efb76ca +2010-11-01T20:02:59.529921Z +294 eicke @@ -126,7 +126,7 @@ -8616 +8826 copyright file diff -Nru glosung-3.6.1~jaunty/debian/.svn/text-base/changelog.svn-base glosung-3.6.2~jaunty/debian/.svn/text-base/changelog.svn-base --- glosung-3.6.1~jaunty/debian/.svn/text-base/changelog.svn-base 2010-10-27 20:07:37.000000000 +0000 +++ glosung-3.6.2~jaunty/debian/.svn/text-base/changelog.svn-base 2010-11-01 20:02:59.000000000 +0000 @@ -1,9 +1,16 @@ +glosung (3.6.2~maverick) maverick; urgency=low + + * fix error reporting problem after download (proxy) + * fix translation problem + + -- Eicke Godehardt Mon, 01 Nov 2010 20:52:54 +0100 + glosung (3.6.1~maverick) maverick; urgency=low * fix XML handling, as file format was slightly by losungen.de * add [control] modifier to scroll wheel to navigate monthly - -- Eicke Godehardt Wed, 27 Oct 2010 21:50:47 +0200 + -- Eicke Godehardt Wed, 27 Oct 2010 21:50:47 +0200 glosung (3.6~maverick) maverick; urgency=low diff -Nru glosung-3.6.1~jaunty/debian/.svn/text-base/glosung.files.svn-base glosung-3.6.2~jaunty/debian/.svn/text-base/glosung.files.svn-base --- glosung-3.6.1~jaunty/debian/.svn/text-base/glosung.files.svn-base 2010-10-21 18:21:23.000000000 +0000 +++ glosung-3.6.2~jaunty/debian/.svn/text-base/glosung.files.svn-base 2010-11-01 19:59:52.000000000 +0000 @@ -1,9 +1,9 @@ /usr/bin/glosung /usr/bin/losung /usr/share/applications/glosung.desktop -/usr/share/glosung/add_language.ui -/usr/share/glosung/preferences.ui -/usr/share/glosung/warning_dialog.ui +/usr/share/glosung/add_language.glade +/usr/share/glosung/preferences.glade +/usr/share/glosung/warning_dialog.glade /usr/share/glosung/herrnhut.png /usr/share/glosung/glosung.png /usr/share/glosung/glosung-big.png diff -Nru glosung-3.6.1~jaunty/po/cs.po glosung-3.6.2~jaunty/po/cs.po --- glosung-3.6.1~jaunty/po/cs.po 2010-10-21 18:23:51.000000000 +0000 +++ glosung-3.6.2~jaunty/po/cs.po 2010-11-01 19:29:53.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: glosung 2.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-10-21 20:22+0200\n" +"POT-Creation-Date: 2010-11-01 20:29+0100\n" "PO-Revision-Date: 2010-01-22 22:24+0100\n" "Last-Translator: Eicke Godehardt \n" "Language-Team: czech \n" @@ -463,13 +463,13 @@ # # # File: src/glosung.c, line: 1141 -#~ msgid "Add Languages" -#~ msgstr "Přidej jazyky" +msgid "Add Languages" +msgstr "Přidej jazyky" # # # File: ui/add_language.glade, line: 31 -#~ msgid "Source" -#~ msgstr "Zdroj" +msgid "Source" +msgstr "Zdroj" # # # @@ -494,110 +494,111 @@ # # # File: src/glosung.c, line: 1150 -#~ msgid "Language" -#~ msgstr "Jazyk" +msgid "Language" +msgstr "Jazyk" # # # # # File: src/glosung.c, line: 1152 -#~ msgid "Year" -#~ msgstr "Rok" +msgid "Year" +msgstr "Rok" # # # # # File: src/glosung.c, line: 1144 -#~ msgid "Download" -#~ msgstr "Stáhnout" +msgid "Download" +msgstr "Stáhnout" # # # File: ui/add_language.glade, line: 105 -#~ msgid "download selected verse collection" -#~ msgstr "stáhnout vybranou sbírku veršů" +msgid "download selected verse collection" +msgstr "stáhnout vybranou sbírku veršů" # # # # src/glosung.c:103 # File: src/glosung.c, line: 153 # File: src/glosung.c, line: 429 -#~ msgid "Preferences" -#~ msgstr "Nastavení" +msgid "Preferences" +msgstr "Nastavení" # # # # src/glosung.c:479 # File: src/glosung.c, line: 557 -#~ msgid "Displayed Language:" -#~ msgstr "Výběr jazyka:" +msgid "Displayed Language:" +msgstr "Výběr jazyka:" # # # File: ui/preferences.glade, line: 33 -#~ msgid "Font:" -#~ msgstr "Písmo:" +msgid "Font:" +msgstr "Písmo:" # # # File: ui/preferences.glade, line: 57 -#~ msgid "Start GLosung at login time" -#~ msgstr "Spouštět Glosung při přihlášení" +msgid "Start GLosung at login time" +msgstr "Spouštět Glosung při přihlášení" # # # # File: src/glosung.c, line: 791 -#~ msgid "Link location to Xiphos/Gnomesword" -#~ msgstr "Odkaz na Xiphos/Gnomesword" +msgid "Link location to Xiphos/Gnomesword" +msgstr "Odkaz na Xiphos/Gnomesword" # # # File: ui/preferences.glade, line: 95 -#~ msgid "View" -#~ msgstr "Zobrazení" +msgid "View" +msgstr "Zobrazení" # # # File: ui/preferences.glade, line: 107 -#~ msgid "Proxy" -#~ msgstr "Proxy" +msgid "Proxy" +msgstr "Proxy" # # # File: ui/preferences.glade, line: 128 -#~ msgid "" -#~ "Use proxy to connect to the internet.\n" -#~ "Be careful in persecuted countries, as\n" -#~ "downloading biblical texts may be\n" -#~ "against the law!" -#~ msgstr "" -#~ "Používat proxy k připojení na internet.\n" -#~ "Buďte opatrní v zemích kde dochází\n" -#~ "k pronásledování křesťanů, protože stahování\n" -#~ "biblických textů může být proti zákonu!" +msgid "" +"Use proxy to connect to the internet.\n" +"Be careful in persecuted countries, as\n" +"downloading biblical texts may be\n" +"against the law!" +msgstr "" +"Používat proxy k připojení na internet.\n" +"Buďte opatrní v zemích kde dochází\n" +"k pronásledování křesťanů, protože stahování\n" +"biblických textů může být proti zákonu!" # # # File: ui/preferences.glade, line: 140 -#~ msgid "host[:port]" -#~ msgstr "počítač[:port]" +msgid "host[:port]" +msgstr "počítač[:port]" # # # File: ui/preferences.glade, line: 135 -#~ msgid "Network" -#~ msgstr "Síť" +msgid "Network" +msgstr "Síť" # # # File: ui/warning_dialog.glade, line: 15 -#~ msgid "" -#~ "Warning: If you live in a persecuted country and do not wish to\n" -#~ "risk detection you should NOT use this feature!" -#~ msgstr "" -#~ "Varování: Pokud žijete v zemi kde jsou křesťané pronásledováni\n" -#~ "a nechcete riskovat dopadení NEPOUŽÍVEJTE tuto funkci!" +msgid "" +"Warning: If you live in a persecuted country and do not wish to\n" +"risk detection you should NOT use this feature!" +msgstr "" +"Varování: Pokud žijete v zemi kde jsou křesťané pronásledováni\n" +"a nechcete riskovat dopadení NEPOUŽÍVEJTE tuto funkci!" # # # File: ui/warning_dialog.glade, line: 24 -#~ msgid "Don't show this message again." -#~ msgstr "Později již nezobrazovat tuto zprávu." +msgid "Don't show this message again." +msgstr "Později již nezobrazovat tuto zprávu." # # # File: ui/warning_dialog.glade, line: 28 -#~ msgid "Check this box if you do not want to see this dialog again" -#~ msgstr "Zaškrtněte pokud již nechcete zobrazovat tento dialog" +msgid "Check this box if you do not want to see this dialog again" +msgstr "Zaškrtněte pokud již nechcete zobrazovat tento dialog" +# # # # @@ -610,6 +611,7 @@ # # # +# # File: src/glosung.c, line: 228 #, fuzzy #~ msgid "Authentication" @@ -626,6 +628,7 @@ # # # +# # src/glosung.c:103 # File: src/glosung.c, line: 153 # File: src/glosung.c, line: 429 @@ -650,6 +653,7 @@ # # # +# # File: ui/preferences.glade, line: 111 #~ msgid "gtk-close" #~ msgstr "zavřít" @@ -679,6 +683,7 @@ # # # +# # src/glosung.c:500 # File: src/glosung.c, line: 581 #~ msgid "Choose Font:" @@ -723,6 +728,7 @@ # # # +# # src/glosung.c:116 # File: src/glosung.c, line: 166 #, fuzzy @@ -766,6 +772,7 @@ # # # +# # src/glosung.c:519 # File: src/glosung.c, line: 604 #~ msgid "Show selective and continuing reading" @@ -809,6 +816,7 @@ # # # +# # src/glosung.c:509 # File: src/glosung.c, line: 594 #~ msgid "Close calendar by double click" @@ -853,6 +861,7 @@ # # # +# # File: src/glosung.c, line: 193 #~ msgid "_Copy Watchword" #~ msgstr "Kopírovat Heslo" @@ -914,6 +923,7 @@ # # # +# # src/glosung.c:103 # File: src/glosung.c, line: 153 # File: src/glosung.c, line: 429 @@ -985,6 +995,7 @@ # # # +# # File: src/glosung.c, line: 195 #~ msgid "_About" #~ msgstr "O aplikaci" @@ -1059,6 +1070,7 @@ # # # +# # src/glosung.c:93 src/glosung.c:617 # File: src/glosung.c, line: 143 # File: src/glosung.c, line: 705 @@ -1138,6 +1150,7 @@ # # # +# # src/glosung.c:103 # File: src/glosung.c, line: 153 # File: src/glosung.c, line: 429 @@ -1216,6 +1229,7 @@ # # # +# # src/glosung.c:93 src/glosung.c:617 # File: src/glosung.c, line: 143 # File: src/glosung.c, line: 705 @@ -1295,6 +1309,7 @@ # # # +# # src/glosung.c:77 src/glosung.c:133 # File: src/glosung.c, line: 127 # File: src/glosung.c, line: 183 @@ -1374,6 +1389,7 @@ # # # +# # src/glosung.c:86 # File: src/glosung.c, line: 136 #, fuzzy @@ -1452,6 +1468,7 @@ # # # +# # src/glosung.c:83 # File: src/glosung.c, line: 133 #, fuzzy @@ -1530,6 +1547,7 @@ # # # +# # src/glosung.c:86 # File: src/glosung.c, line: 136 #, fuzzy diff -Nru glosung-3.6.1~jaunty/po/de.po glosung-3.6.2~jaunty/po/de.po --- glosung-3.6.1~jaunty/po/de.po 2010-10-21 18:23:51.000000000 +0000 +++ glosung-3.6.2~jaunty/po/de.po 2010-11-01 19:29:53.000000000 +0000 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: glosung 2.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-10-21 20:22+0200\n" +"POT-Creation-Date: 2010-11-01 20:29+0100\n" "PO-Revision-Date: 2010-07-19 22:02+0100\n" "Last-Translator: Eicke Godehardt \n" "Language-Team: deutsch \n" @@ -424,13 +424,13 @@ # # # File: src/glosung.c, line: 1141 -#~ msgid "Add Languages" -#~ msgstr "Sprachen hinzufügen" +msgid "Add Languages" +msgstr "Sprachen hinzufügen" # # # File: ui/add_language.glade, line: 31 -#~ msgid "Source" -#~ msgstr "Quelle" +msgid "Source" +msgstr "Quelle" # # # @@ -455,108 +455,108 @@ # # # File: src/glosung.c, line: 1150 -#~ msgid "Language" -#~ msgstr "Sprache" +msgid "Language" +msgstr "Sprache" # # # # # File: src/glosung.c, line: 1152 -#~ msgid "Year" -#~ msgstr "Jahr" +msgid "Year" +msgstr "Jahr" # # # # # File: src/glosung.c, line: 1144 -#~ msgid "Download" -#~ msgstr "Herunterladen" +msgid "Download" +msgstr "Herunterladen" # # # File: ui/add_language.glade, line: 105 -#~ msgid "download selected verse collection" -#~ msgstr "herunterladen der ausgewählten Verszusammenstellung" +msgid "download selected verse collection" +msgstr "herunterladen der ausgewählten Verszusammenstellung" # # # -#~ msgid "Preferences" -#~ msgstr "Einstellungen" +msgid "Preferences" +msgstr "Einstellungen" # # # -#~ msgid "Displayed Language:" -#~ msgstr "Sprache des Textes:" +msgid "Displayed Language:" +msgstr "Sprache des Textes:" # # # File: ui/preferences.glade, line: 33 -#~ msgid "Font:" -#~ msgstr "Schriftart:" +msgid "Font:" +msgstr "Schriftart:" # # # # File: src/glosung.c, line: 917 -#~ msgid "Start GLosung at login time" -#~ msgstr "Starte GLosung beim Einloggen" +msgid "Start GLosung at login time" +msgstr "Starte GLosung beim Einloggen" # # # # File: src/glosung.c, line: 791 -#~ msgid "Link location to Xiphos/Gnomesword" -#~ msgstr "Verbinde Stellenangaben mit Xiphos/Gnomesword" +msgid "Link location to Xiphos/Gnomesword" +msgstr "Verbinde Stellenangaben mit Xiphos/Gnomesword" # # # File: ui/preferences.glade, line: 95 -#~ msgid "View" -#~ msgstr "Ansicht" +msgid "View" +msgstr "Ansicht" # # # File: ui/preferences.glade, line: 107 -#~ msgid "Proxy" -#~ msgstr "Proxy" +msgid "Proxy" +msgstr "Proxy" # # # File: ui/preferences.glade, line: 128 -#~ msgid "" -#~ "Use proxy to connect to the internet.\n" -#~ "Be careful in persecuted countries, as\n" -#~ "downloading biblical texts may be\n" -#~ "against the law!" -#~ msgstr "" -#~ "Verwende einen Proxy, um sich mit dem Internet zu verbinden.\n" -#~ "Achtung! Das Herunterladen von biblischen Texten kann in \n" -#~ "manchen Ländern gegen das Gesetz sein!" +msgid "" +"Use proxy to connect to the internet.\n" +"Be careful in persecuted countries, as\n" +"downloading biblical texts may be\n" +"against the law!" +msgstr "" +"Verwende einen Proxy, um sich mit dem Internet zu verbinden.\n" +"Achtung! Das Herunterladen von biblischen Texten kann in \n" +"manchen Ländern gegen das Gesetz sein!" # # # File: ui/preferences.glade, line: 140 -#~ msgid "host[:port]" -#~ msgstr "host[:port]" +msgid "host[:port]" +msgstr "host[:port]" # # # File: ui/preferences.glade, line: 135 -#~ msgid "Network" -#~ msgstr "Netzwerk" +msgid "Network" +msgstr "Netzwerk" # # # File: ui/warning_dialog.glade, line: 15 -#~ msgid "" -#~ "Warning: If you live in a persecuted country and do not wish to\n" -#~ "risk detection you should NOT use this feature!" -#~ msgstr "" -#~ "Warnung: Wenn sie in ihrem Land wegen ihrer Religion verfolgt " -#~ "werden könnten und nicht riskieren wollen entdeckt zu werden, sollten sie " -#~ "diese Funktion NICHT verwenden!" +msgid "" +"Warning: If you live in a persecuted country and do not wish to\n" +"risk detection you should NOT use this feature!" +msgstr "" +"Warnung: Wenn sie in ihrem Land wegen ihrer Religion verfolgt werden " +"könnten und nicht riskieren wollen entdeckt zu werden, sollten sie diese " +"Funktion NICHT verwenden!" # # # File: ui/warning_dialog.glade, line: 24 -#~ msgid "Don't show this message again." -#~ msgstr "Diese Meldung nicht mehr anzeigen." +msgid "Don't show this message again." +msgstr "Diese Meldung nicht mehr anzeigen." # # # File: ui/warning_dialog.glade, line: 28 -#~ msgid "Check this box if you do not want to see this dialog again" -#~ msgstr "" -#~ "Schalten sie das Häkchen an, wenn sie diesen Dialog nicht mehr sehen " -#~ "möchten" +msgid "Check this box if you do not want to see this dialog again" +msgstr "" +"Schalten sie das Häkchen an, wenn sie diesen Dialog nicht mehr sehen möchten" +# # # # @@ -569,6 +569,7 @@ # # # +# # File: ui/preferences.glade, line: 165 #~ msgid "User:" #~ msgstr "Benutzer:" @@ -577,6 +578,7 @@ # # # +# # File: ui/preferences.glade, line: 173 #~ msgid "Password:" #~ msgstr "Passwort:" @@ -585,6 +587,7 @@ # # # +# # File: ui/preferences.glade, line: 189 #~ msgid "user name for proxy authentification" #~ msgstr "Benutzername für die Proxy-Authentifizierung" @@ -593,6 +596,7 @@ # # # +# # File: ui/preferences.glade, line: 202 #~ msgid "password name for proxy authentification" #~ msgstr "Passwort für die Proxy-Authentifizierung" @@ -601,6 +605,7 @@ # # # +# # File: src/glosung.c, line: 228 #~ msgid "Authentication" #~ msgstr "Authentifizierung" @@ -616,6 +621,7 @@ # # # +# #, fuzzy #~ msgid "Prefered Source:" #~ msgstr "Einstellungen" @@ -644,6 +650,7 @@ # # # +# #~ msgid "Choose Font:" #~ msgstr "Schriftart des Textes:" # @@ -674,6 +681,7 @@ # # # +# # File: src/about.c, line: 86 #~ msgid "Since 1731 in about 50 languages." #~ msgstr "Seit 1731 in etwa 50 Sprachen." @@ -716,6 +724,7 @@ # # # +# #~ msgid "About Losungen" #~ msgstr "_über Losungen" # @@ -755,6 +764,7 @@ # # # +# #~ msgid "Show selective and continuing reading" #~ msgstr "Zeige Lesehinweise" # @@ -795,6 +805,7 @@ # # # +# #~ msgid "Close calendar by double click" #~ msgstr "Schließen des Kalenders durch Doppelklick" # @@ -836,6 +847,7 @@ # # # +# # File: src/glosung.c, line: 193 #~ msgid "_Copy Watchword" #~ msgstr "Losung _kopieren" @@ -883,6 +895,7 @@ # # # +# # File: src/glosung.c, line: 1257 #~ msgid "" #~ "This dialog only works for losung files until 2007!\n" @@ -951,6 +964,7 @@ # # # +# #~ msgid "_Preferences..." #~ msgstr "_Einstellungen..." # @@ -1017,6 +1031,7 @@ # # # +# # File: src/glosung.c, line: 195 #~ msgid "_About" #~ msgstr "_Über" @@ -1090,6 +1105,7 @@ # # # +# #, fuzzy #~ msgid "/File/_Calendar" #~ msgstr "Kalender" @@ -1165,6 +1181,7 @@ # # # +# #, fuzzy #~ msgid "/_Edit/_Preferences..." #~ msgstr "Einstellungen..." @@ -1239,6 +1256,7 @@ # # # +# #, fuzzy #~ msgid "/Toolbar/_Calendar" #~ msgstr "Kalender" @@ -1314,6 +1332,7 @@ # # # +# #, fuzzy #~ msgid "/Toolbar/_Next Day" #~ msgstr "Nächster Tag" @@ -1389,6 +1408,7 @@ # # # +# #, fuzzy #~ msgid "/Toolbar/_Previous Day" #~ msgstr "Vorheriger Monat" @@ -1464,6 +1484,7 @@ # # # +# #, fuzzy #~ msgid "/Toolbar/_Next Month" #~ msgstr "Nächster Monat" @@ -1539,6 +1560,7 @@ # # # +# #, fuzzy #~ msgid "/Toolbar/_Previous Month" #~ msgstr "Vorheriger Monat" diff -Nru glosung-3.6.1~jaunty/po/fr.po glosung-3.6.2~jaunty/po/fr.po --- glosung-3.6.1~jaunty/po/fr.po 2010-10-21 18:23:51.000000000 +0000 +++ glosung-3.6.2~jaunty/po/fr.po 2010-11-01 19:29:53.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: glosung 3.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-10-21 20:22+0200\n" +"POT-Creation-Date: 2010-11-01 20:29+0100\n" "PO-Revision-Date: 2006-11-29 22:30+0100\n" "Last-Translator: Nicolas \n" "Language-Team: French \n" @@ -275,8 +275,12 @@ # # File: src/glosung.c, line: 1141 #, fuzzy -#~ msgid "Add Languages" -#~ msgstr "Ajouter de nouvelles traductions" +msgid "Add Languages" +msgstr "Ajouter de nouvelles traductions" +# +# File: ui/add_language.glade, line: 30 +msgid "Source" +msgstr "" # # # @@ -301,40 +305,91 @@ # # # File: src/glosung.c, line: 1150 -#~ msgid "Language" -#~ msgstr "Traduction" +msgid "Language" +msgstr "Traduction" # # # # # File: src/glosung.c, line: 1152 -#~ msgid "Year" -#~ msgstr "Année" +msgid "Year" +msgstr "Année" # # # # # File: src/glosung.c, line: 1144 -#~ msgid "Download" -#~ msgstr "Télécharger" +msgid "Download" +msgstr "Télécharger" # +# File: ui/add_language.glade, line: 104 +msgid "download selected verse collection" +msgstr "" # # -#~ msgid "Preferences" -#~ msgstr "Préférences" +# +msgid "Preferences" +msgstr "Préférences" # # # #, fuzzy -#~ msgid "Displayed Language:" -#~ msgstr "Langue :" +msgid "Displayed Language:" +msgstr "Langue :" +# +# File: ui/preferences.glade, line: 35 +msgid "Font:" +msgstr "" +# +# File: ui/preferences.glade, line: 59 +msgid "Start GLosung at login time" +msgstr "" # # # # File: src/glosung.c, line: 791 #, fuzzy -#~ msgid "Link location to Xiphos/Gnomesword" -#~ msgstr "Liens vers gnomesword" +msgid "Link location to Xiphos/Gnomesword" +msgstr "Liens vers gnomesword" +# +# File: ui/preferences.glade, line: 111 +msgid "View" +msgstr "" +# +# File: ui/preferences.glade, line: 123 +msgid "Proxy" +msgstr "" +# +# File: ui/preferences.glade, line: 127 +msgid "" +"Use proxy to connect to the internet.\n" +"Be careful in persecuted countries, as\n" +"downloading biblical texts may be\n" +"against the law!" +msgstr "" +# +# File: ui/preferences.glade, line: 139 +msgid "host[:port]" +msgstr "" +# +# File: ui/preferences.glade, line: 157 +msgid "Network" +msgstr "" +# +# File: ui/warning_dialog.glade, line: 15 +msgid "" +"Warning: If you live in a persecuted country and do not wish to\n" +"risk detection you should NOT use this feature!" +msgstr "" +# +# File: ui/warning_dialog.glade, line: 24 +msgid "Don't show this message again." +msgstr "" +# +# File: ui/warning_dialog.glade, line: 28 +msgid "Check this box if you do not want to see this dialog again" +msgstr "" +# # # # @@ -377,6 +432,7 @@ # # # +# #~ msgid "Choose Font:" #~ msgstr "Police :" # @@ -412,6 +468,7 @@ # # # +# #, fuzzy #~ msgid "About Losungen" #~ msgstr "_Losung" @@ -453,6 +510,7 @@ # # # +# #~ msgid "Show selective and continuing reading" #~ msgstr "Afficher les suggestions de lecture suivie" # @@ -494,6 +552,7 @@ # # # +# #~ msgid "Close calendar by double click" #~ msgstr "Fermer le calendrier en double-cliquant" # @@ -554,6 +613,7 @@ # # # +# #, fuzzy #~ msgid "_Preferences..." #~ msgstr "Préférences..." @@ -622,6 +682,7 @@ # # # +# #~ msgid "Open a calendar-widget" #~ msgstr "Ouvrir le calendrier" # @@ -689,6 +750,7 @@ # # # +# # File: src/glosung.c, line: 180 #~ msgid "Languages..." #~ msgstr "Traductions" @@ -757,5 +819,6 @@ # # # +# #~ msgid "Exit the Program" #~ msgstr "Quitter le programme" diff -Nru glosung-3.6.1~jaunty/po/hu.po glosung-3.6.2~jaunty/po/hu.po --- glosung-3.6.1~jaunty/po/hu.po 2010-10-21 18:23:51.000000000 +0000 +++ glosung-3.6.2~jaunty/po/hu.po 2010-11-01 19:29:53.000000000 +0000 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: glosung 3.5.3\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-10-21 20:22+0200\n" +"POT-Creation-Date: 2010-11-01 20:29+0100\n" "PO-Revision-Date: 2010-07-27 13:38+0100\n" "Last-Translator: Máté Nagy \n" "Language-Team: hungarian \n" @@ -280,106 +280,107 @@ # # # File: src/glosung.c, line: 1063 -#~ msgid "Add Languages" -#~ msgstr "Nyelv hozzáadása" +msgid "Add Languages" +msgstr "Nyelv hozzáadása" # # -#~ msgid "Source" -#~ msgstr "Forrás" +msgid "Source" +msgstr "Forrás" # # # File: src/glosung.c, line: 1063 -#~ msgid "Language" -#~ msgstr "Nyelv" +msgid "Language" +msgstr "Nyelv" # # -#~ msgid "Year" -#~ msgstr "Év" +msgid "Year" +msgstr "Év" # # -#~ msgid "Download" -#~ msgstr "Letöltés" +msgid "Download" +msgstr "Letöltés" # # -#~ msgid "download selected verse collection" -#~ msgstr "A kiválasztott versösszeállítás letöltése" +msgid "download selected verse collection" +msgstr "A kiválasztott versösszeállítás letöltése" # # # File: src/glosung.c, line: 217 -#~ msgid "Preferences" -#~ msgstr "Beállítások" +msgid "Preferences" +msgstr "Beállítások" # # # File: src/glosung.c, line: 1090 -#~ msgid "Displayed Language:" -#~ msgstr "Telepített nyelvek:" +msgid "Displayed Language:" +msgstr "Telepített nyelvek:" # # -#~ msgid "Font:" -#~ msgstr "Betűkészlet:" +msgid "Font:" +msgstr "Betűkészlet:" # # -#~ msgid "Start GLosung at login time" -#~ msgstr "GLosung indítása bejelentkezéskor" +msgid "Start GLosung at login time" +msgstr "GLosung indítása bejelentkezéskor" # # -#~ msgid "Link location to Xiphos/Gnomesword" -#~ msgstr "Igehelyek linkelése Xiphos/GnomeSword-al" +msgid "Link location to Xiphos/Gnomesword" +msgstr "Igehelyek linkelése Xiphos/GnomeSword-al" # # # File: ui/preferences.glade, line: 95 -#~ msgid "View" -#~ msgstr "Nézet" +msgid "View" +msgstr "Nézet" # # # File: ui/preferences.glade, line: 107 -#~ msgid "Proxy" -#~ msgstr "Proxy" +msgid "Proxy" +msgstr "Proxy" # # # File: ui/preferences.glade, line: 128 -#~ msgid "" -#~ "Use proxy to connect to the internet.\n" -#~ "Be careful in persecuted countries, as\n" -#~ "downloading biblical texts may be\n" -#~ "against the law!" -#~ msgstr "" -#~ "Proxy használata az internet kapcsolathoz.\n" -#~ "Legyen óvatos az olyan országokban, ahol\n" -#~ "kereszt(y)én(y) üldözés van, mert bibliai szövegek\n" -#~ "letöltése törvénybe ütközhet!" +msgid "" +"Use proxy to connect to the internet.\n" +"Be careful in persecuted countries, as\n" +"downloading biblical texts may be\n" +"against the law!" +msgstr "" +"Proxy használata az internet kapcsolathoz.\n" +"Legyen óvatos az olyan országokban, ahol\n" +"kereszt(y)én(y) üldözés van, mert bibliai szövegek\n" +"letöltése törvénybe ütközhet!" # # # File: ui/preferences.glade, line: 140 -#~ msgid "host[:port]" -#~ msgstr "hoszt[:port]" +msgid "host[:port]" +msgstr "hoszt[:port]" # # # File: ui/preferences.glade, line: 135 -#~ msgid "Network" -#~ msgstr "Hálózat" +msgid "Network" +msgstr "Hálózat" # # # File: ui/warning_dialog.glade, line: 15 -#~ msgid "" -#~ "Warning: If you live in a persecuted country and do not wish to\n" -#~ "risk detection you should NOT use this feature!" -#~ msgstr "" -#~ "Figyelem: ha Ön olyan országban él, ahol kereszt(y)én(y) üldözés " -#~ "van,\n" -#~ "és nem akarja megkockáztatni, hogy felfedezzék, akkor NE használja ezt a " -#~ "funkciót!" +msgid "" +"Warning: If you live in a persecuted country and do not wish to\n" +"risk detection you should NOT use this feature!" +msgstr "" +"Figyelem: ha Ön olyan országban él, ahol kereszt(y)én(y) üldözés " +"van,\n" +"és nem akarja megkockáztatni, hogy felfedezzék, akkor NE használja ezt a " +"funkciót!" # # # File: ui/warning_dialog.glade, line: 24 -#~ msgid "Don't show this message again." -#~ msgstr "Ne jelenjen meg újra ez az üzenet." +msgid "Don't show this message again." +msgstr "Ne jelenjen meg újra ez az üzenet." # # # File: ui/warning_dialog.glade, line: 28 -#~ msgid "Check this box if you do not want to see this dialog again" -#~ msgstr "" -#~ "Jelölje be a négyzetet, ha nem szeretné többet ezt a dialógusablakot látni" +msgid "Check this box if you do not want to see this dialog again" +msgstr "" +"Jelölje be a négyzetet, ha nem szeretné többet ezt a dialógusablakot látni" +# # # # @@ -391,6 +392,7 @@ # # # +# # File: src/glosung.c, line: 210 #, fuzzy #~ msgid "Authentication" @@ -406,6 +408,7 @@ # # # +# # File: src/glosung.c, line: 217 #, fuzzy #~ msgid "Prefered Source:" diff -Nru glosung-3.6.1~jaunty/po/SConscript glosung-3.6.2~jaunty/po/SConscript --- glosung-3.6.1~jaunty/po/SConscript 2010-10-27 19:49:10.000000000 +0000 +++ glosung-3.6.2~jaunty/po/SConscript 2010-11-01 19:28:14.000000000 +0000 @@ -29,9 +29,9 @@ '#/src/parser.c', '#/src/settings.c', '#/src/util.c', - '#/ui/add_language.ui', - '#/ui/preferences.ui', - '#/ui/warning_dialog.ui'], + '#/ui/add_language.glade', + '#/ui/preferences.glade', + '#/ui/warning_dialog.glade'], "xgettext --add-comments --keyword=_ --keyword=N_ --add-location --strict --output=$TARGET $SOURCES"); for lang in languages: po = env.Execute (action = "msgmerge --update --strict --verbose " + lang + ".po glosung.pot"); diff -Nru glosung-3.6.1~jaunty/po/.svn/all-wcprops glosung-3.6.2~jaunty/po/.svn/all-wcprops --- glosung-3.6.1~jaunty/po/.svn/all-wcprops 2010-10-27 20:07:39.000000000 +0000 +++ glosung-3.6.2~jaunty/po/.svn/all-wcprops 2010-11-01 20:00:06.000000000 +0000 @@ -7,7 +7,7 @@ K 25 svn:wc:ra_dav:version-url V 52 -/svnroot/glosung/!svn/ver/292/trunk/glosung/po/cs.po +/svnroot/glosung/!svn/ver/293/trunk/glosung/po/cs.po END es.po K 25 @@ -19,13 +19,13 @@ K 25 svn:wc:ra_dav:version-url V 52 -/svnroot/glosung/!svn/ver/292/trunk/glosung/po/fr.po +/svnroot/glosung/!svn/ver/293/trunk/glosung/po/fr.po END de.po K 25 svn:wc:ra_dav:version-url V 52 -/svnroot/glosung/!svn/ver/292/trunk/glosung/po/de.po +/svnroot/glosung/!svn/ver/293/trunk/glosung/po/de.po END sw.po K 25 @@ -37,11 +37,11 @@ K 25 svn:wc:ra_dav:version-url V 57 -/svnroot/glosung/!svn/ver/290/trunk/glosung/po/SConscript +/svnroot/glosung/!svn/ver/293/trunk/glosung/po/SConscript END hu.po K 25 svn:wc:ra_dav:version-url V 52 -/svnroot/glosung/!svn/ver/292/trunk/glosung/po/hu.po +/svnroot/glosung/!svn/ver/293/trunk/glosung/po/hu.po END diff -Nru glosung-3.6.1~jaunty/po/.svn/entries glosung-3.6.2~jaunty/po/.svn/entries --- glosung-3.6.1~jaunty/po/.svn/entries 2010-10-27 20:07:39.000000000 +0000 +++ glosung-3.6.2~jaunty/po/.svn/entries 2010-11-01 20:00:06.000000000 +0000 @@ -28,14 +28,14 @@ cs.po file -292 +293 -2010-10-21T18:23:51.000000Z -e0c622dd55db9d126b22d5acd7d36fe3 -2010-10-27T20:07:37.188193Z -292 +2010-11-01T19:29:53.000000Z +31534113783d667c8b52484e3480728d +2010-11-01T19:59:58.894084Z +293 eicke @@ -58,7 +58,7 @@ -14211 +14097 es.po file @@ -96,14 +96,14 @@ fr.po file -292 +293 -2010-10-21T18:23:51.000000Z -83d870e0b56893b0559c876b263ed3a2 -2010-10-27T20:07:37.188193Z -292 +2010-11-01T19:29:53.000000Z +bbd32bce48fc8aad5f619a8a69a80e64 +2010-11-01T19:59:58.894084Z +293 eicke @@ -126,18 +126,18 @@ -7299 +8466 de.po file -292 +293 -2010-10-21T18:23:51.000000Z -38093b5130fd16f229135d4d459ab51b -2010-10-27T20:07:37.188193Z -292 +2010-11-01T19:29:53.000000Z +434063a6439741004ebb6a024e920473 +2010-11-01T19:59:58.894084Z +293 eicke @@ -160,7 +160,7 @@ -12696 +12583 sw.po file @@ -198,14 +198,14 @@ SConscript file -290 +293 -2010-10-27T19:49:10.000000Z -81e8dcda9e81a5273b4a3ea8dd896103 -2010-10-21T18:21:30.788788Z -290 +2010-11-01T19:28:14.000000Z +b0fc2fea479e0b3b56e153a1f0be2b0f +2010-11-01T19:59:58.894084Z +293 eicke @@ -228,18 +228,18 @@ -3107 +3116 hu.po file -292 +293 -2010-10-21T18:23:51.000000Z -6608e1b6b56e1db0fd70c954f47750d6 -2010-10-27T20:07:37.188193Z -292 +2010-11-01T19:29:53.000000Z +25cd57ff209fce126a7e443109d50db4 +2010-11-01T19:59:58.894084Z +293 eicke @@ -262,5 +262,5 @@ -9056 +8903 diff -Nru glosung-3.6.1~jaunty/po/.svn/text-base/cs.po.svn-base glosung-3.6.2~jaunty/po/.svn/text-base/cs.po.svn-base --- glosung-3.6.1~jaunty/po/.svn/text-base/cs.po.svn-base 2010-10-27 20:07:33.000000000 +0000 +++ glosung-3.6.2~jaunty/po/.svn/text-base/cs.po.svn-base 2010-11-01 19:59:51.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: glosung 2.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-10-21 20:22+0200\n" +"POT-Creation-Date: 2010-11-01 20:29+0100\n" "PO-Revision-Date: 2010-01-22 22:24+0100\n" "Last-Translator: Eicke Godehardt \n" "Language-Team: czech \n" @@ -463,13 +463,13 @@ # # # File: src/glosung.c, line: 1141 -#~ msgid "Add Languages" -#~ msgstr "Přidej jazyky" +msgid "Add Languages" +msgstr "Přidej jazyky" # # # File: ui/add_language.glade, line: 31 -#~ msgid "Source" -#~ msgstr "Zdroj" +msgid "Source" +msgstr "Zdroj" # # # @@ -494,110 +494,111 @@ # # # File: src/glosung.c, line: 1150 -#~ msgid "Language" -#~ msgstr "Jazyk" +msgid "Language" +msgstr "Jazyk" # # # # # File: src/glosung.c, line: 1152 -#~ msgid "Year" -#~ msgstr "Rok" +msgid "Year" +msgstr "Rok" # # # # # File: src/glosung.c, line: 1144 -#~ msgid "Download" -#~ msgstr "Stáhnout" +msgid "Download" +msgstr "Stáhnout" # # # File: ui/add_language.glade, line: 105 -#~ msgid "download selected verse collection" -#~ msgstr "stáhnout vybranou sbírku veršů" +msgid "download selected verse collection" +msgstr "stáhnout vybranou sbírku veršů" # # # # src/glosung.c:103 # File: src/glosung.c, line: 153 # File: src/glosung.c, line: 429 -#~ msgid "Preferences" -#~ msgstr "Nastavení" +msgid "Preferences" +msgstr "Nastavení" # # # # src/glosung.c:479 # File: src/glosung.c, line: 557 -#~ msgid "Displayed Language:" -#~ msgstr "Výběr jazyka:" +msgid "Displayed Language:" +msgstr "Výběr jazyka:" # # # File: ui/preferences.glade, line: 33 -#~ msgid "Font:" -#~ msgstr "Písmo:" +msgid "Font:" +msgstr "Písmo:" # # # File: ui/preferences.glade, line: 57 -#~ msgid "Start GLosung at login time" -#~ msgstr "Spouštět Glosung při přihlášení" +msgid "Start GLosung at login time" +msgstr "Spouštět Glosung při přihlášení" # # # # File: src/glosung.c, line: 791 -#~ msgid "Link location to Xiphos/Gnomesword" -#~ msgstr "Odkaz na Xiphos/Gnomesword" +msgid "Link location to Xiphos/Gnomesword" +msgstr "Odkaz na Xiphos/Gnomesword" # # # File: ui/preferences.glade, line: 95 -#~ msgid "View" -#~ msgstr "Zobrazení" +msgid "View" +msgstr "Zobrazení" # # # File: ui/preferences.glade, line: 107 -#~ msgid "Proxy" -#~ msgstr "Proxy" +msgid "Proxy" +msgstr "Proxy" # # # File: ui/preferences.glade, line: 128 -#~ msgid "" -#~ "Use proxy to connect to the internet.\n" -#~ "Be careful in persecuted countries, as\n" -#~ "downloading biblical texts may be\n" -#~ "against the law!" -#~ msgstr "" -#~ "Používat proxy k připojení na internet.\n" -#~ "Buďte opatrní v zemích kde dochází\n" -#~ "k pronásledování křesťanů, protože stahování\n" -#~ "biblických textů může být proti zákonu!" +msgid "" +"Use proxy to connect to the internet.\n" +"Be careful in persecuted countries, as\n" +"downloading biblical texts may be\n" +"against the law!" +msgstr "" +"Používat proxy k připojení na internet.\n" +"Buďte opatrní v zemích kde dochází\n" +"k pronásledování křesťanů, protože stahování\n" +"biblických textů může být proti zákonu!" # # # File: ui/preferences.glade, line: 140 -#~ msgid "host[:port]" -#~ msgstr "počítač[:port]" +msgid "host[:port]" +msgstr "počítač[:port]" # # # File: ui/preferences.glade, line: 135 -#~ msgid "Network" -#~ msgstr "Síť" +msgid "Network" +msgstr "Síť" # # # File: ui/warning_dialog.glade, line: 15 -#~ msgid "" -#~ "Warning: If you live in a persecuted country and do not wish to\n" -#~ "risk detection you should NOT use this feature!" -#~ msgstr "" -#~ "Varování: Pokud žijete v zemi kde jsou křesťané pronásledováni\n" -#~ "a nechcete riskovat dopadení NEPOUŽÍVEJTE tuto funkci!" +msgid "" +"Warning: If you live in a persecuted country and do not wish to\n" +"risk detection you should NOT use this feature!" +msgstr "" +"Varování: Pokud žijete v zemi kde jsou křesťané pronásledováni\n" +"a nechcete riskovat dopadení NEPOUŽÍVEJTE tuto funkci!" # # # File: ui/warning_dialog.glade, line: 24 -#~ msgid "Don't show this message again." -#~ msgstr "Později již nezobrazovat tuto zprávu." +msgid "Don't show this message again." +msgstr "Později již nezobrazovat tuto zprávu." # # # File: ui/warning_dialog.glade, line: 28 -#~ msgid "Check this box if you do not want to see this dialog again" -#~ msgstr "Zaškrtněte pokud již nechcete zobrazovat tento dialog" +msgid "Check this box if you do not want to see this dialog again" +msgstr "Zaškrtněte pokud již nechcete zobrazovat tento dialog" +# # # # @@ -610,6 +611,7 @@ # # # +# # File: src/glosung.c, line: 228 #, fuzzy #~ msgid "Authentication" @@ -626,6 +628,7 @@ # # # +# # src/glosung.c:103 # File: src/glosung.c, line: 153 # File: src/glosung.c, line: 429 @@ -650,6 +653,7 @@ # # # +# # File: ui/preferences.glade, line: 111 #~ msgid "gtk-close" #~ msgstr "zavřít" @@ -679,6 +683,7 @@ # # # +# # src/glosung.c:500 # File: src/glosung.c, line: 581 #~ msgid "Choose Font:" @@ -723,6 +728,7 @@ # # # +# # src/glosung.c:116 # File: src/glosung.c, line: 166 #, fuzzy @@ -766,6 +772,7 @@ # # # +# # src/glosung.c:519 # File: src/glosung.c, line: 604 #~ msgid "Show selective and continuing reading" @@ -809,6 +816,7 @@ # # # +# # src/glosung.c:509 # File: src/glosung.c, line: 594 #~ msgid "Close calendar by double click" @@ -853,6 +861,7 @@ # # # +# # File: src/glosung.c, line: 193 #~ msgid "_Copy Watchword" #~ msgstr "Kopírovat Heslo" @@ -914,6 +923,7 @@ # # # +# # src/glosung.c:103 # File: src/glosung.c, line: 153 # File: src/glosung.c, line: 429 @@ -985,6 +995,7 @@ # # # +# # File: src/glosung.c, line: 195 #~ msgid "_About" #~ msgstr "O aplikaci" @@ -1059,6 +1070,7 @@ # # # +# # src/glosung.c:93 src/glosung.c:617 # File: src/glosung.c, line: 143 # File: src/glosung.c, line: 705 @@ -1138,6 +1150,7 @@ # # # +# # src/glosung.c:103 # File: src/glosung.c, line: 153 # File: src/glosung.c, line: 429 @@ -1216,6 +1229,7 @@ # # # +# # src/glosung.c:93 src/glosung.c:617 # File: src/glosung.c, line: 143 # File: src/glosung.c, line: 705 @@ -1295,6 +1309,7 @@ # # # +# # src/glosung.c:77 src/glosung.c:133 # File: src/glosung.c, line: 127 # File: src/glosung.c, line: 183 @@ -1374,6 +1389,7 @@ # # # +# # src/glosung.c:86 # File: src/glosung.c, line: 136 #, fuzzy @@ -1452,6 +1468,7 @@ # # # +# # src/glosung.c:83 # File: src/glosung.c, line: 133 #, fuzzy @@ -1530,6 +1547,7 @@ # # # +# # src/glosung.c:86 # File: src/glosung.c, line: 136 #, fuzzy diff -Nru glosung-3.6.1~jaunty/po/.svn/text-base/de.po.svn-base glosung-3.6.2~jaunty/po/.svn/text-base/de.po.svn-base --- glosung-3.6.1~jaunty/po/.svn/text-base/de.po.svn-base 2010-10-27 20:07:34.000000000 +0000 +++ glosung-3.6.2~jaunty/po/.svn/text-base/de.po.svn-base 2010-11-01 19:59:53.000000000 +0000 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: glosung 2.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-10-21 20:22+0200\n" +"POT-Creation-Date: 2010-11-01 20:29+0100\n" "PO-Revision-Date: 2010-07-19 22:02+0100\n" "Last-Translator: Eicke Godehardt \n" "Language-Team: deutsch \n" @@ -424,13 +424,13 @@ # # # File: src/glosung.c, line: 1141 -#~ msgid "Add Languages" -#~ msgstr "Sprachen hinzufügen" +msgid "Add Languages" +msgstr "Sprachen hinzufügen" # # # File: ui/add_language.glade, line: 31 -#~ msgid "Source" -#~ msgstr "Quelle" +msgid "Source" +msgstr "Quelle" # # # @@ -455,108 +455,108 @@ # # # File: src/glosung.c, line: 1150 -#~ msgid "Language" -#~ msgstr "Sprache" +msgid "Language" +msgstr "Sprache" # # # # # File: src/glosung.c, line: 1152 -#~ msgid "Year" -#~ msgstr "Jahr" +msgid "Year" +msgstr "Jahr" # # # # # File: src/glosung.c, line: 1144 -#~ msgid "Download" -#~ msgstr "Herunterladen" +msgid "Download" +msgstr "Herunterladen" # # # File: ui/add_language.glade, line: 105 -#~ msgid "download selected verse collection" -#~ msgstr "herunterladen der ausgewählten Verszusammenstellung" +msgid "download selected verse collection" +msgstr "herunterladen der ausgewählten Verszusammenstellung" # # # -#~ msgid "Preferences" -#~ msgstr "Einstellungen" +msgid "Preferences" +msgstr "Einstellungen" # # # -#~ msgid "Displayed Language:" -#~ msgstr "Sprache des Textes:" +msgid "Displayed Language:" +msgstr "Sprache des Textes:" # # # File: ui/preferences.glade, line: 33 -#~ msgid "Font:" -#~ msgstr "Schriftart:" +msgid "Font:" +msgstr "Schriftart:" # # # # File: src/glosung.c, line: 917 -#~ msgid "Start GLosung at login time" -#~ msgstr "Starte GLosung beim Einloggen" +msgid "Start GLosung at login time" +msgstr "Starte GLosung beim Einloggen" # # # # File: src/glosung.c, line: 791 -#~ msgid "Link location to Xiphos/Gnomesword" -#~ msgstr "Verbinde Stellenangaben mit Xiphos/Gnomesword" +msgid "Link location to Xiphos/Gnomesword" +msgstr "Verbinde Stellenangaben mit Xiphos/Gnomesword" # # # File: ui/preferences.glade, line: 95 -#~ msgid "View" -#~ msgstr "Ansicht" +msgid "View" +msgstr "Ansicht" # # # File: ui/preferences.glade, line: 107 -#~ msgid "Proxy" -#~ msgstr "Proxy" +msgid "Proxy" +msgstr "Proxy" # # # File: ui/preferences.glade, line: 128 -#~ msgid "" -#~ "Use proxy to connect to the internet.\n" -#~ "Be careful in persecuted countries, as\n" -#~ "downloading biblical texts may be\n" -#~ "against the law!" -#~ msgstr "" -#~ "Verwende einen Proxy, um sich mit dem Internet zu verbinden.\n" -#~ "Achtung! Das Herunterladen von biblischen Texten kann in \n" -#~ "manchen Ländern gegen das Gesetz sein!" +msgid "" +"Use proxy to connect to the internet.\n" +"Be careful in persecuted countries, as\n" +"downloading biblical texts may be\n" +"against the law!" +msgstr "" +"Verwende einen Proxy, um sich mit dem Internet zu verbinden.\n" +"Achtung! Das Herunterladen von biblischen Texten kann in \n" +"manchen Ländern gegen das Gesetz sein!" # # # File: ui/preferences.glade, line: 140 -#~ msgid "host[:port]" -#~ msgstr "host[:port]" +msgid "host[:port]" +msgstr "host[:port]" # # # File: ui/preferences.glade, line: 135 -#~ msgid "Network" -#~ msgstr "Netzwerk" +msgid "Network" +msgstr "Netzwerk" # # # File: ui/warning_dialog.glade, line: 15 -#~ msgid "" -#~ "Warning: If you live in a persecuted country and do not wish to\n" -#~ "risk detection you should NOT use this feature!" -#~ msgstr "" -#~ "Warnung: Wenn sie in ihrem Land wegen ihrer Religion verfolgt " -#~ "werden könnten und nicht riskieren wollen entdeckt zu werden, sollten sie " -#~ "diese Funktion NICHT verwenden!" +msgid "" +"Warning: If you live in a persecuted country and do not wish to\n" +"risk detection you should NOT use this feature!" +msgstr "" +"Warnung: Wenn sie in ihrem Land wegen ihrer Religion verfolgt werden " +"könnten und nicht riskieren wollen entdeckt zu werden, sollten sie diese " +"Funktion NICHT verwenden!" # # # File: ui/warning_dialog.glade, line: 24 -#~ msgid "Don't show this message again." -#~ msgstr "Diese Meldung nicht mehr anzeigen." +msgid "Don't show this message again." +msgstr "Diese Meldung nicht mehr anzeigen." # # # File: ui/warning_dialog.glade, line: 28 -#~ msgid "Check this box if you do not want to see this dialog again" -#~ msgstr "" -#~ "Schalten sie das Häkchen an, wenn sie diesen Dialog nicht mehr sehen " -#~ "möchten" +msgid "Check this box if you do not want to see this dialog again" +msgstr "" +"Schalten sie das Häkchen an, wenn sie diesen Dialog nicht mehr sehen möchten" +# # # # @@ -569,6 +569,7 @@ # # # +# # File: ui/preferences.glade, line: 165 #~ msgid "User:" #~ msgstr "Benutzer:" @@ -577,6 +578,7 @@ # # # +# # File: ui/preferences.glade, line: 173 #~ msgid "Password:" #~ msgstr "Passwort:" @@ -585,6 +587,7 @@ # # # +# # File: ui/preferences.glade, line: 189 #~ msgid "user name for proxy authentification" #~ msgstr "Benutzername für die Proxy-Authentifizierung" @@ -593,6 +596,7 @@ # # # +# # File: ui/preferences.glade, line: 202 #~ msgid "password name for proxy authentification" #~ msgstr "Passwort für die Proxy-Authentifizierung" @@ -601,6 +605,7 @@ # # # +# # File: src/glosung.c, line: 228 #~ msgid "Authentication" #~ msgstr "Authentifizierung" @@ -616,6 +621,7 @@ # # # +# #, fuzzy #~ msgid "Prefered Source:" #~ msgstr "Einstellungen" @@ -644,6 +650,7 @@ # # # +# #~ msgid "Choose Font:" #~ msgstr "Schriftart des Textes:" # @@ -674,6 +681,7 @@ # # # +# # File: src/about.c, line: 86 #~ msgid "Since 1731 in about 50 languages." #~ msgstr "Seit 1731 in etwa 50 Sprachen." @@ -716,6 +724,7 @@ # # # +# #~ msgid "About Losungen" #~ msgstr "_über Losungen" # @@ -755,6 +764,7 @@ # # # +# #~ msgid "Show selective and continuing reading" #~ msgstr "Zeige Lesehinweise" # @@ -795,6 +805,7 @@ # # # +# #~ msgid "Close calendar by double click" #~ msgstr "Schließen des Kalenders durch Doppelklick" # @@ -836,6 +847,7 @@ # # # +# # File: src/glosung.c, line: 193 #~ msgid "_Copy Watchword" #~ msgstr "Losung _kopieren" @@ -883,6 +895,7 @@ # # # +# # File: src/glosung.c, line: 1257 #~ msgid "" #~ "This dialog only works for losung files until 2007!\n" @@ -951,6 +964,7 @@ # # # +# #~ msgid "_Preferences..." #~ msgstr "_Einstellungen..." # @@ -1017,6 +1031,7 @@ # # # +# # File: src/glosung.c, line: 195 #~ msgid "_About" #~ msgstr "_Über" @@ -1090,6 +1105,7 @@ # # # +# #, fuzzy #~ msgid "/File/_Calendar" #~ msgstr "Kalender" @@ -1165,6 +1181,7 @@ # # # +# #, fuzzy #~ msgid "/_Edit/_Preferences..." #~ msgstr "Einstellungen..." @@ -1239,6 +1256,7 @@ # # # +# #, fuzzy #~ msgid "/Toolbar/_Calendar" #~ msgstr "Kalender" @@ -1314,6 +1332,7 @@ # # # +# #, fuzzy #~ msgid "/Toolbar/_Next Day" #~ msgstr "Nächster Tag" @@ -1389,6 +1408,7 @@ # # # +# #, fuzzy #~ msgid "/Toolbar/_Previous Day" #~ msgstr "Vorheriger Monat" @@ -1464,6 +1484,7 @@ # # # +# #, fuzzy #~ msgid "/Toolbar/_Next Month" #~ msgstr "Nächster Monat" @@ -1539,6 +1560,7 @@ # # # +# #, fuzzy #~ msgid "/Toolbar/_Previous Month" #~ msgstr "Vorheriger Monat" diff -Nru glosung-3.6.1~jaunty/po/.svn/text-base/fr.po.svn-base glosung-3.6.2~jaunty/po/.svn/text-base/fr.po.svn-base --- glosung-3.6.1~jaunty/po/.svn/text-base/fr.po.svn-base 2010-10-27 20:07:34.000000000 +0000 +++ glosung-3.6.2~jaunty/po/.svn/text-base/fr.po.svn-base 2010-11-01 19:59:53.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: glosung 3.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-10-21 20:22+0200\n" +"POT-Creation-Date: 2010-11-01 20:29+0100\n" "PO-Revision-Date: 2006-11-29 22:30+0100\n" "Last-Translator: Nicolas \n" "Language-Team: French \n" @@ -275,8 +275,12 @@ # # File: src/glosung.c, line: 1141 #, fuzzy -#~ msgid "Add Languages" -#~ msgstr "Ajouter de nouvelles traductions" +msgid "Add Languages" +msgstr "Ajouter de nouvelles traductions" +# +# File: ui/add_language.glade, line: 30 +msgid "Source" +msgstr "" # # # @@ -301,40 +305,91 @@ # # # File: src/glosung.c, line: 1150 -#~ msgid "Language" -#~ msgstr "Traduction" +msgid "Language" +msgstr "Traduction" # # # # # File: src/glosung.c, line: 1152 -#~ msgid "Year" -#~ msgstr "Année" +msgid "Year" +msgstr "Année" # # # # # File: src/glosung.c, line: 1144 -#~ msgid "Download" -#~ msgstr "Télécharger" +msgid "Download" +msgstr "Télécharger" # +# File: ui/add_language.glade, line: 104 +msgid "download selected verse collection" +msgstr "" # # -#~ msgid "Preferences" -#~ msgstr "Préférences" +# +msgid "Preferences" +msgstr "Préférences" # # # #, fuzzy -#~ msgid "Displayed Language:" -#~ msgstr "Langue :" +msgid "Displayed Language:" +msgstr "Langue :" +# +# File: ui/preferences.glade, line: 35 +msgid "Font:" +msgstr "" +# +# File: ui/preferences.glade, line: 59 +msgid "Start GLosung at login time" +msgstr "" # # # # File: src/glosung.c, line: 791 #, fuzzy -#~ msgid "Link location to Xiphos/Gnomesword" -#~ msgstr "Liens vers gnomesword" +msgid "Link location to Xiphos/Gnomesword" +msgstr "Liens vers gnomesword" +# +# File: ui/preferences.glade, line: 111 +msgid "View" +msgstr "" +# +# File: ui/preferences.glade, line: 123 +msgid "Proxy" +msgstr "" +# +# File: ui/preferences.glade, line: 127 +msgid "" +"Use proxy to connect to the internet.\n" +"Be careful in persecuted countries, as\n" +"downloading biblical texts may be\n" +"against the law!" +msgstr "" +# +# File: ui/preferences.glade, line: 139 +msgid "host[:port]" +msgstr "" +# +# File: ui/preferences.glade, line: 157 +msgid "Network" +msgstr "" +# +# File: ui/warning_dialog.glade, line: 15 +msgid "" +"Warning: If you live in a persecuted country and do not wish to\n" +"risk detection you should NOT use this feature!" +msgstr "" +# +# File: ui/warning_dialog.glade, line: 24 +msgid "Don't show this message again." +msgstr "" +# +# File: ui/warning_dialog.glade, line: 28 +msgid "Check this box if you do not want to see this dialog again" +msgstr "" +# # # # @@ -377,6 +432,7 @@ # # # +# #~ msgid "Choose Font:" #~ msgstr "Police :" # @@ -412,6 +468,7 @@ # # # +# #, fuzzy #~ msgid "About Losungen" #~ msgstr "_Losung" @@ -453,6 +510,7 @@ # # # +# #~ msgid "Show selective and continuing reading" #~ msgstr "Afficher les suggestions de lecture suivie" # @@ -494,6 +552,7 @@ # # # +# #~ msgid "Close calendar by double click" #~ msgstr "Fermer le calendrier en double-cliquant" # @@ -554,6 +613,7 @@ # # # +# #, fuzzy #~ msgid "_Preferences..." #~ msgstr "Préférences..." @@ -622,6 +682,7 @@ # # # +# #~ msgid "Open a calendar-widget" #~ msgstr "Ouvrir le calendrier" # @@ -689,6 +750,7 @@ # # # +# # File: src/glosung.c, line: 180 #~ msgid "Languages..." #~ msgstr "Traductions" @@ -757,5 +819,6 @@ # # # +# #~ msgid "Exit the Program" #~ msgstr "Quitter le programme" diff -Nru glosung-3.6.1~jaunty/po/.svn/text-base/hu.po.svn-base glosung-3.6.2~jaunty/po/.svn/text-base/hu.po.svn-base --- glosung-3.6.1~jaunty/po/.svn/text-base/hu.po.svn-base 2010-10-27 20:07:37.000000000 +0000 +++ glosung-3.6.2~jaunty/po/.svn/text-base/hu.po.svn-base 2010-11-01 19:59:57.000000000 +0000 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: glosung 3.5.3\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-10-21 20:22+0200\n" +"POT-Creation-Date: 2010-11-01 20:29+0100\n" "PO-Revision-Date: 2010-07-27 13:38+0100\n" "Last-Translator: Máté Nagy \n" "Language-Team: hungarian \n" @@ -280,106 +280,107 @@ # # # File: src/glosung.c, line: 1063 -#~ msgid "Add Languages" -#~ msgstr "Nyelv hozzáadása" +msgid "Add Languages" +msgstr "Nyelv hozzáadása" # # -#~ msgid "Source" -#~ msgstr "Forrás" +msgid "Source" +msgstr "Forrás" # # # File: src/glosung.c, line: 1063 -#~ msgid "Language" -#~ msgstr "Nyelv" +msgid "Language" +msgstr "Nyelv" # # -#~ msgid "Year" -#~ msgstr "Év" +msgid "Year" +msgstr "Év" # # -#~ msgid "Download" -#~ msgstr "Letöltés" +msgid "Download" +msgstr "Letöltés" # # -#~ msgid "download selected verse collection" -#~ msgstr "A kiválasztott versösszeállítás letöltése" +msgid "download selected verse collection" +msgstr "A kiválasztott versösszeállítás letöltése" # # # File: src/glosung.c, line: 217 -#~ msgid "Preferences" -#~ msgstr "Beállítások" +msgid "Preferences" +msgstr "Beállítások" # # # File: src/glosung.c, line: 1090 -#~ msgid "Displayed Language:" -#~ msgstr "Telepített nyelvek:" +msgid "Displayed Language:" +msgstr "Telepített nyelvek:" # # -#~ msgid "Font:" -#~ msgstr "Betűkészlet:" +msgid "Font:" +msgstr "Betűkészlet:" # # -#~ msgid "Start GLosung at login time" -#~ msgstr "GLosung indítása bejelentkezéskor" +msgid "Start GLosung at login time" +msgstr "GLosung indítása bejelentkezéskor" # # -#~ msgid "Link location to Xiphos/Gnomesword" -#~ msgstr "Igehelyek linkelése Xiphos/GnomeSword-al" +msgid "Link location to Xiphos/Gnomesword" +msgstr "Igehelyek linkelése Xiphos/GnomeSword-al" # # # File: ui/preferences.glade, line: 95 -#~ msgid "View" -#~ msgstr "Nézet" +msgid "View" +msgstr "Nézet" # # # File: ui/preferences.glade, line: 107 -#~ msgid "Proxy" -#~ msgstr "Proxy" +msgid "Proxy" +msgstr "Proxy" # # # File: ui/preferences.glade, line: 128 -#~ msgid "" -#~ "Use proxy to connect to the internet.\n" -#~ "Be careful in persecuted countries, as\n" -#~ "downloading biblical texts may be\n" -#~ "against the law!" -#~ msgstr "" -#~ "Proxy használata az internet kapcsolathoz.\n" -#~ "Legyen óvatos az olyan országokban, ahol\n" -#~ "kereszt(y)én(y) üldözés van, mert bibliai szövegek\n" -#~ "letöltése törvénybe ütközhet!" +msgid "" +"Use proxy to connect to the internet.\n" +"Be careful in persecuted countries, as\n" +"downloading biblical texts may be\n" +"against the law!" +msgstr "" +"Proxy használata az internet kapcsolathoz.\n" +"Legyen óvatos az olyan országokban, ahol\n" +"kereszt(y)én(y) üldözés van, mert bibliai szövegek\n" +"letöltése törvénybe ütközhet!" # # # File: ui/preferences.glade, line: 140 -#~ msgid "host[:port]" -#~ msgstr "hoszt[:port]" +msgid "host[:port]" +msgstr "hoszt[:port]" # # # File: ui/preferences.glade, line: 135 -#~ msgid "Network" -#~ msgstr "Hálózat" +msgid "Network" +msgstr "Hálózat" # # # File: ui/warning_dialog.glade, line: 15 -#~ msgid "" -#~ "Warning: If you live in a persecuted country and do not wish to\n" -#~ "risk detection you should NOT use this feature!" -#~ msgstr "" -#~ "Figyelem: ha Ön olyan országban él, ahol kereszt(y)én(y) üldözés " -#~ "van,\n" -#~ "és nem akarja megkockáztatni, hogy felfedezzék, akkor NE használja ezt a " -#~ "funkciót!" +msgid "" +"Warning: If you live in a persecuted country and do not wish to\n" +"risk detection you should NOT use this feature!" +msgstr "" +"Figyelem: ha Ön olyan országban él, ahol kereszt(y)én(y) üldözés " +"van,\n" +"és nem akarja megkockáztatni, hogy felfedezzék, akkor NE használja ezt a " +"funkciót!" # # # File: ui/warning_dialog.glade, line: 24 -#~ msgid "Don't show this message again." -#~ msgstr "Ne jelenjen meg újra ez az üzenet." +msgid "Don't show this message again." +msgstr "Ne jelenjen meg újra ez az üzenet." # # # File: ui/warning_dialog.glade, line: 28 -#~ msgid "Check this box if you do not want to see this dialog again" -#~ msgstr "" -#~ "Jelölje be a négyzetet, ha nem szeretné többet ezt a dialógusablakot látni" +msgid "Check this box if you do not want to see this dialog again" +msgstr "" +"Jelölje be a négyzetet, ha nem szeretné többet ezt a dialógusablakot látni" +# # # # @@ -391,6 +392,7 @@ # # # +# # File: src/glosung.c, line: 210 #, fuzzy #~ msgid "Authentication" @@ -406,6 +408,7 @@ # # # +# # File: src/glosung.c, line: 217 #, fuzzy #~ msgid "Prefered Source:" diff -Nru glosung-3.6.1~jaunty/po/.svn/text-base/SConscript.svn-base glosung-3.6.2~jaunty/po/.svn/text-base/SConscript.svn-base --- glosung-3.6.1~jaunty/po/.svn/text-base/SConscript.svn-base 2010-10-21 18:21:24.000000000 +0000 +++ glosung-3.6.2~jaunty/po/.svn/text-base/SConscript.svn-base 2010-11-01 19:59:54.000000000 +0000 @@ -29,9 +29,9 @@ '#/src/parser.c', '#/src/settings.c', '#/src/util.c', - '#/ui/add_language.ui', - '#/ui/preferences.ui', - '#/ui/warning_dialog.ui'], + '#/ui/add_language.glade', + '#/ui/preferences.glade', + '#/ui/warning_dialog.glade'], "xgettext --add-comments --keyword=_ --keyword=N_ --add-location --strict --output=$TARGET $SOURCES"); for lang in languages: po = env.Execute (action = "msgmerge --update --strict --verbose " + lang + ".po glosung.pot"); diff -Nru glosung-3.6.1~jaunty/rpm/glosung.spec glosung-3.6.2~jaunty/rpm/glosung.spec --- glosung-3.6.1~jaunty/rpm/glosung.spec 2010-10-27 19:56:11.000000000 +0000 +++ glosung-3.6.2~jaunty/rpm/glosung.spec 2010-11-01 19:54:33.000000000 +0000 @@ -1,5 +1,5 @@ %define name glosung -%define version 3.6 +%define version 3.6.2 %define release 1 Summary: Gtk+ Version of watch words (german: Losung) @@ -57,9 +57,9 @@ /usr/share/glosung/glosung.png /usr/share/glosung/glosung-big.png /usr/share/glosung/herrnhut.png -/usr/share/glosung/add_language.ui -/usr/share/glosung/preferences.ui -/usr/share/glosung/warning_dialog.ui +/usr/share/glosung/add_language.glade +/usr/share/glosung/preferences.glade +/usr/share/glosung/warning_dialog.glade /usr/share/locale/cs/LC_MESSAGES/glosung.mo /usr/share/locale/de/LC_MESSAGES/glosung.mo /usr/share/locale/fr/LC_MESSAGES/glosung.mo @@ -76,6 +76,10 @@ %changelog +*2010-11-01 Eicke +- fix error reporting problem after download (proxy) +- fix translation problem + *2010-10-27 Eicke - fix XML handling, as file format was slightly by losungen.de - add [control] modifier to scroll wheel to navigate monthly diff -Nru glosung-3.6.1~jaunty/rpm/.svn/all-wcprops glosung-3.6.2~jaunty/rpm/.svn/all-wcprops --- glosung-3.6.1~jaunty/rpm/.svn/all-wcprops 2010-10-27 20:07:39.000000000 +0000 +++ glosung-3.6.2~jaunty/rpm/.svn/all-wcprops 2010-11-01 20:00:06.000000000 +0000 @@ -7,5 +7,5 @@ K 25 svn:wc:ra_dav:version-url V 60 -/svnroot/glosung/!svn/ver/292/trunk/glosung/rpm/glosung.spec +/svnroot/glosung/!svn/ver/293/trunk/glosung/rpm/glosung.spec END diff -Nru glosung-3.6.1~jaunty/rpm/.svn/entries glosung-3.6.2~jaunty/rpm/.svn/entries --- glosung-3.6.1~jaunty/rpm/.svn/entries 2010-10-27 20:07:39.000000000 +0000 +++ glosung-3.6.2~jaunty/rpm/.svn/entries 2010-11-01 20:00:06.000000000 +0000 @@ -28,14 +28,14 @@ glosung.spec file -292 +293 -2010-10-27T19:56:11.000000Z -47d221234d87acc75a36fbc73d078d91 -2010-10-27T20:07:37.188193Z -292 +2010-11-01T19:54:33.000000Z +27a7ed5f07ea50a09ef476e5146873f1 +2010-11-01T19:59:58.894084Z +293 eicke @@ -58,5 +58,5 @@ -7828 +7937 diff -Nru glosung-3.6.1~jaunty/rpm/.svn/text-base/glosung.spec.svn-base glosung-3.6.2~jaunty/rpm/.svn/text-base/glosung.spec.svn-base --- glosung-3.6.1~jaunty/rpm/.svn/text-base/glosung.spec.svn-base 2010-10-27 20:07:35.000000000 +0000 +++ glosung-3.6.2~jaunty/rpm/.svn/text-base/glosung.spec.svn-base 2010-11-01 19:59:54.000000000 +0000 @@ -1,5 +1,5 @@ %define name glosung -%define version 3.6 +%define version 3.6.2 %define release 1 Summary: Gtk+ Version of watch words (german: Losung) @@ -57,9 +57,9 @@ /usr/share/glosung/glosung.png /usr/share/glosung/glosung-big.png /usr/share/glosung/herrnhut.png -/usr/share/glosung/add_language.ui -/usr/share/glosung/preferences.ui -/usr/share/glosung/warning_dialog.ui +/usr/share/glosung/add_language.glade +/usr/share/glosung/preferences.glade +/usr/share/glosung/warning_dialog.glade /usr/share/locale/cs/LC_MESSAGES/glosung.mo /usr/share/locale/de/LC_MESSAGES/glosung.mo /usr/share/locale/fr/LC_MESSAGES/glosung.mo @@ -76,6 +76,10 @@ %changelog +*2010-11-01 Eicke +- fix error reporting problem after download (proxy) +- fix translation problem + *2010-10-27 Eicke - fix XML handling, as file format was slightly by losungen.de - add [control] modifier to scroll wheel to navigate monthly Binary files /tmp/x_nd_e9lso/glosung-3.6.1~jaunty/.sconsign.dblite and /tmp/fw6hlKkLfU/glosung-3.6.2~jaunty/.sconsign.dblite differ diff -Nru glosung-3.6.1~jaunty/SConstruct glosung-3.6.2~jaunty/SConstruct --- glosung-3.6.1~jaunty/SConstruct 2010-10-21 18:29:27.000000000 +0000 +++ glosung-3.6.2~jaunty/SConstruct 2010-11-01 19:33:30.000000000 +0000 @@ -18,7 +18,7 @@ import os -version = '3.6.1' +version = '3.6.2' # Stores signatures in ".sconsign.dbm" # in the top-level SConstruct directory. @@ -121,7 +121,7 @@ env.Install (dir = install_dir + pixmap_dir, source = ['herrnhut.png', 'glosung.png', 'glosung-big.png']) env.Install (dir = install_dir + data_dir, - source = ['ui/add_language.ui', 'ui/preferences.ui', 'ui/warning_dialog.ui']) + source = ['ui/add_language.glade', 'ui/preferences.glade', 'ui/warning_dialog.glade']) # TODO put everything into a folder "glosung-" and rename build to src if env['PLATFORM'] != 'win32': @@ -136,9 +136,9 @@ 'glosung-big.png', 'glosung.desktop', 'glosung.png', - 'ui/add_language.ui', - 'ui/preferences.ui', - 'ui/warning_dialog.ui', + 'ui/add_language.glade', + 'ui/preferences.glade', + 'ui/warning_dialog.glade', 'debian/glosung.files', 'debian/control', 'debian/changelog', diff -Nru glosung-3.6.1~jaunty/src/download.c glosung-3.6.2~jaunty/src/download.c --- glosung-3.6.1~jaunty/src/download.c 2010-08-04 20:02:51.000000000 +0000 +++ glosung-3.6.2~jaunty/src/download.c 2010-11-01 19:47:49.000000000 +0000 @@ -351,10 +351,9 @@ break; default: g_message ("unknown source type '%s'", cs->name); - return -1; + error = -100; } - error = 5; return error; } /* download */ diff -Nru glosung-3.6.1~jaunty/src/glosung.c glosung-3.6.2~jaunty/src/glosung.c --- glosung-3.6.1~jaunty/src/glosung.c 2010-10-21 18:33:40.000000000 +0000 +++ glosung-3.6.2~jaunty/src/glosung.c 2010-11-01 19:43:11.000000000 +0000 @@ -688,7 +688,7 @@ GtkBuilder* builder = gtk_builder_new (); gtk_builder_set_translation_domain (builder, PACKAGE); - gchar *ui_file = find_ui_file ("preferences.ui"); + gchar *ui_file = find_ui_file ("preferences.glade"); guint build = gtk_builder_add_from_file (builder, ui_file,NULL); g_free (ui_file); if (! build) { @@ -1167,7 +1167,7 @@ GtkBuilder* builder = gtk_builder_new (); gtk_builder_set_translation_domain (builder, PACKAGE); - gchar *ui_file = find_ui_file ("add_language.ui"); + gchar *ui_file = find_ui_file ("add_language.glade"); guint build = gtk_builder_add_from_file (builder, ui_file, NULL); g_free (ui_file); if (! build) { @@ -1208,23 +1208,6 @@ gtk_container_add (GTK_CONTAINER (year_frame), GTK_WIDGET (year_combo)); gtk_widget_set_sensitive (GTK_WIDGET (year_combo), FALSE); - time_t t; - struct tm now; - - t = time (NULL); - now = *localtime (&t); - gint this_year = now.tm_year + 1900; - if (now.tm_mon >= 10) { - // in November and December offer - // download next year's texts - this_year++; - } -/* - for (i = this_year; i >= this_year - 2; i--) { - gchar *year = g_strdup_printf ("%d", i); - gtk_combo_box_append_text (year_combo, year); - } -*/ gtk_combo_box_set_active (year_combo, 0); g_signal_connect (G_OBJECT (source_combo), "changed", @@ -1248,11 +1231,11 @@ langu = g_ptr_array_index (langs, index); GPtrArray *vc_s = source_get_collections (server_list, langu); - gint i = 0; + gint i = gtk_combo_box_get_active (GTK_COMBO_BOX (year_combo)); guint year = VC (g_ptr_array_index (vc_s, i))->year; if (! is_hide_warning ()) { - ui_file = find_ui_file ("warning_dialog.ui"); + ui_file = find_ui_file ("warning_dialog.glade"); gtk_builder_add_from_file (builder, ui_file, NULL); g_free (ui_file); gtk_builder_connect_signals (builder, NULL); diff -Nru glosung-3.6.1~jaunty/src/.svn/all-wcprops glosung-3.6.2~jaunty/src/.svn/all-wcprops --- glosung-3.6.1~jaunty/src/.svn/all-wcprops 2010-10-21 18:39:40.000000000 +0000 +++ glosung-3.6.2~jaunty/src/.svn/all-wcprops 2010-11-01 20:00:06.000000000 +0000 @@ -27,18 +27,18 @@ V 58 /svnroot/glosung/!svn/ver/275/trunk/glosung/src/SConscript END -download.c -K 25 -svn:wc:ra_dav:version-url -V 58 -/svnroot/glosung/!svn/ver/286/trunk/glosung/src/download.c -END losung.c K 25 svn:wc:ra_dav:version-url V 56 /svnroot/glosung/!svn/ver/260/trunk/glosung/src/losung.c END +download.c +K 25 +svn:wc:ra_dav:version-url +V 58 +/svnroot/glosung/!svn/ver/293/trunk/glosung/src/download.c +END about.c K 25 svn:wc:ra_dav:version-url @@ -57,18 +57,18 @@ V 54 /svnroot/glosung/!svn/ver/266/trunk/glosung/src/util.c END -glosung.c -K 25 -svn:wc:ra_dav:version-url -V 57 -/svnroot/glosung/!svn/ver/291/trunk/glosung/src/glosung.c -END collections.c K 25 svn:wc:ra_dav:version-url V 61 /svnroot/glosung/!svn/ver/291/trunk/glosung/src/collections.c END +glosung.c +K 25 +svn:wc:ra_dav:version-url +V 57 +/svnroot/glosung/!svn/ver/293/trunk/glosung/src/glosung.c +END about.h K 25 svn:wc:ra_dav:version-url diff -Nru glosung-3.6.1~jaunty/src/.svn/entries glosung-3.6.2~jaunty/src/.svn/entries --- glosung-3.6.1~jaunty/src/.svn/entries 2010-10-21 18:39:40.000000000 +0000 +++ glosung-3.6.2~jaunty/src/.svn/entries 2010-11-01 20:00:06.000000000 +0000 @@ -188,14 +188,14 @@ download.c file -286 +293 -2010-08-04T20:02:51.000000Z -2249fed4e03da2f75f61819e54aa6459 -2010-08-04T20:08:55.954134Z -286 +2010-11-01T19:47:49.000000Z +086e4b29b865a65da26da6c60dd214c7 +2010-11-01T19:59:58.894084Z +293 eicke @@ -218,7 +218,7 @@ -11515 +11506 losung.c file @@ -382,14 +382,14 @@ glosung.c file -291 +293 -2010-10-21T18:33:40.000000Z -2aa1a44ff32f7441004e8e8079751642 -2010-10-21T18:39:39.321438Z -291 +2010-11-01T19:43:11.000000Z +f6d3bd05a0f1c93b350949c4c702dc6f +2010-11-01T19:59:58.894084Z +293 eicke @@ -412,7 +412,7 @@ -51631 +51208 collections.c file @@ -420,7 +420,7 @@ -2010-10-21T18:21:52.000000Z +2010-11-01T19:08:14.000000Z 62ccdba917b129833c163c33a22a5c28 2010-10-21T18:39:39.321438Z 291 diff -Nru glosung-3.6.1~jaunty/src/.svn/text-base/download.c.svn-base glosung-3.6.2~jaunty/src/.svn/text-base/download.c.svn-base --- glosung-3.6.1~jaunty/src/.svn/text-base/download.c.svn-base 2010-08-04 20:08:55.000000000 +0000 +++ glosung-3.6.2~jaunty/src/.svn/text-base/download.c.svn-base 2010-11-01 19:59:50.000000000 +0000 @@ -351,10 +351,9 @@ break; default: g_message ("unknown source type '%s'", cs->name); - return -1; + error = -100; } - error = 5; return error; } /* download */ diff -Nru glosung-3.6.1~jaunty/src/.svn/text-base/glosung.c.svn-base glosung-3.6.2~jaunty/src/.svn/text-base/glosung.c.svn-base --- glosung-3.6.1~jaunty/src/.svn/text-base/glosung.c.svn-base 2010-10-21 18:39:37.000000000 +0000 +++ glosung-3.6.2~jaunty/src/.svn/text-base/glosung.c.svn-base 2010-11-01 19:59:55.000000000 +0000 @@ -688,7 +688,7 @@ GtkBuilder* builder = gtk_builder_new (); gtk_builder_set_translation_domain (builder, PACKAGE); - gchar *ui_file = find_ui_file ("preferences.ui"); + gchar *ui_file = find_ui_file ("preferences.glade"); guint build = gtk_builder_add_from_file (builder, ui_file,NULL); g_free (ui_file); if (! build) { @@ -1167,7 +1167,7 @@ GtkBuilder* builder = gtk_builder_new (); gtk_builder_set_translation_domain (builder, PACKAGE); - gchar *ui_file = find_ui_file ("add_language.ui"); + gchar *ui_file = find_ui_file ("add_language.glade"); guint build = gtk_builder_add_from_file (builder, ui_file, NULL); g_free (ui_file); if (! build) { @@ -1208,23 +1208,6 @@ gtk_container_add (GTK_CONTAINER (year_frame), GTK_WIDGET (year_combo)); gtk_widget_set_sensitive (GTK_WIDGET (year_combo), FALSE); - time_t t; - struct tm now; - - t = time (NULL); - now = *localtime (&t); - gint this_year = now.tm_year + 1900; - if (now.tm_mon >= 10) { - // in November and December offer - // download next year's texts - this_year++; - } -/* - for (i = this_year; i >= this_year - 2; i--) { - gchar *year = g_strdup_printf ("%d", i); - gtk_combo_box_append_text (year_combo, year); - } -*/ gtk_combo_box_set_active (year_combo, 0); g_signal_connect (G_OBJECT (source_combo), "changed", @@ -1248,11 +1231,11 @@ langu = g_ptr_array_index (langs, index); GPtrArray *vc_s = source_get_collections (server_list, langu); - gint i = 0; + gint i = gtk_combo_box_get_active (GTK_COMBO_BOX (year_combo)); guint year = VC (g_ptr_array_index (vc_s, i))->year; if (! is_hide_warning ()) { - ui_file = find_ui_file ("warning_dialog.ui"); + ui_file = find_ui_file ("warning_dialog.glade"); gtk_builder_add_from_file (builder, ui_file, NULL); g_free (ui_file); gtk_builder_connect_signals (builder, NULL); diff -Nru glosung-3.6.1~jaunty/.svn/all-wcprops glosung-3.6.2~jaunty/.svn/all-wcprops --- glosung-3.6.1~jaunty/.svn/all-wcprops 2010-10-27 20:07:39.000000000 +0000 +++ glosung-3.6.2~jaunty/.svn/all-wcprops 2010-11-01 20:00:06.000000000 +0000 @@ -49,13 +49,13 @@ K 25 svn:wc:ra_dav:version-url V 53 -/svnroot/glosung/!svn/ver/292/trunk/glosung/ChangeLog +/svnroot/glosung/!svn/ver/293/trunk/glosung/ChangeLog END SConstruct K 25 svn:wc:ra_dav:version-url V 54 -/svnroot/glosung/!svn/ver/291/trunk/glosung/SConstruct +/svnroot/glosung/!svn/ver/293/trunk/glosung/SConstruct END COPYING K 25 diff -Nru glosung-3.6.1~jaunty/.svn/entries glosung-3.6.2~jaunty/.svn/entries --- glosung-3.6.1~jaunty/.svn/entries 2010-10-27 20:07:39.000000000 +0000 +++ glosung-3.6.2~jaunty/.svn/entries 2010-11-01 20:00:06.000000000 +0000 @@ -26,6 +26,9 @@ 6688e68a-c221-0410-b4c0-83a6ce095ebb +debian +dir + herrnhut.png file @@ -60,9 +63,6 @@ 7598 -debian -dir - AUTHORS file @@ -131,16 +131,19 @@ 369 +src +dir + ChangeLog file -292 +293 -2010-10-27T20:00:26.000000Z -987ebada322d7840346f011ca0548770 -2010-10-27T20:07:37.188193Z -292 +2010-11-01T19:54:24.000000Z +dcfb2c7eddbb1aa0d350d40c258bef6b +2010-11-01T19:59:58.894084Z +293 eicke @@ -163,21 +166,18 @@ -10345 - -src -dir +10471 -herrnhut.svg +README file -2009-02-24T15:08:32.000000Z -4700d4adbb927890eaeee668a4a92a79 -2009-02-24T15:22:14.876220Z -229 +2009-01-31T13:36:27.000000Z +da81cb65ed94ade2c8ed4dc53c0a14fa +2008-01-08T13:42:45.830947Z +146 eicke @@ -200,18 +200,18 @@ -7804 +1378 -README +herrnhut.svg file -2009-01-31T13:36:27.000000Z -da81cb65ed94ade2c8ed4dc53c0a14fa -2008-01-08T13:42:45.830947Z -146 +2009-02-24T15:08:32.000000Z +4700d4adbb927890eaeee668a4a92a79 +2009-02-24T15:22:14.876220Z +229 eicke @@ -234,7 +234,7 @@ -1378 +7804 rpm dir @@ -341,17 +341,13 @@ 954 -INSTALL +add_language.glade file +231 -2009-01-31T13:36:27.000000Z -168cffac5c9b6d7431b8eb62110a8d9b -2006-11-11T12:16:56.945154Z -2 -eicke @@ -367,17 +363,21 @@ +deleted + +INSTALL +file +2009-01-31T13:36:27.000000Z +168cffac5c9b6d7431b8eb62110a8d9b +2006-11-11T12:16:56.945154Z +2 +eicke -440 - -add_language.glade -file -231 @@ -397,18 +397,18 @@ -deleted +440 SConstruct file -291 +293 -2010-10-21T18:29:27.000000Z -a95a7f095b1306a69d896f26759cf659 -2010-10-21T18:39:39.321438Z -291 +2010-11-01T19:33:30.000000Z +2d58213ae83579ce96a1ca7d7f170f79 +2010-11-01T19:59:58.894084Z +293 eicke @@ -431,7 +431,7 @@ -4732 +4750 COPYING file diff -Nru glosung-3.6.1~jaunty/.svn/text-base/ChangeLog.svn-base glosung-3.6.2~jaunty/.svn/text-base/ChangeLog.svn-base --- glosung-3.6.1~jaunty/.svn/text-base/ChangeLog.svn-base 2010-10-27 20:07:36.000000000 +0000 +++ glosung-3.6.2~jaunty/.svn/text-base/ChangeLog.svn-base 2010-11-01 19:59:56.000000000 +0000 @@ -1,3 +1,9 @@ +2010-11-01 eicke + + * release 3.6.2 + * fix error reporting problem after download (proxy) + * fix translation problem + 2010-10-27 eicke * release 3.6.1 diff -Nru glosung-3.6.1~jaunty/.svn/text-base/SConstruct.svn-base glosung-3.6.2~jaunty/.svn/text-base/SConstruct.svn-base --- glosung-3.6.1~jaunty/.svn/text-base/SConstruct.svn-base 2010-10-21 18:39:38.000000000 +0000 +++ glosung-3.6.2~jaunty/.svn/text-base/SConstruct.svn-base 2010-11-01 19:59:57.000000000 +0000 @@ -18,7 +18,7 @@ import os -version = '3.6.1' +version = '3.6.2' # Stores signatures in ".sconsign.dbm" # in the top-level SConstruct directory. @@ -121,7 +121,7 @@ env.Install (dir = install_dir + pixmap_dir, source = ['herrnhut.png', 'glosung.png', 'glosung-big.png']) env.Install (dir = install_dir + data_dir, - source = ['ui/add_language.ui', 'ui/preferences.ui', 'ui/warning_dialog.ui']) + source = ['ui/add_language.glade', 'ui/preferences.glade', 'ui/warning_dialog.glade']) # TODO put everything into a folder "glosung-" and rename build to src if env['PLATFORM'] != 'win32': @@ -136,9 +136,9 @@ 'glosung-big.png', 'glosung.desktop', 'glosung.png', - 'ui/add_language.ui', - 'ui/preferences.ui', - 'ui/warning_dialog.ui', + 'ui/add_language.glade', + 'ui/preferences.glade', + 'ui/warning_dialog.glade', 'debian/glosung.files', 'debian/control', 'debian/changelog', diff -Nru glosung-3.6.1~jaunty/ui/add_language.glade glosung-3.6.2~jaunty/ui/add_language.glade --- glosung-3.6.1~jaunty/ui/add_language.glade 1970-01-01 00:00:00.000000000 +0000 +++ glosung-3.6.2~jaunty/ui/add_language.glade 2010-11-01 19:28:55.000000000 +0000 @@ -0,0 +1,140 @@ + + + + + + 5 + Add Languages + center-on-parent + normal + False + + + True + 5 + + + True + 5 + + + True + 0 + out + + + + + + True + Source + True + + + + + 0 + + + + + True + 0 + out + + + + + + True + Language + True + + + + + 1 + + + + + True + 0 + out + + + + + + True + Year + True + + + + + 2 + + + + + 1 + + + + + True + + + False + 2 + + + + + True + end + + + Download + True + False + True + True + download selected verse collection + + + False + False + 0 + + + + + gtk-cancel + True + True + True + True + + + False + False + 1 + + + + + False + end + 0 + + + + + + download_button + cancel_button + + + diff -Nru glosung-3.6.1~jaunty/ui/add_language.ui glosung-3.6.2~jaunty/ui/add_language.ui --- glosung-3.6.1~jaunty/ui/add_language.ui 2010-10-21 18:11:26.000000000 +0000 +++ glosung-3.6.2~jaunty/ui/add_language.ui 1970-01-01 00:00:00.000000000 +0000 @@ -1,140 +0,0 @@ - - - - - - 5 - Add Languages - center-on-parent - normal - False - - - True - 5 - - - True - 5 - - - True - 0 - out - - - - - - True - Source - True - - - - - 0 - - - - - True - 0 - out - - - - - - True - Language - True - - - - - 1 - - - - - True - 0 - out - - - - - - True - Year - True - - - - - 2 - - - - - 1 - - - - - True - - - False - 2 - - - - - True - end - - - Download - True - False - True - True - download selected verse collection - - - False - False - 0 - - - - - gtk-cancel - True - True - True - True - - - False - False - 1 - - - - - False - end - 0 - - - - - - download_button - cancel_button - - - diff -Nru glosung-3.6.1~jaunty/ui/preferences.glade glosung-3.6.2~jaunty/ui/preferences.glade --- glosung-3.6.1~jaunty/ui/preferences.glade 1970-01-01 00:00:00.000000000 +0000 +++ glosung-3.6.2~jaunty/ui/preferences.glade 2010-11-01 19:29:03.000000000 +0000 @@ -0,0 +1,233 @@ + + + + + + 5 + Preferences + normal + False + + + True + 5 + + + True + True + + + True + 5 + 2 + 3 + + + True + 0 + Displayed Language: + + + + + True + 0 + Font: + 0.050000000000000003 + + + 1 + 2 + + + + + True + True + True + + + + 1 + 2 + 1 + 2 + + + + + Start GLosung at login time + True + True + False + True + + + + 2 + 2 + 3 + + + + + Link location to Xiphos/Gnomesword + True + True + False + True + + + + 2 + 4 + 5 + + + + + Start only once a day + True + True + False + True + + + + 2 + 3 + 4 + 25 + + + + + + + + + + True + View + + + False + + + + + True + 2 + + + Proxy + True + True + False + Use proxy to connect to the internet. +Be careful in persecuted countries, as +downloading biblical texts may be +against the law! + True + + + + + True + False + True + host[:port] + ● + False + + + + 1 + 2 + + + + + 1 + + + + + True + Network + + + 1 + False + + + + + + + + + + + 1 + + + + + True + + + False + 2 + + + + + True + end + + + + + + gtk-close + True + True + True + True + + + + False + False + 1 + + + + + False + end + 0 + + + + + + close + + + + + + + + + + Herrnhuter Losungen + + + Bible 2.0 + + + + diff -Nru glosung-3.6.1~jaunty/ui/preferences.ui glosung-3.6.2~jaunty/ui/preferences.ui --- glosung-3.6.1~jaunty/ui/preferences.ui 2010-10-21 18:11:36.000000000 +0000 +++ glosung-3.6.2~jaunty/ui/preferences.ui 1970-01-01 00:00:00.000000000 +0000 @@ -1,233 +0,0 @@ - - - - - - 5 - Preferences - normal - False - - - True - 5 - - - True - True - - - True - 5 - 2 - 3 - - - True - 0 - Displayed Language: - - - - - True - 0 - Font: - 0.050000000000000003 - - - 1 - 2 - - - - - True - True - True - - - - 1 - 2 - 1 - 2 - - - - - Start GLosung at login time - True - True - False - True - - - - 2 - 2 - 3 - - - - - Link location to Xiphos/Gnomesword - True - True - False - True - - - - 2 - 4 - 5 - - - - - Start only once a day - True - True - False - True - - - - 2 - 3 - 4 - 25 - - - - - - - - - - True - View - - - False - - - - - True - 2 - - - Proxy - True - True - False - Use proxy to connect to the internet. -Be careful in persecuted countries, as -downloading biblical texts may be -against the law! - True - - - - - True - False - True - host[:port] - ● - False - - - - 1 - 2 - - - - - 1 - - - - - True - Network - - - 1 - False - - - - - - - - - - - 1 - - - - - True - - - False - 2 - - - - - True - end - - - - - - gtk-close - True - True - True - True - - - - False - False - 1 - - - - - False - end - 0 - - - - - - close - - - - - - - - - - Herrnhuter Losungen - - - Bible 2.0 - - - - diff -Nru glosung-3.6.1~jaunty/ui/preferences_with_auth.glade glosung-3.6.2~jaunty/ui/preferences_with_auth.glade --- glosung-3.6.1~jaunty/ui/preferences_with_auth.glade 1970-01-01 00:00:00.000000000 +0000 +++ glosung-3.6.2~jaunty/ui/preferences_with_auth.glade 2010-06-17 19:05:58.000000000 +0000 @@ -0,0 +1,315 @@ + + + + + + 5 + Preferences + normal + False + + + True + 5 + + + True + True + + + True + 5 + 2 + 3 + + + True + 0 + Displayed Language: + + + + + True + 0 + Font: + 0.050000000000000003 + + + 1 + 2 + + + + + True + True + True + + + + 1 + 2 + 1 + 2 + + + + + Start GLosung at login time + True + True + False + True + + + + 2 + 2 + 3 + + + + + Link location to Xiphos/Gnomesword + True + True + False + True + + + + 2 + 4 + 5 + + + + + Start only once a day + True + True + False + True + + + + 2 + 3 + 4 + 25 + + + + + + + + + + True + View + + + False + + + + + True + 2 + 2 + + + Proxy + True + True + False + Use proxy to connect to the internet. +Be careful in persecuted countries, as +downloading biblical texts may be +against the law! + True + + + + + True + False + True + host[:port] + ● + False + + + + 1 + 2 + + + + + True + False + 0 + + + True + 12 + + + True + 3 + 2 + 2 + + + True + 1 + 8 + User: + + + + + True + 1 + 8 + Password: + + + 1 + 2 + + + + + True + True + user name for proxy authentification + ● + + + + 1 + 2 + + + + + True + True + password name for proxy authentification + ● + + + + 1 + 2 + 1 + 2 + + + + + + + + + True + Authentication + True + + + + + 2 + 1 + 2 + + + + + 1 + + + + + True + Network + + + 1 + False + + + + + + + + + + + 1 + + + + + True + + + False + 2 + + + + + True + end + + + + + + gtk-close + True + True + True + True + + + + False + False + 1 + + + + + False + end + 0 + + + + + + close + + + + + + + + + + Herrnhuter Losungen + + + Bible 2.0 + + + + diff -Nru glosung-3.6.1~jaunty/ui/preferences_with_auth.ui glosung-3.6.2~jaunty/ui/preferences_with_auth.ui --- glosung-3.6.1~jaunty/ui/preferences_with_auth.ui 2010-06-17 19:05:58.000000000 +0000 +++ glosung-3.6.2~jaunty/ui/preferences_with_auth.ui 1970-01-01 00:00:00.000000000 +0000 @@ -1,315 +0,0 @@ - - - - - - 5 - Preferences - normal - False - - - True - 5 - - - True - True - - - True - 5 - 2 - 3 - - - True - 0 - Displayed Language: - - - - - True - 0 - Font: - 0.050000000000000003 - - - 1 - 2 - - - - - True - True - True - - - - 1 - 2 - 1 - 2 - - - - - Start GLosung at login time - True - True - False - True - - - - 2 - 2 - 3 - - - - - Link location to Xiphos/Gnomesword - True - True - False - True - - - - 2 - 4 - 5 - - - - - Start only once a day - True - True - False - True - - - - 2 - 3 - 4 - 25 - - - - - - - - - - True - View - - - False - - - - - True - 2 - 2 - - - Proxy - True - True - False - Use proxy to connect to the internet. -Be careful in persecuted countries, as -downloading biblical texts may be -against the law! - True - - - - - True - False - True - host[:port] - ● - False - - - - 1 - 2 - - - - - True - False - 0 - - - True - 12 - - - True - 3 - 2 - 2 - - - True - 1 - 8 - User: - - - - - True - 1 - 8 - Password: - - - 1 - 2 - - - - - True - True - user name for proxy authentification - ● - - - - 1 - 2 - - - - - True - True - password name for proxy authentification - ● - - - - 1 - 2 - 1 - 2 - - - - - - - - - True - Authentication - True - - - - - 2 - 1 - 2 - - - - - 1 - - - - - True - Network - - - 1 - False - - - - - - - - - - - 1 - - - - - True - - - False - 2 - - - - - True - end - - - - - - gtk-close - True - True - True - True - - - - False - False - 1 - - - - - False - end - 0 - - - - - - close - - - - - - - - - - Herrnhuter Losungen - - - Bible 2.0 - - - - diff -Nru glosung-3.6.1~jaunty/ui/.svn/all-wcprops glosung-3.6.2~jaunty/ui/.svn/all-wcprops --- glosung-3.6.1~jaunty/ui/.svn/all-wcprops 2010-10-21 18:21:32.000000000 +0000 +++ glosung-3.6.2~jaunty/ui/.svn/all-wcprops 2010-11-01 20:00:06.000000000 +0000 @@ -3,21 +3,21 @@ V 46 /svnroot/glosung/!svn/ver/231/trunk/glosung/ui END -warning_dialog.ui +warning_dialog.glade K 25 svn:wc:ra_dav:version-url -V 64 -/svnroot/glosung/!svn/ver/290/trunk/glosung/ui/warning_dialog.ui +V 67 +/svnroot/glosung/!svn/ver/293/trunk/glosung/ui/warning_dialog.glade END -add_language.ui +add_language.glade K 25 svn:wc:ra_dav:version-url -V 62 -/svnroot/glosung/!svn/ver/290/trunk/glosung/ui/add_language.ui +V 65 +/svnroot/glosung/!svn/ver/293/trunk/glosung/ui/add_language.glade END -preferences.ui +preferences.glade K 25 svn:wc:ra_dav:version-url -V 61 -/svnroot/glosung/!svn/ver/290/trunk/glosung/ui/preferences.ui +V 64 +/svnroot/glosung/!svn/ver/293/trunk/glosung/ui/preferences.glade END diff -Nru glosung-3.6.1~jaunty/ui/.svn/entries glosung-3.6.2~jaunty/ui/.svn/entries --- glosung-3.6.1~jaunty/ui/.svn/entries 2010-10-21 18:21:32.000000000 +0000 +++ glosung-3.6.2~jaunty/ui/.svn/entries 2010-11-01 20:00:06.000000000 +0000 @@ -35,10 +35,15 @@ warning_dialog.glade file -290 +293 +2010-11-01T19:29:08.000000Z +a5f2da57d9928f21368151529452fd51 +2010-11-01T19:59:58.894084Z +293 +eicke @@ -55,21 +60,16 @@ -deleted - -warning_dialog.ui -file -290 -2010-10-21T18:11:45.000000Z -a5f2da57d9928f21368151529452fd51 -2010-10-21T18:21:30.788788Z -290 -eicke +2496 + +warning_dialog.ui +file +293 @@ -89,14 +89,20 @@ -2496 +deleted add_language.glade file -290 +293 +2010-11-01T19:28:55.000000Z +dcc67b907e203a1ad843c0bf9293c06d +2010-11-01T19:59:58.894084Z +293 +eicke +has-props @@ -113,21 +119,15 @@ -deleted - -add_language.ui -file -290 -2010-10-21T18:11:26.000000Z -dcc67b907e203a1ad843c0bf9293c06d -2010-10-21T18:21:30.788788Z -290 -eicke -has-props +5849 + +add_language.ui +file +293 @@ -147,14 +147,20 @@ -5849 +deleted preferences.glade file -290 +293 +2010-11-01T19:29:03.000000Z +7dd0d592bec729e224826afcc06e2a70 +2010-11-01T19:59:58.894084Z +293 +eicke +has-props @@ -171,21 +177,15 @@ -deleted - -preferences.ui -file -290 -2010-10-21T18:11:36.000000Z -7dd0d592bec729e224826afcc06e2a70 -2010-10-21T18:21:30.788788Z -290 -eicke -has-props +10414 + +preferences.ui +file +293 @@ -205,5 +205,5 @@ -10414 +deleted diff -Nru glosung-3.6.1~jaunty/ui/.svn/prop-base/add_language.glade.svn-base glosung-3.6.2~jaunty/ui/.svn/prop-base/add_language.glade.svn-base --- glosung-3.6.1~jaunty/ui/.svn/prop-base/add_language.glade.svn-base 1970-01-01 00:00:00.000000000 +0000 +++ glosung-3.6.2~jaunty/ui/.svn/prop-base/add_language.glade.svn-base 2010-11-01 19:28:55.000000000 +0000 @@ -0,0 +1,5 @@ +K 13 +svn:mergeinfo +V 0 + +END diff -Nru glosung-3.6.1~jaunty/ui/.svn/prop-base/add_language.ui.svn-base glosung-3.6.2~jaunty/ui/.svn/prop-base/add_language.ui.svn-base --- glosung-3.6.1~jaunty/ui/.svn/prop-base/add_language.ui.svn-base 2010-10-21 18:11:26.000000000 +0000 +++ glosung-3.6.2~jaunty/ui/.svn/prop-base/add_language.ui.svn-base 1970-01-01 00:00:00.000000000 +0000 @@ -1,5 +0,0 @@ -K 13 -svn:mergeinfo -V 0 - -END diff -Nru glosung-3.6.1~jaunty/ui/.svn/prop-base/preferences.glade.svn-base glosung-3.6.2~jaunty/ui/.svn/prop-base/preferences.glade.svn-base --- glosung-3.6.1~jaunty/ui/.svn/prop-base/preferences.glade.svn-base 1970-01-01 00:00:00.000000000 +0000 +++ glosung-3.6.2~jaunty/ui/.svn/prop-base/preferences.glade.svn-base 2010-11-01 19:29:03.000000000 +0000 @@ -0,0 +1,5 @@ +K 13 +svn:mergeinfo +V 0 + +END diff -Nru glosung-3.6.1~jaunty/ui/.svn/prop-base/preferences.ui.svn-base glosung-3.6.2~jaunty/ui/.svn/prop-base/preferences.ui.svn-base --- glosung-3.6.1~jaunty/ui/.svn/prop-base/preferences.ui.svn-base 2010-10-21 18:11:36.000000000 +0000 +++ glosung-3.6.2~jaunty/ui/.svn/prop-base/preferences.ui.svn-base 1970-01-01 00:00:00.000000000 +0000 @@ -1,5 +0,0 @@ -K 13 -svn:mergeinfo -V 0 - -END diff -Nru glosung-3.6.1~jaunty/ui/.svn/text-base/add_language.glade.svn-base glosung-3.6.2~jaunty/ui/.svn/text-base/add_language.glade.svn-base --- glosung-3.6.1~jaunty/ui/.svn/text-base/add_language.glade.svn-base 1970-01-01 00:00:00.000000000 +0000 +++ glosung-3.6.2~jaunty/ui/.svn/text-base/add_language.glade.svn-base 2010-11-01 19:28:55.000000000 +0000 @@ -0,0 +1,140 @@ + + + + + + 5 + Add Languages + center-on-parent + normal + False + + + True + 5 + + + True + 5 + + + True + 0 + out + + + + + + True + Source + True + + + + + 0 + + + + + True + 0 + out + + + + + + True + Language + True + + + + + 1 + + + + + True + 0 + out + + + + + + True + Year + True + + + + + 2 + + + + + 1 + + + + + True + + + False + 2 + + + + + True + end + + + Download + True + False + True + True + download selected verse collection + + + False + False + 0 + + + + + gtk-cancel + True + True + True + True + + + False + False + 1 + + + + + False + end + 0 + + + + + + download_button + cancel_button + + + diff -Nru glosung-3.6.1~jaunty/ui/.svn/text-base/add_language.ui.svn-base glosung-3.6.2~jaunty/ui/.svn/text-base/add_language.ui.svn-base --- glosung-3.6.1~jaunty/ui/.svn/text-base/add_language.ui.svn-base 2010-10-21 18:11:26.000000000 +0000 +++ glosung-3.6.2~jaunty/ui/.svn/text-base/add_language.ui.svn-base 1970-01-01 00:00:00.000000000 +0000 @@ -1,140 +0,0 @@ - - - - - - 5 - Add Languages - center-on-parent - normal - False - - - True - 5 - - - True - 5 - - - True - 0 - out - - - - - - True - Source - True - - - - - 0 - - - - - True - 0 - out - - - - - - True - Language - True - - - - - 1 - - - - - True - 0 - out - - - - - - True - Year - True - - - - - 2 - - - - - 1 - - - - - True - - - False - 2 - - - - - True - end - - - Download - True - False - True - True - download selected verse collection - - - False - False - 0 - - - - - gtk-cancel - True - True - True - True - - - False - False - 1 - - - - - False - end - 0 - - - - - - download_button - cancel_button - - - diff -Nru glosung-3.6.1~jaunty/ui/.svn/text-base/preferences.glade.svn-base glosung-3.6.2~jaunty/ui/.svn/text-base/preferences.glade.svn-base --- glosung-3.6.1~jaunty/ui/.svn/text-base/preferences.glade.svn-base 1970-01-01 00:00:00.000000000 +0000 +++ glosung-3.6.2~jaunty/ui/.svn/text-base/preferences.glade.svn-base 2010-11-01 19:29:03.000000000 +0000 @@ -0,0 +1,233 @@ + + + + + + 5 + Preferences + normal + False + + + True + 5 + + + True + True + + + True + 5 + 2 + 3 + + + True + 0 + Displayed Language: + + + + + True + 0 + Font: + 0.050000000000000003 + + + 1 + 2 + + + + + True + True + True + + + + 1 + 2 + 1 + 2 + + + + + Start GLosung at login time + True + True + False + True + + + + 2 + 2 + 3 + + + + + Link location to Xiphos/Gnomesword + True + True + False + True + + + + 2 + 4 + 5 + + + + + Start only once a day + True + True + False + True + + + + 2 + 3 + 4 + 25 + + + + + + + + + + True + View + + + False + + + + + True + 2 + + + Proxy + True + True + False + Use proxy to connect to the internet. +Be careful in persecuted countries, as +downloading biblical texts may be +against the law! + True + + + + + True + False + True + host[:port] + ● + False + + + + 1 + 2 + + + + + 1 + + + + + True + Network + + + 1 + False + + + + + + + + + + + 1 + + + + + True + + + False + 2 + + + + + True + end + + + + + + gtk-close + True + True + True + True + + + + False + False + 1 + + + + + False + end + 0 + + + + + + close + + + + + + + + + + Herrnhuter Losungen + + + Bible 2.0 + + + + diff -Nru glosung-3.6.1~jaunty/ui/.svn/text-base/preferences.ui.svn-base glosung-3.6.2~jaunty/ui/.svn/text-base/preferences.ui.svn-base --- glosung-3.6.1~jaunty/ui/.svn/text-base/preferences.ui.svn-base 2010-10-21 18:11:36.000000000 +0000 +++ glosung-3.6.2~jaunty/ui/.svn/text-base/preferences.ui.svn-base 1970-01-01 00:00:00.000000000 +0000 @@ -1,233 +0,0 @@ - - - - - - 5 - Preferences - normal - False - - - True - 5 - - - True - True - - - True - 5 - 2 - 3 - - - True - 0 - Displayed Language: - - - - - True - 0 - Font: - 0.050000000000000003 - - - 1 - 2 - - - - - True - True - True - - - - 1 - 2 - 1 - 2 - - - - - Start GLosung at login time - True - True - False - True - - - - 2 - 2 - 3 - - - - - Link location to Xiphos/Gnomesword - True - True - False - True - - - - 2 - 4 - 5 - - - - - Start only once a day - True - True - False - True - - - - 2 - 3 - 4 - 25 - - - - - - - - - - True - View - - - False - - - - - True - 2 - - - Proxy - True - True - False - Use proxy to connect to the internet. -Be careful in persecuted countries, as -downloading biblical texts may be -against the law! - True - - - - - True - False - True - host[:port] - ● - False - - - - 1 - 2 - - - - - 1 - - - - - True - Network - - - 1 - False - - - - - - - - - - - 1 - - - - - True - - - False - 2 - - - - - True - end - - - - - - gtk-close - True - True - True - True - - - - False - False - 1 - - - - - False - end - 0 - - - - - - close - - - - - - - - - - Herrnhuter Losungen - - - Bible 2.0 - - - - diff -Nru glosung-3.6.1~jaunty/ui/.svn/text-base/warning_dialog.glade.svn-base glosung-3.6.2~jaunty/ui/.svn/text-base/warning_dialog.glade.svn-base --- glosung-3.6.1~jaunty/ui/.svn/text-base/warning_dialog.glade.svn-base 1970-01-01 00:00:00.000000000 +0000 +++ glosung-3.6.2~jaunty/ui/.svn/text-base/warning_dialog.glade.svn-base 2010-11-01 19:29:08.000000000 +0000 @@ -0,0 +1,57 @@ + + + + + + 5 + True + center-on-parent + True + normal + True + True + warning + ok-cancel + <b>Warning:</b> If you live in a persecuted country and do not wish to +risk detection you should NOT use this feature! + True + + + True + 2 + + + Don't show this message again. + True + True + False + Check this box if you do not want to see this dialog again + True + + + + end + 1 + + + + + True + end + + + + + + + + + False + end + 0 + + + + + + diff -Nru glosung-3.6.1~jaunty/ui/.svn/text-base/warning_dialog.ui.svn-base glosung-3.6.2~jaunty/ui/.svn/text-base/warning_dialog.ui.svn-base --- glosung-3.6.1~jaunty/ui/.svn/text-base/warning_dialog.ui.svn-base 2010-10-21 18:11:45.000000000 +0000 +++ glosung-3.6.2~jaunty/ui/.svn/text-base/warning_dialog.ui.svn-base 1970-01-01 00:00:00.000000000 +0000 @@ -1,57 +0,0 @@ - - - - - - 5 - True - center-on-parent - True - normal - True - True - warning - ok-cancel - <b>Warning:</b> If you live in a persecuted country and do not wish to -risk detection you should NOT use this feature! - True - - - True - 2 - - - Don't show this message again. - True - True - False - Check this box if you do not want to see this dialog again - True - - - - end - 1 - - - - - True - end - - - - - - - - - False - end - 0 - - - - - - diff -Nru glosung-3.6.1~jaunty/ui/warning_dialog.glade glosung-3.6.2~jaunty/ui/warning_dialog.glade --- glosung-3.6.1~jaunty/ui/warning_dialog.glade 1970-01-01 00:00:00.000000000 +0000 +++ glosung-3.6.2~jaunty/ui/warning_dialog.glade 2010-11-01 19:29:08.000000000 +0000 @@ -0,0 +1,57 @@ + + + + + + 5 + True + center-on-parent + True + normal + True + True + warning + ok-cancel + <b>Warning:</b> If you live in a persecuted country and do not wish to +risk detection you should NOT use this feature! + True + + + True + 2 + + + Don't show this message again. + True + True + False + Check this box if you do not want to see this dialog again + True + + + + end + 1 + + + + + True + end + + + + + + + + + False + end + 0 + + + + + + diff -Nru glosung-3.6.1~jaunty/ui/warning_dialog.ui glosung-3.6.2~jaunty/ui/warning_dialog.ui --- glosung-3.6.1~jaunty/ui/warning_dialog.ui 2010-10-21 18:11:45.000000000 +0000 +++ glosung-3.6.2~jaunty/ui/warning_dialog.ui 1970-01-01 00:00:00.000000000 +0000 @@ -1,57 +0,0 @@ - - - - - - 5 - True - center-on-parent - True - normal - True - True - warning - ok-cancel - <b>Warning:</b> If you live in a persecuted country and do not wish to -risk detection you should NOT use this feature! - True - - - True - 2 - - - Don't show this message again. - True - True - False - Check this box if you do not want to see this dialog again - True - - - - end - 1 - - - - - True - end - - - - - - - - - False - end - 0 - - - - - -