gnome-mud r837 - in trunk: . src ui

[lharris svn gnome org]

Author: lharris
Date: Thu Mar 26 17:05:20 2009
New Revision: 837
URL: http://svn.gnome.org/viewvc/gnome-mud?rev=837&view=rev

Log:
Translation string fixes.

Modified:
   trunk/ChangeLog
   trunk/src/mud-connections.c
   trunk/src/mud-trigger.c
   trunk/src/mud-trigger.h
   trunk/src/mud-window-prefs.c
   trunk/ui/muds.glade
   trunk/ui/prefs.glade

Modified: trunk/src/mud-connections.c
==============================================================================
--- trunk/src/mud-connections.c	(original)
+++ trunk/src/mud-connections.c	Thu Mar 26 17:05:20 2009
@@ -228,6 +228,7 @@
 
     GladeXML *glade;
     GConfClient *client;
+    GtkWidget *main_window;
 
     GObject *obj;
     MudConnectionsClass *klass;
@@ -321,6 +322,12 @@
 
     mud_connections_populate_iconview(conn);
 
+    g_object_get(conn->parent_window, "window", &main_window, NULL);
+
+    g_object_set(conn->priv->window,
+                 "transient-for", GTK_WINDOW(main_window),
+                 NULL);
+
     gtk_widget_show_all(conn->priv->window);
     g_object_unref(glade);
     g_object_unref(client);

Modified: trunk/src/mud-trigger.c
==============================================================================
--- trunk/src/mud-trigger.c	(original)
+++ trunk/src/mud-trigger.c	Thu Mar 26 17:05:20 2009
@@ -34,12 +34,22 @@
     gulong lines;
 
     gboolean enabled;
+
     gboolean gag_output;
+    
     gboolean multiline;
-    gboolean set;
+    gboolean filter;
+
+    /* Glob Triggers */
+    GPatternSpec *glob;
+    gchar *glob_string;
 
+    /* Regex Triggers */
     GRegex *regex;
     gchar *regex_string;
+
+    /* Condition Triggers */
+    GList *condition_items;
 };
 
 /* Property Identifiers */

Modified: trunk/src/mud-trigger.h
==============================================================================
--- trunk/src/mud-trigger.h	(original)
+++ trunk/src/mud-trigger.h	Thu Mar 26 17:05:20 2009
@@ -53,7 +53,8 @@
 {
     MUD_TRIGGER_TYPE_SINGLE,
     MUD_TRIGGER_TYPE_MULTI,
-    MUD_TRIGGER_TYPE_SET
+    MUD_TRIGGER_TYPE_FILTER,
+    MUD_TRIGGER_TYPE_CONDITION
 } MudTriggerType;
 
 GType         mud_trigger_get_type (void);

Modified: trunk/src/mud-window-prefs.c
==============================================================================
--- trunk/src/mud-window-prefs.c	(original)
+++ trunk/src/mud-window-prefs.c	Thu Mar 26 17:05:20 2009
@@ -430,11 +430,11 @@
     self->priv->font_button    = glade_xml_get_widget(glade, "fp_font");
     self->priv->fore_button    = glade_xml_get_widget(glade, "cb_foreground");
     self->priv->back_button    = glade_xml_get_widget(glade, "cb_background");
-    self->priv->proxy_check   = glade_xml_get_widget(glade, "proxy_check");
-    self->priv->proxy_entry   = glade_xml_get_widget(glade, "proxy_entry");
-    self->priv->proxy_combo   = glade_xml_get_widget(glade, "proxy_combo");
-    self->priv->msp_check     = glade_xml_get_widget(glade, "msp_check");
-    self->priv->charset_check = glade_xml_get_widget(glade, "charset_check");
+    self->priv->proxy_check    = glade_xml_get_widget(glade, "proxy_check");
+    self->priv->proxy_entry    = glade_xml_get_widget(glade, "proxy_entry");
+    self->priv->proxy_combo    = glade_xml_get_widget(glade, "proxy_combo");
+    self->priv->msp_check      = glade_xml_get_widget(glade, "msp_check");
+    self->priv->charset_check  = glade_xml_get_widget(glade, "charset_check");
 
     for(i = 0; i < C_MAX; ++i)
     {

Modified: trunk/ui/muds.glade
==============================================================================
--- trunk/ui/muds.glade	(original)
+++ trunk/ui/muds.glade	Thu Mar 26 17:05:20 2009
@@ -8,7 +8,6 @@
     <property name="window_position">center-on-parent</property>
     <property name="default_width">600</property>
     <property name="default_height">400</property>
-    <property name="type_hint">dialog</property>
     <property name="skip_taskbar_hint">True</property>
     <property name="skip_pager_hint">True</property>
     <child>
@@ -159,7 +158,7 @@
                 </child>
                 <child>
                   <widget class="GtkButton" id="qconnect_connect_button">
-                    <property name="label" translatable="no">gtk-connect</property>
+                    <property name="label">gtk-connect</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="can_default">True</property>

Modified: trunk/ui/prefs.glade
==============================================================================
--- trunk/ui/prefs.glade	(original)
+++ trunk/ui/prefs.glade	Thu Mar 26 17:05:20 2009
@@ -495,7 +495,7 @@
                             <child>
                               <widget class="GtkComboBox" id="encoding_combo">
                                 <property name="visible">True</property>
-                                <property name="items" translatable="yes">ISO-8859-1
+                                <property name="items">ISO-8859-1
 ISO-8859-2
 ISO-8859-3
 ISO-8859-4
@@ -1191,7 +1191,7 @@
                               <widget class="GtkComboBox" id="proxy_combo">
                                 <property name="visible">True</property>
                                 <property name="sensitive">False</property>
-                                <property name="items" translatable="yes">4
+                                <property name="items">4
 5</property>
                               </widget>
                               <packing>