diary r53 - in trunk: . data po src

[pwithnall svn gnome org]

Author: pwithnall
Date: Mon Jun 23 16:11:00 2008
New Revision: 53
URL: http://svn.gnome.org/viewvc/diary?rev=53&view=rev

Log:
2008-06-23  Philip Withnall  <philip tecnocode co uk>

	* data/diary.ui: Mark some strings as translatable.
	* src/interface.c: (diary_create_interface): Improve the error
	message when the UI can't be loaded.
	* po/POTFILES.in: Fix translation of the UI.
	* po/en_GB.po: Updated British English translation.



Modified:
   trunk/ChangeLog
   trunk/data/diary.ui
   trunk/po/ChangeLog
   trunk/po/POTFILES.in
   trunk/po/en_GB.po
   trunk/src/interface.c

Modified: trunk/data/diary.ui
==============================================================================
--- trunk/data/diary.ui	(original)
+++ trunk/data/diary.ui	Mon Jun 23 16:11:00 2008
@@ -6,7 +6,7 @@
 				<child>
 					<object class="GtkAction" id="dry_ui_file">
 						<property name="name">file</property>
-						<property name="label">_File</property>
+						<property name="label" translatable="yes">_File</property>
 					</object>
 				</child>
 				<child>
@@ -26,7 +26,7 @@
 				<child>
 					<object class="GtkAction" id="dry_ui_edit">
 						<property name="name">edit</property>
-						<property name="label">_Edit</property>
+						<property name="label" translatable="yes">_Edit</property>
 					</object>
 				</child>
 				<child>
@@ -68,7 +68,7 @@
 				<child>
 					<object class="GtkAction" id="dry_ui_help">
 						<property name="name">help</property>
-						<property name="label">_Help</property>
+						<property name="label" translatable="yes">_Help</property>
 					</object>
 				</child>
 				<child>
@@ -169,7 +169,6 @@
 							<object class="GtkVBox" id="vbox3">
 								<child>
 									<object class="GtkLabel" id="dry_mw_date_label">
-										<property name="label" translatable="yes">&lt;big&gt;&lt;big&gt;&lt;b&gt;Wednesday, March 5, 2007&lt;/b&gt;&lt;/big&gt;&lt;/big&gt;</property>
 										<property name="use-markup">True</property>
 									</object>
 									<packing>
@@ -448,7 +447,7 @@
 				</child>
 				<child>
 					<object class="GtkLabel" id="label2">
-						<property name="label">&lt;b&gt;Results&lt;/b&gt;</property>
+						<property name="label" translatable="yes">&lt;b&gt;Results&lt;/b&gt;</property>
 						<property name="use-markup">True</property>
 					</object>
 					<packing>

Modified: trunk/po/POTFILES.in
==============================================================================
--- trunk/po/POTFILES.in	(original)
+++ trunk/po/POTFILES.in	Mon Jun 23 16:11:00 2008
@@ -1,7 +1,7 @@
 # List of source files containing translatable strings.
 [encoding: UTF-8]
 data/diary.desktop.in
-data/diary.ui
+[type: gettext/glade]data/diary.ui
 src/interface.c
 src/link.c
 src/links/file.c

Modified: trunk/src/interface.c
==============================================================================
--- trunk/src/interface.c	(original)
+++ trunk/src/interface.c	Mon Jun 23 16:11:00 2008
@@ -35,14 +35,15 @@
 
 	builder = gtk_builder_new ();
 
-	if (gtk_builder_add_from_file (builder, PACKAGE_DATA_DIR"/diary/diary.ui", &error) == FALSE &&
-	    gtk_builder_add_from_file (builder, "./data/diary.ui", NULL) == FALSE) {
+	if (gtk_builder_add_from_file (builder, PACKAGE_DATA_DIR"/diary2/diary.ui", &error) == FALSE &&
+	    gtk_builder_add_from_file (builder, "./data2/diary.ui", NULL) == FALSE) {
 		/* Show an error */
 		GtkWidget *dialog = gtk_message_dialog_new (NULL,
 				GTK_DIALOG_MODAL,
 				GTK_MESSAGE_ERROR,
 				GTK_BUTTONS_OK,
-				_("UI file \"%s/diary/diary.ui\" could not be loaded. Error: %s"), PACKAGE_DATA_DIR, error->message);
+				_("UI file \"%s/diary/diary.ui\" could not be loaded."), PACKAGE_DATA_DIR);
+		gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), error->message);
 		gtk_dialog_run (GTK_DIALOG (dialog));
 		gtk_widget_destroy (dialog);