From 31bd44a96ae5c7f2687d2c37f037a386a087ad17 Mon Sep 17 00:00:00 2001
From: Jim Evins <evins@snaught.com>
Date: Mon, 15 Dec 2008 04:54:58 +0000
Subject: [PATCH] 2008-12-14  Jim Evins  <evins@snaught.com>

	* src/ui.c: (gl_ui_new):
		Bug #2395628.  Fixed i18n for application shell.
	* po/POTFILES.in:
		Bug #2395628.  Reconciled POTFILES.in with current files.


git-svn-id: https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@801 f5e0f49d-192f-0410-a22d-a8d8700d0965
---
 glabels2/ChangeLog      |  7 +++++
 glabels2/po/POTFILES.in | 64 +++++++++++++++++++++++------------------
 glabels2/src/ui.c       |  1 +
 3 files changed, 44 insertions(+), 28 deletions(-)

diff --git a/glabels2/ChangeLog b/glabels2/ChangeLog
index 520499e4..153b637c 100644
--- a/glabels2/ChangeLog
+++ b/glabels2/ChangeLog
@@ -1,3 +1,10 @@
+2008-12-14  Jim Evins  <evins@snaught.com>
+
+	* src/ui.c: (gl_ui_new):
+		Bug #2395628.  Fixed i18n for application shell.
+	* po/POTFILES.in:
+		Bug #2395628.  Reconciled POTFILES.in with current files.
+	
 2008-12-14  Jim Evins  <evins@snaught.com>
 
 	* configure.in:
diff --git a/glabels2/po/POTFILES.in b/glabels2/po/POTFILES.in
index e6b7ee95..9c9b5f4e 100644
--- a/glabels2/po/POTFILES.in
+++ b/glabels2/po/POTFILES.in
@@ -56,6 +56,7 @@ src/object-editor-lsize-page.c
 src/object-editor-position-page.c
 src/object-editor-size-page.c
 src/object-editor-text-page.c
+src/object-editor-shadow-page.c
 src/merge-properties-dialog.c
 src/merge-properties-dialog.h
 src/print.c
@@ -102,6 +103,14 @@ src/merge-text.h
 src/merge-evolution.c
 src/text-node.c
 src/text-node.h
+src/color-combo.c
+src/color-combo.h
+src/color-combo-color-menu-item.c
+src/color-combo-color-menu-item.h
+src/color-combo-history.c
+src/color-combo-history.h
+src/color-combo-menu.c
+src/color-combo-menu.h
 src/wdgt-print-copies.c
 src/wdgt-print-copies.h
 src/wdgt-print-merge.c
@@ -120,51 +129,50 @@ src/color.c
 src/color.h
 src/debug.c
 src/debug.h
-src/mygal/color-group.c
-src/mygal/color-group.h
-src/mygal/color-palette.c
-src/mygal/color-palette.h
-src/mygal/e-colors.c
-src/mygal/e-colors.h
-src/mygal/e-util.h
-src/mygal/mygal-combo-box.c
-src/mygal/mygal-combo-box.h
-src/mygal/widget-color-combo.c
-src/mygal/widget-color-combo.h
 src/critical-error-handler.c
 src/warning-handler.c
 
 libglabels/category.c
-libglabels/template.c
-libglabels/template.h
+libglabels/category.h
+libglabels/db.c
+libglabels/db.h
+libglabels/enums.h
+libglabels/libglabels-private.h
 libglabels/paper.c
 libglabels/paper.h
-libglabels/xml-template.c
-libglabels/xml-template.h
-libglabels/xml-paper.c
-libglabels/xml-paper.h
+libglabels/str.c
+libglabels/str.h
+libglabels/template.c
+libglabels/template.h
 libglabels/xml.c
 libglabels/xml.h
+libglabels/xml-category.c
+libglabels/xml-category.h
+libglabels/xml-paper.c
+libglabels/xml-paper.h
+libglabels/xml-template.c
+libglabels/xml-template.h
 
-data/glade/merge-properties-dialog.glade
-data/glade/new-label-dialog.glade
-data/glade/object-editor.glade
-data/glade/prefs-dialog.glade
-data/glade/print-custom-widget.glade
-data/glade/property-bar.glade
-data/glade/template-designer.glade
-data/glade/wdgt-media-select.glade
-data/glade/wdgt-rotate-label.glade
+data/builder/merge-properties-dialog.glade
+data/builder/new-label-dialog.glade
+data/builder/object-editor.glade
+data/builder/prefs-dialog.glade
+data/builder/print-custom-widget.glade
+data/builder/property-bar.glade
+data/builder/template-designer.glade
+data/builder/wdgt-media-select.glade
 
 data/templates/paper-sizes.xml
+data/templates/categories.xml
 data/templates/avery-us-templates.xml
 data/templates/avery-iso-templates.xml
 data/templates/avery-other-templates.xml
-data/templates/categories.xml
-data/templates/zweckform-iso-templates.xml
+data/templates/brother-other-templates.xml
+data/templates/dymo-other-templates.xml
 data/templates/misc-us-templates.xml
 data/templates/misc-iso-templates.xml
 data/templates/misc-other-templates.xml
+data/templates/zweckform-iso-templates.xml
 
 data/desktop/glabels.desktop.in
 
diff --git a/glabels2/src/ui.c b/glabels2/src/ui.c
index ab6e2067..f8cbd128 100644
--- a/glabels2/src/ui.c
+++ b/glabels2/src/ui.c
@@ -775,6 +775,7 @@ gl_ui_new (glWindow *window)
 			  G_CALLBACK (disconnect_proxy_cb), window);
 
 	actions = gtk_action_group_new ("Actions");
+        gtk_action_group_set_translation_domain (actions, NULL);
 	gtk_action_group_add_actions (actions, entries, n_entries, GTK_WINDOW (window));
 	gtk_action_group_add_toggle_actions (actions, 
 					     toggle_entries, n_toggle_entries, 
-- 
2.39.2