don't mark empty and padding strings for translation (bug #502087)

2007-12-06  Jens Granseuer  <jensgr@gmx.net>

	* gnome-about-me.glade: don't mark empty and padding strings for
	translation (bug #502087)

2007-12-06  Jens Granseuer  <jensgr@gmx.net>

	* gnome-accessibility-keyboard-properties.glade: don't mark padding
	string for translation (bug #502087)

2007-12-06  Jens Granseuer  <jensgr@gmx.net>

	* data/appearance.glade: don't mark padding strings for translation
	and add translation comments for the pixel order strings (bug #502087)

2007-12-06  Jens Granseuer  <jensgr@gmx.net>

	* gnome-keyboard-properties.glade: don't mark padding strings and stock
	items for translation (bug #502087)

2007-12-06  Jens Granseuer  <jensgr@gmx.net>

	* gnome-mouse-properties.glade: don't mark padding string as
	translatable (bug #502087)

2007-12-06  Jens Granseuer  <jensgr@gmx.net>

	* gnome-window-properties.c: (reload_mouse_modifiers): add a comment
	for translators (bug #502087)

2007-12-06  Jens Granseuer  <jensgr@gmx.net>

	* apply-font.glade: don't mark padding string as translatable (bug
	#502087)

svn path=/trunk/; revision=8312
This commit is contained in:
Jens Granseuer 2007-12-06 21:02:54 +00:00 committed by Jens Granseuer
parent 6865140ec7
commit a94bd1c8b1
14 changed files with 140 additions and 104 deletions

View file

@ -1,3 +1,8 @@
2007-12-06 Jens Granseuer <jensgr@gmx.net>
* gnome-about-me.glade: don't mark empty and padding strings for
translation (bug #502087)
2007-11-24 Jens Granseuer <jensgr@gmx.net>
Patch by: Matthias Clasen <mclasen@redhat.com>

View file

@ -172,7 +172,7 @@
<child>
<widget class="GtkLabel" id="login">
<property name="visible">True</property>
<property name="label" translatable="yes"> </property>
<property name="label"></property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@ -294,7 +294,7 @@
<child>
<widget class="GtkLabel" id="label1058">
<property name="visible">True</property>
<property name="label" translatable="yes"> </property>
<property name="label"> </property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@ -390,7 +390,7 @@
<property name="editable">True</property>
<property name="visibility">True</property>
<property name="max_length">0</property>
<property name="text" translatable="yes"></property>
<property name="text"></property>
<property name="has_frame">True</property>
<property name="activates_default">False</property>
</widget>
@ -410,7 +410,7 @@
<property name="editable">True</property>
<property name="visibility">True</property>
<property name="max_length">0</property>
<property name="text" translatable="yes"></property>
<property name="text"></property>
<property name="has_frame">True</property>
<property name="activates_default">False</property>
</widget>
@ -484,7 +484,7 @@
<child>
<widget class="GtkLabel" id="label1059">
<property name="visible">True</property>
<property name="label" translatable="yes"> </property>
<property name="label"> </property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@ -580,7 +580,7 @@
<property name="editable">True</property>
<property name="visibility">True</property>
<property name="max_length">0</property>
<property name="text" translatable="yes"></property>
<property name="text"></property>
<property name="has_frame">True</property>
<property name="activates_default">False</property>
</widget>
@ -600,7 +600,7 @@
<property name="editable">True</property>
<property name="visibility">True</property>
<property name="max_length">0</property>
<property name="text" translatable="yes"></property>
<property name="text"></property>
<property name="has_frame">True</property>
<property name="activates_default">False</property>
</widget>
@ -620,7 +620,7 @@
<property name="editable">True</property>
<property name="visibility">True</property>
<property name="max_length">0</property>
<property name="text" translatable="yes"></property>
<property name="text"></property>
<property name="has_frame">True</property>
<property name="activates_default">False</property>
</widget>
@ -640,7 +640,7 @@
<property name="editable">True</property>
<property name="visibility">True</property>
<property name="max_length">0</property>
<property name="text" translatable="yes"></property>
<property name="text"></property>
<property name="has_frame">True</property>
<property name="activates_default">False</property>
</widget>
@ -772,7 +772,7 @@
<child>
<widget class="GtkLabel" id="label1060">
<property name="visible">True</property>
<property name="label" translatable="yes"> </property>
<property name="label"> </property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@ -839,7 +839,7 @@
<property name="editable">True</property>
<property name="visibility">True</property>
<property name="max_length">0</property>
<property name="text" translatable="yes"></property>
<property name="text"></property>
<property name="has_frame">True</property>
<property name="activates_default">False</property>
</widget>
@ -859,7 +859,7 @@
<property name="editable">True</property>
<property name="visibility">True</property>
<property name="max_length">0</property>
<property name="text" translatable="yes"></property>
<property name="text"></property>
<property name="has_frame">True</property>
<property name="activates_default">False</property>
</widget>
@ -1024,7 +1024,7 @@
<property name="editable">True</property>
<property name="visibility">True</property>
<property name="max_length">0</property>
<property name="text" translatable="yes"></property>
<property name="text"></property>
<property name="has_frame">True</property>
<property name="activates_default">False</property>
</widget>
@ -1044,7 +1044,7 @@
<property name="editable">True</property>
<property name="visibility">True</property>
<property name="max_length">0</property>
<property name="text" translatable="yes"></property>
<property name="text"></property>
<property name="has_frame">True</property>
<property name="activates_default">False</property>
</widget>
@ -1064,7 +1064,7 @@
<property name="editable">True</property>
<property name="visibility">True</property>
<property name="max_length">0</property>
<property name="text" translatable="yes"></property>
<property name="text"></property>
<property name="has_frame">True</property>
<property name="activates_default">False</property>
</widget>
@ -1084,7 +1084,7 @@
<property name="editable">True</property>
<property name="visibility">True</property>
<property name="max_length">0</property>
<property name="text" translatable="yes"></property>
<property name="text"></property>
<property name="has_frame">True</property>
<property name="activates_default">False</property>
</widget>
@ -1200,7 +1200,7 @@
<child>
<widget class="GtkLabel" id="label1061">
<property name="visible">True</property>
<property name="label" translatable="yes"> </property>
<property name="label"> </property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@ -1285,7 +1285,7 @@
<property name="left_margin">0</property>
<property name="right_margin">0</property>
<property name="indent">0</property>
<property name="text" translatable="yes"></property>
<property name="text"></property>
</widget>
</child>
</widget>
@ -1450,7 +1450,7 @@
<property name="editable">True</property>
<property name="visibility">True</property>
<property name="max_length">0</property>
<property name="text" translatable="yes"></property>
<property name="text"></property>
<property name="has_frame">True</property>
<property name="activates_default">False</property>
</widget>
@ -1470,7 +1470,7 @@
<property name="editable">True</property>
<property name="visibility">True</property>
<property name="max_length">0</property>
<property name="text" translatable="yes"></property>
<property name="text"></property>
<property name="has_frame">True</property>
<property name="activates_default">False</property>
</widget>
@ -1490,7 +1490,7 @@
<property name="editable">True</property>
<property name="visibility">True</property>
<property name="max_length">0</property>
<property name="text" translatable="yes"></property>
<property name="text"></property>
<property name="has_frame">True</property>
<property name="activates_default">False</property>
</widget>
@ -1510,7 +1510,7 @@
<property name="editable">True</property>
<property name="visibility">True</property>
<property name="max_length">0</property>
<property name="text" translatable="yes"></property>
<property name="text"></property>
<property name="has_frame">True</property>
<property name="activates_default">False</property>
</widget>
@ -1530,7 +1530,7 @@
<property name="editable">True</property>
<property name="visibility">True</property>
<property name="max_length">0</property>
<property name="text" translatable="yes"></property>
<property name="text"></property>
<property name="has_frame">True</property>
<property name="activates_default">False</property>
</widget>
@ -1611,7 +1611,7 @@
<child>
<widget class="GtkLabel" id="label1062">
<property name="visible">True</property>
<property name="label" translatable="yes"> </property>
<property name="label"> </property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@ -1696,7 +1696,7 @@
<property name="left_margin">0</property>
<property name="right_margin">0</property>
<property name="indent">0</property>
<property name="text" translatable="yes"></property>
<property name="text"></property>
</widget>
</child>
</widget>
@ -1861,7 +1861,7 @@
<property name="editable">True</property>
<property name="visibility">True</property>
<property name="max_length">0</property>
<property name="text" translatable="yes"></property>
<property name="text"></property>
<property name="has_frame">True</property>
<property name="activates_default">False</property>
</widget>
@ -1881,7 +1881,7 @@
<property name="editable">True</property>
<property name="visibility">True</property>
<property name="max_length">0</property>
<property name="text" translatable="yes"></property>
<property name="text"></property>
<property name="has_frame">True</property>
<property name="activates_default">False</property>
</widget>
@ -1901,7 +1901,7 @@
<property name="editable">True</property>
<property name="visibility">True</property>
<property name="max_length">0</property>
<property name="text" translatable="yes"></property>
<property name="text"></property>
<property name="has_frame">True</property>
<property name="activates_default">False</property>
</widget>
@ -1921,7 +1921,7 @@
<property name="editable">True</property>
<property name="visibility">True</property>
<property name="max_length">0</property>
<property name="text" translatable="yes"></property>
<property name="text"></property>
<property name="has_frame">True</property>
<property name="activates_default">False</property>
</widget>
@ -1941,7 +1941,7 @@
<property name="editable">True</property>
<property name="visibility">True</property>
<property name="max_length">0</property>
<property name="text" translatable="yes"></property>
<property name="text"></property>
<property name="has_frame">True</property>
<property name="activates_default">False</property>
</widget>
@ -2051,7 +2051,7 @@
<child>
<widget class="GtkLabel" id="label1063">
<property name="visible">True</property>
<property name="label" translatable="yes"> </property>
<property name="label"> </property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@ -2176,7 +2176,7 @@
<property name="editable">True</property>
<property name="visibility">True</property>
<property name="max_length">0</property>
<property name="text" translatable="yes"></property>
<property name="text"></property>
<property name="has_frame">True</property>
<property name="activates_default">False</property>
</widget>
@ -2196,7 +2196,7 @@
<property name="editable">True</property>
<property name="visibility">True</property>
<property name="max_length">0</property>
<property name="text" translatable="yes"></property>
<property name="text"></property>
<property name="has_frame">True</property>
<property name="activates_default">False</property>
</widget>
@ -2216,7 +2216,7 @@
<property name="editable">True</property>
<property name="visibility">True</property>
<property name="max_length">0</property>
<property name="text" translatable="yes"></property>
<property name="text"></property>
<property name="has_frame">True</property>
<property name="activates_default">False</property>
</widget>
@ -2290,7 +2290,7 @@
<child>
<widget class="GtkLabel" id="label1064">
<property name="visible">True</property>
<property name="label" translatable="yes"> </property>
<property name="label"> </property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@ -2502,7 +2502,7 @@
<property name="editable">True</property>
<property name="visibility">True</property>
<property name="max_length">0</property>
<property name="text" translatable="yes"></property>
<property name="text"></property>
<property name="has_frame">True</property>
<property name="activates_default">False</property>
</widget>
@ -2522,7 +2522,7 @@
<property name="editable">True</property>
<property name="visibility">True</property>
<property name="max_length">0</property>
<property name="text" translatable="yes"></property>
<property name="text"></property>
<property name="has_frame">True</property>
<property name="activates_default">False</property>
</widget>
@ -2542,7 +2542,7 @@
<property name="editable">True</property>
<property name="visibility">True</property>
<property name="max_length">0</property>
<property name="text" translatable="yes"></property>
<property name="text"></property>
<property name="has_frame">True</property>
<property name="activates_default">False</property>
</widget>
@ -2562,7 +2562,7 @@
<property name="editable">True</property>
<property name="visibility">True</property>
<property name="max_length">0</property>
<property name="text" translatable="yes"></property>
<property name="text"></property>
<property name="has_frame">True</property>
<property name="activates_default">False</property>
</widget>
@ -2582,7 +2582,7 @@
<property name="editable">True</property>
<property name="visibility">True</property>
<property name="max_length">0</property>
<property name="text" translatable="yes"></property>
<property name="text"></property>
<property name="has_frame">True</property>
<property name="activates_default">False</property>
</widget>
@ -2602,7 +2602,7 @@
<property name="editable">True</property>
<property name="visibility">True</property>
<property name="max_length">0</property>
<property name="text" translatable="yes"></property>
<property name="text"></property>
<property name="has_frame">True</property>
<property name="activates_default">False</property>
</widget>
@ -2952,7 +2952,7 @@ After you have authenticated, enter your new password, retype it for verificatio
<property name="editable">True</property>
<property name="visibility">False</property>
<property name="max_length">0</property>
<property name="text" translatable="yes"></property>
<property name="text"></property>
<property name="has_frame">True</property>
<property name="activates_default">False</property>
</widget>
@ -3056,7 +3056,7 @@ After you have authenticated, enter your new password, retype it for verificatio
<property name="editable">True</property>
<property name="visibility">False</property>
<property name="max_length">0</property>
<property name="text" translatable="yes"></property>
<property name="text"></property>
<property name="has_frame">True</property>
<property name="activates_default">False</property>
</widget>
@ -3075,7 +3075,7 @@ After you have authenticated, enter your new password, retype it for verificatio
<property name="editable">True</property>
<property name="visibility">False</property>
<property name="max_length">0</property>
<property name="text" translatable="yes"></property>
<property name="text"></property>
<property name="has_frame">True</property>
<property name="activates_default">True</property>
</widget>

View file

@ -1,3 +1,8 @@
2007-12-06 Jens Granseuer <jensgr@gmx.net>
* gnome-accessibility-keyboard-properties.glade: don't mark padding
string for translation (bug #502087)
2007-05-05 Jens Granseuer <jensgr@gmx.net>
* accessibility-keyboard.c: (setup_images):

View file

@ -134,7 +134,7 @@
<child>
<widget class="GtkLabel" id="label88">
<property name="visible">True</property>
<property name="label" translatable="yes"> </property>
<property name="label"> </property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>

View file

@ -1,3 +1,8 @@
2007-12-06 Jens Granseuer <jensgr@gmx.net>
* 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 <jensgr@gmx.net>
* appearance-desktop.c: (desktop_init):

View file

@ -472,7 +472,7 @@
<widget class="GtkRadioButton" id="subpixel_rgb_radio">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="label" translatable="yes">_RGB</property>
<property name="label" translatable="yes" comments="pixel order red, green, blue">_RGB</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
</widget>
@ -498,7 +498,7 @@
<widget class="GtkRadioButton" id="subpixel_bgr_radio">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="label" translatable="yes">_BGR</property>
<property name="label" translatable="yes" comments="pixel order blue, green, red">_BGR</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
<property name="group">subpixel_rgb_radio</property>
@ -530,7 +530,7 @@
<widget class="GtkRadioButton" id="subpixel_vrgb_radio">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="label" translatable="yes">_VRGB</property>
<property name="label" translatable="yes" comments="vertical hinting, pixel order red, green, blue">_VRGB</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
<property name="group">subpixel_rgb_radio</property>
@ -562,7 +562,7 @@
<widget class="GtkRadioButton" id="subpixel_vbgr_radio">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="label" translatable="yes">VB_GR</property>
<property name="label" translatable="yes" comments="vertical hinting, pixel order blue, green, red">VB_GR</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
<property name="group">subpixel_rgb_radio</property>
@ -1465,7 +1465,7 @@ Vertical gradient</property>
<child>
<widget class="GtkLabel" id="label36">
<property name="visible">True</property>
<property name="label" translatable="yes"> </property>
<property name="label"> </property>
</widget>
<packing>
<property name="expand">False</property>
@ -1583,7 +1583,7 @@ Text only</property>
<child>
<widget class="GtkLabel" id="label39">
<property name="visible">True</property>
<property name="label" translatable="yes"> </property>
<property name="label"> </property>
</widget>
<packing>
<property name="expand">False</property>

View file

@ -1,3 +1,8 @@
2007-12-06 Jens Granseuer <jensgr@gmx.net>
* gnome-keyboard-properties.glade: don't mark padding strings and stock
items for translation (bug #502087)
2007-11-11 Jens Granseuer <jensgr@gmx.net>
* gnome-keyboard-properties.glade: the fine line between text fields

View file

@ -45,7 +45,7 @@
<child>
<widget class="GtkLabel" id="label43">
<property name="visible">True</property>
<property name="label" translatable="yes"> </property>
<property name="label"> </property>
</widget>
<packing>
<property name="expand">False</property>
@ -244,7 +244,7 @@
<child>
<widget class="GtkLabel" id="label44">
<property name="visible">True</property>
<property name="label" translatable="yes"> </property>
<property name="label"> </property>
</widget>
<packing>
<property name="expand">False</property>
@ -637,7 +637,7 @@
<child>
<widget class="GtkLabel" id="label45">
<property name="visible">True</property>
<property name="label" translatable="yes"> </property>
<property name="label"> </property>
</widget>
<packing>
<property name="expand">False</property>
@ -1180,7 +1180,7 @@
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="label" translatable="yes">gtk-help</property>
<property name="label">gtk-help</property>
<property name="use_stock">True</property>
<property name="response_id">-11</property>
</widget>
@ -1191,7 +1191,7 @@
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="label" translatable="yes">gtk-close</property>
<property name="label">gtk-close</property>
<property name="use_stock">True</property>
<property name="response_id">0</property>
</widget>

View file

@ -1,3 +1,8 @@
2007-12-06 Jens Granseuer <jensgr@gmx.net>
* gnome-mouse-properties.glade: don't mark padding string as
translatable (bug #502087)
2007-07-27 Denis Washington <denisw@svn.gnome.org>
* Makefile.am:

View file

@ -122,7 +122,7 @@
<child>
<widget class="GtkLabel" id="label11">
<property name="visible">True</property>
<property name="label" translatable="yes"> </property>
<property name="label"> </property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@ -271,7 +271,7 @@
<child>
<widget class="GtkLabel" id="label13">
<property name="visible">True</property>
<property name="label" translatable="yes"> </property>
<property name="label"> </property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@ -525,7 +525,7 @@
<child>
<widget class="GtkLabel" id="label18">
<property name="visible">True</property>
<property name="label" translatable="yes"> </property>
<property name="label"> </property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@ -841,7 +841,7 @@
<child>
<widget class="GtkLabel" id="label19">
<property name="visible">True</property>
<property name="label" translatable="yes"> </property>
<property name="label"> </property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>

View file

@ -1,3 +1,8 @@
2007-12-06 Jens Granseuer <jensgr@gmx.net>
* gnome-window-properties.c: (reload_mouse_modifiers): add a comment
for translators (bug #502087)
2007-04-27 Rodrigo Moya <rodrigo@gnome-db.org>
* window-properties.desktop.in.in: renamed Bugzilla product.

View file

@ -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 ("<b>%s</b>\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;

View file

@ -1,3 +1,8 @@
2007-12-06 Jens Granseuer <jensgr@gmx.net>
* apply-font.glade: don't mark padding string as translatable (bug
#502087)
2007-11-23 Frederic Crozat <fcrozat@mandriva.com>
* themus-theme-applier.desktop.in.in: Fix .desktop to be valid (bug

View file

@ -6,7 +6,7 @@
<widget class="GtkDialog" id="ApplyFontAlert">
<property name="border_width">6</property>
<property name="visible">True</property>
<property name="title" translatable="yes"> </property>
<property name="title"></property>
<property name="type">GTK_WINDOW_TOPLEVEL</property>
<property name="window_position">GTK_WIN_POS_NONE</property>
<property name="modal">False</property>
@ -193,7 +193,7 @@
<child>
<widget class="GtkLabel" id="font_sample">
<property name="visible">True</property>
<property name="label" translatable="yes"></property>
<property name="label"></property>
<property name="use_underline">False</property>
<property name="use_markup">True</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>