Changeset 292

Timestamp:

07/04/08 17:11:30 (3 months ago)

Author:

mattn

Message:

* more translateable strings
* fixed warning about unused variable

Files:

• GtkRadiant/trunk/contrib/bkgrnd2d/dialog.cpp (modified) (11 diffs)
• GtkRadiant/trunk/contrib/camera/dialogs.cpp (modified) (37 diffs)
• GtkRadiant/trunk/contrib/gtkgensurf/gendlgs.cpp (modified) (56 diffs)
• GtkRadiant/trunk/contrib/prtview/gtkdlgs.cpp (modified) (13 diffs)
• GtkRadiant/trunk/plugins/surface_ufoai/surfaceflagsdialog_ufoai.cpp (modified) (2 diffs)
• GtkRadiant/trunk/radiant.pot (modified) (10 diffs)
• GtkRadiant/trunk/radiant/findtexturedialog.cpp (modified) (11 diffs)
• GtkRadiant/trunk/radiant/gtkmisc.cpp (modified) (9 diffs)
• GtkRadiant/trunk/radiant/patchdialog.cpp (modified) (23 diffs)
• GtkRadiant/trunk/radiant/surfacedialog.cpp (modified) (52 diffs)

GtkRadiant/trunk/contrib/bkgrnd2d/dialog.cpp

@@ -32 +32 @@
-#include "bkgrnd2d.h"
-#include "dialog.h"
+#include <glib/gi18n.h>
-
-// spaces to make label nice and big
@@ -147 +148 @@
-//TODO patern gets fucked up sometimes if empty
-        newfile = g_FuncTable.m_pfnFileDialog(pDialogWnd,TRUE,
-"Load Background Image"
+_("Load Background Image")
-        if(!newfile) {
-                Syn_Printf(MSG_PREFIX "newfile = NULL\n");
@@ -170 +171 @@
-{
-        char s[64];
-
-
+
-                        (int)(m_pImage->m_ymin),(int)(m_pImage->m_xmax),(int)(m_pImage->m_ymax));
-        gtk_label_set_text(GTK_LABEL(m_pPosLabel),s);
@@ -189 +189 @@
-        {
-                case XY:
-"X/Y"
+_("X/Y")
-                        m_pImage = &backgroundXY;
-                        break;
-                case XZ:
-"X/Z"
+_("X/Z")
-                        m_pImage = &backgroundXZ;
-                        break;
-                case YZ:
-"Y/Z"
+_("Y/Z")
-                        m_pImage = &backgroundYZ;
-                        break;
@@ -204 +204 @@
-        m_pWidget = gtk_vbox_new(FALSE,0);
-// Frame for file row
-"File"
+_("File")
-        gtk_box_pack_start (GTK_BOX (m_pWidget),frame, FALSE, FALSE, 2);
-
@@ -240 +240 @@
-
-// second row (rendering options)
-"Rendering"
+_("Rendering")
-        gtk_box_pack_start (GTK_BOX (m_pWidget),frame, FALSE, FALSE, 2);
-
@@ -247 +247 @@
-        gtk_container_add (GTK_CONTAINER (frame), hbox);
-
-"Vertex alpha:"
+_("Vertex alpha:")
-        gtk_box_pack_start (GTK_BOX (hbox),w, FALSE, FALSE, 5);
-  gtk_widget_show (w);
@@ -257 +257 @@
-                          G_CALLBACK (alpha_adjust_callback), (gpointer)this);
-        gtk_box_pack_start (GTK_BOX (hbox),w, TRUE, TRUE, 5);
-"Set image transparancy"
+_("Set image transparancy")
-  gtk_widget_show (w);
-
@@ -263 +263 @@
-        gtk_widget_show (frame);
-// Third row (size and position)
-"Size/Position (undefined)"
+_("Size/Position (undefined)")
-        m_pPosLabel = gtk_frame_get_label_widget (GTK_FRAME(frame));
-        gtk_box_pack_start ( GTK_BOX (m_pWidget), frame, FALSE, FALSE, 2);
@@ -271 +271 @@
-        gtk_container_set_border_width(GTK_CONTAINER (hbox),4);
-
-"from selection"
+_("from selection")
-        gtk_box_pack_start (GTK_BOX (hbox),w, TRUE, FALSE, 5);
-        g_signal_connect (G_OBJECT (w), "clicked", G_CALLBACK (size_sel_callback),
-                                                                (gpointer)this);
-"Set the size of the image to the bounding rectangle of all selected brushes and entities"
+_("Set the size of the image to the bounding rectangle of all selected brushes and entities")
-  gtk_widget_show (w);
-
-        if(m_vt == XY) {
-"from map mins/maxs"
+_("from map mins/maxs")
-                gtk_box_pack_start ( GTK_BOX (hbox),w, TRUE, FALSE, 2);
-                g_signal_connect (G_OBJECT (w), "clicked", G_CALLBACK (size_mm_callback),
-                                                                (gpointer)this);
-"Set the size of the image using the mapcoordsmins and mapcoordsmaxs keys of the worldspawn entity"
+_("Set the size of the image using the mapcoordsmins and mapcoordsmaxs keys of the worldspawn entity")
-                gtk_widget_show (w);
-        }
@@ -322 +322 @@
-        CBackgroundDialogPage *pPage;
-
-"Background Images"
+_("Background Images")
-                              GTK_WINDOW(g_pMainWidget),
-                              (GtkDialogFlags)(GTK_DIALOG_DESTROY_WITH_PARENT),

GtkRadiant/trunk/contrib/camera/dialogs.cpp

@@ -94 +94 @@
-        gtk_widget_show( hbox );
-
-"Type"
+_("Type")
-  gtk_box_pack_start( GTK_BOX( hbox ), frame, TRUE, TRUE, 0 );
-  gtk_widget_show( frame );
@@ -157 +157 @@
-                while (loop)
-                        gtk_main_iteration ();
-
+
-                dialogError = FALSE;
-
@@ -212 +212 @@
-
-                str = gtk_entry_get_text( GTK_ENTRY(g_pSecondsEntry) );
-
+
-                if( str ) {
-                        GetCurrentCam()->GetCam()->setBaseTime( atof( str ) );
@@ -435 +435 @@
-                while (loop)
-                        gtk_main_iteration ();
-
+
-                dialogError = FALSE;
-
@@ -515 +515 @@
-        gtk_widget_show( hbox );
-
-"Type"
+_("Type")
-  gtk_box_pack_start( GTK_BOX( hbox ), frame, TRUE, TRUE, 0 );
-  gtk_widget_show( frame );
@@ -526 +526 @@
-        // -------------------------- //
-
-"Fixed"
+_("Fixed")
-        gtk_box_pack_start( GTK_BOX( vbox2 ), fixed, FALSE, FALSE, 3 );
-  gtk_widget_show( fixed );
-  targetTypeRadio = gtk_radio_button_group( GTK_RADIO_BUTTON( fixed ) );
-
-"Interpolated"
+_("Interpolated")
-        gtk_box_pack_start( GTK_BOX( vbox2 ), interpolated, FALSE, FALSE, 3 );
-  gtk_widget_show( interpolated );
-  targetTypeRadio = gtk_radio_button_group( GTK_RADIO_BUTTON( interpolated ) );
-
-"Spline"
+_("Spline")
-        gtk_box_pack_start( GTK_BOX( vbox2 ), spline, FALSE, FALSE, 3 );
-  gtk_widget_show( spline );
@@ -553 +553 @@
-        gtk_widget_show( hbox );
-
-"Ok"
+_("Ok")
-        gtk_box_pack_start (GTK_BOX (hbox), w, TRUE, TRUE, 0);
-        gtk_signal_connect (GTK_OBJECT (w), "clicked", GTK_SIGNAL_FUNC (dialog_button_callback), GINT_TO_POINTER (IDOK));
@@ -561 +561 @@
-        gtk_widget_grab_default( w );
-
-"Cancel"
+_("Cancel")
-        gtk_box_pack_start (GTK_BOX (hbox), w, TRUE, TRUE, 0);
-        gtk_signal_connect (GTK_OBJECT (w), "clicked", GTK_SIGNAL_FUNC (dialog_button_callback), GINT_TO_POINTER (IDCANCEL));
@@ -578 +578 @@
-                while (loop)
-                        gtk_main_iteration ();
-
+
-                dialogError = FALSE;
-
@@ -753 +753 @@
-enum camEventType {
-        EVENT_NA = 0x00,
- 
- 
- 
+
+
+
-        EVENT_TARGET,                   // char(name)
- 
+
-        EVENT_FOV,                              // int(time), int(targetfov)
- 
- 
- 
- 
+
+
+
+
-        EVENT_FADEOUT,          // int(time)
-        EVENT_FADEIN,                   // int(time)
- 
-                    
+
+
-};
-
@@ -788 +788 @@
-
-const char *camEventStr[] = {
-"n/a"
-"Wait"
-"Target wait"
-"Speed"
-"Change Target <string:name>"
-"Snap Target"
-"FOV <int:duration> <int:targetfov>"
-"Run Script"
-"Trigger"
-"Stop"
-  "Change to Camera <string:camera> (or <int:cameranum> <string:camera>"
-"Fade Out <int:duration>"
-"Fade In <int:duration>"
-"Feather"
+N_("n/a")
+N_("Wait")
+N_("Target wait")
+N_("Speed")
+N_("Change Target <string:name>")
+N_("Snap Target")
+N_("FOV <int:duration> <int:targetfov>")
+N_("Run Script")
+N_("Trigger")
+N_("Stop")
+       N_("Change to Camera <string:camera> (or <int:cameranum> <string:camera>")
+N_("Fade Out <int:duration>")
+N_("Fade In <int:duration>")
+N_("Feather")
-};
-
@@ -817 +817 @@
-        // create the window
-  window = gtk_window_new( GTK_WINDOW_TOPLEVEL );
-"Add Event"
+_("Add Event")
-  gtk_signal_connect( GTK_OBJECT (window), "delete_event", GTK_SIGNAL_FUNC( dialog_delete_callback ), NULL );
-  gtk_signal_connect( GTK_OBJECT (window), "destroy", GTK_SIGNAL_FUNC( gtk_widget_destroy ), NULL );
@@ -838 +838 @@
-        gtk_widget_show( hbox );
-
-"Type"
+_("Type")
-  gtk_box_pack_start( GTK_BOX( hbox ), frame, TRUE, TRUE, 0 );
-  gtk_widget_show( frame );
@@ -864 +864 @@
-        gtk_widget_show( hbox );
-
-"Parameters:"
+_("Parameters:")
-        gtk_box_pack_start( GTK_BOX( hbox ), w, FALSE, FALSE, 0 );
-        gtk_widget_show( w );
@@ -884 +884 @@
-        gtk_widget_show( hbox );
-
-"Ok"
+_("Ok")
-        gtk_box_pack_start (GTK_BOX (hbox), w, TRUE, TRUE, 0);
-        gtk_signal_connect (GTK_OBJECT (w), "clicked", GTK_SIGNAL_FUNC (dialog_button_callback), GINT_TO_POINTER (IDOK));
@@ -892 +892 @@
-        gtk_widget_grab_default( w );
-
-"Cancel"
+_("Cancel")
-        gtk_box_pack_start (GTK_BOX (hbox), w, TRUE, TRUE, 0);
-        gtk_signal_connect (GTK_OBJECT (w), "clicked", GTK_SIGNAL_FUNC (dialog_button_callback), GINT_TO_POINTER (IDCANCEL));
@@ -909 +909 @@
-                while (loop)
-                        gtk_main_iteration ();
-
+
-                dialogError = FALSE;
-
@@ -971 +971 @@
-                GetCurrentCam()->GetCam()->getCameraInfo( (long)(adjustment->value), &origin[0], &dir[0], &fov );
-                VectorSet( angles, asin (dir[2])*180/3.14159, atan2 (dir[1], dir[0])*180/3.14159, 0 );
-        
-      
+
+
-
-        return TRUE;
@@ -983 +983 @@
-  // create the window
-  window = gtk_window_new( GTK_WINDOW_TOPLEVEL );
-"Camera Inspector"
+_("Camera Inspector")
-  gtk_signal_connect( GTK_OBJECT (window), "delete_event", GTK_SIGNAL_FUNC( ci_close ), NULL );
-  gtk_signal_connect( GTK_OBJECT (window), "expose_event", GTK_SIGNAL_FUNC( ci_expose ), NULL );
@@ -1019 +1019 @@
-        gtk_widget_show( hbox );
-
-"File:"
+_("File:")
-        gtk_box_pack_start( GTK_BOX( hbox ), w, FALSE, FALSE, 0 );
-        gtk_widget_show( w );
@@ -1033 +1033 @@
-        gtk_widget_show( hbox );
-
-"Name:"
+_("Name:")
-        gtk_box_pack_start( GTK_BOX( hbox ), w, FALSE, FALSE, 0 );
-        gtk_widget_show( w );
@@ -1039 +1039 @@
-  g_pCamName = gtk_entry_new();
-  gtk_box_pack_start( GTK_BOX( hbox ), g_pCamName, FALSE, FALSE, 0 );
-       
-
-"Type: "
+
+
+_("Type:")
-        gtk_box_pack_start( GTK_BOX( hbox ), w, FALSE, FALSE, 0 );
-        gtk_widget_show( w );
@@ -1057 +1057 @@
-  // -------------------------- //
-
-"Path and Target editing"
+_("Path and Target editing")
-  gtk_widget_show( frame );
-  gtk_table_attach( GTK_TABLE( table ), frame, 0, 1, 1, 2,
@@ -1074 +1074 @@
-        gtk_widget_show( hbox );
-
-"Edit:"
+_("Edit:")
-        gtk_box_pack_start( GTK_BOX( hbox ), w, FALSE, FALSE, 0 );
-        gtk_widget_show( w );
@@ -1093 +1093 @@
-        gtk_widget_show( hbox );
-
-"Edit Points"
+_("Edit Points")
-        gtk_box_pack_start( GTK_BOX( hbox ), g_pEditModeEditRadioButton, FALSE, FALSE, 3 );
-  gtk_widget_show( g_pEditModeEditRadioButton );
@@ -1100 +1100 @@
-        gtk_signal_connect( GTK_OBJECT( g_pEditModeEditRadioButton ), "clicked", GTK_SIGNAL_FUNC( ci_editmode_edit ), NULL );
-
-"Add Points"
+_("Add Points")
-        gtk_box_pack_start( GTK_BOX( hbox ), g_pEditModeAddRadioButton, FALSE, FALSE, 3 );
-  gtk_widget_show( g_pEditModeAddRadioButton );
@@ -1113 +1113 @@
-        }
-
-"Type: "
+_("Type:")
-        gtk_box_pack_start( GTK_BOX( hbox ), w, FALSE, FALSE, 0 );
-        gtk_widget_show( w );
@@ -1128 +1128 @@
-        gtk_widget_show( hbox );
-
-"Rename..."
+_("Rename...")
-        gtk_box_pack_start( GTK_BOX( hbox ), w, FALSE, TRUE, 0);
-        gtk_signal_connect( GTK_OBJECT( w ), "clicked", GTK_SIGNAL_FUNC( ci_rename ), NULL );
-        gtk_widget_show( w );
-
-"Add Target..."
+_("Add Target...")
-        gtk_box_pack_start( GTK_BOX( hbox ), w, FALSE, TRUE, 0);
-        gtk_signal_connect( GTK_OBJECT( w ), "clicked", GTK_SIGNAL_FUNC( ci_add_target ), NULL );
@@ -1151 +1151 @@
-  // -------------------------- //
-
-"Time"
+_("Time")
-  gtk_widget_show( frame );
-  gtk_table_attach( GTK_TABLE( table ), frame, 0, 1, 2, 3,
@@ -1168 +1168 @@
-        gtk_widget_show( hbox );
-
-"Length (seconds):"
+_("Length (seconds):")
-        gtk_box_pack_start( GTK_BOX( hbox ), w, FALSE, FALSE, 0 );
-        gtk_widget_show( w );
@@ -1182 +1182 @@
-        gtk_widget_show( hbox );
-
-"Current Time: "
+_("Current Time:")
-        gtk_box_pack_start( GTK_BOX( hbox ), w, FALSE, FALSE, 0 );
-        gtk_widget_show( w );
-
-"0.00"
+_("0.00")
-  gtk_box_pack_start( GTK_BOX( hbox ), w, FALSE, FALSE, 0 );
-  gtk_widget_show( w );
-        g_pCurrentTime = GTK_LABEL( w );
-
-" of "
+_(" of ")
-        gtk_box_pack_start( GTK_BOX( hbox ), w, FALSE, FALSE, 0 );
-        gtk_widget_show( w );
-
-"0.00"
+_("0.00")
-  gtk_box_pack_start( GTK_BOX( hbox ), w, FALSE, FALSE, 0 );
-  gtk_widget_show( w );
@@ -1219 +1219 @@
-        gtk_widget_show( hbox );
-
-"Track Camera"
+_("Track Camera")
-  gtk_box_pack_start( GTK_BOX( hbox ), g_pTrackCamera, FALSE, FALSE, 0 );
-  gtk_widget_show( g_pTrackCamera );
@@ -1229 +1229 @@
-        gtk_widget_show( hbox );
-
-"Events:"
+_("Events:")
-        gtk_box_pack_start( GTK_BOX( hbox ), w, FALSE, FALSE, 0 );
-        gtk_widget_show( w );
@@ -1259 +1259 @@
-        gtk_widget_show( vbox );
-
-"Add..."
+_("Add...")
-        gtk_box_pack_start( GTK_BOX( vbox ), w, FALSE, FALSE, 0);
-        gtk_signal_connect( GTK_OBJECT( w ), "clicked", GTK_SIGNAL_FUNC( ci_add ), NULL );
-        gtk_widget_show( w );
-
-"Del"
+_("Del")
-        gtk_box_pack_start( GTK_BOX( vbox ), w, FALSE, FALSE, 0);
-        gtk_signal_connect( GTK_OBJECT( w ), "clicked", GTK_SIGNAL_FUNC( ci_del ), NULL );
@@ -1286 +1286 @@
-                    (GtkAttachOptions) (GTK_FILL), 0, 0 );
-
-"New..."
+_("New...")
-        gtk_box_pack_start( GTK_BOX( vbox ), w, FALSE, FALSE, 0);
-        gtk_signal_connect( GTK_OBJECT( w ), "clicked", GTK_SIGNAL_FUNC( ci_new ), NULL );
-        gtk_widget_show( w );
-
-"Load..."
+_("Load...")
-        gtk_box_pack_start( GTK_BOX( vbox ), w, FALSE, FALSE, 0);
-        gtk_signal_connect( GTK_OBJECT( w ), "clicked", GTK_SIGNAL_FUNC( ci_load ), NULL );
@@ -1304 +1304 @@
-                    (GtkAttachOptions) (GTK_FILL), 0, 0 );
-
-"Save..."
+_("Save...")
-        gtk_box_pack_start( GTK_BOX( vbox ), w, FALSE, FALSE, 0);
-        gtk_signal_connect( GTK_OBJECT( w ), "clicked", GTK_SIGNAL_FUNC( ci_save ), NULL );
-        gtk_widget_show( w );
-
-"Unload"
+_("Unload")
-        gtk_box_pack_start( GTK_BOX( vbox ), w, FALSE, FALSE, 0);
-        gtk_signal_connect( GTK_OBJECT( w ), "clicked", GTK_SIGNAL_FUNC( ci_unload ), NULL );
-        gtk_widget_show( w );
-
+
-  hbox = gtk_hbox_new( FALSE, 5 );
-        gtk_box_pack_start( GTK_BOX( vbox ), hbox, TRUE, TRUE, 0 );
-        gtk_widget_show( hbox );
-
-"Apply"
+_("Apply")
-        gtk_box_pack_start( GTK_BOX( vbox ), w, FALSE, FALSE, 0);
-        gtk_signal_connect( GTK_OBJECT( w ), "clicked", GTK_SIGNAL_FUNC( ci_apply ), NULL );
-        gtk_widget_show( w );
-
-"Preview"
+_("Preview")
-        gtk_box_pack_start( GTK_BOX( vbox ), w, FALSE, FALSE, 0);
-        gtk_signal_connect( GTK_OBJECT( w ), "clicked", GTK_SIGNAL_FUNC( ci_preview ), NULL );
@@ -1340 +1340 @@
-        gtk_widget_show( hbox );
-
-"Close"
+_("Close")
-        gtk_box_pack_start( GTK_BOX( vbox ), w, FALSE, FALSE, 0);
-        gtk_signal_connect( GTK_OBJECT( w ), "clicked", GTK_SIGNAL_FUNC( ci_close ), NULL );

GtkRadiant/trunk/contrib/gtkgensurf/gendlgs.cpp

@@ -24 +24 @@
-#include <math.h>
-#include "gensurf.h"
+#include <glib/gi18n.h>
-
-#define GENERAL_TAB   0
@@ -266 +267 @@
-  char Text[256];
-  char RForm[16] = "%.5g";
-  int i;
-
-  switch (tab)
@@ -278 +278 @@
-    if (!FirstPassComplete)
-    {
+      int i;
-      for (i = 0; i < NUMGAMES; i++)
-        gtk_widget_set_sensitive (game_radios[i], (i == Game ? TRUE : FALSE));
@@ -1424 +1425 @@
-  gtk_table_set_col_spacings (GTK_TABLE (table), 5);
-
-"General"
+_("General")
-  gtk_widget_show (label);
-  gtk_notebook_append_page (GTK_NOTEBOOK (notebook), table, label);
-
-"Game"
+_("Game")
-  gtk_widget_show (frame);
-  gtk_table_attach (GTK_TABLE (table), frame, 0, 1, 0, 1,
@@ -1449 +1450 @@
-  }
-
-"Waveform"
+_("Waveform")
-  gtk_widget_show (frame);
-  gtk_table_attach (GTK_TABLE (table), frame, 1, 2, 0, 1,
@@ -1470 +1471 @@
-  }
-
-"Orientation"
+_("Orientation")
-  gtk_widget_show (frame);
-  gtk_table_attach (GTK_TABLE (table), frame, 0, 1, 1, 2,
@@ -1499 +1500 @@
-                    (GtkAttachOptions) (GTK_EXPAND|GTK_FILL), 0, 0);
-
-"Wavelength:"
+_("Wavelength:")
-  gtk_widget_show (label);
-  gtk_table_attach (GTK_TABLE (table2), label, 0, 1, 0, 1,
@@ -1507 +1508 @@
-  gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_RIGHT);
-
-"Max. amplitude:"
+_("Max. amplitude:")
-  gtk_widget_show (label);
-  gtk_table_attach (GTK_TABLE (table2), label, 0, 1, 1, 2,
@@ -1515 +1516 @@
-  gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_RIGHT);
-
-"Roughness:"
+_("Roughness:")
-  gtk_widget_show (label);
-  gtk_table_attach (GTK_TABLE (table2), label, 0, 1, 2, 3,
@@ -1523 +1524 @@
-  gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_RIGHT);
-
-"Random seed:"
+_("Random seed:")
-  gtk_widget_show (label);
-  gtk_table_attach (GTK_TABLE (table2), label, 0, 1, 3, 4,
@@ -1572 +1573 @@
-  gtk_container_set_border_width (GTK_CONTAINER (vbox), 5);
-
-"Extents"
+_("Extents")
-  gtk_widget_show (label);
-  gtk_notebook_append_page (GTK_NOTEBOOK (notebook), vbox, label);
@@ -1580 +1581 @@
-  gtk_box_pack_start (GTK_BOX (vbox), hbox2, FALSE, TRUE, 0);
-
-"Extents"
+_("Extents")
-  gtk_widget_show (frame);
-  gtk_box_pack_start (GTK_BOX (hbox2), frame, TRUE, TRUE, 0);
@@ -1591 +1592 @@
-  gtk_table_set_col_spacings (GTK_TABLE (table), 5);
-
-"X:"
+_("X:")
-  gtk_widget_show (label);
-  gtk_table_attach (GTK_TABLE (table), label, 0, 1, 1, 2,
@@ -1598 +1599 @@
-  g_object_set_data (G_OBJECT (dlg), "hmin_text", label);
-
-"X:"
+_("X:")
-  gtk_widget_show (label);
-  gtk_table_attach (GTK_TABLE (table), label, 2, 3, 1, 2,
@@ -1605 +1606 @@
-  g_object_set_data (G_OBJECT (dlg), "hmax_text", label);
-
-"Y:"
+_("Y:")
-  gtk_widget_show (label);
-  gtk_table_attach (GTK_TABLE (table), label, 0, 1, 2, 3,
@@ -1612 +1613 @@
-  g_object_set_data (G_OBJECT (dlg), "vmin_text", label);
-
-"Y:"
+_("Y:")
-  gtk_widget_show (label);
-  gtk_table_attach (GTK_TABLE (table), label, 2, 3, 2, 3,
@@ -1619 +1620 @@
-  g_object_set_data (G_OBJECT (dlg), "vmax_text", label);
-
-"Lower-left"
+_("Lower-left")
-  gtk_widget_show (label);
-  gtk_table_attach (GTK_TABLE (table), label, 1, 2, 0, 1,
@@ -1625 +1626 @@
-                    (GtkAttachOptions) (GTK_FILL), 0, 0);
-
-"Upper-right"
+_("Upper-right")
-  gtk_widget_show (label);
-  gtk_table_attach (GTK_TABLE (table), label, 3, 4, 0, 1,
@@ -1667 +1668 @@
-  g_signal_connect (G_OBJECT (entry), "focus_out_event", G_CALLBACK (doublevariable_entryfocusout), &Vur);
-
-"Divisions"
+_("Divisions")
-  gtk_widget_show (frame);
-  gtk_box_pack_start (GTK_BOX (hbox2), frame, TRUE, TRUE, 0);
@@ -1678 +1679 @@
-  gtk_table_set_col_spacings (GTK_TABLE (table), 5);
-
-"X:"
+_("X:")
-  gtk_widget_show (label);
-  gtk_table_attach (GTK_TABLE (table), label, 0, 1, 0, 1,
@@ -1685 +1686 @@
-  g_object_set_data (G_OBJECT (dlg), "nh_text", label);
-
-"Y:"
+_("Y:")
-  gtk_widget_show (label);
-  gtk_table_attach (GTK_TABLE (table), label, 0, 1, 1, 2,
@@ -1719 +1720 @@
-
-        // ^Fishman - Snap to grid, replaced scroll bar with a texbox.
-"Snap to grid:"
+_("Snap to grid:")
-  gtk_widget_show (label);
-        gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, TRUE, 0);
@@ -1737 +1738 @@
-  gtk_box_pack_start (GTK_BOX (vbox), hbox2, FALSE, TRUE, 10);
-
-"Decimate:"
+_("Decimate:")
-  gtk_widget_show (label);
-  gtk_box_pack_start (GTK_BOX (hbox2), label, FALSE, TRUE, 0);
@@ -1751 +1752 @@
-  g_object_set_data (G_OBJECT (dlg), "decimate", scale);
-
-"Corner values"
+_("Corner values")
-  gtk_widget_show (frame);
-  gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, TRUE, 0);
@@ -1762 +1763 @@
-  gtk_table_set_col_spacings (GTK_TABLE (table), 5);
-
-"Upper-left:"
+_("Upper-left:")
-  gtk_widget_show (label);
-  gtk_table_attach (GTK_TABLE (table), label, 0, 1, 0, 1,
@@ -1768 +1769 @@
-                    (GtkAttachOptions) (GTK_FILL), 0, 0);
-
-"Lower-left:"
+_("Lower-left:")
-  gtk_widget_show (label);
-  gtk_table_attach (GTK_TABLE (table), label, 0, 1, 1, 2,
@@ -1774 +1775 @@
-                    (GtkAttachOptions) (GTK_FILL), 0, 0);
-
-"Upper-right:"
+_("Upper-right:")
-  gtk_widget_show (label);
-  gtk_table_attach (GTK_TABLE (table), label, 2, 3, 0, 1,
@@ -1780 +1781 @@
-                    (GtkAttachOptions) (GTK_FILL), 0, 0);
-
-"Lower-right:"
+_("Lower-right:")
-  gtk_widget_show (label);
-  gtk_table_attach (GTK_TABLE (table), label, 2, 3, 1, 2,
@@ -1834 +1835 @@
-  gtk_container_set_border_width (GTK_CONTAINER (vbox), 5);
-
-"Bitmap"
+_("Bitmap")
-  gtk_widget_show (label);
-  gtk_notebook_append_page (GTK_NOTEBOOK (notebook), vbox, label);
@@ -1850 +1851 @@
-  gtk_table_set_col_spacings (GTK_TABLE (table), 5);
-
-"Filename:"
+_("Filename:")
-  gtk_widget_show (label);
-  gtk_table_attach (GTK_TABLE (table), label, 0, 1, 0, 1,
@@ -1871 +1872 @@
-                    (GtkAttachOptions) (GTK_EXPAND|GTK_FILL), 0, 0);
-
-"Browse..."
+_("Browse...")
-  gtk_widget_show (button);
-  gtk_box_pack_start (GTK_BOX (hbox2), button, FALSE, FALSE, 0);
@@ -1878 +1879 @@
-  g_signal_connect (G_OBJECT (button), "clicked", G_CALLBACK (bitmap_browse), NULL);
-
-"Reload"
+_("Reload")
-  gtk_widget_show (button);
-  gtk_box_pack_start (GTK_BOX (hbox2), button, FALSE, FALSE, 0);
@@ -1892 +1893 @@
-  gtk_table_set_col_spacings (GTK_TABLE (table), 5);
-
-"Map color 0 to:"
+_("Map color 0 to:")
-  gtk_widget_show (label);
-  gtk_table_attach (GTK_TABLE (table), label, 0, 1, 0, 1,
@@ -1901 +1902 @@
-  gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_RIGHT);
-
-"Map color 255 to:"
+_("Map color 255 to:")
-  gtk_widget_show (label);
-  gtk_table_attach (GTK_TABLE (table), label, 0, 1, 1, 2,
@@ -1940 +1941 @@
-  gtk_container_set_border_width (GTK_CONTAINER (vbox), 5);
-
-"Fix Points"
+_("Fix Points")
-  gtk_widget_show (label);
-  gtk_notebook_append_page (GTK_NOTEBOOK (notebook), vbox, label);
-
-
+_(
-                         "then use the arrow keys or text box to assign a value.\n"
-                         "Use Ctrl+Click to select multiple vertices/toggle a\n"
-                         "selection. Use Shift+Click to select a range of vertices.\n\n"
-                         "Click \"Free\" to unlock a vertex. Vertices within \"Range\n"
-
+)
-  gtk_widget_show (label);
-  gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, TRUE, 0);
@@ -1960 +1961 @@
-  gtk_table_set_col_spacings (GTK_TABLE (table), 5);
-
-"Value:"
+_("Value:")
-  gtk_widget_show (label);
-  gtk_table_attach (GTK_TABLE (table), label, 0, 1, 0, 1,
@@ -1968 +1969 @@
-  g_object_set_data (G_OBJECT (dlg), "fix_value_text", label);
-
-"Range affected:"
+_("Range affected:")
-  gtk_widget_show (label);
-  gtk_table_attach (GTK_TABLE (table), label, 0, 1, 1, 2,
@@ -1976 +1977 @@
-  g_object_set_data (G_OBJECT (dlg), "fix_range_text", label);
-
-"Rate of change:"
+_("Rate of change:")
-  gtk_widget_show (label);
-  gtk_table_attach (GTK_TABLE (table), label, 0, 1, 2, 3,
@@ -2013 +2014 @@
-  g_signal_connect (G_OBJECT (entry), "focus_out_event", G_CALLBACK (fix_rate_entryfocusout), NULL);
-
-"Free"
+_("Free")
-  gtk_widget_show (button);
-  gtk_table_attach (GTK_TABLE (table), button, 2, 3, 0, 1,
@@ -2022 +2023 @@
-  g_signal_connect (G_OBJECT (button), "clicked", G_CALLBACK (fix_free), NULL);
-
-"Free All"
+_("Free All")
-  gtk_widget_show (button);
-  gtk_table_attach (GTK_TABLE (table), button, 2, 3, 1, 2,
@@ -2035 +2036 @@
-  gtk_container_set_border_width (GTK_CONTAINER (vbox), 5);
-
-"Texture"
+_("Texture")
-  gtk_widget_show (label);
-  gtk_notebook_append_page (GTK_NOTEBOOK (notebook), vbox, label);
@@ -2046 +2047 @@
-  gtk_table_set_col_spacings (GTK_TABLE (table), 5);
-
-"Surface:"
+_("Surface:")
-  gtk_widget_show (label);
-  gtk_table_attach (GTK_TABLE (table), label, 0, 1, 0, 1,
@@ -2053 +2054 @@
-  gtk_misc_set_alignment (GTK_MISC (label), 1, 0.5);
-
-"Other:"
+_("Other:")
-  gtk_widget_show (label);
-  gtk_table_attach (GTK_TABLE (table), label, 0, 1, 1, 2,
@@ -2060 +2061 @@
-  gtk_misc_set_alignment (GTK_MISC (label), 1, 0.5);
-
-"Steep:"
+_("Steep:")
-  gtk_widget_show (label);
-  gtk_table_attach (GTK_TABLE (table), label, 0, 1, 2, 3,
@@ -2097 +2098 @@
-  gtk_box_pack_start (GTK_BOX (vbox), hbox2, FALSE, TRUE, 0);
-
-"\"Steep\" angle:"
+_("\"Steep\" angle:")
-  gtk_widget_show (label);
-  gtk_box_pack_start (GTK_BOX (hbox2), label, FALSE, TRUE, 0);
@@ -2113 +2114 @@
-  gtk_table_set_col_spacings (GTK_TABLE (table), 5);
-
-"Offset <h,v>"
+_("Offset <h,v>")
-  gtk_widget_show (label);
-  gtk_table_attach (GTK_TABLE (table), label, 0, 2, 0, 1,
@@ -2119 +2120 @@
-                    (GtkAttachOptions) (GTK_FILL), 0, 0);
-
-"Scale <h,v>"
+_("Scale <h,v>")
-  gtk_widget_show (label);
-  gtk_table_attach (GTK_TABLE (table), label, 2, 4, 0, 1,
@@ -2159 +2160 @@
-
-
-"Use detail brushes"
+_("Use detail brushes")
-  gtk_widget_show (check);
-  gtk_box_pack_start (GTK_BOX (vbox), check, FALSE, TRUE, 0);
@@ -2165 +2166 @@
-  g_signal_connect (G_OBJECT (check), "toggled", G_CALLBACK (texture_detail), NULL);
-
-"Detail hint brushes"
+_("Detail hint brushes")
-  gtk_widget_show (check);
-  gtk_box_pack_start (GTK_BOX (vbox), check, FALSE, TRUE, 0);
@@ -2172 +2173 @@
-
-        // ^Fishman - Add terrain key to func_group.
-"Add terrain key"
+_("Add terrain key")
-  gtk_widget_show (check);
-  gtk_box_pack_start (GTK_BOX (vbox), check, FALSE, TRUE, 0);
@@ -2182 +2183 @@
-  gtk_box_pack_start (GTK_BOX (hbox), vbox, FALSE, TRUE, 0);
-
-"OK"
+_("OK")
-  gtk_widget_show (button);
-  gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, TRUE, 0);
@@ -2189 +2190 @@
-  g_signal_connect (G_OBJECT (button), "clicked", G_CALLBACK (main_go), NULL);
-
-"Settings:"
+_("Settings:")
-  gtk_widget_show (label);
-  gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, TRUE, 0);
@@ -2199 +2200 @@
-  g_signal_connect (G_OBJECT (button), "clicked", G_CALLBACK (main_open), NULL);
-
-"Save as..."
+_("Save as...")
-  gtk_widget_show (button);
-  gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, TRUE, 0);
@@ -2205 +2206 @@
-  g_signal_connect (G_OBJECT (button), "clicked", G_CALLBACK (main_save), NULL);
-
-"Defaults"
+_("Defaults")
-  gtk_widget_show