grab buttons 2 and 3 also, so you can focus a window with those, #70840

002-02-08  Havoc Pennington  <hp@pobox.com>

	* src/display.c (meta_display_grab_focus_window_button): grab
	buttons 2 and 3 also, so you can focus a window with those,
	#70840
	(event_callback): fix this to let you focus a window with any
	unmodified click, and also with Alt+button1

	* configure.in (AC_OUTPUT): add po/Makefile.in

	* autogen.sh: port to glib-gettextize, remove stupid
	auto-find-subdirs crap

	* Makefile.am (SUBDIRS): add po to subdirs, #70615

	* src/window.c (meta_window_activate): unshaded window if shaded,
	I thought this was in bugzilla but I don't see it. anyway thanks
	whoever mentioned it to me.

1 files changed, 358 insertions, 157 deletions

diff --git a/po/ru.po b/po/ru.po
index 6062a2d5..e26fda45 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: metacity\n"
-"POT-Creation-Date: 2001-10-14 16:17+0400\n"
+"POT-Creation-Date: 2002-02-08 01:59-0500\n"
 "PO-Revision-Date: 2001-10-14 16:24+0400\n"
 "Last-Translator: Valek Filippov <frob@df.ru>\n"
 "Language-Team: Russian <ru@li.org>\n"
@@ -12,12 +12,12 @@ msgstr ""
 "Content-Type: text/plain; charset=koi8-r\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/display.c:153
+#: src/display.c:160
 #, c-format
 msgid "Failed to open X Window System display '%s'\n"
 msgstr ""
 
-#: src/errors.c:92
+#: src/errors.c:93
 #, c-format
 msgid ""
 "Lost connection to the display '%s';\n"
@@ -25,270 +25,471 @@ msgid ""
 "the window manager.\n"
 msgstr ""
 
-#: src/errors.c:99
+#: src/errors.c:100
 #, c-format
 msgid "Fatal IO error %d (%s) on display '%s'.\n"
 msgstr ""
 
-#: src/frames.c:229
-msgid "Left edge"
-msgstr "Левый край"
-
-#: src/frames.c:229
-msgid "Left window edge width"
-msgstr ""
-
-#: src/frames.c:230
-msgid "Right edge"
-msgstr "Правый край"
-
-#: src/frames.c:230
-msgid "Right window edge width"
-msgstr ""
-
-#: src/frames.c:231
-msgid "Bottom edge"
-msgstr "Нижний край"
-
-#: src/frames.c:231
-msgid "Bottom window edge height"
-msgstr ""
-
-#: src/frames.c:233
-msgid "Title border"
-msgstr "Граница заголовка"
-
-#: src/frames.c:233
-msgid "Border around title area"
-msgstr "Граница вокруг области заголовка"
-
-#: src/frames.c:234
-msgid "Text border"
-msgstr "Граница текста"
-
-#: src/frames.c:234
-msgid "Border around window title text"
-msgstr "Граница вокруг текста заголовка окна"
-
-#: src/frames.c:236
-msgid "Spacer padding"
-msgstr ""
-
-#: src/frames.c:236
-msgid "Padding on either side of spacer"
-msgstr ""
-
-#: src/frames.c:237
-msgid "Spacer width"
-msgstr ""
-
-#: src/frames.c:237
-msgid "Width of spacer"
-msgstr ""
-
-#: src/frames.c:238
-msgid "Spacer height"
-msgstr ""
-
-#: src/frames.c:238
-msgid "Height of spacer"
-msgstr ""
-
-#. same as right_width left_width by default
-#: src/frames.c:241
-msgid "Right inset"
-msgstr ""
-
-#: src/frames.c:241
-msgid "Distance of buttons from right edge of frame"
-msgstr ""
-
-#: src/frames.c:242
-msgid "Left inset"
-msgstr ""
-
-#: src/frames.c:242
-msgid "Distance of menu button from left edge of frame"
-msgstr "Расстояние до кнопки меню от левого края кадра"
-
-#: src/frames.c:244
-msgid "Button width"
-msgstr "Ширина кнопки"
-
-#: src/frames.c:244
-msgid "Width of buttons"
-msgstr "Ширина кнопки"
-
-#: src/frames.c:245
-msgid "Button height"
-msgstr "Высота кнопки"
-
-#: src/frames.c:245
-msgid "Height of buttons"
-msgstr "Высота кнопки"
-
-#: src/frames.c:247
-msgid "Button border"
-msgstr "Граница кнопки"
-
-#: src/frames.c:247
-msgid "Border around buttons"
-msgstr "Граница вокруг кнопки"
-
-#: src/frames.c:248
-msgid "Inner button border"
-msgstr ""
-
-#: src/frames.c:248
-msgid "Border around the icon inside buttons"
-msgstr ""
-
-#: src/frames.c:883
+#: src/frames.c:555
 msgid "Close Window"
 msgstr "Закрыть окно"
 
-#: src/frames.c:886
+#: src/frames.c:558
 msgid "Window Menu"
 msgstr "Меню окна"
 
-#: src/frames.c:889
+#: src/frames.c:561
 msgid "Minimize Window"
 msgstr "Минимизировать окно"
 
-#: src/frames.c:892
+#: src/frames.c:564
 msgid "Maximize Window"
 msgstr "Максимизировать окно"
 
-#: src/frames.c:895
+#: src/frames.c:567
 msgid "Unmaximize Window"
 msgstr ""
 
-#: src/keybindings.c:203
+#: src/keybindings.c:228
 #, c-format
 msgid ""
 "Some other program is already using the key %s with modifiers %x as a "
 "binding\n"
 msgstr ""
 
-#: src/menu.c:47
+#: src/main.c:227
+#, c-format
+msgid "Could not find a theme! Be sure %s exits and contains the usual themes."
+msgstr ""
+
+#: src/main.c:273
+#, fuzzy, c-format
+msgid "Failed to restart: %s\n"
+msgstr "Сбой при чтении сохранённого файла сеанса \"%s\": %s\n"
+
+#: src/menu.c:49
 msgid "_Close"
 msgstr "Закрыть"
 
-#: src/menu.c:48
+#: src/menu.c:50
 msgid "_Minimize"
 msgstr "Минимизировать"
 
-#: src/menu.c:49
+#: src/menu.c:51
 msgid "Ma_ximize"
 msgstr "Максимизировать"
 
-#: src/menu.c:50
+#: src/menu.c:52
 msgid "_Unmaximize"
 msgstr ""
 
-#: src/menu.c:51
+#: src/menu.c:53
 msgid "_Shade"
 msgstr ""
 
-#: src/menu.c:52
+#: src/menu.c:54
 msgid "U_nshade"
 msgstr ""
 
-#: src/menu.c:53
+#: src/menu.c:55
 msgid "Mo_ve"
 msgstr "Переместить"
 
-#: src/menu.c:54
+#: src/menu.c:56
 msgid "_Resize"
 msgstr "Изменить размер"
 
 #. separator
-#: src/menu.c:56
+#: src/menu.c:58
 msgid "Put on _All Workspaces"
 msgstr "Поместить на все рабочие столы"
 
-#: src/menu.c:57
+#: src/menu.c:59
 msgid "Only on _This Workspace"
 msgstr "Только на этом рабочем столе"
 
-#: src/menu.c:260
-#, c-format
-msgid "Only on workspace _%d"
+#: src/menu.c:298
+#, fuzzy, c-format
+msgid "Only on workspace %s%d"
 msgstr "Только на рабочем столе %d"
 
-#: src/menu.c:263
-#, c-format
-msgid "Move to workspace _%d"
+#: src/menu.c:301
+#, fuzzy, c-format
+msgid "Move to workspace %s%d"
 msgstr "Переместить на рабочий стол %d"
 
-#: src/screen.c:168
+#: src/prefs.c:281 src/prefs.c:297 src/prefs.c:313 src/prefs.c:329
+#: src/prefs.c:345 src/prefs.c:365 src/prefs.c:381
+#, c-format
+msgid "GConf key \"%s\" is set to an invalid type\n"
+msgstr ""
+
+#: src/prefs.c:415
+#, c-format
+msgid "GConf key '%s' is set to an invalid value"
+msgstr ""
+
+#: src/prefs.c:487
+#, c-format
+msgid "Could not parse font description \"%s\" from GConf key %s\n"
+msgstr ""
+
+#: src/prefs.c:524
+#, c-format
+msgid "%d stored in GConf key %s is not a valid font size\n"
+msgstr ""
+
+#: src/prefs.c:550
+#, c-format
+msgid ""
+"%d stored in GConf key %s is not a reasonable number of workspaces, current "
+"maximum is %d\n"
+msgstr ""
+
+#: src/screen.c:174
 #, c-format
 msgid "Screen %d on display '%s' is invalid\n"
 msgstr ""
 
-#: src/screen.c:183
+#: src/screen.c:190
 #, c-format
 msgid "Screen %d on display '%s' already has a window manager\n"
 msgstr ""
 
-#: src/session.c:751 src/session.c:758
+#: src/screen.c:268
+#, fuzzy, c-format
+msgid "Could not release screen %d on display '%s'\n"
+msgstr "Не удалось создать каталог \"%s\": %s\n"
+
+#: src/session.c:760 src/session.c:767
 #, c-format
 msgid "Could not create directory '%s': %s\n"
 msgstr "Не удалось создать каталог \"%s\": %s\n"
 
-#: src/session.c:768
+#: src/session.c:777
 #, c-format
 msgid "Could not open session file '%s' for writing: %s\n"
 msgstr "Не удалось открыть для записи файл сеанса \"%s\": %s\n"
 
-#: src/session.c:900
+#: src/session.c:909
 #, c-format
 msgid "Error writing session file '%s': %s\n"
 msgstr "Ошибка записи файла сеанса \"%s\": %s\n"
 
-#: src/session.c:905
+#: src/session.c:914
 #, c-format
 msgid "Error closing session file '%s': %s\n"
 msgstr "Ошибка закрытия файла сеанса \"%s\": %s\n"
 
-#: src/session.c:979
+#: src/session.c:988
 #, c-format
 msgid "Failed to read saved session file %s: %s\n"
 msgstr "Сбой при чтении сохранённого файла сеанса \"%s\": %s\n"
 
-#: src/session.c:1013
+#: src/session.c:1022
 #, c-format
 msgid "Failed to parse saved session file: %s\n"
 msgstr ""
 
-#: src/session.c:1051
+#: src/session.c:1060
 msgid "nested <window> tag"
 msgstr ""
 
-#: src/session.c:1101 src/session.c:1133
+#: src/session.c:1110 src/session.c:1142
 #, c-format
 msgid "Unknown attribute %s on <window> element"
 msgstr ""
 
-#: src/session.c:1193
+#: src/session.c:1202
 #, c-format
 msgid "Unknown attribute %s on <geometry> element"
 msgstr ""
 
-#: src/session.c:1213
+#: src/session.c:1222
 #, c-format
 msgid "Unknown element %s"
 msgstr "Неизвестный элемент %s"
 
-#. someone is on crack
-#: src/window.c:2852
+#: src/theme.c:348
+msgid "top"
+msgstr ""
+
+#: src/theme.c:350
+msgid "bottom"
+msgstr ""
+
+#: src/theme.c:352
+msgid "left"
+msgstr ""
+
+#: src/theme.c:354
+msgid "right"
+msgstr ""
+
+#: src/theme.c:368
+#, c-format
+msgid "frame geometry does not specify \"%s\" dimension"
+msgstr ""
+
+#: src/theme.c:387
+#, c-format
+msgid "frame geometry does not specify dimension \"%s\" for border \"%s\""
+msgstr ""
+
+#: src/theme.c:738
+msgid "Gradients should have at least two colors"
+msgstr ""
+
+#: src/theme.c:828
+#, c-format
+msgid ""
+"GTK color specification must have the state in brackets, e.g. gtk:fg[NORMAL] "
+"where NORMAL is the state; could not parse \"%s\""
+msgstr ""
+
+#: src/theme.c:842
+#, c-format
+msgid ""
+"GTK color specification must have a close bracket after the state, e.g. gtk:"
+"fg[NORMAL] where NORMAL is the state; could not parse \"%s\""
+msgstr ""
+
+#: src/theme.c:853
+#, c-format
+msgid "Did not understand state \"%s\" in color specification"
+msgstr ""
+
+#: src/theme.c:866
 #, c-format
-msgid "Window %s sets max width %d less than min width %d, disabling resize\n"
+msgid "Did not understand color component \"%s\" in color specification"
 msgstr ""
 
-#. another cracksmoker
-#: src/window.c:2862
+#: src/theme.c:896
 #, c-format
 msgid ""
-"Window %s sets max height %d less than min height %d, disabling resize\n"
+"Blend format is \"blend/bg_color/fg_color/alpha\", \"%s\" does not fit the "
+"format"
 msgstr ""
+
+#: src/theme.c:907
+#, c-format
+msgid "Could not parse alpha value \"%s\" in blended color"
+msgstr ""
+
+#: src/theme.c:917
+#, c-format
+msgid "Alpha value \"%s\" in blended color is not between 0.0 and 1.0"
+msgstr ""
+
+#: src/theme.c:956
+#, fuzzy, c-format
+msgid "Could not parse color \"%s\""
+msgstr "Не удалось создать каталог \"%s\": %s\n"
+
+#: src/theme.c:1206
+#, c-format
+msgid "Coordinate expression contains character '%s' which is not allowed"
+msgstr ""
+
+#: src/theme.c:1233
+#, c-format
+msgid ""
+"Coordinate expression contains floating point number '%s' which could not be "
+"parsed"
+msgstr ""
+
+#: src/theme.c:1247
+#, c-format
+msgid "Coordinate expression contains integer '%s' which could not be parsed"
+msgstr ""
+
+#: src/theme.c:1314
+#, c-format
+msgid ""
+"Coordinate expression contained unknown operator at the start of this text: "
+"\"%s\""
+msgstr ""
+
+#: src/theme.c:1371
+msgid "Coordinate expression was empty or not understood"
+msgstr ""
+
+#: src/theme.c:1510 src/theme.c:1520 src/theme.c:1554
+msgid "Coordinate expression results in division by zero"
+msgstr ""
+
+#: src/theme.c:1562
+msgid ""
+"Coordinate expression tries to use mod operator on a floating-point number"
+msgstr ""
+
+#: src/theme.c:1619
+#, c-format
+msgid ""
+"Coordinate expression has an operator \"%s\" where an operand was expected"
+msgstr ""
+
+#: src/theme.c:1628
+msgid "Coordinate expression had an operand where an operator was expected"
+msgstr ""
+
+#: src/theme.c:1636
+msgid "Coordinate expression ended with an operator instead of an operand"
+msgstr ""
+
+#: src/theme.c:1646
+#, c-format
+msgid ""
+"Coordinate expression has operator \"%c\" following operator \"%c\" with no "
+"operand in between"
+msgstr ""
+
+#: src/theme.c:1765
+msgid ""
+"Coordinate expression parser overflowed its buffer, this is really a "
+"Metacity bug, but are you sure you need a huge expression like that?"
+msgstr ""
+
+#: src/theme.c:1794
+msgid "Coordinate expression had a close parenthesis with no open parenthesis"
+msgstr ""
+
+#: src/theme.c:1857
+#, c-format
+msgid "Coordinate expression had unknown variable or constant \"%s\""
+msgstr ""
+
+#: src/theme.c:1914
+msgid "Coordinate expression had an open parenthesis with no close parenthesis"
+msgstr ""
+
+#: src/theme.c:1925
+msgid "Coordinate expression doesn't seem to have any operators or operands"
+msgstr ""
+
+#: src/theme.c:2169 src/theme.c:2191 src/theme.c:2212
+#, c-format
+msgid "Theme contained an expression \"%s\" that resulted in an error: %s\n"
+msgstr ""
+
+#: src/theme.c:3376
+#, c-format
+msgid ""
+"<button function=\"%s\" state=\"%s\" draw_ops=\"whatever\"/> must be "
+"specified for this frame style"
+msgstr ""
+
+#: src/theme.c:3785 src/theme.c:3817
+#, c-format
+msgid ""
+"Missing <frame state=\"%s\" resize=\"%s\" focus=\"%s\" style=\"whatever\"/>"
+msgstr ""
+
+#: src/theme.c:3868
+#, fuzzy, c-format
+msgid "Failed to load theme \"%s\": %s"
+msgstr "Сбой при чтении сохранённого файла сеанса \"%s\": %s\n"
+
+#: src/theme.c:4013
+#, c-format
+msgid "No <name> set for theme \"%s\""
+msgstr ""
+
+#: src/theme.c:4020
+#, c-format
+msgid "No <author> set for theme \"%s\""
+msgstr ""
+
+#: src/theme.c:4027
+#, c-format
+msgid "No <date> set for theme \"%s\""
+msgstr ""
+
+#: src/theme.c:4034
+#, c-format
+msgid "No <description> set for theme \"%s\""
+msgstr ""
+
+#: src/theme.c:4041
+#, c-format
+msgid "No <copyright> set for theme \"%s\""
+msgstr ""
+
+#: src/theme.c:4051
+#, c-format
+msgid ""
+"No frame style set for window type \"%s\" in theme \"%s\", add a <window "
+"type=\"%s\" style_set=\"whatever\"/> element"
+msgstr ""
+
+#: src/theme.c:4073
+#, c-format
+msgid ""
+"<menu_icon function=\"%s\" state=\"%s\" draw_ops=\"whatever\"/> must be "
+"specified for this theme"
+msgstr ""
+
+#: src/theme.c:4424 src/theme.c:4484
+#, c-format
+msgid ""
+"User-defined constants must begin with a capital letter; \"%s\" does not"
+msgstr ""
+
+#: src/theme.c:4432 src/theme.c:4492
+#, c-format
+msgid "Constant \"%s\" has already been defined"
+msgstr ""
+
+#: src/xprops.c:53
+#, c-format
+msgid ""
+"Window 0x%lx has property %s that was expected to have type %s format %d and "
+"actually has type %s format %d n_items %d\n"
+msgstr ""
+
+#: src/xprops.c:281
+#, c-format
+msgid "Property %s on window 0x%lx contained invalid UTF-8\n"
+msgstr ""
+
+#~ msgid "Left edge"
+#~ msgstr "Левый край"
+
+#~ msgid "Right edge"
+#~ msgstr "Правый край"
+
+#~ msgid "Bottom edge"
+#~ msgstr "Нижний край"
+
+#~ msgid "Title border"
+#~ msgstr "Граница заголовка"
+
+#~ msgid "Border around title area"
+#~ msgstr "Граница вокруг области заголовка"
+
+#~ msgid "Text border"
+#~ msgstr "Граница текста"
+
+#~ msgid "Border around window title text"
+#~ msgstr "Граница вокруг текста заголовка окна"
+
+#~ msgid "Distance of menu button from left edge of frame"
+#~ msgstr "Расстояние до кнопки меню от левого края кадра"
+
+#~ msgid "Button width"
+#~ msgstr "Ширина кнопки"
+
+#~ msgid "Width of buttons"
+#~ msgstr "Ширина кнопки"
+
+#~ msgid "Button height"
+#~ msgstr "Высота кнопки"
+
+#~ msgid "Height of buttons"
+#~ msgstr "Высота кнопки"
+
+#~ msgid "Button border"
+#~ msgstr "Граница кнопки"
+
+#~ msgid "Border around buttons"
+#~ msgstr "Граница вокруг кнопки"