2.11.2 release

2005-08-08  Elijah Newren  <newren@gmail.com>

	* NEWS:	2.11.2 release

ChangeLog

@@ -1,3 +1,977 @@
+2005-08-08  Elijah Newren  <newren@gmail.com>
+
+	* NEWS:	2.11.2 release
+
+2005-08-08  Elijah Newren  <newren@gmail.com>
+
+	Patch from Brent Smith to fix a duplicate string.  Fixes #309774.
+
+	* src/theme-parser.c (parse_toplevel_element, parse_draw_op_element):
+	Change "No \"%s\" attribute on element <%s>" string to "No \"%s\"
+	attribute on <%s> element"
+
+2005-08-03  Ray Strode  <rstrode@redhat.com>
+
+	Improve the behavior of keyboard move/resize and edge
+	snapping.  Still not perfect, bug 310888.
+
+	* src/effects.c (draw_xor_rect): Make the outside of a
+	wireframe rectangle line up with the outside edge of its
+	window, instead of centering the wireframe edges on the
+	window edges.
+
+	* src/keybindings.c (process_keyboard_move_grab): allow
+	edge snapping in wireframe mode.  Adjust code to take
+	into account changed semantics of find_next_*_edge
+	functions.
+	(process_keyboard_resize_grab_op_change): new function 
+	to take some orthogonal logic out of
+	process_keyboard_resize_grab_op.  Only allow keyboard
+	resize cursor to go to flat edges, not corners.
+	(process_keyboard_resize_grab):  allow edge snapping in
+	wireframe mode.  Fix up snapping logic.
+
+	* src/place.c (get_{vertical,horizontal}_edges): use 
+	GArray instead of int *, since the number of output
+	edges isn't known until the middle of the function now.
+	Use xor rect extents instead of window extends if in
+	wireframe mode.
+	(meta_window_find_next_{vertical,horizontal}_edge: add
+	new source_edge_position parameter to specify which edge
+	on the active window to start from when looking for next
+	edge on the screen. Return the coordinate of the edge 
+	found and not the coordinate of where the window should be
+	moved to snap to where the edge was found.
+
+	* src/window.c (update_move): all the user to specify
+	an edge to resize with mouse in keyboard resize mode.
+	window
+
+2005-08-01  Elijah Newren  <newren@gmail.com>
+
+	* src/metacity.schemas.in: Change default theme from "Simple" to
+	"Clearlooks".
+
+2005-07-31  Elijah Newren  <newren@gmail.com>
+
+	* src/stack.c (is_focused_foreach, get_standalone_layer): use only
+	the expected_focus_window instead of both the focused_window and
+	the expected_focus_window.  Removes an infinite flicker loop in
+	sloppy and mouse focus, and an ugly one time flicker in click to
+	focus.  Fixes #311400.
+
+2005-07-30  Elijah Newren  <newren@gmail.com>
+
+	Patch from Jaap Haitsma to make sure that Metacity dialogs have
+	icons.  Fixes #309876.
+	
+	* src/metacity-dialog.c (kill_window_question,
+	warn_about_no_sm_support, error_about_command): call
+	gtk_window_set_icon_name() to set the dialog icon
+
+2005-07-28  Elijah Newren  <newren@gmail.com>
+
+	* src/place.c (avoid_being_obscured_as_second_modal_dialog):
+	remove some unneeded debug spew that was causing crashes.  Fixes
+	#311819.
+
+2005-07-24  Elijah Newren  <newren@gmail.com>
+
+	* configure.in: post-release version bump to 2.11.2
+
+2005-07-24  Elijah Newren  <newren@gmail.com>
+
+	* NEWS:	2.11.1 release
+
+2005-07-24  Elijah Newren  <newren@gmail.com>
+
+	* src/place.c (find_most_freespace): try to place windows denied
+	focus near the focus window and fix a xinerama bug with the
+	placement, (avoid_being_obscured_as_a_second_modal_dialog): avoid
+	modal dialogs being obscured in somewhat pathologically strange
+	circumstances that Eclipse seems to be good at triggering,
+	(meta_window_place): have dialog windows make use of
+	avoid_being_obscured_as_a_second_modal_dialog().  Fixes one of the
+	issues found in #307875.
+
+2005-07-24  Elijah Newren  <newren@gmail.com>
+
+	* src/window.c (meta_window_raise): raise the window as well as
+	its ancestor; fixes a stacking bug with an ancestor that has more
+	than one child window.  Fixes one of the issues in #307875.
+
+2005-07-24  Elijah Newren  <newren@gmail.com>
+
+	* src/window.c (meta_window_free): restore original window size if
+	the window was maximized, as the FIXME says.  ;-) Fixes #137185.
+	Thanks to Christian Persch for the testcase that made this easier
+	to track down.
+
+2005-07-23  Elijah Newren  <newren@gmail.com>
+
+	* src/window.c (meta_window_activate): revert the patch from
+	#128380--change _NET_ACTIVE_WINDOW behavior to what it originally
+	was.
+
+2005-07-18  Matthias Clasen  <mclasen@redhat.com>
+	
+	* configure.in: Add checks for Xcursor, to make the changes
+	done on 2005-07-11 effective.
+
+2005-07-14  Elijah Newren  <newren@gmail.com>
+
+	Patch from Ken Harris to provide a more lenient threshold for
+	drawing rounded corners.  Fixes #122065.
+
+	* src/theme.c (meta_frame_layout_calc_geometry): use height +
+	width > 5 instead of height > 3 && width > 3 as criterion
+
+2005-07-13  Elijah Newren  <newren@gmail.com>
+
+	Fix a slight bug (causing possible miscoloring of parts of the
+	titlebar) introduced by the patch from #169982.
+
+	* src/gradient.c:
+	(meta_gradient_create_interwoven):
+	(meta_gradient_create_multi_vertical):
+	
+	bitshifting operators do not take precedence over typecasting, so
+	make sure to use parentheses to get the right operation order.
+
+2005-07-12  Elijah Newren  <newren@gmail.com>
+
+	* configure.in: post-release version bump to 2.11.1
+
+2005-07-12  Elijah Newren  <newren@gmail.com>
+
+	* NEWS:	2.11.0 release
+
+2005-07-12  Elijah Newren  <newren@gmail.com>
+
+	Patch from Andrew Johnson to speed up vertical gradients.  Fixes
+	#169982.
+
+	* src/gradient.c:
+	(meta_gradient_create_interwoven):
+	(meta_gradient_create_vertical):
+	(meta_gradient_create_multi_vertical):
+	
+	use memcpy instead of really long loops to set values in memory to
+	a given pattern.
+
+2005-07-12  Elijah Newren  <newren@gmail.com>
+
+	Patch from Björn Lindqvist to split up main() into more manageable
+	chunks and make use of GOpt.  Closes #305331.
+
+	* src/main.c (usage): remove this function,
+	(meta_print_compilation_info): new function taken from main(),
+	(meta_print_self_identity): new function taken from main(),
+	(struct MetaArguments) new struct to replace some free variables,
+	(meta_parse_options): new funcion taken from main() but now using
+	GOpt, (meta_select_display): new function taken from main()
+
+2005-07-12  Aivars Kalvans <aivars.kalvans@inbox.lv>
+
+	* src/screen.c (meta_screen_free): free ->xinerama_infos
+	Closes #307884
+
+2005-07-11  Elijah Newren  <newren@gmail.com>
+
+	Stuff I forgot to do when I branched an hour or so ago before
+	Matthias' commit...
+	
+	* configure.in: bump version to 2.11.0.  Add UNSTABLE warning.
+	* README: add 2.11.x to the list of unstable branches
+
+2005-07-11  Matthias Clasen  <mclasen@redhat.com>
+
+	React to cursor theme changes: (#308106)
+	
+	* src/prefs.h: 
+	* src/prefs.c: Expose the GConf keys for cursor theme
+	and size as preferences META_PREF_CURSOR_THEME and
+	META_PREF_CURSOR_SIZE with getters meta_prefs_get_cursor_theme()
+	and meta_prefs_get_cursor_size().
+
+	* src/display.c (meta_display_open): Initialize the cursor 
+	theme and size.
+	
+	* src/display.h:
+	* src/display.c (meta_display_set_cursor_theme): New function 
+	to change the cursor theme and update all cursors.
+
+	* src/screen.h 
+	* src/screen.c (meta_screen_update_cursor): New function to
+	refesh the root cursor of a screen.
+
+	* src/main.c (prefs_changed_callback): Update the cursor
+	theme when the cursor preferences change.
+
+2005-06-27  Elijah Newren  <newren@gmail.com>
+
+	* configure.in: post-release version bump to 2.10.3
+
+2005-06-27  Elijah Newren  <newren@gmail.com>
+
+	* NEWS:	2.10.2 release
+
+Sun Jun 26 11:19:18 2005  Soeren Sandmann  <sandmann@redhat.com>
+
+	* src/frames.c: Add a cache of pixmaps for recently exposed frame
+	areas. Makes metacity a bit faster when dragging windows around.
+	See bug 141813.
+
+2005-06-10  Ryan Lortie  <desrt@desrt.ca>
+
+	* src/frames.c: Prevent using the address of a local variable
+	  as a hash key.  (Bug #307209)
+
+	* src/xprops.c (meta_prop_get_values): Fix a small leak in the
+	  case of a SYNC_COUNTER property value and HAVE_XSYNC not
+	  defined.  (Bug #307214)
+
+2005-06-07  Ray Strode  <rstrode@redhat.com>
+
+	Cleanup font data when done with it (bug 306720).
+
+	* src/effects.c (draw_xor_rect): free font info structure.
+	* src/screen.c (meta_screen_new): pass a 1 not a 0 to
+	XFreeFontInfo to free font info structure.
+	(meta_screen_free): call XUnloadFont on GC font before freeing
+	the GC.
+
+2005-06-02  Elijah Newren  <newren@gmail.com>
+
+	* src/window.c (meta_window_focus): if the window has a modal
+	transient which is being unmanaged, don't focus it.  Fixes the
+	Metacity issue reported in #305362.
+
+2005-05-30  Ray Strode  <rstrode@redhat.com>
+
+	Bug 305564 again.
+
+	When drawing XOR resize popup use "fixed" font instead of
+	-misc-fixed-*-16-* xlfd.  Should work on more xservers.
+
+	Also take steps to fail better if the xserver isn't 
+	cooperating. 
+	
+	* src/effects.c (draw_xor_rect): if we can't draw font box
+	for whatever reason, at least draw grid frames.
+	
+	* src/screen.c (meta_screen_new): use fixed alias instead
+	of a xfld.  Don't pass GCFont to XCreateGC if font couldn't
+	be loaded.  Print a warning if font couldn't be loaded.
+
+2005-05-26  Elijah Newren  <newren@gmail.com>
+
+	* HACKING: Add a clarification that METACITY_VERBOSE needs to be
+	accompanied by METACITY_USE_LOGFILE
+
+2005-05-26  Elijah Newren  <newren@gmail.com>
+
+	* src/window.c (meta_window_configure_request): Patch from Greg
+	Hudson to make sure window position is calculated correctly for
+	reconfigure requests when part of the XWindowChanges structure is
+	uninitialized.  Fixes #305257.
+
+2005-05-26  Ray Strode  <rstrode@redhat.com>
+	
+	Actually commit the stuff mentioned in the last 
+	ChangeLog entry.
+
+2005-05-26  Ray Strode  <rstrode@redhat.com>
+
+	Add a resize popup when resizing constrained 
+	windows, (bug 305564).
+
+	* src/display.c: 
+	(meta_display_begin_grab_op), 
+	(meta_display_end_grab_op): 
+	* src/keybindings.c (process_keyboard_move_grab),
+	(process_keyboard_resize_grab): Call 
+	meta_window_{begin,update,end}_wireframe convenience 
+	functions instead of the meta_effects counterparts.
+
+	* src/display.h: keep track of old wireframe geometry to
+	clean up xor popup on resize
+
+	* src/effects.[ch] (meta_effects_begin_wireframe),
+	(meta_effects_update_wireframe),
+	(meta_effects_end_wireframe),
+	(draw_xor_rect): take optional width and height arguments
+	to show to user in resize popup. Draw resize popup if
+	width and height >= 0 and wireframe isn't smaller than
+	the popup would be.
+
+	* src/screen.c (meta_screen_new): load a largish font for
+	the resize popup
+
+	* src/window.[ch] 
+	(meta_window_move_resize_internal): update
+	wireframe resize popup when the window is resized.
+	(meta_window_get_wireframe_geometry): new function to
+	calculate the numbers to display in resize popup
+	(meta_window_begin_wireframe),
+	(meta_window_update_wireframe),
+	(meta_window_end_wireframe): new functions to reduce
+	repetitive wireframe code.  Functions handle updating
+	wireframe and resize popup geometry.
+	(update_move), (update_resize),
+	(meta_window_refresh_resize_popup): remove fixme and
+	add debug message.
+
+2005-05-26  Elijah Newren  <newren@gmail.com>
+
+	* src/window.c (check_maximize_to_work_area): don't accidentally
+	treat maximize vertically as maximize in both directions.  Fixes
+	#302204.
+
+2005-05-26  Elijah Newren  <newren@gmail.com>
+
+	* src/window.c (meta_window_new_with_attrs): put all transients
+	of the new window, if any exist, in the calc_showing queue.  Fixes
+	#303284.  Thanks to Billy Biggs for the testcase that made this
+	easy to track down.
+
+2005-04-11  Elijah Newren  <newren@gmail.com>
+
+	* configure.in: post-release version bump to 2.10.2
+
+2005-04-11  Elijah Newren  <newren@gmail.com>
+
+	* NEWS:	2.10.1 release
+
+2005-04-05  Dan Winship  <danw@novell.com>
+
+	* src/metacity-dialog.c (warn_about_no_sm_support): Make sure the
+	"Close" button has the focus, not the table. (#172703)
+
+2005-04-05  Pawan Chitrakar  <pawan@nplinux.org>
+
+	* configure.in: Added ne in ALL_LINGUAS
+
+2005-03-31  Steve Murphy  <murf@e-tools.com>
+
+        * configure.in: Added "rw" to ALL_LINGUAS.
+
+2005-03-17  Lex Hider  <Lex.Hider@gmail.com>
+
+	* doc/Makefile.am (EXTRA_DIST): add doc/code-overview.txt and
+	doc/how-to-get-focus-right.txt
+
+2005-03-10  Adi Attar  <aattar@cvs.gnome.org>
+
+	* configure.in: Added "xh" to ALL_LINGUAS.
+
+2005-03-07  Elijah Newren  <newren@gmail.com>
+
+	* configure.in: post-release version bump to 2.10.1
+
+2005-03-07  Elijah Newren  <newren@gmail.com>
+
+	* configure.in:
+	* README:
+	* NEWS:
+	2.10.0 release
+
+2005-02-28  Elijah Newren  <newren@gmail.com>
+
+	* configure.in: post-release version bump to 2.9.55
+
+2005-02-28  Elijah Newren  <newren@gmail.com>
+
+	* NEWS: Metacity 2.9.34 unstable release
+
+2005-02-28  Elijah Newren  <newren@gmail.com>
+
+	Patch from Aidan Delaney to make sure that icons in the alt-tab
+	popup are dimmed for all hidden windows, not just minimized ones.
+	Fixes #168455.
+
+	* src/screen.c: (meta_screen_ensure_tab_popup): make use
+	meta_window_showing_on_its_workspace() instead of just checking if
+	the window is minimized.
+
+2005-02-25  Elijah Newren  <newren@gmail.com>
+
+	Prevent the visual bell from changing the focus window.  Fixes
+	#123366.
+
+	* src/bell.c: (meta_bell_flash_screen): if not in click-to-focus
+	mode and mouse_mode is also false, increment the focus sentinel so
+	that we can ignore spurious EnterNotify and LeaveNotify events.
+
+	* src.display.c: (event_callback): make sure to also ignore
+	LeaveNotify events when the focus sentinel isn't clear
+
+2005-02-23  Elijah Newren  <newren@gmail.com>
+
+	* src/window.c: (meta_window_new_with_attrs): Fix crash that
+	occurs when stupid apps claim that a window is its own parent.
+	#168207
+
+2005-02-21  Elijah Newren  <newren@gmail.com>
+
+	* configure.in: post-release version bump to 2.9.34
+
+2005-02-21  Elijah Newren  <newren@gmail.com>
+
+	* NEWS: Metacity 2.9.21 unstable release
+
+2005-02-21  Elijah Newren  <newren@gmail.com>
+
+	Handle keynav vs. mousenav in mouse and sloppy focus modes.  Fixes
+	#167545.
+
+	* doc/how-to-get-focus-right.txt: Update due to this new method
+	for handling keynav vs. mousenav, plus various other updates that
+	I previously forgot.
+
+	* src/display.h: (struct _MetaDisplay): add a mouse_mode boolean
+
+	* src/display.c: (meta_display_open): initialize mouse_mode to
+	true, (event_callback): have EnterNotify and LeaveNotify events
+	set mouse_mode to true when focusing a window
+
+	* src/keybindings.c: (process_tab_grab): set mouse_mode to false
+	when using alt-tab/alt-esc, (do_choose_window): likewise,
+	(do_handle_move_to_workspace): set mouse_mode to false on
+	move-window-to-workspace-<n> keybindings
+
+	* src/window.c (idle_calc_showing): if we're in keynav mode while
+	using sloppy or mouse focus, use metacity_sentinel to avoid
+	EnterNotify events being generated from events other than mouse
+	movement.
+
+	* src/workspace.c (meta_workspace_activate_with_focus): add a
+	FIXME in a potentially duplicate section of code,
+	(meta_workspace_focus_default_window): use the same focus choice
+	as click-to-focus if in keynav mode.
+
+2005-02-20  Elijah Newren  <newren@gmail.com>
+
+	* src/display.c: (event_callback): Handle _NET_CURRENT_DESKTOP
+	messages that come with timestamps.  Fixes the metacity portion of
+	#161361 other than the portion handled by #128380.
+
+2005-02-20  Elijah Newren  <newren@gmail.com>
+
+	* src/window.c: (meta_window_activate): when receiving a
+	_NET_ACTIVE_WINDOW message, switch to the desktop where the window
+	is located before activating instead of moving the window to the
+	current desktop.  Thanks to Lubos Lunak for catching this issue.
+	Fixes #128380.
+
+2005-02-20  Elijah Newren  <newren@gmail.com>
+
+	* src/window.c (meta_window_show): Ignore all focus and
+	focus-stealing-prevention code in meta_window_show when not
+	showing the window for the first time.  Fixes #167199.
+
+2005-02-20  Elijah Newren  <newren@gmail.com>
+
+	Fix an obscure xinerama placement bug with windows that are too
+	large to fit in the workarea in both dimensions.  #166757
+
+	* src/place.c: (meta_window_place): use the current xinerama
+	instead of arbitrarily resetting to 0
+
+2005-02-20  Elijah Newren  <newren@gmail.com>
+
+	Patch from Joe Marcus Clarke to fix a possible crash on logout.
+	#167935.  Thanks for fixing my mistakes, Joe!
+
+	* src/display.c: (meta_display_open): initialize
+	display->grab_old_window_stacking to NULL.
+
+2005-02-20  Elijah Newren  <newren@gmail.com>
+
+	Big patch to cover about 6 different issues in order to correct
+	rare problems with timestamps (make sure window selected in
+	tasklist actually gets focus, sanity check timestamps to avoid
+	rogue apps hosing the system, correct the updating of
+	net_wm_user_time, correctly handle timestamps of 0 when comparing
+	xserver timestamps for those who have had their systems up for
+	over 25 days or so, add some debugging information to verbose
+	logs, some code cleanups).  Fixes all issues listed in #167358.
+
+	* src/display.h: (struct _MetaDisplay): clarify comment on
+	last_focus_time, introduce a new variable--last_user_time,
+	(XSERVER_TIME_IS_BEFORE macro): put this functionality into a
+	separate macro and then introduce a new macro with this name that
+	uses the old one but adds additional special-case checks for
+	timestamps that are 0, (comment to
+	meta_display_set_input_focus_window): add information about how
+	last_user_time should be used in this function
+	
+	* src/display.c (santiy_check_timestamps): new function,
+	(meta_display_open): intialize display->last_user_time,
+	(meta_display_get_current_time_roundtrip): use the timestamp,
+	which is known to be good, in order to sanity_check_timestamps,
+	(event_callback): use the new meta_window_ste_user_time() function
+	in order to correct problems, use the timestamp of KeyPress and
+	ButtonPress events, which are known to be good, in order to
+	sanity_check_timestamps, (timestamp_too_old): new function for
+	common behavior of meta_display_focus_the_no_focus_window and
+	meta_display_set_input_focus_window, with added checking for
+	display->last_user_time in addition to display->last_focus_time,
+	(meta_display_set_input_focus_window): replace some of the code
+	with a call to timestamp_too_old(),
+	(meta_display_focus_the_no_focus_window): replace some of th ecode
+	with a call to timestamp_too_old()
+
+	* src/window.h: (meta_window_set_user_time): new function to
+	abstract the many things that need to be done when updating the
+	net_wm_user_time of any window
+
+	* src/window.c: (meta_window_activate): add debugging spew, make
+	sure the comparison is made with last_user_time NOT
+	last_focus_time, use meta_window_set_user_time() function in order
+	to correct problems, (meta_window_client_message): add a newline
+	to a debugging message to make them easier to read,
+	(meta_window_set_user_time): new function
+
+	* src/window-props.c (reload_net_wm_user_time): use the new
+	meta_window_ste_user_time() function in order to correct problems
+
+2005-02-16  Elijah Newren  <newren@gmail.com>
+
+	* src/display.c: (event_callback): trivial fix to a log message:
+	change %d to %lu (see debugging log from bug 167358).
+
+2005-02-12  Elijah Newren  <newren@gmail.com>
+
+	Raise the ancestor of a window instead of the window itself.
+	Fixes #166894.
+
+	* src/window.c: (find_root_ancestor): new function,
+	(meta_window_raise): get the ancestor of the given window and
+	raise it if possible instead of the window
+
+2005-02-12  Elijah Newren  <newren@gmail.com>
+
+	Don't unconditionally place splashscreens (and other
+	not-to-be-focused windows) below the focus window.  Fixes #167042.
+
+	* src/window.c: (intervening_user_event_occurred): new function
+	taken from the timestamp comparison portion of the old
+	window_takes_focus_on_map function, (window_state_on_map): new
+	function with remainder of old window_takes_focus_on_map function
+	that determines both whether the window will take focus and
+	whether it should be placed on top, (meta_window_show): use
+	place_on_top_on_map to determine window stacking instead of trying
+	to infer it from takes_focus_on_map
+
+2005-02-11  Elijah Newren  <newren@gmail.com>
+
+	Avoid new windows being obscured by the focus window (and thus
+	possibly lost).  Fixes #166524.
+
+	* src/place.c: new MetaWindowDirection enum,
+	(find_most_freespace): new function to find where there is the
+	most space available around the focused window,
+	(meta_window_place): if a window is denied focus and the window
+	overlaps the focused window, retry the first-fit algorithm only
+	paying attention to the focus window position and if that fails
+	just find the location on the screen with the most space
+	available.
+
+	* src/window.h: (struct MetaWindow): new
+	denied_focus_and_not_transient bitfield
+
+	* src/window.c: (meta_window_new_with_attrs): initialize
+	denied_focus_and_not_transient, (meta_window_show): set and unset
+	the denied_focus_and_not_transient field appropriately
+
+2005-02-08  Aidan Delaney  <adelaney@cs.may.ie>
+
+	Removed useless function call.  #166730
+
+	* src/tabpopup.c: (outline_window_expose): Removed unused
+	references to variables and an unnecessary function call to
+	gdk_window_get_size().
+
+2005-02-08  Elijah Newren  <newren@gmail.com>
+
+	Avoid using CurrentTime when focusing, handle it better in case we
+	miss any cases.  Fixes #166732.
+
+	* src/window.c: (meta_window_shade): use
+	meta_display_get_current_time_roundtrip() to ensure we have a
+	valid timestamp, (meta_window_unshade): same
+
+	* src/display.c: (meta_display_set_input_focus_window): If
+	CurrentTime was passed, get one from the XServer in addition to
+	throwing a warning, (meta_display_focus_the_no_focus_window): same
+
+2005-02-08  Elijah Newren  <newren@gmail.com>
+
+	* src/window.c: (meta_window_activate): If we're not passed a
+	timestamp, make sure to manually get one.  Fixes #166728.
+
+2005-02-07  Elijah Newren  <newren@gmail.com>
+
+	* configure.in: post-release version bump to 2.9.21
+
+2005-02-07  Elijah Newren  <newren@gmail.com>
+
+	* NEWS: Metacity 2.9.13 unstable release
+
+2005-02-06  Elijah Newren  <newren@gmail.com>
+
+	Set a _METACITY_VERSION property (a utf8 string) on the WM check
+	window.  #165350.
+
+	* src/display.h: (struct MetaDisplay): add a atom_metacity_version
+	field
+	
+	* src/display.c: (meta_display_open): initialize the
+	_METACITY_VERSION property on the WM check window to the current
+	version of Metacity.
+
+2005-02-06  Elijah Newren  <newren@gmail.com>
+
+	Ignore xconfigurerequest events for stacking when it should be
+	safe to do so.  Again, thanks to Crispin Flowerday for the test
+	case.  Thanks to KWin for the inspiration (and to Google for
+	indexing their source code).  Fixes the other half of #166395.
+
+	* src/window.c: (meta_window_configure_request): if the
+	active_window is from a separate application than the one getting
+	the configure request and the net_wm_user_time of the active
+	window is later than that of the window getting the configure
+	request, then ignore the request.
+
+2005-02-06  Elijah Newren  <newren@gmail.com>
+
+	If activation requests are too old, set the demands_attention hint
+	instead of actually activating.  Thanks to Crispin Flowerday for
+	the test case and for testing the patch.  Fixes half of #166395.
+
+	* src/window.c: (meta_window_activate): if the request came before
+	the last focus time, set the demands attention hint instead
+
+2005-02-04  Dave Ahlswede  <mightyquinn@letterboxes.org>
+
+	* src/metacity.schemas.in: Add period to the end of
+	reduced_resources' description.  Fixes #165780.
+ 	
+2005-02-04  Elijah Newren  <newren@gmail.com>
+
+	Make sure window->border_only is initialized so we don't get
+	random windows without decorations.  Thanks to Sinisa Segvic and
+	Owen Taylor for providing test cases.  Fixes #145131.
+
+	* src/window.c: (update_mwm_hints): Be sure to call
+	recalc_window_features even if no MWM hints are set
+
+2005-02-02  Elijah Newren  <newren@gmail.com>
+
+	Focus parents of dismissed transient windows in preference to the
+	window that most recently had keyboard focus.  Fixes #157360.
+
+	* doc/how-to-get-focus-right.txt: Note the distinction between
+	"most recently used window" and "most recent to have keyboard
+	focus" that we are now making.
+
+	* src/workspace.c: (focus_ancestor_or_mru_window): rename from
+	meta_workspace_focus_mru_window, and first check whether we need
+	to focus an ancestor window before looking for the mru window,
+	(record_ancestor): helper function for
+	focus_ancestor_or_mru_window,
+	(meta_workspace_focus_default_window): update due to the function
+	rename from meta_workspace_focus_mru_window to
+	focus_ancestor_or_mru_window
+
+2005-01-31  Elijah Newren  <newren@gmail.com>
+
+	Try 2 to correct misleading and inaccurate wording.  Hopefully,
+	really fixes #165380.
+
+	* src/menu.c: Change wording of menu from "Always on Current
+	Workspace" to "Always on Visible Workspace".  "Always on Current
+	Workspace" could sound like a synonym of "Only on This Workspace"
+	when it was supposed to be the opposite.
+
+2005-01-31  Elijah Newren  <newren@gmail.com>
+
+	Correct the stacking when return from fullscreen mode.  Fixes
+	#165718.
+	
+	* src/window.c: (meta_window_unmake_fullscreen): Update the layer
+	after resizing the window
+
+2005-01-31  Muktha  <muktha.narayan@wipro.com>
+
+	src/themes/Atlanta/metacity-theme-1.xml:
+	src/themes/Simple/metacity-theme-1.xml:
+	src/themes/Bright/metacity-theme-1.xml:	
+	Make the unfocussed title bar distinguishable. Fixes #125291.
+
+2005-01-28  Elijah Newren  <newren@gmail.com>
+
+	Patch from RHEL-3 (Havoc doesn't remember how it got there) that
+	Havoc posted in bug 156511 to fix the problem with fullscreen
+	windows on a different xinerama monitor not staying on top.  I
+	updated to HEAD.  Should fix #156511.
+
+	* src/stack.c: (windows_on_different_xinerama): new function,
+	(get_standalone_layer): let windows on a different screen than the
+	one with the focus window stay in the fullscreen layer
+
+2005-01-28  Elijah Newren  <newren@gmail.com>
+
+	* src/metacity-dialog.c: (warn_about_no_sm_support): make this
+	dialog be sticky.  Fixes #164745.
+
+2005-01-28  Elijah Newren  <newren@gmail.com>
+
+	Patch from Tim Herold to handle xcomposite pkgconfig version
+	regression.  Fixes #149368.
+
+	* configure.in: Change XCOMPOSITE_VERSION from 1.0 to 0.2
+
+2005-01-28  Elijah Newren  <newren@gmail.com>
+
+	Correct misleading and inaccurate wording.  Fixes #165380.
+
+	* src/menu.c: Change wording of menu to "Always on Current
+	Workspace" from "Put on All Workspaces", remove a quick-key
+	conflict between "On _Top" and "Only on _This Workspace" by
+	switching the latter to "_Only on This Workspace"
+
+	* src/window.c: Remove a comment that is no longer necessary
+	(since bug 87531 has been fixed)
+
+2005-01-28  Elijah Newren  <newren@gmail.com>
+
+	Take into account the appropriate list of windows when placing a
+	new one.  Fixes #165381.
+
+	* src/place.c: (meta_window_place): use
+	meta_window_showing_on_its_workspace(w) instead of !w->minimzed,
+	also take into account sticky windows
+
+	* src/window.[ch]: rename window_showing_on_its_workspace to
+	meta_window_showing_on_its_workspace and export it
+
+2005-01-27  Elijah Newren  <newren@gmail.com>
+
+	Plug a pair of leaks.  Fixes #165378
+
+	* src/place.c: (meta_window_place, get_windows_on_same_workspace):
+	free list returned by meta_display_list_windows.
+
+2005-01-27  Elijah Newren  <newren@gmail.com>
+
+	Treat splashscreens same as other windows for stacking.  Fixes
+	#165243.
+
+	* src/stack.h: (MetaStackLayer enum): remove META_LAYER_SPLASH
+	from the list
+
+	* src/stack.c: (get_standalone_layer): remove the special casing
+	of META_WINDOW_SPLASHSCREEN
+
+2005-01-27  Elijah Newren  <newren@gmail.com>
+
+	* src/window.c: (set_net_wm_state): shaded windows should not show
+	up in pagers.  Fixes #165377.
+
+2005-01-26  Elijah Newren  <newren@gmail.com>
+
+	Stick and unstick transients with their parent automatically.
+	Fixes #152283.
+
+	* src/window.c: (window_stick_impl, window_unstick_impl): rename
+	from meta_window_stick and meta_window_unstick respectively,
+	(stick_foreach_func): a function to assist calling
+	window_(un)stick_impl on each transient, (meta_window_stick,
+	meta_window_unstick): new functions that call window_stick_impl or
+	window_unstick_impl for the window and each of its transients.
+
+2005-01-26  Elijah Newren  <newren@gmail.com>
+
+	Patch from John Paul Wallington to keep tooltip on screen
+	horizontally for xinerama.  Fixes #165261.
+
+	* src/fixedtip.c: (meta_fixed_tip_show): rename screen_width and
+	screen_height to screen_right_edge and screen_bottom_edge, set
+	them using xinerama info instead of just screen geometry, and use
+	them to determine where to place the tooltip window.
+
+2005-01-26  Arvind Samptur  <arvind.samptur@wipro.com>
+
+	Don't wireframe when accessibility is on, it apparently
+	causes a desktop wide freeze.
+
+	* src/prefs.[ch] (meta_prefs_init) (change_notify)
+	(update_gnome_accessibility) (meta_preference_to_string)
+	(meta_prefs_get_gnome_accessibility) : Add code to monitor
+	accessibility status.
+
+	* src/display.c (meta_display_begin_grab_op): Check
+	accessibility status before going ahead with wireframe.
+	Fixes #159538
+
+2005-01-25  Elijah Newren  <newren@gmail.com>
+
+	* src/tabpopup.c: (meta_select_workspace_expose_event): ignore
+	sticky windows for non-active workspaces.  Fixes #165259.
+
+2005-01-25  Elijah Newren  <newren@gmail.com>
+
+	* src/window.c: (meta_window_new_with_attrs): set the window state
+	hints _after_ applying session information.  Fixes #164677.
+
+2005-01-25  Elijah Newren  <newren@gmail.com>
+
+	Add man pages for metacity-window-demo and metacity-theme-viewer.
+	Man pages from Jose Moya, auto-fu from Dave Ahlswede. (#143513)
+
+	* doc/man/metacity-theme-viewer.1:
+	* doc/man/metacity-window-demo.1:
+
+	New man pages
+
+	* doc/man/Makefile.am:
+	* doc/Makefile.am:
+	* configure.in:
+
+	Make sure to install the man pages
+	
+	* doc/man/.cvsignore:
+	
+	Silence cvs
+
+2005-01-25  Benjamin Kahn  <xkahn@novell.com>
+
+	New 48x48 default icon as specified in bug #160660
+
+2005-01-25  Elijah Newren  <newren@math.utah.edu>
+
+	Patch from Stephane LOEUILLET in bug #151850.
+
+	* src/metacity.desktop.in: specify encoding
+
+2005-01-25  Balamurali Viswanathan <balamurali.viswanathan@wipro.com>
+ 
+ 	* src/prefs.c (meta_prefs_init): Get gconf to load the
+ 	terminal dir so that we get the notifications when
+ 	the command is changed. Fixes bug #160934
+ 
+2005-01-25  Elijah Newren  <newren@gmail.com>
+
+	Refuse to focus a window with a modal transient, and focus the
+	transient instead.  Fixes #164716.
+
+	* src/window.c: (get_modal_transient): new function,
+	(meta_window_focus): if the window has a modal transient, make
+	sure it is on the current workspace and then focus it instead.
+
+2005-01-24  Elijah Newren  <newren@gmail.com>
+
+	* configure.in: post-release version bump to 2.9.13
+
+2005-01-24  Elijah Newren  <newren@gmail.com>
+
+	* NEWS: Metacity 2.9.8 unstable release
+
+2005-01-24  Elijah Newren  <newren@gmail.com>
+
+	* src/display.c: (meta_display_begin_grab_op): don't forget to
+	initialize display->grab_old_window_stacking.  Thanks to Sebastien
+	Bacher and the bleeding edge Ubuntu users for catching the
+	occasional crash this could cause so quickly, and for verifying
+	that the patch worked (I couldn't duplicate).  Fixes #165093.
+
+2005-01-23  Elijah Newren  <newren@gmail.com>
+
+	* configure.in: post-release version bump to 2.9.8
+
+2005-01-23  Elijah Newren  <newren@gmail.com>
+
+	* NEWS: Metacity 2.9.5 unstable release
+	* README: there are more stable releases beyond 2.8.6...
+
+2005-01-23  Elijah Newren  <newren@gmail.com>
+
+	Restore original stacking when aborting an alt-esc window switch
+	operation.  Fixes #123576.
+
+	* src/display.c: (GRAB_OP_IS_WINDOW_SWITCH): new macro,
+	(meta_display_close): clear grab_old_window_stacking if non-NULL,
+	(event_callback): restore stack positions if alt-esc op cancelled
+	with button press, (meta_display_begin_grab_op): store the old
+	stacking positions, (meta_display_end_grab_op): free the old stack
+	positions
+
+	* src/display.h: (struct _MetaDisplay): add a
+	grab_old_window_stacking list
+
+	* src/keybindings.c: (process_tab_grab): restore stack positions
+	if alt-esc op cancelled with an errant key press
+
+	* src/stack.c: (compare_just_window_stack_position): new
+	GCompareFunc function, (meta_stack_get_positions): get current
+	stack positions, (compare_pointers): new GCompareFunc function,
+	(lists_contain_same_windows): simple utility func to see if two
+	lists contains the same windows, (meta_stack_set_positions): new
+	function to set the positions of all the windows in the stack
+
+	* src/stack.h: (meta_stack_get_postions,
+	meta_stack_set_positions): new functions
+
+2005-01-23  Elijah Newren  <newren@gmail.com>
+
+	Patch from John Paul Wallington to fix #163420.
+
+	* src/window.c: (check_maximize_to_work_area): fix vertical
+	maximization for second screen
+
+2005-01-21  Elijah Newren  <newren@gmail.com>
+
+	* rationales.txt: Add a tracker bug for modal dialog issues
+
+2005-01-20  Elijah Newren  <newren@gmail.com>
+
+	* src/tabpopup.c (dimm_icon): use pixbuf, not dimmed_pixbuf (which
+	isn't defined yet).  Fixes crash from #136666.
+
+2005-01-20  Vincent Noel  <vnoel@cox.net>
+
+	* src/screen.c: (meta_screen_ensure_tab_popup),
+	(meta_screen_ensure_workspace_popup):
+	* src/tabpopup.c: (meta_ui_tab_popup_new), (display_entry):
+	* src/tabpopup.h: Show labels in bold for windows that demand
+	attention. Fixes #164590.
+
+2005-01-18  Vincent Noel  <vnoel@cox.net>
+
+	* src/screen.c: (meta_screen_ensure_tab_popup),
+	(meta_screen_ensure_workspace_popup):
+	* src/tabpopup.c: (dimm_icon), (meta_ui_tab_popup_new),
+	(free_entry):
+	* src/tabpopup.h: In the tab task switcher popup, dim the window
+	icon and put its name between brackets when the window is
+	minimized. Fixes #136666.
+
+2005-01-11  Elijah Newren  <newren@gmail.com>
+
+	Correct highlighting of windows in workspace switcher popup.
+	Fixes #163450.
+
+	* src/tabpopup.c (meta_select_workspace_expose_event): Remove race
+	between FocusIn/FocusOut events and the expose event by replacing
+	window->has_focus with
+	window==window->display->expected_focus_window.
+
+2005-01-09  Elijah Newren  <newren@gmail.com>
+
+	* configure.in: post-release version bump to 2.9.5
+
 2005-01-09  Elijah Newren  <newren@gmail.com>
 
 	* NEWS: Metacity 2.9.3 unstable release

HACKING

@@ -101,9 +101,11 @@ Debugging information
   useful to get more information than just warnings.  You can set
   METACITY_VERBOSE to do that, like so:
     METACITY_VERBOSE=1 METACITY_USE_LOGFILE=1 metacity --replace
-  There are also other flags, such as METACITY_DEBUG, most of which I
-  haven't tried and don't know what they do.  Go to the source code
-  directory and run
+  (note that METACITY_VERBOSE=1 cannot be used without
+  METACITY_USE_LOGFILE=1 or metacity will crash).  There are also
+  other flags, such as METACITY_DEBUG, most of which I haven't tried
+  and don't know what they do.  Go to the source code directory and
+  run
     grep "METACITY_" * | grep getenv
   to find out what the other ones are.
 

NEWS

@@ -1,3 +1,303 @@
+2.11.2
+==
+
+Thanks to Elijah Newren, Jaap Haitsma, Ray Strode, and Brent Smith for
+improvements in this release.
+
+ - Fix an easy to trigger crasher in 2.11.1 caused by unneeded
+   debugging spew (Elijah) [#311819]
+ - Make sure that Metacity dialogs have icons (Jaap) [309876]
+ - Fix an infinite restacking flicker loop in sloppy and mouse focus
+   with fullscreen windows (Elijah) [#311400]
+ - Change default theme from Simple to Clearlooks (Elijah)
+ - Vastly improve the behavior of keyboard move/resize and edge
+   snapping (Ray) [310888]
+ - Remove a duplicate string (Brent) [#309774]
+
+Translations
+  Yuval Tanny (he), Gnome PL Team (pl), Raphael Higino (pt_BR),
+  Chao-Hsiung Liao (zh_TW)
+
+2.11.1
+==
+
+Thanks to Elijah Newren, Ken Harris, Matthias Clasen, Christian
+Persch, and Billy Biggs for improvements in this release.
+
+ - Fix a miscoloring of parts of the titlebar introduced in the last
+   unstable release (Elijah) [follow-up to #169982]
+ - Provide a more lenient threshold for drawing rounded corners (Ken)
+   [#122065]
+ - Make the Xcursor changes in the last unstable release effective
+   (Matthias) [follow-up to #308106]
+ - Revert the _NET_ACTIVE_WINDOW behavior change made in the 2.9.x
+   unstable series; activation includes changing a window to the
+   current workspace again (Elijah) [reversion of #128380]
+ - Restore original window size if the window was maximized upon
+   withdrawing it (Elijah, Christian) [#137185]
+ - Fix a raising bug with a window that has more than one child window
+   (Elijah, Billy) [part of #307875]
+ - Try to place windows denied focus near the focus window and fix a
+   xinerama bug with the placement (Elijah) [part of #307875]
+ - Avoid modal dialogs being obscured in somewhat pathologically
+   strange circumstances that Eclipse seems to be good at triggering
+   (Elijah) [part of #307875]
+
+Translations
+  Miloslav Trmac (cs), Kostas Papadimas (el), Adam Weinberger (en_CA),
+  Francisco Javier F. Serrador (es), Ilkka Tuohela (fi), Christophe
+  Merlet (RedFox) (fr), Ignacio Casal Quinteiro (gl), Ankit 
+  Patel (gu), Yair Hershkovitz (he), Takeshi AIHANA (ja), Kjartan
+  Maraas (nb), Kjartan Maraas (no), Marcel Telka (sk), Theppitak
+  Karoonboonyanan (th), Clytie Siddall (vi), Funda Wang (zh_CN)
+
+2.11.0
+==
+
+This release contains all fixes up to Metacity 2.10.2 plus some new goodies.
+
+Thanks to Matthias Clasen, Aivars Kalvans, Bj<42>rn Lindqvist, and
+Andrew Johnson for improvements in this release.
+
+ - React to cursor theme changes (Matthias) [#308106]
+ - Plug a small leak with xinerama information (Aivars) [#307884]
+ - Split up main() into more manageable chunks and make use of GOpt
+   (Bj<42>rn) [#305331]
+ - Speed up vertical gradients (Andrew) [#169982]
+
+Translations
+  Hendrik Richter (de), Ivar Smolin (et), Ignacio Casal
+  Quinteiro (gl), Clytie Siddall (vi)
+
+2.10.2
+==
+
+Thanks to Billy Biggs, Greg Hudson, Elijah Newren, Ray Strode, Ryan
+Lortie, and Soeren Sandmann for improvements in this release.
+
+ - Makes metacity a bit faster when dragging windows around (Soeren) [#141813]
+ - Fix simple memory error, using the address of a local variable as a
+   hash key (Ryan) [#307209]
+ - Fix a small leak in the case of a SYNC_COUNTER property value and
+   HAVE_XSYNC not defined (Ryan) [#307214]
+ - Cleanup font data when done with it (Ray) [#306720]
+ - If the window has a modal transient which is being unmanaged, don't
+   focus it (Elijah) [#305362]
+ - Make sure window position is calculated correctly for reconfigure
+   requests when part of the XWindowChanges structure is uninitialized
+   (Greg) [#305257]
+ - Add a resize popup when resizing constrained windows (Ray) [#305564]
+ - Don't accidentally treat maximize vertically as maximize in both
+   directions (Elijah) [#302204]
+ - Put all transients of the new window, if any exist, in the
+   calc_showing queue (Elijah, Billy) [#303284]
+
+Translations
+  Kostas Papadimas (el), Priit Laes (et), Pauli Virtanen (fi), Ignacio
+  Casal Quinteiro (gl), Theppitak Karoonboonyanan (th), Canonical
+  Ltd (xh), Woodman Tuen (zh_TW)
+
+2.10.1
+==
+
+This is a stable release to coincide with the release of Gnome 2.10.0.
+
+Thanks to Dan Winship and Lex Hider for fixes in this release.
+
+ - Make sure the "Close" button has the focus in the
+   buggy-session-management-applications-warning dialog instead of the
+   table (Dan) [#172703]
+ - add doc/code-overview.txt and doc/how-to-get-focus-right.txt to the
+   distributed files (Lex) [#170519]
+
+Translations
+  Adam Weinberger (en_CA), Christopher Orr (en_GB), Elnaz Sarbar (fa),
+  Gabor Kelemen (hu), Jyotsna Shrestha (ne), Steve Murphy (rw),
+  Baris Cicek (tr), Canonical Ltd (xh)
+
+2.10.0
+==
+
+This is a stable release to coincide with the release of Gnome 2.10.0.
+The only difference between this version and 2.9.34 is some
+translation updates.
+
+Translations
+  Vladimir Petkov (bg), Gabor Kelemen (hu), <20>ygimantas Berucka (lt),
+  Reinout van Schouwen (nl), Mugurel Tudor (ro), Danilo <20>egan (sr),
+  Woodman Tuen (zh_TW)
+
+2.9.34
+==
+
+This is an unstable release to coincide with the release of Gnome
+2.10.0 release candidate 1 (2.9.92).
+
+Thanks to Aidan Delaney, Elijah Newren, and Joe Marcus Clarke for
+fixes in this release.
+
+ - Fix crash that occurs when stupid apps claim that a window is its
+   own parent (Elijah, Joe) [#168207]
+ - Prevent the visual bell from changing the focus window (Elijah)
+   [#123366]
+ - Make sure that icons in the alt-tab popup are dimmed for all hidden
+   windows, not just minimized ones (Aidan) [#168455]
+
+Translations
+  Elnaz Sarbar (fa), Ankit Patel (gu), Luca Ferretti (it),
+  Reinout van Schouwen (nl), Gnome PL Team (pl),
+  Alexandre Folle de Menezes (pt_BR)
+
+2.9.21
+==
+
+This is an unstable release heading towards Gnome 2.10.  Since there
+have been an awful lot of fixes since Gnome 2.10 Beta 2, we are hoping
+to get an extra week of wider testing of all these changes before hard
+code freeze.
+
+Thanks to Aidan Delaney, Crispin Flowerday, Elijah Newren, and Joe
+Marcus Clarke for fixes in this release.
+
+ - Make sure we get a valid timestamp if one doesn't come with the
+   _NET_ACTIVE_WINDOW message (Elijah, Crispin) [#166728]
+ - Avoid sending CurrentTime to our XSetInputFocus wrappers, but
+   handle it better in case we miss any cases (Elijah) [#166732]
+ - Remove useless function call (Aidan) [#166730]
+ - Avoid new windows being obscured by the focus window and thus
+   possibly lost (Elijah) [#166524]
+ - Don't unconditionally place not-to-be-focused windows, such as
+   splashscreens, below the focus window (Elijah) [#167042]
+ - Raise the ancestor of a window instead of the window itself
+   (Elijah) [#166894]
+ - Cover half a dozen issues needed to fix a variety of rare timestamp
+   bugs (Elijah) [#167358]
+ - Fix a possible crash on logout (Joe) [#167935]
+ - Fix an obscure xinerama placement bug with windows that are too
+   large to fit in the workarea in both dimensions (Elijah) [#166757]
+ - Ignore all focus and focus-stealing-prevention code in
+   meta_window_show when not showing the window for the first time
+   (Elijah) [#167199]
+ - when receiving a _NET_ACTIVE_WINDOW message, switch to the desktop
+   where the window is located before activating instead of moving the
+   window to the current desktop (Elijah) [#128380]
+ - Handle _NET_CURRENT_DESKTOP messages that come with timestamps
+   (Elijah) [#161361]
+ - Handle keynav vs. mousenav in mouse and sloppy focus modes (Elijah)
+   [#167545]
+
+Translations
+  Jordi Mallach (ca), Martin Willemoes Hansen (da), 
+  Kostas Papadimas (el), David Lodge (en_GB), 
+  Francisco Javier F.  Serrador (es), T<>ivo Leedj<64>rv (et),
+  Christophe Merlet (RedFox) (fr), Takeshi AIHANA (ja), 
+  Young-Ho, Cha (ko), Kjartan Maraas (nb), Michiel Sikkes (nl),
+  Kjartan Maraas (no), Duarte Loreto (pt), Leonid Kanter (ru), 
+  Marcel Telka (sk), Laurent Dhima (sq), Maxim Dziumanenko (uk)
+
+2.9.13
+==
+
+This is an unstable release to coincide with the release of Gnome
+2.10.0 Beta 2 (2.9.91).
+
+Thanks to Elijah Newren, Balamurali Viswanathan, Stephane Loeuillet,
+Benjamin Kahn, Garrett (LeSage?), Jose Moya, Dave Ahlswede, Arvind
+Samptur, John Paul Wallington, Tim Herold, Muktha Narayan, Sinisa
+Segvic, Owen Taylor, Crispin Flowerday, "RHEL-3", KWin, and Google for
+improvements in this release.
+
+ - Refuse to focus a window with a modal transient, and focus the
+   transient instead (Elijah) [#164716]
+ - Make sure we get gconf notifications about the terminal command
+   changing (Balamurali) [#160934]
+ - Specify encoding of src/metacity.desktop.in (Stephane) [#151850]
+ - New 48x48 default icon (Benjamin, Garrett) [#160660]
+ - Add man pages for metacity-window-demo and metacity-theme-viewer
+   (Jose, Dave) [#143513]
+ - Fix minimized window display in workspace switcher after relogin
+   with a saved session (Elijah) [#164677]
+ - Ignore sticky windows for non-active workspaces (Elijah) [#165259]
+ - Don't wireframe when accessibility is on, it apparently causes a
+   desktop wide freeze. (Arvind) [#159538]
+ - Keep tooltip on screen horizontally for xinerama (John) [#165261]
+ - Stick and unstick transients with their parent automatically
+   (Elijah) [#152283]
+ - Shaded windows should not show up in pagers (Elijah) [#165377]
+ - Treat splashscreens same as other windows for stacking (Elijah)
+   [#165243]
+ - Plug a pair of leaks (Elijah) [#165378]
+ - Take into account the appropriate list of windows when placing a
+   new one (Elijah) [#165381]
+ - Correct misleading and inaccurate wording (Elijah) [#165380]
+ - Handle xcomposite pkgconfig version regression (Tim) [#149368]
+ - Make the warn-about-buggy-session-management-apps dialog be sticky
+   (Elijah) [#164745]
+ - Fix the problem with fullscreen windows on a different xinerama
+   monitor not staying on top ("RHEL-3") [#156511]
+ - Make the unfocussed title bar distinguishable in cases where it
+   otherwise isn't for the Atlanta, Simple, and Bright themes (Muktha)
+   [#125291]
+ - Correct the stacking when returning from fullscreen mode (Elijah)
+   [#165718]
+ - Focus parents of dismissed transient windows in preference to the
+   window that most recently had keyboard focus (Elijah) [#157360]
+ - Make sure window->border_only is initialized so we don't get random
+   windows without decorations (Elijah, Sinisa, Owen) [#145131]
+ - Add period to the end of reduced_resources' description (Dave)
+   [#165780]
+ - If activation requests are too old, set the demands_attention hint
+   instead of actually activating (Elijah, Crispin) [#166395]
+ - Ignore xconfigurerequest events for stacking when it should be safe
+   to do so (Elijah, Crispin, KWin, Google) [#166395]
+ - Set a _METACITY_VERSION property (a utf8 string) on the WM check
+   window (Elijah) [#165350]
+
+Translations
+  Vladimir Petkov (bg), Miloslav Trmac (cs), Frank Arnold (de), 
+  Adam Weinberger (en_CA), David Lodge (en_GB), 
+  Francisco Javier F. Serrador (es), Pauli Virtanen (fi), 
+  Young-Ho, Changwoo Ryu (ko), <20>ygimantas Berucka (lt),
+  Kjartan Maraas (nb),  Kjartan Maraas (no), Duarte Loreto (pt),
+  Marcel Telka (sk), Christian Rose (sv), 
+  Theppitak Karoonboonyanan (th)
+
+2.9.8
+==
+
+This is a brown paper bag release to cover up the crash I introduced
+in version 2.9.5.  Thanks to Sebastien Bacher and the bleeding edge
+Ubuntu users for quickly catching the occasional crash that my fix in
+#123576 could cause, and for verifying that the patch I made fixed
+this issue (I couldn't duplicate).
+
+ - Don't forget to initialize display->grab_old_window_stacking
+   [#165093]
+
+2.9.5
+==
+
+This is an unstable release to coincide with the release of Gnome
+2.10.0 Beta 1 (2.9.90).
+
+Thanks to Vincent Noel, Elijah Newren, and John Paul Wallington for
+fixes in this release.
+
+ - Restore original stacking when aborting an alt-esc window switch
+   operation (Elijah) [#123576]
+ - Fix vertical maximization for second screen (John) [#163420]
+ - Show labels in bold for windows that demand attention (Vincent)
+   [#164590]
+ - In the tab task switcher popup, dim the window icon and put its
+   name between brackets when the window is minimized (Vincent)
+   [#136666]
+ - Correct highlighting of windows in workspace switcher popup
+   (Elijah) [#163450]
+
+Translations
+ zh_CN (Funda Wang), nb (Kjartan Maraas), nn (Kjartan Maraas), de
+ (Frank Arnold)
+
 2.9.3
 ==
 

README

@@ -6,9 +6,9 @@ on UNIX keyboards.
 The first release of Metacity was version 2.3. Metacity has no need for
 your petty hangups about version numbers.
 
-The stable releases so far are 2.4.x, 2.6.x, 2.8.0, 2.8.1, 2.8.1.x, 2.8.5-6
+The stable releases so far are 2.4.x, 2.6.x, 2.8.[01], 2.8.1.x, 2.8.5-, 2.10.x
 
-Unstable branches are 2.3.x, 2.5.x, 2.8.2-4, 2.9.x)
+Unstable branches are 2.3.x, 2.5.x, 2.8.2-4, 2.9.x, 2.11.x
 
 COMPILING METACITY
 ===

configure.in

@@ -2,7 +2,7 @@ AC_PREREQ(2.50)
 
 # Fibonacci sequence for micro version numbering:
 # 0, 1, 1, 2, 3, 5, 8, 13, 21, 34, 55, 89, 144, 233, 377, 610, 987
-AC_INIT([metacity], [2.9.3],
+AC_INIT([metacity], [2.11.2],
         [http://bugzilla.gnome.org/enter_bug.cgi?product=metacity])
 
 AC_CONFIG_SRCDIR(src/display.c)
@@ -155,7 +155,7 @@ AC_ARG_ENABLE(shape,
 ## try definining HAVE_BACKTRACE
 AC_CHECK_HEADERS(execinfo.h, [AC_CHECK_FUNCS(backtrace)])
 
-ALL_LINGUAS="am ar az be bg bn bs ca cs cy da de el en_CA en_GB es et eu fa fi fr ga gl gu he hi hr hu id is it ja ko lt lv mk ml mn ms nb nl nn no or pa pl pt pt_BR ro ru sl sk sq sr sr@Latn sv ta th tk tr uk vi wa zh_CN zh_TW"
+ALL_LINGUAS="am ar az be bg bn bs ca cs cy da de el en_CA en_GB es et eu fa fi fr ga gl gu he hi hr hu id is it ja ko lt lv mk ml mn ms nb ne nl nn no or pa pl pt pt_BR ro ru rw sl sk sq sr sr@Latn sv ta th tk tr uk vi wa xh zh_CN zh_TW"
 AM_GLIB_GNU_GETTEXT
 
 ## here we get the flags we'll actually use
@@ -198,7 +198,7 @@ fi
 ## or the render-specific check later
 have_xrender=no
 
-XCOMPOSITE_VERSION=1.0
+XCOMPOSITE_VERSION=0.2
 AC_MSG_CHECKING([Xcomposite >= $XCOMPOSITE_VERSION])
 if $PKG_CONFIG --atleast-version $XCOMPOSITE_VERSION xcomposite; then
    have_xcomposite=yes
@@ -258,6 +258,20 @@ if test x$have_xrender = xyes; then
   AC_DEFINE(HAVE_RENDER, , [Building with Render extension support])
 fi
 
+AC_MSG_CHECKING([Xcursor])
+if $PKG_CONFIG xcursor; then
+     have_xcursor=yes
+  else
+     have_xcursor=no
+  fi
+  AC_MSG_RESULT($have_xcursor)
+
+if test x$have_xcursor = xyes; then
+  echo "Building with Xcursor"
+  METACITY_PC_MODULES="$METACITY_PC_MODULES xcursor"
+  AC_DEFINE(HAVE_XCURSOR, , [Building with Xcursor support]) 
+fi
+
 PKG_CHECK_MODULES(METACITY, $METACITY_PC_MODULES)
 
 AC_PATH_XTRA
@@ -451,6 +465,7 @@ fi
 AC_CONFIG_FILES([
 Makefile
 doc/Makefile
+doc/man/Makefile
 src/Makefile
 src/wm-tester/Makefile
 src/libmetacity-private.pc
@@ -497,6 +512,7 @@ metacity-$VERSION:
 	Resize-and-rotate:        ${found_randr}
 	Xsync:                    ${found_xsync}
 	Render:                   ${have_xrender}
+	Xcursor:                  ${have_xcursor}
 "
 echo "This is the UNSTABLE branch of metacity"
-echo "Use 2.8.x (where x > 5) for stable (gnome-2-8 branch in CVS)"
+echo "Use 2.10.x for stable (gnome-2-10 branch in CVS)"

doc/Makefile.am

@@ -1,2 +1,4 @@
+SUBDIRS = man 
 
-EXTRA_DIST=theme-format.txt metacity-theme.dtd dialogs.txt
+EXTRA_DIST=theme-format.txt metacity-theme.dtd dialogs.txt code-overview.txt \
+	how-to-get-focus-right.txt

doc/how-to-get-focus-right.txt

@@ -37,6 +37,14 @@ Focus method  Behavior
     mouse     Focus the window containing the pointer if there is one,
               otherwise focus the designated "no_focus_window".
 
+Note that "most recently used window", as used here, has a slightly
+different connotation than "most recent to have keyboard focus".  This
+is because when a user activates a window that is a transient, its
+ancestor(s) should be considered to be more recently used than other
+windows that have had the keyboard focus more recently.  (See bug
+157360; this may mean that the alt-tab order should also change
+simultaneously, although the current implementation does not do that.)
+
 Also, sometimes a new window will be mapped (e.g. unminimizing a
 window or launching a new application).  Most users want to interact
 with new windows right away, so these should typically be focused.
@@ -71,9 +79,26 @@ to alert the user that there is a window to work with:
 Additionally, the user may decide to use the keyboard instead of the mouse
 to navigate between windows (referred to as "keynav").  This poses no
 problems for click-to-focus (because the same invariant can be
-maintained), but for sloppy and mouse focus it means that EnterNotify
-and LeaveNotify events should be ignored (they can be generated
-without using the mouse, for example, by grabs).
+maintained), but for sloppy and mouse focus it requires extra work to
+attempt to handle the INHERENTLY CONFLICTING CONSTRAINTS.  Metacity does
+this by having a mouse_mode boolean used to determine which of the two
+sets of invariants holds.  This mode is set according to which method was
+most recently used to choose a focus window:
+  1) When receiving EnterNotify/LeaveNotify events from mouse movement, set
+     mouse_mode to TRUE.
+  2) When using keynav to choose a focus window (e.g. alt-tab, alt-esc,
+     move-window-to-workspace keybindings), set mouse_mode to FALSE.
+  3) When handling events that don't choose a focus window but rather need
+     a focus_window chosen for them (e.g. switch-to-workspace keybindings),
+     don't change the mouse_mode and just use the current value.
+Note that grabs present a special case since they can generate EnterNotify
+and LeaveNotify events without using the mouse, thus these events should be
+ignored when the crossing mode is NotifyGrab or NotifyUngrab.  THIS
+MOUSENAV/KEYNAV MODERATION METHOD IS NOT PERFECT--there are corner cases
+when trying to mix-and-match between mousenav and keynav simultaneously
+that cause problems; but it appears to be the most reasonable tradeoff and
+works well in most cases, especially if the user sticks to just mousenav
+for a long time or just keynav for a long time.
 
 Finally, windows of type WM_DOCK or WM_DESKTOP (e.g. the desktop and
 the panel) present a special case, at least partially due to the lack
@@ -95,7 +120,8 @@ To read more about the bugs that inspired these choices:
     Also, the EWMH spec, especially the parts relating to _NET_WM_USER_TIME
   - Modal vs. non-modal dialogs that get denied focus when mapped
     http://bugzilla.gnome.org/show_bug.cgi?id=151996
-  - Ignoring EnterNotify and LeaveNotify events during keynav
+  - Mousenav vs. Keynav in mouse and sloppy focus modes
+    http://bugzilla.gnome.org/show_bug.cgi?id=167545
     http://bugzilla.gnome.org/show_bug.cgi?id=101190
   - Not focusing panels
     http://bugzilla.gnome.org/show_bug.cgi?id=160470
@@ -113,6 +139,7 @@ the ones I'm the most familiar with):
   bug  95747  should ignore EnterNotify events with NotifyInferior detail set
   bug  97635  sticky windows always keep focus when switching workspaces
   bug 102665  a window unminimized from the tasklist should be focused
+  bug 107347  focus windows that manually position themselves too
   bug 108643  focus in MRU order instead of stack order
   bug 110970  moving a window to another workspace loses focus
   bug 112031  closing a dialog can result in a strange focus window
@@ -120,6 +147,7 @@ the ones I'm the most familiar with):
   bug 120100  panel shouldn't be focused after workspace applet usage
   bug 123803  need final EnterNotify after workspace switch (see also 124798)
   bug 124981  focus clicked window in pager only if on current workspace
+  bug 125492  catch the xserver unfocusing everything and fix its braindeadedness
   bug 128200  focus correct window on libwnck window minimize (see 107681 too)
   bug 131582  fix race condition on window minimize/close
   bug 133120  wrong window focused when changing workspaces
@@ -140,6 +168,18 @@ the ones I'm the most familiar with):
   bug 151990  prevent focus inconsistencies by only providing one focus method
   bug 151996  modal dialogs denied focus should not be lowered
   bug 152000  fix race on window close followed by rapid mouse movement
+  bug 152004  ways to handle new window versus mouse invariants
+  bug 153220  catch the root window getting focus and reset to default window
+  bug 157360  focus parents of dismissed transient windows in preference to
+              the window that most recently had focus
+  bug 159257  focus the desktop when showing it
+  bug 160470  don't focus panels on click
+  bug 163450  correct highlighting in workspace switcher popup
+  bug 164716  refuse to focus a window with a modal transient, and focus
+              the transient instead
+  bug 166524  avoid new windows being obscured by the focus window
+  bug 167545  mousenav vs. keynav in mouse and sloppy focus modes
+  <a massive heap of bugs relating to focus stealing prevention...>
 
 
 Addendum on sloppy and mouse focus
@@ -148,7 +188,7 @@ Addendum on sloppy and mouse focus
 
   1) Keynav doesn't maintain the same invariants as mouse navigation
      for these focus modes; switching back and forth between
-     navigation methods, therefore, may appear to have
+     navigation methods, therefore, may have or appear to have
      inconsistencies.  Examples:
      a) If the user uses Alt-Tab to change the window with focus, then
         starts to move the mouse, at that moment the window where the
@@ -174,6 +214,15 @@ Addendum on sloppy and mouse focus
         containing the menu) but is one of those hard-to-get-right
         keynav and mouse focus mixture cases.  (See bug 101190 for
         more details)
+     d) Similar to (c), moving the mouse off the menu doesn't immediately
+        focus the window that the mouse goes over, due to an application
+        grab (we couldn't change this and wouldn't want to, but
+        technically it does break the invariant).
+     e) If mouse_mode is off and the user does something to cause focus to
+        change (e.g. switch workspaces, close or minimize a window, etc.)
+        and simultaneously tries to move the mouse, the choice of which
+        window to focus is inherently race-y.  (You probably can't satisfy
+        both keynav and mousenav invariants simultaneously...)
   2) The sloppy/mouse invariants are often not strictly maintained;
      for example, we provide an exception to the invariant for newly
      mapped windows.  (Most find that not allowing this exception is

doc/man/.cvsignore

@@ -0,0 +1,2 @@
+Makefile
+Makefile.in

doc/man/Makefile.am

@@ -0,0 +1,3 @@
+man_MANS = metacity-theme-viewer.1 metacity-window-demo.1
+
+EXTRA_DIST = $(man_MANS)

doc/man/metacity-theme-viewer.1

@@ -0,0 +1,43 @@
+.\" In .TH, FOO should be all caps, SECTION should be 1-8, maybe w/ subsection
+.\" other parms are allowed: see man(7), man(1)
+.\"
+.\" Based on template provided by Tom Christiansen <tchrist@jhereg.perl.com>.
+.\" 
+.TH METACITY-THEME-VIEWER 1 "1 June 2004" 
+.SH NAME
+metacity-theme-viewer \- view metacity themes
+.SH SYNOPSIS
+.B metacity-theme-viewer
+[
+.I THEMENAME
+]
+.SH DESCRIPTION
+.\" Putting a newline after each sentence can generate better output.
+.B metacity-theme-viewer
+allows you to preview any installed Metacity theme.
+.PP
+When designing a new Metacity theme, you can use
+.B metacity-theme-viewer
+to measure the performance of a window frame option, and to preview
+the option.
+.SH OPTIONS
+.TP
+.I THEMENAME
+Name of the theme to be shown (\fIAtlanta\fR by default).
+It is case-sensitive.
+.SH FILES
+.br
+.nf
+.TP
+.I /usr/share/themes
+system themes directory
+.TP
+.I /usr/share/themes/*/metacity-1/metacity-theme-1.xml
+theme specification file
+.SH AUTHOR
+This manual page was written by Jose M. Moya <josem@die.upm.es>, for
+the Debian  GNU/Linux system (but may be used by others).
+.SH "SEE ALSO"
+.\" Always quote multiple words for .SH
+.BR metacity (1),
+.BR metacity-window-demo (1).

doc/man/metacity-window-demo.1

@@ -0,0 +1,25 @@
+.\" In .TH, FOO should be all caps, SECTION should be 1-8, maybe w/ subsection
+.\" other parms are allowed: see man(7), man(1)
+.\"
+.\" Based on template provided by Tom Christiansen <tchrist@jhereg.perl.com>.
+.\" 
+.TH METACITY-WINDOW-DEMO 1 "1 June 2004" 
+.SH NAME
+metacity-window-demo \- demo of window features
+.SH SYNOPSIS
+.B metacity-window-demo
+.SH DESCRIPTION
+.\" Putting a newline after each sentence can generate better output.
+This program demonstrates various kinds of windows that window
+managers and window manager themes should handle.
+.PP
+Be sure to tear off the menu and toolbar, those are also a special
+kind of window.
+.SH AUTHOR
+This manual page was written by Jose M. Moya <josem@die.upm.es>, for
+the Debian  GNU/Linux system (but may be used by others).
+.SH "SEE ALSO"
+.\" Always quote multiple words for .SH
+.BR x-window-manager (1),
+.BR metacity (1),
+.BR metacity-theme-viewer (1).

po/ChangeLog

@@ -1,3 +1,443 @@
+2005-08-02  Chao-Hsiung Liao  <j_h_liau@yahoo.com.tw>
+
+	* zh_TW.po: Updated Traditional Chinese translation.
+
+2005-07-31  Yair Hershkovitz  <yairhr@gmail.com>
+
+	* he.po: Updated Hebrew translation by Yuval Tanai.
+
+2005-07-28  Artur Flinta  <aflinta@cvs.gnome.org>
+
+	* pl.po: Updated Polish translation by GNOME PL Team.
+
+2005-07-26  Raphael Higino  <raphaelh@cvs.gnome.org>
+
+	* pt_BR.po: Converted to UTF-8.
+
+2005-07-26  Raphael Higino  <raphaelh@cvs.gnome.org>
+
+	* pt_BR.po: Updated Brazilian Portuguese translation.
+
+2005-07-24  Ilkka Tuohela  <hile@iki.fi>
+
+	* fi.po: Updated Finnish translation.
+
+2005-07-24  Kjartan Maraas  <kmaraas@gnome.org>
+
+	* nb.po: Updated Norwegian bokmål translation.
+	* no.po: Same
+
+2005-07-23  Clytie Siddall <clytie@riverland.net.au>
+
+	* vi.po: Updated Vietnamese translation.
+
+2005-07-23  Funda Wang  <fundawang@linux.net.cn>
+
+	* zh_CN.po: Updated Simplified Chinese translation.
+
+2005-07-21 Ankit Patel <ankit644@yahoo.com>
+
+	* gu.po: Updated Gujarati Translation.
+
+2005-07-20  Marcel Telka  <marcel@telka.sk>
+
+	* sk.po: Updated Slovak translation.
+
+2005-07-18  Adam Weinberger  <adamw@gnome.org>
+
+	* en_CA.po: Updated Canadian English translation.
+
+2005-07-17  Christophe Merlet  <redfox@redfoxcenter.org>
+
+	* fr.po: Updated French translation.
+
+2005-07-17  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
+
+	* es.po: Updated Spanish translation.
+
+2005-07-17  Theppitak Karoonboonyanan  <thep@linux.thai.net>
+
+	* th.po: Updated Thai translation.
+
+2005-07-17  Nikos Charonitakis  <charosn@her.forthenet.gr>
+
+	* el.po: Updated Greek translation.
+
+2005-07-16  Takeshi AIHANA <aihana@gnome.gr.jp>
+
+	* ja.po: Updated Japanese translation.
+
+2005-07-15  Ignacio Casal Quinteiro  <nacho.resa@gmail.com>
+
+	* gl.po: Updated Galician Translation.
+
+2005-07-14  Yair Hershkovitz  <yairhr@gmail.com>
+
+	* he.po: Updated Hebrew translation.
+
+2005-07-14  Miloslav Trmac  <mitr@volny.cz>
+
+	* cs.po: Updated Czech translation.
+
+2005-07-13  Marcel Telka  <marcel@telka.sk>
+
+	* sk.po: Updated Slovak translation.
+
+2005-07-12  Priit Laes  <plaes@cvs.gnome.org>
+
+	* et.po: Translation updated by Ivar Smolin.
+
+2005-07-08  Clytie Siddall <clytie@riverland.net.au>
+
+        * vi.po: Updated Vietnamese translation.
+
+2004-07-06  Christian Rose  <menthos@menthos.com>
+
+	* gl.po: Updated Galician translation by
+	Ignacio Casal Quinteiro <nacho.resa@gmail.com>.
+
+2005-07-04  Hendrik Richter  <hendi@gnome-de.org>
+
+	* de.po: Fixed German translation by
+	Jens Seidel <jensseidel@users.sf.net>.
+
+2005-06-23  Ignacio Casal Quinteiro  <nacho.resa@gmail.com>
+
+	* gl.po: Updated Galician translation.
+
+2005-06-22  Abel Cheung  <maddog@linuxhall.org>
+
+	* zh_TW.po: Fix language team reference.
+
+2005-06-05  Theppitak Karoonboonyanan  <thep@linux.thai.net>
+
+	* th.po: Updated Thai translation.
+
+2005-06-01  Priit Laes  <plaes@cvs.gnome.org>
+
+	* et.po: Translation updated.
+
+2005-05-19 Nikos Charonitakis  <charosn@her.forthnet.gr>
+
+	* el.po: Updated Greek translation.
+
+2005-05-11 Kostas Papadimas <pkst@gnome.org>
+      
+	* el.po: Updated Greek Translation.
+
+2005-05-10  Adi Attar  <aattar@cvs.gnome.org>
+
+	* xh.po: Updated Xhosa translation.
+
+2005-04-28   Kostas Papadimas <pkst@gnome.org>
+
+	* el.po: Updated Greek translation
+
+2005-04-25  Priit Laes  <plaes@cvs.gnome.org>
+
+	* et.po: Translation updated by Ivar Smolin.
+
+2005-04-17  Pauli Virtanen <pauli.virtanen@hut.fi>
+
+	 * fi.po: Fix a small mistranslation.
+
+2005-04-09  Christopher Orr  <chris@protactin.co.uk>
+
+	* en_GB.po: Updated British English translation.
+
+2005-04-06  Roozbeh Pournader  <roozbeh@farsiweb.info>
+
+	* fa.po: Updated Persian translation by
+	  Elnaz Sarbar <elnaz@farsiweb.info>.
+
+2005-04-05  Pawan Chitrakar  <pawan@nplinux.org>
+
+	* ne.po: Added Nepali Translation.
+
+2005-04-03  Gabor Kelemen  <kelemeng@gnome.hu>
+
+	* hu.po: Hungarian translation updated.
+
+2005-03-31  Steve Murphy  <murf@e-tools.com>
+
+        * rw.po: Added Kinyarwanda translation.
+
+2005-03-29  Adi Attar  <aattar@cvs.gnome.org>
+
+	* xh.po: Updated Xhosa translation.
+
+2005-03-17  Adam Weinberger  <adamw@gnome.org>
+
+	* en_CA.po: Updated Canadian English translation.
+
+2005-03-12  Baris Cicek <baris@teamforce.name.tr>
+
+	* tr.po: Updated Turkish Translation
+
+2005-03-10  Adi Attar  <aattar@cvs.gnome.org>
+
+	* xh.po: Added Xhosa translation.
+
+2005-03-07  Vincent van Adrighem  <adrighem@gnome.org>
+
+	* nl.po: Translation updated by Reinout van Schouwen.
+
+2005-03-07  Mugurel Tudor  <mugurelu@go.ro>
+
+	* ro.po: Updated Romanian translation.
+
+2005-03-04  Laszlo Dvornik  <dvornik@gnome.hu>
+
+	* hu.po: Hungarian translation updated by Gabor Kelemen.
+
+2005-03-03  Alexander Shopov  <ash@contact.bg>
+
+	* bg.po: Updated Bulgarian translation by
+	Vladimir Petkov <vpetkov@i-space.org>
+
+2005-03-03  Žygimantas Beručka  <uid0@akl.lt>
+
+	* lt.po: Updated Lithuanian translation.
+
+2005-03-02  Danilo Šegan  <dsegan@gmx.net>
+
+	* sr.po, sr@Latn.po: Updated Serbian translation.
+
+2005-03-02  Abel Cheung  <maddog@linuxhall.org>
+
+	* zh_TW.po: Updated traditional Chinese translation from GNOME HK Team
+
+2005-02-28  Vincent van Adrighem  <adrighem@gnome.org>
+
+	* nl.po: Translation updated by Reinout van Schouwen.
+
+2005-02-27  Alessio Frusciante  <algol@firenze.linux.it>
+
+	* it.po: Updated Italian translation by
+	Luca Ferretti <elle.uca@infinito.it>.
+
+2005-02-24  Artur Flinta  <aflinta@cvs.gnome.org>
+
+	* pl.po: Updated Polish translation by GNOME PL Team.
+
+2005-02-24  Ankit Patel <ankit644@yahoo.com>
+
+	* gu.po: Updated Gujarati Translation.
+
+2005-02-23  Vincent van Adrighem  <adrighem@gnome.org>
+
+	* nl.po: Translation updated by Michiel Sikkes.
+
+2004-02-22  Roozbeh Pournader  <roozbeh@farsiweb.info>
+
+	* fa.po: Updated Persian translation by
+	  Elnaz Sarbar <elnaz@farsiweb.info>.
+
+2005-02-22  Raphael Higino  <raphaelh@cvs.gnome.org>
+
+	* pt_BR.po: Updated Brazilian Portuguese translation.
+
+2005-02-21  Christophe Merlet  <redfox@redfoxcenter.org>
+
+	* fr.po: Updated French translation.
+
+2005-02-21  Bastien Nocera  <hadess@hadess.net>
+
+	* en_GB.po: the file is actually in UTF-8
+
+2005-02-21  Martin Willemoes Hansen  <mwh@sysrq.dk>
+
+	* da.po: Updated Danish translation.
+
+2005-02-21  Priit Laes  <plaes@cvs.gnome.org>
+
+	* et.po: Translation updated by Tõivo Leedjärv.
+
+2005-02-18  Changwoo Ryu  <cwryu@debian.org>
+
+	* ko.po: Updated Korean translation.
+
+2005-02-18  Duarte Loreto <happyguy_pt@hotmail.com>
+
+	* pt.po: Updated Portuguese translation.
+
+2005-02-17  Vincent van Adrighem  <adrighem@gnome.org>
+
+	* nl.po: Translation updated by Tino Meinen.
+
+2005-02-17  Laurent Dhima  <laurenti@alblinux.net>
+
+	* sq.po: Updated Albanian translation.
+
+2005-02-16  Jordi Mallach  <jordi@sindominio.net>
+
+	* ca.po: Updated Catalan translation.
+
+2005-02-15  Maxim Dziumanenko <mvd@mylinux.com.ua>
+
+	* uk.po: Updated Ukrainian translation.
+
+2005-02-15  Kjartan Maraas  <kmaraas@gnome.org>
+
+	* nb.po: s/applikasjon/program
+	* no.po: Same
+
+2005-02-12  Marcel Telka  <marcel@telka.sk>
+
+	* sk.po: Updated Slovak translation.
+
+2005-02-12  Takeshi AIHANA <aihana@gnome.gr.jp>
+
+	* ja.po: Updated Japanese translation.
+
+2005-02-11  Kostas Papadimas <pkst@gnome.org>
+
+	* el.po: Updated  Greek translation.
+
+2005-02-10  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
+
+	* es.po: Updated Spanish translation.
+
+2005-02-08  Leonid Kanter <leon@asplinux.ru>
+
+	* ru.po: Updated Russian translation
+
+2005-02-08  Kjartan Maraas  <kmaraas@gnome.org>
+
+	* nb.po: Update
+	* no.po: Update
+
+2005-02-07  David Lodge <dave@cirt.net>
+                                                                                
+        * en_GB.po: Updated British translation.
+                                                                                
+2005-02-06  Adam Weinberger  <adamw@gnome.org>
+
+	* en_CA.po: Updated Canadian English translation.
+
+2005-02-06  Miloslav Trmac  <mitr@volny.cz>
+
+	* cs.po: Updated Czech translation.
+
+2005-02-06  Alexander Shopov  <ash@contact.bg>
+
+	* bg.po: Updated Bulgarian translation by
+	Vladimir Petkov <vpetkov@i-space.org>
+
+2005-02-06  Pauli Virtanen <pauli.virtanen@hut.fi>
+
+	 * fi.po: Updated Finnish translation.
+
+2005-02-05  Frank Arnold  <farnold@cvs.gnome.org>
+
+	* de.po: Updated German translation.
+
+2005-02-05  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
+
+	* es.po: Updated Spanish translation.
+
+2005-02-05  Žygimantas Beručka  <uid0@akl.lt>
+
+	* lt.po: Updated Lithuanian translation.
+
+2005-02-04  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
+
+	* es.po: Updated Spanish translation.
+
+2005-02-04  Changwoo Ryu  <cwryu@debian.org>
+
+	* ko.po: Updated Korean translation.
+
+2005-02-02  Miloslav Trmac  <mitr@volny.cz>
+
+	* cs.po: Updated Czech translation.
+
+2005-02-02  Frank Arnold  <farnold@cvs.gnome.org>
+
+	* de.po: Updated German translation.
+
+2005-02-01  Kjartan Maraas  <kmaraas@gnome.org>
+
+	* nb.po: Update
+	* no.po: Update
+
+2005-02-01  Adam Weinberger  <adamw@gnome.org>
+
+	* en_CA.po: Updated Canadian English translation.
+
+2005-02-01  Žygimantas Beručka  <uid0@akl.lt>
+
+	* lt.po: Updated Lithuanian translation.
+
+2005-01-31  Christian Rose  <menthos@menthos.com>
+
+	* sv.po: Updated Swedish translation.
+
+2005-01-31  Miloslav Trmac  <mitr@volny.cz>
+
+	* cs.po: Updated Czech translation.
+
+2005-01-31  Christian Rose  <menthos@menthos.com>
+
+	* sv.po: Updated Swedish translation.
+
+2005-01-30  Žygimantas Beručka  <uid0@akl.lt>
+
+	* lt.po: Updated Lithuanian translation.
+
+2005-01-29  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
+
+	* es.po: Updated Spanish translation.
+
+2005-01-29  Miloslav Trmac  <mitr@volny.cz>
+
+	* cs.po: Updated Czech translation.
+
+2005-01-29  Marcel Telka  <marcel@telka.sk>
+
+	* sk.po: Updated Slovak translation.
+
+2005-01-29  Adam Weinberger  <adamw@gnome.org>
+
+	* en_CA.po: Updated Canadian English translation.
+
+2005-01-28  Kjartan Maraas  <kmaraas@gnome.org>
+
+	* nb.po: Update
+	* no.po: Update
+
+2005-01-26  Adam Weinberger  <adamw@gnome.org>
+
+	* en_CA.po: Updated Canadian English translation.
+
+2005-01-26  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
+
+	* es.po: Updated Spanish translation.
+
+2005-01-26  Duarte Loreto <happyguy_pt@hotmail.com>
+
+	* pt.po: Updated Portuguese translation.
+
+2005-01-25  Theppitak Karoonboonyanan  <thep@linux.thai.net>
+
+	* th.po: Updated Thai translation.
+
+2005-01-23  Funda Wang  <fundawang@linux.net.cn>
+
+	* zh_CN.po: Updated Simplified Chinese translation.
+
+2005-01-21  Kjartan Maraas  <kmaraas@gnome.org>
+
+	* nb.po: Update this too while we're at it.
+
+2005-01-21  Kjartan Maraas  <kmaraas@gnome.org>
+
+	* nn.po: Update
+
+2005-01-15  Frank Arnold  <farnold@cvs.gnome.org>
+
+	* de.po: Updated German translation.
+
 2005-01-01  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
 
 	* es.po: Updated Spanish translation.

po/am.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: metacity\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-09 21:23-0700\n"
+"POT-Creation-Date: 2005-06-27 17:21-0600\n"
 "PO-Revision-Date: 2003-02-03 10:16+EDT\n"
 "Last-Translator: Ge'ez Frontier Foundation <locales@geez.org>\n"
 "Language-Team: Amharic <locales@geez.org>\n"
@@ -58,7 +58,7 @@ msgstr ""
 msgid "Failed to get hostname: %s\n"
 msgstr ""
 
-#: src/display.c:306
+#: src/display.c:316
 #, c-format
 msgid "Failed to open X Window System display '%s'\n"
 msgstr ""
@@ -76,23 +76,23 @@ msgstr ""
 msgid "Fatal IO error %d (%s) on display '%s'.\n"
 msgstr ""
 
-#: src/frames.c:1020
+#: src/frames.c:1125
 msgid "Close Window"
 msgstr "መስኮቱን ዝጋ"
 
-#: src/frames.c:1023
+#: src/frames.c:1128
 msgid "Window Menu"
 msgstr "የመስኮት ሜኑ"
 
-#: src/frames.c:1026
+#: src/frames.c:1131
 msgid "Minimize Window"
 msgstr "መስኮቱን አሳንስ"
 
-#: src/frames.c:1029
+#: src/frames.c:1134
 msgid "Maximize Window"
 msgstr "መስኮቱን አስተልቅ"
 
-#: src/frames.c:1032
+#: src/frames.c:1137
 msgid "Unmaximize Window"
 msgstr "መስኮቱን አታስተልቅ"
 
@@ -103,17 +103,17 @@ msgid ""
 "binding\n"
 msgstr ""
 
-#: src/keybindings.c:2554
+#: src/keybindings.c:2535
 #, c-format
 msgid "Error launching metacity-dialog to print an error about a command: %s\n"
 msgstr ""
 
-#: src/keybindings.c:2659
+#: src/keybindings.c:2640
 #, c-format
 msgid "No command %d has been defined.\n"
 msgstr ""
 
-#: src/keybindings.c:3489
+#: src/keybindings.c:3485
 msgid "No terminal command has been defined.\n"
 msgstr ""
 
@@ -188,11 +188,13 @@ msgstr "ዝጋ (_C)"
 
 #. separator
 #: src/menu.c:66
-msgid "Put on _All Workspaces"
-msgstr "ሁሉም መሥሪያ ቦታዎች ላይ አድርግ (_A)"
+#, fuzzy
+msgid "_Always on Visible Workspace"
+msgstr "በዚህ መሥሪያ ቦታ ላይ ብቻ (_U)"
 
 #: src/menu.c:67
-msgid "Only on _This Workspace"
+#, fuzzy
+msgid "_Only on This Workspace"
 msgstr "በዚህ መሥሪያ ቦታ ላይ ብቻ (_U)"
 
 #: src/menu.c:68
@@ -215,7 +217,7 @@ msgstr "መስኮትን ወደ መሥሪያ ቦታ 1 አንቀሳቅስ"
 msgid "Move to Workspace _Down"
 msgstr "መስኮትን ወደ መሥሪያ ቦታ 9 አንቀሳቅስ"
 
-#: src/menu.c:162 src/prefs.c:1942
+#: src/menu.c:162 src/prefs.c:1996
 #, c-format
 msgid "Workspace %d"
 msgstr "መሥሪያ ቦታ %d"
@@ -347,13 +349,13 @@ msgstr "አርእስት"
 msgid "Class"
 msgstr "መደብ"
 
-#: src/metacity-dialog.c:262
+#: src/metacity-dialog.c:263
 msgid ""
 "These windows do not support \"save current setup\" and will have to be "
 "restarted manually next time you log in."
 msgstr ""
 
-#: src/metacity-dialog.c:323
+#: src/metacity-dialog.c:328
 #, c-format
 msgid ""
 "There was an error running \"%s\":\n"
@@ -466,7 +468,8 @@ msgid ""
 "\"direct manipulation\", by using wireframes, avoiding animations, or other "
 "means. This is a significant reduction in usability for many users, but may "
 "allow legacy applications and terminal servers to function when they would "
-"otherwise be impractical."
+"otherwise be impractical. However, the wireframe feature is disabled when "
+"accessibility is on to avoid weird desktop breakages."
 msgstr ""
 
 #: src/metacity.schemas.in.h:20
@@ -1477,64 +1480,64 @@ msgstr ""
 msgid "Window title font"
 msgstr "የመስኮት አርእስት የፊደል ቅርጽ"
 
-#: src/prefs.c:476 src/prefs.c:492 src/prefs.c:508 src/prefs.c:524
-#: src/prefs.c:540 src/prefs.c:560 src/prefs.c:576 src/prefs.c:592
-#: src/prefs.c:608 src/prefs.c:624 src/prefs.c:640 src/prefs.c:656
-#: src/prefs.c:672 src/prefs.c:689 src/prefs.c:705 src/prefs.c:721
-#: src/prefs.c:737 src/prefs.c:753 src/prefs.c:768 src/prefs.c:783
-#: src/prefs.c:798
+#: src/prefs.c:501 src/prefs.c:517 src/prefs.c:533 src/prefs.c:549
+#: src/prefs.c:565 src/prefs.c:585 src/prefs.c:601 src/prefs.c:617
+#: src/prefs.c:633 src/prefs.c:649 src/prefs.c:665 src/prefs.c:681
+#: src/prefs.c:697 src/prefs.c:714 src/prefs.c:730 src/prefs.c:746
+#: src/prefs.c:762 src/prefs.c:778 src/prefs.c:793 src/prefs.c:808
+#: src/prefs.c:823 src/prefs.c:839
 #, c-format
 msgid "GConf key \"%s\" is set to an invalid type\n"
 msgstr ""
 
-#: src/prefs.c:843
+#: src/prefs.c:884
 #, c-format
 msgid ""
 "\"%s\" found in configuration database is not a valid value for mouse button "
 "modifier\n"
 msgstr ""
 
-#: src/prefs.c:867 src/prefs.c:1277
+#: src/prefs.c:908 src/prefs.c:1318
 #, c-format
 msgid "GConf key '%s' is set to an invalid value\n"
 msgstr ""
 
-#: src/prefs.c:994
+#: src/prefs.c:1035
 #, c-format
 msgid "Could not parse font description \"%s\" from GConf key %s\n"
 msgstr ""
 
-#: src/prefs.c:1179
+#: src/prefs.c:1220
 #, c-format
 msgid ""
 "%d stored in GConf key %s is not a reasonable number of workspaces, current "
 "maximum is %d\n"
 msgstr ""
 
-#: src/prefs.c:1239
+#: src/prefs.c:1280
 msgid ""
 "Workarounds for broken applications disabled. Some applications may not "
 "behave properly.\n"
 msgstr ""
 
-#: src/prefs.c:1304
+#: src/prefs.c:1345
 #, c-format
 msgid "%d stored in GConf key %s is out of range 0 to %d\n"
 msgstr ""
 
-#: src/prefs.c:1425
+#: src/prefs.c:1479
 #, c-format
 msgid "Error setting number of workspaces to %d: %s\n"
 msgstr ""
 
-#: src/prefs.c:1669
+#: src/prefs.c:1723
 #, c-format
 msgid ""
 "\"%s\" found in configuration database is not a valid value for keybinding "
 "\"%s\"\n"
 msgstr ""
 
-#: src/prefs.c:2023
+#: src/prefs.c:2077
 #, c-format
 msgid "Error setting name for workspace %d to \"%s\": %s\n"
 msgstr ""
@@ -1567,7 +1570,7 @@ msgstr ""
 msgid "Screen %d on display \"%s\" already has a window manager\n"
 msgstr ""
 
-#: src/screen.c:699
+#: src/screen.c:716
 #, c-format
 msgid "Could not release screen %d on display \"%s\"\n"
 msgstr ""
@@ -2615,7 +2618,7 @@ msgid "Application set a bogus _NET_WM_PID %ld\n"
 msgstr ""
 
 #. first time through
-#: src/window.c:4829
+#: src/window.c:5197
 #, c-format
 msgid ""
 "Window %s sets SM_CLIENT_ID on itself, instead of on the WM_CLIENT_LEADER "
@@ -2629,7 +2632,7 @@ msgstr ""
 #. * MWM but not WM_NORMAL_HINTS are basically broken. We complain
 #. * about these apps but make them work.
 #.
-#: src/window.c:5500
+#: src/window.c:5868
 #, c-format
 msgid ""
 "Window %s sets an MWM hint indicating it isn't resizable, but sets min size %"
@@ -2657,6 +2660,9 @@ msgid ""
 "Property %s on window 0x%lx contained invalid UTF-8 for item %d in the list\n"
 msgstr ""
 
+#~ msgid "Put on _All Workspaces"
+#~ msgstr "ሁሉም መሥሪያ ቦታዎች ላይ አድርግ (_A)"
+
 #~ msgid "Move to %s"
 #~ msgstr "ወደ %s አንቀሳቅስ"
 

po/ar.po

@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: metacity\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-09 21:23-0700\n"
+"POT-Creation-Date: 2005-06-27 17:21-0600\n"
 "PO-Revision-Date: 2004-09-04 17:54+0300\n"
 "Last-Translator: Abdulaziz Al-Arfaj <alarfaj0@yahoo.com>\n"
 "Language-Team: Arabic <support@arabeyes.org>\n"
@@ -64,7 +64,7 @@ msgstr "خطأ اطلاق حوار ميتستي للسؤال حول قتل تط
 msgid "Failed to get hostname: %s\n"
 msgstr "فشل تلقي اسم المضيف: %s\n"
 
-#: src/display.c:306
+#: src/display.c:316
 #, c-format
 msgid "Failed to open X Window System display '%s'\n"
 msgstr "فشل فتح شاشة نظام نوافذ X '%s'\n"
@@ -85,23 +85,23 @@ msgstr ""
 msgid "Fatal IO error %d (%s) on display '%s'.\n"
 msgstr "خطأ IO فادح %d (%s) على الشاشة '%s'.\n"
 
-#: src/frames.c:1020
+#: src/frames.c:1125
 msgid "Close Window"
 msgstr "غلق النافذة"
 
-#: src/frames.c:1023
+#: src/frames.c:1128
 msgid "Window Menu"
 msgstr "قائمة النافذة"
 
-#: src/frames.c:1026
+#: src/frames.c:1131
 msgid "Minimize Window"
 msgstr "تصغير النافذة"
 
-#: src/frames.c:1029
+#: src/frames.c:1134
 msgid "Maximize Window"
 msgstr "تكبير النافذة"
 
-#: src/frames.c:1032
+#: src/frames.c:1137
 msgid "Unmaximize Window"
 msgstr "إلغاء تكبير النافذة"
 
@@ -112,17 +112,17 @@ msgid ""
 "binding\n"
 msgstr "برنامج آخر بصدد استعمال المفتاح %s بالمغيرين %x كرابط\n"
 
-#: src/keybindings.c:2554
+#: src/keybindings.c:2535
 #, c-format
 msgid "Error launching metacity-dialog to print an error about a command: %s\n"
 msgstr "خطأ اطلاق حوار ميتستي لعرض خطأ حول الأمر: %s\n"
 
-#: src/keybindings.c:2659
+#: src/keybindings.c:2640
 #, c-format
 msgid "No command %d has been defined.\n"
 msgstr "لم يعرف أمر %d.\n"
 
-#: src/keybindings.c:3489
+#: src/keybindings.c:3485
 #, fuzzy
 msgid "No terminal command has been defined.\n"
 msgstr "لم يعرف أمر %d.\n"
@@ -204,11 +204,13 @@ msgstr "_غلق"
 
 #. separator
 #: src/menu.c:66
-msgid "Put on _All Workspaces"
-msgstr "وضع على ج_ميع مساحات العمل"
+#, fuzzy
+msgid "_Always on Visible Workspace"
+msgstr "فقط على مساحة العمل _هذه"
 
 #: src/menu.c:67
-msgid "Only on _This Workspace"
+#, fuzzy
+msgid "_Only on This Workspace"
 msgstr "فقط على مساحة العمل _هذه"
 
 #: src/menu.c:68
@@ -227,7 +229,7 @@ msgstr "نقل لمساحة العمل إلى ال_أعلى"
 msgid "Move to Workspace _Down"
 msgstr "نقل لمساحة العمل إلى الأ_سفل"
 
-#: src/menu.c:162 src/prefs.c:1942
+#: src/menu.c:162 src/prefs.c:1996
 #, c-format
 msgid "Workspace %d"
 msgstr "مساحة العمل %d"
@@ -357,7 +359,7 @@ msgstr "العنوان"
 msgid "Class"
 msgstr "الطبقة"
 
-#: src/metacity-dialog.c:262
+#: src/metacity-dialog.c:263
 msgid ""
 "These windows do not support \"save current setup\" and will have to be "
 "restarted manually next time you log in."
@@ -365,7 +367,7 @@ msgstr ""
 "هذه النوافذ لا تدعم \"حفظ الضبط الحالي\" يجب اعادة تشغيلها شخصيا عند التسجيل "
 "المرة القادمة."
 
-#: src/metacity-dialog.c:323
+#: src/metacity-dialog.c:328
 #, c-format
 msgid ""
 "There was an error running \"%s\":\n"
@@ -492,12 +494,14 @@ msgstr ""
 "لعناوين النوافذ."
 
 #: src/metacity.schemas.in.h:19
+#, fuzzy
 msgid ""
 "If true, metacity will give the user less feedback and less sense of "
 "\"direct manipulation\", by using wireframes, avoiding animations, or other "
 "means. This is a significant reduction in usability for many users, but may "
 "allow legacy applications and terminal servers to function when they would "
-"otherwise be impractical."
+"otherwise be impractical. However, the wireframe feature is disabled when "
+"accessibility is on to avoid weird desktop breakages."
 msgstr ""
 "إذا ضبط لـ true، فسيعطي ميتستي المستخدم ردّا أقل و أحساسا أقل بـ \"التحوير "
 "المباشر\"، بإستخدام إطارات شبكية تجنّب الرسوم المتحركة أو بطرق أخرى. هذا "
@@ -1857,17 +1861,17 @@ msgstr "نمط تركيز النافذة"
 msgid "Window title font"
 msgstr "خط عنوان النافذة"
 
-#: src/prefs.c:476 src/prefs.c:492 src/prefs.c:508 src/prefs.c:524
-#: src/prefs.c:540 src/prefs.c:560 src/prefs.c:576 src/prefs.c:592
-#: src/prefs.c:608 src/prefs.c:624 src/prefs.c:640 src/prefs.c:656
-#: src/prefs.c:672 src/prefs.c:689 src/prefs.c:705 src/prefs.c:721
-#: src/prefs.c:737 src/prefs.c:753 src/prefs.c:768 src/prefs.c:783
-#: src/prefs.c:798
+#: src/prefs.c:501 src/prefs.c:517 src/prefs.c:533 src/prefs.c:549
+#: src/prefs.c:565 src/prefs.c:585 src/prefs.c:601 src/prefs.c:617
+#: src/prefs.c:633 src/prefs.c:649 src/prefs.c:665 src/prefs.c:681
+#: src/prefs.c:697 src/prefs.c:714 src/prefs.c:730 src/prefs.c:746
+#: src/prefs.c:762 src/prefs.c:778 src/prefs.c:793 src/prefs.c:808
+#: src/prefs.c:823 src/prefs.c:839
 #, c-format
 msgid "GConf key \"%s\" is set to an invalid type\n"
 msgstr "مفتاح GConf \"%s\" مضبوط لنوع غير صحيح\n"
 
-#: src/prefs.c:843
+#: src/prefs.c:884
 #, c-format
 msgid ""
 "\"%s\" found in configuration database is not a valid value for mouse button "
@@ -1875,17 +1879,17 @@ msgid ""
 msgstr ""
 "\"%s\" الموجود في قاعدة بايانات الإعدادات قيمة غير سليمة لمغير أزرار الفأرة\n"
 
-#: src/prefs.c:867 src/prefs.c:1277
+#: src/prefs.c:908 src/prefs.c:1318
 #, c-format
 msgid "GConf key '%s' is set to an invalid value\n"
 msgstr "مفتاح GConf '%s' مضبوط لقيمة غير صحيحة\n"
 
-#: src/prefs.c:994
+#: src/prefs.c:1035
 #, c-format
 msgid "Could not parse font description \"%s\" from GConf key %s\n"
 msgstr "لا يمكن تشعيب وصف الخط \"%s\" من مفتاح GConf %s\n"
 
-#: src/prefs.c:1179
+#: src/prefs.c:1220
 #, c-format
 msgid ""
 "%d stored in GConf key %s is not a reasonable number of workspaces, current "
@@ -1894,24 +1898,24 @@ msgstr ""
 "%d مخزون في مفتاح GConf %s ليس عدد معقول لمساحات العمل، الحدالأقصى الحالي هو "
 "%d\n"
 
-#: src/prefs.c:1239
+#: src/prefs.c:1280
 msgid ""
 "Workarounds for broken applications disabled. Some applications may not "
 "behave properly.\n"
 msgstr ""
 "تجاهلات لالتطبيقات المكسورة ملغات. ربما لن تتصرف بعض التطبيقات بسلامة.\n"
 
-#: src/prefs.c:1304
+#: src/prefs.c:1345
 #, c-format
 msgid "%d stored in GConf key %s is out of range 0 to %d\n"
 msgstr "%d مخزون في مفتاح GConf %s خارج المدى من 0 إلى %d\n"
 
-#: src/prefs.c:1425
+#: src/prefs.c:1479
 #, c-format
 msgid "Error setting number of workspaces to %d: %s\n"
 msgstr "خطأ تعيين عدد مساحات العمل لـ %d: %s\n"
 
-#: src/prefs.c:1669
+#: src/prefs.c:1723
 #, c-format
 msgid ""
 "\"%s\" found in configuration database is not a valid value for keybinding "
@@ -1919,7 +1923,7 @@ msgid ""
 msgstr ""
 "\"%s\" الموجود في قاعدة بيانات الإعدادات قيمة غير سليمة لربط المفتاح \"%s\"\n"
 
-#: src/prefs.c:2023
+#: src/prefs.c:2077
 #, c-format
 msgid "Error setting name for workspace %d to \"%s\": %s\n"
 msgstr "خطأ تعيين اسم مساحة العمل %d لـ \"%s\": %s\n"
@@ -1954,7 +1958,7 @@ msgstr "لا يمكن الحصول على اختيار مدير النوافذ
 msgid "Screen %d on display \"%s\" already has a window manager\n"
 msgstr "الشاشة %d على المعرض \"%s\" لها مدير نوافذ\n"
 
-#: src/screen.c:699
+#: src/screen.c:716
 #, c-format
 msgid "Could not release screen %d on display \"%s\"\n"
 msgstr "لا يمكن تسريح الشاشة %d على المعرض \"%s\"\n"
@@ -3025,7 +3029,7 @@ msgid "Application set a bogus _NET_WM_PID %ld\n"
 msgstr "ضبط التطبيق صك _NET_WM_PID %ld\n"
 
 #. first time through
-#: src/window.c:4829
+#: src/window.c:5197
 #, c-format
 msgid ""
 "Window %s sets SM_CLIENT_ID on itself, instead of on the WM_CLIENT_LEADER "
@@ -3041,7 +3045,7 @@ msgstr ""
 #. * MWM but not WM_NORMAL_HINTS are basically broken. We complain
 #. * about these apps but make them work.
 #.
-#: src/window.c:5500
+#: src/window.c:5868
 #, c-format
 msgid ""
 "Window %s sets an MWM hint indicating it isn't resizable, but sets min size %"
@@ -3077,6 +3081,9 @@ msgid ""
 msgstr ""
 "الخاصية %s على النافذة 0x%lx تحتوي UTF-8 غير صحيح للعنصر %d في القائمة\n"
 
+#~ msgid "Put on _All Workspaces"
+#~ msgstr "وضع على ج_ميع مساحات العمل"
+
 #~ msgid "Select how to give focus to windows"
 #~ msgstr "اختر كيفية تركيز النوافذ"
 

po/az.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: metacity.HEAD.az\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-09 21:23-0700\n"
+"POT-Creation-Date: 2005-06-27 17:21-0600\n"
 "PO-Revision-Date: 2004-08-17 21:53+0300\n"
 "Last-Translator: Metin Amiroff <metin@karegen.com>\n"
 "Language-Team: Azerbaijani <translation-team-az@lists.sourceforge.net>\n"
@@ -61,7 +61,7 @@ msgstr "Tə'minatı sonlandırma haqqında metacity-dialoqu başlatma xətası:
 msgid "Failed to get hostname: %s\n"
 msgstr "Verici adı alına bilmədi: %s\n"
 
-#: src/display.c:306
+#: src/display.c:316
 #, c-format
 msgid "Failed to open X Window System display '%s'\n"
 msgstr "X Window System displeyi '%s' açıla bilmədi\n"
@@ -82,23 +82,23 @@ msgstr ""
 msgid "Fatal IO error %d (%s) on display '%s'.\n"
 msgstr "Fatal IO error %d (%s) on display '%s'.\n"
 
-#: src/frames.c:1020
+#: src/frames.c:1125
 msgid "Close Window"
 msgstr "Pəncərəni Bağla"
 
-#: src/frames.c:1023
+#: src/frames.c:1128
 msgid "Window Menu"
 msgstr "Pəncərə Menyusu"
 
-#: src/frames.c:1026
+#: src/frames.c:1131
 msgid "Minimize Window"
 msgstr "Pəncərəni Kiçilt"
 
-#: src/frames.c:1029
+#: src/frames.c:1134
 msgid "Maximize Window"
 msgstr "Pəncərəni Böyüt"
 
-#: src/frames.c:1032
+#: src/frames.c:1137
 msgid "Unmaximize Window"
 msgstr "Pəncərəni Balacalaşdır"
 
@@ -110,17 +110,17 @@ msgid ""
 msgstr ""
 "Başqa bir proqram hazırda %s açarını %x modifayrlı bağlayıcı olaraq işlədir\n"
 
-#: src/keybindings.c:2554
+#: src/keybindings.c:2535
 #, c-format
 msgid "Error launching metacity-dialog to print an error about a command: %s\n"
 msgstr "Əmr haqqında xəta metacity-dialoqu başlatma xətası: %s\n"
 
-#: src/keybindings.c:2659
+#: src/keybindings.c:2640
 #, c-format
 msgid "No command %d has been defined.\n"
 msgstr "%d əmri tə'yin edilməyib.\n"
 
-#: src/keybindings.c:3489
+#: src/keybindings.c:3485
 #, fuzzy
 msgid "No terminal command has been defined.\n"
 msgstr "%d əmri tə'yin edilməyib.\n"
@@ -202,11 +202,13 @@ msgstr "_Bağla"
 
 #. separator
 #: src/menu.c:66
-msgid "Put on _All Workspaces"
-msgstr "_Bütün İş Sahələrinə Qoy"
+#, fuzzy
+msgid "_Always on Visible Workspace"
+msgstr "Ancaq _Bu İş Sahəsinə"
 
 #: src/menu.c:67
-msgid "Only on _This Workspace"
+#, fuzzy
+msgid "_Only on This Workspace"
 msgstr "Ancaq _Bu İş Sahəsinə"
 
 #: src/menu.c:68
@@ -225,7 +227,7 @@ msgstr "Ü_stdəki İş Sahəsinə Daşı"
 msgid "Move to Workspace _Down"
 msgstr "_Altdakı İş Sahəsinə Daşı"
 
-#: src/menu.c:162 src/prefs.c:1942
+#: src/menu.c:162 src/prefs.c:1996
 #, c-format
 msgid "Workspace %d"
 msgstr "İş Sahəsi %d"
@@ -357,7 +359,7 @@ msgstr "Başlıq"
 msgid "Class"
 msgstr "Sinif"
 
-#: src/metacity-dialog.c:262
+#: src/metacity-dialog.c:263
 msgid ""
 "These windows do not support \"save current setup\" and will have to be "
 "restarted manually next time you log in."
@@ -365,7 +367,7 @@ msgstr ""
 "Bu pəncərələr \"hazırkı iclası qeyd et\" xassəsini dəstəkləmir və növbəti "
 "girişdə əllə başladılmalıdır."
 
-#: src/metacity-dialog.c:323
+#: src/metacity-dialog.c:328
 #, c-format
 msgid ""
 "There was an error running \"%s\":\n"
@@ -492,12 +494,14 @@ msgstr ""
 "proqramların standart yazı növünü işlət."
 
 #: src/metacity.schemas.in.h:19
+#, fuzzy
 msgid ""
 "If true, metacity will give the user less feedback and less sense of "
 "\"direct manipulation\", by using wireframes, avoiding animations, or other "
 "means. This is a significant reduction in usability for many users, but may "
 "allow legacy applications and terminal servers to function when they would "
-"otherwise be impractical."
+"otherwise be impractical. However, the wireframe feature is disabled when "
+"accessibility is on to avoid weird desktop breakages."
 msgstr ""
 "Əgər true isə, metacity istifadəçiyə daha az animasiya və başqa ehtiyat "
 "alıcı gedişatlar göstərərək daha az ehtiyat/mənbə işlədəcəkdir. Bu, bəziləri "
@@ -1900,17 +1904,17 @@ msgstr "Pəncərə Fokus Modu"
 msgid "Window title font"
 msgstr "Pəncərə başlığının yazı növü"
 
-#: src/prefs.c:476 src/prefs.c:492 src/prefs.c:508 src/prefs.c:524
-#: src/prefs.c:540 src/prefs.c:560 src/prefs.c:576 src/prefs.c:592
-#: src/prefs.c:608 src/prefs.c:624 src/prefs.c:640 src/prefs.c:656
-#: src/prefs.c:672 src/prefs.c:689 src/prefs.c:705 src/prefs.c:721
-#: src/prefs.c:737 src/prefs.c:753 src/prefs.c:768 src/prefs.c:783
-#: src/prefs.c:798
+#: src/prefs.c:501 src/prefs.c:517 src/prefs.c:533 src/prefs.c:549
+#: src/prefs.c:565 src/prefs.c:585 src/prefs.c:601 src/prefs.c:617
+#: src/prefs.c:633 src/prefs.c:649 src/prefs.c:665 src/prefs.c:681
+#: src/prefs.c:697 src/prefs.c:714 src/prefs.c:730 src/prefs.c:746
+#: src/prefs.c:762 src/prefs.c:778 src/prefs.c:793 src/prefs.c:808
+#: src/prefs.c:823 src/prefs.c:839
 #, c-format
 msgid "GConf key \"%s\" is set to an invalid type\n"
 msgstr "GConf açarı \"%s\" hökmsüz növlə tə'yin edilib\n"
 
-#: src/prefs.c:843
+#: src/prefs.c:884
 #, c-format
 msgid ""
 "\"%s\" found in configuration database is not a valid value for mouse button "
@@ -1918,17 +1922,17 @@ msgid ""
 msgstr ""
 "Quraşdırma bazasında tapılan \"%s\" hökmlü siçan sür'ətləndiricisi deyil\n"
 
-#: src/prefs.c:867 src/prefs.c:1277
+#: src/prefs.c:908 src/prefs.c:1318
 #, c-format
 msgid "GConf key '%s' is set to an invalid value\n"
 msgstr "GConf açarı \"%s\" hökmsüz qiymətlə tə'yin edilib\n"
 
-#: src/prefs.c:994
+#: src/prefs.c:1035
 #, c-format
 msgid "Could not parse font description \"%s\" from GConf key %s\n"
 msgstr "\"%s\" yazı növü izahatı oxuna bilmədi. Gconf açarı: %s\n"
 
-#: src/prefs.c:1179
+#: src/prefs.c:1220
 #, c-format
 msgid ""
 "%d stored in GConf key %s is not a reasonable number of workspaces, current "
@@ -1937,7 +1941,7 @@ msgstr ""
 "%d GConf %s  açarında iş sahəsi ədədini düzgün bildirmir, hazırkı maksimal "
 "qiymət %d-dır\n"
 
-#: src/prefs.c:1239
+#: src/prefs.c:1280
 msgid ""
 "Workarounds for broken applications disabled. Some applications may not "
 "behave properly.\n"
@@ -1945,17 +1949,17 @@ msgstr ""
 "Xarab tə'minatlar üçün düzəltmə qeyri-fəaldır. Bə'zi proqramlar "
 "düzgündavranmaya bilər.\n"
 
-#: src/prefs.c:1304
+#: src/prefs.c:1345
 #, c-format
 msgid "%d stored in GConf key %s is out of range 0 to %d\n"
 msgstr "%d GConf %s açarında 0 ilə %d aralığının xaricindədir\n"
 
-#: src/prefs.c:1425
+#: src/prefs.c:1479
 #, c-format
 msgid "Error setting number of workspaces to %d: %s\n"
 msgstr "İş sahələrinin ədədi %d seçilirkən xəta: %s\n"
 
-#: src/prefs.c:1669
+#: src/prefs.c:1723
 #, c-format
 msgid ""
 "\"%s\" found in configuration database is not a valid value for keybinding "
@@ -1964,7 +1968,7 @@ msgstr ""
 "Quraşdırma bazasında tapılan \"%s\", \"%s\" qısa yolu üçün hökmlü qiymət "
 "deyil\n"
 
-#: src/prefs.c:2023
+#: src/prefs.c:2077
 #, c-format
 msgid "Error setting name for workspace %d to \"%s\": %s\n"
 msgstr "%d iş sahəsinin adı \"%s\" ilə dəyişdirilirkən xəta: %s\n"
@@ -2000,7 +2004,7 @@ msgstr ""
 msgid "Screen %d on display \"%s\" already has a window manager\n"
 msgstr "%d ekranı \"%s\" displeyində onsuz da pəncərə idarəçisinə malikdir\n"
 
-#: src/screen.c:699
+#: src/screen.c:716
 #, c-format
 msgid "Could not release screen %d on display \"%s\"\n"
 msgstr "Could not release screen %d on display \"%s\"\n"
@@ -3082,7 +3086,7 @@ msgid "Application set a bogus _NET_WM_PID %ld\n"
 msgstr "Proqram tə'minatı xətalı _NET_WM_PID %ld tə'yin etdi\n"
 
 #. first time through
-#: src/window.c:4829
+#: src/window.c:5197
 #, c-format
 msgid ""
 "Window %s sets SM_CLIENT_ID on itself, instead of on the WM_CLIENT_LEADER "
@@ -3098,7 +3102,7 @@ msgstr ""
 #. * MWM but not WM_NORMAL_HINTS are basically broken. We complain
 #. * about these apps but make them work.
 #.
-#: src/window.c:5500
+#: src/window.c:5868
 #, c-format
 msgid ""
 "Window %s sets an MWM hint indicating it isn't resizable, but sets min size %"
@@ -3135,6 +3139,9 @@ msgid ""
 msgstr ""
 "Property %s on window 0x%lx contained invalid UTF-8 for item %d in the list\n"
 
+#~ msgid "Put on _All Workspaces"
+#~ msgstr "_Bütün İş Sahələrinə Qoy"
+
 #~ msgid "Select how to give focus to windows"
 #~ msgstr "Pəncərələrə necə fokus veriləcəyini seç"
 

po/be.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: metacity HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-09 21:23-0700\n"
+"POT-Creation-Date: 2005-06-27 17:21-0600\n"
 "PO-Revision-Date: 2003-08-13 20:59+0300\n"
 "Last-Translator: Ales Nyakhaychyk <nab@mail.by>\n"
 "Language-Team: Belarusian <i18n@mova.org>\n"
@@ -60,7 +60,7 @@ msgstr ""
 msgid "Failed to get hostname: %s\n"
 msgstr "Адбыўся збой пад час атрыманьня назвы вузла: %s\n"
 
-#: src/display.c:306
+#: src/display.c:316
 #, c-format
 msgid "Failed to open X Window System display '%s'\n"
 msgstr ""
@@ -82,23 +82,23 @@ msgstr ""
 msgid "Fatal IO error %d (%s) on display '%s'.\n"
 msgstr "Фатальная памылка ўводу-вываду %d (%s) на дысплэі \"%s\".\n"
 
-#: src/frames.c:1020
+#: src/frames.c:1125
 msgid "Close Window"
 msgstr "Закрыць акно"
 
-#: src/frames.c:1023
+#: src/frames.c:1128
 msgid "Window Menu"
 msgstr "Мэню акна"
 
-#: src/frames.c:1026
+#: src/frames.c:1131
 msgid "Minimize Window"
 msgstr "Найменьшыць акно"
 
-#: src/frames.c:1029
+#: src/frames.c:1134
 msgid "Maximize Window"
 msgstr "Найбольшыць акно"
 
-#: src/frames.c:1032
+#: src/frames.c:1137
 msgid "Unmaximize Window"
 msgstr "Аднавіць папярэдні памер"
 
@@ -110,19 +110,19 @@ msgid ""
 msgstr ""
 "Клявішу \"%s\" з мадыфікатарамі \"%x\" ужо выкарыстоўвае іншая праграма\n"
 
-#: src/keybindings.c:2554
+#: src/keybindings.c:2535
 #, c-format
 msgid "Error launching metacity-dialog to print an error about a command: %s\n"
 msgstr ""
 "Памыдка загрузкі дыялёга Metacity для вываду паведамленьня пра памылку "
 "каманды: %s\n"
 
-#: src/keybindings.c:2659
+#: src/keybindings.c:2640
 #, c-format
 msgid "No command %d has been defined.\n"
 msgstr "Каманда %d не была вызначана.\n"
 
-#: src/keybindings.c:3489
+#: src/keybindings.c:3485
 #, fuzzy
 msgid "No terminal command has been defined.\n"
 msgstr "Каманда %d не была вызначана.\n"
@@ -208,11 +208,13 @@ msgstr "За_крыць"
 
 #. separator
 #: src/menu.c:66
-msgid "Put on _All Workspaces"
-msgstr "Разьмясьціць на _ўсіх працоўных прасторах"
+#, fuzzy
+msgid "_Always on Visible Workspace"
+msgstr "Толькі на _гэтай працоўнай прасторы"
 
 #: src/menu.c:67
-msgid "Only on _This Workspace"
+#, fuzzy
+msgid "_Only on This Workspace"
 msgstr "Толькі на _гэтай працоўнай прасторы"
 
 #: src/menu.c:68
@@ -235,7 +237,7 @@ msgstr "Перамясьціць акно на працоўную прастор
 msgid "Move to Workspace _Down"
 msgstr "Перамясьціць акно на адну працоўную прастору долу"
 
-#: src/menu.c:162 src/prefs.c:1942
+#: src/menu.c:162 src/prefs.c:1996
 #, c-format
 msgid "Workspace %d"
 msgstr "Працоўная прастора %d"
@@ -369,7 +371,7 @@ msgstr "Загаловак"
 msgid "Class"
 msgstr "Кляса"
 
-#: src/metacity-dialog.c:262
+#: src/metacity-dialog.c:263
 msgid ""
 "These windows do not support \"save current setup\" and will have to be "
 "restarted manually next time you log in."
@@ -377,7 +379,7 @@ msgstr ""
 "Гэтыя вокны ня падтрымліваюць каманду \"save current setup\", пад час "
 "наступнага ўваходу іх прыйдзецца перазапусьціць асабіста."
 
-#: src/metacity-dialog.c:323
+#: src/metacity-dialog.c:328
 #, c-format
 msgid ""
 "There was an error running \"%s\":\n"
@@ -518,7 +520,8 @@ msgid ""
 "\"direct manipulation\", by using wireframes, avoiding animations, or other "
 "means. This is a significant reduction in usability for many users, but may "
 "allow legacy applications and terminal servers to function when they would "
-"otherwise be impractical."
+"otherwise be impractical. However, the wireframe feature is disabled when "
+"accessibility is on to avoid weird desktop breakages."
 msgstr ""
 
 #: src/metacity.schemas.in.h:20
@@ -2039,17 +2042,17 @@ msgstr "Рэжым засяроджаньня акна"
 msgid "Window title font"
 msgstr "Шрыфт загалоўка акна"
 
-#: src/prefs.c:476 src/prefs.c:492 src/prefs.c:508 src/prefs.c:524
-#: src/prefs.c:540 src/prefs.c:560 src/prefs.c:576 src/prefs.c:592
-#: src/prefs.c:608 src/prefs.c:624 src/prefs.c:640 src/prefs.c:656
-#: src/prefs.c:672 src/prefs.c:689 src/prefs.c:705 src/prefs.c:721
-#: src/prefs.c:737 src/prefs.c:753 src/prefs.c:768 src/prefs.c:783
-#: src/prefs.c:798
+#: src/prefs.c:501 src/prefs.c:517 src/prefs.c:533 src/prefs.c:549
+#: src/prefs.c:565 src/prefs.c:585 src/prefs.c:601 src/prefs.c:617
+#: src/prefs.c:633 src/prefs.c:649 src/prefs.c:665 src/prefs.c:681
+#: src/prefs.c:697 src/prefs.c:714 src/prefs.c:730 src/prefs.c:746
+#: src/prefs.c:762 src/prefs.c:778 src/prefs.c:793 src/prefs.c:808
+#: src/prefs.c:823 src/prefs.c:839
 #, c-format
 msgid "GConf key \"%s\" is set to an invalid type\n"
 msgstr "Для ключа сыстэмы GConf \"%s\" выбраны недапушчальны тып\n"
 
-#: src/prefs.c:843
+#: src/prefs.c:884
 #, c-format
 msgid ""
 "\"%s\" found in configuration database is not a valid value for mouse button "
@@ -2058,19 +2061,19 @@ msgstr ""
 "Значэньне \"%s\" з базы даньняў наладкі зьяўляецца нерэчаісным значэньнем "
 "для мадыфікатара кнопкі мышы\n"
 
-#: src/prefs.c:867 src/prefs.c:1277
+#: src/prefs.c:908 src/prefs.c:1318
 #, c-format
 msgid "GConf key '%s' is set to an invalid value\n"
 msgstr "Для ключа сыстэмы GConf \"%s\" усталявана нерэчаіснае значэньне\n"
 
-#: src/prefs.c:994
+#: src/prefs.c:1035
 #, c-format
 msgid "Could not parse font description \"%s\" from GConf key %s\n"
 msgstr ""
 "Ня атрымалася выканаць разбор апісаньня шрыфта \"%s\" з ключа сыстэмы GConf %"
 "s\n"
 
-#: src/prefs.c:1179
+#: src/prefs.c:1220
 #, c-format
 msgid ""
 "%d stored in GConf key %s is not a reasonable number of workspaces, current "
@@ -2079,7 +2082,7 @@ msgstr ""
 "Значэньне %d з ключа сыстэмы GConf %s зьяўляецца недапушчальнай колькасьцю "
 "працоўных прастораў, бягучы максымум - %d\n"
 
-#: src/prefs.c:1239
+#: src/prefs.c:1280
 msgid ""
 "Workarounds for broken applications disabled. Some applications may not "
 "behave properly.\n"
@@ -2087,20 +2090,20 @@ msgstr ""
 "Ліквідаваньне хібаў для нестандартных дастасаваньняў адключана. Пэўныя "
 "дастасаваньні могуць кепска працаваць.\n"
 
-#: src/prefs.c:1304
+#: src/prefs.c:1345
 #, c-format
 msgid "%d stored in GConf key %s is out of range 0 to %d\n"
 msgstr ""
 "Значэньне%d з ключа сыстэмы GConf \"%s\" ня ўваходзіць у дыяпазон значэньняў "
 "ад 0 да %d\n"
 
-#: src/prefs.c:1425
+#: src/prefs.c:1479
 #, c-format
 msgid "Error setting number of workspaces to %d: %s\n"
 msgstr ""
 "Адбылася памылка усталяваньня колькасьці працоўных прастораў раўнымі %d: %s\n"
 
-#: src/prefs.c:1669
+#: src/prefs.c:1723
 #, c-format
 msgid ""
 "\"%s\" found in configuration database is not a valid value for keybinding "
@@ -2109,7 +2112,7 @@ msgstr ""
 "Значэньне \"%s\" з базы даньняў наладкі зьяўляецца нерэчаісным значэньнем "
 "для камбінацыі клявішаў \"%s\"\n"
 
-#: src/prefs.c:2023
+#: src/prefs.c:2077
 #, c-format
 msgid "Error setting name for workspace %d to \"%s\": %s\n"
 msgstr ""
@@ -2145,7 +2148,7 @@ msgstr "Ня атрымалася выбраць мэнаджар вокнаў
 msgid "Screen %d on display \"%s\" already has a window manager\n"
 msgstr "У экрана %d дысплэя \"%s\" ужо ёсьць мэнаджар вокнаў\n"
 
-#: src/screen.c:699
+#: src/screen.c:716
 #, c-format
 msgid "Could not release screen %d on display \"%s\"\n"
 msgstr "Ня атрымалася вызваліць экран %d дысплэя \"%s\"\n"
@@ -3262,7 +3265,7 @@ msgstr ""
 "Дастасаваньне усталявала няправільнае значэньне парамэтра _NET_WM_PID %ld\n"
 
 #. first time through
-#: src/window.c:4829
+#: src/window.c:5197
 #, c-format
 msgid ""
 "Window %s sets SM_CLIENT_ID on itself, instead of on the WM_CLIENT_LEADER "
@@ -3278,7 +3281,7 @@ msgstr ""
 #. * MWM but not WM_NORMAL_HINTS are basically broken. We complain
 #. * about these apps but make them work.
 #.
-#: src/window.c:5500
+#: src/window.c:5868
 #, c-format
 msgid ""
 "Window %s sets an MWM hint indicating it isn't resizable, but sets min size %"
@@ -3318,6 +3321,9 @@ msgstr ""
 "Уласьцівасьць \"%s\" для акна 0x%lx утрымлівала нерэчаісныя даньні UTF-8 для "
 "элемэнта %d у сьпісе\n"
 
+#~ msgid "Put on _All Workspaces"
+#~ msgstr "Разьмясьціць на _ўсіх працоўных прасторах"
+
 #~ msgid "Select how to give focus to windows"
 #~ msgstr "Выбар наладак пераключэньня засяроджаньня вокнаў"
 

po/bg.po

@@ -9,10 +9,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: metacity 2.10\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-09 21:23-0700\n"
-"PO-Revision-Date: 2004-12-16 09:37+0200\n"
+"POT-Creation-Date: 2005-06-27 17:21-0600\n"
+"PO-Revision-Date: 2005-03-03 17:10+0200\n"
 "Last-Translator: Vladimir Petkov <vpetkov@i-space.org>\n"
-"Language-Team: Bulgarian <dict@linux.zonebg.com>\n"
+"Language-Team: Bulgarian <dict@fsa-bg.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -31,7 +31,7 @@ msgstr "Metacity е компилиран без поддръжка на подр
 #: src/theme-parser.c:467
 #, c-format
 msgid "Could not parse \"%s\" as an integer"
-msgstr "Не можах да анализирам \"%s\" като цяло число"
+msgstr "\"%s\" не можe да се анализира като цяло число"
 
 #: src/delete.c:70 src/delete.c:97 src/metacity-dialog.c:77
 #: src/theme-parser.c:476 src/theme-parser.c:530
@@ -62,7 +62,7 @@ msgstr ""
 msgid "Failed to get hostname: %s\n"
 msgstr "Не успях да получа името на хоста: %s\n"
 
-#: src/display.c:306
+#: src/display.c:316
 #, c-format
 msgid "Failed to open X Window System display '%s'\n"
 msgstr "Не успях да отворя дисплея на X Window \"%s\"\n"
@@ -83,23 +83,23 @@ msgstr ""
 msgid "Fatal IO error %d (%s) on display '%s'.\n"
 msgstr "Фатална вх./изх. грешка %d (%s) на дисплей \"%s\".\n"
 
-#: src/frames.c:1020
+#: src/frames.c:1125
 msgid "Close Window"
 msgstr "Затваряне на прозореца"
 
-#: src/frames.c:1023
+#: src/frames.c:1128
 msgid "Window Menu"
 msgstr "Меню за прозорците"
 
-#: src/frames.c:1026
+#: src/frames.c:1131
 msgid "Minimize Window"
 msgstr "Минимизиране на прозореца"
 
-#: src/frames.c:1029
+#: src/frames.c:1134
 msgid "Maximize Window"
 msgstr "Максимизиране на прозореца"
 
-#: src/frames.c:1032
+#: src/frames.c:1137
 msgid "Unmaximize Window"
 msgstr "Демаксимизиране на прозореца"
 
@@ -110,19 +110,19 @@ msgid ""
 "binding\n"
 msgstr "Някоя друга програма използва бързия клавиш %s с модификатори %x\n"
 
-#: src/keybindings.c:2554
+#: src/keybindings.c:2535
 #, c-format
 msgid "Error launching metacity-dialog to print an error about a command: %s\n"
 msgstr ""
 "Грешка при стартиране на диалоговия прозорец на Metacity, за отпечатване на "
 "грешка за команда: %s\n"
 
-#: src/keybindings.c:2659
+#: src/keybindings.c:2640
 #, c-format
 msgid "No command %d has been defined.\n"
 msgstr "Не е дефинирана команда %d.\n"
 
-#: src/keybindings.c:3489
+#: src/keybindings.c:3485
 msgid "No terminal command has been defined.\n"
 msgstr "Не е дефинирана терминална команда.\n"
 
@@ -207,11 +207,11 @@ msgstr "_Затваряне"
 
 #. separator
 #: src/menu.c:66
-msgid "Put on _All Workspaces"
-msgstr "Поставяне на _всички работни плотове"
+msgid "_Always on Visible Workspace"
+msgstr "_Винаги на видимия работен плот"
 
 #: src/menu.c:67
-msgid "Only on _This Workspace"
+msgid "_Only on This Workspace"
 msgstr "_Само на този работен плот"
 
 #: src/menu.c:68
@@ -220,7 +220,7 @@ msgstr "Преместване в _левия работен плот"
 
 #: src/menu.c:69
 msgid "Move to Workspace R_ight"
-msgstr "Преместване в _дясния работен плот"
+msgstr "Преместване в _десния работен плот"
 
 #: src/menu.c:70
 msgid "Move to Workspace _Up"
@@ -230,7 +230,7 @@ msgstr "Преместване в _горния работен плот"
 msgid "Move to Workspace _Down"
 msgstr "Преместване в _долния работен плот"
 
-#: src/menu.c:162 src/prefs.c:1942
+#: src/menu.c:162 src/prefs.c:1996
 #, c-format
 msgid "Workspace %d"
 msgstr "Работен плот %d"
@@ -362,7 +362,7 @@ msgstr "Заглавие"
 msgid "Class"
 msgstr "Клас"
 
-#: src/metacity-dialog.c:262
+#: src/metacity-dialog.c:263
 msgid ""
 "These windows do not support \"save current setup\" and will have to be "
 "restarted manually next time you log in."
@@ -370,7 +370,7 @@ msgstr ""
 "Тези прозорци не поддържат операцията по записване на текущото състояние и "
 "ще трябва да се стартират ръчно при следващото Ви влизане."
 
-#: src/metacity-dialog.c:323
+#: src/metacity-dialog.c:328
 #, c-format
 msgid ""
 "There was an error running \"%s\":\n"
@@ -512,13 +512,17 @@ msgid ""
 "\"direct manipulation\", by using wireframes, avoiding animations, or other "
 "means. This is a significant reduction in usability for many users, but may "
 "allow legacy applications and terminal servers to function when they would "
-"otherwise be impractical."
+"otherwise be impractical. However, the wireframe feature is disabled when "
+"accessibility is on to avoid weird desktop breakages."
 msgstr ""
-"Ако е включено, metacity ще даде на потребителя по-малко обратна връзка и по-"
-"малко усещане за \"директна манипулация\", като се използват wireframes, "
-"избягват се анимации, или чрез други средства. Това е значимо намаление на "
-"използваемостта за много потребители, но може да позволи на специфични "
-"програми и терминални сървъри да работят, което иначе би билоневъзможно."
+"Ако е включено, metacity ще дава на потребителя по-малко обратна връзка и по-"
+"малко усещане за \"директна манипулация\", като се използват рамки вместо "
+"цели прозорци, избягват се анимации или чрез други средства. Това е значимо "
+"влошаване на използваемостта за много потребители, но може да позволи на "
+"специфични програми и терминални сървъри да работят, което иначе би било "
+"невъзможно. Както и да е, рамките за прозорците са изключени, когато са "
+"включени възможностите за достъпност, за да се избегнат странни повреди на "
+"работния плот."
 
 #: src/metacity.schemas.in.h:20
 msgid ""
@@ -1194,14 +1198,13 @@ msgid ""
 "will be no keybinding for this action."
 msgstr ""
 "Бързият клавиш за скриване на нормални прозорци и фокусиране на фона на "
-"десктопа.Форматът е от вида \"&lt;Control&gt;a\" или \"&lt;Shift&gt;&lt;"
+"работния плот.Форматът е от вида \"&lt;Control&gt;a\" или \"&lt;Shift&gt;&lt;"
 "Alt&gt;F1. Анализиращата програма е доста либерална по отношение на "
 "регистъра и съкращения от вида \"&lt;Ctl&gt;\" и \"&lt;Ctrl&gt;\". Ако "
 "зададете опцията да е специалният низ \"disabled\", това действие няма да "
 "има бърз клавиш."
 
 #: src/metacity.schemas.in.h:109
-#, fuzzy
 msgid ""
 "The keybinding used to maximize a window. The format looks like \"&lt;"
 "Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;F1\". The parser is fairly "
@@ -1933,17 +1936,17 @@ msgstr "Режим на фокусиране на прозорци"
 msgid "Window title font"
 msgstr "Шрифт за заглавията на прозорците"
 
-#: src/prefs.c:476 src/prefs.c:492 src/prefs.c:508 src/prefs.c:524
-#: src/prefs.c:540 src/prefs.c:560 src/prefs.c:576 src/prefs.c:592
-#: src/prefs.c:608 src/prefs.c:624 src/prefs.c:640 src/prefs.c:656
-#: src/prefs.c:672 src/prefs.c:689 src/prefs.c:705 src/prefs.c:721
-#: src/prefs.c:737 src/prefs.c:753 src/prefs.c:768 src/prefs.c:783
-#: src/prefs.c:798
+#: src/prefs.c:501 src/prefs.c:517 src/prefs.c:533 src/prefs.c:549
+#: src/prefs.c:565 src/prefs.c:585 src/prefs.c:601 src/prefs.c:617
+#: src/prefs.c:633 src/prefs.c:649 src/prefs.c:665 src/prefs.c:681
+#: src/prefs.c:697 src/prefs.c:714 src/prefs.c:730 src/prefs.c:746
+#: src/prefs.c:762 src/prefs.c:778 src/prefs.c:793 src/prefs.c:808
+#: src/prefs.c:823 src/prefs.c:839
 #, c-format
 msgid "GConf key \"%s\" is set to an invalid type\n"
 msgstr "GConf ключът \"%s\" е от невалиден тип\n"
 
-#: src/prefs.c:843
+#: src/prefs.c:884
 #, c-format
 msgid ""
 "\"%s\" found in configuration database is not a valid value for mouse button "
@@ -1952,17 +1955,17 @@ msgstr ""
 "\"%s\", който е открит в базата данни с настройките, не е валиден "
 "модификатор на бутон на мишката\n"
 
-#: src/prefs.c:867 src/prefs.c:1277
+#: src/prefs.c:908 src/prefs.c:1318
 #, c-format
 msgid "GConf key '%s' is set to an invalid value\n"
 msgstr "GConf ключът \"%s\" е с невалидна стойност\n"
 
-#: src/prefs.c:994
+#: src/prefs.c:1035
 #, c-format
 msgid "Could not parse font description \"%s\" from GConf key %s\n"
 msgstr "Не успях да анализирам шрифтовото описание \"%s\" от GConf ключа %s\n"
 
-#: src/prefs.c:1179
+#: src/prefs.c:1220
 #, c-format
 msgid ""
 "%d stored in GConf key %s is not a reasonable number of workspaces, current "
@@ -1971,7 +1974,7 @@ msgstr ""
 "Стойността %d записана в GConf клавиша %s, е неподходяща за брой на "
 "работните места. Текущият максимум е %d\n"
 
-#: src/prefs.c:1239
+#: src/prefs.c:1280
 msgid ""
 "Workarounds for broken applications disabled. Some applications may not "
 "behave properly.\n"
@@ -1979,17 +1982,17 @@ msgstr ""
 "Триковете за развалените програми са изключени. Някои програми могат да са с "
 "неправилно поведение.\n"
 
-#: src/prefs.c:1304
+#: src/prefs.c:1345
 #, c-format
 msgid "%d stored in GConf key %s is out of range 0 to %d\n"
 msgstr "Стойността %d записана в GConf ключа %s е извън обхвата от 0 до %d\n"
 
-#: src/prefs.c:1425
+#: src/prefs.c:1479
 #, c-format
 msgid "Error setting number of workspaces to %d: %s\n"
 msgstr "Грешка при задаване на броя на работни места да е %d: %s\n"
 
-#: src/prefs.c:1669
+#: src/prefs.c:1723
 #, c-format
 msgid ""
 "\"%s\" found in configuration database is not a valid value for keybinding "
@@ -1998,7 +2001,7 @@ msgstr ""
 "Низът \"%s\" открит в базата данни с настройки е невалиден за стойност на "
 "клавишната комбинация \"%s\"\n"
 
-#: src/prefs.c:2023
+#: src/prefs.c:2077
 #, c-format
 msgid "Error setting name for workspace %d to \"%s\": %s\n"
 msgstr "Грешка при задаване на името на работното място %d да е \"%s\": %s\n"
@@ -2035,7 +2038,7 @@ msgstr ""
 msgid "Screen %d on display \"%s\" already has a window manager\n"
 msgstr "Екран %d на дисплей \"%s\" вече има мениджър за прозорци\n"
 
-#: src/screen.c:699
+#: src/screen.c:716
 #, c-format
 msgid "Could not release screen %d on display \"%s\"\n"
 msgstr "Не успях да отстъпя екран %d на дисплей \"%s\"\n"
@@ -2140,7 +2143,7 @@ msgstr "Цялото число %ld е прекалено голямо, макс
 #: src/theme-parser.c:521 src/theme-parser.c:602 src/theme-parser.c:626
 #, c-format
 msgid "Could not parse \"%s\" as a floating point number"
-msgstr "Не можах да интерпретирам \"%s\" като число с плаваща запетая"
+msgstr "\"%s\" не може да се интерпретира като число с плаваща запетая"
 
 #: src/theme-parser.c:552
 #, c-format
@@ -2376,7 +2379,7 @@ msgstr "Елементът <%s> няма атрибут \"type\""
 #: src/theme-parser.c:2209
 #, c-format
 msgid "Did not understand value \"%s\" for type of gradient"
-msgstr "Не разбирам стойността \"%s\" като тип градиент"
+msgstr "Стойността \"%s\" не може да се анализира като тип градиент"
 
 #: src/theme-parser.c:2294
 #, c-format
@@ -2777,7 +2780,7 @@ msgstr "Статистика"
 
 #: src/theme-viewer.c:908
 msgid "Window Title Goes Here"
-msgstr "Тук се постявя заглавието на прозорците"
+msgstr "Тук се поставя заглавието на прозорците"
 
 #: src/theme-viewer.c:1012
 #, c-format
@@ -3018,7 +3021,7 @@ 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 ""
-"Анализаторът на координати препълни буфера си. Това е грешка на Метасити, но "
+"Анализаторът на координати препълни буфера си. Това е грешка на Metacity, но "
 "уверени ли сте, че се нуждаете от толкова дълъг израз?"
 
 #: src/theme.c:2015
@@ -3033,7 +3036,7 @@ msgstr ""
 
 #: src/theme.c:2135
 msgid "Coordinate expression had an open parenthesis with no close parenthesis"
-msgstr "В израза за координати има отваряща скоба без съответна затваряща"
+msgstr "В изразът за координати има отваряща скоба без съответна затваряща"
 
 #: src/theme.c:2146
 msgid "Coordinate expression doesn't seem to have any operators or operands"
@@ -3127,7 +3130,7 @@ msgstr "Грешка в мениджъра на прозорци: "
 
 #: src/util.c:378
 msgid "Window manager warning: "
-msgstr "Предупреждение от мениджъра на прозорци"
+msgstr "Предупреждение от мениджъра на прозорци: "
 
 #: src/util.c:402
 msgid "Window manager error: "
@@ -3139,7 +3142,7 @@ msgid "Application set a bogus _NET_WM_PID %ld\n"
 msgstr "Приложението зададе неверен _NET_WM_PID %ld\n"
 
 #. first time through
-#: src/window.c:4829
+#: src/window.c:5197
 #, c-format
 msgid ""
 "Window %s sets SM_CLIENT_ID on itself, instead of on the WM_CLIENT_LEADER "
@@ -3155,7 +3158,7 @@ msgstr ""
 #. * MWM but not WM_NORMAL_HINTS are basically broken. We complain
 #. * about these apps but make them work.
 #.
-#: src/window.c:5500
+#: src/window.c:5868
 #, c-format
 msgid ""
 "Window %s sets an MWM hint indicating it isn't resizable, but sets min size %"
@@ -3192,49 +3195,3 @@ msgid ""
 msgstr ""
 "Свойството %s на прозореца 0x%lx съдържа невалиден UTF-8 за елемента %d в "
 "списъка\n"
-
-#~ msgid "Select how to give focus to windows"
-#~ msgstr "Изберете как да фокусирате прозорците"
-
-#~ msgid "Window Focus"
-#~ msgstr "Фокусиране на прозорци"
-
-#~ msgid "Clic_k to give focus"
-#~ msgstr "_Натискане, за фокусиране"
-
-#~ msgid "Focus behavior:"
-#~ msgstr "Поведение на фокуса:"
-
-#~ msgid "Window Focus Preferences"
-#~ msgstr "Настройки на фокусирането на прозорците"
-
-#~ msgid "_Point to give focus"
-#~ msgstr "_Посочване, за фокусиране"
-
-#~ msgid "_Raise window on focus"
-#~ msgstr "_Издигане на прозореца при фокусиране"
-
-#~ msgid ""
-#~ "Failed to a open connection to a session manager, so window positions "
-#~ "will not be saved: %s\n"
-#~ msgstr ""
-#~ "Не успях да създам връзка към мениджъра на сесии, затова позициите на "
-#~ "прозорците няма да се запомнят: %s\n"
-
-#~ msgid "Only on %s"
-#~ msgstr "Само на %s"
-
-#~ msgid "Move to %s"
-#~ msgstr "Премести на %s"
-
-#~ msgid ""
-#~ "The window \"%s\" is not responding.\n"
-#~ "Force this application to exit?\n"
-#~ "(Any open documents will be lost.)"
-#~ msgstr ""
-#~ "Прозорецът \"%s\" не отговаря.\n"
-#~ "Да принудя ли приложението да приключи?\n"
-#~ "(Всички отворени документи ще бъдат загубени.)"
-
-#~ msgid "Kill application"
-#~ msgstr "Убий приложението"

po/bn.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: METACITY 2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-09 21:23-0700\n"
+"POT-Creation-Date: 2005-06-27 17:21-0600\n"
 "PO-Revision-Date: 2003-10-12 20:33+0530\n"
 "Last-Translator: Dr Anirban Mitra <mitra_anirban@yahoo.co.in>\n"
 "Language-Team: Bengali <gnome-trans@bengalinux.org>\n"
@@ -60,7 +60,7 @@ msgstr ""
 msgid "Failed to get hostname: %s\n"
 msgstr "এই হোস্টনেম পেতে ভুল হয়েছে: %s\n"
 
-#: src/display.c:306
+#: src/display.c:316
 #, c-format
 msgid "Failed to open X Window System display '%s'\n"
 msgstr "এক্স উইন্ডো সিস্টেম প্রদর্শক %s খুলতে পারছি না\n"
@@ -81,25 +81,25 @@ msgstr ""
 msgid "Fatal IO error %d (%s) on display '%s'.\n"
 msgstr "ঘাতক IO ভুল %d(%s) হয়েছে প্রদর্শক '%s' তে\n"
 
-#: src/frames.c:1020
+#: src/frames.c:1125
 msgid "Close Window"
 msgstr "জানালা  বন্ধ কর "
 
-#: src/frames.c:1023
+#: src/frames.c:1128
 msgid "Window Menu"
 msgstr "জানালা পছন্দতালিকা"
 
-#: src/frames.c:1026
+#: src/frames.c:1131
 msgid "Minimize Window"
 msgstr "ছোটো কর"
 
 # "উইন্ডো ক্ষুদ্রায়ত কর"
-#: src/frames.c:1029
+#: src/frames.c:1134
 msgid "Maximize Window"
 msgstr "পুরো পর্দা জুড়ে কর"
 
 # "উইন্ডো বৃহদায়ত কর"
-#: src/frames.c:1032
+#: src/frames.c:1137
 msgid "Unmaximize Window"
 msgstr "মাঝারি আকার কর"
 
@@ -112,17 +112,17 @@ msgid ""
 msgstr ""
 "অন্য একটি প্রোগ্রাম ইতিমধ্যেই %s চাবি %x পরিবর্তক সহ কার্যকারক হিসাবে ব্যবহার করছে\n"
 
-#: src/keybindings.c:2554
+#: src/keybindings.c:2535
 #, c-format
 msgid "Error launching metacity-dialog to print an error about a command: %s\n"
 msgstr "একটি আদেশ বিষয়ে ভুল ছাপার মেটাসিটি বার্তালাপ চালু করতে গন্ডগোল হয়েছে: %s\n"
 
-#: src/keybindings.c:2659
+#: src/keybindings.c:2640
 #, c-format
 msgid "No command %d has been defined.\n"
 msgstr "আদেশ %d জানা  নেই।\n"
 
-#: src/keybindings.c:3489
+#: src/keybindings.c:3485
 #, fuzzy
 msgid "No terminal command has been defined.\n"
 msgstr "আদেশ %d জানা  নেই।\n"
@@ -204,11 +204,13 @@ msgstr "বন্ধ _কর"
 
 #. separator
 #: src/menu.c:66
-msgid "Put on _All Workspaces"
-msgstr "স_মস্ত কার্যক্ষেত্রে রাখ"
+#, fuzzy
+msgid "_Always on Visible Workspace"
+msgstr "শুধুমাত্র _এই কার্যক্ষেত্রে"
 
 #: src/menu.c:67
-msgid "Only on _This Workspace"
+#, fuzzy
+msgid "_Only on This Workspace"
 msgstr "শুধুমাত্র _এই কার্যক্ষেত্রে"
 
 #: src/menu.c:68
@@ -231,7 +233,7 @@ msgstr "জানালাটিকে কার্যক্ষেত্র 1-
 msgid "Move to Workspace _Down"
 msgstr "জানালাটিকে নিচের কার্যক্ষেত্র পাঠাও"
 
-#: src/menu.c:162 src/prefs.c:1942
+#: src/menu.c:162 src/prefs.c:1996
 #, c-format
 msgid "Workspace %d"
 msgstr "কার্যক্ষেত্র %d"
@@ -365,7 +367,7 @@ msgstr "শীর্ষক"
 msgid "Class"
 msgstr "শ্রেণী"
 
-#: src/metacity-dialog.c:262
+#: src/metacity-dialog.c:263
 msgid ""
 "These windows do not support \"save current setup\" and will have to be "
 "restarted manually next time you log in."
@@ -373,7 +375,7 @@ msgstr ""
 "এই জানালাগুলি \"বর্তমান অবস্থা সঞ্চিত কর \" কে সাহায্য করে না এবং পরবর্তীবার যখন "
 "আপনি লগ্-ইন্ করবেন তখন এদের আপনাকেই চালু করতে হবে"
 
-#: src/metacity-dialog.c:323
+#: src/metacity-dialog.c:328
 #, c-format
 msgid ""
 "There was an error running \"%s\":\n"
@@ -508,7 +510,8 @@ msgid ""
 "\"direct manipulation\", by using wireframes, avoiding animations, or other "
 "means. This is a significant reduction in usability for many users, but may "
 "allow legacy applications and terminal servers to function when they would "
-"otherwise be impractical."
+"otherwise be impractical. However, the wireframe feature is disabled when "
+"accessibility is on to avoid weird desktop breakages."
 msgstr ""
 
 # fuzzy
@@ -1983,17 +1986,17 @@ msgstr "জানালার আলোকপাতের প্রকার"
 msgid "Window title font"
 msgstr "জানালার শীর্ষক ফন্ট"
 
-#: src/prefs.c:476 src/prefs.c:492 src/prefs.c:508 src/prefs.c:524
-#: src/prefs.c:540 src/prefs.c:560 src/prefs.c:576 src/prefs.c:592
-#: src/prefs.c:608 src/prefs.c:624 src/prefs.c:640 src/prefs.c:656
-#: src/prefs.c:672 src/prefs.c:689 src/prefs.c:705 src/prefs.c:721
-#: src/prefs.c:737 src/prefs.c:753 src/prefs.c:768 src/prefs.c:783
-#: src/prefs.c:798
+#: src/prefs.c:501 src/prefs.c:517 src/prefs.c:533 src/prefs.c:549
+#: src/prefs.c:565 src/prefs.c:585 src/prefs.c:601 src/prefs.c:617
+#: src/prefs.c:633 src/prefs.c:649 src/prefs.c:665 src/prefs.c:681
+#: src/prefs.c:697 src/prefs.c:714 src/prefs.c:730 src/prefs.c:746
+#: src/prefs.c:762 src/prefs.c:778 src/prefs.c:793 src/prefs.c:808
+#: src/prefs.c:823 src/prefs.c:839
 #, c-format
 msgid "GConf key \"%s\" is set to an invalid type\n"
 msgstr "জিকন্‌ফ কী \"%s\"  ভুল প্রকার স্থির করা হয়েছে\n"
 
-#: src/prefs.c:843
+#: src/prefs.c:884
 #, c-format
 msgid ""
 "\"%s\" found in configuration database is not a valid value for mouse button "
@@ -2001,17 +2004,17 @@ msgid ""
 msgstr ""
 "কন্‌ফিগারেশন ডাটাবেস-এ পাওয়া  \"%s\" মাউস বোতামের পরিবর্তক হিসাবে কার্যকরমান নয়\n"
 
-#: src/prefs.c:867 src/prefs.c:1277
+#: src/prefs.c:908 src/prefs.c:1318
 #, c-format
 msgid "GConf key '%s' is set to an invalid value\n"
 msgstr "জিকন্‌ফ কী  '%s' একটি ভুল মান স্থির করা হয়েছে\n"
 
-#: src/prefs.c:994
+#: src/prefs.c:1035
 #, c-format
 msgid "Could not parse font description \"%s\" from GConf key %s\n"
 msgstr "ফন্ট বিবরণ \"%s\" যা জিকন্‌ফ কী %s থেকে পাওয়া গেছে পার্স করা যায় নি\n"
 
-#: src/prefs.c:1179
+#: src/prefs.c:1220
 #, c-format
 msgid ""
 "%d stored in GConf key %s is not a reasonable number of workspaces, current "
@@ -2020,7 +2023,7 @@ msgstr ""
 "%d যা জিকন্‌ফ কী %s তে সঞ্চিত আছে, একটি যুক্তিযুক্ত কার্যক্ষেত্রের সংখ্যা নয় বর্তমান "
 "সর্বোচ্চ সংখ্যা হল %d\n"
 
-#: src/prefs.c:1239
+#: src/prefs.c:1280
 msgid ""
 "Workarounds for broken applications disabled. Some applications may not "
 "behave properly.\n"
@@ -2028,17 +2031,17 @@ msgstr ""
 "ভগ্ন প্রোগ্রামের জন্য এড়িয়ে যাওয়ার ব্যবস্থা নিষ্ক্রিয় করা আছে। কিছু প্রোগ্রাম ঠিকভাবে "
 "ব্যবহার নাও করতে পারে\n"
 
-#: src/prefs.c:1304
+#: src/prefs.c:1345
 #, c-format
 msgid "%d stored in GConf key %s is out of range 0 to %d\n"
 msgstr "সঞ্চিত মান %d জিকন্‌ফ কী %s এর  কার্যকরী সীমা 0 থেকে %d এর বাইরে\n"
 
-#: src/prefs.c:1425
+#: src/prefs.c:1479
 #, c-format
 msgid "Error setting number of workspaces to %d: %s\n"
 msgstr "কার্যক্ষেত্রের সংখ্যা %d করতে এই ভুল হয়েছে: %s\n"
 
-#: src/prefs.c:1669
+#: src/prefs.c:1723
 #, c-format
 msgid ""
 "\"%s\" found in configuration database is not a valid value for keybinding "
@@ -2047,7 +2050,7 @@ msgstr ""
 "\"%s\" যা কন্‌ফিগারেশন ডাটাবেসে পাওয়া গেছে সেটি কীবাইন্ডিং\"%s\" র জন্য সঠিক মান "
 "নয়\n"
 
-#: src/prefs.c:2023
+#: src/prefs.c:2077
 #, c-format
 msgid "Error setting name for workspace %d to \"%s\": %s\n"
 msgstr "কার্যক্ষেত্র %d -র নাম \"%s\" করতে ভুল হয়েছে: %s\n"
@@ -2083,7 +2086,7 @@ msgstr ""
 msgid "Screen %d on display \"%s\" already has a window manager\n"
 msgstr "পর্দা %d প্রদর্শক \"%s\"এ ইতিমধ্যেই একটি জানালা প্রবন্ধক আছে\n"
 
-#: src/screen.c:699
+#: src/screen.c:716
 #, c-format
 msgid "Could not release screen %d on display \"%s\"\n"
 msgstr "পর্দা %d প্রদর্শক \"%s\" কে ছাড়তে পারলাম না\n"
@@ -3173,7 +3176,7 @@ msgid "Application set a bogus _NET_WM_PID %ld\n"
 msgstr "প্রোগ্রামটি একটি অর্থহীন _NET_WM_PID স্থির করেছে %ld\n"
 
 #. first time through
-#: src/window.c:4829
+#: src/window.c:5197
 #, c-format
 msgid ""
 "Window %s sets SM_CLIENT_ID on itself, instead of on the WM_CLIENT_LEADER "
@@ -3189,7 +3192,7 @@ msgstr ""
 #. * MWM but not WM_NORMAL_HINTS are basically broken. We complain
 #. * about these apps but make them work.
 #.
-#: src/window.c:5500
+#: src/window.c:5868
 #, c-format
 msgid ""
 "Window %s sets an MWM hint indicating it isn't resizable, but sets min size %"
@@ -3226,6 +3229,9 @@ msgid ""
 "Property %s on window 0x%lx contained invalid UTF-8 for item %d in the list\n"
 msgstr ""
 
+#~ msgid "Put on _All Workspaces"
+#~ msgstr "স_মস্ত কার্যক্ষেত্রে রাখ"
+
 #~ msgid "Select how to give focus to windows"
 #~ msgstr "বেছে নিন কিভাবে একটি জানালায় আলোকপাত করবেন"
 

po/bs.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: metacity.HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-09 21:23-0700\n"
+"POT-Creation-Date: 2005-06-27 17:21-0600\n"
 "PO-Revision-Date: 2004-07-30 02:16+0200\n"
 "Last-Translator: Kemal Sanjta <gomez@lugzdk.ba>\n"
 "Language-Team: Bosnian <+>\n"
@@ -60,7 +60,7 @@ msgstr ""
 msgid "Failed to get hostname: %s\n"
 msgstr "Neuspjeh pri primanju imena računara %s\n"
 
-#: src/display.c:306
+#: src/display.c:316
 #, c-format
 msgid "Failed to open X Window System display '%s'\n"
 msgstr "Neuspjeh pri otvaranju X Window Sistem prikaza %s'\n"
@@ -81,23 +81,23 @@ msgstr ""
 msgid "Fatal IO error %d (%s) on display '%s'.\n"
 msgstr "Fatalna IO greška %d (%s) na prikazu %s'.\n"
 
-#: src/frames.c:1020
+#: src/frames.c:1125
 msgid "Close Window"
 msgstr "Zatvori prozor"
 
-#: src/frames.c:1023
+#: src/frames.c:1128
 msgid "Window Menu"
 msgstr "Izbornik prozor"
 
-#: src/frames.c:1026
+#: src/frames.c:1131
 msgid "Minimize Window"
 msgstr "Minimiziraj prozor"
 
-#: src/frames.c:1029
+#: src/frames.c:1134
 msgid "Maximize Window"
 msgstr "Maksimiziraj prozor"
 
-#: src/frames.c:1032
+#: src/frames.c:1137
 msgid "Unmaximize Window"
 msgstr "Poništi povećanje prozora"
 
@@ -109,17 +109,17 @@ msgid ""
 msgstr ""
 "Neki drugi program već koristi kljuć %s sa modifikacijama %x kao spoj\n"
 
-#: src/keybindings.c:2554
+#: src/keybindings.c:2535
 #, c-format
 msgid "Error launching metacity-dialog to print an error about a command: %s\n"
 msgstr "Greška pri pokretanju metacity dijaloga za ispis greške komande: %s\n"
 
-#: src/keybindings.c:2659
+#: src/keybindings.c:2640
 #, c-format
 msgid "No command %d has been defined.\n"
 msgstr "Nijedna komanda %d nije definisana.\n"
 
-#: src/keybindings.c:3489
+#: src/keybindings.c:3485
 #, fuzzy
 msgid "No terminal command has been defined.\n"
 msgstr "Nijedna komanda %d nije definisana.\n"
@@ -201,11 +201,13 @@ msgstr "_Zatvori"
 
 #. separator
 #: src/menu.c:66
-msgid "Put on _All Workspaces"
-msgstr "Postavi na _Sve radne površine"
+#, fuzzy
+msgid "_Always on Visible Workspace"
+msgstr "Samo na _Ovoj radnoj površini"
 
 #: src/menu.c:67
-msgid "Only on _This Workspace"
+#, fuzzy
+msgid "_Only on This Workspace"
 msgstr "Samo na _Ovoj radnoj površini"
 
 #: src/menu.c:68
@@ -224,7 +226,7 @@ msgstr "Premjesti na _gornju radnu površinu"
 msgid "Move to Workspace _Down"
 msgstr "Pomjeri na _donju radnu površinu"
 
-#: src/menu.c:162 src/prefs.c:1942
+#: src/menu.c:162 src/prefs.c:1996
 #, c-format
 msgid "Workspace %d"
 msgstr "Radna površina %d"
@@ -356,7 +358,7 @@ msgstr "Naslov"
 msgid "Class"
 msgstr "Klasa"
 
-#: src/metacity-dialog.c:262
+#: src/metacity-dialog.c:263
 msgid ""
 "These windows do not support \"save current setup\" and will have to be "
 "restarted manually next time you log in."
@@ -364,7 +366,7 @@ msgstr ""
 "Ovi prozori ne podržavaju mogućnost \"snimi trenutne postavke\" i morati "
 "ćete ih ručno ponovno pokrenuti sljedeći put kada se prijavite."
 
-#: src/metacity-dialog.c:323
+#: src/metacity-dialog.c:328
 #, c-format
 msgid ""
 "There was an error running \"%s\":\n"
@@ -496,12 +498,14 @@ msgstr ""
 "aplikacijsko pismo za naslovnu traku prozora."
 
 #: src/metacity.schemas.in.h:19
+#, fuzzy
 msgid ""
 "If true, metacity will give the user less feedback and less sense of "
 "\"direct manipulation\", by using wireframes, avoiding animations, or other "
 "means. This is a significant reduction in usability for many users, but may "
 "allow legacy applications and terminal servers to function when they would "
-"otherwise be impractical."
+"otherwise be impractical. However, the wireframe feature is disabled when "
+"accessibility is on to avoid weird desktop breakages."
 msgstr ""
 "Ukoliko je postavljeno, metacity će korisniku dati manje povratnih "
 "informacija i manje osjećaja \"direktne manipulacije\", korištenjem žičanih "
@@ -1972,17 +1976,17 @@ msgstr "Način fokusa prozora"
 msgid "Window title font"
 msgstr "Font naslova prozora"
 
-#: src/prefs.c:476 src/prefs.c:492 src/prefs.c:508 src/prefs.c:524
-#: src/prefs.c:540 src/prefs.c:560 src/prefs.c:576 src/prefs.c:592
-#: src/prefs.c:608 src/prefs.c:624 src/prefs.c:640 src/prefs.c:656
-#: src/prefs.c:672 src/prefs.c:689 src/prefs.c:705 src/prefs.c:721
-#: src/prefs.c:737 src/prefs.c:753 src/prefs.c:768 src/prefs.c:783
-#: src/prefs.c:798
+#: src/prefs.c:501 src/prefs.c:517 src/prefs.c:533 src/prefs.c:549
+#: src/prefs.c:565 src/prefs.c:585 src/prefs.c:601 src/prefs.c:617
+#: src/prefs.c:633 src/prefs.c:649 src/prefs.c:665 src/prefs.c:681
+#: src/prefs.c:697 src/prefs.c:714 src/prefs.c:730 src/prefs.c:746
+#: src/prefs.c:762 src/prefs.c:778 src/prefs.c:793 src/prefs.c:808
+#: src/prefs.c:823 src/prefs.c:839
 #, c-format
 msgid "GConf key \"%s\" is set to an invalid type\n"
 msgstr "GConf ključ \"%s\" je postavljen na neispravan tip\n"
 
-#: src/prefs.c:843
+#: src/prefs.c:884
 #, c-format
 msgid ""
 "\"%s\" found in configuration database is not a valid value for mouse button "
@@ -1991,17 +1995,17 @@ msgstr ""
 "“%s“ je pronađen u bazi podešavanja što nije ispravna vrijednost za dugme "
 "koje mijenja ponašanje dugmadi miša\n"
 
-#: src/prefs.c:867 src/prefs.c:1277
+#: src/prefs.c:908 src/prefs.c:1318
 #, c-format
 msgid "GConf key '%s' is set to an invalid value\n"
 msgstr "GConf ključ '%s' je postavljen na neispravnu vrijednost\n"
 
-#: src/prefs.c:994
+#: src/prefs.c:1035
 #, c-format
 msgid "Could not parse font description \"%s\" from GConf key %s\n"
 msgstr "Nije moguće analizirati opis fonta  \"%s\" iz Gconf ključa %s\n"
 
-#: src/prefs.c:1179
+#: src/prefs.c:1220
 #, c-format
 msgid ""
 "%d stored in GConf key %s is not a reasonable number of workspaces, current "
@@ -2010,7 +2014,7 @@ msgstr ""
 "%d pohranjen u GConf ključu %s nije podnošljiv broj radnih površina, "
 "trenutno je maksimalan %d\n"
 
-#: src/prefs.c:1239
+#: src/prefs.c:1280
 msgid ""
 "Workarounds for broken applications disabled. Some applications may not "
 "behave properly.\n"
@@ -2018,17 +2022,17 @@ msgstr ""
 "Kompromisi za loše programe su isključeni. Neki programi se mogu ponašati "
 "čudno.\n"
 
-#: src/prefs.c:1304
+#: src/prefs.c:1345
 #, c-format
 msgid "%d stored in GConf key %s is out of range 0 to %d\n"
 msgstr "%d pohranjen u GConf ključu %s je izvan dometa od 0 do %d\n"
 
-#: src/prefs.c:1425
+#: src/prefs.c:1479
 #, c-format
 msgid "Error setting number of workspaces to %d: %s\n"
 msgstr "Greška prilikom podešavanja broja radnih površina na %d: %s\n"
 
-#: src/prefs.c:1669
+#: src/prefs.c:1723
 #, c-format
 msgid ""
 "\"%s\" found in configuration database is not a valid value for keybinding "
@@ -2037,7 +2041,7 @@ msgstr ""
 "\"%s\" nađen u konfiguracijskoj bazi nije ispravna kombinacija dugmadi \"%s"
 "\"\n"
 
-#: src/prefs.c:2023
+#: src/prefs.c:2077
 #, c-format
 msgid "Error setting name for workspace %d to \"%s\": %s\n"
 msgstr "Greška prilikom podešavanja imena radne površine %d  u \"%s\": %s\n"
@@ -2073,7 +2077,7 @@ msgstr ""
 msgid "Screen %d on display \"%s\" already has a window manager\n"
 msgstr "Ekran %d na prikazu \"%s\" već ima rukovoditelja prozora\n"
 
-#: src/screen.c:699
+#: src/screen.c:716
 #, c-format
 msgid "Could not release screen %d on display \"%s\"\n"
 msgstr "Nije moguće otpustiti ekran %d na prikazu \"%s\"\n"
@@ -3173,7 +3177,7 @@ msgid "Application set a bogus _NET_WM_PID %ld\n"
 msgstr "Aplikacija je postavila prividan _NETWM_PID %ld\n"
 
 #. first time through
-#: src/window.c:4829
+#: src/window.c:5197
 #, c-format
 msgid ""
 "Window %s sets SM_CLIENT_ID on itself, instead of on the WM_CLIENT_LEADER "
@@ -3189,7 +3193,7 @@ msgstr ""
 #. * MWM but not WM_NORMAL_HINTS are basically broken. We complain
 #. * about these apps but make them work.
 #.
-#: src/window.c:5500
+#: src/window.c:5868
 #, c-format
 msgid ""
 "Window %s sets an MWM hint indicating it isn't resizable, but sets min size %"
@@ -3226,6 +3230,9 @@ msgid ""
 msgstr ""
 "Osobina %s na prozoru 0x%lx sadrži neispravni UTF-8 za predmet %d na popisu\n"
 
+#~ msgid "Put on _All Workspaces"
+#~ msgstr "Postavi na _Sve radne površine"
+
 #~ msgid "Select how to give focus to windows"
 #~ msgstr "Odaberite kako da fokusirate na prozor"
 

po/ca.po

@@ -1,16 +1,16 @@
 # Catalan translation of Metacity.
-# Copyright © 2002, 2003, 2004 Free Software Foundation, Inc.
+# Copyright © 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 # This file is distributed under the same license as the metacity package.
 # Softcatala <info@softcatala.org>, 2002.
 # Jesús Moreno <jmmolas@wanadoo.es>, 2002.
-# Jordi Mallach <jordi@sindominio.net>, 2003, 2004.
+# Jordi Mallach <jordi@sindominio.net>, 2003, 2004, 2005.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: metacity 2.7.90\n"
+"Project-Id-Version: metacity 2.9.91\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-09 21:23-0700\n"
-"PO-Revision-Date: 2004-08-21 18:54+0200\n"
+"POT-Creation-Date: 2005-06-27 17:21-0600\n"
+"PO-Revision-Date: 2005-02-16 10:23+0100\n"
 "Last-Translator: Jordi Mallach <jordi@sindominio.net>\n"
 "Language-Team: Softcatalà <tradgnome@softcatala.org>\n"
 "MIME-Version: 1.0\n"
@@ -30,7 +30,7 @@ msgstr "Metacity es va compilar sense suport per al mode detallat\n"
 #: src/theme-parser.c:467
 #, c-format
 msgid "Could not parse \"%s\" as an integer"
-msgstr "No s'ha pogut analitzar \"%s\" com a enter"
+msgstr "No s'ha pogut analitzar «%s» com a enter"
 
 #: src/delete.c:70 src/delete.c:97 src/metacity-dialog.c:77
 #: src/theme-parser.c:476 src/theme-parser.c:530
@@ -63,7 +63,7 @@ msgstr ""
 msgid "Failed to get hostname: %s\n"
 msgstr "És impossible d'obtenir el nom de l'ordinador central: %s\n"
 
-#: src/display.c:306
+#: src/display.c:316
 #, c-format
 msgid "Failed to open X Window System display '%s'\n"
 msgstr "És impossible d'obrir la pantalla del Sistema de la Finestra X '%s'\n"
@@ -75,32 +75,32 @@ msgid ""
 "most likely the X server was shut down or you killed/destroyed\n"
 "the window manager.\n"
 msgstr ""
-"S'ha perdut la connexió amb la pantalla '%s';\n"
+"S'ha perdut la connexió amb la pantalla «%s»;\n"
 "és molt probable que el servidor X s'hagi aturat o que hàgiu finalitzat/\n"
 "destruït el gestor de la finestra.\n"
 
 #: src/errors.c:238
 #, c-format
 msgid "Fatal IO error %d (%s) on display '%s'.\n"
-msgstr "Error d'ES %d fatal (%s) a la pantalla '%s'.\n"
+msgstr "S'ha produït un error fatal d'E/S %d (%s) a la pantalla «%s».\n"
 
-#: src/frames.c:1020
+#: src/frames.c:1125
 msgid "Close Window"
 msgstr "Tanca la finestra"
 
-#: src/frames.c:1023
+#: src/frames.c:1128
 msgid "Window Menu"
 msgstr "Menú de la finestra"
 
-#: src/frames.c:1026
+#: src/frames.c:1131
 msgid "Minimize Window"
 msgstr "Minimitza la finestra"
 
-#: src/frames.c:1029
+#: src/frames.c:1134
 msgid "Maximize Window"
 msgstr "Maximitza la finestra"
 
-#: src/frames.c:1032
+#: src/frames.c:1137
 msgid "Unmaximize Window"
 msgstr "Desmaximitza la finestra"
 
@@ -113,22 +113,21 @@ msgstr ""
 "Ja hi ha algun altre programa utilitzant la clau %s amb els modificadors %x "
 "com a vinculació\n"
 
-#: src/keybindings.c:2554
+#: src/keybindings.c:2535
 #, c-format
 msgid "Error launching metacity-dialog to print an error about a command: %s\n"
 msgstr ""
 "S'ha produït un error en executar el metacity-dialog per a mostrar un error "
 "sobre una ordre: %s\n"
 
-#: src/keybindings.c:2659
+#: src/keybindings.c:2640
 #, c-format
 msgid "No command %d has been defined.\n"
 msgstr "No s'ha definit cap ordre %d.\n"
 
-#: src/keybindings.c:3489
-#, fuzzy
+#: src/keybindings.c:3485
 msgid "No terminal command has been defined.\n"
-msgstr "No s'ha definit cap ordre %d.\n"
+msgstr "No s'ha definit cap ordre de terminal.\n"
 
 #: src/main.c:69
 msgid ""
@@ -210,12 +209,12 @@ msgstr "_Tanca"
 
 #. separator
 #: src/menu.c:66
-msgid "Put on _All Workspaces"
-msgstr "Posa-ho en _tots els espais de treball"
+msgid "_Always on Visible Workspace"
+msgstr "_Sempre a l'espai de treball visible"
 
 #: src/menu.c:67
-msgid "Only on _This Workspace"
-msgstr "Només en aques_t espai de treball"
+msgid "_Only on This Workspace"
+msgstr "N_omés a aquest espai de treball"
 
 #: src/menu.c:68
 msgid "Move to Workspace _Left"
@@ -233,7 +232,7 @@ msgstr "Mou a l'espai de treball de da_lt"
 msgid "Move to Workspace _Down"
 msgstr "Mou a l'espai de treball d'a_vall"
 
-#: src/menu.c:162 src/prefs.c:1942
+#: src/menu.c:162 src/prefs.c:1996
 #, c-format
 msgid "Workspace %d"
 msgstr "Espai de treball %d"
@@ -364,7 +363,7 @@ msgstr "Títol"
 msgid "Class"
 msgstr "Classe"
 
-#: src/metacity-dialog.c:262
+#: src/metacity-dialog.c:263
 msgid ""
 "These windows do not support \"save current setup\" and will have to be "
 "restarted manually next time you log in."
@@ -372,7 +371,7 @@ msgstr ""
 "Aquestes finestres no suporten «desa la configuració actual» i es tindràn "
 "que reiniciar manualment la pròxima vegada que entreu."
 
-#: src/metacity-dialog.c:323
+#: src/metacity-dialog.c:328
 #, c-format
 msgid ""
 "There was an error running \"%s\":\n"
@@ -514,13 +513,16 @@ msgid ""
 "\"direct manipulation\", by using wireframes, avoiding animations, or other "
 "means. This is a significant reduction in usability for many users, but may "
 "allow legacy applications and terminal servers to function when they would "
-"otherwise be impractical."
+"otherwise be impractical. However, the wireframe feature is disabled when "
+"accessibility is on to avoid weird desktop breakages."
 msgstr ""
 "Sí és vertader, metacity donarà a l'usuari menys informació i menys sensació "
 "de «manipulació directa» utilitzant marcs amb fils, evitant les animacions o "
 "altres mitjans. Això és una reducció significativa en usabilitat per a molts "
 "usuaris, però pot permetre a algunes aplicacions velles i servidors de "
-"terminal funcionar quan serien impracticables d'altra manera."
+"terminal funcionar quan serien impracticables d'altra manera. No obstant, la "
+"funcionalitat dels marcs amb fils es desactiva quan l'accessibility està "
+"habilitada, per a evitar problemes estranys a l'escriptori."
 
 #: src/metacity.schemas.in.h:20
 msgid ""
@@ -709,7 +711,7 @@ msgstr "Executa una ordre definida"
 
 #: src/metacity.schemas.in.h:60
 msgid "Run a terminal"
-msgstr ""
+msgstr "Executa un terminal"
 
 #: src/metacity.schemas.in.h:61
 msgid "Show the panel menu"
@@ -1198,7 +1200,6 @@ msgstr ""
 "per a aquesta acció."
 
 #: src/metacity.schemas.in.h:109
-#, fuzzy
 msgid ""
 "The keybinding used to maximize a window. The format looks like \"&lt;"
 "Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;F1\". The parser is fairly "
@@ -1694,7 +1695,6 @@ msgstr ""
 "acció."
 
 #: src/metacity.schemas.in.h:142
-#, fuzzy
 msgid ""
 "The keybinding which invokes a terminal. The format looks like \"&lt;"
 "Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;F1\". The parser is fairly "
@@ -1702,11 +1702,11 @@ msgid ""
 "Ctl&gt;\" and \"&lt;Ctrl&gt;\". If you set the option to the special string "
 "\"disabled\", then there will be no keybinding for this action."
 msgstr ""
-"La vinculació de tecles que mostra el menú principal del quadre. El format "
-"és paregut a «&lt;Control&gt;a» o «&lt;Shift&gt;&lt;Alt&gt;F1». "
-"L'analitzador és prou flexible i permet minúscules i majúscules, i també "
-"abreviacions com «&lt;Ctl&gt;» i «&lt;Ctrl&gt;». Si establiu l'opció a la "
-"cadena especial «disabled», no hi haurà cap vinculació per a aquesta acció."
+"La vinculació de tecles que executa un terminal. El format és paregut a «&lt;"
+"Control&gt;a» o «&lt;Shift&gt;&lt;Alt&gt;F1». L'analitzador és prou flexible "
+"i permet minúscules i majúscules, i també abreviacions com «&lt;Ctl&gt;» i "
+"«&lt;Ctrl&gt;». Si establiu l'opció a la cadena especial «disabled», no hi "
+"haurà cap vinculació per a aquesta acció."
 
 #: src/metacity.schemas.in.h:143
 msgid ""
@@ -1939,17 +1939,17 @@ msgstr "Mode de focus de les finestres"
 msgid "Window title font"
 msgstr "Tipus de lletra del títol de les finestres"
 
-#: src/prefs.c:476 src/prefs.c:492 src/prefs.c:508 src/prefs.c:524
-#: src/prefs.c:540 src/prefs.c:560 src/prefs.c:576 src/prefs.c:592
-#: src/prefs.c:608 src/prefs.c:624 src/prefs.c:640 src/prefs.c:656
-#: src/prefs.c:672 src/prefs.c:689 src/prefs.c:705 src/prefs.c:721
-#: src/prefs.c:737 src/prefs.c:753 src/prefs.c:768 src/prefs.c:783
-#: src/prefs.c:798
+#: src/prefs.c:501 src/prefs.c:517 src/prefs.c:533 src/prefs.c:549
+#: src/prefs.c:565 src/prefs.c:585 src/prefs.c:601 src/prefs.c:617
+#: src/prefs.c:633 src/prefs.c:649 src/prefs.c:665 src/prefs.c:681
+#: src/prefs.c:697 src/prefs.c:714 src/prefs.c:730 src/prefs.c:746
+#: src/prefs.c:762 src/prefs.c:778 src/prefs.c:793 src/prefs.c:808
+#: src/prefs.c:823 src/prefs.c:839
 #, c-format
 msgid "GConf key \"%s\" is set to an invalid type\n"
 msgstr "La clau Gconf \"%s\" està configurada a un tipus no vàlid\n"
 
-#: src/prefs.c:843
+#: src/prefs.c:884
 #, c-format
 msgid ""
 "\"%s\" found in configuration database is not a valid value for mouse button "
@@ -1958,17 +1958,17 @@ msgstr ""
 "«%s» trobat a la base de dades de la configuració no és un valor vàlid per "
 "al modificador del botó del ratolí\n"
 
-#: src/prefs.c:867 src/prefs.c:1277
+#: src/prefs.c:908 src/prefs.c:1318
 #, c-format
 msgid "GConf key '%s' is set to an invalid value\n"
 msgstr "La clau GConf «%s» està establerta a un valor no vàlid\n"
 
-#: src/prefs.c:994
+#: src/prefs.c:1035
 #, c-format
 msgid "Could not parse font description \"%s\" from GConf key %s\n"
 msgstr "No s'ha pogut analitzar la descripció font «%s» de la clau GConf %s\n"
 
-#: src/prefs.c:1179
+#: src/prefs.c:1220
 #, c-format
 msgid ""
 "%d stored in GConf key %s is not a reasonable number of workspaces, current "
@@ -1977,7 +1977,7 @@ msgstr ""
 "%d emmagatzemat a la clau GConf %s no té un nombre raonable d'espais de "
 "treball, el màxim actual és %d\n"
 
-#: src/prefs.c:1239
+#: src/prefs.c:1280
 msgid ""
 "Workarounds for broken applications disabled. Some applications may not "
 "behave properly.\n"
@@ -1985,18 +1985,18 @@ msgstr ""
 "El suport per a aplicacions amb errors està inhabilitat. Algunes aplicacions "
 "poden no comportar-se correctament.\n"
 
-#: src/prefs.c:1304
+#: src/prefs.c:1345
 #, c-format
 msgid "%d stored in GConf key %s is out of range 0 to %d\n"
 msgstr "%d emmagatzemat a la clau GConf %s està fora del rang 0 a %d\n"
 
-#: src/prefs.c:1425
+#: src/prefs.c:1479
 #, c-format
 msgid "Error setting number of workspaces to %d: %s\n"
 msgstr ""
 "S'ha produït un error en establir el nombre d'espais de treball a %d: %s\n"
 
-#: src/prefs.c:1669
+#: src/prefs.c:1723
 #, c-format
 msgid ""
 "\"%s\" found in configuration database is not a valid value for keybinding "
@@ -2005,7 +2005,7 @@ msgstr ""
 "«%s» trobat a la base de dades de la configuració no és un valor vàlid per a "
 "la vinculació de tecla «%s»\n"
 
-#: src/prefs.c:2023
+#: src/prefs.c:2077
 #, c-format
 msgid "Error setting name for workspace %d to \"%s\": %s\n"
 msgstr ""
@@ -2044,7 +2044,7 @@ msgstr ""
 msgid "Screen %d on display \"%s\" already has a window manager\n"
 msgstr "La pantalla %d en la visualització «%s» ja té un gestor de finestres\n"
 
-#: src/screen.c:699
+#: src/screen.c:716
 #, c-format
 msgid "Could not release screen %d on display \"%s\"\n"
 msgstr "No s'ha pogut lliberar la pantalla %d en la visualització «%s»\n"
@@ -3155,7 +3155,7 @@ msgid "Application set a bogus _NET_WM_PID %ld\n"
 msgstr "L'aplicació ha definit un _NET_WM_PID %ld fals\n"
 
 #. first time through
-#: src/window.c:4829
+#: src/window.c:5197
 #, c-format
 msgid ""
 "Window %s sets SM_CLIENT_ID on itself, instead of on the WM_CLIENT_LEADER "
@@ -3171,7 +3171,7 @@ msgstr ""
 #. * MWM but not WM_NORMAL_HINTS are basically broken. We complain
 #. * about these apps but make them work.
 #.
-#: src/window.c:5500
+#: src/window.c:5868
 #, c-format
 msgid ""
 "Window %s sets an MWM hint indicating it isn't resizable, but sets min size %"
@@ -3211,6 +3211,9 @@ msgstr ""
 "La propietat %s en la finestra 0x%lx contenia UTF-8 invàlid per a l'element %"
 "d en la lista\n"
 
+#~ msgid "Put on _All Workspaces"
+#~ msgstr "Posa-ho en _tots els espais de treball"
+
 #~ msgid "Select how to give focus to windows"
 #~ msgstr "Selecciona com donar el focus a les finestres"
 

po/cy.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: metacity\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-09 21:23-0700\n"
+"POT-Creation-Date: 2005-06-27 17:21-0600\n"
 "PO-Revision-Date: 2004-09-12 16:38+0100\n"
 "Last-Translator: Dafydd Harries <daf@muse.19inch.net>\n"
 "Language-Team: Cymraeg <gnome-cy@pengwyn.linux.org.uk>\n"
@@ -59,7 +59,7 @@ msgstr ""
 msgid "Failed to get hostname: %s\n"
 msgstr "Methu cyrchu'r enw gwesteiwr: %s\n"
 
-#: src/display.c:306
+#: src/display.c:316
 #, c-format
 msgid "Failed to open X Window System display '%s'\n"
 msgstr "Methu agor y dangosydd System Ffenestri X '%s'\n"
@@ -80,23 +80,23 @@ msgstr ""
 msgid "Fatal IO error %d (%s) on display '%s'.\n"
 msgstr "Gwall IO marwol %d (%s) ar y dangosydd '%s'.\n"
 
-#: src/frames.c:1020
+#: src/frames.c:1125
 msgid "Close Window"
 msgstr "Cau'r Ffenest"
 
-#: src/frames.c:1023
+#: src/frames.c:1128
 msgid "Window Menu"
 msgstr "Dewislen Ffenest"
 
-#: src/frames.c:1026
+#: src/frames.c:1131
 msgid "Minimize Window"
 msgstr "Lleihau'r Ffenest"
 
-#: src/frames.c:1029
+#: src/frames.c:1134
 msgid "Maximize Window"
 msgstr "Ehangu'r Ffenest"
 
-#: src/frames.c:1032
+#: src/frames.c:1137
 msgid "Unmaximize Window"
 msgstr "Dadehangu'r Ffenest"
 
@@ -109,19 +109,19 @@ msgstr ""
 "Mae rhaglen arall yn defnyddio'r bysell %s gyfa'r addasyddion %x fel "
 "rhwymiad eisioes\n"
 
-#: src/keybindings.c:2554
+#: src/keybindings.c:2535
 #, c-format
 msgid "Error launching metacity-dialog to print an error about a command: %s\n"
 msgstr ""
 "Gwall wrth lansio metacity-dialog er mwyn argraffu gwall ynghylch gorchymyn: "
 "%s\n"
 
-#: src/keybindings.c:2659
+#: src/keybindings.c:2640
 #, c-format
 msgid "No command %d has been defined.\n"
 msgstr "Does dim gorchmyn %d wedi ei ddiffinio.\n"
 
-#: src/keybindings.c:3489
+#: src/keybindings.c:3485
 #, fuzzy
 msgid "No terminal command has been defined.\n"
 msgstr "Does dim gorchmyn %d wedi ei ddiffinio.\n"
@@ -207,11 +207,13 @@ msgstr "_Cau"
 
 #. separator
 #: src/menu.c:66
-msgid "Put on _All Workspaces"
-msgstr "Rhoi ar _Pob Gweithfan"
+#, fuzzy
+msgid "_Always on Visible Workspace"
+msgstr "Ar y Gweithfan _Yma'n Unig"
 
 #: src/menu.c:67
-msgid "Only on _This Workspace"
+#, fuzzy
+msgid "_Only on This Workspace"
 msgstr "Ar y Gweithfan _Yma'n Unig"
 
 #: src/menu.c:68
@@ -230,7 +232,7 @@ msgstr "Symud at i _Fyny'r Gweithfan"
 msgid "Move to Workspace _Down"
 msgstr "Symud at i _Lawr y Gweithfan"
 
-#: src/menu.c:162 src/prefs.c:1942
+#: src/menu.c:162 src/prefs.c:1996
 #, c-format
 msgid "Workspace %d"
 msgstr "Gweithfan %d"
@@ -362,7 +364,7 @@ msgstr "Teitl"
 msgid "Class"
 msgstr "Dosbarth"
 
-#: src/metacity-dialog.c:262
+#: src/metacity-dialog.c:263
 msgid ""
 "These windows do not support \"save current setup\" and will have to be "
 "restarted manually next time you log in."
@@ -370,7 +372,7 @@ msgstr ""
 "Dyw'r ffenestri yma ddim yn cynnal \"arbed y gosodiad cyfredol\" a bydd "
 "rhaid eu ail-ddechrau gyda llaw y tro nesaf rydych yn mewngofnodi."
 
-#: src/metacity-dialog.c:323
+#: src/metacity-dialog.c:328
 #, c-format
 msgid ""
 "There was an error running \"%s\":\n"
@@ -506,12 +508,14 @@ msgstr ""
 "rhaglen am teitlau ffenestr."
 
 #: src/metacity.schemas.in.h:19
+#, fuzzy
 msgid ""
 "If true, metacity will give the user less feedback and less sense of "
 "\"direct manipulation\", by using wireframes, avoiding animations, or other "
 "means. This is a significant reduction in usability for many users, but may "
 "allow legacy applications and terminal servers to function when they would "
-"otherwise be impractical."
+"otherwise be impractical. However, the wireframe feature is disabled when "
+"accessibility is on to avoid weird desktop breakages."
 msgstr ""
 "Os yn wir, yn fe dydd metacity yn rhoi llai o adborth i'r defnyddiwr a llai "
 "o brofiad o \"thrin uniongyrchol\", gan ddefnyddio ffrâmiau gwifren, osgoi "
@@ -1971,17 +1975,17 @@ msgstr "Modd ffocysu ffenestri"
 msgid "Window title font"
 msgstr "Ffont teitl ffenestri"
 
-#: src/prefs.c:476 src/prefs.c:492 src/prefs.c:508 src/prefs.c:524
-#: src/prefs.c:540 src/prefs.c:560 src/prefs.c:576 src/prefs.c:592
-#: src/prefs.c:608 src/prefs.c:624 src/prefs.c:640 src/prefs.c:656
-#: src/prefs.c:672 src/prefs.c:689 src/prefs.c:705 src/prefs.c:721
-#: src/prefs.c:737 src/prefs.c:753 src/prefs.c:768 src/prefs.c:783
-#: src/prefs.c:798
+#: src/prefs.c:501 src/prefs.c:517 src/prefs.c:533 src/prefs.c:549
+#: src/prefs.c:565 src/prefs.c:585 src/prefs.c:601 src/prefs.c:617
+#: src/prefs.c:633 src/prefs.c:649 src/prefs.c:665 src/prefs.c:681
+#: src/prefs.c:697 src/prefs.c:714 src/prefs.c:730 src/prefs.c:746
+#: src/prefs.c:762 src/prefs.c:778 src/prefs.c:793 src/prefs.c:808
+#: src/prefs.c:823 src/prefs.c:839
 #, c-format
 msgid "GConf key \"%s\" is set to an invalid type\n"
 msgstr "Y mae allwedd GConf \"%s\" wedi ei osod yn fath annilys\n"
 
-#: src/prefs.c:843
+#: src/prefs.c:884
 #, c-format
 msgid ""
 "\"%s\" found in configuration database is not a valid value for mouse button "
@@ -1990,17 +1994,17 @@ msgstr ""
 "Nid yw \"%s\" sydd wedi ei ddarganfod yn y cronfa cyfluniad yn werth ddilys "
 "ar gyfer addasydd botwm llygoden\n"
 
-#: src/prefs.c:867 src/prefs.c:1277
+#: src/prefs.c:908 src/prefs.c:1318
 #, c-format
 msgid "GConf key '%s' is set to an invalid value\n"
 msgstr "Y mae allwedd GConf '%s' wedi ei gosod yn werth annilys\n"
 
-#: src/prefs.c:994
+#: src/prefs.c:1035
 #, c-format
 msgid "Could not parse font description \"%s\" from GConf key %s\n"
 msgstr "Ni all gramadegu'r disgrifiad ffont \"%s\" o'r allwedd GConf %s\n"
 
-#: src/prefs.c:1179
+#: src/prefs.c:1220
 #, c-format
 msgid ""
 "%d stored in GConf key %s is not a reasonable number of workspaces, current "
@@ -2009,7 +2013,7 @@ msgstr ""
 "Nid yw %d sydd wedi ei gadw tu fewn i allwedd GConf %s yn nifer rhesymol o "
 "weithfannau, %d yw'r cyfanswm cyfredol\n"
 
-#: src/prefs.c:1239
+#: src/prefs.c:1280
 msgid ""
 "Workarounds for broken applications disabled. Some applications may not "
 "behave properly.\n"
@@ -2017,19 +2021,19 @@ msgstr ""
 "Mae cywiriadau ar gyfer rhaglenni torredig wedi ei analluogi. Efallai ni "
 "fydd rhai rhaglenni yn ymddwyn yn gywir.\n"
 
-#: src/prefs.c:1304
+#: src/prefs.c:1345
 #, c-format
 msgid "%d stored in GConf key %s is out of range 0 to %d\n"
 msgstr ""
 "Y mae %d, sydd wedi ei gadw tu fewn i allwedd GConf %s, tu allan o'r "
 "amrediad 0 i %d\n"
 
-#: src/prefs.c:1425
+#: src/prefs.c:1479
 #, c-format
 msgid "Error setting number of workspaces to %d: %s\n"
 msgstr "Gwall wrth osod y nifer o weithfannau i %d: %s\n"
 
-#: src/prefs.c:1669
+#: src/prefs.c:1723
 #, c-format
 msgid ""
 "\"%s\" found in configuration database is not a valid value for keybinding "
@@ -2038,7 +2042,7 @@ msgstr ""
 "Nid yw \"%s\" sydd wedi ei ddarganfod yn y cronfa cyfluniad yn werth ddilys "
 "ar gyfer y rhwymiad bysell \"%s\"\n"
 
-#: src/prefs.c:2023
+#: src/prefs.c:2077
 #, c-format
 msgid "Error setting name for workspace %d to \"%s\": %s\n"
 msgstr "Gwall wrth osod enw gweithle %d i \"%s\": %s\n"
@@ -2074,7 +2078,7 @@ msgstr ""
 msgid "Screen %d on display \"%s\" already has a window manager\n"
 msgstr "Mae gan y sgrîn %d ar y dangosydd \"%s\" rheolydd ffenestri eisioes\n"
 
-#: src/screen.c:699
+#: src/screen.c:716
 #, c-format
 msgid "Could not release screen %d on display \"%s\"\n"
 msgstr "Methu rhyddhau sgrîn %d ar y dangosydd \"%s\"\n"
@@ -3181,7 +3185,7 @@ msgid "Application set a bogus _NET_WM_PID %ld\n"
 msgstr "Gosododd rhaglen _NET_WM_PID drŵg %ld\n"
 
 #. first time through
-#: src/window.c:4829
+#: src/window.c:5197
 #, c-format
 msgid ""
 "Window %s sets SM_CLIENT_ID on itself, instead of on the WM_CLIENT_LEADER "
@@ -3197,7 +3201,7 @@ msgstr ""
 #. * MWM but not WM_NORMAL_HINTS are basically broken. We complain
 #. * about these apps but make them work.
 #.
-#: src/window.c:5500
+#: src/window.c:5868
 #, c-format
 msgid ""
 "Window %s sets an MWM hint indicating it isn't resizable, but sets min size %"
@@ -3235,6 +3239,9 @@ msgstr ""
 "Roedd y priodwedd %s ar y ffenest 0x%lx yn cynnwys UTF-8 annilys ar gyfer "
 "eitem %d yn y rhestr\n"
 
+#~ msgid "Put on _All Workspaces"
+#~ msgstr "Rhoi ar _Pob Gweithfan"
+
 #~ msgid "Select how to give focus to windows"
 #~ msgstr "Dewis sut i rhoi ffocws i ffenestri"
 

po/da.po

@@ -4,14 +4,14 @@
 # Kjartan Maraas <kmaraas@gnome.org>, 2002
 # Keld simonsen <keld@dkuug.dk>, 2002
 # Ole Laursen <olau@hardworking.dk>, 2002.
-# Martin Willemoes Hansen <mwh@sysrq.dk>, 2004.
+# Martin Willemoes Hansen <mwh@sysrq.dk>, 2004, 05.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: metacity\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-09 21:23-0700\n"
-"PO-Revision-Date: 2004-11-23 13:49+0100\n"
+"POT-Creation-Date: 2005-06-27 17:21-0600\n"
+"PO-Revision-Date: 2005-02-21 14:10+0100\n"
 "Last-Translator: Martin Willemoes Hansen <mwh@sysrq.dk>\n"
 "Language-Team: Danish <dansk@klid.dk>\n"
 "MIME-Version: 1.0\n"
@@ -62,7 +62,7 @@ msgstr ""
 msgid "Failed to get hostname: %s\n"
 msgstr "Kunne ikke skaffe værtsnavn: %s\n"
 
-#: src/display.c:306
+#: src/display.c:316
 #, c-format
 msgid "Failed to open X Window System display '%s'\n"
 msgstr "Kunne ikke åbne X Window System-terminalen '%s'\n"
@@ -83,23 +83,23 @@ msgstr ""
 msgid "Fatal IO error %d (%s) on display '%s'.\n"
 msgstr "Fatal IO-fejl %d (%s) på terminal '%s'.\n"
 
-#: src/frames.c:1020
+#: src/frames.c:1125
 msgid "Close Window"
 msgstr "Luk vindue"
 
-#: src/frames.c:1023
+#: src/frames.c:1128
 msgid "Window Menu"
 msgstr "Vinduesmenu"
 
-#: src/frames.c:1026
+#: src/frames.c:1131
 msgid "Minimize Window"
 msgstr "Minimér vindue"
 
-#: src/frames.c:1029
+#: src/frames.c:1134
 msgid "Maximize Window"
 msgstr "Maksimér vindue"
 
-#: src/frames.c:1032
+#: src/frames.c:1137
 msgid "Unmaximize Window"
 msgstr "Gendan vindue"
 
@@ -111,18 +111,18 @@ msgid ""
 msgstr ""
 "Et andet program bruger allerede nøglen %s med modifikatorer %x som binding\n"
 
-#: src/keybindings.c:2554
+#: src/keybindings.c:2535
 #, c-format
 msgid "Error launching metacity-dialog to print an error about a command: %s\n"
 msgstr ""
 "Fejl ved start af metacity-dialog for at vise en fejl for en kommando: %s\n"
 
-#: src/keybindings.c:2659
+#: src/keybindings.c:2640
 #, c-format
 msgid "No command %d has been defined.\n"
 msgstr "Ingen kommando %d er blevet defineret.\n"
 
-#: src/keybindings.c:3489
+#: src/keybindings.c:3485
 msgid "No terminal command has been defined.\n"
 msgstr "Ingen terminal-kommando er blevet defineret.\n"
 
@@ -206,12 +206,12 @@ msgstr "_Luk"
 
 #. separator
 #: src/menu.c:66
-msgid "Put on _All Workspaces"
-msgstr "Placér på _alle arbejdsområder"
+msgid "_Always on Visible Workspace"
+msgstr "_Altid på synligt arbejdsområde"
 
 #: src/menu.c:67
-msgid "Only on _This Workspace"
-msgstr "Kun på de_tte arbejdsområde"
+msgid "_Only on This Workspace"
+msgstr "_Kun på dette arbejdsområde"
 
 #: src/menu.c:68
 msgid "Move to Workspace _Left"
@@ -229,7 +229,7 @@ msgstr "Flyt til arbejdsområde _op"
 msgid "Move to Workspace _Down"
 msgstr "Flyt til arbejdsområde _ned"
 
-#: src/menu.c:162 src/prefs.c:1942
+#: src/menu.c:162 src/prefs.c:1996
 #, c-format
 msgid "Workspace %d"
 msgstr "Arbejdsområde %d"
@@ -361,7 +361,7 @@ msgstr "Titel"
 msgid "Class"
 msgstr "Klasse"
 
-#: src/metacity-dialog.c:262
+#: src/metacity-dialog.c:263
 msgid ""
 "These windows do not support \"save current setup\" and will have to be "
 "restarted manually next time you log in."
@@ -369,7 +369,7 @@ msgstr ""
 "Disse vinduer understøtter ikke gemning af deres opsætning og skal "
 "genstartes manuelt næste gang du logger på."
 
-#: src/metacity-dialog.c:323
+#: src/metacity-dialog.c:328
 #, c-format
 msgid ""
 "There was an error running \"%s\":\n"
@@ -506,13 +506,16 @@ msgid ""
 "\"direct manipulation\", by using wireframes, avoiding animations, or other "
 "means. This is a significant reduction in usability for many users, but may "
 "allow legacy applications and terminal servers to function when they would "
-"otherwise be impractical."
+"otherwise be impractical. However, the wireframe feature is disabled when "
+"accessibility is on to avoid weird desktop breakages."
 msgstr ""
 "Hvis sand, vil Metacity give brugeren mindre feedback og mindre fornemmelse "
-"af direkte manipulering ved at bruge rammelinjer, undgå animeringer og "
+"af \"direkte manipulering\" ved at bruge rammelinjer, undgå animeringer og "
 "andet. Dette er en betydelig formindskelse af brugbarheden for mange "
 "brugere, men kan sætte gamle programmer og terminalservere i stand til at "
-"fungere når de ellers ville være umulige."
+"fungere hvor de ellers ville være upraktiske. Rammelinje-faciliteten er "
+"deaktiveret når tilgængelighed er slået til for at undgå underlige "
+"skrivebordsfejl."
 
 #: src/metacity.schemas.in.h:20
 msgid ""
@@ -1203,7 +1206,6 @@ msgstr ""
 "der ikke være nogen tastaturgenvej til denne handling."
 
 #: src/metacity.schemas.in.h:109
-#, fuzzy
 msgid ""
 "The keybinding used to maximize a window. The format looks like \"&lt;"
 "Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;F1\". The parser is fairly "
@@ -1963,17 +1965,17 @@ msgstr "Vinduesfokuseringstilstand"
 msgid "Window title font"
 msgstr "Skrifttype til vinduestitel"
 
-#: src/prefs.c:476 src/prefs.c:492 src/prefs.c:508 src/prefs.c:524
-#: src/prefs.c:540 src/prefs.c:560 src/prefs.c:576 src/prefs.c:592
-#: src/prefs.c:608 src/prefs.c:624 src/prefs.c:640 src/prefs.c:656
-#: src/prefs.c:672 src/prefs.c:689 src/prefs.c:705 src/prefs.c:721
-#: src/prefs.c:737 src/prefs.c:753 src/prefs.c:768 src/prefs.c:783
-#: src/prefs.c:798
+#: src/prefs.c:501 src/prefs.c:517 src/prefs.c:533 src/prefs.c:549
+#: src/prefs.c:565 src/prefs.c:585 src/prefs.c:601 src/prefs.c:617
+#: src/prefs.c:633 src/prefs.c:649 src/prefs.c:665 src/prefs.c:681
+#: src/prefs.c:697 src/prefs.c:714 src/prefs.c:730 src/prefs.c:746
+#: src/prefs.c:762 src/prefs.c:778 src/prefs.c:793 src/prefs.c:808
+#: src/prefs.c:823 src/prefs.c:839
 #, c-format
 msgid "GConf key \"%s\" is set to an invalid type\n"
 msgstr "GConf-nøglen '%s' er sat til en ugyldig type\n"
 
-#: src/prefs.c:843
+#: src/prefs.c:884
 #, c-format
 msgid ""
 "\"%s\" found in configuration database is not a valid value for mouse button "
@@ -1982,17 +1984,17 @@ msgstr ""
 "\"%s\" fundet i konfigurationsdatabasen er ikke en gyldig værdi som "
 "museknapsmodifikation\n"
 
-#: src/prefs.c:867 src/prefs.c:1277
+#: src/prefs.c:908 src/prefs.c:1318
 #, c-format
 msgid "GConf key '%s' is set to an invalid value\n"
 msgstr "GConf-nøglen '%s' er sat til en ugyldig værdi\n"
 
-#: src/prefs.c:994
+#: src/prefs.c:1035
 #, c-format
 msgid "Could not parse font description \"%s\" from GConf key %s\n"
 msgstr "Kunne ikke fortolke skrifttypebeskrivelsen '%s' fra GConf-nøglen %s\n"
 
-#: src/prefs.c:1179
+#: src/prefs.c:1220
 #, c-format
 msgid ""
 "%d stored in GConf key %s is not a reasonable number of workspaces, current "
@@ -2001,7 +2003,7 @@ msgstr ""
 "%d lagret i GConf-nøgle %s er ikke et fornuftigt antal arbejdsområder, "
 "aktuelt maksimum er %d\n"
 
-#: src/prefs.c:1239
+#: src/prefs.c:1280
 msgid ""
 "Workarounds for broken applications disabled. Some applications may not "
 "behave properly.\n"
@@ -2009,17 +2011,17 @@ msgstr ""
 "Omgåelser for ødelagte programmer deaktiveret. Nogle programmer opfører sig "
 "måske ikke korrekt.\n"
 
-#: src/prefs.c:1304
+#: src/prefs.c:1345
 #, c-format
 msgid "%d stored in GConf key %s is out of range 0 to %d\n"
 msgstr "%d lagret i GConf-nøgle %s er uden for intervallet 0 til %d\n"
 
-#: src/prefs.c:1425
+#: src/prefs.c:1479
 #, c-format
 msgid "Error setting number of workspaces to %d: %s\n"
 msgstr "Fejl under sætning af antallet af arbejdsområder til %d: %s\n"
 
-#: src/prefs.c:1669
+#: src/prefs.c:1723
 #, c-format
 msgid ""
 "\"%s\" found in configuration database is not a valid value for keybinding "
@@ -2028,7 +2030,7 @@ msgstr ""
 "\"%s\" fundet i konfigurationsdatabasen er ikke en gyldig værdi for "
 "tastebindingen \"%s\"\n"
 
-#: src/prefs.c:2023
+#: src/prefs.c:2077
 #, c-format
 msgid "Error setting name for workspace %d to \"%s\": %s\n"
 msgstr "Fejl under sætning af navnet for arbejdsområde %d til \"%s\": %s\n"
@@ -2065,7 +2067,7 @@ msgstr ""
 msgid "Screen %d on display \"%s\" already has a window manager\n"
 msgstr "Skærm %d på terminal \"%s\" har allerede en vindueshåndtering\n"
 
-#: src/screen.c:699
+#: src/screen.c:716
 #, c-format
 msgid "Could not release screen %d on display \"%s\"\n"
 msgstr "Kunne ikke frigive skærm %d på terminal \"%s\"\n"
@@ -3159,7 +3161,7 @@ msgid "Application set a bogus _NET_WM_PID %ld\n"
 msgstr "Program angav en ugyldig _NET_WM_PID %ld\n"
 
 #. first time through
-#: src/window.c:4829
+#: src/window.c:5197
 #, c-format
 msgid ""
 "Window %s sets SM_CLIENT_ID on itself, instead of on the WM_CLIENT_LEADER "
@@ -3175,7 +3177,7 @@ msgstr ""
 #. * MWM but not WM_NORMAL_HINTS are basically broken. We complain
 #. * about these apps but make them work.
 #.
-#: src/window.c:5500
+#: src/window.c:5868
 #, c-format
 msgid ""
 "Window %s sets an MWM hint indicating it isn't resizable, but sets min size %"
@@ -3213,6 +3215,9 @@ msgstr ""
 "Egenskaben %s for vinduet 0x%lx indeholdt ugyldig UTF-8 for element %d i "
 "listen\n"
 
+#~ msgid "Put on _All Workspaces"
+#~ msgstr "Placér på _alle arbejdsområder"
+
 #~ msgid "Select how to give focus to windows"
 #~ msgstr "Vælg hvordan vinduer skal fokuseres"
 

po/de.po

@@ -2,14 +2,15 @@
 # Copyright (C) 2002-2004 Free Software Foundation, Inc.
 # Matthias Warkus <mawarkus@gnome.org>, 2002.
 # Christian Neumair <chris@gnome-de.org>, 2002-2004.
-#
+# Hendrik Richter <hendi@gnome-de.org>, 2005.
+# 
 msgid ""
 msgstr ""
-"Project-Id-Version: Metacity 2.8.2\n"
+"Project-Id-Version: Metacity\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-09 21:23-0700\n"
-"PO-Revision-Date: 2004-07-25 12:35+0200\n"
-"Last-Translator: Christian Neumair <chris@gnome-de.org>\n"
+"POT-Creation-Date: 2005-06-27 17:21-0600\n"
+"PO-Revision-Date: 2005-07-04 20:03+0200\n"
+"Last-Translator: Hendrik Richter <hendi@gnome-de.org>\n"
 "Language-Team: German <gnome-de@gnome.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -62,7 +63,7 @@ msgstr ""
 msgid "Failed to get hostname: %s\n"
 msgstr "Rechnername konnte nicht ermittelt werden: %s\n"
 
-#: src/display.c:306
+#: src/display.c:316
 #, c-format
 msgid "Failed to open X Window System display '%s'\n"
 msgstr "X-Window-Systemanzeige »%s« konnte nicht geöffnet werden\n"
@@ -83,23 +84,23 @@ msgstr ""
 msgid "Fatal IO error %d (%s) on display '%s'.\n"
 msgstr "Schwerwiegender E/A-Fehler %d (%s) auf Anzeige »%s«.\n"
 
-#: src/frames.c:1020
+#: src/frames.c:1125
 msgid "Close Window"
 msgstr "Fenster schließen"
 
-#: src/frames.c:1023
+#: src/frames.c:1128
 msgid "Window Menu"
 msgstr "Fenstermenü"
 
-#: src/frames.c:1026
+#: src/frames.c:1131
 msgid "Minimize Window"
 msgstr "Fenster minimieren"
 
-#: src/frames.c:1029
+#: src/frames.c:1134
 msgid "Maximize Window"
 msgstr "Fenster maximieren"
 
-#: src/frames.c:1032
+#: src/frames.c:1137
 msgid "Unmaximize Window"
 msgstr "Fenster wiederherstellen"
 
@@ -112,22 +113,21 @@ msgstr ""
 "Ein anderes Programm verwendet die Taste %s bereits mit den Umschaltern %x "
 "als Tastenkombination\n"
 
-#: src/keybindings.c:2554
+#: src/keybindings.c:2535
 #, c-format
 msgid "Error launching metacity-dialog to print an error about a command: %s\n"
 msgstr ""
 "Beim Starten eines Metacity-Dialogs, der einen Fehler zu einem Befehl "
 "anzeigen sollte, ist ein Fehler aufgetreten: %s\n"
 
-#: src/keybindings.c:2659
+#: src/keybindings.c:2640
 #, c-format
 msgid "No command %d has been defined.\n"
 msgstr "Es wurde kein Befehl %d festgelegt.\n"
 
-#: src/keybindings.c:3489
-#, fuzzy
+#: src/keybindings.c:3485
 msgid "No terminal command has been defined.\n"
-msgstr "Es wurde kein Befehl %d festgelegt.\n"
+msgstr "Es wurde kein Terminal-Befehl festgelegt.\n"
 
 #: src/main.c:69
 msgid ""
@@ -211,11 +211,11 @@ msgstr "S_chließen"
 
 #. separator
 #: src/menu.c:66
-msgid "Put on _All Workspaces"
-msgstr "Auf _alle Arbeitsflächen legen"
+msgid "_Always on Visible Workspace"
+msgstr "Immer auf der _sichtbaren Arbeitsfläche"
 
 #: src/menu.c:67
-msgid "Only on _This Workspace"
+msgid "_Only on This Workspace"
 msgstr "Nur auf _dieser Arbeitsfläche"
 
 #: src/menu.c:68
@@ -234,7 +234,7 @@ msgstr "Auf Arbeitsfläche darü_ber verschieben"
 msgid "Move to Workspace _Down"
 msgstr "Auf Arbeitsfläche dar_unter verschieben"
 
-#: src/menu.c:162 src/prefs.c:1942
+#: src/menu.c:162 src/prefs.c:1996
 #, c-format
 msgid "Workspace %d"
 msgstr "Arbeitsfläche %d"
@@ -366,7 +366,7 @@ msgstr "Titel"
 msgid "Class"
 msgstr "Klasse"
 
-#: src/metacity-dialog.c:262
+#: src/metacity-dialog.c:263
 msgid ""
 "These windows do not support \"save current setup\" and will have to be "
 "restarted manually next time you log in."
@@ -374,7 +374,7 @@ msgstr ""
 "Diese Fenster unterstützen das Speichern der aktuellen Einstellungen nicht "
 "und müssen bei der nächsten Anmeldung manuell neu gestartet werden."
 
-#: src/metacity-dialog.c:323
+#: src/metacity-dialog.c:328
 #, c-format
 msgid ""
 "There was an error running \"%s\":\n"
@@ -523,14 +523,17 @@ msgid ""
 "\"direct manipulation\", by using wireframes, avoiding animations, or other "
 "means. This is a significant reduction in usability for many users, but may "
 "allow legacy applications and terminal servers to function when they would "
-"otherwise be impractical."
+"otherwise be impractical. However, the wireframe feature is disabled when "
+"accessibility is on to avoid weird desktop breakages."
 msgstr ""
 "Falls dieser Schlüssel wahr ist, gibt Metacity dem Benutzer weniger "
 "Rückmeldungen und weniger Möglichkeiten zur »direkten Manipulation«, indem z."
 "B. Drahtrahmen verwendet und Animationen gemieden werden. Dies bedeutet eine "
 "signifikante Verschlechterung in Sachen Benutzerfreundlichkeit, erlaubt es "
 "jedoch Anwendungen und Terminal-Servern von Drittanbietern, auch dann zu "
-"funktionieren, wenn dies sonst nicht möglich wäre."
+"funktionieren, wenn dies sonst nicht möglich wäre. Die Drahtrahmenfunktion "
+"wird jedoch nicht verwendet, wenn die Barrierefreiheit eingeschaltet ist, um "
+"eigenartige Einflüsse auf den Desktop zu vermeiden."
 
 #: src/metacity.schemas.in.h:20
 msgid ""
@@ -729,7 +732,7 @@ msgstr "Einen festgelegten Befehl ausführen"
 
 #: src/metacity.schemas.in.h:60
 msgid "Run a terminal"
-msgstr ""
+msgstr "Ein Terminal starten"
 
 #: src/metacity.schemas.in.h:61
 msgid "Show the panel menu"
@@ -859,7 +862,7 @@ msgid ""
 "currently focused window's titlebar is flashed."
 msgstr ""
 "Legt fest, wie Metacity visuell verdeutlichen soll, dass die Systemglocke "
-"ausgelöst wurde oder ein andrer »Piepser« seitens der Anwendung erfolgt ist. "
+"ausgelöst wurde oder ein anderer »Piepser« seitens der Anwendung erfolgt ist. "
 "Zulässige Werte: »fullscreen« (Schwarz/weiß-Blinken im Vollbild) sowie "
 "»frame_flash« (Titelbar der betroffenen Anwendung blinkt). Ist die Anwendung "
 "unbekannt, die die Glocke ausgelöst hat (bei »Systempiepsern« ist dies der "
@@ -1229,7 +1232,7 @@ msgid ""
 "\". If you set the option to the special string \"disabled\", then there "
 "will be no keybinding for this action."
 msgstr ""
-"Die zum Verbergen aller normalen Fenster und Fokusieren des Desktops "
+"Die zum Verbergen aller normalen Fenster und Fokussieren des Desktops "
 "verwendete Tastenkombination. Das Format ist »&lt;Control&gt;« (für Strg.) "
 "oder »&lt;Shift&gt;&lt;Alt&gt;F1«. Der Interpreter ist recht liberal und "
 "erlaubt Groß- und Kleinschreibung sowie Abkürzungen wie z.B. »&lt;Ctl&gt;« "
@@ -1238,7 +1241,6 @@ msgstr ""
 "festgelegt."
 
 #: src/metacity.schemas.in.h:109
-#, fuzzy
 msgid ""
 "The keybinding used to maximize a window. The format looks like \"&lt;"
 "Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;F1\". The parser is fairly "
@@ -1247,7 +1249,7 @@ msgid ""
 "\"disabled\", then there will be no keybinding for this action."
 msgstr ""
 "Die zum Maximieren eines Fensters verwendete Tastenkombination. Das Format "
-"ist »&lt;Control&gt;« (für Strg.) oder »&lt;Shift&gt;&lt;Alt&gt;F1«. Der "
+"ist »&lt;Control&gt;a« (für Strg.+A) oder »&lt;Shift&gt;&lt;Alt&gt;F1«. Der "
 "Interpreter ist recht liberal und erlaubt Groß- und Kleinschreibung sowie "
 "Abkürzungen wie z.B. »&lt;Ctl&gt;« oder »&lt;Ctrl&gt;«. Falls diese diese "
 "Option auf die Zeichenkette »disabled« gesetzt ist, wird für diese Aktion "
@@ -1761,7 +1763,6 @@ msgstr ""
 "ist, wird für diese Aktion keine Tastenkombination festgelegt."
 
 #: src/metacity.schemas.in.h:142
-#, fuzzy
 msgid ""
 "The keybinding which invokes a terminal. The format looks like \"&lt;"
 "Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;F1\". The parser is fairly "
@@ -1770,8 +1771,8 @@ msgid ""
 "\"disabled\", then there will be no keybinding for this action."
 msgstr ""
 "Die zum Anzeigen des Panel-Hauptmenüs verwendete Tastenkombination. Das "
-"Format ist »&lt;Control&gt;« (für Strg.) oder »&lt;Shift&gt;&lt;Alt&gt;F1«. "
-"Der Interpreter ist recht liberal und erlaubt Groß- und Kleinschreibung "
+"Format ist »&lt;Control&gt;a« (für Strg.+A) oder »&lt;Shift&gt;&lt;Alt&gt;"
+"F1«. Der Interpreter ist recht liberal und erlaubt Groß- und Kleinschreibung "
 "sowie Abkürzungen wie z.B. »&lt;Ctl&gt;« oder »&lt;Ctrl&gt;«. Falls diese "
 "diese Option auf die Zeichenkette »disabled« gesetzt ist, wird für diese "
 "Aktion keine Tastenkombination festgelegt."
@@ -2012,17 +2013,17 @@ msgstr "Modus des Fensterfokus"
 msgid "Window title font"
 msgstr "Schrift für Fenstertitel"
 
-#: src/prefs.c:476 src/prefs.c:492 src/prefs.c:508 src/prefs.c:524
-#: src/prefs.c:540 src/prefs.c:560 src/prefs.c:576 src/prefs.c:592
-#: src/prefs.c:608 src/prefs.c:624 src/prefs.c:640 src/prefs.c:656
-#: src/prefs.c:672 src/prefs.c:689 src/prefs.c:705 src/prefs.c:721
-#: src/prefs.c:737 src/prefs.c:753 src/prefs.c:768 src/prefs.c:783
-#: src/prefs.c:798
+#: src/prefs.c:501 src/prefs.c:517 src/prefs.c:533 src/prefs.c:549
+#: src/prefs.c:565 src/prefs.c:585 src/prefs.c:601 src/prefs.c:617
+#: src/prefs.c:633 src/prefs.c:649 src/prefs.c:665 src/prefs.c:681
+#: src/prefs.c:697 src/prefs.c:714 src/prefs.c:730 src/prefs.c:746
+#: src/prefs.c:762 src/prefs.c:778 src/prefs.c:793 src/prefs.c:808
+#: src/prefs.c:823 src/prefs.c:839
 #, c-format
 msgid "GConf key \"%s\" is set to an invalid type\n"
 msgstr "Typ des GConf-Schlüssels »%s« ungültig\n"
 
-#: src/prefs.c:843
+#: src/prefs.c:884
 #, c-format
 msgid ""
 "\"%s\" found in configuration database is not a valid value for mouse button "
@@ -2031,19 +2032,19 @@ msgstr ""
 "In der Konfigurationsdatenbank gefundenes »%s« ist kein zulässiger Wert für "
 "den Maustastenumschalter\n"
 
-#: src/prefs.c:867 src/prefs.c:1277
+#: src/prefs.c:908 src/prefs.c:1318
 #, c-format
 msgid "GConf key '%s' is set to an invalid value\n"
 msgstr "Wert des GConf-Schlüssels »%s« unzulässig\n"
 
-#: src/prefs.c:994
+#: src/prefs.c:1035
 #, c-format
 msgid "Could not parse font description \"%s\" from GConf key %s\n"
 msgstr ""
 "Schriftbeschreibung »%s« aus GConf-Schlüssel %s konnte nicht verarbeitet "
 "werden\n"
 
-#: src/prefs.c:1179
+#: src/prefs.c:1220
 #, c-format
 msgid ""
 "%d stored in GConf key %s is not a reasonable number of workspaces, current "
@@ -2052,7 +2053,7 @@ msgstr ""
 "%d, gespeichert in GConf-Schlüssel %s ist keine sinnvolle Anzahl der "
 "Arbeitsflächen; das aktuelle Maximum ist %d\n"
 
-#: src/prefs.c:1239
+#: src/prefs.c:1280
 msgid ""
 "Workarounds for broken applications disabled. Some applications may not "
 "behave properly.\n"
@@ -2060,18 +2061,18 @@ msgstr ""
 "Provisorien (Workarounds) für defekte Anwendungen abgeschaltet. "
 "Möglicherweise funktionieren manche Anwendungen nicht richtig.\n"
 
-#: src/prefs.c:1304
+#: src/prefs.c:1345
 #, c-format
 msgid "%d stored in GConf key %s is out of range 0 to %d\n"
 msgstr ""
 "%d, gespeichert in GConf-Schlüssel %s, liegt außerhalb des Bereichs 0-%d\n"
 
-#: src/prefs.c:1425
+#: src/prefs.c:1479
 #, c-format
 msgid "Error setting number of workspaces to %d: %s\n"
 msgstr "Fehler beim Festlegen der Anzahl der Arbeitsflächen auf %d: %s\n"
 
-#: src/prefs.c:1669
+#: src/prefs.c:1723
 #, c-format
 msgid ""
 "\"%s\" found in configuration database is not a valid value for keybinding "
@@ -2080,7 +2081,7 @@ msgstr ""
 "In der Konfigurationsdatenbank gefundenes »%s« ist kein zulässiger Wert für "
 "die Tastenkombination »%s«\n"
 
-#: src/prefs.c:2023
+#: src/prefs.c:2077
 #, c-format
 msgid "Error setting name for workspace %d to \"%s\": %s\n"
 msgstr "Fehler beim Festlegen des Namens der Arbeitsflächen %d auf »%s«: %s\n"
@@ -2118,7 +2119,7 @@ msgstr ""
 msgid "Screen %d on display \"%s\" already has a window manager\n"
 msgstr "Bildschirm %d auf Anzeige »%s« hat bereits einen Fenstermanager\n"
 
-#: src/screen.c:699
+#: src/screen.c:716
 #, c-format
 msgid "Could not release screen %d on display \"%s\"\n"
 msgstr "Bildschirm %d auf Anzeige »%s« konnte nicht freigegeben werden\n"
@@ -3237,7 +3238,7 @@ msgid "Application set a bogus _NET_WM_PID %ld\n"
 msgstr "Application hat eine unsinnige _NET_WM_PID %ld angegeben\n"
 
 #. first time through
-#: src/window.c:4829
+#: src/window.c:5197
 #, c-format
 msgid ""
 "Window %s sets SM_CLIENT_ID on itself, instead of on the WM_CLIENT_LEADER "
@@ -3259,7 +3260,7 @@ msgstr ""
 #. * MWM but not WM_NORMAL_HINTS are basically broken. We complain
 #. * about these apps but make them work.
 #.
-#: src/window.c:5500
+#: src/window.c:5868
 #, c-format
 msgid ""
 "Window %s sets an MWM hint indicating it isn't resizable, but sets min size %"
@@ -3298,6 +3299,9 @@ msgstr ""
 "Eigenschaft %s auf Fenster 0x%lx enthielt ungültiges UTF-8 für Objekt %d in "
 "der Liste\n"
 
+#~ msgid "Put on _All Workspaces"
+#~ msgstr "Auf _alle Arbeitsflächen legen"
+
 #~ msgid "Select how to give focus to windows"
 #~ msgstr "Festlegen, wie der Fokus zwischen Fenstern durchgereicht wird"
 

po/en_CA.po

@@ -1,17 +1,17 @@
 # English/Canada translation of metacity.
-# Copyright (C) 2004 Adam Weinberger and the GNOME Foundation
+# Copyright (C) 2004-2005 Adam Weinberger and the GNOME Foundation
 # This file is distributed under the same licence as the metacity package.
-# Maintainer: Adam Weinberger <adamw@gnome.org>.
+# Adam Weinberger <adamw@gnome.org>, 2004, 2005.
 # 
 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: metacity\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-09 21:23-0700\n"
-"PO-Revision-Date: 2004-12-20 18:28-0400\n"
+"POT-Creation-Date: 2005-07-18 05:01-0400\n"
+"PO-Revision-Date: 2005-07-18 18:28-0400\n"
 "Last-Translator: Adam Weinberger <adamw@gnome.org>\n"
-"Language-Team: English/Canada <adamw@FreeBSD.org>\n"
+"Language-Team: Canadian English <adamw@gnome.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -59,7 +59,7 @@ msgstr ""
 msgid "Failed to get hostname: %s\n"
 msgstr "Failed to get hostname: %s\n"
 
-#: src/display.c:306
+#: src/display.c:319
 #, c-format
 msgid "Failed to open X Window System display '%s'\n"
 msgstr "Failed to open X Window System display '%s'\n"
@@ -80,23 +80,23 @@ msgstr ""
 msgid "Fatal IO error %d (%s) on display '%s'.\n"
 msgstr "Fatal IO error %d (%s) on display '%s'.\n"
 
-#: src/frames.c:1020
+#: src/frames.c:1125
 msgid "Close Window"
 msgstr "Close Window"
 
-#: src/frames.c:1023
+#: src/frames.c:1128
 msgid "Window Menu"
 msgstr "Window Menu"
 
-#: src/frames.c:1026
+#: src/frames.c:1131
 msgid "Minimize Window"
 msgstr "Minimize Window"
 
-#: src/frames.c:1029
+#: src/frames.c:1134
 msgid "Maximize Window"
 msgstr "Maximize Window"
 
-#: src/frames.c:1032
+#: src/frames.c:1137
 msgid "Unmaximize Window"
 msgstr "Unmaximize Window"
 
@@ -109,30 +109,22 @@ msgstr ""
 "Some other program is already using the key %s with modifiers %x as a "
 "binding\n"
 
-#: src/keybindings.c:2554
+#: src/keybindings.c:2535
 #, c-format
 msgid "Error launching metacity-dialog to print an error about a command: %s\n"
 msgstr ""
 "Error launching metacity-dialogue to print an error about a command: %s\n"
 
-#: src/keybindings.c:2659
+#: src/keybindings.c:2640
 #, c-format
 msgid "No command %d has been defined.\n"
 msgstr "No command %d has been defined.\n"
 
-#: src/keybindings.c:3489
+#: src/keybindings.c:3485
 msgid "No terminal command has been defined.\n"
 msgstr "No terminal command has been defined.\n"
 
 #: src/main.c:69
-msgid ""
-"metacity [--sm-disable] [--sm-client-id=ID] [--sm-save-file=FILENAME] [--"
-"display=DISPLAY] [--replace] [--version]\n"
-msgstr ""
-"metacity [--sm-disable] [--sm-client-id=ID] [--sm-save-file=FILENAME] [--"
-"display=DISPLAY] [--replace] [--version]\n"
-
-#: src/main.c:76
 #, c-format
 msgid ""
 "metacity %s\n"
@@ -147,19 +139,43 @@ msgstr ""
 "There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A "
 "PARTICULAR PURPOSE.\n"
 
-#: src/main.c:443
+#: src/main.c:257
+msgid "Disable connection to session manager"
+msgstr "Disable connection to session manager"
+
+#: src/main.c:263
+msgid "Replace the running window manager with Metacity"
+msgstr "Replace the running window manager with Metacity"
+
+#: src/main.c:269
+msgid "Specify session management ID"
+msgstr "Specify session management ID"
+
+#: src/main.c:274
+msgid "X Display to use"
+msgstr "X Display to use"
+
+#: src/main.c:280
+msgid "Initialize session from savefile"
+msgstr "Initialize session from savefile"
+
+#: src/main.c:286
+msgid "Print version"
+msgstr "Print version"
+
+#: src/main.c:440
 #, c-format
 msgid "Failed to scan themes directory: %s\n"
 msgstr "Failed to scan themes directory: %s\n"
 
-#: src/main.c:459
+#: src/main.c:456
 #, c-format
 msgid ""
 "Could not find a theme! Be sure %s exists and contains the usual themes."
 msgstr ""
 "Could not find a theme! Be sure %s exists and contains the usual themes."
 
-#: src/main.c:521
+#: src/main.c:518
 #, c-format
 msgid "Failed to restart: %s\n"
 msgstr "Failed to restart: %s\n"
@@ -203,12 +219,12 @@ msgstr "_Close"
 
 #. separator
 #: src/menu.c:66
-msgid "Put on _All Workspaces"
-msgstr "Put on _All Workspaces"
+msgid "_Always on Visible Workspace"
+msgstr "_Always on Visible Workspace"
 
 #: src/menu.c:67
-msgid "Only on _This Workspace"
-msgstr "Only on _This Workspace"
+msgid "_Only on This Workspace"
+msgstr "_Only on This Workspace"
 
 #: src/menu.c:68
 msgid "Move to Workspace _Left"
@@ -226,7 +242,7 @@ msgstr "Move to Workspace _Up"
 msgid "Move to Workspace _Down"
 msgstr "Move to Workspace _Down"
 
-#: src/menu.c:162 src/prefs.c:1942
+#: src/menu.c:162 src/prefs.c:2106
 #, c-format
 msgid "Workspace %d"
 msgstr "Workspace %d"
@@ -357,7 +373,7 @@ msgstr "Title"
 msgid "Class"
 msgstr "Class"
 
-#: src/metacity-dialog.c:262
+#: src/metacity-dialog.c:263
 msgid ""
 "These windows do not support \"save current setup\" and will have to be "
 "restarted manually next time you log in."
@@ -365,7 +381,7 @@ msgstr ""
 "These windows do not support \"save current setup\" and will have to be "
 "restarted manually next time you log in."
 
-#: src/metacity-dialog.c:323
+#: src/metacity-dialog.c:328
 #, c-format
 msgid ""
 "There was an error running \"%s\":\n"
@@ -503,13 +519,15 @@ msgid ""
 "\"direct manipulation\", by using wireframes, avoiding animations, or other "
 "means. This is a significant reduction in usability for many users, but may "
 "allow legacy applications and terminal servers to function when they would "
-"otherwise be impractical."
+"otherwise be impractical. However, the wireframe feature is disabled when "
+"accessibility is on to avoid weird desktop breakages."
 msgstr ""
 "If true, metacity will give the user less feedback and less sense of "
 "\"direct manipulation\", by using wireframes, avoiding animations, or other "
 "means. This is a significant reduction in usability for many users, but may "
 "allow legacy applications and terminal servers to function when they would "
-"otherwise be impractical."
+"otherwise be impractical. However, the wireframe feature is disabled when "
+"accessibility is on to avoid weird desktop breakages."
 
 #: src/metacity.schemas.in.h:20
 msgid ""
@@ -1921,17 +1939,17 @@ msgstr "Window focus mode"
 msgid "Window title font"
 msgstr "Window title font"
 
-#: src/prefs.c:476 src/prefs.c:492 src/prefs.c:508 src/prefs.c:524
-#: src/prefs.c:540 src/prefs.c:560 src/prefs.c:576 src/prefs.c:592
-#: src/prefs.c:608 src/prefs.c:624 src/prefs.c:640 src/prefs.c:656
-#: src/prefs.c:672 src/prefs.c:689 src/prefs.c:705 src/prefs.c:721
-#: src/prefs.c:737 src/prefs.c:753 src/prefs.c:768 src/prefs.c:783
-#: src/prefs.c:798
+#: src/prefs.c:528 src/prefs.c:544 src/prefs.c:560 src/prefs.c:576
+#: src/prefs.c:592 src/prefs.c:612 src/prefs.c:628 src/prefs.c:644
+#: src/prefs.c:660 src/prefs.c:676 src/prefs.c:692 src/prefs.c:708
+#: src/prefs.c:724 src/prefs.c:741 src/prefs.c:757 src/prefs.c:773
+#: src/prefs.c:789 src/prefs.c:805 src/prefs.c:820 src/prefs.c:835
+#: src/prefs.c:850 src/prefs.c:866 src/prefs.c:882 src/prefs.c:898
 #, c-format
 msgid "GConf key \"%s\" is set to an invalid type\n"
 msgstr "GConf key \"%s\" is set to an invalid type\n"
 
-#: src/prefs.c:843
+#: src/prefs.c:943
 #, c-format
 msgid ""
 "\"%s\" found in configuration database is not a valid value for mouse button "
@@ -1940,17 +1958,17 @@ msgstr ""
 "\"%s\" found in configuration database is not a valid value for mouse button "
 "modifier\n"
 
-#: src/prefs.c:867 src/prefs.c:1277
+#: src/prefs.c:967 src/prefs.c:1428
 #, c-format
 msgid "GConf key '%s' is set to an invalid value\n"
 msgstr "GConf key '%s' is set to an invalid value\n"
 
-#: src/prefs.c:994
+#: src/prefs.c:1145
 #, c-format
 msgid "Could not parse font description \"%s\" from GConf key %s\n"
 msgstr "Could not parse font description \"%s\" from GConf key %s\n"
 
-#: src/prefs.c:1179
+#: src/prefs.c:1330
 #, c-format
 msgid ""
 "%d stored in GConf key %s is not a reasonable number of workspaces, current "
@@ -1959,7 +1977,7 @@ msgstr ""
 "%d stored in GConf key %s is not a reasonable number of workspaces, current "
 "maximum is %d\n"
 
-#: src/prefs.c:1239
+#: src/prefs.c:1390
 msgid ""
 "Workarounds for broken applications disabled. Some applications may not "
 "behave properly.\n"
@@ -1967,17 +1985,17 @@ msgstr ""
 "Workarounds for broken applications disabled. Some applications may not "
 "behave properly.\n"
 
-#: src/prefs.c:1304
+#: src/prefs.c:1455
 #, c-format
 msgid "%d stored in GConf key %s is out of range 0 to %d\n"
 msgstr "%d stored in GConf key %s is out of range 0 to %d\n"
 
-#: src/prefs.c:1425
+#: src/prefs.c:1589
 #, c-format
 msgid "Error setting number of workspaces to %d: %s\n"
 msgstr "Error setting number of workspaces to %d: %s\n"
 
-#: src/prefs.c:1669
+#: src/prefs.c:1833
 #, c-format
 msgid ""
 "\"%s\" found in configuration database is not a valid value for keybinding "
@@ -1986,7 +2004,7 @@ msgstr ""
 "\"%s\" found in configuration database is not a valid value for keybinding "
 "\"%s\"\n"
 
-#: src/prefs.c:2023
+#: src/prefs.c:2187
 #, c-format
 msgid "Error setting name for workspace %d to \"%s\": %s\n"
 msgstr "Error setting name for workspace %d to \"%s\": %s\n"
@@ -2022,7 +2040,7 @@ msgstr ""
 msgid "Screen %d on display \"%s\" already has a window manager\n"
 msgstr "Screen %d on display \"%s\" already has a window manager\n"
 
-#: src/screen.c:699
+#: src/screen.c:716
 #, c-format
 msgid "Could not release screen %d on display \"%s\"\n"
 msgstr "Could not release screen %d on display \"%s\"\n"
@@ -2848,11 +2866,11 @@ msgstr "Button aspect ratio %g is not reasonable"
 msgid "Frame geometry does not specify size of buttons"
 msgstr "Frame geometry does not specify size of buttons"
 
-#: src/theme.c:849
+#: src/theme.c:843
 msgid "Gradients should have at least two colors"
 msgstr "Gradients should have at least two colours"
 
-#: src/theme.c:975
+#: src/theme.c:969
 #, c-format
 msgid ""
 "GTK color specification must have the state in brackets, e.g. gtk:fg[NORMAL] "
@@ -2861,7 +2879,7 @@ msgstr ""
 "GTK colour specification must have the state in brackets, e.g. gtk:fg"
 "[NORMAL] where NORMAL is the state; could not parse \"%s\""
 
-#: src/theme.c:989
+#: src/theme.c:983
 #, c-format
 msgid ""
 "GTK color specification must have a close bracket after the state, e.g. gtk:"
@@ -2870,17 +2888,17 @@ msgstr ""
 "GTK colour specification must have a close bracket after the state, e.g. gtk:"
 "fg[NORMAL] where NORMAL is the state; could not parse \"%s\""
 
-#: src/theme.c:1000
+#: src/theme.c:994
 #, c-format
 msgid "Did not understand state \"%s\" in color specification"
 msgstr "Did not understand state \"%s\" in colour specification"
 
-#: src/theme.c:1013
+#: src/theme.c:1007
 #, c-format
 msgid "Did not understand color component \"%s\" in color specification"
 msgstr "Did not understand colour component \"%s\" in colour specification"
 
-#: src/theme.c:1043
+#: src/theme.c:1037
 #, c-format
 msgid ""
 "Blend format is \"blend/bg_color/fg_color/alpha\", \"%s\" does not fit the "
@@ -2889,44 +2907,44 @@ msgstr ""
 "Blend format is \"blend/bg_colour/fg_colour/alpha\", \"%s\" does not fit the "
 "format"
 
-#: src/theme.c:1054
+#: src/theme.c:1048
 #, c-format
 msgid "Could not parse alpha value \"%s\" in blended color"
 msgstr "Could not parse alpha value \"%s\" in blended colour"
 
-#: src/theme.c:1064
+#: src/theme.c:1058
 #, c-format
 msgid "Alpha value \"%s\" in blended color is not between 0.0 and 1.0"
 msgstr "Alpha value \"%s\" in blended colour is not between 0.0 and 1.0"
 
-#: src/theme.c:1111
+#: src/theme.c:1105
 #, c-format
 msgid ""
 "Shade format is \"shade/base_color/factor\", \"%s\" does not fit the format"
 msgstr ""
 "Shade format is \"shade/base_colour/factor\", \"%s\" does not fit the format"
 
-#: src/theme.c:1122
+#: src/theme.c:1116
 #, c-format
 msgid "Could not parse shade factor \"%s\" in shaded color"
 msgstr "Could not parse shade factor \"%s\" in shaded colour"
 
-#: src/theme.c:1132
+#: src/theme.c:1126
 #, c-format
 msgid "Shade factor \"%s\" in shaded color is negative"
 msgstr "Shade factor \"%s\" in shaded colour is negative"
 
-#: src/theme.c:1161
+#: src/theme.c:1155
 #, c-format
 msgid "Could not parse color \"%s\""
 msgstr "Could not parse colour \"%s\""
 
-#: src/theme.c:1423
+#: src/theme.c:1417
 #, c-format
 msgid "Coordinate expression contains character '%s' which is not allowed"
 msgstr "Coordinate expression contains character '%s' which is not allowed"
 
-#: src/theme.c:1450
+#: src/theme.c:1444
 #, c-format
 msgid ""
 "Coordinate expression contains floating point number '%s' which could not be "
@@ -2935,12 +2953,12 @@ msgstr ""
 "Coordinate expression contains floating point number '%s' which could not be "
 "parsed"
 
-#: src/theme.c:1464
+#: src/theme.c:1458
 #, c-format
 msgid "Coordinate expression contains integer '%s' which could not be parsed"
 msgstr "Coordinate expression contains integer '%s' which could not be parsed"
 
-#: src/theme.c:1531
+#: src/theme.c:1525
 #, c-format
 msgid ""
 "Coordinate expression contained unknown operator at the start of this text: "
@@ -2949,36 +2967,36 @@ msgstr ""
 "Coordinate expression contained unknown operator at the start of this text: "
 "\"%s\""
 
-#: src/theme.c:1588
+#: src/theme.c:1582
 msgid "Coordinate expression was empty or not understood"
 msgstr "Coordinate expression was empty or not understood"
 
-#: src/theme.c:1731 src/theme.c:1741 src/theme.c:1775
+#: src/theme.c:1725 src/theme.c:1735 src/theme.c:1769
 msgid "Coordinate expression results in division by zero"
 msgstr "Coordinate expression results in division by zero"
 
-#: src/theme.c:1783
+#: src/theme.c:1777
 msgid ""
 "Coordinate expression tries to use mod operator on a floating-point number"
 msgstr ""
 "Coordinate expression tries to use mod operator on a floating-point number"
 
-#: src/theme.c:1840
+#: src/theme.c:1834
 #, c-format
 msgid ""
 "Coordinate expression has an operator \"%s\" where an operand was expected"
 msgstr ""
 "Coordinate expression has an operator \"%s\" where an operand was expected"
 
-#: src/theme.c:1849
+#: src/theme.c:1843
 msgid "Coordinate expression had an operand where an operator was expected"
 msgstr "Coordinate expression had an operand where an operator was expected"
 
-#: src/theme.c:1857
+#: src/theme.c:1851
 msgid "Coordinate expression ended with an operator instead of an operand"
 msgstr "Coordinate expression ended with an operator instead of an operand"
 
-#: src/theme.c:1867
+#: src/theme.c:1861
 #, c-format
 msgid ""
 "Coordinate expression has operator \"%c\" following operator \"%c\" with no "
@@ -2987,7 +3005,7 @@ msgstr ""
 "Coordinate expression has operator \"%c\" following operator \"%c\" with no "
 "operand in between"
 
-#: src/theme.c:1986
+#: src/theme.c:1980
 msgid ""
 "Coordinate expression parser overflowed its buffer, this is really a "
 "Metacity bug, but are you sure you need a huge expression like that?"
@@ -2995,30 +3013,30 @@ msgstr ""
 "Coordinate expression parser overflowed its buffer, this is really a "
 "Metacity bug, but are you sure you need a huge expression like that?"
 
-#: src/theme.c:2015
+#: src/theme.c:2009
 msgid "Coordinate expression had a close parenthesis with no open parenthesis"
 msgstr "Coordinate expression had a close parenthesis with no open parenthesis"
 
-#: src/theme.c:2078
+#: src/theme.c:2072
 #, c-format
 msgid "Coordinate expression had unknown variable or constant \"%s\""
 msgstr "Coordinate expression had unknown variable or constant \"%s\""
 
-#: src/theme.c:2135
+#: src/theme.c:2129
 msgid "Coordinate expression had an open parenthesis with no close parenthesis"
 msgstr ""
 "Coordinate expression had an open parenthesis with no close parenthesis"
 
-#: src/theme.c:2146
+#: src/theme.c:2140
 msgid "Coordinate expression doesn't seem to have any operators or operands"
 msgstr "Coordinate expression doesn't seem to have any operators or operands"
 
-#: src/theme.c:2390 src/theme.c:2412 src/theme.c:2433
+#: src/theme.c:2384 src/theme.c:2406 src/theme.c:2427
 #, c-format
 msgid "Theme contained an expression \"%s\" that resulted in an error: %s\n"
 msgstr "Theme contained an expression \"%s\" that resulted in an error: %s\n"
 
-#: src/theme.c:3919
+#: src/theme.c:3913
 #, c-format
 msgid ""
 "<button function=\"%s\" state=\"%s\" draw_ops=\"whatever\"/> must be "
@@ -3027,25 +3045,25 @@ msgstr ""
 "<button function=\"%s\" state=\"%s\" draw_ops=\"whatever\"/> must be "
 "specified for this frame style"
 
-#: src/theme.c:4369 src/theme.c:4401
+#: src/theme.c:4363 src/theme.c:4395
 #, c-format
 msgid ""
 "Missing <frame state=\"%s\" resize=\"%s\" focus=\"%s\" style=\"whatever\"/>"
 msgstr ""
 "Missing <frame state=\"%s\" resize=\"%s\" focus=\"%s\" style=\"whatever\"/>"
 
-#: src/theme.c:4452
+#: src/theme.c:4446
 #, c-format
 msgid "Failed to load theme \"%s\": %s\n"
 msgstr "Failed to load theme \"%s\": %s\n"
 
-#: src/theme.c:4598 src/theme.c:4605 src/theme.c:4612 src/theme.c:4619
-#: src/theme.c:4626
+#: src/theme.c:4592 src/theme.c:4599 src/theme.c:4606 src/theme.c:4613
+#: src/theme.c:4620
 #, c-format
 msgid "No <%s> set for theme \"%s\""
 msgstr "No <%s> set for theme \"%s\""
 
-#: src/theme.c:4636
+#: src/theme.c:4630
 #, c-format
 msgid ""
 "No frame style set for window type \"%s\" in theme \"%s\", add a <window "
@@ -3054,7 +3072,7 @@ msgstr ""
 "No frame style set for window type \"%s\" in theme \"%s\", add a <window "
 "type=\"%s\" style_set=\"whatever\"/> element"
 
-#: src/theme.c:4658
+#: src/theme.c:4652
 #, c-format
 msgid ""
 "<menu_icon function=\"%s\" state=\"%s\" draw_ops=\"whatever\"/> must be "
@@ -3063,14 +3081,14 @@ msgstr ""
 "<menu_icon function=\"%s\" state=\"%s\" draw_ops=\"whatever\"/> must be "
 "specified for this theme"
 
-#: src/theme.c:5047 src/theme.c:5109
+#: src/theme.c:5041 src/theme.c:5103
 #, c-format
 msgid ""
 "User-defined constants must begin with a capital letter; \"%s\" does not"
 msgstr ""
 "User-defined constants must begin with a capital letter; \"%s\" does not"
 
-#: src/theme.c:5055 src/theme.c:5117
+#: src/theme.c:5049 src/theme.c:5111
 #, c-format
 msgid "Constant \"%s\" has already been defined"
 msgstr "Constant \"%s\" has already been defined"
@@ -3112,7 +3130,7 @@ msgid "Application set a bogus _NET_WM_PID %ld\n"
 msgstr "Application set a bogus _NET_WM_PID %ld\n"
 
 #. first time through
-#: src/window.c:4829
+#: src/window.c:5197
 #, c-format
 msgid ""
 "Window %s sets SM_CLIENT_ID on itself, instead of on the WM_CLIENT_LEADER "
@@ -3128,7 +3146,7 @@ msgstr ""
 #. * MWM but not WM_NORMAL_HINTS are basically broken. We complain
 #. * about these apps but make them work.
 #.
-#: src/window.c:5500
+#: src/window.c:5868
 #, c-format
 msgid ""
 "Window %s sets an MWM hint indicating it isn't resizable, but sets min size %"

po/en_GB.po

@@ -9,12 +9,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: metacity\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-09 21:23-0700\n"
-"PO-Revision-Date: 2004-10-13 22:13+0100\n"
-"Last-Translator: David Lodge <dave@cirt.net>\n"
+"POT-Creation-Date: 2005-06-27 17:21-0600\n"
+"PO-Revision-Date: 2005-04-09 15:10+0100\n"
+"Last-Translator: Christopher Orr <chris@protactin.co.uk>\n"
 "Language-Team: English/GB <en@li.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-1\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #: src/tools/metacity-message.c:150
@@ -53,14 +53,14 @@ msgstr "Error reading from dialogue display process: %s\n"
 msgid ""
 "Error launching metacity-dialog to ask about killing an application: %s\n"
 msgstr ""
-"Error launching metacity-dialogue to ask about killing an application: %s\n"
+"Error launching metacity-dialog to ask about killing an application: %s\n"
 
 #: src/delete.c:452
 #, c-format
 msgid "Failed to get hostname: %s\n"
 msgstr "Failed to get hostname: %s\n"
 
-#: src/display.c:306
+#: src/display.c:316
 #, c-format
 msgid "Failed to open X Window System display '%s'\n"
 msgstr "Failed to open X Window System display '%s'\n"
@@ -81,25 +81,25 @@ msgstr ""
 msgid "Fatal IO error %d (%s) on display '%s'.\n"
 msgstr "Fatal IO error %d (%s) on display '%s'.\n"
 
-#: src/frames.c:1020
+#: src/frames.c:1125
 msgid "Close Window"
 msgstr "Close Window"
 
-#: src/frames.c:1023
+#: src/frames.c:1128
 msgid "Window Menu"
 msgstr "Window Menu"
 
-#: src/frames.c:1026
+#: src/frames.c:1131
 msgid "Minimize Window"
-msgstr "Minimize Window"
+msgstr "Minimise Window"
 
-#: src/frames.c:1029
+#: src/frames.c:1134
 msgid "Maximize Window"
-msgstr "Maximize Window"
+msgstr "Maximise Window"
 
-#: src/frames.c:1032
+#: src/frames.c:1137
 msgid "Unmaximize Window"
-msgstr "Unmaximize Window"
+msgstr "Unmaximise Window"
 
 #: src/keybindings.c:994
 #, c-format
@@ -110,18 +110,18 @@ msgstr ""
 "Some other program is already using the key %s with modifiers %x as a "
 "binding\n"
 
-#: src/keybindings.c:2554
+#: src/keybindings.c:2535
 #, c-format
 msgid "Error launching metacity-dialog to print an error about a command: %s\n"
 msgstr ""
-"Error launching metacity-dialogue to print an error about a command: %s\n"
+"Error launching metacity-dialog to print an error about a command: %s\n"
 
-#: src/keybindings.c:2659
+#: src/keybindings.c:2640
 #, c-format
 msgid "No command %d has been defined.\n"
 msgstr "No command %d has been defined.\n"
 
-#: src/keybindings.c:3489
+#: src/keybindings.c:3485
 msgid "No terminal command has been defined.\n"
 msgstr "No terminal command has been defined.\n"
 
@@ -167,15 +167,15 @@ msgstr "Failed to restart: %s\n"
 
 #: src/menu.c:54
 msgid "Mi_nimize"
-msgstr "Mi_nimize"
+msgstr "Mi_nimise"
 
 #: src/menu.c:55
 msgid "Ma_ximize"
-msgstr "Ma_ximize"
+msgstr "Ma_ximise"
 
 #: src/menu.c:56
 msgid "Unma_ximize"
-msgstr "Unma_ximize"
+msgstr "Unma_ximise"
 
 #: src/menu.c:57
 msgid "Roll _Up"
@@ -204,12 +204,12 @@ msgstr "_Close"
 
 #. separator
 #: src/menu.c:66
-msgid "Put on _All Workspaces"
-msgstr "Put on _All Workspaces"
+msgid "_Always on Visible Workspace"
+msgstr "_Always on Visible Workspace"
 
 #: src/menu.c:67
-msgid "Only on _This Workspace"
-msgstr "Only on _This Workspace"
+msgid "_Only on This Workspace"
+msgstr "_Only on This Workspace"
 
 #: src/menu.c:68
 msgid "Move to Workspace _Left"
@@ -227,7 +227,7 @@ msgstr "Move to Workspace _Up"
 msgid "Move to Workspace _Down"
 msgstr "Move to Workspace _Down"
 
-#: src/menu.c:162 src/prefs.c:1942
+#: src/menu.c:162 src/prefs.c:1996
 #, c-format
 msgid "Workspace %d"
 msgstr "Workspace %d"
@@ -358,7 +358,7 @@ msgstr "Title"
 msgid "Class"
 msgstr "Class"
 
-#: src/metacity-dialog.c:262
+#: src/metacity-dialog.c:263
 msgid ""
 "These windows do not support \"save current setup\" and will have to be "
 "restarted manually next time you log in."
@@ -366,7 +366,7 @@ msgstr ""
 "These windows do not support \"save current setup\" and will have to be "
 "restarted manually next time you log in."
 
-#: src/metacity-dialog.c:323
+#: src/metacity-dialog.c:328
 #, c-format
 msgid ""
 "There was an error running \"%s\":\n"
@@ -504,13 +504,15 @@ msgid ""
 "\"direct manipulation\", by using wireframes, avoiding animations, or other "
 "means. This is a significant reduction in usability for many users, but may "
 "allow legacy applications and terminal servers to function when they would "
-"otherwise be impractical."
+"otherwise be impractical. However, the wireframe feature is disabled when "
+"accessibility is on to avoid weird desktop breakages."
 msgstr ""
 "If true, metacity will give the user less feedback and less sense of "
 "\"direct manipulation\", by using wireframes, avoiding animations, or other "
 "means. This is a significant reduction in usability for many users, but may "
 "allow legacy applications and terminal servers to function when they would "
-"otherwise be impractical."
+"otherwise be impractical. However, the wireframe feature is disabled when "
+"accessibility is on to avoid weird desktop breakages."
 
 #: src/metacity.schemas.in.h:20
 msgid ""
@@ -726,13 +728,13 @@ msgstr ""
 "Some applications break specifications in ways that result in window manager "
 "misfeatures. For example, ideally Metacity would place all dialogues in a "
 "consistent position with respect to their parent window. This requires "
-"ignoring application-specified positions for dialogs. But some versions of "
-"Java/Swing mark their popup menus as dialogs, so Metacity has to disable "
-"dialog positioning to allow menus to work in broken Java applications. There "
-"are several other examples like this. This option puts Metacity in full-on "
-"Correct mode, which perhaps gives a moderately nicer UI if you don't need to "
-"run any broken apps. Sadly, workarounds must be enabled by default; the real "
-"world is an ugly place. Some of the workarounds are workarounds for "
+"ignoring application-specified positions for dialogues. But some versions of "
+"Java/Swing mark their popup menus as dialogues, so Metacity has to disable "
+"dialogue positioning to allow menus to work in broken Java applications. "
+"There are several other examples like this. This option puts Metacity in "
+"full-on Correct mode, which perhaps gives a moderately nicer UI if you don't "
+"need to run any broken apps. Sadly, workarounds must be enabled by default; "
+"the real world is an ugly place. Some of the workarounds are workarounds for "
 "limitations in the specifications themselves, so sometimes a bug in no-"
 "workarounds mode won't be fixable without amending a spec."
 
@@ -1183,7 +1185,6 @@ msgstr ""
 "will be no keybinding for this action."
 
 #: src/metacity.schemas.in.h:109
-#, fuzzy
 msgid ""
 "The keybinding used to maximize a window. The format looks like \"&lt;"
 "Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;F1\". The parser is fairly "
@@ -1191,7 +1192,7 @@ msgid ""
 "Ctl&gt;\" and \"&lt;Ctrl&gt;\". If you set the option to the special string "
 "\"disabled\", then there will be no keybinding for this action."
 msgstr ""
-"The keybinding used to maximise a window The format looks like \"&lt;"
+"The keybinding used to maximise a window. The format looks like \"&lt;"
 "Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;F1\". The parser is fairly "
 "liberal and allows lower or upper case, and also abbreviations such as \"&lt;"
 "Ctl&gt;\" and \"&lt;Ctrl&gt;\". If you set the option to the special string "
@@ -1871,7 +1872,7 @@ msgid ""
 msgstr ""
 "This option determines the effects of double-clicking on the title bar. "
 "Current valid options are 'toggle_shade', which will shade/unshade the "
-"window, and 'toggle_maximize' which will maximize/unmaximize the window."
+"window, and 'toggle_maximize' which will maximise/unmaximise the window."
 
 #: src/metacity.schemas.in.h:158
 msgid "Toggle always on top state"
@@ -1883,7 +1884,7 @@ msgstr "Toggle fullscreen mode"
 
 #: src/metacity.schemas.in.h:160
 msgid "Toggle maximization state"
-msgstr "Toggle maximization state"
+msgstr "Toggle maximisation state"
 
 #: src/metacity.schemas.in.h:161
 msgid "Toggle shaded state"
@@ -1923,17 +1924,17 @@ msgstr "Window focus mode"
 msgid "Window title font"
 msgstr "Window title font"
 
-#: src/prefs.c:476 src/prefs.c:492 src/prefs.c:508 src/prefs.c:524
-#: src/prefs.c:540 src/prefs.c:560 src/prefs.c:576 src/prefs.c:592
-#: src/prefs.c:608 src/prefs.c:624 src/prefs.c:640 src/prefs.c:656
-#: src/prefs.c:672 src/prefs.c:689 src/prefs.c:705 src/prefs.c:721
-#: src/prefs.c:737 src/prefs.c:753 src/prefs.c:768 src/prefs.c:783
-#: src/prefs.c:798
+#: src/prefs.c:501 src/prefs.c:517 src/prefs.c:533 src/prefs.c:549
+#: src/prefs.c:565 src/prefs.c:585 src/prefs.c:601 src/prefs.c:617
+#: src/prefs.c:633 src/prefs.c:649 src/prefs.c:665 src/prefs.c:681
+#: src/prefs.c:697 src/prefs.c:714 src/prefs.c:730 src/prefs.c:746
+#: src/prefs.c:762 src/prefs.c:778 src/prefs.c:793 src/prefs.c:808
+#: src/prefs.c:823 src/prefs.c:839
 #, c-format
 msgid "GConf key \"%s\" is set to an invalid type\n"
 msgstr "GConf key \"%s\" is set to an invalid type\n"
 
-#: src/prefs.c:843
+#: src/prefs.c:884
 #, c-format
 msgid ""
 "\"%s\" found in configuration database is not a valid value for mouse button "
@@ -1942,17 +1943,17 @@ msgstr ""
 "\"%s\" found in configuration database is not a valid value for mouse button "
 "modifier\n"
 
-#: src/prefs.c:867 src/prefs.c:1277
+#: src/prefs.c:908 src/prefs.c:1318
 #, c-format
 msgid "GConf key '%s' is set to an invalid value\n"
 msgstr "GConf key '%s' is set to an invalid value\n"
 
-#: src/prefs.c:994
+#: src/prefs.c:1035
 #, c-format
 msgid "Could not parse font description \"%s\" from GConf key %s\n"
 msgstr "Could not parse font description \"%s\" from GConf key %s\n"
 
-#: src/prefs.c:1179
+#: src/prefs.c:1220
 #, c-format
 msgid ""
 "%d stored in GConf key %s is not a reasonable number of workspaces, current "
@@ -1961,7 +1962,7 @@ msgstr ""
 "%d stored in GConf key %s is not a reasonable number of workspaces, current "
 "maximum is %d\n"
 
-#: src/prefs.c:1239
+#: src/prefs.c:1280
 msgid ""
 "Workarounds for broken applications disabled. Some applications may not "
 "behave properly.\n"
@@ -1969,17 +1970,17 @@ msgstr ""
 "Workarounds for broken applications disabled. Some applications may not "
 "behave properly.\n"
 
-#: src/prefs.c:1304
+#: src/prefs.c:1345
 #, c-format
 msgid "%d stored in GConf key %s is out of range 0 to %d\n"
 msgstr "%d stored in GConf key %s is out of range 0 to %d\n"
 
-#: src/prefs.c:1425
+#: src/prefs.c:1479
 #, c-format
 msgid "Error setting number of workspaces to %d: %s\n"
 msgstr "Error setting number of workspaces to %d: %s\n"
 
-#: src/prefs.c:1669
+#: src/prefs.c:1723
 #, c-format
 msgid ""
 "\"%s\" found in configuration database is not a valid value for keybinding "
@@ -1988,7 +1989,7 @@ msgstr ""
 "\"%s\" found in configuration database is not a valid value for keybinding "
 "\"%s\"\n"
 
-#: src/prefs.c:2023
+#: src/prefs.c:2077
 #, c-format
 msgid "Error setting name for workspace %d to \"%s\": %s\n"
 msgstr "Error setting name for workspace %d to \"%s\": %s\n"
@@ -2024,7 +2025,7 @@ msgstr ""
 msgid "Screen %d on display \"%s\" already has a window manager\n"
 msgstr "Screen %d on display \"%s\" already has a window manager\n"
 
-#: src/screen.c:699
+#: src/screen.c:716
 #, c-format
 msgid "Could not release screen %d on display \"%s\"\n"
 msgstr "Could not release screen %d on display \"%s\"\n"
@@ -2287,7 +2288,7 @@ msgstr "Border \"%s\" is unknown"
 #: src/theme-parser.c:2055 src/theme-parser.c:2869
 #, c-format
 msgid "No \"color\" attribute on element <%s>"
-msgstr "No \"colour\" attribute on element <%s>"
+msgstr "No \"color\" attribute on element <%s>"
 
 #: src/theme-parser.c:1662
 #, c-format
@@ -2500,7 +2501,7 @@ msgid ""
 "Should not have \"resize\" attribute on <%s> element for maximized/shaded "
 "states"
 msgstr ""
-"Should not have \"resize\" attribute on <%s> element for maximized/shaded "
+"Should not have \"resize\" attribute on <%s> element for maximised/shaded "
 "states"
 
 #: src/theme-parser.c:3464
@@ -2880,7 +2881,7 @@ msgstr "Did not understand state \"%s\" in colour specification"
 #: src/theme.c:1013
 #, c-format
 msgid "Did not understand color component \"%s\" in color specification"
-msgstr "Did not understand colour component \"%s\" in color specification"
+msgstr "Did not understand colour component \"%s\" in colour specification"
 
 #: src/theme.c:1043
 #, c-format
@@ -2888,7 +2889,7 @@ msgid ""
 "Blend format is \"blend/bg_color/fg_color/alpha\", \"%s\" does not fit the "
 "format"
 msgstr ""
-"Blend format is \"blend/bg_colour/fg_color/alpha\", \"%s\" does not fit the "
+"Blend format is \"blend/bg_colour/fg_colour/alpha\", \"%s\" does not fit the "
 "format"
 
 #: src/theme.c:1054
@@ -3114,7 +3115,7 @@ msgid "Application set a bogus _NET_WM_PID %ld\n"
 msgstr "Application set a bogus _NET_WM_PID %ld\n"
 
 #. first time through
-#: src/window.c:4829
+#: src/window.c:5197
 #, c-format
 msgid ""
 "Window %s sets SM_CLIENT_ID on itself, instead of on the WM_CLIENT_LEADER "
@@ -3130,7 +3131,7 @@ msgstr ""
 #. * MWM but not WM_NORMAL_HINTS are basically broken. We complain
 #. * about these apps but make them work.
 #.
-#: src/window.c:5500
+#: src/window.c:5868
 #, c-format
 msgid ""
 "Window %s sets an MWM hint indicating it isn't resizable, but sets min size %"
@@ -3165,24 +3166,3 @@ msgid ""
 "Property %s on window 0x%lx contained invalid UTF-8 for item %d in the list\n"
 msgstr ""
 "Property %s on window 0x%lx contained invalid UTF-8 for item %d in the list\n"
-
-#~ msgid "Select how to give focus to windows"
-#~ msgstr "Select how to give focus to windows"
-
-#~ msgid "Window Focus"
-#~ msgstr "Window Focus"
-
-#~ msgid "Clic_k to give focus"
-#~ msgstr "Clic_k to give focus"
-
-#~ msgid "Focus behavior:"
-#~ msgstr "Focus behavior:"
-
-#~ msgid "Window Focus Preferences"
-#~ msgstr "Window Focus Preferences"
-
-#~ msgid "_Point to give focus"
-#~ msgstr "_Point to give focus"
-
-#~ msgid "_Raise window on focus"
-#~ msgstr "_Raise window on focus"

po/eu.po

@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: eu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-09 21:23-0700\n"
+"POT-Creation-Date: 2005-06-27 17:21-0600\n"
 "PO-Revision-Date: 2004-08-26 23:33+0200\n"
 "Last-Translator: Iñaki Larrañaga Murgoitio <dooteo@euskalgnu.org>\n"
 "Language-Team: Basque <itzulpena@euskalgnu.org>\n"
@@ -64,7 +64,7 @@ msgstr ""
 msgid "Failed to get hostname: %s\n"
 msgstr "Huts egin du ostalari-izena hartzean: %s\n"
 
-#: src/display.c:306
+#: src/display.c:316
 #, c-format
 msgid "Failed to open X Window System display '%s'\n"
 msgstr "Huts egin du X Window sistemaren '%s' pantaila irekitzean\n"
@@ -85,23 +85,23 @@ msgstr ""
 msgid "Fatal IO error %d (%s) on display '%s'.\n"
 msgstr "S/Iko %d (%s) errore konponezina '%s' pantailan.\n"
 
-#: src/frames.c:1020
+#: src/frames.c:1125
 msgid "Close Window"
 msgstr "Itxi leihoa"
 
-#: src/frames.c:1023
+#: src/frames.c:1128
 msgid "Window Menu"
 msgstr "Leiho-menua"
 
-#: src/frames.c:1026
+#: src/frames.c:1131
 msgid "Minimize Window"
 msgstr "Ikonotu leihoa"
 
-#: src/frames.c:1029
+#: src/frames.c:1134
 msgid "Maximize Window"
 msgstr "Maximizatu leihoa"
 
-#: src/frames.c:1032
+#: src/frames.c:1137
 msgid "Unmaximize Window"
 msgstr "Desmaximizatu leihoa"
 
@@ -114,19 +114,19 @@ msgstr ""
 "Beste programaren batek erabiltzen du %s gakoa %x aldatzaileekin lotura "
 "gisa\n"
 
-#: src/keybindings.c:2554
+#: src/keybindings.c:2535
 #, c-format
 msgid "Error launching metacity-dialog to print an error about a command: %s\n"
 msgstr ""
 "Errorea komando bati buruzko errorea inprimatzeko metacity-ren elkarrizketa-"
 "koadroa abiaraztean: %s\n"
 
-#: src/keybindings.c:2659
+#: src/keybindings.c:2640
 #, c-format
 msgid "No command %d has been defined.\n"
 msgstr "%d komandoa ez dago definituta.\n"
 
-#: src/keybindings.c:3489
+#: src/keybindings.c:3485
 #, fuzzy
 msgid "No terminal command has been defined.\n"
 msgstr "%d komandoa ez dago definituta.\n"
@@ -210,11 +210,13 @@ msgstr "It_xi"
 
 #. separator
 #: src/menu.c:66
-msgid "Put on _All Workspaces"
-msgstr "Ipini laneko area gu_ztietan"
+#, fuzzy
+msgid "_Always on Visible Workspace"
+msgstr "Laneko area _honetan bakarrik"
 
 #: src/menu.c:67
-msgid "Only on _This Workspace"
+#, fuzzy
+msgid "_Only on This Workspace"
 msgstr "Laneko area _honetan bakarrik"
 
 #: src/menu.c:68
@@ -233,7 +235,7 @@ msgstr "Eraman g_aineko laneko areara"
 msgid "Move to Workspace _Down"
 msgstr "Eraman _azpiko laneko areara"
 
-#: src/menu.c:162 src/prefs.c:1942
+#: src/menu.c:162 src/prefs.c:1996
 #, c-format
 msgid "Workspace %d"
 msgstr "%d laneko area"
@@ -365,7 +367,7 @@ msgstr "Titulua"
 msgid "Class"
 msgstr "Klasea"
 
-#: src/metacity-dialog.c:262
+#: src/metacity-dialog.c:263
 msgid ""
 "These windows do not support \"save current setup\" and will have to be "
 "restarted manually next time you log in."
@@ -373,7 +375,7 @@ msgstr ""
 "Leiho hauek ez dute onartzen \"gorde uneko konfigurazioa\" eta eskuz "
 "berrabiarazi beharko dituzu hurrengo saioa hasten duzunean."
 
-#: src/metacity-dialog.c:323
+#: src/metacity-dialog.c:328
 #, c-format
 msgid ""
 "There was an error running \"%s\":\n"
@@ -509,12 +511,14 @@ msgstr ""
 "aplikazioaren letra-tipo estandarra leihoen tituluan."
 
 #: src/metacity.schemas.in.h:19
+#, fuzzy
 msgid ""
 "If true, metacity will give the user less feedback and less sense of "
 "\"direct manipulation\", by using wireframes, avoiding animations, or other "
 "means. This is a significant reduction in usability for many users, but may "
 "allow legacy applications and terminal servers to function when they would "
-"otherwise be impractical."
+"otherwise be impractical. However, the wireframe feature is disabled when "
+"accessibility is on to avoid weird desktop breakages."
 msgstr ""
 "Egia bada, metacity-k erabiltzaileari informazio eta \"zuzeneko kudeaketa\" "
 "zentzu gutxiago eskainiko dio, wireframe-ak erabiliz, animazioak sahiestuz, "
@@ -1946,17 +1950,17 @@ msgstr "Leiho-fokuaren modua"
 msgid "Window title font"
 msgstr "Leihoaren tituluaren letra-tipoa"
 
-#: src/prefs.c:476 src/prefs.c:492 src/prefs.c:508 src/prefs.c:524
-#: src/prefs.c:540 src/prefs.c:560 src/prefs.c:576 src/prefs.c:592
-#: src/prefs.c:608 src/prefs.c:624 src/prefs.c:640 src/prefs.c:656
-#: src/prefs.c:672 src/prefs.c:689 src/prefs.c:705 src/prefs.c:721
-#: src/prefs.c:737 src/prefs.c:753 src/prefs.c:768 src/prefs.c:783
-#: src/prefs.c:798
+#: src/prefs.c:501 src/prefs.c:517 src/prefs.c:533 src/prefs.c:549
+#: src/prefs.c:565 src/prefs.c:585 src/prefs.c:601 src/prefs.c:617
+#: src/prefs.c:633 src/prefs.c:649 src/prefs.c:665 src/prefs.c:681
+#: src/prefs.c:697 src/prefs.c:714 src/prefs.c:730 src/prefs.c:746
+#: src/prefs.c:762 src/prefs.c:778 src/prefs.c:793 src/prefs.c:808
+#: src/prefs.c:823 src/prefs.c:839
 #, c-format
 msgid "GConf key \"%s\" is set to an invalid type\n"
 msgstr "\"%s\" GConf gakoa mota baliogabean ezarrita dago\n"
 
-#: src/prefs.c:843
+#: src/prefs.c:884
 #, c-format
 msgid ""
 "\"%s\" found in configuration database is not a valid value for mouse button "
@@ -1965,17 +1969,17 @@ msgstr ""
 "Konfigurazioaren datu-basean aurkitutako \"%s\" balioa ez da baliozkoa sagu-"
 "botoiaren aldatzailearentzat\n"
 
-#: src/prefs.c:867 src/prefs.c:1277
+#: src/prefs.c:908 src/prefs.c:1318
 #, c-format
 msgid "GConf key '%s' is set to an invalid value\n"
 msgstr "\"%s\" GConf gakoa balio baliogabean ezarrita dago\n"
 
-#: src/prefs.c:994
+#: src/prefs.c:1035
 #, c-format
 msgid "Could not parse font description \"%s\" from GConf key %s\n"
 msgstr "Ezin da analizatu \"%s\" letra-tipoaren deskribapena %s GConf gakoan\n"
 
-#: src/prefs.c:1179
+#: src/prefs.c:1220
 #, c-format
 msgid ""
 "%d stored in GConf key %s is not a reasonable number of workspaces, current "
@@ -1984,7 +1988,7 @@ msgstr ""
 "%2$s GConf gakoko %1$d balioa ez da zentzuzkoa, laneko areentzat ezarrita "
 "dagoen gehienezko kopurua %3$d da\n"
 
-#: src/prefs.c:1239
+#: src/prefs.c:1280
 msgid ""
 "Workarounds for broken applications disabled. Some applications may not "
 "behave properly.\n"
@@ -1992,17 +1996,17 @@ msgstr ""
 "Aplikazio hautsien konponbidea desgaituta. Aplikazio batzuk ez dira behar "
 "den bezala ibiliko.\n"
 
-#: src/prefs.c:1304
+#: src/prefs.c:1345
 #, c-format
 msgid "%d stored in GConf key %s is out of range 0 to %d\n"
 msgstr "%2$s GConf gakoko %1$d balioa 0 - %3$d barrutitik kanpo dago\n"
 
-#: src/prefs.c:1425
+#: src/prefs.c:1479
 #, c-format
 msgid "Error setting number of workspaces to %d: %s\n"
 msgstr "Errorea laneko %d area ezartzean: %s\n"
 
-#: src/prefs.c:1669
+#: src/prefs.c:1723
 #, c-format
 msgid ""
 "\"%s\" found in configuration database is not a valid value for keybinding "
@@ -2011,7 +2015,7 @@ msgstr ""
 "Konfigurazioaren datu-basean aurkitutako \"%s\" balioa ez da baliozkoa \"%s"
 "\" laster-teklarentzat.\n"
 
-#: src/prefs.c:2023
+#: src/prefs.c:2077
 #, c-format
 msgid "Error setting name for workspace %d to \"%s\": %s\n"
 msgstr "Errorea %d. laneko areari \"%s\" izena ezartzean: %s\n"
@@ -2048,7 +2052,7 @@ msgstr ""
 msgid "Screen %d on display \"%s\" already has a window manager\n"
 msgstr "\"%2$s\" bistaratzeko %1$d pantailak badu leiho-kudeatzailea\n"
 
-#: src/screen.c:699
+#: src/screen.c:716
 #, c-format
 msgid "Could not release screen %d on display \"%s\"\n"
 msgstr "Ezin izan da askatu \"%2$s\" bistaratzeko %1$d pantaila\n"
@@ -3157,7 +3161,7 @@ msgid "Application set a bogus _NET_WM_PID %ld\n"
 msgstr "Aplikazioak _NET_WM_PID %ld faltsua ezarri du\n"
 
 #. first time through
-#: src/window.c:4829
+#: src/window.c:5197
 #, c-format
 msgid ""
 "Window %s sets SM_CLIENT_ID on itself, instead of on the WM_CLIENT_LEADER "
@@ -3173,7 +3177,7 @@ msgstr ""
 #. * MWM but not WM_NORMAL_HINTS are basically broken. We complain
 #. * about these apps but make them work.
 #.
-#: src/window.c:5500
+#: src/window.c:5868
 #, c-format
 msgid ""
 "Window %s sets an MWM hint indicating it isn't resizable, but sets min size %"
@@ -3211,6 +3215,9 @@ msgstr ""
 "0x%2$lx leihoko %1$s propietateak UTF-8 baliogabea du zerrendako %3$d. "
 "elementuan\n"
 
+#~ msgid "Put on _All Workspaces"
+#~ msgstr "Ipini laneko area gu_ztietan"
+
 #~ msgid "Select how to give focus to windows"
 #~ msgstr "Hautatu nola eman behar zaien fokua leihoei"
 

po/fr.po

@@ -1,20 +1,20 @@
 # French translation of metacity.
-# Copyright (C) 2002-2004 Free Software Foundation, Inc.
+# Copyright (C) 2002-2005 Free Software Foundation, Inc.
 # This file is distributed under the same license as the metacity package.
 # 
 # maintainer: Christophe Fergeau <teuf@users.sourceforge.net>, 2002.
-# Christophe Merlet (RedFox) <redfox@redfoxcenter.org>, 2002-2004.
+# Christophe Merlet (RedFox) <redfox@redfoxcenter.org>, 2002-2005.
 # Sun G11n <gnome_int_l10n@ireland.sun.com>, 2002.
 # Guy CLOTILDE <guy.clotilde@wanadoo.fr>, 2002.
 # Baptiste Mille-Mathias <baptiste@mille-mathias.info>, 2004.
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: metacity 2.8.7\n"
+"Project-Id-Version: metacity 2.10.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-09 21:23-0700\n"
-"PO-Revision-Date: 2004-11-14 10:12+0100\n"
-"Last-Translator: Baptiste Mille-Mathias <baptiste@mille-mathias.info>\n"
+"POT-Creation-Date: 2005-07-17 19:23+0200\n"
+"PO-Revision-Date: 2005-07-17 19:14+0200\n"
+"Last-Translator: Christophe Merlet (RedFox) <redfox@redfoxcenter.org>\n"
 "Language-Team: GNOME French Team <gnomefr@traduc.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -70,7 +70,7 @@ msgstr ""
 msgid "Failed to get hostname: %s\n"
 msgstr "Impossible d'obtenir le nom de machine : %s\n"
 
-#: src/display.c:306
+#: src/display.c:319
 #, c-format
 msgid "Failed to open X Window System display '%s'\n"
 msgstr "Impossible d'ouvrir le visuel « %s » du système X Window\n"
@@ -91,23 +91,23 @@ msgstr ""
 msgid "Fatal IO error %d (%s) on display '%s'.\n"
 msgstr "Erreur d'ES fatale %d (%s) sur le visuel « %s ».\n"
 
-#: src/frames.c:1020
+#: src/frames.c:1125
 msgid "Close Window"
 msgstr "Fermer la fenêtre"
 
-#: src/frames.c:1023
+#: src/frames.c:1128
 msgid "Window Menu"
 msgstr "Menu Fenêtre"
 
-#: src/frames.c:1026
+#: src/frames.c:1131
 msgid "Minimize Window"
 msgstr "Minimiser la fenêtre"
 
-#: src/frames.c:1029
+#: src/frames.c:1134
 msgid "Maximize Window"
 msgstr "Maximiser la fenêtre"
 
-#: src/frames.c:1032
+#: src/frames.c:1137
 msgid "Unmaximize Window"
 msgstr "Annuler la maximisation"
 
@@ -120,32 +120,23 @@ msgstr ""
 "Un autre programme utilise déjà la clé %s avec les modificateurs %x comme "
 "liaisons\n"
 
-#: src/keybindings.c:2554
+#: src/keybindings.c:2535
 #, c-format
 msgid "Error launching metacity-dialog to print an error about a command: %s\n"
 msgstr ""
 "Erreur pendant le lancement de metacity-dialog pour afficher un message "
 "d'erreur pour la commande : %s\n"
 
-#: src/keybindings.c:2659
+#: src/keybindings.c:2640
 #, c-format
 msgid "No command %d has been defined.\n"
 msgstr "Aucune commande %d n'a été définie.\n"
 
-#: src/keybindings.c:3489
-#, fuzzy
+#: src/keybindings.c:3485
 msgid "No terminal command has been defined.\n"
-msgstr "Aucune commande %d n'a été définie.\n"
+msgstr "Aucune commande de terminal n'a été définie.\n"
 
 #: src/main.c:69
-msgid ""
-"metacity [--sm-disable] [--sm-client-id=ID] [--sm-save-file=FILENAME] [--"
-"display=DISPLAY] [--replace] [--version]\n"
-msgstr ""
-"metacity [--sm-disable] [--sm-client-id=ID] [--sm-save-file=NOMDEFICHIER] [--"
-"display=VISUEL] [--replace] [--version]\n"
-
-#: src/main.c:76
 #, c-format
 msgid ""
 "metacity %s\n"
@@ -161,12 +152,36 @@ msgstr ""
 "Il n'y a AUCUNE garantie ; même pas de VALEUR MARCHANDE ou d'ADÉQUATION\n"
 "À UN USAGE PARTICULIER.\n"
 
-#: src/main.c:443
+#: src/main.c:257
+msgid "Disable connection to session manager"
+msgstr ""
+
+#: src/main.c:263
+msgid "Replace the running window manager with Metacity"
+msgstr ""
+
+#: src/main.c:269
+msgid "Specify session management ID"
+msgstr ""
+
+#: src/main.c:274
+msgid "X Display to use"
+msgstr ""
+
+#: src/main.c:280
+msgid "Initialize session from savefile"
+msgstr ""
+
+#: src/main.c:286
+msgid "Print version"
+msgstr ""
+
+#: src/main.c:440
 #, c-format
 msgid "Failed to scan themes directory: %s\n"
 msgstr "Le scrutage du répertoire de thèmes a échoué : %s\n"
 
-#: src/main.c:459
+#: src/main.c:456
 #, c-format
 msgid ""
 "Could not find a theme! Be sure %s exists and contains the usual themes."
@@ -174,7 +189,7 @@ msgstr ""
 "Impossible de trouver un thème ! Assurez-vous que %s existe et contient les "
 "thèmes habituels."
 
-#: src/main.c:521
+#: src/main.c:518
 #, c-format
 msgid "Failed to restart: %s\n"
 msgstr "Impossible de redémarrer : %s\n"
@@ -218,12 +233,12 @@ msgstr "_Fermer"
 
 #. separator
 #: src/menu.c:66
-msgid "Put on _All Workspaces"
-msgstr "Placer sur _tous les espaces de travail"
+msgid "_Always on Visible Workspace"
+msgstr "_Toujours sur l'espace de travail visible"
 
 #: src/menu.c:67
-msgid "Only on _This Workspace"
-msgstr "Seulement sur _cet espace de travail"
+msgid "_Only on This Workspace"
+msgstr "_Seulement sur cet espace de travail"
 
 #: src/menu.c:68
 msgid "Move to Workspace _Left"
@@ -241,7 +256,7 @@ msgstr "Déplacer vers l'espace de travail du _dessus"
 msgid "Move to Workspace _Down"
 msgstr "Déplacer vers l'espace de travail du _dessous"
 
-#: src/menu.c:162 src/prefs.c:1942
+#: src/menu.c:162 src/prefs.c:2106
 #, c-format
 msgid "Workspace %d"
 msgstr "Espace de travail %d"
@@ -373,7 +388,7 @@ msgstr "Titre"
 msgid "Class"
 msgstr "Classe"
 
-#: src/metacity-dialog.c:262
+#: src/metacity-dialog.c:263
 msgid ""
 "These windows do not support \"save current setup\" and will have to be "
 "restarted manually next time you log in."
@@ -382,7 +397,7 @@ msgstr ""
 "configuration courante » et devront être redémarrées manuellement à la "
 "prochaine connexion."
 
-#: src/metacity-dialog.c:323
+#: src/metacity-dialog.c:328
 #, c-format
 msgid ""
 "There was an error running \"%s\":\n"
@@ -458,7 +473,7 @@ msgid ""
 "for example."
 msgstr ""
 "Cliquer sur une fenêtre en maintenant enfoncée cette touche de modification "
-"déplacera la fenêtre (clique gauche), redimenssionnera la fenêtre (clique au "
+"déplacera la fenêtre (clique gauche), redimensionnera la fenêtre (clique au "
 "milieu), ou affichera le menu de la fenêtre (clique droit). Le modificateur "
 "est défini comme « &lt;Alt&gt; » ou « &lt;Super&gt; » par exemple."
 
@@ -527,14 +542,17 @@ msgid ""
 "\"direct manipulation\", by using wireframes, avoiding animations, or other "
 "means. This is a significant reduction in usability for many users, but may "
 "allow legacy applications and terminal servers to function when they would "
-"otherwise be impractical."
+"otherwise be impractical. However, the wireframe feature is disabled when "
+"accessibility is on to avoid weird desktop breakages."
 msgstr ""
 "Si vrai, metacity donnera à l'utilisateur moins de retour d'informations et "
 "moins de sensations de « manipulation directe », en utilisant des cadres en "
 "fil de fer, en évitant les animations, ou d'autres moyens. C'est une "
 "réduction significative de convivialité pour beaucoup d'utilisateurs, mais "
-"peut permettre aux vielles applications et aux serveurs de terminaux de "
-"fonctionner alors qu'ils seraient impraticables."
+"peut permettre aux vieilles applications et aux serveurs de terminaux de "
+"fonctionner alors qu'ils seraient impraticables. Par ailleurs, la "
+"fonctionnalité fil de fer est désactivé lorsque l'accessibilité est activé "
+"afin d'éviter d'étranges disfonctionnements du bureau."
 
 #: src/metacity.schemas.in.h:20
 msgid ""
@@ -729,7 +747,7 @@ msgstr "Exécuter la commande définie"
 
 #: src/metacity.schemas.in.h:60
 msgid "Run a terminal"
-msgstr ""
+msgstr "Lancer un terminal"
 
 #: src/metacity.schemas.in.h:61
 msgid "Show the panel menu"
@@ -1263,7 +1281,6 @@ msgstr ""
 "combinaison de touches pour cette action."
 
 #: src/metacity.schemas.in.h:109
-#, fuzzy
 msgid ""
 "The keybinding used to maximize a window. The format looks like \"&lt;"
 "Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;F1\". The parser is fairly "
@@ -1272,12 +1289,12 @@ msgid ""
 "\"disabled\", then there will be no keybinding for this action."
 msgstr ""
 "La combinaison de touches utilisée pour maximiser une fenêtre. Le format "
-"ressemble à ceci : « &lt;Contrôle&gt;a » ou « &lt;Shift&gt;&lt;Alt&gt;F1 "
-"» (la touche Shift est parfois notée Maj sur certains claviers). L'analyseur "
-"est assez souple et permet d'utiliser des majuscules ou des minuscules et "
-"des abréviations telles que « &lt;Ctl&gt; » et « &lt;Ctrl&gt; ». Si vous "
-"définissez l'option sur la chaîne spéciale « disabled » (désactivé), il n'y "
-"aura pas de combinaison de touches pour cette action."
+"ressemble à ceci : « &lt;Contrôle&gt;a » ou « &lt;Shift&gt;&lt;Alt&gt;F1 ». "
+"L'analyseur est assez souple et permet d'utiliser des majuscules ou des "
+"minuscules et des abréviations telles que « &lt;Ctl&gt; » et « &lt;"
+"Ctrl&gt; ». Si vous définissez l'option sur la chaîne spéciale "
+"« disabled » (désactivé), il n'y aura pas de combinaison de touches pour "
+"cette action."
 
 #: src/metacity.schemas.in.h:110
 msgid ""
@@ -1828,7 +1845,6 @@ msgstr ""
 "aucune combinaison de touches associée à cette action."
 
 #: src/metacity.schemas.in.h:142
-#, fuzzy
 msgid ""
 "The keybinding which invokes a terminal. The format looks like \"&lt;"
 "Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;F1\". The parser is fairly "
@@ -1836,12 +1852,12 @@ msgid ""
 "Ctl&gt;\" and \"&lt;Ctrl&gt;\". If you set the option to the special string "
 "\"disabled\", then there will be no keybinding for this action."
 msgstr ""
-"La combinaison de touches utilisée pour afficher le menu principal du "
-"tableau de bord. Le format ressemble à « <Control>a » ou « <Shift><Alt>F1 ». "
-"L'analyseur est libéral et est insensible à la casse, de même  aux "
-"abréviations tels que « <Ctl> » et « <Ctrl> ». Si vous définissez l'option à "
-"la chaîne spéciale « disabled », alors il n'y aura aucune combinaison de "
-"touches associée à cette action."
+"La combinaison de touches qui invoque un terminal. Le format ressemble à "
+"« &lt;Control&gt;a » ou « &lt;Shift&gt;&lt;Alt&gt;F1 ». L'analyseur est "
+"libéral et est insensible à la casse, de même aux abréviations tels que "
+"« &lt;Ctl&gt; » et « &lt;Ctrl&gt; ». Si vous définissez l'option à la chaîne "
+"spéciale « disabled », alors il n'y aura aucune combinaison de touches "
+"associée à cette action."
 
 #: src/metacity.schemas.in.h:143
 msgid ""
@@ -2081,17 +2097,17 @@ msgstr "Mode de focus des fenêtres"
 msgid "Window title font"
 msgstr "Police de titre des fenêtres"
 
-#: src/prefs.c:476 src/prefs.c:492 src/prefs.c:508 src/prefs.c:524
-#: src/prefs.c:540 src/prefs.c:560 src/prefs.c:576 src/prefs.c:592
-#: src/prefs.c:608 src/prefs.c:624 src/prefs.c:640 src/prefs.c:656
-#: src/prefs.c:672 src/prefs.c:689 src/prefs.c:705 src/prefs.c:721
-#: src/prefs.c:737 src/prefs.c:753 src/prefs.c:768 src/prefs.c:783
-#: src/prefs.c:798
+#: src/prefs.c:528 src/prefs.c:544 src/prefs.c:560 src/prefs.c:576
+#: src/prefs.c:592 src/prefs.c:612 src/prefs.c:628 src/prefs.c:644
+#: src/prefs.c:660 src/prefs.c:676 src/prefs.c:692 src/prefs.c:708
+#: src/prefs.c:724 src/prefs.c:741 src/prefs.c:757 src/prefs.c:773
+#: src/prefs.c:789 src/prefs.c:805 src/prefs.c:820 src/prefs.c:835
+#: src/prefs.c:850 src/prefs.c:866 src/prefs.c:882 src/prefs.c:898
 #, c-format
 msgid "GConf key \"%s\" is set to an invalid type\n"
 msgstr "La clef GConf « %s » est définie sur un type non valide\n"
 
-#: src/prefs.c:843
+#: src/prefs.c:943
 #, c-format
 msgid ""
 "\"%s\" found in configuration database is not a valid value for mouse button "
@@ -2100,19 +2116,19 @@ msgstr ""
 "« %s » trouvé dans la base de données de configuration n'est pas une valeur "
 "correcte pour le bouton de souris\n"
 
-#: src/prefs.c:867 src/prefs.c:1277
+#: src/prefs.c:967 src/prefs.c:1428
 #, c-format
 msgid "GConf key '%s' is set to an invalid value\n"
 msgstr "La clef GConf « %s » est définie sur une valeur non valide\n"
 
-#: src/prefs.c:994
+#: src/prefs.c:1145
 #, c-format
 msgid "Could not parse font description \"%s\" from GConf key %s\n"
 msgstr ""
 "Impossible d'analyser la description de police « %s » depuis la clef GConf %"
 "s\n"
 
-#: src/prefs.c:1179
+#: src/prefs.c:1330
 #, c-format
 msgid ""
 "%d stored in GConf key %s is not a reasonable number of workspaces, current "
@@ -2121,7 +2137,7 @@ msgstr ""
 "%d enregistré dans la clef GConf %s n'est pas un nombre d'espaces de travail "
 "raisonnable, le maximum actuel est %d\n"
 
-#: src/prefs.c:1239
+#: src/prefs.c:1390
 msgid ""
 "Workarounds for broken applications disabled. Some applications may not "
 "behave properly.\n"
@@ -2129,18 +2145,18 @@ msgstr ""
 "Solutions de rechange désactivées pour les applications endommagées. "
 "Certaines applications peuvent ne pas se comporter correctement.\n"
 
-#: src/prefs.c:1304
+#: src/prefs.c:1455
 #, c-format
 msgid "%d stored in GConf key %s is out of range 0 to %d\n"
 msgstr ""
 "%d enregistré dans la clef GConf %s est n'est pas comprise entre 0 et %d\n"
 
-#: src/prefs.c:1425
+#: src/prefs.c:1589
 #, c-format
 msgid "Error setting number of workspaces to %d: %s\n"
 msgstr "Erreur de définition du nombre d'espaces de travail sur %d : %s\n"
 
-#: src/prefs.c:1669
+#: src/prefs.c:1833
 #, c-format
 msgid ""
 "\"%s\" found in configuration database is not a valid value for keybinding "
@@ -2149,7 +2165,7 @@ msgstr ""
 "« %s » trouvé dans la base de données de configuration n'est pas une valeur "
 "correcte pour la combinaison de touches « %s »\n"
 
-#: src/prefs.c:2023
+#: src/prefs.c:2187
 #, c-format
 msgid "Error setting name for workspace %d to \"%s\": %s\n"
 msgstr ""
@@ -2188,7 +2204,7 @@ msgstr ""
 msgid "Screen %d on display \"%s\" already has a window manager\n"
 msgstr "L'écran %d sur le visuel « %s » a déjà un gestionnaire de fenêtres\n"
 
-#: src/screen.c:699
+#: src/screen.c:716
 #, c-format
 msgid "Could not release screen %d on display \"%s\"\n"
 msgstr "Impossible de libérer l'écran %d sur le visuel « %s »\n"
@@ -3041,11 +3057,11 @@ msgstr "La proportion de bouton %g n'est pas raisonnable"
 msgid "Frame geometry does not specify size of buttons"
 msgstr "La géométrie du cadre ne spécifie pas la taille des boutons"
 
-#: src/theme.c:849
+#: src/theme.c:843
 msgid "Gradients should have at least two colors"
 msgstr "Les dégradés doivent comporter au moins deux couleurs"
 
-#: src/theme.c:975
+#: src/theme.c:969
 #, c-format
 msgid ""
 "GTK color specification must have the state in brackets, e.g. gtk:fg[NORMAL] "
@@ -3054,7 +3070,7 @@ msgstr ""
 "La spécification de couleur GTK doit présenter l'état entre crochets, p. ex. "
 "gtk:fg[NORMAL] où NORMAL est l'état ; impossible d'analyser « %s »"
 
-#: src/theme.c:989
+#: src/theme.c:983
 #, c-format
 msgid ""
 "GTK color specification must have a close bracket after the state, e.g. gtk:"
@@ -3064,20 +3080,20 @@ msgstr ""
 "l'état, p. ex. gtk:fg[NORMAL] où NORMAL est l'état ; impossible d'analyser "
 "« %s »"
 
-#: src/theme.c:1000
+#: src/theme.c:994
 #, c-format
 msgid "Did not understand state \"%s\" in color specification"
 msgstr ""
 "Impossible de comprendre l'état « %s » dans la spécification de couleur"
 
-#: src/theme.c:1013
+#: src/theme.c:1007
 #, c-format
 msgid "Did not understand color component \"%s\" in color specification"
 msgstr ""
 "Impossible de comprendre le composant de couleur « %s » dans la "
 "spécification de couleur"
 
-#: src/theme.c:1043
+#: src/theme.c:1037
 #, c-format
 msgid ""
 "Blend format is \"blend/bg_color/fg_color/alpha\", \"%s\" does not fit the "
@@ -3086,19 +3102,19 @@ msgstr ""
 "Le format de mélange est « blend/bg_color/fg_color/alpha », « %s » il ne "
 "correspond pas au format ."
 
-#: src/theme.c:1054
+#: src/theme.c:1048
 #, c-format
 msgid "Could not parse alpha value \"%s\" in blended color"
 msgstr "Impossible d'analyser la valeur alpha « %s » en couleur mélangée"
 
-#: src/theme.c:1064
+#: src/theme.c:1058
 #, c-format
 msgid "Alpha value \"%s\" in blended color is not between 0.0 and 1.0"
 msgstr ""
 "La valeur alpha « %s » en couleur mélangée n'est pas comprise entre 0,0 et "
 "1,0"
 
-#: src/theme.c:1111
+#: src/theme.c:1105
 #, c-format
 msgid ""
 "Shade format is \"shade/base_color/factor\", \"%s\" does not fit the format"
@@ -3106,29 +3122,29 @@ msgstr ""
 "Le format d'ombre est « shade/base_color/factor », « %s » il ne correspond "
 "pas au format"
 
-#: src/theme.c:1122
+#: src/theme.c:1116
 #, c-format
 msgid "Could not parse shade factor \"%s\" in shaded color"
 msgstr "Impossible d'analyser le facteur d'ombre « %s » en couleur ombrée"
 
-#: src/theme.c:1132
+#: src/theme.c:1126
 #, c-format
 msgid "Shade factor \"%s\" in shaded color is negative"
 msgstr "Le facteur d'ombre « %s » en couleur ombrée est négatif"
 
-#: src/theme.c:1161
+#: src/theme.c:1155
 #, c-format
 msgid "Could not parse color \"%s\""
 msgstr "Impossible d'analyser la couleur « %s »"
 
-#: src/theme.c:1423
+#: src/theme.c:1417
 #, c-format
 msgid "Coordinate expression contains character '%s' which is not allowed"
 msgstr ""
 "L'expression de la coordonnée contient le caractère « %s » qui n'est pas "
 "autorisé"
 
-#: src/theme.c:1450
+#: src/theme.c:1444
 #, c-format
 msgid ""
 "Coordinate expression contains floating point number '%s' which could not be "
@@ -3137,14 +3153,14 @@ msgstr ""
 "L'expression de la coordonnée contient la valeur en virgule flottante « %s » "
 "qui ne peut pas être analysée"
 
-#: src/theme.c:1464
+#: src/theme.c:1458
 #, c-format
 msgid "Coordinate expression contains integer '%s' which could not be parsed"
 msgstr ""
 "L'expression de la coordonnée contient l'entier « %s » qui n'a pas pu être "
 "analysé"
 
-#: src/theme.c:1531
+#: src/theme.c:1525
 #, c-format
 msgid ""
 "Coordinate expression contained unknown operator at the start of this text: "
@@ -3153,22 +3169,22 @@ msgstr ""
 "L'expression de la coordonnée contenait un opérateur inconnu au début de ce "
 "texte : « %s »"
 
-#: src/theme.c:1588
+#: src/theme.c:1582
 msgid "Coordinate expression was empty or not understood"
 msgstr "L'expression de la coordonnée était vide ou incomprise"
 
-#: src/theme.c:1731 src/theme.c:1741 src/theme.c:1775
+#: src/theme.c:1725 src/theme.c:1735 src/theme.c:1769
 msgid "Coordinate expression results in division by zero"
 msgstr "L'expression de la coordonnée entraîne une division par zéro"
 
-#: src/theme.c:1783
+#: src/theme.c:1777
 msgid ""
 "Coordinate expression tries to use mod operator on a floating-point number"
 msgstr ""
 "L'expression de la coordonnée tente d'utiliser l'opérateur mod sur une "
 "valeur en virgule flottante"
 
-#: src/theme.c:1840
+#: src/theme.c:1834
 #, c-format
 msgid ""
 "Coordinate expression has an operator \"%s\" where an operand was expected"
@@ -3176,18 +3192,18 @@ msgstr ""
 "L'expression de la coordonnée a un opérateur « %s » là où un opérande était "
 "attendu"
 
-#: src/theme.c:1849
+#: src/theme.c:1843
 msgid "Coordinate expression had an operand where an operator was expected"
 msgstr ""
 "L'expression de la coordonnée a un opérande là où un opérateur était attendu"
 
-#: src/theme.c:1857
+#: src/theme.c:1851
 msgid "Coordinate expression ended with an operator instead of an operand"
 msgstr ""
 "L'expression de la coordonnée était terminée par un opérateur au lieu d'un "
 "opérande"
 
-#: src/theme.c:1867
+#: src/theme.c:1861
 #, c-format
 msgid ""
 "Coordinate expression has operator \"%c\" following operator \"%c\" with no "
@@ -3196,7 +3212,7 @@ msgstr ""
 "L'expression de la coordonnée a un opérateur « %c » suivant l'opérateur « %c "
 "» sans opérande entre eux"
 
-#: src/theme.c:1986
+#: src/theme.c:1980
 msgid ""
 "Coordinate expression parser overflowed its buffer, this is really a "
 "Metacity bug, but are you sure you need a huge expression like that?"
@@ -3205,38 +3221,38 @@ msgstr ""
 "s'agit d'un bogue de Metacity, mais avez-vous vraiment besoin d'une "
 "expression aussi grande ?"
 
-#: src/theme.c:2015
+#: src/theme.c:2009
 msgid "Coordinate expression had a close parenthesis with no open parenthesis"
 msgstr ""
 "L'expression de la coordonnée comporte une parenthèse de fermeture, mais pas "
 "de parenthèse d'ouverture"
 
-#: src/theme.c:2078
+#: src/theme.c:2072
 #, c-format
 msgid "Coordinate expression had unknown variable or constant \"%s\""
 msgstr ""
 "L'expression de la coordonnée possède une variable ou constante inconnue « %"
 "s »"
 
-#: src/theme.c:2135
+#: src/theme.c:2129
 msgid "Coordinate expression had an open parenthesis with no close parenthesis"
 msgstr ""
 "L'expression de la coordonnée comporte une parenthèse d'ouverture, mais pas "
 "de parenthèse de fermeture"
 
-#: src/theme.c:2146
+#: src/theme.c:2140
 msgid "Coordinate expression doesn't seem to have any operators or operands"
 msgstr ""
 "L'expression de la coordonnée ne semble pas comprendre d'opérateurs ni "
 "d'opérandes"
 
-#: src/theme.c:2390 src/theme.c:2412 src/theme.c:2433
+#: src/theme.c:2384 src/theme.c:2406 src/theme.c:2427
 #, c-format
 msgid "Theme contained an expression \"%s\" that resulted in an error: %s\n"
 msgstr ""
 "Le thème contenait une expression « %s » qui a entraîné une erreur : %s\n"
 
-#: src/theme.c:3919
+#: src/theme.c:3913
 #, c-format
 msgid ""
 "<button function=\"%s\" state=\"%s\" draw_ops=\"whatever\"/> must be "
@@ -3245,25 +3261,25 @@ msgstr ""
 "<button function=\"%s\" state=\"%s\" draw_ops=\"whatever\"/> doit être "
 "spécifié pour ce style de cadre"
 
-#: src/theme.c:4369 src/theme.c:4401
+#: src/theme.c:4363 src/theme.c:4395
 #, c-format
 msgid ""
 "Missing <frame state=\"%s\" resize=\"%s\" focus=\"%s\" style=\"whatever\"/>"
 msgstr ""
 "<frame state=\"%s\" resize=\"%s\" focus=\"%s\" style=\"whatever\" manquant/>"
 
-#: src/theme.c:4452
+#: src/theme.c:4446
 #, c-format
 msgid "Failed to load theme \"%s\": %s\n"
 msgstr "Impossible de charger le thème « %s » : %s\n"
 
-#: src/theme.c:4598 src/theme.c:4605 src/theme.c:4612 src/theme.c:4619
-#: src/theme.c:4626
+#: src/theme.c:4592 src/theme.c:4599 src/theme.c:4606 src/theme.c:4613
+#: src/theme.c:4620
 #, c-format
 msgid "No <%s> set for theme \"%s\""
 msgstr "Aucun <%s> défini pour le thème « %s »"
 
-#: src/theme.c:4636
+#: src/theme.c:4630
 #, c-format
 msgid ""
 "No frame style set for window type \"%s\" in theme \"%s\", add a <window "
@@ -3272,7 +3288,7 @@ msgstr ""
 "Aucun style de cadre défini pour le type de fenêtre « %s » dans le thème « %"
 "s », ajoutez un élément <window type=\"%s\" style_set=\"whatever\"/>"
 
-#: src/theme.c:4658
+#: src/theme.c:4652
 #, c-format
 msgid ""
 "<menu_icon function=\"%s\" state=\"%s\" draw_ops=\"whatever\"/> must be "
@@ -3281,7 +3297,7 @@ msgstr ""
 "<menu_icon function=\"%s\" state=\"%s\" draw_ops=\"whatever\"/> doit être "
 "spécifié pour ce thème"
 
-#: src/theme.c:5047 src/theme.c:5109
+#: src/theme.c:5041 src/theme.c:5103
 #, c-format
 msgid ""
 "User-defined constants must begin with a capital letter; \"%s\" does not"
@@ -3289,7 +3305,7 @@ msgstr ""
 "Les constantes définies par l'utilisateur doivent commencer par une "
 "majuscule ; « %s » commence par une minuscule"
 
-#: src/theme.c:5055 src/theme.c:5117
+#: src/theme.c:5049 src/theme.c:5111
 #, c-format
 msgid "Constant \"%s\" has already been defined"
 msgstr "La constante « %s » a déjà été définie"
@@ -3332,7 +3348,7 @@ msgid "Application set a bogus _NET_WM_PID %ld\n"
 msgstr "L'application a défini un faux _NET_WM_PID %ld\n"
 
 #. first time through
-#: src/window.c:4829
+#: src/window.c:5197
 #, c-format
 msgid ""
 "Window %s sets SM_CLIENT_ID on itself, instead of on the WM_CLIENT_LEADER "
@@ -3348,7 +3364,7 @@ msgstr ""
 #. * MWM but not WM_NORMAL_HINTS are basically broken. We complain
 #. * about these apps but make them work.
 #.
-#: src/window.c:5500
+#: src/window.c:5868
 #, c-format
 msgid ""
 "Window %s sets an MWM hint indicating it isn't resizable, but sets min size %"
@@ -3388,23 +3404,9 @@ msgstr ""
 "La propriété %s de la fenêtre 0x%lx contient un code UTF-8 non valide pour "
 "l'élément %d dans la liste\n"
 
-#~ msgid "Select how to give focus to windows"
-#~ msgstr "Sélectionne la manière de donner le focus aux fenêtres"
-
-#~ msgid "Window Focus"
-#~ msgstr "Focus de fenêtre"
-
-#~ msgid "Clic_k to give focus"
-#~ msgstr "_Cliquer pour activer"
-
-#~ msgid "Focus behavior:"
-#~ msgstr "Comportement de focus :"
-
-#~ msgid "Window Focus Preferences"
-#~ msgstr "Préférences de focus de fenêtre"
-
-#~ msgid "_Point to give focus"
-#~ msgstr "_Pointer pour activer"
-
-#~ msgid "_Raise window on focus"
-#~ msgstr "_Mettre la fenêtre au premier plan en cas de focus"
+#~ msgid ""
+#~ "metacity [--sm-disable] [--sm-client-id=ID] [--sm-save-file=FILENAME] [--"
+#~ "display=DISPLAY] [--replace] [--version]\n"
+#~ msgstr ""
+#~ "metacity [--sm-disable] [--sm-client-id=ID] [--sm-save-file=NOMDEFICHIER] "
+#~ "[--display=VISUEL] [--replace] [--version]\n"

po/ga.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Metacity HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-09 21:23-0700\n"
+"POT-Creation-Date: 2005-06-27 17:21-0600\n"
 "PO-Revision-Date: 2004-03-08 19:05 GMT\n"
 "Last-Translator: Alastair McKinstry <mckinstry@computer.org>\n"
 "Language-Team: Irish <gaeilge-gnulinux@lists.sourceforge.net>\n"
@@ -58,7 +58,7 @@ msgstr ""
 msgid "Failed to get hostname: %s\n"
 msgstr "Teip ag leámh óstainm: %s\n"
 
-#: src/display.c:306
+#: src/display.c:316
 #, c-format
 msgid "Failed to open X Window System display '%s'\n"
 msgstr "Teipeadh ag oscailt scathán Corás Fhunneoga X '%s'\n"
@@ -76,23 +76,23 @@ msgstr ""
 msgid "Fatal IO error %d (%s) on display '%s'.\n"
 msgstr ""
 
-#: src/frames.c:1020
+#: src/frames.c:1125
 msgid "Close Window"
 msgstr "Dún an Fhuinneog"
 
-#: src/frames.c:1023
+#: src/frames.c:1128
 msgid "Window Menu"
 msgstr "Roghchlár an Fhuinneog"
 
-#: src/frames.c:1026
+#: src/frames.c:1131
 msgid "Minimize Window"
 msgstr ""
 
-#: src/frames.c:1029
+#: src/frames.c:1134
 msgid "Maximize Window"
 msgstr ""
 
-#: src/frames.c:1032
+#: src/frames.c:1137
 msgid "Unmaximize Window"
 msgstr ""
 
@@ -103,17 +103,17 @@ msgid ""
 "binding\n"
 msgstr ""
 
-#: src/keybindings.c:2554
+#: src/keybindings.c:2535
 #, c-format
 msgid "Error launching metacity-dialog to print an error about a command: %s\n"
 msgstr ""
 
-#: src/keybindings.c:2659
+#: src/keybindings.c:2640
 #, c-format
 msgid "No command %d has been defined.\n"
 msgstr ""
 
-#: src/keybindings.c:3489
+#: src/keybindings.c:3485
 msgid "No terminal command has been defined.\n"
 msgstr ""
 
@@ -188,11 +188,13 @@ msgstr "_Dún"
 
 #. separator
 #: src/menu.c:66
-msgid "Put on _All Workspaces"
-msgstr "Chuir ar G_ach Deascanna"
+#, fuzzy
+msgid "_Always on Visible Workspace"
+msgstr "Ar an Deas _Seo amhain"
 
 #: src/menu.c:67
-msgid "Only on _This Workspace"
+#, fuzzy
+msgid "_Only on This Workspace"
 msgstr "Ar an Deas _Seo amhain"
 
 #: src/menu.c:68
@@ -215,7 +217,7 @@ msgstr "Chuir an fhuinneog seo ar deasc a 1"
 msgid "Move to Workspace _Down"
 msgstr "Chuir an fhuinneog aon deasc síos"
 
-#: src/menu.c:162 src/prefs.c:1942
+#: src/menu.c:162 src/prefs.c:1996
 #, c-format
 msgid "Workspace %d"
 msgstr "Deasc %d"
@@ -347,13 +349,13 @@ msgstr "Teidel"
 msgid "Class"
 msgstr "Rang"
 
-#: src/metacity-dialog.c:262
+#: src/metacity-dialog.c:263
 msgid ""
 "These windows do not support \"save current setup\" and will have to be "
 "restarted manually next time you log in."
 msgstr ""
 
-#: src/metacity-dialog.c:323
+#: src/metacity-dialog.c:328
 #, c-format
 msgid ""
 "There was an error running \"%s\":\n"
@@ -468,7 +470,8 @@ msgid ""
 "\"direct manipulation\", by using wireframes, avoiding animations, or other "
 "means. This is a significant reduction in usability for many users, but may "
 "allow legacy applications and terminal servers to function when they would "
-"otherwise be impractical."
+"otherwise be impractical. However, the wireframe feature is disabled when "
+"accessibility is on to avoid weird desktop breakages."
 msgstr ""
 
 #: src/metacity.schemas.in.h:20
@@ -1476,64 +1479,64 @@ msgstr ""
 msgid "Window title font"
 msgstr ""
 
-#: src/prefs.c:476 src/prefs.c:492 src/prefs.c:508 src/prefs.c:524
-#: src/prefs.c:540 src/prefs.c:560 src/prefs.c:576 src/prefs.c:592
-#: src/prefs.c:608 src/prefs.c:624 src/prefs.c:640 src/prefs.c:656
-#: src/prefs.c:672 src/prefs.c:689 src/prefs.c:705 src/prefs.c:721
-#: src/prefs.c:737 src/prefs.c:753 src/prefs.c:768 src/prefs.c:783
-#: src/prefs.c:798
+#: src/prefs.c:501 src/prefs.c:517 src/prefs.c:533 src/prefs.c:549
+#: src/prefs.c:565 src/prefs.c:585 src/prefs.c:601 src/prefs.c:617
+#: src/prefs.c:633 src/prefs.c:649 src/prefs.c:665 src/prefs.c:681
+#: src/prefs.c:697 src/prefs.c:714 src/prefs.c:730 src/prefs.c:746
+#: src/prefs.c:762 src/prefs.c:778 src/prefs.c:793 src/prefs.c:808
+#: src/prefs.c:823 src/prefs.c:839
 #, c-format
 msgid "GConf key \"%s\" is set to an invalid type\n"
 msgstr ""
 
-#: src/prefs.c:843
+#: src/prefs.c:884
 #, c-format
 msgid ""
 "\"%s\" found in configuration database is not a valid value for mouse button "
 "modifier\n"
 msgstr ""
 
-#: src/prefs.c:867 src/prefs.c:1277
+#: src/prefs.c:908 src/prefs.c:1318
 #, c-format
 msgid "GConf key '%s' is set to an invalid value\n"
 msgstr ""
 
-#: src/prefs.c:994
+#: src/prefs.c:1035
 #, c-format
 msgid "Could not parse font description \"%s\" from GConf key %s\n"
 msgstr ""
 
-#: src/prefs.c:1179
+#: src/prefs.c:1220
 #, c-format
 msgid ""
 "%d stored in GConf key %s is not a reasonable number of workspaces, current "
 "maximum is %d\n"
 msgstr ""
 
-#: src/prefs.c:1239
+#: src/prefs.c:1280
 msgid ""
 "Workarounds for broken applications disabled. Some applications may not "
 "behave properly.\n"
 msgstr ""
 
-#: src/prefs.c:1304
+#: src/prefs.c:1345
 #, c-format
 msgid "%d stored in GConf key %s is out of range 0 to %d\n"
 msgstr ""
 
-#: src/prefs.c:1425
+#: src/prefs.c:1479
 #, c-format
 msgid "Error setting number of workspaces to %d: %s\n"
 msgstr ""
 
-#: src/prefs.c:1669
+#: src/prefs.c:1723
 #, c-format
 msgid ""
 "\"%s\" found in configuration database is not a valid value for keybinding "
 "\"%s\"\n"
 msgstr ""
 
-#: src/prefs.c:2023
+#: src/prefs.c:2077
 #, c-format
 msgid "Error setting name for workspace %d to \"%s\": %s\n"
 msgstr ""
@@ -1566,7 +1569,7 @@ msgstr ""
 msgid "Screen %d on display \"%s\" already has a window manager\n"
 msgstr ""
 
-#: src/screen.c:699
+#: src/screen.c:716
 #, c-format
 msgid "Could not release screen %d on display \"%s\"\n"
 msgstr ""
@@ -2612,7 +2615,7 @@ msgid "Application set a bogus _NET_WM_PID %ld\n"
 msgstr ""
 
 #. first time through
-#: src/window.c:4829
+#: src/window.c:5197
 #, c-format
 msgid ""
 "Window %s sets SM_CLIENT_ID on itself, instead of on the WM_CLIENT_LEADER "
@@ -2626,7 +2629,7 @@ msgstr ""
 #. * MWM but not WM_NORMAL_HINTS are basically broken. We complain
 #. * about these apps but make them work.
 #.
-#: src/window.c:5500
+#: src/window.c:5868
 #, c-format
 msgid ""
 "Window %s sets an MWM hint indicating it isn't resizable, but sets min size %"
@@ -2654,6 +2657,9 @@ msgid ""
 "Property %s on window 0x%lx contained invalid UTF-8 for item %d in the list\n"
 msgstr ""
 
+#~ msgid "Put on _All Workspaces"
+#~ msgstr "Chuir ar G_ach Deascanna"
+
 #~ msgid "Window Focus"
 #~ msgstr "Fócas an Fhuinneog"
 

po/hr.po

@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: metacity 0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-09 21:23-0700\n"
+"POT-Creation-Date: 2005-06-27 17:21-0600\n"
 "PO-Revision-Date: 2004-02-05 23:51+CET\n"
 "Last-Translator: auto\n"
 "Language-Team: Croatian <lokalizacija@linux.hr>\n"
@@ -58,7 +58,7 @@ msgstr ""
 msgid "Failed to get hostname: %s\n"
 msgstr "Nije uspjelo dobivanje imena računala: %s\n"
 
-#: src/display.c:306
+#: src/display.c:316
 #, c-format
 msgid "Failed to open X Window System display '%s'\n"
 msgstr "Nije uspjelo otvaranje  X Window System prikaza'%s'\n"
@@ -79,23 +79,23 @@ msgstr ""
 msgid "Fatal IO error %d (%s) on display '%s'.\n"
 msgstr "Kobna IO greška %d (%s) na prikazu '%s'.\n"
 
-#: src/frames.c:1020
+#: src/frames.c:1125
 msgid "Close Window"
 msgstr "Zatvori prozor"
 
-#: src/frames.c:1023
+#: src/frames.c:1128
 msgid "Window Menu"
 msgstr "Izbornik Prozor"
 
-#: src/frames.c:1026
+#: src/frames.c:1131
 msgid "Minimize Window"
 msgstr "Minimiziraj prozor"
 
-#: src/frames.c:1029
+#: src/frames.c:1134
 msgid "Maximize Window"
 msgstr "Maksimiziraj prozor"
 
-#: src/frames.c:1032
+#: src/frames.c:1137
 msgid "Unmaximize Window"
 msgstr "Poništi uvećanje prozora"
 
@@ -107,18 +107,18 @@ msgid ""
 msgstr ""
 "Neki drugi prograk već koristi kljuć %s sa modifikacijama %x kao spoj\n"
 
-#: src/keybindings.c:2554
+#: src/keybindings.c:2535
 #, c-format
 msgid "Error launching metacity-dialog to print an error about a command: %s\n"
 msgstr ""
 "Greška pri pokretanju metacity-dialoga za ispisom greške o komandi %s\n"
 
-#: src/keybindings.c:2659
+#: src/keybindings.c:2640
 #, c-format
 msgid "No command %d has been defined.\n"
 msgstr "Naredba %d nije definirana.\n"
 
-#: src/keybindings.c:3489
+#: src/keybindings.c:3485
 #, fuzzy
 msgid "No terminal command has been defined.\n"
 msgstr "Naredba %d nije definirana.\n"
@@ -202,11 +202,13 @@ msgstr "_Zatvori"
 
 #. separator
 #: src/menu.c:66
-msgid "Put on _All Workspaces"
-msgstr "Stavi na _sve radne prostore"
+#, fuzzy
+msgid "_Always on Visible Workspace"
+msgstr "Samo na _ovom radnom prostoru"
 
 #: src/menu.c:67
-msgid "Only on _This Workspace"
+#, fuzzy
+msgid "_Only on This Workspace"
 msgstr "Samo na _ovom radnom prostoru"
 
 #: src/menu.c:68
@@ -225,7 +227,7 @@ msgstr "Premjesti na _gornju radnu površinu"
 msgid "Move to Workspace _Down"
 msgstr "Pomak na _donju radnu površinu"
 
-#: src/menu.c:162 src/prefs.c:1942
+#: src/menu.c:162 src/prefs.c:1996
 #, c-format
 msgid "Workspace %d"
 msgstr "Radna površina %d"
@@ -357,7 +359,7 @@ msgstr "Naslov"
 msgid "Class"
 msgstr "Klasa"
 
-#: src/metacity-dialog.c:262
+#: src/metacity-dialog.c:263
 msgid ""
 "These windows do not support \"save current setup\" and will have to be "
 "restarted manually next time you log in."
@@ -365,7 +367,7 @@ msgstr ""
 "Ovi prozori ne podržavaju mogućnost \"snimi trenutne postavke\" i morati "
 "ćete ih ručno ponovno pokrenuti sljedeći put kada se prijavite.."
 
-#: src/metacity-dialog.c:323
+#: src/metacity-dialog.c:328
 #, c-format
 msgid ""
 "There was an error running \"%s\":\n"
@@ -498,12 +500,14 @@ msgstr ""
 "aplikacijsko pismo za naslovnu traku prozora."
 
 #: src/metacity.schemas.in.h:19
+#, fuzzy
 msgid ""
 "If true, metacity will give the user less feedback and less sense of "
 "\"direct manipulation\", by using wireframes, avoiding animations, or other "
 "means. This is a significant reduction in usability for many users, but may "
 "allow legacy applications and terminal servers to function when they would "
-"otherwise be impractical."
+"otherwise be impractical. However, the wireframe feature is disabled when "
+"accessibility is on to avoid weird desktop breakages."
 msgstr ""
 "Ukoliko je postavljeno, metacity će korisniku dati manje povratnih "
 "informacija i manje osjećaja \"direktne manipulacije\", korištenjem žičanih "
@@ -2040,17 +2044,17 @@ msgstr "Način fokusa prozora"
 msgid "Window title font"
 msgstr "Pismo naslova prozora"
 
-#: src/prefs.c:476 src/prefs.c:492 src/prefs.c:508 src/prefs.c:524
-#: src/prefs.c:540 src/prefs.c:560 src/prefs.c:576 src/prefs.c:592
-#: src/prefs.c:608 src/prefs.c:624 src/prefs.c:640 src/prefs.c:656
-#: src/prefs.c:672 src/prefs.c:689 src/prefs.c:705 src/prefs.c:721
-#: src/prefs.c:737 src/prefs.c:753 src/prefs.c:768 src/prefs.c:783
-#: src/prefs.c:798
+#: src/prefs.c:501 src/prefs.c:517 src/prefs.c:533 src/prefs.c:549
+#: src/prefs.c:565 src/prefs.c:585 src/prefs.c:601 src/prefs.c:617
+#: src/prefs.c:633 src/prefs.c:649 src/prefs.c:665 src/prefs.c:681
+#: src/prefs.c:697 src/prefs.c:714 src/prefs.c:730 src/prefs.c:746
+#: src/prefs.c:762 src/prefs.c:778 src/prefs.c:793 src/prefs.c:808
+#: src/prefs.c:823 src/prefs.c:839
 #, c-format
 msgid "GConf key \"%s\" is set to an invalid type\n"
 msgstr "GConf ključ \"%s\" je postavljen na neispravan tip\n"
 
-#: src/prefs.c:843
+#: src/prefs.c:884
 #, c-format
 msgid ""
 "\"%s\" found in configuration database is not a valid value for mouse button "
@@ -2059,17 +2063,17 @@ msgstr ""
 "“%s“ je pronađen u bazi podešavanja što nije ispravna vrijednost za tipku "
 "koja mijenja ponašanje tipki miša\n"
 
-#: src/prefs.c:867 src/prefs.c:1277
+#: src/prefs.c:908 src/prefs.c:1318
 #, c-format
 msgid "GConf key '%s' is set to an invalid value\n"
 msgstr "GConf ključ '%s' je postavljen na neispravnu vrijednost\n"
 
-#: src/prefs.c:994
+#: src/prefs.c:1035
 #, c-format
 msgid "Could not parse font description \"%s\" from GConf key %s\n"
 msgstr "Nije moguće analizirati opis pisma  \"%s\" iz Gconf ključa %s\n"
 
-#: src/prefs.c:1179
+#: src/prefs.c:1220
 #, c-format
 msgid ""
 "%d stored in GConf key %s is not a reasonable number of workspaces, current "
@@ -2078,7 +2082,7 @@ msgstr ""
 "%d pohranjen u GConf ključu %s nije podnošljiv broj radnih površina, "
 "trenutno je maksimalan %d\n"
 
-#: src/prefs.c:1239
+#: src/prefs.c:1280
 msgid ""
 "Workarounds for broken applications disabled. Some applications may not "
 "behave properly.\n"
@@ -2086,24 +2090,24 @@ msgstr ""
 "Kompromisi za loše programe su isključeni. Neki programi se mogu ponašati "
 "čudno.\n"
 
-#: src/prefs.c:1304
+#: src/prefs.c:1345
 #, c-format
 msgid "%d stored in GConf key %s is out of range 0 to %d\n"
 msgstr "%d pohranjen u GConf ključu %s je izvan dometa od 0 do %d\n"
 
-#: src/prefs.c:1425
+#: src/prefs.c:1479
 #, c-format
 msgid "Error setting number of workspaces to %d: %s\n"
 msgstr "Pogreška prilikom podešavanja broja radnih površina na %d: %s\n"
 
-#: src/prefs.c:1669
+#: src/prefs.c:1723
 #, c-format
 msgid ""
 "\"%s\" found in configuration database is not a valid value for keybinding "
 "\"%s\"\n"
 msgstr "\"%s\" nađen u bazi postavki nije ispravna kombinacija tipki \"%s\"\n"
 
-#: src/prefs.c:2023
+#: src/prefs.c:2077
 #, c-format
 msgid "Error setting name for workspace %d to \"%s\": %s\n"
 msgstr "Pogreška prilikom podešavanja imena radne površine %d  u \"%s\": %s\n"
@@ -2139,7 +2143,7 @@ msgstr ""
 msgid "Screen %d on display \"%s\" already has a window manager\n"
 msgstr "Ekran %d na prikazu \"%s\" već ima rukovoditelj prozora\n"
 
-#: src/screen.c:699
+#: src/screen.c:716
 #, c-format
 msgid "Could not release screen %d on display \"%s\"\n"
 msgstr "Nije moguće izbaciti otpustiti ekran %d na prikazu \"%s\"\n"
@@ -3239,7 +3243,7 @@ msgid "Application set a bogus _NET_WM_PID %ld\n"
 msgstr "Aplikacija je postavila prividan _NETWM_PID %ld\n"
 
 #. first time through
-#: src/window.c:4829
+#: src/window.c:5197
 #, c-format
 msgid ""
 "Window %s sets SM_CLIENT_ID on itself, instead of on the WM_CLIENT_LEADER "
@@ -3255,7 +3259,7 @@ msgstr ""
 #. * MWM but not WM_NORMAL_HINTS are basically broken. We complain
 #. * about these apps but make them work.
 #.
-#: src/window.c:5500
+#: src/window.c:5868
 #, c-format
 msgid ""
 "Window %s sets an MWM hint indicating it isn't resizable, but sets min size %"
@@ -3293,6 +3297,9 @@ msgstr ""
 "Svojstvo %s na prozoru 0x%lx sadrži neispravni UTF-8 za predmet %d na "
 "popisu\n"
 
+#~ msgid "Put on _All Workspaces"
+#~ msgstr "Stavi na _sve radne prostore"
+
 #~ msgid "Select how to give focus to windows"
 #~ msgstr "Odaberite kako da usredotočite na prozor"
 

po/id.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: metacity HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-09 21:23-0700\n"
+"POT-Creation-Date: 2005-06-27 17:21-0600\n"
 "PO-Revision-Date: 2003-06-26 22:41+0700\n"
 "Last-Translator: Mohammad DAMT <mdamt@bisnisweb.com>\n"
 "Language-Team: Indonesian <sukarelawan@gnome.linux.or.id>\n"
@@ -60,7 +60,7 @@ msgstr ""
 msgid "Failed to get hostname: %s\n"
 msgstr "Gagal mendapatkan alamat host: %s\n"
 
-#: src/display.c:306
+#: src/display.c:316
 #, c-format
 msgid "Failed to open X Window System display '%s'\n"
 msgstr "Gagal membuka tampilan X Window System '%s'\n"
@@ -81,23 +81,23 @@ msgstr ""
 msgid "Fatal IO error %d (%s) on display '%s'.\n"
 msgstr "Error IO yang fatal berkode %d (%s) pada display '%s'\n"
 
-#: src/frames.c:1020
+#: src/frames.c:1125
 msgid "Close Window"
 msgstr "Tutup Window"
 
-#: src/frames.c:1023
+#: src/frames.c:1128
 msgid "Window Menu"
 msgstr "Menu Window"
 
-#: src/frames.c:1026
+#: src/frames.c:1131
 msgid "Minimize Window"
 msgstr "Kecilkan Window"
 
-#: src/frames.c:1029
+#: src/frames.c:1134
 msgid "Maximize Window"
 msgstr "Besarkan Window maksimal"
 
-#: src/frames.c:1032
+#: src/frames.c:1137
 msgid "Unmaximize Window"
 msgstr "Kembalikan ukuran window semula"
 
@@ -108,19 +108,19 @@ msgid ""
 "binding\n"
 msgstr "Ada program lain yang menggunakan tombol %s dengan kombinasi %x\n"
 
-#: src/keybindings.c:2554
+#: src/keybindings.c:2535
 #, c-format
 msgid "Error launching metacity-dialog to print an error about a command: %s\n"
 msgstr ""
 "Ada error saat menjalankan metacity-dialog untuk menampilkan error suatu "
 "perintah: %s\n"
 
-#: src/keybindings.c:2659
+#: src/keybindings.c:2640
 #, c-format
 msgid "No command %d has been defined.\n"
 msgstr "Tidak ada perintah %d.\n"
 
-#: src/keybindings.c:3489
+#: src/keybindings.c:3485
 #, fuzzy
 msgid "No terminal command has been defined.\n"
 msgstr "Tidak ada perintah %d.\n"
@@ -203,11 +203,13 @@ msgstr "_Tutup"
 
 #. separator
 #: src/menu.c:66
-msgid "Put on _All Workspaces"
-msgstr "Letakkan p_ada semua area kerja"
+#, fuzzy
+msgid "_Always on Visible Workspace"
+msgstr "Le_takkan di area kerja ini saja"
 
 #: src/menu.c:67
-msgid "Only on _This Workspace"
+#, fuzzy
+msgid "_Only on This Workspace"
 msgstr "Le_takkan di area kerja ini saja"
 
 #: src/menu.c:68
@@ -226,7 +228,7 @@ msgstr "Pindahkan jendela ini ke area kerja atas"
 msgid "Move to Workspace _Down"
 msgstr "Pindahkan jendela ini ke area kerja bawah"
 
-#: src/menu.c:162 src/prefs.c:1942
+#: src/menu.c:162 src/prefs.c:1996
 #, c-format
 msgid "Workspace %d"
 msgstr "Area kerja %d"
@@ -358,7 +360,7 @@ msgstr "Judul"
 msgid "Class"
 msgstr "Kelas"
 
-#: src/metacity-dialog.c:262
+#: src/metacity-dialog.c:263
 msgid ""
 "These windows do not support \"save current setup\" and will have to be "
 "restarted manually next time you log in."
@@ -366,7 +368,7 @@ msgstr ""
 "Window ini tidak bisa \"menyimpan setingan aktif saat ini\" dan bila login "
 "kali lain Anda harus menjalankan ulang."
 
-#: src/metacity-dialog.c:323
+#: src/metacity-dialog.c:328
 #, c-format
 msgid ""
 "There was an error running \"%s\":\n"
@@ -502,12 +504,14 @@ msgstr ""
 "huruf yang digunakan aplikasi standar pada judul windownya."
 
 #: src/metacity.schemas.in.h:19
+#, fuzzy
 msgid ""
 "If true, metacity will give the user less feedback and less sense of "
 "\"direct manipulation\", by using wireframes, avoiding animations, or other "
 "means. This is a significant reduction in usability for many users, but may "
 "allow legacy applications and terminal servers to function when they would "
-"otherwise be impractical."
+"otherwise be impractical. However, the wireframe feature is disabled when "
+"accessibility is on to avoid weird desktop breakages."
 msgstr ""
 "Pilih jika ingin metacity memberi reaksi yang lebih sedikit dan melakukan "
 "manipulasi langsung dengan menggunakan bingkai kawat, tidak menjalankan "
@@ -2107,17 +2111,17 @@ msgstr "mode fokus window"
 msgid "Window title font"
 msgstr "Jenis huruf yang dipakai pada judul window"
 
-#: src/prefs.c:476 src/prefs.c:492 src/prefs.c:508 src/prefs.c:524
-#: src/prefs.c:540 src/prefs.c:560 src/prefs.c:576 src/prefs.c:592
-#: src/prefs.c:608 src/prefs.c:624 src/prefs.c:640 src/prefs.c:656
-#: src/prefs.c:672 src/prefs.c:689 src/prefs.c:705 src/prefs.c:721
-#: src/prefs.c:737 src/prefs.c:753 src/prefs.c:768 src/prefs.c:783
-#: src/prefs.c:798
+#: src/prefs.c:501 src/prefs.c:517 src/prefs.c:533 src/prefs.c:549
+#: src/prefs.c:565 src/prefs.c:585 src/prefs.c:601 src/prefs.c:617
+#: src/prefs.c:633 src/prefs.c:649 src/prefs.c:665 src/prefs.c:681
+#: src/prefs.c:697 src/prefs.c:714 src/prefs.c:730 src/prefs.c:746
+#: src/prefs.c:762 src/prefs.c:778 src/prefs.c:793 src/prefs.c:808
+#: src/prefs.c:823 src/prefs.c:839
 #, c-format
 msgid "GConf key \"%s\" is set to an invalid type\n"
 msgstr "Key \"%s\" GConf tipenya salah\n"
 
-#: src/prefs.c:843
+#: src/prefs.c:884
 #, c-format
 msgid ""
 "\"%s\" found in configuration database is not a valid value for mouse button "
@@ -2126,17 +2130,17 @@ msgstr ""
 "\"%s\" yang ada pada database konfigurasi bukanlah nilai yang benar untuk "
 "tombol mouse.\n"
 
-#: src/prefs.c:867 src/prefs.c:1277
+#: src/prefs.c:908 src/prefs.c:1318
 #, c-format
 msgid "GConf key '%s' is set to an invalid value\n"
 msgstr "Key GConf '%s' bernilai salah\n"
 
-#: src/prefs.c:994
+#: src/prefs.c:1035
 #, c-format
 msgid "Could not parse font description \"%s\" from GConf key %s\n"
 msgstr "Tidak dapat membaca deskripsi font \"%s\" dari key GConf %s\n"
 
-#: src/prefs.c:1179
+#: src/prefs.c:1220
 #, c-format
 msgid ""
 "%d stored in GConf key %s is not a reasonable number of workspaces, current "
@@ -2145,7 +2149,7 @@ msgstr ""
 "%d yang ada pada key GConf %s berisi angka yang tidak lazim sebagai jumlah "
 "workspace, karena sudah ditentukan maksimumnya adlaah %d\n"
 
-#: src/prefs.c:1239
+#: src/prefs.c:1280
 msgid ""
 "Workarounds for broken applications disabled. Some applications may not "
 "behave properly.\n"
@@ -2153,18 +2157,18 @@ msgstr ""
 "Pencegahan kesalahan bagi aplikasi yang rusak sedang dinonaktifkan. Mungkin "
 "nanti ada beberapa aplikasi yang akan bertingkah aneh.\n"
 
-#: src/prefs.c:1304
+#: src/prefs.c:1345
 #, c-format
 msgid "%d stored in GConf key %s is out of range 0 to %d\n"
 msgstr ""
 "%d yang disimpan pada key GConf %s berada di luar jangkauan 0 hingga %d\n"
 
-#: src/prefs.c:1425
+#: src/prefs.c:1479
 #, c-format
 msgid "Error setting number of workspaces to %d: %s\n"
 msgstr "Ada error saat mengeset jumlah workspace ke %d: %s\n"
 
-#: src/prefs.c:1669
+#: src/prefs.c:1723
 #, c-format
 msgid ""
 "\"%s\" found in configuration database is not a valid value for keybinding "
@@ -2173,7 +2177,7 @@ msgstr ""
 "\"%s\" yang ada pada database konfigurasi bernilai tidak benar untuk "
 "kombinasi tombol \"%s\"\n"
 
-#: src/prefs.c:2023
+#: src/prefs.c:2077
 #, c-format
 msgid "Error setting name for workspace %d to \"%s\": %s\n"
 msgstr "Ada error saat melakukan seting nama workspace %d ke \"%s\": %s\n"
@@ -2210,7 +2214,7 @@ msgstr ""
 msgid "Screen %d on display \"%s\" already has a window manager\n"
 msgstr "Layar %d pada tampilan \"%s\" sudah ada manajer windownya\n"
 
-#: src/screen.c:699
+#: src/screen.c:716
 #, c-format
 msgid "Could not release screen %d on display \"%s\"\n"
 msgstr "Layar %d pada display \"%s\" tidak dapat dilepas\n"
@@ -3304,7 +3308,7 @@ msgid "Application set a bogus _NET_WM_PID %ld\n"
 msgstr "Aplikasi telah membuat _NET_WM_PID %ld bohongan\n"
 
 #. first time through
-#: src/window.c:4829
+#: src/window.c:5197
 #, c-format
 msgid ""
 "Window %s sets SM_CLIENT_ID on itself, instead of on the WM_CLIENT_LEADER "
@@ -3320,7 +3324,7 @@ msgstr ""
 #. * MWM but not WM_NORMAL_HINTS are basically broken. We complain
 #. * about these apps but make them work.
 #.
-#: src/window.c:5500
+#: src/window.c:5868
 #, c-format
 msgid ""
 "Window %s sets an MWM hint indicating it isn't resizable, but sets min size %"
@@ -3357,6 +3361,9 @@ msgid ""
 msgstr ""
 "Properti %s pada jendela 0x%lx di obyek %d berisi karakter UTF-8 yang salah\n"
 
+#~ msgid "Put on _All Workspaces"
+#~ msgstr "Letakkan p_ada semua area kerja"
+
 #~ msgid "Select how to give focus to windows"
 #~ msgstr "Pilih bagaimana cara fokus dapat dikenakan pada window"
 

po/is.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: metacity\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-09 21:23-0700\n"
+"POT-Creation-Date: 2005-06-27 17:21-0600\n"
 "PO-Revision-Date: 2003-06-22 17:16--100\n"
 "Last-Translator: Samuel Jon Gunnarsson <sammi@techattack.nu>\n"
 "Language-Team: Icelandic <gnome@techattack.nu>\n"
@@ -59,7 +59,7 @@ msgstr ""
 msgid "Failed to get hostname: %s\n"
 msgstr "Ekki tókst að ná í nafn hýsils: %s\n"
 
-#: src/display.c:306
+#: src/display.c:316
 #, c-format
 msgid "Failed to open X Window System display '%s'\n"
 msgstr ""
@@ -77,23 +77,23 @@ msgstr ""
 msgid "Fatal IO error %d (%s) on display '%s'.\n"
 msgstr "Banvæn IO villa %d (%s) á skjá '%s'.\n"
 
-#: src/frames.c:1020
+#: src/frames.c:1125
 msgid "Close Window"
 msgstr "Loka glugga"
 
-#: src/frames.c:1023
+#: src/frames.c:1128
 msgid "Window Menu"
 msgstr "Gluggavalmynd"
 
-#: src/frames.c:1026
+#: src/frames.c:1131
 msgid "Minimize Window"
 msgstr "Lágmarka glugga"
 
-#: src/frames.c:1029
+#: src/frames.c:1134
 msgid "Maximize Window"
 msgstr "Hámarka glugga"
 
-#: src/frames.c:1032
+#: src/frames.c:1137
 msgid "Unmaximize Window"
 msgstr "Minnka glugga"
 
@@ -104,17 +104,17 @@ msgid ""
 "binding\n"
 msgstr ""
 
-#: src/keybindings.c:2554
+#: src/keybindings.c:2535
 #, c-format
 msgid "Error launching metacity-dialog to print an error about a command: %s\n"
 msgstr ""
 
-#: src/keybindings.c:2659
+#: src/keybindings.c:2640
 #, c-format
 msgid "No command %d has been defined.\n"
 msgstr "Engin skipun %d hefur verið skilgreind.\n"
 
-#: src/keybindings.c:3489
+#: src/keybindings.c:3485
 #, fuzzy
 msgid "No terminal command has been defined.\n"
 msgstr "Engin skipun %d hefur verið skilgreind.\n"
@@ -200,11 +200,13 @@ msgstr "_Loka"
 
 #. separator
 #: src/menu.c:66
-msgid "Put on _All Workspaces"
-msgstr "Setj_a á öll vinnusvæði"
+#, fuzzy
+msgid "_Always on Visible Workspace"
+msgstr "Einungis á _þessu vinnusvæði"
 
 #: src/menu.c:67
-msgid "Only on _This Workspace"
+#, fuzzy
+msgid "_Only on This Workspace"
 msgstr "Einungis á _þessu vinnusvæði"
 
 #: src/menu.c:68
@@ -227,7 +229,7 @@ msgstr "Flytja glugga yfir á vinnusvæði 1"
 msgid "Move to Workspace _Down"
 msgstr "Flytja glugga niður um eitt vinnusvæði"
 
-#: src/menu.c:162 src/prefs.c:1942
+#: src/menu.c:162 src/prefs.c:1996
 #, c-format
 msgid "Workspace %d"
 msgstr "Vinnusvæði %d"
@@ -363,13 +365,13 @@ msgstr "Titill"
 msgid "Class"
 msgstr "Klassi"
 
-#: src/metacity-dialog.c:262
+#: src/metacity-dialog.c:263
 msgid ""
 "These windows do not support \"save current setup\" and will have to be "
 "restarted manually next time you log in."
 msgstr ""
 
-#: src/metacity-dialog.c:323
+#: src/metacity-dialog.c:328
 #, c-format
 msgid ""
 "There was an error running \"%s\":\n"
@@ -488,7 +490,8 @@ msgid ""
 "\"direct manipulation\", by using wireframes, avoiding animations, or other "
 "means. This is a significant reduction in usability for many users, but may "
 "allow legacy applications and terminal servers to function when they would "
-"otherwise be impractical."
+"otherwise be impractical. However, the wireframe feature is disabled when "
+"accessibility is on to avoid weird desktop breakages."
 msgstr ""
 
 #: src/metacity.schemas.in.h:20
@@ -1501,64 +1504,64 @@ msgstr "Fókusgerð glugga"
 msgid "Window title font"
 msgstr "Leturgerð gluggatitils"
 
-#: src/prefs.c:476 src/prefs.c:492 src/prefs.c:508 src/prefs.c:524
-#: src/prefs.c:540 src/prefs.c:560 src/prefs.c:576 src/prefs.c:592
-#: src/prefs.c:608 src/prefs.c:624 src/prefs.c:640 src/prefs.c:656
-#: src/prefs.c:672 src/prefs.c:689 src/prefs.c:705 src/prefs.c:721
-#: src/prefs.c:737 src/prefs.c:753 src/prefs.c:768 src/prefs.c:783
-#: src/prefs.c:798
+#: src/prefs.c:501 src/prefs.c:517 src/prefs.c:533 src/prefs.c:549
+#: src/prefs.c:565 src/prefs.c:585 src/prefs.c:601 src/prefs.c:617
+#: src/prefs.c:633 src/prefs.c:649 src/prefs.c:665 src/prefs.c:681
+#: src/prefs.c:697 src/prefs.c:714 src/prefs.c:730 src/prefs.c:746
+#: src/prefs.c:762 src/prefs.c:778 src/prefs.c:793 src/prefs.c:808
+#: src/prefs.c:823 src/prefs.c:839
 #, c-format
 msgid "GConf key \"%s\" is set to an invalid type\n"
 msgstr ""
 
-#: src/prefs.c:843
+#: src/prefs.c:884
 #, c-format
 msgid ""
 "\"%s\" found in configuration database is not a valid value for mouse button "
 "modifier\n"
 msgstr ""
 
-#: src/prefs.c:867 src/prefs.c:1277
+#: src/prefs.c:908 src/prefs.c:1318
 #, c-format
 msgid "GConf key '%s' is set to an invalid value\n"
 msgstr ""
 
-#: src/prefs.c:994
+#: src/prefs.c:1035
 #, c-format
 msgid "Could not parse font description \"%s\" from GConf key %s\n"
 msgstr ""
 
-#: src/prefs.c:1179
+#: src/prefs.c:1220
 #, c-format
 msgid ""
 "%d stored in GConf key %s is not a reasonable number of workspaces, current "
 "maximum is %d\n"
 msgstr ""
 
-#: src/prefs.c:1239
+#: src/prefs.c:1280
 msgid ""
 "Workarounds for broken applications disabled. Some applications may not "
 "behave properly.\n"
 msgstr ""
 
-#: src/prefs.c:1304
+#: src/prefs.c:1345
 #, c-format
 msgid "%d stored in GConf key %s is out of range 0 to %d\n"
 msgstr ""
 
-#: src/prefs.c:1425
+#: src/prefs.c:1479
 #, c-format
 msgid "Error setting number of workspaces to %d: %s\n"
 msgstr ""
 
-#: src/prefs.c:1669
+#: src/prefs.c:1723
 #, c-format
 msgid ""
 "\"%s\" found in configuration database is not a valid value for keybinding "
 "\"%s\"\n"
 msgstr ""
 
-#: src/prefs.c:2023
+#: src/prefs.c:2077
 #, c-format
 msgid "Error setting name for workspace %d to \"%s\": %s\n"
 msgstr ""
@@ -1591,7 +1594,7 @@ msgstr ""
 msgid "Screen %d on display \"%s\" already has a window manager\n"
 msgstr ""
 
-#: src/screen.c:699
+#: src/screen.c:716
 #, c-format
 msgid "Could not release screen %d on display \"%s\"\n"
 msgstr ""
@@ -2642,7 +2645,7 @@ msgid "Application set a bogus _NET_WM_PID %ld\n"
 msgstr ""
 
 #. first time through
-#: src/window.c:4829
+#: src/window.c:5197
 #, c-format
 msgid ""
 "Window %s sets SM_CLIENT_ID on itself, instead of on the WM_CLIENT_LEADER "
@@ -2656,7 +2659,7 @@ msgstr ""
 #. * MWM but not WM_NORMAL_HINTS are basically broken. We complain
 #. * about these apps but make them work.
 #.
-#: src/window.c:5500
+#: src/window.c:5868
 #, c-format
 msgid ""
 "Window %s sets an MWM hint indicating it isn't resizable, but sets min size %"
@@ -2684,6 +2687,9 @@ msgid ""
 "Property %s on window 0x%lx contained invalid UTF-8 for item %d in the list\n"
 msgstr ""
 
+#~ msgid "Put on _All Workspaces"
+#~ msgstr "Setj_a á öll vinnusvæði"
+
 #~ msgid "Select how to give focus to windows"
 #~ msgstr "Veldu hvernig gefa eigi glugga fókus"
 

po/it.po

@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: metacity 2.3.55\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-09 21:23-0700\n"
-"PO-Revision-Date: 2004-09-19 16:36+0200\n"
+"POT-Creation-Date: 2005-06-27 17:21-0600\n"
+"PO-Revision-Date: 2005-02-15 09:14+0100\n"
 "Last-Translator: Luca Ferretti <elle.uca@infinito.it>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
 "MIME-Version: 1.0\n"
@@ -61,7 +61,7 @@ msgstr ""
 msgid "Failed to get hostname: %s\n"
 msgstr "Recupero del nome host fallito: %s\n"
 
-#: src/display.c:306
+#: src/display.c:316
 #, c-format
 msgid "Failed to open X Window System display '%s'\n"
 msgstr "Apertura del display «%s» di X Window System fallita\n"
@@ -82,23 +82,23 @@ msgstr ""
 msgid "Fatal IO error %d (%s) on display '%s'.\n"
 msgstr "Errore fatale di IO %d (%s) relativo al display «%s».\n"
 
-#: src/frames.c:1020
+#: src/frames.c:1125
 msgid "Close Window"
 msgstr "Chiude la finestra"
 
-#: src/frames.c:1023
+#: src/frames.c:1128
 msgid "Window Menu"
 msgstr "Menù della finestra"
 
-#: src/frames.c:1026
+#: src/frames.c:1131
 msgid "Minimize Window"
 msgstr "Minimizza la finestra"
 
-#: src/frames.c:1029
+#: src/frames.c:1134
 msgid "Maximize Window"
 msgstr "Massimizza la finestra"
 
-#: src/frames.c:1032
+#: src/frames.c:1137
 msgid "Unmaximize Window"
 msgstr "Demassimizza la finestra"
 
@@ -111,22 +111,21 @@ msgstr ""
 "Qualche altro programma sta usando come associazione il tasto %s con "
 "modificatore %x\n"
 
-#: src/keybindings.c:2554
+#: src/keybindings.c:2535
 #, c-format
 msgid "Error launching metacity-dialog to print an error about a command: %s\n"
 msgstr ""
 "Errore nell'avviare metacity-dialog per notificare un errore relativo a un "
 "comando: %s\n"
 
-#: src/keybindings.c:2659
+#: src/keybindings.c:2640
 #, c-format
 msgid "No command %d has been defined.\n"
 msgstr "Il comando %d non è stato definito.\n"
 
-#: src/keybindings.c:3489
-#, fuzzy
+#: src/keybindings.c:3485
 msgid "No terminal command has been defined.\n"
-msgstr "Il comando %d non è stato definito.\n"
+msgstr "Nessun comando di terminale è stato definito.\n"
 
 #: src/main.c:69
 msgid ""
@@ -169,9 +168,10 @@ msgstr ""
 msgid "Failed to restart: %s\n"
 msgstr "Riavvio fallito: %s\n"
 
+# mantenere in sync con libwnck
 #: src/menu.c:54
 msgid "Mi_nimize"
-msgstr "Mi_nimizza"
+msgstr "_Minimizza"
 
 #: src/menu.c:55
 msgid "Ma_ximize"
@@ -208,12 +208,12 @@ msgstr "_Chiudi"
 
 #. separator
 #: src/menu.c:66
-msgid "Put on _All Workspaces"
-msgstr "Su t_utte le aree di lavoro"
+msgid "_Always on Visible Workspace"
+msgstr "S_empre sull'area di lavoro visibile"
 
 #: src/menu.c:67
-msgid "Only on _This Workspace"
-msgstr "Solo su q_uesta area di lavoro"
+msgid "_Only on This Workspace"
+msgstr "Solo su _questa area di lavoro"
 
 #: src/menu.c:68
 msgid "Move to Workspace _Left"
@@ -231,7 +231,7 @@ msgstr "Sposta sull'area di lavoro il a_lto"
 msgid "Move to Workspace _Down"
 msgstr "Sposta sull'area di lavoro in _basso"
 
-#: src/menu.c:162 src/prefs.c:1942
+#: src/menu.c:162 src/prefs.c:1996
 #, c-format
 msgid "Workspace %d"
 msgstr "Area di lavoro %d"
@@ -363,7 +363,7 @@ msgstr "Titolo"
 msgid "Class"
 msgstr "Classe"
 
-#: src/metacity-dialog.c:262
+#: src/metacity-dialog.c:263
 msgid ""
 "These windows do not support \"save current setup\" and will have to be "
 "restarted manually next time you log in."
@@ -371,7 +371,7 @@ msgstr ""
 "Queste finestre non supportano \"salva impostazioni attuali\" e dovranno "
 "essere riavviate manualmente al prossimo login."
 
-#: src/metacity-dialog.c:323
+#: src/metacity-dialog.c:328
 #, c-format
 msgid ""
 "There was an error running \"%s\":\n"
@@ -517,13 +517,16 @@ msgid ""
 "\"direct manipulation\", by using wireframes, avoiding animations, or other "
 "means. This is a significant reduction in usability for many users, but may "
 "allow legacy applications and terminal servers to function when they would "
-"otherwise be impractical."
+"otherwise be impractical. However, the wireframe feature is disabled when "
+"accessibility is on to avoid weird desktop breakages."
 msgstr ""
 "Se impostata a vero, metacity fornisce all'utente minore riscontro e minore "
 "senso di \"manipolazione diretta\" usando wireframe, evitando le animazioni "
 "ed altro. Ciò rappresenta una significativa riduzione di facilità d'uso da "
 "parte di molti utenti, ma potrebbe consentire ad applicazioni legacy e "
-"terminal server di funzionare laddove sarebbe invece poco pratico."
+"terminal server di funzionare laddove sarebbe invece poco pratico. La "
+"funzionalità wireframe è disabilitata quando l'accessibilità è attivata per "
+"evitare strani malfunzionamenti del desktop."
 
 #: src/metacity.schemas.in.h:20
 msgid ""
@@ -723,7 +726,7 @@ msgstr "Esegui un comando stabilito"
 
 #: src/metacity.schemas.in.h:60
 msgid "Run a terminal"
-msgstr ""
+msgstr "Esegui un terminale"
 
 #: src/metacity.schemas.in.h:61
 msgid "Show the panel menu"
@@ -823,7 +826,7 @@ msgstr "Passa all'area di lavoro in basso"
 
 #: src/metacity.schemas.in.h:78
 msgid "Switch to workspace on the left"
-msgstr "Passa all'area di lavore a sinistra"
+msgstr "Passa all'area di lavoro a sinistra"
 
 #: src/metacity.schemas.in.h:79
 msgid "Switch to workspace on the right"
@@ -1215,7 +1218,6 @@ msgstr ""
 "allora non c'è alcuna scorciatoia per questa azione."
 
 #: src/metacity.schemas.in.h:109
-#, fuzzy
 msgid ""
 "The keybinding used to maximize a window. The format looks like \"&lt;"
 "Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;F1\". The parser is fairly "
@@ -1731,7 +1733,6 @@ msgstr ""
 "scorciatoia per questa azione."
 
 #: src/metacity.schemas.in.h:142
-#, fuzzy
 msgid ""
 "The keybinding which invokes a terminal. The format looks like \"&lt;"
 "Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;F1\". The parser is fairly "
@@ -1739,11 +1740,11 @@ msgid ""
 "Ctl&gt;\" and \"&lt;Ctrl&gt;\". If you set the option to the special string "
 "\"disabled\", then there will be no keybinding for this action."
 msgstr ""
-"La scorciatoia che mostra il menù principale del pannello. Il formato è "
-"\"&lt;Control$gt;a\" oppure \"&lt;Shift&gt;&lt;Alt&gt;F1\". È consentito "
-"l'utilizzo di lettere maiuscole, minuscole e anche di abbreviazioni tipo "
-"\"&lt;Ctl&gt;\" o \"&lt;Ctrl&gt;\". Se l'opzione è impostata alla stringa "
-"speciale \"disabled\", allora non c'è alcuna scorciatoia per questa azione."
+"La scorciatoia che fa eseguire un terminale. Il formato è \"&lt;Control$gt;a"
+"\" oppure \"&lt;Shift&gt;&lt;Alt&gt;F1\". È consentito l'utilizzo di lettere "
+"maiuscole, minuscole e anche di abbreviazioni tipo \"&lt;Ctl&gt;\" o \"&lt;"
+"Ctrl&gt;\". Se l'opzione è impostata alla stringa speciale \"disabled\", "
+"allora non c'è alcuna scorciatoia per questa azione."
 
 #: src/metacity.schemas.in.h:143
 msgid ""
@@ -1975,17 +1976,17 @@ msgstr "Modalità di focus delle finestre"
 msgid "Window title font"
 msgstr "Carattere per il titolo della finestra"
 
-#: src/prefs.c:476 src/prefs.c:492 src/prefs.c:508 src/prefs.c:524
-#: src/prefs.c:540 src/prefs.c:560 src/prefs.c:576 src/prefs.c:592
-#: src/prefs.c:608 src/prefs.c:624 src/prefs.c:640 src/prefs.c:656
-#: src/prefs.c:672 src/prefs.c:689 src/prefs.c:705 src/prefs.c:721
-#: src/prefs.c:737 src/prefs.c:753 src/prefs.c:768 src/prefs.c:783
-#: src/prefs.c:798
+#: src/prefs.c:501 src/prefs.c:517 src/prefs.c:533 src/prefs.c:549
+#: src/prefs.c:565 src/prefs.c:585 src/prefs.c:601 src/prefs.c:617
+#: src/prefs.c:633 src/prefs.c:649 src/prefs.c:665 src/prefs.c:681
+#: src/prefs.c:697 src/prefs.c:714 src/prefs.c:730 src/prefs.c:746
+#: src/prefs.c:762 src/prefs.c:778 src/prefs.c:793 src/prefs.c:808
+#: src/prefs.c:823 src/prefs.c:839
 #, c-format
 msgid "GConf key \"%s\" is set to an invalid type\n"
 msgstr "La chiave GConf «%s» è impostata ad un tipo non valido\n"
 
-#: src/prefs.c:843
+#: src/prefs.c:884
 #, c-format
 msgid ""
 "\"%s\" found in configuration database is not a valid value for mouse button "
@@ -1994,19 +1995,19 @@ msgstr ""
 "Il valore «%s» nel database di configurazione non è valido per il "
 "modificatore del tasto del mouse\n"
 
-#: src/prefs.c:867 src/prefs.c:1277
+#: src/prefs.c:908 src/prefs.c:1318
 #, c-format
 msgid "GConf key '%s' is set to an invalid value\n"
 msgstr "La chiave GConf «%s» è impostata ad un valore non valido\n"
 
-#: src/prefs.c:994
+#: src/prefs.c:1035
 #, c-format
 msgid "Could not parse font description \"%s\" from GConf key %s\n"
 msgstr ""
 "Impossibile analizzare la descrizione del tipo di carattere «%s» dalla "
 "chiave GConf %s\n"
 
-#: src/prefs.c:1179
+#: src/prefs.c:1220
 #, c-format
 msgid ""
 "%d stored in GConf key %s is not a reasonable number of workspaces, current "
@@ -2015,7 +2016,7 @@ msgstr ""
 "Il valore %d memorizzato nella chiave GConf %s non è un numero ragionevole "
 "di aree di lavoro, il massimo corrente è %d\n"
 
-#: src/prefs.c:1239
+#: src/prefs.c:1280
 msgid ""
 "Workarounds for broken applications disabled. Some applications may not "
 "behave properly.\n"
@@ -2023,19 +2024,19 @@ msgstr ""
 "Funzionalità palliative per la gestione di applicazioni difettose "
 "disabilitate. Alcune applicazioni potrebbero esibire comportamenti errati.\n"
 
-#: src/prefs.c:1304
+#: src/prefs.c:1345
 #, c-format
 msgid "%d stored in GConf key %s is out of range 0 to %d\n"
 msgstr ""
 "Il valore %d memorizzato nella chiave GConf %s è fuori dall'intervallo da 0 "
 "a %d\n"
 
-#: src/prefs.c:1425
+#: src/prefs.c:1479
 #, c-format
 msgid "Error setting number of workspaces to %d: %s\n"
 msgstr "Errore nell'impostare il numero di aree di lavoro a %d: %s\n"
 
-#: src/prefs.c:1669
+#: src/prefs.c:1723
 #, c-format
 msgid ""
 "\"%s\" found in configuration database is not a valid value for keybinding "
@@ -2044,7 +2045,7 @@ msgstr ""
 "Il valore «%s» nel database di configurazione non è valido per la "
 "scorciatoia «%s»\n"
 
-#: src/prefs.c:2023
+#: src/prefs.c:2077
 #, c-format
 msgid "Error setting name for workspace %d to \"%s\": %s\n"
 msgstr "Errore nell'impostare il nome dell'area di lavoro %d a «%s»: %s\n"
@@ -2081,7 +2082,7 @@ msgstr ""
 msgid "Screen %d on display \"%s\" already has a window manager\n"
 msgstr "Lo schermo %d nel display «%s» ha già un window manager\n"
 
-#: src/screen.c:699
+#: src/screen.c:716
 #, c-format
 msgid "Could not release screen %d on display \"%s\"\n"
 msgstr "Impossibile rilasciare lo schermo %d nel display «%s»\n"
@@ -3202,7 +3203,7 @@ msgid "Application set a bogus _NET_WM_PID %ld\n"
 msgstr "L'applicazione ha impostato un _NET_WM_PID errato %ld\n"
 
 #. first time through
-#: src/window.c:4829
+#: src/window.c:5197
 #, c-format
 msgid ""
 "Window %s sets SM_CLIENT_ID on itself, instead of on the WM_CLIENT_LEADER "
@@ -3218,7 +3219,7 @@ msgstr ""
 #. * MWM but not WM_NORMAL_HINTS are basically broken. We complain
 #. * about these apps but make them work.
 #.
-#: src/window.c:5500
+#: src/window.c:5868
 #, c-format
 msgid ""
 "Window %s sets an MWM hint indicating it isn't resizable, but sets min size %"
@@ -3256,24 +3257,3 @@ msgid ""
 msgstr ""
 "La proprietà %s della finestra 0x%lx contiene UTF-8 non valido per "
 "l'elemento %d nella lista\n"
-
-#~ msgid "Select how to give focus to windows"
-#~ msgstr "Imposta come assegnare il focus alle finestre"
-
-#~ msgid "Window Focus"
-#~ msgstr "Focus delle finestre"
-
-#~ msgid "Clic_k to give focus"
-#~ msgstr "_Fare clic per assegnare il focus"
-
-#~ msgid "Focus behavior:"
-#~ msgstr "Comportamento del focus:"
-
-#~ msgid "Window Focus Preferences"
-#~ msgstr "Preferenze del focus delle finestre"
-
-#~ msgid "_Point to give focus"
-#~ msgstr "_Puntare per assegnare il focus"
-
-#~ msgid "_Raise window on focus"
-#~ msgstr "Finestra in p_rimo piano al focus"

po/ko.po

@@ -1,13 +1,13 @@
 # metacity korean translation
 # Young-Ho, Cha <ganadist@chollian.net>, 2002.
-# Changwoo Ryu <cwryu@debian.org>, 2003, 2004.
+# Changwoo Ryu <cwryu@debian.org>, 2003, 2004, 2005.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: metacity 2.5.3\n"
+"Project-Id-Version: metacity 2.9.21\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-09 21:23-0700\n"
-"PO-Revision-Date: 2004-08-15 10:59+0900\n"
+"POT-Creation-Date: 2005-06-27 17:21-0600\n"
+"PO-Revision-Date: 2005-02-18 22:23+0900\n"
 "Last-Translator: Young-Ho, Cha <ganadist at mizi.com>\n"
 "Language-Team: GNOME Korea <gnome-kr-hackers@lists.kldp.net>\n"
 "MIME-Version: 1.0\n"
@@ -59,7 +59,7 @@ msgstr ""
 msgid "Failed to get hostname: %s\n"
 msgstr "호스트 이름 얻기 실패: %s\n"
 
-#: src/display.c:306
+#: src/display.c:316
 #, c-format
 msgid "Failed to open X Window System display '%s'\n"
 msgstr "X 윈도 시스템 디스플레이 '%s'을(를) 여는데 실패하였습니다\n"
@@ -80,23 +80,23 @@ msgstr ""
 msgid "Fatal IO error %d (%s) on display '%s'.\n"
 msgstr "디스플레이 '%3$s'에서 치명적인 입출력 오류 %1$d (%2$s).\n"
 
-#: src/frames.c:1020
+#: src/frames.c:1125
 msgid "Close Window"
 msgstr "창 닫기"
 
-#: src/frames.c:1023
+#: src/frames.c:1128
 msgid "Window Menu"
 msgstr "창 메뉴"
 
-#: src/frames.c:1026
+#: src/frames.c:1131
 msgid "Minimize Window"
 msgstr "창 최소화"
 
-#: src/frames.c:1029
+#: src/frames.c:1134
 msgid "Maximize Window"
 msgstr "창 최대화"
 
-#: src/frames.c:1032
+#: src/frames.c:1137
 msgid "Unmaximize Window"
 msgstr "창 최대화 취소"
 
@@ -109,22 +109,21 @@ msgstr ""
 "몇몇 다른 프로그램에서 이미 단축키로 변경 키 %2$x와(과) 키 %1$s을(를) 사용하"
 "고 있습니다\n"
 
-#: src/keybindings.c:2554
+#: src/keybindings.c:2535
 #, c-format
 msgid "Error launching metacity-dialog to print an error about a command: %s\n"
 msgstr ""
 "명령에 대한 오류를 출력하기 위해 metacity-dialog를 실행하는 중 오류가 발생했"
 "습니다: %s\n"
 
-#: src/keybindings.c:2659
+#: src/keybindings.c:2640
 #, c-format
 msgid "No command %d has been defined.\n"
 msgstr "명령 %d이(가) 정의되지 않았습니다.\n"
 
-#: src/keybindings.c:3489
-#, fuzzy
+#: src/keybindings.c:3485
 msgid "No terminal command has been defined.\n"
-msgstr "명령 %d이(가) 정의되지 않았습니다.\n"
+msgstr "터미널 명령을 정의하지 않았습니다.\n"
 
 #: src/main.c:69
 msgid ""
@@ -205,12 +204,12 @@ msgstr "닫기(_C)"
 
 #. separator
 #: src/menu.c:66
-msgid "Put on _All Workspaces"
-msgstr "모든 작업 공간에 놓기(_A)"
+msgid "_Always on Visible Workspace"
+msgstr "항상 현재 작업 공간에 놓기(_A)"
 
 #: src/menu.c:67
-msgid "Only on _This Workspace"
-msgstr "이 작업 공간에만 놓기(_T)"
+msgid "_Only on This Workspace"
+msgstr "이 작업 공간에만 놓기(_O)"
 
 #: src/menu.c:68
 msgid "Move to Workspace _Left"
@@ -218,7 +217,7 @@ msgstr "왼쪽 작업 공간으로 옮기기(_L)"
 
 #: src/menu.c:69
 msgid "Move to Workspace R_ight"
-msgstr "오른쪽 작업 공간으로 옮기기(_R)"
+msgstr "오른쪽 작업 공간으로 옮기기(_I)"
 
 #: src/menu.c:70
 msgid "Move to Workspace _Up"
@@ -228,7 +227,7 @@ msgstr "위쪽 작업 공간으로 옮기기(_U)"
 msgid "Move to Workspace _Down"
 msgstr "아래쪽 작업 공간으로 옮기기(_D)"
 
-#: src/menu.c:162 src/prefs.c:1942
+#: src/menu.c:162 src/prefs.c:1996
 #, c-format
 msgid "Workspace %d"
 msgstr "작업 공간 %d"
@@ -359,7 +358,7 @@ msgstr "제목"
 msgid "Class"
 msgstr "클래스"
 
-#: src/metacity-dialog.c:262
+#: src/metacity-dialog.c:263
 msgid ""
 "These windows do not support \"save current setup\" and will have to be "
 "restarted manually next time you log in."
@@ -367,7 +366,7 @@ msgstr ""
 "이 창은 \"현재 설정 저장\"을 지원하지 않기 때문에 다음 번에 로그인 할 때수동"
 "으로 재시작 하여야 합니다."
 
-#: src/metacity-dialog.c:323
+#: src/metacity-dialog.c:328
 #, c-format
 msgid ""
 "There was an error running \"%s\":\n"
@@ -502,12 +501,15 @@ msgid ""
 "\"direct manipulation\", by using wireframes, avoiding animations, or other "
 "means. This is a significant reduction in usability for many users, but may "
 "allow legacy applications and terminal servers to function when they would "
-"otherwise be impractical."
+"otherwise be impractical. However, the wireframe feature is disabled when "
+"accessibility is on to avoid weird desktop breakages."
 msgstr ""
 "참이면, 이른바 \"직접 제어\"에 대해서 제대로 지원하지 않게 됩니다. 예를 들어 "
 "애니메이션을 하지 않고 와이어프레임을 쓴다든지 하는 식입니다. \"직접 제어\"하"
 "는 것들은 많은 사용자의 사용성을 떨어뜨리지만, 과거의 프로그램이나 터미널 서"
-"버가 동작하는 데 꼭 필요할 수 있습니다."
+"버가 동작하는 데 꼭 필요할 수 있습니다. 하지만 접근성 기능을 사용할 경우, 데"
+"스크탑이 괴상하게 망가지는 걸 막기 위해 와이어프레임 기능은 사용하지 않습니"
+"다."
 
 #: src/metacity.schemas.in.h:20
 msgid ""
@@ -693,7 +695,7 @@ msgstr "정의한 명령을 실행합니다"
 
 #: src/metacity.schemas.in.h:60
 msgid "Run a terminal"
-msgstr ""
+msgstr "터미널 실행"
 
 #: src/metacity.schemas.in.h:61
 msgid "Show the panel menu"
@@ -1153,7 +1155,6 @@ msgstr ""
 "션에 대한 키바인딩은 없습니다."
 
 #: src/metacity.schemas.in.h:109
-#, fuzzy
 msgid ""
 "The keybinding used to maximize a window. The format looks like \"&lt;"
 "Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;F1\". The parser is fairly "
@@ -1161,10 +1162,10 @@ msgid ""
 "Ctl&gt;\" and \"&lt;Ctrl&gt;\". If you set the option to the special string "
 "\"disabled\", then there will be no keybinding for this action."
 msgstr ""
-"창을 최대화하는 키바인딩. 이 \"&lt;Control&gt;a\" 혹은 \"&lt;Shift&gt;&lt;"
+"창을 최대화하는 키바인딩. \"&lt;Control&gt;a\" 혹은 \"&lt;Shift&gt;&lt;"
 "Alt&gt;F1\"과 같이 씁니다. 파서는 매우 유연하므로 대소문자를 모두 쓸 수 있"
-"고, \"&lt;Ctl&gt;\"나 \"&lt;Ctrl&gt;\"처럼 줄여서 쓸 수도 있습니다. 이 옵션"
-"을 \"disabled\" 스트링으로 하면, 이 액션에 대한 키바인딩은 없습니다."
+"고, \"&lt;Ctl&gt;\" 혹은 \"&lt;Ctrl&gt;\"처럼 줄여서 쓸 수도 있습니다. 이 옵"
+"션을 \"disabled\" 스트링으로 하면, 이 액션에 대한 키바인딩은 없습니다."
 
 #: src/metacity.schemas.in.h:110
 msgid ""
@@ -1176,8 +1177,8 @@ msgid ""
 msgstr ""
 "창을 최소화하는 키바인딩. 이 \"&lt;Control&gt;a\" 혹은 \"&lt;Shift&gt;&lt;"
 "Alt&gt;F1\"과 같이 씁니다. 파서는 매우 유연하므로 대소문자를 모두 쓸 수 있"
-"고, \"&lt;Ctl&gt;\"나 \"&lt;Ctrl&gt;\"처럼 줄여서 쓸 수도 있습니다. 이 옵션"
-"을 \"disabled\" 스트링으로 하면, 이 액션에 대한 키바인딩은 없습니다."
+"고, \"&lt;Ctl&gt;\" 혹은 \"&lt;Ctrl&gt;\"처럼 줄여서 쓸 수도 있습니다. 이 옵"
+"션을 \"disabled\" 스트링으로 하면, 이 액션에 대한 키바인딩은 없습니다."
 
 #: src/metacity.schemas.in.h:111
 msgid ""
@@ -1633,7 +1634,6 @@ msgstr ""
 "은 없습니다."
 
 #: src/metacity.schemas.in.h:142
-#, fuzzy
 msgid ""
 "The keybinding which invokes a terminal. The format looks like \"&lt;"
 "Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;F1\". The parser is fairly "
@@ -1641,10 +1641,10 @@ msgid ""
 "Ctl&gt;\" and \"&lt;Ctrl&gt;\". If you set the option to the special string "
 "\"disabled\", then there will be no keybinding for this action."
 msgstr ""
-"패널의 주 메뉴를 보여주는 키바인딩. \"&lt;Control&gt;a\" 혹은 \"&lt;Shift&gt;"
-"&lt;Alt&gt;F1\"과 같이 씁니다. 파서는 매우 유연하므로 대소문자를 모두 쓸 수 "
-"있고, \"&lt;Ctl&gt;\"나 \"&lt;Ctrl&gt;\"처럼 줄여서 쓸 수도 있습니다. 이 옵션"
-"을 \"disabled\" 스트링으로 하면, 이 액션에 대한 키바인딩은 없습니다."
+"터미널을 실행하는 키바인딩. \"&lt;Control&gt;a\" 혹은 \"&lt;Shift&gt;&lt;"
+"Alt&gt;F1\"과 같이 씁니다. 파서는 매우 유연하므로 대소문자를 모두 쓸 수 있"
+"고, \"&lt;Ctl&gt;\" 혹은 \"&lt;Ctrl&gt;\"처럼 줄여서 쓸 수도 있습니다. 이 옵"
+"션을 \"disabled\" 스트링으로 하면, 이 액션에 대한 키바인딩은 없습니다."
 
 #: src/metacity.schemas.in.h:143
 msgid ""
@@ -1865,17 +1865,17 @@ msgstr "창 포커스 모드"
 msgid "Window title font"
 msgstr "창 제목 글꼴"
 
-#: src/prefs.c:476 src/prefs.c:492 src/prefs.c:508 src/prefs.c:524
-#: src/prefs.c:540 src/prefs.c:560 src/prefs.c:576 src/prefs.c:592
-#: src/prefs.c:608 src/prefs.c:624 src/prefs.c:640 src/prefs.c:656
-#: src/prefs.c:672 src/prefs.c:689 src/prefs.c:705 src/prefs.c:721
-#: src/prefs.c:737 src/prefs.c:753 src/prefs.c:768 src/prefs.c:783
-#: src/prefs.c:798
+#: src/prefs.c:501 src/prefs.c:517 src/prefs.c:533 src/prefs.c:549
+#: src/prefs.c:565 src/prefs.c:585 src/prefs.c:601 src/prefs.c:617
+#: src/prefs.c:633 src/prefs.c:649 src/prefs.c:665 src/prefs.c:681
+#: src/prefs.c:697 src/prefs.c:714 src/prefs.c:730 src/prefs.c:746
+#: src/prefs.c:762 src/prefs.c:778 src/prefs.c:793 src/prefs.c:808
+#: src/prefs.c:823 src/prefs.c:839
 #, c-format
 msgid "GConf key \"%s\" is set to an invalid type\n"
 msgstr "GConf 키 \"%s\"이(가) 잘못된 형식으로 설정되어 있습니다\n"
 
-#: src/prefs.c:843
+#: src/prefs.c:884
 #, c-format
 msgid ""
 "\"%s\" found in configuration database is not a valid value for mouse button "
@@ -1884,17 +1884,17 @@ msgstr ""
 "설정 데이터베이스에서 찾은 \"%s\"이(가) 마우스 단추 설정 키의 올바른 값이 아"
 "닙니다\n"
 
-#: src/prefs.c:867 src/prefs.c:1277
+#: src/prefs.c:908 src/prefs.c:1318
 #, c-format
 msgid "GConf key '%s' is set to an invalid value\n"
 msgstr "GConf 키 '%s'이(가) 잘못된 값으로 설정되어 있습니다\n"
 
-#: src/prefs.c:994
+#: src/prefs.c:1035
 #, c-format
 msgid "Could not parse font description \"%s\" from GConf key %s\n"
 msgstr "GConf 키 %2$s에서 글꼴 지정 \"%1$s\"을(를) 분석할 수 없습니다\n"
 
-#: src/prefs.c:1179
+#: src/prefs.c:1220
 #, c-format
 msgid ""
 "%d stored in GConf key %s is not a reasonable number of workspaces, current "
@@ -1903,7 +1903,7 @@ msgstr ""
 "Gconf 키 %2$s에 저장된 %1$d은(는) 사용할 수 없는 작업 공간 번호 입니다, 현재 "
 "최대값은 %3$d 입니다\n"
 
-#: src/prefs.c:1239
+#: src/prefs.c:1280
 msgid ""
 "Workarounds for broken applications disabled. Some applications may not "
 "behave properly.\n"
@@ -1911,17 +1911,17 @@ msgstr ""
 "응용 프로그램에 대한 임시 방편을 막았습니다. 몇몇 응용프로그램들이 제대로 동"
 "작하지 않을것입니다.\n"
 
-#: src/prefs.c:1304
+#: src/prefs.c:1345
 #, c-format
 msgid "%d stored in GConf key %s is out of range 0 to %d\n"
 msgstr "GConf 키 %2$s에 저장된 %1$d은(는) 0과 %3$d의 범위를 넘었습니다\n"
 
-#: src/prefs.c:1425
+#: src/prefs.c:1479
 #, c-format
 msgid "Error setting number of workspaces to %d: %s\n"
 msgstr "작업 공간의 수를 %d(으)로 설정하는 중 오류: %s\n"
 
-#: src/prefs.c:1669
+#: src/prefs.c:1723
 #, c-format
 msgid ""
 "\"%s\" found in configuration database is not a valid value for keybinding "
@@ -1930,7 +1930,7 @@ msgstr ""
 "설정 데이터베이스에서 찾은 \"%s\"이(가) 단축키 \"%s\"에 대한 올바른 값이 아닙"
 "니다\n"
 
-#: src/prefs.c:2023
+#: src/prefs.c:2077
 #, c-format
 msgid "Error setting name for workspace %d to \"%s\": %s\n"
 msgstr "작업 공간 %d의 이름을 \"%s\"(으)로 설정하는 중 오류: %s\n"
@@ -1966,7 +1966,7 @@ msgid "Screen %d on display \"%s\" already has a window manager\n"
 msgstr ""
 "디스플레이 \"%2$s\"의 화면 %1$d은(는) 이미 창 관리자가 실행되고 있습니다\n"
 
-#: src/screen.c:699
+#: src/screen.c:716
 #, c-format
 msgid "Could not release screen %d on display \"%s\"\n"
 msgstr "디스플레이 \"%2$s\"의 화면 %1$d을(를) 떼어 놓을수 없습니다\n"
@@ -2141,7 +2141,7 @@ msgstr "<%2$s> 요소에 알 수 없는 형식 \"%1$s\""
 #: src/theme-parser.c:1091
 #, c-format
 msgid "Unknown style_set \"%s\" on <%s> element"
-msgstr "<%2$s> 요소에 알 수 없는 스티일 셋 \"%1$s\""
+msgstr "<%2$s> 요소에 알 수 없는 스타일 셋 \"%1$s\""
 
 #: src/theme-parser.c:1099
 #, c-format
@@ -3056,7 +3056,7 @@ msgid "Application set a bogus _NET_WM_PID %ld\n"
 msgstr "응용 프로그램이 가짜 _NET_WM_PID %ld을(를) 설정하였습니다\n"
 
 #. first time through
-#: src/window.c:4829
+#: src/window.c:5197
 #, c-format
 msgid ""
 "Window %s sets SM_CLIENT_ID on itself, instead of on the WM_CLIENT_LEADER "
@@ -3072,7 +3072,7 @@ msgstr ""
 #. * MWM but not WM_NORMAL_HINTS are basically broken. We complain
 #. * about these apps but make them work.
 #.
-#: src/window.c:5500
+#: src/window.c:5868
 #, c-format
 msgid ""
 "Window %s sets an MWM hint indicating it isn't resizable, but sets min size %"
@@ -3108,24 +3108,3 @@ msgid ""
 msgstr ""
 "창 0x%2$lx의 등록 정보 %1$s은(는) 목록안의 항목 %3$d에 잘못된 UTF-8을 포함하"
 "고 있습니다\n"
-
-#~ msgid "Select how to give focus to windows"
-#~ msgstr "창 사이에 포커스 주는 방법을 선택합니다"
-
-#~ msgid "Window Focus"
-#~ msgstr "창 포커스"
-
-#~ msgid "Clic_k to give focus"
-#~ msgstr "마우스를 누르면 포커스 주기(_K)"
-
-#~ msgid "Focus behavior:"
-#~ msgstr "포커스 설정:"
-
-#~ msgid "Window Focus Preferences"
-#~ msgstr "창 포커스 세부 설정"
-
-#~ msgid "_Point to give focus"
-#~ msgstr "마우스 위치에 따라 포커스 주기(_P)"
-
-#~ msgid "_Raise window on focus"
-#~ msgstr "포커스 주면 창 띄우기(_R)"

po/lt.po

@@ -1,15 +1,15 @@
 # Lithuanian translation of metacity.
-# Copyright (C) 2003-2004 Free Software Foundation, Inc.
+# Copyright (C) 2003-2005 Free Software Foundation, Inc.
 # Tomas Kuliavas <tokul@users.sourceforge.net>, 2003.
-# Žygimantas Beručka <uid0@akl.lt>, 2004.
+# Žygimantas Beručka <uid0@akl.lt>, 2004-2005.
 # 
 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: metacity HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-09 21:23-0700\n"
-"PO-Revision-Date: 2004-11-13 12:03+0200\n"
+"POT-Creation-Date: 2005-06-27 17:21-0600\n"
+"PO-Revision-Date: 2005-03-03 13:35+0200\n"
 "Last-Translator: Žygimantas Beručka <uid0@akl.lt>\n"
 "Language-Team: Lithuanian <komp_lt@konferencijos.lt>\n"
 "MIME-Version: 1.0\n"
@@ -23,7 +23,7 @@ msgstr "Naudojimas: %s\n"
 
 #: src/tools/metacity-message.c:176 src/util.c:128
 msgid "Metacity was compiled without support for verbose mode\n"
-msgstr "Metacity buvo sukompiliuota be išsamaus veikimo režimo\n"
+msgstr "Metacity buvo sukompiliuota be išsamaus veikimo veiksenos\n"
 
 #: src/delete.c:63 src/delete.c:90 src/metacity-dialog.c:70
 #: src/theme-parser.c:467
@@ -60,10 +60,10 @@ msgstr ""
 msgid "Failed to get hostname: %s\n"
 msgstr "Nepavyko gauti kompiuterio vardo: %s\n"
 
-#: src/display.c:306
+#: src/display.c:316
 #, c-format
 msgid "Failed to open X Window System display '%s'\n"
-msgstr "Nepavyko atidaryti X Window sistemos ekrano '%s'\n"
+msgstr "Nepavyko atverti X Window sistemos ekrano '%s'\n"
 
 #: src/errors.c:231
 #, c-format
@@ -81,23 +81,23 @@ msgstr ""
 msgid "Fatal IO error %d (%s) on display '%s'.\n"
 msgstr "Kritinė IO klaida %d (%s) ekrane '%s'.\n"
 
-#: src/frames.c:1020
+#: src/frames.c:1125
 msgid "Close Window"
 msgstr "Uždaryti langą"
 
-#: src/frames.c:1023
+#: src/frames.c:1128
 msgid "Window Menu"
 msgstr "Lango meniu"
 
-#: src/frames.c:1026
+#: src/frames.c:1131
 msgid "Minimize Window"
 msgstr "Sumažinti langą"
 
-#: src/frames.c:1029
+#: src/frames.c:1134
 msgid "Maximize Window"
 msgstr "Išdidinti langą"
 
-#: src/frames.c:1032
+#: src/frames.c:1137
 msgid "Unmaximize Window"
 msgstr "Sutraukti langą"
 
@@ -110,19 +110,19 @@ msgstr ""
 "Kažkokia kita programa jau naudoja %s klavišą su modifikatoriais %x kaip "
 "susiejimą\n"
 
-#: src/keybindings.c:2554
+#: src/keybindings.c:2535
 #, c-format
 msgid "Error launching metacity-dialog to print an error about a command: %s\n"
 msgstr ""
 "Įvyko klaida paleidžiant metacity-dialog, išvedantį informaciją apie "
 "komandos klaidą: %s\n"
 
-#: src/keybindings.c:2659
+#: src/keybindings.c:2640
 #, c-format
 msgid "No command %d has been defined.\n"
 msgstr "Komanda %d neaprašyta.\n"
 
-#: src/keybindings.c:3489
+#: src/keybindings.c:3485
 msgid "No terminal command has been defined.\n"
 msgstr "Terminalo komanda nebuvo nurodyta.\n"
 
@@ -208,12 +208,12 @@ msgstr "_Uždaryti"
 
 #. separator
 #: src/menu.c:66
-msgid "Put on _All Workspaces"
-msgstr "P_atalpinti visuose darbo laukuose"
+msgid "_Always on Visible Workspace"
+msgstr "_Visada matomame lauke"
 
 #: src/menu.c:67
-msgid "Only on _This Workspace"
-msgstr "_Talpinti tik šiame darbo lauke"
+msgid "_Only on This Workspace"
+msgstr "_Tik šiame darbo lauke"
 
 #: src/menu.c:68
 msgid "Move to Workspace _Left"
@@ -225,20 +225,20 @@ msgstr "Pe_rkelti langą į dešinįjį darbo lauką"
 
 #: src/menu.c:70
 msgid "Move to Workspace _Up"
-msgstr "Perkelti langą į a_ukštesnį darbo lauką"
+msgstr "Perkelti langą į a_ukštesnįjį darbo lauką"
 
 #: src/menu.c:71
 msgid "Move to Workspace _Down"
-msgstr "Perkelti langą į _žemesnį darbo lauką"
+msgstr "Perkelti langą į ž_emesnįjį darbo lauką"
 
-#: src/menu.c:162 src/prefs.c:1942
+#: src/menu.c:162 src/prefs.c:1996
 #, c-format
 msgid "Workspace %d"
 msgstr "Darbo laukas %d"
 
 #: src/menu.c:171
 msgid "Workspace 1_0"
-msgstr "1_0-as darbo laukas"
+msgstr "1_0-tas darbo laukas"
 
 #: src/menu.c:173
 #, c-format
@@ -362,7 +362,7 @@ msgstr "Antraštė"
 msgid "Class"
 msgstr "Klasė"
 
-#: src/metacity-dialog.c:262
+#: src/metacity-dialog.c:263
 msgid ""
 "These windows do not support \"save current setup\" and will have to be "
 "restarted manually next time you log in."
@@ -370,7 +370,7 @@ msgstr ""
 "Šie langai nepalaiko \"išsaugoti esamus nustatymus\" komandos ir turi būti "
 "paleisti rankiniu būdu, kai Jūs prisijungsite kitą kartą."
 
-#: src/metacity-dialog.c:323
+#: src/metacity-dialog.c:328
 #, c-format
 msgid ""
 "There was an error running \"%s\":\n"
@@ -398,11 +398,11 @@ msgid ""
 "is unset, causing Metacity to fall back to the desktop font even if "
 "titlebar_uses_desktop_font is false."
 msgstr ""
-"Šrifto aprašymo seka nurodanti šriftą naudojamą langų antraštėms. Šrifto "
-"dydis esantis aprašyme naudojamas tik tuo atveju jei titlebar_font_size "
-"požymis yra lygus nuliui. Be to šis požymis atjungiamas, jei "
+"Šrifto aprašymo seka, nurodanti šriftą, naudojamą langų antraštėms. Šrifto "
+"dydis esantis aprašyme naudojamas tik tuo atveju, jei titlebar_font_size "
+"požymis yra lygus nuliui. Be to, šis požymis atjungiamas, jei "
 "titlebar_uses_desktop_font požymis yra teigiamas (true). Standartinė "
-"titlebar_font reikšmė yra nenustatyta ir Metacity naudoja standartinį "
+"titlebar_font reikšmė yra nenustatyta, ir Metacity naudoja standartinį "
 "aplinkos šriftą, nei jei titlebar_uses_desktop_font požymis yra neigiamas "
 "(false)."
 
@@ -428,7 +428,7 @@ msgid ""
 "older versions."
 msgstr ""
 "Mygtukų išdėstymas antraštės juostoje. Požymio reikšmė turi būti simbolių "
-"seka, pvzš \"menu:minimize,maximize,close\"; dvitaškis skiria kairįjį lango "
+"seka, pvz., \"menu:minimize,maximize,close\"; dvitaškis skiria kairįjį lango "
 "kampą nuo dešiniojo, o mygtukų vardai atskiriami kableliais. Mygtukų vardai "
 "neturi pasikartoti. Nežinomi mygtukai yra ignoruojami, tam atvejui jei juos "
 "kada nors naudos būsimos metacity laidos."
@@ -466,8 +466,7 @@ msgstr "Dabartinė tema"
 #: src/metacity.schemas.in.h:12
 msgid "Delay in milliseconds for the auto raise option"
 msgstr ""
-"Uždelsimas milisekundėmis prieš suveikiant automatinio lango iškėlimo "
-"nustatymui"
+"Uždelsimas milisekundėmis prieš suveikiant automatinio lango iškėlimui."
 
 #: src/metacity.schemas.in.h:13
 msgid ""
@@ -514,13 +513,15 @@ msgid ""
 "\"direct manipulation\", by using wireframes, avoiding animations, or other "
 "means. This is a significant reduction in usability for many users, but may "
 "allow legacy applications and terminal servers to function when they would "
-"otherwise be impractical."
+"otherwise be impractical. However, the wireframe feature is disabled when "
+"accessibility is on to avoid weird desktop breakages."
 msgstr ""
-"Jei reikšmė teigiama, metacity pateiks vartotojui mažiau reakcijų ir "
-"„tiesioginių pokyčių\" požymių, naudodama langų rėmelius, vengdama animacijų "
-"ar kitų efektų. Tai smarkiai suprastina sąsajos išraiškingumą, bet leidžia "
-"normaliai veikti senesnėms mašinoms bei terminalų serveriams. Efektų "
-"įjungimas labai pablogintųšių konfiguracijų darbo greitį ir yra nepraktiškas."
+"Jei reikšmė teigiama, metacity, naudodama langų rėmelius, vengdama animacijų "
+"ar kitų efektų, pateiks vartotojui mažiau reakcijų ir bus mažiau jaučiama "
+"„tiesioginė manipuliacija“. Tai smarkiai suprastina sąsajos išraiškingumą, "
+"bet leidžia normaliai veikti senesnėms programoms bei terminalų serveriams, "
+"kai kitu atveju jie būtų nepraktiški. Tačiau, norint išvengti darbastalio "
+"gedimų, kai yra įjungtas prieinamumas, rėmelių naudojimas yra išjungtas."
 
 #: src/metacity.schemas.in.h:20
 msgid ""
@@ -1215,7 +1216,6 @@ msgstr ""
 "požymį \"disabled\", su šiuo veiksmu nebus susieta jokia klavišų kombinacija."
 
 #: src/metacity.schemas.in.h:109
-#, fuzzy
 msgid ""
 "The keybinding used to maximize a window. The format looks like \"&lt;"
 "Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;F1\". The parser is fairly "
@@ -1223,12 +1223,12 @@ msgid ""
 "Ctl&gt;\" and \"&lt;Ctrl&gt;\". If you set the option to the special string "
 "\"disabled\", then there will be no keybinding for this action."
 msgstr ""
-"Klavišų kombinacija, kuri išplečia langą. Klavišų kombinacijos formatas gali "
-"būti panašus į \"&lt;Control&gt;a\" arba \"&lt;Shift&gt;&lt;Alt&gt;F1. "
-"Sistema apdorojanti aprašymą yra gana laisva ir leidžia maišyti didžiąsias "
-"bei mažąsias raides ir naudoti tokius sutrumpinimus kaip \"&lt;Ctl&gt;\" ir "
-"\"&lt;Ctrl&gt;\". Nustačius specialų požymį \"disabled\", su šiuo veiksmu "
-"nebus susieta jokia klavišų kombinacija."
+"Klavišų kombinacija, naudojama išplėsti langui. Klavišų kombinacijos "
+"formatas gali būti panašus į „&lt;Control&gt;a“ arba „&lt;Shift&gt;&lt;"
+"Alt&gt;F1“. Sistema apdorojanti aprašymą yra gana laisva ir leidžia maišyti "
+"didžiąsias bei mažąsias raides ir naudoti tokius sutrumpinimus kaip „&lt;"
+"Ctl&gt;“ ir „&lt;Ctrl&gt;“. Nustačius specialų požymį „disabled“, su šiuo "
+"veiksmu nebus susieta jokia klavišų kombinacija."
 
 #: src/metacity.schemas.in.h:110
 msgid ""
@@ -1764,7 +1764,7 @@ msgid ""
 "will be no keybinding for this action."
 msgstr ""
 "Klavišų kombinacija, kuri paleidžia skydelio ekrano vaizdo kopijų darymo "
-"programą tam, kad padaryti lango vaizdo kopiją. Klavišų kombinacijos "
+"programą tam, kad toji padarytų lango vaizdo kopiją. Klavišų kombinacijos "
 "formatas gali būti panašus į \"&lt;Control&gt;a\" arba \"&lt;Shift&gt;&lt;"
 "Alt&gt;F1. Sistema apdorojanti aprašymą yra gana laisva ir leidžia maišyti "
 "didžiąsias bei mažąsias raides ir naudoti tokius sutrumpinimus kaip \"&lt;"
@@ -1836,7 +1836,7 @@ msgstr ""
 "galimos reikšmės; \"click\" reiškia, kad reikia spragtelėti ant lango norint "
 "jį aktyvuoti, \"sloppy\" aktyvuoja langus kai ant jų užvedamas pelės "
 "kursorius, o \"mouse\" reiškia, kad langai bus aktyvuojami kai ant jų bus "
-"užvestes kursorius ir aktyvacija bus atšaukta kursoriui pasitraukus."
+"užvestas kursorius ir aktyvacija bus atšaukta kursoriui pasitraukus."
 
 #: src/metacity.schemas.in.h:151
 msgid "The window screenshot command"
@@ -1984,17 +1984,17 @@ msgstr "Langų fokusavimo režimas"
 msgid "Window title font"
 msgstr "Lango antraštės šriftas"
 
-#: src/prefs.c:476 src/prefs.c:492 src/prefs.c:508 src/prefs.c:524
-#: src/prefs.c:540 src/prefs.c:560 src/prefs.c:576 src/prefs.c:592
-#: src/prefs.c:608 src/prefs.c:624 src/prefs.c:640 src/prefs.c:656
-#: src/prefs.c:672 src/prefs.c:689 src/prefs.c:705 src/prefs.c:721
-#: src/prefs.c:737 src/prefs.c:753 src/prefs.c:768 src/prefs.c:783
-#: src/prefs.c:798
+#: src/prefs.c:501 src/prefs.c:517 src/prefs.c:533 src/prefs.c:549
+#: src/prefs.c:565 src/prefs.c:585 src/prefs.c:601 src/prefs.c:617
+#: src/prefs.c:633 src/prefs.c:649 src/prefs.c:665 src/prefs.c:681
+#: src/prefs.c:697 src/prefs.c:714 src/prefs.c:730 src/prefs.c:746
+#: src/prefs.c:762 src/prefs.c:778 src/prefs.c:793 src/prefs.c:808
+#: src/prefs.c:823 src/prefs.c:839
 #, c-format
 msgid "GConf key \"%s\" is set to an invalid type\n"
 msgstr "GConf raktui „%s“ nustatytas neteisingas tipas\n"
 
-#: src/prefs.c:843
+#: src/prefs.c:884
 #, c-format
 msgid ""
 "\"%s\" found in configuration database is not a valid value for mouse button "
@@ -2003,17 +2003,17 @@ msgstr ""
 "„%s“ reikšmė rasta nustatymų duomenų bazėje yra netinkama pelės mygtuko "
 "keitiklio aprašymui\n"
 
-#: src/prefs.c:867 src/prefs.c:1277
+#: src/prefs.c:908 src/prefs.c:1318
 #, c-format
 msgid "GConf key '%s' is set to an invalid value\n"
 msgstr "GConf raktas '%s' saugo netinkamą reikšmę\n"
 
-#: src/prefs.c:994
+#: src/prefs.c:1035
 #, c-format
 msgid "Could not parse font description \"%s\" from GConf key %s\n"
 msgstr "Nepavyko apdoroti šrifto aprašymo „%s“ saugomo GConf rakte %s\n"
 
-#: src/prefs.c:1179
+#: src/prefs.c:1220
 #, c-format
 msgid ""
 "%d stored in GConf key %s is not a reasonable number of workspaces, current "
@@ -2022,7 +2022,7 @@ msgstr ""
 "%d reikšmė saugoma GConf rakte %s nurodo nepriimtina darbo laukų skaičių, "
 "šiuo metu maksimali reikšmė yra %d\n"
 
-#: src/prefs.c:1239
+#: src/prefs.c:1280
 msgid ""
 "Workarounds for broken applications disabled. Some applications may not "
 "behave properly.\n"
@@ -2030,17 +2030,17 @@ msgstr ""
 "Apsauga nuo sugadintų programų atjungta. Kai kurios programos gali pradėti "
 "keistai elgtis.\n"
 
-#: src/prefs.c:1304
+#: src/prefs.c:1345
 #, c-format
 msgid "%d stored in GConf key %s is out of range 0 to %d\n"
 msgstr "%d reikšmė saugoma GConf rakte %s netelpra tarp 0 ir %d\n"
 
-#: src/prefs.c:1425
+#: src/prefs.c:1479
 #, c-format
 msgid "Error setting number of workspaces to %d: %s\n"
 msgstr "Įvyko klaida nustatant darbo laukų skaičių į %d: %s\n"
 
-#: src/prefs.c:1669
+#: src/prefs.c:1723
 #, c-format
 msgid ""
 "\"%s\" found in configuration database is not a valid value for keybinding "
@@ -2049,7 +2049,7 @@ msgstr ""
 "„%s“ reikšmė rasta konfiguracijos duomenų bazė yra netinkama klavišų "
 "kombinacijai „%s“\n"
 
-#: src/prefs.c:2023
+#: src/prefs.c:2077
 #, c-format
 msgid "Error setting name for workspace %d to \"%s\": %s\n"
 msgstr "Įvyko klaida pervadinant darbo lauką %d į „%s“: %s\n"
@@ -2071,7 +2071,7 @@ msgid ""
 "replace option to replace the current window manager.\n"
 msgstr ""
 "Ekranas %d vaizduoklyje „%s“ jau turi langų tvarkyklę; pabandykite "
-"pasinaudoti --replace raktu kad pakeisti esamą langų tvarkyklę.\n"
+"pasinaudoti --replace raktu, jei norite pakeisti esamą langų tvarkyklę.\n"
 
 #: src/screen.c:448
 #, c-format
@@ -2085,7 +2085,7 @@ msgstr ""
 msgid "Screen %d on display \"%s\" already has a window manager\n"
 msgstr "Ekranas %d vaizduoklyje „%s“ jau turi langų tvarkyklę\n"
 
-#: src/screen.c:699
+#: src/screen.c:716
 #, c-format
 msgid "Could not release screen %d on display \"%s\"\n"
 msgstr "Nepavyko pasitraukti iš ekrano %d vaizduoklyje „%s“\n"
@@ -2098,7 +2098,7 @@ msgstr "Nepavyko sukurti aplanko '%s': %s\n"
 #: src/session.c:901
 #, c-format
 msgid "Could not open session file '%s' for writing: %s\n"
-msgstr "Nepavyko rašymui atidaryti sesijos bylos '%s': %s\n"
+msgstr "Nepavyko rašymui atverti sesijos bylos '%s': %s\n"
 
 #: src/session.c:1053
 #, c-format
@@ -2736,11 +2736,11 @@ msgstr "/Langai/_Darbastalis"
 
 #: src/theme-viewer.c:131
 msgid "Open another one of these windows"
-msgstr "Atidaryti dar vieną tokį langą"
+msgstr "Atverti dar vieną tokį langą"
 
 #: src/theme-viewer.c:138
 msgid "This is a demo button with an 'open' icon"
-msgstr "Tai yra bandomasis mygtukas su „atidaryti“ ženklu"
+msgstr "Tai yra bandomasis mygtukas su „atverti“ ženklu"
 
 #: src/theme-viewer.c:145
 msgid "This is a demo button with a 'quit' icon"
@@ -2765,23 +2765,23 @@ msgstr "Juosta"
 
 #: src/theme-viewer.c:377
 msgid "Normal Application Window"
-msgstr "Įprastas Programos Langas"
+msgstr "Įprastas programos langas"
 
 #: src/theme-viewer.c:382
 msgid "Dialog Box"
-msgstr "Dialogo Langas"
+msgstr "Dialogo langas"
 
 #: src/theme-viewer.c:387
 msgid "Modal Dialog Box"
-msgstr "Modulinis Dialogo Langas"
+msgstr "Modalinis dialogo langas"
 
 #: src/theme-viewer.c:392
 msgid "Utility Palette"
-msgstr "Įrankių Paletė"
+msgstr "Įrankių paletė"
 
 #: src/theme-viewer.c:397
 msgid "Torn-off Menu"
-msgstr "Nuplėšiamas Meniu"
+msgstr "Nuplėšiamas meniu"
 
 #: src/theme-viewer.c:402
 msgid "Border"
@@ -2813,19 +2813,19 @@ msgstr "Tema „%s“ įkelta per %g sekundžių\n"
 
 #: src/theme-viewer.c:839
 msgid "Normal Title Font"
-msgstr "Normalus Antraštės Šriftas"
+msgstr "Normalus antraštės šriftas"
 
 #: src/theme-viewer.c:845
 msgid "Small Title Font"
-msgstr "Smulkus Antraštės Šriftas"
+msgstr "Smulkus antraštės šriftas"
 
 #: src/theme-viewer.c:851
 msgid "Large Title Font"
-msgstr "Didelis Antraštės Šriftas"
+msgstr "Didelis antraštės šriftas"
 
 #: src/theme-viewer.c:856
 msgid "Button Layouts"
-msgstr "Mygtukų Išdėstymai"
+msgstr "Mygtukų išdėstymai"
 
 #: src/theme-viewer.c:861
 msgid "Benchmark"
@@ -2833,7 +2833,7 @@ msgstr "Greičio testas"
 
 #: src/theme-viewer.c:908
 msgid "Window Title Goes Here"
-msgstr "Čia Rodomo Lango Antraštė"
+msgstr "Čia rodomo lango antraštė"
 
 #: src/theme-viewer.c:1012
 #, c-format
@@ -2934,8 +2934,8 @@ msgid ""
 "where NORMAL is the state; could not parse \"%s\""
 msgstr ""
 "GTK spalvų aprašymas turi turėti būsenos aprašymą patalpintą tarp laužtinių "
-"skliaustų, pvz.: gtk:fg[NORMAL] kai NORMAL yra būsena; nepavyko apdoroti \"%s"
-"\""
+"skliaustų, pvz.: gtk:fg[NORMAL], kur NORMAL yra būsena; nepavyko apdoroti \"%"
+"s\""
 
 #: src/theme.c:989
 #, c-format
@@ -2944,8 +2944,8 @@ msgid ""
 "fg[NORMAL] where NORMAL is the state; could not parse \"%s\""
 msgstr ""
 "GTK spalvų aprašymas po būsenos turi turėti uždarančius laužtinius "
-"skliaustus, pvz.: gtk:fg[NORMAL] kai NORMAL yra būsena; nepavyko apdoroti \"%"
-"s\""
+"skliaustus, pvz.: gtk:fg[NORMAL], kur NORMAL yra būsena; nepavyko apdoroti "
+"\"%s\""
 
 #: src/theme.c:1000
 #, c-format
@@ -3004,7 +3004,7 @@ msgstr "Nepavyko apdoroti spalvos \"%s\""
 #: src/theme.c:1423
 #, c-format
 msgid "Coordinate expression contains character '%s' which is not allowed"
-msgstr "Koordinačių išraiška turi simbolį '%s', kuris yra neleistinas"
+msgstr "Koordinačių išraiška turi neleistiną simbolį '%s'"
 
 #: src/theme.c:1450
 #, c-format
@@ -3042,8 +3042,8 @@ msgstr "Koordinačių išraiška sukelia dalybą iš nulio"
 msgid ""
 "Coordinate expression tries to use mod operator on a floating-point number"
 msgstr ""
-"Koordinačių išraiška bando panaudoti mod operatorių kartu su slankaus "
-"kablelio skaičiumi"
+"Koordinačių išraiška bando panaudoti liekanos operatorių (mod) slankaus "
+"kablelio skaičiui"
 
 #: src/theme.c:1840
 #, c-format
@@ -3166,7 +3166,7 @@ msgstr "Konstata \"%s\" jau aprašyta"
 #: src/util.c:93
 #, c-format
 msgid "Failed to open debug log: %s\n"
-msgstr "Nepavyko atverti testavimo žurnalo: %s\n"
+msgstr "Nepavyko atverti derinimo žurnalo: %s\n"
 
 #: src/util.c:103
 #, c-format
@@ -3176,7 +3176,7 @@ msgstr "Funkcija fdopen() nepavyko su žurnalo byla %s: %s\n"
 #: src/util.c:109
 #, c-format
 msgid "Opened log file %s\n"
-msgstr "Atidaryta žurnalo byla %s\n"
+msgstr "Atverta žurnalo byla %s\n"
 
 #: src/util.c:203
 msgid "Window manager: "
@@ -3200,14 +3200,14 @@ msgid "Application set a bogus _NET_WM_PID %ld\n"
 msgstr "Programa nustatė apgaulingą _NET_WM_PID %ld požymį\n"
 
 #. first time through
-#: src/window.c:4829
+#: src/window.c:5197
 #, c-format
 msgid ""
 "Window %s sets SM_CLIENT_ID on itself, instead of on the WM_CLIENT_LEADER "
 "window as specified in the ICCCM.\n"
 msgstr ""
-"Langas %s nustatė SM_CLIENT_ID kintamajį į save patį vietoj to, kad "
-"nustatyti jį į WM_CLIENT_LEADER langą kaip nurodo ICCCM.\n"
+"Langas %s nustatė SM_CLIENT_ID kintamajį į save patį vietoj to, kad ustatytų "
+"jį į WM_CLIENT_LEADER langą kaip nurodo ICCCM..\n"
 
 #. We ignore mwm_has_resize_func because WM_NORMAL_HINTS is the
 #. * authoritative source for that info. Some apps such as mplayer or
@@ -3216,7 +3216,7 @@ msgstr ""
 #. * MWM but not WM_NORMAL_HINTS are basically broken. We complain
 #. * about these apps but make them work.
 #.
-#: src/window.c:5500
+#: src/window.c:5868
 #, c-format
 msgid ""
 "Window %s sets an MWM hint indicating it isn't resizable, but sets min size %"
@@ -3254,6 +3254,9 @@ msgstr ""
 "Požymis %s lange 0x%lx naudoja nepriimtinus UTF-8 simbolius sąrašo punkte %"
 "d\n"
 
+#~ msgid "Put on _All Workspaces"
+#~ msgstr "P_atalpinti visuose darbo laukuose"
+
 #~ msgid "Select how to give focus to windows"
 #~ msgstr "Pasirinkite kaip aktyvuoti langus"
 

po/lv.po

@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: metacity\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-09 21:23-0700\n"
+"POT-Creation-Date: 2005-06-27 17:21-0600\n"
 "PO-Revision-Date: 2002-12-22 01:07+0200\n"
 "Last-Translator: Artis Trops <hornet@navigators.lv>\n"
 "Language-Team: Latvian <ll10nt@os.lv>\n"
@@ -58,7 +58,7 @@ msgstr ""
 msgid "Failed to get hostname: %s\n"
 msgstr "Neizdevās dabūt resursdatora nosaukumu: %s\n"
 
-#: src/display.c:306
+#: src/display.c:316
 #, c-format
 msgid "Failed to open X Window System display '%s'\n"
 msgstr "Nevarēja atvērt X Logu Sistēmas displeju '%s'\n"
@@ -79,23 +79,23 @@ msgstr ""
 msgid "Fatal IO error %d (%s) on display '%s'.\n"
 msgstr "Fatāla IO kļūda %d (%s) displejā '%s'.\n"
 
-#: src/frames.c:1020
+#: src/frames.c:1125
 msgid "Close Window"
 msgstr "Aizvērt Logu"
 
-#: src/frames.c:1023
+#: src/frames.c:1128
 msgid "Window Menu"
 msgstr "Loga Izvēlne"
 
-#: src/frames.c:1026
+#: src/frames.c:1131
 msgid "Minimize Window"
 msgstr "Samazināt Logu"
 
-#: src/frames.c:1029
+#: src/frames.c:1134
 msgid "Maximize Window"
 msgstr "Maksimizēt Logu"
 
-#: src/frames.c:1032
+#: src/frames.c:1137
 msgid "Unmaximize Window"
 msgstr "Atjaunot Logu"
 
@@ -107,17 +107,17 @@ msgid ""
 msgstr ""
 "Kāda cita programma jau lieto taustiņu %s ar modifcētājiem %x kā sasaisti\n"
 
-#: src/keybindings.c:2554
+#: src/keybindings.c:2535
 #, c-format
 msgid "Error launching metacity-dialog to print an error about a command: %s\n"
 msgstr "Kļūda palaižot metacity-dialogu, lai parādītu kļūdu par komandu: %s\n"
 
-#: src/keybindings.c:2659
+#: src/keybindings.c:2640
 #, c-format
 msgid "No command %d has been defined.\n"
 msgstr "Neviena komanda %d netika definēta.\n"
 
-#: src/keybindings.c:3489
+#: src/keybindings.c:3485
 #, fuzzy
 msgid "No terminal command has been defined.\n"
 msgstr "Neviena komanda %d netika definēta.\n"
@@ -202,11 +202,13 @@ msgstr "_Aizvērt"
 
 #. separator
 #: src/menu.c:66
-msgid "Put on _All Workspaces"
-msgstr "Novietot uz Visām D_arba vietām"
+#, fuzzy
+msgid "_Always on Visible Workspace"
+msgstr "Tikai uz Šīs Darba vie_tas"
 
 #: src/menu.c:67
-msgid "Only on _This Workspace"
+#, fuzzy
+msgid "_Only on This Workspace"
 msgstr "Tikai uz Šīs Darba vie_tas"
 
 #: src/menu.c:68
@@ -229,7 +231,7 @@ msgstr "Pārvietot logu uz darba vietu 1"
 msgid "Move to Workspace _Down"
 msgstr "Pārvietot logu par vienu darba vietu lejup"
 
-#: src/menu.c:162 src/prefs.c:1942
+#: src/menu.c:162 src/prefs.c:1996
 #, c-format
 msgid "Workspace %d"
 msgstr "Darba vieta %d"
@@ -361,7 +363,7 @@ msgstr "Nosaukums"
 msgid "Class"
 msgstr "Klase"
 
-#: src/metacity-dialog.c:262
+#: src/metacity-dialog.c:263
 msgid ""
 "These windows do not support \"save current setup\" and will have to be "
 "restarted manually next time you log in."
@@ -369,7 +371,7 @@ msgstr ""
 "Šie logi neatbalsta \"saglabāt pašreizējos uzstādījumus\" un būs jāpārsāknē "
 "pašrocīgi nākamreiz, kad pieteiksieties."
 
-#: src/metacity-dialog.c:323
+#: src/metacity-dialog.c:328
 #, c-format
 msgid ""
 "There was an error running \"%s\":\n"
@@ -508,7 +510,8 @@ msgid ""
 "\"direct manipulation\", by using wireframes, avoiding animations, or other "
 "means. This is a significant reduction in usability for many users, but may "
 "allow legacy applications and terminal servers to function when they would "
-"otherwise be impractical."
+"otherwise be impractical. However, the wireframe feature is disabled when "
+"accessibility is on to avoid weird desktop breakages."
 msgstr ""
 
 #: src/metacity.schemas.in.h:20
@@ -2001,17 +2004,17 @@ msgstr "Logu fokusēšanās režīms"
 msgid "Window title font"
 msgstr "Loga nosaukuma fonts"
 
-#: src/prefs.c:476 src/prefs.c:492 src/prefs.c:508 src/prefs.c:524
-#: src/prefs.c:540 src/prefs.c:560 src/prefs.c:576 src/prefs.c:592
-#: src/prefs.c:608 src/prefs.c:624 src/prefs.c:640 src/prefs.c:656
-#: src/prefs.c:672 src/prefs.c:689 src/prefs.c:705 src/prefs.c:721
-#: src/prefs.c:737 src/prefs.c:753 src/prefs.c:768 src/prefs.c:783
-#: src/prefs.c:798
+#: src/prefs.c:501 src/prefs.c:517 src/prefs.c:533 src/prefs.c:549
+#: src/prefs.c:565 src/prefs.c:585 src/prefs.c:601 src/prefs.c:617
+#: src/prefs.c:633 src/prefs.c:649 src/prefs.c:665 src/prefs.c:681
+#: src/prefs.c:697 src/prefs.c:714 src/prefs.c:730 src/prefs.c:746
+#: src/prefs.c:762 src/prefs.c:778 src/prefs.c:793 src/prefs.c:808
+#: src/prefs.c:823 src/prefs.c:839
 #, c-format
 msgid "GConf key \"%s\" is set to an invalid type\n"
 msgstr "GConf atslēga \"%s\" ir uzstādīta uz nederīgu tipu\n"
 
-#: src/prefs.c:843
+#: src/prefs.c:884
 #, c-format
 msgid ""
 "\"%s\" found in configuration database is not a valid value for mouse button "
@@ -2020,17 +2023,17 @@ msgstr ""
 "\"%s\", atrasta konfigurācijas datu bāzē, nav derīga vērtība peles pogas "
 "modifikatoram\n"
 
-#: src/prefs.c:867 src/prefs.c:1277
+#: src/prefs.c:908 src/prefs.c:1318
 #, c-format
 msgid "GConf key '%s' is set to an invalid value\n"
 msgstr "GConf atslēga '%s' ir uzstādīta uz nederīgu vērtību\n"
 
-#: src/prefs.c:994
+#: src/prefs.c:1035
 #, c-format
 msgid "Could not parse font description \"%s\" from GConf key %s\n"
 msgstr "Nespēja parsēt fonta aprakstu \"%s\" no GConf atslēgas %s\n"
 
-#: src/prefs.c:1179
+#: src/prefs.c:1220
 #, c-format
 msgid ""
 "%d stored in GConf key %s is not a reasonable number of workspaces, current "
@@ -2039,7 +2042,7 @@ msgstr ""
 "%d, kas saglabāts GConf atslēgā %s, nav saprātīgs darba vietu skaits, "
 "pašreizējais maksimums ir %d\n"
 
-#: src/prefs.c:1239
+#: src/prefs.c:1280
 msgid ""
 "Workarounds for broken applications disabled. Some applications may not "
 "behave properly.\n"
@@ -2047,17 +2050,17 @@ msgstr ""
 "Apvedceļi sabojātām aplikācijām deaktivizēti. Dažas aplikācijas var "
 "neuzvesties atbilstoši.\n"
 
-#: src/prefs.c:1304
+#: src/prefs.c:1345
 #, c-format
 msgid "%d stored in GConf key %s is out of range 0 to %d\n"
 msgstr "%d, kas saglabāts GConf atslēgā %s, ir ārpus 0 līdz %d diapazona\n"
 
-#: src/prefs.c:1425
+#: src/prefs.c:1479
 #, c-format
 msgid "Error setting number of workspaces to %d: %s\n"
 msgstr "Kļūda iestatot darba vietu daudzumu uz %d: %s\n"
 
-#: src/prefs.c:1669
+#: src/prefs.c:1723
 #, c-format
 msgid ""
 "\"%s\" found in configuration database is not a valid value for keybinding "
@@ -2066,7 +2069,7 @@ msgstr ""
 "\"%s\", atrasta konfigurācijas datu bāzē, nav derīga vērtība "
 "taustiņsasaistei \"%s\"\n"
 
-#: src/prefs.c:2023
+#: src/prefs.c:2077
 #, c-format
 msgid "Error setting name for workspace %d to \"%s\": %s\n"
 msgstr "Kļūda iestatot darba vietas %d nosaukumu uz \"%s\": %s\n"
@@ -2101,7 +2104,7 @@ msgstr "Nevarēju iegūt logu pārvaldnieka izvēli ekrāna %d displejā \"%s\"\
 msgid "Screen %d on display \"%s\" already has a window manager\n"
 msgstr "Ekrāna %d displejam \"%s\" jau ir logu pārvaldnieks\n"
 
-#: src/screen.c:699
+#: src/screen.c:716
 #, c-format
 msgid "Could not release screen %d on display \"%s\"\n"
 msgstr "Nevarēju atlaist ekrānu %d uz displeja \"%s\"\n"
@@ -3194,7 +3197,7 @@ msgid "Application set a bogus _NET_WM_PID %ld\n"
 msgstr "Aplikācija iestatīja neīstu _NET_WM_PID %ld\n"
 
 #. first time through
-#: src/window.c:4829
+#: src/window.c:5197
 #, c-format
 msgid ""
 "Window %s sets SM_CLIENT_ID on itself, instead of on the WM_CLIENT_LEADER "
@@ -3210,7 +3213,7 @@ msgstr ""
 #. * MWM but not WM_NORMAL_HINTS are basically broken. We complain
 #. * about these apps but make them work.
 #.
-#: src/window.c:5500
+#: src/window.c:5868
 #, c-format
 msgid ""
 "Window %s sets an MWM hint indicating it isn't resizable, but sets min size %"
@@ -3246,6 +3249,9 @@ msgid ""
 msgstr ""
 "Rekvizīts %slogā 0x%lx saturēja nederīgu UTF-8 priekšmetam %d no saraksta\n"
 
+#~ msgid "Put on _All Workspaces"
+#~ msgstr "Novietot uz Visām D_arba vietām"
+
 #~ msgid "Select how to give focus to windows"
 #~ msgstr "Izvēlies, kā fokusēt logus"
 

po/ml.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:metacity.HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-09 21:23-0700\n"
+"POT-Creation-Date: 2005-06-27 17:21-0600\n"
 "PO-Revision-Date: 2003-07-05 10:29+0530\n"
 "Last-Translator: FSF-India <locale@gnu.org.in>\n"
 "Language-Team: Malayalam <locale@gnu.org.in>\n"
@@ -57,7 +57,7 @@ msgstr ""
 msgid "Failed to get hostname: %s\n"
 msgstr "ആതിഥേയനാമം ലഭിക്കുന്നതില്‌ പരാജയപ്പെട്ടു: %s\n"
 
-#: src/display.c:306
+#: src/display.c:316
 #, c-format
 msgid "Failed to open X Window System display '%s'\n"
 msgstr "XWindow തുറക്കുന്നതില്‌ പരാജയം : %s\n"
@@ -75,23 +75,23 @@ msgstr ""
 msgid "Fatal IO error %d (%s) on display '%s'.\n"
 msgstr ""
 
-#: src/frames.c:1020
+#: src/frames.c:1125
 msgid "Close Window"
 msgstr "ജാലകം അടയ്‍ക്കുക"
 
-#: src/frames.c:1023
+#: src/frames.c:1128
 msgid "Window Menu"
 msgstr "ജാലക പട്ടിക‌"
 
-#: src/frames.c:1026
+#: src/frames.c:1131
 msgid "Minimize Window"
 msgstr "ജാലകം ചെറുതാക്കുക"
 
-#: src/frames.c:1029
+#: src/frames.c:1134
 msgid "Maximize Window"
 msgstr "ജാലകം വലുതാക്കുക"
 
-#: src/frames.c:1032
+#: src/frames.c:1137
 msgid "Unmaximize Window"
 msgstr "ജാലകം വലുതാക്കിയതൊഴിവാക്കുക"
 
@@ -102,17 +102,17 @@ msgid ""
 "binding\n"
 msgstr ""
 
-#: src/keybindings.c:2554
+#: src/keybindings.c:2535
 #, c-format
 msgid "Error launching metacity-dialog to print an error about a command: %s\n"
 msgstr ""
 
-#: src/keybindings.c:2659
+#: src/keybindings.c:2640
 #, c-format
 msgid "No command %d has been defined.\n"
 msgstr ""
 
-#: src/keybindings.c:3489
+#: src/keybindings.c:3485
 msgid "No terminal command has been defined.\n"
 msgstr ""
 
@@ -187,11 +187,13 @@ msgstr "അടയ്‍ക്കുക"
 
 #. separator
 #: src/menu.c:66
-msgid "Put on _All Workspaces"
-msgstr "എല്ലാ പണിയറയിലും ഇടുക"
+#, fuzzy
+msgid "_Always on Visible Workspace"
+msgstr "ഈ പണിയറയില് മാത്രം"
 
 #: src/menu.c:67
-msgid "Only on _This Workspace"
+#, fuzzy
+msgid "_Only on This Workspace"
 msgstr "ഈ പണിയറയില് മാത്രം"
 
 #: src/menu.c:68
@@ -214,7 +216,7 @@ msgstr "പണിയറ ജാലകം ഒന്നിലേക്ക് നീ
 msgid "Move to Workspace _Down"
 msgstr "ഒരു പണിയറ‌‌‌‌‌യ‌്ക്ക് താഴെ ജാലകം നീക്കുക"
 
-#: src/menu.c:162 src/prefs.c:1942
+#: src/menu.c:162 src/prefs.c:1996
 #, c-format
 msgid "Workspace %d"
 msgstr "പണിയറ %d"
@@ -346,13 +348,13 @@ msgstr "തലക്കെട്ട്"
 msgid "Class"
 msgstr "ക്ളാസ്"
 
-#: src/metacity-dialog.c:262
+#: src/metacity-dialog.c:263
 msgid ""
 "These windows do not support \"save current setup\" and will have to be "
 "restarted manually next time you log in."
 msgstr ""
 
-#: src/metacity-dialog.c:323
+#: src/metacity-dialog.c:328
 #, c-format
 msgid ""
 "There was an error running \"%s\":\n"
@@ -467,7 +469,8 @@ msgid ""
 "\"direct manipulation\", by using wireframes, avoiding animations, or other "
 "means. This is a significant reduction in usability for many users, but may "
 "allow legacy applications and terminal servers to function when they would "
-"otherwise be impractical."
+"otherwise be impractical. However, the wireframe feature is disabled when "
+"accessibility is on to avoid weird desktop breakages."
 msgstr ""
 
 #: src/metacity.schemas.in.h:20
@@ -1478,64 +1481,64 @@ msgstr "ജാലക കേന്ദ്രീകരണരീതി"
 msgid "Window title font"
 msgstr "ജാലക തലക്കെട്ട് അക്ഷരരൂപം"
 
-#: src/prefs.c:476 src/prefs.c:492 src/prefs.c:508 src/prefs.c:524
-#: src/prefs.c:540 src/prefs.c:560 src/prefs.c:576 src/prefs.c:592
-#: src/prefs.c:608 src/prefs.c:624 src/prefs.c:640 src/prefs.c:656
-#: src/prefs.c:672 src/prefs.c:689 src/prefs.c:705 src/prefs.c:721
-#: src/prefs.c:737 src/prefs.c:753 src/prefs.c:768 src/prefs.c:783
-#: src/prefs.c:798
+#: src/prefs.c:501 src/prefs.c:517 src/prefs.c:533 src/prefs.c:549
+#: src/prefs.c:565 src/prefs.c:585 src/prefs.c:601 src/prefs.c:617
+#: src/prefs.c:633 src/prefs.c:649 src/prefs.c:665 src/prefs.c:681
+#: src/prefs.c:697 src/prefs.c:714 src/prefs.c:730 src/prefs.c:746
+#: src/prefs.c:762 src/prefs.c:778 src/prefs.c:793 src/prefs.c:808
+#: src/prefs.c:823 src/prefs.c:839
 #, c-format
 msgid "GConf key \"%s\" is set to an invalid type\n"
 msgstr ""
 
-#: src/prefs.c:843
+#: src/prefs.c:884
 #, c-format
 msgid ""
 "\"%s\" found in configuration database is not a valid value for mouse button "
 "modifier\n"
 msgstr ""
 
-#: src/prefs.c:867 src/prefs.c:1277
+#: src/prefs.c:908 src/prefs.c:1318
 #, c-format
 msgid "GConf key '%s' is set to an invalid value\n"
 msgstr ""
 
-#: src/prefs.c:994
+#: src/prefs.c:1035
 #, c-format
 msgid "Could not parse font description \"%s\" from GConf key %s\n"
 msgstr ""
 
-#: src/prefs.c:1179
+#: src/prefs.c:1220
 #, c-format
 msgid ""
 "%d stored in GConf key %s is not a reasonable number of workspaces, current "
 "maximum is %d\n"
 msgstr ""
 
-#: src/prefs.c:1239
+#: src/prefs.c:1280
 msgid ""
 "Workarounds for broken applications disabled. Some applications may not "
 "behave properly.\n"
 msgstr ""
 
-#: src/prefs.c:1304
+#: src/prefs.c:1345
 #, c-format
 msgid "%d stored in GConf key %s is out of range 0 to %d\n"
 msgstr ""
 
-#: src/prefs.c:1425
+#: src/prefs.c:1479
 #, c-format
 msgid "Error setting number of workspaces to %d: %s\n"
 msgstr ""
 
-#: src/prefs.c:1669
+#: src/prefs.c:1723
 #, c-format
 msgid ""
 "\"%s\" found in configuration database is not a valid value for keybinding "
 "\"%s\"\n"
 msgstr ""
 
-#: src/prefs.c:2023
+#: src/prefs.c:2077
 #, c-format
 msgid "Error setting name for workspace %d to \"%s\": %s\n"
 msgstr "%d യില്‌നിന്ന് \"%s\"ലേക്ക് പണിയറയുടെ പേ‌ര‌് സജ്ജമാക്കുന്നതില്‌ തെറ്റ്: %s\n"
@@ -1568,7 +1571,7 @@ msgstr ""
 msgid "Screen %d on display \"%s\" already has a window manager\n"
 msgstr ""
 
-#: src/screen.c:699
+#: src/screen.c:716
 #, c-format
 msgid "Could not release screen %d on display \"%s\"\n"
 msgstr ""
@@ -2619,7 +2622,7 @@ msgid "Application set a bogus _NET_WM_PID %ld\n"
 msgstr ""
 
 #. first time through
-#: src/window.c:4829
+#: src/window.c:5197
 #, c-format
 msgid ""
 "Window %s sets SM_CLIENT_ID on itself, instead of on the WM_CLIENT_LEADER "
@@ -2633,7 +2636,7 @@ msgstr ""
 #. * MWM but not WM_NORMAL_HINTS are basically broken. We complain
 #. * about these apps but make them work.
 #.
-#: src/window.c:5500
+#: src/window.c:5868
 #, c-format
 msgid ""
 "Window %s sets an MWM hint indicating it isn't resizable, but sets min size %"
@@ -2661,6 +2664,9 @@ msgid ""
 "Property %s on window 0x%lx contained invalid UTF-8 for item %d in the list\n"
 msgstr ""
 
+#~ msgid "Put on _All Workspaces"
+#~ msgstr "എല്ലാ പണിയറയിലും ഇടുക"
+
 #~ msgid "Window Focus"
 #~ msgstr "ജാലകം കേന്ദ്രീകരിക്കുക"
 

po/mn.po

@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: metacity.HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-09 21:23-0700\n"
+"POT-Creation-Date: 2005-06-27 17:21-0600\n"
 "PO-Revision-Date: 2004-01-03 15:09+0100\n"
 "Last-Translator: Sanlig Badral <Badral@openmn.org>\n"
 "Language-Team: Mongolian <openmn-core@lists.sf.net>\n"
@@ -65,7 +65,7 @@ msgstr ""
 msgid "Failed to get hostname: %s\n"
 msgstr "Хостын нэрийг олж чадсангүй: %s\n"
 
-#: src/display.c:306
+#: src/display.c:316
 #, c-format
 msgid "Failed to open X Window System display '%s'\n"
 msgstr "X-Цонхны системийн дэлгэц »%s« нээгдсэнгүй\n"
@@ -85,23 +85,23 @@ msgstr ""
 msgid "Fatal IO error %d (%s) on display '%s'.\n"
 msgstr "%d (%s) төрлийн алдаа »%s«.дэлгэцэн дээр гарлаа \n"
 
-#: src/frames.c:1020
+#: src/frames.c:1125
 msgid "Close Window"
 msgstr "Цонх хаах"
 
-#: src/frames.c:1023
+#: src/frames.c:1128
 msgid "Window Menu"
 msgstr "Цонхны цэс"
 
-#: src/frames.c:1026
+#: src/frames.c:1131
 msgid "Minimize Window"
 msgstr "Цонх агшаах"
 
-#: src/frames.c:1029
+#: src/frames.c:1134
 msgid "Maximize Window"
 msgstr "Цонх томсгох"
 
-#: src/frames.c:1032
+#: src/frames.c:1137
 msgid "Unmaximize Window"
 msgstr "Цонх хаах"
 
@@ -114,19 +114,19 @@ msgstr ""
 "Өөр нэг программ %s товчийг %x modifier-ын хамтаар товчлуурын комбинац "
 "хэлбэрээр хэрэглэж бйна \n"
 
-#: src/keybindings.c:2554
+#: src/keybindings.c:2535
 #, c-format
 msgid "Error launching metacity-dialog to print an error about a command: %s\n"
 msgstr ""
 "Нэгэн командад гарсан алдааг заах ёстой  Metacity-диалогийг эхлэхэд алдаа "
 "гарлаа: %s\n"
 
-#: src/keybindings.c:2659
+#: src/keybindings.c:2640
 #, c-format
 msgid "No command %d has been defined.\n"
 msgstr "Ямар ч %d команд тодорхойлогдоогүй байна.\n"
 
-#: src/keybindings.c:3489
+#: src/keybindings.c:3485
 #, fuzzy
 msgid "No terminal command has been defined.\n"
 msgstr "Ямар ч %d команд тодорхойлогдоогүй байна.\n"
@@ -212,11 +212,13 @@ msgstr "_Хаах"
 
 #. separator
 #: src/menu.c:66
-msgid "Put on _All Workspaces"
-msgstr "_Бүх ажлын талбар дээр тавих"
+#, fuzzy
+msgid "_Always on Visible Workspace"
+msgstr "Зөвхөн _энэ ажлын талбар дээр "
 
 #: src/menu.c:67
-msgid "Only on _This Workspace"
+#, fuzzy
+msgid "_Only on This Workspace"
 msgstr "Зөвхөн _энэ ажлын талбар дээр "
 
 #: src/menu.c:68
@@ -235,7 +237,7 @@ msgstr "Ажлын талбарын дээш зөө"
 msgid "Move to Workspace _Down"
 msgstr "Ажлын талбарын доош зөө"
 
-#: src/menu.c:162 src/prefs.c:1942
+#: src/menu.c:162 src/prefs.c:1996
 #, c-format
 msgid "Workspace %d"
 msgstr "Ажлын талбар %d"
@@ -366,7 +368,7 @@ msgstr "Гарчиг"
 msgid "Class"
 msgstr "Анги"
 
-#: src/metacity-dialog.c:262
+#: src/metacity-dialog.c:263
 msgid ""
 "These windows do not support \"save current setup\" and will have to be "
 "restarted manually next time you log in."
@@ -374,7 +376,7 @@ msgstr ""
 "Эдгээр цонхнууд одоогийн тохиргоонуудыг хадгалахад оролцохгүй бөгөөд "
 "дараагийн асаалтаар гараар шинээр эхлэх хэрэгтэй."
 
-#: src/metacity-dialog.c:323
+#: src/metacity-dialog.c:328
 #, c-format
 msgid ""
 "There was an error running \"%s\":\n"
@@ -510,12 +512,14 @@ msgstr ""
 "стандарт  программын шрифтийг ашигла."
 
 #: src/metacity.schemas.in.h:19
+#, fuzzy
 msgid ""
 "If true, metacity will give the user less feedback and less sense of "
 "\"direct manipulation\", by using wireframes, avoiding animations, or other "
 "means. This is a significant reduction in usability for many users, but may "
 "allow legacy applications and terminal servers to function when they would "
-"otherwise be impractical."
+"otherwise be impractical. However, the wireframe feature is disabled when "
+"accessibility is on to avoid weird desktop breakages."
 msgstr ""
 "Хэрэв үнэн бол метасити бага сонордуулга өгөх ба утсан хүрээ хэрэглэх "
 "хөдөлгөөн оруулах зэрэг »шууд зохицуулалтад« бага боломж олгоно. Энэ нь "
@@ -2007,17 +2011,17 @@ msgstr "Цонхны фокусын горим"
 msgid "Window title font"
 msgstr "Цонхны нэрийн үсгийн хэв"
 
-#: src/prefs.c:476 src/prefs.c:492 src/prefs.c:508 src/prefs.c:524
-#: src/prefs.c:540 src/prefs.c:560 src/prefs.c:576 src/prefs.c:592
-#: src/prefs.c:608 src/prefs.c:624 src/prefs.c:640 src/prefs.c:656
-#: src/prefs.c:672 src/prefs.c:689 src/prefs.c:705 src/prefs.c:721
-#: src/prefs.c:737 src/prefs.c:753 src/prefs.c:768 src/prefs.c:783
-#: src/prefs.c:798
+#: src/prefs.c:501 src/prefs.c:517 src/prefs.c:533 src/prefs.c:549
+#: src/prefs.c:565 src/prefs.c:585 src/prefs.c:601 src/prefs.c:617
+#: src/prefs.c:633 src/prefs.c:649 src/prefs.c:665 src/prefs.c:681
+#: src/prefs.c:697 src/prefs.c:714 src/prefs.c:730 src/prefs.c:746
+#: src/prefs.c:762 src/prefs.c:778 src/prefs.c:793 src/prefs.c:808
+#: src/prefs.c:823 src/prefs.c:839
 #, c-format
 msgid "GConf key \"%s\" is set to an invalid type\n"
 msgstr "GConf-key »%s«-д хүчингүй төрөл өгөгдсөн байна\n"
 
-#: src/prefs.c:843
+#: src/prefs.c:884
 #, c-format
 msgid ""
 "\"%s\" found in configuration database is not a valid value for mouse button "
@@ -2026,17 +2030,17 @@ msgstr ""
 "Конфигурацийн сангаас олдсон »%s« утга нь хулганын товчлуурын сэлгүүрт "
 "тохирох утга биш\n"
 
-#: src/prefs.c:867 src/prefs.c:1277
+#: src/prefs.c:908 src/prefs.c:1318
 #, c-format
 msgid "GConf key '%s' is set to an invalid value\n"
 msgstr "GConf-key »%s«-д хүчингүй утга өгөгдсөн байна\n"
 
-#: src/prefs.c:994
+#: src/prefs.c:1035
 #, c-format
 msgid "Could not parse font description \"%s\" from GConf key %s\n"
 msgstr "Фонтын тайлбар »%s«-ыг GConf-key %s-с ялгаж чадсангүй\n"
 
-#: src/prefs.c:1179
+#: src/prefs.c:1220
 #, c-format
 msgid ""
 "%d stored in GConf key %s is not a reasonable number of workspaces, current "
@@ -2045,7 +2049,7 @@ msgstr ""
 "%d нь GConf-key %s дотор хадгалагдсан ба ажлын талбарын тоог үнэмшилтэйгээр "
 "төлөөлж чадахгүй; одоогоор максимум утга %d байна\n"
 
-#: src/prefs.c:1239
+#: src/prefs.c:1280
 msgid ""
 "Workarounds for broken applications disabled. Some applications may not "
 "behave properly.\n"
@@ -2053,18 +2057,18 @@ msgstr ""
 "Эвдрэлтэй х.программын Workarounds-ийг идэвхгүйжүүллээ. Магадгүй зарим х."
 "программууд буруу ажиллаж магадгүй.\n"
 
-#: src/prefs.c:1304
+#: src/prefs.c:1345
 #, c-format
 msgid "%d stored in GConf key %s is out of range 0 to %d\n"
 msgstr ""
 "%d нь GConf-key %s-д хадгалагдсан ба утга нь 0-%d интервалаас гадуур байна\n"
 
-#: src/prefs.c:1425
+#: src/prefs.c:1479
 #, c-format
 msgid "Error setting number of workspaces to %d: %s\n"
 msgstr "%d дээрхи ажлын талбарын тоог оруулахад алдаа гарлаа: %s\n"
 
-#: src/prefs.c:1669
+#: src/prefs.c:1723
 #, c-format
 msgid ""
 "\"%s\" found in configuration database is not a valid value for keybinding "
@@ -2072,7 +2076,7 @@ msgid ""
 msgstr ""
 "Тохируулгын сангаас олдсон »%s« нь »%s«-товчлуурын комбинацид үл тохирно\n"
 
-#: src/prefs.c:2023
+#: src/prefs.c:2077
 #, c-format
 msgid "Error setting name for workspace %d to \"%s\": %s\n"
 msgstr "Ажлын талбар %d-ийн нэрийг »%s« болгож өөрчлөхөд алдаа гарлаа: %s\n"
@@ -2110,7 +2114,7 @@ msgstr ""
 msgid "Screen %d on display \"%s\" already has a window manager\n"
 msgstr "%d » (%s« джжрхи) цонхны менежертэй байна\n"
 
-#: src/screen.c:699
+#: src/screen.c:716
 #, c-format
 msgid "Could not release screen %d on display \"%s\"\n"
 msgstr "%d нь »%s« дэлгэцэн дээр гаргагдаж чадсангүй\n"
@@ -3216,7 +3220,7 @@ msgid "Application set a bogus _NET_WM_PID %ld\n"
 msgstr "Программ дараахи утгагүй _NET_WM_PID %ld үзүүлж байна\n"
 
 #. first time through
-#: src/window.c:4829
+#: src/window.c:5197
 #, c-format
 msgid ""
 "Window %s sets SM_CLIENT_ID on itself, instead of on the WM_CLIENT_LEADER "
@@ -3238,7 +3242,7 @@ msgstr ""
 #. * MWM but not WM_NORMAL_HINTS are basically broken. We complain
 #. * about these apps but make them work.
 #.
-#: src/window.c:5500
+#: src/window.c:5868
 #, c-format
 msgid ""
 "Window %s sets an MWM hint indicating it isn't resizable, but sets min size %"
@@ -3275,6 +3279,9 @@ msgid ""
 msgstr ""
 "Онцлог %s. 0x%lx цонхон дээр объект %d -ийн буруу UTF-8 агуулагдаж байна\n"
 
+#~ msgid "Put on _All Workspaces"
+#~ msgstr "_Бүх ажлын талбар дээр тавих"
+
 #~ msgid "Select how to give focus to windows"
 #~ msgstr "Цонхыг фокуслахын тулд сонгох"
 

po/ms.po

@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Metacity 2.3.x\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-09 21:23-0700\n"
+"POT-Creation-Date: 2005-06-27 17:21-0600\n"
 "PO-Revision-Date: 2004-01-16 23:12+0730\n"
 "Last-Translator: Hasbullah Bin Pit <sebol@ikhlas.com>\n"
 "Language-Team: Projek Gabai (Bahasa Melayu) <gabai-penyumbang@lists."
@@ -59,7 +59,7 @@ msgstr ""
 msgid "Failed to get hostname: %s\n"
 msgstr "Gagal mendapatkan namahos:: %s\n"
 
-#: src/display.c:306
+#: src/display.c:316
 #, c-format
 msgid "Failed to open X Window System display '%s'\n"
 msgstr "Gagal membuka paparan %s Sistem X Window\n"
@@ -80,23 +80,23 @@ msgstr ""
 msgid "Fatal IO error %d (%s) on display '%s'.\n"
 msgstr "Ralat IO fatal %d (%s) pada paparan '%s'.\n"
 
-#: src/frames.c:1020
+#: src/frames.c:1125
 msgid "Close Window"
 msgstr "Tutup Tetingkap"
 
-#: src/frames.c:1023
+#: src/frames.c:1128
 msgid "Window Menu"
 msgstr "Menu Tetingkap"
 
-#: src/frames.c:1026
+#: src/frames.c:1131
 msgid "Minimize Window"
 msgstr "Miniatur Tetingkap"
 
-#: src/frames.c:1029
+#: src/frames.c:1134
 msgid "Maximize Window"
 msgstr "Maksimum tetingkap"
 
-#: src/frames.c:1032
+#: src/frames.c:1137
 msgid "Unmaximize Window"
 msgstr "Nyah Maksimum Tetingkap"
 
@@ -110,18 +110,18 @@ msgstr ""
 "Terdapat program lain yang sudah menggunakan kekukci %s dengan modifier %x "
 "sebagai binding\n"
 
-#: src/keybindings.c:2554
+#: src/keybindings.c:2535
 #, c-format
 msgid "Error launching metacity-dialog to print an error about a command: %s\n"
 msgstr ""
 "Ralat melancarkan dialog-metacity untuk mencetak ralat tentang arahan: %s\n"
 
-#: src/keybindings.c:2659
+#: src/keybindings.c:2640
 #, c-format
 msgid "No command %d has been defined.\n"
 msgstr "Tiada arahan %d ditakrifkan.\n"
 
-#: src/keybindings.c:3489
+#: src/keybindings.c:3485
 #, fuzzy
 msgid "No terminal command has been defined.\n"
 msgstr "Tiada arahan %d ditakrifkan.\n"
@@ -200,11 +200,13 @@ msgstr "_Tutup"
 
 #. separator
 #: src/menu.c:66
-msgid "Put on _All Workspaces"
-msgstr "Letak pada Semu_a Ruangkerja"
+#, fuzzy
+msgid "_Always on Visible Workspace"
+msgstr "_Ikon pada Ruangkerja ini"
 
 #: src/menu.c:67
-msgid "Only on _This Workspace"
+#, fuzzy
+msgid "_Only on This Workspace"
 msgstr "_Ikon pada Ruangkerja ini"
 
 #: src/menu.c:68
@@ -223,7 +225,7 @@ msgstr "Pindah ke Ruangkerja _Atas"
 msgid "Move to Workspace _Down"
 msgstr "Pindah ke Ruangkerja Bawah"
 
-#: src/menu.c:162 src/prefs.c:1942
+#: src/menu.c:162 src/prefs.c:1996
 #, c-format
 msgid "Workspace %d"
 msgstr "Ruangkerja %d"
@@ -355,7 +357,7 @@ msgstr "Tajuk"
 msgid "Class"
 msgstr "Kelas"
 
-#: src/metacity-dialog.c:262
+#: src/metacity-dialog.c:263
 msgid ""
 "These windows do not support \"save current setup\" and will have to be "
 "restarted manually next time you log in."
@@ -363,7 +365,7 @@ msgstr ""
 "tetingkap ini tidak menyokong \"Simpan tetapan semasa\" dan akan "
 "diulanghidupkan secara manual bila anda log masuk kelak."
 
-#: src/metacity-dialog.c:323
+#: src/metacity-dialog.c:328
 #, c-format
 msgid ""
 "There was an error running \"%s\":\n"
@@ -478,7 +480,8 @@ msgid ""
 "\"direct manipulation\", by using wireframes, avoiding animations, or other "
 "means. This is a significant reduction in usability for many users, but may "
 "allow legacy applications and terminal servers to function when they would "
-"otherwise be impractical."
+"otherwise be impractical. However, the wireframe feature is disabled when "
+"accessibility is on to avoid weird desktop breakages."
 msgstr ""
 
 #: src/metacity.schemas.in.h:20
@@ -1505,17 +1508,17 @@ msgstr "Mod fokus tetingkap"
 msgid "Window title font"
 msgstr "Font tajuk tetingkap"
 
-#: src/prefs.c:476 src/prefs.c:492 src/prefs.c:508 src/prefs.c:524
-#: src/prefs.c:540 src/prefs.c:560 src/prefs.c:576 src/prefs.c:592
-#: src/prefs.c:608 src/prefs.c:624 src/prefs.c:640 src/prefs.c:656
-#: src/prefs.c:672 src/prefs.c:689 src/prefs.c:705 src/prefs.c:721
-#: src/prefs.c:737 src/prefs.c:753 src/prefs.c:768 src/prefs.c:783
-#: src/prefs.c:798
+#: src/prefs.c:501 src/prefs.c:517 src/prefs.c:533 src/prefs.c:549
+#: src/prefs.c:565 src/prefs.c:585 src/prefs.c:601 src/prefs.c:617
+#: src/prefs.c:633 src/prefs.c:649 src/prefs.c:665 src/prefs.c:681
+#: src/prefs.c:697 src/prefs.c:714 src/prefs.c:730 src/prefs.c:746
+#: src/prefs.c:762 src/prefs.c:778 src/prefs.c:793 src/prefs.c:808
+#: src/prefs.c:823 src/prefs.c:839
 #, c-format
 msgid "GConf key \"%s\" is set to an invalid type\n"
 msgstr "Kekunci GConf \"%s\" ditetapkan kepada jenis yang tidak sah\n"
 
-#: src/prefs.c:843
+#: src/prefs.c:884
 #, c-format
 msgid ""
 "\"%s\" found in configuration database is not a valid value for mouse button "
@@ -1524,17 +1527,17 @@ msgstr ""
 "\"%s\" dijumpai pada pangkalan data konfigurasi adalah bukan pengubahsuai "
 "butang tetikus yang sah\n"
 
-#: src/prefs.c:867 src/prefs.c:1277
+#: src/prefs.c:908 src/prefs.c:1318
 #, c-format
 msgid "GConf key '%s' is set to an invalid value\n"
 msgstr "Kekunci GConf '%s' ditetapkan kepada nilai yang tidak sah\n"
 
-#: src/prefs.c:994
+#: src/prefs.c:1035
 #, c-format
 msgid "Could not parse font description \"%s\" from GConf key %s\n"
 msgstr "Tak dapat menghantar huraian font \"%s\" daripada kekunci GConf %s\n"
 
-#: src/prefs.c:1179
+#: src/prefs.c:1220
 #, c-format
 msgid ""
 "%d stored in GConf key %s is not a reasonable number of workspaces, current "
@@ -1543,31 +1546,31 @@ msgstr ""
 "%d yang disimpan pada kekunci GConf %s adalah bilangan ruangkerja yang tak "
 "munasabah, maksimum semasa ialah %d\n"
 
-#: src/prefs.c:1239
+#: src/prefs.c:1280
 msgid ""
 "Workarounds for broken applications disabled. Some applications may not "
 "behave properly.\n"
 msgstr ""
 
-#: src/prefs.c:1304
+#: src/prefs.c:1345
 #, c-format
 msgid "%d stored in GConf key %s is out of range 0 to %d\n"
 msgstr ""
 "%d yang disimpan pada kekunci GConf %s adalah diluar julat 0 hingga %d\n"
 
-#: src/prefs.c:1425
+#: src/prefs.c:1479
 #, c-format
 msgid "Error setting number of workspaces to %d: %s\n"
 msgstr "Ralat menetapkan bilangan ruangkerja ke %d: %s\n"
 
-#: src/prefs.c:1669
+#: src/prefs.c:1723
 #, c-format
 msgid ""
 "\"%s\" found in configuration database is not a valid value for keybinding "
 "\"%s\"\n"
 msgstr ""
 
-#: src/prefs.c:2023
+#: src/prefs.c:2077
 #, c-format
 msgid "Error setting name for workspace %d to \"%s\": %s\n"
 msgstr "Ralat menetapkan nama bagi ruangkerja %d ke \"%s\": %s\n"
@@ -1603,7 +1606,7 @@ msgstr ""
 msgid "Screen %d on display \"%s\" already has a window manager\n"
 msgstr "Skrin %d pada paparan \"%s\" sudah mempunyai pengurus tetingkap\n"
 
-#: src/screen.c:699
+#: src/screen.c:716
 #, c-format
 msgid "Could not release screen %d on display \"%s\"\n"
 msgstr "Tak dapat melepaskan skrin %d pada paparan \"%s\"\n"
@@ -2669,7 +2672,7 @@ msgid "Application set a bogus _NET_WM_PID %ld\n"
 msgstr ""
 
 #. first time through
-#: src/window.c:4829
+#: src/window.c:5197
 #, c-format
 msgid ""
 "Window %s sets SM_CLIENT_ID on itself, instead of on the WM_CLIENT_LEADER "
@@ -2683,7 +2686,7 @@ msgstr ""
 #. * MWM but not WM_NORMAL_HINTS are basically broken. We complain
 #. * about these apps but make them work.
 #.
-#: src/window.c:5500
+#: src/window.c:5868
 #, c-format
 msgid ""
 "Window %s sets an MWM hint indicating it isn't resizable, but sets min size %"
@@ -2718,6 +2721,9 @@ msgstr ""
 "Ciri-ciri %s pada tetingkap 0x%lx mengandungi  UTF-8 yang tidak sah bagi "
 "item %d pada senarai\n"
 
+#~ msgid "Put on _All Workspaces"
+#~ msgstr "Letak pada Semu_a Ruangkerja"
+
 #~ msgid "Select how to give focus to windows"
 #~ msgstr "Pilih bagaimana memberi fokus kepada tetingkap"
 

po/nl.po

@@ -2,7 +2,7 @@
 # Copyright (C) 2003 The Free Software Foundation, Inc.
 # This file is distributed under the same license as the metacity package.
 # Tino Meinen <a.t.meinen@chello.nl>, 2003, 2004
-# Reinout van Schouwen <reinout@cs.vu.nl>, 2003.
+# Reinout van Schouwen <reinout@cs.vu.nl>, 2003, 2005.
 # -------------------------------------------
 # Unroll -> Uitrollen of afrollen?
 # draw_ops?
@@ -12,13 +12,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: metacity 2.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-09 21:23-0700\n"
-"PO-Revision-Date: 2004-07-27 18:02+0100\n"
-"Last-Translator: Michiel Sikkes <michiel@eyesopened.nl>\n"
-"Language-Team: Dutch <vertaling@nl.linux.org>\n"
+"POT-Creation-Date: 2005-06-27 17:21-0600\n"
+"PO-Revision-Date: 2005-02-27 23:50+0100\n"
+"Last-Translator: Reinout van Schouwen <reinout@cs.vu.nl>\n"
+"Language-Team: Dutch <vertaling@vrijschrift.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: src/tools/metacity-message.c:150
 #, c-format
@@ -62,12 +63,12 @@ msgstr ""
 #: src/delete.c:452
 #, c-format
 msgid "Failed to get hostname: %s\n"
-msgstr "Ophalen hostname mislukt: %s\n"
+msgstr "Ophalen hostnaam mislukt: %s\n"
 
-#: src/display.c:306
+#: src/display.c:316
 #, c-format
 msgid "Failed to open X Window System display '%s'\n"
-msgstr "Openen van X Window System display, mislukt: '%s'\n"
+msgstr "Openen van X Window System display '%s' mislukt\n"
 
 #: src/errors.c:231
 #, c-format
@@ -85,23 +86,23 @@ msgstr ""
 msgid "Fatal IO error %d (%s) on display '%s'.\n"
 msgstr "Fatale IO-fout %d (%s) op display '%s'.\n"
 
-#: src/frames.c:1020
+#: src/frames.c:1125
 msgid "Close Window"
 msgstr "Venster sluiten"
 
-#: src/frames.c:1023
+#: src/frames.c:1128
 msgid "Window Menu"
-msgstr "Venster-menu"
+msgstr "Venstermenu"
 
-#: src/frames.c:1026
+#: src/frames.c:1131
 msgid "Minimize Window"
 msgstr "Venster minimaliseren"
 
-#: src/frames.c:1029
+#: src/frames.c:1134
 msgid "Maximize Window"
 msgstr "Venster maximaliseren"
 
-#: src/frames.c:1032
+#: src/frames.c:1137
 msgid "Unmaximize Window"
 msgstr "Venster herstellen"
 
@@ -115,22 +116,21 @@ msgstr ""
 "Een ander programma gebruikt reeds de %s-toets met controletoets %x als "
 "toetsbinding\n"
 
-#: src/keybindings.c:2554
+#: src/keybindings.c:2535
 #, c-format
 msgid "Error launching metacity-dialog to print an error about a command: %s\n"
 msgstr ""
 "Fout bij het starten van een metacity-dialoogvenster om een foutmelding te "
 "tonen over een opdracht: %s\n"
 
-#: src/keybindings.c:2659
+#: src/keybindings.c:2640
 #, c-format
 msgid "No command %d has been defined.\n"
 msgstr "Er is geen opdracht %d gedefinieerd.\n"
 
-#: src/keybindings.c:3489
-#, fuzzy
+#: src/keybindings.c:3485
 msgid "No terminal command has been defined.\n"
-msgstr "Er is geen opdracht %d gedefinieerd.\n"
+msgstr "Er is geen opdracht voor de terminal gedefinieerd.\n"
 
 #: src/main.c:69
 msgid ""
@@ -195,7 +195,7 @@ msgstr "_Uitrollen"
 
 #: src/menu.c:59 src/menu.c:60
 msgid "On _Top"
-msgstr "_Bovenliggend"
+msgstr "_Bovenop"
 
 #: src/menu.c:61
 msgid "_Move"
@@ -212,11 +212,11 @@ msgstr "Sl_uiten"
 
 #. separator
 #: src/menu.c:66
-msgid "Put on _All Workspaces"
-msgstr "Op _alle werkbladen tonen"
+msgid "_Always on Visible Workspace"
+msgstr "Op _alle werkbladen zichtbaar"
 
 #: src/menu.c:67
-msgid "Only on _This Workspace"
+msgid "_Only on This Workspace"
 msgstr "Alleen op dit _werkblad"
 
 #: src/menu.c:68
@@ -235,7 +235,7 @@ msgstr "Verplaatsen naar _bovenliggend werkblad"
 msgid "Move to Workspace _Down"
 msgstr "Verplaatsen naar _onderliggend werkblad"
 
-#: src/menu.c:162 src/prefs.c:1942
+#: src/menu.c:162 src/prefs.c:1996
 #, c-format
 msgid "Workspace %d"
 msgstr "Werkblad %d"
@@ -367,7 +367,7 @@ msgstr "Titel"
 msgid "Class"
 msgstr "Klasse"
 
-#: src/metacity-dialog.c:262
+#: src/metacity-dialog.c:263
 msgid ""
 "These windows do not support \"save current setup\" and will have to be "
 "restarted manually next time you log in."
@@ -375,7 +375,7 @@ msgstr ""
 "Deze vensters ondersteunen niet \"huidige instellingen opslaan\" en zullen "
 "bij een volgende sessie opnieuw moeten worden opgestart."
 
-#: src/metacity-dialog.c:323
+#: src/metacity-dialog.c:328
 #, c-format
 msgid ""
 "There was an error running \"%s\":\n"
@@ -517,7 +517,8 @@ msgid ""
 "\"direct manipulation\", by using wireframes, avoiding animations, or other "
 "means. This is a significant reduction in usability for many users, but may "
 "allow legacy applications and terminal servers to function when they would "
-"otherwise be impractical."
+"otherwise be impractical. However, the wireframe feature is disabled when "
+"accessibility is on to avoid weird desktop breakages."
 msgstr ""
 "Indien waar, geeft metacity de gebruiker minder directe terugkoppeling door "
 "raamwerken te gebruiken en animaties te minimaliseren. Dit is een "
@@ -715,14 +716,14 @@ msgstr "Venstergrootte veranderen"
 msgid "Run a defined command"
 msgstr "Voorgedefineerde opdracht uitvoeren"
 
+# Terminal opstarten/Een terminal opstarten
 #: src/metacity.schemas.in.h:60
 msgid "Run a terminal"
-msgstr ""
+msgstr "Een terminal opstarten"
 
-# aan elkaar hier is niet consistent met het andere bericht: panel run dialog
 #: src/metacity.schemas.in.h:61
 msgid "Show the panel menu"
-msgstr "Het paneel-menu tonen"
+msgstr "Het paneelmenu tonen"
 
 #: src/metacity.schemas.in.h:62
 msgid "Show the panel run application dialog"
@@ -1207,7 +1208,6 @@ msgstr ""
 "\"uitgeschakeld\", dan zal deze actie geen toetskoppeling kennen."
 
 #: src/metacity.schemas.in.h:109
-#, fuzzy
 msgid ""
 "The keybinding used to maximize a window. The format looks like \"&lt;"
 "Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;F1\". The parser is fairly "
@@ -1718,7 +1718,6 @@ msgstr ""
 "actie niet aan een toets zijn gebonden."
 
 #: src/metacity.schemas.in.h:142
-#, fuzzy
 msgid ""
 "The keybinding which invokes a terminal. The format looks like \"&lt;"
 "Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;F1\". The parser is fairly "
@@ -1961,17 +1960,17 @@ msgstr "Vensteraandacht-modus"
 msgid "Window title font"
 msgstr "Venstertitellettertype"
 
-#: src/prefs.c:476 src/prefs.c:492 src/prefs.c:508 src/prefs.c:524
-#: src/prefs.c:540 src/prefs.c:560 src/prefs.c:576 src/prefs.c:592
-#: src/prefs.c:608 src/prefs.c:624 src/prefs.c:640 src/prefs.c:656
-#: src/prefs.c:672 src/prefs.c:689 src/prefs.c:705 src/prefs.c:721
-#: src/prefs.c:737 src/prefs.c:753 src/prefs.c:768 src/prefs.c:783
-#: src/prefs.c:798
+#: src/prefs.c:501 src/prefs.c:517 src/prefs.c:533 src/prefs.c:549
+#: src/prefs.c:565 src/prefs.c:585 src/prefs.c:601 src/prefs.c:617
+#: src/prefs.c:633 src/prefs.c:649 src/prefs.c:665 src/prefs.c:681
+#: src/prefs.c:697 src/prefs.c:714 src/prefs.c:730 src/prefs.c:746
+#: src/prefs.c:762 src/prefs.c:778 src/prefs.c:793 src/prefs.c:808
+#: src/prefs.c:823 src/prefs.c:839
 #, c-format
 msgid "GConf key \"%s\" is set to an invalid type\n"
 msgstr "GConf-sleutel \"%s\" is op een ongeldig type ingesteld\n"
 
-#: src/prefs.c:843
+#: src/prefs.c:884
 #, c-format
 msgid ""
 "\"%s\" found in configuration database is not a valid value for mouse button "
@@ -1980,18 +1979,18 @@ msgstr ""
 "\"%s\", gevonden in de configuratiedatabase, is geen geldige waarde voor de "
 "muisknop-optietoets\n"
 
-#: src/prefs.c:867 src/prefs.c:1277
+#: src/prefs.c:908 src/prefs.c:1318
 #, c-format
 msgid "GConf key '%s' is set to an invalid value\n"
 msgstr "GConf-sleutel '%s' is ingesteld op een ongeldige waarde\n"
 
-#: src/prefs.c:994
+#: src/prefs.c:1035
 #, c-format
 msgid "Could not parse font description \"%s\" from GConf key %s\n"
 msgstr ""
 "Kon lettertypebeschrijving \"%s\" niet verwerken van Gconf-sleutel %s\n"
 
-#: src/prefs.c:1179
+#: src/prefs.c:1220
 #, c-format
 msgid ""
 "%d stored in GConf key %s is not a reasonable number of workspaces, current "
@@ -2000,7 +1999,7 @@ msgstr ""
 "%d opgeslagen in GConf-sleutel %s is geen redelijk aantal werkbladen, "
 "huidige maximum is %d\n"
 
-#: src/prefs.c:1239
+#: src/prefs.c:1280
 msgid ""
 "Workarounds for broken applications disabled. Some applications may not "
 "behave properly.\n"
@@ -2008,17 +2007,17 @@ msgstr ""
 "Werkoplossing voor gebroken toepassingen uitgezet. Bepaalde toepassingen "
 "zullen niet naar behoren functioneren.\n"
 
-#: src/prefs.c:1304
+#: src/prefs.c:1345
 #, c-format
 msgid "%d stored in GConf key %s is out of range 0 to %d\n"
 msgstr "%d opgeslagen in GConf-sleutel %s valt buiten het bereik 0 %d\n"
 
-#: src/prefs.c:1425
+#: src/prefs.c:1479
 #, c-format
 msgid "Error setting number of workspaces to %d: %s\n"
 msgstr "Fout bij het instellen van het aantal werkbladen op %d: %s\n"
 
-#: src/prefs.c:1669
+#: src/prefs.c:1723
 #, c-format
 msgid ""
 "\"%s\" found in configuration database is not a valid value for keybinding "
@@ -2027,7 +2026,7 @@ msgstr ""
 "\"%s\" in de configuratiedatabase is geen geldige waarde voor toetsbinding "
 "\"%s\"\n"
 
-#: src/prefs.c:2023
+#: src/prefs.c:2077
 #, c-format
 msgid "Error setting name for workspace %d to \"%s\": %s\n"
 msgstr "Fout bij het instellen van de naam voor werkblad %d op \"%s\": %s\n"
@@ -2063,7 +2062,7 @@ msgstr ""
 msgid "Screen %d on display \"%s\" already has a window manager\n"
 msgstr "Scherm %d op display \"%s\" heeft al een windowmanager\n"
 
-#: src/screen.c:699
+#: src/screen.c:716
 #, c-format
 msgid "Could not release screen %d on display \"%s\"\n"
 msgstr "Kon scherm %d op display \"%s\" niet vrijmaken\n"
@@ -2304,22 +2303,22 @@ msgstr "Verhouding \"%s\" is onbekend"
 #: src/theme-parser.c:1446
 #, c-format
 msgid "No \"top\" attribute on element <%s>"
-msgstr "Geen \"boven\" attribuut op element <%s>"
+msgstr "Geen \"top\"-attribuut op element <%s>"
 
 #: src/theme-parser.c:1453
 #, c-format
 msgid "No \"bottom\" attribute on element <%s>"
-msgstr "Geen \"onder\" attribuut op element <%s>"
+msgstr "Geen \"bottom\"-attribuut op element <%s>"
 
 #: src/theme-parser.c:1460
 #, c-format
 msgid "No \"left\" attribute on element <%s>"
-msgstr "Geen \"links\" attribuut op element <%s>"
+msgstr "Geen \"left\"-attribuut op element <%s>"
 
 #: src/theme-parser.c:1467
 #, c-format
 msgid "No \"right\" attribute on element <%s>"
-msgstr "Geen \"rechts\" attribuut op element <%s>"
+msgstr "Geen \"right\"-attribuut op element <%s>"
 
 #: src/theme-parser.c:1499
 #, c-format
@@ -2373,24 +2372,24 @@ msgstr "Geen \"y\" attribuut op element <%s>"
 #: src/theme-parser.c:2497 src/theme-parser.c:2623 src/theme-parser.c:2795
 #, c-format
 msgid "No \"width\" attribute on element <%s>"
-msgstr "Geen \"breedte\" attribuut op element <%s>"
+msgstr "Geen \"width\" attribuut op element <%s>"
 
 #: src/theme-parser.c:1793 src/theme-parser.c:1896 src/theme-parser.c:2002
 #: src/theme-parser.c:2083 src/theme-parser.c:2189 src/theme-parser.c:2287
 #: src/theme-parser.c:2504 src/theme-parser.c:2630 src/theme-parser.c:2802
 #, c-format
 msgid "No \"height\" attribute on element <%s>"
-msgstr "Geen \"hoogte\" attribuut op element <%s>"
+msgstr "Geen \"height\" attribuut op element <%s>"
 
 #: src/theme-parser.c:1903
 #, c-format
 msgid "No \"start_angle\" attribute on element <%s>"
-msgstr "Geen \"begin_hoek\" attribuut op element <%s>"
+msgstr "Geen \"start_angle\" attribuut op element <%s>"
 
 #: src/theme-parser.c:1910
 #, c-format
 msgid "No \"extent_angle\" attribute on element <%s>"
-msgstr "Geen \"reikweidte_hoek\" attribuut op element <%s>"
+msgstr "Geen \"extent_angle\" attribuut op element <%s>"
 
 #: src/theme-parser.c:2090
 #, c-format
@@ -2410,27 +2409,27 @@ msgstr "Niet begrepen: de waarde \"%s\" voor type kleurverloop"
 #: src/theme-parser.c:2294
 #, c-format
 msgid "No \"filename\" attribute on element <%s>"
-msgstr "Geen \"bestandsnaam\" attribuut op element <%s>"
+msgstr "Geen \"filename\"-attribuut op element <%s>"
 
 #: src/theme-parser.c:2319 src/theme-parser.c:2827
 #, c-format
 msgid "Did not understand fill type \"%s\" for <%s> element"
-msgstr "Niet begrepen: vul-type \"%s\" voor <%s> element"
+msgstr "Niet begrepen: vul-type \"%s\" voor <%s>-element"
 
 #: src/theme-parser.c:2462 src/theme-parser.c:2595 src/theme-parser.c:2700
 #, c-format
 msgid "No \"state\" attribute on element <%s>"
-msgstr "Geen \"status\" attribuut op element <%s>"
+msgstr "Geen \"state\"-attribuut op element <%s>"
 
 #: src/theme-parser.c:2469 src/theme-parser.c:2602
 #, c-format
 msgid "No \"shadow\" attribute on element <%s>"
-msgstr "Geen \"schaduw\" attribuut op element <%s>"
+msgstr "Geen \"shadow\"-attribuut op element <%s>"
 
 #: src/theme-parser.c:2476
 #, c-format
 msgid "No \"arrow\" attribute on element <%s>"
-msgstr "Geen \"pijl\" attribuut op element <%s>"
+msgstr "Geen \"arrow\"-attribuut op element <%s>"
 
 #: src/theme-parser.c:2529 src/theme-parser.c:2651 src/theme-parser.c:2739
 #, c-format
@@ -2505,12 +2504,12 @@ msgstr "Kader-stijl heeft reeds een knop voor functie %s status %s"
 #: src/theme-parser.c:3376
 #, c-format
 msgid "No \"focus\" attribute on <%s> element"
-msgstr "Geen \"aandacht\" attribuut op <%s> element"
+msgstr "Geen \"focus\"-attribuut op <%s> element"
 
 #: src/theme-parser.c:3392
 #, c-format
 msgid "No \"style\" attribute on <%s> element"
-msgstr "Geen \"stijl\" attribuut op <%s> element"
+msgstr "Geen \"style\"-attribuut op <%s> element"
 
 #: src/theme-parser.c:3401
 #, c-format
@@ -2543,7 +2542,7 @@ msgid ""
 "Should not have \"resize\" attribute on <%s> element for maximized/shaded "
 "states"
 msgstr ""
-"Behoort geen \"grootte aanpassen\" attribuut te hebben op <%s> element voor "
+"Behoort geen \"resize\"-attribuut te hebben op <%s>-element voor "
 "gemaximaliseerde/opgerolde toestanden"
 
 #: src/theme-parser.c:3464
@@ -2617,7 +2616,7 @@ msgstr "Element <%s> is niet toegestaan binnen een \"draw operation\" element"
 #: src/theme-parser.c:3728 src/theme-parser.c:3758 src/theme-parser.c:3763
 #, c-format
 msgid "Element <%s> is not allowed inside a <%s> element"
-msgstr "Element <%s> is niet toegestaan binnen een <%s> element"
+msgstr "Element <%s> is niet toegestaan binnen een <%s>-element"
 
 #: src/theme-parser.c:3984
 msgid "No draw_ops provided for frame piece"
@@ -2659,7 +2658,7 @@ msgstr "<beschrijving> twee keer gegeven voor dit thema"
 #: src/theme-parser.c:4348
 #, c-format
 msgid "Failed to read theme from file %s: %s\n"
-msgstr "Kon thema niet uit bestand %s lezen: %s\n"
+msgstr "Kan thema niet uit bestand %s lezen: %s\n"
 
 #: src/theme-parser.c:4403
 #, c-format
@@ -2862,7 +2861,7 @@ msgstr "y-waarde is %d, %d verwacht"
 #, c-format
 msgid "%d coordinate expressions parsed in %g seconds (%g seconds average)\n"
 msgstr ""
-"%d coordinatenexpressies verwerkt in %g seconden (gemiddelde van %g "
+"%d coördinatenexpressies verwerkt in %g seconden (gemiddelde van %g "
 "seconden)\n"
 
 #: src/theme.c:202
@@ -3143,7 +3142,7 @@ msgstr "Constante \"%s\" is reeds gedefinieerd"
 #: src/util.c:93
 #, c-format
 msgid "Failed to open debug log: %s\n"
-msgstr "debug-logboek openen mislukt: %s\n"
+msgstr "Debug-logboek openen mislukt: %s\n"
 
 #: src/util.c:103
 #, c-format
@@ -3177,7 +3176,7 @@ msgid "Application set a bogus _NET_WM_PID %ld\n"
 msgstr "Toepassing heeft een overbodige _NET_WM_PID %ld ingesteld\n"
 
 #. first time through
-#: src/window.c:4829
+#: src/window.c:5197
 #, c-format
 msgid ""
 "Window %s sets SM_CLIENT_ID on itself, instead of on the WM_CLIENT_LEADER "
@@ -3193,7 +3192,7 @@ msgstr ""
 #. * MWM but not WM_NORMAL_HINTS are basically broken. We complain
 #. * about these apps but make them work.
 #.
-#: src/window.c:5500
+#: src/window.c:5868
 #, c-format
 msgid ""
 "Window %s sets an MWM hint indicating it isn't resizable, but sets min size %"
@@ -3232,6 +3231,9 @@ msgstr ""
 "Eigenschap %s bij venster 0x%lx bevat ongeldige UTF-8 voor item %d van de "
 "lijst\n"
 
+#~ msgid "Put on _All Workspaces"
+#~ msgstr "Op _alle werkbladen tonen"
+
 #~ msgid "Select how to give focus to windows"
 #~ msgstr "Kiezen hoe u vensters aandacht geeft"
 

po/nn.po

@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-09 21:23-0700\n"
-"PO-Revision-Date: 2004-08-30 22:41+0000\n"
+"POT-Creation-Date: 2005-06-27 17:21-0600\n"
+"PO-Revision-Date: 2005-01-21 13:41+0100\n"
 "Last-Translator: Åsmund Skjæveland <aasmunds@fys.uio.no>\n"
 "Language-Team: Norwegian Nynorsk <i18n-nn@lister.ping.uio.no>\n"
 "MIME-Version: 1.0\n"
@@ -65,7 +65,7 @@ msgid "Failed to get hostname: %s\n"
 msgstr "Klarte ikkje å finna vertsnamn: %s\n"
 
 # TRN: "X Window System"?
-#: src/display.c:306
+#: src/display.c:316
 #, c-format
 msgid "Failed to open X Window System display '%s'\n"
 msgstr "Kunne ikkje opna X Window System-display «%s»\n"
@@ -85,23 +85,23 @@ msgstr ""
 msgid "Fatal IO error %d (%s) on display '%s'.\n"
 msgstr "Fatal IU-feil %d (%s) på display «%s».\n"
 
-#: src/frames.c:1020
+#: src/frames.c:1125
 msgid "Close Window"
 msgstr "Steng vindauge"
 
-#: src/frames.c:1023
+#: src/frames.c:1128
 msgid "Window Menu"
 msgstr "Vindaugemeny"
 
-#: src/frames.c:1026
+#: src/frames.c:1131
 msgid "Minimize Window"
 msgstr "Minimer vindauge"
 
-#: src/frames.c:1029
+#: src/frames.c:1134
 msgid "Maximize Window"
 msgstr "Maksimer vindauge"
 
-#: src/frames.c:1032
+#: src/frames.c:1137
 msgid "Unmaximize Window"
 msgstr "Av-maksimer vindauge"
 
@@ -114,21 +114,20 @@ msgstr ""
 "Eit anna program brukar allereie tasten %s med modifikator %x som ein "
 "snøggtast\n"
 
-#: src/keybindings.c:2554
+#: src/keybindings.c:2535
 #, c-format
 msgid "Error launching metacity-dialog to print an error about a command: %s\n"
 msgstr ""
 "Kunne ikkje opna metacity-dialog for å visa ein feil ved ein kommando: %s\n"
 
-#: src/keybindings.c:2659
+#: src/keybindings.c:2640
 #, c-format
 msgid "No command %d has been defined.\n"
 msgstr "Kommandoen %d er ikkje definert.\n"
 
-#: src/keybindings.c:3489
-#, fuzzy
+#: src/keybindings.c:3485
 msgid "No terminal command has been defined.\n"
-msgstr "Kommandoen %d er ikkje definert.\n"
+msgstr "Ingen terminalkommando er definert.\n"
 
 #: src/main.c:69
 msgid ""
@@ -211,11 +210,13 @@ msgstr "_Lukk"
 
 #. separator
 #: src/menu.c:66
-msgid "Put on _All Workspaces"
-msgstr "Legg på _alle arbeidsområde"
+#, fuzzy
+msgid "_Always on Visible Workspace"
+msgstr "Berre på de_tte arbeidsområdet"
 
 #: src/menu.c:67
-msgid "Only on _This Workspace"
+#, fuzzy
+msgid "_Only on This Workspace"
 msgstr "Berre på de_tte arbeidsområdet"
 
 #: src/menu.c:68
@@ -234,7 +235,7 @@ msgstr "Flytt eitt arbeidsområde _opp"
 msgid "Move to Workspace _Down"
 msgstr "Flytt eitt arbeidsområde ne_d"
 
-#: src/menu.c:162 src/prefs.c:1942
+#: src/menu.c:162 src/prefs.c:1996
 #, c-format
 msgid "Workspace %d"
 msgstr "Arbeidsområde %d"
@@ -366,7 +367,7 @@ msgstr "Tittel"
 msgid "Class"
 msgstr "Klasse"
 
-#: src/metacity-dialog.c:262
+#: src/metacity-dialog.c:263
 msgid ""
 "These windows do not support \"save current setup\" and will have to be "
 "restarted manually next time you log in."
@@ -374,7 +375,7 @@ msgstr ""
 "Desse vindauga støttar ikkje lagring av gjeldande oppsett, og må startast "
 "manuelt neste gong du loggar inn."
 
-#: src/metacity-dialog.c:323
+#: src/metacity-dialog.c:328
 #, c-format
 msgid ""
 "There was an error running \"%s\":\n"
@@ -511,12 +512,14 @@ msgstr ""
 "applikasjonsfonten for vindaugetitlane."
 
 #: src/metacity.schemas.in.h:19
+#, fuzzy
 msgid ""
 "If true, metacity will give the user less feedback and less sense of "
 "\"direct manipulation\", by using wireframes, avoiding animations, or other "
 "means. This is a significant reduction in usability for many users, but may "
 "allow legacy applications and terminal servers to function when they would "
-"otherwise be impractical."
+"otherwise be impractical. However, the wireframe feature is disabled when "
+"accessibility is on to avoid weird desktop breakages."
 msgstr ""
 "Dersom sann, vil Metacity gje brukaren mindre tilbakemelding og mindre "
 "kjensle av direkte manipulering, ved å bruka trådrammer, unngå animasjonar, "
@@ -713,7 +716,7 @@ msgstr "Køyr ein definert kommando"
 
 #: src/metacity.schemas.in.h:60
 msgid "Run a terminal"
-msgstr ""
+msgstr "Køyr ein terminal"
 
 #: src/metacity.schemas.in.h:61
 msgid "Show the panel menu"
@@ -1199,7 +1202,6 @@ msgstr ""
 "nokon snøggtast."
 
 #: src/metacity.schemas.in.h:109
-#, fuzzy
 msgid ""
 "The keybinding used to maximize a window. The format looks like \"&lt;"
 "Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;F1\". The parser is fairly "
@@ -1694,7 +1696,6 @@ msgstr ""
 "verdien «disabled», vil ikkje denne handlinga ha nokon snøggtast."
 
 #: src/metacity.schemas.in.h:142
-#, fuzzy
 msgid ""
 "The keybinding which invokes a terminal. The format looks like \"&lt;"
 "Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;F1\". The parser is fairly "
@@ -1702,12 +1703,11 @@ msgid ""
 "Ctl&gt;\" and \"&lt;Ctrl&gt;\". If you set the option to the special string "
 "\"disabled\", then there will be no keybinding for this action."
 msgstr ""
-"Snøggtasten som køyrer panelet sitt skjermbileteverktøy for å ta eit bilete "
-"av eit vindauge. Formatet er på forma «&lt;Control&gt;a» og «&lt;Shift&gt;"
-"&lt;Alt&gt;F1». Tolkaren er ganske romsleg og tillet små og store bokstavar, "
-"og forkortingar slik som «&lt;Ctl&gt;» og «&lt;Ctrl&gt;». Dersom du set "
-"dette valet til den spesielle verdien «disabled», vil ikkje denne handlinga "
-"ha nokon snøggtast."
+"Snøggtasten som køyrer ein terminal. Formatet er på forma «&lt;Control&gt;a» "
+"og «&lt;Shift&gt;&lt;Alt&gt;F1». Tolkaren er ganske romsleg og tillet små og "
+"store bokstavar, og forkortingar slik som «&lt;Ctl&gt;» og «&lt;Ctrl&gt;». "
+"Dersom du set dette valet til den spesielle verdien «disabled», vil ikkje "
+"denne handlinga ha nokon snøggtast."
 
 #: src/metacity.schemas.in.h:143
 msgid ""
@@ -1938,17 +1938,17 @@ msgstr "Fokuseringsmodus for vindauge"
 msgid "Window title font"
 msgstr "Skrifttype for vindaugetitlar"
 
-#: src/prefs.c:476 src/prefs.c:492 src/prefs.c:508 src/prefs.c:524
-#: src/prefs.c:540 src/prefs.c:560 src/prefs.c:576 src/prefs.c:592
-#: src/prefs.c:608 src/prefs.c:624 src/prefs.c:640 src/prefs.c:656
-#: src/prefs.c:672 src/prefs.c:689 src/prefs.c:705 src/prefs.c:721
-#: src/prefs.c:737 src/prefs.c:753 src/prefs.c:768 src/prefs.c:783
-#: src/prefs.c:798
+#: src/prefs.c:501 src/prefs.c:517 src/prefs.c:533 src/prefs.c:549
+#: src/prefs.c:565 src/prefs.c:585 src/prefs.c:601 src/prefs.c:617
+#: src/prefs.c:633 src/prefs.c:649 src/prefs.c:665 src/prefs.c:681
+#: src/prefs.c:697 src/prefs.c:714 src/prefs.c:730 src/prefs.c:746
+#: src/prefs.c:762 src/prefs.c:778 src/prefs.c:793 src/prefs.c:808
+#: src/prefs.c:823 src/prefs.c:839
 #, c-format
 msgid "GConf key \"%s\" is set to an invalid type\n"
 msgstr "GConf-nøkkel «%s» er satt til ein ugyldig type\n"
 
-#: src/prefs.c:843
+#: src/prefs.c:884
 #, c-format
 msgid ""
 "\"%s\" found in configuration database is not a valid value for mouse button "
@@ -1957,17 +1957,17 @@ msgstr ""
 "«%s» funne i oppsettdatabasen er ikkje ein gyldig verdi for modifikator for "
 "musknapp\n"
 
-#: src/prefs.c:867 src/prefs.c:1277
+#: src/prefs.c:908 src/prefs.c:1318
 #, c-format
 msgid "GConf key '%s' is set to an invalid value\n"
 msgstr "GConf-nøkkel «%s» er satt til ein ugyldig verdi\n"
 
-#: src/prefs.c:994
+#: src/prefs.c:1035
 #, c-format
 msgid "Could not parse font description \"%s\" from GConf key %s\n"
 msgstr "Kunne ikkje tolka fontskildringa «%s» frå GConf-nøkkelen %s\n"
 
-#: src/prefs.c:1179
+#: src/prefs.c:1220
 #, c-format
 msgid ""
 "%d stored in GConf key %s is not a reasonable number of workspaces, current "
@@ -1976,7 +1976,7 @@ msgstr ""
 "%d lagra i GConf-nøkkelen %s er ikkje eit rimeleg tal på arbeidsområder, "
 "noverande maksimum er %d\n"
 
-#: src/prefs.c:1239
+#: src/prefs.c:1280
 msgid ""
 "Workarounds for broken applications disabled. Some applications may not "
 "behave properly.\n"
@@ -1984,17 +1984,17 @@ msgstr ""
 "Triks for å unngå problem med defekte applikasjonar er slått av. Somme "
 "applikasjonar vil kanskje ikkje oppføra seg som venta.\n"
 
-#: src/prefs.c:1304
+#: src/prefs.c:1345
 #, c-format
 msgid "%d stored in GConf key %s is out of range 0 to %d\n"
 msgstr "%d lagra i GConf-nøkkel %s er utanfor området 0 til %d\n"
 
-#: src/prefs.c:1425
+#: src/prefs.c:1479
 #, c-format
 msgid "Error setting number of workspaces to %d: %s\n"
 msgstr "Ein feil oppstod: Kan ikkje setja talet på arbeidsområder til %d: %s\n"
 
-#: src/prefs.c:1669
+#: src/prefs.c:1723
 #, c-format
 msgid ""
 "\"%s\" found in configuration database is not a valid value for keybinding "
@@ -2003,7 +2003,7 @@ msgstr ""
 "«%s» funnen i oppsettdatabasen er ikkje ein gyldig verdi for snøggtasten «%"
 "s»\n"
 
-#: src/prefs.c:2023
+#: src/prefs.c:2077
 #, c-format
 msgid "Error setting name for workspace %d to \"%s\": %s\n"
 msgstr "Ein feil oppstod: Kunne ikkje gje arbeidsområde %d namnet «%s»: %s\n"
@@ -2040,7 +2040,7 @@ msgstr ""
 msgid "Screen %d on display \"%s\" already has a window manager\n"
 msgstr "Skjerm %d på display «%s» har allereie ein vindaugehandsamar\n"
 
-#: src/screen.c:699
+#: src/screen.c:716
 #, c-format
 msgid "Could not release screen %d on display \"%s\"\n"
 msgstr "Kunne ikkje frigjera skjerm %d på display «%s»\n"
@@ -3131,7 +3131,7 @@ msgid "Application set a bogus _NET_WM_PID %ld\n"
 msgstr "Applikasjonen satte ein ugyldig _NET_WM_PID %ld\n"
 
 #. first time through
-#: src/window.c:4829
+#: src/window.c:5197
 #, c-format
 msgid ""
 "Window %s sets SM_CLIENT_ID on itself, instead of on the WM_CLIENT_LEADER "
@@ -3147,7 +3147,7 @@ msgstr ""
 #. * MWM but not WM_NORMAL_HINTS are basically broken. We complain
 #. * about these apps but make them work.
 #.
-#: src/window.c:5500
+#: src/window.c:5868
 #, c-format
 msgid ""
 "Window %s sets an MWM hint indicating it isn't resizable, but sets min size %"
@@ -3185,6 +3185,9 @@ msgstr ""
 "Egenskap %s på vindauge 0x%lx inneheldt ugyldig UTF-8 for oppføring %d i "
 "lista\n"
 
+#~ msgid "Put on _All Workspaces"
+#~ msgstr "Legg på _alle arbeidsområde"
+
 #~ msgid "Select how to give focus to windows"
 #~ msgstr "Velg korleis vindauga skal få fokus"
 

po/or.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: metacity.HEAD.or\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-09 21:23-0700\n"
+"POT-Creation-Date: 2005-06-27 17:21-0600\n"
 "PO-Revision-Date: 2004-08-10 03:43+0530\n"
 "Last-Translator: Gora Mohanty <gora_mohanty@yahoo.co.in>\n"
 "Language-Team: Oriya <oriya-group@lists.sarovar.org>\n"
@@ -59,7 +59,7 @@ msgstr ""
 msgid "Failed to get hostname: %s\n"
 msgstr "ହୋଷ୍ଟ ନାମ ପାଇବାରେ ଅସମର୍ଥ: %s\n"
 
-#: src/display.c:306
+#: src/display.c:316
 #, c-format
 msgid "Failed to open X Window System display '%s'\n"
 msgstr "ଏକ୍ସ ୱିଣ୍ଡୋ ତନ୍ତ୍ରର ପ୍ରଦର୍ଶିକା '%s' ଖୋଲିବାରେ ଅସମର୍ଥ\n"
@@ -79,23 +79,23 @@ msgstr ""
 msgid "Fatal IO error %d (%s) on display '%s'.\n"
 msgstr "ପ୍ରଦର୍ଶିକା '%3$s'ରେ ସାଂଘାତିକ ଆଇ.ଓ. (ନିବେଶ/ନିର୍ଗମ) ତ୍ରୁଟି %1$d (%2$s).\n"
 
-#: src/frames.c:1020
+#: src/frames.c:1125
 msgid "Close Window"
 msgstr "ୱିଣ୍ଡୋ ବନ୍ଦ କରନ୍ତୁ"
 
-#: src/frames.c:1023
+#: src/frames.c:1128
 msgid "Window Menu"
 msgstr "ୱିଣ୍ଡୋ ମେନୁ"
 
-#: src/frames.c:1026
+#: src/frames.c:1131
 msgid "Minimize Window"
 msgstr "ୱିଣ୍ଡୋକୁ କ୍ଷୁଦ୍ରତମ କରନ୍ତୁ"
 
-#: src/frames.c:1029
+#: src/frames.c:1134
 msgid "Maximize Window"
 msgstr "ୱିଣ୍ଡୋକୁ ବୃହତ୍ତମ କରନ୍ତୁ"
 
-#: src/frames.c:1032
+#: src/frames.c:1137
 msgid "Unmaximize Window"
 msgstr "ୱିଣ୍ଡୋକୁ ସାଧାରଣ ଆକାର ଦିଅନ୍ତୁ"
 
@@ -106,17 +106,17 @@ msgid ""
 "binding\n"
 msgstr "ଏକ ଅଲଗା କାରିକା ପୂର୍ବରୁ ଚାବି %sକୁ ରୂପାନ୍ତରକ %x ସହିତ ବନ୍ଧନ ରୂପେ ବ୍ଯବହାର କରୁଛି\n"
 
-#: src/keybindings.c:2554
+#: src/keybindings.c:2535
 #, c-format
 msgid "Error launching metacity-dialog to print an error about a command: %s\n"
 msgstr "ଗୋଟିଏ ନିର୍ଦ୍ଦେଶ ବିଷୟରେ ଏକ ତ୍ରୁଟି ମୁଦ୍ରଣ କରିବା ପାଇଁ ମେଟାସିଟି ସଂଳାପ ଚଳାଇବାରେ ତ୍ରୁଟି: %s\n"
 
-#: src/keybindings.c:2659
+#: src/keybindings.c:2640
 #, c-format
 msgid "No command %d has been defined.\n"
 msgstr "%d ନିର୍ଦ୍ଦେଶ ବ୍ଯାଖ୍ଯା କରାଯାଇ ନାହିଁ.\n"
 
-#: src/keybindings.c:3489
+#: src/keybindings.c:3485
 #, fuzzy
 msgid "No terminal command has been defined.\n"
 msgstr "%d ନିର୍ଦ୍ଦେଶ ବ୍ଯାଖ୍ଯା କରାଯାଇ ନାହିଁ.\n"
@@ -200,11 +200,13 @@ msgstr "ବନ୍ଦ କରନ୍ତୁ (_C)"
 
 #. separator
 #: src/menu.c:66
-msgid "Put on _All Workspaces"
-msgstr "ସବୁ କାର୍ଯ୍ଯକ୍ଷେତ୍ରରେ ରଖନ୍ତୁ (_A)"
+#, fuzzy
+msgid "_Always on Visible Workspace"
+msgstr "କେବଳ ଏହି କାର୍ଯ୍ଯକ୍ଷେତ୍ରରେ (_T)"
 
 #: src/menu.c:67
-msgid "Only on _This Workspace"
+#, fuzzy
+msgid "_Only on This Workspace"
 msgstr "କେବଳ ଏହି କାର୍ଯ୍ଯକ୍ଷେତ୍ରରେ (_T)"
 
 #: src/menu.c:68
@@ -223,7 +225,7 @@ msgstr "ଉପର କାର୍ଯ୍ଯକ୍ଷେତ୍ରକୁ ପଠାନ
 msgid "Move to Workspace _Down"
 msgstr "ତଳ କାର୍ଯ୍ଯକ୍ଷେତ୍ରକୁ ପଠାନ୍ତୁ (_D)"
 
-#: src/menu.c:162 src/prefs.c:1942
+#: src/menu.c:162 src/prefs.c:1996
 #, c-format
 msgid "Workspace %d"
 msgstr "କାର୍ଯ୍ଯକ୍ଷେତ୍ର %d"
@@ -353,7 +355,7 @@ msgstr "ଶୀର୍ଷକ"
 msgid "Class"
 msgstr "ଶ୍ରେଣୀ"
 
-#: src/metacity-dialog.c:262
+#: src/metacity-dialog.c:263
 msgid ""
 "These windows do not support \"save current setup\" and will have to be "
 "restarted manually next time you log in."
@@ -361,7 +363,7 @@ msgstr ""
 "ଏହି ୱିଣ୍ଡୋଗୁଡ଼ିକର \"ସାମ୍ପ୍ରତିକ ବ୍ଯବସ୍ଥା ସଂରକ୍ଷଣ\" ସହାୟକ ନାହିଁ, ଏବଂ ଆପଣ ପୁଣି ଲଗଇନ୍ କଲେ "
 "ଏହୋଙ୍କୁନିଜେ ପୁନଃ ପ୍ରାରମ୍ଭ କରିବାକୁ ହେବ."
 
-#: src/metacity-dialog.c:323
+#: src/metacity-dialog.c:328
 #, c-format
 msgid ""
 "There was an error running \"%s\":\n"
@@ -489,12 +491,14 @@ msgid ""
 msgstr "ଏହା ସତ ହେଲେ, "
 
 #: src/metacity.schemas.in.h:19
+#, fuzzy
 msgid ""
 "If true, metacity will give the user less feedback and less sense of "
 "\"direct manipulation\", by using wireframes, avoiding animations, or other "
 "means. This is a significant reduction in usability for many users, but may "
 "allow legacy applications and terminal servers to function when they would "
-"otherwise be impractical."
+"otherwise be impractical. However, the wireframe feature is disabled when "
+"accessibility is on to avoid weird desktop breakages."
 msgstr ""
 "ଏହା ସତ ହେଲେ, ମେଟାସିଟି ତାର ଆକୃତି ବ୍ଯବହାର କରି, ଜୀବନାୟନଗୁଡ଼ିକୁ ଏଡ଼ାଇ, ଓ ଅନ୍ଯ ଉପାୟ ଦ୍ବାରା "
 "ବ୍ଯବହାରକାରୀକୁ କମ ପ୍ରତିକ୍ରିୟା ଏବଂ \"ପ୍ରତ୍ଯକ୍ଷ ପ୍ରକଳନ\"ର କମ ଭାବ ଦେବ. ଅନେକ ବ୍ଯବହାରକାରୀଙ୍କ "
@@ -1841,17 +1845,17 @@ msgstr "ୱିଣ୍ଡୋ କେନ୍ଦ୍ରୀଭୂତ ଧାରା"
 msgid "Window title font"
 msgstr "ୱିଣ୍ଡୋ ଶୀର୍ଷକ ଅକ୍ଷରରୂପ"
 
-#: src/prefs.c:476 src/prefs.c:492 src/prefs.c:508 src/prefs.c:524
-#: src/prefs.c:540 src/prefs.c:560 src/prefs.c:576 src/prefs.c:592
-#: src/prefs.c:608 src/prefs.c:624 src/prefs.c:640 src/prefs.c:656
-#: src/prefs.c:672 src/prefs.c:689 src/prefs.c:705 src/prefs.c:721
-#: src/prefs.c:737 src/prefs.c:753 src/prefs.c:768 src/prefs.c:783
-#: src/prefs.c:798
+#: src/prefs.c:501 src/prefs.c:517 src/prefs.c:533 src/prefs.c:549
+#: src/prefs.c:565 src/prefs.c:585 src/prefs.c:601 src/prefs.c:617
+#: src/prefs.c:633 src/prefs.c:649 src/prefs.c:665 src/prefs.c:681
+#: src/prefs.c:697 src/prefs.c:714 src/prefs.c:730 src/prefs.c:746
+#: src/prefs.c:762 src/prefs.c:778 src/prefs.c:793 src/prefs.c:808
+#: src/prefs.c:823 src/prefs.c:839
 #, c-format
 msgid "GConf key \"%s\" is set to an invalid type\n"
 msgstr "ଜିକନ୍ଫ ଚାବି \"%s\" ଅବୈଧ ପ୍ରକାରକୁ ବିନ୍ଯାସ କରାଯାଇଛି\n"
 
-#: src/prefs.c:843
+#: src/prefs.c:884
 #, c-format
 msgid ""
 "\"%s\" found in configuration database is not a valid value for mouse button "
@@ -1859,17 +1863,17 @@ msgid ""
 msgstr ""
 "ବିନ୍ଯାସ ତଥ୍ଯାଧାରରେ ପାୟାଯାଇଥିବା \"%s\" ମାଉସ ଚାବି ରୂପାନ୍ତରକ ପାଇଁ ଗୋଟିଏ ବୈଧ ମୂଲ୍ଯ ନୁହେଁ\n"
 
-#: src/prefs.c:867 src/prefs.c:1277
+#: src/prefs.c:908 src/prefs.c:1318
 #, c-format
 msgid "GConf key '%s' is set to an invalid value\n"
 msgstr "ଜିକନ୍ଫ ଚାବି '%s' ଅବୈଧ ମୂଲ୍ଯକୁ ବିନ୍ଯାସ କରାଯାଇଛି\n"
 
-#: src/prefs.c:994
+#: src/prefs.c:1035
 #, c-format
 msgid "Could not parse font description \"%s\" from GConf key %s\n"
 msgstr "ଜିକନ୍ଫ ଚାବି %2$sରୁ \"%1$s\" ଅକ୍ଷରରୂପ ବିବରଣୀ ବିଶ୍ଳେଷଣ କରିହେଲା ନାହିଁ\n"
 
-#: src/prefs.c:1179
+#: src/prefs.c:1220
 #, c-format
 msgid ""
 "%d stored in GConf key %s is not a reasonable number of workspaces, current "
@@ -1878,24 +1882,24 @@ msgstr ""
 "ଜିକନ୍ଫ ଚାବି %2$sରେ ସଞ୍ଚିତ %1$d କାର୍ଯ୍ଯକ୍ଷେତ୍ର ସଂଖ୍ଯା ପାଇଁ ଯୁକ୍ତିଯୁକ୍ତ ମୂଲ୍ଯ ନୁହେଁ, ବର୍ତ୍ତମାନ "
 "ସର୍ବାଧିକ ମୂଲ୍ଯ ହେଲା %3$d\n"
 
-#: src/prefs.c:1239
+#: src/prefs.c:1280
 msgid ""
 "Workarounds for broken applications disabled. Some applications may not "
 "behave properly.\n"
 msgstr ""
 "ଅବୈଧ ପ୍ରୟୋଗ ପାଇଁ ଅନ୍ଯତର ଉପାୟଗୁଡ଼ିକ ଅସମର୍ଥ କରାଯାଇଛି. କିଛି ପ୍ରୟୋଗ ଠିକ ଭାବେ ନ ଚଳିପାରନ୍ତି.\n"
 
-#: src/prefs.c:1304
+#: src/prefs.c:1345
 #, c-format
 msgid "%d stored in GConf key %s is out of range 0 to %d\n"
 msgstr "ଜିକନ୍ଫ ଚାବି %2$sରେ ସଞ୍ଚିତ %1$d ପରିସର ୦ରୁ %3$d ବାହାରେ\n"
 
-#: src/prefs.c:1425
+#: src/prefs.c:1479
 #, c-format
 msgid "Error setting number of workspaces to %d: %s\n"
 msgstr "କାର୍ଯ୍ଯକ୍ଷେତ୍ର ସଂଖ୍ଯାକୁ %d ଭଳି ବିନ୍ଯାସ କରିବାରେ ତ୍ରୁଟି: %s\n"
 
-#: src/prefs.c:1669
+#: src/prefs.c:1723
 #, c-format
 msgid ""
 "\"%s\" found in configuration database is not a valid value for keybinding "
@@ -1903,7 +1907,7 @@ msgid ""
 msgstr ""
 "ବିନ୍ଯାସ ତଥ୍ଯାଧାରରେ ପାୟାଯାଇଥିବା \"%s\" ଚାବିବନ୍ଧନୀ \"%s\" ପାଇଁ ଗୋଟିଏ ବୈଧ ମୂଲ୍ଯ ନୁହେଁ\n"
 
-#: src/prefs.c:2023
+#: src/prefs.c:2077
 #, c-format
 msgid "Error setting name for workspace %d to \"%s\": %s\n"
 msgstr "କାର୍ଯ୍ଯକ୍ଷେତ୍ର %dର ନାମ \"%s\" ବିନ୍ଯାସ କରିବାରେ ତ୍ରୁଟି: %s\n"
@@ -1938,7 +1942,7 @@ msgstr "ପ୍ରଦର୍ଶକ \"%2$s\"ରେ ପରଦା %1$dର ୱିଣ
 msgid "Screen %d on display \"%s\" already has a window manager\n"
 msgstr "ପ୍ରଦର୍ଶକ \"%2$s\"ରେ ପରଦା %1$dର ପୂର୍ବରୁ ଗୋଟିଏ ୱିଣ୍ଢୋ ପରିଚାଳକ ଅଛି\n"
 
-#: src/screen.c:699
+#: src/screen.c:716
 #, c-format
 msgid "Could not release screen %d on display \"%s\"\n"
 msgstr "ପ୍ରଦର୍ଶକ \"%2$s\"ରେ ପରଦା %1$dକୁ ନୁକ୍ତ କରିହେଲା ନାହିଁ\n"
@@ -3016,7 +3020,7 @@ msgid "Application set a bogus _NET_WM_PID %ld\n"
 msgstr "ପ୍ରୟୋଗ ଗୋଟିଏ ନକଲି _NET_WM_PID %ld\n"
 
 #. first time through
-#: src/window.c:4829
+#: src/window.c:5197
 #, c-format
 msgid ""
 "Window %s sets SM_CLIENT_ID on itself, instead of on the WM_CLIENT_LEADER "
@@ -3032,7 +3036,7 @@ msgstr ""
 #. * MWM but not WM_NORMAL_HINTS are basically broken. We complain
 #. * about these apps but make them work.
 #.
-#: src/window.c:5500
+#: src/window.c:5868
 #, c-format
 msgid ""
 "Window %s sets an MWM hint indicating it isn't resizable, but sets min size %"
@@ -3067,6 +3071,9 @@ msgid ""
 "Property %s on window 0x%lx contained invalid UTF-8 for item %d in the list\n"
 msgstr "ୱିଣ୍ଡୋ 0x%2$lxର %1$s ଗୁଣଧର୍ମର ତାଲିକାରେ %3$d ବସ୍ତୁରେ ଅବୈଧ ୟି.ଟି.ଏଫ.-୮ ଅଛି\n"
 
+#~ msgid "Put on _All Workspaces"
+#~ msgstr "ସବୁ କାର୍ଯ୍ଯକ୍ଷେତ୍ରରେ ରଖନ୍ତୁ (_A)"
+
 #~ msgid "Select how to give focus to windows"
 #~ msgstr "ୱିଣ୍ଡୋଗୁଡ଼ିକୁ କିପରି କେନ୍ଦ୍ରିତ କରିବା ବାଛନ୍ତୁ"
 

po/pt.po

@@ -1,14 +1,14 @@
 # metacity's Portuguese Translation
-# Copyright © 2001, 2002, 2003, 2004 metacity
+# Copyright © 2001, 2002, 2003, 2004, 2005 metacity
 # Distributed under the same licence as the metacity package
-# Duarte Loreto <happyguy_pt@hotmail.com>, 2001, 2002, 2003, 2004
+# Duarte Loreto <happyguy_pt@hotmail.com>, 2001, 2002, 2003, 2004, 2005.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: 2.8\n"
+"Project-Id-Version: 2.10\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-09 21:23-0700\n"
-"PO-Revision-Date: 2004-08-02 20:50+0000\n"
+"POT-Creation-Date: 2005-06-27 17:21-0600\n"
+"PO-Revision-Date: 2005-02-18 00:45+0000\n"
 "Last-Translator: Duarte Loreto <happyguy_pt@hotmail.com>\n"
 "Language-Team: Portuguese <gnome_pt@yahoogroups.com>\n"
 "MIME-Version: 1.0\n"
@@ -60,7 +60,7 @@ msgstr ""
 msgid "Failed to get hostname: %s\n"
 msgstr "Falha ao obter nome de máquina: %s\n"
 
-#: src/display.c:306
+#: src/display.c:316
 #, c-format
 msgid "Failed to open X Window System display '%s'\n"
 msgstr "Falha ao abrir ecrã '%s' do Sistema Janelas X\n"
@@ -81,23 +81,23 @@ msgstr ""
 msgid "Fatal IO error %d (%s) on display '%s'.\n"
 msgstr "Erro IO fatal %d (%s) no ecrã '%s'.\n"
 
-#: src/frames.c:1020
+#: src/frames.c:1125
 msgid "Close Window"
 msgstr "Fechar Janela"
 
-#: src/frames.c:1023
+#: src/frames.c:1128
 msgid "Window Menu"
 msgstr "Menu de Janela"
 
-#: src/frames.c:1026
+#: src/frames.c:1131
 msgid "Minimize Window"
 msgstr "Minimizar Janela"
 
-#: src/frames.c:1029
+#: src/frames.c:1134
 msgid "Maximize Window"
 msgstr "Maximizar Janela"
 
-#: src/frames.c:1032
+#: src/frames.c:1137
 msgid "Unmaximize Window"
 msgstr "Restaurar Janela"
 
@@ -110,21 +110,20 @@ msgstr ""
 "A tecla %s com os modificadores %x já está a ser utilizada como atalho por "
 "outra aplicação\n"
 
-#: src/keybindings.c:2554
+#: src/keybindings.c:2535
 #, c-format
 msgid "Error launching metacity-dialog to print an error about a command: %s\n"
 msgstr ""
 "Erro ao abrir diálogo-metacity para imprimir um erro sobre um comando: %s\n"
 
-#: src/keybindings.c:2659
+#: src/keybindings.c:2640
 #, c-format
 msgid "No command %d has been defined.\n"
 msgstr "Não foi definido nenhum comando %d.\n"
 
-#: src/keybindings.c:3489
-#, fuzzy
+#: src/keybindings.c:3485
 msgid "No terminal command has been defined.\n"
-msgstr "Não foi definido nenhum comando %d.\n"
+msgstr "Não foi definido nenhum comando de consola.\n"
 
 #: src/main.c:69
 msgid ""
@@ -207,12 +206,12 @@ msgstr "_Fechar"
 
 #. separator
 #: src/menu.c:66
-msgid "Put on _All Workspaces"
-msgstr "Colocar em _Todas as Áreas de Trabalho"
+msgid "_Always on Visible Workspace"
+msgstr "_Sempre na Área de Trabalho Visível"
 
 #: src/menu.c:67
-msgid "Only on _This Workspace"
-msgstr "Apenas Nesta Área de _Trabalho"
+msgid "_Only on This Workspace"
+msgstr "_Apenas nesta Área de Trabalho"
 
 #: src/menu.c:68
 msgid "Move to Workspace _Left"
@@ -230,7 +229,7 @@ msgstr "Mover para Área de Trabalho _Acima"
 msgid "Move to Workspace _Down"
 msgstr "Mover para Área de Trabalho A_baixo"
 
-#: src/menu.c:162 src/prefs.c:1942
+#: src/menu.c:162 src/prefs.c:1996
 #, c-format
 msgid "Workspace %d"
 msgstr "Área de Trabalho %d"
@@ -361,7 +360,7 @@ msgstr "Título"
 msgid "Class"
 msgstr "Classe"
 
-#: src/metacity-dialog.c:262
+#: src/metacity-dialog.c:263
 msgid ""
 "These windows do not support \"save current setup\" and will have to be "
 "restarted manually next time you log in."
@@ -369,7 +368,7 @@ msgstr ""
 "Estas janelas não suportam \"gravar configuração actual\" e terão de ser "
 "reiniciadas manualmente da próxima vez que iniciar sessão."
 
-#: src/metacity-dialog.c:323
+#: src/metacity-dialog.c:328
 #, c-format
 msgid ""
 "There was an error running \"%s\":\n"
@@ -510,14 +509,17 @@ msgid ""
 "\"direct manipulation\", by using wireframes, avoiding animations, or other "
 "means. This is a significant reduction in usability for many users, but may "
 "allow legacy applications and terminal servers to function when they would "
-"otherwise be impractical."
+"otherwise be impractical. However, the wireframe feature is disabled when "
+"accessibility is on to avoid weird desktop breakages."
 msgstr ""
-"Se verdadeiro, o metacity dará ao utilizador menos feedback e menor sensação "
-"de \"manipulação directa\", utilizando molduras de linhas, evitando "
+"Se verdadeiro, o metacity transmitirá ao utilizador menos resposta e menor "
+"sensação de \"manipulação directa\", utilizando molduras de linhas, evitando "
 "animações ou outros meios. Isto representa para muitos utilizadores uma "
 "redução significativa na usabilidade, mas poderá permitir que aplicações "
 "antigas e servidores de consola funcionem quando de outra forma tal seria "
-"impraticável."
+"impraticável. No entanto, a funcionalidade de molduras de linhas estará "
+"inactiva quando a acessibilidade estiver activa para evitar estranhos "
+"problemas no ambiente de trabalho."
 
 #: src/metacity.schemas.in.h:20
 msgid ""
@@ -705,7 +707,7 @@ msgstr "Executar um comando definido"
 
 #: src/metacity.schemas.in.h:60
 msgid "Run a terminal"
-msgstr ""
+msgstr "Executar uma consola"
 
 #: src/metacity.schemas.in.h:61
 msgid "Show the panel menu"
@@ -1210,7 +1212,6 @@ msgstr ""
 "atalhos de teclado para esta acção."
 
 #: src/metacity.schemas.in.h:109
-#, fuzzy
 msgid ""
 "The keybinding used to maximize a window. The format looks like \"&lt;"
 "Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;F1\". The parser is fairly "
@@ -1738,7 +1739,6 @@ msgstr ""
 "não existirão quaisquer atalhos de teclado para esta acção."
 
 #: src/metacity.schemas.in.h:142
-#, fuzzy
 msgid ""
 "The keybinding which invokes a terminal. The format looks like \"&lt;"
 "Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;F1\". The parser is fairly "
@@ -1746,12 +1746,12 @@ msgid ""
 "Ctl&gt;\" and \"&lt;Ctrl&gt;\". If you set the option to the special string "
 "\"disabled\", then there will be no keybinding for this action."
 msgstr ""
-"O atalho de teclado que apresenta o menu principal do painel. O formato "
-"assemelha-se a \"&lt;Control&gt;a\" ou \"&lt;Shift&gt;&lt;Alt&gt;F1\". O "
-"parseador é razoavelmente liberal e permite capitalização maiúscula ou "
-"minúscula e também abreviaturas tais como \"&lt;Ctl&gt;\" e \"&lt;Ctrl&gt;"
-"\". Se definir a opção para a expressão especial \"disabled\", não existirão "
-"quaisquer atalhos de teclado para esta acção."
+"O atalho de teclado que apresenta uma consola. O formato assemelha-se a "
+"\"&lt;Control&gt;a\" ou \"&lt;Shift&gt;&lt;Alt&gt;F1\". O parseador é "
+"razoavelmente liberal e permite capitalização maiúscula ou minúscula e "
+"também abreviaturas tais como \"&lt;Ctl&gt;\" e \"&lt;Ctrl&gt;\". Se definir "
+"a opção para a expressão especial \"disabled\", não existirão quaisquer "
+"atalhos de teclado para esta acção."
 
 #: src/metacity.schemas.in.h:143
 msgid ""
@@ -1986,17 +1986,17 @@ msgstr "Modo de foco de janela"
 msgid "Window title font"
 msgstr "Fonte de título de janela"
 
-#: src/prefs.c:476 src/prefs.c:492 src/prefs.c:508 src/prefs.c:524
-#: src/prefs.c:540 src/prefs.c:560 src/prefs.c:576 src/prefs.c:592
-#: src/prefs.c:608 src/prefs.c:624 src/prefs.c:640 src/prefs.c:656
-#: src/prefs.c:672 src/prefs.c:689 src/prefs.c:705 src/prefs.c:721
-#: src/prefs.c:737 src/prefs.c:753 src/prefs.c:768 src/prefs.c:783
-#: src/prefs.c:798
+#: src/prefs.c:501 src/prefs.c:517 src/prefs.c:533 src/prefs.c:549
+#: src/prefs.c:565 src/prefs.c:585 src/prefs.c:601 src/prefs.c:617
+#: src/prefs.c:633 src/prefs.c:649 src/prefs.c:665 src/prefs.c:681
+#: src/prefs.c:697 src/prefs.c:714 src/prefs.c:730 src/prefs.c:746
+#: src/prefs.c:762 src/prefs.c:778 src/prefs.c:793 src/prefs.c:808
+#: src/prefs.c:823 src/prefs.c:839
 #, c-format
 msgid "GConf key \"%s\" is set to an invalid type\n"
 msgstr "Chave GConf \"%s\" está definida para um tipo inválido\n"
 
-#: src/prefs.c:843
+#: src/prefs.c:884
 #, c-format
 msgid ""
 "\"%s\" found in configuration database is not a valid value for mouse button "
@@ -2005,17 +2005,17 @@ msgstr ""
 "\"%s\" encontrado na base de dados de configuração não é um valor válido "
 "para o modificador de botão de rato\n"
 
-#: src/prefs.c:867 src/prefs.c:1277
+#: src/prefs.c:908 src/prefs.c:1318
 #, c-format
 msgid "GConf key '%s' is set to an invalid value\n"
 msgstr "Chave GConf '%s' está definida com um valor inválido\n"
 
-#: src/prefs.c:994
+#: src/prefs.c:1035
 #, c-format
 msgid "Could not parse font description \"%s\" from GConf key %s\n"
 msgstr "Incapaz de parsear descrição de fonte \"%s\" da chave GConf %s\n"
 
-#: src/prefs.c:1179
+#: src/prefs.c:1220
 #, c-format
 msgid ""
 "%d stored in GConf key %s is not a reasonable number of workspaces, current "
@@ -2024,7 +2024,7 @@ msgstr ""
 "%d armazenado na chave GConf %s não é um número razoável de ambientes de "
 "trabalho, o número máximo actual é %d\n"
 
-#: src/prefs.c:1239
+#: src/prefs.c:1280
 msgid ""
 "Workarounds for broken applications disabled. Some applications may not "
 "behave properly.\n"
@@ -2032,17 +2032,17 @@ msgstr ""
 "Recursos para aplicações problemáticas inactivos. Algumas aplicações poderão "
 "não funcionar correctamente.\n"
 
-#: src/prefs.c:1304
+#: src/prefs.c:1345
 #, c-format
 msgid "%d stored in GConf key %s is out of range 0 to %d\n"
 msgstr "%d armazenado na chave GConf %s está fora do intervalo de 0 a %d\n"
 
-#: src/prefs.c:1425
+#: src/prefs.c:1479
 #, c-format
 msgid "Error setting number of workspaces to %d: %s\n"
 msgstr "Erro ao definir número de ambientes de trabalho para %d: %s\n"
 
-#: src/prefs.c:1669
+#: src/prefs.c:1723
 #, c-format
 msgid ""
 "\"%s\" found in configuration database is not a valid value for keybinding "
@@ -2051,7 +2051,7 @@ msgstr ""
 "\"%s\" encontrado na base de dados de configuração não é um valor válido "
 "para o atalho de teclado \"%s\"\n"
 
-#: src/prefs.c:2023
+#: src/prefs.c:2077
 #, c-format
 msgid "Error setting name for workspace %d to \"%s\": %s\n"
 msgstr "Erro ao definir nome da área de trabalho %d para \"%s\": %s\n"
@@ -2087,7 +2087,7 @@ msgstr ""
 msgid "Screen %d on display \"%s\" already has a window manager\n"
 msgstr "Ecrã %d no monitor \"%s\" já tem um gestor de janelas\n"
 
-#: src/screen.c:699
+#: src/screen.c:716
 #, c-format
 msgid "Could not release screen %d on display \"%s\"\n"
 msgstr "Incapaz libertar ecrã %d no monitor \"%s\"\n"
@@ -3193,7 +3193,7 @@ msgid "Application set a bogus _NET_WM_PID %ld\n"
 msgstr "Aplicação definiu um _NET_WM_PID %ld fictício\n"
 
 #. first time through
-#: src/window.c:4829
+#: src/window.c:5197
 #, c-format
 msgid ""
 "Window %s sets SM_CLIENT_ID on itself, instead of on the WM_CLIENT_LEADER "
@@ -3209,7 +3209,7 @@ msgstr ""
 #. * MWM but not WM_NORMAL_HINTS are basically broken. We complain
 #. * about these apps but make them work.
 #.
-#: src/window.c:5500
+#: src/window.c:5868
 #, c-format
 msgid ""
 "Window %s sets an MWM hint indicating it isn't resizable, but sets min size %"
@@ -3248,6 +3248,9 @@ msgstr ""
 "Propriedade %s na janela 0x%lx continha UTF-8 inválido para item %d na "
 "lista\n"
 
+#~ msgid "Put on _All Workspaces"
+#~ msgstr "Colocar em _Todas as Áreas de Trabalho"
+
 #~ msgid "Select how to give focus to windows"
 #~ msgstr "Seleccione como dar foco a uma janela"
 

po/ro.po

@@ -3,20 +3,20 @@
 # Romanian translation for metacity-2.4.0.
 # Copyright (C) 2002
 # This file is distributed under the same license as the PACKAGE package.
-# Mugurel Tudor <mugurelu@go.ro>, 2002-2004.
+# Mugurel Tudor <mugurelu@go.ro>, 2002-2004, 2005.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: metacity.HEAD.ro\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-09 21:23-0700\n"
-"PO-Revision-Date: 2004-09-07 01:05+0300\n"
+"POT-Creation-Date: 2005-06-27 17:21-0600\n"
+"PO-Revision-Date: 2005-03-06 23:06+0200\n"
 "Last-Translator: Mugurel Tudor <mugurelu@go.ro>\n"
 "Language-Team: Romanian <@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.3.1\n"
+"X-Generator: KBabel 1.9.1\n"
 
 #: src/tools/metacity-message.c:150
 #, c-format
@@ -61,7 +61,7 @@ msgstr ""
 msgid "Failed to get hostname: %s\n"
 msgstr "Nu am putut încărca numele gazdei: %s\n"
 
-#: src/display.c:306
+#: src/display.c:316
 #, c-format
 msgid "Failed to open X Window System display '%s'\n"
 msgstr "Nu am putut deschide afişajul X Window System '%s'\n"
@@ -82,23 +82,23 @@ msgstr ""
 msgid "Fatal IO error %d (%s) on display '%s'.\n"
 msgstr "Eroare fatală IO %d (%s) la afişajul '%s'.\n"
 
-#: src/frames.c:1020
+#: src/frames.c:1125
 msgid "Close Window"
 msgstr "Închide fereastra"
 
-#: src/frames.c:1023
+#: src/frames.c:1128
 msgid "Window Menu"
 msgstr "Meniu fereastră"
 
-#: src/frames.c:1026
+#: src/frames.c:1131
 msgid "Minimize Window"
 msgstr "Minimizează fereastra"
 
-#: src/frames.c:1029
+#: src/frames.c:1134
 msgid "Maximize Window"
 msgstr "Maximizează fereastra"
 
-#: src/frames.c:1032
+#: src/frames.c:1137
 msgid "Unmaximize Window"
 msgstr "Restaurează fereastra"
 
@@ -110,22 +110,21 @@ msgid ""
 msgstr ""
 "Alt program foloseşte deja tasta %s cu modificatorul %x drept combinaţie\n"
 
-#: src/keybindings.c:2554
+#: src/keybindings.c:2535
 #, c-format
 msgid "Error launching metacity-dialog to print an error about a command: %s\n"
 msgstr ""
 "Eroare la lansarea metacity-dialog pentru a afişa o eroare despre o comandă: "
 "%s\n"
 
-#: src/keybindings.c:2659
+#: src/keybindings.c:2640
 #, c-format
 msgid "No command %d has been defined.\n"
 msgstr "Nici o comandă %d nu a fost definită.\n"
 
-#: src/keybindings.c:3489
-#, fuzzy
+#: src/keybindings.c:3485
 msgid "No terminal command has been defined.\n"
-msgstr "Nici o comandă %d nu a fost definită.\n"
+msgstr "Nici o comandă pentru terminal nu a fost definită.\n"
 
 #: src/main.c:69
 msgid ""
@@ -206,11 +205,11 @@ msgstr "_Închide"
 
 #. separator
 #: src/menu.c:66
-msgid "Put on _All Workspaces"
-msgstr "Pe _toate ecranele"
+msgid "_Always on Visible Workspace"
+msgstr "Întotde_auna pe ecranul vizibil"
 
 #: src/menu.c:67
-msgid "Only on _This Workspace"
+msgid "_Only on This Workspace"
 msgstr "Doar pe _acest ecran"
 
 #: src/menu.c:68
@@ -229,7 +228,7 @@ msgstr "Mută fereastra către ecranul de s_us"
 msgid "Move to Workspace _Down"
 msgstr "Mută fereastra către ecranul de _jos"
 
-#: src/menu.c:162 src/prefs.c:1942
+#: src/menu.c:162 src/prefs.c:1996
 #, c-format
 msgid "Workspace %d"
 msgstr "Ecranul %d"
@@ -361,7 +360,7 @@ msgstr "Titlu"
 msgid "Class"
 msgstr "Clasă"
 
-#: src/metacity-dialog.c:262
+#: src/metacity-dialog.c:263
 msgid ""
 "These windows do not support \"save current setup\" and will have to be "
 "restarted manually next time you log in."
@@ -369,7 +368,7 @@ msgstr ""
 "Aceste ferestre nu suportă \"salvează setarea curentă\" şi vor trebui "
 "restartate manual urmatoarea dată când vă veţi loga."
 
-#: src/metacity-dialog.c:323
+#: src/metacity-dialog.c:328
 #, c-format
 msgid ""
 "There was an error running \"%s\":\n"
@@ -508,12 +507,16 @@ msgid ""
 "\"direct manipulation\", by using wireframes, avoiding animations, or other "
 "means. This is a significant reduction in usability for many users, but may "
 "allow legacy applications and terminal servers to function when they would "
-"otherwise be impractical."
+"otherwise be impractical. However, the wireframe feature is disabled when "
+"accessibility is on to avoid weird desktop breakages."
 msgstr ""
-"Daca este true, metacity va furniza mai puţin feedback utilizatorului, "
-"folosindwireframe, dezactivand animaţiile şi alte efecte. În acest fel "
-"uzabilitatea va fimult înrăutăţită pentru utilizatori, dar multe aplicaţii "
-"mai vechi şi servere determinale vor putea funcţiona doar în aceste condiţii."
+"Daca este true, metacity va furniza mai puţin feedback utilizatorului şi va "
+"da o senzaţie mai slabă pentru „manipularea directă”, folosind wireframe, "
+"dezactivand animaţiile şi alte efecte. În acest fel uzabilitatea va fi mult "
+"înrăutăţită pentru utilizatori, dar multe aplicaţii mai vechi şi servere "
+"determinale vor putea funcţiona doar în aceste condiţii. Totuşi, facilitatea "
+"de wireframe este dezactivată când accesibilitatea este activată pentru "
+"pentru a evita generarea de efecte ciudate pe ecran."
 
 #: src/metacity.schemas.in.h:20
 msgid ""
@@ -703,7 +706,7 @@ msgstr "Rulează o comandă definită"
 
 #: src/metacity.schemas.in.h:60
 msgid "Run a terminal"
-msgstr ""
+msgstr "Rulează un terminal"
 
 #: src/metacity.schemas.in.h:61
 msgid "Show the panel menu"
@@ -1201,7 +1204,6 @@ msgstr ""
 "o combinaţie de taste pentru această acţiune."
 
 #: src/metacity.schemas.in.h:109
-#, fuzzy
 msgid ""
 "The keybinding used to maximize a window. The format looks like \"&lt;"
 "Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;F1\". The parser is fairly "
@@ -1726,7 +1728,6 @@ msgstr ""
 "pentru această acţiune."
 
 #: src/metacity.schemas.in.h:142
-#, fuzzy
 msgid ""
 "The keybinding which invokes a terminal. The format looks like \"&lt;"
 "Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;F1\". The parser is fairly "
@@ -1734,12 +1735,12 @@ msgid ""
 "Ctl&gt;\" and \"&lt;Ctrl&gt;\". If you set the option to the special string "
 "\"disabled\", then there will be no keybinding for this action."
 msgstr ""
-"Combinaţia de taste folosită pentru a activa meniul principal al panoului. "
-"Formatul arată ca de exemplu \"&lt;Control&gt;a\" sau \"&lt;Shift&gt;&lt;"
-"Alt&gt;F1\". Este permisă folosirea majusculelor şi a minusculelor, precum "
-"şi a abrevierilor gen \"&lt;Ctl&gt;\" şi \"&lt;Ctrl&gt;\". Dacă setaţi "
-"opţiunea cu şirul \"disabled\", atunci nu va exista o combinaţie de taste "
-"pentru această acţiune."
+"Combinaţia de taste folosită pentru a porni un terminal. Formatul arată ca "
+"de exemplu \"&lt;Control&gt;a\" sau \"&lt;Shift&gt;&lt;Alt&gt;F1\". Este "
+"permisă folosirea majusculelor şi a minusculelor, precum şi a abrevierilor "
+"gen \"&lt;Ctl&gt;\" şi \"&lt;Ctrl&gt;\". Dacă setaţi opţiunea cu şirul "
+"\"disabled\", atunci nu va exista o combinaţie de taste pentru această "
+"acţiune."
 
 #: src/metacity.schemas.in.h:143
 msgid ""
@@ -1974,17 +1975,17 @@ msgstr "Modul de focalizare al ferestrei"
 msgid "Window title font"
 msgstr "Font titlu fereastră"
 
-#: src/prefs.c:476 src/prefs.c:492 src/prefs.c:508 src/prefs.c:524
-#: src/prefs.c:540 src/prefs.c:560 src/prefs.c:576 src/prefs.c:592
-#: src/prefs.c:608 src/prefs.c:624 src/prefs.c:640 src/prefs.c:656
-#: src/prefs.c:672 src/prefs.c:689 src/prefs.c:705 src/prefs.c:721
-#: src/prefs.c:737 src/prefs.c:753 src/prefs.c:768 src/prefs.c:783
-#: src/prefs.c:798
+#: src/prefs.c:501 src/prefs.c:517 src/prefs.c:533 src/prefs.c:549
+#: src/prefs.c:565 src/prefs.c:585 src/prefs.c:601 src/prefs.c:617
+#: src/prefs.c:633 src/prefs.c:649 src/prefs.c:665 src/prefs.c:681
+#: src/prefs.c:697 src/prefs.c:714 src/prefs.c:730 src/prefs.c:746
+#: src/prefs.c:762 src/prefs.c:778 src/prefs.c:793 src/prefs.c:808
+#: src/prefs.c:823 src/prefs.c:839
 #, c-format
 msgid "GConf key \"%s\" is set to an invalid type\n"
 msgstr "Cheia GConf \"%s\" este setată la o valoare invalidă\n"
 
-#: src/prefs.c:843
+#: src/prefs.c:884
 #, c-format
 msgid ""
 "\"%s\" found in configuration database is not a valid value for mouse button "
@@ -1993,17 +1994,17 @@ msgstr ""
 "\"%s\" găsită în configuraţie nu este o cheie validă pentru modificatorul "
 "butonului de mouse\n"
 
-#: src/prefs.c:867 src/prefs.c:1277
+#: src/prefs.c:908 src/prefs.c:1318
 #, c-format
 msgid "GConf key '%s' is set to an invalid value\n"
 msgstr "Cheia GConf '%s' este setată la o valoare invalidă\n"
 
-#: src/prefs.c:994
+#: src/prefs.c:1035
 #, c-format
 msgid "Could not parse font description \"%s\" from GConf key %s\n"
 msgstr "Nu am putut parsa descrierea fontului \"%s\" din cheia GConf %s\n"
 
-#: src/prefs.c:1179
+#: src/prefs.c:1220
 #, c-format
 msgid ""
 "%d stored in GConf key %s is not a reasonable number of workspaces, current "
@@ -2012,7 +2013,7 @@ msgstr ""
 "%d stocat în cheia GConf %s nu este un număr rezonabil de spaţii de lucru, "
 "maximul este de %d\n"
 
-#: src/prefs.c:1239
+#: src/prefs.c:1280
 msgid ""
 "Workarounds for broken applications disabled. Some applications may not "
 "behave properly.\n"
@@ -2020,17 +2021,17 @@ msgstr ""
 "Soluţiile de compromis pentru aplicaţiile problematice sunt dezactivate. "
 "Există posibilitatea ca unele aplicaţii să nu se comporte corect.\n"
 
-#: src/prefs.c:1304
+#: src/prefs.c:1345
 #, c-format
 msgid "%d stored in GConf key %s is out of range 0 to %d\n"
 msgstr "%d stocat în cheia GConf %s este în afara domeniului 0 - %d\n"
 
-#: src/prefs.c:1425
+#: src/prefs.c:1479
 #, c-format
 msgid "Error setting number of workspaces to %d: %s\n"
 msgstr "Eroare la setare numărului de ecrane la %d: %s\n"
 
-#: src/prefs.c:1669
+#: src/prefs.c:1723
 #, c-format
 msgid ""
 "\"%s\" found in configuration database is not a valid value for keybinding "
@@ -2039,7 +2040,7 @@ msgstr ""
 "\"%s\" găsită în configuraţie nu este o cheie validă pentru combinaţia de "
 "taste \"%s\"\n"
 
-#: src/prefs.c:2023
+#: src/prefs.c:2077
 #, c-format
 msgid "Error setting name for workspace %d to \"%s\": %s\n"
 msgstr "Eroare la setarea numelui pentru spaţiul de lucru %d la \"%s\": %s\n"
@@ -2076,7 +2077,7 @@ msgstr ""
 msgid "Screen %d on display \"%s\" already has a window manager\n"
 msgstr "Ecranul %d pe afişajul \"%s\" are deja un manager de ferestre\n"
 
-#: src/screen.c:699
+#: src/screen.c:716
 #, c-format
 msgid "Could not release screen %d on display \"%s\"\n"
 msgstr "Nu am putut elibera ecranul %d pe afişajul \"%s\"\n"
@@ -3180,7 +3181,7 @@ msgid "Application set a bogus _NET_WM_PID %ld\n"
 msgstr "Aplicaţia a setat un _NET_WM_PID fals %ld\n"
 
 #. first time through
-#: src/window.c:4829
+#: src/window.c:5197
 #, c-format
 msgid ""
 "Window %s sets SM_CLIENT_ID on itself, instead of on the WM_CLIENT_LEADER "
@@ -3196,7 +3197,7 @@ msgstr ""
 #. * MWM but not WM_NORMAL_HINTS are basically broken. We complain
 #. * about these apps but make them work.
 #.
-#: src/window.c:5500
+#: src/window.c:5868
 #, c-format
 msgid ""
 "Window %s sets an MWM hint indicating it isn't resizable, but sets min size %"
@@ -3234,24 +3235,3 @@ msgid ""
 msgstr ""
 "Proprietatea %s din fereastra 0x%lx conţine date invalide UTF-8 pentru "
 "elementul %d din listă\n"
-
-#~ msgid "Select how to give focus to windows"
-#~ msgstr "Selectaţi metoda de focalizare a ferestrei"
-
-#~ msgid "Window Focus"
-#~ msgstr "Focalizare ferestră"
-
-#~ msgid "Clic_k to give focus"
-#~ msgstr "Clic_k pentru a focaliza"
-
-#~ msgid "Focus behavior:"
-#~ msgstr "Comportament focalizare:"
-
-#~ msgid "Window Focus Preferences"
-#~ msgstr "Preferinţe focalizare fereastră"
-
-#~ msgid "_Point to give focus"
-#~ msgstr "_Indică pentru a focaliza"
-
-#~ msgid "_Raise window on focus"
-#~ msgstr "_Ridică fereastra focalizată"

po/ru.po

@@ -1,23 +1,22 @@
-# 
-# Copyright (C) 2001 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2005 Free Software Foundation, Inc.
 # Valek Filippov <frob@df.ru>, 2001.
 # Sun G11n <gnome_int_l10n@ireland.sun.com>, 2002.
 # Dmitry G. Mastrukov <dmitry@taurussoft.org>, 2002-2003.
 # Andrew w. Nosenko <awn@bcs.zp.ua>, 2003.
-# Leonid Kanter <leon@asplinux.ru>, 2004.
+# Leonid Kanter <leon@asplinux.ru>, 2004, 2005.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: metacity\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-09 21:23-0700\n"
-"PO-Revision-Date: 2004-08-11 11:05+0400\n"
-"Last-Translator: Dmitry G. Mastrukov <dmitry@taurussoft.org>\n"
+"POT-Creation-Date: 2005-06-27 17:21-0600\n"
+"PO-Revision-Date: 2005-02-21 15:38+0200\n"
+"Last-Translator: Leonid Kanter <leon@asplinux.ru>\n"
 "Language-Team: Russian <gnome-cyr@gnome.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.3.1\n"
+"X-Generator: KBabel 1.9.1\n"
 
 #: src/tools/metacity-message.c:150
 #, c-format
@@ -26,7 +25,7 @@ msgstr "Применение: %s\n"
 
 #: src/tools/metacity-message.c:176 src/util.c:128
 msgid "Metacity was compiled without support for verbose mode\n"
-msgstr "\"Метасити\" был собран без поддержки режима подробных собщений\n"
+msgstr "Metacity был собран без поддержки режима подробных сообщений\n"
 
 #: src/delete.c:63 src/delete.c:90 src/metacity-dialog.c:70
 #: src/theme-parser.c:467
@@ -55,7 +54,7 @@ msgstr "Произошла ошибка чтения из процесса от
 msgid ""
 "Error launching metacity-dialog to ask about killing an application: %s\n"
 msgstr ""
-"Произошла ошибка загрузки диалога \"Метасити\" для запроса на уничтожение "
+"Произошла ошибка загрузки диалога Metacity для запроса на уничтожение "
 "приложения: %s\n"
 
 #: src/delete.c:452
@@ -63,7 +62,7 @@ msgstr ""
 msgid "Failed to get hostname: %s\n"
 msgstr "Произошёл сбой при получении имени узла: %s\n"
 
-#: src/display.c:306
+#: src/display.c:316
 #, c-format
 msgid "Failed to open X Window System display '%s'\n"
 msgstr "Произошёл сбой при открытии системного окна \"%s\" среды X Window\n"
@@ -85,23 +84,23 @@ msgid "Fatal IO error %d (%s) on display '%s'.\n"
 msgstr ""
 "Произошла неустранимая ошибка ввода-вывода %d (%s) на дисплее \"%s\".\n"
 
-#: src/frames.c:1020
+#: src/frames.c:1125
 msgid "Close Window"
 msgstr "Закрыть окно"
 
-#: src/frames.c:1023
+#: src/frames.c:1128
 msgid "Window Menu"
 msgstr "Меню окна"
 
-#: src/frames.c:1026
+#: src/frames.c:1131
 msgid "Minimize Window"
 msgstr "Свернуть окно"
 
-#: src/frames.c:1029
+#: src/frames.c:1134
 msgid "Maximize Window"
 msgstr "Развернуть окно на весь экран"
 
-#: src/frames.c:1032
+#: src/frames.c:1137
 msgid "Unmaximize Window"
 msgstr "Восстановить прежний размер окна"
 
@@ -114,22 +113,21 @@ msgstr ""
 "Клавишу \"%s\" со связующими модификаторами \"%x\" уже использует другая "
 "программа\n"
 
-#: src/keybindings.c:2554
+#: src/keybindings.c:2535
 #, c-format
 msgid "Error launching metacity-dialog to print an error about a command: %s\n"
 msgstr ""
-"Произошла ошибка загрузки диалога \"Метасити\" для вывода сообщения об "
-"ошибке команды: %s\n"
+"Произошла ошибка загрузки диалога Metacity для вывода сообщения об ошибке "
+"команды: %s\n"
 
-#: src/keybindings.c:2659
+#: src/keybindings.c:2640
 #, c-format
 msgid "No command %d has been defined.\n"
 msgstr "Команда %d не была определена.\n"
 
-#: src/keybindings.c:3489
-#, fuzzy
+#: src/keybindings.c:3485
 msgid "No terminal command has been defined.\n"
-msgstr "Команда %d не была определена.\n"
+msgstr "Команда терминала не была определена.\n"
 
 #: src/main.c:69
 msgid ""
@@ -148,7 +146,7 @@ msgid ""
 "There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A "
 "PARTICULAR PURPOSE.\n"
 msgstr ""
-"\"Метасити\" версии %s\n"
+"Metacity версии %s\n"
 "Авторское право (C) 2001-2002 Havoc Pennington, Red Hat, Inc. и другие\n"
 "Это свободное программное обеспечение; условия копирования указаны в "
 "исходном тексте.\n"
@@ -213,12 +211,12 @@ msgstr "_Закрыть"
 
 #. separator
 #: src/menu.c:66
-msgid "Put on _All Workspaces"
-msgstr "Поместить на вс_е рабочие места"
+msgid "_Always on Visible Workspace"
+msgstr "_Всегда на видимом рабочем месте"
 
 #: src/menu.c:67
-msgid "Only on _This Workspace"
-msgstr "Поместить только на э_том рабочем месте"
+msgid "_Only on This Workspace"
+msgstr "Т_олько на этом рабочем месте"
 
 #: src/menu.c:68
 msgid "Move to Workspace _Left"
@@ -236,7 +234,7 @@ msgstr "Переместить на рабочее место _вверх"
 msgid "Move to Workspace _Down"
 msgstr "Переместить на рабочее место в_низ"
 
-#: src/menu.c:162 src/prefs.c:1942
+#: src/menu.c:162 src/prefs.c:1996
 #, c-format
 msgid "Workspace %d"
 msgstr "Рабочее место %d"
@@ -368,7 +366,7 @@ msgstr "Заголовок"
 msgid "Class"
 msgstr "Класс"
 
-#: src/metacity-dialog.c:262
+#: src/metacity-dialog.c:263
 msgid ""
 "These windows do not support \"save current setup\" and will have to be "
 "restarted manually next time you log in."
@@ -376,7 +374,7 @@ msgstr ""
 "Эти окна не поддерживают команду \"save current setup\", при следующем входе "
 "их придется перезапустить вручную."
 
-#: src/metacity-dialog.c:323
+#: src/metacity-dialog.c:328
 #, c-format
 msgid ""
 "There was an error running \"%s\":\n"
@@ -516,9 +514,10 @@ msgid ""
 "\"direct manipulation\", by using wireframes, avoiding animations, or other "
 "means. This is a significant reduction in usability for many users, but may "
 "allow legacy applications and terminal servers to function when they would "
-"otherwise be impractical."
+"otherwise be impractical. However, the wireframe feature is disabled when "
+"accessibility is on to avoid weird desktop breakages."
 msgstr ""
-"Если установлено, \"Метасити\" предоставляет пользователю меньший отклик и "
+"Если установлено, Metacity предоставляет пользователю меньший отклик и "
 "меньшее ощущение \"непосредственного управления\" за счет использования "
 "контурных рамок, отключения анимации и другими способами. Это существенное "
 "уменьшение удобства в использовании для многих пользователей, но позволяет "
@@ -537,7 +536,7 @@ msgid ""
 "details of application-based vs. window-based, e.g. whether to pass through "
 "clicks. Also, application-based mode is largely unimplemented at the moment."
 msgstr ""
-"Если выбрано значение Истинно, \"Метасити\" работает с приложениями, а не c "
+"Если выбрано значение Истинно, Metacity работает с приложениями, а не c "
 "окнами. Архитектура, основанная на приложениях, больше похожа на системы "
 "Mac, чем на Windows, хотя такая формулировка довольно расплывчата. При "
 "активизации окна в режиме, основанном на приложениях, открываются все окна "
@@ -722,7 +721,7 @@ msgstr "Запустить определённую команду"
 
 #: src/metacity.schemas.in.h:60
 msgid "Run a terminal"
-msgstr ""
+msgstr "Открыть терминал"
 
 #: src/metacity.schemas.in.h:61
 msgid "Show the panel menu"
@@ -748,14 +747,14 @@ msgid ""
 "workarounds mode won't be fixable without amending a spec."
 msgstr ""
 "Некоторые приложения нарушают спецификации, что приводит к неправильной "
-"работе менеджера окон. Например, в идеале \"Метасити\" должен размещать все "
+"работе менеджера окон. Например, в идеале Metacity должен размещать все "
 "диалоговые окна одинаково по отношению к родительскому окну. Для этого "
 "требуется проигнорировать координаты диалоговых окон, определенные в "
 "приложении. Но некоторые версии Java/Swing помечают свои всплывающие меню "
-"как диалоговые окна, так что \"Метасити\" приходится отключать функции "
+"как диалоговые окна, так что Metacity приходится отключать функции "
 "размещения диалоговых окон, чтобы эти меню смогли работать в нестандартных "
 "приложениях Java. Есть еще несколько подобных примеров. Этот параметр "
-"переключает \"Метасити\" в режим полного следования стандарту, что делает "
+"переключает Metacity в режим полного следования стандарту, что делает "
 "интерфейс немного более привлекательным, если не используются нестандартные "
 "приложения. К сожалению, все равно придется устранять недоделки, так уж "
 "устроен мир... Некоторые недоделки связаны с ограниченностью самих "
@@ -1225,7 +1224,6 @@ msgstr ""
 "комбинация клавиш для этого действия выбрана не будет."
 
 #: src/metacity.schemas.in.h:109
-#, fuzzy
 msgid ""
 "The keybinding used to maximize a window. The format looks like \"&lt;"
 "Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;F1\". The parser is fairly "
@@ -1750,7 +1748,6 @@ msgstr ""
 "\" (\"отключен\"), комбинация клавиш для этого действия выбрана не будет."
 
 #: src/metacity.schemas.in.h:142
-#, fuzzy
 msgid ""
 "The keybinding which invokes a terminal. The format looks like \"&lt;"
 "Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;F1\". The parser is fairly "
@@ -1758,8 +1755,8 @@ msgid ""
 "Ctl&gt;\" and \"&lt;Ctrl&gt;\". If you set the option to the special string "
 "\"disabled\", then there will be no keybinding for this action."
 msgstr ""
-"Комбинация клавиш для активации главного меню панели.  Используется формат "
-"\"&lt;Control&gt;a\" или \"&lt;Shift&gt;&lt;Alt&gt;F1.  Анализатор довольно "
+"Комбинация клавиш, которая вызывает терминал. Используется формат \"&lt;"
+"Control&gt;a\" или \"&lt;Shift&gt;&lt;Alt&gt;F1.  Анализатор довольно "
 "нестрогий, можно использовать верхний и нижний регистр и сокращения, "
 "например \"&lt;Ctl&gt;\" и \"&lt;Ctrl&gt;\".  Если для этого параметра "
 "выбрать значение \"disabled\" (\"отключен\"), комбинация клавиш для этого "
@@ -1995,17 +1992,17 @@ msgstr "Режим активации окна"
 msgid "Window title font"
 msgstr "Шрифт заголовка окна"
 
-#: src/prefs.c:476 src/prefs.c:492 src/prefs.c:508 src/prefs.c:524
-#: src/prefs.c:540 src/prefs.c:560 src/prefs.c:576 src/prefs.c:592
-#: src/prefs.c:608 src/prefs.c:624 src/prefs.c:640 src/prefs.c:656
-#: src/prefs.c:672 src/prefs.c:689 src/prefs.c:705 src/prefs.c:721
-#: src/prefs.c:737 src/prefs.c:753 src/prefs.c:768 src/prefs.c:783
-#: src/prefs.c:798
+#: src/prefs.c:501 src/prefs.c:517 src/prefs.c:533 src/prefs.c:549
+#: src/prefs.c:565 src/prefs.c:585 src/prefs.c:601 src/prefs.c:617
+#: src/prefs.c:633 src/prefs.c:649 src/prefs.c:665 src/prefs.c:681
+#: src/prefs.c:697 src/prefs.c:714 src/prefs.c:730 src/prefs.c:746
+#: src/prefs.c:762 src/prefs.c:778 src/prefs.c:793 src/prefs.c:808
+#: src/prefs.c:823 src/prefs.c:839
 #, c-format
 msgid "GConf key \"%s\" is set to an invalid type\n"
 msgstr "Для ключа системы GConf \"%s\" выбран недопустимый тип\n"
 
-#: src/prefs.c:843
+#: src/prefs.c:884
 #, c-format
 msgid ""
 "\"%s\" found in configuration database is not a valid value for mouse button "
@@ -2014,19 +2011,19 @@ msgstr ""
 "Значение \"%s\" из базы данных конфигурации является недопустимым значением "
 "для модификатора кнопки мыши\n"
 
-#: src/prefs.c:867 src/prefs.c:1277
+#: src/prefs.c:908 src/prefs.c:1318
 #, c-format
 msgid "GConf key '%s' is set to an invalid value\n"
 msgstr "Для ключа системы GConf \"%s\" установлено недопустимое значение\n"
 
-#: src/prefs.c:994
+#: src/prefs.c:1035
 #, c-format
 msgid "Could not parse font description \"%s\" from GConf key %s\n"
 msgstr ""
 "Не удалось выполнить разбор описания шрифта \"%s\" из ключа системы GConf %"
 "s\n"
 
-#: src/prefs.c:1179
+#: src/prefs.c:1220
 #, c-format
 msgid ""
 "%d stored in GConf key %s is not a reasonable number of workspaces, current "
@@ -2035,7 +2032,7 @@ msgstr ""
 "Значение %d из ключа системы GConf %s является недопустимым количеством "
 "рабочих областей, текущим максимумом является значение %d\n"
 
-#: src/prefs.c:1239
+#: src/prefs.c:1280
 msgid ""
 "Workarounds for broken applications disabled. Some applications may not "
 "behave properly.\n"
@@ -2043,19 +2040,19 @@ msgstr ""
 "Устранение недоделок для нестандартных приложений отключено. Некоторые "
 "приложения могут работать неверно.\n"
 
-#: src/prefs.c:1304
+#: src/prefs.c:1345
 #, c-format
 msgid "%d stored in GConf key %s is out of range 0 to %d\n"
 msgstr ""
 "Значение%d из ключа системы GConf \"%s\" не входит в диапазон значений от 0 "
 "до %d\n"
 
-#: src/prefs.c:1425
+#: src/prefs.c:1479
 #, c-format
 msgid "Error setting number of workspaces to %d: %s\n"
 msgstr "Произошла ошибка установки количества рабочих мест равным %d: %s\n"
 
-#: src/prefs.c:1669
+#: src/prefs.c:1723
 #, c-format
 msgid ""
 "\"%s\" found in configuration database is not a valid value for keybinding "
@@ -2064,7 +2061,7 @@ msgstr ""
 "Значение \"%s\" из базы данных конфигурации является недопустимым значением "
 "для комбинации клавиш \"%s\"\n"
 
-#: src/prefs.c:2023
+#: src/prefs.c:2077
 #, c-format
 msgid "Error setting name for workspace %d to \"%s\": %s\n"
 msgstr "Произошла ошибка установки имени рабочего места %d в \"%s\": %s\n"
@@ -2099,7 +2096,7 @@ msgstr "Не удалось выбрать менеджер окон на экр
 msgid "Screen %d on display \"%s\" already has a window manager\n"
 msgstr "У экрана %d дисплея \"%s\" уже есть менеджер окон\n"
 
-#: src/screen.c:699
+#: src/screen.c:716
 #, c-format
 msgid "Could not release screen %d on display \"%s\"\n"
 msgstr "Не удалось освободить экран %d дисплея \"%s\"\n"
@@ -2173,8 +2170,8 @@ msgid ""
 "Error launching metacity-dialog to warn about apps that don't support "
 "session management: %s\n"
 msgstr ""
-"Произошла ошибка загрузки диалога \"Метасити\" для предупреждения о "
-"приложениях, которые не поддерживают менеджер сеанса: %s\n"
+"Произошла ошибка загрузки диалога Metacity для предупреждения о приложениях, "
+"которые не поддерживают менеджер сеанса: %s\n"
 
 #: src/theme-parser.c:224 src/theme-parser.c:242
 #, c-format
@@ -3216,7 +3213,7 @@ msgstr ""
 "Приложение установило неправильное значение параметра _NET_WM_PID %ld\n"
 
 #. first time through
-#: src/window.c:4829
+#: src/window.c:5197
 #, c-format
 msgid ""
 "Window %s sets SM_CLIENT_ID on itself, instead of on the WM_CLIENT_LEADER "
@@ -3232,7 +3229,7 @@ msgstr ""
 #. * MWM but not WM_NORMAL_HINTS are basically broken. We complain
 #. * about these apps but make them work.
 #.
-#: src/window.c:5500
+#: src/window.c:5868
 #, c-format
 msgid ""
 "Window %s sets an MWM hint indicating it isn't resizable, but sets min size %"
@@ -3269,49 +3266,3 @@ msgid ""
 msgstr ""
 "Свойство \"%s\" для окна 0x%lx содержало недопустимые данные UTF-8 для "
 "элемента %d в списке\n"
-
-#~ msgid "Select how to give focus to windows"
-#~ msgstr "Диалог настроек переключения фокуса ввода между окнами"
-
-#~ msgid "Window Focus"
-#~ msgstr "Передача фокуса ввода"
-
-#~ msgid "Clic_k to give focus"
-#~ msgstr "_щелчок клавишей мыши передаёт фокус"
-
-#~ msgid "Focus behavior:"
-#~ msgstr "Правила передачи фокуса:"
-
-#~ msgid "Window Focus Preferences"
-#~ msgstr "Настройки активации окна"
-
-#~ msgid "_Point to give focus"
-#~ msgstr "на_водка курсора передаёт фокус"
-
-#~ msgid "_Raise window on focus"
-#~ msgstr "_Располагать поверх всех окон при активации"
-
-#~ msgid ""
-#~ "Failed to a open connection to a session manager, so window positions "
-#~ "will not be saved: %s\n"
-#~ msgstr ""
-#~ "Произошёл сбой при открытии соединения с менеджером сеанса, позиция окна "
-#~ "не будет сохранена: %s\n"
-
-#~ msgid "Only on %s"
-#~ msgstr "Поместить только на %s"
-
-#~ msgid "Move to %s"
-#~ msgstr "Переместить на %s"
-
-#~ msgid ""
-#~ "The window \"%s\" is not responding.\n"
-#~ "Force this application to exit?\n"
-#~ "(Any open documents will be lost.)"
-#~ msgstr ""
-#~ "Окно \"%s\" не отвечает.\n"
-#~ "Завершить работу этого приложения?\n"
-#~ "(Все несохраненные документы будут потеряны.)"
-
-#~ msgid "Kill application"
-#~ msgstr "Уничтожить приложение"

po/sl.po

@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: metacity\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-09 21:23-0700\n"
+"POT-Creation-Date: 2005-06-27 17:21-0600\n"
 "PO-Revision-Date: 2002-06-07 21:46+0200\n"
 "Last-Translator: Andraz Tori <andraz.tori1@guest.arnes.si>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
@@ -57,7 +57,7 @@ msgstr ""
 msgid "Failed to get hostname: %s\n"
 msgstr "Nisem uspel dobiti gostitelja z imenom: %s\n"
 
-#: src/display.c:306
+#: src/display.c:316
 #, c-format
 msgid "Failed to open X Window System display '%s'\n"
 msgstr "Nisem uspel odpreti zaslona '%s' okenskega sistema X\n"
@@ -78,26 +78,26 @@ msgstr ""
 msgid "Fatal IO error %d (%s) on display '%s'.\n"
 msgstr "Usodna napaka IO %d (%s) na zaslonu '%s'.\n"
 
-#: src/frames.c:1020
+#: src/frames.c:1125
 msgid "Close Window"
 msgstr "Zapri okno"
 
 # G:1 K:1 O:0
-#: src/frames.c:1023
+#: src/frames.c:1128
 msgid "Window Menu"
 msgstr "Menu oken"
 
 # G:0 K:1 O:0
-#: src/frames.c:1026
+#: src/frames.c:1131
 msgid "Minimize Window"
 msgstr "Pomanjšaj okno"
 
-#: src/frames.c:1029
+#: src/frames.c:1134
 msgid "Maximize Window"
 msgstr "Razpni okno"
 
 # G:1 K:0 O:0
-#: src/frames.c:1032
+#: src/frames.c:1137
 msgid "Unmaximize Window"
 msgstr "Odrazpni okno"
 
@@ -109,17 +109,17 @@ msgid ""
 "binding\n"
 msgstr "Tipko %s s spremenilnikom %x uporablja že nek drug program\n"
 
-#: src/keybindings.c:2554
+#: src/keybindings.c:2535
 #, c-format
 msgid "Error launching metacity-dialog to print an error about a command: %s\n"
 msgstr "Napaka ob zaganjanju metacity-dialog za izpis napake o ukazu: %s\n"
 
-#: src/keybindings.c:2659
+#: src/keybindings.c:2640
 #, c-format
 msgid "No command %d has been defined.\n"
 msgstr "Ukaz %d ni bil naveden.\n"
 
-#: src/keybindings.c:3489
+#: src/keybindings.c:3485
 #, fuzzy
 msgid "No terminal command has been defined.\n"
 msgstr "Ukaz %d ni bil naveden.\n"
@@ -211,15 +211,17 @@ msgstr "_Spremeni velikost"
 msgid "_Close"
 msgstr "_Zapri"
 
-# G:12 K:1 O:0
+# G:1 K:0 O:0
 #. separator
 #: src/menu.c:66
-msgid "Put on _All Workspaces"
-msgstr "Postavi na _vse delovne površine"
+#, fuzzy
+msgid "_Always on Visible Workspace"
+msgstr "Le na _tej delovni površini"
 
 # G:1 K:0 O:0
 #: src/menu.c:67
-msgid "Only on _This Workspace"
+#, fuzzy
+msgid "_Only on This Workspace"
 msgstr "Le na _tej delovni površini"
 
 #: src/menu.c:68
@@ -243,7 +245,7 @@ msgid "Move to Workspace _Down"
 msgstr "Prestavi okno eno delovno površino navzdol"
 
 # G:1 K:0 O:0
-#: src/menu.c:162 src/prefs.c:1942
+#: src/menu.c:162 src/prefs.c:1996
 #, c-format
 msgid "Workspace %d"
 msgstr "Delovna površina %d"
@@ -385,7 +387,7 @@ msgid "Class"
 msgstr "Razred"
 
 # G:2 K:6 O:0
-#: src/metacity-dialog.c:262
+#: src/metacity-dialog.c:263
 msgid ""
 "These windows do not support \"save current setup\" and will have to be "
 "restarted manually next time you log in."
@@ -393,7 +395,7 @@ msgstr ""
 "Ta okna ne podpirajo \"shranitve trenutnih nastavitev\", zato bodo morala "
 "biti ob vaši naslednji prijavi znova zagnana ročno."
 
-#: src/metacity-dialog.c:323
+#: src/metacity-dialog.c:328
 #, c-format
 msgid ""
 "There was an error running \"%s\":\n"
@@ -528,7 +530,8 @@ msgid ""
 "\"direct manipulation\", by using wireframes, avoiding animations, or other "
 "means. This is a significant reduction in usability for many users, but may "
 "allow legacy applications and terminal servers to function when they would "
-"otherwise be impractical."
+"otherwise be impractical. However, the wireframe feature is disabled when "
+"accessibility is on to avoid weird desktop breakages."
 msgstr ""
 
 #: src/metacity.schemas.in.h:20
@@ -2002,17 +2005,17 @@ msgid "Window title font"
 msgstr "Pisava naziva okna"
 
 # G:1 K:0 O:0
-#: src/prefs.c:476 src/prefs.c:492 src/prefs.c:508 src/prefs.c:524
-#: src/prefs.c:540 src/prefs.c:560 src/prefs.c:576 src/prefs.c:592
-#: src/prefs.c:608 src/prefs.c:624 src/prefs.c:640 src/prefs.c:656
-#: src/prefs.c:672 src/prefs.c:689 src/prefs.c:705 src/prefs.c:721
-#: src/prefs.c:737 src/prefs.c:753 src/prefs.c:768 src/prefs.c:783
-#: src/prefs.c:798
+#: src/prefs.c:501 src/prefs.c:517 src/prefs.c:533 src/prefs.c:549
+#: src/prefs.c:565 src/prefs.c:585 src/prefs.c:601 src/prefs.c:617
+#: src/prefs.c:633 src/prefs.c:649 src/prefs.c:665 src/prefs.c:681
+#: src/prefs.c:697 src/prefs.c:714 src/prefs.c:730 src/prefs.c:746
+#: src/prefs.c:762 src/prefs.c:778 src/prefs.c:793 src/prefs.c:808
+#: src/prefs.c:823 src/prefs.c:839
 #, c-format
 msgid "GConf key \"%s\" is set to an invalid type\n"
 msgstr "Ključ GConf \"%s\" je nastavljen na neveljavno vrsto\n"
 
-#: src/prefs.c:843
+#: src/prefs.c:884
 #, c-format
 msgid ""
 "\"%s\" found in configuration database is not a valid value for mouse button "
@@ -2021,17 +2024,17 @@ msgstr ""
 "\"%s\", ki je bil najden v podatkovni zbirki nastavitev ni veljaven "
 "spremenilnik za miškine gumbe.\n"
 
-#: src/prefs.c:867 src/prefs.c:1277
+#: src/prefs.c:908 src/prefs.c:1318
 #, c-format
 msgid "GConf key '%s' is set to an invalid value\n"
 msgstr "Ključ GConf '%s' je nastavljen na neveljavno vrednost\n"
 
-#: src/prefs.c:994
+#: src/prefs.c:1035
 #, c-format
 msgid "Could not parse font description \"%s\" from GConf key %s\n"
 msgstr "Nisem mogel razčleniti opisa \"%s\" iz ključa GConf %s\n"
 
-#: src/prefs.c:1179
+#: src/prefs.c:1220
 #, c-format
 msgid ""
 "%d stored in GConf key %s is not a reasonable number of workspaces, current "
@@ -2040,7 +2043,7 @@ msgstr ""
 "%d shranjen v ključu GConf %s ni normalno število delovnih površin, trenutno "
 "največje število je %d\n"
 
-#: src/prefs.c:1239
+#: src/prefs.c:1280
 msgid ""
 "Workarounds for broken applications disabled. Some applications may not "
 "behave properly.\n"
@@ -2048,17 +2051,17 @@ msgstr ""
 "Obhodi za pokvarjene programe so izključeni. Nekateri programi se morda ne "
 "bodo pravilno obnašali.\n"
 
-#: src/prefs.c:1304
+#: src/prefs.c:1345
 #, c-format
 msgid "%d stored in GConf key %s is out of range 0 to %d\n"
 msgstr "%d shranjen v GConf ključu %s je izven meje med 0 in %d\n"
 
-#: src/prefs.c:1425
+#: src/prefs.c:1479
 #, c-format
 msgid "Error setting number of workspaces to %d: %s\n"
 msgstr "Napaka ob nastavljanju števila delovnih površin na %d: %s\n"
 
-#: src/prefs.c:1669
+#: src/prefs.c:1723
 #, c-format
 msgid ""
 "\"%s\" found in configuration database is not a valid value for keybinding "
@@ -2067,7 +2070,7 @@ msgstr ""
 "\"%s\" najden v podatkovni zbirki nastavitev ni veljaven ključ za "
 "tipkovnično vez \"%s\"\n"
 
-#: src/prefs.c:2023
+#: src/prefs.c:2077
 #, c-format
 msgid "Error setting name for workspace %d to \"%s\": %s\n"
 msgstr "Napaka ob nastavljanju imena delovne površine %d na \"%s\": %s\n"
@@ -2103,7 +2106,7 @@ msgstr ""
 msgid "Screen %d on display \"%s\" already has a window manager\n"
 msgstr "Zaslon %d na prikazu \"%s\" že ima upravljalnik oken\n"
 
-#: src/screen.c:699
+#: src/screen.c:716
 #, c-format
 msgid "Could not release screen %d on display \"%s\"\n"
 msgstr "Nisem mogel opustiti prikaza %d prikazu \"%s\"\n"
@@ -3199,7 +3202,7 @@ msgid "Application set a bogus _NET_WM_PID %ld\n"
 msgstr "Program je nastavil pokvarjen _NET_WM_PID %ld\n"
 
 #. first time through
-#: src/window.c:4829
+#: src/window.c:5197
 #, c-format
 msgid ""
 "Window %s sets SM_CLIENT_ID on itself, instead of on the WM_CLIENT_LEADER "
@@ -3215,7 +3218,7 @@ msgstr ""
 #. * MWM but not WM_NORMAL_HINTS are basically broken. We complain
 #. * about these apps but make them work.
 #.
-#: src/window.c:5500
+#: src/window.c:5868
 #, c-format
 msgid ""
 "Window %s sets an MWM hint indicating it isn't resizable, but sets min size %"
@@ -3253,6 +3256,10 @@ msgstr ""
 "Lastnost %s okna 0x%lx vsebuje neveljaven znak UTF-8 za %d. predmet na "
 "seznamu\n"
 
+# G:12 K:1 O:0
+#~ msgid "Put on _All Workspaces"
+#~ msgstr "Postavi na _vse delovne površine"
+
 #~ msgid "Select how to give focus to windows"
 #~ msgstr "Nastavi kako naj se okna fokusirajo"
 

po/sq.po

@@ -1,14 +1,14 @@
 # Përkthimi i mesazheve të metacity në shqip
 # This file is distributed under the same license as the metacity package.
-# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
-# Laurent Dhima <laurenti@alblinux.net>, 2003, 2004.
+# Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
+# Laurent Dhima <laurenti@alblinux.net>, 2003, 2004, 2005.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: metacity HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-09 21:23-0700\n"
-"PO-Revision-Date: 2004-10-19 18:44+0200\n"
+"POT-Creation-Date: 2005-06-27 17:21-0600\n"
+"PO-Revision-Date: 2005-02-17 10:58+0100\n"
 "Last-Translator: Laurent Dhima <laurenti@alblinux.net>\n"
 "Language-Team: Albanian <gnome-albanian-perkthyesit@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
@@ -61,7 +61,7 @@ msgstr ""
 msgid "Failed to get hostname: %s\n"
 msgstr "Gabim gjatë marrjes së emrit të host: %s\n"
 
-#: src/display.c:306
+#: src/display.c:316
 #, c-format
 msgid "Failed to open X Window System display '%s'\n"
 msgstr "Gabim gjatë hapjes së display '%s' të X Window System\n"
@@ -82,23 +82,23 @@ msgstr ""
 msgid "Fatal IO error %d (%s) on display '%s'.\n"
 msgstr "Gabim fatal IO %d (%s) tek display '%s'.\n"
 
-#: src/frames.c:1020
+#: src/frames.c:1125
 msgid "Close Window"
 msgstr "Mbylle dritaren"
 
-#: src/frames.c:1023
+#: src/frames.c:1128
 msgid "Window Menu"
 msgstr "Menuja e dritares"
 
-#: src/frames.c:1026
+#: src/frames.c:1131
 msgid "Minimize Window"
 msgstr "Dritarja në minimum"
 
-#: src/frames.c:1029
+#: src/frames.c:1134
 msgid "Maximize Window"
 msgstr "Dritarja në maksimum"
 
-#: src/frames.c:1032
+#: src/frames.c:1137
 msgid "Unmaximize Window"
 msgstr "Zvogëlo dritaren"
 
@@ -111,19 +111,19 @@ msgstr ""
 "Ndonjë program tjetër është duke përdorur kombinimin e pulsantit %s me "
 "ndryshuesin %x\n"
 
-#: src/keybindings.c:2554
+#: src/keybindings.c:2535
 #, c-format
 msgid "Error launching metacity-dialog to print an error about a command: %s\n"
 msgstr ""
 "Gabim gjatë lëshimit të dritares së dialogut të metacity për të lajmëruar "
 "një gabim në lidhje me një komandë: %s\n"
 
-#: src/keybindings.c:2659
+#: src/keybindings.c:2640
 #, c-format
 msgid "No command %d has been defined.\n"
 msgstr "Komanda %d nuk është përcaktuar.\n"
 
-#: src/keybindings.c:3489
+#: src/keybindings.c:3485
 msgid "No terminal command has been defined.\n"
 msgstr "Nuk është përcaktuar komanda e terminalit.\n"
 
@@ -206,12 +206,12 @@ msgstr "_Mbyll"
 
 #. separator
 #: src/menu.c:66
-msgid "Put on _All Workspaces"
-msgstr "Vendose në të _Gjitha Hapësirat e Punës"
+msgid "_Always on Visible Workspace"
+msgstr "_Gjithmonë tek hapësira e dukshme e punës"
 
 #: src/menu.c:67
-msgid "Only on _This Workspace"
-msgstr "Vetëm në _Këtë Hapësirë Pune"
+msgid "_Only on This Workspace"
+msgstr "_Vetëm në këtë hapësirë pune"
 
 #: src/menu.c:68
 msgid "Move to Workspace _Left"
@@ -229,7 +229,7 @@ msgstr "Lëvize tek hapësira e punës _Sipër"
 msgid "Move to Workspace _Down"
 msgstr "Lëvize tek hapësira e punës _Poshtë"
 
-#: src/menu.c:162 src/prefs.c:1942
+#: src/menu.c:162 src/prefs.c:1996
 #, c-format
 msgid "Workspace %d"
 msgstr "Hapësira e punës %d"
@@ -361,7 +361,7 @@ msgstr "Titulli"
 msgid "Class"
 msgstr "Klasa"
 
-#: src/metacity-dialog.c:262
+#: src/metacity-dialog.c:263
 msgid ""
 "These windows do not support \"save current setup\" and will have to be "
 "restarted manually next time you log in."
@@ -369,7 +369,7 @@ msgstr ""
 "Këto dritare nuk suportojnë \"ruaj rregullimet aktuale\" dhe duhet të "
 "rinisen nga ju kur të futeni përsëri."
 
-#: src/metacity-dialog.c:323
+#: src/metacity-dialog.c:328
 #, c-format
 msgid ""
 "There was an error running \"%s\":\n"
@@ -510,14 +510,17 @@ msgid ""
 "\"direct manipulation\", by using wireframes, avoiding animations, or other "
 "means. This is a significant reduction in usability for many users, but may "
 "allow legacy applications and terminal servers to function when they would "
-"otherwise be impractical."
+"otherwise be impractical. However, the wireframe feature is disabled when "
+"accessibility is on to avoid weird desktop breakages."
 msgstr ""
-"Nëse e vërtetë, metacity do t'i japë përdoruesit më pak të drejta e një "
+"Nëse e vërtetë, metacity do t'i japë përdoruesit më pak të drejta dhe një "
 "ndjenjë më të vogël të \"ndërhyrjes direkte\", me anë të përdorimit të "
-"frames kapërcyese, animacione evituese, e gjëra të tjera të ngjashme. Ky "
+"frames kapërcyese, animacione evituese, apo gjëra të tjera të ngjashme. Ky "
 "është një zvogëlim i ndjeshëm i përdoshmërisë për shumë nga përdoruest por, "
-"nga ana tjetër, mund t'u japë mundësinë programeve dhe server-ve të "
+"nga ana tjetër, mund t'u japë mundësinë programeve dhe serverve të "
 "funksionojnë në rastet kur përndryshe mund të ishin të pashfrytzueshëm. "
+"Sidoqoftë, përdorimi i frames kapërcyese është ç'aktivuar kur "
+"përdorueshmëria ka më rendësi se problemet e mundëshme."
 
 #: src/metacity.schemas.in.h:20
 msgid ""
@@ -1197,7 +1200,6 @@ msgstr ""
 "rrugëshkurtim për këtë veprim."
 
 #: src/metacity.schemas.in.h:109
-#, fuzzy
 msgid ""
 "The keybinding used to maximize a window. The format looks like \"&lt;"
 "Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;F1\". The parser is fairly "
@@ -1207,7 +1209,7 @@ msgid ""
 msgstr ""
 "Rrugëshkurtimi i përdorur për të zmadhuar një dritare. Forma është \"&lt;"
 "Control&gt;a\" ose \"&lt;Shift&gt;&lt;Alt&gt;F1\". Lejohet përdorimi i "
-"gërmave të mëdha, të vogla si dhe shkurtimet si p.sh. \"&lt;Ctl&gt; \" apo "
+"gërmave të mëdha, të vogla si dhe shkurtimet si p.sh. \"&lt;Ctl&gt; \" dhe "
 "\"&lt;Ctrl&gt;\". Nëse ky opcion vendoset tek \"disabled\", atëhere nuk do "
 "të ketë asnjë rrugëshkurtim për këtë veprim."
 
@@ -1929,17 +1931,17 @@ msgstr "Modaliteti i fokusimit të dritareve"
 msgid "Window title font"
 msgstr "Gërmat e titullit të dritares"
 
-#: src/prefs.c:476 src/prefs.c:492 src/prefs.c:508 src/prefs.c:524
-#: src/prefs.c:540 src/prefs.c:560 src/prefs.c:576 src/prefs.c:592
-#: src/prefs.c:608 src/prefs.c:624 src/prefs.c:640 src/prefs.c:656
-#: src/prefs.c:672 src/prefs.c:689 src/prefs.c:705 src/prefs.c:721
-#: src/prefs.c:737 src/prefs.c:753 src/prefs.c:768 src/prefs.c:783
-#: src/prefs.c:798
+#: src/prefs.c:501 src/prefs.c:517 src/prefs.c:533 src/prefs.c:549
+#: src/prefs.c:565 src/prefs.c:585 src/prefs.c:601 src/prefs.c:617
+#: src/prefs.c:633 src/prefs.c:649 src/prefs.c:665 src/prefs.c:681
+#: src/prefs.c:697 src/prefs.c:714 src/prefs.c:730 src/prefs.c:746
+#: src/prefs.c:762 src/prefs.c:778 src/prefs.c:793 src/prefs.c:808
+#: src/prefs.c:823 src/prefs.c:839
 #, c-format
 msgid "GConf key \"%s\" is set to an invalid type\n"
 msgstr "Kyçi GConf \"%s\" është vendosur në një lloj të pavlefshëm\n"
 
-#: src/prefs.c:843
+#: src/prefs.c:884
 #, c-format
 msgid ""
 "\"%s\" found in configuration database is not a valid value for mouse button "
@@ -1948,17 +1950,17 @@ msgstr ""
 "Vlera \"%s\" tek databaza e konfigurimit është e pavlefshme për ndryshuesin "
 "e pulsantit të mouse\n"
 
-#: src/prefs.c:867 src/prefs.c:1277
+#: src/prefs.c:908 src/prefs.c:1318
 #, c-format
 msgid "GConf key '%s' is set to an invalid value\n"
 msgstr "Kyçi GConf \"%s\" është vendosur në një vlerë të pavlefshme\n"
 
-#: src/prefs.c:994
+#: src/prefs.c:1035
 #, c-format
 msgid "Could not parse font description \"%s\" from GConf key %s\n"
 msgstr "E pamundur analiza e përshkrimit të gërmës \"%s\" nga kyçi GConf %s\n"
 
-#: src/prefs.c:1179
+#: src/prefs.c:1220
 #, c-format
 msgid ""
 "%d stored in GConf key %s is not a reasonable number of workspaces, current "
@@ -1967,7 +1969,7 @@ msgstr ""
 "Vlera %d e memorizuar në kyçit GConf %s nuk është një numër i arsyeshëm për "
 "hapësirat e punës, maksimumi aktual është %d\n"
 
-#: src/prefs.c:1239
+#: src/prefs.c:1280
 msgid ""
 "Workarounds for broken applications disabled. Some applications may not "
 "behave properly.\n"
@@ -1975,18 +1977,18 @@ msgstr ""
 "Veprimtari mirëmbajtje për manazhimin e programeve difektozë të ç'aktivuar. "
 "Disa programe mund të sillen në mënyrë të gabuar.\n"
 
-#: src/prefs.c:1304
+#: src/prefs.c:1345
 #, c-format
 msgid "%d stored in GConf key %s is out of range 0 to %d\n"
 msgstr ""
 "Vlera %d e memorizuar tek kyçi GConf %s është jashtë intervalit nga 0 në %d\n"
 
-#: src/prefs.c:1425
+#: src/prefs.c:1479
 #, c-format
 msgid "Error setting number of workspaces to %d: %s\n"
 msgstr "Gabim gjatë vendosjes së numrit të hapësirave të punës në %d: %s\n"
 
-#: src/prefs.c:1669
+#: src/prefs.c:1723
 #, c-format
 msgid ""
 "\"%s\" found in configuration database is not a valid value for keybinding "
@@ -1995,7 +1997,7 @@ msgstr ""
 "Vlera \"%s\" në databazën e konfigurimit është e pavlefshme për kombinim "
 "tastesh \"%s\"\n"
 
-#: src/prefs.c:2023
+#: src/prefs.c:2077
 #, c-format
 msgid "Error setting name for workspace %d to \"%s\": %s\n"
 msgstr ""
@@ -2034,7 +2036,7 @@ msgid "Screen %d on display \"%s\" already has a window manager\n"
 msgstr ""
 "Screen %d tek display \"%s\" aktualisht e ka një organizues dritareje\n"
 
-#: src/screen.c:699
+#: src/screen.c:716
 #, c-format
 msgid "Could not release screen %d on display \"%s\"\n"
 msgstr "I pamundur lëshimi i screen %d tek display \"%s\"\n"
@@ -3142,7 +3144,7 @@ msgid "Application set a bogus _NET_WM_PID %ld\n"
 msgstr "Aplikativi ka vendosur një _NET_WM_PID të gabuar %ld\n"
 
 #. first time through
-#: src/window.c:4829
+#: src/window.c:5197
 #, c-format
 msgid ""
 "Window %s sets SM_CLIENT_ID on itself, instead of on the WM_CLIENT_LEADER "
@@ -3158,7 +3160,7 @@ msgstr ""
 #. * MWM but not WM_NORMAL_HINTS are basically broken. We complain
 #. * about these apps but make them work.
 #.
-#: src/window.c:5500
+#: src/window.c:5868
 #, c-format
 msgid ""
 "Window %s sets an MWM hint indicating it isn't resizable, but sets min size %"
@@ -3196,24 +3198,3 @@ msgid ""
 msgstr ""
 "Pronësia %s e dritares 0x%lx përmban UTF-8 të pavlefshme për elementin %d në "
 "listë\n"
-
-#~ msgid "Select how to give focus to windows"
-#~ msgstr "Vendos se si t'ja japësh fokus-in dritareve"
-
-#~ msgid "Window Focus"
-#~ msgstr "Fokus i dritareve"
-
-#~ msgid "Clic_k to give focus"
-#~ msgstr "Kli_ko për t'i dhënë fokus-in"
-
-#~ msgid "Focus behavior:"
-#~ msgstr "Sjellja e fokus-it:"
-
-#~ msgid "Window Focus Preferences"
-#~ msgstr "Preferimet për fokus-in e dritareve"
-
-#~ msgid "_Point to give focus"
-#~ msgstr "_Punto për t'i dhënë fokusin"
-
-#~ msgid "_Raise window on focus"
-#~ msgstr "Në plan të pa_rë dritarja në fokus"

po/sr.po

@@ -1,5 +1,5 @@
 # Serbian translation of metacity
-# Courtesy of Prevod.org team (http://prevod.org/) -- 2003, 2004.
+# Courtesy of Prevod.org team (http://prevod.org/) -- 2003, 2004, 2005.
 #
 # This file is distributed under the same license as the metacity package.
 #
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: metacity\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-09 21:23-0700\n"
-"PO-Revision-Date: 2004-10-15 23:15+0200\n"
+"POT-Creation-Date: 2005-06-27 17:21-0600\n"
+"PO-Revision-Date: 2005-03-02 23:38+0100\n"
 "Last-Translator: Данило Шеган <danilo@prevod.org>\n"
 "Language-Team: Serbian (sr) <gnom@prevod.org>\n"
 "MIME-Version: 1.0\n"
@@ -61,7 +61,7 @@ msgstr ""
 msgid "Failed to get hostname: %s\n"
 msgstr "Нисам успео да сазнам име компјутера: %s\n"
 
-#: src/display.c:306
+#: src/display.c:316
 #, c-format
 msgid "Failed to open X Window System display '%s'\n"
 msgstr "Нисам успео да отворим X Window System  екран „%s“\n"
@@ -82,23 +82,23 @@ msgstr ""
 msgid "Fatal IO error %d (%s) on display '%s'.\n"
 msgstr "Кобна грешка са излазом/улазом: %d (%s) на екрану „%s“.\n"
 
-#: src/frames.c:1020
+#: src/frames.c:1125
 msgid "Close Window"
 msgstr "Затвори прозор"
 
-#: src/frames.c:1023
+#: src/frames.c:1128
 msgid "Window Menu"
 msgstr "Мени прозора"
 
-#: src/frames.c:1026
+#: src/frames.c:1131
 msgid "Minimize Window"
 msgstr "Умањи прозор"
 
-#: src/frames.c:1029
+#: src/frames.c:1134
 msgid "Maximize Window"
 msgstr "Увећај прозор"
 
-#: src/frames.c:1032
+#: src/frames.c:1137
 msgid "Unmaximize Window"
 msgstr "Поништи увећавање прозора"
 
@@ -111,19 +111,19 @@ msgstr ""
 "Неки други програм већ користи тастер %s са измењивачима %x за неку "
 "функцију\n"
 
-#: src/keybindings.c:2554
+#: src/keybindings.c:2535
 #, c-format
 msgid "Error launching metacity-dialog to print an error about a command: %s\n"
 msgstr ""
 "Грешка приликом покретања metacity-dialog програма због штампања грешке о "
 "команди: %s\n"
 
-#: src/keybindings.c:2659
+#: src/keybindings.c:2640
 #, c-format
 msgid "No command %d has been defined.\n"
 msgstr "Није дефинисана команда %d.\n"
 
-#: src/keybindings.c:3489
+#: src/keybindings.c:3485
 msgid "No terminal command has been defined.\n"
 msgstr "Није дефинисана наредба терминала.\n"
 
@@ -207,12 +207,12 @@ msgstr "Затвори"
 
 #. separator
 #: src/menu.c:66
-msgid "Put on _All Workspaces"
-msgstr "Постави на све радне површине"
+msgid "_Always on Visible Workspace"
+msgstr "_Увек на приказаној радној површини"
 
 #: src/menu.c:67
-msgid "Only on _This Workspace"
-msgstr "Само на овој радној површини"
+msgid "_Only on This Workspace"
+msgstr "Само на _овој радној површини"
 
 #: src/menu.c:68
 msgid "Move to Workspace _Left"
@@ -230,7 +230,7 @@ msgstr "Премести на радни простор _изнад"
 msgid "Move to Workspace _Down"
 msgstr "Премести на радни простор ис_под"
 
-#: src/menu.c:162 src/prefs.c:1942
+#: src/menu.c:162 src/prefs.c:1996
 #, c-format
 msgid "Workspace %d"
 msgstr "%d. радни простор"
@@ -360,7 +360,7 @@ msgstr "Наслов"
 msgid "Class"
 msgstr "Класа"
 
-#: src/metacity-dialog.c:262
+#: src/metacity-dialog.c:263
 msgid ""
 "These windows do not support \"save current setup\" and will have to be "
 "restarted manually next time you log in."
@@ -368,7 +368,7 @@ msgstr ""
 "Ови прозори не подржавају могућност „сними тренутна подешавања“ па ћете "
 "морати да их ручно поново покренете када се следећи пут пријавите."
 
-#: src/metacity-dialog.c:323
+#: src/metacity-dialog.c:328
 #, c-format
 msgid ""
 "There was an error running \"%s\":\n"
@@ -503,13 +503,15 @@ msgid ""
 "\"direct manipulation\", by using wireframes, avoiding animations, or other "
 "means. This is a significant reduction in usability for many users, but may "
 "allow legacy applications and terminal servers to function when they would "
-"otherwise be impractical."
+"otherwise be impractical. However, the wireframe feature is disabled when "
+"accessibility is on to avoid weird desktop breakages."
 msgstr ""
 "Ако је постављено, Метасити ће кориснику приказати мање података и мање "
 "осећаја о „непосредном управљању“, употребом линија, избегавањем анимација "
 "или другим средствима. Ово је значајни недостатак по питању употребљивости "
 "за многе кориснике, али може омогућити старим програмима и терминалским "
-"серверима да раде када би иначе били непрактични."
+"серверима да раде када би иначе били непрактични. Такође, употреба линија је "
+"онемогућена када је укључена приступачност да би се избегли чудни проблеми."
 
 #: src/metacity.schemas.in.h:20
 msgid ""
@@ -1195,9 +1197,7 @@ msgstr ""
 "подесите опцију на нарочити низ знакова „disabled“, онда неће бити коришћена "
 "ниједна комбинација тастера за ову акцију."
 
-# bug: missing dot
 #: src/metacity.schemas.in.h:109
-#, fuzzy
 msgid ""
 "The keybinding used to maximize a window. The format looks like \"&lt;"
 "Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;F1\". The parser is fairly "
@@ -1957,17 +1957,17 @@ msgstr "Начин фокуса прозора"
 msgid "Window title font"
 msgstr "Фонт наслова прозора"
 
-#: src/prefs.c:476 src/prefs.c:492 src/prefs.c:508 src/prefs.c:524
-#: src/prefs.c:540 src/prefs.c:560 src/prefs.c:576 src/prefs.c:592
-#: src/prefs.c:608 src/prefs.c:624 src/prefs.c:640 src/prefs.c:656
-#: src/prefs.c:672 src/prefs.c:689 src/prefs.c:705 src/prefs.c:721
-#: src/prefs.c:737 src/prefs.c:753 src/prefs.c:768 src/prefs.c:783
-#: src/prefs.c:798
+#: src/prefs.c:501 src/prefs.c:517 src/prefs.c:533 src/prefs.c:549
+#: src/prefs.c:565 src/prefs.c:585 src/prefs.c:601 src/prefs.c:617
+#: src/prefs.c:633 src/prefs.c:649 src/prefs.c:665 src/prefs.c:681
+#: src/prefs.c:697 src/prefs.c:714 src/prefs.c:730 src/prefs.c:746
+#: src/prefs.c:762 src/prefs.c:778 src/prefs.c:793 src/prefs.c:808
+#: src/prefs.c:823 src/prefs.c:839
 #, c-format
 msgid "GConf key \"%s\" is set to an invalid type\n"
 msgstr "Кључ „%s“ у гном подешавањима је подешен на непрописни тип\n"
 
-#: src/prefs.c:843
+#: src/prefs.c:884
 #, c-format
 msgid ""
 "\"%s\" found in configuration database is not a valid value for mouse button "
@@ -1976,17 +1976,17 @@ msgstr ""
 "“%s“ је пронађен у бази подешавања што није исправна вредност за типку која "
 "мења понашање тастера миша\n"
 
-#: src/prefs.c:867 src/prefs.c:1277
+#: src/prefs.c:908 src/prefs.c:1318
 #, c-format
 msgid "GConf key '%s' is set to an invalid value\n"
 msgstr "Кључ „%s“ у гном подешавањима је подешен на непрописну вредност\n"
 
-#: src/prefs.c:994
+#: src/prefs.c:1035
 #, c-format
 msgid "Could not parse font description \"%s\" from GConf key %s\n"
 msgstr "Нисам могао да обрадим опис „%s“ из кључа %s у гном подешавањима\n"
 
-#: src/prefs.c:1179
+#: src/prefs.c:1220
 #, c-format
 msgid ""
 "%d stored in GConf key %s is not a reasonable number of workspaces, current "
@@ -1995,7 +1995,7 @@ msgstr ""
 "%d сачувано у кључу %s у гном подешавањима није разуман број радних "
 "површина, тренутни максимум је %d\n"
 
-#: src/prefs.c:1239
+#: src/prefs.c:1280
 msgid ""
 "Workarounds for broken applications disabled. Some applications may not "
 "behave properly.\n"
@@ -2003,25 +2003,25 @@ msgstr ""
 "Компромиси за лоше програме су искључени. Неке апликације се могу понашати "
 "чудно.\n"
 
-#: src/prefs.c:1304
+#: src/prefs.c:1345
 #, c-format
 msgid "%d stored in GConf key %s is out of range 0 to %d\n"
 msgstr ""
 "Вредност %d из кључа „%s“ у гном подешавањима је ван распона од 0 до %d\n"
 
-#: src/prefs.c:1425
+#: src/prefs.c:1479
 #, c-format
 msgid "Error setting number of workspaces to %d: %s\n"
 msgstr "Грешка приликом постављања броја радних површина на %d: %s\n"
 
-#: src/prefs.c:1669
+#: src/prefs.c:1723
 #, c-format
 msgid ""
 "\"%s\" found in configuration database is not a valid value for keybinding "
 "\"%s\"\n"
 msgstr "“%s“ из базе са подешавањима није исправна комбинација тастера „%s“\n"
 
-#: src/prefs.c:2023
+#: src/prefs.c:2077
 #, c-format
 msgid "Error setting name for workspace %d to \"%s\": %s\n"
 msgstr "Грешка приликом постављања имена за радну површину %d у „%s“: %s\n"
@@ -2057,7 +2057,7 @@ msgstr ""
 msgid "Screen %d on display \"%s\" already has a window manager\n"
 msgstr "Приказ %d на екрану „%s“ већ има менаџер прозора\n"
 
-#: src/screen.c:699
+#: src/screen.c:716
 #, c-format
 msgid "Could not release screen %d on display \"%s\"\n"
 msgstr "Нисам могао да испустим приказ %d на екрану „%s“\n"
@@ -3150,7 +3150,7 @@ msgid "Application set a bogus _NET_WM_PID %ld\n"
 msgstr "Програм је поставио нетачан _NET_WM_PID %ld\n"
 
 #. first time through
-#: src/window.c:4829
+#: src/window.c:5197
 #, c-format
 msgid ""
 "Window %s sets SM_CLIENT_ID on itself, instead of on the WM_CLIENT_LEADER "
@@ -3166,7 +3166,7 @@ msgstr ""
 #. * MWM but not WM_NORMAL_HINTS are basically broken. We complain
 #. * about these apps but make them work.
 #.
-#: src/window.c:5500
+#: src/window.c:5868
 #, c-format
 msgid ""
 "Window %s sets an MWM hint indicating it isn't resizable, but sets min size %"
@@ -3203,6 +3203,9 @@ msgid ""
 msgstr ""
 "Особина %s прозора 0x%lx садржи неисправан UTF-8 за ставку %d у листи\n"
 
+#~ msgid "Put on _All Workspaces"
+#~ msgstr "Постави на све радне површине"
+
 #~ msgid "Select how to give focus to windows"
 #~ msgstr "Изаберизе како желите да дате фокус прозору"
 

po/sr@Latn.po

@@ -1,5 +1,5 @@
 # Serbian translation of metacity
-# Courtesy of Prevod.org team (http://prevod.org/) -- 2003, 2004.
+# Courtesy of Prevod.org team (http://prevod.org/) -- 2003, 2004, 2005.
 #
 # This file is distributed under the same license as the metacity package.
 #
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: metacity\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-09 21:23-0700\n"
-"PO-Revision-Date: 2004-10-15 23:15+0200\n"
+"POT-Creation-Date: 2005-06-27 17:21-0600\n"
+"PO-Revision-Date: 2005-03-02 23:38+0100\n"
 "Last-Translator: Danilo Šegan <danilo@prevod.org>\n"
 "Language-Team: Serbian (sr) <gnom@prevod.org>\n"
 "MIME-Version: 1.0\n"
@@ -61,7 +61,7 @@ msgstr ""
 msgid "Failed to get hostname: %s\n"
 msgstr "Nisam uspeo da saznam ime kompjutera: %s\n"
 
-#: src/display.c:306
+#: src/display.c:316
 #, c-format
 msgid "Failed to open X Window System display '%s'\n"
 msgstr "Nisam uspeo da otvorim X Window System  ekran „%s“\n"
@@ -82,23 +82,23 @@ msgstr ""
 msgid "Fatal IO error %d (%s) on display '%s'.\n"
 msgstr "Kobna greška sa izlazom/ulazom: %d (%s) na ekranu „%s“.\n"
 
-#: src/frames.c:1020
+#: src/frames.c:1125
 msgid "Close Window"
 msgstr "Zatvori prozor"
 
-#: src/frames.c:1023
+#: src/frames.c:1128
 msgid "Window Menu"
 msgstr "Meni prozora"
 
-#: src/frames.c:1026
+#: src/frames.c:1131
 msgid "Minimize Window"
 msgstr "Umanji prozor"
 
-#: src/frames.c:1029
+#: src/frames.c:1134
 msgid "Maximize Window"
 msgstr "Uvećaj prozor"
 
-#: src/frames.c:1032
+#: src/frames.c:1137
 msgid "Unmaximize Window"
 msgstr "Poništi uvećavanje prozora"
 
@@ -111,19 +111,19 @@ msgstr ""
 "Neki drugi program već koristi taster %s sa izmenjivačima %x za neku "
 "funkciju\n"
 
-#: src/keybindings.c:2554
+#: src/keybindings.c:2535
 #, c-format
 msgid "Error launching metacity-dialog to print an error about a command: %s\n"
 msgstr ""
 "Greška prilikom pokretanja metacity-dialog programa zbog štampanja greške o "
 "komandi: %s\n"
 
-#: src/keybindings.c:2659
+#: src/keybindings.c:2640
 #, c-format
 msgid "No command %d has been defined.\n"
 msgstr "Nije definisana komanda %d.\n"
 
-#: src/keybindings.c:3489
+#: src/keybindings.c:3485
 msgid "No terminal command has been defined.\n"
 msgstr "Nije definisana naredba terminala.\n"
 
@@ -207,12 +207,12 @@ msgstr "Zatvori"
 
 #. separator
 #: src/menu.c:66
-msgid "Put on _All Workspaces"
-msgstr "Postavi na sve radne površine"
+msgid "_Always on Visible Workspace"
+msgstr "_Uvek na prikazanoj radnoj površini"
 
 #: src/menu.c:67
-msgid "Only on _This Workspace"
-msgstr "Samo na ovoj radnoj površini"
+msgid "_Only on This Workspace"
+msgstr "Samo na _ovoj radnoj površini"
 
 #: src/menu.c:68
 msgid "Move to Workspace _Left"
@@ -230,7 +230,7 @@ msgstr "Premesti na radni prostor _iznad"
 msgid "Move to Workspace _Down"
 msgstr "Premesti na radni prostor is_pod"
 
-#: src/menu.c:162 src/prefs.c:1942
+#: src/menu.c:162 src/prefs.c:1996
 #, c-format
 msgid "Workspace %d"
 msgstr "%d. radni prostor"
@@ -360,7 +360,7 @@ msgstr "Naslov"
 msgid "Class"
 msgstr "Klasa"
 
-#: src/metacity-dialog.c:262
+#: src/metacity-dialog.c:263
 msgid ""
 "These windows do not support \"save current setup\" and will have to be "
 "restarted manually next time you log in."
@@ -368,7 +368,7 @@ msgstr ""
 "Ovi prozori ne podržavaju mogućnost „snimi trenutna podešavanja“ pa ćete "
 "morati da ih ručno ponovo pokrenete kada se sledeći put prijavite."
 
-#: src/metacity-dialog.c:323
+#: src/metacity-dialog.c:328
 #, c-format
 msgid ""
 "There was an error running \"%s\":\n"
@@ -503,13 +503,16 @@ msgid ""
 "\"direct manipulation\", by using wireframes, avoiding animations, or other "
 "means. This is a significant reduction in usability for many users, but may "
 "allow legacy applications and terminal servers to function when they would "
-"otherwise be impractical."
+"otherwise be impractical. However, the wireframe feature is disabled when "
+"accessibility is on to avoid weird desktop breakages."
 msgstr ""
 "Ako je postavljeno, Metasiti će korisniku prikazati manje podataka i manje "
 "osećaja o „neposrednom upravljanju“, upotrebom linija, izbegavanjem "
 "animacija ili drugim sredstvima. Ovo je značajni nedostatak po pitanju "
 "upotrebljivosti za mnoge korisnike, ali može omogućiti starim programima i "
-"terminalskim serverima da rade kada bi inače bili nepraktični."
+"terminalskim serverima da rade kada bi inače bili nepraktični. Takođe, "
+"upotreba linija je onemogućena kada je uključena pristupačnost da bi se "
+"izbegli čudni problemi."
 
 #: src/metacity.schemas.in.h:20
 msgid ""
@@ -1195,9 +1198,7 @@ msgstr ""
 "podesite opciju na naročiti niz znakova „disabled“, onda neće biti korišćena "
 "nijedna kombinacija tastera za ovu akciju."
 
-# bug: missing dot
 #: src/metacity.schemas.in.h:109
-#, fuzzy
 msgid ""
 "The keybinding used to maximize a window. The format looks like \"&lt;"
 "Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;F1\". The parser is fairly "
@@ -1958,17 +1959,17 @@ msgstr "Način fokusa prozora"
 msgid "Window title font"
 msgstr "Font naslova prozora"
 
-#: src/prefs.c:476 src/prefs.c:492 src/prefs.c:508 src/prefs.c:524
-#: src/prefs.c:540 src/prefs.c:560 src/prefs.c:576 src/prefs.c:592
-#: src/prefs.c:608 src/prefs.c:624 src/prefs.c:640 src/prefs.c:656
-#: src/prefs.c:672 src/prefs.c:689 src/prefs.c:705 src/prefs.c:721
-#: src/prefs.c:737 src/prefs.c:753 src/prefs.c:768 src/prefs.c:783
-#: src/prefs.c:798
+#: src/prefs.c:501 src/prefs.c:517 src/prefs.c:533 src/prefs.c:549
+#: src/prefs.c:565 src/prefs.c:585 src/prefs.c:601 src/prefs.c:617
+#: src/prefs.c:633 src/prefs.c:649 src/prefs.c:665 src/prefs.c:681
+#: src/prefs.c:697 src/prefs.c:714 src/prefs.c:730 src/prefs.c:746
+#: src/prefs.c:762 src/prefs.c:778 src/prefs.c:793 src/prefs.c:808
+#: src/prefs.c:823 src/prefs.c:839
 #, c-format
 msgid "GConf key \"%s\" is set to an invalid type\n"
 msgstr "Ključ „%s“ u gnom podešavanjima je podešen na nepropisni tip\n"
 
-#: src/prefs.c:843
+#: src/prefs.c:884
 #, c-format
 msgid ""
 "\"%s\" found in configuration database is not a valid value for mouse button "
@@ -1977,17 +1978,17 @@ msgstr ""
 "“%s“ je pronađen u bazi podešavanja što nije ispravna vrednost za tipku koja "
 "menja ponašanje tastera miša\n"
 
-#: src/prefs.c:867 src/prefs.c:1277
+#: src/prefs.c:908 src/prefs.c:1318
 #, c-format
 msgid "GConf key '%s' is set to an invalid value\n"
 msgstr "Ključ „%s“ u gnom podešavanjima je podešen na nepropisnu vrednost\n"
 
-#: src/prefs.c:994
+#: src/prefs.c:1035
 #, c-format
 msgid "Could not parse font description \"%s\" from GConf key %s\n"
 msgstr "Nisam mogao da obradim opis „%s“ iz ključa %s u gnom podešavanjima\n"
 
-#: src/prefs.c:1179
+#: src/prefs.c:1220
 #, c-format
 msgid ""
 "%d stored in GConf key %s is not a reasonable number of workspaces, current "
@@ -1996,7 +1997,7 @@ msgstr ""
 "%d sačuvano u ključu %s u gnom podešavanjima nije razuman broj radnih "
 "površina, trenutni maksimum je %d\n"
 
-#: src/prefs.c:1239
+#: src/prefs.c:1280
 msgid ""
 "Workarounds for broken applications disabled. Some applications may not "
 "behave properly.\n"
@@ -2004,25 +2005,25 @@ msgstr ""
 "Kompromisi za loše programe su isključeni. Neke aplikacije se mogu ponašati "
 "čudno.\n"
 
-#: src/prefs.c:1304
+#: src/prefs.c:1345
 #, c-format
 msgid "%d stored in GConf key %s is out of range 0 to %d\n"
 msgstr ""
 "Vrednost %d iz ključa „%s“ u gnom podešavanjima je van raspona od 0 do %d\n"
 
-#: src/prefs.c:1425
+#: src/prefs.c:1479
 #, c-format
 msgid "Error setting number of workspaces to %d: %s\n"
 msgstr "Greška prilikom postavljanja broja radnih površina na %d: %s\n"
 
-#: src/prefs.c:1669
+#: src/prefs.c:1723
 #, c-format
 msgid ""
 "\"%s\" found in configuration database is not a valid value for keybinding "
 "\"%s\"\n"
 msgstr "“%s“ iz baze sa podešavanjima nije ispravna kombinacija tastera „%s“\n"
 
-#: src/prefs.c:2023
+#: src/prefs.c:2077
 #, c-format
 msgid "Error setting name for workspace %d to \"%s\": %s\n"
 msgstr "Greška prilikom postavljanja imena za radnu površinu %d u „%s“: %s\n"
@@ -2058,7 +2059,7 @@ msgstr ""
 msgid "Screen %d on display \"%s\" already has a window manager\n"
 msgstr "Prikaz %d na ekranu „%s“ već ima menadžer prozora\n"
 
-#: src/screen.c:699
+#: src/screen.c:716
 #, c-format
 msgid "Could not release screen %d on display \"%s\"\n"
 msgstr "Nisam mogao da ispustim prikaz %d na ekranu „%s“\n"
@@ -3151,7 +3152,7 @@ msgid "Application set a bogus _NET_WM_PID %ld\n"
 msgstr "Program je postavio netačan _NET_WM_PID %ld\n"
 
 #. first time through
-#: src/window.c:4829
+#: src/window.c:5197
 #, c-format
 msgid ""
 "Window %s sets SM_CLIENT_ID on itself, instead of on the WM_CLIENT_LEADER "
@@ -3167,7 +3168,7 @@ msgstr ""
 #. * MWM but not WM_NORMAL_HINTS are basically broken. We complain
 #. * about these apps but make them work.
 #.
-#: src/window.c:5500
+#: src/window.c:5868
 #, c-format
 msgid ""
 "Window %s sets an MWM hint indicating it isn't resizable, but sets min size %"
@@ -3204,6 +3205,9 @@ msgid ""
 msgstr ""
 "Osobina %s prozora 0x%lx sadrži neispravan UTF-8 za stavku %d u listi\n"
 
+#~ msgid "Put on _All Workspaces"
+#~ msgstr "Postavi na sve radne površine"
+
 #~ msgid "Select how to give focus to windows"
 #~ msgstr "Izaberize kako želite da date fokus prozoru"
 

po/sv.po

@@ -1,6 +1,6 @@
 # Swedish messages for metacity.
-# Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
-# Christian Rose <menthos@menthos.com>, 2001, 2002, 2003, 2004.
+# Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+# Christian Rose <menthos@menthos.com>, 2001, 2002, 2003, 2004, 2005.
 #
 # $Id$
 #
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: metacity\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-09 21:23-0700\n"
-"PO-Revision-Date: 2004-12-28 23:28+0100\n"
+"POT-Creation-Date: 2005-06-27 17:21-0600\n"
+"PO-Revision-Date: 2005-01-31 23:18+0100\n"
 "Last-Translator: Christian Rose <menthos@menthos.com>\n"
 "Language-Team: Swedish <sv@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -61,7 +61,7 @@ msgstr ""
 msgid "Failed to get hostname: %s\n"
 msgstr "Misslyckades med att få tag i värdnamn: %s\n"
 
-#: src/display.c:306
+#: src/display.c:316
 #, c-format
 msgid "Failed to open X Window System display '%s'\n"
 msgstr "Misslyckades med att öppna X Window System-displayen \"%s\"\n"
@@ -82,23 +82,23 @@ msgstr ""
 msgid "Fatal IO error %d (%s) on display '%s'.\n"
 msgstr "Ödesdigert IO-fel %d (%s) på display \"%s\".\n"
 
-#: src/frames.c:1020
+#: src/frames.c:1125
 msgid "Close Window"
 msgstr "Stäng fönster"
 
-#: src/frames.c:1023
+#: src/frames.c:1128
 msgid "Window Menu"
 msgstr "Fönstermeny"
 
-#: src/frames.c:1026
+#: src/frames.c:1131
 msgid "Minimize Window"
 msgstr "Minimera fönster"
 
-#: src/frames.c:1029
+#: src/frames.c:1134
 msgid "Maximize Window"
 msgstr "Maximera fönster"
 
-#: src/frames.c:1032
+#: src/frames.c:1137
 msgid "Unmaximize Window"
 msgstr "Avmaximera fönster"
 
@@ -111,19 +111,19 @@ msgstr ""
 "Ett annat program använder redan tangenten %s med modifierarna %x som en "
 "bindning\n"
 
-#: src/keybindings.c:2554
+#: src/keybindings.c:2535
 #, c-format
 msgid "Error launching metacity-dialog to print an error about a command: %s\n"
 msgstr ""
 "Fel vid start av metacity-dialog för att skriva ut ett fel om ett kommando: %"
 "s\n"
 
-#: src/keybindings.c:2659
+#: src/keybindings.c:2640
 #, c-format
 msgid "No command %d has been defined.\n"
 msgstr "Inget kommando %d har definierats.\n"
 
-#: src/keybindings.c:3489
+#: src/keybindings.c:3485
 msgid "No terminal command has been defined.\n"
 msgstr "Inget terminalkommando har definierats.\n"
 
@@ -207,12 +207,12 @@ msgstr "_Stäng"
 
 #. separator
 #: src/menu.c:66
-msgid "Put on _All Workspaces"
-msgstr "Placera på _alla arbetsytor"
+msgid "_Always on Visible Workspace"
+msgstr "_Alltid på synlig arbetsyta"
 
 #: src/menu.c:67
-msgid "Only on _This Workspace"
-msgstr "Endast på _denna arbetsyta"
+msgid "_Only on This Workspace"
+msgstr "_Endast på denna arbetsyta"
 
 #: src/menu.c:68
 msgid "Move to Workspace _Left"
@@ -230,7 +230,7 @@ msgstr "Flytta till arbetsyta _uppåt"
 msgid "Move to Workspace _Down"
 msgstr "Flytta till arbetsyta _nedanför"
 
-#: src/menu.c:162 src/prefs.c:1942
+#: src/menu.c:162 src/prefs.c:1996
 #, c-format
 msgid "Workspace %d"
 msgstr "Arbetsyta %d"
@@ -362,7 +362,7 @@ msgstr "Titel"
 msgid "Class"
 msgstr "Klass"
 
-#: src/metacity-dialog.c:262
+#: src/metacity-dialog.c:263
 msgid ""
 "These windows do not support \"save current setup\" and will have to be "
 "restarted manually next time you log in."
@@ -370,7 +370,7 @@ msgstr ""
 "Dessa fönster stöder inte \"spara nuvarande inställningar\" och kommer att "
 "behöva startas om manuellt nästa gång du loggar in."
 
-#: src/metacity-dialog.c:323
+#: src/metacity-dialog.c:328
 #, c-format
 msgid ""
 "There was an error running \"%s\":\n"
@@ -511,13 +511,16 @@ msgid ""
 "\"direct manipulation\", by using wireframes, avoiding animations, or other "
 "means. This is a significant reduction in usability for many users, but may "
 "allow legacy applications and terminal servers to function when they would "
-"otherwise be impractical."
+"otherwise be impractical. However, the wireframe feature is disabled when "
+"accessibility is on to avoid weird desktop breakages."
 msgstr ""
 "Om detta är sant kommer metacity att ge användaren mindre återkoppling och "
 "mindre känsla av \"direktmanipulering\" genom att använda trådramar, undvika "
 "animationer, och andra sätt. Detta är en betydande minskning av "
 "användbarheten för många användare, men kan tillåta äldre program och "
 "terminalservrar att fungera i de fall de annars skulle varit olämpliga."
+"Funktionaliteten med trådramar är dock inaktiverad då tillgänglighet är på "
+"för att undvika konstiga skrivbordsfel."
 
 # SUN CHANGED MESSAGE
 #: src/metacity.schemas.in.h:20
@@ -1983,17 +1986,17 @@ msgid "Window title font"
 msgstr "Typsnitt för fönstertitel"
 
 # SUN CHANGED MESSAGE
-#: src/prefs.c:476 src/prefs.c:492 src/prefs.c:508 src/prefs.c:524
-#: src/prefs.c:540 src/prefs.c:560 src/prefs.c:576 src/prefs.c:592
-#: src/prefs.c:608 src/prefs.c:624 src/prefs.c:640 src/prefs.c:656
-#: src/prefs.c:672 src/prefs.c:689 src/prefs.c:705 src/prefs.c:721
-#: src/prefs.c:737 src/prefs.c:753 src/prefs.c:768 src/prefs.c:783
-#: src/prefs.c:798
+#: src/prefs.c:501 src/prefs.c:517 src/prefs.c:533 src/prefs.c:549
+#: src/prefs.c:565 src/prefs.c:585 src/prefs.c:601 src/prefs.c:617
+#: src/prefs.c:633 src/prefs.c:649 src/prefs.c:665 src/prefs.c:681
+#: src/prefs.c:697 src/prefs.c:714 src/prefs.c:730 src/prefs.c:746
+#: src/prefs.c:762 src/prefs.c:778 src/prefs.c:793 src/prefs.c:808
+#: src/prefs.c:823 src/prefs.c:839
 #, c-format
 msgid "GConf key \"%s\" is set to an invalid type\n"
 msgstr "GConf-nyckeln \"%s\" är satt till en ogiltig typ\n"
 
-#: src/prefs.c:843
+#: src/prefs.c:884
 #, c-format
 msgid ""
 "\"%s\" found in configuration database is not a valid value for mouse button "
@@ -2002,17 +2005,17 @@ msgstr ""
 "\"%s\" som hittades i konfigurationsdatabasen är inte ett giltigt värde för "
 "musknappsmodifierare\n"
 
-#: src/prefs.c:867 src/prefs.c:1277
+#: src/prefs.c:908 src/prefs.c:1318
 #, c-format
 msgid "GConf key '%s' is set to an invalid value\n"
 msgstr "GConf-nyckeln \"%s\" är satt till ett ogiltigt värde\n"
 
-#: src/prefs.c:994
+#: src/prefs.c:1035
 #, c-format
 msgid "Could not parse font description \"%s\" from GConf key %s\n"
 msgstr "Kunde inte tolka typsnittsbeskrivningen \"%s\" från GConf-nyckeln %s\n"
 
-#: src/prefs.c:1179
+#: src/prefs.c:1220
 #, c-format
 msgid ""
 "%d stored in GConf key %s is not a reasonable number of workspaces, current "
@@ -2021,7 +2024,7 @@ msgstr ""
 "%d lagrad i GConf-nyckeln %s är inte ett rimligt antal arbetsytor, aktuellt "
 "maxvärde är %d\n"
 
-#: src/prefs.c:1239
+#: src/prefs.c:1280
 msgid ""
 "Workarounds for broken applications disabled. Some applications may not "
 "behave properly.\n"
@@ -2029,17 +2032,17 @@ msgstr ""
 "Fixar för trasiga program är inaktiverade. En del program fungerar kanske "
 "inte korrekt.\n"
 
-#: src/prefs.c:1304
+#: src/prefs.c:1345
 #, c-format
 msgid "%d stored in GConf key %s is out of range 0 to %d\n"
 msgstr "%d lagrad i GConf-nyckeln %s är inte i intervallet 0 till %d\n"
 
-#: src/prefs.c:1425
+#: src/prefs.c:1479
 #, c-format
 msgid "Error setting number of workspaces to %d: %s\n"
 msgstr "Fel vid inställning av antalet arbetsytor till %d: %s\n"
 
-#: src/prefs.c:1669
+#: src/prefs.c:1723
 #, c-format
 msgid ""
 "\"%s\" found in configuration database is not a valid value for keybinding "
@@ -2048,7 +2051,7 @@ msgstr ""
 "\"%s\" som hittades i konfigurationsdatabasen är inte ett giltigt värde för "
 "tangentbindningen \"%s\"\n"
 
-#: src/prefs.c:2023
+#: src/prefs.c:2077
 #, c-format
 msgid "Error setting name for workspace %d to \"%s\": %s\n"
 msgstr "Fel vid inställning av namnet på arbetsyta %d till \"%s\": %s\n"
@@ -2083,7 +2086,7 @@ msgstr "Kunde inte få tag i fönsterhanterarval på skärm %d display \"%s\"\n"
 msgid "Screen %d on display \"%s\" already has a window manager\n"
 msgstr "Skärm %d på display \"%s\" har redan en fönsterhanterare\n"
 
-#: src/screen.c:699
+#: src/screen.c:716
 #, c-format
 msgid "Could not release screen %d on display \"%s\"\n"
 msgstr "Kunde inte släppa skärm %d på display \"%s\"\n"
@@ -3215,7 +3218,7 @@ msgid "Application set a bogus _NET_WM_PID %ld\n"
 msgstr "Programmet ställde in ett felaktigt _NET_WM_PID %ld\n"
 
 #. first time through
-#: src/window.c:4829
+#: src/window.c:5197
 #, c-format
 msgid ""
 "Window %s sets SM_CLIENT_ID on itself, instead of on the WM_CLIENT_LEADER "
@@ -3231,7 +3234,7 @@ msgstr ""
 #. * MWM but not WM_NORMAL_HINTS are basically broken. We complain
 #. * about these apps but make them work.
 #.
-#: src/window.c:5500
+#: src/window.c:5868
 #, c-format
 msgid ""
 "Window %s sets an MWM hint indicating it isn't resizable, but sets min size %"
@@ -3268,6 +3271,28 @@ msgid ""
 msgstr ""
 "Egenskap %s på fönster 0x%lx innehöll ogiltig UTF-8 för objekt %d i listan\n"
 
+#~ msgid ""
+#~ "If true, metacity will give the user less feedback and less sense of "
+#~ "\"direct manipulation\", by using wireframes, avoiding animations, or "
+#~ "other means. This is a significant reduction in usability for many users, "
+#~ "but may allow legacy applications and terminal servers to function when "
+#~ "they would otherwise be impractical. However, the wireframe feature is "
+#~ "disabled when accessibility is on to avoid weird desktop breakages"
+#~ msgstr ""
+#~ "Om detta är sant kommer metacity att ge användaren mindre återkoppling "
+#~ "och mindre känsla av \"direktmanipulering\" genom att använda trådramar, "
+#~ "undvika animationer, och andra sätt. Detta är en betydande minskning av "
+#~ "användbarheten för många användare, men kan tillåta äldre program och "
+#~ "terminalservrar att fungera i de fall de annars skulle varit olämpliga."
+#~ "Funktionaliteten med trådramar är dock inaktiverad då tillgänglighet är "
+#~ "på för att undvika konstiga skrivbordsfel"
+
+#~ msgid "_Always on Current Workspace"
+#~ msgstr "_Alltid på aktuell arbetsyta"
+
+#~ msgid "Put on _All Workspaces"
+#~ msgstr "Placera på _alla arbetsytor"
+
 #~ msgid ""
 #~ "The keybinding used to maximize a window The format looks like \"&lt;"
 #~ "Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;F1\". The parser is fairly "

po/ta.po

@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ta\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-09 21:23-0700\n"
+"POT-Creation-Date: 2005-06-27 17:21-0600\n"
 "PO-Revision-Date: 2004-09-03 16:47+0530\n"
 "Last-Translator: Jayaradha N <jaya@pune.redhat.com>\n"
 "Language-Team: Tamil <zhakanini@yahoogroups.com>\n"
@@ -63,7 +63,7 @@ msgstr "மெட்டாசிட்டி தகவலை ஏற்றும
 msgid "Failed to get hostname: %s\n"
 msgstr "புரவலன் பெயரை பெறுவதில் தோல்வி: %s\n"
 
-#: src/display.c:306
+#: src/display.c:316
 #, c-format
 msgid "Failed to open X Window System display '%s'\n"
 msgstr "X சாளர காட்சியை திறப்பதில் தோல்வி '%s'\n"
@@ -84,23 +84,23 @@ msgstr ""
 msgid "Fatal IO error %d (%s) on display '%s'.\n"
 msgstr "கவலைக்கிடமான IO பிழை %d (%s) திரையில் '%s'.\n"
 
-#: src/frames.c:1020
+#: src/frames.c:1125
 msgid "Close Window"
 msgstr "சாளரம் மூடவும்"
 
-#: src/frames.c:1023
+#: src/frames.c:1128
 msgid "Window Menu"
 msgstr "தலைப்புப் பட்டி"
 
-#: src/frames.c:1026
+#: src/frames.c:1131
 msgid "Minimize Window"
 msgstr "சாளரத்தை சிறிதாக்கு"
 
-#: src/frames.c:1029
+#: src/frames.c:1134
 msgid "Maximize Window"
 msgstr "சாளரத்தை பெரிதாக்கு"
 
-#: src/frames.c:1032
+#: src/frames.c:1137
 msgid "Unmaximize Window"
 msgstr "சாளரத்தை பெரிதாக்காதே"
 
@@ -111,17 +111,17 @@ msgid ""
 "binding\n"
 msgstr "விசை %s ஐ மாற்றி  %x ஓடு இணைத்து வேறு நிரல் பயன்படுத்திக்கொண்டிருக்கிறது\n"
 
-#: src/keybindings.c:2554
+#: src/keybindings.c:2535
 #, c-format
 msgid "Error launching metacity-dialog to print an error about a command: %s\n"
 msgstr "மெட்டா-சிட்டி உரையை துவக்குவதில் பிழை கட்டளை பற்றிய பிழையை அச்சடிக்கவும்: %s\n"
 
-#: src/keybindings.c:2659
+#: src/keybindings.c:2640
 #, c-format
 msgid "No command %d has been defined.\n"
 msgstr "கட்டளை %d எதுவும் குறிப்பிடப்படவில்லை.\n"
 
-#: src/keybindings.c:3489
+#: src/keybindings.c:3485
 #, fuzzy
 msgid "No terminal command has been defined.\n"
 msgstr "கட்டளை %d எதுவும் குறிப்பிடப்படவில்லை.\n"
@@ -206,11 +206,13 @@ msgstr "மூடு"
 
 #. separator
 #: src/menu.c:66
-msgid "Put on _All Workspaces"
-msgstr "அனைத்து வேலையிடங்களிலும் போடுக"
+#, fuzzy
+msgid "_Always on Visible Workspace"
+msgstr "þவ்வேலையிடத்தில் மட்டும்"
 
 #: src/menu.c:67
-msgid "Only on _This Workspace"
+#, fuzzy
+msgid "_Only on This Workspace"
 msgstr "þவ்வேலையிடத்தில் மட்டும்"
 
 #: src/menu.c:68
@@ -229,7 +231,7 @@ msgstr "(_U)பணியிடத்தின் மேலே நகர்த்
 msgid "Move to Workspace _Down"
 msgstr "(_D)பணியிடத்தின் கீழேகம் நகர்த்து"
 
-#: src/menu.c:162 src/prefs.c:1942
+#: src/menu.c:162 src/prefs.c:1996
 #, c-format
 msgid "Workspace %d"
 msgstr "வேலை þடம் %d"
@@ -359,7 +361,7 @@ msgstr "தலைப்பு"
 msgid "Class"
 msgstr "Class"
 
-#: src/metacity-dialog.c:262
+#: src/metacity-dialog.c:263
 msgid ""
 "These windows do not support \"save current setup\" and will have to be "
 "restarted manually next time you log in."
@@ -367,7 +369,7 @@ msgstr ""
 "\"தற்போதைய அமைப்பை சேமி\" செயலுக்கு ஆதரவு இல்லை மேலும் அடுத்த முறை உள்நுழையும் போது "
 "நீங்களாக துவக்க வேண்டும்"
 
-#: src/metacity-dialog.c:323
+#: src/metacity-dialog.c:328
 #, c-format
 msgid ""
 "There was an error running \"%s\":\n"
@@ -495,12 +497,14 @@ msgstr ""
 "காட்டும்."
 
 #: src/metacity.schemas.in.h:19
+#, fuzzy
 msgid ""
 "If true, metacity will give the user less feedback and less sense of "
 "\"direct manipulation\", by using wireframes, avoiding animations, or other "
 "means. This is a significant reduction in usability for many users, but may "
 "allow legacy applications and terminal servers to function when they would "
-"otherwise be impractical."
+"otherwise be impractical. However, the wireframe feature is disabled when "
+"accessibility is on to avoid weird desktop breakages."
 msgstr ""
 "உண்மையெனில், மெட்டாசிட்டி குறைவான கருத்து மற்றும் குறைந்த  \"நேர் மாற்றத்திற்கம்\" வசதி "
 "செய்து தரும், கம்பி சட்டங்களை பயன்படுத்தி, உயிர் சித்திரங்களை தவிர்க்கும். இது பயனீட்டாளரின் "
@@ -1877,34 +1881,34 @@ msgstr "சாளர குறி பாங்கு"
 msgid "Window title font"
 msgstr "சாளர தலைப்பு எழுத்துரு"
 
-#: src/prefs.c:476 src/prefs.c:492 src/prefs.c:508 src/prefs.c:524
-#: src/prefs.c:540 src/prefs.c:560 src/prefs.c:576 src/prefs.c:592
-#: src/prefs.c:608 src/prefs.c:624 src/prefs.c:640 src/prefs.c:656
-#: src/prefs.c:672 src/prefs.c:689 src/prefs.c:705 src/prefs.c:721
-#: src/prefs.c:737 src/prefs.c:753 src/prefs.c:768 src/prefs.c:783
-#: src/prefs.c:798
+#: src/prefs.c:501 src/prefs.c:517 src/prefs.c:533 src/prefs.c:549
+#: src/prefs.c:565 src/prefs.c:585 src/prefs.c:601 src/prefs.c:617
+#: src/prefs.c:633 src/prefs.c:649 src/prefs.c:665 src/prefs.c:681
+#: src/prefs.c:697 src/prefs.c:714 src/prefs.c:730 src/prefs.c:746
+#: src/prefs.c:762 src/prefs.c:778 src/prefs.c:793 src/prefs.c:808
+#: src/prefs.c:823 src/prefs.c:839
 #, c-format
 msgid "GConf key \"%s\" is set to an invalid type\n"
 msgstr "GConf விசை \"%s\" செல்லாத வகை\n"
 
-#: src/prefs.c:843
+#: src/prefs.c:884
 #, c-format
 msgid ""
 "\"%s\" found in configuration database is not a valid value for mouse button "
 "modifier\n"
 msgstr "அமைப்பு பாங்கில் உள்ள \"%s\" சுட்டி பட்டன் மாற்றியில் செல்லாத மதிப்பு\n"
 
-#: src/prefs.c:867 src/prefs.c:1277
+#: src/prefs.c:908 src/prefs.c:1318
 #, c-format
 msgid "GConf key '%s' is set to an invalid value\n"
 msgstr "GConf விசை '%s' செல்லாத மதிப்பாக அமைக்கப்பட்டுள்ளது\n"
 
-#: src/prefs.c:994
+#: src/prefs.c:1035
 #, c-format
 msgid "Could not parse font description \"%s\" from GConf key %s\n"
 msgstr "எழுத்துரு விளக்கம் \"%s\" ஐ GConf விசையிலிருந்து பகுக்க முடியவில்லை %s\n"
 
-#: src/prefs.c:1179
+#: src/prefs.c:1220
 #, c-format
 msgid ""
 "%d stored in GConf key %s is not a reasonable number of workspaces, current "
@@ -1912,7 +1916,7 @@ msgid ""
 msgstr ""
 "%d GConf விசை %s இல் சேமிக்கப்பட்டுள்ளது ஆனால் அது செல்லாது தற்போது அதிகபட்சம் %d\n"
 
-#: src/prefs.c:1239
+#: src/prefs.c:1280
 msgid ""
 "Workarounds for broken applications disabled. Some applications may not "
 "behave properly.\n"
@@ -1920,24 +1924,24 @@ msgstr ""
 "உடைந்த பயன்பாடுகளின் செயல்பாடு தடைசெய்யப்பட்டது, சில பயன்பாடுகள் சரியாக வேலை "
 "செய்யாது.\n"
 
-#: src/prefs.c:1304
+#: src/prefs.c:1345
 #, c-format
 msgid "%d stored in GConf key %s is out of range 0 to %d\n"
 msgstr "%d GConf விசையில் %s சேமிக்கப்பட்டுள்ளது அதன் வரம்பு 0 லிருந்து %d\n"
 
-#: src/prefs.c:1425
+#: src/prefs.c:1479
 #, c-format
 msgid "Error setting number of workspaces to %d: %s\n"
 msgstr "பணியிடத்தை அமைப்பதில் பிழை %d: %s\n"
 
-#: src/prefs.c:1669
+#: src/prefs.c:1723
 #, c-format
 msgid ""
 "\"%s\" found in configuration database is not a valid value for keybinding "
 "\"%s\"\n"
 msgstr "\"%s\" அமைப்பு தரவுத்தளத்தில் உள்ள மதிப்பு செல்லாத கீபைன்டிங்\"%s\"\n"
 
-#: src/prefs.c:2023
+#: src/prefs.c:2077
 #, c-format
 msgid "Error setting name for workspace %d to \"%s\": %s\n"
 msgstr "பணியிடத்தை %d லிருந்து \"%s\" க்கு மாற்றுவதில் பிழை: %s\n"
@@ -1972,7 +1976,7 @@ msgstr "திரையில் சாளர மேலாளர் தேர்
 msgid "Screen %d on display \"%s\" already has a window manager\n"
 msgstr "திரை %d யின் காட்சி \"%s\" க்கு சாளர மேலாளர் ஏற்கெனவே உள்ளது\n"
 
-#: src/screen.c:699
+#: src/screen.c:716
 #, c-format
 msgid "Could not release screen %d on display \"%s\"\n"
 msgstr "திரை %d ஐ விடுவிக்க முடியவில்லை \"%s\"\n"
@@ -3047,7 +3051,7 @@ msgid "Application set a bogus _NET_WM_PID %ld\n"
 msgstr "பயன்பாடு தவறாக அமைக்கப்பட்டது _NET_WM_PID %ld\n"
 
 #. first time through
-#: src/window.c:4829
+#: src/window.c:5197
 #, c-format
 msgid ""
 "Window %s sets SM_CLIENT_ID on itself, instead of on the WM_CLIENT_LEADER "
@@ -3063,7 +3067,7 @@ msgstr ""
 #. * MWM but not WM_NORMAL_HINTS are basically broken. We complain
 #. * about these apps but make them work.
 #.
-#: src/window.c:5500
+#: src/window.c:5868
 #, c-format
 msgid ""
 "Window %s sets an MWM hint indicating it isn't resizable, but sets min size %"
@@ -3098,6 +3102,9 @@ msgid ""
 "Property %s on window 0x%lx contained invalid UTF-8 for item %d in the list\n"
 msgstr "பண்பு %s சாளரம் 0x%lx செல்லாத UTF-8 உருப்படி %d பட்டியலில் உள்ளது\n"
 
+#~ msgid "Put on _All Workspaces"
+#~ msgstr "அனைத்து வேலையிடங்களிலும் போடுக"
+
 #~ msgid "Select how to give focus to windows"
 #~ msgstr "சாளரத்தை எப்படி குறிப்பது என்பதை தேர்வு செய்யவும்"
 

po/th.po

@@ -5,24 +5,20 @@
 # Phakhinee Thangnithirat <sc442535@angsila.compsci.buu.ac.th>, 2003
 # Chanchai Junlouchai <taz@opentle.org>, 2003
 # Paisa Seeluangsawat <paisa@users.sf.net>, 2004.
-# Theppitak Karoonboonyanan <thep@linux.thai.net>, 2004.
-#
-# Paisa's note:
-#       The Burapha traslations for opentle 5.0 need heavy editing.
-#       Entries that I haven't edited has been commented out.
+# Theppitak Karoonboonyanan <thep@linux.thai.net>, 2004-2005.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: metacity\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-09 21:23-0700\n"
-"PO-Revision-Date: 2004-09-12 22:37-0500\n"
-"Last-Translator: Paisa Seeluangsawat <paisa@users.sf.net>\n"
+"POT-Creation-Date: 2005-07-17 09:12+0700\n"
+"PO-Revision-Date: 2005-07-17 09:22+0700\n"
+"Last-Translator: Theppitak Karoonboonyanan <thep@linux.thai.net>\n"
 "Language-Team: Thai <L10n@opentle.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
+"Plural-Forms: nplurals=1; plural=0;"
 
 #: src/tools/metacity-message.c:150
 #, c-format
@@ -66,7 +62,7 @@ msgstr "เกิดข้อผิดพลาด ขณะเปิดหน
 msgid "Failed to get hostname: %s\n"
 msgstr "ไม่สามารถอ่านชื่อโฮสต์: %s\n"
 
-#: src/display.c:306
+#: src/display.c:319
 #, c-format
 msgid "Failed to open X Window System display '%s'\n"
 msgstr "ไม่สามารถเปิด display '%s' ของระบบ X Window\n"
@@ -86,23 +82,23 @@ msgstr ""
 msgid "Fatal IO error %d (%s) on display '%s'.\n"
 msgstr "เกิดข้อผิดพลาดสาหัส %d (%s) ในการอ่านเขียนข้อมูลจาก display '%s'\n"
 
-#: src/frames.c:1020
+#: src/frames.c:1125
 msgid "Close Window"
 msgstr "ปิดหน้าต่าง"
 
-#: src/frames.c:1023
+#: src/frames.c:1128
 msgid "Window Menu"
 msgstr "เมนูหน้าต่าง"
 
-#: src/frames.c:1026
+#: src/frames.c:1131
 msgid "Minimize Window"
 msgstr "ย่อหน้าต่างหาย"
 
-#: src/frames.c:1029
+#: src/frames.c:1134
 msgid "Maximize Window"
 msgstr "ขยายหน้าต่างเต็ม"
 
-#: src/frames.c:1032
+#: src/frames.c:1137
 msgid "Unmaximize Window"
 msgstr "เลิกขยายหน้าต่างเต็ม"
 
@@ -113,31 +109,22 @@ msgid ""
 "binding\n"
 msgstr "โปรแกรมอื่นกำลังใช้ปุ่ม %s ร่วมกับปุ่ม %x เป็นปุ่มลัดอยู่แล้ว\n"
 
-#: src/keybindings.c:2554
+#: src/keybindings.c:2535
 #, c-format
 msgid "Error launching metacity-dialog to print an error about a command: %s\n"
 msgstr "ไม่สามารถเปิดหน้าต่างโต้ตอบ เพื่อแสดงข้อผิดพลาดของคำสั่ง: %s\n"
 
-#: src/keybindings.c:2659
+#: src/keybindings.c:2640
 #, c-format
 msgid "No command %d has been defined.\n"
 msgstr "คำสั่ง %d ยังไม่ได้ถูกกำหนด\n"
 
-#: src/keybindings.c:3489
-#, fuzzy
+#: src/keybindings.c:3485
 msgid "No terminal command has been defined.\n"
-msgstr "คำสั่ง %d ยังไม่ได้ถูกกำหนด\n"
-
-#: src/main.c:69
-msgid ""
-"metacity [--sm-disable] [--sm-client-id=ID] [--sm-save-file=FILENAME] [--"
-"display=DISPLAY] [--replace] [--version]\n"
-msgstr ""
-"metacity [--sm-disable] [--sm-client-id=ID] [--sm-save-file=FILENAME] [--"
-"display=DISPLAY] [--replace] [--version]\n"
+msgstr "คำสั่งเปิดเทอร์มินัลยังไม่ได้ถูกกำหนด\n"
 
 # FIXME: Get a lawer to translate the legal clause.
-#: src/main.c:76
+#: src/main.c:69
 #, c-format
 msgid ""
 "metacity %s\n"
@@ -152,18 +139,42 @@ msgstr ""
 "ไม่รับผิดชอบข้อเสียหายใดๆ "
 "ไม่รับประกันความเหมาะสมในเชิงพาณิชย์หรือการใช้งานเฉพาะทางอย่างหนึ่งอย่างใด\n"
 
-#: src/main.c:443
+#: src/main.c:257
+msgid "Disable connection to session manager"
+msgstr "ปิดการเชื่อมต่อไปยังตัวจัดการวาระ"
+
+#: src/main.c:263
+msgid "Replace the running window manager with Metacity"
+msgstr "แทนที่ตัวจัดการหน้าต่างที่กำลังทำงานอยู่ด้วย Metacity"
+
+#: src/main.c:269
+msgid "Specify session management ID"
+msgstr "ระบุ ID ของการจัดการวาระ"
+
+#: src/main.c:274
+msgid "X Display to use"
+msgstr "ดิสเพลย์ X ที่จะใช้"
+
+#: src/main.c:280
+msgid "Initialize session from savefile"
+msgstr "ใช้ค่าเริ่มต้นของวาระจากแฟ้มที่บันทึกไว้"
+
+#: src/main.c:286
+msgid "Print version"
+msgstr "แสดงเลขรุ่น"
+
+#: src/main.c:440
 #, c-format
 msgid "Failed to scan themes directory: %s\n"
 msgstr "ไม่สามารถอ่านโฟลเดอร์ชุดตกแต่ง: %s\n"
 
-#: src/main.c:459
+#: src/main.c:456
 #, c-format
 msgid ""
 "Could not find a theme! Be sure %s exists and contains the usual themes."
 msgstr "ไม่พบชุดตกแต่ง โปรดตรวจดูว่า %s มีอยู่จริง และบรรจุชุดตกแต่งที่ควรจะมี"
 
-#: src/main.c:521
+#: src/main.c:518
 #, c-format
 msgid "Failed to restart: %s\n"
 msgstr "ไม่สามารถเริ่มการทำงานใหม่ของ: %s\n"
@@ -207,12 +218,12 @@ msgstr "ปิ_ด"
 
 #. separator
 #: src/menu.c:66
-msgid "Put on _All Workspaces"
-msgstr "แสดงบนทุก_พื้นที่ทำงาน"
+msgid "_Always on Visible Workspace"
+msgstr "แสดงบนพื้นที่ทำงานเ_สมอ"
 
 #: src/menu.c:67
-msgid "Only on _This Workspace"
-msgstr "บน_พื้นที่ทำงานนี้เท่านั้น"
+msgid "_Only on This Workspace"
+msgstr "แสดงบนพื้นที่ทำงาน_นี้เท่านั้น"
 
 #: src/menu.c:68
 msgid "Move to Workspace _Left"
@@ -230,7 +241,7 @@ msgstr "ย้ายไปพื้นที่ทำงาน_บน"
 msgid "Move to Workspace _Down"
 msgstr "ย้ายไปพื้นที่ทำงาน_ล่าง"
 
-#: src/menu.c:162 src/prefs.c:1942
+#: src/menu.c:162 src/prefs.c:2106
 #, c-format
 msgid "Workspace %d"
 msgstr "พื้นที่ทำงาน %d"
@@ -360,7 +371,7 @@ msgstr "หัวหน้าต่าง"
 msgid "Class"
 msgstr "คลาส"
 
-#: src/metacity-dialog.c:262
+#: src/metacity-dialog.c:263
 msgid ""
 "These windows do not support \"save current setup\" and will have to be "
 "restarted manually next time you log in."
@@ -368,7 +379,7 @@ msgstr ""
 "หน้าต่างเหล่านี้ไม่สนับสนุนการ \"บันทึกค่าตั้งปัจจุบัน\" และคุณต้องเรียกใช้มันใหม่เอง "
 "เมื่อคุณเข้าสู่ระบบครั้งต่อไป"
 
-#: src/metacity-dialog.c:323
+#: src/metacity-dialog.c:328
 #, c-format
 msgid ""
 "There was an error running \"%s\":\n"
@@ -501,11 +512,13 @@ msgid ""
 "\"direct manipulation\", by using wireframes, avoiding animations, or other "
 "means. This is a significant reduction in usability for many users, but may "
 "allow legacy applications and terminal servers to function when they would "
-"otherwise be impractical."
+"otherwise be impractical. However, the wireframe feature is disabled when "
+"accessibility is on to avoid weird desktop breakages."
 msgstr ""
 "ถ้าเป็นจริง metacity จะตอบสนองและให้ความรู้สึกของการ \"ควบคุมโดยตรง\" น้อยลงโดยใช้ "
 "wireframe ใช้ภาพเคลื่อนไหวน้อยลง หรืออะไรก็ตาม ซึ่งอาจดูใช้ยากขึ้นสำหรับผู้ใช้หลายๆ คน "
-"แต่จะช่วยให้โปรแกรมเก่าๆ หรือเทอร์มินัลเก่าๆ ทำงานได้"
+"แต่จะช่วยให้โปรแกรมเก่าๆ หรือเทอร์มินัลเก่าๆ ทำงานได้ อย่างไรก็ดี metacity จะไม่ใช้ "
+"wireframe เมื่อเปิดระบบอำนวยการใช้งาน เพื่อเลี่ยงการพังของเดสก์ท็อป"
 
 #: src/metacity.schemas.in.h:20
 msgid ""
@@ -696,7 +709,7 @@ msgstr "เรียกใช้คำสั่งที่กำหนดไว
 
 #: src/metacity.schemas.in.h:60
 msgid "Run a terminal"
-msgstr ""
+msgstr "เปิดเทอร์มินัล"
 
 #: src/metacity.schemas.in.h:61
 msgid "Show the panel menu"
@@ -1147,7 +1160,6 @@ msgstr ""
 "\"disabled\" ถ้าไม่ต้องการปุ่มลัดสำหรับปฏิบัติการนี้"
 
 #: src/metacity.schemas.in.h:109
-#, fuzzy
 msgid ""
 "The keybinding used to maximize a window. The format looks like \"&lt;"
 "Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;F1\". The parser is fairly "
@@ -1607,7 +1619,6 @@ msgstr ""
 "\"disabled\" ถ้าไม่ต้องการปุ่มลัดสำหรับปฏิบัติการนี้"
 
 #: src/metacity.schemas.in.h:142
-#, fuzzy
 msgid ""
 "The keybinding which invokes a terminal. The format looks like \"&lt;"
 "Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;F1\". The parser is fairly "
@@ -1615,8 +1626,8 @@ msgid ""
 "Ctl&gt;\" and \"&lt;Ctrl&gt;\". If you set the option to the special string "
 "\"disabled\", then there will be no keybinding for this action."
 msgstr ""
-"ปุ่มลัดสำหรับเปิดเมนูหลักของพาเนล  รูปแบบคือ \"&lt;Control&gt;a\" หรือ \"&lt;Shift&gt;"
-"&lt;Alt&gt;F1\"  ตัวอ่านค่าคีย์ไม่สนใจว่าเป็นตัวพิมพ์ใหญ่หรือเล็ก และเข้าใจชื่อย่อ เช่น \"&lt;"
+"ปุ่มลัดสำหรับเปิดเทอร์มินัล  รูปแบบคือ \"&lt;Control&gt;a\" หรือ \"&lt;Shift&gt;&lt;"
+"Alt&gt;F1\"  ตัวอ่านค่าคีย์ไม่สนใจว่าเป็นตัวพิมพ์ใหญ่หรือเล็ก และเข้าใจชื่อย่อ เช่น \"&lt;"
 "Ctl&gt;\" และ \"&lt;Ctrl&gt;\"  คุณสามารถตั้งค่าตัวเลือกเป็น \"disabled\" "
 "ถ้าไม่ต้องการปุ่มลัดสำหรับปฏิบัติการนี้"
 
@@ -1831,41 +1842,41 @@ msgstr "โหมดโฟกัสหน้าต่าง"
 msgid "Window title font"
 msgstr "แบบอักษรหัวหน้าต่าง"
 
-#: src/prefs.c:476 src/prefs.c:492 src/prefs.c:508 src/prefs.c:524
-#: src/prefs.c:540 src/prefs.c:560 src/prefs.c:576 src/prefs.c:592
-#: src/prefs.c:608 src/prefs.c:624 src/prefs.c:640 src/prefs.c:656
-#: src/prefs.c:672 src/prefs.c:689 src/prefs.c:705 src/prefs.c:721
-#: src/prefs.c:737 src/prefs.c:753 src/prefs.c:768 src/prefs.c:783
-#: src/prefs.c:798
+#: src/prefs.c:528 src/prefs.c:544 src/prefs.c:560 src/prefs.c:576
+#: src/prefs.c:592 src/prefs.c:612 src/prefs.c:628 src/prefs.c:644
+#: src/prefs.c:660 src/prefs.c:676 src/prefs.c:692 src/prefs.c:708
+#: src/prefs.c:724 src/prefs.c:741 src/prefs.c:757 src/prefs.c:773
+#: src/prefs.c:789 src/prefs.c:805 src/prefs.c:820 src/prefs.c:835
+#: src/prefs.c:850 src/prefs.c:866 src/prefs.c:882 src/prefs.c:898
 #, c-format
 msgid "GConf key \"%s\" is set to an invalid type\n"
 msgstr "GConf คีย์ \"%s\" ถูกตั้งค่าเป็นชนิดที่ใช้ไม่ได้\n"
 
-#: src/prefs.c:843
+#: src/prefs.c:943
 #, c-format
 msgid ""
 "\"%s\" found in configuration database is not a valid value for mouse button "
 "modifier\n"
 msgstr "\"%s\" ที่พบในฐานข้อมูลข้อปรับแต่ง ใช้เป็นปุ่มใช้ร่วมสำหรับเมาส์ไม่ได้\n"
 
-#: src/prefs.c:867 src/prefs.c:1277
+#: src/prefs.c:967 src/prefs.c:1428
 #, c-format
 msgid "GConf key '%s' is set to an invalid value\n"
 msgstr "GConf คีย์ '%s' ถูกตั้งค่าเป็นค่าที่ใช้ไม่ได้\n"
 
-#: src/prefs.c:994
+#: src/prefs.c:1145
 #, c-format
 msgid "Could not parse font description \"%s\" from GConf key %s\n"
 msgstr "ไม่เข้าใจคำบรรยายแบบตัวอักษร \"%s\" จาก GConf คีย์ %s\n"
 
-#: src/prefs.c:1179
+#: src/prefs.c:1330
 #, c-format
 msgid ""
 "%d stored in GConf key %s is not a reasonable number of workspaces, current "
 "maximum is %d\n"
 msgstr "%d ใน GConf คีย์ %s ไม่ใช่จำนวนพื้นที่ทำงาน ที่สมเหตุสมผล สามารถตั้งได้มากสุดเป็น %d\n"
 
-#: src/prefs.c:1239
+#: src/prefs.c:1390
 msgid ""
 "Workarounds for broken applications disabled. Some applications may not "
 "behave properly.\n"
@@ -1873,24 +1884,24 @@ msgstr ""
 "ปิดการแก้ขัดที่เตรียมไว้สำหรับโปรแกรมเสียๆ บางโปรแกรมแล้ว "
 "ซึ่งอาจทำให้โปรแกรมเหล่านี้ทำงานไม่ปกติ\n"
 
-#: src/prefs.c:1304
+#: src/prefs.c:1455
 #, c-format
 msgid "%d stored in GConf key %s is out of range 0 to %d\n"
 msgstr "%d ใน GConf คีย์ %s ต้องอยู่ระหว่าง 0 และ %d\n"
 
-#: src/prefs.c:1425
+#: src/prefs.c:1589
 #, c-format
 msgid "Error setting number of workspaces to %d: %s\n"
 msgstr "ไม่สามารถตั้งจำนวนพื้นที่ทำงานเป็น %d: %s\n"
 
-#: src/prefs.c:1669
+#: src/prefs.c:1833
 #, c-format
 msgid ""
 "\"%s\" found in configuration database is not a valid value for keybinding "
 "\"%s\"\n"
 msgstr "\"%s\" ที่พบในฐานข้อมูลค่าปรับแต่ง ไม่สามารถใช้เป็นปุ่มลัด \"%s\"\n"
 
-#: src/prefs.c:2023
+#: src/prefs.c:2187
 #, c-format
 msgid "Error setting name for workspace %d to \"%s\": %s\n"
 msgstr "ไม่สามารถตั้งชื่อพื้นที่ทำงาน %d เป็น %s: %s\n"
@@ -1925,7 +1936,7 @@ msgstr "ไม่สามารถอ่านค่าตัวจัดกา
 msgid "Screen %d on display \"%s\" already has a window manager\n"
 msgstr "screen %d บน display \"%s\" มีตัวจัดการหน้าต่างอยู่แล้ว\n"
 
-#: src/screen.c:699
+#: src/screen.c:716
 #, c-format
 msgid "Could not release screen %d on display \"%s\"\n"
 msgstr "ไม่สามารถปล่อยการควบคุม screen %d บน display \"%s\"\n"
@@ -2026,7 +2037,8 @@ msgstr "จำนวนเต็ม %ld ต้องเป็นบวก"
 msgid "Integer %ld is too large, current max is %d"
 msgstr "จำนวนเต็ม %ld ใหญ่เกินไป ตั้งได้สูงสุดเป็น %d"
 
-#: src/theme-parser.c:521 src/theme-parser.c:602 src/theme-parser.c:626
+#: src/theme-parser.c:521 src/theme-parser.c:602
+#: src/theme-parser.c:626
 #, c-format
 msgid "Could not parse \"%s\" as a floating point number"
 msgstr "แปลง \"%s\" เป็นเลขจุดทศนิยมไม่สำเร็จ"
@@ -2056,26 +2068,29 @@ msgstr ""
 "x-large, หรือ xx-large\n"
 
 # 
-#: src/theme-parser.c:729 src/theme-parser.c:737 src/theme-parser.c:2936
-#: src/theme-parser.c:3025 src/theme-parser.c:3032 src/theme-parser.c:3039
+#: src/theme-parser.c:729 src/theme-parser.c:737
+#: src/theme-parser.c:2936 src/theme-parser.c:3025
+#: src/theme-parser.c:3032 src/theme-parser.c:3039
 #, c-format
 msgid "No \"%s\" attribute on element <%s>"
 msgstr "ขาดแอตทริบิวต์ \"%s\" ในอีลีเมนต์ <%s>"
 
-#: src/theme-parser.c:807 src/theme-parser.c:897 src/theme-parser.c:935
-#: src/theme-parser.c:1012 src/theme-parser.c:1062 src/theme-parser.c:1070
+#: src/theme-parser.c:807 src/theme-parser.c:897
+#: src/theme-parser.c:935 src/theme-parser.c:1012
+#: src/theme-parser.c:1062 src/theme-parser.c:1070
 #: src/theme-parser.c:1126 src/theme-parser.c:1134
 #, c-format
 msgid "No \"%s\" attribute on <%s> element"
 msgstr "ขาดแอตทริบิวต์ \"%s\" ในอีลิเมนต์ <%s>"
 
-#: src/theme-parser.c:837 src/theme-parser.c:905 src/theme-parser.c:943
-#: src/theme-parser.c:1020
+#: src/theme-parser.c:837 src/theme-parser.c:905
+#: src/theme-parser.c:943 src/theme-parser.c:1020
 #, c-format
 msgid "<%s> name \"%s\" used a second time"
 msgstr "<%s> ชื่อ \"%s\" ถูกใช้เป็นครั้งที่สอง"
 
-#: src/theme-parser.c:849 src/theme-parser.c:955 src/theme-parser.c:1032
+#: src/theme-parser.c:849 src/theme-parser.c:955
+#: src/theme-parser.c:1032
 #, c-format
 msgid "<%s> parent \"%s\" has not been defined"
 msgstr "<%s>: พาเรนต์ \"%s\" ไม่ได้ระบุ"
@@ -2120,20 +2135,23 @@ msgstr "ไม่รู้จักสถานะ \"%s\" สำหรับไ
 msgid "Theme already has a menu icon for function %s state %s"
 msgstr "ชุดตกแต่งมีไอคอนเมนูสำหรับฟังก์ชัน %s สถานะ %s อยู่แล้ว"
 
-#: src/theme-parser.c:1177 src/theme-parser.c:3244 src/theme-parser.c:3323
+#: src/theme-parser.c:1177 src/theme-parser.c:3244
+#: src/theme-parser.c:3323
 #, c-format
 msgid "No <draw_ops> with the name \"%s\" has been defined"
 msgstr "ยังไม่ได้กำหนด <draw_ops> ชื่อ \"%s\""
 
-#: src/theme-parser.c:1192 src/theme-parser.c:1256 src/theme-parser.c:1545
-#: src/theme-parser.c:3124 src/theme-parser.c:3178 src/theme-parser.c:3338
-#: src/theme-parser.c:3515 src/theme-parser.c:3553 src/theme-parser.c:3591
-#: src/theme-parser.c:3629
+#: src/theme-parser.c:1192 src/theme-parser.c:1256
+#: src/theme-parser.c:1545 src/theme-parser.c:3124
+#: src/theme-parser.c:3178 src/theme-parser.c:3338
+#: src/theme-parser.c:3515 src/theme-parser.c:3553
+#: src/theme-parser.c:3591 src/theme-parser.c:3629
 #, c-format
 msgid "Element <%s> is not allowed below <%s>"
 msgstr "ไม่อนุญาตให้มีอีลิเมนต์ <%s> ภายใน <%s>"
 
-#: src/theme-parser.c:1282 src/theme-parser.c:1369 src/theme-parser.c:1439
+#: src/theme-parser.c:1282 src/theme-parser.c:1369
+#: src/theme-parser.c:1439
 #, c-format
 msgid "No \"name\" attribute on element <%s>"
 msgstr "ขาดแอตทริบิวต์ \"name\" ในอีลิเมนต์ <%s>"
@@ -2143,7 +2161,8 @@ msgstr "ขาดแอตทริบิวต์ \"name\" ในอีลิ
 msgid "No \"value\" attribute on element <%s>"
 msgstr "ขาดแอตทริบิวต์ \"value\" ในอีลิเมนต์ <%s>"
 
-#: src/theme-parser.c:1320 src/theme-parser.c:1334 src/theme-parser.c:1393
+#: src/theme-parser.c:1320 src/theme-parser.c:1334
+#: src/theme-parser.c:1393
 msgid ""
 "Cannot specify both button_width/button_height and aspect ratio for buttons"
 msgstr ""
@@ -2184,8 +2203,9 @@ msgstr "ขาดแอตทริบิวต์ \"right\" ในอีลิ
 msgid "Border \"%s\" is unknown"
 msgstr "ไม่รู้จักเส้นขอบ \"%s\""
 
-#: src/theme-parser.c:1655 src/theme-parser.c:1765 src/theme-parser.c:1868
-#: src/theme-parser.c:2055 src/theme-parser.c:2869
+#: src/theme-parser.c:1655 src/theme-parser.c:1765
+#: src/theme-parser.c:1868 src/theme-parser.c:2055
+#: src/theme-parser.c:2869
 #, c-format
 msgid "No \"color\" attribute on element <%s>"
 msgstr "ขาดแอตทริบิวต์ \"color\" ในอีลิเมนต์<%s>"
@@ -2210,32 +2230,39 @@ msgstr "ขาดแอตทริบิวต์ \"x2\" ในอีลิเ
 msgid "No \"y2\" attribute on element <%s>"
 msgstr "ขาดแอตทริบิวต์ \"y2\" ในอีลิเมนต์<%s>"
 
-#: src/theme-parser.c:1772 src/theme-parser.c:1875 src/theme-parser.c:1981
-#: src/theme-parser.c:2062 src/theme-parser.c:2168 src/theme-parser.c:2266
-#: src/theme-parser.c:2483 src/theme-parser.c:2609 src/theme-parser.c:2707
-#: src/theme-parser.c:2781 src/theme-parser.c:2876
+#: src/theme-parser.c:1772 src/theme-parser.c:1875
+#: src/theme-parser.c:1981 src/theme-parser.c:2062
+#: src/theme-parser.c:2168 src/theme-parser.c:2266
+#: src/theme-parser.c:2483 src/theme-parser.c:2609
+#: src/theme-parser.c:2707 src/theme-parser.c:2781
+#: src/theme-parser.c:2876
 #, c-format
 msgid "No \"x\" attribute on element <%s>"
 msgstr "ขาดแอตทริบิวต์ \"x\" ในอีลิเมนต์<%s>"
 
-#: src/theme-parser.c:1779 src/theme-parser.c:1882 src/theme-parser.c:1988
-#: src/theme-parser.c:2069 src/theme-parser.c:2175 src/theme-parser.c:2273
-#: src/theme-parser.c:2490 src/theme-parser.c:2616 src/theme-parser.c:2788
-#: src/theme-parser.c:2883
+#: src/theme-parser.c:1779 src/theme-parser.c:1882
+#: src/theme-parser.c:1988 src/theme-parser.c:2069
+#: src/theme-parser.c:2175 src/theme-parser.c:2273
+#: src/theme-parser.c:2490 src/theme-parser.c:2616
+#: src/theme-parser.c:2788 src/theme-parser.c:2883
 #, c-format
 msgid "No \"y\" attribute on element <%s>"
 msgstr "ขาดแอตทริบิวต์ \"y\" ในอีลิเมนต์<%s>"
 
-#: src/theme-parser.c:1786 src/theme-parser.c:1889 src/theme-parser.c:1995
-#: src/theme-parser.c:2076 src/theme-parser.c:2182 src/theme-parser.c:2280
-#: src/theme-parser.c:2497 src/theme-parser.c:2623 src/theme-parser.c:2795
+#: src/theme-parser.c:1786 src/theme-parser.c:1889
+#: src/theme-parser.c:1995 src/theme-parser.c:2076
+#: src/theme-parser.c:2182 src/theme-parser.c:2280
+#: src/theme-parser.c:2497 src/theme-parser.c:2623
+#: src/theme-parser.c:2795
 #, c-format
 msgid "No \"width\" attribute on element <%s>"
 msgstr "ขาดแอตทริบิวต์ \"width\" ในอีลิเมนต์<%s>"
 
-#: src/theme-parser.c:1793 src/theme-parser.c:1896 src/theme-parser.c:2002
-#: src/theme-parser.c:2083 src/theme-parser.c:2189 src/theme-parser.c:2287
-#: src/theme-parser.c:2504 src/theme-parser.c:2630 src/theme-parser.c:2802
+#: src/theme-parser.c:1793 src/theme-parser.c:1896
+#: src/theme-parser.c:2002 src/theme-parser.c:2083
+#: src/theme-parser.c:2189 src/theme-parser.c:2287
+#: src/theme-parser.c:2504 src/theme-parser.c:2630
+#: src/theme-parser.c:2802
 #, c-format
 msgid "No \"height\" attribute on element <%s>"
 msgstr "ขาดแอตทริบิวต์ \"height\" ในอีลิเมนต์<%s>"
@@ -2275,7 +2302,8 @@ msgstr "ขาดแอตทริบิวต์ \"filename\" ในอีล
 msgid "Did not understand fill type \"%s\" for <%s> element"
 msgstr "ไม่เข้าใจชนิดการเติม \"%s\" สำหรับอีลิเมนต์ <%s>"
 
-#: src/theme-parser.c:2462 src/theme-parser.c:2595 src/theme-parser.c:2700
+#: src/theme-parser.c:2462 src/theme-parser.c:2595
+#: src/theme-parser.c:2700
 #, c-format
 msgid "No \"state\" attribute on element <%s>"
 msgstr "ขาดแอตทริบิวต์ \"state\" ในอีลิเมนต์ <%s>"
@@ -2290,7 +2318,8 @@ msgstr "ขาดแอตทริบิวต์ \"shadow\" ในอีลิ
 msgid "No \"arrow\" attribute on element <%s>"
 msgstr "ขาดแอตทริบิวต์ \"arrow\" ในอีลิเมนต์ <%s>"
 
-#: src/theme-parser.c:2529 src/theme-parser.c:2651 src/theme-parser.c:2739
+#: src/theme-parser.c:2529 src/theme-parser.c:2651
+#: src/theme-parser.c:2739
 #, c-format
 msgid "Did not understand state \"%s\" for <%s> element"
 msgstr "ไม่เข้าใจค่า state \"%s\" สำหรับอีลิเมนต์ <%s>"
@@ -2407,7 +2436,8 @@ msgstr "ไม่ควรมีแอตทริบิวต์ \"resize\" ใ
 msgid "Style has already been specified for state %s resize %s focus %s"
 msgstr "มีรูปแบบสำหรับ state %s resize %s focus %s กำหนดไว้ก่อนแล้ว"
 
-#: src/theme-parser.c:3475 src/theme-parser.c:3486 src/theme-parser.c:3497
+#: src/theme-parser.c:3475 src/theme-parser.c:3486
+#: src/theme-parser.c:3497
 #, c-format
 msgid "Style has already been specified for state %s focus %s"
 msgstr "มีรูปแบบสำหรับ state %s focus %s กำหนดไว้ก่อนแล้ว"
@@ -2464,7 +2494,8 @@ msgstr "ไม่อนุญาตให้มีอีลิเมนต์·<
 msgid "Element <%s> is not allowed inside a draw operation element"
 msgstr "ไม่อนุญาตให้มีอีลิเมนต์·<%s>·ภายในอีลิเมนต์เกี่ยวกับคำสั่งวาด"
 
-#: src/theme-parser.c:3728 src/theme-parser.c:3758 src/theme-parser.c:3763
+#: src/theme-parser.c:3728 src/theme-parser.c:3758
+#: src/theme-parser.c:3763
 #, c-format
 msgid "Element <%s> is not allowed inside a <%s> element"
 msgstr "ไม่อนุญาตให้มีอีลิเมนต์·<%s>·ภายในอีลิเมนต์·<%s>"
@@ -2747,11 +2778,11 @@ msgstr "ค่า aspect ratio %g ของปุ่มไม่สมเหต
 msgid "Frame geometry does not specify size of buttons"
 msgstr "ค่าเรขาคณิตของเฟรมไม่ได้ระบุขนาดของปุ่ม"
 
-#: src/theme.c:849
+#: src/theme.c:843
 msgid "Gradients should have at least two colors"
 msgstr "การไล่สีควรใช้อย่างน้อยสองสี"
 
-#: src/theme.c:975
+#: src/theme.c:969
 #, c-format
 msgid ""
 "GTK color specification must have the state in brackets, e.g. gtk:fg[NORMAL] "
@@ -2760,7 +2791,7 @@ msgstr ""
 "การกำหนดสี GTK ต้องเขียนสถานะในวงเล็บเหลี่ยม เช่น gtk:fg[NORMAL] เมื่อ NORMAL "
 "เป็นสถานะ; ไม่สามารถแจงค่า \"%s\""
 
-#: src/theme.c:989
+#: src/theme.c:983
 #, c-format
 msgid ""
 "GTK color specification must have a close bracket after the state, e.g. gtk:"
@@ -2769,17 +2800,17 @@ msgstr ""
 "การกำหนดสี·GTK·ต้องมีวงเล็บเหลี่ยมปิดหลังสถานะด้วย·เช่น·gtk:fg[NORMAL]"
 "·เมื่อ·NORMAL·เป็นสถานะ;·ไม่สามารถแจงค่า·\"%s\""
 
-#: src/theme.c:1000
+#: src/theme.c:994
 #, c-format
 msgid "Did not understand state \"%s\" in color specification"
 msgstr "ไม่เข้าใจสถานะ \"%s\" ในการระบุสี"
 
-#: src/theme.c:1013
+#: src/theme.c:1007
 #, c-format
 msgid "Did not understand color component \"%s\" in color specification"
 msgstr "ไม่เข้าใจองค์ประกอบ \"%s\" ในการระบุสี"
 
-#: src/theme.c:1043
+#: src/theme.c:1037
 #, c-format
 msgid ""
 "Blend format is \"blend/bg_color/fg_color/alpha\", \"%s\" does not fit the "
@@ -2787,89 +2818,89 @@ msgid ""
 msgstr ""
 "รูปแบบการเกลี่ยสีคือ \"blend/bg_color/fg_color/alpha\", ค่า \"%s\" ไม่ตรงกับรูปแบบ"
 
-#: src/theme.c:1054
+#: src/theme.c:1048
 #, c-format
 msgid "Could not parse alpha value \"%s\" in blended color"
 msgstr "ไม่สามารถแจงค่าอัลฟา \"%s\" ในการเกลี่ยสี"
 
-#: src/theme.c:1064
+#: src/theme.c:1058
 #, c-format
 msgid "Alpha value \"%s\" in blended color is not between 0.0 and 1.0"
 msgstr "ค่าอัลฟา \"%s\" ในการเกลี่ยสีไม่อยู่ระหว่าง 0.0 และ 1.0"
 
-#: src/theme.c:1111
+#: src/theme.c:1105
 #, c-format
 msgid ""
 "Shade format is \"shade/base_color/factor\", \"%s\" does not fit the format"
 msgstr "รูปแบบของเฉดสีคือ \"shade/base_color/factor \", \"%s\" ไม่ตรงกับรูปแบบ"
 
-#: src/theme.c:1122
+#: src/theme.c:1116
 #, c-format
 msgid "Could not parse shade factor \"%s\" in shaded color"
 msgstr "ไม่สามารถแจงค่าตัวคูณของเฉด \"%s\" ในเฉดสี"
 
-#: src/theme.c:1132
+#: src/theme.c:1126
 #, c-format
 msgid "Shade factor \"%s\" in shaded color is negative"
 msgstr "ตัวคูณเฉดสี \"%s\" ในเฉดสีเป็นค่าลบ"
 
-#: src/theme.c:1161
+#: src/theme.c:1155
 #, c-format
 msgid "Could not parse color \"%s\""
 msgstr "ไม่เข้าใจสี \"%s\""
 
-#: src/theme.c:1423
+#: src/theme.c:1417
 #, c-format
 msgid "Coordinate expression contains character '%s' which is not allowed"
 msgstr "นิพจน์พิกัดมีอักขระ'%s' ซึ่งไม่อนุญาตให้ใช้"
 
-#: src/theme.c:1450
+#: src/theme.c:1444
 #, c-format
 msgid ""
 "Coordinate expression contains floating point number '%s' which could not be "
 "parsed"
 msgstr "นิพจน์พิกัดมีเลขจุดทศนิยม '%s'·ที่แจงค่าไม่ได้"
 
-#: src/theme.c:1464
+#: src/theme.c:1458
 #, c-format
 msgid "Coordinate expression contains integer '%s' which could not be parsed"
 msgstr "นิพจน์พิกัดมีเลขจำนวนเต็ม·'%s' ที่แจงค่าไม่ได้"
 
-#: src/theme.c:1531
+#: src/theme.c:1525
 #, c-format
 msgid ""
 "Coordinate expression contained unknown operator at the start of this text: "
 "\"%s\""
 msgstr "นิพจน์พิกัดมีเครื่องหมายดำเนินการที่ไม่รู้จัก เริ่มจากตำแหน่ง·\"%s\""
 
-#: src/theme.c:1588
+#: src/theme.c:1582
 msgid "Coordinate expression was empty or not understood"
 msgstr "นิพจน์พิกัดว่างเปล่าหรือไม่สามารถเข้าใจ"
 
-#: src/theme.c:1731 src/theme.c:1741 src/theme.c:1775
+#: src/theme.c:1725 src/theme.c:1735 src/theme.c:1769
 msgid "Coordinate expression results in division by zero"
 msgstr "นิพจน์พิกัดมีผลลัพธ์ที่เป็นการหารด้วยศูนย์"
 
-#: src/theme.c:1783
+#: src/theme.c:1777
 msgid ""
 "Coordinate expression tries to use mod operator on a floating-point number"
 msgstr "นิพจน์พิกัดพยายามใช้ตัวดำเนินการ mod กับตัวเลขจุดทศนิยม"
 
-#: src/theme.c:1840
+#: src/theme.c:1834
 #, c-format
 msgid ""
 "Coordinate expression has an operator \"%s\" where an operand was expected"
 msgstr "นิพจน์พิกัดมีตัวดำเนินการ\"%s\" ในที่ที่ควรจะเป็นตัวถูกดำเนินการ"
 
-#: src/theme.c:1849
+#: src/theme.c:1843
 msgid "Coordinate expression had an operand where an operator was expected"
 msgstr "นิพจน์พิกัดมีตัวถูกดำเนินการในที่ที่ควรจะเป็นตัวดำเนินการ"
 
-#: src/theme.c:1857
+#: src/theme.c:1851
 msgid "Coordinate expression ended with an operator instead of an operand"
 msgstr "นิพจน์พิกัดจบด้วยตัวดำเนินการแทนที่จะเป็นตัวถูกดำเนินการ"
 
-#: src/theme.c:1867
+#: src/theme.c:1861
 #, c-format
 msgid ""
 "Coordinate expression has operator \"%c\" following operator \"%c\" with no "
@@ -2877,7 +2908,7 @@ msgid ""
 msgstr ""
 "นิพจน์พิกัดมีตัวดำเนินการ\"%c\" ตามหลังตัวดำเนินการ \"%c\" โดยไม่มีตัวถูกดำเนินการคั่นกลาง"
 
-#: src/theme.c:1986
+#: src/theme.c:1980
 msgid ""
 "Coordinate expression parser overflowed its buffer, this is really a "
 "Metacity bug, but are you sure you need a huge expression like that?"
@@ -2885,29 +2916,29 @@ msgstr ""
 "ตัวแจงค่านิพจน์พิกัดทำข้อมูลล้น ความจริงแล้วนี่ถือเป็นบักของ Metacity "
 "แต่คุณแน่ใจหรือว่าคุณต้องการนิพจน์ที่ใหญ่มหึมาเช่นนี้?"
 
-#: src/theme.c:2015
+#: src/theme.c:2009
 msgid "Coordinate expression had a close parenthesis with no open parenthesis"
 msgstr "นิพจน์พิกัดมีวงเล็บปิดโดยไม่มีวงเล็บเปิด"
 
-#: src/theme.c:2078
+#: src/theme.c:2072
 #, c-format
 msgid "Coordinate expression had unknown variable or constant \"%s\""
 msgstr "นิพจน์พิกัดมีตัวแปรหรือค่าคงที่ \"%s\" ที่ไม่รู้จัก"
 
-#: src/theme.c:2135
+#: src/theme.c:2129
 msgid "Coordinate expression had an open parenthesis with no close parenthesis"
 msgstr "นิพจน์พิกัดมีวงเล็บเปิดโดยไม่มีวงเล็บปิด"
 
-#: src/theme.c:2146
+#: src/theme.c:2140
 msgid "Coordinate expression doesn't seem to have any operators or operands"
 msgstr "นิพจน์พิกัดท่าทางจะไม่มีตัวดำเนินการหรือตัวถูกดำเนินการเลย"
 
-#: src/theme.c:2390 src/theme.c:2412 src/theme.c:2433
+#: src/theme.c:2384 src/theme.c:2406 src/theme.c:2427
 #, c-format
 msgid "Theme contained an expression \"%s\" that resulted in an error: %s\n"
 msgstr "ชุดตกแต่งมีนิพจน์ \"%s\" ซึ่งทำให้เกิดข้อผิดพลาด: %s\n"
 
-#: src/theme.c:3919
+#: src/theme.c:3913
 #, c-format
 msgid ""
 "<button function=\"%s\" state=\"%s\" draw_ops=\"whatever\"/> must be "
@@ -2916,25 +2947,25 @@ msgstr ""
 "ต้องระบุ <button function =\"%s\" state=\"%s\" draw_ops=\"อะไรก็ตามแต่\"/> "
 "สำหรับรูปแบบเฟรมด้วย"
 
-#: src/theme.c:4369 src/theme.c:4401
+#: src/theme.c:4363 src/theme.c:4395
 #, c-format
 msgid ""
 "Missing <frame state=\"%s\" resize=\"%s\" focus=\"%s\" style=\"whatever\"/>"
 msgstr ""
 "ขาด <frame state=\"%s\" resize=\"%s\" focus=\"%s\" style=\"อะไรก็ตามแต่\"/>"
 
-#: src/theme.c:4452
+#: src/theme.c:4446
 #, c-format
 msgid "Failed to load theme \"%s\": %s\n"
 msgstr "โหลดชุดตกแต่ง \"%s\" ล้มเหลว: %s\n"
 
-#: src/theme.c:4598 src/theme.c:4605 src/theme.c:4612 src/theme.c:4619
-#: src/theme.c:4626
+#: src/theme.c:4592 src/theme.c:4599 src/theme.c:4606
+#: src/theme.c:4613 src/theme.c:4620
 #, c-format
 msgid "No <%s> set for theme \"%s\""
 msgstr "ไม่ได้กำหนดค่า <%s> สำหรับชุดตกแต่ง \"%s\""
 
-#: src/theme.c:4636
+#: src/theme.c:4630
 #, c-format
 msgid ""
 "No frame style set for window type \"%s\" in theme \"%s\", add a <window "
@@ -2943,7 +2974,7 @@ msgstr ""
 "ไม่ได้กำหนดรูปแบบเฟรมสำหรับชนิดหน้าต่าง \"%s\" ในชุดตกแต่ง \"%s\", กรุณาเพิ่มอีลิเมนต์ "
 "<window type=\"%s\" style_set=\"อะไรก็ตามแต่\"/>"
 
-#: src/theme.c:4658
+#: src/theme.c:4652
 #, c-format
 msgid ""
 "<menu_icon function=\"%s\" state=\"%s\" draw_ops=\"whatever\"/> must be "
@@ -2952,13 +2983,13 @@ msgstr ""
 "ต้องระบุ <menu_icon function=\"%s\" state=\"%s\" draw_ops=\"อะไรก็ตามแต่\"/> "
 "สำหรับชุดตกแต่งนี้"
 
-#: src/theme.c:5047 src/theme.c:5109
+#: src/theme.c:5041 src/theme.c:5103
 #, c-format
 msgid ""
 "User-defined constants must begin with a capital letter; \"%s\" does not"
 msgstr "ค่าคงที่ที่ผู้ใช้กำหนดเองต้องเริ่มต้นด้วยอักษรตัวใหญ่; แต่ \"%s\" ไม่ได้เป็นตามนั้น"
 
-#: src/theme.c:5055 src/theme.c:5117
+#: src/theme.c:5049 src/theme.c:5111
 #, c-format
 msgid "Constant \"%s\" has already been defined"
 msgstr "ค่าคงที่ \"%s\" ถูกกำหนดไว้แล้ว"
@@ -3000,12 +3031,14 @@ msgid "Application set a bogus _NET_WM_PID %ld\n"
 msgstr "โปรแกรมประยุกต์ตั้งค่า _NET_WM_PID เป็น %ld ซึ่งไม่มีอยู่จริง\n"
 
 #. first time through
-#: src/window.c:4829
+#: src/window.c:5197
 #, c-format
 msgid ""
 "Window %s sets SM_CLIENT_ID on itself, instead of on the WM_CLIENT_LEADER "
 "window as specified in the ICCCM.\n"
 msgstr ""
+"หน้าต่าง %s ตั้งค่า SM_CLIENT_ID มาที่ตัวเอง แทนที่จะอ้างไปถึงหน้าต่างของ WM_CLIENT_LEADER "
+"ตามที่กำหนดไว้ใน ICCCM\n"
 
 #. We ignore mwm_has_resize_func because WM_NORMAL_HINTS is the
 #. * authoritative source for that info. Some apps such as mplayer or
@@ -3014,12 +3047,14 @@ msgstr ""
 #. * MWM but not WM_NORMAL_HINTS are basically broken. We complain
 #. * about these apps but make them work.
 #.
-#: src/window.c:5500
+#: src/window.c:5868
 #, c-format
 msgid ""
 "Window %s sets an MWM hint indicating it isn't resizable, but sets min size %"
 "d x %d and max size %d x %d; this doesn't make much sense.\n"
 msgstr ""
+"หน้าต่าง %s ตั้งค่า MWM hint ไว้ว่าเป็นหน้าต่างที่เปลี่ยนขนาดไม่ได้ แต่กลับตั้งค่าขนาดต่ำสุด %d x %"
+"d และขนาดสูงสุด %d x %d ไว้ ซึ่งไม่สมเหตุสมผลเท่าไรนัก\n"
 
 #: src/xprops.c:153
 #, c-format
@@ -3048,6 +3083,16 @@ msgid ""
 msgstr ""
 "คุณสมบัติ %s ของหน้าต่าง 0x%lx มีค่าที่ไม่ใช่ UTF-8 ที่ถูกต้องสำหรับหัวข้อที่ %d ในรายการ\n"
 
+#~ msgid ""
+#~ "metacity [--sm-disable] [--sm-client-id=ID] [--sm-save-file=FILENAME] [--"
+#~ "display=DISPLAY] [--replace] [--version]\n"
+#~ msgstr ""
+#~ "metacity [--sm-disable] [--sm-client-id=ID] [--sm-save-file=FILENAME] [--"
+#~ "display=DISPLAY] [--replace] [--version]\n"
+
+#~ msgid "Put on _All Workspaces"
+#~ msgstr "แสดงบนทุก_พื้นที่ทำงาน"
+
 #~ msgid "Select how to give focus to windows"
 #~ msgstr "เลือกวิธีโฟกัสหน้าต่าง"
 

po/tk.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: metacity VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-09 21:23-0700\n"
+"POT-Creation-Date: 2005-06-27 17:21-0600\n"
 "PO-Revision-Date: 2004-08-13 03:30+0330\n"
 "Last-Translator: Gurban Mühemmet Tewekgeli <gmtavakkoli@yahoo.com>\n"
 "Language-Team: Turkmen <kakilikgroup@yahoo.com>\n"
@@ -58,7 +58,7 @@ msgstr ""
 msgid "Failed to get hostname: %s\n"
 msgstr ""
 
-#: src/display.c:306
+#: src/display.c:316
 #, c-format
 msgid "Failed to open X Window System display '%s'\n"
 msgstr ""
@@ -76,23 +76,23 @@ msgstr ""
 msgid "Fatal IO error %d (%s) on display '%s'.\n"
 msgstr ""
 
-#: src/frames.c:1020
+#: src/frames.c:1125
 msgid "Close Window"
 msgstr "Äpişgäni Bagla"
 
-#: src/frames.c:1023
+#: src/frames.c:1128
 msgid "Window Menu"
 msgstr "Äpişge Menüsi"
 
-#: src/frames.c:1026
+#: src/frames.c:1131
 msgid "Minimize Window"
 msgstr "Äpişgäni Kiçelt"
 
-#: src/frames.c:1029
+#: src/frames.c:1134
 msgid "Maximize Window"
 msgstr "Äpişgäni Ulalt"
 
-#: src/frames.c:1032
+#: src/frames.c:1137
 msgid "Unmaximize Window"
 msgstr "Äpişgäniň Ulylykny Gaýtar"
 
@@ -103,17 +103,17 @@ msgid ""
 "binding\n"
 msgstr ""
 
-#: src/keybindings.c:2554
+#: src/keybindings.c:2535
 #, c-format
 msgid "Error launching metacity-dialog to print an error about a command: %s\n"
 msgstr ""
 
-#: src/keybindings.c:2659
+#: src/keybindings.c:2640
 #, c-format
 msgid "No command %d has been defined.\n"
 msgstr ""
 
-#: src/keybindings.c:3489
+#: src/keybindings.c:3485
 msgid "No terminal command has been defined.\n"
 msgstr ""
 
@@ -188,11 +188,11 @@ msgstr "_Bagla"
 
 #. separator
 #: src/menu.c:66
-msgid "Put on _All Workspaces"
+msgid "_Always on Visible Workspace"
 msgstr ""
 
 #: src/menu.c:67
-msgid "Only on _This Workspace"
+msgid "_Only on This Workspace"
 msgstr ""
 
 #: src/menu.c:68
@@ -211,7 +211,7 @@ msgstr ""
 msgid "Move to Workspace _Down"
 msgstr ""
 
-#: src/menu.c:162 src/prefs.c:1942
+#: src/menu.c:162 src/prefs.c:1996
 #, c-format
 msgid "Workspace %d"
 msgstr ""
@@ -341,13 +341,13 @@ msgstr ""
 msgid "Class"
 msgstr ""
 
-#: src/metacity-dialog.c:262
+#: src/metacity-dialog.c:263
 msgid ""
 "These windows do not support \"save current setup\" and will have to be "
 "restarted manually next time you log in."
 msgstr ""
 
-#: src/metacity-dialog.c:323
+#: src/metacity-dialog.c:328
 #, c-format
 msgid ""
 "There was an error running \"%s\":\n"
@@ -459,7 +459,8 @@ msgid ""
 "\"direct manipulation\", by using wireframes, avoiding animations, or other "
 "means. This is a significant reduction in usability for many users, but may "
 "allow legacy applications and terminal servers to function when they would "
-"otherwise be impractical."
+"otherwise be impractical. However, the wireframe feature is disabled when "
+"accessibility is on to avoid weird desktop breakages."
 msgstr ""
 
 #: src/metacity.schemas.in.h:20
@@ -1465,64 +1466,64 @@ msgstr ""
 msgid "Window title font"
 msgstr ""
 
-#: src/prefs.c:476 src/prefs.c:492 src/prefs.c:508 src/prefs.c:524
-#: src/prefs.c:540 src/prefs.c:560 src/prefs.c:576 src/prefs.c:592
-#: src/prefs.c:608 src/prefs.c:624 src/prefs.c:640 src/prefs.c:656
-#: src/prefs.c:672 src/prefs.c:689 src/prefs.c:705 src/prefs.c:721
-#: src/prefs.c:737 src/prefs.c:753 src/prefs.c:768 src/prefs.c:783
-#: src/prefs.c:798
+#: src/prefs.c:501 src/prefs.c:517 src/prefs.c:533 src/prefs.c:549
+#: src/prefs.c:565 src/prefs.c:585 src/prefs.c:601 src/prefs.c:617
+#: src/prefs.c:633 src/prefs.c:649 src/prefs.c:665 src/prefs.c:681
+#: src/prefs.c:697 src/prefs.c:714 src/prefs.c:730 src/prefs.c:746
+#: src/prefs.c:762 src/prefs.c:778 src/prefs.c:793 src/prefs.c:808
+#: src/prefs.c:823 src/prefs.c:839
 #, c-format
 msgid "GConf key \"%s\" is set to an invalid type\n"
 msgstr ""
 
-#: src/prefs.c:843
+#: src/prefs.c:884
 #, c-format
 msgid ""
 "\"%s\" found in configuration database is not a valid value for mouse button "
 "modifier\n"
 msgstr ""
 
-#: src/prefs.c:867 src/prefs.c:1277
+#: src/prefs.c:908 src/prefs.c:1318
 #, c-format
 msgid "GConf key '%s' is set to an invalid value\n"
 msgstr ""
 
-#: src/prefs.c:994
+#: src/prefs.c:1035
 #, c-format
 msgid "Could not parse font description \"%s\" from GConf key %s\n"
 msgstr ""
 
-#: src/prefs.c:1179
+#: src/prefs.c:1220
 #, c-format
 msgid ""
 "%d stored in GConf key %s is not a reasonable number of workspaces, current "
 "maximum is %d\n"
 msgstr ""
 
-#: src/prefs.c:1239
+#: src/prefs.c:1280
 msgid ""
 "Workarounds for broken applications disabled. Some applications may not "
 "behave properly.\n"
 msgstr ""
 
-#: src/prefs.c:1304
+#: src/prefs.c:1345
 #, c-format
 msgid "%d stored in GConf key %s is out of range 0 to %d\n"
 msgstr ""
 
-#: src/prefs.c:1425
+#: src/prefs.c:1479
 #, c-format
 msgid "Error setting number of workspaces to %d: %s\n"
 msgstr ""
 
-#: src/prefs.c:1669
+#: src/prefs.c:1723
 #, c-format
 msgid ""
 "\"%s\" found in configuration database is not a valid value for keybinding "
 "\"%s\"\n"
 msgstr ""
 
-#: src/prefs.c:2023
+#: src/prefs.c:2077
 #, c-format
 msgid "Error setting name for workspace %d to \"%s\": %s\n"
 msgstr ""
@@ -1555,7 +1556,7 @@ msgstr ""
 msgid "Screen %d on display \"%s\" already has a window manager\n"
 msgstr ""
 
-#: src/screen.c:699
+#: src/screen.c:716
 #, c-format
 msgid "Could not release screen %d on display \"%s\"\n"
 msgstr ""
@@ -2601,7 +2602,7 @@ msgid "Application set a bogus _NET_WM_PID %ld\n"
 msgstr ""
 
 #. first time through
-#: src/window.c:4829
+#: src/window.c:5197
 #, c-format
 msgid ""
 "Window %s sets SM_CLIENT_ID on itself, instead of on the WM_CLIENT_LEADER "
@@ -2615,7 +2616,7 @@ msgstr ""
 #. * MWM but not WM_NORMAL_HINTS are basically broken. We complain
 #. * about these apps but make them work.
 #.
-#: src/window.c:5500
+#: src/window.c:5868
 #, c-format
 msgid ""
 "Window %s sets an MWM hint indicating it isn't resizable, but sets min size %"

po/tr.po

@@ -2,19 +2,20 @@
 # Copyright (C) 2003 Free Software Foundation.
 # This file is distributed under the same license as the metacity package.
 # Sinan İmamoğlu <sinan@myrealbox.com>, 2003.
-# Baris Cicek <baris@teamforce.name.tr>, 2004.
+# Baris Cicek <baris@teamforce.name.tr>, 2004, 2005.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: metacity\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-09 21:23-0700\n"
-"PO-Revision-Date: 2004-09-03 22:39+0300\n"
+"POT-Creation-Date: 2005-06-27 17:21-0600\n"
+"PO-Revision-Date: 2005-03-13 03:34+0200\n"
 "Last-Translator: Baris Cicek <baris@teamforce.name.tr>\n"
 "Language-Team: Turkish <gnome-turk@gnome.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.9.1\n"
 
 #: src/tools/metacity-message.c:150
 #, c-format
@@ -60,7 +61,7 @@ msgstr ""
 msgid "Failed to get hostname: %s\n"
 msgstr "Makine adı alınamadı: %s\n"
 
-#: src/display.c:306
+#: src/display.c:316
 #, c-format
 msgid "Failed to open X Window System display '%s'\n"
 msgstr "X Pencere Sistemi '%s' ekranı açılamadı\n"
@@ -81,23 +82,23 @@ msgstr ""
 msgid "Fatal IO error %d (%s) on display '%s'.\n"
 msgstr "Ölümcül G/Ç hatası %d (%s); '%s' ekranında.\n"
 
-#: src/frames.c:1020
+#: src/frames.c:1125
 msgid "Close Window"
 msgstr "Pencereyi Kapat"
 
-#: src/frames.c:1023
+#: src/frames.c:1128
 msgid "Window Menu"
 msgstr "Pencere Menüsü"
 
-#: src/frames.c:1026
+#: src/frames.c:1131
 msgid "Minimize Window"
 msgstr "Pencereyi Küçült"
 
-#: src/frames.c:1029
+#: src/frames.c:1134
 msgid "Maximize Window"
 msgstr "Pencereyi Büyült"
 
-#: src/frames.c:1032
+#: src/frames.c:1137
 msgid "Unmaximize Window"
 msgstr "Pencereyi Büyültmeyi Geri Al"
 
@@ -110,22 +111,21 @@ msgstr ""
 "%s tuşu %x değiştiricileriyle birlikte başka bir uygulama tarafından tuş "
 "bağıolarak kullanılıyor\n"
 
-#: src/keybindings.c:2554
+#: src/keybindings.c:2535
 #, c-format
 msgid "Error launching metacity-dialog to print an error about a command: %s\n"
 msgstr ""
 "Bir komutla ilgili hatayı göstermek için metacity-dialog başlatılırken hata: "
 "%s\n"
 
-#: src/keybindings.c:2659
+#: src/keybindings.c:2640
 #, c-format
 msgid "No command %d has been defined.\n"
 msgstr "%d komutu tanımlanmamış.\n"
 
-#: src/keybindings.c:3489
-#, fuzzy
+#: src/keybindings.c:3485
 msgid "No terminal command has been defined.\n"
-msgstr "%d komutu tanımlanmamış.\n"
+msgstr "Hiçbir termina komutu tanımlanmamış.\n"
 
 #: src/main.c:69
 msgid ""
@@ -206,11 +206,11 @@ msgstr "_Kapat"
 
 #. separator
 #: src/menu.c:66
-msgid "Put on _All Workspaces"
-msgstr "Tüm Çalışma _Alanlarına Yerleştir"
+msgid "_Always on Visible Workspace"
+msgstr "Her _Zaman Görünen Çalışma Alanında"
 
 #: src/menu.c:67
-msgid "Only on _This Workspace"
+msgid "_Only on This Workspace"
 msgstr "Yalnız _Bu Çalışma Alanında"
 
 #: src/menu.c:68
@@ -229,7 +229,7 @@ msgstr "_Yukarıdaki Çalışma Alanına Taşı"
 msgid "Move to Workspace _Down"
 msgstr "_Aşağıdaki Çalışma Alanına Taşı"
 
-#: src/menu.c:162 src/prefs.c:1942
+#: src/menu.c:162 src/prefs.c:1996
 #, c-format
 msgid "Workspace %d"
 msgstr "Çalışma Alanı %d"
@@ -361,7 +361,7 @@ msgstr "Başlık"
 msgid "Class"
 msgstr "Sınıf"
 
-#: src/metacity-dialog.c:262
+#: src/metacity-dialog.c:263
 msgid ""
 "These windows do not support \"save current setup\" and will have to be "
 "restarted manually next time you log in."
@@ -369,7 +369,7 @@ msgstr ""
 "Bu pencereler, \"geçerli durumu kaydet\" özelliğini desteklemiyorlar ve bir "
 "dahaki girişte kendiniz yeniden başlatmalısınız."
 
-#: src/metacity-dialog.c:323
+#: src/metacity-dialog.c:328
 #, c-format
 msgid ""
 "There was an error running \"%s\":\n"
@@ -509,13 +509,14 @@ msgid ""
 "\"direct manipulation\", by using wireframes, avoiding animations, or other "
 "means. This is a significant reduction in usability for many users, but may "
 "allow legacy applications and terminal servers to function when they would "
-"otherwise be impractical."
+"otherwise be impractical. However, the wireframe feature is disabled when "
+"accessibility is on to avoid weird desktop breakages."
 msgstr ""
 "Eğer seçiliyse, metacity tel çerçeveleri kullanarak, canlandırma "
 "kullanmayarak ve diğer şekillerde, kullanıcıya daha az geri bildirim verip "
 "daha az \"doğrudan işlem\"e imkan verir. Bu bir çok kullanıcı için "
 "kullanılabilirlikte belirgin biz azalmaya neden olur, ancak aksi halde "
-"kullanışsız olacak terminal sunucuları ve diğer eskiuygulamalar için "
+"kullanışsız olacak terminal sunucuları ve diğer eski uygulamalar için "
 "işleyebilirlik sağlayabilir."
 
 #: src/metacity.schemas.in.h:20
@@ -706,7 +707,7 @@ msgstr "Tanımlanmış bir komutu çalıştır"
 
 #: src/metacity.schemas.in.h:60
 msgid "Run a terminal"
-msgstr ""
+msgstr "Bir terminal çalıştır"
 
 #: src/metacity.schemas.in.h:61
 msgid "Show the panel menu"
@@ -1192,7 +1193,6 @@ msgstr ""
 "tuş bağı yapılmamış olur."
 
 #: src/metacity.schemas.in.h:109
-#, fuzzy
 msgid ""
 "The keybinding used to maximize a window. The format looks like \"&lt;"
 "Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;F1\". The parser is fairly "
@@ -1693,7 +1693,6 @@ msgstr ""
 "yapılmamış olur."
 
 #: src/metacity.schemas.in.h:142
-#, fuzzy
 msgid ""
 "The keybinding which invokes a terminal. The format looks like \"&lt;"
 "Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;F1\". The parser is fairly "
@@ -1934,17 +1933,17 @@ msgstr "Pencere odaklama kipi"
 msgid "Window title font"
 msgstr "Pencere başlığı yazıtipi"
 
-#: src/prefs.c:476 src/prefs.c:492 src/prefs.c:508 src/prefs.c:524
-#: src/prefs.c:540 src/prefs.c:560 src/prefs.c:576 src/prefs.c:592
-#: src/prefs.c:608 src/prefs.c:624 src/prefs.c:640 src/prefs.c:656
-#: src/prefs.c:672 src/prefs.c:689 src/prefs.c:705 src/prefs.c:721
-#: src/prefs.c:737 src/prefs.c:753 src/prefs.c:768 src/prefs.c:783
-#: src/prefs.c:798
+#: src/prefs.c:501 src/prefs.c:517 src/prefs.c:533 src/prefs.c:549
+#: src/prefs.c:565 src/prefs.c:585 src/prefs.c:601 src/prefs.c:617
+#: src/prefs.c:633 src/prefs.c:649 src/prefs.c:665 src/prefs.c:681
+#: src/prefs.c:697 src/prefs.c:714 src/prefs.c:730 src/prefs.c:746
+#: src/prefs.c:762 src/prefs.c:778 src/prefs.c:793 src/prefs.c:808
+#: src/prefs.c:823 src/prefs.c:839
 #, c-format
 msgid "GConf key \"%s\" is set to an invalid type\n"
 msgstr "\"%s\" GConf anahtarına geçersiz bir tür atanmış\n"
 
-#: src/prefs.c:843
+#: src/prefs.c:884
 #, c-format
 msgid ""
 "\"%s\" found in configuration database is not a valid value for mouse button "
@@ -1953,17 +1952,17 @@ msgstr ""
 "Yapılandırma veritabanında bulunan \"%s\", fare düğme düzenleyicisi olarak "
 "geçerli bir değer değil\n"
 
-#: src/prefs.c:867 src/prefs.c:1277
+#: src/prefs.c:908 src/prefs.c:1318
 #, c-format
 msgid "GConf key '%s' is set to an invalid value\n"
 msgstr "'%s' GConf anahtarına geçersiz bir değer atanmış\n"
 
-#: src/prefs.c:994
+#: src/prefs.c:1035
 #, c-format
 msgid "Could not parse font description \"%s\" from GConf key %s\n"
 msgstr "\"%s\" yazıtipi tanımlaması %s GConf anahtarından ayrıştırılamadı\n"
 
-#: src/prefs.c:1179
+#: src/prefs.c:1220
 #, c-format
 msgid ""
 "%d stored in GConf key %s is not a reasonable number of workspaces, current "
@@ -1972,7 +1971,7 @@ msgstr ""
 "%2$s GConf anahtarında saklı %1$d değeri geçerli bir çalışma alanı sayısı "
 "değil; şu anki üst sınır: %3$d\n"
 
-#: src/prefs.c:1239
+#: src/prefs.c:1280
 msgid ""
 "Workarounds for broken applications disabled. Some applications may not "
 "behave properly.\n"
@@ -1980,18 +1979,18 @@ msgstr ""
 "Hatalı uygulamalara yönelik çözümler devre dışı. Bazı uygulamalar düzgün "
 "işlemeyebilir.\n"
 
-#: src/prefs.c:1304
+#: src/prefs.c:1345
 #, c-format
 msgid "%d stored in GConf key %s is out of range 0 to %d\n"
 msgstr ""
 "%2$s GConf anahtarında saklı %1$d değeri 0 ile %3$d aralığının dışında\n"
 
-#: src/prefs.c:1425
+#: src/prefs.c:1479
 #, c-format
 msgid "Error setting number of workspaces to %d: %s\n"
 msgstr "Çalışma alanı sayısının %d yapılmasında hata: %s\n"
 
-#: src/prefs.c:1669
+#: src/prefs.c:1723
 #, c-format
 msgid ""
 "\"%s\" found in configuration database is not a valid value for keybinding "
@@ -2000,7 +1999,7 @@ msgstr ""
 "Yapılandırma veritabanında bulunan \"%s\", \"%s\" tuş bağı olarak geçerli "
 "bir değer değil\n"
 
-#: src/prefs.c:2023
+#: src/prefs.c:2077
 #, c-format
 msgid "Error setting name for workspace %d to \"%s\": %s\n"
 msgstr "%d çalışma alanının adının \"%s\" yapılmasında hata: %s\n"
@@ -2039,7 +2038,7 @@ msgid "Screen %d on display \"%s\" already has a window manager\n"
 msgstr ""
 "\"%2$s\" X oturumundaki ekran %1$d bir pencere yöneticisine zaten sahip\n"
 
-#: src/screen.c:699
+#: src/screen.c:716
 #, c-format
 msgid "Could not release screen %d on display \"%s\"\n"
 msgstr "\"%2$s\" X oturumundaki ekran %1$d serberst bırakılamadı\"\n"
@@ -3140,7 +3139,7 @@ msgid "Application set a bogus _NET_WM_PID %ld\n"
 msgstr "Uygulama _NET_WM_PID'e geçersiz %ld değerini atadı\n"
 
 #. first time through
-#: src/window.c:4829
+#: src/window.c:5197
 #, c-format
 msgid ""
 "Window %s sets SM_CLIENT_ID on itself, instead of on the WM_CLIENT_LEADER "
@@ -3156,7 +3155,7 @@ msgstr ""
 #. * MWM but not WM_NORMAL_HINTS are basically broken. We complain
 #. * about these apps but make them work.
 #.
-#: src/window.c:5500
+#: src/window.c:5868
 #, c-format
 msgid ""
 "Window %s sets an MWM hint indicating it isn't resizable, but sets min size %"
@@ -3193,24 +3192,3 @@ msgid ""
 msgstr ""
 "0x%2$lx penceresinin %1$s özelliği listedeki öğe %3$d için geçersiz UTF-8 "
 "içeriyor\n"
-
-#~ msgid "Select how to give focus to windows"
-#~ msgstr "Pencerelere nasıl odaklanacağını seçin"
-
-#~ msgid "Window Focus"
-#~ msgstr "Pencere Odaklanması"
-
-#~ msgid "Clic_k to give focus"
-#~ msgstr "Odaklamak için _tıklayın"
-
-#~ msgid "Focus behavior:"
-#~ msgstr "Odaklanma işleyişi:"
-
-#~ msgid "Window Focus Preferences"
-#~ msgstr "Pencere Odaklanma Tercihleri"
-
-#~ msgid "_Point to give focus"
-#~ msgstr "_Göstererek odakla"
-
-#~ msgid "_Raise window on focus"
-#~ msgstr "Odaklanan pencereyi _yükselt"

po/uk.po

@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: metacity\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-09 21:23-0700\n"
-"PO-Revision-Date: 2003-02-05 03:08--500\n"
+"POT-Creation-Date: 2005-06-27 17:21-0600\n"
+"PO-Revision-Date: 2005-02-15 03:08--500\n"
 "Last-Translator: Maxim Dziumanenko <mvd@mylinux.com.ua>\n"
 "Language-Team: Ukrainian <uk@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -57,7 +57,7 @@ msgstr "Помилка при відкриванні діалогу закрит
 msgid "Failed to get hostname: %s\n"
 msgstr "Збій при отриманні назви комп'ютера: %s\n"
 
-#: src/display.c:306
+#: src/display.c:316
 #, c-format
 msgid "Failed to open X Window System display '%s'\n"
 msgstr "Не вдається відкрити дисплей X Window System \"%s\"\n"
@@ -78,23 +78,23 @@ msgstr ""
 msgid "Fatal IO error %d (%s) on display '%s'.\n"
 msgstr "Фатальна помилка вводу-виводу %d (%s) на дисплеї \"%s\".\n"
 
-#: src/frames.c:1020
+#: src/frames.c:1125
 msgid "Close Window"
 msgstr "Закрити вікно"
 
-#: src/frames.c:1023
+#: src/frames.c:1128
 msgid "Window Menu"
 msgstr "Меню вікна"
 
-#: src/frames.c:1026
+#: src/frames.c:1131
 msgid "Minimize Window"
 msgstr "Мінімізувати вікно"
 
-#: src/frames.c:1029
+#: src/frames.c:1134
 msgid "Maximize Window"
 msgstr "Максимізувати вікно"
 
-#: src/frames.c:1032
+#: src/frames.c:1137
 msgid "Unmaximize Window"
 msgstr "Демаксимізувати вікно"
 
@@ -107,22 +107,21 @@ msgstr ""
 "Якась програма вже використовує клавішу %s з модифікатором %x в якості "
 "прив'язки\n"
 
-#: src/keybindings.c:2554
+#: src/keybindings.c:2535
 #, c-format
 msgid "Error launching metacity-dialog to print an error about a command: %s\n"
 msgstr ""
 "Помилка при відкриванні діалогу виводу повідомлення про помилку у команді: %"
 "s\n"
 
-#: src/keybindings.c:2659
+#: src/keybindings.c:2640
 #, c-format
 msgid "No command %d has been defined.\n"
 msgstr "Команду %d не визначено.\n"
 
-#: src/keybindings.c:3489
-#, fuzzy
+#: src/keybindings.c:3485
 msgid "No terminal command has been defined.\n"
-msgstr "Команду %d не визначено.\n"
+msgstr "Команду терміналу не визначено.\n"
 
 #: src/main.c:69
 msgid ""
@@ -205,12 +204,12 @@ msgstr "_Закрити"
 
 #. separator
 #: src/menu.c:66
-msgid "Put on _All Workspaces"
-msgstr "Помістити на _всі робочі області"
+msgid "_Always on Visible Workspace"
+msgstr "_Завжди на видимій робочій області"
 
 #: src/menu.c:67
-msgid "Only on _This Workspace"
-msgstr "Лише на _цій робочій області"
+msgid "_Only on This Workspace"
+msgstr "_Лише на цій робочій області"
 
 #: src/menu.c:68
 msgid "Move to Workspace _Left"
@@ -228,7 +227,7 @@ msgstr "Перемістити у робочу область в_верху"
 msgid "Move to Workspace _Down"
 msgstr "Перемістити у робочу область в_низу"
 
-#: src/menu.c:162 src/prefs.c:1942
+#: src/menu.c:162 src/prefs.c:1996
 #, c-format
 msgid "Workspace %d"
 msgstr "Робоча область %d"
@@ -359,7 +358,7 @@ msgstr "Заголовок"
 msgid "Class"
 msgstr "Клас"
 
-#: src/metacity-dialog.c:262
+#: src/metacity-dialog.c:263
 msgid ""
 "These windows do not support \"save current setup\" and will have to be "
 "restarted manually next time you log in."
@@ -367,7 +366,7 @@ msgstr ""
 "Ці вікна не підтримують \"збереження поточних параметрів\", при наступному "
 "входженні їх треба запустити власноруч."
 
-#: src/metacity-dialog.c:323
+#: src/metacity-dialog.c:328
 #, c-format
 msgid ""
 "There was an error running \"%s\":\n"
@@ -505,13 +504,14 @@ msgid ""
 "\"direct manipulation\", by using wireframes, avoiding animations, or other "
 "means. This is a significant reduction in usability for many users, but may "
 "allow legacy applications and terminal servers to function when they would "
-"otherwise be impractical."
+"otherwise be impractical. However, the wireframe feature is disabled when "
+"accessibility is on to avoid weird desktop breakages."
 msgstr ""
-"Якщо встановлено, то \"Метасіті\" зменшує об'єм виводу і можливість прямої "
-"маніпуляції для користувача, використанням контурних рамок, уникненням "
-"анімації та іншими шляхами. Це суттєве зменшення зручності у використанні "
-"для багатьох користувачів, але може дозволити старим програмам і "
-"термінальним серверам функціонувати, продовжуючи час їхньої служби."
+"Якщо встановлено, то \"Метасіті\" надає користувачу менший відклик та менше "
+"відчуття \"безпосереднього керування\" за рахунок контурних рамок, "
+"відключення анімації та іншими шляхами. Це суттєве зменшення зручності у "
+"використанні для багатьох користувачів, але може дозволити старим програмам "
+"і термінальним серверам функціонувати, продовжуючи час їхньої служби."
 
 #: src/metacity.schemas.in.h:20
 msgid ""
@@ -704,7 +704,7 @@ msgstr "Запустити зазначену команду"
 
 #: src/metacity.schemas.in.h:60
 msgid "Run a terminal"
-msgstr ""
+msgstr "Запустити термінал"
 
 #: src/metacity.schemas.in.h:61
 msgid "Show the panel menu"
@@ -874,7 +874,7 @@ msgid ""
 msgstr ""
 "Комбінація клавіш для запуску команд з відповідним номером у ключі  /apps/"
 "metacity/keybinding_commands Використовується формат \"&lt;Control&gt;a\" "
-"або \"&lt;Shift&gt;&lt;Alt&gt;F1\". Аналізатор достатньо гнучкий та дозволяє "
+"або \"&lt;Shift&gt;&lt;Alt&gt;F1\". Аналізатор досить гнучкий та дозволяє "
 "використання верхнього та нижнього регістру та скорочень, наприклад \"&lt;"
 "Ctl&gt;\" та \"&lt;Ctrl&gt;\". Якщо цей параметр встановити у спеціальне "
 "значення \"disabled\", то для цієї дії не буде призначено комбінації клавіш."
@@ -890,10 +890,10 @@ msgid ""
 msgstr ""
 "Комбінація клавіш, що перемикає на робочу область розташовану вище поточної. "
 "Використовується формат \"&lt;Control&gt;a\" або \"&lt;Shift&gt;&lt;Alt&gt;F1"
-"\". Аналізатор достатньо гнучкий та дозволяє використання верхнього та "
-"нижнього регістру та скорочень, наприклад \"&lt;Ctl&gt;\" та \"&lt;Ctrl&gt;"
-"\". Якщо цей параметр встановити у спеціальне значення \"disabled\", то для "
-"цієї дії не буде призначено комбінації клавіш."
+"\". Аналізатор досить гнучкий та дозволяє використання верхнього та нижнього "
+"регістру та скорочень, наприклад \"&lt;Ctl&gt;\" та \"&lt;Ctrl&gt;\". Якщо "
+"цей параметр встановити у спеціальне значення \"disabled\", то для цієї дії "
+"не буде призначено комбінації клавіш."
 
 #: src/metacity.schemas.in.h:89
 msgid ""
@@ -906,7 +906,7 @@ msgid ""
 msgstr ""
 "Комбінація клавіш, що перемикає на робочу область розташовану нижче "
 "поточної. Використовується формат \"&lt;Control&gt;a\" або \"&lt;Shift&gt;"
-"&lt;Alt&gt;F1\". Аналізатор достатньо гнучкий та дозволяє використання "
+"&lt;Alt&gt;F1\". Аналізатор досить гнучкий та дозволяє використання "
 "верхнього та нижнього регістру та скорочень, наприклад \"&lt;Ctl&gt;\" та "
 "\"&lt;Ctrl&gt;\". Якщо цей параметр встановити у спеціальне значення "
 "\"disabled\", то для цієї дії не буде призначено комбінації клавіш."
@@ -922,7 +922,7 @@ msgid ""
 msgstr ""
 "Комбінація клавіш, що перемикає на робочу область розташовану ліворуч "
 "поточної. Використовується формат \"&lt;Control&gt;a\" або \"&lt;Shift&gt;"
-"&lt;Alt&gt;F1\". Аналізатор достатньо гнучкий та дозволяє використання "
+"&lt;Alt&gt;F1\". Аналізатор досить гнучкий та дозволяє використання "
 "верхнього та нижнього регістру та скорочень, наприклад \"&lt;Ctl&gt;\" та "
 "\"&lt;Ctrl&gt;\". Якщо цей параметр встановити у спеціальне значення "
 "\"disabled\", то для цієї дії не буде призначено комбінації клавіш."
@@ -938,7 +938,7 @@ msgid ""
 msgstr ""
 "Комбінація клавіш, що перемикає на робочу область розташовану праворуч "
 "поточної. Використовується формат \"&lt;Control&gt;a\" або \"&lt;Shift&gt;"
-"&lt;Alt&gt;F1\". Аналізатор достатньо гнучкий та дозволяє використання "
+"&lt;Alt&gt;F1\". Аналізатор досить гнучкий та дозволяє використання "
 "верхнього та нижнього регістру та скорочень, наприклад \"&lt;Ctl&gt;\" та "
 "\"&lt;Ctrl&gt;\". Якщо цей параметр встановити у спеціальне значення "
 "\"disabled\", то для цієї дії не буде призначено комбінації клавіш."
@@ -953,10 +953,10 @@ msgid ""
 msgstr ""
 "Комбінація клавіш, що перемикає на робочу область з номером 1. "
 "Використовується формат \"&lt;Control&gt;a\" або \"&lt;Shift&gt;&lt;Alt&gt;F1"
-"\". Аналізатор достатньо гнучкий та дозволяє використання верхнього та "
-"нижнього регістру та скорочень, наприклад \"&lt;Ctl&gt;\" та \"&lt;Ctrl&gt;"
-"\". Якщо цей параметр встановити у спеціальне значення \"disabled\", то для "
-"цієї дії не буде призначено комбінації клавіш."
+"\". Аналізатор досить гнучкий та дозволяє використання верхнього та нижнього "
+"регістру та скорочень, наприклад \"&lt;Ctl&gt;\" та \"&lt;Ctrl&gt;\". Якщо "
+"цей параметр встановити у спеціальне значення \"disabled\", то для цієї дії "
+"не буде призначено комбінації клавіш."
 
 #: src/metacity.schemas.in.h:93
 msgid ""
@@ -968,10 +968,10 @@ msgid ""
 msgstr ""
 "Комбінація клавіш, що перемикає на робочу область з номером 10. "
 "Використовується формат \"&lt;Control&gt;a\" або \"&lt;Shift&gt;&lt;Alt&gt;F1"
-"\". Аналізатор достатньо гнучкий та дозволяє використання верхнього та "
-"нижнього регістру та скорочень, наприклад \"&lt;Ctl&gt;\" та \"&lt;Ctrl&gt;"
-"\". Якщо цей параметр встановити у спеціальне значення \"disabled\", то для "
-"цієї дії не буде призначено комбінації клавіш."
+"\". Аналізатор досить гнучкий та дозволяє використання верхнього та нижнього "
+"регістру та скорочень, наприклад \"&lt;Ctl&gt;\" та \"&lt;Ctrl&gt;\". Якщо "
+"цей параметр встановити у спеціальне значення \"disabled\", то для цієї дії "
+"не буде призначено комбінації клавіш."
 
 #: src/metacity.schemas.in.h:94
 msgid ""
@@ -983,10 +983,10 @@ msgid ""
 msgstr ""
 "Комбінація клавіш, що перемикає на робочу область з номером 11. "
 "Використовується формат \"&lt;Control&gt;a\" або \"&lt;Shift&gt;&lt;Alt&gt;F1"
-"\". Аналізатор достатньо гнучкий та дозволяє використання верхнього та "
-"нижнього регістру та скорочень, наприклад \"&lt;Ctl&gt;\" та \"&lt;Ctrl&gt;"
-"\". Якщо цей параметр встановити у спеціальне значення \"disabled\", то для "
-"цієї дії не буде призначено комбінації клавіш."
+"\". Аналізатор досить гнучкий та дозволяє використання верхнього та нижнього "
+"регістру та скорочень, наприклад \"&lt;Ctl&gt;\" та \"&lt;Ctrl&gt;\". Якщо "
+"цей параметр встановити у спеціальне значення \"disabled\", то для цієї дії "
+"не буде призначено комбінації клавіш."
 
 #: src/metacity.schemas.in.h:95
 msgid ""
@@ -998,10 +998,10 @@ msgid ""
 msgstr ""
 "Комбінація клавіш, що перемикає на робочу область з номером 12. "
 "Використовується формат \"&lt;Control&gt;a\" або \"&lt;Shift&gt;&lt;Alt&gt;F1"
-"\". Аналізатор достатньо гнучкий та дозволяє використання верхнього та "
-"нижнього регістру та скорочень, наприклад \"&lt;Ctl&gt;\" та \"&lt;Ctrl&gt;"
-"\". Якщо цей параметр встановити у спеціальне значення \"disabled\", то для "
-"цієї дії не буде призначено комбінації клавіш."
+"\". Аналізатор досить гнучкий та дозволяє використання верхнього та нижнього "
+"регістру та скорочень, наприклад \"&lt;Ctl&gt;\" та \"&lt;Ctrl&gt;\". Якщо "
+"цей параметр встановити у спеціальне значення \"disabled\", то для цієї дії "
+"не буде призначено комбінації клавіш."
 
 #: src/metacity.schemas.in.h:96
 msgid ""
@@ -1013,10 +1013,10 @@ msgid ""
 msgstr ""
 "Комбінація клавіш, що перемикає на робочу область з номером 2. "
 "Використовується формат \"&lt;Control&gt;a\" або \"&lt;Shift&gt;&lt;Alt&gt;F1"
-"\". Аналізатор достатньо гнучкий та дозволяє використання верхнього та "
-"нижнього регістру та скорочень, наприклад \"&lt;Ctl&gt;\" та \"&lt;Ctrl&gt;"
-"\". Якщо цей параметр встановити у спеціальне значення \"disabled\", то для "
-"цієї дії не буде призначено комбінації клавіш."
+"\". Аналізатор досить гнучкий та дозволяє використання верхнього та нижнього "
+"регістру та скорочень, наприклад \"&lt;Ctl&gt;\" та \"&lt;Ctrl&gt;\". Якщо "
+"цей параметр встановити у спеціальне значення \"disabled\", то для цієї дії "
+"не буде призначено комбінації клавіш."
 
 #: src/metacity.schemas.in.h:97
 msgid ""
@@ -1028,10 +1028,10 @@ msgid ""
 msgstr ""
 "Комбінація клавіш, що перемикає на робочу область з номером 3. "
 "Використовується формат \"&lt;Control&gt;a\" або \"&lt;Shift&gt;&lt;Alt&gt;F1"
-"\". Аналізатор достатньо гнучкий та дозволяє використання верхнього та "
-"нижнього регістру та скорочень, наприклад \"&lt;Ctl&gt;\" та \"&lt;Ctrl&gt;"
-"\". Якщо цей параметр встановити у спеціальне значення \"disabled\", то для "
-"цієї дії не буде призначено комбінації клавіш."
+"\". Аналізатор досить гнучкий та дозволяє використання верхнього та нижнього "
+"регістру та скорочень, наприклад \"&lt;Ctl&gt;\" та \"&lt;Ctrl&gt;\". Якщо "
+"цей параметр встановити у спеціальне значення \"disabled\", то для цієї дії "
+"не буде призначено комбінації клавіш."
 
 #: src/metacity.schemas.in.h:98
 msgid ""
@@ -1043,10 +1043,10 @@ msgid ""
 msgstr ""
 "Комбінація клавіш, що перемикає на робочу область з номером 4. "
 "Використовується формат \"&lt;Control&gt;a\" або \"&lt;Shift&gt;&lt;Alt&gt;F1"
-"\". Аналізатор достатньо гнучкий та дозволяє використання верхнього та "
-"нижнього регістру та скорочень, наприклад \"&lt;Ctl&gt;\" та \"&lt;Ctrl&gt;"
-"\". Якщо цей параметр встановити у спеціальне значення \"disabled\", то для "
-"цієї дії не буде призначено комбінації клавіш."
+"\". Аналізатор досить гнучкий та дозволяє використання верхнього та нижнього "
+"регістру та скорочень, наприклад \"&lt;Ctl&gt;\" та \"&lt;Ctrl&gt;\". Якщо "
+"цей параметр встановити у спеціальне значення \"disabled\", то для цієї дії "
+"не буде призначено комбінації клавіш."
 
 #: src/metacity.schemas.in.h:99
 msgid ""
@@ -1058,10 +1058,10 @@ msgid ""
 msgstr ""
 "Комбінація клавіш, що перемикає на робочу область з номером 5. "
 "Використовується формат \"&lt;Control&gt;a\" або \"&lt;Shift&gt;&lt;Alt&gt;F1"
-"\". Аналізатор достатньо гнучкий та дозволяє використання верхнього та "
-"нижнього регістру та скорочень, наприклад \"&lt;Ctl&gt;\" та \"&lt;Ctrl&gt;"
-"\". Якщо цей параметр встановити у спеціальне значення \"disabled\", то для "
-"цієї дії не буде призначено комбінації клавіш."
+"\". Аналізатор досить гнучкий та дозволяє використання верхнього та нижнього "
+"регістру та скорочень, наприклад \"&lt;Ctl&gt;\" та \"&lt;Ctrl&gt;\". Якщо "
+"цей параметр встановити у спеціальне значення \"disabled\", то для цієї дії "
+"не буде призначено комбінації клавіш."
 
 #: src/metacity.schemas.in.h:100
 msgid ""
@@ -1073,10 +1073,10 @@ msgid ""
 msgstr ""
 "Комбінація клавіш, що перемикає на робочу область з номером 6. "
 "Використовується формат \"&lt;Control&gt;a\" або \"&lt;Shift&gt;&lt;Alt&gt;F1"
-"\". Аналізатор достатньо гнучкий та дозволяє використання верхнього та "
-"нижнього регістру та скорочень, наприклад \"&lt;Ctl&gt;\" та \"&lt;Ctrl&gt;"
-"\". Якщо цей параметр встановити у спеціальне значення \"disabled\", то для "
-"цієї дії не буде призначено комбінації клавіш."
+"\". Аналізатор досить гнучкий та дозволяє використання верхнього та нижнього "
+"регістру та скорочень, наприклад \"&lt;Ctl&gt;\" та \"&lt;Ctrl&gt;\". Якщо "
+"цей параметр встановити у спеціальне значення \"disabled\", то для цієї дії "
+"не буде призначено комбінації клавіш."
 
 #: src/metacity.schemas.in.h:101
 msgid ""
@@ -1088,10 +1088,10 @@ msgid ""
 msgstr ""
 "Комбінація клавіш, що перемикає на робочу область з номером 7. "
 "Використовується формат \"&lt;Control&gt;a\" або \"&lt;Shift&gt;&lt;Alt&gt;F1"
-"\". Аналізатор достатньо гнучкий та дозволяє використання верхнього та "
-"нижнього регістру та скорочень, наприклад \"&lt;Ctl&gt;\" та \"&lt;Ctrl&gt;"
-"\". Якщо цей параметр встановити у спеціальне значення \"disabled\", то для "
-"цієї дії не буде призначено комбінації клавіш."
+"\". Аналізатор досить гнучкий та дозволяє використання верхнього та нижнього "
+"регістру та скорочень, наприклад \"&lt;Ctl&gt;\" та \"&lt;Ctrl&gt;\". Якщо "
+"цей параметр встановити у спеціальне значення \"disabled\", то для цієї дії "
+"не буде призначено комбінації клавіш."
 
 #: src/metacity.schemas.in.h:102
 msgid ""
@@ -1103,10 +1103,10 @@ msgid ""
 msgstr ""
 "Комбінація клавіш, що перемикає на робочу область з номером 8. "
 "Використовується формат \"&lt;Control&gt;a\" або \"&lt;Shift&gt;&lt;Alt&gt;F1"
-"\". Аналізатор достатньо гнучкий та дозволяє використання верхнього та "
-"нижнього регістру та скорочень, наприклад \"&lt;Ctl&gt;\" та \"&lt;Ctrl&gt;"
-"\". Якщо цей параметр встановити у спеціальне значення \"disabled\", то для "
-"цієї дії не буде призначено комбінації клавіш."
+"\". Аналізатор досить гнучкий та дозволяє використання верхнього та нижнього "
+"регістру та скорочень, наприклад \"&lt;Ctl&gt;\" та \"&lt;Ctrl&gt;\". Якщо "
+"цей параметр встановити у спеціальне значення \"disabled\", то для цієї дії "
+"не буде призначено комбінації клавіш."
 
 #: src/metacity.schemas.in.h:103
 msgid ""
@@ -1118,10 +1118,10 @@ msgid ""
 msgstr ""
 "Комбінація клавіш, що перемикає на робочу область з номером 9. "
 "Використовується формат \"&lt;Control&gt;a\" або \"&lt;Shift&gt;&lt;Alt&gt;F1"
-"\". Аналізатор достатньо гнучкий та дозволяє використання верхнього та "
-"нижнього регістру та скорочень, наприклад \"&lt;Ctl&gt;\" та \"&lt;Ctrl&gt;"
-"\". Якщо цей параметр встановити у спеціальне значення \"disabled\", то для "
-"цієї дії не буде призначено комбінації клавіш."
+"\". Аналізатор досить гнучкий та дозволяє використання верхнього та нижнього "
+"регістру та скорочень, наприклад \"&lt;Ctl&gt;\" та \"&lt;Ctrl&gt;\". Якщо "
+"цей параметр встановити у спеціальне значення \"disabled\", то для цієї дії "
+"не буде призначено комбінації клавіш."
 
 #: src/metacity.schemas.in.h:104
 msgid ""
@@ -1147,7 +1147,7 @@ msgid ""
 "\"disabled\", then there will be no keybinding for this action."
 msgstr ""
 "Комбінація клавіш закривання вікна. Використовується формат \"&lt;Control&gt;"
-"a\" або \"&lt;Shift&gt;&lt;Alt&gt;F1\". Аналізатор достатньо гнучкий та "
+"a\" або \"&lt;Shift&gt;&lt;Alt&gt;F1\". Аналізатор досить гнучкий та "
 "дозволяє використання верхнього та нижнього регістру та скорочень, наприклад "
 "\"&lt;Ctl&gt;\" та \"&lt;Ctrl&gt;\". Якщо цей параметр встановити у "
 "спеціальне значення \"disabled\", то для цієї дії не буде призначено "
@@ -1164,7 +1164,7 @@ msgid ""
 msgstr ""
 "Комбінація клавіш переходу у режим \"переміщення\", у цьому режимі вікно "
 "переміщується клавішами клавіатури. Використовується формат \"&lt;Control&gt;"
-"a\" або \"&lt;Shift&gt;&lt;Alt&gt;F1\". Аналізатор достатньо гнучкий та "
+"a\" або \"&lt;Shift&gt;&lt;Alt&gt;F1\". Аналізатор досить гнучкий та "
 "дозволяє використання верхнього та нижнього регістру та скорочень, наприклад "
 "\"&lt;Ctl&gt;\" та \"&lt;Ctrl&gt;\". Якщо цей параметр встановити у "
 "спеціальне значення \"disabled\", то для цієї дії не буде призначено "
@@ -1198,13 +1198,12 @@ msgid ""
 msgstr ""
 "Комбінація клавіш приховування всіх звичайних вікон та передачі фокусу вводу "
 "стільниці. Використовується формат \"&lt;Control&gt;a\" або \"&lt;Shift&gt;"
-"&lt;Alt&gt;F1\". Аналізатор достатньо гнучкий та дозволяє використання "
+"&lt;Alt&gt;F1\". Аналізатор досить гнучкий та дозволяє використання "
 "верхнього та нижнього регістру та скорочень, наприклад \"&lt;Ctl&gt;\" та "
 "\"&lt;Ctrl&gt;\". Якщо цей параметр встановити у спеціальне значення "
 "\"disabled\", то для цієї дії не буде призначено комбінації клавіш."
 
 #: src/metacity.schemas.in.h:109
-#, fuzzy
 msgid ""
 "The keybinding used to maximize a window. The format looks like \"&lt;"
 "Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;F1\". The parser is fairly "
@@ -1245,7 +1244,7 @@ msgid ""
 msgstr ""
 "Комбінація клавіш переміщення вікна до робочої області розташованої під "
 "поточною. Використовується формат \"&lt;Control&gt;a\" або \"&lt;Shift&gt;"
-"&lt;Alt&gt;F1\". Аналізатор достатньо гнучкий та дозволяє використання "
+"&lt;Alt&gt;F1\". Аналізатор досить гнучкий та дозволяє використання "
 "верхнього та нижнього регістру та скорочень, наприклад \"&lt;Ctl&gt;\" та "
 "\"&lt;Ctrl&gt;\". Якщо цей параметр встановити у спеціальне значення "
 "\"disabled\", то для цієї дії не буде призначено комбінації клавіш."
@@ -1261,7 +1260,7 @@ msgid ""
 msgstr ""
 "Комбінація клавіш переміщення вікна до робочої області розташованої ліворуч "
 "поточної. Використовується формат \"&lt;Control&gt;a\" або \"&lt;Shift&gt;"
-"&lt;Alt&gt;F1\". Аналізатор достатньо гнучкий та дозволяє використання "
+"&lt;Alt&gt;F1\". Аналізатор досить гнучкий та дозволяє використання "
 "верхнього та нижнього регістру та скорочень, наприклад \"&lt;Ctl&gt;\" та "
 "\"&lt;Ctrl&gt;\". Якщо цей параметр встановити у спеціальне значення "
 "\"disabled\", то для цієї дії не буде призначено комбінації клавіш."
@@ -1277,7 +1276,7 @@ msgid ""
 msgstr ""
 "Комбінація клавіш переміщення вікна до робочої області розташованої праворуч "
 "поточної. Використовується формат \"&lt;Control&gt;a\" або \"&lt;Shift&gt;"
-"&lt;Alt&gt;F1\". Аналізатор достатньо гнучкий та дозволяє використання "
+"&lt;Alt&gt;F1\". Аналізатор досить гнучкий та дозволяє використання "
 "верхнього та нижнього регістру та скорочень, наприклад \"&lt;Ctl&gt;\" та "
 "\"&lt;Ctrl&gt;\". Якщо цей параметр встановити у спеціальне значення "
 "\"disabled\", то для цієї дії не буде призначено комбінації клавіш."
@@ -1292,7 +1291,7 @@ msgid ""
 msgstr ""
 "Комбінація клавіш переміщення вікна до робочої області розташованої над "
 "поточною. Використовується формат \"&lt;Control&gt;a\" або \"&lt;Shift&gt;"
-"&lt;Alt&gt;F1\". Аналізатор достатньо гнучкий та дозволяє використання "
+"&lt;Alt&gt;F1\". Аналізатор досить гнучкий та дозволяє використання "
 "верхнього та нижнього регістру та скорочень, наприклад \"&lt;Ctl&gt;\" та "
 "\"&lt;Ctrl&gt;\". Якщо цей параметр встановити у спеціальне значення "
 "\"disabled\", то для цієї дії не буде призначено комбінації клавіш."
@@ -1307,10 +1306,10 @@ msgid ""
 msgstr ""
 "Комбінація клавіш переміщення вікна до робочої області з номером 1. "
 "Використовується формат \"&lt;Control&gt;a\" або \"&lt;Shift&gt;&lt;Alt&gt;F1"
-"\". Аналізатор достатньо гнучкий та дозволяє використання верхнього та "
-"нижнього регістру та скорочень, наприклад \"&lt;Ctl&gt;\" та \"&lt;Ctrl&gt;"
-"\". Якщо цей параметр встановити у спеціальне значення \"disabled\", то для "
-"цієї дії не буде призначено комбінації клавіш."
+"\". Аналізатор досить гнучкий та дозволяє використання верхнього та нижнього "
+"регістру та скорочень, наприклад \"&lt;Ctl&gt;\" та \"&lt;Ctrl&gt;\". Якщо "
+"цей параметр встановити у спеціальне значення \"disabled\", то для цієї дії "
+"не буде призначено комбінації клавіш."
 
 #: src/metacity.schemas.in.h:116
 msgid ""
@@ -1322,10 +1321,10 @@ msgid ""
 msgstr ""
 "Комбінація клавіш переміщення вікна до робочої області з номером 10. "
 "Використовується формат \"&lt;Control&gt;a\" або \"&lt;Shift&gt;&lt;Alt&gt;F1"
-"\". Аналізатор достатньо гнучкий та дозволяє використання верхнього та "
-"нижнього регістру та скорочень, наприклад \"&lt;Ctl&gt;\" та \"&lt;Ctrl&gt;"
-"\". Якщо цей параметр встановити у спеціальне значення \"disabled\", то для "
-"цієї дії не буде призначено комбінації клавіш."
+"\". Аналізатор досить гнучкий та дозволяє використання верхнього та нижнього "
+"регістру та скорочень, наприклад \"&lt;Ctl&gt;\" та \"&lt;Ctrl&gt;\". Якщо "
+"цей параметр встановити у спеціальне значення \"disabled\", то для цієї дії "
+"не буде призначено комбінації клавіш."
 
 #: src/metacity.schemas.in.h:117
 msgid ""
@@ -1337,10 +1336,10 @@ msgid ""
 msgstr ""
 "Комбінація клавіш переміщення вікна до робочої області з номером 11. "
 "Використовується формат \"&lt;Control&gt;a\" або \"&lt;Shift&gt;&lt;Alt&gt;F1"
-"\". Аналізатор достатньо гнучкий та дозволяє використання верхнього та "
-"нижнього регістру та скорочень, наприклад \"&lt;Ctl&gt;\" та \"&lt;Ctrl&gt;"
-"\". Якщо цей параметр встановити у спеціальне значення \"disabled\", то для "
-"цієї дії не буде призначено комбінації клавіш."
+"\". Аналізатор досить гнучкий та дозволяє використання верхнього та нижнього "
+"регістру та скорочень, наприклад \"&lt;Ctl&gt;\" та \"&lt;Ctrl&gt;\". Якщо "
+"цей параметр встановити у спеціальне значення \"disabled\", то для цієї дії "
+"не буде призначено комбінації клавіш."
 
 #: src/metacity.schemas.in.h:118
 msgid ""
@@ -1352,10 +1351,10 @@ msgid ""
 msgstr ""
 "Комбінація клавіш переміщення вікна до робочої області з номером 12. "
 "Використовується формат \"&lt;Control&gt;a\" або \"&lt;Shift&gt;&lt;Alt&gt;F1"
-"\". Аналізатор достатньо гнучкий та дозволяє використання верхнього та "
-"нижнього регістру та скорочень, наприклад \"&lt;Ctl&gt;\" та \"&lt;Ctrl&gt;"
-"\". Якщо цей параметр встановити у спеціальне значення \"disabled\", то для "
-"цієї дії не буде призначено комбінації клавіш."
+"\". Аналізатор досить гнучкий та дозволяє використання верхнього та нижнього "
+"регістру та скорочень, наприклад \"&lt;Ctl&gt;\" та \"&lt;Ctrl&gt;\". Якщо "
+"цей параметр встановити у спеціальне значення \"disabled\", то для цієї дії "
+"не буде призначено комбінації клавіш."
 
 #: src/metacity.schemas.in.h:119
 msgid ""
@@ -1367,10 +1366,10 @@ msgid ""
 msgstr ""
 "Комбінація клавіш переміщення вікна до робочої області з номером 2. "
 "Використовується формат \"&lt;Control&gt;a\" або \"&lt;Shift&gt;&lt;Alt&gt;F1"
-"\". Аналізатор достатньо гнучкий та дозволяє використання верхнього та "
-"нижнього регістру та скорочень, наприклад \"&lt;Ctl&gt;\" та \"&lt;Ctrl&gt;"
-"\". Якщо цей параметр встановити у спеціальне значення \"disabled\", то для "
-"цієї дії не буде призначено комбінації клавіш."
+"\". Аналізатор досить гнучкий та дозволяє використання верхнього та нижнього "
+"регістру та скорочень, наприклад \"&lt;Ctl&gt;\" та \"&lt;Ctrl&gt;\". Якщо "
+"цей параметр встановити у спеціальне значення \"disabled\", то для цієї дії "
+"не буде призначено комбінації клавіш."
 
 #: src/metacity.schemas.in.h:120
 msgid ""
@@ -1382,10 +1381,10 @@ msgid ""
 msgstr ""
 "Комбінація клавіш переміщення вікна до робочої області з номером 3. "
 "Використовується формат \"&lt;Control&gt;a\" або \"&lt;Shift&gt;&lt;Alt&gt;F1"
-"\". Аналізатор достатньо гнучкий та дозволяє використання верхнього та "
-"нижнього регістру та скорочень, наприклад \"&lt;Ctl&gt;\" та \"&lt;Ctrl&gt;"
-"\". Якщо цей параметр встановити у спеціальне значення \"disabled\", то для "
-"цієї дії не буде призначено комбінації клавіш."
+"\". Аналізатор досить гнучкий та дозволяє використання верхнього та нижнього "
+"регістру та скорочень, наприклад \"&lt;Ctl&gt;\" та \"&lt;Ctrl&gt;\". Якщо "
+"цей параметр встановити у спеціальне значення \"disabled\", то для цієї дії "
+"не буде призначено комбінації клавіш."
 
 #: src/metacity.schemas.in.h:121
 msgid ""
@@ -1397,10 +1396,10 @@ msgid ""
 msgstr ""
 "Комбінація клавіш переміщення вікна до робочої області з номером 4. "
 "Використовується формат \"&lt;Control&gt;a\" або \"&lt;Shift&gt;&lt;Alt&gt;F1"
-"\". Аналізатор достатньо гнучкий та дозволяє використання верхнього та "
-"нижнього регістру та скорочень, наприклад \"&lt;Ctl&gt;\" та \"&lt;Ctrl&gt;"
-"\". Якщо цей параметр встановити у спеціальне значення \"disabled\", то для "
-"цієї дії не буде призначено комбінації клавіш."
+"\". Аналізатор досить гнучкий та дозволяє використання верхнього та нижнього "
+"регістру та скорочень, наприклад \"&lt;Ctl&gt;\" та \"&lt;Ctrl&gt;\". Якщо "
+"цей параметр встановити у спеціальне значення \"disabled\", то для цієї дії "
+"не буде призначено комбінації клавіш."
 
 #: src/metacity.schemas.in.h:122
 msgid ""
@@ -1412,10 +1411,10 @@ msgid ""
 msgstr ""
 "Комбінація клавіш переміщення вікна до робочої області з номером 5. "
 "Використовується формат \"&lt;Control&gt;a\" або \"&lt;Shift&gt;&lt;Alt&gt;F1"
-"\". Аналізатор достатньо гнучкий та дозволяє використання верхнього та "
-"нижнього регістру та скорочень, наприклад \"&lt;Ctl&gt;\" та \"&lt;Ctrl&gt;"
-"\". Якщо цей параметр встановити у спеціальне значення \"disabled\", то для "
-"цієї дії не буде призначено комбінації клавіш."
+"\". Аналізатор досить гнучкий та дозволяє використання верхнього та нижнього "
+"регістру та скорочень, наприклад \"&lt;Ctl&gt;\" та \"&lt;Ctrl&gt;\". Якщо "
+"цей параметр встановити у спеціальне значення \"disabled\", то для цієї дії "
+"не буде призначено комбінації клавіш."
 
 #: src/metacity.schemas.in.h:123
 msgid ""
@@ -1427,10 +1426,10 @@ msgid ""
 msgstr ""
 "Комбінація клавіш переміщення вікна до робочої області з номером 6. "
 "Використовується формат \"&lt;Control&gt;a\" або \"&lt;Shift&gt;&lt;Alt&gt;F1"
-"\". Аналізатор достатньо гнучкий та дозволяє використання верхнього та "
-"нижнього регістру та скорочень, наприклад \"&lt;Ctl&gt;\" та \"&lt;Ctrl&gt;"
-"\". Якщо цей параметр встановити у спеціальне значення \"disabled\", то для "
-"цієї дії не буде призначено комбінації клавіш."
+"\". Аналізатор досить гнучкий та дозволяє використання верхнього та нижнього "
+"регістру та скорочень, наприклад \"&lt;Ctl&gt;\" та \"&lt;Ctrl&gt;\". Якщо "
+"цей параметр встановити у спеціальне значення \"disabled\", то для цієї дії "
+"не буде призначено комбінації клавіш."
 
 #: src/metacity.schemas.in.h:124
 msgid ""
@@ -1442,10 +1441,10 @@ msgid ""
 msgstr ""
 "Комбінація клавіш переміщення вікна до робочої області з номером 7. "
 "Використовується формат \"&lt;Control&gt;a\" або \"&lt;Shift&gt;&lt;Alt&gt;F1"
-"\". Аналізатор достатньо гнучкий та дозволяє використання верхнього та "
-"нижнього регістру та скорочень, наприклад \"&lt;Ctl&gt;\" та \"&lt;Ctrl&gt;"
-"\". Якщо цей параметр встановити у спеціальне значення \"disabled\", то для "
-"цієї дії не буде призначено комбінації клавіш."
+"\". Аналізатор досить гнучкий та дозволяє використання верхнього та нижнього "
+"регістру та скорочень, наприклад \"&lt;Ctl&gt;\" та \"&lt;Ctrl&gt;\". Якщо "
+"цей параметр встановити у спеціальне значення \"disabled\", то для цієї дії "
+"не буде призначено комбінації клавіш."
 
 #: src/metacity.schemas.in.h:125
 msgid ""
@@ -1457,10 +1456,10 @@ msgid ""
 msgstr ""
 "Комбінація клавіш переміщення вікна до робочої області з номером 8. "
 "Використовується формат \"&lt;Control&gt;a\" або \"&lt;Shift&gt;&lt;Alt&gt;F1"
-"\". Аналізатор достатньо гнучкий та дозволяє використання верхнього та "
-"нижнього регістру та скорочень, наприклад \"&lt;Ctl&gt;\" та \"&lt;Ctrl&gt;"
-"\". Якщо цей параметр встановити у спеціальне значення \"disabled\", то для "
-"цієї дії не буде призначено комбінації клавіш."
+"\". Аналізатор досить гнучкий та дозволяє використання верхнього та нижнього "
+"регістру та скорочень, наприклад \"&lt;Ctl&gt;\" та \"&lt;Ctrl&gt;\". Якщо "
+"цей параметр встановити у спеціальне значення \"disabled\", то для цієї дії "
+"не буде призначено комбінації клавіш."
 
 #: src/metacity.schemas.in.h:126
 msgid ""
@@ -1472,10 +1471,10 @@ msgid ""
 msgstr ""
 "Комбінація клавіш переміщення вікна до робочої області з номером 9. "
 "Використовується формат \"&lt;Control&gt;a\" або \"&lt;Shift&gt;&lt;Alt&gt;F1"
-"\". Аналізатор достатньо гнучкий та дозволяє використання верхнього та "
-"нижнього регістру та скорочень, наприклад \"&lt;Ctl&gt;\" та \"&lt;Ctrl&gt;"
-"\". Якщо цей параметр встановити у спеціальне значення \"disabled\", то для "
-"цієї дії не буде призначено комбінації клавіш."
+"\". Аналізатор досить гнучкий та дозволяє використання верхнього та нижнього "
+"регістру та скорочень, наприклад \"&lt;Ctl&gt;\" та \"&lt;Ctrl&gt;\". Якщо "
+"цей параметр встановити у спеціальне значення \"disabled\", то для цієї дії "
+"не буде призначено комбінації клавіш."
 
 #: src/metacity.schemas.in.h:127
 msgid ""
@@ -1488,7 +1487,7 @@ msgid ""
 msgstr ""
 "Комбінація клавіш передачі фокусу вводу у зворотному напрямку між панелями "
 "та стільницею з появою меню. Використовується формат \"&lt;Control&gt;a\" "
-"або \"&lt;Shift&gt;&lt;Alt&gt;F1\". Аналізатор достатньо гнучкий та дозволяє "
+"або \"&lt;Shift&gt;&lt;Alt&gt;F1\". Аналізатор досить гнучкий та дозволяє "
 "використання верхнього та нижнього регістру та скорочень, наприклад \"&lt;"
 "Ctl&gt;\" та \"&lt;Ctrl&gt;\". Якщо цей параметр встановити у спеціальне "
 "значення \"disabled\", то для цієї дії не буде призначено комбінації клавіш."
@@ -1504,7 +1503,7 @@ msgid ""
 msgstr ""
 "Комбінація клавіш передачі фокусу вводу у зворотному напрямку між панелями "
 "та стільницею без появи меню. Використовується формат \"&lt;Control&gt;a\" "
-"або \"&lt;Shift&gt;&lt;Alt&gt;F1\". Аналізатор достатньо гнучкий та дозволяє "
+"або \"&lt;Shift&gt;&lt;Alt&gt;F1\". Аналізатор досить гнучкий та дозволяє "
 "використання верхнього та нижнього регістру та скорочень, наприклад \"&lt;"
 "Ctl&gt;\" та \"&lt;Ctrl&gt;\". Якщо цей параметр встановити у спеціальне "
 "значення \"disabled\", то для цієї дії не буде призначено комбінації клавіш."
@@ -1522,7 +1521,7 @@ msgstr ""
 "Комбінація клавіш передачі фокусу вводу у зворотному напрямку між вікнами "
 "без появи меню. При утримуванні \"Shift\" разом з цією комбінацією напрямок "
 "перемикається на прямий.Використовується формат \"&lt;Control&gt;a\" або "
-"\"&lt;Shift&gt;&lt;Alt&gt;F1\". Аналізатор достатньо гнучкий та дозволяє "
+"\"&lt;Shift&gt;&lt;Alt&gt;F1\". Аналізатор досить гнучкий та дозволяє "
 "використання верхнього та нижнього регістру та скорочень, наприклад \"&lt;"
 "Ctl&gt;\" та \"&lt;Ctrl&gt;\". Якщо цей параметр встановити у спеціальне "
 "значення \"disabled\", то для цієї дії не буде призначено комбінації клавіш."
@@ -1540,7 +1539,7 @@ msgstr ""
 "Комбінація клавіш передачі фокусу вводу у зворотному напрямку між вікнами з "
 "появою меню. При утримуванні \"Shift\" разом з цією комбінацією напрямок "
 "перемикається на прямий.Використовується формат \"&lt;Control&gt;a\" або "
-"\"&lt;Shift&gt;&lt;Alt&gt;F1\". Аналізатор достатньо гнучкий та дозволяє "
+"\"&lt;Shift&gt;&lt;Alt&gt;F1\". Аналізатор досить гнучкий та дозволяє "
 "використання верхнього та нижнього регістру та скорочень, наприклад \"&lt;"
 "Ctl&gt;\" та \"&lt;Ctrl&gt;\". Якщо цей параметр встановити у спеціальне "
 "значення \"disabled\", то для цієї дії не буде призначено комбінації клавіш."
@@ -1556,7 +1555,7 @@ msgid ""
 msgstr ""
 "Комбінація клавіш передачі фокусу вводу у прямому напрямку між панелями та "
 "стільницею з появою меню. Використовується формат \"&lt;Control&gt;a\" або "
-"\"&lt;Shift&gt;&lt;Alt&gt;F1\". Аналізатор достатньо гнучкий та дозволяє "
+"\"&lt;Shift&gt;&lt;Alt&gt;F1\". Аналізатор досить гнучкий та дозволяє "
 "використання верхнього та нижнього регістру та скорочень, наприклад \"&lt;"
 "Ctl&gt;\" та \"&lt;Ctrl&gt;\". Якщо цей параметр встановити у спеціальне "
 "значення \"disabled\", то для цієї дії не буде призначено комбінації клавіш."
@@ -1572,7 +1571,7 @@ msgid ""
 msgstr ""
 "Комбінація клавіш передачі фокусу вводу у прямому напрямку між панелями та "
 "стільницею без появи меню. Використовується формат \"&lt;Control&gt;a\" або "
-"\"&lt;Shift&gt;&lt;Alt&gt;F1\". Аналізатор достатньо гнучкий та дозволяє "
+"\"&lt;Shift&gt;&lt;Alt&gt;F1\". Аналізатор досить гнучкий та дозволяє "
 "використання верхнього та нижнього регістру та скорочень, наприклад \"&lt;"
 "Ctl&gt;\" та \"&lt;Ctrl&gt;\". Якщо цей параметр встановити у спеціальне "
 "значення \"disabled\", то для цієї дії не буде призначено комбінації клавіш."
@@ -1591,7 +1590,7 @@ msgstr ""
 "появи меню. (Зазвичай це &lt;Alt&gt;Escape) При утримуванні \"Shift\" разом "
 "з цією комбінацією напрямок перемикається на зворотний.Використовується "
 "формат \"&lt;Control&gt;a\" або \"&lt;Shift&gt;&lt;Alt&gt;F1\". Аналізатор "
-"достатньо гнучкий та дозволяє використання верхнього та нижнього регістру та "
+"досить гнучкий та дозволяє використання верхнього та нижнього регістру та "
 "скорочень, наприклад \"&lt;Ctl&gt;\" та \"&lt;Ctrl&gt;\". Якщо цей параметр "
 "встановити у спеціальне значення \"disabled\", то для цієї дії не буде "
 "призначено комбінації клавіш."
@@ -1609,8 +1608,8 @@ msgstr ""
 "Комбінація клавіш передачі фокусу вводу у прямому напрямку між вікнами з "
 "появою меню. (Зазвичай це &lt;Alt&gt;Tab) При утримуванні \"Shift\" разом з "
 "цією комбінацією напрямок перемикається на зворотний.Використовується формат "
-"\"&lt;Control&gt;a\" або \"&lt;Shift&gt;&lt;Alt&gt;F1\". Аналізатор "
-"достатньо гнучкий та дозволяє використання верхнього та нижнього регістру та "
+"\"&lt;Control&gt;a\" або \"&lt;Shift&gt;&lt;Alt&gt;F1\". Аналізатор досить "
+"гнучкий та дозволяє використання верхнього та нижнього регістру та "
 "скорочень, наприклад \"&lt;Ctl&gt;\" та \"&lt;Ctrl&gt;\". Якщо цей параметр "
 "встановити у спеціальне значення \"disabled\", то для цієї дії не буде "
 "призначено комбінації клавіш."
@@ -1626,10 +1625,10 @@ msgid ""
 msgstr ""
 "Комбінація клавіш перемикання стану чи показувати вікно завжди на верху. "
 "Використовується формат \"&lt;Control&gt;a\" або \"&lt;Shift&gt;&lt;Alt&gt;F1"
-"\". Аналізатор достатньо гнучкий та дозволяє використання верхнього та "
-"нижнього регістру та скорочень, наприклад \"&lt;Ctl&gt;\" та \"&lt;Ctrl&gt;"
-"\". Якщо цей параметр встановити у спеціальне значення \"disabled\", то для "
-"цієї дії не буде призначено комбінації клавіш."
+"\". Аналізатор досить гнучкий та дозволяє використання верхнього та нижнього "
+"регістру та скорочень, наприклад \"&lt;Ctl&gt;\" та \"&lt;Ctrl&gt;\". Якщо "
+"цей параметр встановити у спеціальне значення \"disabled\", то для цієї дії "
+"не буде призначено комбінації клавіш."
 
 #: src/metacity.schemas.in.h:136
 msgid ""
@@ -1640,8 +1639,8 @@ msgid ""
 "\"disabled\", then there will be no keybinding for this action."
 msgstr ""
 "Комбінація клавіш перемикання у повноекранний режим. Використовується формат "
-"\"&lt;Control&gt;a\" або \"&lt;Shift&gt;&lt;Alt&gt;F1\". Аналізатор "
-"достатньо гнучкий та дозволяє використання верхнього та нижнього регістру та "
+"\"&lt;Control&gt;a\" або \"&lt;Shift&gt;&lt;Alt&gt;F1\". Аналізатор досить "
+"гнучкий та дозволяє використання верхнього та нижнього регістру та "
 "скорочень, наприклад \"&lt;Ctl&gt;\" та \"&lt;Ctrl&gt;\". Якщо цей параметр "
 "встановити у спеціальне значення \"disabled\", то для цієї дії не буде "
 "призначено комбінації клавіш."
@@ -1670,8 +1669,8 @@ msgid ""
 "\"disabled\", then there will be no keybinding for this action."
 msgstr ""
 "Комбінація клавіш перемикання стану згорнутості. Використовується формат "
-"\"&lt;Control&gt;a\" або \"&lt;Shift&gt;&lt;Alt&gt;F1\". Аналізатор "
-"достатньо гнучкий та дозволяє використання верхнього та нижнього регістру та "
+"\"&lt;Control&gt;a\" або \"&lt;Shift&gt;&lt;Alt&gt;F1\". Аналізатор досить "
+"гнучкий та дозволяє використання верхнього та нижнього регістру та "
 "скорочень, наприклад \"&lt;Ctl&gt;\" та \"&lt;Ctrl&gt;\". Якщо цей параметр "
 "встановити у спеціальне значення \"disabled\", то для цієї дії не буде "
 "призначено комбінації клавіш."
@@ -1687,7 +1686,7 @@ msgid ""
 msgstr ""
 "Комбінація клавіш перемикання стану чи показувати вікно на усіх робочих "
 "областях, чи лише на одній. Використовується формат \"&lt;Control&gt;a\" або "
-"\"&lt;Shift&gt;&lt;Alt&gt;F1\". Аналізатор достатньо гнучкий та дозволяє "
+"\"&lt;Shift&gt;&lt;Alt&gt;F1\". Аналізатор досить гнучкий та дозволяє "
 "використання верхнього та нижнього регістру та скорочень, наприклад \"&lt;"
 "Ctl&gt;\" та \"&lt;Ctrl&gt;\". Якщо цей параметр встановити у спеціальне "
 "значення \"disabled\", то для цієї дії не буде призначено комбінації клавіш."
@@ -1701,8 +1700,8 @@ msgid ""
 "\"disabled\", then there will be no keybinding for this action."
 msgstr ""
 "Комбінація клавіш перемикання мінімізації вікна. Використовується формат "
-"\"&lt;Control&gt;a\" або \"&lt;Shift&gt;&lt;Alt&gt;F1\". Аналізатор "
-"достатньо гнучкий та дозволяє використання верхнього та нижнього регістру та "
+"\"&lt;Control&gt;a\" або \"&lt;Shift&gt;&lt;Alt&gt;F1\". Аналізатор досить "
+"гнучкий та дозволяє використання верхнього та нижнього регістру та "
 "скорочень, наприклад \"&lt;Ctl&gt;\" та \"&lt;Ctrl&gt;\". Якщо цей параметр "
 "встановити у спеціальне значення \"disabled\", то для цієї дії не буде "
 "призначено комбінації клавіш."
@@ -1718,13 +1717,12 @@ msgid ""
 msgstr ""
 "Комбінація клавіш, що викликає діалог панелі для запуску програм. "
 "Використовується формат \"&lt;Control&gt;a\" або \"&lt;Shift&gt;&lt;Alt&gt;F1"
-"\". Аналізатор достатньо гнучкий та дозволяє використання верхнього та "
-"нижнього регістру та скорочень, наприклад \"&lt;Ctl&gt;\" та \"&lt;Ctrl&gt;"
-"\". Якщо цей параметр встановити у спеціальне значення \"disabled\", то для "
-"цієї дії не буде призначено комбінації клавіш."
+"\". Аналізатор досить гнучкий та дозволяє використання верхнього та нижнього "
+"регістру та скорочень, наприклад \"&lt;Ctl&gt;\" та \"&lt;Ctrl&gt;\". Якщо "
+"цей параметр встановити у спеціальне значення \"disabled\", то для цієї дії "
+"не буде призначено комбінації клавіш."
 
 #: src/metacity.schemas.in.h:142
-#, fuzzy
 msgid ""
 "The keybinding which invokes a terminal. The format looks like \"&lt;"
 "Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;F1\". The parser is fairly "
@@ -1732,12 +1730,12 @@ msgid ""
 "Ctl&gt;\" and \"&lt;Ctrl&gt;\". If you set the option to the special string "
 "\"disabled\", then there will be no keybinding for this action."
 msgstr ""
-"Комбінація клавіш, що показує головне меню панелі. Використовується формат "
-"\"&lt;Control&gt;a\" або \"&lt;Shift&gt;&lt;Alt&gt;F1\". Аналізатор "
-"достатньо гнучкий та дозволяє використання верхнього і нижнього регістру та "
-"скорочень, наприклад \"&lt;Ctl&gt;\" та \"&lt;Ctrl&gt;\". Якщо цей параметр "
-"встановити у спеціальне значення \"disabled\", то для цієї дії не буде "
-"призначено комбінації клавіш."
+"Комбінація клавіш, що запускає термінал. Використовується формат \"&lt;"
+"Control&gt;a\" або \"&lt;Shift&gt;&lt;Alt&gt;F1\". Аналізатор досить гнучкий "
+"та дозволяє використання верхнього і нижнього регістру та скорочень, "
+"наприклад \"&lt;Ctl&gt;\" та \"&lt;Ctrl&gt;\". Якщо цей параметр встановити "
+"у спеціальне значення \"disabled\", то для цієї дії не буде призначено "
+"комбінації клавіш."
 
 #: src/metacity.schemas.in.h:143
 msgid ""
@@ -1750,10 +1748,10 @@ msgid ""
 msgstr ""
 "Комбінація клавіш, що викликає утиліту панелі для створення знімку вікна. "
 "Використовується формат \"&lt;Control&gt;a\" або \"&lt;Shift&gt;&lt;Alt&gt;F1"
-"\". Аналізатор достатньо гнучкий та дозволяє використання верхнього та "
-"нижнього регістру та скорочень, наприклад  \"&lt;Ctl&gt;\" та \"&lt;Ctrl&gt;"
-"\". Якщо цей параметр встановити у спеціальне значення \"disabled\", то для "
-"цієї дії не буде призначено комбінації клавіш."
+"\". Аналізатор досить гнучкий та дозволяє використання верхнього та нижнього "
+"регістру та скорочень, наприклад  \"&lt;Ctl&gt;\" та \"&lt;Ctrl&gt;\". Якщо "
+"цей параметр встановити у спеціальне значення \"disabled\", то для цієї дії "
+"не буде призначено комбінації клавіш."
 
 #: src/metacity.schemas.in.h:144
 msgid ""
@@ -1766,10 +1764,10 @@ msgid ""
 msgstr ""
 "Комбінація клавіш, що викликає утиліту панелі для створення знімку екрана. "
 "Використовується формат \"&lt;Control&gt;a\" або \"&lt;Shift&gt;&lt;Alt&gt;F1"
-"\". Аналізатор достатньо гнучкий та дозволяє використання верхнього та "
-"нижнього регістру та скорочень, наприклад \"&lt;Ctl&gt;\" та \"&lt;Ctrl&gt;"
-"\". Якщо цей параметр встановити у спеціальне значення \"disabled\", то для "
-"цієї дії не буде призначено комбінації клавіш."
+"\". Аналізатор досить гнучкий та дозволяє використання верхнього та нижнього "
+"регістру та скорочень, наприклад \"&lt;Ctl&gt;\" та \"&lt;Ctrl&gt;\". Якщо "
+"цей параметр встановити у спеціальне значення \"disabled\", то для цієї дії "
+"не буде призначено комбінації клавіш."
 
 #: src/metacity.schemas.in.h:145
 msgid ""
@@ -1780,11 +1778,11 @@ msgid ""
 "\"disabled\", then there will be no keybinding for this action."
 msgstr ""
 "Комбінація клавіш, що показує головне меню панелі. Використовується формат "
-"\"&lt;Control&gt;a\" або \"&lt;Shift&gt;&lt;Alt&gt;F1\". Аналізатор "
-"достатньо гнучкий та дозволяє використання верхнього і нижнього регістру та "
-"скорочень, наприклад \"&lt;Ctl&gt;\" та \"&lt;Ctrl&gt;\". Якщо цей параметр "
-"встановити у спеціальне значення \"disabled\", то для цієї дії не буде "
-"призначено комбінації клавіш."
+"\"&lt;Control&gt;a\" або \"&lt;Shift&gt;&lt;Alt&gt;F1\". Аналізатор досить "
+"гнучкий та дозволяє використання верхнього і нижнього регістру та скорочень, "
+"наприклад \"&lt;Ctl&gt;\" та \"&lt;Ctrl&gt;\". Якщо цей параметр встановити "
+"у спеціальне значення \"disabled\", то для цієї дії не буде призначено "
+"комбінації клавіш."
 
 #: src/metacity.schemas.in.h:146
 msgid "The name of a workspace."
@@ -1842,10 +1840,10 @@ msgstr ""
 "вікнами. Якщо вікно перекрите іншим вікном, вона піднімає вікно над іншими "
 "вікнами. Якщо вікно не перекрите ніякими вікнами - опускає нижче інших "
 "вікон. Використовується формат \"&lt;Control&gt;a\" або \"&lt;Shift&gt;&lt;"
-"Alt&gt;F1\". Аналізатор достатньо гнучкий та дозволяє використання верхнього "
-"та нижнього регістру та скорочень, наприклад \"&lt;Ctl&gt;\" та \"&lt;"
-"Ctrl&gt;\". Якщо цей параметр встановити у спеціальне значення \"disabled\", "
-"то для цієї дії не буде призначено комбінації клавіш."
+"Alt&gt;F1\". Аналізатор досить гнучкий та дозволяє використання верхнього та "
+"нижнього регістру та скорочень, наприклад \"&lt;Ctl&gt;\" та \"&lt;Ctrl&gt;"
+"\". Якщо цей параметр встановити у спеціальне значення \"disabled\", то для "
+"цієї дії не буде призначено комбінації клавіш."
 
 #: src/metacity.schemas.in.h:153
 msgid ""
@@ -1857,7 +1855,7 @@ msgid ""
 msgstr ""
 "Комбінація клавіш, що опускає вікно нижче інших вікон. Використовується "
 "формат \"&lt;Control&gt;a\" або \"&lt;Shift&gt;&lt;Alt&gt;F1\". Аналізатор "
-"достатньо гнучкий та дозволяє використання верхнього та нижнього регістру та "
+"досить гнучкий та дозволяє використання верхнього та нижнього регістру та "
 "скорочень, наприклад \"&lt;Ctl&gt;\" та \"&lt;Ctrl&gt;\". Якщо цей параметр "
 "встановити у спеціальне значення \"disabled\", то для цієї дії не буде "
 "призначено комбінації клавіш."
@@ -1872,7 +1870,7 @@ msgid ""
 msgstr ""
 "Комбінація клавіш, що піднімає вікно над іншими вікнами. Використовується "
 "формат \"&lt;Control&gt;a\" або \"&lt;Shift&gt;&lt;Alt&gt;F1\". Аналізатор "
-"достатньо гнучкий та дозволяє використання верхнього та нижнього регістру та "
+"досить гнучкий та дозволяє використання верхнього та нижнього регістру та "
 "скорочень, наприклад \"&lt;Ctl&gt;\" та \"&lt;Ctrl&gt;\". Якщо цей параметр "
 "встановити у спеціальне значення \"disabled\", то для цієї дії не буде "
 "призначено комбінації клавіш."
@@ -1888,10 +1886,10 @@ msgid ""
 msgstr ""
 "Комбінація клавіш, що змінює розмір вікна, щоб заповнити весь горизонтальний "
 "простір. Використовується формат \"&lt;Control&gt;a\" або \"&lt;Shift&gt;&lt;"
-"Alt&gt;F1\". Аналізатор достатньо гнучкий та дозволяє використання верхнього "
-"та нижнього регістру та скорочень, наприклад \"&lt;Ctl&gt;\" та \"&lt;"
-"Ctrl&gt;\". Якщо цей параметр встановити у спеціальне значення \"disabled\", "
-"то для цієї дії не буде призначено комбінації клавіш."
+"Alt&gt;F1\". Аналізатор досить гнучкий та дозволяє використання верхнього та "
+"нижнього регістру та скорочень, наприклад \"&lt;Ctl&gt;\" та \"&lt;Ctrl&gt;"
+"\". Якщо цей параметр встановити у спеціальне значення \"disabled\", то для "
+"цієї дії не буде призначено комбінації клавіш."
 
 #: src/metacity.schemas.in.h:156
 msgid ""
@@ -1904,10 +1902,10 @@ msgid ""
 msgstr ""
 "Комбінація клавіш, що змінює розмір вікна, щоб заповнити весь вертикальний "
 "простір. Використовується формат \"&lt;Control&gt;a\" або \"&lt;Shift&gt;&lt;"
-"Alt&gt;F1\". Аналізатор достатньо гнучкий та дозволяє використання верхнього "
-"та нижнього регістру та скорочень, наприклад \"&lt;Ctl&gt;\" та \"&lt;"
-"Ctrl&gt;\". Якщо цей параметр встановити у спеціальне значення \"disabled\", "
-"то для цієї дії не буде призначено комбінації клавіш."
+"Alt&gt;F1\". Аналізатор досить гнучкий та дозволяє використання верхнього та "
+"нижнього регістру та скорочень, наприклад \"&lt;Ctl&gt;\" та \"&lt;Ctrl&gt;"
+"\". Якщо цей параметр встановити у спеціальне значення \"disabled\", то для "
+"цієї дії не буде призначено комбінації клавіш."
 
 #: src/metacity.schemas.in.h:157
 msgid ""
@@ -1968,17 +1966,17 @@ msgstr "Режим отримання фокусу вікном"
 msgid "Window title font"
 msgstr "Шрифт заголовка вікна"
 
-#: src/prefs.c:476 src/prefs.c:492 src/prefs.c:508 src/prefs.c:524
-#: src/prefs.c:540 src/prefs.c:560 src/prefs.c:576 src/prefs.c:592
-#: src/prefs.c:608 src/prefs.c:624 src/prefs.c:640 src/prefs.c:656
-#: src/prefs.c:672 src/prefs.c:689 src/prefs.c:705 src/prefs.c:721
-#: src/prefs.c:737 src/prefs.c:753 src/prefs.c:768 src/prefs.c:783
-#: src/prefs.c:798
+#: src/prefs.c:501 src/prefs.c:517 src/prefs.c:533 src/prefs.c:549
+#: src/prefs.c:565 src/prefs.c:585 src/prefs.c:601 src/prefs.c:617
+#: src/prefs.c:633 src/prefs.c:649 src/prefs.c:665 src/prefs.c:681
+#: src/prefs.c:697 src/prefs.c:714 src/prefs.c:730 src/prefs.c:746
+#: src/prefs.c:762 src/prefs.c:778 src/prefs.c:793 src/prefs.c:808
+#: src/prefs.c:823 src/prefs.c:839
 #, c-format
 msgid "GConf key \"%s\" is set to an invalid type\n"
 msgstr "Ключ GConf \"%s\" встановлено у неправильний тип\n"
 
-#: src/prefs.c:843
+#: src/prefs.c:884
 #, c-format
 msgid ""
 "\"%s\" found in configuration database is not a valid value for mouse button "
@@ -1987,17 +1985,17 @@ msgstr ""
 "У базі даних конфігурації знайдено \"%s\" - що не є правильним значенням "
 "модифікатора клавіші миші.\n"
 
-#: src/prefs.c:867 src/prefs.c:1277
+#: src/prefs.c:908 src/prefs.c:1318
 #, c-format
 msgid "GConf key '%s' is set to an invalid value\n"
 msgstr "Ключ GConf \"%s\" встановлено у неправильний тип\n"
 
-#: src/prefs.c:994
+#: src/prefs.c:1035
 #, c-format
 msgid "Could not parse font description \"%s\" from GConf key %s\n"
 msgstr "Неможливо проаналізувати опис шрифту \"%s\" у ключі GConf %s\n"
 
-#: src/prefs.c:1179
+#: src/prefs.c:1220
 #, c-format
 msgid ""
 "%d stored in GConf key %s is not a reasonable number of workspaces, current "
@@ -2006,7 +2004,7 @@ msgstr ""
 "Значення %d встановлено у ключі GCong %s ― що не є припустимим значенням "
 "кількості робочих областей, поточний максимум рівний %d\n"
 
-#: src/prefs.c:1239
+#: src/prefs.c:1280
 msgid ""
 "Workarounds for broken applications disabled. Some applications may not "
 "behave properly.\n"
@@ -2014,17 +2012,17 @@ msgstr ""
 "Трюк для роботи із зіпсованими програмами вимкнено. Деякі додатки можуть "
 "поводитись неправильно.\n"
 
-#: src/prefs.c:1304
+#: src/prefs.c:1345
 #, c-format
 msgid "%d stored in GConf key %s is out of range 0 to %d\n"
 msgstr "Значення %d встановлене у ключі GConf %s виходить за межі 0 ― %d\n"
 
-#: src/prefs.c:1425
+#: src/prefs.c:1479
 #, c-format
 msgid "Error setting number of workspaces to %d: %s\n"
 msgstr "Помилка встановлення кількості робочих областей у %d: %s\n"
 
-#: src/prefs.c:1669
+#: src/prefs.c:1723
 #, c-format
 msgid ""
 "\"%s\" found in configuration database is not a valid value for keybinding "
@@ -2033,7 +2031,7 @@ msgstr ""
 "Знайдене у конфігураційній базі даних значення \"%s\" не є правильним "
 "записом комбінації клавіш \"%s\"\n"
 
-#: src/prefs.c:2023
+#: src/prefs.c:2077
 #, c-format
 msgid "Error setting name for workspace %d to \"%s\": %s\n"
 msgstr "Помилка встановлення назви робочої області %d у \"%s\": %s\n"
@@ -2070,7 +2068,7 @@ msgstr ""
 msgid "Screen %d on display \"%s\" already has a window manager\n"
 msgstr "Екран %d на дисплеї \"%s\" вже контролюється менеджером вікон\n"
 
-#: src/screen.c:699
+#: src/screen.c:716
 #, c-format
 msgid "Could not release screen %d on display \"%s\"\n"
 msgstr "Не вдається повернути екран %d на дисплеї \"%s\"\n"
@@ -3174,7 +3172,7 @@ msgid "Application set a bogus _NET_WM_PID %ld\n"
 msgstr "Додаток встановив неправильне значення _NET_WM_PID %ld\n"
 
 #. first time through
-#: src/window.c:4829
+#: src/window.c:5197
 #, c-format
 msgid ""
 "Window %s sets SM_CLIENT_ID on itself, instead of on the WM_CLIENT_LEADER "
@@ -3190,7 +3188,7 @@ msgstr ""
 #. * MWM but not WM_NORMAL_HINTS are basically broken. We complain
 #. * about these apps but make them work.
 #.
-#: src/window.c:5500
+#: src/window.c:5868
 #, c-format
 msgid ""
 "Window %s sets an MWM hint indicating it isn't resizable, but sets min size %"
@@ -3226,24 +3224,3 @@ msgid ""
 "Property %s on window 0x%lx contained invalid UTF-8 for item %d in the list\n"
 msgstr ""
 "Властивість %s вікна 0x%lx містить неправильний UTF-8 у пункті %d списку\n"
-
-#~ msgid "Select how to give focus to windows"
-#~ msgstr "Вибір способу передачі фокусу вводу вікнам"
-
-#~ msgid "Window Focus"
-#~ msgstr "Фокус вікна"
-
-#~ msgid "Clic_k to give focus"
-#~ msgstr "Кла_цнути щоб передати фокус"
-
-#~ msgid "Focus behavior:"
-#~ msgstr "Поведінка фокусу:"
-
-#~ msgid "Window Focus Preferences"
-#~ msgstr "Властивості фокусу вікна"
-
-#~ msgid "_Point to give focus"
-#~ msgstr "Від_мітити щоб надати фокус"
-
-#~ msgid "_Raise window on focus"
-#~ msgstr "Пі_днімати вікно при отриманні фокусу"

po/wa.po

@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: metacity\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-09 21:23-0700\n"
+"POT-Creation-Date: 2005-06-27 17:21-0600\n"
 "PO-Revision-Date: 2003-07-12 14:51+0200\n"
 "Last-Translator: Pablo Saratxaga <pablo@mandrakesoft.com>\n"
 "Language-Team: Walon <linux-wa@walon.org>\n"
@@ -61,7 +61,7 @@ msgstr ""
 msgid "Failed to get hostname: %s\n"
 msgstr ""
 
-#: src/display.c:306
+#: src/display.c:316
 #, c-format
 msgid "Failed to open X Window System display '%s'\n"
 msgstr ""
@@ -79,23 +79,23 @@ msgstr ""
 msgid "Fatal IO error %d (%s) on display '%s'.\n"
 msgstr ""
 
-#: src/frames.c:1020
+#: src/frames.c:1125
 msgid "Close Window"
 msgstr "Clôre li purnea"
 
-#: src/frames.c:1023
+#: src/frames.c:1128
 msgid "Window Menu"
 msgstr "Menu do purnea"
 
-#: src/frames.c:1026
+#: src/frames.c:1131
 msgid "Minimize Window"
 msgstr "Mete li purnea å pus ptit"
 
-#: src/frames.c:1029
+#: src/frames.c:1134
 msgid "Maximize Window"
 msgstr "Mete li purnea å pus grand"
 
-#: src/frames.c:1032
+#: src/frames.c:1137
 msgid "Unmaximize Window"
 msgstr "Rimete li purnea a s' grandeu di dvant"
 
@@ -106,17 +106,17 @@ msgid ""
 "binding\n"
 msgstr ""
 
-#: src/keybindings.c:2554
+#: src/keybindings.c:2535
 #, c-format
 msgid "Error launching metacity-dialog to print an error about a command: %s\n"
 msgstr ""
 
-#: src/keybindings.c:2659
+#: src/keybindings.c:2640
 #, c-format
 msgid "No command %d has been defined.\n"
 msgstr ""
 
-#: src/keybindings.c:3489
+#: src/keybindings.c:3485
 #, fuzzy
 msgid "No terminal command has been defined.\n"
 msgstr "Nou stîle lomé «%s» n' a stî defini"
@@ -200,11 +200,13 @@ msgstr "_Clôre"
 
 #. separator
 #: src/menu.c:66
-msgid "Put on _All Workspaces"
-msgstr "Mete so tos les _scribannes"
+#, fuzzy
+msgid "_Always on Visible Workspace"
+msgstr "Seulmint so _ci scribanne chal"
 
 #: src/menu.c:67
-msgid "Only on _This Workspace"
+#, fuzzy
+msgid "_Only on This Workspace"
 msgstr "Seulmint so _ci scribanne chal"
 
 #: src/menu.c:68
@@ -227,7 +229,7 @@ msgstr "Bodjî l' purnea viè l' sicribanne 1"
 msgid "Move to Workspace _Down"
 msgstr "Bodjî l' purnea viè l' sicribanne do dzo"
 
-#: src/menu.c:162 src/prefs.c:1942
+#: src/menu.c:162 src/prefs.c:1996
 #, c-format
 msgid "Workspace %d"
 msgstr "Sicribanne %d"
@@ -359,13 +361,13 @@ msgstr "Tite"
 msgid "Class"
 msgstr "Classe"
 
-#: src/metacity-dialog.c:262
+#: src/metacity-dialog.c:263
 msgid ""
 "These windows do not support \"save current setup\" and will have to be "
 "restarted manually next time you log in."
 msgstr ""
 
-#: src/metacity-dialog.c:323
+#: src/metacity-dialog.c:328
 #, c-format
 msgid ""
 "There was an error running \"%s\":\n"
@@ -480,7 +482,8 @@ msgid ""
 "\"direct manipulation\", by using wireframes, avoiding animations, or other "
 "means. This is a significant reduction in usability for many users, but may "
 "allow legacy applications and terminal servers to function when they would "
-"otherwise be impractical."
+"otherwise be impractical. However, the wireframe feature is disabled when "
+"accessibility is on to avoid weird desktop breakages."
 msgstr ""
 
 #: src/metacity.schemas.in.h:20
@@ -1493,64 +1496,64 @@ msgstr "Môde di focus des purneas"
 msgid "Window title font"
 msgstr "Fonte pol tite des purneas"
 
-#: src/prefs.c:476 src/prefs.c:492 src/prefs.c:508 src/prefs.c:524
-#: src/prefs.c:540 src/prefs.c:560 src/prefs.c:576 src/prefs.c:592
-#: src/prefs.c:608 src/prefs.c:624 src/prefs.c:640 src/prefs.c:656
-#: src/prefs.c:672 src/prefs.c:689 src/prefs.c:705 src/prefs.c:721
-#: src/prefs.c:737 src/prefs.c:753 src/prefs.c:768 src/prefs.c:783
-#: src/prefs.c:798
+#: src/prefs.c:501 src/prefs.c:517 src/prefs.c:533 src/prefs.c:549
+#: src/prefs.c:565 src/prefs.c:585 src/prefs.c:601 src/prefs.c:617
+#: src/prefs.c:633 src/prefs.c:649 src/prefs.c:665 src/prefs.c:681
+#: src/prefs.c:697 src/prefs.c:714 src/prefs.c:730 src/prefs.c:746
+#: src/prefs.c:762 src/prefs.c:778 src/prefs.c:793 src/prefs.c:808
+#: src/prefs.c:823 src/prefs.c:839
 #, c-format
 msgid "GConf key \"%s\" is set to an invalid type\n"
 msgstr ""
 
-#: src/prefs.c:843
+#: src/prefs.c:884
 #, c-format
 msgid ""
 "\"%s\" found in configuration database is not a valid value for mouse button "
 "modifier\n"
 msgstr ""
 
-#: src/prefs.c:867 src/prefs.c:1277
+#: src/prefs.c:908 src/prefs.c:1318
 #, c-format
 msgid "GConf key '%s' is set to an invalid value\n"
 msgstr ""
 
-#: src/prefs.c:994
+#: src/prefs.c:1035
 #, c-format
 msgid "Could not parse font description \"%s\" from GConf key %s\n"
 msgstr ""
 
-#: src/prefs.c:1179
+#: src/prefs.c:1220
 #, c-format
 msgid ""
 "%d stored in GConf key %s is not a reasonable number of workspaces, current "
 "maximum is %d\n"
 msgstr ""
 
-#: src/prefs.c:1239
+#: src/prefs.c:1280
 msgid ""
 "Workarounds for broken applications disabled. Some applications may not "
 "behave properly.\n"
 msgstr ""
 
-#: src/prefs.c:1304
+#: src/prefs.c:1345
 #, c-format
 msgid "%d stored in GConf key %s is out of range 0 to %d\n"
 msgstr ""
 
-#: src/prefs.c:1425
+#: src/prefs.c:1479
 #, c-format
 msgid "Error setting number of workspaces to %d: %s\n"
 msgstr ""
 
-#: src/prefs.c:1669
+#: src/prefs.c:1723
 #, c-format
 msgid ""
 "\"%s\" found in configuration database is not a valid value for keybinding "
 "\"%s\"\n"
 msgstr ""
 
-#: src/prefs.c:2023
+#: src/prefs.c:2077
 #, c-format
 msgid "Error setting name for workspace %d to \"%s\": %s\n"
 msgstr ""
@@ -1583,7 +1586,7 @@ msgstr ""
 msgid "Screen %d on display \"%s\" already has a window manager\n"
 msgstr ""
 
-#: src/screen.c:699
+#: src/screen.c:716
 #, c-format
 msgid "Could not release screen %d on display \"%s\"\n"
 msgstr ""
@@ -2637,7 +2640,7 @@ msgid "Application set a bogus _NET_WM_PID %ld\n"
 msgstr ""
 
 #. first time through
-#: src/window.c:4829
+#: src/window.c:5197
 #, c-format
 msgid ""
 "Window %s sets SM_CLIENT_ID on itself, instead of on the WM_CLIENT_LEADER "
@@ -2651,7 +2654,7 @@ msgstr ""
 #. * MWM but not WM_NORMAL_HINTS are basically broken. We complain
 #. * about these apps but make them work.
 #.
-#: src/window.c:5500
+#: src/window.c:5868
 #, c-format
 msgid ""
 "Window %s sets an MWM hint indicating it isn't resizable, but sets min size %"
@@ -2679,6 +2682,9 @@ msgid ""
 "Property %s on window 0x%lx contained invalid UTF-8 for item %d in the list\n"
 msgstr ""
 
+#~ msgid "Put on _All Workspaces"
+#~ msgstr "Mete so tos les _scribannes"
+
 #~ msgid "Select how to give focus to windows"
 #~ msgstr "Tchoezixhoz cmint dner l' focus åzès purneas"
 

rationales.txt

@@ -59,3 +59,4 @@ Tracking bugs
 moving/resizing (constraints): http://bugzilla.gnome.org/show_bug.cgi?id=155458
              window placement: http://bugzilla.gnome.org/show_bug.cgi?id=155460
    logout/system-monitor keys: http://bugzilla.gnome.org/show_bug.cgi?id=155462
+                modal dialogs: http://bugzilla.gnome.org/show_bug.cgi?id=164841

src/bell.c

@@ -78,6 +78,10 @@ meta_bell_flash_screen (MetaDisplay *display,
       XSync (display->xdisplay, False);
       XUnmapWindow (display->xdisplay, screen->flash_window);
     }
+
+  if (meta_prefs_get_focus_mode () != META_FOCUS_MODE_CLICK &&
+      !display->mouse_mode)
+    meta_display_increment_focus_sentinel (display);
   XFlush (display->xdisplay);
 }
 

src/display.c

@@ -59,10 +59,19 @@
 #ifdef HAVE_XKB
 #include <X11/XKBlib.h>
 #endif
+#ifdef HAVE_XCURSOR
+#include <X11/Xcursor/Xcursor.h>
+#endif
 #include <string.h>
 
 #define USE_GDK_DISPLAY
 
+#define GRAB_OP_IS_WINDOW_SWITCH(g)                     \
+        (g == META_GRAB_OP_KEYBOARD_TABBING_NORMAL  ||  \
+         g == META_GRAB_OP_KEYBOARD_TABBING_DOCK    ||  \
+         g == META_GRAB_OP_KEYBOARD_ESCAPING_NORMAL ||  \
+         g == META_GRAB_OP_KEYBOARD_ESCAPING_DOCK)
+
 typedef struct 
 {
   MetaDisplay *display;
@@ -109,6 +118,9 @@ static void    update_window_grab_modifiers (MetaDisplay *display);
 static void    prefs_changed_callback    (MetaPreference pref,
                                           void          *data);
 
+static void    sanity_check_timestamps   (MetaDisplay *display,
+                                          Time         known_good_timestamp);
+
 static void
 set_utf8_string_hint (MetaDisplay *display,
                       Window xwindow,
@@ -289,7 +301,8 @@ meta_display_open (const char *name)
     "_NET_RESTACK_WINDOW",
     "_NET_MOVERESIZE_WINDOW",
     "_NET_DESKTOP_GEOMETRY",
-    "_NET_DESKTOP_VIEWPORT"
+    "_NET_DESKTOP_VIEWPORT",
+    "_METACITY_VERSION"
   };
   Atom atoms[G_N_ELEMENTS(atom_names)];
   
@@ -331,6 +344,9 @@ meta_display_open (const char *name)
   display->autoraise_window = NULL;
   display->focus_window = NULL;
   display->expected_focus_window = NULL;
+  display->grab_old_window_stacking = NULL;
+
+  display->mouse_mode = TRUE; /* Only relevant for mouse or sloppy focus */
 
 #ifdef HAVE_XSYNC
   display->grab_sync_request_alarm = None;
@@ -443,6 +459,7 @@ meta_display_open (const char *name)
   display->atom_net_moveresize_window = atoms[88];
   display->atom_net_desktop_geometry = atoms[89];
   display->atom_net_desktop_viewport = atoms[90];
+  display->atom_metacity_version = atoms[91];
 
   display->prop_hooks = NULL;
   meta_display_init_window_prop_hooks (display);
@@ -595,7 +612,16 @@ meta_display_open (const char *name)
 #else  /* HAVE_RENDER */
   meta_verbose ("Not compiled with Render support\n");
 #endif /* !HAVE_RENDER */
-  
+
+#ifdef HAVE_XCURSOR
+  {
+    XcursorSetTheme (display->xdisplay, meta_prefs_get_cursor_theme ());
+    XcursorSetDefaultSize (display->xdisplay, meta_prefs_get_cursor_size ());
+  }
+#else /* HAVE_XCURSOR */
+  meta_verbose ("Not compiled with Xcursor support\n");
+#endif /* !HAVE_XCURSOR */
+
   /* Create the leader window here. Set its properties and
    * use the timestamp from one of the PropertyNotify events
    * that will follow.
@@ -616,6 +642,11 @@ meta_display_open (const char *name)
                           display->atom_net_wm_name,
                           "Metacity");
     
+    set_utf8_string_hint (display,
+                          display->leader_window,
+                          display->atom_metacity_version,
+                          VERSION);
+
     data[0] = display->leader_window;
     XChangeProperty (display->xdisplay,
                      display->leader_window,
@@ -632,6 +663,7 @@ meta_display_open (const char *name)
   }
 
   display->last_focus_time = timestamp;
+  display->last_user_time = timestamp;
   display->compositor = meta_compositor_new (display);
   
   screens = NULL;
@@ -790,6 +822,9 @@ meta_display_close (MetaDisplay *display)
   meta_prefs_remove_listener (prefs_changed_callback, display);
   
   meta_display_remove_autoraise_callback (display);
+
+  if (display->grab_old_window_stacking)
+    g_list_free (display->grab_old_window_stacking);
   
 #ifdef USE_GDK_DISPLAY
   /* Stop caring about events */
@@ -1130,6 +1165,8 @@ meta_display_get_current_time_roundtrip (MetaDisplay *display)
       timestamp = property_event.xproperty.time;
     }
 
+  sanity_check_timestamps (display, timestamp);
+
   return timestamp;
 }
 
@@ -1547,11 +1584,8 @@ event_callback (XEvent   *event,
   if (window && ((event->type == KeyPress) || (event->type == ButtonPress)))
     {
       g_assert (CurrentTime != display->current_time);
-      meta_topic (META_DEBUG_WINDOW_STATE,
-                  "Metacity set %s's net_wm_user_time to %d.\n",
-                  window->desc, display->current_time);
-      window->net_wm_user_time_set = TRUE;
-      window->net_wm_user_time = display->current_time;
+      meta_window_set_user_time (window, display->current_time);
+      sanity_check_timestamps (display, display->current_time);
     }
   
   switch (event->type)
@@ -1574,6 +1608,16 @@ event_callback (XEvent   *event,
                       (display->grab_window ?
                        display->grab_window->desc : 
                        "none"));
+          if (GRAB_OP_IS_WINDOW_SWITCH (display->grab_op))
+            {
+              MetaScreen *screen;
+              meta_topic (META_DEBUG_WINDOW_OPS, 
+                          "Syncing to old stack positions.\n");
+              screen = 
+                meta_display_screen_for_root (display, event->xany.window);
+              meta_stack_set_positions (screen->stack,
+                                        display->grab_old_window_stacking);
+            }
           meta_display_end_grab_op (display,
                                     event->xbutton.time);
         }
@@ -1755,10 +1799,15 @@ event_callback (XEvent   *event,
                   window->type != META_WINDOW_DESKTOP)
                 {
                   meta_topic (META_DEBUG_FOCUS,
-                              "Focusing %s due to enter notify with serial %lu\n",
-                              window->desc, event->xany.serial);
+                              "Focusing %s due to enter notify with serial %lu "
+                              "at time %lu, and setting display->mouse_mode to "
+                              "TRUE.\n",
+                              window->desc, 
+                              event->xany.serial,
+                              event->xcrossing.time);
 
-		  meta_window_focus (window, event->xcrossing.time);
+                  display->mouse_mode = TRUE;
+                  meta_window_focus (window, event->xcrossing.time);
 
 		  /* stop ignoring stuff */
 		  reset_ignores (display);
@@ -1792,16 +1841,29 @@ event_callback (XEvent   *event,
           switch (meta_prefs_get_focus_mode ())
             {
             case META_FOCUS_MODE_MOUSE:
-              if (window == display->expected_focus_window &&
-                  (window->frame == NULL || frame_was_receiver) &&
-		  event->xcrossing.mode != NotifyGrab && 
-		  event->xcrossing.mode != NotifyUngrab &&
-		  event->xcrossing.detail != NotifyInferior)
+              if ((window->frame == NULL || frame_was_receiver) &&
+                  event->xcrossing.mode != NotifyGrab && 
+                  event->xcrossing.mode != NotifyUngrab &&
+                  event->xcrossing.detail != NotifyInferior &&
+                  meta_display_focus_sentinel_clear (display))
                 {
-                  meta_verbose ("Unsetting focus from %s due to LeaveNotify\n",
-                                window->desc);
-                  meta_display_focus_the_no_focus_window (display, 
-                                                          event->xcrossing.time);
+                  if (window == display->expected_focus_window)
+                    {
+                      meta_topic (META_DEBUG_FOCUS,
+                                  "Unsetting focus from %s due to LeaveNotify\n",
+                                  window->desc);
+                      meta_display_focus_the_no_focus_window (display, 
+                                                              event->xcrossing.time);
+                    }
+                  if (window->type != META_WINDOW_DOCK &&
+                      window->type != META_WINDOW_DESKTOP)
+                    {
+                      meta_topic (META_DEBUG_FOCUS,
+                                  "Setting display->mouse_mode to TRUE due to "
+                                  "LeaveNotify at time %lu.\n",
+                                  event->xcrossing.time);
+                      display->mouse_mode = TRUE;
+                    }
                 }
               break;
             case META_FOCUS_MODE_SLOPPY:
@@ -2124,18 +2186,25 @@ event_callback (XEvent   *event,
                 {
                   int space;
                   MetaWorkspace *workspace;
+                  guint32 time;
               
                   space = event->xclient.data.l[0];
+                  time = event->xclient.data.l[1];
               
-                  meta_verbose ("Request to change current workspace to %d\n",
-                                space);
-              
+                  meta_verbose ("Request to change current workspace to %d with "
+                                "specified timestamp of %lu\n",
+                                space, (unsigned long)time);
+
                   workspace =
                     meta_screen_get_workspace_by_index (screen,
                                                         space);
 
+                  /* Handle clients using the older version of the spec... */
+                  if (time == 0 && workspace)
+                    time = meta_display_get_current_time_roundtrip (display);
+
                   if (workspace)
-                    meta_workspace_activate (workspace, meta_display_get_current_time_roundtrip (display));
+                    meta_workspace_activate (workspace, time);
                   else
                     meta_verbose ("Don't know about workspace %d\n", space);
                 }
@@ -3181,6 +3250,7 @@ meta_display_begin_grab_op (MetaDisplay *display,
   display->grab_last_moveresize_time.tv_sec = 0;
   display->grab_last_moveresize_time.tv_usec = 0;
   display->grab_motion_notify_time = 0;
+  display->grab_old_window_stacking = NULL;
 #ifdef HAVE_XSYNC
   display->grab_sync_request_alarm = None;
 #endif
@@ -3201,29 +3271,14 @@ meta_display_begin_grab_op (MetaDisplay *display,
       display->grab_anchor_window_pos = display->grab_initial_window_pos;
 
       display->grab_wireframe_active =
-        meta_prefs_get_reduced_resources () && 
+        (meta_prefs_get_reduced_resources () && !meta_prefs_get_gnome_accessibility ())  && 
         (meta_grab_op_is_resizing (display->grab_op) ||
          meta_grab_op_is_moving (display->grab_op));
       
       if (display->grab_wireframe_active)
         {
-          MetaRectangle xor_rect;
-          
-          display->grab_wireframe_rect = window->rect;
-          if (window->frame)
-            {
-              display->grab_wireframe_rect.x += window->frame->rect.x;
-              display->grab_wireframe_rect.y += window->frame->rect.y;
-            }
-          
           meta_window_calc_showing (display->grab_window);
-
-          meta_window_get_xor_rect (window, &display->grab_wireframe_rect,
-                                    &xor_rect);
-          
-          meta_effects_begin_wireframe (display->grab_window->screen,
-                                        &xor_rect);
-          display->grab_wireframe_last_xor_rect = xor_rect;
+          meta_window_begin_wireframe (window);
         }
       
 #ifdef HAVE_XSYNC
@@ -3289,6 +3344,16 @@ meta_display_begin_grab_op (MetaDisplay *display,
   g_assert (display->grab_window != NULL || display->grab_screen != NULL);
   g_assert (display->grab_op != META_GRAB_OP_NONE);
 
+  /* Save the old stacking */
+  if (GRAB_OP_IS_WINDOW_SWITCH (display->grab_op))
+    {
+      meta_topic (META_DEBUG_WINDOW_OPS,
+                  "Saving old stack positions; old pointer was %p.\n",
+                  display->grab_old_window_stacking);
+      display->grab_old_window_stacking = 
+        meta_stack_get_positions (screen->stack);
+    }
+
   /* Do this last, after everything is set up. */
   switch (op)
     {
@@ -3340,10 +3405,7 @@ meta_display_end_grab_op (MetaDisplay *display,
   if (display->grab_window != NULL)
     display->grab_window->shaken_loose = FALSE;
   
-  if (display->grab_op == META_GRAB_OP_KEYBOARD_TABBING_NORMAL ||
-      display->grab_op == META_GRAB_OP_KEYBOARD_TABBING_DOCK ||
-      display->grab_op == META_GRAB_OP_KEYBOARD_ESCAPING_NORMAL ||
-      display->grab_op == META_GRAB_OP_KEYBOARD_ESCAPING_DOCK ||
+  if (GRAB_OP_IS_WINDOW_SWITCH (display->grab_op) ||
       display->grab_op == META_GRAB_OP_KEYBOARD_WORKSPACE_SWITCHING)
     {
       meta_ui_tab_popup_free (display->grab_screen->tab_popup);
@@ -3355,11 +3417,20 @@ meta_display_end_grab_op (MetaDisplay *display,
       display->ungrab_should_not_cause_focus_window = display->grab_xwindow;
     }
   
+  if (display->grab_old_window_stacking != NULL)
+    {
+      meta_topic (META_DEBUG_WINDOW_OPS,
+                  "Clearing out the old stack position, which was %p.\n",
+                  display->grab_old_window_stacking);
+      g_list_free (display->grab_old_window_stacking);
+      display->grab_old_window_stacking = NULL;
+    }
+
   if (display->grab_wireframe_active)
     {
       display->grab_wireframe_active = FALSE;
-      meta_effects_end_wireframe (display->grab_window->screen,
-                                  &display->grab_wireframe_last_xor_rect);
+      meta_window_end_wireframe (display->grab_window);
+
       if (!display->grab_was_cancelled)
         meta_window_move_resize (display->grab_window,
                                  TRUE,
@@ -3703,6 +3774,36 @@ meta_display_retheme_all (void)
     }
 }
 
+void 
+meta_display_set_cursor_theme (const char *theme, 
+			       int         size)
+{
+#ifdef HAVE_XCURSOR     
+  GSList *tmp, *tmp2;
+  
+  tmp = meta_displays_list ();
+  while (tmp != NULL)
+    {
+      MetaDisplay *display = tmp->data;
+
+      XcursorSetTheme (display->xdisplay, theme);
+      XcursorSetDefaultSize (display->xdisplay, size);
+
+      tmp2 = display->screens;
+      while (tmp2 != NULL)
+	{
+	  MetaScreen *screen = tmp2->data;
+	  	  
+	  meta_screen_update_cursor (screen);
+
+	  tmp2 = tmp2->next;
+	}
+      
+      tmp = tmp->next;
+    }
+#endif
+}
+
 static gboolean is_syncing = FALSE;
 
 gboolean
@@ -4605,20 +4706,114 @@ meta_display_focus_sentinel_clear (MetaDisplay *display)
   return (display->sentinel_counter == 0);
 }
 
+static void
+sanity_check_timestamps (MetaDisplay *display,
+                         Time         timestamp)
+{
+  if (XSERVER_TIME_IS_BEFORE (timestamp, display->last_focus_time))
+    {
+      meta_warning ("last_focus_time (%lu) is greater than comparison "
+                    "timestamp (%lu).  This most likely represents a buggy "
+                    "client sending inaccurate timestamps in messages such as "
+                    "_NET_ACTIVE_WINDOW.  Trying to work around...\n",
+                    display->last_focus_time, (unsigned long)timestamp);
+      display->last_focus_time = timestamp;
+    }
+  if (XSERVER_TIME_IS_BEFORE (timestamp, display->last_user_time))
+    {
+      GSList *windows;
+      GSList *tmp;
+
+      meta_warning ("last_user_time (%lu) is greater than comparison "
+                    "timestamp (%lu).  This most likely represents a buggy "
+                    "client sending inaccurate timestamps in messages such as "
+                    "_NET_ACTIVE_WINDOW.  Trying to work around...\n",
+                    display->last_user_time, (unsigned long)timestamp);
+      display->last_user_time = timestamp;
+
+      windows = meta_display_list_windows (display);
+      tmp = windows;
+      while (tmp != NULL)
+        {
+          MetaWindow *window = tmp->data;
+          
+          if (XSERVER_TIME_IS_BEFORE (timestamp, window->net_wm_user_time))
+            {
+              meta_warning ("%s appears to be one of the offending windows "
+                            "with a timestamp of %lu.  Working around...\n",
+                            window->desc, window->net_wm_user_time);
+              window->net_wm_user_time = timestamp;
+            }
+          
+          tmp = tmp->next;
+        }
+
+      g_slist_free (windows);
+    }
+}
+
+static gboolean
+timestamp_too_old (MetaDisplay *display,
+                   MetaWindow  *window,
+                   Time        *timestamp)
+{
+  /* FIXME: If Soeren's suggestion in bug 151984 is implemented, it will allow
+   * us to sanity check the timestamp here and ensure it doesn't correspond to
+   * a future time (though we would want to rename to 
+   * timestamp_too_old_or_in_future).
+   */
+
+  MetaWindow *focus_window;
+  focus_window = display->focus_window;
+
+  if (*timestamp == CurrentTime)
+    {
+      meta_warning ("Got a request to focus %s with a timestamp of 0.  This "
+                    "shouldn't happen!\n",
+                    window ? window->desc : "the no_focus_window");
+      meta_print_backtrace ();
+      *timestamp = meta_display_get_current_time_roundtrip (display);
+      return FALSE;
+    }
+  else if (XSERVER_TIME_IS_BEFORE (*timestamp, display->last_focus_time))
+    {
+      if (XSERVER_TIME_IS_BEFORE (*timestamp, display->last_user_time))
+        {
+          meta_topic (META_DEBUG_FOCUS,
+                      "Ignoring focus request for %s since %lu "
+                      "is less than %lu and %lu.\n",
+                      window ? window->desc : "the no_focus_window",
+                      *timestamp,
+                      (unsigned long) display->last_user_time,
+                      (unsigned long) display->last_focus_time);
+          return TRUE;
+        }
+      else
+        {
+          meta_topic (META_DEBUG_FOCUS,
+                      "Received focus request for %s which is newer than most "
+                      "recent user_time, but less recent than "
+                      "last_focus_time (%lu < %lu < %lu); adjusting "
+                      "accordingly.  (See bug 167358)\n",
+                      window ? window->desc : "the no_focus_window",
+                      display->last_user_time,
+                      *timestamp,
+                      display->last_focus_time);
+          *timestamp = display->last_focus_time;
+          return FALSE;
+        }
+    }
+
+  return FALSE;
+}
+
 void
 meta_display_set_input_focus_window (MetaDisplay *display, 
                                      MetaWindow  *window,
                                      gboolean     focus_frame,
                                      Time         timestamp)
 {
-  if (timestamp == CurrentTime)
-    {
-      meta_warning ("meta_display_set_input_focus_window called with a "
-                    "timestamp of 0 for window %s.  This shouldn't happen!\n",
-                    window->desc);
-      meta_print_backtrace ();
-    }
-  else if (XSERVER_TIME_IS_BEFORE (timestamp, display->last_focus_time))
+  if (timestamp_too_old (display, window, &timestamp))
     return;
 
   XSetInputFocus (display->xdisplay,
@@ -4636,17 +4831,8 @@ void
 meta_display_focus_the_no_focus_window (MetaDisplay *display, 
                                         Time         timestamp)
 {
-  if (timestamp == CurrentTime)
-    {
-      meta_warning ("meta_display_focus_the_no_focus_window called with a "
-                    "timestamp of 0.  This shouldn't happen!\n");
-      meta_print_backtrace ();
-    }
-  else if (XSERVER_TIME_IS_BEFORE (timestamp, display->last_focus_time))
-    {
-      meta_warning ("Ignoring focus request for no_focus_window since %lu is less than %lu.\n", timestamp, display->last_focus_time);
+  if (timestamp_too_old (display, NULL, &timestamp))
     return;
-    }
 
   XSetInputFocus (display->xdisplay,
                   display->no_focus_window,

src/display.h

@@ -182,6 +182,7 @@ struct _MetaDisplay
   Atom atom_net_moveresize_window;
   Atom atom_net_desktop_geometry;
   Atom atom_net_desktop_viewport;
+  Atom atom_metacity_version;
 
   /* This is the actual window from focus events,
    * not the one we last set
@@ -197,9 +198,17 @@ struct _MetaDisplay
    */
   MetaWindow *expected_focus_window;
 
-  /* last timestamp that a window was focused */
+  /* last timestamp passed to XSetInputFocus */
   Time last_focus_time;
 
+  /* last user interaction time in any app */
+  Time last_user_time;
+
+  /* whether we're using mousenav (only relevant for sloppy&mouse focus modes;
+   * !mouse_mode means "keynav mode")
+   */
+  guint mouse_mode : 1;
+
   guint static_gravity_works : 1;
   
   /*< private-ish >*/
@@ -265,6 +274,9 @@ struct _MetaDisplay
   MetaResizePopup *grab_resize_popup;
   GTimeVal    grab_last_moveresize_time;
   Time        grab_motion_notify_time;
+  int         grab_wireframe_last_display_width;
+  int         grab_wireframe_last_display_height;
+  GList*      grab_old_window_stacking;
   
   /* we use property updates as sentinels for certain window focus events
    * to avoid some race conditions on EnterNotify events
@@ -359,11 +371,21 @@ struct _MetaDisplay
  * has occurred, this is equivalent to
  *   time1 < time2
  * Of course, the rest of the ugliness of this macro comes from accounting
- * for the fact that wraparound can occur.
+ * for the fact that wraparound can occur and the fact that a timestamp of
+ * 0 must be special-cased since it means older than anything else. 
+ *
+ * Note that this is NOT an equivalent for time1 <= time2; if that's what
+ * you need then you'll need to swap the order of the arguments and negate
+ * the result.
  */
-#define XSERVER_TIME_IS_BEFORE(time1, time2)                       \
-  ( (( time1 < time2 ) && ( time2 - time1 < ((guint32)-1)/2 )) ||  \
-    (( time1 > time2 ) && ( time1 - time2 > ((guint32)-1)/2 ))     \
+#define XSERVER_TIME_IS_BEFORE_ASSUMING_REAL_TIMESTAMPS(time1, time2) \
+  ( (( time1 < time2 ) && ( time2 - time1 < ((guint32)-1)/2 )) ||     \
+    (( time1 > time2 ) && ( time1 - time2 > ((guint32)-1)/2 ))        \
+  )
+#define XSERVER_TIME_IS_BEFORE(time1, time2)                          \
+  ( time1 == 0 ||                                                     \
+    (XSERVER_TIME_IS_BEFORE_ASSUMING_REAL_TIMESTAMPS(time1, time2) && \
+     time2 != 0)                                                      \
   )
 
 gboolean      meta_display_open                (const char  *name);
@@ -449,6 +471,9 @@ const char* meta_event_detail_to_string (int d);
 void meta_display_queue_retheme_all_windows (MetaDisplay *display);
 void meta_display_retheme_all (void);
 
+void meta_display_set_cursor_theme (const char *theme, 
+				    int         size);
+
 void     meta_display_ping_window              (MetaDisplay        *display,
 						MetaWindow         *window,
 						Time                timestamp,
@@ -505,9 +530,11 @@ gboolean meta_display_focus_sentinel_clear (MetaDisplay *display);
 /* meta_display_set_input_focus_window is like XSetInputFocus, except
  * that (a) it can't detect timestamps later than the current time,
  * since Metacity isn't part of the XServer, and thus gives erroneous
- * behavior in this circumstance (so don't do it), and (b) it uses
- * display->last_focus_time and display->expected_focus_window since
- * we don't have access to the true Xserver ones.
+ * behavior in this circumstance (so don't do it), (b) it uses
+ * display->last_focus_time since we don't have access to the true
+ * Xserver one, (c) it makes use of display->user_time since checking
+ * whether a window should be allowed to be focused should depend
+ * on user_time events (see bug 167358, comment 15 in particular)
  */
 void meta_display_set_input_focus_window   (MetaDisplay *display, 
                                             MetaWindow  *window,

src/effects.c

@@ -28,6 +28,8 @@
 #include <X11/extensions/shape.h>
 #endif
 
+#include <string.h>
+
 typedef enum
 {
   META_ANIMATION_DRAW_ROOT,
@@ -429,56 +431,138 @@ meta_effects_draw_box_animation (MetaScreen     *screen,
 
 void
 meta_effects_begin_wireframe (MetaScreen          *screen,
-                              const MetaRectangle *rect)
+                              const MetaRectangle *rect,
+                              int                  width,
+                              int                  height)
 {
   /* Grab the X server to avoid screen dirt */
   meta_display_grab (screen->display);
   meta_ui_push_delay_exposes (screen->ui);  
 
-  meta_effects_update_wireframe (screen, NULL, rect);
+  meta_effects_update_wireframe (screen, 
+                                 NULL, -1, -1,
+                                 rect, width, height);
 }
 
 static void
 draw_xor_rect (MetaScreen          *screen,
-               const MetaRectangle *rect)
+               const MetaRectangle *rect,
+               int                  width,
+               int                  height)
 {
   /* The lines in the center can't overlap the rectangle or each
    * other, or the XOR gets reversed. So we have to draw things
    * a bit oddly.
    */
   XSegment segments[8];
+  MetaRectangle shrunk_rect;
   int i;
   
 #define LINE_WIDTH META_WIREFRAME_XOR_LINE_WIDTH
-  
+
+  /* We don't want the wireframe going outside the window area.
+   * It makes it harder for the user to position windows and it exposes other
+   * annoying bugs.
+   */
+  shrunk_rect = *rect;
+
+  shrunk_rect.x += LINE_WIDTH / 2 + LINE_WIDTH % 2;
+  shrunk_rect.y += LINE_WIDTH / 2 + LINE_WIDTH % 2;
+  shrunk_rect.width -= LINE_WIDTH + 2 * (LINE_WIDTH % 2);
+  shrunk_rect.height -= LINE_WIDTH + 2 * (LINE_WIDTH % 2);
+
   XDrawRectangle (screen->display->xdisplay,
                   screen->xroot,
                   screen->root_xor_gc,
-                  rect->x, rect->y,
-                  rect->width, rect->height);
+                  shrunk_rect.x, shrunk_rect.y,
+                  shrunk_rect.width, shrunk_rect.height);
 
   /* Don't put lines inside small rectangles where they won't fit */
-  if (rect->width < (LINE_WIDTH * 4) ||
-      rect->height < (LINE_WIDTH * 4))
+  if (shrunk_rect.width < (LINE_WIDTH * 4) ||
+      shrunk_rect.height < (LINE_WIDTH * 4))
     return;
-  
+
+  if ((width >= 0) && (height >= 0))
+    {
+      XGCValues gc_values = { 0 };
+
+      if (XGetGCValues (screen->display->xdisplay,
+                        screen->root_xor_gc, 
+                        GCFont, &gc_values))
+        {
+          char *text;
+          int text_length;
+
+          XFontStruct *font_struct;
+          int text_width, text_height; 
+          int box_x, box_y;
+          int box_width, box_height;
+
+          font_struct = XQueryFont (screen->display->xdisplay,
+                                    gc_values.font);
+
+          if (font_struct != NULL)
+            {
+              text = g_strdup_printf ("%d x %d", width, height);
+              text_length = strlen (text);
+
+              text_width = text_length * font_struct->max_bounds.width;
+              text_height = font_struct->max_bounds.descent + 
+                            font_struct->max_bounds.ascent;
+
+              box_width = text_width + 2 * LINE_WIDTH;
+              box_height = text_height + 2 * LINE_WIDTH;
+
+
+              box_x = shrunk_rect.x + (shrunk_rect.width - box_width) / 2;
+              box_y = shrunk_rect.y + (shrunk_rect.height - box_height) / 2;
+
+              if ((box_width < shrunk_rect.width) &&
+                  (box_height < shrunk_rect.height))
+                {
+                  XFillRectangle (screen->display->xdisplay,
+                                  screen->xroot,
+                                  screen->root_xor_gc,
+                                  box_x, box_y,
+                                  box_width, box_height);
+                  XDrawString (screen->display->xdisplay, 
+                               screen->xroot,
+                               screen->root_xor_gc,
+                               box_x + LINE_WIDTH,
+                               box_y + LINE_WIDTH + font_struct->max_bounds.ascent,
+                               text, text_length);
+                }
+
+              g_free (text);
+
+              XFreeFontInfo (NULL, font_struct, 1);
+
+              if ((box_width + LINE_WIDTH) >= (shrunk_rect.width / 3))
+                return;
+
+              if ((box_height + LINE_WIDTH) >= (shrunk_rect.height / 3))
+                return;
+            }
+        }
+    }
+
   /* Two vertical lines at 1/3 and 2/3 */
-  segments[0].x1 = rect->x + rect->width / 3;
-  segments[0].y1 = rect->y + LINE_WIDTH / 2 + LINE_WIDTH % 2;
+  segments[0].x1 = shrunk_rect.x + shrunk_rect.width / 3;
+  segments[0].y1 = shrunk_rect.y + LINE_WIDTH / 2 + LINE_WIDTH % 2;
   segments[0].x2 = segments[0].x1;
-  segments[0].y2 = rect->y + rect->height - LINE_WIDTH / 2;  
+  segments[0].y2 = shrunk_rect.y + shrunk_rect.height - LINE_WIDTH / 2;  
 
   segments[1] = segments[0];
-  segments[1].x1 = rect->x + (rect->width / 3) * 2;
+  segments[1].x1 = shrunk_rect.x + (shrunk_rect.width / 3) * 2;
   segments[1].x2 = segments[1].x1;
 
   /* Now make two horizontal lines at 1/3 and 2/3, but not
    * overlapping the verticals
    */
 
-  segments[2].x1 = rect->x + LINE_WIDTH / 2 + LINE_WIDTH % 2;
+  segments[2].x1 = shrunk_rect.x + LINE_WIDTH / 2 + LINE_WIDTH % 2;
   segments[2].x2 = segments[0].x1 - LINE_WIDTH / 2;
-  segments[2].y1 = rect->y + rect->height / 3;
+  segments[2].y1 = shrunk_rect.y + shrunk_rect.height / 3;
   segments[2].y2 = segments[2].y1;
 
   segments[3] = segments[2];
@@ -487,7 +571,7 @@ draw_xor_rect (MetaScreen          *screen,
   
   segments[4] = segments[3];
   segments[4].x1 = segments[3].x2 + LINE_WIDTH;
-  segments[4].x2 = rect->x + rect->width - LINE_WIDTH / 2;
+  segments[4].x2 = shrunk_rect.x + shrunk_rect.width - LINE_WIDTH / 2;
 
   /* Second horizontal line is just like the first, but
    * shifted down
@@ -496,7 +580,7 @@ draw_xor_rect (MetaScreen          *screen,
   while (i < 8)
     {
       segments[i] = segments[i - 3];
-      segments[i].y1 = rect->y + (rect->height / 3) * 2;
+      segments[i].y1 = shrunk_rect.y + (shrunk_rect.height / 3) * 2;
       segments[i].y2 = segments[i].y1;
       ++i;
     }
@@ -511,22 +595,30 @@ draw_xor_rect (MetaScreen          *screen,
 void
 meta_effects_update_wireframe (MetaScreen          *screen,
                                const MetaRectangle *old_rect,
-                               const MetaRectangle *new_rect)
+                               int                  old_width,
+                               int                  old_height,
+                               const MetaRectangle *new_rect,
+                               int                  new_width,
+                               int                  new_height)
 {
   if (old_rect)
-    draw_xor_rect (screen, old_rect);
+    draw_xor_rect (screen, old_rect, old_width, old_height);
     
   if (new_rect)
-    draw_xor_rect (screen, new_rect);
+    draw_xor_rect (screen, new_rect, new_width, new_height);
     
   XFlush (screen->display->xdisplay);
 }
 
 void
 meta_effects_end_wireframe (MetaScreen          *screen,
-                            const MetaRectangle *old_rect)
+                            const MetaRectangle *old_rect,
+                            int                  old_width,
+                            int                  old_height)
 {
-  meta_effects_update_wireframe (screen, old_rect, NULL);
+  meta_effects_update_wireframe (screen, 
+                                 old_rect, old_width, old_height,
+                                 NULL, -1, -1);
   
   meta_display_ungrab (screen->display);
   meta_ui_pop_delay_exposes (screen->ui);

src/effects.h

@@ -42,11 +42,19 @@ void meta_effects_draw_box_animation (MetaScreen     *screen,
                                       MetaBoxAnimType anim_type);
 
 void meta_effects_begin_wireframe  (MetaScreen          *screen,
-                                    const MetaRectangle *rect);
+                                    const MetaRectangle *rect,
+                                    int                  width,
+                                    int                  height);
 void meta_effects_update_wireframe (MetaScreen          *screen,
                                     const MetaRectangle *old_rect,
-                                    const MetaRectangle *new_rect);
+                                    int                  old_width,
+                                    int                  old_height,
+                                    const MetaRectangle *new_rect,
+                                    int                  new_width,
+                                    int                  new_height);
 void meta_effects_end_wireframe    (MetaScreen          *screen,
-                                    const MetaRectangle *old_rect);
+                                    const MetaRectangle *old_rect,
+                                    int                  width,
+                                    int                  height);
 
 #endif /* META_EFFECTS_H */

src/fixedtip.c

@@ -24,8 +24,8 @@
 
 static GtkWidget *tip = NULL;
 static GtkWidget *label = NULL;
-static int screen_width = 0;
-static int screen_height = 0;
+static int screen_right_edge = 0;
+static int screen_bottom_edge = 0;
 
 static gint
 expose_handler (GtkTooltips *tooltips)
@@ -50,13 +50,17 @@ meta_fixed_tip_show (Display *xdisplay, int screen_number,
       tip = gtk_window_new (GTK_WINDOW_POPUP);
       {
         GdkScreen *gdk_screen;
+	GdkRectangle monitor;
+	gint mon_num;
 
         gdk_screen = gdk_display_get_screen (gdk_display_get_default (),
                                              screen_number);
         gtk_window_set_screen (GTK_WINDOW (tip),
                                gdk_screen);
-        screen_width = gdk_screen_get_width (gdk_screen);
-        screen_height = gdk_screen_get_height (gdk_screen);
+	mon_num = gdk_screen_get_monitor_at_point (gdk_screen, root_x, root_y);
+	gdk_screen_get_monitor_geometry (gdk_screen, mon_num, &monitor);
+	screen_right_edge = monitor.x + monitor.width;
+	screen_bottom_edge = monitor.y + monitor.height;
       }
       
       gtk_widget_set_app_paintable (tip, TRUE);
@@ -80,12 +84,9 @@ meta_fixed_tip_show (Display *xdisplay, int screen_number,
 
   gtk_label_set_markup (GTK_LABEL (label), markup_text);
   
-  /* FIXME should also handle Xinerama here, just to be
-   * really cool
-   */
   gtk_window_get_size (GTK_WINDOW (tip), &w, &h);
-  if ((root_x + w) > screen_width)
-    root_x -= (root_x + w) - screen_width;
+  if ((root_x + w) > screen_right_edge)
+    root_x -= (root_x + w) - screen_right_edge;
   
   gtk_window_move (GTK_WINDOW (tip), root_x, root_y);
 

src/frames.c

@@ -62,7 +62,9 @@ static gboolean meta_frames_leave_notify_event    (GtkWidget           *widget,
 static void meta_frames_paint_to_drawable (MetaFrames   *frames,
                                            MetaUIFrame  *frame,
                                            GdkDrawable  *drawable,
-                                           GdkRegion    *region);
+                                           GdkRegion    *region,
+					   int           x_offset,
+					   int           y_offset);
 
 static void meta_frames_set_window_background (MetaFrames   *frames,
                                                MetaUIFrame  *frame);
@@ -88,6 +90,9 @@ static MetaFrameControl get_control  (MetaFrames        *frames,
                                       int                x,
                                       int                y);
 static void clear_tip (MetaFrames *frames);
+static void invalidate_all_caches (MetaFrames *frames);
+static void invalidate_whole_window (MetaFrames *frames,
+				     MetaUIFrame *frame);
 
 static GtkWidgetClass *parent_class = NULL;
 
@@ -188,7 +193,7 @@ meta_frames_init (MetaFrames *frames)
 {
   GTK_WINDOW (frames)->type = GTK_WINDOW_POPUP;
 
-  frames->text_heights = g_hash_table_new (g_int_hash, g_int_equal);
+  frames->text_heights = g_hash_table_new (NULL, NULL);
   
   frames->frames = g_hash_table_new (unsigned_long_hash, unsigned_long_equal);
 
@@ -196,6 +201,10 @@ meta_frames_init (MetaFrames *frames)
 
   frames->expose_delay_count = 0;
 
+  frames->invalidate_cache_timeout_id = 0;
+  frames->invalidate_frames = NULL;
+  frames->cache = g_hash_table_new (g_direct_hash, g_direct_equal);
+
   gtk_widget_set_double_buffered (GTK_WIDGET (frames), FALSE);
 
   meta_prefs_add_listener (prefs_changed_callback, frames);
@@ -253,13 +262,100 @@ meta_frames_finalize (GObject *object)
   meta_prefs_remove_listener (prefs_changed_callback, frames);
   
   g_hash_table_destroy (frames->text_heights);
+
+  invalidate_all_caches (frames);
+  if (frames->invalidate_cache_timeout_id)
+    g_source_remove (frames->invalidate_cache_timeout_id);
   
   g_assert (g_hash_table_size (frames->frames) == 0);
   g_hash_table_destroy (frames->frames);
+  g_hash_table_destroy (frames->cache);
 
   G_OBJECT_CLASS (parent_class)->finalize (object);
 }
 
+typedef struct
+{
+  GdkPixmap *top;
+  gint top_x, top_y;
+  
+  GdkPixmap *left;
+  gint left_x, left_y;
+  
+  GdkPixmap *right;
+  gint right_y, right_x;
+  
+  GdkPixmap *bottom;
+  gint bottom_x, bottom_y;
+  
+} CachedPixels;
+
+static CachedPixels *
+get_cache (MetaFrames *frames,
+	   MetaUIFrame *frame)
+{
+  CachedPixels *pixels;
+  
+  pixels = g_hash_table_lookup (frames->cache, frame);
+
+  if (!pixels)
+    {
+      pixels = g_new0 (CachedPixels, 1);
+      g_hash_table_insert (frames->cache, frame, pixels);
+    }
+
+  return pixels;
+}
+
+static void
+invalidate_cache (MetaFrames *frames,
+		  MetaUIFrame *frame)
+{
+  CachedPixels *pixels = get_cache (frames, frame);
+  
+  if (pixels->top)
+    g_object_unref (pixels->top);
+  if (pixels->left)
+    g_object_unref (pixels->left);
+  if (pixels->right)
+    g_object_unref (pixels->right);
+  if (pixels->bottom)
+    g_object_unref (pixels->bottom);
+  
+  pixels->top = NULL;
+  pixels->bottom = NULL;
+  pixels->right = NULL;
+  pixels->left = NULL;
+
+  g_hash_table_remove (frames->cache, frame);
+}
+
+static void
+invalidate_all_caches (MetaFrames *frames)
+{
+  GList *l;
+
+  for (l = frames->invalidate_frames; l; l = l->next)
+    {
+      MetaUIFrame *frame = l->data;
+
+      invalidate_cache (frames, frame);
+    }
+  
+  g_list_free (frames->invalidate_frames);
+  frames->invalidate_frames = NULL;
+}
+
+static gboolean
+invalidate_cache_timeout (gpointer data)
+{
+  MetaFrames *frames = data;
+  
+  invalidate_all_caches (frames);
+  frames->invalidate_cache_timeout_id = 0;
+  return FALSE;
+}
+
 static void
 queue_recalc_func (gpointer key, gpointer value, gpointer data)
 {
@@ -275,7 +371,7 @@ queue_recalc_func (gpointer key, gpointer value, gpointer data)
    */
   meta_frames_set_window_background (frames, frame);
   
-  gdk_window_invalidate_rect (frame->window, NULL, FALSE);
+  invalidate_whole_window (frames, frame);
   meta_core_queue_frame_resize (gdk_display,
                                 frame->xwindow);
   if (frame->layout)
@@ -296,7 +392,7 @@ meta_frames_font_changed (MetaFrames *frames)
   if (g_hash_table_size (frames->text_heights) > 0)
     {
       g_hash_table_destroy (frames->text_heights);
-      frames->text_heights = g_hash_table_new (g_int_hash, g_int_equal);
+      frames->text_heights = g_hash_table_new (NULL, NULL);
     }
   
   /* Queue a draw/resize on all frames */
@@ -320,7 +416,7 @@ queue_draw_func (gpointer key, gpointer value, gpointer data)
    */
   meta_frames_set_window_background (frames, frame);
 
-  gdk_window_invalidate_rect (frame->window, NULL, FALSE);
+  invalidate_whole_window (frames, frame);
 }
 
 static void
@@ -395,9 +491,9 @@ meta_frames_ensure_layout (MetaFrames  *frames,
 						 meta_prefs_get_titlebar_font ());
 
       size = pango_font_description_get_size (font_desc);
-      
+
       if (g_hash_table_lookup_extended (frames->text_heights,
-                                        &size,
+                                        GINT_TO_POINTER (size),
                                         &key, &value))
         {
           frame->text_height = GPOINTER_TO_INT (value);
@@ -409,7 +505,7 @@ meta_frames_ensure_layout (MetaFrames  *frames,
                                                   gtk_widget_get_pango_context (widget));
 
           g_hash_table_replace (frames->text_heights,
-                                &size,
+                                GINT_TO_POINTER (size),
                                 GINT_TO_POINTER (frame->text_height));
         }
       
@@ -512,6 +608,11 @@ meta_frames_unmanage_window (MetaFrames *frames,
 
   if (frame)
     {
+      /* invalidating all caches ensures the frame
+       * is not actually referenced anymore
+       */
+      invalidate_all_caches (frames);
+      
       /* restore the cursor */
       meta_core_set_screen_cursor (gdk_display,
 				   frame->xwindow,
@@ -922,14 +1023,15 @@ meta_frames_move_resize_frame (MetaFrames *frames,
 			       int         height)
 {
   MetaUIFrame *frame = meta_frames_lookup_window (frames, xwindow);
-  int old_width, old_height;
+  int old_x, old_y, old_width, old_height;
   
   gdk_drawable_get_size (frame->window, &old_width, &old_height);
+  gdk_window_get_position (frame->window, &old_x, &old_y);
 
   gdk_window_move_resize (frame->window, x, y, width, height);
 
   if (old_width != width || old_height != height)
-    gdk_window_invalidate_rect (frame->window, NULL, FALSE);
+    invalidate_whole_window (frames, frame);
 }
 
 void
@@ -943,7 +1045,7 @@ meta_frames_queue_draw (MetaFrames *frames,
 
   frame = meta_frames_lookup_window (frames, xwindow);
 
-  gdk_window_invalidate_rect (frame->window, NULL, FALSE);
+  invalidate_whole_window (frames, frame);
 }
 
 void
@@ -968,8 +1070,8 @@ meta_frames_set_title (MetaFrames *frames,
       g_object_unref (frame->layout);
       frame->layout = NULL;
     }
-  
-  gdk_window_invalidate_rect (frame->window, NULL, FALSE);
+
+  invalidate_whole_window (frames, frame);
 }
 
 void
@@ -985,7 +1087,10 @@ meta_frames_repaint_frame (MetaFrames *frames,
 
   g_assert (frame);
 
-  gdk_window_process_updates (frame->window, TRUE);
+  /* repaint everything, so the other frame don't
+   * lag behind if they are exposed
+   */
+  gdk_window_process_all_updates ();
 }
 
 static void
@@ -1124,6 +1229,7 @@ redraw_control (MetaFrames *frames,
   rect = control_rect (control, &fgeom);
 
   gdk_window_invalidate_rect (frame->window, rect, FALSE);
+  invalidate_cache (frames, frame);
 }
 
 static gboolean
@@ -1691,12 +1797,218 @@ meta_frames_destroy_event           (GtkWidget           *widget,
   return TRUE;
 }
 
+/* Cut and paste from GDK */
+static GdkGC *
+get_bg_gc (GdkWindow *window, int x_offset, int y_offset)
+{
+  GdkWindowObject *private = (GdkWindowObject *)window;
+  guint gc_mask = 0;
+  GdkGCValues gc_values;
+
+  if (private->bg_pixmap == GDK_PARENT_RELATIVE_BG && private->parent)
+    {
+      return get_bg_gc (GDK_WINDOW (private->parent),
+			x_offset + private->x,
+			y_offset + private->y);
+    }
+  else if (private->bg_pixmap && 
+           private->bg_pixmap != GDK_PARENT_RELATIVE_BG && 
+           private->bg_pixmap != GDK_NO_BG)
+    {
+      gc_values.fill = GDK_TILED;
+      gc_values.tile = private->bg_pixmap;
+      gc_values.ts_x_origin = x_offset;
+      gc_values.ts_y_origin = y_offset;
+      
+      gc_mask = GDK_GC_FILL | GDK_GC_TILE | GDK_GC_TS_X_ORIGIN | GDK_GC_TS_Y_ORIGIN;
+
+      return gdk_gc_new_with_values (window, &gc_values, gc_mask);
+    }
+  else
+    {
+      GdkGC *gc = gdk_gc_new (window);
+
+      gdk_gc_set_foreground (gc, &(private->bg_color));
+
+      return gc;
+    }
+}
+
+static void
+clear_backing (GdkPixmap *pixmap,
+	       GdkWindow *window,
+	       int xoffset, int yoffset)
+{
+  GdkGC *tmp_gc = get_bg_gc (window, xoffset, yoffset);
+
+  gdk_draw_rectangle (pixmap, tmp_gc, TRUE,
+		      0, 0, -1, -1);
+  
+  g_object_unref (tmp_gc);
+}
+
+static GdkPixmap *
+generate_pixmap (MetaFrames *frames,
+		 MetaUIFrame *frame,
+		 int x,
+		 int y,
+		 int width,
+		 int height)
+{
+  GdkRectangle rectangle;
+  GdkRegion *region;
+  GdkPixmap *result;
+
+  rectangle.x = x;
+  rectangle.y = y;
+  rectangle.width = MAX (width, 1);
+  rectangle.height = MAX (height, 1);
+  
+  result = gdk_pixmap_new (frame->window, rectangle.width, rectangle.height, -1);
+  
+  clear_backing (result, frame->window, rectangle.x, rectangle.y);
+
+  region = gdk_region_rectangle (&rectangle);
+
+  meta_frames_paint_to_drawable (frames, frame, result, region,
+				 - rectangle.x, - rectangle.y);
+
+  gdk_region_destroy (region);
+
+  return result;
+}
+
+static void
+populate_cache (MetaFrames *frames,
+		MetaUIFrame *frame)
+{
+  int top, bottom, left, right;
+  int width, height;
+  int frame_width, frame_height, screen_width, screen_height;
+  CachedPixels *pixels;
+
+  meta_core_get_frame_extents (gdk_display,
+                               frame->xwindow,
+                               NULL, NULL,
+                               &frame_width, &frame_height);
+
+  meta_core_get_screen_size (gdk_display,
+                             frame->xwindow,
+                             &screen_width, &screen_height);
+
+  /* don't cache extremely large windows */
+  if (frame_width > 2 * screen_width ||
+      frame_height > 2 * screen_height)
+    {
+      return;
+    }
+  
+  meta_theme_get_frame_borders (meta_theme_get_current (),
+                                meta_core_get_frame_type (gdk_display, frame->xwindow),
+				frame->text_height,
+				meta_core_get_frame_flags (gdk_display, frame->xwindow),
+                                &top, &bottom, &left, &right);
+
+  meta_core_get_client_size (gdk_display, frame->xwindow, &width, &height);
+
+  pixels = get_cache (frames, frame);
+  
+  if (!pixels->top)
+    {
+      pixels->top = generate_pixmap (frames, frame,
+				    0, 0, left + width + height, top);
+      pixels->top_x = 0;
+      pixels->top_y = 0;
+    }
+  
+  if (!pixels->left)
+    {
+      pixels->left = generate_pixmap (frames, frame,
+				     0, top, left, height);
+      pixels->left_x = 0;
+      pixels->left_y = top;
+    }
+  
+  if (!pixels->right)
+    {
+      pixels->right = generate_pixmap (frames, frame,
+				      left + width, top, right, height);
+      pixels->right_x = left + width;
+      pixels->right_y = top;
+    }
+  
+  if (!pixels->bottom)
+    {
+      pixels->bottom = generate_pixmap (frames, frame,
+				       0, top + height, left + width + height, bottom);
+      pixels->bottom_x = 0;
+      pixels->bottom_y = top + height;
+    }
+  
+  if (frames->invalidate_cache_timeout_id)
+    g_source_remove (frames->invalidate_cache_timeout_id);
+  
+  frames->invalidate_cache_timeout_id = g_timeout_add (1000, invalidate_cache_timeout, frames);
+
+  if (!g_list_find (frames->invalidate_frames, frame))
+    frames->invalidate_frames =
+      g_list_prepend (frames->invalidate_frames, frame);
+}
+
+static void
+clip_to_screen (GdkRegion *region, MetaUIFrame *frame)
+{
+  GdkRectangle frame_area;
+  GdkRectangle screen_area = { 0, 0, 0, 0 };
+  GdkRegion *tmp_region;
+  
+  /* Chop off stuff outside the screen; this optimization
+   * is crucial to handle huge client windows,
+   * like "xterm -geometry 1000x1000"
+   */
+  meta_core_get_frame_extents (gdk_display,
+                               frame->xwindow,
+                               &frame_area.x, &frame_area.y,
+                               &frame_area.width, &frame_area.height);
+
+  meta_core_get_screen_size (gdk_display,
+                             frame->xwindow,
+                             &screen_area.width, &screen_area.height);
+
+  gdk_region_offset (region, frame_area.x, frame_area.y);
+
+  tmp_region = gdk_region_rectangle (&frame_area);
+  gdk_region_intersect (region, tmp_region);
+  gdk_region_destroy (tmp_region);
+
+  gdk_region_offset (region, - frame_area.x, - frame_area.y);
+}
+
+static void
+subtract_from_region (GdkRegion *region, GdkDrawable *drawable,
+		      gint x, gint y)
+{
+  GdkRectangle rect;
+  GdkRegion *reg_rect;
+
+  gdk_drawable_get_size (drawable, &rect.width, &rect.height);
+  rect.x = x;
+  rect.y = y;
+
+  reg_rect = gdk_region_rectangle (&rect);
+  gdk_region_subtract (region, reg_rect);
+  gdk_region_destroy (reg_rect);
+}
+
 static gboolean
 meta_frames_expose_event (GtkWidget           *widget,
                           GdkEventExpose      *event)
 {
   MetaUIFrame *frame;
   MetaFrames *frames;
+  GdkGC *gc;
+  GdkRegion *region;
+  CachedPixels *pixels;
 
   frames = META_FRAMES (widget);
 
@@ -1711,8 +2023,57 @@ meta_frames_expose_event (GtkWidget           *widget,
       return TRUE;
     }
 
-  meta_frames_paint_to_drawable (frames, frame, frame->window, event->region);
+  populate_cache (frames, frame);
 
+  region = gdk_region_copy (event->region);
+  
+  gc = gdk_gc_new (frame->window);
+
+  pixels = get_cache (frames, frame);
+  
+  if (pixels->top)
+    {
+      gdk_draw_drawable (frame->window, gc, pixels->top,
+			 0, 0,
+			 pixels->top_x, pixels->top_y,
+			 -1, -1);
+      subtract_from_region (region, pixels->top, pixels->top_x, pixels->top_y);
+    }
+
+  if (pixels->left)
+    {
+      gdk_draw_drawable (frame->window, gc, pixels->left,
+			 0, 0,
+			 pixels->left_x, pixels->left_y,
+			 -1, -1);
+      subtract_from_region (region, pixels->left, pixels->left_x, pixels->left_y);
+    }
+
+  if (pixels->right)
+    {
+      gdk_draw_drawable (frame->window, gc, pixels->right,
+			 0, 0,
+			 pixels->right_x, pixels->right_y,
+			 -1, -1);
+      subtract_from_region (region, pixels->right, pixels->right_x, pixels->right_y);
+    }
+  
+  if (pixels->bottom)
+    {
+      gdk_draw_drawable (frame->window, gc, pixels->bottom,
+			 0, 0,
+			 pixels->bottom_x, pixels->bottom_y,
+			 -1, -1);
+      subtract_from_region (region, pixels->bottom, pixels->bottom_x, pixels->bottom_y);
+    }
+
+  clip_to_screen (region, frame);
+  meta_frames_paint_to_drawable (frames, frame,
+				 frame->window, region, 0, 0);
+  
+  g_object_unref (gc);
+  gdk_region_destroy (region);
+  
   return TRUE;
 }
 
@@ -1720,7 +2081,9 @@ static void
 meta_frames_paint_to_drawable (MetaFrames   *frames,
                                MetaUIFrame  *frame,
                                GdkDrawable  *drawable,
-                               GdkRegion    *region)
+                               GdkRegion    *region,
+			       int           x_offset,
+			       int           y_offset)
 {
   GtkWidget *widget;
   MetaFrameFlags flags;
@@ -1737,7 +2100,6 @@ meta_frames_paint_to_drawable (MetaFrames   *frames,
   GdkRectangle area;
   GdkRectangle *areas;
   int n_areas;
-  int screen_width, screen_height;
   MetaButtonLayout button_layout;
   MetaGrabOp grab_op;
   
@@ -1834,36 +2196,6 @@ meta_frames_paint_to_drawable (MetaFrames   *frames,
   gdk_region_subtract (edges, tmp_region);
   gdk_region_destroy (tmp_region);
 
-  /* Chop off stuff outside the screen; this optimization
-   * is crucial to handle huge client windows,
-   * like "xterm -geometry 1000x1000"
-   */
-  meta_core_get_frame_extents (gdk_display,
-                               frame->xwindow,
-                               &area.x, &area.y,
-                               &area.width, &area.height);
-
-  meta_core_get_screen_size (gdk_display,
-                             frame->xwindow,
-                             &screen_width, &screen_height);
-
-  if ((area.x + area.width) > screen_width)
-    area.width = screen_width - area.x;
-  if (area.width < 0)
-    area.width = 0;
-  
-  if ((area.y + area.height) > screen_height)
-    area.height = screen_height - area.y;
-  if (area.height < 0)
-    area.height = 0;
-
-  area.x = 0; /* make relative to frame rather than screen */
-  area.y = 0;
-  
-  tmp_region = gdk_region_rectangle (&area);
-  gdk_region_intersect (edges, tmp_region);
-  gdk_region_destroy (tmp_region);
-
   /* Now draw remaining portion of region */
   gdk_region_get_rectangles (edges, &areas, &n_areas);
 
@@ -1878,8 +2210,8 @@ meta_frames_paint_to_drawable (MetaFrames   *frames,
       meta_theme_draw_frame (meta_theme_get_current (),
                              widget,
                              drawable,
-                             &areas[i],
-                             0, 0,
+                             NULL, /* &areas[i], */
+                             x_offset, y_offset,
                              type,
                              flags,
                              w, h,
@@ -2157,7 +2489,7 @@ queue_pending_exposes_func (gpointer key, gpointer value, gpointer data)
 
   if (frame->expose_delayed)
     {
-      gdk_window_invalidate_rect (frame->window, NULL, FALSE);
+      invalidate_whole_window (frames, frame);
       frame->expose_delayed = FALSE;
     }
 }
@@ -2176,3 +2508,11 @@ meta_frames_pop_delay_exposes  (MetaFrames *frames)
                             frames);
     }
 }
+
+static void
+invalidate_whole_window (MetaFrames *frames,
+			 MetaUIFrame *frame)
+{
+  gdk_window_invalidate_rect (frame->window, NULL, FALSE);
+  invalidate_cache (frames, frame);
+}

src/frames.h

@@ -90,6 +90,10 @@ struct _MetaFrames
   MetaUIFrame *last_motion_frame;
 
   int expose_delay_count;
+
+  int invalidate_cache_timeout_id;
+  GList *invalidate_frames;
+  GHashTable *cache;
 };
 
 struct _MetaFramesClass

src/gradient.c

@@ -166,7 +166,6 @@ meta_gradient_create_interwoven (int            width,
   long r2, g2, b2, dr2, dg2, db2;
   GdkPixbuf *pixbuf;
   unsigned char *ptr;
-  unsigned char rr, gg, bb;
   unsigned char *pixels;
   int rowstride;
   
@@ -199,37 +198,21 @@ meta_gradient_create_interwoven (int            width,
       
       if (k == 0)
         {
-          rr = r1>>16;
-          gg = g1>>16;
-          bb = b1>>16;
+          ptr[0] = (unsigned char) (r1>>16);
+          ptr[1] = (unsigned char) (g1>>16);
+          ptr[2] = (unsigned char) (b1>>16);
         }
       else
         {
-          rr = r2>>16;
-          gg = g2>>16;
-          bb = b2>>16;
-        }
-      for (j=0; j<width/8; j++)
-        {
-          *(ptr++) = rr; *(ptr++) = gg; *(ptr++) = bb;
-          *(ptr++) = rr; *(ptr++) = gg; *(ptr++) = bb;
-          *(ptr++) = rr; *(ptr++) = gg; *(ptr++) = bb;
-          *(ptr++) = rr; *(ptr++) = gg; *(ptr++) = bb;
-          *(ptr++) = rr; *(ptr++) = gg; *(ptr++) = bb;
-          *(ptr++) = rr; *(ptr++) = gg; *(ptr++) = bb;
-          *(ptr++) = rr; *(ptr++) = gg; *(ptr++) = bb;
-          *(ptr++) = rr; *(ptr++) = gg; *(ptr++) = bb;
-        }
-      switch (width%8)
-        {
-        case 7: *(ptr++) = rr; *(ptr++) = gg; *(ptr++) = bb;
-        case 6: *(ptr++) = rr; *(ptr++) = gg; *(ptr++) = bb;
-        case 5: *(ptr++) = rr; *(ptr++) = gg; *(ptr++) = bb;
-        case 4: *(ptr++) = rr; *(ptr++) = gg; *(ptr++) = bb;
-        case 3: *(ptr++) = rr; *(ptr++) = gg; *(ptr++) = bb;
-        case 2: *(ptr++) = rr; *(ptr++) = gg; *(ptr++) = bb;
-        case 1: *(ptr++) = rr; *(ptr++) = gg; *(ptr++) = bb;
+          ptr[0] = (unsigned char) (r2>>16);
+          ptr[1] = (unsigned char) (g2>>16);
+          ptr[2] = (unsigned char) (b2>>16);
         }
+
+      for (j=1; j <= width/2; j *= 2)
+        memcpy (&(ptr[j*3]), ptr, j*3);
+      memcpy (&(ptr[j*3]), ptr, (width - j)*3);
+
       if (++l == ll)
         {
           if (k == 0)
@@ -346,7 +329,6 @@ meta_gradient_create_vertical (int width, int height,
   long r, g, b, dr, dg, db;
   GdkPixbuf *pixbuf;
   unsigned char *ptr;
-  unsigned char rr, gg, bb;
   int r0, g0, b0;
   int rf, gf, bf;
   int rowstride;
@@ -378,30 +360,14 @@ meta_gradient_create_vertical (int width, int height,
     {
       ptr = pixels + i * rowstride;
       
-      rr = r>>16;
-      gg = g>>16;
-      bb = b>>16;
-      for (j=0; j<width/8; j++)
-        {
-          *(ptr++) = rr; *(ptr++) = gg; *(ptr++) = bb;
-          *(ptr++) = rr; *(ptr++) = gg; *(ptr++) = bb;
-          *(ptr++) = rr; *(ptr++) = gg; *(ptr++) = bb;
-          *(ptr++) = rr; *(ptr++) = gg; *(ptr++) = bb;
-          *(ptr++) = rr; *(ptr++) = gg; *(ptr++) = bb;
-          *(ptr++) = rr; *(ptr++) = gg; *(ptr++) = bb;
-          *(ptr++) = rr; *(ptr++) = gg; *(ptr++) = bb;
-          *(ptr++) = rr; *(ptr++) = gg; *(ptr++) = bb;
-	}
-      switch (width%8)
-        {
-        case 7: *(ptr++) = rr; *(ptr++) = gg; *(ptr++) = bb;
-        case 6: *(ptr++) = rr; *(ptr++) = gg; *(ptr++) = bb;
-        case 5: *(ptr++) = rr; *(ptr++) = gg; *(ptr++) = bb;
-        case 4: *(ptr++) = rr; *(ptr++) = gg; *(ptr++) = bb;
-        case 3: *(ptr++) = rr; *(ptr++) = gg; *(ptr++) = bb;
-        case 2: *(ptr++) = rr; *(ptr++) = gg; *(ptr++) = bb;
-        case 1: *(ptr++) = rr; *(ptr++) = gg; *(ptr++) = bb;
-	}
+      ptr[0] = (unsigned char)(r>>16);
+      ptr[1] = (unsigned char)(g>>16);
+      ptr[2] = (unsigned char)(b>>16);
+
+      for (j=1; j <= width/2; j *= 2)
+        memcpy (&(ptr[j*3]), ptr, j*3);
+      memcpy (&(ptr[j*3]), ptr, (width - j)*3);
+
       r+=dr;
       g+=dg;
       b+=db;
@@ -565,9 +531,7 @@ meta_gradient_create_multi_vertical (int width, int height,
   unsigned char *ptr, *tmp, *pixels;
   int height2;
   int x;
-  unsigned char rr, gg, bb;    
   int rowstride;
-  int pad;
   
   g_return_val_if_fail (count > 2, NULL);
 
@@ -577,7 +541,6 @@ meta_gradient_create_multi_vertical (int width, int height,
     
   pixels = gdk_pixbuf_get_pixels (pixbuf);
   rowstride = gdk_pixbuf_get_rowstride (pixbuf);
-  pad = rowstride - (width * 3);
   ptr = pixels;
     
   if (count > height)
@@ -602,25 +565,15 @@ meta_gradient_create_multi_vertical (int width, int height,
 
       for (j=0; j<height2; j++)
         {
-          rr = r>>16;
-          gg = g>>16;
-          bb = b>>16;
+          ptr[0] = (unsigned char)(r>>16);
+          ptr[1] = (unsigned char)(g>>16);
+          ptr[2] = (unsigned char)(b>>16);
 
-          for (x=0; x<width/4; x++)
-            {
-              *ptr++ = rr; *ptr++ = gg; *ptr++ = bb;
-              *ptr++ = rr; *ptr++ = gg; *ptr++ = bb;
-              *ptr++ = rr; *ptr++ = gg; *ptr++ = bb;
-              *ptr++ = rr; *ptr++ = gg; *ptr++ = bb;
-	    }
-          switch (width%4)
-            {
-            case 3: *ptr++ = rr; *ptr++ = gg; *ptr++ = bb;
-            case 2: *ptr++ = rr; *ptr++ = gg; *ptr++ = bb;
-            case 1: *ptr++ = rr; *ptr++ = gg; *ptr++ = bb;
-	    }
+          for (x=1; x <= width/2; x *= 2)
+            memcpy (&(ptr[x*3]), ptr, x*3);
+          memcpy (&(ptr[x*3]), ptr, (width - x)*3);
 
-          ptr += pad;
+          ptr += rowstride;
           
           r += dr;
           g += dg;
@@ -632,29 +585,19 @@ meta_gradient_create_multi_vertical (int width, int height,
       b = colors[i].blue << 8;
     }
 
-  rr = r>>16;
-  gg = g>>16;
-  bb = b>>16;
-
   if (k<height)
     {
       tmp = ptr;
-      for (x=0; x<width/4; x++)
-        {
-          *ptr++ = rr; *ptr++ = gg; *ptr++ = bb;
-          *ptr++ = rr; *ptr++ = gg; *ptr++ = bb;
-          *ptr++ = rr; *ptr++ = gg; *ptr++ = bb;
-          *ptr++ = rr; *ptr++ = gg; *ptr++ = bb;
-        }
-      switch (width%4)
-        {
-        case 3: *ptr++ = rr; *ptr++ = gg; *ptr++ = bb;
-        case 2: *ptr++ = rr; *ptr++ = gg; *ptr++ = bb;
-        case 1: *ptr++ = rr; *ptr++ = gg; *ptr++ = bb;
-        default: break;
-        }
 
-      ptr += pad;
+      ptr[0] = (unsigned char) (r>>16);
+      ptr[1] = (unsigned char) (g>>16);
+      ptr[2] = (unsigned char) (b>>16);
+
+      for (x=1; x <= width/2; x *= 2)
+        memcpy (&(ptr[x*3]), ptr, x*3);
+      memcpy (&(ptr[x*3]), ptr, (width - x)*3);
+
+      ptr += rowstride;
       
       for (j=k+1; j<height; j++)
         {

src/keybindings.c

@@ -1690,6 +1690,7 @@ process_keyboard_move_grab (MetaDisplay *display,
   int incr;
   gboolean smart_snap;
   int edge;
+  int candidate_position;
   
   handled = FALSE;
 
@@ -1711,13 +1712,7 @@ process_keyboard_move_grab (MetaDisplay *display,
       meta_window_get_position (window, &x, &y);
     }
 
-  /* FIXME in wireframe mode the edge snapping is all fucked up
-   * since the edge-find routines use window->rect. Window
-   * constraints are also broken with wireframe.
-   */  
   smart_snap = (event->xkey.state & ShiftMask) != 0;
-  if (display->grab_wireframe_active)
-    smart_snap = FALSE;
   
 #define SMALL_INCREMENT 1
 #define NORMAL_INCREMENT 10
@@ -1736,12 +1731,13 @@ process_keyboard_move_grab (MetaDisplay *display,
        * since in wireframe we always moveresize at the end
        * of the grab only.
        */
-      meta_window_move_resize (display->grab_window,
-                               TRUE,
-                               display->grab_initial_window_pos.x,
-                               display->grab_initial_window_pos.y,
-                               display->grab_initial_window_pos.width,
-                               display->grab_initial_window_pos.height);
+      if (!display->grab_wireframe_active)
+        meta_window_move_resize (display->grab_window,
+                                 TRUE,
+                                 display->grab_initial_window_pos.x,
+                                 display->grab_initial_window_pos.y,
+                                 display->grab_initial_window_pos.width,
+                                 display->grab_initial_window_pos.height);
       display->grab_was_cancelled = TRUE;
     }
   
@@ -1758,13 +1754,17 @@ process_keyboard_move_grab (MetaDisplay *display,
     case XK_KP_Up:
       y -= incr;
 
-      if (!display->grab_wireframe_active)
-        {
-          edge = meta_window_find_next_horizontal_edge (window, FALSE);
-          if (smart_snap || ((edge > y) && ABS (edge - y) < incr))
-            y = edge;
-        }
-          
+      edge = meta_window_find_next_horizontal_edge (window, 
+                                                    META_WINDOW_EDGE_TOP,
+                                                    FALSE);
+      if (window->frame)
+        candidate_position = edge + window->frame->child_y;
+      else
+        candidate_position = edge;
+
+      if (smart_snap || ((candidate_position > y) && ABS (candidate_position - y) < incr))
+        y = candidate_position;
+
       handled = TRUE;
       break;
     case XK_KP_End:
@@ -1773,13 +1773,17 @@ process_keyboard_move_grab (MetaDisplay *display,
     case XK_KP_Down:
       y += incr;
 
-      if (!display->grab_wireframe_active)
-        {
-          edge = meta_window_find_next_horizontal_edge (window, TRUE);
-          if (smart_snap || ((edge < y) && ABS (edge - y) < incr))
-            y = edge;
-        }
-          
+      edge = meta_window_find_next_horizontal_edge (window, 
+                                                    META_WINDOW_EDGE_BOTTOM,
+                                                    TRUE);
+      if (window->frame)
+        candidate_position = edge - window->frame->bottom_height - window->rect.height;
+      else
+        candidate_position = edge - window->rect.height;
+
+      if (smart_snap || ((candidate_position < y) && ABS (candidate_position - y) < incr))
+        y = candidate_position;
+
       handled = TRUE;
       break;
     }
@@ -1792,12 +1796,17 @@ process_keyboard_move_grab (MetaDisplay *display,
     case XK_KP_Left:
       x -= incr;
 
-      if (!display->grab_wireframe_active)
-        {
-          edge = meta_window_find_next_vertical_edge (window, FALSE);
-          if (smart_snap || ((edge > x) && ABS (edge - x) < incr))
-            x = edge;
-        }
+      edge = meta_window_find_next_vertical_edge (window, 
+                                                  META_WINDOW_EDGE_LEFT,
+                                                  FALSE);
+      if (window->frame)
+        candidate_position = edge + window->frame->child_x;
+      else
+        candidate_position = edge;
+
+      if (smart_snap || 
+          ((candidate_position > x) && ABS (candidate_position - x) < incr))
+        x = candidate_position;
 
       handled = TRUE;
       break;
@@ -1807,13 +1816,17 @@ process_keyboard_move_grab (MetaDisplay *display,
     case XK_KP_Right:
       x += incr;
 
-      if (!display->grab_wireframe_active)
-        {
-          edge = meta_window_find_next_vertical_edge (window, TRUE);
-          if (smart_snap || ((edge < x) && ABS (edge - x) < incr))
-            x = edge;
-        }
+      edge = meta_window_find_next_vertical_edge (window, 
+                                                  META_WINDOW_EDGE_RIGHT,
+                                                  TRUE);
+      if (window->frame)
+        candidate_position = edge - window->frame->right_width - window->rect.width;
+      else
+        candidate_position = edge - window->rect.width;
       
+      if (smart_snap || ((candidate_position < x) && ABS (candidate_position - x) < incr))
+        x = candidate_position;
+
       handled = TRUE;
       break;
     }
@@ -1825,18 +1838,9 @@ process_keyboard_move_grab (MetaDisplay *display,
                   x, y);
       if (display->grab_wireframe_active)
         {
-          MetaRectangle new_xor;
-
-          display->grab_wireframe_rect.x = x;
-          display->grab_wireframe_rect.y = y;
-          
-          meta_window_get_xor_rect (window, &display->grab_wireframe_rect,
-                                    &new_xor);
-          
-          meta_effects_update_wireframe (window->screen,
-                                         &display->grab_wireframe_last_xor_rect,
-                                         &new_xor);
-          display->grab_wireframe_last_xor_rect = new_xor;
+          meta_window_update_wireframe (window, x, y,
+                                        display->grab_wireframe_rect.width,
+                                        display->grab_wireframe_rect.height);
         }
       else
         {
@@ -1850,50 +1854,15 @@ process_keyboard_move_grab (MetaDisplay *display,
 }
 
 static gboolean
-process_keyboard_resize_grab (MetaDisplay *display,
-                              MetaScreen  *screen,
-                              MetaWindow  *window,
-                              XEvent      *event,
-                              KeySym       keysym)
+process_keyboard_resize_grab_op_change (MetaDisplay *display,
+                                        MetaScreen  *screen,
+                                        MetaWindow  *window,
+                                        XEvent      *event,
+                                        KeySym       keysym)
 {
   gboolean handled;
-  int height_inc;
-  int width_inc;
-  int x, y;
-  int orig_x, orig_y;
-  int width, height;
-  gboolean smart_snap;
-  int edge;
-  int gravity;
-  
+
   handled = FALSE;
-
-  /* don't care about releases, but eat them, don't end grab */
-  if (event->type == KeyRelease)
-    return TRUE;
-
-  /* don't end grab on modifier key presses */
-  if (is_modifier (display, event->xkey.keycode))
-    return TRUE;
-
-  if (keysym == XK_Escape)
-    {
-      /* End resize and restore to original state.
-       * The move_resize is only needed when !wireframe
-       * since in wireframe we always moveresize at the end
-       * of the grab only.
-       */
-      meta_window_move_resize (display->grab_window,
-                               TRUE,
-                               display->grab_initial_window_pos.x,
-                               display->grab_initial_window_pos.y,
-                               display->grab_initial_window_pos.width,
-                               display->grab_initial_window_pos.height);
-      display->grab_was_cancelled = TRUE;
-
-      return FALSE;
-    }
-  
   switch (display->grab_op)
     {
     case META_GRAB_OP_KEYBOARD_RESIZING_UNKNOWN:
@@ -1927,12 +1896,12 @@ process_keyboard_resize_grab (MetaDisplay *display,
         {
         case XK_Left:
         case XK_KP_Left:
-          display->grab_op = META_GRAB_OP_KEYBOARD_RESIZING_SW;
+          display->grab_op = META_GRAB_OP_KEYBOARD_RESIZING_W;
           handled = TRUE;
           break;
         case XK_Right:
         case XK_KP_Right:
-          display->grab_op = META_GRAB_OP_KEYBOARD_RESIZING_SE;
+          display->grab_op = META_GRAB_OP_KEYBOARD_RESIZING_E;
           handled = TRUE;
           break;
         }
@@ -1943,12 +1912,12 @@ process_keyboard_resize_grab (MetaDisplay *display,
         {
         case XK_Left:
         case XK_KP_Left:
-          display->grab_op = META_GRAB_OP_KEYBOARD_RESIZING_NW;
+          display->grab_op = META_GRAB_OP_KEYBOARD_RESIZING_W;
           handled = TRUE;
           break;
         case XK_Right:
         case XK_KP_Right:
-          display->grab_op = META_GRAB_OP_KEYBOARD_RESIZING_NE;
+          display->grab_op = META_GRAB_OP_KEYBOARD_RESIZING_E;
           handled = TRUE;
           break;
         }
@@ -1959,12 +1928,12 @@ process_keyboard_resize_grab (MetaDisplay *display,
         {
         case XK_Up:
         case XK_KP_Up:
-          display->grab_op = META_GRAB_OP_KEYBOARD_RESIZING_NW;          
+          display->grab_op = META_GRAB_OP_KEYBOARD_RESIZING_N;          
           handled = TRUE;
           break;
         case XK_Down:
         case XK_KP_Down:
-          display->grab_op = META_GRAB_OP_KEYBOARD_RESIZING_SW;
+          display->grab_op = META_GRAB_OP_KEYBOARD_RESIZING_S;
           handled = TRUE;
           break;
         }
@@ -1975,12 +1944,12 @@ process_keyboard_resize_grab (MetaDisplay *display,
         {
         case XK_Up:
         case XK_KP_Up:
-          display->grab_op = META_GRAB_OP_KEYBOARD_RESIZING_NE; 
+          display->grab_op = META_GRAB_OP_KEYBOARD_RESIZING_N; 
           handled = TRUE;
           break;
         case XK_Down:
         case XK_KP_Down:
-          display->grab_op = META_GRAB_OP_KEYBOARD_RESIZING_SE;
+          display->grab_op = META_GRAB_OP_KEYBOARD_RESIZING_S;
           handled = TRUE;
           break;
         }
@@ -2003,33 +1972,80 @@ process_keyboard_resize_grab (MetaDisplay *display,
       return TRUE; 
     }
 
+  return FALSE;
+}
+
+static gboolean
+process_keyboard_resize_grab (MetaDisplay *display,
+                              MetaScreen  *screen,
+                              MetaWindow  *window,
+                              XEvent      *event,
+                              KeySym       keysym)
+{
+  gboolean handled;
+  int height_inc;
+  int width_inc;
+  int x, y;
+  int orig_x, orig_y;
+  int width, height;
+  gboolean smart_snap;
+  int edge;
+  int gravity;
+  int candidate_position;
+  
+  handled = FALSE;
+
+  /* don't care about releases, but eat them, don't end grab */
+  if (event->type == KeyRelease)
+    return TRUE;
+
+  /* don't end grab on modifier key presses */
+  if (is_modifier (display, event->xkey.keycode))
+    return TRUE;
+
+  if (keysym == XK_Escape)
+    {
+      /* End resize and restore to original state.
+       * The move_resize is only needed when !wireframe
+       * since in wireframe we always moveresize at the end
+       * of the grab only.
+       */
+      if (!display->grab_wireframe_active)
+        meta_window_move_resize (display->grab_window,
+                                 TRUE,
+                                 display->grab_initial_window_pos.x,
+                                 display->grab_initial_window_pos.y,
+                                 display->grab_initial_window_pos.width,
+                                 display->grab_initial_window_pos.height);
+      display->grab_was_cancelled = TRUE;
+
+      return FALSE;
+    }
+
+  if (process_keyboard_resize_grab_op_change (display, screen, window, 
+                                              event, keysym))
+    return TRUE;
+
   if (display->grab_wireframe_active)
     {
-      x = display->grab_wireframe_rect.x;
-      y = display->grab_wireframe_rect.y;
-      orig_x = x;
-      orig_y = y;
+      orig_x = display->grab_wireframe_rect.x;
+      orig_y = display->grab_wireframe_rect.y;
       width = display->grab_wireframe_rect.width;
       height = display->grab_wireframe_rect.height;
     }
   else
     {
       meta_window_get_position (window, &orig_x, &orig_y);
-      x = orig_x;
-      y = orig_y;
       width = window->rect.width;
       height = window->rect.height;
     }
 
+  x = orig_x;
+  y = orig_y;
+
   gravity = meta_resize_gravity_from_grab_op (display->grab_op);
 
-  /* FIXME in wireframe mode the edge snapping is all fucked up
-   * since the edge-find routines use window->rect. Window
-   * constraints are also broken with wireframe.
-   */  
   smart_snap = (event->xkey.state & ShiftMask) != 0;
-  if (display->grab_wireframe_active)
-    smart_snap = FALSE;
   
 #define SMALL_INCREMENT 1
 #define NORMAL_INCREMENT 10
@@ -2080,17 +2096,27 @@ process_keyboard_resize_grab (MetaDisplay *display,
         case NorthWestGravity:
         case NorthEastGravity:
           /* Move bottom edge up */
-          height -= height_inc;
-          
-          if (!display->grab_wireframe_active)
+          edge = meta_window_find_next_horizontal_edge (window, 
+                                                        META_WINDOW_EDGE_BOTTOM,
+                                                        FALSE);
+
+          if (window->frame)
+            candidate_position = edge - window->frame->bottom_height;
+          else
+            candidate_position = edge;
+
+          if (smart_snap || 
+              ((candidate_position > (y + (height - height_inc))) &&
+               ABS (candidate_position - (y + (height - height_inc))) < height_inc))
             {
-              edge = meta_window_find_next_horizontal_edge (window, TRUE);
-              
-              if (smart_snap || ((edge > (y+height)) &&
-                                 ABS (edge - (y+height)) < height_inc))
-                height = edge - y;
+              if (candidate_position - y > 0)
+                height = candidate_position - y;
             }
-          
+          else if (height - height_inc > 0)
+            {
+              height -= height_inc;
+            }
+
           handled = TRUE;
           break;
 
@@ -2100,14 +2126,18 @@ process_keyboard_resize_grab (MetaDisplay *display,
           /* Move top edge up */
           y -= height_inc;
 
-          if (!display->grab_wireframe_active)
-            {
-              edge = meta_window_find_next_horizontal_edge (window, FALSE);          
+          edge = meta_window_find_next_horizontal_edge (window, 
+                                                        META_WINDOW_EDGE_TOP,
+                                                        FALSE);          
+
+          if (window->frame)
+            candidate_position = edge + window->frame->child_y;
+          else
+            candidate_position = edge;
+
+          if (smart_snap || ((candidate_position > y) && ABS (candidate_position - y) < height_inc))
+            y = candidate_position;
 
-              if (smart_snap || ((edge > y) && ABS (edge - y) < height_inc))
-                y = edge;
-            }
-          
           height += (orig_y - y);
           break;
 
@@ -2131,33 +2161,48 @@ process_keyboard_resize_grab (MetaDisplay *display,
           /* Move bottom edge down */
           height += height_inc;
 
-          if (!display->grab_wireframe_active)
-            {
-              edge = meta_window_find_next_horizontal_edge (window, TRUE);
+          edge = meta_window_find_next_horizontal_edge (window,
+                                                        META_WINDOW_EDGE_BOTTOM,
+                                                        TRUE);
 
-               if (smart_snap || ((edge < (y+height)) &&
-                                  ABS (edge - (y+height)) < height_inc))
-                 height = edge - y;
-            }
-          
-          handled = TRUE;
+          if (window->frame)
+            candidate_position = edge - window->frame->bottom_height;
+          else
+            candidate_position = edge;
+
+          if (smart_snap || ((candidate_position < (y+height)) &&
+                             ABS (candidate_position - (y+height)) < height_inc))
+            height = candidate_position - y;
           break;
 
         case SouthGravity:
         case SouthWestGravity:
         case SouthEastGravity:
           /* Move top edge down */
-          y += height_inc;
+          edge = meta_window_find_next_horizontal_edge (window, 
+                                                        META_WINDOW_EDGE_TOP,
+                                                        TRUE);
 
-          if (!display->grab_wireframe_active)
+          if (window->frame)
+            candidate_position = edge + window->frame->child_y;
+          else
+            candidate_position = edge;
+
+          if (smart_snap || 
+              ((candidate_position < (y + height_inc)) && 
+               ABS (candidate_position - (y + height_inc)) < height_inc))
             {
-              edge = meta_window_find_next_horizontal_edge (window, FALSE);
-
-              if (smart_snap || ((edge < y) && ABS (edge - y) < height_inc))
-                y = edge;
+              if (height - (candidate_position - orig_y) > 0)
+                {
+                  y = candidate_position;
+                  height -= (y - orig_y);
+                }
+            }
+          else if (height - ((y + height_inc) - orig_y) > 0)
+            {
+              y += height_inc;
+              height -= (y - orig_y);
             }
-          
-          height -= (y - orig_y);
           break;
 
         case EastGravity:
@@ -2177,17 +2222,21 @@ process_keyboard_resize_grab (MetaDisplay *display,
         case EastGravity:
         case SouthEastGravity:
         case NorthEastGravity:
-          /* Move left edge left */
           x -= width_inc;
-          
-          if (!display->grab_wireframe_active)
-            {
-              edge = meta_window_find_next_vertical_edge (window, TRUE);
 
-               if (smart_snap || ((edge > x) && ABS (edge - x) < width_inc))
-                 x = edge;
-            }
-          
+          /* Move left edge left */
+          edge = meta_window_find_next_vertical_edge (window, 
+                                                      META_WINDOW_EDGE_LEFT,
+                                                      FALSE);
+
+          if (window->frame)
+            candidate_position = edge + window->frame->child_x;
+          else
+            candidate_position = edge;
+
+          if (smart_snap || ((candidate_position > x) && ABS (candidate_position - x) < width_inc))
+              x = candidate_position;
+
           width += (orig_x - x);
           break;
 
@@ -2195,17 +2244,27 @@ process_keyboard_resize_grab (MetaDisplay *display,
         case SouthWestGravity:
         case NorthWestGravity:
           /* Move right edge left */
-          width -= width_inc;
-          
-          if (!display->grab_wireframe_active)
+          edge = meta_window_find_next_vertical_edge (window, 
+                                                      META_WINDOW_EDGE_RIGHT,
+                                                      FALSE);
+
+          if (window->frame)
+            candidate_position = edge - window->frame->right_width;
+          else
+            candidate_position = edge;
+
+          if (smart_snap || 
+              ((candidate_position > (x + (width - width_inc))) &&
+               ABS (candidate_position - (x + (width - width_inc))) < width_inc))
             {
-              edge = meta_window_find_next_vertical_edge (window, FALSE);
-              
-              if (smart_snap || ((edge > (x+width)) &&
-                                 ABS (edge - (x+width)) < width_inc))
-                width = edge - x;
+              if (candidate_position - x > 0)
+                width = candidate_position - x;
             }
-          
+          else if (width - width_inc > 0)
+            {
+              width -= width_inc;
+            }
+
           handled = TRUE;
           break;
 
@@ -2227,17 +2286,30 @@ process_keyboard_resize_grab (MetaDisplay *display,
         case SouthEastGravity:
         case NorthEastGravity:
           /* Move left edge right */
-          x += width_inc;
+          edge = meta_window_find_next_vertical_edge (window, 
+                                                      META_WINDOW_EDGE_LEFT,
+                                                      TRUE);
 
-          if (!display->grab_wireframe_active)
+          if (window->frame)
+            candidate_position = edge + window->frame->child_x;
+          else
+            candidate_position = edge;
+
+          if (smart_snap || 
+              ((candidate_position < (x + width_inc)) && 
+               ABS (candidate_position - (x + width_inc)) < width_inc))
             {
-              edge = meta_window_find_next_vertical_edge (window, FALSE);
-
-              if (smart_snap || ((edge < x) && ABS (edge - x) < width_inc))
-                x = edge;
+              if (width - (candidate_position - orig_x) > 0)
+                {
+                  x = candidate_position;
+                  width -= (x - orig_x);
+                }
+            }
+          else if (width - ((x + width_inc) - orig_x) > 0)
+            {
+              x += width_inc;
+              width -= (x - orig_x);
             }
-          
-          width -= (x - orig_x);
           break;
 
         case WestGravity:
@@ -2246,15 +2318,19 @@ process_keyboard_resize_grab (MetaDisplay *display,
           /* Move right edge right */
           width += width_inc;
 
-          if (!display->grab_wireframe_active)
-            {
-              edge = meta_window_find_next_vertical_edge (window, TRUE);
-              
-              if (smart_snap || ((edge > (x+width)) &&
-                                 ABS (edge - (x+width)) < width_inc))
-                width = edge - x;
-            }
-          
+          edge = meta_window_find_next_vertical_edge (window, 
+                                                      META_WINDOW_EDGE_RIGHT,
+                                                      TRUE);
+
+          if (window->frame)
+            candidate_position = edge - window->frame->right_width;
+          else
+            candidate_position = edge;
+
+          if (smart_snap || ((candidate_position > (x+width)) &&
+                             ABS (candidate_position - (x+width)) < width_inc))
+            width = candidate_position - x;
+
           handled = TRUE;
           break;
 
@@ -2286,24 +2362,7 @@ process_keyboard_resize_grab (MetaDisplay *display,
       
       if (display->grab_wireframe_active)
         {
-          MetaRectangle new_xor;
-      
-          window->display->grab_wireframe_rect.x = x;
-          window->display->grab_wireframe_rect.y = y;
-          window->display->grab_wireframe_rect.width = width;
-          window->display->grab_wireframe_rect.height = height;
-
-          meta_window_get_xor_rect (window,
-                                    &window->display->grab_wireframe_rect,
-                                    &new_xor);
-          
-          meta_effects_update_wireframe (window->screen,
-                                         &window->display->grab_wireframe_last_xor_rect,
-                                         &new_xor);
-          window->display->grab_wireframe_last_xor_rect = new_xor;
-
-          /* do this after drawing the wires, so we don't draw over it */
-          meta_window_refresh_resize_popup (window);
+          meta_window_update_wireframe (window, x, y, width, height);
         }
       else
         {
@@ -2378,8 +2437,10 @@ process_tab_grab (MetaDisplay *display,
           meta_topic (META_DEBUG_KEYBINDINGS,
                       "Activating target window\n");
 
-          meta_topic (META_DEBUG_FOCUS, "Activating %s due to tab popup selection\n",
+          meta_topic (META_DEBUG_FOCUS, "Activating %s due to tab popup "
+                      "selection and turning mouse_mode off\n",
                       target_window->desc);
+          display->mouse_mode = FALSE;
           meta_window_activate (target_window, event->xkey.time);
 
           meta_topic (META_DEBUG_KEYBINDINGS,
@@ -2475,6 +2536,11 @@ process_tab_grab (MetaDisplay *display,
       /* end grab */
       meta_topic (META_DEBUG_KEYBINDINGS,
                   "Ending tabbing/cycling, uninteresting key pressed\n");
+
+      meta_topic (META_DEBUG_KEYBINDINGS, 
+                  "Syncing to old stack positions.\n");
+      meta_stack_set_positions (screen->stack,
+                                screen->display->grab_old_window_stacking);
     }
   
   return key_used;
@@ -2988,8 +3054,11 @@ do_choose_window (MetaDisplay    *display,
           /* If no modifiers, we can't do the "hold down modifier to keep
            * moving" thing, so we just instaswitch by one window.
            */
-          meta_topic (META_DEBUG_FOCUS, "Activating %s due to switch/cycle windows with no modifiers\n",
+          meta_topic (META_DEBUG_FOCUS,
+                      "Activating %s and turning off mouse_mode due to "
+                      "switch/cycle windows with no modifiers\n",
                       initial_selection->desc);
+          display->mouse_mode = FALSE;
           meta_window_activate (initial_selection, event->xkey.time);
         }
       else if (meta_display_begin_grab_op (display,
@@ -3012,9 +3081,13 @@ do_choose_window (MetaDisplay    *display,
                * before we establish the grab. must end grab
                * prior to trying to focus a window.
                */
-              meta_topic (META_DEBUG_FOCUS, "Ending grab and activating %s due to switch/cycle windows where modifier was released prior to grab\n",
+              meta_topic (META_DEBUG_FOCUS, 
+                          "Ending grab, activating %s, and turning off "
+                          "mouse_mode due to switch/cycle windows where "
+                          "modifier was released prior to grab\n",
                           initial_selection->desc);
               meta_display_end_grab_op (display, event->xkey.time);
+              display->mouse_mode = FALSE;
               meta_window_activate (initial_selection, event->xkey.time);
             }
           else
@@ -3270,7 +3343,15 @@ do_handle_move_to_workspace  (MetaDisplay    *display,
       /* Activate second, so the window is never unmapped */
       meta_window_change_workspace (window, workspace);
       if (flip)
-        meta_workspace_activate_with_focus (workspace, window, event->xkey.time);
+        {
+          meta_topic (META_DEBUG_FOCUS,
+                      "Resetting mouse_mode to FALSE due to "
+                      "do_handle_move_to_workspace() call with flip set.\n");
+          workspace->screen->display->mouse_mode = FALSE;
+          meta_workspace_activate_with_focus (workspace,
+                                              window,
+                                              event->xkey.time);
+        }
     }
   else
     {

src/main.c

@@ -63,13 +63,6 @@ log_handler (const gchar   *log_domain,
   meta_print_backtrace ();
 }
 
-static void
-usage (void)
-{
-  g_print (_("metacity [--sm-disable] [--sm-client-id=ID] [--sm-save-file=FILENAME] [--display=DISPLAY] [--replace] [--version]\n"));
-  exit (1);
-}
-
 static void
 version (void)
 {
@@ -110,7 +103,7 @@ find_accessibility_module (const char *libname)
 
 static gboolean
 accessibility_invoke_module (const char   *libname,
-			     gboolean      init)
+                             gboolean      init)
 {
   GModule    *handle;
   void      (*invoke_fn) (void);
@@ -128,21 +121,21 @@ accessibility_invoke_module (const char   *libname,
   if (!module_name)
     {
       g_warning ("Accessibility: failed to find module '%s' which "
-		 "is needed to make this application accessible",
-		 libname);
+                 "is needed to make this application accessible",
+                 libname);
 
     }
   else if (!(handle = g_module_open (module_name, G_MODULE_BIND_LAZY)))
     {
       g_warning ("Accessibility: failed to load module '%s': '%s'",
-		 libname, g_module_error ());
+                 libname, g_module_error ());
 
     }
   else if (!g_module_symbol (handle, method, (gpointer *)&invoke_fn))
     {
       g_warning ("Accessibility: error library '%s' does not include "
-		 "method '%s' required for accessibility support",
-		 libname, method);
+                 "method '%s' required for accessibility support",
+                 libname, method);
       g_module_close (handle);
 
     }
@@ -165,184 +158,9 @@ accessibility_invoke (gboolean init)
   return TRUE;
 }
 
-int
-main (int argc, char **argv)
+static void
+meta_print_compilation_info (void)
 {
-  struct sigaction act;
-  sigset_t empty_mask;
-  char *display_name;
-  int i;
-  const char *client_id;
-  gboolean disable_sm;
-  const char *prev_arg;
-  const char *save_file;
-
-  g_set_prgname (argv[0]);
-  
-  if (setlocale (LC_ALL, "") == NULL)
-    meta_warning ("Locale not understood by C library, internationalization will not work\n");
-  
-  sigemptyset (&empty_mask);
-  act.sa_handler = SIG_IGN;
-  act.sa_mask    = empty_mask;
-  act.sa_flags   = 0;
-  if (sigaction (SIGPIPE,  &act, NULL) < 0)
-    g_printerr ("Failed to register SIGPIPE handler: %s\n",
-                g_strerror (errno));
-#ifdef SIGXFSZ
-  if (sigaction (SIGXFSZ,  &act, NULL) < 0)
-    g_printerr ("Failed to register SIGXFSZ handler: %s\n",
-                g_strerror (errno));
-#endif
-
-  if (g_getenv ("METACITY_VERBOSE"))
-    meta_set_verbose (TRUE);
-  if (g_getenv ("METACITY_DEBUG"))
-    meta_set_debugging (TRUE);
-  meta_set_syncing (g_getenv ("METACITY_SYNC") != NULL);
-
-  if (g_get_home_dir ())
-    chdir (g_get_home_dir ());
-
-  {
-    char buf[256];
-    GDate d;
-    g_date_clear (&d, 1);
-    g_date_set_time (&d, time (NULL));
-    g_date_strftime (buf, sizeof (buf), "%x", &d);
-    meta_verbose ("Metacity version %s running on %s\n", VERSION, buf);
-  }
-  
-  {
-    const char *charset;
-    g_get_charset (&charset);
-    meta_verbose ("Running in locale \"%s\" with encoding \"%s\"\n",
-                  setlocale (LC_ALL, NULL), charset);
-  }
-  
-  bindtextdomain (GETTEXT_PACKAGE, METACITY_LOCALEDIR);
-  bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
-  textdomain (GETTEXT_PACKAGE);
-  
-  /* Parse options lamely */
-
-  display_name = NULL;
-  client_id = NULL;
-  save_file = NULL;
-  disable_sm = FALSE;
-  prev_arg = NULL;
-  i = 1;
-  while (i < argc)
-    {
-      const char *arg = argv[i];
-      
-      if (strcmp (arg, "--help") == 0 ||
-          strcmp (arg, "-h") == 0 ||
-          strcmp (arg, "-?") == 0)
-        usage ();
-      else if (strcmp (arg, "--version") == 0)
-        version ();
-      else if (strcmp (arg, "--sm-disable") == 0)
-        disable_sm = TRUE;
-      else if (strcmp (arg, "--replace") == 0)
-        meta_set_replace_current_wm (TRUE);
-      else if (strstr (arg, "--display=") == arg)
-        {
-          const char *disp;
-
-          if (display_name != NULL)
-            meta_fatal ("Can't specify display twice\n");
-          
-          disp = strchr (arg, '=');
-          ++disp;
-          
-          display_name =
-            g_strconcat ("DISPLAY=", disp, NULL);
-        }
-      else if (prev_arg &&
-               strcmp (prev_arg, "--display") == 0)
-        {
-          if (display_name != NULL)
-            meta_fatal ("Can't specify display twice\n");
-
-          display_name = g_strconcat ("DISPLAY=", arg, NULL);
-        }
-      else if (strcmp (arg, "--display") == 0)
-        ; /* wait for next arg */
-      else if (strstr (arg, "--sm-client-id=") == arg)
-        {
-          const char *id;
-
-          if (client_id)
-            meta_fatal ("Can't specify client ID twice\n");
-          
-          id = strchr (arg, '=');
-          ++id;
-
-          client_id = g_strdup (id);
-        }
-      else if (prev_arg &&
-               strcmp (prev_arg, "--sm-client-id") == 0)
-        {
-          if (client_id)
-            meta_fatal ("Can't specify client ID twice\n");
-
-          client_id = g_strdup (arg);
-        }
-      else if (strcmp (arg, "--sm-client-id") == 0)
-        ; /* wait for next arg */
-      else if (strstr (arg, "--sm-save-file=") == arg)
-        {
-          const char *file;
-
-          if (save_file)
-            meta_fatal ("Can't specify SM save file twice\n");
-          
-          file = strchr (arg, '=');
-          ++file;
-
-          save_file = g_strdup (file);
-        }
-      else if (prev_arg &&
-               strcmp (prev_arg, "--sm-save-file") == 0)
-        {
-          if (save_file)
-            meta_fatal ("Can't specify SM save file twice\n");
-
-          save_file = g_strdup (arg);
-        }
-      else if (strcmp (arg, "--sm-save-file") == 0)
-        ; /* wait for next arg */
-      else
-        usage ();
-      
-      prev_arg = arg;
-      
-      ++i;
-    }
-
-  if (save_file && client_id)
-    meta_fatal ("Can't specify both SM save file and SM client id\n");
-  
-  meta_main_loop = g_main_loop_new (NULL, FALSE);
-  
-  if (display_name == NULL &&
-      g_getenv ("METACITY_DISPLAY"))
-    {
-      meta_verbose ("Using METACITY_DISPLAY %s\n",
-                    g_getenv ("METACITY_DISPLAY"));
-      display_name =
-        g_strconcat ("DISPLAY=", g_getenv ("METACITY_DISPLAY"), NULL);
-    }
-
-  if (display_name)
-    {
-      putenv (display_name);
-      /* DO NOT FREE display_name, putenv() sucks */
-    }  
-  
-  g_type_init ();
-
 #ifdef HAVE_SHAPE
   meta_verbose ("Compiled with shape extension\n");
 #else
@@ -383,11 +201,190 @@ main (int argc, char **argv)
 #else
   meta_verbose ("Compiled without composite extensions\n");
 #endif
+}
+
+static void
+meta_print_self_identity (void)
+{
+  char buf[256];
+  GDate d;
+  const char *charset;
+
+  /* Version and current date. */
+  g_date_clear (&d, 1);
+  g_date_set_time (&d, time (NULL));
+  g_date_strftime (buf, sizeof (buf), "%x", &d);
+  meta_verbose ("Metacity version %s running on %s\n",
+    VERSION, buf);
   
+  /* Locale and encoding. */
+  g_get_charset (&charset);
+  meta_verbose ("Running in locale \"%s\" with encoding \"%s\"\n",
+    setlocale (LC_ALL, NULL), charset);
+
+  /* Compilation settings. */
+  meta_print_compilation_info ();
+}
+
+typedef struct
+{
+  gchar *save_file;
+  gchar *display_name;
+  gchar *client_id;
+  gboolean replace_wm;
+  gboolean disable_sm;
+  gboolean print_version;
+} MetaArguments;
+
+/**
+ * meta_parse_options() parses argc and argv and returns the
+ * arguments that Metacity understands in struct
+ * MetaArguments. In meta_args.
+ *
+ * The strange call signature has to be written like it is so
+ * that g_option_context_parse() gets a chance to modify argc and
+ * argv.
+ **/
+static void
+meta_parse_options (int *argc, char ***argv,
+                    MetaArguments *meta_args)
+{
+  MetaArguments my_args = {NULL, NULL, NULL, FALSE, FALSE, FALSE};
+  GOptionEntry options[] = {
+    {
+      "sm-disable", 0, 0, G_OPTION_ARG_NONE,
+      &my_args.disable_sm,
+      N_("Disable connection to session manager"),
+      NULL
+    },
+    {
+      "replace", 0, 0, G_OPTION_ARG_NONE,
+      &my_args.replace_wm,
+      N_("Replace the running window manager with Metacity"),
+      NULL
+    },
+    {
+      "sm-client-id", 0, 0, G_OPTION_ARG_STRING,
+      &my_args.client_id,
+      N_("Specify session management ID"),
+      "ID"
+    },
+    {
+      "display", 0, 0, G_OPTION_ARG_STRING,
+      &my_args.display_name, N_("X Display to use"),
+      "DISPLAY"
+    },
+    {
+      "sm-save-file", 0, 0, G_OPTION_ARG_FILENAME,
+      &my_args.save_file,
+      N_("Initialize session from savefile"),
+      "FILE"
+    },
+    {
+      "version", 0, 0, G_OPTION_ARG_NONE,
+      &my_args.print_version,
+      N_("Print version"),
+      NULL
+    },
+    {NULL}
+  };
+  GOptionContext *ctx;
+  GError *error = NULL;
+
+  ctx = g_option_context_new (NULL);
+  g_option_context_add_main_entries (ctx, options, "metacity");
+  if (!g_option_context_parse (ctx, argc, argv, &error))
+    {
+      g_print ("metacity: %s\n", error->message);
+      exit(1);
+    }
+  g_option_context_free (ctx);
+  /* Return the parsed options through the meta_args param. */
+  *meta_args = my_args;
+}
+
+/**
+ * meta_select_display() is a helper function that selects
+ * which display Metacity should use. It first tries to use
+ * display_name as the display. If display_name is NULL then
+ * try to use the environment variable METACITY_DISPLAY. If that
+ * also is NULL, use the default - :0.0
+ */
+static
+void meta_select_display (gchar *display_name)
+{
+  gchar *envVar = "";
+  if (display_name)
+    envVar = g_strconcat ("DISPLAY=", display_name, NULL);
+  else if (g_getenv ("METACITY_DISPLAY"))
+    envVar = g_strconcat ("DISPLAY=",
+      g_getenv ("METACITY_DISPLAY"), NULL);
+  /* DO NOT FREE envVar, putenv() sucks */
+  putenv (envVar);
+}
+    
+int
+main (int argc, char **argv)
+{
+  struct sigaction act;
+  sigset_t empty_mask;
+  MetaArguments meta_args;
+
+  g_set_prgname (argv[0]);
+  
+  if (setlocale (LC_ALL, "") == NULL)
+    meta_warning ("Locale not understood by C library, internationalization will not work\n");
+  
+  sigemptyset (&empty_mask);
+  act.sa_handler = SIG_IGN;
+  act.sa_mask    = empty_mask;
+  act.sa_flags   = 0;
+  if (sigaction (SIGPIPE,  &act, NULL) < 0)
+    g_printerr ("Failed to register SIGPIPE handler: %s\n",
+                g_strerror (errno));
+#ifdef SIGXFSZ
+  if (sigaction (SIGXFSZ,  &act, NULL) < 0)
+    g_printerr ("Failed to register SIGXFSZ handler: %s\n",
+                g_strerror (errno));
+#endif
+
+  if (g_getenv ("METACITY_VERBOSE"))
+    meta_set_verbose (TRUE);
+  if (g_getenv ("METACITY_DEBUG"))
+    meta_set_debugging (TRUE);
+  meta_set_syncing (g_getenv ("METACITY_SYNC") != NULL);
+
+  if (g_get_home_dir ())
+    chdir (g_get_home_dir ());
+
+  meta_print_self_identity ();
+  
+  bindtextdomain (GETTEXT_PACKAGE, METACITY_LOCALEDIR);
+  bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+  textdomain (GETTEXT_PACKAGE);
+
+  /* Parse command line arguments.*/
+  meta_parse_options (&argc, &argv, &meta_args);
+
+  if (meta_args.print_version)
+    version ();
+
+  meta_select_display (meta_args.display_name);
+  
+  if (meta_args.replace_wm)
+    meta_set_replace_current_wm (TRUE);
+
+  if (meta_args.save_file && meta_args.client_id)
+    meta_fatal ("Can't specify both SM save file and SM client id\n");
+  
+  meta_main_loop = g_main_loop_new (NULL, FALSE);
+  
+  g_type_init ();
+
   /* Load prefs */
   meta_prefs_init ();
   meta_prefs_add_listener (prefs_changed_callback, NULL);
-  
+
   meta_ui_init (&argc, &argv);  
 
   /* must be after UI init so we can override GDK handlers */
@@ -463,8 +460,8 @@ main (int argc, char **argv)
    * or we might try to manage a window before we have the session
    * info
    */
-  if (!disable_sm)
-    meta_session_init (client_id, save_file);
+  if (!meta_args.disable_sm)
+    meta_session_init (meta_args.client_id, meta_args.save_file);
   
   if (!meta_display_open (NULL))
     meta_exit (META_EXIT_ERROR);
@@ -561,6 +558,11 @@ prefs_changed_callback (MetaPreference pref,
       meta_display_retheme_all ();
       break;
 
+    case META_PREF_CURSOR_THEME:
+    case META_PREF_CURSOR_SIZE:
+      meta_display_set_cursor_theme (meta_prefs_get_cursor_theme (),
+				     meta_prefs_get_cursor_size ());
+      break;
     default:
       /* handled elsewhere or otherwise */
       break;

src/menu.c

@@ -63,8 +63,8 @@ static MenuItem menuitems[] = {
   { 0, NULL, FALSE, NULL }, /* separator */
   { META_MENU_OP_DELETE, METACITY_STOCK_DELETE, FALSE, N_("_Close") },
   { META_MENU_OP_WORKSPACES, NULL, FALSE, NULL }, /* separator */
-  { META_MENU_OP_STICK, NULL, FALSE, N_("Put on _All Workspaces") },
-  { META_MENU_OP_UNSTICK, NULL, FALSE,  N_("Only on _This Workspace") },
+  { META_MENU_OP_STICK, NULL, FALSE, N_("_Always on Visible Workspace") },
+  { META_MENU_OP_UNSTICK, NULL, FALSE,  N_("_Only on This Workspace") },
   { META_MENU_OP_MOVE_LEFT, NULL, FALSE, N_("Move to Workspace _Left") },
   { META_MENU_OP_MOVE_RIGHT, NULL, FALSE, N_("Move to Workspace R_ight") },
   { META_MENU_OP_MOVE_UP, NULL, FALSE, N_("Move to Workspace _Up") },

src/metacity-dialog.c

@@ -118,7 +118,8 @@ kill_window_question (const char *window_name,
 				   _("Forcing this application to quit will "
 				     "cause you to lose any unsaved changes."));
   g_free (str);
-  
+  gtk_window_set_icon_name (GTK_WINDOW (dialog), "panel-force-quit");
+
   gtk_label_set_use_markup (GTK_LABEL (GTK_MESSAGE_DIALOG (dialog)->label), TRUE);
   gtk_label_set_line_wrap (GTK_LABEL (GTK_MESSAGE_DIALOG (dialog)->label), TRUE);
   
@@ -254,12 +255,14 @@ warn_about_no_sm_support (char **lame_apps,
   GtkWidget *dialog;
   GtkWidget *list;
   GtkWidget *sw;
+  GtkWidget *button;
       
   dialog = gtk_message_dialog_new (NULL,
                                    0,
                                    GTK_MESSAGE_WARNING,
-                                   GTK_BUTTONS_CLOSE,
+                                   GTK_BUTTONS_NONE,
                                    _("These windows do not support \"save current setup\" and will have to be restarted manually next time you log in."));
+  gtk_window_set_icon_name (GTK_WINDOW (dialog), "stock_dialog-warning");
   
   g_signal_connect (G_OBJECT (dialog),
                     "response",
@@ -269,6 +272,7 @@ warn_about_no_sm_support (char **lame_apps,
   /* Wait 4 minutes then force quit, so we don't wait around all night */
   g_timeout_add (4 * 60 * 1000, (GSourceFunc) gtk_main_quit, NULL);
 
+  button = gtk_dialog_add_button (GTK_DIALOG (dialog), GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE);
   gtk_dialog_set_default_response(GTK_DIALOG(dialog), GTK_RESPONSE_CLOSE);
   list = create_lame_apps_list (lame_apps);
 
@@ -296,9 +300,12 @@ warn_about_no_sm_support (char **lame_apps,
                       sw,
                       TRUE, TRUE, 0);
   
+  gtk_window_stick (GTK_WINDOW (dialog));
+
   gtk_widget_realize (dialog);
   copy_of_gdk_x11_window_set_user_time (dialog->window, timestamp);
 
+  gtk_widget_grab_focus (button);
   gtk_widget_show_all (dialog);
 
   gtk_main ();
@@ -328,6 +335,7 @@ error_about_command (const char *gconf_key,
                                      GTK_MESSAGE_ERROR,
                                      GTK_BUTTONS_CLOSE,
                                      "%s", error);
+  gtk_window_set_icon_name (GTK_WINDOW (dialog), "stock_dialog-error");
   
   gtk_widget_realize (dialog);
   copy_of_gdk_x11_window_set_user_time (dialog->window, timestamp);

src/metacity.desktop.in

@@ -1,4 +1,5 @@
 [Desktop Entry]
+Encoding=UTF-8
 _Name=Metacity
 Exec=metacity
 # name of loadable control center module

src/metacity.schemas.in

@@ -114,7 +114,7 @@
       <applyto>/apps/metacity/general/theme</applyto>
       <owner>metacity</owner>
       <type>string</type>
-      <default>Simple</default>
+      <default>Clearlooks</default>
       <locale name="C">
          <short>Current theme</short>
          <long>
@@ -271,7 +271,9 @@
         avoiding animations, or other means. This is a significant 
         reduction in usability for many users, but may allow 
         legacy applications and terminal servers to function 
-        when they would otherwise be impractical.
+        when they would otherwise be impractical. However, the wireframe
+        feature is disabled when accessibility is on to avoid weird desktop
+        breakages.
          </long>
       </locale>
     </schema>

src/place.c

@@ -30,6 +30,14 @@
 #include <math.h>
 #include <stdlib.h>
 
+typedef enum
+{
+  META_LEFT,
+  META_RIGHT,
+  META_TOP,
+  META_BOTTOM
+} MetaWindowDirection;
+
 static gint
 northwestcmp (gconstpointer a, gconstpointer b)
 {
@@ -224,6 +232,145 @@ find_next_cascade (MetaWindow *window,
     }
 }
 
+static void
+find_most_freespace (MetaWindow *window,
+                     MetaFrameGeometry *fgeom,
+                     /* visible windows on relevant workspaces */
+                     MetaWindow *focus_window,
+                     int         x,
+                     int         y,
+                     int        *new_x,
+                     int        *new_y)
+{
+  MetaWindowDirection side;
+  int max_area;
+  int max_width, max_height, left, right, top, bottom;
+  int left_space, right_space, top_space, bottom_space;
+  int frame_size_left, frame_size_top;
+  MetaRectangle work_area;
+  MetaRectangle avoid;
+  MetaRectangle outer;
+
+  frame_size_left = fgeom ? fgeom->left_width : 0;
+  frame_size_top  = fgeom ? fgeom->top_height : 0;
+
+  meta_window_get_work_area_current_xinerama (focus_window, &work_area);
+  meta_window_get_outer_rect (focus_window, &avoid);
+  meta_window_get_outer_rect (window, &outer);
+
+  /* Find the areas of choosing the various sides of the focus window */
+  max_width  = MIN (avoid.width, outer.width);
+  max_height = MIN (avoid.height, outer.height);
+  left_space   = avoid.x - work_area.x;
+  right_space  = work_area.width - (avoid.x + avoid.width - work_area.x);
+  top_space    = avoid.y - work_area.y;
+  bottom_space = work_area.height - (avoid.y + avoid.height - work_area.y);
+  left   = MIN (left_space,   outer.width);
+  right  = MIN (right_space,  outer.width);
+  top    = MIN (top_space,    outer.height);
+  bottom = MIN (bottom_space, outer.height);
+
+  /* Find out which side of the focus_window can show the most of the window */
+  side = META_LEFT;
+  max_area = left*max_height;
+  if (right*max_height > max_area)
+    {
+      side = META_RIGHT;
+      max_area = right*max_height;
+    }
+  if (top*max_width > max_area)
+    {
+      side = META_TOP;
+      max_area = top*max_width;
+    }
+  if (bottom*max_width > max_area)
+    {
+      side = META_BOTTOM;
+      max_area = bottom*max_width;
+    }
+
+  /* Give up if there's no where to put it (i.e. focus window is maximized) */
+  if (max_area == 0)
+    return;
+
+  /* Place the window on the relevant side; if the whole window fits,
+   * make it adjacent to the focus window; if not, make sure the
+   * window doesn't go off the edge of the screen.
+   */
+  switch (side)
+    {
+    case META_LEFT:
+      *new_y = avoid.y + frame_size_top;
+      if (left_space > outer.width)
+        *new_x = avoid.x - outer.width + frame_size_left;
+      else
+        *new_x = work_area.x + frame_size_left;
+      break;
+    case META_RIGHT:
+      *new_y = avoid.y + frame_size_top;
+      if (right_space > outer.width)
+        *new_x = avoid.x + avoid.width + frame_size_left;
+      else
+        *new_x = work_area.x + work_area.width - outer.width + frame_size_left;
+      break;
+    case META_TOP:
+      *new_x = avoid.x + frame_size_left;
+      if (top_space > outer.height)
+        *new_y = avoid.y - outer.height + frame_size_top;
+      else
+        *new_y = work_area.y + frame_size_top;
+      break;
+    case META_BOTTOM:
+      *new_x = avoid.x + frame_size_left;
+      if (bottom_space > outer.height)
+        *new_y = avoid.y + avoid.height + frame_size_top;
+      else
+        *new_y = work_area.y + work_area.height - outer.height + frame_size_top;
+      break;
+    }
+}
+
+static void
+avoid_being_obscured_as_second_modal_dialog (MetaWindow *window,
+                                             MetaFrameGeometry *fgeom,
+                                             int        *x,
+                                             int        *y)
+{
+  /* We can't center this dialog if it was denied focus and it
+   * overlaps with the focus window and this dialog is modal and this
+   * dialog is in the same app as the focus window (*phew*...please
+   * don't make me say that ten times fast). See bug 307875 comment 11
+   * and 12 for details, but basically it means this is probably a
+   * second modal dialog for some app while the focus window is the
+   * first modal dialog.  We should probably make them simultaneously
+   * visible in general, but it becomes mandatory to do so due to
+   * buggy apps (e.g. those using gtk+ *sigh*) because in those cases
+   * this second modal dialog also happens to be modal to the first
+   * dialog in addition to the main window, while it has only let us
+   * know about the modal-to-the-main-window part.
+   */
+
+  MetaWindow *focus_window;
+  MetaRectangle overlap;
+
+  focus_window = window->display->focus_window;
+
+  if (window->denied_focus_and_not_transient &&
+      window->wm_state_modal && /* FIXME: Maybe do this for all transients? */
+      meta_window_same_application (window, focus_window) &&
+      meta_rectangle_intersect (&window->rect,
+                                &focus_window->rect,
+                                &overlap))
+    {
+      find_most_freespace (window, fgeom, focus_window, *x, *y, x, y);
+      meta_topic (META_DEBUG_PLACEMENT,
+                  "Dialog window %s was denied focus but may be modal "
+                  "to the focus window; had to move it to avoid the "
+                  "focus window\n",
+                  window->desc);
+    }
+}
+
 static int
 intcmp (const void* a, const void* b)
 {
@@ -649,6 +796,7 @@ meta_window_place (MetaWindow        *window,
         {
           meta_topic (META_DEBUG_PLACEMENT,
                       "Not placing window with PPosition or USPosition set\n");
+          avoid_being_obscured_as_second_modal_dialog (window, fgeom, &x, &y);
           goto done_no_constraints;
         }
     }
@@ -700,6 +848,8 @@ meta_window_place (MetaWindow        *window,
           meta_topic (META_DEBUG_PLACEMENT, "Centered window %s over transient parent\n",
                       window->desc);
           
+          avoid_being_obscured_as_second_modal_dialog (window, fgeom, &x, &y);
+
           goto done;
         }
     }
@@ -748,13 +898,16 @@ meta_window_place (MetaWindow        *window,
       {
         MetaWindow *w = tmp->data;
 
-        if (!w->minimized &&
+        if (meta_window_showing_on_its_workspace (w) &&
             w != window && 
-            window->workspace == w->workspace)
+            (window->workspace == w->workspace ||
+             window->on_all_workspaces || w->on_all_workspaces))
           windows = g_list_prepend (windows, w);
 
         tmp = tmp->next;
       }
+
+    g_slist_free (all_windows);
   }
 
   /* Warning, this is a round trip! */
@@ -771,7 +924,7 @@ meta_window_place (MetaWindow        *window,
   if (find_first_fit (window, fgeom, windows,
                       xineramas_list, n_xineramas,
                       x, y, &x, &y))
-    goto done;
+    goto done_check_denied_focus;
 
   /* This is a special-case origin-cascade so that windows that are
    * too large to fit onto a workspace (and which will be
@@ -814,7 +967,7 @@ meta_window_place (MetaWindow        *window,
   if (placed_on == -1)
     {
       find_next_cascade (window, fgeom, windows, x, y, &x, &y);
-      placed_on = 0;
+      placed_on = window->screen->last_xinerama_index;
     }
 
   /* Maximize windows if they are too big for their work area (bit of
@@ -838,6 +991,51 @@ meta_window_place (MetaWindow        *window,
           window->maximize_after_placement = TRUE;
         }
     }
+
+ done_check_denied_focus:
+  /* If the window is being denied focus and isn't a transient of the
+   * focus window, we do NOT want it to overlap with the focus window
+   * if at all possible.  This is guaranteed to only be called if the
+   * focus_window is non-NULL, and we try to avoid that window.
+   */
+  if (window->denied_focus_and_not_transient)
+    {
+      gboolean       found_fit;
+      MetaWindow    *focus_window;
+      MetaRectangle  overlap;
+
+      focus_window = window->display->focus_window;
+      g_assert (focus_window != NULL);
+
+      /* No need to do anything if the window doesn't overlap at all */
+      found_fit = !meta_rectangle_intersect (&window->rect,
+                                             &focus_window->rect,
+                                             &overlap);
+
+      /* Try to do a first fit again, this time only taking into account the
+       * focus window.
+       */
+      if (!found_fit)
+        {
+          GList *focus_window_list;
+          focus_window_list = g_list_prepend (NULL, focus_window);
+
+          /* Reset x and y ("origin" placement algorithm) */
+          x = xi->x_origin;
+          y = xi->y_origin;
+
+          found_fit = find_first_fit (window, fgeom, focus_window_list,
+                                      xineramas_list, n_xineramas,
+                                      x, y, &x, &y);
+          g_list_free (focus_window_list);
+	}
+
+      /* If that still didn't work, just place it where we can see as much
+       * as possible.
+       */
+      if (!found_fit)
+        find_most_freespace (window, fgeom, focus_window, x, y, &x, &y);
+    }
   
  done:
   g_free (xineramas_list);
@@ -888,6 +1086,8 @@ get_windows_on_same_workspace (MetaWindow *window,
   if (n_windows)
     *n_windows = i;
   
+  g_slist_free (all_windows);
+
   return windows;
 }
 
@@ -926,43 +1126,53 @@ get_vertical_edges (MetaWindow *window,
   GSList *windows;
   GSList *tmp;
   int n_windows;
-  int *edges;
-  int i, j;
-  int n_edges;
+  GArray *edges;
+  int edge, i;
   MetaRectangle rect;
   MetaRectangle work_area;
   
   windows = get_windows_on_same_workspace (window, &n_windows);
 
-  i = 0;
-  /* 4 = workspace/screen edges */
-  n_edges = n_windows * 2 + 4 + window->screen->n_xinerama_infos - 1; 
-
-  edges = g_new (int, n_edges);
+  edges = g_array_sized_new (FALSE, FALSE, sizeof (int), 
+                             n_windows * 2 + 4 /* 4 = workspace/screen edges */
+                             + window->screen->n_xinerama_infos - 1
+                             + 2 /* active window edges when in wireframe mode */); 
 
   /* workspace/screen edges */
   meta_window_get_work_area_current_xinerama (window, &work_area);
-
-  edges[i] = work_area.x;
-  ++i;
-  edges[i] = work_area.x + work_area.width;
-  ++i;
-  edges[i] = 0;
-  ++i;
-  edges[i] = window->screen->width;
-  ++i;
-
-  g_assert (i == 4);
+  
+  g_array_append_val (edges, work_area.x);
+  edge = work_area.x + work_area.width;
+  g_array_append_val (edges, edge);
+  edge = 0;
+  g_array_append_val (edges, edge);
+  g_array_append_val (edges, window->screen->width);
 
   /* Now get the xinerama screen edges */
-  for (j = 0; j < window->screen->n_xinerama_infos - 1; j++) {
-    edges[i] = window->screen->xinerama_infos[j].x_origin +
-      window->screen->xinerama_infos[j].width;
-    ++i;
-  }
-  
-  meta_window_get_outer_rect (window, &rect);
-  
+  for (i = 0; i < window->screen->n_xinerama_infos - 1; i++)
+    {
+      edge = window->screen->xinerama_infos[i].x_origin +
+             window->screen->xinerama_infos[i].width;
+
+      g_array_append_val (edges, edge);
+    }
+
+  if (window->display->grab_wireframe_active)
+    {
+      int left_edge, right_edge, top_edge, bottom_edge;
+
+      meta_window_get_xor_rect (window, &window->display->grab_wireframe_rect,
+                                &rect);
+
+      window_get_edges (window, &left_edge, &right_edge, 
+                        &top_edge, &bottom_edge);
+
+      g_array_append_val (edges, left_edge);
+      g_array_append_val (edges, right_edge);
+    }
+  else
+    meta_window_get_outer_rect (window, &rect);
+
   /* get window edges */
   tmp = windows;
   while (tmp != NULL)
@@ -974,22 +1184,21 @@ get_vertical_edges (MetaWindow *window,
       
       if (rects_overlap_vertically (&rect, &w_rect))
         {
-          window_get_edges (w, &edges[i], &edges[i+1], NULL, NULL);
-          i += 2;
+          g_array_append_val (edges, w_rect.x);
+          edge = w_rect.x + w_rect.width;
+          g_array_append_val (edges, edge);
         }
 
       tmp = tmp->next;
     }
-  n_edges = i;
-  
   g_slist_free (windows);
 
   /* Sort */
-  qsort (edges, n_edges, sizeof (int), intcmp);
+  qsort (edges->data, edges->len, sizeof (int), intcmp);
 
-  *edges_p = edges;
-  *n_edges_p = n_edges;
-}  
+  *n_edges_p = edges->len;  
+  *edges_p = (int *) g_array_free (edges, FALSE);
+}
 
 static void
 get_horizontal_edges (MetaWindow *window,
@@ -999,41 +1208,52 @@ get_horizontal_edges (MetaWindow *window,
   GSList *windows;
   GSList *tmp;
   int n_windows;
-  int *edges;
-  int i, j;
-  int n_edges;
+  GArray *edges;
+  int edge, i;
   MetaRectangle rect;
   MetaRectangle work_area;
   
   windows = get_windows_on_same_workspace (window, &n_windows);
 
-  i = 0;
-  n_edges = n_windows * 2 + 4 + window->screen->n_xinerama_infos - 1; /* 4 = workspace/screen edges */
-  edges = g_new (int, n_edges);
+  edges = g_array_sized_new (FALSE, FALSE, sizeof (int), 
+                             n_windows * 2 + 4 /* 4 = workspace/screen edges */
+                             + window->screen->n_xinerama_infos - 1
+                             + 2 /* active window edges when in wireframe mode */); 
 
   /* workspace/screen edges */
   meta_window_get_work_area_current_xinerama (window, &work_area);
   
-  edges[i] = work_area.y;
-  ++i;
-  edges[i] = work_area.y + work_area.height;
-  ++i;
-  edges[i] = 0;
-  ++i;
-  edges[i] = window->screen->height;
-  ++i;
+  g_array_append_val (edges, work_area.y);
+  edge = work_area.y + work_area.height;
+  g_array_append_val (edges, edge);
+  edge = 0;
+  g_array_append_val (edges, edge);
+  g_array_append_val (edges, window->screen->height);
 
-  g_assert (i == 4);
-  
   /* Now get the xinerama screen edges */
-  for (j = 0; j < window->screen->n_xinerama_infos - 1; j++) {
-    edges[i] = window->screen->xinerama_infos[j].y_origin +
-      window->screen->xinerama_infos[j].height;
-    ++i;
-  }
+  for (i = 0; i < window->screen->n_xinerama_infos - 1; i++) 
+    {
+      edge = window->screen->xinerama_infos[i].y_origin +
+             window->screen->xinerama_infos[i].height;
+      g_array_append_val (edges, edge);
+    }
 
-  meta_window_get_outer_rect (window, &rect);
-  
+  if (window->display->grab_wireframe_active)
+    {
+      int left_edge, right_edge, top_edge, bottom_edge;
+
+      meta_window_get_xor_rect (window, &window->display->grab_wireframe_rect,
+                                &rect);
+
+      window_get_edges (window, &left_edge, &right_edge, 
+                        &top_edge, &bottom_edge);
+
+      g_array_append_val (edges, top_edge);
+      g_array_append_val (edges, bottom_edge);
+    }
+  else
+    meta_window_get_outer_rect (window, &rect);
+ 
   /* get window edges */
   tmp = windows;
   while (tmp != NULL)
@@ -1045,60 +1265,75 @@ get_horizontal_edges (MetaWindow *window,
       
       if (rects_overlap_horizontally (&rect, &w_rect))
         {
-          window_get_edges (w, NULL, NULL, &edges[i], &edges[i+1]);
-          i += 2;
+          g_array_append_val (edges, w_rect.y);
+          edge = w_rect.y + w_rect.height;
+          g_array_append_val (edges, edge);
         }
 
       tmp = tmp->next;
     }
-  n_edges = i;
-  
   g_slist_free (windows);
 
   /* Sort */
-  qsort (edges, n_edges, sizeof (int), intcmp);
+  qsort (edges->data, edges->len, sizeof (int), intcmp);
 
-  *edges_p = edges;
-  *n_edges_p = n_edges;  
+  *n_edges_p = edges->len;  
+  *edges_p = (int *) g_array_free (edges, FALSE);
 }
 
 int
 meta_window_find_next_vertical_edge (MetaWindow *window,
+                                     MetaWindowEdgePosition source_edge_position,
                                      gboolean    right)
 {
-  int left_edge, right_edge;
+  int left_edge, right_edge, source_edge;
   int *edges;
   int i;
   int n_edges;
   int retval;
 
   get_vertical_edges (window, &edges, &n_edges);
-  
-  /* Find next */
-  meta_window_get_position (window, &retval, NULL);
 
-  window_get_edges (window, &left_edge, &right_edge, NULL, NULL);
-  
+  /* Find next */
+  if (window->display->grab_wireframe_active)
+    {
+      MetaRectangle rect;
+
+      meta_window_get_xor_rect (window, &window->display->grab_wireframe_rect,
+                                &rect);
+
+      left_edge = rect.x;
+      right_edge = left_edge + rect.width;
+    }
+  else
+    window_get_edges (window, &left_edge, &right_edge, NULL, NULL);
+
+  switch (source_edge_position)
+    {
+      case META_WINDOW_EDGE_LEFT:
+        source_edge = left_edge;
+        break;
+
+      case META_WINDOW_EDGE_RIGHT:
+        source_edge = right_edge;
+        break;
+
+      case META_WINDOW_EDGE_TOP:
+      case META_WINDOW_EDGE_BOTTOM:
+      default:
+        g_assert_not_reached ();
+    }
+
+  retval = source_edge;
+
   if (right)
     {
       i = 0;
       while (i < n_edges)
         {
-          if (edges[i] > right_edge)
+          if (edges[i] > source_edge)
             {
-              /* This is the one we want, snap right
-               * edge of window to edges[i]
-               */
               retval = edges[i];
-              if (window->frame)
-                {
-                  retval -= window->frame->rect.width;
-                  retval += window->frame->child_x;
-                }
-              else
-                {
-                  retval -= window->rect.width;
-                }
               break;
             }
           
@@ -1112,13 +1347,9 @@ meta_window_find_next_vertical_edge (MetaWindow *window,
         {
           --i;
           
-          if (edges[i] < left_edge)
+          if (edges[i] < source_edge)
             {
-              /* This is the one we want */
               retval = edges[i];
-              if (window->frame)
-                retval += window->frame->child_x;
-
               break;
             }
         }
@@ -1132,9 +1363,10 @@ meta_window_find_next_vertical_edge (MetaWindow *window,
 
 int
 meta_window_find_next_horizontal_edge (MetaWindow *window,
+                                       MetaWindowEdgePosition source_edge_position,
                                        gboolean    down)
 {
-  int top_edge, bottom_edge;
+  int top_edge, bottom_edge, source_edge;
   int *edges;
   int i;
   int n_edges;
@@ -1143,30 +1375,45 @@ meta_window_find_next_horizontal_edge (MetaWindow *window,
   get_horizontal_edges (window, &edges, &n_edges);
   
   /* Find next */
-  meta_window_get_position (window, NULL, &retval);
+  if (window->display->grab_wireframe_active)
+    {
+      MetaRectangle rect;
+
+      meta_window_get_xor_rect (window, &window->display->grab_wireframe_rect,
+                                &rect);
+
+      top_edge = rect.y;
+      bottom_edge = top_edge + rect.height;
+    }
+  else
+    window_get_edges (window, NULL, NULL, &top_edge, &bottom_edge);
+
+  switch (source_edge_position)
+    {
+      case META_WINDOW_EDGE_TOP:
+        source_edge = top_edge;
+        break;
+
+      case META_WINDOW_EDGE_BOTTOM:
+        source_edge = bottom_edge;
+        break;
+
+      case META_WINDOW_EDGE_LEFT:
+      case META_WINDOW_EDGE_RIGHT:
+      default:
+        g_assert_not_reached ();
+    }
+
+  retval = source_edge;
 
-  window_get_edges (window, NULL, NULL, &top_edge, &bottom_edge);
-  
   if (down)
     {
       i = 0;
       while (i < n_edges)
         {
-          if (edges[i] > bottom_edge)
+          if (edges[i] > source_edge)
             {
-              /* This is the one we want, snap right
-               * edge of window to edges[i]
-               */
               retval = edges[i];
-              if (window->frame)
-                {
-                  retval -= window->frame->rect.height;
-                  retval += window->frame->child_y;
-                }
-              else
-                {
-                  retval -= window->rect.height;
-                }
               break;
             }
           
@@ -1180,13 +1427,9 @@ meta_window_find_next_horizontal_edge (MetaWindow *window,
         {
           --i;
           
-          if (edges[i] < top_edge)
+          if (edges[i] < source_edge)
             {
-              /* This is the one we want */
               retval = edges[i];
-              if (window->frame)
-                retval += window->frame->child_y;
-
               break;
             }
         }
@@ -1221,11 +1464,10 @@ meta_window_find_nearest_vertical_edge (MetaWindow *window,
       int left_pos, right_pos;
 
       left_pos = edges[i];
-      if (window->frame)
-        left_pos += window->frame->child_x;
 
       if (window->frame)
         {
+          left_pos += window->frame->child_x;
           right_pos = edges[i] - window->frame->rect.width;
           right_pos += window->frame->child_x;
         }
@@ -1292,11 +1534,10 @@ meta_window_find_nearest_horizontal_edge (MetaWindow *window,
       int top_pos, bottom_pos;
 
       top_pos = edges[i];
-      if (window->frame)
-        top_pos += window->frame->child_y;
 
       if (window->frame)
         {
+          top_pos += window->frame->child_y;
           bottom_pos = edges[i] - window->frame->rect.height;
           bottom_pos += window->frame->child_y;
         }

src/place.h

@@ -25,6 +25,16 @@
 #include "window.h"
 #include "frame.h"
 
+typedef enum _MetaWindowEdgePosition MetaWindowEdgePosition;
+
+enum _MetaWindowEdgePosition
+{
+  META_WINDOW_EDGE_TOP = 0,
+  META_WINDOW_EDGE_LEFT,
+  META_WINDOW_EDGE_RIGHT,
+  META_WINDOW_EDGE_BOTTOM
+};
+
 void meta_window_place (MetaWindow *window,
                         MetaFrameGeometry *fgeom,
                         int         x,
@@ -32,14 +42,16 @@ void meta_window_place (MetaWindow *window,
                         int        *new_x,
                         int        *new_y);
 
-/* Returns the position to move the window to in order
+/* Returns the position to move the specified window edge to in order
  * to snap it to the next edge in the given direction,
  * while moving.
  */
 int meta_window_find_next_vertical_edge   (MetaWindow *window,
-                                           gboolean    right);
-int meta_window_find_next_horizontal_edge (MetaWindow *window,
+                                           MetaWindowEdgePosition source_edge_position,
                                            gboolean    down);
+int meta_window_find_next_horizontal_edge (MetaWindow *window,
+                                           MetaWindowEdgePosition source_edge_position,
+                                           gboolean    right);
 
 /* Returns the position to move the window to in order
  * to snap it to the nearest edge, while moving.
@@ -49,13 +61,4 @@ int meta_window_find_nearest_vertical_edge (MetaWindow *window,
 
 int meta_window_find_nearest_horizontal_edge (MetaWindow *window,
                                               int         y_pos);
-
-/* FIXME need edge-snap functions for resizing as well, those
- * behave somewhat differently.
- */
-
 #endif
-
-
-
-

src/prefs.c

@@ -52,6 +52,7 @@
 #define KEY_DISABLE_WORKAROUNDS "/apps/metacity/general/disable_workarounds"
 #define KEY_BUTTON_LAYOUT "/apps/metacity/general/button_layout"
 #define KEY_REDUCED_RESOURCES "/apps/metacity/general/reduced_resources"
+#define KEY_GNOME_ACCESSIBILITY "/desktop/gnome/interface/accessibility"
 
 #define KEY_COMMAND_PREFIX "/apps/metacity/keybinding_commands/command_"
 
@@ -65,6 +66,8 @@
 #define KEY_VISUAL_BELL "/apps/metacity/general/visual_bell"
 #define KEY_AUDIBLE_BELL "/apps/metacity/general/audible_bell"
 #define KEY_VISUAL_BELL_TYPE "/apps/metacity/general/visual_bell_type"
+#define KEY_CURSOR_THEME "/desktop/gnome/peripherals/mouse/cursor_theme"
+#define KEY_CURSOR_SIZE "/desktop/gnome/peripherals/mouse/cursor_size"
 
 #ifdef HAVE_GCONF
 static GConfClient *default_client = NULL;
@@ -88,6 +91,9 @@ static gboolean auto_raise_delay = 500;
 static gboolean provide_visual_bell = TRUE;
 static gboolean bell_is_audible = TRUE;
 static gboolean reduced_resources = FALSE;
+static gboolean gnome_accessibility = FALSE;
+static char *cursor_theme = NULL;
+static int   cursor_size = 24;
 
 static MetaVisualBellType visual_bell_type = META_VISUAL_BELL_INVALID;
 static MetaButtonLayout button_layout = {
@@ -139,6 +145,9 @@ static gboolean update_terminal_command   (const char *value);
 static gboolean update_workspace_name     (const char  *name,
                                            const char  *value);
 static gboolean update_reduced_resources  (gboolean     value);
+static gboolean update_gnome_accessibility  (gboolean     value);
+static gboolean update_cursor_theme       (const char *value);
+static gboolean update_cursor_size        (int size);
 
 static void change_notify (GConfClient    *client,
                            guint           cnxn_id,
@@ -310,6 +319,21 @@ meta_prefs_init (void)
                         &err);
   cleanup_error (&err);
 
+  gconf_client_add_dir (default_client, "/desktop/gnome/applications/terminal",
+                        GCONF_CLIENT_PRELOAD_RECURSIVE,
+                        &err);
+  cleanup_error (&err);
+
+  gconf_client_add_dir (default_client, KEY_GNOME_ACCESSIBILITY,
+                        GCONF_CLIENT_PRELOAD_RECURSIVE,
+                        &err);
+  cleanup_error (&err);
+
+  gconf_client_add_dir (default_client, "/desktop/gnome/peripherals/mouse",
+                        GCONF_CLIENT_PRELOAD_RECURSIVE,
+                        &err);
+  cleanup_error (&err);
+
   str_val = gconf_client_get_string (default_client, KEY_MOUSE_BUTTON_MODS,
                                      &err);
   cleanup_error (&err);
@@ -407,6 +431,23 @@ meta_prefs_init (void)
   cleanup_error (&err);
   update_terminal_command (str_val);
   g_free (str_val);
+
+  bool_val = gconf_client_get_bool (default_client, KEY_GNOME_ACCESSIBILITY,
+                                    &err);
+  
+  cleanup_error (&err);
+  update_gnome_accessibility (bool_val);
+
+  str_val = gconf_client_get_string (default_client, KEY_CURSOR_THEME,
+                                     &err);
+  cleanup_error (&err);
+  update_cursor_theme (str_val);
+  g_free (str_val);
+
+  int_val = gconf_client_get_int (default_client, KEY_CURSOR_SIZE,
+                                  &err);
+  cleanup_error (&err);
+  update_cursor_size (int_val);
 #endif /* HAVE_GCONF */
   
   /* Load keybindings prefs */
@@ -429,6 +470,17 @@ meta_prefs_init (void)
                            NULL,
                            NULL,
                            &err);
+  gconf_client_notify_add (default_client, KEY_GNOME_ACCESSIBILITY,
+                           change_notify,
+                           NULL,
+                           NULL,
+                           &err);
+  gconf_client_notify_add (default_client, "/desktop/gnome/peripherals/mouse",
+                           change_notify,
+                           NULL,
+                           NULL,
+                           &err);
+
   cleanup_error (&err);  
 #endif /* HAVE_GCONF */
 }
@@ -805,6 +857,54 @@ change_notify (GConfClient    *client,
       if (update_reduced_resources (b))
         queue_changed (META_PREF_REDUCED_RESOURCES);
     }
+  else if (strcmp (key, KEY_GNOME_ACCESSIBILITY) == 0)
+    {
+      gboolean b;
+
+      if (value && value->type != GCONF_VALUE_BOOL)
+        {
+          meta_warning (_("GConf key \"%s\" is set to an invalid type\n"),
+                       KEY_GNOME_ACCESSIBILITY);
+          goto out;
+        }
+
+      b = value ? gconf_value_get_bool (value) : gnome_accessibility;
+
+      if (update_gnome_accessibility (b))
+        queue_changed (META_PREF_GNOME_ACCESSIBILITY);
+    }
+  else if (strcmp (key, KEY_CURSOR_THEME) == 0)
+    {
+      const char *str;
+
+      if (value && value->type != GCONF_VALUE_STRING)
+        {
+          meta_warning (_("GConf key \"%s\" is set to an invalid type\n"),
+                       KEY_CURSOR_THEME);
+          goto out;
+        }
+
+      str = value ? gconf_value_get_string (value) : NULL;
+
+      if (update_cursor_theme (str))
+	queue_changed (META_PREF_CURSOR_THEME);
+    }
+  else if (strcmp (key, KEY_CURSOR_SIZE) == 0)
+    {
+      int d;
+
+      if (value && value->type != GCONF_VALUE_INT)
+        {
+          meta_warning (_("GConf key \"%s\" is set to an invalid type\n"),
+                       KEY_CURSOR_SIZE);
+          goto out;
+        }
+
+      d = value ? gconf_value_get_int (value) : 24;
+
+      if (update_cursor_size (d))
+	queue_changed (META_PREF_CURSOR_SIZE);
+    }
   else
     {
       meta_topic (META_DEBUG_PREFS, "Key %s doesn't mean anything to Metacity\n",
@@ -924,6 +1024,57 @@ meta_prefs_get_theme (void)
   return current_theme;
 }
 
+#ifdef HAVE_GCONF
+static gboolean
+update_cursor_theme (const char *value)
+{
+  char *old_theme;
+  gboolean changed;
+  
+  old_theme = cursor_theme;
+  
+  if (value != NULL && *value)
+    {
+      cursor_theme = g_strdup (value);
+    }
+
+  changed = TRUE;
+  if ((old_theme && cursor_theme &&
+       strcmp (old_theme, cursor_theme) == 0) ||
+      (old_theme == NULL && cursor_theme == NULL))
+    changed = FALSE;
+
+  if (old_theme != cursor_theme)
+    g_free (old_theme);
+
+  return changed;
+}
+#endif /* HAVE_GCONF */
+
+const char*
+meta_prefs_get_cursor_theme (void)
+{
+  return cursor_theme;
+}
+
+#ifdef HAVE_GCONF
+static gboolean
+update_cursor_size (int value)
+{
+  int old = cursor_size;
+
+  cursor_size = value;
+
+  return old != value;
+}
+#endif
+
+int
+meta_prefs_get_cursor_size (void)
+{
+  return cursor_size;
+}
+
 #ifdef HAVE_GCONF
 static gboolean
 update_use_system_font (gboolean value)
@@ -1321,6 +1472,16 @@ update_reduced_resources (gboolean value)
 
   return old != reduced_resources;
 }
+
+static gboolean
+update_gnome_accessibility (gboolean value)
+{
+  gboolean old = gnome_accessibility;
+
+  gnome_accessibility = value;
+  
+  return old != gnome_accessibility;
+}
 #endif /* HAVE_GCONF */
 
 #ifdef WITH_VERBOSE_MODE
@@ -1394,6 +1555,9 @@ meta_preference_to_string (MetaPreference pref)
     case META_PREF_REDUCED_RESOURCES:
       return "REDUCED_RESOURCES";
       break;
+    case META_PREF_GNOME_ACCESSIBILITY:
+      return "GNOME_ACCESSIBILTY";
+      break;
     }
 
   return "(unknown)";
@@ -2107,6 +2271,12 @@ meta_prefs_get_reduced_resources (void)
   return reduced_resources;
 }
 
+gboolean
+meta_prefs_get_gnome_accessibility ()
+{
+  return gnome_accessibility;
+}
+
 MetaKeyBindingAction
 meta_prefs_get_keybinding_action (const char *name)
 {