diff --git a/capplets/about-me/ChangeLog b/capplets/about-me/ChangeLog index ef58481c0..f2cc85a1c 100644 --- a/capplets/about-me/ChangeLog +++ b/capplets/about-me/ChangeLog @@ -1,3 +1,8 @@ +2007-12-06 Jens Granseuer + + * gnome-about-me.glade: don't mark empty and padding strings for + translation (bug #502087) + 2007-11-24 Jens Granseuer Patch by: Matthias Clasen diff --git a/capplets/about-me/gnome-about-me.glade b/capplets/about-me/gnome-about-me.glade index 1f6b5dab2..41c964463 100644 --- a/capplets/about-me/gnome-about-me.glade +++ b/capplets/about-me/gnome-about-me.glade @@ -172,7 +172,7 @@ True - + False False GTK_JUSTIFY_LEFT @@ -294,7 +294,7 @@ True - + False False GTK_JUSTIFY_LEFT @@ -390,7 +390,7 @@ True True 0 - + True False @@ -410,7 +410,7 @@ True True 0 - + True False @@ -484,7 +484,7 @@ True - + False False GTK_JUSTIFY_LEFT @@ -580,7 +580,7 @@ True True 0 - + True False @@ -600,7 +600,7 @@ True True 0 - + True False @@ -620,7 +620,7 @@ True True 0 - + True False @@ -640,7 +640,7 @@ True True 0 - + True False @@ -772,7 +772,7 @@ True - + False False GTK_JUSTIFY_LEFT @@ -839,7 +839,7 @@ True True 0 - + True False @@ -859,7 +859,7 @@ True True 0 - + True False @@ -1024,7 +1024,7 @@ True True 0 - + True False @@ -1044,7 +1044,7 @@ True True 0 - + True False @@ -1064,7 +1064,7 @@ True True 0 - + True False @@ -1084,7 +1084,7 @@ True True 0 - + True False @@ -1200,7 +1200,7 @@ True - + False False GTK_JUSTIFY_LEFT @@ -1285,7 +1285,7 @@ 0 0 0 - + @@ -1450,7 +1450,7 @@ True True 0 - + True False @@ -1470,7 +1470,7 @@ True True 0 - + True False @@ -1490,7 +1490,7 @@ True True 0 - + True False @@ -1510,7 +1510,7 @@ True True 0 - + True False @@ -1530,7 +1530,7 @@ True True 0 - + True False @@ -1611,7 +1611,7 @@ True - + False False GTK_JUSTIFY_LEFT @@ -1696,7 +1696,7 @@ 0 0 0 - + @@ -1861,7 +1861,7 @@ True True 0 - + True False @@ -1881,7 +1881,7 @@ True True 0 - + True False @@ -1901,7 +1901,7 @@ True True 0 - + True False @@ -1921,7 +1921,7 @@ True True 0 - + True False @@ -1941,7 +1941,7 @@ True True 0 - + True False @@ -2051,7 +2051,7 @@ True - + False False GTK_JUSTIFY_LEFT @@ -2176,7 +2176,7 @@ True True 0 - + True False @@ -2196,7 +2196,7 @@ True True 0 - + True False @@ -2216,7 +2216,7 @@ True True 0 - + True False @@ -2290,7 +2290,7 @@ True - + False False GTK_JUSTIFY_LEFT @@ -2502,7 +2502,7 @@ True True 0 - + True False @@ -2522,7 +2522,7 @@ True True 0 - + True False @@ -2542,7 +2542,7 @@ True True 0 - + True False @@ -2562,7 +2562,7 @@ True True 0 - + True False @@ -2582,7 +2582,7 @@ True True 0 - + True False @@ -2602,7 +2602,7 @@ True True 0 - + True False @@ -2952,7 +2952,7 @@ After you have authenticated, enter your new password, retype it for verificatio True False 0 - + True False @@ -3056,7 +3056,7 @@ After you have authenticated, enter your new password, retype it for verificatio True False 0 - + True False @@ -3075,7 +3075,7 @@ After you have authenticated, enter your new password, retype it for verificatio True False 0 - + True True diff --git a/capplets/accessibility/keyboard/ChangeLog b/capplets/accessibility/keyboard/ChangeLog index e9bdce7c6..0c4fcdad2 100644 --- a/capplets/accessibility/keyboard/ChangeLog +++ b/capplets/accessibility/keyboard/ChangeLog @@ -1,3 +1,8 @@ +2007-12-06 Jens Granseuer + + * gnome-accessibility-keyboard-properties.glade: don't mark padding + string for translation (bug #502087) + 2007-05-05 Jens Granseuer * accessibility-keyboard.c: (setup_images): diff --git a/capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade b/capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade index c06a578b9..c4ca1b638 100644 --- a/capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade +++ b/capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade @@ -134,7 +134,7 @@ True - + False False GTK_JUSTIFY_LEFT diff --git a/capplets/appearance/ChangeLog b/capplets/appearance/ChangeLog index eaf914e83..be7884e48 100644 --- a/capplets/appearance/ChangeLog +++ b/capplets/appearance/ChangeLog @@ -1,3 +1,8 @@ +2007-12-06 Jens Granseuer + + * data/appearance.glade: don't mark padding strings for translation + and add translation comments for the pixel order strings (bug #502087) + 2007-11-28 Jens Granseuer * appearance-desktop.c: (desktop_init): diff --git a/capplets/appearance/data/appearance.glade b/capplets/appearance/data/appearance.glade index 3d8844d28..eb3c67d0c 100644 --- a/capplets/appearance/data/appearance.glade +++ b/capplets/appearance/data/appearance.glade @@ -472,7 +472,7 @@ True True - _RGB + _RGB True True @@ -498,7 +498,7 @@ True True - _BGR + _BGR True True subpixel_rgb_radio @@ -530,7 +530,7 @@ True True - _VRGB + _VRGB True True subpixel_rgb_radio @@ -562,7 +562,7 @@ True True - VB_GR + VB_GR True True subpixel_rgb_radio @@ -1465,7 +1465,7 @@ Vertical gradient True - + False @@ -1583,7 +1583,7 @@ Text only True - + False diff --git a/capplets/keyboard/ChangeLog b/capplets/keyboard/ChangeLog index 97661cc20..6e7b569dd 100644 --- a/capplets/keyboard/ChangeLog +++ b/capplets/keyboard/ChangeLog @@ -1,3 +1,8 @@ +2007-12-06 Jens Granseuer + + * gnome-keyboard-properties.glade: don't mark padding strings and stock + items for translation (bug #502087) + 2007-11-11 Jens Granseuer * gnome-keyboard-properties.glade: the fine line between text fields diff --git a/capplets/keyboard/gnome-keyboard-properties.glade b/capplets/keyboard/gnome-keyboard-properties.glade index e36105055..ed8997815 100644 --- a/capplets/keyboard/gnome-keyboard-properties.glade +++ b/capplets/keyboard/gnome-keyboard-properties.glade @@ -45,7 +45,7 @@ True - + False @@ -244,7 +244,7 @@ True - + False @@ -637,7 +637,7 @@ True - + False @@ -1180,7 +1180,7 @@ True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - gtk-help + gtk-help True -11 @@ -1191,7 +1191,7 @@ True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - gtk-close + gtk-close True 0 diff --git a/capplets/mouse/ChangeLog b/capplets/mouse/ChangeLog index 7cdd3178e..122cfca95 100644 --- a/capplets/mouse/ChangeLog +++ b/capplets/mouse/ChangeLog @@ -1,3 +1,8 @@ +2007-12-06 Jens Granseuer + + * gnome-mouse-properties.glade: don't mark padding string as + translatable (bug #502087) + 2007-07-27 Denis Washington * Makefile.am: diff --git a/capplets/mouse/gnome-mouse-properties.glade b/capplets/mouse/gnome-mouse-properties.glade index 1f2574a5f..b5a31798d 100644 --- a/capplets/mouse/gnome-mouse-properties.glade +++ b/capplets/mouse/gnome-mouse-properties.glade @@ -122,7 +122,7 @@ True - + False False GTK_JUSTIFY_LEFT @@ -271,7 +271,7 @@ True - + False False GTK_JUSTIFY_LEFT @@ -525,7 +525,7 @@ True - + False False GTK_JUSTIFY_LEFT @@ -841,7 +841,7 @@ True - + False False GTK_JUSTIFY_LEFT diff --git a/capplets/windows/ChangeLog b/capplets/windows/ChangeLog index 467b3a693..8def3919c 100644 --- a/capplets/windows/ChangeLog +++ b/capplets/windows/ChangeLog @@ -1,3 +1,8 @@ +2007-12-06 Jens Granseuer + + * gnome-window-properties.c: (reload_mouse_modifiers): add a comment + for translators (bug #502087) + 2007-04-27 Rodrigo Moya * window-properties.desktop.in.in: renamed Bugzilla product. diff --git a/capplets/windows/gnome-window-properties.c b/capplets/windows/gnome-window-properties.c index 6d9c3e08f..4d118014f 100644 --- a/capplets/windows/gnome-window-properties.c +++ b/capplets/windows/gnome-window-properties.c @@ -108,7 +108,7 @@ double_click_titlebar_changed_callback (GtkWidget *optionmenu, void *data) { GnomeWMSettings new_settings; - + new_settings.flags = GNOME_WM_SETTING_DOUBLE_CLICK_ACTION; new_settings.double_click_action = gtk_combo_box_get_active (GTK_COMBO_BOX (optionmenu)); @@ -124,13 +124,13 @@ alt_click_radio_toggled_callback (GtkWidget *radio, GnomeWMSettings new_settings; gboolean active; MouseClickModifier *modifier = data; - + new_settings.flags = GNOME_WM_SETTING_MOUSE_MOVE_MODIFIER; active = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (radio)); if (active && current_wm != NULL) { new_settings.mouse_move_modifier = modifier->value; - + if ((settings->mouse_move_modifier == NULL) || (strcmp (new_settings.mouse_move_modifier, settings->mouse_move_modifier) != 0)) @@ -143,7 +143,7 @@ update_sensitivity (void) { gtk_widget_set_sensitive (autoraise_checkbutton, settings->focus_follows_mouse); - + gtk_widget_set_sensitive (autoraise_delay_hbox, settings->focus_follows_mouse && settings->autoraise); @@ -165,13 +165,13 @@ init_settings_struct (GnomeWMSettings *settings) /* Init fields that weren't initialized */ if ((settings->flags & GNOME_WM_SETTING_MOUSE_FOCUS) == 0) settings->focus_follows_mouse = FALSE; - + if ((settings->flags & GNOME_WM_SETTING_AUTORAISE) == 0) settings->autoraise = FALSE; - + if ((settings->flags & GNOME_WM_SETTING_AUTORAISE_DELAY) == 0) settings->autoraise_delay = 1000; - + if ((settings->flags & GNOME_WM_SETTING_MOUSE_MOVE_MODIFIER) == 0) settings->mouse_move_modifier = "Super"; @@ -211,7 +211,7 @@ reload_settings (void) GnomeWMSettings new_settings; g_assert (n_mouse_modifiers > 0); - + if (current_wm != NULL) { new_settings.flags = GNOME_WM_SETTING_MOUSE_FOCUS | GNOME_WM_SETTING_AUTORAISE | @@ -226,7 +226,7 @@ reload_settings (void) } init_settings_struct (&new_settings); - + if (new_settings.focus_follows_mouse != settings->focus_follows_mouse) gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (focus_mode_checkbutton), new_settings.focus_follows_mouse); @@ -238,13 +238,13 @@ reload_settings (void) if (new_settings.autoraise_delay != settings->autoraise_delay) gtk_range_set_value (GTK_RANGE (autoraise_delay_slider), new_settings.autoraise_delay / 1000.0); - + if (n_double_click_actions > 0 && new_settings.double_click_action != settings->double_click_action) { gtk_combo_box_set_active (GTK_COMBO_BOX (double_click_titlebar_optionmenu), new_settings.double_click_action); } - + if (settings->mouse_move_modifier == NULL || new_settings.mouse_move_modifier == NULL || strcmp (settings->mouse_move_modifier, @@ -272,7 +272,7 @@ update_wm (GdkScreen *screen, int i; g_assert (n_mouse_modifiers > 0); - + if (current_wm != NULL) { g_signal_handlers_disconnect_by_func (G_OBJECT (current_wm), G_CALLBACK (wm_settings_changed_callback), @@ -291,7 +291,7 @@ update_wm (GdkScreen *screen, gnome_window_manager_get_double_click_actions (current_wm, &double_click_actions, &n_double_click_actions); - + } for (i = 0; i < n_double_click_actions; i++) { @@ -339,12 +339,12 @@ try_spawn_config_tool (GdkScreen *screen) char *escaped; escaped = g_markup_escape_text (error->message, -1); - + str = g_strdup_printf ("%s\n\n%s", _("Cannot start the preferences application for your window manager"), escaped); g_free (escaped); - + no_tool_dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_DESTROY_WITH_PARENT, @@ -353,17 +353,17 @@ try_spawn_config_tool (GdkScreen *screen) " "); gtk_window_set_title (GTK_WINDOW (no_tool_dialog), ""); gtk_window_set_resizable (GTK_WINDOW (no_tool_dialog), FALSE); - + gtk_label_set_markup (GTK_LABEL (GTK_MESSAGE_DIALOG (no_tool_dialog)->label), str); g_free (str); - + gtk_dialog_run (GTK_DIALOG (no_tool_dialog)); gtk_widget_destroy (no_tool_dialog); g_error_free (error); - + exit (1); } @@ -379,7 +379,7 @@ main (int argc, char **argv) GnomeWMSettings new_settings; int rc = 0; int i; - + bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR); bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8"); textdomain (GETTEXT_PACKAGE); @@ -391,14 +391,14 @@ main (int argc, char **argv) gnome_wm_manager_init (); screen = gdk_display_get_default_screen (gdk_display_get_default ()); - + current_wm = gnome_wm_manager_get_current (screen); if (current_wm == NULL) { try_spawn_config_tool (screen); goto out; } - + dialog = glade_xml_new (GLADEDIR "/gnome-window-properties.glade", "main-dialog", GETTEXT_PACKAGE); @@ -407,7 +407,7 @@ main (int argc, char **argv) rc = 1; goto out; } - + dialog_win = WID ("main-dialog"); focus_mode_checkbutton = WID ("focus-mode-checkbutton"); autoraise_checkbutton = WID ("autoraise-checkbutton"); @@ -428,7 +428,7 @@ main (int argc, char **argv) reload_mouse_modifiers (); update_wm (screen, FALSE); - + set_alt_click_value (&new_settings); gtk_range_set_value (GTK_RANGE (autoraise_delay_slider), new_settings.autoraise_delay / 1000.0); @@ -436,10 +436,10 @@ main (int argc, char **argv) new_settings.double_click_action); reload_settings (); /* must come before below signal connections */ - + g_signal_connect (G_OBJECT (dialog_win), "response", G_CALLBACK (response_cb), NULL); - + g_signal_connect (G_OBJECT (dialog_win), "destroy", G_CALLBACK (gtk_main_quit), NULL); @@ -455,7 +455,7 @@ main (int argc, char **argv) g_signal_connect (G_OBJECT (double_click_titlebar_optionmenu), "changed", G_CALLBACK (double_click_titlebar_changed_callback), NULL); - + g_signal_connect (G_OBJECT (screen), "window_manager_changed", G_CALLBACK (wm_changed_callback), NULL); @@ -466,10 +466,10 @@ main (int argc, char **argv) &mouse_modifiers[i]); ++i; } - + capplet_set_icon (dialog_win, "gnome-window-manager"); gtk_widget_show (dialog_win); - + gtk_main (); g_object_unref (dialog); @@ -492,7 +492,7 @@ fill_radio (GtkRadioButton *group, modifier->name); gtk_box_pack_start (GTK_BOX (alt_click_hbox), modifier->radio, FALSE, FALSE, 0); - + gtk_widget_show (modifier->radio); } @@ -509,7 +509,7 @@ reload_mouse_modifiers (void) gboolean have_super; int min_keycode, max_keycode; int mod_meta, mod_super, mod_hyper; - + XDisplayKeycodes (gdk_display, &min_keycode, &max_keycode); @@ -518,13 +518,13 @@ reload_mouse_modifiers (void) min_keycode, max_keycode - min_keycode, &keysyms_per_keycode); - + modmap = XGetModifierMapping (gdk_display); have_super = FALSE; have_meta = FALSE; have_hyper = FALSE; - + /* there are 8 modifiers, and the first 3 are shift, shift lock, * and control */ @@ -536,13 +536,13 @@ reload_mouse_modifiers (void) * see if its keysym is one we're interested in */ int keycode = modmap->modifiermap[i]; - + if (keycode >= min_keycode && keycode <= max_keycode) { int j = 0; KeySym *syms = keymap + (keycode - min_keycode) * keysyms_per_keycode; - - while (j < keysyms_per_keycode) { + + while (j < keysyms_per_keycode) { if (syms[j] == XK_Super_L || syms[j] == XK_Super_R) mod_super = i / modmap->max_keypermod; @@ -555,17 +555,17 @@ reload_mouse_modifiers (void) ++j; } } - + ++i; } - + if ((1 << mod_meta) != Mod1Mask) have_meta = TRUE; - if (mod_super != 0 && + if (mod_super != 0 && mod_super != mod_meta) have_super = TRUE; - if (mod_hyper != 0 && - mod_hyper != mod_meta && + if (mod_hyper != 0 && + mod_hyper != mod_meta && mod_hyper != mod_super) have_hyper = TRUE; @@ -581,8 +581,8 @@ reload_mouse_modifiers (void) } g_free (mouse_modifiers); mouse_modifiers = NULL; - - + + n_mouse_modifiers = 2; /* control, alt */ if (have_super) ++n_mouse_modifiers; @@ -598,6 +598,7 @@ reload_mouse_modifiers (void) i = 0; mouse_modifiers[i].number = i; + /* translators: this is the Control key */ mouse_modifiers[i].name = g_strdup (_("C_ontrol")); mouse_modifiers[i].value = "Control"; ++i; diff --git a/vfs-methods/themus/ChangeLog b/vfs-methods/themus/ChangeLog index 72e348d2f..dc26d1a64 100644 --- a/vfs-methods/themus/ChangeLog +++ b/vfs-methods/themus/ChangeLog @@ -1,3 +1,8 @@ +2007-12-06 Jens Granseuer + + * apply-font.glade: don't mark padding string as translatable (bug + #502087) + 2007-11-23 Frederic Crozat * themus-theme-applier.desktop.in.in: Fix .desktop to be valid (bug diff --git a/vfs-methods/themus/apply-font.glade b/vfs-methods/themus/apply-font.glade index 1590c9c11..cfab47bd5 100644 --- a/vfs-methods/themus/apply-font.glade +++ b/vfs-methods/themus/apply-font.glade @@ -6,7 +6,7 @@ 6 True - + GTK_WINDOW_TOPLEVEL GTK_WIN_POS_NONE False @@ -193,7 +193,7 @@ True - + False True GTK_JUSTIFY_LEFT