gnome-mud r681 - in trunk: . ui

[jordim svn gnome org]

Author: jordim
Date: Fri Jul 18 11:52:11 2008
New Revision: 681
URL: http://svn.gnome.org/viewvc/gnome-mud?rev=681&view=rev

Log:
2008-07-18  Jordi Mallach  <jordi sindominio net>

	* Makefile.am: Make schema installation conditional to
	GCONF_SCHEMAS_INSTALL.

	* gnome-mud.schemas.in: Remove "charset" from a string.
	* ui/prefs.glade: Mark a string as non-translatable.


Modified:
   trunk/ChangeLog
   trunk/Makefile.am
   trunk/gnome-mud.schemas.in
   trunk/ui/prefs.glade

Modified: trunk/Makefile.am
==============================================================================
--- trunk/Makefile.am	(original)
+++ trunk/Makefile.am	Fri Jul 18 11:52:11 2008
@@ -40,6 +40,13 @@
 
 DISTCHECK_CONFIGURE_FLAGS = --disable-schemas-install --disable-scrollkeeper
 
+if GCONF_SCHEMAS_INSTALL
 install-data-local:
-	-GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/$(schema_DATA)
-
+	if test -z "$(DESTDIR)" ; then \
+	  for p in $(schemas_DATA) ; do \
+	    GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/$$p ; \
+          done \
+        fi
+else
+install-data-local:
+endif

Modified: trunk/gnome-mud.schemas.in
==============================================================================
--- trunk/gnome-mud.schemas.in	(original)
+++ trunk/gnome-mud.schemas.in	Fri Jul 18 11:52:11 2008
@@ -165,7 +165,7 @@
 			<locale name="C">
 				<short>Remote Encoding</short>
 				<long>
-				Use Remote Encoding charset negotiation.
+				Use Remote Encoding negotiation.
 				</long>
 			</locale>
 		</schema>

Modified: trunk/ui/prefs.glade
==============================================================================
--- trunk/ui/prefs.glade	(original)
+++ trunk/ui/prefs.glade	Fri Jul 18 11:52:11 2008
@@ -506,7 +506,7 @@
 				  <child>
 				    <widget class="GtkComboBox" id="proxy_combo">
 				      <property name="visible">True</property>
-				      <property name="items" translatable="yes">4
+				      <property name="items">4
 5</property>
 				      <property name="add_tearoffs">False</property>
 				      <property name="focus_on_click">True</property>