gnomesword-cvs Mailing List for Xiphos (see github)

Revision: 4935
          http://sourceforge.net/p/gnomesword/code/4935
Author:   charcoal
Date:     2016-01-13 20:31:00 +0000 (Wed, 13 Jan 2016)
Log Message:
-----------
update to replace stcmp/strcoll sort with unicode support

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/src/gnome2/utilities.c
    trunk/src/gui/utilities.h
    trunk/src/main/sword.cc
    trunk/wscript

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2016-01-01 20:28:48 UTC (rev 4934)
+++ trunk/ChangeLog	2016-01-13 20:31:00 UTC (rev 4935)
@@ -1,10 +1,10 @@
-2016-01-01  karl <cha...@us...>
+2016-01-13  karl <cha...@us...>
 
-	* change module list sort from strcmp() to strcoll().
+	* change module lang sort from strcmp/strcoll to ICU ucol_strcollUTF8.
 
 2015-08-30  karl <cha...@us...>
 
-	* 4.0.3 release.
+	* 4.0.4 release.
 
 2015-08-17  karl <cha...@us...>
 

Modified: trunk/src/gnome2/utilities.c
===================================================================
--- trunk/src/gnome2/utilities.c	2016-01-01 20:28:48 UTC (rev 4934)
+++ trunk/src/gnome2/utilities.c	2016-01-13 20:31:00 UTC (rev 4935)
@@ -1094,14 +1094,19 @@
 	++(language_set[module_type].count);
 }
 
-/* comparator function pulled verbatim from qsort(3). */
+/* comparator function pulled verbatim from qsort(3) */
+/* but with function changed to ucol_strcollUTF8(3). */
+/* http://icu-project.org/apiref/icu4c/ucol_8h.html  */
 static int cmpstringp(const void *p1, const void *p2)
 {
 	/* The actual arguments to this function are "pointers to
 	   pointers to char", but strcmp(3) arguments are "pointers
 	   to char", hence the following cast plus dereference */
 
-	return strcoll(*(char *const *)p1, *(char *const *)p2);
+	return ucol_strcollUTF8(collator,
+				*(char *const *)p1, -1,
+				*(char *const *)p2, -1,
+				&collator_status);
 }
 
 /* retrieve the language set specific to the module type requested */

Modified: trunk/src/gui/utilities.h
===================================================================
--- trunk/src/gui/utilities.h	2016-01-01 20:28:48 UTC (rev 4934)
+++ trunk/src/gui/utilities.h	2016-01-13 20:31:00 UTC (rev 4935)
@@ -27,6 +27,18 @@
 #include "main/module_dialogs.h"
 #include <gsf/gsf-outfile.h>
 
+/* Unicode collation necessities */
+#include "unicode/utypes.h"
+#include "unicode/unorm.h"
+#include "unicode/localpointer.h"
+#include "unicode/parseerr.h"
+#include "unicode/uloc.h"
+#include "unicode/uset.h"
+#include "unicode/uscript.h"
+#include "unicode/ucol.h"
+extern UCollator* collator;
+extern UErrorCode collator_status;
+
 #ifdef __cplusplus
 extern "C" {
 #endif

Modified: trunk/src/main/sword.cc
===================================================================
--- trunk/src/main/sword.cc	2016-01-01 20:28:48 UTC (rev 4934)
+++ trunk/src/main/sword.cc	2016-01-13 20:31:00 UTC (rev 4935)
@@ -88,6 +88,10 @@
 char *sword_locale = NULL;
 gboolean companion_activity = FALSE;
 
+/* Unicode collation necessities. */
+UCollator* collator;
+UErrorCode collator_status;
+
 extern gboolean valid_scripture_key;
 
 // these track together.  when one changes, so does the other.
@@ -787,6 +791,7 @@
 	if (!lang)
 		lang = "C";
 	sword_locale = set_sword_locale(lang);
+	collator = ucol_open(sword_locale, &collator_status);
 	lang = LocaleMgr::getSystemLocaleMgr()->getDefaultLocaleName();
 
 	backend = new BackEnd();

Modified: trunk/wscript
===================================================================
--- trunk/wscript	2016-01-01 20:28:48 UTC (rev 4934)
+++ trunk/wscript	2016-01-13 20:31:00 UTC (rev 4935)
@@ -411,6 +411,13 @@
                    mandatory=True)
     env.append_value('ALL_LIBS', 'SWORD')
 
+    conf.check_cfg(package='icu-i18n',
+                   args='--cflags --libs',
+                   uselib_store='ICUI18N',
+                   errmsg='fail',
+                   mandatory=True)
+    env.append_value('ALL_LIBS', 'ICUI18N')
+
     conf.check_cfg(package='biblesync',
                    args='"biblesync >= 1.1.2" --cflags --libs',
                    uselib_store='BIBLESYNC',

Revision: 4934
          http://sourceforge.net/p/gnomesword/code/4934
Author:   charcoal
Date:     2016-01-01 20:28:48 +0000 (Fri, 01 Jan 2016)
Log Message:
-----------
fix module list sort to be UTF-compatible.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/src/gnome2/utilities.c

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2015-08-30 17:49:22 UTC (rev 4933)
+++ trunk/ChangeLog	2016-01-01 20:28:48 UTC (rev 4934)
@@ -1,3 +1,7 @@
+2016-01-01  karl <cha...@us...>
+
+	* change module list sort from strcmp() to strcoll().
+
 2015-08-30  karl <cha...@us...>
 
 	* 4.0.3 release.

Modified: trunk/src/gnome2/utilities.c
===================================================================
--- trunk/src/gnome2/utilities.c	2015-08-30 17:49:22 UTC (rev 4933)
+++ trunk/src/gnome2/utilities.c	2016-01-01 20:28:48 UTC (rev 4934)
@@ -1101,7 +1101,7 @@
 	   pointers to char", but strcmp(3) arguments are "pointers
 	   to char", hence the following cast plus dereference */
 
-	return strcmp(*(char *const *)p1, *(char *const *)p2);
+	return strcoll(*(char *const *)p1, *(char *const *)p2);
 }
 
 /* retrieve the language set specific to the module type requested */

Revision: 4933
          http://sourceforge.net/p/gnomesword/code/4933
Author:   charcoal
Date:     2015-08-30 17:49:22 +0000 (Sun, 30 Aug 2015)
Log Message:
-----------
tag 4.0.3

Added Paths:
-----------
    tags/4.0.3/

Index: tags/4.0.3
===================================================================
--- trunk	2015-08-07 02:18:21 UTC (rev 4914)
+++ tags/4.0.3	2015-08-30 17:49:22 UTC (rev 4933)

Property changes on: tags/4.0.3
___________________________________________________________________
Added: bzr:pointless
## -0,0 +1 ##
+3
\ No newline at end of property
Added: svn:mergeinfo
## -0,0 +1,4 ##
+/branches/matysek:3290-3291,3299
+/branches/remove-gtkhtml:4691-4696
+/branches/webkit:3914-4379
+/trunk:3424,3486-3490,3507-3509,3530-3532,3537,3620
\ No newline at end of property
Added: svk:merge
## -0,0 +1,5 ##
+95a4280c-1b0e-0410-9f8f-80a059958c3c:/trunk:3424
+95a4280c-1b0e-0410-9f8f-80a059958c3c:/trunk:3490
+95a4280c-1b0e-0410-9f8f-80a059958c3c:/trunk:3509
+95a4280c-1b0e-0410-9f8f-80a059958c3c:/trunk:3537
+95a4280c-1b0e-0410-9f8f-80a059958c3c:/trunk:3620

Revision: 4932
          http://sourceforge.net/p/gnomesword/code/4932
Author:   charcoal
Date:     2015-08-30 17:15:52 +0000 (Sun, 30 Aug 2015)
Log Message:
-----------
tag 4.0.4 w/1 gtk update past version stamp change

Added Paths:
-----------
    tags/4.0.4/

Index: tags/4.0.4
===================================================================
--- trunk	2015-08-30 16:29:43 UTC (rev 4931)
+++ tags/4.0.4	2015-08-30 17:15:52 UTC (rev 4932)

Property changes on: tags/4.0.4
___________________________________________________________________
Added: bzr:pointless
## -0,0 +1 ##
+3
\ No newline at end of property
Added: svn:mergeinfo
## -0,0 +1,4 ##
+/branches/matysek:3290-3291,3299
+/branches/remove-gtkhtml:4691-4696
+/branches/webkit:3914-4379
+/trunk:3424,3486-3490,3507-3509,3530-3532,3537,3620
\ No newline at end of property
Added: svk:merge
## -0,0 +1,5 ##
+95a4280c-1b0e-0410-9f8f-80a059958c3c:/trunk:3424
+95a4280c-1b0e-0410-9f8f-80a059958c3c:/trunk:3490
+95a4280c-1b0e-0410-9f8f-80a059958c3c:/trunk:3509
+95a4280c-1b0e-0410-9f8f-80a059958c3c:/trunk:3537
+95a4280c-1b0e-0410-9f8f-80a059958c3c:/trunk:3620

Revision: 4931
          http://sourceforge.net/p/gnomesword/code/4931
Author:   charcoal
Date:     2015-08-30 16:29:43 +0000 (Sun, 30 Aug 2015)
Log Message:
-----------
late catch: gtk_window_is_maximized is gtk >= 3.12 only

Modified Paths:
--------------
    trunk/src/gnome2/main_window.c

Modified: trunk/src/gnome2/main_window.c
===================================================================
--- trunk/src/gnome2/main_window.c	2015-08-30 16:15:59 UTC (rev 4930)
+++ trunk/src/gnome2/main_window.c	2015-08-30 16:29:43 UTC (rev 4931)
@@ -456,7 +456,7 @@
 	settings.app_x = x;
 	settings.app_y = y;
 
-#ifdef USE_GTK_3
+#ifdef HAVE_GTK_312
 	sprintf(layout, "%d", gtk_window_is_maximized(GTK_WINDOW(widgets.app)));
 	xml_set_value("Xiphos", "layout", "maximized", layout);
 #endif

Revision: 4930
          http://sourceforge.net/p/gnomesword/code/4930
Author:   charcoal
Date:     2015-08-30 16:15:59 +0000 (Sun, 30 Aug 2015)
Log Message:
-----------
4.0.3 release

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/RELEASE-NOTES
    trunk/debian/changelog
    trunk/win32/nsis/installer32.nsi
    trunk/win32/nsis/installer64.nsi
    trunk/wscript

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2015-08-29 01:21:55 UTC (rev 4929)
+++ trunk/ChangeLog	2015-08-30 16:15:59 UTC (rev 4930)
@@ -1,3 +1,7 @@
+2015-08-30  karl <cha...@us...>
+
+	* 4.0.3 release.
+
 2015-08-17  karl <cha...@us...>
 
 	* change language_set to grow dynamically, no limit.

Modified: trunk/RELEASE-NOTES
===================================================================
--- trunk/RELEASE-NOTES	2015-08-29 01:21:55 UTC (rev 4929)
+++ trunk/RELEASE-NOTES	2015-08-30 16:15:59 UTC (rev 4930)
@@ -3,6 +3,16 @@
 XIPHOS RELEASE NOTES
 ____________________
 
+Release 4.0.4
+30 Aug 2015
+
+- Implemented dynamic allocation enhancement to replace survivability fix.
+- Updated language abbreviations to eliminate unknowns.
+- Fixed module installation messages so they are not lost.
+- Fixed abbrev support, to show abbrevs in all non-essential contexts.
+- Fixed maximization restoral (mostly gtk3; partial for gtk2).
+________________________________________________________________
+
 Release 4.0.3
 06 Aug 2015
 
@@ -25,34 +35,19 @@
 30 Mar 2015
 
 - Completed webkit editor, due to replace gtkhtml editor.
-
 - Added Abbreviation module configuration support.
-
 - Added Glosses (Ruby) and Morpheme Segmentation display support.
-
 - Added obsolete module audit, during install and on maintenance page.
-
 - Added more informative "About" for modules.
-
 - Added status bar en/disable.
-
-- Removed BibleSync from Xiphos' source tree. It must be referenced as a
-  proper library.
-
+- Removed BibleSync from Xiphos' source, now referenced as a proper library.
 - Fixed studypad directory choice.
-
 - Fixed mis-handling of unreal "multiple verse" reference in URL handling.
-
 - Fixed editor's mis-handling of the link editor subdialog.
-
 - Updated Win32 URL clickability; updated "About Sword" URL properly.
-
 - Huge GTK3 compatibility cleanliness hackery.
-
 - WebKit2 compatibility hackery.
-
 - Fix compiler flag choices.
-
 - Numerous code internals updates due to cppcheck(1) diagnostics.
 ________________________________________________________________
 

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2015-08-29 01:21:55 UTC (rev 4929)
+++ trunk/debian/changelog	2015-08-30 16:15:59 UTC (rev 4930)
@@ -1,3 +1,9 @@
+xiphos-svn (4.0.4-0~svn) unstable; urgency=low
+
+  * New upstream release
+
+ -- Karl Kleinpaste <cha...@us...>  Sun, 30 Aug 2015 12:13:00 +0000
+
 xiphos-svn (4.0.3-0~svn) unstable; urgency=low
 
   * New upstream release, urgent bugfix only

Modified: trunk/win32/nsis/installer32.nsi
===================================================================
--- trunk/win32/nsis/installer32.nsi	2015-08-29 01:21:55 UTC (rev 4929)
+++ trunk/win32/nsis/installer32.nsi	2015-08-30 16:15:59 UTC (rev 4930)
@@ -44,7 +44,7 @@
     !define APP_NAME "Xiphos"
     !define INSTALLER_NAME "xiphos"
     !define APP_BINARY_NAME "xiphos.exe"
-    !define APP_VERS "4.0.3"
+    !define APP_VERS "4.0.4"
     !define APP_EDITION "win32"
     !define APP_URL "http://xiphos.org"
 

Modified: trunk/win32/nsis/installer64.nsi
===================================================================
--- trunk/win32/nsis/installer64.nsi	2015-08-29 01:21:55 UTC (rev 4929)
+++ trunk/win32/nsis/installer64.nsi	2015-08-30 16:15:59 UTC (rev 4930)
@@ -44,7 +44,7 @@
     !define APP_NAME "Xiphos"
     !define INSTALLER_NAME "xiphos"
     !define APP_BINARY_NAME "xiphos.exe"
-    !define APP_VERS "4.0.3"
+    !define APP_VERS "4.0.4"
     !define APP_EDITION "win64"
     !define APP_URL "http://xiphos.org"
 

Modified: trunk/wscript
===================================================================
--- trunk/wscript	2015-08-29 01:21:55 UTC (rev 4929)
+++ trunk/wscript	2015-08-30 16:15:59 UTC (rev 4930)
@@ -14,7 +14,7 @@
 import waffles.misc
 import waffles.gnome as gnome
 
-VERSION='4.0.3'
+VERSION='4.0.4'
 
 APPNAME='xiphos'
 PACKAGE='xiphos'

Revision: 4929
          http://sourceforge.net/p/gnomesword/code/4929
Author:   charcoal
Date:     2015-08-29 01:21:55 +0000 (Sat, 29 Aug 2015)
Log Message:
-----------
about_modules.c: move abbreviation to just below formal name

Modified Paths:
--------------
    trunk/src/gnome2/about_modules.c

Modified: trunk/src/gnome2/about_modules.c
===================================================================
--- trunk/src/gnome2/about_modules.c	2015-08-28 02:45:36 UTC (rev 4928)
+++ trunk/src/gnome2/about_modules.c	2015-08-29 01:21:55 UTC (rev 4929)
@@ -412,6 +412,14 @@
 	info = g_string_append(info, modname);
 	info = g_string_append(info, "<br/>");
 
+	if (abbreviation && *abbreviation) {
+		info =
+		    g_string_append(info,
+				    _("<b>Module abbreviation:</b> "));
+		info = g_string_append(info, abbreviation);
+		info = g_string_append(info, "<br/>");
+	}
+
 	info = g_string_append(info, _("<b>Version:</b> "));
 	info = g_string_append(info, ((version && *version)
 					  ? version
@@ -460,14 +468,6 @@
 	}
 	info = g_string_append(info, "<br/>");
 
-	if (abbreviation && *abbreviation) {
-		info =
-		    g_string_append(info,
-				    _("<b>Module abbreviation:</b> "));
-		info = g_string_append(info, abbreviation);
-		info = g_string_append(info, "<br/>");
-	}
-
 	info = g_string_append(info, _("<b>Language:</b> "));
 	info = g_string_append(info, ((language && *language)
 					  ? language

Revision: 4928
          http://sourceforge.net/p/gnomesword/code/4928
Author:   charcoal
Date:     2015-08-28 02:45:36 +0000 (Fri, 28 Aug 2015)
Log Message:
-----------
handle abbrev going both ways in parallel possibilities

Modified Paths:
--------------
    trunk/src/main/parallel_view.cc

Modified: trunk/src/main/parallel_view.cc
===================================================================
--- trunk/src/main/parallel_view.cc	2015-08-28 02:13:15 UTC (rev 4927)
+++ trunk/src/main/parallel_view.cc	2015-08-28 02:45:36 UTC (rev 4928)
@@ -665,9 +665,12 @@
 	if (settings.parallel_list) {
 		gchar *mod_name;
 		for (modidx = 0;
-		     (mod_name = settings.parallel_list[modidx]);
+		     mod_name = settings.parallel_list[modidx];
 		     modidx++) {
 			const gchar *rowcolor;
+			const char *real_mod = main_get_name(mod_name);
+			if (real_mod)
+				mod_name = (gchar *)real_mod;
 
 			// if a module was deleted, but still in parallels list,
 			// we will segfault when looking for content for the
@@ -721,12 +724,12 @@
 				g_string_append(data, "<br/><div align=right>");
 
 			// does this verse exist for this module?
-			if (!backend_p->is_Bible_key(settings.parallel_list[modidx],
+			if (!backend_p->is_Bible_key(mod_name,
 						     settings.cvparallel, settings.cvparallel)) {
 				g_string_append(data, no_content);
 			} else {
 				SWBuf text("");
-				backend_p->set_module_key(settings.parallel_list[modidx], settings.cvparallel);
+				backend_p->set_module_key(mod_name, settings.cvparallel);
 				get_heading(text, backend_p, modidx);
 				g_string_append(data, text.c_str());
 
@@ -780,13 +783,14 @@
 	// should be 1st parallel module.
 	// it would be really weird if that's missing, but be ready anyhow.
 	char *module_name = (settings.parallel_list
-				 ? settings.parallel_list[0]
-				 : settings.MainWindowModule);
+			     ? settings.parallel_list[0]
+			     : settings.MainWindowModule);
+	// might have an abbrev. get the real.
+	const char *real_mod = main_get_name(module_name);
+	if (real_mod)
+		module_name = (gchar *)real_mod;
 
-	gchar *utf8str,
-	    *textColor,
-	    *tmpkey,
-	    tmpbuf[256];
+	gchar *utf8str, *textColor, *tmpkey, tmpbuf[256];
 	const gchar *bgColor;
 	gchar str[500];
 	gint cur_verse, cur_chapter, verse, modidx;
@@ -817,17 +821,22 @@
 
 	// quick cache of fonts/rtol/type info.
 	for (modidx = 0; modidx < parallel_count; ++modidx) {
+		gchar *mod = settings.parallel_list[modidx];
+		// might have an abbrev. get the real.
+		const char *real_mod = main_get_name(mod);
+		if (real_mod)
+			mod = (gchar *)real_mod;
+
 		// determine module presence once each.
-		is_module[modidx] = backend->is_module(settings.parallel_list[modidx]);
+		is_module[modidx] = backend->is_module(mod);
 
 		if (is_module[modidx]) {
-			is_rtol[modidx] = main_is_mod_rtol(settings.parallel_list[modidx]);
-			mf[modidx] = get_font(settings.parallel_list[modidx]);
+			is_rtol[modidx] = main_is_mod_rtol(mod);
+			mf[modidx] = get_font(mod);
 			is_bible_text[modidx] =
-			    (main_get_mod_type(settings.parallel_list[modidx]) == TEXT_TYPE);
+			    (main_get_mod_type(mod) == TEXT_TYPE);
 		} else {
-			gui_generic_warning((unknown_parallel +
-					     (SWBuf)settings.parallel_list[modidx]).c_str());
+			gui_generic_warning((unknown_parallel + (SWBuf)mod).c_str());
 		}
 	}
 
@@ -858,6 +867,12 @@
 			bgColor = settings.bible_bg_color;
 
 		for (modidx = 0; modidx < parallel_count; modidx++) {
+			gchar *mod = settings.parallel_list[modidx];
+			// might have an abbrev. get the real.
+			const char *real_mod = main_get_name(mod);
+			if (real_mod)
+				mod = (gchar *)real_mod;
+
 			if (is_module[modidx]) {
 
 				// mark current verse properly.
@@ -891,10 +906,10 @@
 				if (is_rtol[modidx])
 					text += "<br/><div align=right>";
 
-				backend_p->set_module_key(settings.parallel_list[modidx], tmpkey);
+				backend_p->set_module_key(mod, tmpkey);
 				get_heading(text, backend_p, modidx);
 
-				utf8str = backend_p->get_render_text(settings.parallel_list[modidx], tmpkey);
+				utf8str = backend_p->get_render_text(mod, tmpkey);
 				if (utf8str) {
 					text += utf8str;
 					g_free(utf8str);

Revision: 4927
          http://sourceforge.net/p/gnomesword/code/4927
Author:   charcoal
Date:     2015-08-28 02:13:15 +0000 (Fri, 28 Aug 2015)
Log Message:
-----------
handle abbrevs in adv.search modnames

Modified Paths:
--------------
    trunk/src/main/search_dialog.cc

Modified: trunk/src/main/search_dialog.cc
===================================================================
--- trunk/src/main/search_dialog.cc	2015-08-25 08:39:44 UTC (rev 4926)
+++ trunk/src/main/search_dialog.cc	2015-08-28 02:13:15 UTC (rev 4927)
@@ -1365,6 +1365,11 @@
 
 	while (search_mods != NULL) {
 		module = (gchar *)search_mods->data;
+		const char *real_mod = main_get_name(module);
+		if (real_mod) {
+			g_free(module);
+			module = g_strdup((gchar *)real_mod);
+		}
 
 		if (terminate_search) {
 			// we simply wrap through the remaining

Revision: 4926
          http://sourceforge.net/p/gnomesword/code/4926
Author:   domcox
Date:     2015-08-25 08:39:44 +0000 (Tue, 25 Aug 2015)
Log Message:
-----------
French translation: fix typo

Modified Paths:
--------------
    trunk/po/fr.po

Modified: trunk/po/fr.po
===================================================================
--- trunk/po/fr.po	2015-08-25 01:23:58 UTC (rev 4925)
+++ trunk/po/fr.po	2015-08-25 08:39:44 UTC (rev 4926)
@@ -25,7 +25,7 @@
 "Project-Id-Version: Xiphos 4.0.2\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-06-16 13:36-0400\n"
-"PO-Revision-Date: 2015-08-05 14:49+0200\n"
+"PO-Revision-Date: 2015-08-25 10:39+0200\n"
 "Last-Translator: Dominique Corbex <do...@us...>\n"
 "Language-Team: emacs + po-mode <gn...@tr...>\n"
 "Language: \n"
@@ -173,7 +173,7 @@
 
 #: ../src/gnome2/about_modules.c:466
 msgid "<b>Module abbreviation:</b> "
-msgstr "<b>Abbréviation du module :</b>"
+msgstr "<b>Abréviation :</b>"
 
 #: ../src/gnome2/about_modules.c:471
 msgid "<b>Language:</b> "

Revision: 4925
          http://sourceforge.net/p/gnomesword/code/4925
Author:   charcoal
Date:     2015-08-25 01:23:58 +0000 (Tue, 25 Aug 2015)
Log Message:
-----------
add maximization detection, for startup restoral

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/src/gnome2/main_window.c
    trunk/src/gnome2/xiphos.c
    trunk/src/main/settings.c
    trunk/src/main/settings.h
    trunk/src/main/xml.c

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2015-08-23 23:50:28 UTC (rev 4924)
+++ trunk/ChangeLog	2015-08-25 01:23:58 UTC (rev 4925)
@@ -3,6 +3,9 @@
 	* change language_set to grow dynamically, no limit.
 	* improve abbrev support: use abbrev in parallel page, parallel
 	  dialog/tab, main window non-Bible (comm/book/dict), bookmarks.
+	* fixed module installation messages' display, so they're not lost.
+	* update language abbreviations to eliminate more unknowns.
+	* added gtk3 maximization detection.
 
 2015-08-06  karl <cha...@us...>
 

Modified: trunk/src/gnome2/main_window.c
===================================================================
--- trunk/src/gnome2/main_window.c	2015-08-23 23:50:28 UTC (rev 4924)
+++ trunk/src/gnome2/main_window.c	2015-08-25 01:23:58 UTC (rev 4925)
@@ -449,14 +449,18 @@
 	gint x;
 	gint y;
 
-	gdk_window_get_root_origin(gtk_widget_get_window(widgets.app), &x,
-				   &y);
+	gdk_window_get_root_origin(gtk_widget_get_window(widgets.app), &x, &y);
 
 	settings.gs_width = event->width;
 	settings.gs_height = event->height;
 	settings.app_x = x;
 	settings.app_y = y;
 
+#ifdef USE_GTK_3
+	sprintf(layout, "%d", gtk_window_is_maximized(GTK_WINDOW(widgets.app)));
+	xml_set_value("Xiphos", "layout", "maximized", layout);
+#endif
+
 	sprintf(layout, "%d", settings.gs_width);
 	xml_set_value("Xiphos", "layout", "width", layout);
 

Modified: trunk/src/gnome2/xiphos.c
===================================================================
--- trunk/src/gnome2/xiphos.c	2015-08-23 23:50:28 UTC (rev 4924)
+++ trunk/src/gnome2/xiphos.c	2015-08-25 01:23:58 UTC (rev 4925)
@@ -179,13 +179,15 @@
 	 * especially if it's due to just shutting linux down.
 	 */
 	if (settings.app_x < 0)
-		settings.app_x = 10;
+		settings.app_x = 0;
 	if (settings.app_x > (screen_width - 100))
 		settings.app_x = screen_width - 100;
 	if (settings.app_y < 0)
-		settings.app_y = 10;
+		settings.app_y = 0;
 	if (settings.app_y > (screen_height - 100))
 		settings.app_y = screen_height - 100;
+	if (settings.maximized)
+		gtk_window_maximize(GTK_WINDOW(widgets.app));
 
 	gtk_window_move(GTK_WINDOW(widgets.app), settings.app_x,
 			settings.app_y);

Modified: trunk/src/main/settings.c
===================================================================
--- trunk/src/main/settings.c	2015-08-23 23:50:28 UTC (rev 4924)
+++ trunk/src/main/settings.c	2015-08-25 01:23:58 UTC (rev 4925)
@@ -637,6 +637,12 @@
 	}
 
 	/* main window placement */
+	if ((buf = xml_get_value("layout", "maximized")))
+		settings.app_x = atoi(buf);
+	else {
+		xml_add_new_item_to_section("layout", "maximized", "0");
+		settings.maximized = 0;
+	}
 	if ((buf = xml_get_value("layout", "app_x")))
 		settings.app_x = atoi(buf);
 	else {

Modified: trunk/src/main/settings.h
===================================================================
--- trunk/src/main/settings.h	2015-08-23 23:50:28 UTC (rev 4924)
+++ trunk/src/main/settings.h	2015-08-25 01:23:58 UTC (rev 4925)
@@ -174,6 +174,7 @@
 
 	/* window location at close */
 	int app_x, app_y;
+	int maximized;	/* gboolean */
 	int parallel_x, parallel_y;
 	int modmgr_x, modmgr_y;
 	int advsearch_x, advsearch_y;

Modified: trunk/src/main/xml.c
===================================================================
--- trunk/src/main/xml.c	2015-08-23 23:50:28 UTC (rev 4924)
+++ trunk/src/main/xml.c	2015-08-25 01:23:58 UTC (rev 4925)
@@ -720,6 +720,8 @@
 
 	section_node =
 	    xmlNewChild(root_node, NULL, (const xmlChar *)"layout", NULL);
+	xmlNewTextChild(section_node, NULL, (const xmlChar *)"maximized",
+			(const xmlChar *)"0");
 	xmlNewTextChild(section_node, NULL, (const xmlChar *)"height",
 			(const xmlChar *)"600");
 	xmlNewTextChild(section_node, NULL, (const xmlChar *)"width",

Revision: 4924
          http://sourceforge.net/p/gnomesword/code/4924
Author:   charcoal
Date:     2015-08-23 23:50:28 +0000 (Sun, 23 Aug 2015)
Log Message:
-----------
abbrev sanity tweak: catch module-internal abbrev refs

Modified Paths:
--------------
    trunk/src/main/url.cc

Modified: trunk/src/main/url.cc
===================================================================
--- trunk/src/main/url.cc	2015-08-23 23:14:03 UTC (rev 4923)
+++ trunk/src/main/url.cc	2015-08-23 23:50:28 UTC (rev 4924)
@@ -774,6 +774,10 @@
 		   ? work_buf[MODULE]
 		   : settings.MainWindowModule);
 
+	const char *real_mod = main_get_name(mod);
+	if (real_mod)
+		mod = (gchar *)real_mod;
+	
 	if (strpbrk(tmpkey, "-;,") && // >1 verse marked
 	    (main_get_mod_type(mod) == TEXT_TYPE)) {
 		main_display_verse_list_in_sidebar(settings.currentverse, mod, tmpkey);
@@ -922,7 +926,7 @@
 		passage = g_strdup((gchar *)m_url.getParameterValue("passage"));
 
 		// no module specified => use main module.
-		if (!strcmp(module, "")) {
+		if (!module || !strcmp(module, "")) {
 			g_free(module);
 			module = g_strdup(settings.MainWindowModule);
 		}

Revision: 4923
          http://sourceforge.net/p/gnomesword/code/4923
Author:   charcoal
Date:     2015-08-23 23:14:03 +0000 (Sun, 23 Aug 2015)
Log Message:
-----------
abbrev sanity tweak: bookmark modules, get real from potential abbrev.

Modified Paths:
--------------
    trunk/src/gnome2/bookmarks_treeview.c

Modified: trunk/src/gnome2/bookmarks_treeview.c
===================================================================
--- trunk/src/gnome2/bookmarks_treeview.c	2015-08-23 03:58:43 UTC (rev 4922)
+++ trunk/src/gnome2/bookmarks_treeview.c	2015-08-23 23:14:03 UTC (rev 4923)
@@ -777,13 +777,18 @@
 	}
 	if (is_selected) {
 		if (!gtk_tree_model_iter_has_child(GTK_TREE_MODEL(model), &selected) && key != NULL) {
+			// might have an abbrev.  get the real.
+			const gchar *real_mod = main_get_name(module);
 			gchar *url = NULL;
+
 			if (!strcmp(module, "studypad"))
 				url =
 				    g_strdup_printf("passagestudy.jsp?action=showStudypad&"
 						    "type=9&value=%s&module=%s",
 						    main_url_encode(key),
-						    main_url_encode(module));
+						    main_url_encode((real_mod
+								     ? real_mod
+								     : module)));
 
 			else if (button_one)
 				url =
@@ -791,7 +796,9 @@
 						    "type=%s&value=%s&module=%s",
 						    "currentTab",
 						    main_url_encode(key),
-						    main_url_encode(module));
+						    main_url_encode((real_mod
+								     ? real_mod
+								     : module)));
 			if (url) {
 				main_url_handler(url, TRUE);
 				g_free(url);

Revision: 4922
          http://sourceforge.net/p/gnomesword/code/4922
Author:   charcoal
Date:     2015-08-23 03:58:43 +0000 (Sun, 23 Aug 2015)
Log Message:
-----------
more abbrev completeness hacking

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/src/main/previewer.cc
    trunk/src/main/url.cc

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2015-08-21 12:08:29 UTC (rev 4921)
+++ trunk/ChangeLog	2015-08-23 03:58:43 UTC (rev 4922)
@@ -1,8 +1,8 @@
 2015-08-17  karl <cha...@us...>
 
 	* change language_set to grow dynamically, no limit.
-	* improve abbreviation support: use abbrev in parallel page,
-	  parallel dialog/tab, and in main window non-Bible (comm/book/dict).
+	* improve abbrev support: use abbrev in parallel page, parallel
+	  dialog/tab, main window non-Bible (comm/book/dict), bookmarks.
 
 2015-08-06  karl <cha...@us...>
 

Modified: trunk/src/main/previewer.cc
===================================================================
--- trunk/src/main/previewer.cc	2015-08-21 12:08:29 UTC (rev 4921)
+++ trunk/src/main/previewer.cc	2015-08-23 03:58:43 UTC (rev 4922)
@@ -209,9 +209,11 @@
 			str = g_string_append(str, tmp_str->str);
 		}
 	} else {
+		const char *abbreviation = main_get_abbreviation(mod_name);
 		g_string_printf(tmp_str,
 				"<font color=\"grey\">%s: %s</font><hr/>",
-				mod_name, key);
+				(abbreviation ? abbreviation : mod_name),
+				key);
 		str = g_string_append(str, tmp_str->str);
 	}
 
@@ -433,6 +435,7 @@
 
 	/* show key in html widget  */
 	if (show_key) {
+		const char *abbreviation = main_get_abbreviation(mod_name);
 		if ((settings.displaySearchResults)) {
 			g_string_printf(tmp_str,
 					"<a href=\"sword://%s/%s\">"
@@ -440,7 +443,8 @@
 					mod_name,
 					key,
 					settings.link_color,
-					mod_name, key);
+					(abbreviation ? abbreviation : mod_name),
+					key);
 		} else {
 			g_string_printf(tmp_str,
 					"<a href=\"passagestudy.jsp?action=showModInfo&value=%s&module=%s\">"
@@ -448,7 +452,8 @@
 					backend->module_description(mod_name),
 					mod_name,
 					settings.link_color,
-					mod_name, key);
+					(abbreviation ? abbreviation : mod_name),
+					key);
 		}
 		str = g_string_append(str, tmp_str->str);
 	}

Modified: trunk/src/main/url.cc
===================================================================
--- trunk/src/main/url.cc	2015-08-21 12:08:29 UTC (rev 4921)
+++ trunk/src/main/url.cc	2015-08-23 03:58:43 UTC (rev 4922)
@@ -401,16 +401,16 @@
 
 /******************************************************************************
  * Name
- *   note_uri
+ *   show_note
  *
  * Synopsis
  *   #include "main/url.hh"
  *
- *   gint note_uri(const gchar * url)
+ *   gint show_note(module, passage, stype, svalue, gblooean clicked)
  *
  * Description
+ *   show a footnote in the previewer.
  *
- *
  * Return value
  *   gint
  */
@@ -668,11 +668,15 @@
 
 	work_buf = g_strsplit(url, "/", 4);
 
-	mybuf = main_get_rendered_text(work_buf[MODULE], work_buf[KEY]);
+	// might be an abbrev.  get the real.
+	const char *real_mod = main_get_name(work_buf[MODULE]);
 
+	mybuf = main_get_rendered_text((real_mod ? real_mod : work_buf[MODULE]),
+				       work_buf[KEY]);
+
 	if (mybuf) {
 		main_information_viewer(
-		    (gchar *)work_buf[MODULE],
+		    (gchar *)(real_mod ? real_mod : work_buf[MODULE]),
 		    mybuf,
 		    (gchar *)work_buf[KEY],
 		    NULL,
@@ -729,14 +733,19 @@
 			gchar *slash = g_strstr_len(name, 20, "/");
 			if (slash)
 				*slash = '\0'; // limit to name end.
-			int mod_type = backend->module_type(name);
+
+			// might be an abbrev.  get the real.
+			const char *real_mod = main_get_name(name);
+
+			int mod_type = backend->module_type(real_mod ? real_mod : name);
+
 			if (slash)
 				*slash = '/';
 
 			if (mod_type == DICTIONARY_TYPE)
 				show_in_previewer(url);
 			else
-				gui_set_statusbar(url);
+				gui_set_statusbar(name + ((*name == '/') ? 1 : 0));
 		}
 		handling_uri = FALSE;
 		return 1;
@@ -773,12 +782,12 @@
 	}
 
 	verse_count = 1; //backend->is_Bible_key(mykey, settings.currentverse);
-	if (backend->is_module(work_buf[MODULE])) {
-		mod_type = backend->module_type(work_buf[MODULE]);
+	if (backend->is_module(mod)) {
+		mod_type = backend->module_type(mod);
 		switch (mod_type) {
 		case TEXT_TYPE:
-			key = main_update_nav_controls(work_buf[MODULE], tmpkey);
-			main_display_bible(work_buf[MODULE], key);
+			key = main_update_nav_controls(mod, tmpkey);
+			main_display_bible(mod, key);
 			if (settings.comm_showing)
 				main_display_commentary(NULL, key);
 			main_keep_bibletext_dialog_in_sync((gchar *)key);
@@ -795,16 +804,15 @@
 				settings.special_anchor = save;
 			}
 			settings.comm_showing = TRUE;
-			key = main_update_nav_controls(work_buf[MODULE], tmpkey);
-			main_display_commentary(work_buf[MODULE], key);
+			key = main_update_nav_controls(mod, tmpkey);
+			main_display_commentary(mod, key);
 			main_display_bible(NULL, key);
 			main_keep_bibletext_dialog_in_sync((gchar *)key);
 			if (key)
 				g_free((gchar *)key);
 			break;
 		case DICTIONARY_TYPE:
-			main_display_dictionary(work_buf[MODULE],
-						tmpkey);
+			main_display_dictionary(mod, tmpkey);
 			break;
 		case BOOK_TYPE:
 			if (gtk_notebook_get_current_page(GTK_NOTEBOOK(widgets.notebook_comm_book)) != 1) {
@@ -814,7 +822,7 @@
 				settings.special_anchor = save;
 			}
 			settings.comm_showing = FALSE;
-			main_display_book(work_buf[MODULE], tmpkey);
+			main_display_book(mod, tmpkey);
 			break;
 		}
 	} else { /* module name not found or not given */
@@ -905,12 +913,20 @@
 
 		/* passagestudy.jsp?action=showStrongs&type= */
 		URL m_url((const char *)tmpstr->str);
-		action = g_strdup(m_url.getParameterValue("action"));
-		morph = g_strdup((gchar *)m_url.getParameterValue("morph"));
+		action  = g_strdup((gchar *)m_url.getParameterValue("action"));
+		morph   = g_strdup((gchar *)m_url.getParameterValue("morph"));
 		strongs = g_strdup((gchar *)m_url.getParameterValue("lemma"));
-		stype = g_strdup((gchar *)m_url.getParameterValue("type"));
-		svalue = g_strdup((gchar *)m_url.getParameterValue("value"));
+		stype   = g_strdup((gchar *)m_url.getParameterValue("type"));
+		svalue  = g_strdup((gchar *)m_url.getParameterValue("value"));
+		module  = g_strdup((gchar *)m_url.getParameterValue("module"));
+		passage = g_strdup((gchar *)m_url.getParameterValue("passage"));
 
+		// no module specified => use main module.
+		if (!strcmp(module, "")) {
+			g_free(module);
+			module = g_strdup(settings.MainWindowModule);
+		}
+
 		// XXX gross hack-fix
 		// AraSVD is named "Smith & Van Dyke", using a literal '&'.
 		// this is technically a Sword bug: Sword should encode it.
@@ -919,38 +935,28 @@
 		//	*(svalue+1) = '-';
 
 		XI_message(("action = %s", action));
+		XI_message(("morph = %s", morph));
+		XI_message(("strongs = %s", strongs));
 		XI_message(("type = %s", stype));
 		XI_message(("value = %s", svalue));
-		XI_message(("strongs = %s", strongs));
-		XI_message(("morph = %s", morph));
+		XI_message(("module = %s", module));
+		XI_message(("passage = %s", passage));
 
 		if (!strcmp(action, "showStrongs")) {
 			show_strongs(stype, svalue, clicked);
 		}
 
 		else if (!strcmp(action, "showMorph")) {
-			show_morph(settings.MainWindowModule,
-				   stype, svalue, clicked);
+			show_morph(module, stype, svalue, clicked);
 		}
 
 		else if (!strcmp(action, "showNote")) {
-			module = g_strdup(m_url.getParameterValue("module"));
-			passage = g_strdup((gchar *)m_url.getParameterValue("passage"));
 			show_note(module, passage, stype, svalue, clicked);
-			if (module)
-				g_free(module);
-			if (passage)
-				g_free(passage);
 		}
 
 		else if (!strcmp(action, "showUserNote")) {
-			module = g_strdup(m_url.getParameterValue("module"));
-			passage = g_strdup((gchar *)m_url.getParameterValue("passage"));
-
 			// need localized key, not the osisref that we've got.
-			ModMap::iterator it = backend->get_mgr()->Modules.find((module && *module)
-										   ? module
-										   : settings.MainWindowModule);
+			ModMap::iterator it = backend->get_mgr()->Modules.find(module);
 			SWModule *m = (*it).second;
 			VerseKey *vk = (VerseKey *)m->getKey();
 			*vk = passage;
@@ -962,32 +968,19 @@
 						(gchar *)"u",
 						NULL,
 						NULL);
-			if (module)
-				g_free(module);
-			if (passage)
-				g_free(passage);
 		}
 
 		else if (!strcmp(action, "showRef")) {
-			module = g_strdup(m_url.getParameterValue("module"));
 			if (!strcmp(stype, "scripRef"))
 				show_ref(module, svalue, clicked);
-			if (module)
-				g_free(module);
 		}
 
 		else if (!strcmp(action, "showBookmark")) {
-			module = g_strdup(m_url.getParameterValue("module"));
 			show_module_and_key(module, svalue, stype, clicked);
-			if (module)
-				g_free(module);
 		}
 
 		else if (!strcmp(action, "showModInfo")) {
-			module = g_strdup(m_url.getParameterValue("module"));
 			show_mod_info(module, svalue, clicked);
-			if (module)
-				g_free(module);
 		}
 
 		else if (!strcmp(action, "showParallel")) {
@@ -1015,6 +1008,11 @@
 			g_free(strongs);
 		if (morph)
 			g_free(morph);
+		if (module)
+			g_free(module);
+		if (passage)
+			g_free(passage);
+
 		g_string_free(tmpstr, TRUE);
 		retval = 1;
 	} else if (clicked)

Revision: 4921
          http://sourceforge.net/p/gnomesword/code/4921
Author:   charcoal
Date:     2015-08-21 12:08:29 +0000 (Fri, 21 Aug 2015)
Log Message:
-----------
update abbrev support to show abbrevs in all contexts

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/src/main/display.cc
    trunk/src/main/parallel_view.cc
    trunk/src/main/sword.cc

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2015-08-20 01:28:31 UTC (rev 4920)
+++ trunk/ChangeLog	2015-08-21 12:08:29 UTC (rev 4921)
@@ -1,6 +1,8 @@
 2015-08-17  karl <cha...@us...>
 
 	* change language_set to grow dynamically, no limit.
+	* improve abbreviation support: use abbrev in parallel page,
+	  parallel dialog/tab, and in main window non-Bible (comm/book/dict).
 
 2015-08-06  karl <cha...@us...>
 

Modified: trunk/src/main/display.cc
===================================================================
--- trunk/src/main/display.cc	2015-08-20 01:28:31 UTC (rev 4920)
+++ trunk/src/main/display.cc	2015-08-21 12:08:29 UTC (rev 4921)
@@ -939,6 +939,7 @@
 	if (!gtk_widget_get_realized(GTK_WIDGET(gtkText)))
 		gtk_widget_realize(gtkText);
 
+	const char *abbreviation = main_get_abbreviation(imodule.getName());
 	gchar *buf;
 	mf = get_font(imodule.getName());
 	swbuf = "";
@@ -980,7 +981,7 @@
 			      imodule.getDescription(),
 			      imodule.getName(),
 			      settings.bible_verse_num_color,
-			      imodule.getName());
+			      (abbreviation ? abbreviation : imodule.getName()));
 	swbuf.append(buf);
 	g_free(buf);
 

Modified: trunk/src/main/parallel_view.cc
===================================================================
--- trunk/src/main/parallel_view.cc	2015-08-20 01:28:31 UTC (rev 4920)
+++ trunk/src/main/parallel_view.cc	2015-08-21 12:08:29 UTC (rev 4921)
@@ -703,6 +703,7 @@
 							    mf->old_font_size_value, mf->old_font);
 			free_font(mf);
 
+			const char *abbreviation = main_get_abbreviation(mod_name);
 			tmpBuf = g_strdup_printf(
 			    "<tr bgcolor=\"%s\"><td>%s<b><a href=\"passagestudy.jsp?action=showModInfo&value=%s&module=%s\"><font color=\"%s\" size=\"%+d\">[%s]</font></a></b><br/>",
 			    rowcolor,
@@ -711,7 +712,7 @@
 			    mod_name,
 			    settings.bible_verse_num_color,
 			    settings.verse_num_font_size + settings.base_font_size,
-			    mod_name);
+			    (abbreviation ? abbreviation : mod_name));
 			g_free(fontstring);
 			g_string_append(data, tmpBuf);
 			g_free(tmpBuf);
@@ -964,12 +965,13 @@
 	text += buf;
 
 	for (modidx = 0; settings.parallel_list[modidx]; ++modidx) {
+		const char *abbreviation = main_get_abbreviation(settings.parallel_list[modidx]);
 		snprintf(buf, 499,
 			 "<td valign=\"top\" width=\"%d%%\" bgcolor=\"#c0c0c0\"><font color=\"%s\" size=\"%+d\"><b>%s</b></font></td>",
 			 fraction,
 			 settings.bible_verse_num_color,
 			 settings.verse_num_font_size + settings.base_font_size,
-			 settings.parallel_list[modidx]);
+			 (abbreviation ? abbreviation : settings.parallel_list[modidx]));
 		text += buf;
 	}
 

Modified: trunk/src/main/sword.cc
===================================================================
--- trunk/src/main/sword.cc	2015-08-20 01:28:31 UTC (rev 4920)
+++ trunk/src/main/sword.cc	2015-08-21 12:08:29 UTC (rev 4921)
@@ -129,7 +129,7 @@
  *   const char * main_get_abbreviation(const char *name)
  *
  * Description
- *   gets abbreviation, if available.
+ *   gets abbreviation from real module, if available.
  *
  * Return value
  *   const char *
@@ -156,7 +156,7 @@
  *   const char * main_get_name(const char *abbreviation)
  *
  * Description
- *   gets abbreviation, if available.
+ *   gets real module name from abbreviation, if available.
  *
  * Return value
  *   const char *

Revision: 4920
          http://sourceforge.net/p/gnomesword/code/4920
Author:   charcoal
Date:     2015-08-20 01:28:31 +0000 (Thu, 20 Aug 2015)
Log Message:
-----------
mod.mgr sync_windows() to avoid losing last install messages

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/src/gnome2/mod_mgr.c

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2015-08-19 01:51:53 UTC (rev 4919)
+++ trunk/ChangeLog	2015-08-20 01:28:31 UTC (rev 4920)
@@ -5,6 +5,8 @@
 2015-08-06  karl <cha...@us...>
 
 	* survivability fix: increase LANGSET_COUNT to 2000 (eBible repo).
+	* updated French translation.
+	* added Korean translation.
 	* 4.0.3 release.
 
 2015-06-15  karl <cha...@us...>

Modified: trunk/src/gnome2/mod_mgr.c
===================================================================
--- trunk/src/gnome2/mod_mgr.c	2015-08-19 01:51:53 UTC (rev 4919)
+++ trunk/src/gnome2/mod_mgr.c	2015-08-20 01:28:31 UTC (rev 4920)
@@ -963,6 +963,9 @@
 							       source,
 							       module_name));
 
+			/* do gtk refresh, to make sure last messages display */
+			sync_windows();
+
 			/* try to re-use a saved key. */
 			if ((result != -1) && preserved_cipherkey) {
 				main_save_module_key(module_name,

Revision: 4919
          http://sourceforge.net/p/gnomesword/code/4919
Author:   charcoal
Date:     2015-08-19 01:51:53 +0000 (Wed, 19 Aug 2015)
Log Message:
-----------
improve dyn.alloc: avoid potential fencepost, ensure 1 more present

Modified Paths:
--------------
    trunk/src/gnome2/utilities.c

Modified: trunk/src/gnome2/utilities.c
===================================================================
--- trunk/src/gnome2/utilities.c	2015-08-18 02:12:43 UTC (rev 4918)
+++ trunk/src/gnome2/utilities.c	2015-08-19 01:51:53 UTC (rev 4919)
@@ -1040,7 +1040,7 @@
 	int i;
 	for (i = 0; i < N_LANGSET_MODTYPES; ++i) {
 		language_set[i].ptr =
-		    calloc(LANGSET_STRIDE, sizeof(char *));
+		    calloc(LANGSET_STRIDE + 1, sizeof(char *));
 		language_set[i].count = 0;
 		language_set[i].max = LANGSET_STRIDE;	/* initial limit */
 	}
@@ -1079,17 +1079,15 @@
 
 	// grow the set dynamically as we run out of space.
 	if (j >= language_set[module_type].max) {
-		// in bytes.
-		int old_size = language_set[module_type].max * sizeof(char*);
+		int old_max = language_set[module_type].max;
 
 		language_set[module_type].max += LANGSET_STRIDE;
 		s = language_set[module_type].ptr =
 			realloc(language_set[module_type].ptr,
-				language_set[module_type].max *
+				(language_set[module_type].max + 1) *
 				sizeof(char*));
 		// realloc() does not set newly-alloc'd mem to zeroes.
-		// must use (void*), otherwise arithmetic will use pointer size.
-		memset((void*)s + old_size, '\0', LANGSET_STRIDE * sizeof(char*));
+		memset(s + old_max, '\0', (LANGSET_STRIDE + 1) * sizeof(char*));
 	}
 
 	s[j] = g_strdup(language);

Revision: 4918
          http://sourceforge.net/p/gnomesword/code/4918
Author:   charcoal
Date:     2015-08-18 02:12:43 +0000 (Tue, 18 Aug 2015)
Log Message:
-----------
language survivability fix replaced with dynamic allocation

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/src/gnome2/utilities.c
    trunk/src/gui/utilities.h

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2015-08-18 00:26:40 UTC (rev 4917)
+++ trunk/ChangeLog	2015-08-18 02:12:43 UTC (rev 4918)
@@ -1,3 +1,28 @@
+2015-08-17  karl <cha...@us...>
+
+	* change language_set to grow dynamically, no limit.
+
+2015-08-06  karl <cha...@us...>
+
+	* survivability fix: increase LANGSET_COUNT to 2000 (eBible repo).
+	* 4.0.3 release.
+
+2015-06-15  karl <cha...@us...>
+
+	* fixed detached parallel "close" button visual overreach.
+	* updated Slovenian translation (marjan savli).
+	* add toolkit identifications to "about xiphos."
+	* generic, all-purpose makeDistro.sh; deleted makeDistro3.sh.
+
+2015-04-15  karl <cha...@us...>
+
+	* emergency fix mem alloc error in editor.
+	* 4.0.2 release.
+
+2015-03-29  karl <cha...@us...>
+
+	* 4.0.1 release.
+
 2015-02-20  karl <cha...@us...>
 
 	* consequent to use of cppcheck, made many updates for efficiency,

Modified: trunk/src/gnome2/utilities.c
===================================================================
--- trunk/src/gnome2/utilities.c	2015-08-18 00:26:40 UTC (rev 4917)
+++ trunk/src/gnome2/utilities.c	2015-08-18 02:12:43 UTC (rev 4918)
@@ -1031,6 +1031,7 @@
 {
 	gchar **ptr;
 	int count;
+	int max;
 } language_set[N_LANGSET_MODTYPES];
 
 /* one-shot setup during initialization. */
@@ -1039,8 +1040,9 @@
 	int i;
 	for (i = 0; i < N_LANGSET_MODTYPES; ++i) {
 		language_set[i].ptr =
-		    calloc(LANGSET_COUNT, sizeof(char *));
+		    calloc(LANGSET_STRIDE, sizeof(char *));
 		language_set[i].count = 0;
+		language_set[i].max = LANGSET_STRIDE;	/* initial limit */
 	}
 }
 
@@ -1068,12 +1070,28 @@
 	if ((language == NULL) || (*language == '\0'))
 		language = _("Unknown");
 	assert((module_type >= 0) && (module_type < N_LANGSET_MODTYPES));
+
 	s = language_set[module_type].ptr;
 	for (j = 0; j < language_set[module_type].count; ++j) {
 		if (!strcmp(s[j], language))
 			return; /* found -- duplicate. */
 	}
-	assert(j < LANGSET_COUNT); /* let's not overrun the set. */
+
+	// grow the set dynamically as we run out of space.
+	if (j >= language_set[module_type].max) {
+		// in bytes.
+		int old_size = language_set[module_type].max * sizeof(char*);
+
+		language_set[module_type].max += LANGSET_STRIDE;
+		s = language_set[module_type].ptr =
+			realloc(language_set[module_type].ptr,
+				language_set[module_type].max *
+				sizeof(char*));
+		// realloc() does not set newly-alloc'd mem to zeroes.
+		// must use (void*), otherwise arithmetic will use pointer size.
+		memset((void*)s + old_size, '\0', LANGSET_STRIDE * sizeof(char*));
+	}
+
 	s[j] = g_strdup(language);
 	++(language_set[module_type].count);
 }

Modified: trunk/src/gui/utilities.h
===================================================================
--- trunk/src/gui/utilities.h	2015-08-18 00:26:40 UTC (rev 4917)
+++ trunk/src/gui/utilities.h	2015-08-18 02:12:43 UTC (rev 4918)
@@ -146,7 +146,7 @@
 	UTIL_N_COLUMNS
 };
 
-#define LANGSET_COUNT 2000
+#define	LANGSET_STRIDE	100
 
 void language_init(void);
 

Revision: 4917
          http://sourceforge.net/p/gnomesword/code/4917
Author:   charcoal
Date:     2015-08-18 00:26:40 +0000 (Tue, 18 Aug 2015)
Log Message:
-----------
add yrk-cyrl

Modified Paths:
--------------
    trunk/ui/languages

Modified: trunk/ui/languages
===================================================================
--- trunk/ui/languages	2015-08-10 15:23:48 UTC (rev 4916)
+++ trunk/ui/languages	2015-08-18 00:26:40 UTC (rev 4917)
@@ -8008,6 +8008,8 @@
 yre	Yaouré
 yri	Yarí
 yrk	Nenets
+# add dup for cyrillic version
+yrk-Cyrl	Nenets
 yrl	Nhengatu
 yrn	Yerong
 yrs	Yarsun

Revision: 4916
          http://sourceforge.net/p/gnomesword/code/4916
Author:   charcoal
Date:     2015-08-10 15:23:48 +0000 (Mon, 10 Aug 2015)
Log Message:
-----------
fix editing glitch in language

Modified Paths:
--------------
    trunk/ui/languages

Modified: trunk/ui/languages
===================================================================
--- trunk/ui/languages	2015-08-10 14:48:08 UTC (rev 4915)
+++ trunk/ui/languages	2015-08-10 15:23:48 UTC (rev 4916)
@@ -3780,7 +3780,7 @@
 kub	Kutep
 kuc	Kwinsu
 # remove leading ' (consequent to eBible repo discoveries)
-kud	'Auhelawa
+kud	Auhelawa
 kue	Kuman
 kuf	Western Katu
 kug	Kupa

Revision: 4915
          http://sourceforge.net/p/gnomesword/code/4915
Author:   charcoal
Date:     2015-08-10 14:48:08 +0000 (Mon, 10 Aug 2015)
Log Message:
-----------
languages updates consequent to eBible discoveries

Modified Paths:
--------------
    trunk/ui/languages

Modified: trunk/ui/languages
===================================================================
--- trunk/ui/languages	2015-08-07 02:18:21 UTC (rev 4914)
+++ trunk/ui/languages	2015-08-10 14:48:08 UTC (rev 4915)
@@ -698,7 +698,8 @@
 alr	Alutor
 als	Tosk Albanian
 alt	Southern Altai
-alu	'Are'are
+# remove leading ' (consequent to eBible repo discoveries)
+alu	Are'are
 alw	Alaba-K’abeena
 alx	Amol
 aly	Alyawarr
@@ -881,7 +882,8 @@
 aub	Alugu
 auc	Waorani
 aud	Anuta
-aue	=/Kx'au//'ein
+# remove leading =/ (consequent to eBible repo discoveries)
+aue	Kx'au//'ein
 aug	Aguna
 auh	Aushi
 aui	Anuki
@@ -1220,6 +1222,8 @@
 bjm	Bajelani
 bjn	Banjar
 bjo	Mid-Southern Banda
+# addition from eBible repo
+bjp	Tangga
 bjq	Southern Betsimisaraka Malagasy
 bjr	Binumarien
 bjs	Bajan
@@ -2219,6 +2223,8 @@
 dva	Duau
 dwa	Diri
 dwl	Walo Kumbe Dogon
+# addition from eBible repo
+dwr	Dawro
 dws	Dutton World Speedwords
 dww	Dawawa
 dya	Dyan
@@ -2238,6 +2244,8 @@
 dzn	Dzando
 dzo	Dzongkha
 ebg	Ebughu
+# addition from eBible repo
+ebk	Eastern Bontok
 ebo	Teke-Ebo
 ebr	Ebrié
 ebu	Embu
@@ -2614,6 +2622,8 @@
 gmn	Gimnime
 gmo	Gamo-Gofa-Dawro
 gmu	Gumalu
+# addition from eBible repo
+gmv	Gamo
 gmx	Magoma
 gmy	Mycenaean Greek
 gna	Kaansa
@@ -2624,7 +2634,8 @@
 gng	Ngangam
 gnh	Lere
 gni	Gooniyandi
-gnk	//Gana
+# remove leading // (consequent to eBible repo discoveries)
+gnk	Gana
 gnl	Gangulu
 gnm	Ginuman
 gnn	Gumatj
@@ -2640,6 +2651,8 @@
 goc	Gorakor
 god	Godié
 goe	Gongduk
+# addition from eBible repo
+gof	Gofa
 gog	Gogo
 goh	Old High German (ca. 750-1050)
 goi	Gobasi
@@ -2743,7 +2756,8 @@
 gwf	Gowro
 gwg	Moo
 gwi	Gwichʼin
-gwj	/Gwi
+# remove leading / (consequent to eBible repo discoveries)
+gwj	Gwi
 gwn	Gwandara
 gwr	Gwere
 gwt	Gawar-Bati
@@ -2874,7 +2888,8 @@
 hna	Mina (Cameroon)
 hnd	Southern Hindko
 hne	Chhattisgarhi
-hnh	//Ani
+# remove leading // (consequent to eBible repo discoveries)
+hnh	Ani
 hni	Hani
 hnj	Hmong Njua
 hnn	Hanunoo
@@ -2925,7 +2940,8 @@
 htu	Hitu
 htx	Middle Hittite
 hub	Huambisa
-huc	=/Hua
+# remove leading =/ (consequent to eBible repo discoveries)
+huc	Hua
 hud	Huaulu
 hue	San Francisco Del Mar Huave
 huf	Humene
@@ -3763,6 +3779,7 @@
 kua	Kuanyama
 kub	Kutep
 kuc	Kwinsu
+# remove leading ' (consequent to eBible repo discoveries)
 kud	'Auhelawa
 kue	Kuman
 kuf	Western Katu
@@ -3950,6 +3967,8 @@
 lbg	Laopang
 lbi	La'bi
 lbj	Ladakhi
+# addition from eBible repo
+lbk	Central Bontok
 lbm	Lodhi
 lbn	Lamet
 lbo	Laven
@@ -5169,7 +5188,8 @@
 nmk	Namakura
 nml	Ndemli
 nmm	Manangba
-nmn	!Xóõ
+# remove leading ! (consequent to eBible repo discoveries)
+nmn	Xóõ
 nmo	Moyon Naga
 nmp	Nimanbur
 nmq	Nambya
@@ -5528,7 +5548,8 @@
 oue	Oune
 oui	Old Uighur
 oum	Ouma
-oun	!O!ung
+# remove leading ! (consequent to eBible repo discoveries)
+oun	O!ung
 owi	Owiniga
 owl	Old Welsh
 oyb	Oy
@@ -5796,6 +5817,8 @@
 prc	Parachi
 prd	Parsi-Dari
 pre	Principense
+# addition from eBible repo
+prf	Paranan
 prg	Prussian
 prh	Porohanon
 pri	Paicî
@@ -6903,6 +6926,8 @@
 tnx	Tanema
 tny	Tongwe
 tnz	Tonga (Thailand)
+# addition from eBible repo
+to	Tongan
 tob	Toba
 toc	Coyutla Totonac
 tod	Toma
@@ -7568,7 +7593,8 @@
 xag	Aghwan
 xai	Kaimbé
 xal	Kalmyk
-xam	/Xam
+# remove leading / (consequent to eBible repo discoveries)
+xam	Xam
 xan	Xamtanga
 xao	Khao
 xap	Apalachee
@@ -7608,7 +7634,8 @@
 xdy	Malayic Dayak
 xeb	Eblan
 xed	Hdi
-xeg	//Xegwi
+# remove leading // (consequent to eBible repo discoveries)
+xeg	Xegwi
 xel	Kelo
 xem	Kembayan
 xep	Epi-Olmec

Revision: 4914
          http://sourceforge.net/p/gnomesword/code/4914
Author:   charcoal
Date:     2015-08-07 02:18:21 +0000 (Fri, 07 Aug 2015)
Log Message:
-----------
4.0.3 release

Modified Paths:
--------------
    trunk/RELEASE-NOTES
    trunk/debian/changelog
    trunk/win32/nsis/installer32.nsi
    trunk/win32/nsis/installer64.nsi
    trunk/wscript

Modified: trunk/RELEASE-NOTES
===================================================================
--- trunk/RELEASE-NOTES	2015-08-05 13:08:03 UTC (rev 4913)
+++ trunk/RELEASE-NOTES	2015-08-07 02:18:21 UTC (rev 4914)
@@ -3,6 +3,16 @@
 XIPHOS RELEASE NOTES
 ____________________
 
+Release 4.0.3
+06 Aug 2015
+
+Another bugfix release, induced by the discovery that a hard limit on the
+number of language groups that can be supported is too small with respect
+to newer repositories supporting far larger groups of modules.  The code
+involved will be re-factored for a better near-term future release but
+this is an immediate survivability fix.
+________________________________________________________________
+
 Release 4.0.2
 15 Apr 2015
 

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2015-08-05 13:08:03 UTC (rev 4913)
+++ trunk/debian/changelog	2015-08-07 02:18:21 UTC (rev 4914)
@@ -1,3 +1,9 @@
+xiphos-svn (4.0.3-0~svn) unstable; urgency=low
+
+  * New upstream release, urgent bugfix only
+
+ -- Karl Kleinpaste <cha...@us...>  Thu, 06 Aug 2015 07:15:00 +0000
+
 xiphos-svn (4.0.2-0~svn) unstable; urgency=low
 
   * New upstream release, urgent bugfix only

Modified: trunk/win32/nsis/installer32.nsi
===================================================================
--- trunk/win32/nsis/installer32.nsi	2015-08-05 13:08:03 UTC (rev 4913)
+++ trunk/win32/nsis/installer32.nsi	2015-08-07 02:18:21 UTC (rev 4914)
@@ -44,7 +44,7 @@
     !define APP_NAME "Xiphos"
     !define INSTALLER_NAME "xiphos"
     !define APP_BINARY_NAME "xiphos.exe"
-    !define APP_VERS "4.0.2"
+    !define APP_VERS "4.0.3"
     !define APP_EDITION "win32"
     !define APP_URL "http://xiphos.org"
 

Modified: trunk/win32/nsis/installer64.nsi
===================================================================
--- trunk/win32/nsis/installer64.nsi	2015-08-05 13:08:03 UTC (rev 4913)
+++ trunk/win32/nsis/installer64.nsi	2015-08-07 02:18:21 UTC (rev 4914)
@@ -44,7 +44,7 @@
     !define APP_NAME "Xiphos"
     !define INSTALLER_NAME "xiphos"
     !define APP_BINARY_NAME "xiphos.exe"
-    !define APP_VERS "4.0.2"
+    !define APP_VERS "4.0.3"
     !define APP_EDITION "win64"
     !define APP_URL "http://xiphos.org"
 

Modified: trunk/wscript
===================================================================
--- trunk/wscript	2015-08-05 13:08:03 UTC (rev 4913)
+++ trunk/wscript	2015-08-07 02:18:21 UTC (rev 4914)
@@ -14,7 +14,7 @@
 import waffles.misc
 import waffles.gnome as gnome
 
-VERSION='4.0.2'
+VERSION='4.0.3'
 
 APPNAME='xiphos'
 PACKAGE='xiphos'

Revision: 4913
          http://sourceforge.net/p/gnomesword/code/4913
Author:   domcox
Date:     2015-08-05 13:08:03 +0000 (Wed, 05 Aug 2015)
Log Message:
-----------
French translation update

Modified Paths:
--------------
    trunk/po/fr.po

Modified: trunk/po/fr.po
===================================================================
--- trunk/po/fr.po	2015-08-04 22:18:17 UTC (rev 4912)
+++ trunk/po/fr.po	2015-08-05 13:08:03 UTC (rev 4913)
@@ -1,5 +1,5 @@
 # French translation for Xiphos
-# Copyright (C) 2002, 2014 Free Software Foundation, Inc.
+# Copyright (C) 2002, 2015 Free Software Foundation, Inc.
 # Contributions are welcome.
 #
 # Translation Notes (Any comment welcome)
@@ -13,18 +13,19 @@
 # Viewer                  -> Aperçu
 # Biblical Text           -> Textes bibliques
 # Lemma                   -> Lemme
+# Glosse			-> Annotation
 # Daily Devotion          -> Calendrier biblique
-# Speaker                 -> Orateur
+# Speaker                 -> Intervenant
 # Audience                -> Audience
 #
-# Dominique Corbex <do...@us...>, 2002, 2014.
+# Dominique Corbex <do...@us...>, 2002, 2015.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Xiphos 3.4.0\n"
+"Project-Id-Version: Xiphos 4.0.2\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-06-16 13:36-0400\n"
-"PO-Revision-Date: 2014-12-19 21:51+0100\n"
+"PO-Revision-Date: 2015-08-05 14:49+0200\n"
 "Last-Translator: Dominique Corbex <do...@us...>\n"
 "Language-Team: emacs + po-mode <gn...@tr...>\n"
 "Language: \n"
@@ -98,29 +99,25 @@
 #: ../src/gnome2/about_modules.c:219 ../src/gnome2/about_trans.c:168
 #: ../src/gnome2/find_dialog.c:288
 msgid "Close"
-msgstr ""
+msgstr "Fermer"
 
 #: ../src/gnome2/about_modules.c:411
-#, fuzzy
 msgid "<b>Module name:</b> "
-msgstr "<b>Gestionnaire de modules</b>"
+msgstr "<b>Module :</b>"
 
 #: ../src/gnome2/about_modules.c:415
-#, fuzzy
 msgid "<b>Version:</b> "
-msgstr "<b>Options de la requête</b>"
+msgstr "<b>Version :</b>"
 
 #: ../src/gnome2/about_modules.c:418
 msgid "No version stamp found"
-msgstr ""
+msgstr "Pas d'indication trouvée"
 
 #: ../src/gnome2/about_modules.c:421
-#, fuzzy
 msgid "<b>Type:</b> "
-msgstr "<b>Plage de versets</b>"
+msgstr "<b>Type :</b>"
 
 #: ../src/gnome2/about_modules.c:423
-#, fuzzy
 msgid "Daily Devotion"
 msgstr "Calendrier biblique"
 
@@ -137,17 +134,16 @@
 msgstr "Images"
 
 #: ../src/gnome2/about_modules.c:429
-#, fuzzy
 msgid "Glossary"
-msgstr "Glossaires"
+msgstr "Glossaire"
 
 #: ../src/gnome2/about_modules.c:433
 msgid "Cult"
-msgstr ""
+msgstr "Culte"
 
 #: ../src/gnome2/about_modules.c:437 ../src/gnome2/search_sidebar.c:261
 msgid "Bible"
-msgstr "Texte biblique"
+msgstr "Bible"
 
 #: ../src/gnome2/about_modules.c:440 ../src/gnome2/search_sidebar.c:269
 #: ../ui/prefs.glade.h:134 ../ui/prefs.gtkbuilder.h:134
@@ -160,139 +156,116 @@
 msgstr "Dictionnaire"
 
 #: ../src/gnome2/about_modules.c:446
-#, fuzzy
 msgid "General Book"
-msgstr "Livres"
+msgstr "Livre"
 
 #: ../src/gnome2/about_modules.c:451
-#, fuzzy
 msgid "Personal Commentary"
-msgstr "Renommer le commentaire"
+msgstr "Commentaire personnel"
 
 #: ../src/gnome2/about_modules.c:454
-#, fuzzy
 msgid "Journal"
-msgstr "JournalQuotidien"
+msgstr "Journal"
 
 #: ../src/gnome2/about_modules.c:457
-#, fuzzy
 msgid "Unknown type"
-msgstr "Inconnu"
+msgstr "Type inconnu"
 
 #: ../src/gnome2/about_modules.c:466
-#, fuzzy
 msgid "<b>Module abbreviation:</b> "
-msgstr "<b>Listes de modules</b>"
+msgstr "<b>Abbréviation du module :</b>"
 
 #: ../src/gnome2/about_modules.c:471
-#, fuzzy
 msgid "<b>Language:</b> "
-msgstr "<b>Plages de versets</b>"
+msgstr "<b>Langue :</b>"
 
 #: ../src/gnome2/about_modules.c:474
 msgid "Not specified"
-msgstr ""
+msgstr "Non spécifiée"
 
 #: ../src/gnome2/about_modules.c:483
-#, fuzzy
 msgid "<b>Installed size:</b> "
-msgstr "<b>Source des dépôts</b>"
+msgstr "<b>Taille :</b>"
 
 #: ../src/gnome2/about_modules.c:491
-#, fuzzy
 msgid "<b>Companion module(s):</b></br>"
-msgstr "<b>Modules de base</b>"
+msgstr "<b>Modules compagnons :</b></br>"
 
 #: ../src/gnome2/about_modules.c:501
-#, fuzzy
 msgid "<b>Features:</b>"
-msgstr "<b>Format</b>"
+msgstr "<b>Options :</b>"
 
 #: ../src/gnome2/about_modules.c:505
-#, fuzzy
 msgid "*&nbsp;Headings"
-msgstr "En-têtes"
+msgstr "*&nbsp;En-têtes"
 
 #: ../src/gnome2/about_modules.c:513
-#, fuzzy
 msgid "*&nbsp;Footnotes"
-msgstr "Notes de bas de page"
+msgstr "*&nbsp;Notes de bas de page"
 
 #: ../src/gnome2/about_modules.c:519
-#, fuzzy
 msgid "*&nbsp;Cross references"
-msgstr "Références croisées"
+msgstr "*&nbsp;Références croisées"
 
 #: ../src/gnome2/about_modules.c:526
-#, fuzzy
 msgid "*&nbsp;Strong's numbers"
-msgstr "Nombres de Strong"
+msgstr "*&nbsp;Nombres de Strong"
 
 #: ../src/gnome2/about_modules.c:534
-#, fuzzy
 msgid "*&nbsp;Morphological tags"
-msgstr "Étiquettes morphologiques"
+msgstr "*&nbsp;Étiquettes morphologiques"
 
 #: ../src/gnome2/about_modules.c:540
-#, fuzzy
 msgid "*&nbsp;Lemmas"
-msgstr "Lemmes"
+msgstr "*&nbsp;Lemmes"
 
 #: ../src/gnome2/about_modules.c:548
-#, fuzzy
 msgid "*&nbsp;Words of Christ in red"
-msgstr "Paroles de Christ en rouge"
+msgstr "*&nbsp;Paroles de Christ en rouge"
 
 #: ../src/gnome2/about_modules.c:553
-#, fuzzy
 msgid "*&nbsp;Greek accents"
-msgstr "Accents grecs"
+msgstr "*&nbsp;Accents grecs"
 
 #: ../src/gnome2/about_modules.c:559
-#, fuzzy
 msgid "*&nbsp;Hebrew Vowel Points"
-msgstr "Ponctuation des voyelles en hébreu"
+msgstr "*&nbsp;Ponctuation des voyelles en hébreu"
 
 #: ../src/gnome2/about_modules.c:565
-#, fuzzy
 msgid "*&nbsp;Hebrew Cantillation"
-msgstr "Vocalisations en hébreu"
+msgstr "*&nbsp;Vocalisations en hébreu"
 
 #: ../src/gnome2/about_modules.c:571
 msgid "*&nbsp;Variant readings"
-msgstr ""
+msgstr "*&nbsp;Variantes"
 
 #: ../src/gnome2/about_modules.c:578
-#, fuzzy
 msgid "*&nbsp;Transliteration forms"
-msgstr "Translittération"
+msgstr "*&nbsp;Translittération"
 
 #: ../src/gnome2/about_modules.c:583
 msgid "*&nbsp;Enumerations"
-msgstr ""
+msgstr "*&nbsp;Énumérations"
 
 #: ../src/gnome2/about_modules.c:588
 msgid "*&nbsp;Glosses"
-msgstr ""
+msgstr "*&nbsp;Annotations"
 
 #: ../src/gnome2/about_modules.c:595
-#, fuzzy
 msgid "*&nbsp;Morpheme Segmentation"
-msgstr "Segmentation de morphème"
+msgstr "*&nbsp;Segmentation de morphème"
 
 #: ../src/gnome2/about_modules.c:602
 msgid "*&nbsp;<i>No features found</i>"
-msgstr ""
+msgstr "*&nbsp;<i>Aucune option</i>"
 
 #: ../src/gnome2/about_modules.c:612
-#, fuzzy
 msgid "<b>Distribution license:</b>"
-msgstr "<b>Type d'attribut</b>"
+msgstr "<b>Licence de distribution :</b>"
 
 #: ../src/gnome2/about_modules.c:625
-#, fuzzy
 msgid "<b>Promotional:</b> "
-msgstr "<b>Options de la requête</b>"
+msgstr "<b>Promotion :</b>"
 
 #: ../src/gnome2/about_sword.c:79
 msgid ""
@@ -305,25 +278,19 @@
 "\n"
 " Books can be downloaded from the SWORD Project."
 msgstr ""
-"Le Projet SWORD a pour objectif la création d'un ensemble de logiciels "
-"destinés à l'étude de Dieu et de Sa Parole.\n"
+"Le Projet SWORD a pour objectif la création d'un ensemble de logiciels destinés à l'étude de Dieu et de Sa Parole.\n"
 "\n"
-"La bibliothèque logicielle du Projet SWORD donne les moyens d'utiliser et "
-"étudier aisément textes bibliques, commentaires, dictionnaires ou autres "
-"documents.\n"
+"La plateforme logicielle du Projet SWORD apporte les moyens de construire des outils permettant d'utiliser et d'étudier aisément les textes bibliques, commentaires, dictionnaires ou autres ouvrages.\n"
 "\n"
-"De nombreux logiciels utilisateurs sont développés sur cette bibliothèque. "
-"L'installation d'une seule collection de textes est ainsi exploitable par "
-"tous ces logiciels.\n"
+"De nombreux logiciels utilisateurs sont développés à partir de cette plateforme. Une collection de documents installée est ainsi exploitable par tous ces logiciels.\n"
 "\n"
-"Les textes peuvent être téléchargés depuis le Projet SWORD."
+"Les documents peuvent être téléchargés depuis le Projet SWORD."
 
 #: ../src/gnome2/about_sword.c:98
 msgid "The SWORD Project"
 msgstr "The SWORD Project"
 
 #: ../src/gnome2/about_trans.c:82
-#, fuzzy
 msgid ""
 "Do you like using Xiphos to study the Bible? Would you like to see its user "
 "interface in your native language? You could translate Xiphos! \n"
@@ -333,13 +300,9 @@
 "below, contact us, and get involved with our efforts. Your help will be much "
 "appreciated!"
 msgstr ""
-"Si vous appréciez Xiphos, vous aimeriez peut-être le voir s'afficher dans "
-"votre langue maternelle ? Sachez que vous pouvez participer à sa "
-"traduction !\n"
+"Si vous appréciez Xiphos, vous aimeriez peut-être le voir s'afficher dans votre langue maternelle ? Sachez que vous pouvez participer à sa traduction !\n"
 "\n"
-"Toute nouvelle contribution à la traduction de Xiphos est la bienvenue. Si "
-"vous souhaitez apporter votre aide, suivez le lien ci-dessous. N'hésitez pas "
-"à nous contacter et nous rejoindre."
+"Toute nouvelle contribution à la traduction de Xiphos est la bienvenue. Si vous souhaitez apporter votre aide, suivez le lien ci-dessous. N'hésitez pas à nous contacter et nous rejoindre. Votre aide sera très appréciée."
 
 #: ../src/gnome2/about_trans.c:96
 msgid "About Xiphos Translation"
@@ -575,7 +538,7 @@
 
 #: ../src/gnome2/main_window.c:972
 msgid "Open a new tab"
-msgstr "Ouvrir un nouvel onglet"
+msgstr "Ouvre un nouvel onglet"
 
 #: ../src/gnome2/main_window.c:1052 ../src/gnome2/sidebar.c:614
 #: ../src/gnome2/sidebar.c:619 ../src/main/sidebar.cc:656
@@ -689,30 +652,21 @@
 "Live Chat, or (if no one is responsive in chat) send mail to our users' "
 "mailing list.\n"
 msgstr ""
-"<b>Bienvenue dans le Gestionnaire de modules</b>\n"
+"<b>Bienvenue dans le Gestionnaire de modules!</b>\n"
 "\n"
-"C'est le mécanisme de Xiphos pour obtenir du contenu et le mettre à jour. Si "
-"vous ne l'avez pas encore utilisé, prenez quelques instants pour le "
-"connaître.\n"
+"C'est le moyen utilisé dans Xiphos pour installer et mettre à jour les modules de bibles, commentaires ou autres. Si vous ne l'avez pas encore utilisé, prenez quelques instants pour le découvrir.\n"
 " \n"
-"Les modules proviennent de différents <u>dépots</u>.  \n"
+"Les modules proviennent de diverses sources appelées <i>dépots</i>.  \n"
 "\n"
-"<b>Dépots : Ajouter/Supprimer</b> indique quels dépots sont actuellement "
-"répertoriés.\n"
+"<b>Dépots → Ajouter/Supprimer</b> liste les dépots actuellement répertoriés.\n"
 "\n"
-"<b>Dépots : Sélection</b> permet de définir d'où les modules doivent "
-"provenir, c'est-à-dire de quel dépôt Xiphos doit les rapatrier, ainsi que "
-"l'endroit où ils doivent être placés sur le système. Sélectionnez <i>Source "
-"des dépots</i> et <i>Dossier d'installation</i>, puis ensuite <i>Actualiser</"
-"i>.\n"
+"<b>Dépots → Sélection</b> permet de définir d'où les modules doivent provenir, c'est-à-dire de quel dépôt Xiphos doit les rapatrier, ainsi que l'endroit où ils doivent être placés sur le système. Sélectionnez <i>Source des dépots</i> et <i>Dossier d'installation</i>, puis ensuite <b>Actualiser</b>.\n"
 "\n"
-"<b>Modules : Installer</b> permet de sélectionner et d'obtenir des modules "
-"après avoir choisi la source et le dossier d'installation.\n"
+"<b>Modules → Installer/Maj</b> permet de sélectionner et d'installer des modules après avoir choisi la source et le dossier d'installation.\n"
 "\n"
-"<b>Modules : Maintenance</b> sert à l'archivage et la création d'index.\n"
+"<b>Modules → Maintenance</b> sert à l'archivage et la création d'index.\n"
 "\n"
-"Pour plus d'informations à propos du gestionnaire de modules, voir la "
-"section 5 du manuel d'aide. \n"
+"Pour plus d'informations à propos du gestionnaire de modules, voir la section 5 du manuel d'aide. \n"
 
 #: ../src/gnome2/mod_mgr.c:67
 msgid ""
@@ -750,36 +704,26 @@
 msgstr ""
 "<b>Bienvenue dans Xiphos.</b>\n"
 "\n"
-"Aucune Bible n'est installée. Pour achever son initialisation, Xiphos a "
-"besoin d'au moins un module de texte biblique. \n"
-"Le gestionnaire de modules a donc été ouvert pour pouvoir installer une ou "
-"plusieurs Bibles depuis soit un dépot local (cdrom, disque flash) soit par "
-"internet depuis le serveur de Crosswire Bible Society.\n"
-"Merci de se référer aux instructions suivantes, ainsi qu'à celles présentes "
-"dans la vue d'ensemble du gestionnaire de modules également ouverte.\n"
+"Aucune Bible n'a été trouvée. Pour achever son initialisation, Xiphos a besoin d'au moins un module de texte biblique. \n"
+"Le <i>Gestionnaire de modules</i> a donc été ouvert pour vous permettre d'installer une ou plusieurs Bibles soit à partir d'un dépot local (cdrom, disque flash) soit par téléchargement depuis le serveur de la Crosswire Bible Society.\n"
+"Merci de se référer aux instructions suivantes, ainsi qu'à celles présentes dans l'écran de bienvenue du <i>Gestionnaire de modules</i> ouvert en arrière-plan.\n"
 "\n"
 "<u>Installation locale :</u>\n"
-"- Dans <i>Dépôts : Ajouter/Supprimer</i>, ajouter le nom du nouveau "
-"répertoire local où se trouvent les modules. (Répertoire contenant les "
-"dossiers nommés <i>mods.d</i> et <i>modules</i>)\n"
-"- Dans <i>Dépôts : Sélection</i>, sélectionner « Dépot local » puis le nom "
-"du répertoire dans le menu déroulant.\n"
+"- Dans <b>Dépôts → Ajouter/Supprimer</b>, ajouter le nom du nouveau répertoire local où se trouvent les modules. (Répertoire contenant les dossiers nommés <i>mods.d</i> et <i>modules</i>)\n"
+"- Dans <b>Dépôts → Sélection</b>, sélectionner « Dépot local » puis le nom du répertoire dans le menu déroulant.\n"
 "\n"
-"<u>Installation par Internet :</u>\n"
-"- Dans <i>Dépôts : Sélection</i>, sélectionner « Dépot distant » puis « "
-"Crosswire » dans le menu déroulant.\n"
-"- Cliquer « Actualiser » au bas de la fenêtre. \n"
+"<u>Installation par téléchargement :</u>\n"
+"- Dans <b>Dépôts → Sélection</b>, sélectionner « Dépot distant » puis « Crosswire » dans le menu déroulant.\n"
+"- Cliquer sur <b>Actualiser</b> au bas de la fenêtre. \n"
 "\n"
 "<u>Dans les 2 cas :</u>\n"
-"- Dans <i>Modules : Installer</i>, sélectionner la Bible et les autres "
-"modules de votre choix.\n"
-"- Cliquer « Installer ».\n"
-"- Fermer le Gestionnaire de modules quand vous avez terminé.\n"
+"- Dans <b>Modules → Installer/Maj</b>, sélectionner la Bible et les autres modules de votre choix.\n"
+"- Cliquer sur <b>Installer</b>.\n"
+"- Fermer le <i>Gestionnaire de modules</i> quand vous avez terminé.\n"
 "\n"
-"<u>Attention</u> : Prudence dans les pays de persécution.\n"
+"<u>Attention</u> : La plus extrême prudence est requise dans les pays de persécution.\n"
 "\n"
-"Cette fenêtre d'aide ainsi que la vue d'ensemble du gestionnaire de modules "
-"peuvent être fermées à tout moment."
+" "
 
 #: ../src/gnome2/mod_mgr.c:191
 msgid "Remove these modules?"
@@ -1142,10 +1086,13 @@
 "Would you like to delete %s?\n"
 "Beware: This cannot be undone."
 msgstr ""
+"%s remplace %s.\n"
+"Effacer %s?\n"
+"Attention: pas de retour en arrière possible"
 
 #: ../src/gnome2/mod_mgr.c:2682
 msgid "No obsolete modules were found."
-msgstr ""
+msgstr "Aucun module périmé trouvé."
 
 #: ../src/gnome2/mod_mgr.c:2704
 msgid "Standard remote sources have been loaded."
@@ -1281,7 +1228,7 @@
 
 #: ../src/gnome2/preferences_dialog.c:997
 msgid "Speaker"
-msgstr "Orateur"
+msgstr "Intervenant"
 
 #: ../src/gnome2/preferences_dialog.c:998
 msgid "Audience"
@@ -1432,7 +1379,7 @@
 "For complete details, search the web for \"lucene search syntax\"."
 msgstr ""
 "<b>Aperçu de la syntaxe des requêtes optimisées « lucene »</b>\n"
-"Rechercher des versets qui contiennent ...\n"
+"Correspondance des recherches de versets :\n"
 "\n"
 "est amour\n"
 "\t« est » ou « amour »\n"
@@ -1458,8 +1405,7 @@
 "\tSélectionner aussi l'affichage « Avec nombres \n"
 "\tde Strong » dans l'onglet « Attributs »\n"
 "\n"
-"Pour plus d'amples détails, rechercher sur Internet : « Syntaxe requête "
-"Lucene »."
+"Pour plus d'amples détails, rechercher sur Internet : « Syntaxe requête Lucene »."
 
 #. *****************************************************************************
 #. * Name
@@ -1609,7 +1555,7 @@
 
 #: ../src/gnome2/sidebar.c:934
 msgid "Paste verse references"
-msgstr "Copier les références de verset"
+msgstr "Coller les références de verset"
 
 #: ../src/gnome2/sidebar.c:936
 msgid "List:"
@@ -1705,94 +1651,90 @@
 msgid ""
 "Mismatched packet\n"
 "\n"
-msgstr ""
+msgstr "Paquet incohérent :\n\n"
 
 #: ../src/main/biblesync_glue.cc:118
 msgid ""
 "Presence announcement:\n"
 "\n"
-msgstr ""
+msgstr "Annonce de présence :\n\n"
 
 #: ../src/main/biblesync_glue.cc:128
 msgid ""
 "Navigation packet:\n"
 "\n"
-msgstr ""
+msgstr "Paquet de navigation :\n\n"
 
 #: ../src/main/biblesync_glue.cc:179
-#, fuzzy
 msgid "Unknown module "
-msgstr "Pas de module"
+msgstr "Module inconnu"
 
 #: ../src/main/biblesync_glue.cc:179
 msgid ""
 ".\n"
 "Navigated indirectly using verse list."
 msgstr ""
+".\n"
+"Navigation indirecte en utilisant la liste de versets."
 
 #: ../src/main/biblesync_glue.cc:255
 msgid "ERROR: unknown BibleSync indicator: "
-msgstr ""
+msgstr "ERREUR : indicateur BibleSync inconnu : "
 
 #: ../src/main/biblesync_glue.cc:255
 msgid "Other indications are:"
-msgstr ""
+msgstr "Les autres indications sont :"
 
 #: ../src/main/biblesync_glue.cc:530
-#, fuzzy
 msgid "Check the box to listen to this Speaker"
-msgstr "Cocher la case pour travailler avec ce module"
+msgstr "Cocher la case pour suivre cet intervenant"
 
 #: ../src/main/biblesync_glue.cc:543
-#, fuzzy
 msgid "Available Speakers"
-msgstr "Dispo"
+msgstr "Intervenants disponibles"
 
 #: ../src/main/biblesync_glue.cc:552
 msgid "D/I"
-msgstr ""
+msgstr "D/I"
 
 #: ../src/main/biblesync_glue.cc:562
 msgid "Last navigation was Direct or Indirect"
-msgstr ""
+msgstr "La dernière navigation était directe ou indirecte"
 
 #: ../src/main/biblesync_glue.cc:571
-#, fuzzy
 msgid "Last Navigation"
-msgstr "Naviguer"
+msgstr "Dernière navigation"
 
 #: ../src/main/biblesync_glue.cc:590
 msgid "UUID"
-msgstr ""
+msgstr "UUID"
 
 #: ../src/main/biblesync_glue.cc:610
-#, fuzzy
 msgid "IP address: "
-msgstr "Adresse"
+msgstr "Adresse IP :"
 
 #: ../src/main/biblesync_glue.cc:610
-#, fuzzy
 msgid ""
 "\n"
 "Application: "
-msgstr "Ã propos de cette application"
+msgstr "\nApplication : "
 
 #: ../src/main/biblesync_glue.cc:610
 msgid ""
 "\n"
 "Device: "
-msgstr ""
+msgstr "\nPériphérique :"
 
 #: ../src/main/biblesync_glue.cc:610
 msgid ""
 "\n"
 "UUID: "
-msgstr ""
+msgstr "\nUUID : "
 
 #: ../src/main/display.cc:89
 msgid ""
 "<br/><br/><center><i>This module has no content at this point.</i></center>"
-msgstr ""
+msgstr "<br/><br/><center><i>Ce module n'a aucun contenu à cette référence.</i></center>"
 
 #: ../src/main/display.cc:249
 #, c-format
@@ -1865,7 +1807,7 @@
 
 #: ../src/main/parallel_view.cc:61
 msgid "Unknown parallel module: "
-msgstr ""
+msgstr "Module parallèle inconnu : "
 
 #: ../src/main/parallel_view.cc:400 ../ui/xi-menus.glade.h:68
 #: ../ui/xi-menus-popup.gtkbuilder.h:47
@@ -1950,20 +1892,18 @@
 
 #: ../src/main/parallel_view.cc:547 ../ui/xi-menus.glade.h:83
 #: ../ui/xi-menus-popup.gtkbuilder.h:61
-#, fuzzy
 msgid "Transliterated Forms"
-msgstr "Translittération"
+msgstr "Formes translittérées"
 
 #: ../src/main/parallel_view.cc:556 ../ui/xi-menus.glade.h:84
 #: ../ui/xi-menus-popup.gtkbuilder.h:62
 msgid "Enumerations"
-msgstr ""
+msgstr "Énumérations"
 
 #: ../src/main/parallel_view.cc:565 ../ui/xi-menus.glade.h:85
 #: ../ui/xi-menus-popup.gtkbuilder.h:63
-#, fuzzy
 msgid "Glosses"
-msgstr "Glossaires"
+msgstr "Annotations"
 
 #: ../src/main/parallel_view.cc:745
 msgid "view context"
@@ -2245,11 +2185,9 @@
 msgstr "$HOME n'est pas défini!"
 
 #: ../src/main/settings.c:120
-#, fuzzy, c-format
+#, c-format
 msgid "Xiphos can not create directory "
-msgstr ""
-"Impossible de créer le chemin d'accès au module:\n"
-"%s"
+msgstr "Impossible de créer le dossier"
 
 #: ../src/main/settings.c:134 ../src/main/settings.c:144
 #: ../src/main/settings.c:155
@@ -2278,18 +2216,14 @@
 "Xiphos cannot proceed,\n"
 "and will now exit."
 msgstr ""
-"Aucun module de texte biblique\n"
-"n'a été installé, suite à un\n"
-"ajournement opérateur.\n"
+"Aucune Bible trouvée!\n"
 "\n"
-"Sans aucun module de Bible à\n"
-"visualiser, Xiphos ne peut\n"
-"fonctionner, et va maintenant\n"
-"se terminer."
+"Xiphos ne peut fonctionner sans Bible,\n"
+"et va maintenant se terminer."
 
 #: ../src/main/settings.c:223
 msgid "Bible module installation complete."
-msgstr "Installation de module terminée."
+msgstr "L'installation des modules est terminée."
 
 #: ../src/main/sidebar.cc:146
 msgid ""
@@ -2411,9 +2345,8 @@
 msgstr "Effacer l'historique"
 
 #: ../src/main/tab_history.c:308
-#, fuzzy
 msgid "History ➛ Verse List"
-msgstr "_Versets"
+msgstr "Historique ➛ Liste de versets"
 
 #: ../src/main/url.cc:106
 msgid "URL not found:"
@@ -2930,7 +2863,7 @@
 
 #: ../ui/export-dialog.glade.h:32
 msgid "Include Version"
-msgstr "Nom de la version de la Bible"
+msgstr "Nom de la version de Bible"
 
 #: ../ui/export-dialog.glade.h:33 ../ui/export-dialog.gtkbuilder.h:33
 msgid "Version button"
@@ -3341,7 +3274,6 @@
 msgstr "Liste alphabétique"
 
 #: ../ui/gtk2_webedit.ui.h:103 ../ui/gtk_webedit.ui.h:103
-#, fuzzy
 msgid "Strike"
 msgstr "Barré"
 
@@ -3375,9 +3307,7 @@
 
 #: ../ui/module-manager.glade.h:3 ../ui/module-manager.gtkbuilder.h:3
 msgid "Open a brief introductory explanation of how the Module Manager works."
-msgstr ""
-"Ouvre une brève explication introduisant la façon dont le gestionnaire de "
-"modules fonctionne."
+msgstr "Ouvre l'aide d'introduction du gestionnaire de modules."
 
 #: ../ui/module-manager.glade.h:4 ../ui/module-manager.gtkbuilder.h:4
 msgid "_Load Standard"
@@ -3395,9 +3325,7 @@
 msgid ""
 "Refresh Xiphos' knowledge of what modules are available at the selected "
 "remote repository"
-msgstr ""
-"Actualise l'information dans « Xiphos » au sujet des modules disponibles "
-"dans les dépôts."
+msgstr "Actualise la liste des modules disponibles dans les dépôts."
 
 #: ../ui/module-manager.glade.h:7 ../ui/module-manager.gtkbuilder.h:8
 msgid "_Install"
@@ -3409,7 +3337,7 @@
 
 #: ../ui/module-manager.glade.h:9 ../ui/module-manager.gtkbuilder.h:9
 msgid "Remove the selected modules from your system"
-msgstr "Supprime les modules sélectionnés de votre système"
+msgstr "Enlève les modules sélectionnés."
 
 #: ../ui/module-manager.glade.h:10 ../ui/module-manager.gtkbuilder.h:10
 msgid "_Archive"
@@ -3426,9 +3354,7 @@
 #: ../ui/module-manager.glade.h:13 ../ui/module-manager.gtkbuilder.h:13
 msgid ""
 "Build an index of the selected modules, for optimized (\"lucene\") searching."
-msgstr ""
-"Construit un index des modules sélectionnés, pour une recherche optimisée "
-"(« lucène »)."
+msgstr "Construit un index des modules sélectionnés, pour optimiser les recherches."
 
 #: ../ui/module-manager.glade.h:14 ../ui/module-manager.gtkbuilder.h:14
 msgid "_Delete Index"
@@ -3440,11 +3366,11 @@
 
 #: ../ui/module-manager.glade.h:16 ../ui/module-manager.gtkbuilder.h:16
 msgid "Scan _Obsolete"
-msgstr ""
+msgstr "Vérifier"
 
 #: ../ui/module-manager.glade.h:17 ../ui/module-manager.gtkbuilder.h:17
 msgid "Scan for obsolete modules and offer to delete them."
-msgstr ""
+msgstr "Vérifie les modules et propose d'enlever les modules périmés."
 
 #: ../ui/module-manager.glade.h:18 ../ui/module-manager.gtkbuilder.h:19
 msgid "Continue"
@@ -3461,7 +3387,7 @@
 
 #: ../ui/module-manager.glade.h:22 ../ui/module-manager.gtkbuilder.h:23
 msgid "<b>WARNING:</b> If you live in a persecuted country use with care."
-msgstr "<b>Attention :</b> Prudence dans les pays de persécution"
+msgstr "<b>Attention :</b> Prudence requise dans les pays de persécution."
 
 #: ../ui/module-manager.glade.h:23 ../ui/module-manager.gtkbuilder.h:24
 msgid "<b>Add and Remove Sources</b>"
@@ -3536,9 +3462,7 @@
 msgid ""
 "<b>Warning:</b> If you live in a persecuted country and do not wish to risk "
 "detection you should NOT use  the remote installation feature! "
-msgstr ""
-"<b>Attention :</b> Ne pas utiliser les dépôts distants depuis les pays où il "
-"est dangereux d'être repéré! "
+msgstr "<b>Attention :</b> Ne pas utiliser les dépôts distants dans les pays de persécution!"
 
 #: ../ui/module-manager.glade.h:39 ../ui/module-manager.gtkbuilder.h:40
 msgid "Local Install Folder"
@@ -3546,7 +3470,7 @@
 
 #: ../ui/module-manager.gtkbuilder.h:18
 msgid "_Cancel"
-msgstr ""
+msgstr "_Annuler"
 
 #: ../ui/navbar_versekey.glade.h:1 ../ui/navbar_versekey.gtkbuilder.h:1
 msgid "Drop down history list"
@@ -3620,7 +3544,7 @@
 
 #: ../ui/prefs.glade.h:8 ../ui/prefs.gtkbuilder.h:16
 msgid "Verse Number"
-msgstr "Numéros de verset"
+msgstr "Numéro de verset"
 
 #: ../ui/prefs.glade.h:9 ../ui/prefs.gtkbuilder.h:17
 msgid "Links"
@@ -3694,13 +3618,11 @@
 msgid ""
 "Name and size choice for any module in a given language; still overridden by "
 "a specific choice on a particular module"
-msgstr ""
-"Choix de police et taille pour n'importe quel module dans une langue donnée; "
-"toujours remplacées par un choix spécifique sur une module particulier"
+msgstr "Sélectionne les choix de police pour tout module dans une langue donnée; toujours remplaçable par un choix spécifique sur un module particulier"
 
 #: ../ui/prefs.glade.h:30 ../ui/prefs.gtkbuilder.h:30
 msgid "Font preferences, per language"
-msgstr "Préférences de police, par langue"
+msgstr "Police préférée par langue"
 
 #: ../ui/prefs.glade.h:31 ../ui/prefs.gtkbuilder.h:31
 msgid "Language Font Combo"
@@ -3725,30 +3647,22 @@
 "audience's Bible programs to follow along; Audience, to receive the "
 "speaker's navigation."
 msgstr ""
-"Xiphos est le premier programme d'étude biblique à fournir une "
-"implémentation de \n"
-"BibleSync, un protocole de synchronisation pour programmes Bibliques. Si "
-"vous\n"
-"utilisez plusieurs programmes Bibliques, ou travaillez en équipe, ou si vous "
-"avez\n"
-"en classe des études mutualisées, BibleSync peut être un outil utile pour "
-"vous.\n"
-"BibleSync opère dans un de ces trois modes : Personnel, pour synchroniser "
-"plusieurs\n"
-"programmes Bibliques, les vôtres ou au sein d'une équipe de travail ; "
-"Orateur,\n"
-"pour piloter les programmes bibliques du public d'une conférence ; Audience, "
-"pour\n"
-"recevoir la navigation de l'orateur."
+"BibleSync est un protocole de synchronisation entre programmes bibliques. Si vous\n"
+"utilisez plusieurs logiciels bibliques, travaillez en équipe, ou participez à des\n"
+"études en commun, BibleSync est un outil intéressant.\n"
+"BibleSync opère dans trois modes distincts : Personnel, pour synchroniser plusieurs\n"
+"logiciels bibliques entre eux ou au sein d'une équipe de travail ; Intervenant,\n"
+"pour piloter à distance les logiciels bibliques d'un auditoire ; Audience, pour\n"
+"recevoir la navigation de l'intervenant.\n"
+"Xiphos est le premier programme d'étude biblique à disposer de BibleSync."
 
 #: ../ui/prefs.glade.h:35 ../ui/prefs.gtkbuilder.h:36
-#, fuzzy
 msgid "<i>Mode:</i>"
-msgstr "<b>Modules</b>"
+msgstr "<i>Mode :</i>"
 
 #: ../ui/prefs.glade.h:36 ../ui/prefs.gtkbuilder.h:35
 msgid "Select the mode in which BibleSync should operate."
-msgstr "Sélectionne le mode dans lequel BibleSync doit opérer."
+msgstr "Sélectionne le mode de fonctionnement de BibleSync"
 
 #: ../ui/prefs.glade.h:37 ../ui/prefs.gtkbuilder.h:37
 msgid "_Off"
@@ -3756,7 +3670,7 @@
 
 #: ../ui/prefs.glade.h:38 ../ui/prefs.gtkbuilder.h:38
 msgid "Disable BibleSync."
-msgstr "Désactive BibleSync"
+msgstr "BibleSync est désactivé"
 
 #: ../ui/prefs.glade.h:39 ../ui/prefs.gtkbuilder.h:39
 msgid "BSP off radio button"
@@ -3764,15 +3678,15 @@
 
 #: ../ui/prefs.glade.h:40 ../ui/prefs.gtkbuilder.h:40
 msgid "_Speaker"
-msgstr "_Orateur"
+msgstr "_Intervenant"
 
 #: ../ui/prefs.glade.h:41 ../ui/prefs.gtkbuilder.h:41
 msgid "Enable BibleSync as the speaker."
-msgstr "Active BibleSync en tant que Orateur."
+msgstr "Biblesync est activé en mode intervenant"
 
 #: ../ui/prefs.glade.h:42 ../ui/prefs.gtkbuilder.h:42
 msgid "BSP speaker radio button"
-msgstr "Bouton radio Orateur BSP"
+msgstr "Bouton radio Intervenant BSP"
 
 #: ../ui/prefs.glade.h:43 ../ui/prefs.gtkbuilder.h:43
 msgid "_Audience"
@@ -3780,7 +3694,7 @@
 
 #: ../ui/prefs.glade.h:44 ../ui/prefs.gtkbuilder.h:44
 msgid "Enable BibleSync as a member of the audience."
-msgstr "Active BibleSync comme membre de l'audience."
+msgstr "BibleSync est activé en mode membre de l'audience"
 
 #: ../ui/prefs.glade.h:45 ../ui/prefs.gtkbuilder.h:45
 msgid "BSP audience radio button"
@@ -3792,7 +3706,7 @@
 
 #: ../ui/prefs.glade.h:47 ../ui/prefs.gtkbuilder.h:47
 msgid "Enable BibleSync for personal or team use."
-msgstr "Active BibleSync pour une utilisation personnelle ou en équipe."
+msgstr "BibleSync est activé en mode utilisation personnelle ou d'équipe"
 
 #: ../ui/prefs.glade.h:48 ../ui/prefs.gtkbuilder.h:48
 msgid "BSP personal radio button"
@@ -3815,13 +3729,12 @@
 msgstr "Bouton BSP privé"
 
 #: ../ui/prefs.glade.h:52 ../ui/prefs.gtkbuilder.h:53
-#, fuzzy
 msgid "<i>Navigate:</i>"
-msgstr "Naviguer"
+msgstr "<i>Navigation :</i>"
 
 #: ../ui/prefs.glade.h:53 ../ui/prefs.gtkbuilder.h:52
 msgid "Choose how to accept incoming navigation synchronization."
-msgstr "Choisir comment accepter la synchronisation de navigation entrante."
+msgstr "Sélectionne le type de navigation entrante"
 
 # src/gs_preferences_dlg.c
 #: ../ui/prefs.glade.h:54 ../ui/prefs.gtkbuilder.h:54
@@ -3830,7 +3743,7 @@
 
 #: ../ui/prefs.glade.h:55 ../ui/prefs.gtkbuilder.h:55
 msgid "BibleSync navigation will send Xiphos directly to the verse indicated."
-msgstr "La navigation BibleSync enverra Xiphos directement au verset indiqué."
+msgstr "Le verset indiqué s'affiche directement dans Xiphos"
 
 #: ../ui/prefs.glade.h:56 ../ui/prefs.gtkbuilder.h:56
 msgid "BSP nav direct radio button"
@@ -3842,22 +3755,19 @@
 
 #: ../ui/prefs.glade.h:58 ../ui/prefs.gtkbuilder.h:58
 msgid "BibleSync navigation will use Xiphos' sidebar verse list."
-msgstr ""
-"La navigation BibleSync utilisera la liste de versets de la barre latérale "
-"de Xiphos. "
+msgstr "Le verset indiqué s'affiche dans la liste de versets"
 
 #: ../ui/prefs.glade.h:59 ../ui/prefs.gtkbuilder.h:59
 msgid "BSP nav verse list radio button"
 msgstr "Bouton radio BSP navigation liste de versets"
 
 #: ../ui/prefs.glade.h:60 ../ui/prefs.gtkbuilder.h:61
-#, fuzzy
 msgid "<i>Listen:</i>"
-msgstr "<b>Nom de la liste</b>"
+msgstr "<i>Suivi :</i>"
 
 #: ../ui/prefs.glade.h:61 ../ui/prefs.gtkbuilder.h:60
 msgid "Xiphos will listen to Speakers according to choice here."
-msgstr "Xiphos va écouter les Orateurs en fonction du choix présent."
+msgstr "Sélectionne le suivi des intervenants"
 
 #: ../ui/prefs.glade.h:62 ../ui/prefs.gtkbuilder.h:62
 msgid "Selective"
@@ -3865,11 +3775,11 @@
 
 #: ../ui/prefs.glade.h:63 ../ui/prefs.gtkbuilder.h:63
 msgid "Choose the Speakers to be followed."
-msgstr "Choisir les Orateurs à suivre."
+msgstr "Choix sélectif de la liste des intervenants à suivre"
 
 #: ../ui/prefs.glade.h:64 ../ui/prefs.gtkbuilder.h:64
 msgid "BSP listen some radio button"
-msgstr "Bouton radio BSP écouter certains orateurs"
+msgstr "Bouton radio BSP écouter certains intervenants"
 
 #: ../ui/prefs.glade.h:65 ../ui/prefs.gtkbuilder.h:65
 msgid "All"
@@ -3877,7 +3787,7 @@
 
 #: ../ui/prefs.glade.h:66 ../ui/prefs.gtkbuilder.h:66
 msgid "All Speakers will be followed."
-msgstr "Tous les orateurs seront reçus."
+msgstr "Tous les intervenants sont suivis"
 
 #: ../ui/prefs.glade.h:67 ../ui/prefs.gtkbuilder.h:67
 msgid "BSP listen all radio button"
@@ -3889,30 +3799,22 @@
 
 #: ../ui/prefs.glade.h:69 ../ui/prefs.gtkbuilder.h:69
 msgid "No Speakers will be followed."
-msgstr "Aucun orateur ne sera reçu."
+msgstr "Aucun intervenant n'est suivi"
 
 #: ../ui/prefs.glade.h:70 ../ui/prefs.gtkbuilder.h:70
 msgid "BSP listen none radio button"
 msgstr "Bouton radio BSP ecouter aucun"
 
 #: ../ui/prefs.glade.h:71 ../ui/prefs.gtkbuilder.h:72
-#, fuzzy
 msgid "<i>Special:</i>"
-msgstr "Spécial"
+msgstr "<i>Spécial :</i>"
 
 #: ../ui/prefs.glade.h:72 ../ui/prefs.gtkbuilder.h:71
 msgid ""
 "Additional traces can be presented during BibleSync operation by enabling "
 "presence, mismatch, and debug. Beware enabling these, they can be very "
 "chatty. Also, decide whether to allow group parameter as Xiphos' tab number."
-msgstr ""
-"Des traces supplémentaires peuvent être afichées pendant le fonctionnement "
-"de \n"
-"BibleSync en autorisant présence, incohérences, et débogage. Attention ceux-"
-"ci\n"
-"peuvent être très bavards. Voir aussi s'il faut autoriser le paramètre de "
-"groupe \n"
-"comme numéro d'onglet de Xiphos."
+msgstr "Des informations supplémentaires peuvent être affichées pendant le fonctionnement de BibleSync en activant ces options. Attention ces informations peuvent être très denses."
 
 #: ../ui/prefs.glade.h:73 ../ui/prefs.gtkbuilder.h:73
 msgid "Presence"
@@ -3920,7 +3822,7 @@
 
 #: ../ui/prefs.glade.h:74 ../ui/prefs.gtkbuilder.h:74
 msgid "Presence announcements will be shown in dialogs."
-msgstr "Les indications de présence seront affichées."
+msgstr "Les fenêtres d'indication de présence seront affichées."
 
 #: ../ui/prefs.glade.h:75 ../ui/prefs.gtkbuilder.h:75
 msgid "BSP presence button"
@@ -3932,7 +3834,7 @@
 
 #: ../ui/prefs.glade.h:77 ../ui/prefs.gtkbuilder.h:77
 msgid "Mismatches from your session will be shown in dialogs."
-msgstr "Les incohérences survenant pendant une session seront affichées."
+msgstr "Les fenêtres d'incohérences survenant pendant une session seront affichées"
 
 #: ../ui/prefs.glade.h:78 ../ui/prefs.gtkbuilder.h:78
 msgid "BSP mismatch button"
@@ -3944,7 +3846,7 @@
 
 #: ../ui/prefs.glade.h:80 ../ui/prefs.gtkbuilder.h:80
 msgid "Packet tracing."
-msgstr "Traçage de paquets."
+msgstr "Traçage des paquets sur le réseau"
 
 #: ../ui/prefs.glade.h:81 ../ui/prefs.gtkbuilder.h:81
 msgid "BSP event debug button"
@@ -3952,20 +3854,14 @@
 
 #: ../ui/prefs.glade.h:82 ../ui/prefs.gtkbuilder.h:82
 msgid "_Group as tab"
-msgstr "_Grouper en onglets"
+msgstr "_Groupe en onglet"
 
 #: ../ui/prefs.glade.h:83 ../ui/prefs.gtkbuilder.h:83
 msgid ""
 "Interpret the protocol's group number parameter as Xiphos' tab number. "
 "Disabling this may be necessary if some Speakers' use of group number is not "
 "appropriate as a tab number."
-msgstr ""
-"Interpréte le paramètre du numéro du groupe du protocole comme le numéro "
-"d'onglet de \n"
-"Xiphos.\"\n"
-"Il sera peut être nécessaire de désactiver cette option si le numéro de "
-"groupe utilisé par \n"
-"certains orateurs n'est pas approprié comme numéro d'onglet.\""
+msgstr "Traduit le numéro de groupe de BibleSync en numéro d'onglet de Xiphos. Cette option sera peut-être à désactiver si le numéro de groupe utilisé par certains intervenants n'est pas approprié"
 
 #: ../ui/prefs.glade.h:84 ../ui/prefs.gtkbuilder.h:84
 msgid "BSP event group-as-tab button"
@@ -3979,13 +3875,11 @@
 msgid ""
 "Select a particular language for interface display, other than your usual "
 "setting"
-msgstr ""
-"Sélection d'une langue spécifique pour affichage de l'interface, autre que "
-"celle de la configuration habituelle"
+msgstr "Sélectionne une langue différente de la configuration habituelle pour l'affichage de l'interface."
 
 #: ../ui/prefs.glade.h:88 ../ui/prefs.gtkbuilder.h:88
 msgid "Special Locale (requires restart)"
-msgstr "Langue spécifique (Nécessite un redémarrage)"
+msgstr "Langue différente (Nécessite un redémarrage)"
 
 #: ../ui/prefs.glade.h:89 ../ui/prefs.gtkbuilder.h:89
 msgid "Special Locale Combo"
@@ -3993,7 +3887,7 @@
 
 #: ../ui/prefs.glade.h:90 ../ui/prefs.gtkbuilder.h:90
 msgid "Show splash screen at start up"
-msgstr "Afficher l'écran de démarrage"
+msgstr "Afficher l'écran d'accueil au démarrage"
 
 #: ../ui/prefs.glade.h:91 ../ui/prefs.gtkbuilder.h:91
 msgid "Show Daily Devotion at start up"
@@ -4003,9 +3897,7 @@
 msgid ""
 "If you have set a preferred daily devotion module, its entry for today will "
 "be shown at startup."
-msgstr ""
-"Si un module de calendrier biblique a été spécifié, l'entrée d'aujourd'hui "
-"sera affichée au démarrage"
+msgstr "Le calendrier biblique du jour sera affiché au démarrage"
 
 # src/gs_preferences_dlg.c
 #: ../ui/prefs.glade.h:93 ../ui/prefs.gtkbuilder.h:93
@@ -4016,9 +3908,7 @@
 msgid ""
 "Make double-click of a word always use default dictionary instead of "
 "dictionary currently displayed"
-msgstr ""
-"Un double-clic sur un mot utilise toujours le dictionnaire par défaut à la "
-"place du dictionnaire actuellement affiché"
+msgstr "Un double-clic sur un mot activera le dictionnaire par défaut à la place du dictionnaire en cours"
 
 # src/gs_preferences_dlg.c
 #: ../ui/prefs.glade.h:95 ../ui/prefs.gtkbuilder.h:95
@@ -4085,9 +3975,7 @@
 
 #: ../ui/prefs.glade.h:109 ../ui/prefs.gtkbuilder.h:109
 msgid "Use the verse list for Bible cross-references instead of the previewer"
-msgstr ""
-"Utilise la liste de versets pour afficher les références-croisées au lieu du "
-"volet Aperçu"
+msgstr "Utilise la liste de versets à la place du volet Aperçu pour afficher les références-croisées"
 
 #: ../ui/prefs.glade.h:110 ../ui/prefs.gtkbuilder.h:110
 msgid "Xrefs in verse list check box"
@@ -4099,7 +3987,7 @@
 
 #: ../ui/prefs.glade.h:112 ../ui/prefs.gtkbuilder.h:112
 msgid "Make journals/prayer lists available"
-msgstr "Autorise les listes de prières et les journaux"
+msgstr "Active les listes de prières et les journaux"
 
 #: ../ui/prefs.glade.h:113 ../ui/prefs.gtkbuilder.h:113
 msgid "Enable Prayer Lists Checkbox"
@@ -4107,11 +3995,11 @@
 
 #: ../ui/prefs.glade.h:114 ../ui/prefs.gtkbuilder.h:114
 msgid "Enable Statusbar"
-msgstr ""
+msgstr "Afficher la barre de statut"
 
 #: ../ui/prefs.glade.h:115
 msgid "Enable/Disable Statusbar."
-msgstr ""
+msgstr "Affiche/cache la barre de statut."
 
 #: ../ui/prefs.glade.h:116 ../ui/prefs.gtkbuilder.h:117
 msgid "Verse number"
@@ -4119,11 +4007,11 @@
 
 #: ../ui/prefs.glade.h:117 ../ui/prefs.gtkbuilder.h:116
 msgid "Offset the verse number in several ways"
-msgstr "Décore le numéro du verset de plusieurs façons"
+msgstr "Modifie l'affichage du numéro du verset"
 
 #: ../ui/prefs.glade.h:119 ../ui/prefs.gtkbuilder.h:119
 msgid "Show verse number in bold text"
-msgstr "Affiche les numéros de verset en gras"
+msgstr "Affiche le numéro de verset en gras"
 
 #: ../ui/prefs.glade.h:120 ../ui/prefs.gtkbuilder.h:120
 msgid "Verse number bold checkbox"
@@ -4135,7 +4023,7 @@
 
 #: ../ui/prefs.glade.h:122 ../ui/prefs.gtkbuilder.h:122
 msgid "Show verse number with [surrounding brackets]"
-msgstr "Affiche les numéros de versets entourés de [parenthèses]"
+msgstr "Affiche le numéro de verset entouré de [parenthèses]"
 
 #: ../ui/prefs.glade.h:123 ../ui/prefs.gtkbuilder.h:123
 msgid "Verse number bracket checkbox"
@@ -4147,7 +4035,7 @@
 
 #: ../ui/prefs.glade.h:125 ../ui/prefs.gtkbuilder.h:125
 msgid "Show verse number as a superscript"
-msgstr "Affiche les numéros de verset en exposant"
+msgstr "Affiche le numéro de verset en exposant"
 
 #: ../ui/prefs.glade.h:126 ../ui/prefs.gtkbuilder.h:126
 msgid "Verse number superscript checkbox"
@@ -4318,9 +4206,8 @@
 msgstr "+5"
 
 #: ../ui/prefs.gtkbuilder.h:115
-#, fuzzy
 msgid "Enable/disable the Statusbar"
-msgstr "Active BibleSync en tant que Orateur."
+msgstr "Affiche la barre de statut au bas de la fenêtre principale"
 
 #: ../ui/search-dialog.glade.h:1 ../ui/search-dialog.gtkbuilder.h:1
 msgid "Advanced Search"
@@ -4373,7 +4260,7 @@
 
 #: ../ui/search-dialog.glade.h:12 ../ui/search-dialog.gtkbuilder.h:14
 msgid "Search entire module"
-msgstr "La requête s'exécute sur tous les versets"
+msgstr "Recherche dans tous les versets"
 
 #: ../ui/search-dialog.glade.h:13 ../ui/search-dialog.gtkbuilder.h:13
 msgid "Entire module"
@@ -4385,9 +4272,7 @@
 
 #: ../ui/search-dialog.glade.h:15 ../ui/search-dialog.gtkbuilder.h:17
 msgid "Use the results of the last search as the scope of the search"
-msgstr ""
-"La requête s'exécute uniquement sur les versets retournés lors de la requête "
-"précédente"
+msgstr "Recherche uniquement dans les versets retournés lors de la requête précédente"
 
 #: ../ui/search-dialog.glade.h:16 ../ui/search-dialog.gtkbuilder.h:16
 msgid "Current results"
@@ -4399,7 +4284,7 @@
 
 #: ../ui/search-dialog.glade.h:18 ../ui/search-dialog.gtkbuilder.h:20
 msgid "Use a custom range for the scope of the search"
-msgstr "La requête s'exécute sur une plage prédéfinie de versets"
+msgstr "Recherche dans une plage prédéfinie de versets"
 
 #: ../ui/search-dialog.glade.h:19 ../ui/search-dialog.gtkbuilder.h:19
 msgid "Custom verse range"
@@ -4415,7 +4300,7 @@
 
 #: ../ui/search-dialog.glade.h:23 ../ui/search-dialog.gtkbuilder.h:25
 msgid "Use a single module for the search"
-msgstr "La requête s'exécute sur  un seul module"
+msgstr "Recherche dans un seul module"
 
 #: ../ui/search-dialog.glade.h:24 ../ui/search-dialog.gtkbuilder.h:24
 msgid "Single module"
@@ -4427,7 +4312,7 @@
 
 #: ../ui/search-dialog.glade.h:26 ../ui/search-dialog.gtkbuilder.h:28
 msgid "Use the current module list for the search"
-msgstr "La requête s'exécute sur plusieurs modules"
+msgstr "Recherche dans plusieurs modules"
 
 #: ../ui/search-dialog.glade.h:27 ../ui/search-dialog.gtkbuilder.h:27
 msgid "Module list"
@@ -4439,7 +4324,7 @@
 
 #: ../ui/search-dialog.glade.h:29 ../ui/search-dialog.gtkbuilder.h:31
 msgid "Use a custom module list for the search"
-msgstr "La requête s'exécute dans une liste de modules prédéfinie"
+msgstr "Recherche dans une liste de modules prédéfinie"
 
 #: ../ui/search-dialog.glade.h:30 ../ui/search-dialog.gtkbuilder.h:30
 msgid "Custom module list"
@@ -4464,7 +4349,7 @@
 "See Module Manager's maintenance functions"
 msgstr ""
 "Recherche optimisée basée sur les index,\n"
-"les index doivent être préalablement construits.\n"
+"les index doivent avoir été générés auparavant.\n"
 "Voir l'onglet Gérer du gestionnaire de modules."
 
 #: ../ui/search-dialog.glade.h:37 ../ui/search-dialog.gtkbuilder.h:34
@@ -4697,7 +4582,7 @@
 
 #: ../ui/search-dialog.glade.h:105 ../ui/search-dialog.gtkbuilder.h:106
 msgid "In modules that have Strong's Numbers"
-msgstr "Pour les modules avec nombres de Strong"
+msgstr "Pour les modules comprenant des nombres de Strong"
 
 #: ../ui/search-dialog.glade.h:106 ../ui/search-dialog.gtkbuilder.h:105
 msgid "Show Strong's Numbers"
@@ -4709,7 +4594,7 @@
 
 #: ../ui/search-dialog.glade.h:108 ../ui/search-dialog.gtkbuilder.h:109
 msgid "In modules that have Morphological Tags"
-msgstr "Pour les modules avec étiquettes morphologiques"
+msgstr "Pour les modules comprenant des étiquettes morphologiques"
 
 #: ../ui/search-dialog.glade.h:109 ../ui/search-dialog.gtkbuilder.h:108
 msgid "Show Morphological Tags"
@@ -4721,7 +4606,7 @@
 
 #: ../ui/search-dialog.glade.h:111 ../ui/search-dialog.gtkbuilder.h:112
 msgid "In modules that have Footnotes"
-msgstr "Pour les modules avec notes de bas de page"
+msgstr "Pour les modules comprenant des notes de bas de page"
 
 #: ../ui/search-dialog.glade.h:112 ../ui/search-dialog.gtkbuilder.h:111
 msgid "Show Footnotes"
@@ -4883,7 +4768,7 @@
 
 #: ../ui/xi-menus.glade.h:28 ../ui/xi-menus.gtkbuilder.h:19
 msgid "Show Verse _Numbers"
-msgstr "Affiche les numéros de verset"
+msgstr "Afficher les numéros de verset"
 
 #: ../ui/xi-menus.glade.h:29
 msgid "Display verse numbers in the text"
@@ -5078,7 +4963,7 @@
 
 #: ../ui/xi-menus.glade.h:101 ../ui/xi-menus-popup.gtkbuilder.h:90
 msgid "Save list as a single bookmark"
-msgstr "Enregistre la liste sous un seul signet"
+msgstr "Enregistrer la liste sous un seul signet"
 
 #: ../ui/xi-menus.glade.h:102 ../ui/xi-menus-popup.gtkbuilder.h:93
 msgid "Save these results as a series of bookmarks in their own folder"
@@ -5087,15 +4972,13 @@
 
 #: ../ui/xi-menus.glade.h:103 ../ui/xi-menus-popup.gtkbuilder.h:92
 msgid "Save list as a series of bookmarks"
-msgstr "Enregistre la liste dans une série de signets"
+msgstr "Enregistrer la liste dans une série de signets"
 
 #: ../ui/xi-menus.glade.h:104 ../ui/xi-menus-popup.gtkbuilder.h:95
 msgid ""
 "Provide a dialog in which to paste a line of verse references, to fill the "
 "verse list."
-msgstr ""
-"Ouvre une boîte de dialogue dans laquelle coller une ligne de références de "
-"versets, permet de remplir la liste de versets."
+msgstr "Remplit la liste de versets au moyen d'une boîte de dialogue dans laquelle sera collée une ligne de références de versets"
 
 #: ../ui/xi-menus.glade.h:105 ../ui/xi-menus-popup.gtkbuilder.h:94
 msgid "Populate verse list"
@@ -5103,24 +4986,21 @@
 
 #: ../ui/xi-menus.glade.h:106 ../ui/xi-menus-popup.gtkbuilder.h:97
 msgid "Push the entire verse list contents directly into the history list."
-msgstr ""
+msgstr "Place le contenu entier de la liste de versets dans l'historique de consultation."
 
 #: ../ui/xi-menus.glade.h:107 ../ui/xi-menus-popup.gtkbuilder.h:96
-#, fuzzy
 msgid "Preload history from verse list"
-msgstr "Efface l'historique des versets consultés"
+msgstr "Charger la liste de versets dans l'historique"
 
 #: ../ui/xi-menus.glade.h:108 ../ui/xi-menus-popup.gtkbuilder.h:99
 msgid ""
 "Send this verse list via BibleSync to others, if you are in Personal or "
 "Speaker mode."
-msgstr ""
-"Envoie cette liste de versets via BibleSync à d'autres, si vous êtes en mode "
-"Personnel ou Orateur."
+msgstr "Envoie cette liste de versets via BibleSync si vous êtes en mode Personnel ou Intervenant."
 
 #: ../ui/xi-menus.glade.h:109 ../ui/xi-menus-popup.gtkbuilder.h:98
 msgid "Send list via BibleSync"
-msgstr "Envoyer la liste vi BibleSync"
+msgstr "Envoyer la liste via BibleSync"
 
 #: ../ui/xi-menus.glade.h:110 ../ui/xi-menus-popup.gtkbuilder.h:100
 msgid "Export List"
@@ -5192,7 +5072,7 @@
 
 #: ../ui/xi-menus.glade.h:129 ../ui/xi-menus-popup.gtkbuilder.h:20
 msgid "Load other bookmarks file (default: from BibleTime)"
-msgstr "Importe un autre fichier de signets (par défaut: de Bibletime)"
+msgstr "Importe un fichier de signets (par défaut: de BibleTime)"
 
 #: ../ui/xi-menus.glade.h:130 ../ui/xi-menus-popup.gtkbuilder.h:19
 msgid "Import Bookmarks"
@@ -5638,12 +5518,9 @@
 #~ msgstr ""
 #~ "Bienvenue dans Xiphos.\n"
 #~ "\n"
-#~ "Aucun module de texte biblique n'est installé. Xiphos a besoin d'au moins "
-#~ "un module de ce type pour fonctionner.\n"
+#~ "Aucun module de texte biblique n'est installé. Xiphos a besoin d'au moins un module de ce type pour fonctionner.\n"
 #~ "\n"
-#~ "Avec votre permission, Xiphos va lancer le gestionnaire de modules pour "
-#~ "télécharger des modules depuis le site de Crosswire, les opérations à "
-#~ "effectuer sont :\n"
+#~ "Avec votre permission, Xiphos va lancer le gestionnaire de modules pour télécharger des modules depuis le site de Crosswire, les opérations à effectuer sont :\n"
 #~ "1. Configuration du dépôt distant\n"
 #~ "2. Connexion\n"
 #~ "3. Choix d'un texte biblique dans la langue désirée\n"
@@ -5651,8 +5528,7 @@
 #~ "\n"
 #~ "Attention : Prudence dans les pays de persécution.\n"
 #~ "\n"
-#~ "Autorisez-vous Xiphos à lancer le gestionnaire de modules pour "
-#~ "télécharger un texte biblique?"
+#~ "Autorisez-vous Xiphos à lancer le gestionnaire de modules pour télécharger un texte biblique?"
 
 #~ msgid "<b>Parallel View</b>"
 #~ msgstr "<b>Vue parallèle</b>"

Revision: 4912
          http://sourceforge.net/p/gnomesword/code/4912
Author:   charcoal
Date:     2015-08-04 22:18:17 +0000 (Tue, 04 Aug 2015)
Log Message:
-----------
max language count usable *= 10

Modified Paths:
--------------
    trunk/src/gui/utilities.h

Modified: trunk/src/gui/utilities.h
===================================================================
--- trunk/src/gui/utilities.h	2015-07-15 14:34:17 UTC (rev 4911)
+++ trunk/src/gui/utilities.h	2015-08-04 22:18:17 UTC (rev 4912)
@@ -146,7 +146,7 @@
 	UTIL_N_COLUMNS
 };
 
-#define LANGSET_COUNT 200
+#define LANGSET_COUNT 2000
 
 void language_init(void);
 

Revision: 4911
          http://sourceforge.net/p/gnomesword/code/4911
Author:   charcoal
Date:     2015-07-15 14:34:17 +0000 (Wed, 15 Jul 2015)
Log Message:
-----------
add korean translation

Modified Paths:
--------------
    trunk/po/LINGUAS

Added Paths:
-----------
    trunk/po/ko_KR.po

Modified: trunk/po/LINGUAS
===================================================================
--- trunk/po/LINGUAS	2015-06-16 17:54:43 UTC (rev 4910)
+++ trunk/po/LINGUAS	2015-07-15 14:34:17 UTC (rev 4911)
@@ -1 +1 @@
-ar cs cy da de en_GB es fa fi fr he hu ja lt lv nb nl pl pt pt_BR ro ru sk sl sv tr zh_CN zh_TW
+ar cs cy da de en_GB es fa fi fr he hu ja ko_KR lt lv nb nl pl pt pt_BR ro ru sk sl sv tr zh_CN zh_TW

Added: trunk/po/ko_KR.po
===================================================================
--- trunk/po/ko_KR.po	                        (rev 0)
+++ trunk/po/ko_KR.po	2015-07-15 14:34:17 UTC (rev 4911)
@@ -0,0 +1,5153 @@
+# Korean translarion for the Xiphos.
+# Copyright (C) 2015 Xiphos Developer Team and the Korean Translator.
+# This file is distributed under the same license as the Xiphos package.
+# Seong-ho Cho <sh...@gn...>, 2015.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Xiphos 4.0.2\n"
+"Report-Msgid-Bugs-To: Seong-ho Cho <sh...@gn...>\n"
+"POT-Creation-Date: 2015-07-15 17:14+0900\n"
+"PO-Revision-Date: 2015-07-15 20:56+0900\n"
+"Last-Translator: Seong-ho Cho <sh...@gn...>\n"
+"Language-Team: Seong-ho Cho <sh...@gn...>\n"
+"Language: ko_KR\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Poedit 1.5.5\n"
+
+#: ../src/backend/sword_main.cc:792
+msgid ""
+"Xiphos failure: \"can't happen\", display_mod: null\n"
+"Please report this. sword_main.cc:set_treekey\n"
+"What were you doing when this occurred?"
+msgstr ""
+"xiphos 치명적 오류: \"동작을 수행할 수 없음\", display_mod: null\n"
+"이 문제를 보고하십시오: sword_main.cc:set_treekey\n"
+"이 문제가 일어났을때 무얼 하고 있었습니까?"
+
+#: ../src/backend/sword_main.cc:1149
+msgid "Configuration not found"
+msgstr "설정이 없습니다"
+
+#: ../src/editor/webkit_editor.c:311
+msgid "Are you sure you want to delete the note for"
+msgstr "정말로 해당 메모를 삭제하시겠습니까?"
+
+#: ../src/editor/webkit_editor.c:605 ../ui/editor_studypad.xml.h:9
+#: ../ui/gtk2_webedit.ui.h:58 ../ui/gtk_webedit.ui.h:58
+msgid "Open"
+msgstr "열기"
+
+#: ../src/editor/webkit_editor.c:688
+msgid "Untitled document"
+msgstr "제목 없는 문서"
+
+#: ../src/editor/webkit_editor.c:1173 ../src/editor/webkit_editor.c:1213
+msgid "Save the changes to document"
+msgstr "바뀐 내용 문서로 저장"
+
+#: ../src/editor/webkit_editor.c:1174 ../src/editor/webkit_editor.c:1214
+msgid "before closing?"
+msgstr "닫기 전에 확인하셨습니까?"
+
+#: ../src/editor/webkit_editor.c:1178 ../src/editor/webkit_editor.c:1218
+msgid "If you don't save, changes will be permanently lost."
+msgstr "저장하지 않으면, 바꾼 내용이 완전히 없어집니다."
+
+#: ../src/editor/webkit_editor.c:1212 ../ui/xi-menus.glade.h:59
+#: ../ui/xi-menus-popup.gtkbuilder.h:39
+msgid "File"
+msgstr "파일"
+
+#: ../src/editor/webkit_editor.c:1255
+msgid "StudyPad"
+msgstr "학습장"
+
+#: ../src/editor/webkit_editor.c:1270
+msgid "Note Editor"
+msgstr "메모 편집기"
+
+#: ../src/editor/webkit_editor.c:1287
+msgid "Prayer List/Journal Editor"
+msgstr "기도 목록/묵상 일기 편집기"
+
+#: ../src/gnome2/about_modules.c:138
+msgid "About Sword Module"
+msgstr "sword 모듈 정보"
+
+#. Don't use an icon with GTK3
+#: ../src/gnome2/about_modules.c:219 ../src/gnome2/about_trans.c:168
+#: ../src/gnome2/find_dialog.c:288
+msgid "Close"
+msgstr "닫기"
+
+#: ../src/gnome2/about_modules.c:411
+msgid "<b>Module name:</b> "
+msgstr "<b>모듈 이름:</b>"
+
+#: ../src/gnome2/about_modules.c:415
+msgid "<b>Version:</b> "
+msgstr "<b>버전:</b>"
+
+#: ../src/gnome2/about_modules.c:418
+msgid "No version stamp found"
+msgstr "버전 스탬프가 없습니다"
+
+#: ../src/gnome2/about_modules.c:421
+msgid "<b>Type:</b> "
+msgstr "<b>형식:</b>"
+
+#: ../src/gnome2/about_modules.c:423
+msgid "Daily Devotion"
+msgstr "매일 묵상"
+
+#: ../src/gnome2/about_modules.c:425 ../src/gnome2/mod_mgr.c:1558
+#: ../src/gnome2/utilities.c:612 ../src/main/sidebar.cc:1030
+#: ../src/main/sidebar.cc:1032
+msgid "Maps"
+msgstr "지도"
+
+#: ../src/gnome2/about_modules.c:427 ../src/gnome2/mod_mgr.c:1562
+#: ../src/gnome2/utilities.c:618 ../src/main/sidebar.cc:1039
+#: ../src/main/sidebar.cc:1041
+msgid "Images"
+msgstr "그림"
+
+#: ../src/gnome2/about_modules.c:429
+msgid "Glossary"
+msgstr "용어집"
+
+#: ../src/gnome2/about_modules.c:433
+msgid "Cult"
+msgstr "이단"
+
+#: ../src/gnome2/about_modules.c:437 ../src/gnome2/search_sidebar.c:261
+msgid "Bible"
+msgstr "성서"
+
+#: ../src/gnome2/about_modules.c:440 ../src/gnome2/search_sidebar.c:269
+#: ../ui/prefs.glade.h:134 ../ui/prefs.gtkbuilder.h:134
+msgid "Commentary"
+msgstr "해설"
+
+#: ../src/gnome2/about_modules.c:443 ../ui/prefs.glade.h:136
+#: ../ui/prefs.gtkbuilder.h:136
+msgid "Dictionary"
+msgstr "사전"
+
+#: ../src/gnome2/about_modules.c:446
+msgid "General Book"
+msgstr "일반 서적"
+
+#: ../src/gnome2/about_modules.c:451
+msgid "Personal Commentary"
+msgstr "개별 해설"
+
+#: ../src/gnome2/about_modules.c:454
+msgid "Journal"
+msgstr "저널"
+
+#: ../src/gnome2/about_modules.c:457
+msgid "Unknown type"
+msgstr "알 수 없는 형식"
+
+#: ../src/gnome2/about_modules.c:466
+msgid "<b>Module abbreviation:</b> "
+msgstr "<b>모듈 약자:</b>"
+
+#: ../src/gnome2/about_modules.c:471
+msgid "<b>Language:</b> "
+msgstr "<b>언어:</b>"
+
+#: ../src/gnome2/about_modules.c:474
+msgid "Not specified"
+msgstr "지정 안함"
+
+#: ../src/gnome2/about_modules.c:483
+msgid "<b>Installed size:</b> "
+msgstr "<b>설치 크기:</b>"
+
+#: ../src/gnome2/about_modules.c:491
+msgid "<b>Companion module(s):</b></br>"
+msgstr "<b>부록 모듈:</b></br>"
+
+#: ../src/gnome2/about_modules.c:501
+msgid "<b>Features:</b>"
+msgstr "<b>기능:</b>"
+
+#: ../src/gnome2/about_modules.c:505
+msgid "*&nbsp;Headings"
+msgstr "*&nbsp;제목"
+
+#: ../src/gnome2/about_modules.c:513
+msgid "*&nbsp;Footnotes"
+msgstr "*&nbsp;각주"
+
+#: ../src/gnome2/about_modules.c:519
+msgid "*&nbsp;Cross references"
+msgstr "*&nbsp;상호 참조"
+
+#: ../src/gnome2/about_modules.c:526
+msgid "*&nbsp;Strong's numbers"
+msgstr "*&nbsp;불규칙 변화 수"
+
+#: ../src/gnome2/about_modules.c:534
+msgid "*&nbsp;Morphological tags"
+msgstr "*&nbsp;어형론상 태그"
+
+#: ../src/gnome2/about_modules.c:540
+msgid "*&nbsp;Lemmas"
+msgstr "*&nbsp;부명제"
+
+#: ../src/gnome2/about_modules.c:548
+msgid "*&nbsp;Words of Christ in red"
+msgstr "*&nbsp;적 그리스도 구절"
+
+#: ../src/gnome2/about_modules.c:553
+msgid "*&nbsp;Greek accents"
+msgstr "*&nbsp;그리스어 강세 부호"
+
+#: ../src/gnome2/about_modules.c:559
+msgid "*&nbsp;Hebrew Vowel Points"
+msgstr "*&nbsp;히브리어 모음 부호"
+
+#: ../src/gnome2/about_modules.c:565
+msgid "*&nbsp;Hebrew Cantillation"
+msgstr "*&nbsp;히브리어 가사"
+
+#: ../src/gnome2/about_modules.c:571
+msgid "*&nbsp;Variant readings"
+msgstr "*&nbsp;이문(異文)"
+
+#: ../src/gnome2/about_modules.c:578
+msgid "*&nbsp;Transliteration forms"
+msgstr "*&nbsp;음역 양식"
+
+#: ../src/gnome2/about_modules.c:583
+msgid "*&nbsp;Enumerations"
+msgstr "*&nbsp;목록"
+
+#: ../src/gnome2/about_modules.c:588
+msgid "*&nbsp;Glosses"
+msgstr "*&nbsp;해설 목록"
+
+#: ../src/gnome2/about_modules.c:595
+msgid "*&nbsp;Morpheme Segmentation"
+msgstr "*&nbsp;형태소 분리"
+
+#: ../src/gnome2/about_modules.c:602
+msgid "*&nbsp;<i>No features found</i>"
+msgstr "*&nbsp;<i>기능이 없습니다</i>"
+
+#: ../src/gnome2/about_modules.c:612
+msgid "<b>Distribution license:</b>"
+msgstr "<b>배포 라이선스:</b>"
+
+#: ../src/gnome2/about_modules.c:625
+msgid "<b>Promotional:</b> "
+msgstr "<b>홍보문:</b>"
+
+#: ../src/gnome2/about_sword.c:79
+msgid ""
+"The SWORD Project is an effort to create an ever-expanding software package "
+"for research and study of God and His Word. The SWORD Project framework "
+"allows easy use and study of Bible texts, commentaries, lexicons, "
+"dictionaries, and other books. Many frontends are built using this "
+"framework. An installed set of books may be shared among all frontends using "
+"the framework.\n"
+"\n"
+" Books can be downloaded from the SWORD Project."
+msgstr ""
+"SWORD 프로젝트는 하나님과 그분의 말씀을 연구하고 학습하는 확장성을 지닌 프로"
+"그램 모음이자 노력의 산물입니다. SWORD 프로젝트 프레임워크는 성경 말씀, 해"
+"설, 어휘 목록, 사전, 기타 서적의 내용을 공부하고 쉽게 활용할 수 있게 합니다. "
+"대부분의 프론트엔드는 이 프레임워크를 기반으로 만듭니다. 설치한 서적 목록은 "
+"프레임워크를 사용하여 모든 프론트엔드에서 공유할 수 있습니다.\n"
+"\n"
+"서적은 SWORD 프로젝트에서 다운로드할 수 있습니다."
+
+#: ../src/gnome2/about_sword.c:98
+msgid "The SWORD Project"
+msgstr "SWORD 프로젝트"
+
+#: ../src/gnome2/about_trans.c:82
+msgid ""
+"Do you like using Xiphos to study the Bible? Would you like to see its user "
+"interface in your native language? You could translate Xiphos! \n"
+"\n"
+"We are always looking for contributions of new translations of Xiphos into "
+"other languages. If you are able to translate for us, please see the link "
+"below, contact us, and get involved with our efforts. Your help will be much "
+"appreciated!"
+msgstr ""
+"성경을 공부할 때 xiphos를 쓰고 싶으세요? 모국어로 된 사용자 인터페이스를 사용"
+"하고 싶으세요? xiphos를 번역할 수 있습니다!\n"
+"\n"
+"xiphos를 다른 언어로 번역해줄 분을 항상 찾고 있습니다. 번역해주실 수 있다면 "
+"아래 링크를 방문하여 저희에게 연락주십시오. 그리고 xiphos팀의 열정에 함께해주십시"
+"오. 여러분의 도움을 감사하게 생각합니다!"
+
+#: ../src/gnome2/about_trans.c:96
+msgid "About Xiphos Translation"
+msgstr "xiphos 번역 참고"
+
+#: ../src/gnome2/about_trans.c:135
+msgid "See TRANSLATION-HOWTO in Xiphos source"
+msgstr "xiphos 소스 코드의 TRANSLATION-HOWTO를 참고하십시오"
+
+#: ../src/gnome2/about_trans.c:141
+msgid "Xiphos development"
+msgstr "xiphos 개발"
+
+#: ../src/gnome2/about_xiphos.c:129
+msgid "Copyright © 2000-2015 Xiphos Development Team"
+msgstr "Copyright © 2000-2015 Xiphos Development Team"
+
+#: ../src/gnome2/about_xiphos.c:131
+msgid ""
+"\n"
+"Powered by The SWORD Project.\n"
+"We would like to thank Troy Griffitts and all the other folks who have given "
+"us The SWORD Project."
+msgstr ""
+"\n"
+"SWORD 프로젝트 제공.\n"
+"Troy Griffitts과 SWORD 프로젝트에 도움을 준 모든 분께 감사드립니다."
+
+#. info->stock_icon = GTK_STOCK_OPEN;
+#: ../src/gnome2/bookmark_dialog.c:163 ../src/gnome2/bookmarks_menu.c:361
+#: ../src/gnome2/bookmarks_menu.c:653 ../src/gnome2/bookmarks_menu.c:753
+#: ../src/gnome2/bookmarks_treeview.c:138 ../ui/editor_studypad.xml.h:15
+#: ../ui/xi-menus.glade.h:56 ../ui/xi-menus-popup.gtkbuilder.h:36
+msgid "Bookmark"
+msgstr "책갈피"
+
+#: ../src/gnome2/bookmark_dialog.c:165 ../src/gnome2/bookmarks_menu.c:755
+#: ../src/gnome2/bookmarks_treeview.c:139
+msgid "Enter Folder Name"
+msgstr "폴더 이름을 입력하십시오"
+
+#: ../src/gnome2/bookmark_dialog.c:167 ../src/gnome2/bookmarks_menu.c:757
+msgid "Folder Name"
+msgstr "폴더 이름"
+
+#: ../src/gnome2/bookmark_dialog.c:168 ../src/gnome2/bookmarks_menu.c:758
+#: ../src/gnome2/bookmarks_treeview.c:141
+msgid "Folder: "
+msgstr "폴더: "
+
+#: ../src/gnome2/bookmarks_menu.c:200
+msgid "Specify bookmarks file"
+msgstr "책갈피 파일을 지정하십시오"
+
+#: ../src/gnome2/bookmarks_menu.c:350 ../ui/xi-menus.glade.h:61
+#: ../ui/xi-menus-popup.gtkbuilder.h:29
+msgid "Edit"
+msgstr "편집"
+
+#: ../src/gnome2/bookmarks_menu.c:364
+msgid "Folder name: "
+msgstr "폴더 이름: "
+
+#: ../src/gnome2/bookmarks_menu.c:367
+msgid "Bookmark name: "
+msgstr "책갈피 이름: "
+
+#: ../src/gnome2/bookmarks_menu.c:370 ../src/gnome2/bookmarks_menu.c:661
+msgid "Verse: "
+msgstr "절: "
+
+#: ../src/gnome2/bookmarks_menu.c:371 ../src/gnome2/bookmarks_menu.c:662
+msgid "Module: "
+msgstr "모듈: "
+
+#: ../src/gnome2/bookmarks_menu.c:493
+msgid "Remove the selected folder"
+msgstr "선택한 폴더를 제거합니까"
+
+#: ../src/gnome2/bookmarks_menu.c:494
+msgid "(and all its contents)?"
+msgstr "(폴더의 모든 내용 포함)?"
+
+#: ../src/gnome2/bookmarks_menu.c:498
+msgid "Remove the selected bookmark"
+msgstr "선택한 책갈피를 제거합니까"
+
+#: ../src/gnome2/bookmarks_menu.c:654
+msgid "Add"
+msgstr "추가"
+
+#: ../src/gnome2/bookmarks_menu.c:660
+msgid "Label: "
+msgstr "레이블: "
+
+#: ../src/gnome2/bookmarks_treeview.c:102 ../src/gnome2/export_bookmarks.c:172
+#: ../src/gnome2/export_bookmarks.c:229
+#, c-format
+msgid "Search result: %s"
+msgstr "검색 결과: %s"
+
+#: ../src/gnome2/bookmarks_treeview.c:747
+msgid ""
+"Opening a multi-reference bookmark in\n"
+"separate tabs is not supported."
+msgstr ""
+"다중 참조 책갈피에서 여는 중이며\n"
+"탭 분리를 지원하지않습니다."
+
+#: ../src/gnome2/bookmarks_treeview.c:839 ../src/gnome2/sidebar.c:1500
+#: ../src/gnome2/sidebar.c:1536
+msgid "Bookmarks"
+msgstr "책갈피"
+
+#: ../src/gnome2/cipher_key_dialog.c:63
+#, c-format
+msgid "Cipher key for module %s"
+msgstr "%s 모듈의 암호 키"
+
+#: ../src/gnome2/cipher_key_dialog.c:64
+msgid "for:"
+msgstr "다음에 대해:"
+
+#: ../src/gnome2/cipher_key_dialog.c:67
+msgid "Enter Key: "
+msgstr "키 입력: "
+
+#: ../src/gnome2/dialog.c:289
+msgid "Close without Saving"
+msgstr "저장 않고 닫기"
+
+#: ../src/gnome2/dialog.c:724
+msgid "Xiphos:"
+msgstr "xiphos:"
+
+#: ../src/gnome2/dialog.c:854
+msgid "Close _without Saving"
+msgstr "저장 않고 닫기(_W)"
+
+#: ../src/gnome2/export_bookmarks.c:175 ../src/gnome2/export_bookmarks.c:232
+#: ../src/gnome2/sidebar.c:1514 ../src/gnome2/sidebar.c:1554
+#, c-format
+msgid "Verse List"
+msgstr "절 목록"
+
+#: ../src/gnome2/export_bookmarks.c:659
+msgid "VerseList"
+msgstr "절 목록"
+
+#: ../src/gnome2/export_bookmarks.c:663
+msgid "SearchResults"
+msgstr "검색 결과"
+
+#: ../src/gnome2/export_dialog.c:325 ../ui/export-dialog.glade.h:4
+#: ../ui/export-dialog.gtkbuilder.h:4
+msgid "Please check copyright before exporting!"
+msgstr "내보내기 전에 저작권을 확인하십시오!"
+
+#: ../src/gnome2/find_dialog.c:183 ../src/gnome2/find_dialog.c:359
+#: ../ui/gtk2_webedit.ui.h:18 ../ui/gtk_webedit.ui.h:18
+msgid "Find"
+msgstr "찾기"
+
+#: ../src/gnome2/find_dialog.c:202
+msgid "Enter Word or Phrase"
+msgstr "단어 또는 어구를 입력하십시오"
+
+#: ../src/gnome2/find_dialog.c:217
+msgid "Search backwards"
+msgstr "후방 검색"
+
+#: ../src/gnome2/find_dialog.c:280
+msgid "Find Next"
+msgstr "다음 겁색"
+
+#: ../src/gnome2/font_dialog.c:296
+msgid "Set Module Font"
+msgstr "모듈 글꼴 설정"
+
+#: ../src/gnome2/font_dialog.c:330
+msgid "Change font for"
+msgstr "다음에 대한 글꼴 바꾸기"
+
+#: ../src/gnome2/font_dialog.c:334 ../ui/editor_link_dialog.xml.h:3
+msgid "Module"
+msgstr "모듈"
+
+#: ../src/gnome2/font_dialog.c:338
+msgid "Current font: "
+msgstr "현재 글꼴: "
+
+#: ../src/gnome2/font_dialog.c:379 ../src/gnome2/font_dialog.c:395
+#: ../ui/prefs.gtkbuilder.h:3
+msgid "+0"
+msgstr "+0"
+
+#: ../src/gnome2/font_dialog.c:398
+msgid "Use the default font for this module"
+msgstr "이 모듈의 기본 글꼴로 사용"
+
+#: ../src/gnome2/gui.c:173
+msgid "BUG! Xiphos is about to crash due to a \"STRDUP\" error."
+msgstr "버그네요?! \"STRDUP\" 오류 때문에 xiphos가 깨진 것 같습니다."
+
+#: ../src/gnome2/gui.c:174 ../src/gnome2/gui.c:204
+msgid "Please report this error to the Xiphos team with:"
+msgstr "다음 내용을 첨부하여 xiphos 팀에게 오류를 보고하십시오:"
+
+#: ../src/gnome2/gui.c:203
+msgid "BUG! Xiphos is about to crash due to a \"STRING\" error."
+msgstr "버그네요?! \"STRING\" 오류 때문에 xiphos가 깨진 것 같습니다."
+
+#: ../src/gnome2/main_window.c:583
+#, c-format
+msgid "Module has no support for %s."
+msgstr "모듈은 %s을(를) 지원하지 않습니다."
+
+#: ../src/gnome2/main_window.c:656
+msgid "Xiphos: No windows."
+msgstr "xiphos: 창이 없습니다."
+
+#: ../src/gnome2/main_window.c:708
+msgid "BibleSync: Current navigation sent."
+msgstr "BibleSync: 현재 내비게이션을 보냈습니다."
+
+#: ../src/gnome2/main_window.c:710
+msgid "BibleSync: Not speaking."
+msgstr "BibleSync: 스피커로 출력하지 않습니다."
+
+#: ../src/gnome2/main_window.c:897
+msgid "Xiphos - Bible Study Software"
+msgstr "xiphos - 성경 공부 프로그램"
+
+#: ../src/gnome2/main_window.c:972
+msgid "Open a new tab"
+msgstr "새 탭 열기"
+
+#: ../src/gnome2/main_window.c:1052 ../src/gnome2/sidebar.c:614
+#: ../src/gnome2/sidebar.c:619 ../src/main/sidebar.cc:656
+#: ../src/main/sidebar.cc:976 ../src/main/sidebar.cc:977
+#: ../src/main/sidebar.cc:978
+msgid "Standard View"
+msgstr "표준 보기"
+
+#: ../src/gnome2/main_window.c:1109
+msgid "Commentary View"
+msgstr "해설 보기"
+
+#: ../src/gnome2/main_window.c:1123
+msgid "Book View"
+msgstr "책 보기"
+
+#: ../src/gnome2/main_window.c:1152
+msgid "Welcome to Xiphos"
+msgstr "xiphos를 사용하시는 여러분 반갑습니다"
+
+#: ../src/gnome2/menu_popup.c:1296
+msgid ""
+"Renaming is not available in Windows.\n"
+"\n"
+"Xiphos is limited by Windows' filesystem,\n"
+"because it disallows the renaming of filename\n"
+"components of currently-open files,\n"
+"such as the contents of this commentary.\n"
+"Therefore, personal commentary renaming is\n"
+"not available in the Windows environment."
+msgstr ""
+"윈도우 운영체제에서는 이름을 바꿀 수 없습니다.\n"
+"\n"
+"xiphos는 윈도우 파일 시스템에서 기능상 제한이 있는데,\n"
+"개별 해설 같은 내용이 있는 이미 열린 파일의 이름을\n"
+"바꿀 수 없기 때문입니다.\n"
+"따라서 윈도우 운영체제 환경에서는 개별 해설의 이름을\n"
+"바꿀 수 없습니다."
+
+#: ../src/gnome2/menu_popup.c:1315
+msgid "Rename Commentary"
+msgstr "해설 이름 바꾸기"
+
+#: ../src/gnome2/menu_popup.c:1318
+msgid "Choose Commentary Name"
+msgstr "해설 이름 선택"
+
+#: ../src/gnome2/menu_popup.c:1320
+msgid "New Name"
+msgstr "새 이름 부여하기"
+
+#: ../src/gnome2/menu_popup.c:1321 ../src/gnome2/treekey-editor.c:138
+#: ../src/gnome2/treekey-editor.c:195 ../src/gnome2/treekey-editor.c:293
+#: ../src/main/prayerlists.cc:230
+msgid "Name: "
+msgstr "이름: "
+
+#: ../src/gnome2/menu_popup.c:1330 ../src/main/prayerlists.cc:243
+msgid "Module names must contain [A-Za-z0-9_] only."
+msgstr "모듈 이름은 영문 대소문자, 숫자, 밑줄문자만 가능합니다."
+
+#: ../src/gnome2/menu_popup.c:1336 ../src/main/prayerlists.cc:249
+msgid "Xiphos already knows a module by that name."
+msgstr "xiphos에 이미 해당 이름을 가진 모듈이 있습니다."
+
+#: ../src/gnome2/menu_popup.c:1378
+#, c-format
+msgid ""
+"Failed to create new configuration:\n"
+"%s"
+msgstr ""
+"새 설정에 실패했습니다:\n"
+"%s"
+
+#: ../src/gnome2/menu_popup.c:1387
+msgid ""
+"Configuration build error:\n"
+"\n"
+msgstr ""
+"설정 빌드 오류:\n"
+"\n"
+
+#: ../src/gnome2/menu_popup.c:2032
+msgid "No module in this pane."
+msgstr "이 창에 모듈이 없습니다."
+
+#. *****************************************************************************
+#. * defines
+#.
+#: ../src/gnome2/mod_mgr.c:64
+msgid ""
+"<b>Overview of the Module Manager.</b>\n"
+"\n"
+"This is Xiphos' mechanism to get new and updated content.\n"
+"If you have never been here before, please take a moment to look it over.\n"
+"\n"
+"Modules come from different <u>repositories</u>.  <b>Module Sources: Add/"
+"Remove</b> will show you what repositories are currently known.\n"
+"\n"
+"<b>Module Sources: Choose</b> is for deciding from where modules should "
+"come, that is, from which repository Xiphos should obtain them, as well as "
+"where they should be placed on your system. Set <i>Install Source</i> and "
+"<i>Install Destination</i>, then click <i>Refresh</i>.\n"
+"\n"
+"<b>Modules: Install/Update</b> is for selecting and obtaining modules after "
+"choosing source and destination.\n"
+"\n"
+"<b>Modules: Maintenance</b> is for archive and index creation.\n"
+"\n"
+"See section 5 of our manual for Module Manager detail, or ask for help via "
+"Live Chat, or (if no one is responsive in chat) send mail to our users' "
+"mailing list.\n"
+msgstr ""
+"<b>모듈 관리자 살펴보기입니다.</b>\n"
+"\n"
+"xiphos에서 새 컨텐트를 가져오는 방식에 대한 내용입니다.\n"
+"이 내용을 본 적이 없다면 잠깐 살펴보십시오.\n"
+"\n"
+"모듈은 개별 <u>저장소</u>에서 가져옵니다. <b>모듈 공급원: 추가/제거</b> 항목"
+"에서는 현재 알려진 저장소를 보여줍니다.\n"
+"\n"
+"<b>모듈 공급원: 선택</b> 항목은 모듈을 가져올 위치를 선택하는데, 시스템의 어"
+"떤 위치에 모듈을 저장할지 설정하는 것처럼 xiphos가 모듈을 가져올 저장소를 언"
+"급합니다. <i>설치 원본</i> 과 <i>설치 대상</i>을 설정하시고, <i>새로 고침</i>"
+"을 누르십시오.\n"
+"\n"
+"<b>모듈: 설치/업데이트</b> 는 원본과 대상을 선택한 후 모듈을 선택하고 가져올 "
+"때 필요한 설정 항목입니다.\n"
+"\n"
+"<b>모듈: 관리</b> 는 저장 모듈을 관리하며 인덱스를 만듭니다.\n"
+"\n"
+"모듈 관리자 설명을 더 자세하게 살펴보려면 설명서 5절을 참고하시거나, 실시간 "
+"대화방에서 도움을 구하시든지, (대화방에서 아무도 반응하지 않는다면) 사용자 메"
+"일링 리스트에 전자메일을 보내십시오.\n"
+
+#: ../src/gnome2/mod_mgr.c:67
+msgid ""
+"<b>Welcome to Xiphos.</b>\n"
+"\n"
+"There are no Bibles installed. In order to initialize, Xiphos needs at least "
+"one Bible module. To facilitate this, the Module Manager has been opened so "
+"that you may install one or more Bibles, either from a local module set "
+"(cdrom, flash drive) or over the network from CrossWire Bible Society. "
+"Please refer to these step-by-step instructions, and to the general module "
+"manager overview that has also been opened.\n"
+"\n"
+"<u>For local install:</u>\n"
+"- In <i>Module Sources: Add/Remove</i>, add a new local folder name where "
+"modules can be found.\n"
+"  (This is where folders exist named <i>mods.d</i> and <i>modules</i>.)\n"
+"- In <i>Module Sources: Choose</i>, click the \"Local\" button, and select "
+"your folder from the pulldown.\n"
+"\n"
+"<u>For network install from CrossWire:</u>\n"
+"- In <i>Module Sources: Choose</i>, click the \"Remote\" button and select "
+"CrossWire from the pulldown.\n"
+"- Click the \"Refresh\" button at the bottom.\n"
+"\n"
+"<u>In either case:</u>\n"
+"- In <i>Modules: Install/Update</i>, select Bibles and other modules of your "
+"preference.\n"
+"- Click \"Install\".\n"
+"- Close the Module Manager when you are done.\n"
+"\n"
+"<u>Warning</u>: If you live in a persecuted country, use with care.\n"
+"\n"
+"Both this step-by-step instruction dialog and the general introduction "
+"dialog may be closed at any time."
+msgstr ""
+"<b>xiphos를 사용하시는 여러분 반갑습니다.</b>\n"
+"\n"
+"설치한 성경이 없습니다. 초기화하려면, 최소한 한가지 성경 모듈이 필요합니다. "
+"성경 모듈을 설치하려 모듈 관리자를 연 후, 지역 모듈 집합(CD-ROM, 또는 USB 메"
+"모리) 또는 CrossWire 성서 공회 네트워크로부터 하나 이상의 성경을 설치합니다. "
+"아래의 절차와 앞서 열어놓은 일반 모듈 관리자를 참고하십시오.\n"
+"\n"
+"<u>로컬 설치:</u>\n"
+"- <i>모듈 공급원: 추가/제거</i>를 통해 모듈을 찾을 수 있는 위치의 로컬 폴더 "
+"이름을 추가하십시오.\n"
+"  (이 위치는 기존의 <i>mods.d</i> 그리고 <i>modules</i> 폴더입니다.)\n"
+"- <i>모듈 공급원: 선택</i>을 통해 \"로컬\" 단추를 누른 후 풀 다운 항목에서 폴"
+"더를 선택하십시오.\n"
+"\n"
+"<u>CrossWire 네트워크로 설치:</u>\n"
+"- <i>모듈 공급원: 선택</i>에서 \"원격\" 단추를 누른 후 풀 다운 항목에서 "
+"CrossWire를 선택하십시오.\n"
+"- 하단의 \"새로 고침\" 단추를 누르십시오.\n"
+"\n"
+"<u>두 가지 경우에 대해:</u>\n"
+"- <i>모듈: 설치/업데이트</i>에서 성경 또는 원하는 다른 모듈을 선택하십시오.\n"
+"- \"설치\"를 누르십시오.\n"
+"- 다 마쳤으면 모듈 관리자를 닫으십시오.\n"
+"\n"
+"<u>경고</u>: 다른 국가에 살고 있다면 저작권에 유의하여 사용하십시오.\n"
+"\n"
+"절차 대화상자와 일반 소개 대화상자는 언제든 닫을 수 있습니다."
+
+#: ../src/gnome2/mod_mgr.c:191
+msgid "Remove these modules?"
+msgstr "이 모듈을 제거합니까?"
+
+#: ../src/gnome2/mod_mgr.c:192
+msgid "Preparing to remove"
+msgstr "제거 준비 중"
+
+#: ../src/gnome2/mod_mgr.c:193
+msgid "Removing"
+msgstr "제거 중"
+
+#: ../src/gnome2/mod_mgr.c:194 ../ui/xi-menus.glade.h:154
+#: ../ui/xi-menus-popup.gtkbuilder.h:27
+msgid "Remove"
+msgstr "제거"
+
+#: ../src/gnome2/mod_mgr.c:195
+msgid "Install these modules?"
+msgstr "이 모듈을 설치합니까?"
+
+#: ../src/gnome2/mod_mgr.c:196
+msgid "Preparing to install"
+msgstr "설치 준비 중"
+
+#: ../src/gnome2/mod_mgr.c:197
+msgid "Installing"
+msgstr "설치 중"
+
+#: ../src/gnome2/mod_mgr.c:198
+msgid "Install"
+msgstr "설치"
+
+#: ../src/gnome2/mod_mgr.c:199
+msgid "Archive these modules?"
+msgstr "이 모듈을 보관처리 합니까?"
+
+#: ../src/gnome2/mod_mgr.c:200
+msgid "Preparing to archive"
+msgstr "보관처리 준비 중"
+
+#: ../src/gnome2/mod_mgr.c:201
+msgid "Archiving"
+msgstr "보관처리 중"
+
+#: ../src/gnome2/mod_mgr.c:202
+msgid "Archive"
+msgstr "보관처리"
+
+#: ../src/gnome2/mod_mgr.c:203
+msgid ""
+"Build fast-search index for these\n"
+"modules (may take minutes/module)?"
+msgstr ""
+"이 모듈에 대한 고속 검색 인덱스를\n"
+"만드시겠습니까(모듈에 대해 수 분이 걸림)?"
+
+#: ../src/gnome2/mod_mgr.c:204
+msgid "Preparing to index"
+msgstr "색인 준비 중"
+
+#: ../src/gnome2/mod_mgr.c:205
+msgid "Indexing"
+msgstr "색인 중"
+
+#: ../src/gnome2/mod_mgr.c:206
+msgid "Index"
+msgstr "색인"
+
+#: ../src/gnome2/mod_mgr.c:207
+msgid "Delete fast-search index for these modules?"
+msgstr "이 모듈에 대한 빠른 검색 색인을 삭제하시겠습니까?"
+
+#: ../src/gnome2/mod_mgr.c:208
+msgid "Preparing to delete index"
+msgstr "색인 삭제 준비 중"
+
+#: ../src/gnome2/mod_mgr.c:209
+msgid "Deleting index"
+msgstr "색인을 삭제합니다"
+
+#: ../src/gnome2/mod_mgr.c:210
+msgid "Deletion"
+msgstr "삭제"
+
+#: ../src/gnome2/mod_mgr.c:311
+msgid "The module has no About information."
+msgstr "모듈 정보가 없습니다."
+
+#: ../src/gnome2/mod_mgr.c:533
+msgid "Module Name"
+msgstr "모듈 이름"
+
+#: ../src/gnome2/mod_mgr.c:562
+msgid "A checkmark means this module is already installed"
+msgstr "표시 기호는 이 모듈을 이미 설치했다는 뜻입니다"
+
+#: ../src/gnome2/mod_mgr.c:589
+msgid "Click the box to work on this module"
+msgstr "이 모듈을 다루려면 박스를 누르십시오"
+
+#: ../src/gnome2/mod_mgr.c:590
+msgid "Click the box to select this module for install/update"
+msgstr "설치/업데이트할 모듈을 선택하려면 박스를 주르십시오"
+
+#: ../src/gnome2/mod_mgr.c:608
+msgid "Installed"
+msgstr "설치함"
+
+#: ../src/gnome2/mod_mgr.c:625
+msgid ""
+"The index icon means you have built an optimized ('lucene') index for this "
+"module for fast searching (see the Maintenance pane for this function)"
+msgstr ""
+"색인 아이콘은 고속 검색 목적으로 이 모듈에 대해 최적화('루씬') 색인을 만들었"
+"다는 뜻입니다(이 기능에 대해서는 관리자 창을 살펴보십시오)"
+
+#: ../src/gnome2/mod_mgr.c:649
+msgid ""
+"The lock icon means this module is encrypted, and requires that you purchase "
+"an unlock key from the content owner"
+msgstr ""
+"잠금 아이콘은 모듈을 암호화했다는 뜻이며, 이 아이콘이 나타나면 컨텐드 소유자 "
+"로부터 잠금 해제 키를 구매해야합니다."
+
+#: ../src/gnome2/mod_mgr.c:664 ../src/main/biblesync_glue.cc:580
+#: ../ui/gtk2_webedit.ui.h:2 ../ui/gtk_webedit.ui.h:2 ../ui/xi-menus.glade.h:55
+#: ../ui/xi-menus-popup.gtkbuilder.h:35
+msgid "About"
+msgstr "정보"
+
+#: ../src/gnome2/mod_mgr.c:688
+msgid ""
+"The refresh icon means the Installed module is older than the newer "
+"Available module: You should update the module"
+msgstr ""
+"새로 고침 아이콘은 설치한 모듈이 새 버전의 모듈보다 오래됐다는 뜻입니다: 모듈"
+"을 업데이트해야합니다"
+
+#: ../src/gnome2/mod_mgr.c:700
+msgid "Available"
+msgstr "가용성"
+
+#: ../src/gnome2/mod_mgr.c:709
+msgid "Size"
+msgstr "크기"
+
+#: ../src/gnome2/mod_mgr.c:718
+msgid "Description"
+msgstr "설명"
+
+#: ../src/gnome2/mod_mgr.c:872
+#, c-format
+msgid ""
+"`mkdir %s' failed:\n"
+"%s."
+msgstr ""
+"`mkdir %s' 실패\n"
+"%s."
+
+#: ../src/gnome2/mod_mgr.c:906
+msgid " archived in: \n"
+msgstr " 다음에 보관: \n"
+
+#: ../src/gnome2/mod_mgr.c:985
+msgid "Journals and prayer lists cannot be indexed."
+msgstr "묵상 일기 및 기도 목록을 색인할 수 없습니다."
+
+#: ../src/gnome2/mod_mgr.c:1016
+#, c-format
+msgid "%s failed"
+msgstr "%s 실패"
+
+#: ../src/gnome2/mod_mgr.c:1019 ../src/gnome2/mod_mgr.c:1784
+msgid "Finished"
+msgstr "마침"
+
+#: ../src/gnome2/mod_mgr.c:1192 ../src/gnome2/mod_mgr.c:1194
+#: ../src/gnome2/mod_mgr.c:1304 ../src/gnome2/mod_mgr.c:1337
+#: ../src/gnome2/mod_mgr.c:1339 ../src/gnome2/utilities.c:432
+#: ../src/gnome2/utilities.c:495 ../src/gnome2/utilities.c:497
+#: ../src/gnome2/utilities.c:1069 ../src/main/sidebar.cc:808
+#: ../src/main/sidebar.cc:879 ../src/main/sidebar.cc:881
+msgid "Unknown"
+msgstr "알 수 없음"
+
+#: ../src/gnome2/mod_mgr.c:1515
+#, c-format
+msgid ""
+"Repository:\n"
+"%s"
+msgstr ""
+"저장소:\n"
+"%s"
+
+#: ../src/gnome2/mod_mgr.c:1528
+msgid ""
+"Categorized by\n"
+"Module Type"
+msgstr ""
+"모듈 형식별\n"
+"분류"
+
+#: ../src/gnome2/mod_mgr.c:1533 ../src/gnome2/utilities.c:574
+#: ../src/main/sidebar.cc:960 ../src/main/sidebar.cc:962
+msgid "Biblical Texts"
+msgstr "성경"
+
+#: ../src/gnome2/mod_mgr.c:1537 ../src/gnome2/utilities.c:580
+#: ../src/main/sidebar.cc:667 ../src/main/sidebar.cc:985
+#: ../src/main/sidebar.cc:987
+msgid "Commentaries"
+msgstr "해설"
+
+#: ../src/gnome2/mod_mgr.c:1541 ../src/gnome2/utilities.c:587
+#: ../src/main/sidebar.cc:994 ../src/main/sidebar.cc:996
+msgid "Dictionaries"
+msgstr "사전"
+
+#: ../src/gnome2/mod_mgr.c:1545 ../src/gnome2/utilities.c:593
+#: ../src/main/sidebar.cc:1003 ../src/main/sidebar.cc:1005
+msgid "Glossaries"
+msgstr "용어집"
+
+#: ../src/gnome2/mod_mgr.c:1549 ../src/gnome2/utilities.c:600
+#: ../src/main/sidebar.cc:1012 ../src/main/sidebar.cc:1014
+msgid "Daily Devotionals"
+msgstr "매일 묵상"
+
+#: ../src/gnome2/mod_mgr.c:1554 ../src/gnome2/utilities.c:606
+#: ../src/main/sidebar.cc:675 ../src/main/sidebar.cc:1021
+#: ../src/main/sidebar.cc:1023
+msgid "General Books"
+msgstr "일반 서적"
+
+#: ../src/gnome2/mod_mgr.c:1566 ../src/gnome2/utilities.c:624
+#: ../src/main/sidebar.cc:1048 ../src/main/sidebar.cc:1050
+msgid "Cult/Unorthodox"
+msgstr "광신도/이단"
+
+#: ../src/gnome2/mod_mgr.c:1575
+msgid ""
+"Categorized by\n"
+"Availability"
+msgstr ""
+"가용성별\n"
+"분류"
+
+#: ../src/gnome2/mod_mgr.c:1579
+msgid "Updates"
+msgstr "업데이트"
+
+#: ../src/gnome2/mod_mgr.c:1584
+msgid "Uninstalled"
+msgstr "설치하지 않음"
+
+#: ../src/gnome2/mod_mgr.c:1589 ../src/gnome2/sidebar.c:630
+#: ../src/gnome2/utilities.c:632 ../src/main/prayerlists.cc:228
+#: ../src/main/sidebar.cc:1058 ../src/main/sidebar.cc:1060
+msgid "Prayer List/Journal"
+msgstr "기도 목록/묵상 일기"
+
+#: ../src/gnome2/mod_mgr.c:1767
+msgid "Refreshing from remote source"
+msgstr "원격 원본으로 새로 고치는 중"
+
+#: ../src/gnome2/mod_mgr.c:1779
+msgid "Remote source not found"
+msgstr "원격 원본이 없습니다"
+
+#: ../src/gnome2/mod_mgr.c:1850
+msgid "Configure"
+msgstr "설정"
+
+#: ../src/gnome2/mod_mgr.c:1879
+msgid "Type"
+msgstr "형식"
+
+#: ../src/gnome2/mod_mgr.c:1886
+msgid "Caption"
+msgstr "설명 제목"
+
+#: ../src/gnome2/mod_mgr.c:1893
+msgid "Source"
+msgstr "원본"
+
+#: ../src/gnome2/mod_mgr.c:1900
+msgid "Directory"
+msgstr "디렉터리"
+
+#: ../src/gnome2/mod_mgr.c:1908
+msgid "User"
+msgstr "사용자"
+
+#: ../src/gnome2/mod_mgr.c:1915
+msgid "Password"
+msgstr "암호"
+
+#: ../src/gnome2/mod_mgr.c:1922
+msgid "UID"
+msgstr "UID"
+
+#: ../src/gnome2/mod_mgr.c:1937
+msgid "Module Sources"
+msgstr "모듈 원본"
+
+#: ../src/gnome2/mod_mgr.c:1940
+msgid "Add/Remove"
+msgstr "추가/제거"
+
+#: ../src/gnome2/mod_mgr.c:1943
+msgid "Choose"
+msgstr "선택"
+
+#: ../src/gnome2/mod_mgr.c:1946 ../src/gnome2/preferences_dialog.c:2023
+#: ../src/gnome2/sidebar.c:1520 ../src/gnome2/sidebar.c:1562
+msgid "Modules"
+msgstr "모듈"
+
+#: ../src/gnome2/mod_mgr.c:1948
+msgid "Install/Update"
+msgstr "설치/업데이트"
+
+#: ../src/gnome2/mod_mgr.c:1951
+msgid "Maintenance"
+msgstr "관리"
+
+#: ../src/gnome2/mod_mgr.c:2167
+msgid "Please Refresh"
+msgstr "새로 고치십시오"
+
+#: ../src/gnome2/mod_mgr.c:2168
+msgid "Your module list is not up to date!"
+msgstr "모듈 목록이 최신이 아닙니다!"
+
+#. Zero Bibles is just not workable in Xiphos.
+#: ../src/gnome2/mod_mgr.c:2485
+msgid ""
+"You have uninstalled your last Bible.\n"
+"Xiphos requires at least one."
+msgstr ""
+"마지막 성경을 제거했습니다.\n"
+"xiphos에는 최소한 하나의 성경이 필요합니다."
+
+#: ../src/gnome2/mod_mgr.c:2491
+msgid ""
+"There are still no Bibles installed.\n"
+"Xiphos cannot continue without one."
+msgstr ""
+"여전히 설치한 성경이 없습니다.\n"
+"xiphos는 성경이 아무것도 없으면 계속 실행할 수 없습니다."
+
+#: ../src/gnome2/mod_mgr.c:2616
+#, c-format
+msgid ""
+"%s obsoletes %s.\n"
+"Would you like to delete %s?\n"
+"Beware: This cannot be undone."
+msgstr ""
+"%2$s은(는) %1$s의 오래된 버전입니다.\n"
+"%3$s을(를) 삭제하시겠습니까?\n"
+"참고: 되돌릴 수 없습니다."
+
+#: ../src/gnome2/mod_mgr.c:2682
+msgid "No obsolete modules were found."
+msgstr "오래된 모듈이 없습니다."
+
+#: ../src/gnome2/mod_mgr.c:2704
+msgid "Standard remote sources have been loaded."
+msgstr "표준 원격 원본을 불러왔습니다."
+
+#: ../src/gnome2/mod_mgr.c:2713
+msgid "Could not load standard sources from CrossWire."
+msgstr "CrossWire에서 표준 원본을 불러올 수 없습니다."
+
+#: ../src/gnome2/mod_mgr.c:2864 ../src/gnome2/mod_mgr.c:3120
+msgid "Remove the selected source"
+msgstr "선택한 원본 제거"
+
+#: ../src/gnome2/mod_mgr.c:2930
+msgid "Enter a remote source"
+msgstr "원격 원본 정보를 입력하십시오"
+
+#: ../src/gnome2/mod_mgr.c:2939
+msgid "Caption:"
+msgstr "설명 제목:"
+
+#: ../src/gnome2/mod_mgr.c:2940
+msgid "Type:"
+msgstr "형식:"
+
+#: ../src/gnome2/mod_mgr.c:2941
+msgid "Host:"
+msgstr "호스트:"
+
+#: ../src/gnome2/mod_mgr.c:2942
+msgid "Directory:"
+msgstr "디렉터리:"
+
+#: ../src/gnome2/mod_mgr.c:2943
+msgid "User (optional):"
+msgstr "사용자(선택):"
+
+#: ../src/gnome2/mod_mgr.c:2944
+msgid "Password (optional):"
+msgstr "암호(선택):"
+
+#. this can happen at most once
+#: ../src/gnome2/mod_mgr.c:2970
+msgid "A source by that name already exists."
+msgstr "해당 이름을 가진 공금원이 이미 있습니다."
+
+#: ../src/gnome2/mod_mgr.c:3117
+msgid "Delete a remote source"
+msgstr "원격 공금원 삭제"
+
+#: ../src/gnome2/mod_mgr.c:3636
+msgid "[no module]"
+msgstr "[모듈 없음]"
+
+#: ../src/gnome2/navbar_book.c:356 ../src/gnome2/navbar_book_dialog.c:300
+msgid "Go outward, to the section containing this one"
+msgstr "이 절이 들어있는 절 바깥 장으로 이동"
+
+#: ../src/gnome2/navbar_book.c:377 ../src/gnome2/navbar_book_dialog.c:322
+msgid "Go to previous item"
+msgstr "이전 항목으로 이동"
+
+#: ../src/gnome2/navbar_book.c:397 ../src/gnome2/navbar_book_dialog.c:342
+msgid "Go to next item"
+msgstr "다음 항목으로 이동"
+
+#: ../src/gnome2/navbar_book.c:418 ../src/gnome2/navbar_book_dialog.c:362
+msgid "Go inward, to the first subsection"
+msgstr "첫번째 하위 절이 있는 안쪽으로 이동"
+
+#: ../src/gnome2/navbar_versekey_dialog.c:898
+#: ../src/gnome2/navbar_versekey_editor.c:926
+#: ../src/gnome2/navbar_versekey_parallel.c:847
+msgid "Synchronize this window's scrolling with the main window"
+msgstr "이 동기화의 스크롤을 메인 창의 스크롤과 동기화"
+
+#: ../src/gnome2/parallel_dialog.c:346 ../src/gnome2/preferences_dialog.c:2030
+msgid "Parallel"
+msgstr "나란히 보기"
+
+#: ../src/gnome2/parallel_view.c:112
+msgid "Detach/Attach"
+msgstr "붙이기/떼어내기"
+
+#: ../src/gnome2/parallel_view.c:117 ../ui/xi-menus.glade.h:64
+#: ../ui/xi-menus-popup.gtkbuilder.h:43
+msgid "Module Options"
+msgstr "모듈 옵션"
+
+#: ../src/gnome2/parallel_view.c:206 ../src/gnome2/sidebar.c:614
+#: ../src/gnome2/sidebar.c:619 ../src/gnome2/tabbed_browser.c:254
+#: ../src/main/sidebar.cc:639 ../src/main/sidebar.cc:968
+#: ../src/main/sidebar.cc:969 ../src/main/sidebar.cc:970
+msgid "Parallel View"
+msgstr "나란히 보기"
+
+#: ../src/gnome2/preferences_dialog.c:860
+msgid "BibleSync session passphrase"
+msgstr "BiboeSync 세션 암호"
+
+#: ../src/gnome2/preferences_dialog.c:862
+msgid "Phrase:"
+msgstr "어구:"
+
+#. mode selection failed? probably dead interface
+#: ../src/gnome2/preferences_dialog.c:933
+msgid ""
+"Mode selection failed.\n"
+"Set \"Debug\" and try again to see why."
+msgstr ""
+"모드 선택에 실패했습니다.\n"
+"\"디버깅\"를 설정하고 원인을 살펴보십시오."
+
+#: ../src/gnome2/preferences_dialog.c:988
+msgid "Mode selection failed.\n"
+msgstr "모드 선택에 실패했습니다.\n"
+
+#: ../src/gnome2/preferences_dialog.c:991
+#, c-format
+msgid "BibleSync: %s (passphrase \"%s\")."
+msgstr "BibleSync: %s (암호: \"%s\"),"
+
+#: ../src/gnome2/preferences_dialog.c:993
+msgid "Disabled"
+msgstr "비활성"
+
+#: ../src/gnome2/preferences_dialog.c:995 ../src/main/xml.c:96
+msgid "Personal"
+msgstr "개인"
+
+#: ../src/gnome2/preferences_dialog.c:997
+msgid "Speaker"
+msgstr "독서자"
+
+#: ../src/gnome2/preferences_dialog.c:998
+msgid "Audience"
+msgstr "청자"
+
+#: ../src/gnome2/preferences_dialog.c:1584
+#: ../src/gnome2/preferences_dialog.c:1618
+#: ../src/gnome2/preferences_dialog.c:1651
+#: ../src/gnome2/preferences_dialog.c:1683
+#: ../src/gnome2/preferences_dialog.c:1714
+#: ../src/gnome2/preferences_dialog.c:1745
+#: ../src/gnome2/preferences_dialog.c:1776
+#: ../src/gnome2/preferences_dialog.c:1808
+#: ../src/gnome2/preferences_dialog.c:1841
+#: ../src/gnome2/preferences_dialog.c:1892
+#: ../src/gnome2/preferences_dialog.c:2340
+msgid "-- Select --"
+msgstr "-- 선택 --"
+
+#: ../src/gnome2/preferences_dialog.c:1855
+msgid "Locale will take effect after restart."
+msgstr "다시 시작하고 나서 로캘을 적용합니다."
+
+#: ../src/gnome2/preferences_dialog.c:1925 ../ui/prefs.glade.h:1
+#: ../ui/prefs.gtkbuilder.h:9
+msgid "Preferences"
+msgstr "기본 설정"
+
+#: ../src/gnome2/preferences_dialog.c:2003
+msgid "General"
+msgstr "일반"
+
+#: ../src/gnome2/preferences_dialog.c:2006
+msgid "Options"
+msgstr "옵션"
+
+# 주: 고유명사이므로 번역해선 안됨. xiphos도 음역하지 않았으므로 용어 번역 일관성을 따르기 위해 번역하지 마십시오.
+#: ../src/gnome2/preferences_dialog.c:2009 ../ui/prefs.glade.h:85
+#: ../ui/prefs.gtkbuilder.h:85
+msgid "BibleSync"
+msgstr "BibleSync"
+
+#: ../src/gnome2/preferences_dialog.c:2013
+msgid "Fonts"
+msgstr "글꼴"
+
+#: ../src/gnome2/preferences_dialog.c:2016
+msgid "Color"
+msgstr "색상"
+
+#: ../src/gnome2/preferences_dialog.c:2019
+msgid "Sizes and Faces"
+msgstr "크기 및 모양새"
+
+#: ../src/gnome2/preferences_dialog.c:2033
+msgid "Special"
+msgstr "특수"
+
+#: ../src/gnome2/preferences_dialog.c:2721 ../src/gnome2/search_dialog.c:519
+msgid "Clear List?"
+msgstr "목록을 지웁니까?"
+
+#: ../src/gnome2/preferences_dialog.c:2722 ../src/gnome2/search_dialog.c:520
+msgid "Are you sure you want to clear the module list?"
+msgstr "정말로 모듈 목록을 지우시겠습니까?"
+
+#: ../src/gnome2/preferences_dialog.c:2773 ../src/main/search_dialog.cc:658
+msgid "Remove Module?"
+msgstr "모듈을 제거합니까?"
+
+#: ../src/gnome2/preferences_dialog.c:2774 ../src/main/search_dialog.cc:659
+msgid "Are you sure you want to remove the selected module?"
+msgstr "정말로 선택한 모듈을 제거하시겠습니까?"
+
+#: ../src/gnome2/search_dialog.c:62 ../src/main/search_dialog.cc:52
+#: ../src/main/search_sidebar.cc:51
+msgid "Searching the "
+msgstr "검색 "
+
+#: ../src/gnome2/search_dialog.c:63 ../src/main/search_dialog.cc:53
+#: ../src/main/search_sidebar.cc:52
+msgid " Module"
+msgstr " 모듈"
+
+#: ../src/gnome2/search_dialog.c:64 ../src/main/search_dialog.cc:54
+#: ../src/main/search_sidebar.cc:53
+msgid "found in "
+msgstr "다음에서 찾음 "
+
+#: ../src/gnome2/search_dialog.c:483
+#, c-format
+msgid "New List %s"
+msgstr "새 목록 %s"
+
+#: ../src/gnome2/search_dialog.c:700
+msgid "The last module list may not be deleted"
+msgstr "마지막 모듈 목록은 삭제하지 않을 수도 있습니다"
+
+#: ../src/gnome2/search_dialog.c:715
+msgid "Delete list?"
+msgstr "목록을 삭제합니까?"
+
+#: ../src/gnome2/search_dialog.c:716
+msgid "Are you sure you want to delete:"
+msgstr "정말로 다음을 삭제하시겠습니까:"
+
+#. *****************************************************************************
+#. * Name
+#. *   on_lucene_intro_clicked
+#. *
+#. * Synopsis
+#. *   #include "gui/search_dialog.h"
+#. *
+#. *   void on_lucene_intro_clicked(GtkToggleButton *button,
+#. *				  gpointer user_data)
+#. *
+#. * Description
+#. *
+#. *
+#. * Return value
+#. *   void
+#.
+#: ../src/gnome2/search_dialog.c:842
+msgid ""
+"<b>Syntax overview for optimized \"lucene\" searches</b>\n"
+"Search for verses that contain...\n"
+"\n"
+"loved one\n"
+"\t \"loved\" or \"one\"\n"
+"\tThis is the same as searching for loved OR one\n"
+"\"loved one\"\n"
+"\tThe phrase \"loved one\"\n"
+"love*\n"
+"\tA word starting with \"love\"\n"
+"\t(love OR loves OR loved OR etc...)\n"
+"loved AND one\n"
+"\tThe word \"loved\" and the word \"one\"\n"
+"\t&amp;&amp; can be used in place of AND\n"
+"+loved one\n"
+"\tVerses that <b>must</b> contain \"loved\" and <b>may</b> contain \"one\"\n"
+"loved NOT one\n"
+"\t\"loved\" but not \"one\"\n"
+"(loved one) AND God\n"
+"\t\"loved\" or \"one\" and \"God\"\n"
+"lemma:G2316\n"
+"\tSearch for the Strong's Greek (\"G\") word number 2316.\n"
+"\tAlso, select Strong's display on the <i>Attribute Search</i> tab.\n"
+"\n"
+"For complete details, search the web for \"lucene search syntax\"."
+msgstr ""
+"<b>잘 정리된 \"루씬\" 검색 문법 정리</b>\n"
+"다음 내용이 들어있는 구절을 검색할 경우...\n"
+"\n"
+"loved one\n"
+"\t \"loved\" or \"one\"\n"
+"\t이 방식은 loved OR one을 검색하는 방식과 같습니다\n"
+"\"loved one\"\n"
+"\t\"loved one\" 구절\n"
+"love*\n"
+"\t\"love\"로 시작하는 단어\n"
+"\t(love OR loves OR loved 등등...)\n"
+"loved AND one\n"
+"\t\"loved\" 단어와 \"one\" 단어\n"
+"\t&amp;&amp; 연산자를 AND 위치에 놓을 수 있습니다\n"
+"+loved one\n"
+"\t \"loved\"가 들어 <b>있어야</b> 하고 \"one\"을 포함 <b>할 수</b> 있습니다\n"
+"loved NOT one\n"
+"\t\"loved\"는 있지만 \"one\"은 없는 구절\n"
+"(loved one) AND God\n"
+"\t\"loved\" or \"one\" and \"God\"\n"
+"lemma:G2316\n"
+"\t스트롱 단어기호 헬라(\"G\") 번호 2316의 검색 결과를 보여줍니다.\n"
+"\t또한 <i>속성 검색</i> 탭에서 스트롱 표시 방식으로 보여줍니다.\n"
+"\n"
+"완벽한 내용을 자세히 살펴보시려면 \"루씬 검색 문법\"을 웹에서 찾아보세요."
+
+#. *****************************************************************************
+#. * Name
+#. *   on_attributes_intro_clicked
+#. *
+#. * Synopsis
+#. *   #include "gui/search_dialog.h"
+#. *
+#. *   void on_attributes_intro_clicked(GtkToggleButton *button,
+#. *				  gpointer user_data)
+#. *
+#. * Description
+#. *
+#. *
+#. * Return value
+#. *   void
+#.
+#: ../src/gnome2/search_dialog.c:900
+msgid ""
+"<b>Attribute-based searches</b>\n"
+"Searches for content contained in markup outside the main text. Attributes "
+"are footnotes, Strong's numbers, and morphological symbols.\n"
+"\n"
+"Be aware that most such searches can now be done faster via optimized "
+"\"lucene\" searches using keyword qualifiers.\n"
+"\n"
+"To use attribute searches, you must select the appropriate button on the "
+"<i>Attribute Search</i> tab.\n"
+"* Footnote text is searched just like regular text.\n"
+"* Strong's words are specified as a prefix letter H or G (Hebrew or Greek) "
+"and the numeric word identifier, e.g. G2316 to find \"θεός\" (\"God\").\n"
+"* Morphological tags are identified literally, e.g. N-ASF for \"noun, "
+"accusative singular feminine\" -- see the Robinson module for details."
+msgstr ""
+"<b>속성 기반 검색</b>\n"
+"본질적인 내용 밖에 있는 마크업에 일부 내용이 있는데 이 내용을 검색합니다. 속"
+"성에는 각주, 스트롱 번호, 어형론상 기호가 있습니다.\n"
+"\n"
+"대부분의 검색 결과는 키워드 검증자로 최적화된 \"루씬\" 검색이 더 빠를 수 있음"
+"을 참고하십시오.\n"
+"\n"
+"속성 검색을 사용하려면, <i>속성 검색</i> 탭의 적절한 단추를 선택해야합니다.\n"
+"* 각주 내용은 일반 내용처럼 검색합니다.\n"
+"* \"θεός\"(\"God\")를 검색하는데 사용하는 스트롱 기호에서 문자(단어)는 H 또"
+"는 G 접두문자(희랍, 헬라), 그리고 식별 숫자(예: G2316)를 사용합니다.\n"
+"* 어형론상 태그는 문장속 단어처럼 인식합니다. 예를 들면, N-ASF는\"noun, "
+"accusative singular feminine\" 입니다. 자세한 사용법은 Robinson 모듈을 살펴보"
+"십시오."
+
+#: ../src/gnome2/search_dialog.c:1195
+msgid "Module is neither Bible nor commentary"
+msgstr "모듈이 성경 또는 해설이 아닙니다."
+
+#: ../src/gnome2/search_dialog.c:1213 ../src/gnome2/sidebar.c:973
+msgid "BibleSync is not active for transmit."
+msgstr "BibleSync에서 전송 준비를 하지 않았습니다."
+
+#: ../src/gnome2/search_sidebar.c:215
+msgid ""
+"This is an inclusive (\"AND\") search:\n"
+"Find matches showing all words."
+msgstr ""
+"포함(\"AND\") 검색 방식입니다:\n"
+"모든 단어가 들어있는 결과를 찾습니다."
+
+#: ../src/gnome2/search_sidebar.c:227
+msgid "_Open Advanced Search"
+msgstr "고급 검색 열기(_O)"
+
+#: ../src/gnome2/search_sidebar.c:232
+msgid "Open the separate Advanced Search dialog."
+msgstr "고급 검색 대화상자를 따로 엽니다."
+
+#: ../src/gnome2/search_sidebar.c:248
+msgid "Search Module"
+msgstr "모듈 검색"
+
+#: ../src/gnome2/search_sidebar.c:285
+msgid "Search Type"
+msgstr "검색 형식"
+
+#: ../src/gnome2/search_sidebar.c:298 ../ui/search-dialog.glade.h:39
+#: ../ui/search-dialog.gtkbuilder.h:39
+msgid "Multi word"
+msgstr "여러 단어 일치"
+
+#: ../src/gnome2/search_sidebar.c:307 ../ui/search-dialog.glade.h:41
+#: ../ui/search-dialog.gtkbuilder.h:41
+msgid "Regular expression"
+msgstr "정규 표현식"
+
+#: ../src/gnome2/search_sidebar.c:314 ../ui/search-dialog.glade.h:43
+#: ../ui/search-dialog.gtkbuilder.h:43
+msgid "Exact phrase"
+msgstr "어구 일치"
+
+#: ../src/gnome2/search_sidebar.c:330
+msgid "Search Options"
+msgstr "검색 옵션"
+
+#: ../src/gnome2/search_sidebar.c:343 ../ui/search-dialog.glade.h:49
+#: ../ui/search-dialog.gtkbuilder.h:49
+msgid "Match case"
+msgstr "대소문자 일치"
+
+#: ../src/gnome2/search_sidebar.c:359
+msgid "Search Scope"
+msgstr "검색 범위"
+
+#: ../src/gnome2/search_sidebar.c:372
+msgid "No scope"
+msgstr "범위 없음"
+
+#: ../src/gnome2/search_sidebar.c:381
+msgid "Use bounds"
+msgstr "범위 사용"
+
+#: ../src/gnome2/search_sidebar.c:389
+msgid "Last search"
+msgstr "마지막 검색"
+
+#: ../src/gnome2/search_sidebar.c:406
+msgid "Bounds"
+msgstr "범위"
+
+#: ../src/gnome2/search_sidebar.c:421 ../src/gnome2/search_sidebar.c:453
+msgid "Lower"
+msgstr "아래로"
+
+#: ../src/gnome2/search_sidebar.c:433 ../src/gnome2/search_sidebar.c:460
+msgid "Upper"
+msgstr "위로"
+
+#: ../src/gnome2/sidebar.c:834
+msgid "Open module in editor?"
+msgstr "편집기에서 모듈을 여시겠습니까?"
+
+#: ../src/gnome2/sidebar.c:835
+msgid "If no, it will open for display only."
+msgstr "그렇지 않으면, 디스플레이만 엽니다."
+
+#: ../src/gnome2/sidebar.c:934
+msgid "Paste verse references"
+msgstr "절 참조 붙여넣기"
+
+#: ../src/gnome2/sidebar.c:936
+msgid "List:"
+msgstr "목록:"
+
+#: ../src/gnome2/sidebar.c:1507 ../src/gnome2/sidebar.c:1545
+msgid "Search"
+msgstr "검색"
+
+#: ../src/gnome2/sidebar_dialog.c:170 ../src/gnome2/sidebar_dialog.c:180
+msgid "Sidebar"
+msgstr "가장자리 표시줄"
+
+#: ../src/gnome2/splash.c:403
+msgid "Powered by the SWORD Project"
+msgstr "SWORD 프로젝트에서 기술 제공함"
+
+#: ../src/gnome2/tabbed_browser.c:358
+msgid "Can't create tabs dir."
+msgstr "탭 디렉터리를 만들 수 없습니다."
+
+#: ../src/gnome2/treekey-editor.c:136 ../src/gnome2/treekey-editor.c:193
+#: ../src/gnome2/treekey-editor.c:291
+msgid "Prayer List/Journal Item"
+msgstr "기도 목록/묵상 일기 항목"
+
+#: ../src/gnome2/treekey-editor.c:137 ../src/gnome2/treekey-editor.c:194
+#: ../src/gnome2/treekey-editor.c:292
+msgid "New name"
+msgstr "새 이름"
+
+#: ../src/gnome2/treekey-editor.c:252
+msgid "Remove the selected item"
+msgstr "선택한 항목 제거"
+
+#: ../src/gnome2/utilities.c:86
+msgid "January"
+msgstr "1월"
+
+#: ../src/gnome2/utilities.c:87
+msgid "February"
+msgstr "2월"
+
+#: ../src/gnome2/utilities.c:88
+msgid "March"
+msgstr "3월"
+
+#: ../src/gnome2/utilities.c:89
+msgid "April"
+msgstr "4월"
+
+#: ../src/gnome2/utilities.c:90
+msgid "May"
+msgstr "5월"
+
+#: ../src/gnome2/utilities.c:91
+msgid "June"
+msgstr "6월"
+
+#: ../src/gnome2/utilities.c:92
+msgid "July"
+msgstr "7월"
+
+#: ../src/gnome2/utilities.c:93
+msgid "August"
+msgstr "8월"
+
+#: ../src/gnome2/utilities.c:94
+msgid "September"
+msgstr "9월"
+
+#: ../src/gnome2/utilities.c:94
+msgid "October"
+msgstr "10월"
+
+#: ../src/gnome2/utilities.c:94
+msgid "November"
+msgstr "11월"
+
+#: ../src/gnome2/utilities.c:94
+msgid "December"
+msgstr "12월"
+
+#: ../src/gnome2/utilities.c:2038
+msgid ""
+"An image file's size could not be determined.\n"
+"Xiphos cannot resize images to fit window."
+msgstr ""
+"그림 파일의 크기를 알 수 없습니다.\n"
+"xiphos에서 창 크기에 맞춰 그림을 크기조절 할 수 없습니다."
+
+#: ../src/main/biblesync_glue.cc:104
+msgid ""
+"Mismatched packet\n"
+"\n"
+msgstr ""
+"일치하지 않는 패킷\n"
+"\n"
+
+#: ../src/main/biblesync_glue.cc:118
+msgid ""
+"Presence announcement:\n"
+"\n"
+msgstr ""
+"존재 알림:\n"
+"\n"
+
+#: ../src/main/biblesync_glue.cc:128
+msgid ""
+"Navigation packet:\n"
+"\n"
+msgstr ""
+"탐색 패킷:\n"
+"\n"
+
+#: ../src/main/biblesync_glue.cc:179
+msgid "Unknown module "
+msgstr "알 수 없는 모듈"
+
+#: ../src/main/biblesync_glue.cc:179
+msgid ""
+".\n"
+"Navigated indirectly using verse list."
+msgstr ""
+".\n"
+"절 목록으로 간접 탐색했습니다."
+
+#: ../src/main/biblesync_glue.cc:255
+msgid "ERROR: unknown BibleSync indicator: "
+msgstr "오류: 알 수 없는 BibleSync 표시자: "
+
+#: ../src/main/biblesync_glue.cc:255
+msgid "Other indications are:"
+msgstr "다른 표시:"
+
+#: ../src/main/biblesync_glue.cc:530
+msgid "Check the box to listen to this Speaker"
+msgstr "이 독서자의 읽기를 들으려면 상자에 표시하십시오"
+
+#: ../src/main/biblesync_glue.cc:543
+msgid "Available Speakers"
+msgstr "존재하는 독서자"
+
+#: ../src/main/biblesync_glue.cc:552
+msgid "D/I"
+msgstr "D/I"
+
+#: ../src/main/biblesync_glue.cc:562
+msgid "Last navigation was Direct or Indirect"
+msgstr "마지막 탐색은 직간접적인 방식입니다"
+
+#: ../src/main/biblesync_glue.cc:571
+msgid "Last Navigation"
+msgstr "마지막 탐색"
+
+#: ../src/main/biblesync_glue.cc:590
+msgid "UUID"
+msgstr "UUID"
+
+#: ../src/main/biblesync_glue.cc:610
+msgid "IP address: "
+msgstr "IP 주소: "
+
+#: ../src/main/biblesync_glue.cc:610
+msgid ""
+"\n"
+"Application: "
+msgstr ""
+"\n"
+"프로그램: "
+
+#: ../src/main/biblesync_glue.cc:610
+msgid ""
+"\n"
+"Device: "
+msgstr ""
+"\n"
+"장치: "
+
+#: ../src/main/biblesync_glue.cc:610
+msgid ""
+"\n"
+"UUID: "
+msgstr ""
+"\n"
+"UUID"
+
+#: ../src/main/display.cc:89
+msgid ""
+"<br/><br/><center><i>This module has no content at this point.</i></center>"
+msgstr "<br/><br/><center><i>이 모듈은 현재 내용이 없습니다</i></center>"
+
+#: ../src/main/display.cc:249
+#, c-format
+msgid ""
+"Improperly encoded personal annotation label:\n"
+"'%s'"
+msgstr ""
+"개인 주석을 올버르지 못한 방법으로 인코딩했습니다:\n"
+"'%s'"
+
+#: ../src/main/display.cc:1115 ../src/main/display.cc:1156
+#: ../src/main/display.cc:1240 ../ui/export-dialog.glade.h:14
+#: ../ui/export-dialog.gtkbuilder.h:13
+msgid "Chapter"
+msgstr "장"
+
+#: ../src/main/main.c:129
+msgid "Xiphos does not understand more than one argument."
+msgstr "xiphos에서 하나 이상의 매개변수를 인식할 수 없습니다."
+
+#: ../src/main/main.c:240
+msgid "Initiating HTML"
+msgstr "HTML 초기화 중"
+
+#: ../src/main/main.c:245
+msgid "Building Interface"
+msgstr "인더페이스 빌드 중"
+
+#: ../src/main/main.c:248
+msgid "Starting Sword"
+msgstr "sword 시작 중"
+
+#: ../src/main/main.c:251
+msgid "Loading Settings"
+msgstr "설정 불러오는 중"
+
+#: ../src/main/main.c:254
+msgid "Displaying Xiphos"
+msgstr "xiphos 창 표시 중"
+
+#: ../src/main/module_dialogs.cc:186 ../src/main/previewer.cc:100
+msgid "Previewer"
+msgstr "미리보기"
+
+#: ../src/main/module_dialogs.cc:240 ../src/main/module_dialogs.cc:344
+#: ../src/main/previewer.cc:188
+msgid "Footnote"
+msgstr "각주"
+
+#: ../src/main/module_dialogs.cc:246 ../src/main/module_dialogs.cc:349
+#: ../src/main/previewer.cc:198
+msgid "Cross Reference"
+msgstr "교차 참조"
+
+#: ../src/main/module_dialogs.cc:252 ../src/main/module_dialogs.cc:266
+#: ../src/main/module_dialogs.cc:354 ../src/main/module_dialogs.cc:366
+#: ../src/main/previewer.cc:203 ../src/main/previewer.cc:221
+msgid "Strongs"
+msgstr "불규칙 변화"
+
+#: ../src/main/module_dialogs.cc:258 ../src/main/module_dialogs.cc:277
+#: ../src/main/module_dialogs.cc:359 ../src/main/module_dialogs.cc:376
+#: ../src/main/previewer.cc:208 ../src/main/previewer.cc:227
+msgid "Morphology"
+msgstr "어형론"
+
+#: ../src/main/module_dialogs.cc:986 ../src/main/url.cc:515
+msgid "Back to "
+msgstr "돌아가기"
+
+#: ../src/main/parallel_view.cc:61
+msgid "Unknown parallel module: "
+msgstr "알 수 없는 병렬 모듈:"
+
+#: ../src/main/parallel_view.cc:400 ../ui/xi-menus.glade.h:68
+#: ../ui/xi-menus-popup.gtkbuilder.h:47
+msgid "Strong's Numbers"
+msgstr "불규칙 변화 수"
+
+#: ../src/main/parallel_view.cc:409 ../ui/search-dialog.glade.h:102
+#: ../ui/search-dialog.gtkbuilder.h:101 ../ui/xi-menus.glade.h:71
+#: ../ui/xi-menus-popup.gtkbuilder.h:50
+msgid "Footnotes"
+msgstr "각주"
+
+#: ../src/main/parallel_view.cc:418 ../ui/search-dialog.glade.h:99
+#: ../ui/search-dialog.gtkbuilder.h:98 ../ui/xi-menus.glade.h:70
+#: ../ui/xi-menus-popup.gtkbuilder.h:49
+msgid "Morphological Tags"
+msgstr "어형론상 태그"
+
+#: ../src/main/parallel_view.cc:427 ../ui/xi-menus.glade.h:76
+#: ../ui/xi-menus-popup.gtkbuilder.h:54
+msgid "Hebrew Vowel Points"
+msgstr "히브리어 모음 부호"
+
+#: ../src/main/parallel_view.cc:436 ../ui/xi-menus.glade.h:77
+#: ../ui/xi-menus-popup.gtkbuilder.h:55
+msgid "Hebrew Cantillation"
+msgstr "히브리어 가사"
+
+#: ../src/main/parallel_view.cc:445 ../ui/xi-menus.glade.h:75
+#: ../ui/xi-menus-popup.gtkbuilder.h:53
+msgid "Greek Accents"
+msgstr "그리스어 강세"
+
+#: ../src/main/parallel_view.cc:454 ../ui/xi-menus.glade.h:72
+#: ../ui/xi-menus-popup.gtkbuilder.h:51
+msgid "Cross-references"
+msgstr "교차 목록"
+
+#: ../src/main/parallel_view.cc:463 ../ui/xi-menus.glade.h:69
+#: ../ui/xi-menus-popup.gtkbuilder.h:48
+msgid "Lemmas"
+msgstr "기본형"
+
+#: ../src/main/parallel_view.cc:472 ../ui/xi-menus.glade.h:66
+#: ../ui/xi-menus-popup.gtkbuilder.h:45
+msgid "Headings"
+msgstr "제목"
+
+#: ../src/main/parallel_view.cc:481 ../src/main/parallel_view.cc:574
+#: ../ui/xi-menus.glade.h:86 ../ui/xi-menus-popup.gtkbuilder.h:64
+msgid "Morpheme Segmentation"
+msgstr "형태소 분리"
+
+#: ../src/main/parallel_view.cc:494 ../ui/xi-menus.glade.h:67
+#: ../ui/xi-menus-popup.gtkbuilder.h:46
+msgid "Words of Christ in Red"
+msgstr "적 그리스도 구절"
+
+#: ../src/main/parallel_view.cc:503 ../ui/xi-menus.glade.h:78
+#: ../ui/xi-menus-popup.gtkbuilder.h:56
+msgid "Transliteration"
+msgstr "음역"
+
+#: ../src/main/parallel_view.cc:512
+msgid "Textual Variants"
+msgstr "원문 변형"
+
+#: ../src/main/parallel_view.cc:520 ../ui/xi-menus.glade.h:80
+#: ../ui/xi-menus-popup.gtkbuilder.h:58
+msgid "Primary Reading"
+msgstr "제 1독서"
+
+#: ../src/main/parallel_view.cc:529 ../ui/xi-menus.glade.h:81
+#: ../ui/xi-menus-popup.gtkbuilder.h:59
+msgid "Secondary Reading"
+msgstr "제 2독서"
+
+#: ../src/main/parallel_view.cc:538 ../ui/xi-menus.glade.h:82
+#: ../ui/xi-menus-popup.gtkbuilder.h:60
+msgid "All Readings"
+msgstr "모든 독서"
+
+#: ../src/main/parallel_view.cc:547 ../ui/xi-menus.glade.h:83
+#: ../ui/xi-menus-popup.gtkbuilder.h:61
+msgid "Transliterated Forms"
+msgstr "음역 양식"
+
+#: ../src/main/parallel_view.cc:556 ../ui/xi-menus.glade.h:84
+#: ../ui/xi-menus-popup.gtkbuilder.h:62
+msgid "Enumerations"
+msgstr "목록"
+
+#: ../src/main/parallel_view.cc:565 ../ui/xi-menus.glade.h:85
+#: ../ui/xi-menus-popup.gtkbuilder.h:63
+msgid "Glosses"
+msgstr "해설 목록"
+
+#: ../src/main/parallel_view.cc:745
+msgid "view context"
+msgstr "뷰 컨텍스트"
+
+#: ../src/main/prayerlists.cc:107
+msgid "Growth"
+msgstr "성숙"
+
+#: ../src/main/prayerlists.cc:108
+msgid "<b>For Growth</b><br/>"
+msgstr "<b>성숙</b><br/>"
+
+#: ../src/main/prayerlists.cc:109 ../src/main/prayerlists.cc:361
+msgid "Salvation"
+msgstr "구원"
+
+#: ../src/main/prayerlists.cc:110
+msgid "<b>For Salvation</b><br/>"
+msgstr "<b>구원</b><br/>"
+
+#: ../src/main/prayerlists.cc:111 ../src/main/prayerlists.cc:365
+msgid "Health"
+msgstr "건강"
+
+#: ../src/main/prayerlists.cc:112
+msgid "<b>For Health</b><br/>"
+msgstr "<b>건강</b><br/>"
+
+#: ../src/main/prayerlists.cc:113
+msgid "Misc"
+msgstr "기타"
+
+#: ../src/main/prayerlists.cc:114
+msgid "<b>Miscellaneous</b><br/>"
+msgstr "<b>기타</b><br/>"
+
+#: ../src/main/prayerlists.cc:122
+msgid "Point x"
+msgstr "x 지점"
+
+#: ../src/main/prayerlists.cc:123
+msgid "<b>(x)</b><br/>"
+msgstr "<b>(x)</b><br/>"
+
+#: ../src/main/prayerlists.cc:124
+msgid "Point y"
+msgstr "y 지점"
+
+#: ../src/main/prayerlists.cc:125
+msgid "<b>(y)</b><br/>"
+msgstr "<b>(y)</b><br/>"
+
+#: ../src/main/prayerlists.cc:126
+msgid "Point z"
+msgstr "z 지점"
+
+#: ../src/main/prayerlists.cc:127
+msgid "<b>(z)</b><br/>"
+msgstr "<b>(z)</b><br/>"
+
+#: ../src/main/prayerlists.cc:135
+msgid "Minor Topic 1"
+msgstr "부 주제 1"
+
+#: ../src/main/prayerlists.cc:136
+msgid "<b>Subtopic 1</b><br/>"
+msgstr "<b>하위 주제 1</b><br/>"
+
+#: ../src/main/prayerlists.cc:138
+msgid "Minor Topic 2"
+msgstr "부 주제 2"
+
+#: ../src/main/prayerlists.cc:139
+msgid "<b>Subtopic 2</b><br/>"
+msgstr "<b>하위 주제 2</b><br/>"
+
+#: ../src/main/prayerlists.cc:141
+msgid "Minor Topic 3"
+msgstr "부 주제 3"
+
+#: ../src/main/prayerlists.cc:142
+msgid "<b>Subtopic 3</b><br/>"
+msgstr "<b>하위 주제 3</b><br/>"
+
+#: ../src/main/prayerlists.cc:144
+msgid "Minor Topic 4"
+msgstr "부 주제 4"
+
+#: ../src/main/prayerlists.cc:145
+msgid "<b>Subtopic 4</b><br/>"
+msgstr "<b>하위 주제 4</b><br/>"
+
+#: ../src/main/prayerlists.cc:229
+msgid "Name for new prayer list or journal"
+msgstr "새 기도 목록 또는 묵상 일기의 이름"
+
+#: ../src/main/prayerlists.cc:257
+msgid "Xiphos finds that prayer list already."
+msgstr "xiphos에서 이미 기도 목록을 찾았습니다."
+
+#. this one matters.
+#: ../src/main/prayerlists.cc:269
+#, c-format
+msgid ""
+"Xiphos cannot create module's path:\n"
+"%s"
+msgstr ""
+"xiphos에서 모듈 경로를 만들 수 없습니다:\n"
+"%s"
+
+#: ../src/main/prayerlists.cc:308
+msgid "A basic prayer list. \\par\\par Module created by Xiphos."
+msgstr "기본 기도 목록. \\par\\par xiphos가 만든 모듈임."
+
+#: ../src/main/prayerlists.cc:309
+msgid "BasicPrayerList"
+msgstr "기본 기도 목록"
+
+#: ../src/main/prayerlists.cc:322
+msgid "MyPrayerList"
+msgstr "내 기도 목록"
+
+#: ../src/main/prayerlists.cc:323
+msgid ""
+"<b>People:</b><br/>Bob<br/>Sam<br/>Sue<br/><br/><b>Church:</b><br/>pews<br/"
+">fellowship<br/>Bibles for missionaries<br/><br/><br/>"
+msgstr ""
+"<b>성도:</b><br/>Bob<br/>Sam<br/>Sue<br/><br/><b>교회:</b><br/>pews<br/"
+">fellowship<br/>Bibles for missionaries<br/><br/><br/>"
+
+#: ../src/main/prayerlists.cc:347
+msgid "A subject-based prayer list. \\par\\par Module created by Xiphos."
+msgstr "제목 기반 기도 목록. \\par\\par xiphos가 만든 모듈임."
+
+#: ../src/main/prayerlists.cc:348
+msgid "SubjectPrayerList"
+msgstr "기도 제목 목록"
+
+#: ../src/main/prayerlists.cc:362
+msgid "Bob<br/>Sam<br/>Sue<br/>John<br/>"
+msgstr "Bob<br/>Sam<br/>Sue<br/>John<br/>"
+
+#: ../src/main/prayerlists.cc:363
+msgid "Spiritual Growth"
+msgstr "영적 성숙"
+
+#: ../src/main/prayerlists.cc:364
+msgid "Mike<br/>Steve<br/>"
+msgstr "Mike<br/>Steve<br/>"
+
+#: ../src/main/prayerlists.cc:366
+msgid "Sue<br/>John<br/>"
+msgstr "Sue<br/>John<br/>"
+
+#: ../src/main/prayerlists.cc:390
+msgid "A monthly prayer list. \\par\\par Module created by Xiphos."
+msgstr "월별 기도 목록. \\par\\par xiphos가 만든 모듈임."
+
+#: ../src/main/prayerlists.cc:391
+msgid "MonthlyPrayerList"
+msgstr "월간 기도 목록"
+
+#: ../src/main/prayerlists.cc:439
+msgid "A daily journal. \\par\\par Module created by Xiphos."
+msgstr "매일 저널. \\par\\par xiphos가 만든 모듈임."
+
+#: ../src/main/prayerlists.cc:440
+msgid "DailyJournal"
+msgstr "묵상 일기"
+
+#: ../src/main/prayerlists.cc:501
+msgid "An outlined topic (e.g. sermon). \\par\\par Module created by Xiphos."
+msgstr "주제(예: 설교) 윤곽잡기. \\par\\par xiphos가 만든 모듈임."
+
+#: ../src/main/prayerlists.cc:502
+msgid "OutlinedTopic"
+msgstr "개요주제"
+
+#: ../src/main/prayerlists.cc:515
+msgid "Major Topic A"
+msgstr "주제 가"
+
+#: ../src/main/prayerlists.cc:516
+msgid "<b>Major Topic A</b><br/>"
+msgstr "<b>주제 가</b><br/>"
+
+#: ../src/main/prayerlists.cc:518
+msgid "Major Topic B"
+msgstr "주제 나"
+
+#: ../src/main/prayerlists.cc:519
+msgid "<b>Major Topic B</b><br/>"
+msgstr "<b>주제 나</b><br/>"
+
+#: ../src/main/prayerlists.cc:521
+msgid "Major Topic C"
+msgstr "주제 다"
+
+#: ../src/main/prayerlists.cc:522
+msgid "<b>Major Topic C</b><br/>"
+msgstr "<b>주제 다</b><br/.>"
+
+#: ../src/main/previewer.cc:193
+msgid "User Annotation"
+msgstr "사용자 주석"
+
+#: ../src/main/search_dialog.cc:188
+#, c-format
+msgid "Search result %s: %s"
+msgstr "%s 검색 결과: %s"
+
+#: ../src/main/search_dialog.cc:404
+msgid "Delete Range?"
+msgstr "범위를 삭제합니까?"
+
+#: ../src/main/search_dialog.cc:405
+msgid "Are you sure you want to delete this range?"
+msgstr "정말로 이 범위를 삭제하시겠습니까?"
+
+#: ../src/main/search_dialog.cc:618 ../src/main/search_dialog.cc:1021
+#: ../src/main/search_dialog.cc:1024 ../src/main/search_dialog.cc:1044
+#: ../src/main/search_dialog.cc:1047
+msgid "Search: "
+msgstr "검색:"
+
+#: ../src/main/search_dialog.cc:1376
+#, c-format
+msgid ""
+"%s:\n"
+"No such module is installed.\n"
+"%s"
+msgstr ""
+"%s:\n"
+"설치한 모듈이 없습니다.\n"
+"%s"
+
+#: ../src/main/search_dialog.cc:1378
+msgid "Please adjust the module list."
+msgstr "모듈 목록을 조정하십시오."
+
+#: ../src/main/search_dialog.cc:1394
+#, c-format
+msgid "No fast-search index exists for %s.%s%s"
+msgstr "%s.%s%s의 비 고속 검색 인덱스가 있습니다"
+
+#: ../src/main/search_dialog.cc:1396
+msgid ""
+"\n"
+"Search on this module is now `multi word'."
+msgstr ""
+"\n"
+"이 모듈 검색 방식은 이제 `여러 단어'를 사용한 방식입니다."
+
+#: ../src/main/search_dialog.cc:1397
+msgid ""
+"\n"
+"See the Module Manager, Maintenance pane."
+msgstr ""
+"\n"
+"관리 창의 모듈 관리자를 참고하십시오."
+
+#: ../src/main/search_dialog.cc:1458
+msgid "Search finished"
+msgstr "검색이 끝났습니다"
+
+#: ../src/main/search_sidebar.cc:88
+msgid "matches"
+msgstr "일치 건수"
+
+#: ../src/main/search_sidebar.cc:203
+msgid "There is no commentary module."
+msgstr "해설 모듈이 없습니다."
+
+#: ../src/main/settings.c:106
+msgid "$HOME is not set!"
+msgstr "$HOME을 설정하지 않았습니다"
+
+#: ../src/main/settings.c:120
+#, c-format
+msgid "Xiphos can not create directory "
+msgstr "xiphos에서 디렉터리를 만들 수 없습니다"
+
+#: ../src/main/settings.c:134 ../src/main/settings.c:144
+#: ../src/main/settings.c:155
+msgid "can not create "
+msgstr "만들 수 없습니다"
+
+#: ../src/main/settings.c:187
+msgid ""
+"Empty settings file -- backup recovery attempted.\n"
+"Some information may have been lost."
+msgstr ""
+"설정 파일이 비었습니다 -- 백업 복구를 시도했습니다.\n"
+"일부 정보를 잃을 수 있습니다."
+
+#: ../src/main/settings.c:190
+msgid "Empty settings file -- no backup?!? Information lost!"
+msgstr "설정 파일이 비었습니다 -- 백업이 없나요?!? 정보가 없습니다!"
+
+#: ../src/main/settings.c:217
+msgid ""
+"There are no Bibles installed.\n"
+"Evidently, you declined to install any.\n"
+"\n"
+"Without any Bible modules to display,\n"
+"Xiphos cannot proceed,\n"
+"and will now exit."
+msgstr ""
+"설치한 성경이 없습니다.\n"
+"분명하게도 어떤 성경 모듈이든\n"
+"\n"
+"표시할 성경의 설치를 거부했기 때문에,\n"
+"xiphos는 계속 진행할 수 없으며,\n"
+"빠져나가겠습니다."
+
+#: ../src/main/settings.c:223
+msgid "Bible module installation complete."
+msgstr "성경 모듈 설치가 끝났습니다."
+
+#: ../src/main/sidebar.cc:146
+msgid ""
+"Module error: Unusable xref encoding.\n"
+"Please report this, with module & verse"
+msgstr ""
+"모듈 오류: xref 인코딩이 무용지물입니다.\n"
+"모듈과 해당 절의 문제를 보고하십시오"
+
+#: ../src/main/sidebar.cc:411
+msgid "verse"
+msgstr "절"
+
+#: ../src/main/sidebar.cc:471
+msgid "chapter"
+msgstr "장"
+
+#: ../src/main/sword.cc:654
+msgid ""
+"Xiphos's file for language\n"
+"abbreviations is missing."
+msgstr ""
+"xiphos 언어 약어 파일이\n"
+"빠졌습니다"
+
+#: ../src/main/sword.cc:660
+msgid ""
+"Xiphos's language abbreviation\n"
+"file cannot be opened."
+msgstr ""
+"xiphos 언어 약어 파일을\n"
+"열 수 없습니다"
+
+#: ../src/main/sword.cc:672
+msgid ""
+"Xiphos cannot allocate space\n"
+"for language abbreviations."
+msgstr ""
+"xiphos에서 언어 약어를 저장할\n"
+"공간을 확보할 수 없습니다"
+
+#: ../src/main/sword.cc:678
+msgid ""
+"Xiphos cannot read the\n"
+"language abbreviation file."
+msgstr ""
+"xiphos에서 언어 약어 파일을\n"
+"읽을 수 없습니다."
+
+#. either we were given a null sys_locale, or it didn't match anything.
+#: ../src/main/sword.cc:758
+#, c-format
+msgid ""
+"No matching locale found for `%s'.\n"
+"%s"
+msgstr ""
+"`%s'에 일치하는 로캘이 없습니다.\n"
+"%s"
+
+#: ../src/main/sword.cc:760
+msgid "Book names and menus may not be translated."
+msgstr "책 이름과 메뉴는 번역하면 안됩니다."
+
+#: ../src/main/sword.cc:1114 ../src/main/sword.cc:1283
+#, c-format
+msgid ""
+"Module %s has companion modules:\n"
+"%s.\n"
+"Would you like to open these as well?%s"
+msgstr ""
+"%s 모듈은 부록 모듈입니다:\n"
+"%s.\n"
+"이 모듈 역시 마찬가지로 여시겠습니까?%s"
+
+#: ../src/main/sword.cc:1118 ../src/main/sword.cc:1287
+msgid ""
+"\n"
+"\n"
+"The first will open in the main window\n"
+...
 
[truncated message content]