diff --git a/.gitignore b/.gitignore
index db70c63b7..616f305f8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,6 +12,7 @@ compile
 *.lo
 *.la
 *.gcov
+.dirstamp
 README
 stamp-enum-types
 stamp-marshal
@@ -23,12 +24,16 @@ stamp-marshal
 /clutter/gcov-report.txt
 /clutter/clutter-json.h
 /clutter/cex100/clutter-cex100.h
+/clutter/*.log
+/clutter/*.trs
 /clutter-lcov.info
 /clutter-lcov
-/build/autotools/*.m4
 !/build/autotools/introspection.m4
 !/build/autotools/as-linguas.m4
 !/build/autotools/as-compiler-flag.m4
+!/build/autotools/glibtests.m4
+/build/autotools/*.m4
+/build/test-driver
 *.gir
 *.typelib
 *.gcda
diff --git a/Makefile.am b/Makefile.am
index 1c37c564f..8743964dd 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,11 +2,7 @@ include $(top_srcdir)/build/autotools/Makefile.am.silent
 
 NULL =
 
-SUBDIRS = clutter doc po build
-
-if BUILD_TESTS
-SUBDIRS += tests
-endif
+SUBDIRS = build clutter tests doc po
 
 if BUILD_EXAMPLES
 SUBDIRS += examples
diff --git a/NEWS b/NEWS
index fa484a6ee..f3a8490bd 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,646 @@
+Clutter 1.21.2                                                       2014-12-15
+===============================================================================
+
+  • List of changes since Clutter 1.20.0
+
+    - Improve input device handling
+    Both on the evdev input backend, and the XInput2 backend for X11.
+
+    - Allow content implementations to drive actors preferred size
+    If a ClutterActor is only used to paint a ClutterContent implementation,
+    it should be possible to allow the actor to have the same preferred size
+    of its content. We use a ClutterRequestMode to specify this behaviour.
+
+    - Documentation fixes
+
+  • List of bugs fixed since Clutter 1.20.0
+
+    #738520 - evdev: Flush event queue before removing device(s)
+    #739050 - Fix some weird graphical glitches in RTL
+    #741350 - Improve touchpad detection on libinput
+    #740997 - Easing modes are not used when computing the value of a
+              KeyframeTransition
+    #676326 - actor: Add a :request-content-size property
+    #711182 - Incorrect drawing behaviour with clutter content centered
+    #709252 - ensure that all deprecated symbols are correctly annotated for
+              gtk-doc
+    #669743 - ObjectInfo property is_actor not correctly set when updating
+              existing actor using ClutterScriptParser
+    #719962 - clutter/osx: add clutter_osx_disable_event_retrieval
+    #681300 - Miss CLUTTER_INPUT_BACKEND description in doc
+    #729462 - DeviceManagerXi2: Update cached core pointer in getter if NULL
+
+Many thanks to:
+
+  Carlos Garnacho, Jasper St. Pierre, Jonas Ådahl, Rico Tzschichholz,
+  Samuel Degrande, Sjoerd Simons, cee1.
+
+Clutter 1.20.0                                                       2014-09-22
+===============================================================================
+
+  • List of changes since Clutter 1.19.10
+
+    - Translations updated
+    Greek
+
+  • List of bugs fixed since Clutter 1.19.10
+
+    - #736826 - clutter_text_set_font_name invalid example using "pt"
+
+Clutter 1.19.10                                                      2014-09-17
+===============================================================================
+
+  • List of changes since Clutter 1.19.8
+
+    - Honour the desktop window scaling factor in the GDK backend
+    The GDK backend will become the default backend in the next cycle, so we
+    need to improve its functionality out of the box.
+
+    - Ensure accessibility support is correctly initialized
+    We need to make sure that the accessibility implementation that Clutter
+    relies on is initialized the way we expect it to.
+
+    - Improve default paint volume computation
+    We should reduce the cases that lead to an invalid paint volume.
+
+    - Improve input handling on Wayland and X11
+
+    - Translations updates
+    Hebrew
+
+  • List of bugs fixed since Clutter 1.19.8
+
+    #736682 - clutter-actor: Don't ask children that have no allocation for
+              a paint volume
+    #736413 - USB mouse doesn't register slow movements to the right or down
+              in Gnome on Wayland
+    #734480 - Handle CLUTTER_SCALE envvar
+    #734115 - Deprecated property crashes /actor/transforms/anchor-point
+    #735388 - xi2 device manager gets a "0" client pointer if queried very
+              early in app lifetime
+    #735244 - shell forgets the DPI of screen sometimes
+
+Many thanks to:
+
+  Bastien Nocera, Adel Gadllah, Alejandro Piñeiro, Carlos Garnacho, Jonas
+  Ådahl, Yosef Or Boczko
+
+Clutter 1.19.8                                                       2014-08-21
+===============================================================================
+
+  • List of changes since Clutter 1.19.6
+  
+    - Improve the GDK backend
+    The GDK backend is now reporting touch events, as well as supporting
+    foreign Wayland surfaces for the Stage window. The goal is to make the
+    GDK backend the preferred one in the next development cycle.
+
+    - Fix drawing transparent Canvas content inside transparent actors
+
+    - Translation updates
+    German, Assamese
+
+  • List of bugs fixed since Clutter 1.19.6
+
+    #733202 - evdev: Add API to set the xkb layout index
+    #734934 - Add touch event translation code to GDK backend
+    #734935 - Add support for wayland foreign windows in GDK backend
+    #734761 - Memory leak in implicit transition
+
+Many thanks to:
+
+  Lionel Landwerlin Christian Kirbach, Rui Matos, Tom Beckmann, ngoswami,
+  Sunjin Yang
+
+Clutter 1.19.6                                                       2014-07-24
+===============================================================================
+
+  • List of changes since Clutter 1.19.4
+
+    - Add a signal for the end of the frame on ClutterStage
+    The ::after-paint signal is useful to execute custom code after all the
+    painting on a specific ClutterStage has been performend, but before the
+    frame contents have been presented on the screen.
+
+    - Improvements in the reliability of the evdev input backend
+
+    - Improvements in the GestureAction implementation
+
+  • List of bugs fixed since Clutter 1.19.4
+
+    #732342 - ClutterStage: Add an ::after-paint signal
+    #732907 - Allow for calling clutter_gesture_action_cancel() within the
+              ::gesture-end handler
+    #733062 - Evdev: set button state in input devices
+    #733300 - ClutterAnimation: fix memory leak
+    #733561 - Make a GType for ClutterEventSequence
+    #733562 - evdev: update xkb_state when resuming input
+    #733560 - Touch events trigger enter events on press, but no leave events
+              on release
+
+Many thanks to:
+
+  Carlos Garnacho, Giovanni Campagna, Owen W. Taylor
+
+Clutter 1.19.4                                                       2014-06-25
+===============================================================================
+
+  • List of changes since Clutter 1.19.2
+
+    - Depend on libinput 0.4
+    The evdev input backend now depends on libinput 0.4.0.
+
+  • List of bugs fixed since Clutter 1.19.2
+
+    #731268 - Events being clamped to the pre-fullscreen window size when
+              stage goes fullscreen
+    #731178 - evdev: Used floating point instead of fixed point numbers
+    #731254 - evdev: Follow libinput enum rename
+    #731536 - evdev: Add clutter_evdev_warp_pointer
+    #732234 - Touch events may leave a stage-less device, or happen on one
+    #732235 - clutter gesture actions may mistakenly handle enter/leave events
+
+Many thanks to:
+
+  Jonas Ådahl, Chun-wei Fan, Gustavo Noronha Silva, Jasper St. Pierre,
+  Carlos Garnacho.
+
+Clutter 1.19.2                                                       2014-05-28
+===============================================================================
+
+  • List of changes since Clutter 1.18
+
+    - Improve event handling on evdev input backend
+    Clutter now allows writing applications and compositors that can respond
+    to eventts from touch devices, as well as reporting correct smooth
+    scrolling deltas.
+
+  • List of bugs fixed since Clutter 1.18
+
+    #723560 - wayland: Generate better smooth scroll deltas
+    #730577 - Do not compress touch events so eagerly
+    #728968 - evdev: Implement touch support
+    #728967 - evdev: Add libinput-specific helpers
+    #730215 - Add a way to pause the ClutterMasterClock
+
+Many thanks to:
+
+  Carlos Garnacho, Jasper St. Pierre, Jonas Ådahl.
+
+Clutter 1.18.2                                                       2014-04-14
+===============================================================================
+
+  • List of changes since Clutter 1.18.0
+
+    - Fix the list of dependencies
+    Clutter 1.18 depends on Cogl 1.17.5 when building the EGL/KMS backend.
+
+    - Fixes for the Visual Studio build files
+    Use the new symbol visibility annotations when building with MSVC.
+
+    - Fix event handling on Windows
+    An optimization led to a crash on the Windows backend when delivering
+    events without an associated ClutterStage.
+
+    - Ensure that set_child_above/below work on the Stage
+    ClutterStage should respect the paint order when using the Actor API.
+
+    - Skip conformance test suite on X11 when DISPLAY is unset
+    Instead of bailing out when initializing the test suite we should just
+    tell the test suite API to skip the units. This allows the TAP driver
+    to catch the skipped tests and avoid warnings.
+
+    - Translation updates
+    Danish, French, Indonesian, Greek.
+
+  • List of bugs fixed since Clutter 1.18.0
+
+    #728177 - Cannot collect coverage with lcov 1.10
+    #727020 - wayland: Add missing CLUTTER_AVAILABLE annotations
+    #711645 - clutter_actor_set_child_above_sibling() not working in
+              ClutterStage
+    #726762 - Fix Import of Clutter Version Constants
+    #726703 - build error: undefined reference to
+              `cogl_kms_renderer_set_kms_fd'
+
+Many thanks to:
+
+  Chun-wei Fan, Adel Gadllah, Andika Triwidada, Ask H. Larsen, David Warman,
+  Emilio Pozuelo Monfort, Vadim Rutkovsky, maria thukididu, teuf.
+
+Clutter 1.18.0                                                       2014-03-18
+===============================================================================
+
+  • List of changes since Clutter 1.17.6
+
+    - Update build environment for Visual Studio
+
+    - Improve the API for implementing Wayland compositors
+    Allow integrating with logind and KMS; provide clipped redraws on both
+    Wayland clients, and direct KMS.
+
+    - Port the documentation to MarkDown
+
+    - Use symbol annotations to ensure the public ABI
+
+    - Translations updates
+    Korean, Traditional Chinese (Hong Kong and Taiwan), Chinese, Portuguese,
+    Latvian, Russian, French.
+
+  • List of bugs fixed since Clutter 1.17.6
+
+    #725716 - Fix build of clutter-test-utils.c on Windows
+    #725873 - Fix the Win32 backend for newer Visual Studio Versions
+    #725722 - Grid layout actor width/height swapped
+    #726199 - evdev changes needed for logind integration work
+    #726341 - eglnative: Add clutter-stage-window implementation
+    #726315 - clutter-stage-wayland: Enable clipped redraws
+    #726313 - stage-cogl: Fix feature check in clutter_stage_cogl_redraw
+    #726198 - egl: Add a way to set the KMS FD
+    #708781 - wayland: Keep track of button modifier state
+    #711857 - Avoid needless event copies when queueing from a backend
+              to a stage
+
+Many thanks to:
+
+  Jasper St. Pierre, Chun-wei Fan, Adel Gadllah, Bastian Winkler, Changwoo Ryu,
+  Chao-Hsiung Liao, Duarte Loreto, Jonas Ådahl, Rui Matos, Rūdolfs Mazurs,
+  Wylmer Wang, Yuri Myasoedov, teuf.
+
+Clutter 1.17.6                                                       2014-03-03
+===============================================================================
+
+  • List of changes since Clutter 1.17.4
+
+    - Use libinput instead of libevdev
+    The evdev input backend is now based on libinput instead of directly
+    using the evdev API; this allows for shared input behaviour with
+    different toolkits.
+
+    - Improvements in the X11 input handling
+    Remove the chance of input devices going out of sync; avoid excessive
+    round trips when asking for the client pointer; retrieve the text
+    direction for the current keymap.
+
+    - Improve RTL handling in ClutterText
+    Try to use the correct text direction based on the contents, keymap,
+    and actor's direction instead of just the latter.
+
+    - Translation updates
+    Brazilian Portuguese, Lithuanian, Czech, Hungarian, Serbian, Polish,
+    Galician.
+
+  • List of bugs fixed
+
+    #
+    #724788 - stage-cogl: Fix buffer_age code path
+    #724971 - Avoid stale ClutterInputDevice pointers in the device list
+    #720566 - [RFC] evdev: Port evdev input backend to libinput
+    #725102 - Patches to rework the evdev backend's keymap handling
+    #725103 - evdev: Set the initial core pointer coordinates to a sane value
+    #705779 - The text in the search-entry isn't aligned to right in RTL text
+    #725561 - DeviceManagerXi2: Cache the client pointer
+
+Many thanks to:
+
+  Rui Matos, Adel Gadllah, Jasper St. Pierre, Aurimas Černius, Balázs Úr,
+  Carlos Garnacho, Fran Diéguez, Jonas Ådahl, Marek Černocký, Piotr Drąg,
+  Rafael Ferreira, Мирослав Николић.
+
+Clutter 1.17.4                                                       2014-02-19
+===============================================================================
+
+  • List of changes since Clutter 1.17.2
+
+    - Add per-gesture thresholds
+    It is possible to give horizontal and vertical thresholds to each
+    ClutterGestureAction instance; if unset, the default is to use the
+    dnd threshold from ClutterSettings.
+
+    - Allow negative factors in ClutterActor scale properties
+    The functions already accepted these values, but the properties did not.
+
+    - Depend on Cogl 1.17.3
+
+    - Translation updates
+    Spanish, Hebrew, Czech, Brazilian Portuguese, Traditional Chinese (Hong
+    Kong and Taiwan), Serbian, Galician, Indonesian, Italian, Aragonese,
+    Norwegian bokmål, Ukranian.
+
+  • List of bugs fixed since Clutter 1.17.2
+
+    #711540 - Fix bad logic in checks
+    #662818 - Fix documentation of 'hsla()' parsing
+    #710232 - Mention that ClutterTransition is abstract in the documentation
+    #706311 - Extend :scale-[xyz] factors in the negative range
+    #724242 - Add per-action thresholds
+
+Many thanks to:
+
+  Bastien Nocera, Daniel Mustieles, Kjartan Maraas, Milo Casagrande, Adel
+  Gadllah, Andika Triwidada, Chao-Hsiung Liao, Daniel Korostil, Fran Diéguez,
+  Jorge Pérez Pérez, Marek Černocký, Rafael Ferreira, Yosef Or Boczko,
+  Мирослав Николић
+
+
+Clutter 1.17.2                                                       2014-01-22
+===============================================================================
+
+  • List of changes since Clutter 1.16.0
+
+    - Allow ClutterScript definitions for Interval and Transition classes
+    ClutterInterval instances can be defined, and used, in ClutterScript
+    UI definition files.
+
+    - Add generic API for event filtering
+    Event filtering is meant to be used to intercept events before they
+    reach the scene graph.
+
+    - Deprecated ClutterTableLayout
+    The Table layout manager is fully superceded by ClutterGridLayout, which
+    supports dynamic grid layouts, RTL flipping, expansion and alignment of
+    children using the ClutterActor flags, and implicit animations using the
+    actor's easing state.
+
+    - Allow GestureAction subclasses to change the trigger edge
+    GestureAction can emit the ::gesture-begin signal depending on the
+    value of the :threshold-trigger-edge property. Using this property it
+    is possible to specify whether the gesture begins after a certain
+    threshold is passed; before a certain threshold is passed; or
+    immediately.
+
+    - Use the window scaling factor when creating Cairo surfaces
+    ClutterCanvas will use the window scaling factor setting when creating
+    Cairo surfaces; it is also possible to set the scaling factor on a
+    per-instance basis, for future compatibility.
+
+    - Detect window scaling factor automatically on X11
+    Use the XSETTING exposed by the environment to change the window
+    scaling factor.
+
+    - Support ClutterStage cursor visibility in the Wayland backend
+    It is possible to show and hide the cursor on the Stage on Wayland.
+
+    - Translations updates
+    Czech, Greek, Hebrew, Chinese simplified, Brazilian Portuguese,
+    Galician, Italian, Spanish.
+
+  • List of bugs fixed since Clutter 1.16.0
+
+    705915 - Support high dpi displays
+    722322 - check coordinate validity in do_pick()
+    722220 - Incorrect string reported in accessible text-changed events
+             when text is removed
+    722188 - atk_text_get_n_selections() should return 0 when no text is
+             selected
+    710229 - Restore initial ClutterGestureAction behavior
+    710227 - ClutterGestureAction memory corruption
+    719901 - ClutterStageCogl: Ignore a clip the size of the stage
+    719900 - ClutterStageCogl: Clip in the right coordinate system
+    719747 - ClutterStage: Don't add empty actors to the stage clip
+    719716 - Make test-clip friendly for people with only one mouse button
+    719563 - input-device: Guard against double free
+    719368 - Don't queue redraws when reallocating actor that haven't moved
+    719367 - Bind constraints: Don't force redraws on source relayout
+    712816 - device-manager-evdev: Stop using deprecated libevdev API
+    712812 - Crash and memory leak fixes for device removals
+    712563 - Fixes for cogl journal usage when picking
+    707560 - Event filter
+    712322 - input-device-xi2: Calculate the correct state for button events
+    707071 - Remove use of XFixes for showing/hiding the cursor
+    709762 - ClutterDragAction can mix pointer and touch events
+    709590 - wayland: Implement support for 'cursor-visible' stage property
+
+Many thanks to:
+
+  Jasper St. Pierre, Rui Matos, Owen W. Taylor, Alejandro Piñeiro, Lionel
+  Landwerlin, Bastian Winkler, Neil Roberts, Rafael Ferreira, Chun-wei Fan,
+  Daniel Mustieles, Dimitris Spingos, Enrico Nicoletto, Florian Müllner, Fran
+  Diéguez, Jonas Ådahl, Marek Černocký, Milo Casagrande, Piotr Drąg, Robert
+  Bragg, Sphinx Jiang, Yosef Or Boczko
+
+Clutter 1.16.0                                                       2013-09-23
+===============================================================================
+
+  • List of changes since Clutter 1.15.96
+
+    - Fix a division by zero in the X11 backend
+
+    - Translation updates
+    Portuguese, Danish
+
+  • List of bugs fixed since Clutter 1.15.96
+
+    #707033 - Hidden division by zero in examples/basic-actor.c
+
+Many thanks to:
+
+  Duarte Loreto, Kenneth Nielsen.
+
+Clutter 1.15.96                                                      2013-09-20
+===============================================================================
+
+  • List of changes since Clutter 1.15.94
+
+    - Fix a crasher bug happening on X11
+    Some events coming from the system would result in a segmentation fault.
+
+  • List of bugs fixed since Clutter 1.15.94
+
+    #708439 - clutter-xi2: don't access the stage if we don't have one
+
+Clutter 1.15.94                                                      2013-09-19
+===============================================================================
+
+  • List of changes since Clutter 1.15.92
+
+    - Improve the evdev input backend
+    The evdev input backend is used when writing applications and compositors
+    that directly drive the frame buffer on Linux. By ensuring that the evdev
+    input backend works correctly it is possible to manage input sources like
+    pointers, keyboards, and touch devices using the raw evdev device nodes.
+    Clutter now depends on libevdev in order to poll the evdev interfaces.
+
+    - Allow scaling windowing surfaces
+    The main part of the work to support high resolution displays is to make
+    sure that windowing surfaces can be created with a scaling factor, while
+    trasparently handling the new size from an application's perspective. The
+    scaling factor is currently set manually, but it in the near future it will
+    be automatically set by the environment.
+
+    - Translation updates
+    Serbian, Aragonese, Russian, Latvian, Belarusian, Assamese, Indonesian,
+    German, Hebrew.
+
+  • List of bugs fixed since Clutter 1.15.92
+
+    #706652 - evdev: add callback to constrain the pointer position
+    #706543 - evdev: use monotonic times for the events
+    #706494 - an assortment of wayland and evdev related changes
+    #707377 - wayland: Check for NULL surface on pointer leave events
+    #707808 - box-layout: Fix floating point truncation when calculating a
+              child's size
+    #707774 - ClutterClickAction can trigger a crash if disposes at
+              inappropriate time
+    #707869 - Add API to restrict the windowing backend to load
+    #708079 - Clutter clutter-1.16 branch fails to commit after commit
+              da3e6988
+    #708383 - ClutterEvent: preserve extended state across
+              clutter_event_copy()
+
+Many thanks to:
+
+  Giovanni Campagna, Emmanuele Bassi, Lionel Landwerlin, Andika Triwidada,
+  Chun-wei Fan, Florian Müllner, Ihar Hrachyshka, Jasper St. Pierre, Jorge
+  Pérez Pérez, Nilamdyuti Goswami, Rob Bradford, Rūdolfs Mazurs, Yuri
+  Myasoedov, Мирослав Николић.
+
+Clutter 1.15.92                                                      2013-09-02
+===============================================================================
+
+  • List of changes since Clutter 1.15.90
+
+    - Fix regression in BoxLayout for RTL text direction
+
+    - Update Visual Studio build files
+
+    - Translation updates
+    Polish, French, Slovak, Lithuanian, Catalan
+
+  • List of bugs fixed since Clutter 1.15.90
+
+    #706450 - box-layout: Fix RTL layout swapping with non-zero container
+              offsets
+
+Many thanks to:
+
+  Chun-wei Fan, Jasper St. Pierre, Alexandre Franke, Aurimas Černius, Gil
+  Forcada, Ján Kyselica, Piotr Drąg
+
+Clutter 1.15.90                                                      2013-08-19
+===============================================================================
+
+  • List of changes since Clutter 1.15.2
+
+    - Update the Wayland backend
+    Use the new 1.2 behaviour and API, and improve the coverage of windowing
+    system features, alongside a slew of bugs.
+
+    - Drop support for XInput 1.x
+    The XInput 1.x extension was never really used after the introduction of
+    the 2.x version.
+
+    - Fix event and device handling when using evdev
+
+    - Allow using ClutterContent on a ClutterStage
+
+    - Fixes for the Windows backend
+    The build script has also been updated with the required dependencies.
+
+    - Documentation fixes
+
+    - Translations updated
+
+  • List of bugs fixed since Clutter 1.15.2
+
+    #703809 - Some LayoutManager fixes
+    #704625 - Cannot assign a ClutterContent to a stage
+    #698836 - Add interactive test for ClutterZoomAction/ClutterRotateAction
+    #705739 - Crash when removing a ClutterActor from a scene at the end of
+              an animation
+    #705710 - evdev: fix X11 to evdev keycode translation
+    #704269 - evdev: add a way for applications to tweak how devices are
+              opened
+    #704457 - Setting the size of the stage causes it to not be shown on
+              wayland
+    #699578 - Implement foreign surface support for stages
+    #704279 - wayland: Add API for disabling the event dispatching
+    #703336 - clutter-actor: Make clutter_actor_has_mapped_clones public
+    #701356 - Update the windows backend to work with latest Cogl
+    #703969 - Select for events with XIAllMasterDevices under XI2
+    #703878 - wayland: Don't pass the shell and compositor down to Cogl
+    #703608 - Update ClutterWaylandSurface to use a resource instead of
+              wl_buffer
+    #703877 - Bump the required Cogl version to 1.15.1
+
+Many thanks to:
+
+  Giovanni Campagna, Neil Roberts, Florian Müllner, Jasper St. Pierre, Rob
+  Bradford, Matej Urbančič, Adel Gadllah, Chao-Hsiung Liao, Chris Cummins,
+  Chun-wei Fan, Lionel Landwerlin, Rafael Ferreira
+
+Clutter 1.15.2                                                       2013-07-10
+===============================================================================
+
+  • List of changes since Clutter 1.14
+
+    - Improve state tracking and short circuiting
+    ClutterActor now tracks clones and unmapped actors more aggressively, to
+    reduce the amount of work necessary when updating the scene graph.
+
+    - Wayland backend improvements and updates
+
+    - Documentation updates
+    Clean up the API reference for readability, and improve the comments in
+    the inlined example code. Also, include the cookbook in the distribution
+    tarball.
+
+    - Allow installation of conformance tests
+    Clutter now allows installing its conformance tests into a well-known
+    location; this allows running the conformance test suite against an
+    installed version of Clutter.
+
+    - Add ClutterFlowLayout:snap-to-grid
+    ClutterFlowLayout users can now ask the layout manager to not align the
+    actors to a grid.
+
+    - Improve gesture recognizers
+
+    - Deprecations
+    ClutterText::cursor-event has been replaced by ClutterText::cursor-changed;
+    ClutterGeometry has been deprecated; ClutterActor::realize and ::unrealize,
+    along with their virtual functions, have been deprecated.
+
+  • List of bugs fixed since Clutter 1.14
+
+    #682789 - Deprecate ClutterGeometry (and remove it for 2.0)
+    #698668 - A few improvements to ClutterGestureAction
+    #698669 - Fix "trigger edge after" behavior with more than 1 touch point
+    #698671 - Refactor event handling code in ClutterGestureAction
+    #698674 - Improve ClutterZoomAction behavior
+    #698783 - Add a paint callback for ClutterStage
+    #698766 - Implicit transitions queued on invisible actors should be ignored
+    #648873 - Feature request: ClutterFlowLayout not aligning on a grid
+    #699675 - Offscreen effects allocating too much memory
+    #692706 - Frequent crash in cally_stage_notify_key_focus_cb
+    #701974 - x11: trap errors when calling XIQueryDevice
+    #696813 - clutter_actor_set_child_above/below_sibling leaking a reference
+              on the actor
+    #701208 - deform-effect: correctly set the cull-face mode of the back
+              pipeline
+    #700980 - Tap action now longer works
+    #702016 - ClutterText reset font when dpi changes and font was set using
+              a pango description
+    #702610 - text: relayout on cursor visibility change
+    #702941 - Install conformance tests
+    RH#975171 - gnome-shell: screen magnifier can cause crash with Cogl error
+    #702202 - conform tests hang on wayland
+    #703188 - Stage doesn't appear when running under Wayland
+    #703476 - tests/actor-offscreen-redirect: Fix race condition
+    #703566 - Need to be able to share Wayland display between GTK and Clutter
+    #697285 - Inconsistent setting of the time member on the events
+    #703882 - Prevent buffer/text/max-length properties notification in the
+              allocation cycle
+
+Many thanks to:
+
+  Lionel Landwerlin, Chris Cummins, Matthias Clasen, Rob Bradford, Alejandro
+  Piñeiro, Jasper St. Pierre, Bastian Winkler, Colin Walters, Craig R. Hughes,
+  Daniel Mustieles, Marek Černocký, Adel Gadllah, Ask H. Larsen, Bastien
+  Nocera, Cosimo Cecchi, Dimitris Spingos, Duarte Loreto, Emanuele Aina, Fran
+  Diéguez, Gil Forcada, Matej Urbančič, Milo Casagrande, Neil Roberts, Rui
+  Matos, Samuel Degrande, Sebastian Keller, Sjoerd Simons.
+
 Clutter 1.13.2                                                       2012-12-18
 ===============================================================================
 
diff --git a/README.in b/README.in
index 22f5ef012..1dba0c0e1 100644
--- a/README.in
+++ b/README.in
@@ -21,7 +21,6 @@ When building the X11 backend, Clutter depends on the following extensions:
   • XComposite ≥ @XCOMPOSITE_REQ_VERSION@
   • XDamage
   • XExt
-  • XFixes ≥ @XFIXES_REQ_VERSION@
   • XInput (1.x or 2.x)
   • XKB
 
@@ -38,6 +37,12 @@ When building the CEx100 backend, Clutter also depends on:
 
   • libgdl
 
+When building the evdev input backend, Clutter also depends on:
+
+  • xkbcommon
+  • libudev ≥ @LIBUDEV_REQ_VERSION@
+  • libinput ≥ @LIBINPUT_REQ_VERSION@
+
 If you are building the API reference you will also need:
 
   • GTK-Doc ≥ @GTK_DOC_REQ_VERSION@
@@ -287,9 +292,9 @@ if possible, add new unit tests for the conformance test suite in case of new
 features. Ensure you run the conformance test suite every for every patch you
 wish to submit, by using:
 
-  cd tests/conform && make test
+  make -C tests/conform check
 
-and verifying that the test suite passes.
+and verifying that the whole test suite passes.
 
 RELEASE NOTES
 -------------------------------------------------------------------------------
@@ -298,6 +303,61 @@ Relevant information for developers with existing Clutter applications
 wanting to port to newer releases (see NEWS for general information on new
 features).
 
+Release Notes for Clutter 1.22
+-------------------------------------------------------------------------------
+
+• The ClutterRequestMode enumeration has a new value. Code checking for the
+  values of ClutterRequestMode should already be resilient to changes to this
+  enumerations, like for all enumerations in Clutter.
+
+Release Notes for Clutter 1.20
+-------------------------------------------------------------------------------
+
+• The clutter_stage_set_paint_callback() experimental function has been
+  removed from the Clutter ABI; it has been replaced by the ::after-paint
+  signal on the ClutterStage class. The set_paint_callback() method was
+  marked as "experimental", required a special definition to be usable, and
+  no guarantees were made on its continued existence.
+
+Release Notes for Clutter 1.18
+-------------------------------------------------------------------------------
+
+• Until 1.18, ClutterStage removed its children during its dispose()
+  implementation, before the default ClutterActor::destroy() implementation
+  would run. ClutterStage will now destroy the children when it is destroyed
+  to ensure that the children are destroyed, and that custom code can remove
+  references through the ClutterActor::destroy signal.
+
+• Clutter does not depend on the XFIXES extension API on X11 any more. Before
+  1.18 Clutter used the XFIXES API to hide the cursor; the API is less than
+  useful for toolkits and applications, so Clutter unconditionally uses the
+  fall back code that was in place in case XFIXES was not available.
+
+• ClutterText emits the ::insert-text and ::delete-text signals before the
+  contents of the ClutterTextBuffer are changed, as documented. The signal
+  emission cannot be guaranteed if the ClutterTextBuffer API is used instead
+  of the ClutterText API.
+
+• Starting from 1.18, the Clutter evdev input device backend no longer uses
+  libevdev and libgudev directly, but relies on libinput for discovering,
+  reading and processing input devices.
+
+• The Clutter evdev input device backend was already considered
+  experimental and not subject to Clutter's API and ABI stabitility
+  guarantees. Starting from 1.18, users have to explicitly acknowldge
+  this by having to #define CLUTTER_ENABLE_COMPOSITOR_API to use its
+  public API.
+
+Release Notes for Clutter 1.16
+-------------------------------------------------------------------------------
+
+• Implicit transitions will not be created on actors that are not mapped,
+  unless they are in a cloned branch of the scene graph. This was never an
+  approved case, as ClutterActor would implicitly skip layout and paint on
+  unmapped actors, but now it's being enforced through the animation machinery
+  as well. Using explicit transitions still works, as explicit transitions
+  completely place the developer in charge.
+
 Release Notes for Clutter 1.14
 -------------------------------------------------------------------------------
 
diff --git a/README.md b/README.md
index 7a3c7a235..0fbf83d44 100644
--- a/README.md
+++ b/README.md
@@ -24,8 +24,7 @@ On X11, Clutter depends on the following extensions:
 * XComposite
 * XDamage
 * XExt
-* XFixes
-* XInput (1.x or 2.x)
+* XInput 2.x
 * XKB
 
 If you are building the API reference you will also need:
@@ -54,30 +53,24 @@ The official Clutter website is:
 
 The API references for the latest stable release are available at:
 
-        http://docs.clutter-project.org/docs/clutter/stable/
-        http://docs.clutter-project.org/docs/cogl/stable/
-        http://docs.clutter-project.org/docs/cally/stable/
+        https://developer.gnome.org/clutter/stable/
 
 The Clutter Cookbook is available at:
 
-        http://docs.clutter-project.org/docs/clutter-cookbook/
+        https://developer.gnome.org/clutter-cookbook/
 
 New releases of Clutter are available at:
 
-        http://source.clutter-project.org/sources/clutter/
-
-The Clutter blog is available at:
-
-        http://www.clutter-project.org/blog/
+        https://download.gnome.org/sources/clutter/
 
 To subscribe to the Clutter mailing lists and read the archives, use the
 Mailman web interface available at:
 
-        http://lists.clutter-project.org/
+        https://mail.gnome.org/mailman/listinfo/clutter-list
 
 New bug page on Bugzilla:
 
-        http://bugzilla.gnome.org/enter_bug.cgi?product=clutter
+        https://bugzilla.gnome.org/enter_bug.cgi?product=clutter
 
 Clutter is licensed under the terms of the GNU Lesser General Public
 License, version 2.1 or (at your option) later: see the `COPYING` file
@@ -93,7 +86,7 @@ be followed:
 2. make
 3. make install
 
-To build Clutter from a Git clone, run the autogen.sh script instead
+To build Clutter from a Git clone, run the `autogen.sh` script instead
 of the configure one. The `autogen.sh` script will run the configure script
 for you, unless the `NOCONFIGURE` environment variable is set to a non-empty
 value.
@@ -134,7 +127,7 @@ The usual workflow for contributions should be:
 2. Create a branch (`git checkout -b my_work`)
 3. Commit your changes (`git commit -am "Added my awesome feature"`)
 4. Push to the branch (`git push origin my_work`)
-5. Create an [Bug][1] with a link to your branch
+5. Create an [Bug][bugzilla-clutter] with a link to your branch
 6. Sit back, relax and wait for feedback and eventual merge
 
 Bugs
@@ -142,7 +135,7 @@ Bugs
 
 Bugs should be reported to the Clutter Bugzilla at:
 
-        http://bugzilla.gnome.org/enter_bug.cgi?product=clutter
+        https://bugzilla.gnome.org/enter_bug.cgi?product=clutter
 
 You will need a Bugzilla account.
 
@@ -162,7 +155,5 @@ behaviour.
 If the bug exposes a crash, the exact text printed out and a stack trace
 obtained using gdb are greatly appreciated.
 
-
-
-[building-clutter]: http://wiki.clutter-project.org/wiki/BuildingClutter
-[1]: http://bugzilla.gnome.org/enter_bug.cgi?product=clutter
+[building-clutter]: https://wiki.gnome.org/Projects/Clutter/Building
+[bugzilla-clutter]: https://bugzilla.gnome.org/enter_bug.cgi?product=clutter
diff --git a/build/autotools/Makefile.am b/build/autotools/Makefile.am
index 8446ea4b6..19dfd1c72 100644
--- a/build/autotools/Makefile.am
+++ b/build/autotools/Makefile.am
@@ -11,4 +11,8 @@ EXTRA_DIST = \
 	gtk-doc.m4		\
 	as-compiler-flag.m4	\
 	as-linguas.m4		\
+	glibtests.m4		\
+	glib-tap.mk		\
+	tap-driver.sh		\
+	tap-test		\
 	$(NULL)
diff --git a/build/autotools/Makefile.am.enums b/build/autotools/Makefile.am.enums
index d3dc742b5..2fd69d5bd 100644
--- a/build/autotools/Makefile.am.enums
+++ b/build/autotools/Makefile.am.enums
@@ -26,16 +26,17 @@ $(if $(glib_enum_headers),,$(error Need to define glib_enum_headers))
 
 enum_tmpl_h=$(addprefix $(srcdir)/, $(glib_enum_h:.h=.h.in))
 enum_tmpl_c=$(addprefix $(srcdir)/, $(glib_enum_c:.c=.c.in))
+enum_headers=$(addprefix $(srcdir)/, $(glib_enum_headers))
 
 CLEANFILES += stamp-enum-types
 DISTCLEANFILES += $(glib_enum_h) $(glib_enum_c)
 BUILT_SOURCES += $(glib_enum_h) $(glib_enum_c)
 EXTRA_DIST += $(enum_tmpl_h) $(enum_tmpl_c)
 
-stamp-enum-types: $(glib_enum_headers) $(enum_tmpl_h)
+stamp-enum-types: $(enum_headers) $(enum_tmpl_h)
 	$(AM_V_GEN)$(GLIB_MKENUMS) \
 		--template $(enum_tmpl_h) \
-	$(glib_enum_headers) > xgen-eh \
+	$(enum_headers) > xgen-eh \
 	&& (cmp -s xgen-eh $(glib_enum_h) || cp -f xgen-eh $(glib_enum_h)) \
 	&& rm -f xgen-eh \
 	&& echo timestamp > $(@F)
@@ -43,9 +44,9 @@ stamp-enum-types: $(glib_enum_headers) $(enum_tmpl_h)
 $(glib_enum_h): stamp-enum-types
 	@true
 
-$(glib_enum_c): $(glib_enum_headers) $(glib_enum_h) $(enum_tmpl_c)
+$(glib_enum_c): $(enum_headers) $(enum_tmpl_h) $(enum_tmpl_c)
 	$(AM_V_GEN)$(GLIB_MKENUMS) \
 		--template $(enum_tmpl_c) \
-	$(glib_enum_headers) > xgen-ec \
+	$(enum_headers) > xgen-ec \
 	&& cp -f xgen-ec $(glib_enum_c) \
 	&& rm -f xgen-ec
diff --git a/build/autotools/Makefile.am.gitignore b/build/autotools/Makefile.am.gitignore
index e86755b64..c3f4e0a11 100644
--- a/build/autotools/Makefile.am.gitignore
+++ b/build/autotools/Makefile.am.gitignore
@@ -3,12 +3,14 @@
 # generator of Git ignore files, and it's not meant to be used as
 # the top-level Git ignore file generator.
 
+GIT_IGNORE_FILES = $(noinst_PROGRAMS) $(check_PROGRAMS) $(check_SCRIPTS) $(GIT_IGNORE_EXTRA)
+
 $(srcdir)/.gitignore: Makefile.am
 	$(QUIET_GEN)( \
 	  echo "*.o" ; \
 	  echo ".gitignore" ; \
 	) > $(srcdir)/.gitignore ; \
-	for p in $(noinst_PROGRAMS); do \
+	for p in $(GIT_IGNORE_FILES); do \
 		echo "/$$p" >> $(srcdir)/.gitignore ; \
 	done
 
diff --git a/build/autotools/Makefile.am.release b/build/autotools/Makefile.am.release
index 6b1fcbc16..79ee35c9d 100644
--- a/build/autotools/Makefile.am.release
+++ b/build/autotools/Makefile.am.release
@@ -11,12 +11,12 @@ TAR_OPTIONS = --owner=0 --group=0
 #RELEASE_URL_BASE = http://source.clutter-project.org/sources/clutter
 #RELEASE_URL      = $(RELEASE_URL_BASE)/$(CLUTTER_MAJOR_VERSION).$(CLUTTER_MINOR_VERSION)
 
-RELEASE_ANNOUNCE_LIST = clutter-announce@clutter-project.org
+RELEASE_ANNOUNCE_LIST = clutter-list@gnome.org
 RELEASE_ANNOUNCE_CC   = gnome-announce-list@gnome.org
 
-RELEASE_DOC_URL = http://docs.clutter-project.org/docs/
+RELEASE_DOC_URL = https://developer.gnome.org
 
-BUGS_URL = http://bugzilla.gnome.org/enter_bug.cgi?product=clutter
+BUGS_URL = https://bugzilla.gnome.org/enter_bug.cgi?product=clutter
 
 tar_file    = $(distdir).tar.xz
 sha256_file = $(distdir).sha256sum
@@ -29,7 +29,7 @@ release-tag:
 	  echo "*** Cannot tag a Git version; please, update the Clutter version" >&2; \
 	else \
 	  if test -d "$(top_srcdir)/.git"; then \
-	    echo "  TAG    Tagging release $(CLUTTER_VERSION)..." ; \
+	    echo "  TAG      Tagging release $(CLUTTER_VERSION)..." ; \
 	    $(top_srcdir)/build/missing --run git tag \
 	 	-s \
 	      	-m "Clutter $(CLUTTER_VERSION) ($(CLUTTER_RELEASE_STATUS))" \
@@ -43,7 +43,7 @@ release-check: release-verify-even-micro release-verify-sane-changelogs release-
 	TAR_OPTIONS="$(TAR_OPTIONS)" $(MAKE) $(AM_MAKEFLAGS) distcheck
 
 release-verify-news:
-	@echo -n "  CHK    Checking that the NEWS file has been updated..."
+	@echo -n "  CHK      Checking that the NEWS file has been updated..."
 	@if ! grep -q "$(CLUTTER_VERSION)" $(top_srcdir)/NEWS; then \
 	  (echo "Ouch." && \
 	   echo "*** The version in the NEWS file does not match $(CLUTTER_VERSION)." && \
@@ -52,7 +52,7 @@ release-verify-news:
 	@echo "Good."
 
 release-verify-sane-changelogs: changelogs
-	@echo -n "  CHK    Checking that the ChangeLog files are sane..."
+	@echo -n "  CHK      Checking that the ChangeLog files are sane..."
 	@if grep -q "is required to generate" $(CHANGELOGS); then \
 	  (echo "Ouch." && \
 	   echo "*** Some of the ChangeLogs are not generated correctly." && \
@@ -60,7 +60,7 @@ release-verify-sane-changelogs: changelogs
 	@echo "Good."
 
 release-verify-even-micro:
-	@echo -n "  CHK    Checking that $(VERSION) has an even micro component..."
+	@echo -n "  CHK      Checking that $(VERSION) has an even micro component..."
 	@test "$(CLUTTER_MICRO_VERSION)" = "`echo $(CLUTTER_MICRO_VERSION)/2*2 | bc`" || \
 	  (echo "Ouch." && \
 	   echo "*** The version micro component '$(CLUTTER_MICRO_VERSION)' is not an even number." && \
@@ -69,10 +69,10 @@ release-verify-even-micro:
 	@echo "Good."
 
 release-upload: $(sha256_file)
-	@echo -n "  SCP    Uploading to master.gnome.org... "
+	@echo -n "  SCP      Uploading to master.gnome.org... "
 	@scp $(tar_file) master.gnome.org:
 	@echo "Done."
-	@echo -n "  EXEC   Running ftpadmin install... "
+	@echo -n "  EXEC     Running ftpadmin install... "
 	@ssh master.gnome.org ftpadmin install $(tar_file)
 	@mv -f $(sha256_file) $(top_builddir)/build/$(sha256_file)
 	@echo "Done."
@@ -128,7 +128,7 @@ release-message:
 	 else \
 	   echo "   Clutter: http://developer.gnome.org/clutter/stable/"; \
 	 fi
-	@echo "  Cookbook: $(RELEASE_DOC_URL)/clutter-cookbook/$(CLUTTER_API_VERSION)/"
+	@echo "  Cookbook: $(RELEASE_DOC_URL)/clutter-cookbook/$(CLUTTER_VERSION)/"
 	@echo ""
 	@echo "Release Notes:"
 	@if test "x$(CLUTTER_RELEASE_STATUS)" = "xsnapshot"; then \
diff --git a/build/autotools/Makefile.am.silent b/build/autotools/Makefile.am.silent
index ca465920b..5a1605c6e 100644
--- a/build/autotools/Makefile.am.silent
+++ b/build/autotools/Makefile.am.silent
@@ -4,16 +4,16 @@ QUIET_GEN = $(AM_V_GEN)
 
 QUIET_LN     = $(QUIET_LN_$(V))
 QUIET_LN_    = $(QUIET_LN_$(AM_DEFAULT_VERBOSITY))
-QUIET_LN_0   = @echo '  LN     '$@;
+QUIET_LN_0   = @echo '  LN       '$@;
 
 QUIET_RM     = $(QUIET_RM_$(V))
 QUIET_RM_    = $(QUIET_RM_$(AM_DEFAULT_VERBOSITY))
-QUIET_RM_0   = @echo '  RM     '$@;
+QUIET_RM_0   = @echo '  RM       '$@;
 
 QUIET_SCAN   = $(QUIET_SCAN_$(V))
 QUIET_SCAN_  = $(QUIET_SCAN_$(AM_DEFAULT_VERBOSITY))
-QUIET_SCAN_0 = @echo '  GISCAN '$@;
+QUIET_SCAN_0 = @echo '  GISCAN   '$@;
 
 QUIET_COMP   = $(QUIET_COMP_$(V))
 QUIET_COMP_  = $(QUIET_COMP_$(AM_DEFAULT_VERBOSITY))
-QUIET_COMP_0 = @echo '  GICOMP '$@;
+QUIET_COMP_0 = @echo '  GICOMP   '$@;
diff --git a/build/autotools/glib-tap.mk b/build/autotools/glib-tap.mk
new file mode 100644
index 000000000..7c5f82b9a
--- /dev/null
+++ b/build/autotools/glib-tap.mk
@@ -0,0 +1,134 @@
+# GLIB - Library of useful C routines
+
+TESTS_ENVIRONMENT= \
+	G_TEST_SRCDIR="$(abs_srcdir)" 		\
+	G_TEST_BUILDDIR="$(abs_builddir)" 	\
+	G_DEBUG=gc-friendly 			\
+	MALLOC_CHECK_=2 			\
+	MALLOC_PERTURB_=$$(($${RANDOM:-256} % 256))
+LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) $(top_srcdir)/build/autotools/tap-driver.sh
+LOG_COMPILER = $(top_srcdir)/build/autotools/tap-test
+
+NULL =
+
+# initialize variables for unconditional += appending
+BUILT_SOURCES =
+BUILT_EXTRA_DIST =
+CLEANFILES = *.log *.trs
+DISTCLEANFILES =
+MAINTAINERCLEANFILES =
+EXTRA_DIST =
+TESTS =
+
+installed_test_LTLIBRARIES =
+installed_test_PROGRAMS =
+installed_test_SCRIPTS =
+nobase_installed_test_DATA =
+
+noinst_LTLIBRARIES =
+noinst_PROGRAMS =
+noinst_SCRIPTS =
+noinst_DATA =
+
+check_LTLIBRARIES =
+check_PROGRAMS =
+check_SCRIPTS =
+check_DATA =
+
+# We support a fairly large range of possible variables.  It is expected that all types of files in a test suite
+# will belong in exactly one of the following variables.
+#
+# First, we support the usual automake suffixes, but in lowercase, with the customary meaning:
+#
+#   test_programs, test_scripts, test_data, test_ltlibraries
+#
+# The above are used to list files that are involved in both uninstalled and installed testing.  The
+# test_programs and test_scripts are taken to be actual testcases and will be run as part of the test suite.
+# Note that _data is always used with the nobase_ automake variable name to ensure that installed test data is
+# installed in the same way as it appears in the package layout.
+#
+# In order to mark a particular file as being only for one type of testing, use 'installed' or 'uninstalled',
+# like so:
+#
+#   installed_test_programs, uninstalled_test_programs
+#   installed_test_scripts, uninstalled_test_scripts
+#   installed_test_data, uninstalled_test_data
+#   installed_test_ltlibraries, uninstalled_test_ltlibraries
+#
+# Additionally, we support 'extra' infixes for programs and scripts.  This is used for support programs/scripts
+# that should not themselves be run as testcases (but exist to be used from other testcases):
+#
+#   test_extra_programs, installed_test_extra_programs, uninstalled_test_extra_programs
+#   test_extra_scripts, installed_test_extra_scripts, uninstalled_test_extra_scripts
+#
+# Additionally, for _scripts and _data, we support the customary dist_ prefix so that the named script or data
+# file automatically end up in the tarball.
+#
+#   dist_test_scripts, dist_test_data, dist_test_extra_scripts
+#   dist_installed_test_scripts, dist_installed_test_data, dist_installed_test_extra_scripts
+#   dist_uninstalled_test_scripts, dist_uninstalled_test_data, dist_uninstalled_test_extra_scripts
+#
+# Note that no file is automatically disted unless it appears in one of the dist_ variables.  This follows the
+# standard automake convention of not disting programs scripts or data by default.
+#
+# test_programs, test_scripts, uninstalled_test_programs and uninstalled_test_scripts (as well as their disted
+# variants) will be run as part of the in-tree 'make check'.  These are all assumed to be runnable under
+# gtester.  That's a bit strange for scripts, but it's possible.
+
+TESTS += $(test_programs) $(test_scripts) $(uninstalled_test_programs) $(uninstalled_test_scripts) \
+         $(dist_test_scripts) $(dist_uninstalled_test_scripts)
+
+# Note: build even the installed-only targets during 'make check' to ensure that they still work.
+# We need to do a bit of trickery here and manage disting via EXTRA_DIST instead of using dist_ prefixes to
+# prevent automake from mistreating gmake functions like $(wildcard ...) and $(addprefix ...) as if they were
+# filenames, including removing duplicate instances of the opening part before the space, eg. '$(addprefix'.
+all_test_programs     = $(test_programs) $(uninstalled_test_programs) $(installed_test_programs) \
+                        $(test_extra_programs) $(uninstalled_test_extra_programs) $(installed_test_extra_programs)
+all_test_scripts      = $(test_scripts) $(uninstalled_test_scripts) $(installed_test_scripts) \
+                        $(test_extra_scripts) $(uninstalled_test_extra_scripts) $(installed_test_extra_scripts)
+all_dist_test_scripts = $(dist_test_scripts) $(dist_uninstalled_test_scripts) $(dist_installed_test_scripts) \
+                        $(dist_test_extra_scripts) $(dist_uninstalled_test_extra_scripts) $(dist_installed_test_extra_scripts)
+all_test_scripts     += $(all_dist_test_scripts)
+EXTRA_DIST           += $(all_dist_test_scripts)
+all_test_data         = $(test_data) $(uninstalled_test_data) $(installed_test_data)
+all_dist_test_data    = $(dist_test_data) $(dist_uninstalled_test_data) $(dist_installed_test_data)
+all_test_data        += $(all_dist_test_data)
+EXTRA_DIST           += $(all_dist_test_data)
+all_test_ltlibs       = $(test_ltlibraries) $(uninstalled_test_ltlibraries) $(installed_test_ltlibraries)
+
+if ENABLE_ALWAYS_BUILD_TESTS
+noinst_LTLIBRARIES += $(all_test_ltlibs)
+noinst_PROGRAMS += $(all_test_programs)
+noinst_SCRIPTS += $(all_test_scripts)
+noinst_DATA += $(all_test_data)
+else
+check_LTLIBRARIES += $(all_test_ltlibs)
+check_PROGRAMS += $(all_test_programs)
+check_SCRIPTS += $(all_test_scripts)
+check_DATA += $(all_test_data)
+endif
+
+if ENABLE_INSTALLED_TESTS
+installed_test_PROGRAMS += $(test_programs) $(installed_test_programs) \
+                          $(test_extra_programs) $(installed_test_extra_programs)
+installed_test_SCRIPTS += $(test_scripts) $(installed_test_scripts) \
+                          $(test_extra_scripts) $(test_installed_extra_scripts)
+installed_test_SCRIPTS += $(dist_test_scripts) $(dist_test_extra_scripts) \
+                          $(dist_installed_test_scripts) $(dist_installed_test_extra_scripts)
+nobase_installed_test_DATA += $(test_data) $(installed_test_data)
+nobase_installed_test_DATA += $(dist_test_data) $(dist_installed_test_data)
+installed_test_LTLIBRARIES += $(test_ltlibraries) $(installed_test_ltlibraries)
+installed_testcases = $(test_programs) $(installed_test_programs) \
+                      $(test_scripts) $(installed_test_scripts) \
+                      $(dist_test_scripts) $(dist_installed_test_scripts)
+
+installed_test_meta_DATA = $(installed_testcases:=.test)
+
+%.test: %$(EXEEXT) Makefile
+	$(AM_V_GEN) (echo '[Test]' > $@.tmp; \
+	echo 'Type=session' >> $@.tmp; \
+	echo 'Exec=env G_ENABLE_DIAGNOSTIC=0 CLUTTER_ENABLE_DIAGNOSTIC=0 $(installed_testdir)/$<' >> $@.tmp; \
+	mv $@.tmp $@)
+
+CLEANFILES += $(installed_test_meta_DATA)
+endif
diff --git a/build/autotools/glibtests.m4 b/build/autotools/glibtests.m4
new file mode 100644
index 000000000..7d5920a43
--- /dev/null
+++ b/build/autotools/glibtests.m4
@@ -0,0 +1,28 @@
+dnl GLIB_TESTS
+dnl
+
+AC_DEFUN([GLIB_TESTS],
+[
+  AC_ARG_ENABLE(installed-tests,
+                AS_HELP_STRING([--enable-installed-tests],
+                               [Enable installation of some test cases]),
+                [case ${enableval} in
+                  yes) ENABLE_INSTALLED_TESTS="1"  ;;
+                  no)  ENABLE_INSTALLED_TESTS="" ;;
+                  *) AC_MSG_ERROR([bad value ${enableval} for --enable-installed-tests]) ;;
+                 esac])
+  AM_CONDITIONAL([ENABLE_INSTALLED_TESTS], test "$ENABLE_INSTALLED_TESTS" = "1")
+  AC_ARG_ENABLE(always-build-tests,
+                AS_HELP_STRING([--enable-always-build-tests],
+                               [Enable always building tests during 'make all']),
+                [case ${enableval} in
+                  yes) ENABLE_ALWAYS_BUILD_TESTS="1"  ;;
+                  no)  ENABLE_ALWAYS_BUILD_TESTS="" ;;
+                  *) AC_MSG_ERROR([bad value ${enableval} for --enable-always-build-tests]) ;;
+                 esac])
+  AM_CONDITIONAL([ENABLE_ALWAYS_BUILD_TESTS], test "$ENABLE_ALWAYS_BUILD_TESTS" = "1")
+  if test "$ENABLE_INSTALLED_TESTS" = "1"; then
+    AC_SUBST(installed_test_metadir, [${datadir}/installed-tests/]AC_PACKAGE_NAME)
+    AC_SUBST(installed_testdir, [${libexecdir}/installed-tests/]AC_PACKAGE_NAME)
+  fi
+])
diff --git a/build/autotools/introspection.m4 b/build/autotools/introspection.m4
index 589721c5a..d89c3d907 100644
--- a/build/autotools/introspection.m4
+++ b/build/autotools/introspection.m4
@@ -41,6 +41,8 @@ m4_define([_GOBJECT_INTROSPECTION_CHECK_INTERNAL],
     ],dnl
     [auto],[dnl
         PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], found_introspection=yes, found_introspection=no)
+	dnl Canonicalize enable_introspection
+	enable_introspection=$found_introspection
     ],dnl
     [dnl	
         AC_MSG_ERROR([invalid argument passed to --enable-introspection, should be one of @<:@no/auto/yes@:>@])
diff --git a/build/autotools/tap-driver.sh b/build/autotools/tap-driver.sh
new file mode 100755
index 000000000..19aa531de
--- /dev/null
+++ b/build/autotools/tap-driver.sh
@@ -0,0 +1,652 @@
+#! /bin/sh
+# Copyright (C) 2011-2013 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# This file is maintained in Automake, please report
+# bugs to <bug-automake@gnu.org> or send patches to
+# <automake-patches@gnu.org>.
+
+scriptversion=2011-12-27.17; # UTC
+
+# Make unconditional expansion of undefined variables an error.  This
+# helps a lot in preventing typo-related bugs.
+set -u
+
+me=tap-driver.sh
+
+fatal ()
+{
+  echo "$me: fatal: $*" >&2
+  exit 1
+}
+
+usage_error ()
+{
+  echo "$me: $*" >&2
+  print_usage >&2
+  exit 2
+}
+
+print_usage ()
+{
+  cat <<END
+Usage:
+  tap-driver.sh --test-name=NAME --log-file=PATH --trs-file=PATH
+                [--expect-failure={yes|no}] [--color-tests={yes|no}]
+                [--enable-hard-errors={yes|no}] [--ignore-exit]
+                [--diagnostic-string=STRING] [--merge|--no-merge]
+                [--comments|--no-comments] [--] TEST-COMMAND
+The \`--test-name', \`--log-file' and \`--trs-file' options are mandatory.
+END
+}
+
+# TODO: better error handling in option parsing (in particular, ensure
+# TODO: $log_file, $trs_file and $test_name are defined).
+test_name= # Used for reporting.
+log_file=  # Where to save the result and output of the test script.
+trs_file=  # Where to save the metadata of the test run.
+expect_failure=0
+color_tests=0
+merge=0
+ignore_exit=0
+comments=0
+diag_string='#'
+while test $# -gt 0; do
+  case $1 in
+  --help) print_usage; exit $?;;
+  --version) echo "$me $scriptversion"; exit $?;;
+  --test-name) test_name=$2; shift;;
+  --log-file) log_file=$2; shift;;
+  --trs-file) trs_file=$2; shift;;
+  --color-tests) color_tests=$2; shift;;
+  --expect-failure) expect_failure=$2; shift;;
+  --enable-hard-errors) shift;; # No-op.
+  --merge) merge=1;;
+  --no-merge) merge=0;;
+  --ignore-exit) ignore_exit=1;;
+  --comments) comments=1;;
+  --no-comments) comments=0;;
+  --diagnostic-string) diag_string=$2; shift;;
+  --) shift; break;;
+  -*) usage_error "invalid option: '$1'";;
+  esac
+  shift
+done
+
+test $# -gt 0 || usage_error "missing test command"
+
+case $expect_failure in
+  yes) expect_failure=1;;
+    *) expect_failure=0;;
+esac
+
+if test $color_tests = yes; then
+  init_colors='
+    color_map["red"]="" # Red.
+    color_map["grn"]="" # Green.
+    color_map["lgn"]="" # Light green.
+    color_map["blu"]="" # Blue.
+    color_map["mgn"]="" # Magenta.
+    color_map["std"]=""     # No color.
+    color_for_result["ERROR"] = "mgn"
+    color_for_result["PASS"]  = "grn"
+    color_for_result["XPASS"] = "red"
+    color_for_result["FAIL"]  = "red"
+    color_for_result["XFAIL"] = "lgn"
+    color_for_result["SKIP"]  = "blu"'
+else
+  init_colors=''
+fi
+
+# :; is there to work around a bug in bash 3.2 (and earlier) which
+# does not always set '$?' properly on redirection failure.
+# See the Autoconf manual for more details.
+:;{
+  (
+    # Ignore common signals (in this subshell only!), to avoid potential
+    # problems with Korn shells.  Some Korn shells are known to propagate
+    # to themselves signals that have killed a child process they were
+    # waiting for; this is done at least for SIGINT (and usually only for
+    # it, in truth).  Without the `trap' below, such a behaviour could
+    # cause a premature exit in the current subshell, e.g., in case the
+    # test command it runs gets terminated by a SIGINT.  Thus, the awk
+    # script we are piping into would never seen the exit status it
+    # expects on its last input line (which is displayed below by the
+    # last `echo $?' statement), and would thus die reporting an internal
+    # error.
+    # For more information, see the Autoconf manual and the threads:
+    # <http://lists.gnu.org/archive/html/bug-autoconf/2011-09/msg00004.html>
+    # <http://mail.opensolaris.org/pipermail/ksh93-integration-discuss/2009-February/004121.html>
+    trap : 1 3 2 13 15
+    if test $merge -gt 0; then
+      exec 2>&1
+    else
+      exec 2>&3
+    fi
+    "$@"
+    echo $?
+  ) | LC_ALL=C ${AM_TAP_AWK-awk} \
+        -v me="$me" \
+        -v test_script_name="$test_name" \
+        -v log_file="$log_file" \
+        -v trs_file="$trs_file" \
+        -v expect_failure="$expect_failure" \
+        -v merge="$merge" \
+        -v ignore_exit="$ignore_exit" \
+        -v comments="$comments" \
+        -v diag_string="$diag_string" \
+'
+# FIXME: the usages of "cat >&3" below could be optimized when using
+# FIXME: GNU awk, and/on on systems that supports /dev/fd/.
+
+# Implementation note: in what follows, `result_obj` will be an
+# associative array that (partly) simulates a TAP result object
+# from the `TAP::Parser` perl module.
+
+## ----------- ##
+##  FUNCTIONS  ##
+## ----------- ##
+
+function fatal(msg)
+{
+  print me ": " msg | "cat >&2"
+  exit 1
+}
+
+function abort(where)
+{
+  fatal("internal error " where)
+}
+
+# Convert a boolean to a "yes"/"no" string.
+function yn(bool)
+{
+  return bool ? "yes" : "no";
+}
+
+function add_test_result(result)
+{
+  if (!test_results_index)
+    test_results_index = 0
+  test_results_list[test_results_index] = result
+  test_results_index += 1
+  test_results_seen[result] = 1;
+}
+
+# Whether the test script should be re-run by "make recheck".
+function must_recheck()
+{
+  for (k in test_results_seen)
+    if (k != "XFAIL" && k != "PASS" && k != "SKIP")
+      return 1
+  return 0
+}
+
+# Whether the content of the log file associated to this test should
+# be copied into the "global" test-suite.log.
+function copy_in_global_log()
+{
+  for (k in test_results_seen)
+    if (k != "PASS")
+      return 1
+  return 0
+}
+
+# FIXME: this can certainly be improved ...
+function get_global_test_result()
+{
+    if ("ERROR" in test_results_seen)
+      return "ERROR"
+    if ("FAIL" in test_results_seen || "XPASS" in test_results_seen)
+      return "FAIL"
+    all_skipped = 1
+    for (k in test_results_seen)
+      if (k != "SKIP")
+        all_skipped = 0
+    if (all_skipped)
+      return "SKIP"
+    return "PASS";
+}
+
+function stringify_result_obj(result_obj)
+{
+  if (result_obj["is_unplanned"] || result_obj["number"] != testno)
+    return "ERROR"
+
+  if (plan_seen == LATE_PLAN)
+    return "ERROR"
+
+  if (result_obj["directive"] == "TODO")
+    return result_obj["is_ok"] ? "XPASS" : "XFAIL"
+
+  if (result_obj["directive"] == "SKIP")
+    return result_obj["is_ok"] ? "SKIP" : COOKED_FAIL;
+
+  if (length(result_obj["directive"]))
+      abort("in function stringify_result_obj()")
+
+  return result_obj["is_ok"] ? COOKED_PASS : COOKED_FAIL
+}
+
+function decorate_result(result)
+{
+  color_name = color_for_result[result]
+  if (color_name)
+    return color_map[color_name] "" result "" color_map["std"]
+  # If we are not using colorized output, or if we do not know how
+  # to colorize the given result, we should return it unchanged.
+  return result
+}
+
+function report(result, details)
+{
+  if (result ~ /^(X?(PASS|FAIL)|SKIP|ERROR)/)
+    {
+      msg = ": " test_script_name
+      add_test_result(result)
+    }
+  else if (result == "#")
+    {
+      msg = " " test_script_name ":"
+    }
+  else
+    {
+      abort("in function report()")
+    }
+  if (length(details))
+    msg = msg " " details
+  # Output on console might be colorized.
+  print decorate_result(result) msg
+  # Log the result in the log file too, to help debugging (this is
+  # especially true when said result is a TAP error or "Bail out!").
+  print result msg | "cat >&3";
+}
+
+function testsuite_error(error_message)
+{
+  report("ERROR", "- " error_message)
+}
+
+function handle_tap_result()
+{
+  details = result_obj["number"];
+  if (length(result_obj["description"]))
+    details = details " " result_obj["description"]
+
+  if (plan_seen == LATE_PLAN)
+    {
+      details = details " # AFTER LATE PLAN";
+    }
+  else if (result_obj["is_unplanned"])
+    {
+       details = details " # UNPLANNED";
+    }
+  else if (result_obj["number"] != testno)
+    {
+       details = sprintf("%s # OUT-OF-ORDER (expecting %d)",
+                         details, testno);
+    }
+  else if (result_obj["directive"])
+    {
+      details = details " # " result_obj["directive"];
+      if (length(result_obj["explanation"]))
+        details = details " " result_obj["explanation"]
+    }
+
+  report(stringify_result_obj(result_obj), details)
+}
+
+# `skip_reason` should be empty whenever planned > 0.
+function handle_tap_plan(planned, skip_reason)
+{
+  planned += 0 # Avoid getting confused if, say, `planned` is "00"
+  if (length(skip_reason) && planned > 0)
+    abort("in function handle_tap_plan()")
+  if (plan_seen)
+    {
+      # Error, only one plan per stream is acceptable.
+      testsuite_error("multiple test plans")
+      return;
+    }
+  planned_tests = planned
+  # The TAP plan can come before or after *all* the TAP results; we speak
+  # respectively of an "early" or a "late" plan.  If we see the plan line
+  # after at least one TAP result has been seen, assume we have a late
+  # plan; in this case, any further test result seen after the plan will
+  # be flagged as an error.
+  plan_seen = (testno >= 1 ? LATE_PLAN : EARLY_PLAN)
+  # If testno > 0, we have an error ("too many tests run") that will be
+  # automatically dealt with later, so do not worry about it here.  If
+  # $plan_seen is true, we have an error due to a repeated plan, and that
+  # has already been dealt with above.  Otherwise, we have a valid "plan
+  # with SKIP" specification, and should report it as a particular kind
+  # of SKIP result.
+  if (planned == 0 && testno == 0)
+    {
+      if (length(skip_reason))
+        skip_reason = "- "  skip_reason;
+      report("SKIP", skip_reason);
+    }
+}
+
+function extract_tap_comment(line)
+{
+  if (index(line, diag_string) == 1)
+    {
+      # Strip leading `diag_string` from `line`.
+      line = substr(line, length(diag_string) + 1)
+      # And strip any leading and trailing whitespace left.
+      sub("^[ \t]*", "", line)
+      sub("[ \t]*$", "", line)
+      # Return what is left (if any).
+      return line;
+    }
+  return "";
+}
+
+# When this function is called, we know that line is a TAP result line,
+# so that it matches the (perl) RE "^(not )?ok\b".
+function setup_result_obj(line)
+{
+  # Get the result, and remove it from the line.
+  result_obj["is_ok"] = (substr(line, 1, 2) == "ok" ? 1 : 0)
+  sub("^(not )?ok[ \t]*", "", line)
+
+  # If the result has an explicit number, get it and strip it; otherwise,
+  # automatically assing the next progresive number to it.
+  if (line ~ /^[0-9]+$/ || line ~ /^[0-9]+[^a-zA-Z0-9_]/)
+    {
+      match(line, "^[0-9]+")
+      # The final `+ 0` is to normalize numbers with leading zeros.
+      result_obj["number"] = substr(line, 1, RLENGTH) + 0
+      line = substr(line, RLENGTH + 1)
+    }
+  else
+    {
+      result_obj["number"] = testno
+    }
+
+  if (plan_seen == LATE_PLAN)
+    # No further test results are acceptable after a "late" TAP plan
+    # has been seen.
+    result_obj["is_unplanned"] = 1
+  else if (plan_seen && testno > planned_tests)
+    result_obj["is_unplanned"] = 1
+  else
+    result_obj["is_unplanned"] = 0
+
+  # Strip trailing and leading whitespace.
+  sub("^[ \t]*", "", line)
+  sub("[ \t]*$", "", line)
+
+  # This will have to be corrected if we have a "TODO"/"SKIP" directive.
+  result_obj["description"] = line
+  result_obj["directive"] = ""
+  result_obj["explanation"] = ""
+
+  if (index(line, "#") == 0)
+    return # No possible directive, nothing more to do.
+
+  # Directives are case-insensitive.
+  rx = "[ \t]*#[ \t]*([tT][oO][dD][oO]|[sS][kK][iI][pP])[ \t]*"
+
+  # See whether we have the directive, and if yes, where.
+  pos = match(line, rx "$")
+  if (!pos)
+    pos = match(line, rx "[^a-zA-Z0-9_]")
+
+  # If there was no TAP directive, we have nothing more to do.
+  if (!pos)
+    return
+
+  # Let`s now see if the TAP directive has been escaped.  For example:
+  #  escaped:     ok \# SKIP
+  #  not escaped: ok \\# SKIP
+  #  escaped:     ok \\\\\# SKIP
+  #  not escaped: ok \ # SKIP
+  if (substr(line, pos, 1) == "#")
+    {
+      bslash_count = 0
+      for (i = pos; i > 1 && substr(line, i - 1, 1) == "\\"; i--)
+        bslash_count += 1
+      if (bslash_count % 2)
+        return # Directive was escaped.
+    }
+
+  # Strip the directive and its explanation (if any) from the test
+  # description.
+  result_obj["description"] = substr(line, 1, pos - 1)
+  # Now remove the test description from the line, that has been dealt
+  # with already.
+  line = substr(line, pos)
+  # Strip the directive, and save its value (normalized to upper case).
+  sub("^[ \t]*#[ \t]*", "", line)
+  result_obj["directive"] = toupper(substr(line, 1, 4))
+  line = substr(line, 5)
+  # Now get the explanation for the directive (if any), with leading
+  # and trailing whitespace removed.
+  sub("^[ \t]*", "", line)
+  sub("[ \t]*$", "", line)
+  result_obj["explanation"] = line
+}
+
+function get_test_exit_message(status)
+{
+  if (status == 0)
+    return ""
+  if (status !~ /^[1-9][0-9]*$/)
+    abort("getting exit status")
+  if (status < 127)
+    exit_details = ""
+  else if (status == 127)
+    exit_details = " (command not found?)"
+  else if (status >= 128 && status <= 255)
+    exit_details = sprintf(" (terminated by signal %d?)", status - 128)
+  else if (status > 256 && status <= 384)
+    # We used to report an "abnormal termination" here, but some Korn
+    # shells, when a child process die due to signal number n, can leave
+    # in $? an exit status of 256+n instead of the more standard 128+n.
+    # Apparently, both behaviours are allowed by POSIX (2008), so be
+    # prepared to handle them both.  See also Austing Group report ID
+    # 0000051 <http://www.austingroupbugs.net/view.php?id=51>
+    exit_details = sprintf(" (terminated by signal %d?)", status - 256)
+  else
+    # Never seen in practice.
+    exit_details = " (abnormal termination)"
+  return sprintf("exited with status %d%s", status, exit_details)
+}
+
+function write_test_results()
+{
+  print ":global-test-result: " get_global_test_result() > trs_file
+  print ":recheck: "  yn(must_recheck()) > trs_file
+  print ":copy-in-global-log: " yn(copy_in_global_log()) > trs_file
+  for (i = 0; i < test_results_index; i += 1)
+    print ":test-result: " test_results_list[i] > trs_file
+  close(trs_file);
+}
+
+BEGIN {
+
+## ------- ##
+##  SETUP  ##
+## ------- ##
+
+'"$init_colors"'
+
+# Properly initialized once the TAP plan is seen.
+planned_tests = 0
+
+COOKED_PASS = expect_failure ? "XPASS": "PASS";
+COOKED_FAIL = expect_failure ? "XFAIL": "FAIL";
+
+# Enumeration-like constants to remember which kind of plan (if any)
+# has been seen.  It is important that NO_PLAN evaluates "false" as
+# a boolean.
+NO_PLAN = 0
+EARLY_PLAN = 1
+LATE_PLAN = 2
+
+testno = 0     # Number of test results seen so far.
+bailed_out = 0 # Whether a "Bail out!" directive has been seen.
+
+# Whether the TAP plan has been seen or not, and if yes, which kind
+# it is ("early" is seen before any test result, "late" otherwise).
+plan_seen = NO_PLAN
+
+## --------- ##
+##  PARSING  ##
+## --------- ##
+
+is_first_read = 1
+
+while (1)
+  {
+    # Involutions required so that we are able to read the exit status
+    # from the last input line.
+    st = getline
+    if (st < 0) # I/O error.
+      fatal("I/O error while reading from input stream")
+    else if (st == 0) # End-of-input
+      {
+        if (is_first_read)
+          abort("in input loop: only one input line")
+        break
+      }
+    if (is_first_read)
+      {
+        is_first_read = 0
+        nextline = $0
+        continue
+      }
+    else
+      {
+        curline = nextline
+        nextline = $0
+        $0 = curline
+      }
+    # Copy any input line verbatim into the log file.
+    print | "cat >&3"
+    # Parsing of TAP input should stop after a "Bail out!" directive.
+    if (bailed_out)
+      continue
+
+    # TAP test result.
+    if ($0 ~ /^(not )?ok$/ || $0 ~ /^(not )?ok[^a-zA-Z0-9_]/)
+      {
+        testno += 1
+        setup_result_obj($0)
+        handle_tap_result()
+      }
+    # TAP plan (normal or "SKIP" without explanation).
+    else if ($0 ~ /^1\.\.[0-9]+[ \t]*$/)
+      {
+        # The next two lines will put the number of planned tests in $0.
+        sub("^1\\.\\.", "")
+        sub("[^0-9]*$", "")
+        handle_tap_plan($0, "")
+        continue
+      }
+    # TAP "SKIP" plan, with an explanation.
+    else if ($0 ~ /^1\.\.0+[ \t]*#/)
+      {
+        # The next lines will put the skip explanation in $0, stripping
+        # any leading and trailing whitespace.  This is a little more
+        # tricky in truth, since we want to also strip a potential leading
+        # "SKIP" string from the message.
+        sub("^[^#]*#[ \t]*(SKIP[: \t][ \t]*)?", "")
+        sub("[ \t]*$", "");
+        handle_tap_plan(0, $0)
+      }
+    # "Bail out!" magic.
+    # Older versions of prove and TAP::Harness (e.g., 3.17) did not
+    # recognize a "Bail out!" directive when preceded by leading
+    # whitespace, but more modern versions (e.g., 3.23) do.  So we
+    # emulate the latter, "more modern" behaviour.
+    else if ($0 ~ /^[ \t]*Bail out!/)
+      {
+        bailed_out = 1
+        # Get the bailout message (if any), with leading and trailing
+        # whitespace stripped.  The message remains stored in `$0`.
+        sub("^[ \t]*Bail out![ \t]*", "");
+        sub("[ \t]*$", "");
+        # Format the error message for the
+        bailout_message = "Bail out!"
+        if (length($0))
+          bailout_message = bailout_message " " $0
+        testsuite_error(bailout_message)
+      }
+    # Maybe we have too look for dianogtic comments too.
+    else if (comments != 0)
+      {
+        comment = extract_tap_comment($0);
+        if (length(comment))
+          report("#", comment);
+      }
+  }
+
+## -------- ##
+##  FINISH  ##
+## -------- ##
+
+# A "Bail out!" directive should cause us to ignore any following TAP
+# error, as well as a non-zero exit status from the TAP producer.
+if (!bailed_out)
+  {
+    if (!plan_seen)
+      {
+        testsuite_error("missing test plan")
+      }
+    else if (planned_tests != testno)
+      {
+        bad_amount = testno > planned_tests ? "many" : "few"
+        testsuite_error(sprintf("too %s tests run (expected %d, got %d)",
+                                bad_amount, planned_tests, testno))
+      }
+    if (!ignore_exit)
+      {
+        # Fetch exit status from the last line.
+        exit_message = get_test_exit_message(nextline)
+        if (exit_message)
+          testsuite_error(exit_message)
+      }
+  }
+
+write_test_results()
+
+exit 0
+
+} # End of "BEGIN" block.
+'
+
+# TODO: document that we consume the file descriptor 3 :-(
+} 3>"$log_file"
+
+test $? -eq 0 || fatal "I/O or internal error"
+
+# Local Variables:
+# mode: shell-script
+# sh-indentation: 2
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
+# End:
diff --git a/build/autotools/tap-test b/build/autotools/tap-test
new file mode 100755
index 000000000..481e333ec
--- /dev/null
+++ b/build/autotools/tap-test
@@ -0,0 +1,5 @@
+#! /bin/sh
+
+# run a GTest in tap mode. The test binary is passed as $1
+
+$1 -k --tap
diff --git a/build/mingw/mingw-fetch-dependencies.sh b/build/mingw/mingw-fetch-dependencies.sh
index 2fce3fd44..2fc9d304f 100755
--- a/build/mingw/mingw-fetch-dependencies.sh
+++ b/build/mingw/mingw-fetch-dependencies.sh
@@ -8,12 +8,15 @@
 TOR_URL="http://ftp.gnome.org/pub/gnome/binaries/win32";
 
 TOR_BINARIES=( \
-    glib/2.28/glib{-dev,}_2.28.1-1_win32.zip \
-    gtk+/2.16/gtk+{-dev,}_2.16.6-2_win32.zip \
-    pango/1.28/pango{-dev,}_1.28.0-1_win32.zip );
+    gtk+/2.16/gtk+{-dev,}_2.16.6-2_win32.zip );
 
 TOR_DEP_URL="http://ftp.gnome.org/pub/gnome/binaries/win32/dependencies";
 
+ZLIB_VERSION=1.2.4-2
+FFI_VERSION=3.0.6
+GLIB_VERSION=2.34.3
+GLIB_MINOR_VERSION="${GLIB_VERSION%.*}"
+
 TOR_DEPS=( \
     cairo{-dev,}_1.10.0-2_win32.zip \
     gettext-runtime-{dev-,}0.17-1.zip \
@@ -21,13 +24,17 @@ TOR_DEPS=( \
     freetype{-dev,}_2.3.12-1_win32.zip \
     expat_2.0.1-1_win32.zip \
     libpng{-dev,}_1.4.0-1_win32.zip \
-    zlib{-dev,}_1.2.4-2_win32.zip );
+    zlib{-dev,}_${ZLIB_VERSION}_win32.zip \
+    libffi{-dev,}_${FFI_VERSION}-1_win32.zip \
+    gettext-runtime{-dev,}_0.18.1.1-2_win32.zip );
 
 GNOME_SOURCES_URL="http://ftp.gnome.org/pub/GNOME/sources/"
 SOURCES_DEPS=(\
-    cogl/1.8/cogl-1.8.0.tar.bz2 \
-    json-glib/0.12/json-glib-0.12.2.tar.bz2 \
-    atk/2.1/atk-2.1.91.tar.bz2 );
+    glib/${GLIB_MINOR_VERSION}/glib-${GLIB_VERSION}.tar.xz \
+    cogl/1.14/cogl-1.14.0.tar.xz \
+    json-glib/0.16/json-glib-0.16.0.tar.xz \
+    atk/2.8/atk-2.8.0.tar.xz \
+    pango/1.34/pango-1.34.1.tar.xz );
 
 GL_HEADER_URLS=( \
     http://cgit.freedesktop.org/mesa/mesa/plain/include/GL/gl.h \
@@ -132,7 +139,7 @@ function do_untar_source_d ()
     local exdir="$1"; shift;
     local tarfile="$1"; shift;
 
-    tar -C "$exdir" -jxvf "$tarfile" "$@";
+    tar -C "$exdir" -axvf "$tarfile" "$@";
 
     if [ "$?" -ne 0 ]; then
 	echo "Failed to extract $tarfile";
@@ -185,13 +192,51 @@ function find_compiler ()
     echo "Using compiler ${MINGW_TOOL_PREFIX}gcc and target $TARGET";
 }
 
+function generate_pc_file ()
+{
+    local pcfile="$1"; shift;
+    local libs="$1"; shift;
+    local version="$1"; shift;
+    local include="$1"; shift;
+    local bn=`basename "$pcfile"`;
+
+    if test -z "$include"; then
+        include="\${prefix}/include";
+    fi;
+
+    if ! test -f "$pcfile"; then
+        cat > "$pcfile" <<EOF
+prefix=$ROOT_DIR
+exec_prefix=\${prefix}
+libdir=\${prefix}/lib
+sharedlibdir=\${libdir}
+includedir=$include
+
+Name: $bn
+Description: $bn
+
+Requires:
+Libs: -L\${libdir} $libs
+Cflags: -I\${includedir}
+Version: $version
+EOF
+    fi
+}
+
 function do_cross_compile ()
 {
     local dep="$1"; shift;
     local builddir="$BUILD_DIR/$dep";
 
     cd "$builddir"
-    ./configure --prefix="$ROOT_DIR" --host="$TARGET" --target="$TARGET" --build="`./config.guess`" CFLAGS="-mms-bitfields -I$ROOT_DIR/include" PKG_CONFIG="$RUN_PKG_CONFIG";
+    ./configure --prefix="$ROOT_DIR" \
+        --host="$TARGET" \
+        --target="$TARGET" \
+        --build="$build_config" \
+        CFLAGS="-mms-bitfields -I${ROOT_DIR}/include" \
+        LDFLAGS="-L${ROOT_DIR}/lib" \
+        PKG_CONFIG="$RUN_PKG_CONFIG" \
+        "$@";
 
     if [ "$?" -ne 0 ]; then
 	echo "Failed to configure $dep";
@@ -321,6 +366,13 @@ for header in "${GL_HEADERS[@]}"; do
     fi;
 done;
 
+# We need pkg-config files for zlib and ffi to build glib. The
+# prepackaged binaries from tml doesn't seem to include them so we'll
+# just generate it manually.
+generate_pc_file "$ROOT_DIR/lib/pkgconfig/zlib.pc" "-lz" "$ZLIB_VERSION"
+generate_pc_file "$ROOT_DIR/lib/pkgconfig/libffi.pc" "-lffi" "$FFI_VERSION" \
+    "${ROOT_DIR}/lib/libffi-${FFI_VERSION}/include"
+
 RUN_PKG_CONFIG="$BUILD_DIR/run-pkg-config.sh";
 
 echo "Generating $BUILD_DIR/run-pkg-config.sh";
@@ -356,8 +408,13 @@ build_config=`bash $DOWNLOAD_DIR/config.guess`;
 for dep in "${SOURCES_DEPS[@]}"; do
     echo "Building $dep...";
     src="${dep##*/}";
-    src="${src%%.tar.bz2}";
-    do_cross_compile "$src"
+    src="${src%%.tar.*}";
+
+    if echo "$src" | grep -q '^glib'; then
+        do_cross_compile "$src" --disable-modular-tests
+    else
+        do_cross_compile "$src"
+    fi;
 done;
 
 echo
diff --git a/build/win32/vs10/Makefile.am b/build/win32/vs10/Makefile.am
index 94d883df2..5c7a05567 100644
--- a/build/win32/vs10/Makefile.am
+++ b/build/win32/vs10/Makefile.am
@@ -14,14 +14,13 @@ EXTRA_DIST = \
 	clutter.vcxprojin	\
 	clutter.vcxproj.filters		\
 	clutter.vcxproj.filtersin	\
-	clutter.props		\
+	clutter-build-defines.props	\
+	clutter-gen-srcs.props	\
+	clutter-install.props	\
+	clutter-version-paths.props	\
 	install.vcxproj	\
 	test-cogl-perf.vcxproj		\
 	test-cogl-perf.vcxproj.filters		\
-	test-conformance-clutter.vcxproj		\
-	test-conformance-clutter.vcxprojin	\
-	test-conformance-clutter.vcxproj.filters		\
-	test-conformance-clutter.vcxproj.filtersin	\
 	test-interactive-clutter.vcxproj		\
 	test-interactive-clutter.vcxprojin	\
 	test-interactive-clutter.vcxproj.filters		\
diff --git a/build/win32/vs10/cally-atkcomponent-example.vcxproj b/build/win32/vs10/cally-atkcomponent-example.vcxproj
index a07814de8..a5d3471b2 100644
--- a/build/win32/vs10/cally-atkcomponent-example.vcxproj
+++ b/build/win32/vs10/cally-atkcomponent-example.vcxproj
@@ -28,38 +28,42 @@
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="clutter.props" />
+    <Import Project="clutter-build-defines.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="clutter.props" />
+    <Import Project="clutter-build-defines.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="clutter.props" />
+    <Import Project="clutter-build-defines.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="clutter.props" />
+    <Import Project="clutter-build-defines.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
@@ -169,4 +173,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/build/win32/vs10/cally-atkcomponent-example.vcxproj.filters b/build/win32/vs10/cally-atkcomponent-example.vcxproj.filters
index 5188a4877..94e8fae66 100644
--- a/build/win32/vs10/cally-atkcomponent-example.vcxproj.filters
+++ b/build/win32/vs10/cally-atkcomponent-example.vcxproj.filters
@@ -23,4 +23,4 @@
       <Filter>Headers</Filter>
     </ClInclude>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/build/win32/vs10/cally-atkeditabletext-example.vcxproj b/build/win32/vs10/cally-atkeditabletext-example.vcxproj
index d3011b734..7c6607d8c 100644
--- a/build/win32/vs10/cally-atkeditabletext-example.vcxproj
+++ b/build/win32/vs10/cally-atkeditabletext-example.vcxproj
@@ -28,38 +28,42 @@
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="clutter.props" />
+    <Import Project="clutter-build-defines.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="clutter.props" />
+    <Import Project="clutter-build-defines.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="clutter.props" />
+    <Import Project="clutter-build-defines.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="clutter.props" />
+    <Import Project="clutter-build-defines.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
@@ -169,4 +173,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/build/win32/vs10/cally-atkeditabletext-example.vcxproj.filters b/build/win32/vs10/cally-atkeditabletext-example.vcxproj.filters
index 931b48cfc..3d06352dd 100644
--- a/build/win32/vs10/cally-atkeditabletext-example.vcxproj.filters
+++ b/build/win32/vs10/cally-atkeditabletext-example.vcxproj.filters
@@ -23,4 +23,4 @@
       <Filter>Headers</Filter>
     </ClInclude>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/build/win32/vs10/cally-atkevents-example.vcxproj b/build/win32/vs10/cally-atkevents-example.vcxproj
index 0bc99dd38..0528086aa 100644
--- a/build/win32/vs10/cally-atkevents-example.vcxproj
+++ b/build/win32/vs10/cally-atkevents-example.vcxproj
@@ -28,38 +28,42 @@
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="clutter.props" />
+    <Import Project="clutter-build-defines.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="clutter.props" />
+    <Import Project="clutter-build-defines.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="clutter.props" />
+    <Import Project="clutter-build-defines.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="clutter.props" />
+    <Import Project="clutter-build-defines.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
@@ -173,4 +177,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/build/win32/vs10/cally-atkevents-example.vcxproj.filters b/build/win32/vs10/cally-atkevents-example.vcxproj.filters
index 58c2c138c..dec13f824 100644
--- a/build/win32/vs10/cally-atkevents-example.vcxproj.filters
+++ b/build/win32/vs10/cally-atkevents-example.vcxproj.filters
@@ -23,4 +23,4 @@
       <Filter>Headers</Filter>
     </ClInclude>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/build/win32/vs10/cally-atktext-example.vcxproj b/build/win32/vs10/cally-atktext-example.vcxproj
index 372a6d96f..4b3192b81 100644
--- a/build/win32/vs10/cally-atktext-example.vcxproj
+++ b/build/win32/vs10/cally-atktext-example.vcxproj
@@ -28,38 +28,42 @@
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="clutter.props" />
+    <Import Project="clutter-build-defines.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="clutter.props" />
+    <Import Project="clutter-build-defines.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="clutter.props" />
+    <Import Project="clutter-build-defines.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="clutter.props" />
+    <Import Project="clutter-build-defines.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
@@ -169,4 +173,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/build/win32/vs10/cally-atktext-example.vcxproj.filters b/build/win32/vs10/cally-atktext-example.vcxproj.filters
index 1318d81d6..bda5036e5 100644
--- a/build/win32/vs10/cally-atktext-example.vcxproj.filters
+++ b/build/win32/vs10/cally-atktext-example.vcxproj.filters
@@ -22,4 +22,4 @@
       <Filter>Headers</Filter>
     </ClInclude>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/build/win32/vs10/cally-clone-example.vcxproj b/build/win32/vs10/cally-clone-example.vcxproj
index e769dca64..ebec1689a 100644
--- a/build/win32/vs10/cally-clone-example.vcxproj
+++ b/build/win32/vs10/cally-clone-example.vcxproj
@@ -28,38 +28,42 @@
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="clutter.props" />
+    <Import Project="clutter-build-defines.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="clutter.props" />
+    <Import Project="clutter-build-defines.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="clutter.props" />
+    <Import Project="clutter-build-defines.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="clutter.props" />
+    <Import Project="clutter-build-defines.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
@@ -169,4 +173,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/build/win32/vs10/cally-clone-example.vcxproj.filters b/build/win32/vs10/cally-clone-example.vcxproj.filters
index 90fccbd5a..81284881e 100644
--- a/build/win32/vs10/cally-clone-example.vcxproj.filters
+++ b/build/win32/vs10/cally-clone-example.vcxproj.filters
@@ -23,4 +23,4 @@
       <Filter>Headers</Filter>
     </ClInclude>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/build/win32/vs10/clutter-build-defines.props b/build/win32/vs10/clutter-build-defines.props
new file mode 100644
index 000000000..8fb7ae6ed
--- /dev/null
+++ b/build/win32/vs10/clutter-build-defines.props
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ImportGroup Label="PropertySheets">
+    <Import Project="clutter-version-paths.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros">
+    <BaseWinBuildDef>_WIN32_WINNT=0x0501</BaseWinBuildDef>
+    <LibBuildDefines>HAVE_CONFIG_H;CLUTTER_COMPILATION;COGL_ENABLE_EXPERIMENTAL_API;DLL_EXPORT</LibBuildDefines>
+    <DebugLibBuildDefines>$(LibBuildDefines);_DEBUG;CLUTTER_ENABLE_DEBUG</DebugLibBuildDefines>
+    <ReleaseLibBuildDefines>$(LibBuildDefines);G_DISABLE_ASSERT;G_DISABLE_CHECKS;G_DISABLE_CAST_CHECKS</ReleaseLibBuildDefines>
+    <ClutterBuildDefines>$(BaseWinBuildDef);G_LOG_DOMAIN="Clutter";CLUTTER_LOCALEDIR="../share/locale";CLUTTER_SYSCONFDIR="../etc";COGL_DISABLE_DEPRECATION_WARNINGS</ClutterBuildDefines>
+    <ClutterDisableDeprecationWarnings>CLUTTER_DISABLE_DEPRECATION_WARNINGS;GLIB_DISABLE_DEPRECATION_WARNINGS</ClutterDisableDeprecationWarnings>
+    <AvoidSDLMain>SDL_MAIN_HANDLED</AvoidSDLMain>
+    <CallyTestDefs>$(BaseWinBuildDef);PREFIXDIR="/some/dummy/dir";$(ClutterDisableDeprecationWarnings);$(AvoidSDLMain)</CallyTestDefs>
+    <TestProgDef>$(BaseWinBuildDef);TESTS_DATADIR="../share/clutter-$(ApiVersion)/data";TESTS_DATA_DIR="../share/clutter-$(ApiVersion)/data";$(AvoidSDLMain)</TestProgDef>
+    <TestPerfProgDef>$(TestProgDef);$(ClutterDisableDeprecationWarnings)</TestPerfProgDef>
+  </PropertyGroup>
+  <PropertyGroup>
+    <_PropertySheetDisplayName>clutterbuilddefinesprops</_PropertySheetDisplayName>
+    <OutDir>$(SolutionDir)$(Configuration)\$(PlatformName)\bin\</OutDir>
+    <IntDir>$(SolutionDir)$(Configuration)\$(PlatformName)\obj\$(ProjectName)\</IntDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <AdditionalIncludeDirectories>..\..\..;..\..\..\clutter;$(GlibEtcInstallRoot)\include\cogl-1.0;$(GlibEtcInstallRoot)\include\pango-1.0;$(GlibEtcInstallRoot)\include\atk-1.0;$(GlibEtcInstallRoot)\include\json-glib-1.0;$(GlibEtcInstallRoot)\include\glib-2.0;$(GlibEtcInstallRoot)\lib\glib-2.0\include;$(GlibEtcInstallRoot)\include\cairo;$(GlibEtcInstallRoot)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>G_DISABLE_SINGLE_INCLUDES;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ForcedIncludeFiles>msvc_recommended_pragmas.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
+      <DisableSpecificWarnings>%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>cogl-pango-1.0.lib;cogl-path-1.0.lib;cogl-1.0.lib;glib-2.0.lib;gobject-2.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(GlibEtcInstallRoot)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <BuildMacro Include="BaseWinBuildDef">
+      <Value>$(BaseWinBuildDef)</Value>
+    </BuildMacro>
+    <BuildMacro Include="LibBuildDefines">
+      <Value>$(LibBuildDefines)</Value>
+    </BuildMacro>
+    <BuildMacro Include="DebugLibBuildDefines">
+      <Value>$(DebugLibBuildDefines)</Value>
+    </BuildMacro>
+    <BuildMacro Include="ReleaseLibBuildDefines">
+      <Value>$(ReleaseLibBuildDefines)</Value>
+    </BuildMacro>
+    <BuildMacro Include="ClutterBuildDefines">
+      <Value>$(ClutterBuildDefines)</Value>
+    </BuildMacro>
+    <BuildMacro Include="ClutterDisableDeprecationWarnings">
+      <Value>$(ClutterDisableDeprecationWarnings)</Value>
+    </BuildMacro>
+    <BuildMacro Include="AvoidSDLMain">
+      <Value>$(AvoidSDLMain)</Value>
+    </BuildMacro>
+    <BuildMacro Include="CallyTestDefs">
+      <Value>$(CallyTestDefs)</Value>
+    </BuildMacro>
+    <BuildMacro Include="TestProgDef">
+      <Value>$(TestProgDef)</Value>
+    </BuildMacro>
+    <BuildMacro Include="TestPerfProgDef">
+      <Value>$(TestPerfProgDef)</Value>
+    </BuildMacro>
+  </ItemGroup>
+</Project>
diff --git a/build/win32/vs10/clutter-gen-srcs.props b/build/win32/vs10/clutter-gen-srcs.props
new file mode 100644
index 000000000..9d8e8b8b7
--- /dev/null
+++ b/build/win32/vs10/clutter-gen-srcs.props
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ImportGroup Label="PropertySheets">
+    <Import Project="clutter-build-defines.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros">
+    <CopyConfigH>copy ..\..\..\clutter\config.h.win32 ..\..\..\clutter\config.h</CopyConfigH>
+    <CopyClutterConfigH>
+if exist ..\..\..\clutter\clutter.bld.win32.win32 goto DONE_CLUTTER_CONFIG_H
+
+if exist clutter.bld.GDK.win32 del clutter.bld.GDK.win32
+
+copy ..\..\..\clutter\clutter-config.h.win32 clutter.bld.win32.win32
+
+copy ..\..\..\clutter\clutter-config.h.win32 ..\..\..\clutter\clutter-config.h
+
+
+:DONE_CLUTTER_CONFIG_H
+    </CopyClutterConfigH>
+    <CopyClutterConfigGDKH>
+if exist ..\..\..\clutter\clutter.bld.GDK.win32 goto DONE_CLUTTER_CONFIG_H
+
+if exist clutter.bld.win32.win32 del clutter.bld.win32.win32
+
+copy ..\..\..\clutter\clutter-config.h.win32_GDK clutter.bld.GDK.win32
+
+copy ..\..\..\clutter\clutter-config.h.win32_GDK ..\..\..\clutter\clutter-config.h
+
+
+:DONE_CLUTTER_CONFIG_H
+    </CopyClutterConfigGDKH>
+    <GenMarshalSrc>
+$(GlibEtcInstallRoot)\bin\glib-genmarshal --prefix=_clutter_marshal --header ..\..\..\clutter\clutter-marshal.list &gt; ..\..\..\clutter\clutter-marshal.h
+
+
+echo #include "clutter-marshal.h" &gt; ..\..\..\clutter\clutter-marshal.c
+
+$(GlibEtcInstallRoot)\bin\glib-genmarshal --prefix=_clutter_marshal --body ..\..\..\clutter\clutter-marshal.list &gt;&gt; ..\..\..\clutter\clutter-marshal.c
+    </GenMarshalSrc>
+    <EnumHeaders>..\..\..\clutter\clutter-action.h ..\..\..\clutter\clutter-actor-meta.h ..\..\..\clutter\clutter-actor.h ..\..\..\clutter\clutter-align-constraint.h ..\..\..\clutter\clutter-animatable.h ..\..\..\clutter\clutter-backend.h ..\..\..\clutter\clutter-bind-constraint.h ..\..\..\clutter\clutter-binding-pool.h ..\..\..\clutter\clutter-bin-layout.h ..\..\..\clutter\clutter-blur-effect.h ..\..\..\clutter\clutter-box-layout.h ..\..\..\clutter\clutter-brightness-contrast-effect.h ..\..\..\clutter\clutter-cairo.h ..\..\..\clutter\clutter-canvas.h ..\..\..\clutter\clutter-child-meta.h ..\..\..\clutter\clutter-click-action.h ..\..\..\clutter\clutter-cogl-compat.h ..\..\..\clutter\clutter-clone.h ..\..\..\clutter\clutter-color-static.h ..\..\..\clutter\clutter-color.h ..\..\..\clutter\clutter-colorize-effect.h ..\..\..\clutter\clutter-constraint.h ..\..\..\clutter\clutter-container.h ..\..\..\clutter\clutter-content.h ..\..\..\clutter\clutter-deform-effect.h ..\..\..\clutter\clutter-deprecated.h ..\..\..\clutter\clutter-desaturate-effect.h ..\..\..\clutter\clutter-device-manager.h ..\..\..\clutter\clutter-drag-action.h ..\..\..\clutter\clutter-drop-action.h ..\..\..\clutter\clutter-effect.h ..\..\..\clutter\clutter-enums.h ..\..\..\clutter\clutter-event.h ..\..\..\clutter\clutter-feature.h ..\..\..\clutter\clutter-fixed-layout.h ..\..\..\clutter\clutter-flow-layout.h ..\..\..\clutter\clutter-gesture-action.h ..\..\..\clutter\clutter-grid-layout.h ..\..\..\clutter\clutter-group.h ..\..\..\clutter\clutter-image.h ..\..\..\clutter\clutter-input-device.h ..\..\..\clutter\clutter-interval.h ..\..\..\clutter\clutter-keyframe-transition.h ..\..\..\clutter\clutter-keysyms.h ..\..\..\clutter\clutter-layout-manager.h ..\..\..\clutter\clutter-layout-meta.h ..\..\..\clutter\clutter-list-model.h ..\..\..\clutter\clutter-macros.h ..\..\..\clutter\clutter-main.h ..\..\..\clutter\clutter-model.h ..\..\..\clutter\clutter-offscreen-effect.h ..\..\..\clutter\clutter-page-turn-effect.h ..\..\..\clutter\clutter-paint-nodes.h ..\..\..\clutter\clutter-paint-node.h ..\..\..\clutter\clutter-pan-action.h ..\..\..\clutter\clutter-path-constraint.h ..\..\..\clutter\clutter-path.h ..\..\..\clutter\clutter-property-transition.h ..\..\..\clutter\clutter-rotate-action.h ..\..\..\clutter\clutter-script.h ..\..\..\clutter\clutter-scriptable.h ..\..\..\clutter\clutter-scroll-actor.h ..\..\..\clutter\clutter-settings.h ..\..\..\clutter\clutter-shader-effect.h ..\..\..\clutter\clutter-shader-types.h ..\..\..\clutter\clutter-swipe-action.h ..\..\..\clutter\clutter-snap-constraint.h ..\..\..\clutter\clutter-stage.h ..\..\..\clutter\clutter-stage-manager.h ..\..\..\clutter\clutter-tap-action.h ..\..\..\clutter\clutter-test-utils.h ..\..\..\clutter\clutter-texture.h ..\..\..\clutter\clutter-text.h ..\..\..\clutter\clutter-text-buffer.h ..\..\..\clutter\clutter-timeline.h ..\..\..\clutter\clutter-transition-group.h ..\..\..\clutter\clutter-transition.h ..\..\..\clutter\clutter-types.h ..\..\..\clutter\clutter-units.h ..\..\..\clutter\clutter-zoom-action.h ..\..\..\clutter\win32\clutter-win32.h</EnumHeaders>
+    <GdkEnumHeader>..\..\..\clutter\gdk\clutter-gdk.h</GdkEnumHeader>
+    <GenEnumsSrcH>perl $(GlibEtcInstallRoot)\bin\glib-mkenums --template ..\..\..\clutter\clutter-enum-types.h.in $(EnumHeaders) &gt; ..\..\..\clutter\clutter-enum-types.h</GenEnumsSrcH>
+    <GenEnumsSrcC>perl $(GlibEtcInstallRoot)\bin\glib-mkenums --template ..\..\..\clutter\clutter-enum-types.c.in $(EnumHeaders) &gt; ..\..\..\clutter\clutter-enum-types.c</GenEnumsSrcC>
+    <GenEnumsSrcGDKH>perl $(GlibEtcInstallRoot)\bin\glib-mkenums --template ..\..\..\clutter\clutter-enum-types.h.in $(EnumHeaders) $(GdkEnumHeader) &gt; ..\..\..\clutter\clutter-enum-types.h</GenEnumsSrcGDKH>
+    <GenEnumsSrcGDKC>perl $(GlibEtcInstallRoot)\bin\glib-mkenums --template ..\..\..\clutter\clutter-enum-types.c.in $(EnumHeaders) $(GdkEnumHeader) &gt; ..\..\..\clutter\clutter-enum-types.c</GenEnumsSrcGDKC>
+  </PropertyGroup>
+  <PropertyGroup>
+    <_PropertySheetDisplayName>cluttergensrcsprops</_PropertySheetDisplayName>
+  </PropertyGroup>
+  <ItemGroup>
+    <BuildMacro Include="CopyConfigH">
+      <Value>$(CopyConfigH)</Value>
+    </BuildMacro>
+    <BuildMacro Include="CopyClutterConfigH">
+      <Value>$(CopyClutterConfigH)</Value>
+    </BuildMacro>
+    <BuildMacro Include="CopyClutterConfigGDKH">
+      <Value>$(CopyClutterConfigGDKH)</Value>
+    </BuildMacro>
+    <BuildMacro Include="GenMarshalSrc">
+      <Value>$(GenMarshalSrc)</Value>
+    </BuildMacro>
+    <BuildMacro Include="EnumHeaders">
+      <Value>$(EnumHeaders)</Value>
+    </BuildMacro>
+    <BuildMacro Include="GdkEnumHeader">
+      <Value>$(GdkEnumHeader)</Value>
+    </BuildMacro>
+    <BuildMacro Include="GenEnumsSrcH">
+      <Value>$(GenEnumsSrcC)</Value>
+    </BuildMacro>
+    <BuildMacro Include="GenEnumsSrcC">
+      <Value>$(GenEnumsSrcC)</Value>
+    </BuildMacro>
+    <BuildMacro Include="GenEnumsSrcGDKH">
+      <Value>$(GenEnumsSrcGDKH)</Value>
+    </BuildMacro>
+    <BuildMacro Include="GenEnumsSrcGDKC">
+      <Value>$(GenEnumsSrcGDKC)</Value>
+    </BuildMacro>
+  </ItemGroup>
+</Project>
diff --git a/build/win32/vs10/clutter-install.props b/build/win32/vs10/clutter-install.props
new file mode 100644
index 000000000..7ac292bed
--- /dev/null
+++ b/build/win32/vs10/clutter-install.props
@@ -0,0 +1,344 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ImportGroup Label="PropertySheets">
+    <Import Project="clutter-build-defines.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros">
+    <BinDir>$(SolutionDir)$(Configuration)\$(Platform)\bin</BinDir>
+    <InstalledDlls>$(BinDir)\$(ClutterDllPrefix)clutter(ClutterDllSuffix).dll</InstalledDlls>
+    <InstalledBins>$(BinDir)\cally-atkcomponent-example.exe;$(BinDir)\cally-atkeditabletext-example.exe;$(BinDir)\cally-atkevents-example.exe;$(BinDir)\cally-atktext-example.exe;$(BinDir)\cally-clone-example.exe;$(BinDir)\test-cogl-perf.exe;$(BinDir)\test-interactive-clutter.exe;$(BinDir)\test-picking-performance.exe;$(BinDir)\test-picking.exe;$(BinDir)\test-random-text.exe;$(BinDir)\test-state-hidden-performance.exe;$(BinDir)\test-state-interactive-performance.exe;$(BinDir)\test-state-mini-performance.exe;$(BinDir)\test-state-performance.exe;$(BinDir)\test-state-pick-performance.exe;$(BinDir)\test-text-perf-performance.exe;$(BinDir)\test-text-perf.exe;$(BinDir)\test-text.exe</InstalledBins>
+    <ClutterDoInstall>
+mkdir $(CopyDir)
+
+mkdir $(CopyDir)\bin
+
+mkdir $(CopyDir)\share\clutter-$(ApiVersion)\data
+
+copy $(BinDir)\*.dll $(CopyDir)\bin
+
+
+copy $(BinDir)\*.exe $(CopyDir)\bin
+
+copy ..\..\..\tests\interactive\*.png $(CopyDir)\share\clutter-$(ApiVersion)\data
+
+copy ..\..\..\tests\clutter-1.0.suppressions $(CopyDir)\share\clutter-$(ApiVersion)\data
+
+copy ..\..\..\tests\interactive\*.json $(CopyDir)\share\clutter-$(ApiVersion)\data
+
+
+
+mkdir $(CopyDir)\lib
+
+copy $(BinDir)\*-$(ApiVersion).lib $(CopyDir)\lib
+
+
+mkdir $(CopyDir)\include\clutter-$(ApiVersion)\clutter\win32
+
+if "$(Configuration)" == "Release" goto DO_INSTALL_COMMON_HEADERS
+if "$(Configuration)" == "Debug" goto DO_INSTALL_COMMON_HEADERS
+
+$(ClutterDoInstallGDK)
+
+:DO_INSTALL_COMMON_HEADERS
+
+copy ..\..\..\clutter\clutter.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter
+
+copy ..\..\..\clutter\clutter-action.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter
+
+copy ..\..\..\clutter\clutter-actor-meta.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter
+
+copy ..\..\..\clutter\clutter-actor.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter
+
+copy ..\..\..\clutter\clutter-align-constraint.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter
+
+copy ..\..\..\clutter\clutter-animatable.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter
+
+copy ..\..\..\clutter\clutter-backend.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter
+
+copy ..\..\..\clutter\clutter-bind-constraint.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter
+
+copy ..\..\..\clutter\clutter-binding-pool.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter
+
+copy ..\..\..\clutter\clutter-bin-layout.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter
+
+copy ..\..\..\clutter\clutter-blur-effect.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter
+
+copy ..\..\..\clutter\clutter-box-layout.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter
+
+copy ..\..\..\clutter\clutter-brightness-contrast-effect.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter
+
+copy ..\..\..\clutter\clutter-cairo.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter
+
+copy ..\..\..\clutter\clutter-canvas.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter
+
+copy ..\..\..\clutter\clutter-child-meta.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter
+
+copy ..\..\..\clutter\clutter-click-action.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter
+
+copy ..\..\..\clutter\clutter-clone.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter
+
+copy ..\..\..\clutter\clutter-cogl-compat.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter
+
+copy ..\..\..\clutter\clutter-color-static.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter
+
+copy ..\..\..\clutter\clutter-color.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter
+
+copy ..\..\..\clutter\clutter-colorize-effect.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter
+
+copy ..\..\..\clutter\clutter-config.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter
+
+copy ..\..\..\clutter\clutter-constraint.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter
+
+copy ..\..\..\clutter\clutter-content.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter
+
+copy ..\..\..\clutter\clutter-container.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter
+
+copy ..\..\..\clutter\clutter-deform-effect.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter
+
+copy ..\..\..\clutter\clutter-deprecated.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter
+
+copy ..\..\..\clutter\clutter-desaturate-effect.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter
+
+copy ..\..\..\clutter\clutter-device-manager.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter
+
+copy ..\..\..\clutter\clutter-drag-action.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter
+
+copy ..\..\..\clutter\clutter-drop-action.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter
+
+copy ..\..\..\clutter\clutter-effect.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter
+
+copy ..\..\..\clutter\clutter-enums.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter
+
+copy ..\..\..\clutter\clutter-enum-types.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter
+
+copy ..\..\..\clutter\clutter-event.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter
+
+copy ..\..\..\clutter\clutter-feature.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter
+
+copy ..\..\..\clutter\clutter-fixed-layout.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter
+
+copy ..\..\..\clutter\clutter-flow-layout.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter
+
+copy ..\..\..\clutter\clutter-gesture-action.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter
+
+copy ..\..\..\clutter\clutter-grid-layout.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter
+
+copy ..\..\..\clutter\clutter-group.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter
+
+copy ..\..\..\clutter\clutter-image.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter
+
+copy ..\..\..\clutter\clutter-input-device.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter
+
+copy ..\..\..\clutter\clutter-interval.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter
+
+copy ..\..\..\clutter\clutter-keyframe-transition.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter
+
+copy ..\..\..\clutter\clutter-keysyms.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter
+
+copy ..\..\..\clutter\clutter-layout-manager.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter
+
+copy ..\..\..\clutter\clutter-layout-meta.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter
+
+copy ..\..\..\clutter\clutter-list-model.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter
+
+copy ..\..\..\clutter\clutter-macros.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter
+
+copy ..\..\..\clutter\clutter-main.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter
+
+copy ..\..\..\clutter\clutter-marshal.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter
+
+copy ..\..\..\clutter\clutter-model.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter
+
+copy ..\..\..\clutter\clutter-offscreen-effect.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter
+
+copy ..\..\..\clutter\clutter-page-turn-effect.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter
+
+copy ..\..\..\clutter\clutter-paint-node.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter
+
+copy ..\..\..\clutter\clutter-paint-nodes.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter
+
+copy ..\..\..\clutter\clutter-pan-action.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter
+
+copy ..\..\..\clutter\clutter-path-constraint.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter
+
+copy ..\..\..\clutter\clutter-path.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter
+
+copy ..\..\..\clutter\clutter-property-transition.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter
+
+copy ..\..\..\clutter\clutter-rotate-action.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter
+
+copy ..\..\..\clutter\clutter-script.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter
+
+copy ..\..\..\clutter\clutter-scriptable.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter
+
+copy ..\..\..\clutter\clutter-scroll-actor.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter
+
+copy ..\..\..\clutter\clutter-settings.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter
+
+copy ..\..\..\clutter\clutter-shader-effect.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter
+
+copy ..\..\..\clutter\clutter-shader-types.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter
+
+copy ..\..\..\clutter\clutter-snap-constraint.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter
+
+copy ..\..\..\clutter\clutter-stage.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter
+
+copy ..\..\..\clutter\clutter-stage-manager.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter
+
+copy ..\..\..\clutter\clutter-stage-window.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter
+
+copy ..\..\..\clutter\clutter-swipe-action.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter
+
+copy ..\..\..\clutter\clutter-tap-action.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter
+
+copy ..\..\..\clutter\clutter-test-utils.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter
+
+copy ..\..\..\clutter\clutter-texture.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter
+
+copy ..\..\..\clutter\clutter-text.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter
+
+copy ..\..\..\clutter\clutter-text-buffer.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter
+
+copy ..\..\..\clutter\clutter-timeline.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter
+
+copy ..\..\..\clutter\clutter-transition.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter
+
+copy ..\..\..\clutter\clutter-transition-group.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter
+
+copy ..\..\..\clutter\clutter-types.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter
+
+copy ..\..\..\clutter\clutter-units.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter
+
+copy ..\..\..\clutter\clutter-version.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter
+
+copy ..\..\..\clutter\clutter-zoom-action.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter
+
+copy ..\..\..\clutter\win32\clutter-win32.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter\win32
+
+
+mkdir $(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated
+
+copy ..\..\..\clutter\deprecated\clutter-actor.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated
+
+copy ..\..\..\clutter\deprecated\clutter-alpha.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated
+
+copy ..\..\..\clutter\deprecated\clutter-animatable.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated
+
+copy ..\..\..\clutter\deprecated\clutter-animation.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated
+
+copy ..\..\..\clutter\deprecated\clutter-animator.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated
+
+copy ..\..\..\clutter\deprecated\clutter-backend.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated
+
+copy ..\..\..\clutter\deprecated\clutter-behaviour.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated
+
+copy ..\..\..\clutter\deprecated\clutter-behaviour-depth.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated
+
+copy ..\..\..\clutter\deprecated\clutter-behaviour-ellipse.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated
+
+copy ..\..\..\clutter\deprecated\clutter-behaviour-opacity.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated
+
+copy ..\..\..\clutter\deprecated\clutter-behaviour-path.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated
+
+copy ..\..\..\clutter\deprecated\clutter-behaviour-rotate.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated
+
+copy ..\..\..\clutter\deprecated\clutter-behaviour-scale.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated
+
+copy ..\..\..\clutter\deprecated\clutter-bin-layout.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated
+
+copy ..\..\..\clutter\deprecated\clutter-box.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated
+
+copy ..\..\..\clutter\deprecated\clutter-cairo-texture.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated
+
+copy ..\..\..\clutter\deprecated\clutter-container.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated
+
+copy ..\..\..\clutter\deprecated\clutter-fixed.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated
+
+copy ..\..\..\clutter\deprecated\clutter-frame-source.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated
+
+copy ..\..\..\clutter\deprecated\clutter-group.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated
+
+copy ..\..\..\clutter\deprecated\clutter-input-device.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated
+
+copy ..\..\..\clutter\deprecated\clutter-keysyms.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated
+
+copy ..\..\..\clutter\deprecated\clutter-main.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated
+
+copy ..\..\..\clutter\deprecated\clutter-media.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated
+
+copy ..\..\..\clutter\deprecated\clutter-rectangle.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated
+
+copy ..\..\..\clutter\deprecated\clutter-score.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated
+
+copy ..\..\..\clutter\deprecated\clutter-shader.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated
+
+copy ..\..\..\clutter\deprecated\clutter-stage.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated
+
+copy ..\..\..\clutter\deprecated\clutter-stage-manager.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated
+
+copy ..\..\..\clutter\deprecated\clutter-state.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated
+
+copy ..\..\..\clutter\deprecated\clutter-table-layout.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated
+
+copy ..\..\..\clutter\deprecated\clutter-texture.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated
+
+copy ..\..\..\clutter\deprecated\clutter-timeline.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated
+
+copy ..\..\..\clutter\deprecated\clutter-timeout-pool.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated
+
+copy ..\..\..\clutter\deprecated\clutter-util.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated
+
+
+mkdir $(CopyDir)\include\clutter-$(ApiVersion)\cally
+
+copy ..\..\..\clutter\cally\cally-actor.h $(CopyDir)\include\clutter-$(ApiVersion)\cally
+
+copy ..\..\..\clutter\cally\cally-clone.h $(CopyDir)\include\clutter-$(ApiVersion)\cally
+
+copy ..\..\..\clutter\cally\cally-factory.h $(CopyDir)\include\clutter-$(ApiVersion)\cally
+
+copy ..\..\..\clutter\cally\cally-group.h $(CopyDir)\include\clutter-$(ApiVersion)\cally
+
+copy ..\..\..\clutter\cally\cally.h $(CopyDir)\include\clutter-$(ApiVersion)\cally
+
+copy ..\..\..\clutter\cally\cally-main.h $(CopyDir)\include\clutter-$(ApiVersion)\cally
+
+copy ..\..\..\clutter\cally\cally-rectangle.h $(CopyDir)\include\clutter-$(ApiVersion)\cally
+
+copy ..\..\..\clutter\cally\cally-root.h $(CopyDir)\include\clutter-$(ApiVersion)\cally
+
+copy ..\..\..\clutter\cally\cally-stage.h $(CopyDir)\include\clutter-$(ApiVersion)\cally
+
+copy ..\..\..\clutter\cally\cally-text.h $(CopyDir)\include\clutter-$(ApiVersion)\cally
+
+copy ..\..\..\clutter\cally\cally-texture.h $(CopyDir)\include\clutter-$(ApiVersion)\cally
+
+copy ..\..\..\clutter\cally\cally-util.h $(CopyDir)\include\clutter-$(ApiVersion)\cally
+    </ClutterDoInstall>
+    <ClutterDoInstallGDK>
+mkdir $(CopyDir)\include\clutter-$(ApiVersion)\clutter\gdk
+
+copy ..\..\..\clutter\gdk\clutter-gdk.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter\gdk
+    </ClutterDoInstallGDK>
+  </PropertyGroup>
+  <PropertyGroup>
+    <_PropertySheetDisplayName>clutterinstallprops</_PropertySheetDisplayName>
+  </PropertyGroup>
+  <ItemGroup>
+    <BuildMacro Include="BinDir">
+      <Value>$(BinDir)</Value>
+    </BuildMacro>
+    <BuildMacro Include="InstalledDlls">
+      <Value>$(InstalledDlls)</Value>
+    </BuildMacro>
+    <BuildMacro Include="InstalledBins">
+      <Value>$(InstalledBins)</Value>
+    </BuildMacro>
+    <BuildMacro Include="ClutterDoInstall">
+      <Value>$(ClutterDoInstall)</Value>
+    </BuildMacro>
+    <BuildMacro Include="ClutterDoInstallGDK">
+      <Value>$(ClutterDoInstallGDK)</Value>
+    </BuildMacro>
+  </ItemGroup>
+</Project>
diff --git a/build/win32/vs10/clutter-version-paths.props b/build/win32/vs10/clutter-version-paths.props
new file mode 100644
index 000000000..997854e49
--- /dev/null
+++ b/build/win32/vs10/clutter-version-paths.props
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup Label="UserMacros">
+    <VSVer>10</VSVer>
+    <GlibEtcInstallRoot>$(SolutionDir)\..\..\..\..\vs$(VSVer)\$(Platform)</GlibEtcInstallRoot>
+    <ApiVersion>1.0</ApiVersion>
+    <CopyDir>$(GlibEtcInstallRoot)</CopyDir>
+    <DefDir>$(SolutionDir)$(Configuration)\$(PlatformName)\obj\$(ProjectName)\</DefDir>
+    <ClutterLibtoolCompatibleDllPrefix>lib</ClutterLibtoolCompatibleDllPrefix>
+    <ClutterLibtoolCompatibleDllSuffix>-$(ApiVersion)-0</ClutterLibtoolCompatibleDllSuffix>
+    <ClutterSeparateVSDllPrefix />
+    <ClutterSeparateVSDllSuffix>-1-vs$(VSVer)</ClutterSeparateVSDllSuffix>
+    <!-- Change the following 2 entries to ClutterLibtoolCompatibleDllPrefix
+         and ClutterLibtoolCompatibleDllSuffix if the use of LibTool-style
+         DLL names is desired -->
+    <ClutterDllPrefix>$(ClutterSeparateVSDllPrefix)</ClutterDllPrefix>
+    <ClutterDllSuffix>$(ClutterSeparateVSDllSuffix)</ClutterDllSuffix>
+  </PropertyGroup>
+  <PropertyGroup>
+    <_PropertySheetDisplayName>clutterversionpathsprops</_PropertySheetDisplayName>
+  </PropertyGroup>
+  <ItemGroup>
+    <BuildMacro Include="VSVer">
+      <Value>$(VSVer)</Value>
+    </BuildMacro>
+    <BuildMacro Include="GlibEtcInstallRoot">
+      <Value>$(GlibEtcInstallRoot)</Value>
+    </BuildMacro>
+    <BuildMacro Include="CopyDir">
+      <Value>$(CopyDir)</Value>
+    </BuildMacro>
+    <BuildMacro Include="DefDir">
+      <Value>$(DefDir)</Value>
+    </BuildMacro>
+    <BuildMacro Include="ApiVersion">
+      <Value>$(ApiVersion)</Value>
+    </BuildMacro>
+    <BuildMacro Include="ClutterLibtoolCompatibleDllPrefix">
+      <Value>$(ClutterLibtoolCompatibleDllPrefix)</Value>
+    </BuildMacro>
+    <BuildMacro Include="ClutterLibtoolCompatibleDllSuffix">
+      <Value>$(ClutterLibtoolCompatibleDllSuffix)</Value>
+    </BuildMacro>
+    <BuildMacro Include="ClutterSeparateVSDllPrefix">
+      <Value>$(ClutterSeparateVSDllPrefix)</Value>
+    </BuildMacro>
+    <BuildMacro Include="ClutterSeparateVSDllSuffix">
+      <Value>$(ClutterSeparateVSDllSuffix)</Value>
+    </BuildMacro>
+    <BuildMacro Include="ClutterDllPrefix">
+      <Value>$(ClutterDllPrefix)</Value>
+    </BuildMacro>
+    <BuildMacro Include="ClutterDllSuffix">
+      <Value>$(ClutterDllSuffix)</Value>
+    </BuildMacro>
+  </ItemGroup>
+</Project>
diff --git a/build/win32/vs10/clutter.props b/build/win32/vs10/clutter.props
deleted file mode 100644
index 8d7ef7610..000000000
--- a/build/win32/vs10/clutter.props
+++ /dev/null
@@ -1,531 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="UserMacros">
-    <GlibEtcInstallRoot>..\..\..\..\vs10\$(Platform)</GlibEtcInstallRoot>
-    <GlibMkEnumsPath>..\..\..\vs10\$(Platform)</GlibMkEnumsPath>
-    <GlibGenMarshalPath>..\..\vs10\$(Platform)</GlibGenMarshalPath>
-    <ClutterApiVersion>1.0</ClutterApiVersion>
-    <CopyDir>$(GlibEtcInstallRoot)</CopyDir>
-    <DefDir>$(SolutionDir)$(Configuration)\$(PlatformName)\obj\$(ProjectName)\</DefDir>
-    <BaseWinBuildDef>_WIN32_WINNT=0x0500</BaseWinBuildDef>
-    <BaseBuildDef>$(BaseWinBuildDef)</BaseBuildDef>
-    <LibBuildDefines>HAVE_CONFIG_H;CLUTTER_COMPILATION;COGL_ENABLE_EXPERIMENTAL_API;COGL_HAS_WIN32_SUPPORT;CLUTTER_ENABLE_EXPERIMENTAL_API</LibBuildDefines>
-    <DebugLibBuildDefines>$(LibBuildDefines);_DEBUG;CLUTTER_ENABLE_DEBUG</DebugLibBuildDefines>
-    <ReleaseLibBuildDefines>$(LibBuildDefines);G_DISABLE_ASSERT;G_DISABLE_CHECKS;G_DISABLE_CAST_CHECKS</ReleaseLibBuildDefines>
-    <ClutterBuildDefines>$(BaseBuildDef);G_LOG_DOMAIN="Clutter";CLUTTER_LOCALEDIR="../share/locale";CLUTTER_SYSCONFDIR="../etc"</ClutterBuildDefines>
-    <ClutterDisableDeprecationWarnings>CLUTTER_DISABLE_DEPRECATION_WARNINGS;GLIB_DISABLE_DEPRECATION_WARNINGS</ClutterDisableDeprecationWarnings>
-    <CallyTestDefs>$(BaseWinBuildDef);PREFIXDIR="/some/dummy/dir";$(ClutterDisableDeprecationWarnings)</CallyTestDefs>
-    <TestProgDef>$(BaseBuildDef);TESTS_DATADIR="../share/clutter-$(ClutterApiVersion)/data"</TestProgDef>
-    <TestPerfProgDef>$(BaseBuildDef);TESTS_DATA_DIR="../share/clutter-$(ClutterApiVersion)/data";$(ClutterDisableDeprecationWarnings)</TestPerfProgDef>
-    <PreBuildWin>
-if exist ..\..\..\clutter\config.h goto DONE_CONFIG_H
-
-copy ..\..\..\clutter\config.h.win32 ..\..\..\clutter\config.h
-
-:DONE_CONFIG_H
-
-if exist ..\..\..\clutter\clutter.bld.win32.win32 goto DONE_CLUTTER_CONFIG_H
-
-del clutter.bld.*.win32
-
-copy ..\..\..\clutter\clutter-config.h.win32 clutter.bld.win32.win32
-
-copy ..\..\..\clutter\clutter-config.h.win32 ..\..\..\clutter\clutter-config.h
-
-:DONE_CLUTTER_CONFIG_H
-    </PreBuildWin>
-    <PreBuildGDK>
-if exist ..\..\..\clutter\config.h goto DONE_CONFIG_H
-
-copy ..\..\..\clutter\config.h.win32 ..\..\..\clutter\config.h
-
-:DONE_CONFIG_H
-
-if exist ..\..\..\clutter\clutter.bld.GDK.win32 goto DONE_CLUTTER_CONFIG_H
-
-del clutter.bld.*.win32
-
-copy ..\..\..\clutter\clutter-config.h.win32_GDK clutter.bld.GDK.win32
-
-copy ..\..\..\clutter\clutter-config.h.win32_GDK ..\..\..\clutter\clutter-config.h
-
-:DONE_CLUTTER_CONFIG_H
-    </PreBuildGDK>
-    <PreBuildCmd2>
-if exist ..\..\..\clutter\clutter-marshal.h goto DONE_CLUTTER_MARSHAL_H
-
-cd ..\..\..\clutter
-
-$(GlibGenMarshalPath)\bin\glib-genmarshal --prefix=_clutter_marshal --header clutter-marshal.list &gt; clutter-marshal.h
-
-cd ..\build\win32\vs10
-
-:DONE_CLUTTER_MARSHAL_H
-
-
-if exist ..\..\..\clutter\clutter-marshal.c goto DONE_CLUTTER_MARSHAL_C
-
-cd ..\..\..\clutter
-
-echo #include "clutter-marshal.h" &gt; clutter-marshal.c
-
-$(GlibGenMarshalPath)\bin\glib-genmarshal --prefix=_clutter_marshal --body clutter-marshal.list &gt;&gt; clutter-marshal.c
-
-cd ..\build\win32\vs10
-
-:DONE_CLUTTER_MARSHAL_C
-
-
-cd ..
-
-gen-enums.bat $(GlibMkEnumsPath)
-
-cd .\vs10
-
-</PreBuildCmd2>
-<ClutterDoInstall>
-mkdir $(CopyDir)
-
-mkdir $(CopyDir)\bin
-
-mkdir $(CopyDir)\share\clutter-$(ClutterApiVersion)\data
-
-copy $(SolutionDir)$(Configuration)\$(Platform)\bin\*.dll $(CopyDir)\bin
-
-
-copy $(SolutionDir)$(Configuration)\$(Platform)\bin\*.exe $(CopyDir)\bin
-
-copy ..\*.bat $(CopyDir)\bin
-
-copy ..\..\..\tests\data\*.png $(CopyDir)\share\clutter-$(ClutterApiVersion)\data
-
-copy ..\..\..\tests\data\clutter-1.0.suppressions $(CopyDir)\share\clutter-$(ClutterApiVersion)\data
-
-copy ..\..\..\tests\data\*.json $(CopyDir)\share\clutter-$(ClutterApiVersion)\data
-
-
-mkdir $(CopyDir)\lib
-
-copy $(SolutionDir)$(Configuration)\$(Platform)\bin\*-$(ClutterApiVersion).lib $(CopyDir)\lib
-
-
-mkdir $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter\win32
-
-
-copy ..\..\..\clutter\clutter.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter
-
-copy ..\..\..\clutter\clutter-action.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter
-
-copy ..\..\..\clutter\clutter-actor-meta.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter
-
-copy ..\..\..\clutter\clutter-actor.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter
-
-copy ..\..\..\clutter\clutter-align-constraint.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter
-
-copy ..\..\..\clutter\clutter-alpha.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter
-
-copy ..\..\..\clutter\clutter-animatable.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter
-
-copy ..\..\..\clutter\clutter-animation.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter
-
-copy ..\..\..\clutter\clutter-animator.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter
-
-copy ..\..\..\clutter\clutter-backend.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter
-
-copy ..\..\..\clutter\clutter-bind-constraint.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter
-
-copy ..\..\..\clutter\clutter-binding-pool.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter
-
-copy ..\..\..\clutter\clutter-bin-layout.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter
-
-copy ..\..\..\clutter\clutter-blur-effect.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter
-
-copy ..\..\..\clutter\clutter-box-layout.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter
-
-copy ..\..\..\clutter\clutter-brightness-contrast-effect.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter
-
-copy ..\..\..\clutter\clutter-cairo-texture.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter
-
-copy ..\..\..\clutter\clutter-canvas.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter
-
-copy ..\..\..\clutter\clutter-child-meta.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter
-
-copy ..\..\..\clutter\clutter-click-action.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter
-
-copy ..\..\..\clutter\clutter-clone.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter
-
-copy ..\..\..\clutter\clutter-cogl-compat.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter
-
-copy ..\..\..\clutter\clutter-color-static.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter
-
-copy ..\..\..\clutter\clutter-color.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter
-
-copy ..\..\..\clutter\clutter-colorize-effect.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter
-
-copy ..\..\..\clutter\clutter-config.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter
-
-copy ..\..\..\clutter\clutter-constraint.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter
-
-copy ..\..\..\clutter\clutter-content.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter
-
-copy ..\..\..\clutter\clutter-container.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter
-
-copy ..\..\..\clutter\clutter-deform-effect.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter
-
-copy ..\..\..\clutter\clutter-deprecated.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter
-
-copy ..\..\..\clutter\clutter-desaturate-effect.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter
-
-copy ..\..\..\clutter\clutter-device-manager.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter
-
-copy ..\..\..\clutter\clutter-drag-action.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter
-
-copy ..\..\..\clutter\clutter-drop-action.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter
-
-copy ..\..\..\clutter\clutter-effect.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter
-
-copy ..\..\..\clutter\clutter-enums.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter
-
-copy ..\..\..\clutter\clutter-enum-types.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter
-
-copy ..\..\..\clutter\clutter-event.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter
-
-copy ..\..\..\clutter\clutter-feature.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter
-
-copy ..\..\..\clutter\clutter-fixed-layout.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter
-
-copy ..\..\..\clutter\clutter-flow-layout.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter
-
-copy ..\..\..\clutter\clutter-gesture-action.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter
-
-copy ..\..\..\clutter\clutter-group.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter
-
-copy ..\..\..\clutter\clutter-image.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter
-
-copy ..\..\..\clutter\clutter-input-device.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter
-
-copy ..\..\..\clutter\clutter-interval.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter
-
-copy ..\..\..\clutter\clutter-keysyms.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter
-
-copy ..\..\..\clutter\clutter-layout-manager.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter
-
-copy ..\..\..\clutter\clutter-layout-meta.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter
-
-copy ..\..\..\clutter\clutter-list-model.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter
-
-copy ..\..\..\clutter\clutter-macros.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter
-
-copy ..\..\..\clutter\clutter-main.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter
-
-copy ..\..\..\clutter\clutter-marshal.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter
-
-copy ..\..\..\clutter\clutter-media.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter
-
-copy ..\..\..\clutter\clutter-model.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter
-
-copy ..\..\..\clutter\clutter-offscreen-effect.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter
-
-copy ..\..\..\clutter\clutter-page-turn-effect.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter
-
-copy ..\..\..\clutter\clutter-paint-node.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter
-
-copy ..\..\..\clutter\clutter-paint-nodes.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter
-
-copy ..\..\..\clutter\clutter-path-constraint.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter
-
-copy ..\..\..\clutter\clutter-path.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter
-
-copy ..\..\..\clutter\clutter-property-transition.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter
-
-copy ..\..\..\clutter\clutter-script.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter
-
-copy ..\..\..\clutter\clutter-scriptable.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter
-
-copy ..\..\..\clutter\clutter-settings.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter
-
-copy ..\..\..\clutter\clutter-shader-effect.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter
-
-copy ..\..\..\clutter\clutter-shader-types.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter
-
-copy ..\..\..\clutter\clutter-snap-constraint.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter
-
-copy ..\..\..\clutter\clutter-stage.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter
-
-copy ..\..\..\clutter\clutter-stage-manager.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter
-
-copy ..\..\..\clutter\clutter-stage-window.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter
-
-copy ..\..\..\clutter\clutter-state.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter
-
-copy ..\..\..\clutter\clutter-swipe-action.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter
-
-copy ..\..\..\clutter\clutter-table-layout.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter
-
-copy ..\..\..\clutter\clutter-texture.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter
-
-copy ..\..\..\clutter\clutter-text.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter
-
-copy ..\..\..\clutter\clutter-text-buffer.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter
-
-copy ..\..\..\clutter\clutter-timeline.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter
-
-copy ..\..\..\clutter\clutter-transition.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter
-
-copy ..\..\..\clutter\clutter-types.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter
-
-copy ..\..\..\clutter\clutter-units.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter
-
-copy ..\..\..\clutter\clutter-version.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter
-
-copy ..\..\..\clutter\win32\clutter-win32.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter\win32
-
-
-mkdir $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter\deprecated
-
-copy ..\..\..\clutter\deprecated\clutter-actor.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter\deprecated
-
-copy ..\..\..\clutter\deprecated\clutter-animatable.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter\deprecated
-
-copy ..\..\..\clutter\deprecated\clutter-animation.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter\deprecated
-
-copy ..\..\..\clutter\deprecated\clutter-backend.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter\deprecated
-
-copy ..\..\..\clutter\deprecated\clutter-behaviour.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter\deprecated
-
-copy ..\..\..\clutter\deprecated\clutter-behaviour-depth.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter\deprecated
-
-copy ..\..\..\clutter\deprecated\clutter-behaviour-ellipse.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter\deprecated
-
-copy ..\..\..\clutter\deprecated\clutter-behaviour-opacity.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter\deprecated
-
-copy ..\..\..\clutter\deprecated\clutter-behaviour-path.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter\deprecated
-
-copy ..\..\..\clutter\deprecated\clutter-behaviour-rotate.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter\deprecated
-
-copy ..\..\..\clutter\deprecated\clutter-behaviour-scale.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter\deprecated
-
-copy ..\..\..\clutter\deprecated\clutter-box.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter\deprecated
-
-copy ..\..\..\clutter\deprecated\clutter-cairo-texture.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter\deprecated
-
-copy ..\..\..\clutter\deprecated\clutter-container.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter\deprecated
-
-copy ..\..\..\clutter\deprecated\clutter-fixed.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter\deprecated
-
-copy ..\..\..\clutter\deprecated\clutter-frame-source.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter\deprecated
-
-copy ..\..\..\clutter\deprecated\clutter-group.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter\deprecated
-
-copy ..\..\..\clutter\deprecated\clutter-keysyms.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter\deprecated
-
-copy ..\..\..\clutter\deprecated\clutter-main.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter\deprecated
-
-copy ..\..\..\clutter\deprecated\clutter-rectangle.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter\deprecated
-
-copy ..\..\..\clutter\deprecated\clutter-score.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter\deprecated
-
-copy ..\..\..\clutter\deprecated\clutter-shader.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter\deprecated
-
-copy ..\..\..\clutter\deprecated\clutter-stage.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter\deprecated
-
-copy ..\..\..\clutter\deprecated\clutter-stage-manager.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter\deprecated
-
-copy ..\..\..\clutter\deprecated\clutter-texture.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter\deprecated
-
-copy ..\..\..\clutter\deprecated\clutter-timeline.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter\deprecated
-
-copy ..\..\..\clutter\deprecated\clutter-timeout-pool.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter\deprecated
-
-copy ..\..\..\clutter\deprecated\clutter-util.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter\deprecated
-
-
-mkdir $(CopyDir)\include\clutter-$(ClutterApiVersion)\cally
-
-copy ..\..\..\clutter\cally\cally-actor.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\cally
-
-copy ..\..\..\clutter\cally\cally-clone.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\cally
-
-copy ..\..\..\clutter\cally\cally-factory.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\cally
-
-copy ..\..\..\clutter\cally\cally-group.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\cally
-
-copy ..\..\..\clutter\cally\cally.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\cally
-
-copy ..\..\..\clutter\cally\cally-main.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\cally
-
-copy ..\..\..\clutter\cally\cally-rectangle.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\cally
-
-copy ..\..\..\clutter\cally\cally-root.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\cally
-
-copy ..\..\..\clutter\cally\cally-stage.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\cally
-
-copy ..\..\..\clutter\cally\cally-text.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\cally
-
-copy ..\..\..\clutter\cally\cally-texture.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\cally
-
-copy ..\..\..\clutter\cally\cally-util.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\cally
-
-
-</ClutterDoInstall>
-<ClutterDoInstallGDK>
-mkdir $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter\gdk
-
-copy ..\..\..\clutter\gdk\clutter-gdk.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter\gdk
-</ClutterDoInstallGDK>
-<ClutterDoInstallReleaseBin>
-mkdir $(CopyDir)\bin
-
-copy $(SolutionDir)Release\$(Platform)\bin\*.dll $(CopyDir)\bin
-
-copy $(SolutionDir)Release\$(Platform)\bin\*.exe $(CopyDir)\bin
-
-
-mkdir $(CopyDir)\lib
-
-copy $(SolutionDir)Release\$(Platform)\bin\*-$(ClutterApiVersion).lib $(CopyDir)\lib
-</ClutterDoInstallReleaseBin>
-<ClutterDoInstallDebugBin>
-mkdir $(CopyDir)\bin
-
-copy $(SolutionDir)Debug\$(Platform)\bin\*.dll $(CopyDir)\bin
-
-copy $(SolutionDir)Debug\$(Platform)\bin\*.exe $(CopyDir)\bin
-
-
-mkdir $(CopyDir)\lib
-
-copy $(SolutionDir)Debug\$(Platform)\bin\*-$(ClutterApiVersion).lib $(CopyDir)\lib
-</ClutterDoInstallDebugBin>
-    <GenerateClutterDef>
-         echo EXPORTS &gt; $(DefDir)\clutter.def
-
-         cl -EP -DHAVE_CAIRO -DCLUTTER_WINDOWING_WIN32 -DCLUTTER_ENABLE_EXPERIMENTAL_API ..\..\..\clutter\clutter.symbols &gt;&gt; $(DefDir)\clutter.def
-
-    </GenerateClutterDef>
-    <GenerateClutterGDKDef>
-         echo EXPORTS &gt; $(DefDir)\clutter.def
-
-         cl -EP -DHAVE_CAIRO -DCLUTTER_WINDOWING_WIN32 -DCLUTTER_WINDOWING_GDK -DCLUTTER_ENABLE_EXPERIMENTAL_API ..\..\..\clutter\clutter.symbols &gt;&gt; $(DefDir)\clutter.def
-
-    </GenerateClutterGDKDef>
-    <ClutterLibtoolCompatibleDllPrefix>lib</ClutterLibtoolCompatibleDllPrefix>
-    <ClutterLibtoolCompatibleDllSuffix>-$(ClutterApiVersion)-0</ClutterLibtoolCompatibleDllSuffix>
-    <ClutterSeparateVS10DllPrefix />
-    <ClutterSeparateVS10DllSuffix>-1-vs10</ClutterSeparateVS10DllSuffix>
-    <ClutterDllPrefix>$(ClutterSeparateVS10DllPrefix)</ClutterDllPrefix>
-    <ClutterDllSuffix>$(ClutterSeparateVS10DllSuffix)</ClutterDllSuffix>
-  </PropertyGroup>
-  <PropertyGroup>
-    <_PropertySheetDisplayName>clutterprops</_PropertySheetDisplayName>
-    <OutDir>$(SolutionDir)$(Configuration)\$(PlatformName)\bin\</OutDir>
-    <IntDir>$(SolutionDir)$(Configuration)\$(PlatformName)\obj\$(ProjectName)\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\..\..;..\..\..\clutter;$(GlibEtcInstallRoot)\include;$(GlibEtcInstallRoot)\include\glib-2.0;$(GlibEtcInstallRoot)\include\cairo;$(GlibEtcInstallRoot)\include\atk-1.0;$(GlibEtcInstallRoot)\include\pango-1.0;$(GlibEtcInstallRoot)\include\cogl-1.0;$(GlibEtcInstallRoot)\include\json-glib-1.0;$(GlibEtcInstallRoot)\lib\glib-2.0\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>G_DISABLE_SINGLE_INCLUDES;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ForcedIncludeFiles>msvc_recommended_pragmas.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
-      <DisableSpecificWarnings>%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>cogl-pango-1.0.lib;cogl-1.0.lib;glib-2.0.lib;gobject-2.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(GlibEtcInstallRoot)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <BuildMacro Include="GlibEtcInstallRoot">
-      <Value>$(GlibEtcInstallRoot)</Value>
-    </BuildMacro>
-    <BuildMacro Include="CopyDir">
-      <Value>$(CopyDir)</Value>
-    </BuildMacro>
-    <BuildMacro Include="DefDir">
-      <Value>$(DefDir)</Value>
-    </BuildMacro>
-    <BuildMacro Include="GlibMkEnumsPath">
-      <Value>$(GlibMkEnumsPath)</Value>
-    </BuildMacro>
-    <BuildMacro Include="GlibGenMarshalPath">
-      <Value>$(GlibGenMarshalPath)</Value>
-    </BuildMacro>
-    <BuildMacro Include="ClutterApiVersion">
-      <Value>$(ClutterApiVersion)</Value>
-    </BuildMacro>
-    <BuildMacro Include="BaseWinBuildDef">
-      <Value>$(BaseWinBuildDef)</Value>
-    </BuildMacro>
-    <BuildMacro Include="BaseBuildDef">
-      <Value>$(BaseBuildDef)</Value>
-    </BuildMacro>
-    <BuildMacro Include="LibBuildDefines">
-      <Value>$(LibBuildDefines)</Value>
-    </BuildMacro>
-    <BuildMacro Include="DebugLibBuildDefines">
-      <Value>$(DebugLibBuildDefines)</Value>
-    </BuildMacro>
-    <BuildMacro Include="ReleaseLibBuildDefines">
-      <Value>$(ReleaseLibBuildDefines)</Value>
-    </BuildMacro>
-    <BuildMacro Include="ClutterBuildDefines">
-      <Value>$(ClutterBuildDefines)</Value>
-    </BuildMacro>
-    <BuildMacro Include="CallyTestDefs">
-      <Value>$(CallyTestDefs)</Value>
-    </BuildMacro>
-    <BuildMacro Include="TestProgDef">
-      <Value>$(TestProgDef)</Value>
-    </BuildMacro>
-    <BuildMacro Include="ClutterDisableDeprecationWarnings">
-      <Value>$(ClutterDisableDeprecationWarnings)</Value>
-    </BuildMacro>
-    <BuildMacro Include="TestPerfProgDef">
-      <Value>$(TestPerfProgDef)</Value>
-    </BuildMacro>
-    <BuildMacro Include="PreBuildGDK">
-      <Value>$(PreBuildGDK)</Value>
-    </BuildMacro>
-    <BuildMacro Include="PreBuildWin">
-      <Value>$(PreBuildWin)</Value>
-    </BuildMacro>
-    <BuildMacro Include="PreBuildCmd2">
-      <Value>$(PreBuildCmd2)</Value>
-    </BuildMacro>
-    <BuildMacro Include="ClutterDoInstall">
-      <Value>$(ClutterDoInstall)</Value>
-    </BuildMacro>
-    <BuildMacro Include="ClutterDoInstallGDK">
-      <Value>$(ClutterDoInstallGDK)</Value>
-    </BuildMacro>
-    <BuildMacro Include="ClutterDoInstallReleaseBin">
-      <Value>$(ClutterDoInstallReleaseBin)</Value>
-    </BuildMacro>
-    <BuildMacro Include="ClutterDoInstallDebugBin">
-      <Value>$(ClutterDoInstallDebugBin)</Value>
-    </BuildMacro>
-    <BuildMacro Include="GenerateClutterDef">
-      <Value>$(GenerateClutterDef)</Value>
-    </BuildMacro>
-    <BuildMacro Include="GenerateClutterGDKDef">
-      <Value>$(GenerateClutterGDKDef)</Value>
-    </BuildMacro>
-    <BuildMacro Include="ClutterLibtoolCompatibleDllPrefix">
-      <Value>$(ClutterLibtoolCompatibleDllPrefix)</Value>
-    </BuildMacro>
-    <BuildMacro Include="ClutterLibtoolCompatibleDllSuffix">
-      <Value>$(ClutterLibtoolCompatibleDllSuffix)</Value>
-    </BuildMacro>
-    <BuildMacro Include="ClutterSeparateVS10DllPrefix">
-      <Value>$(ClutterSeparateVS10DllPrefix)</Value>
-    </BuildMacro>
-    <BuildMacro Include="ClutterSeparateVS10DllSuffix">
-      <Value>$(ClutterSeparateVS10DllSuffix)</Value>
-    </BuildMacro>
-    <BuildMacro Include="ClutterDllPrefix">
-      <Value>$(ClutterDllPrefix)</Value>
-    </BuildMacro>
-    <BuildMacro Include="ClutterDllSuffix">
-      <Value>$(ClutterDllSuffix)</Value>
-    </BuildMacro>
-  </ItemGroup>
-</Project>
diff --git a/build/win32/vs10/clutter.sln b/build/win32/vs10/clutter.sln
index 1302d3a5c..9a51e7200 100644
--- a/build/win32/vs10/clutter.sln
+++ b/build/win32/vs10/clutter.sln
@@ -37,8 +37,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cally-atkevents-example", "
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cally-clone-example", "cally-clone-example.vcxproj", "{E77D40D0-19D4-4865-BE20-B6DA05BA234D}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-conformance-clutter", "test-conformance-clutter.vcxproj", "{0F08F253-DE1A-40CB-A890-93AE3CA23ADE}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-interactive-clutter", "test-interactive-clutter.vcxproj", "{75F9E5AF-040C-448E-96BE-C282EFFFE2D9}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "install", "install.vcxproj", "{35B2A4AC-7235-4FC7-995D-469D59195041}"
@@ -343,22 +341,6 @@ Global
 		{E77D40D0-19D4-4865-BE20-B6DA05BA234D}.Release|Win32.Build.0 = Release|Win32
 		{E77D40D0-19D4-4865-BE20-B6DA05BA234D}.Release|x64.ActiveCfg = Release|x64
 		{E77D40D0-19D4-4865-BE20-B6DA05BA234D}.Release|x64.Build.0 = Release|x64
-		{0F08F253-DE1A-40CB-A890-93AE3CA23ADE}.Debug_GDK|Win32.ActiveCfg = Debug|Win32
-		{0F08F253-DE1A-40CB-A890-93AE3CA23ADE}.Debug_GDK|Win32.Build.0 = Debug|Win32
-		{0F08F253-DE1A-40CB-A890-93AE3CA23ADE}.Debug_GDK|x64.ActiveCfg = Debug|x64
-		{0F08F253-DE1A-40CB-A890-93AE3CA23ADE}.Debug_GDK|x64.Build.0 = Debug|x64
-		{0F08F253-DE1A-40CB-A890-93AE3CA23ADE}.Debug|Win32.ActiveCfg = Debug|Win32
-		{0F08F253-DE1A-40CB-A890-93AE3CA23ADE}.Debug|Win32.Build.0 = Debug|Win32
-		{0F08F253-DE1A-40CB-A890-93AE3CA23ADE}.Debug|x64.ActiveCfg = Debug|x64
-		{0F08F253-DE1A-40CB-A890-93AE3CA23ADE}.Debug|x64.Build.0 = Debug|x64
-		{0F08F253-DE1A-40CB-A890-93AE3CA23ADE}.Release_GDK|Win32.ActiveCfg = Release|Win32
-		{0F08F253-DE1A-40CB-A890-93AE3CA23ADE}.Release_GDK|Win32.Build.0 = Release|Win32
-		{0F08F253-DE1A-40CB-A890-93AE3CA23ADE}.Release_GDK|x64.ActiveCfg = Release|x64
-		{0F08F253-DE1A-40CB-A890-93AE3CA23ADE}.Release_GDK|x64.Build.0 = Release|x64
-		{0F08F253-DE1A-40CB-A890-93AE3CA23ADE}.Release|Win32.ActiveCfg = Release|Win32
-		{0F08F253-DE1A-40CB-A890-93AE3CA23ADE}.Release|Win32.Build.0 = Release|Win32
-		{0F08F253-DE1A-40CB-A890-93AE3CA23ADE}.Release|x64.ActiveCfg = Release|x64
-		{0F08F253-DE1A-40CB-A890-93AE3CA23ADE}.Release|x64.Build.0 = Release|x64
 		{75F9E5AF-040C-448E-96BE-C282EFFFE2D9}.Debug_GDK|Win32.ActiveCfg = Debug|Win32
 		{75F9E5AF-040C-448E-96BE-C282EFFFE2D9}.Debug_GDK|Win32.Build.0 = Debug|Win32
 		{75F9E5AF-040C-448E-96BE-C282EFFFE2D9}.Debug_GDK|x64.ActiveCfg = Debug|x64
@@ -375,18 +357,18 @@ Global
 		{75F9E5AF-040C-448E-96BE-C282EFFFE2D9}.Release|Win32.Build.0 = Release|Win32
 		{75F9E5AF-040C-448E-96BE-C282EFFFE2D9}.Release|x64.ActiveCfg = Release|x64
 		{75F9E5AF-040C-448E-96BE-C282EFFFE2D9}.Release|x64.Build.0 = Release|x64
-		{35B2A4AC-7235-4FC7-995D-469D59195041}.Debug_GDK|Win32.ActiveCfg = Debug_GDK|Win32
-		{35B2A4AC-7235-4FC7-995D-469D59195041}.Debug_GDK|Win32.Build.0 = Debug_GDK|Win32
-		{35B2A4AC-7235-4FC7-995D-469D59195041}.Debug_GDK|x64.ActiveCfg = Debug_GDK|x64
-		{35B2A4AC-7235-4FC7-995D-469D59195041}.Debug_GDK|x64.Build.0 = Debug_GDK|x64
+		{35B2A4AC-7235-4FC7-995D-469D59195041}.Debug_GDK|Win32.ActiveCfg = Debug|Win32
+		{35B2A4AC-7235-4FC7-995D-469D59195041}.Debug_GDK|Win32.Build.0 = Debug|Win32
+		{35B2A4AC-7235-4FC7-995D-469D59195041}.Debug_GDK|x64.ActiveCfg = Debug|x64
+		{35B2A4AC-7235-4FC7-995D-469D59195041}.Debug_GDK|x64.Build.0 = Debug|x64
 		{35B2A4AC-7235-4FC7-995D-469D59195041}.Debug|Win32.ActiveCfg = Debug|Win32
 		{35B2A4AC-7235-4FC7-995D-469D59195041}.Debug|Win32.Build.0 = Debug|Win32
 		{35B2A4AC-7235-4FC7-995D-469D59195041}.Debug|x64.ActiveCfg = Debug|x64
 		{35B2A4AC-7235-4FC7-995D-469D59195041}.Debug|x64.Build.0 = Debug|x64
-		{35B2A4AC-7235-4FC7-995D-469D59195041}.Release_GDK|Win32.ActiveCfg = Release_GDK|Win32
-		{35B2A4AC-7235-4FC7-995D-469D59195041}.Release_GDK|Win32.Build.0 = Release_GDK|Win32
-		{35B2A4AC-7235-4FC7-995D-469D59195041}.Release_GDK|x64.ActiveCfg = Release_GDK|x64
-		{35B2A4AC-7235-4FC7-995D-469D59195041}.Release_GDK|x64.Build.0 = Release_GDK|x64
+		{35B2A4AC-7235-4FC7-995D-469D59195041}.Release_GDK|Win32.ActiveCfg = Release|Win32
+		{35B2A4AC-7235-4FC7-995D-469D59195041}.Release_GDK|Win32.Build.0 = Release|Win32
+		{35B2A4AC-7235-4FC7-995D-469D59195041}.Release_GDK|x64.ActiveCfg = Release|x64
+		{35B2A4AC-7235-4FC7-995D-469D59195041}.Release_GDK|x64.Build.0 = Release|x64
 		{35B2A4AC-7235-4FC7-995D-469D59195041}.Release|Win32.ActiveCfg = Release|Win32
 		{35B2A4AC-7235-4FC7-995D-469D59195041}.Release|Win32.Build.0 = Release|Win32
 		{35B2A4AC-7235-4FC7-995D-469D59195041}.Release|x64.ActiveCfg = Release|x64
diff --git a/build/win32/vs10/clutter.vcxproj.filtersin b/build/win32/vs10/clutter.vcxproj.filtersin
index bb25d10c7..2d910f754 100644
--- a/build/win32/vs10/clutter.vcxproj.filtersin
+++ b/build/win32/vs10/clutter.vcxproj.filtersin
@@ -23,6 +23,14 @@
     <ClCompile Include="..\..\..\clutter\gdk\clutter-stage-gdk.c"><Filter>Sources</Filter></ClCompile>
     <ClCompile Include="..\..\..\clutter\cogl\clutter-stage-cogl.c"><Filter>Sources</Filter></ClCompile>
   </ItemGroup>
+  <ItemGroup>
+    <CustomBuild Include="..\..\..\clutter\config.h.win32"><Filter>Resource Files</Filter></CustomBuild>
+    <CustomBuild Include="..\..\..\clutter\clutter-config.h.win32"><Filter>Resource Files</Filter></CustomBuild>
+    <CustomBuild Include="..\..\..\clutter\clutter-config.h.win32_GDK"><Filter>Resource Files</Filter></CustomBuild>
+    <CustomBuild Include="..\..\..\clutter\clutter-marshal.list"><Filter>Resource Files</Filter></CustomBuild>
+    <CustomBuild Include="..\..\..\clutter\clutter-enum-types.h.in"><Filter>Resource Files</Filter></CustomBuild>
+    <CustomBuild Include="..\..\..\clutter\clutter-enum-types.c.in"><Filter>Resource Files</Filter></CustomBuild>
+  </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\..\..\clutter\win32\resources.rc">
       <Filter>Resource Files</Filter>
diff --git a/build/win32/vs10/clutter.vcxprojin b/build/win32/vs10/clutter.vcxprojin
index ecab540aa..6a6263fdd 100644
--- a/build/win32/vs10/clutter.vcxprojin
+++ b/build/win32/vs10/clutter.vcxprojin
@@ -44,70 +44,78 @@
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_GDK|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_GDK|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_GDK|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_GDK|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="clutter.props" />
+    <Import Project="clutter-gen-srcs.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_GDK|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="clutter.props" />
+    <Import Project="clutter-gen-srcs.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="clutter.props" />
+    <Import Project="clutter-gen-srcs.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug_GDK|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="clutter.props" />
+    <Import Project="clutter-gen-srcs.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="clutter.props" />
+    <Import Project="clutter-gen-srcs.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_GDK|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="clutter.props" />
+    <Import Project="clutter-gen-srcs.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="clutter.props" />
+    <Import Project="clutter-gen-srcs.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug_GDK|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="clutter.props" />
+    <Import Project="clutter-gen-srcs.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
@@ -126,11 +134,11 @@
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <PreBuildEvent>
-      <Command>$(PreBuildWin)$(PreBuildCmd2)</Command>
+      <Command>$(DoConfigs)</Command>
     </PreBuildEvent>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\clutter;..\..\..\clutter\win32;..\..\..\clutter\deprecated;..\..\..\clutter\cally;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\clutter;..\..\..\clutter\cally;$(SolutionDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>$(DebugLibBuildDefines);$(ClutterBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -140,14 +148,10 @@
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
     </ClCompile>
-    <PreLinkEvent>
-      <Command>$(GenerateClutterDef)</Command>
-    </PreLinkEvent>
     <Link>
       <AdditionalDependencies>opengl32.lib;winmm.lib;intl.lib;json-glib-1.0.lib;pangocairo-1.0.lib;pango-1.0.lib;cairo-gobject.lib;cairo.lib;atk-1.0.lib;gmodule-2.0.lib;gio-2.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)$(ClutterDllPrefix)$(ProjectName)$(ClutterDllSuffix).dll</OutputFile>
-      <ModuleDefinitionFile>$(IntDir)\clutter.def</ModuleDefinitionFile>
-      <ImportLibrary>$(TargetDir)$(ProjectName)-$(ClutterApiVersion).lib</ImportLibrary>
+      <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX86</TargetMachine>
@@ -155,11 +159,11 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_GDK|Win32'">
     <PreBuildEvent>
-      <Command>$(PreBuildGDK)$(PreBuildCmd2)</Command>
+      <Command>$(DoConfigs)</Command>
     </PreBuildEvent>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\clutter;..\..\..\clutter\win32;..\..\..\clutter\deprecated;..\..\..\clutter\cally;$(GlibEtcInstallRoot)\include\gtk-3.0;$(GlibEtcInstallRoot)\include\gdk-pixbuf-2.0;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\clutter;..\..\..\clutter\cally;$(GlibEtcInstallRoot)\include\gtk-3.0;$(GlibEtcInstallRoot)\include\gdk-pixbuf-2.0;$(SolutionDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>$(DebugLibBuildDefines);$(ClutterBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -169,14 +173,10 @@
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
     </ClCompile>
-    <PreLinkEvent>
-      <Command>$(GenerateClutterGDKDef)</Command>
-    </PreLinkEvent>
     <Link>
       <AdditionalDependencies>opengl32.lib;winmm.lib;intl.lib;json-glib-1.0.lib;gdk-3.0.lib;pangocairo-1.0.lib;pango-1.0.lib;cairo-gobject.lib;cairo.lib;atk-1.0.lib;gmodule-2.0.lib;gio-2.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)$(ClutterDllPrefix)$(ProjectName)$(ClutterDllSuffix).dll</OutputFile>
-      <ModuleDefinitionFile>$(IntDir)\clutter.def</ModuleDefinitionFile>
-      <ImportLibrary>$(TargetDir)$(ProjectName)-$(ClutterApiVersion).lib</ImportLibrary>
+      <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX86</TargetMachine>
@@ -184,11 +184,11 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <PreBuildEvent>
-      <Command>$(PreBuildWin)$(PreBuildCmd2)</Command>
+      <Command>$(DoConfigs)</Command>
     </PreBuildEvent>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\clutter;..\..\..\clutter\win32;..\..\..\clutter\deprecated;..\..\..\clutter\cally;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\clutter;..\..\..\clutter\cally;$(SolutionDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>$(DebugLibBuildDefines);$(ClutterBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -198,14 +198,10 @@
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
-    <PreLinkEvent>
-      <Command>$(GenerateClutterDef)</Command>
-    </PreLinkEvent>
     <Link>
       <AdditionalDependencies>opengl32.lib;winmm.lib;intl.lib;json-glib-1.0.lib;pangocairo-1.0.lib;pango-1.0.lib;cairo-gobject.lib;cairo.lib;atk-1.0.lib;gmodule-2.0.lib;gio-2.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)$(ClutterDllPrefix)$(ProjectName)$(ClutterDllSuffix).dll</OutputFile>
-      <ModuleDefinitionFile>$(IntDir)\clutter.def</ModuleDefinitionFile>
-      <ImportLibrary>$(TargetDir)$(ProjectName)-$(ClutterApiVersion).lib</ImportLibrary>
+      <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX64</TargetMachine>
@@ -213,11 +209,11 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_GDK|x64'">
     <PreBuildEvent>
-      <Command>$(PreBuildGDK)$(PreBuildCmd2)</Command>
+      <Command>$(DoConfigs)</Command>
     </PreBuildEvent>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\clutter;..\..\..\clutter\win32;..\..\..\clutter\deprecated;..\..\..\clutter\cally;$(GlibEtcInstallRoot)\include\gtk-3.0;$(GlibEtcInstallRoot)\include\gdk-pixbuf-2.0;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\clutter;..\..\..\clutter\cally;$(GlibEtcInstallRoot)\include\gtk-3.0;$(GlibEtcInstallRoot)\include\gdk-pixbuf-2.0;$(SolutionDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>$(DebugLibBuildDefines);$(ClutterBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -227,14 +223,10 @@
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
-    <PreLinkEvent>
-      <Command>$(GenerateClutterGDKDef)</Command>
-    </PreLinkEvent>
     <Link>
       <AdditionalDependencies>opengl32.lib;winmm.lib;intl.lib;json-glib-1.0.lib;gdk-3.0.lib;pangocairo-1.0.lib;pango-1.0.lib;cairo-gobject.lib;cairo.lib;atk-1.0.lib;gmodule-2.0.lib;gio-2.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)$(ClutterDllPrefix)$(ProjectName)$(ClutterDllSuffix).dll</OutputFile>
-      <ModuleDefinitionFile>$(IntDir)\clutter.def</ModuleDefinitionFile>
-      <ImportLibrary>$(TargetDir)$(ProjectName)-$(ClutterApiVersion).lib</ImportLibrary>
+      <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX64</TargetMachine>
@@ -242,12 +234,12 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <PreBuildEvent>
-      <Command>$(PreBuildWin)$(PreBuildCmd2)</Command>
+      <Command>$(DoConfigs)</Command>
     </PreBuildEvent>
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>..\..\..\clutter;..\..\..\clutter\win32;..\..\..\clutter\deprecated;..\..\..\clutter\cally;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\clutter;..\..\..\clutter\cally;$(SolutionDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>$(ReleaseLibBuildDefines);$(ClutterBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
@@ -256,14 +248,10 @@
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
-    <PreLinkEvent>
-      <Command>$(GenerateClutterDef)</Command>
-    </PreLinkEvent>
     <Link>
       <AdditionalDependencies>opengl32.lib;winmm.lib;intl.lib;json-glib-1.0.lib;pangocairo-1.0.lib;pango-1.0.lib;cairo-gobject.lib;cairo.lib;atk-1.0.lib;gmodule-2.0.lib;gio-2.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)$(ClutterDllPrefix)$(ProjectName)$(ClutterDllSuffix).dll</OutputFile>
-      <ModuleDefinitionFile>$(IntDir)\clutter.def</ModuleDefinitionFile>
-      <ImportLibrary>$(TargetDir)$(ProjectName)-$(ClutterApiVersion).lib</ImportLibrary>
+      <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
@@ -273,12 +261,12 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_GDK|Win32'">
     <PreBuildEvent>
-      <Command>$(PreBuildGDK)$(PreBuildCmd2)</Command>
+      <Command>$(DoConfigs)</Command>
     </PreBuildEvent>
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>..\..\..\clutter;..\..\..\clutter\win32;..\..\..\clutter\deprecated;..\..\..\clutter\cally;$(GlibEtcInstallRoot)\include\gtk-3.0;$(GlibEtcInstallRoot)\include\gdk-pixbuf-2.0;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\clutter;..\..\..\clutter\cally;$(GlibEtcInstallRoot)\include\gtk-3.0;$(GlibEtcInstallRoot)\include\gdk-pixbuf-2.0;$(SolutionDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>$(ReleaseLibBuildDefines);$(ClutterBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
@@ -287,14 +275,10 @@
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
-    <PreLinkEvent>
-      <Command>$(GenerateClutterGDKDef)</Command>
-    </PreLinkEvent>
     <Link>
       <AdditionalDependencies>opengl32.lib;winmm.lib;intl.lib;json-glib-1.0.lib;gdk-3.0.lib;pangocairo-1.0.lib;pango-1.0.lib;cairo-gobject.lib;cairo.lib;atk-1.0.lib;gmodule-2.0.lib;gio-2.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)$(ClutterDllPrefix)$(ProjectName)$(ClutterDllSuffix).dll</OutputFile>
-      <ModuleDefinitionFile>$(IntDir)\clutter.def</ModuleDefinitionFile>
-      <ImportLibrary>$(TargetDir)$(ProjectName)-$(ClutterApiVersion).lib</ImportLibrary>
+      <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
@@ -304,10 +288,10 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <PreBuildEvent>
-      <Command>$(PreBuildWin)$(PreBuildCmd2)</Command>
+      <Command>$(DoConfigs)</Command>
     </PreBuildEvent>
     <ClCompile>
-      <AdditionalIncludeDirectories>..\..\..\clutter;..\..\..\clutter\win32;..\..\..\clutter\deprecated;..\..\..\clutter\cally;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\clutter;..\..\..\clutter\cally;$(SolutionDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>$(ReleaseLibBuildDefines);$(ClutterBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <PrecompiledHeader>
@@ -315,14 +299,10 @@
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
-    <PreLinkEvent>
-      <Command>$(GenerateClutterDef)</Command>
-    </PreLinkEvent>
     <Link>
       <AdditionalDependencies>opengl32.lib;winmm.lib;intl.lib;json-glib-1.0.lib;pangocairo-1.0.lib;pango-1.0.lib;cairo-gobject.lib;cairo.lib;atk-1.0.lib;gmodule-2.0.lib;gio-2.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)$(ClutterDllPrefix)$(ProjectName)$(ClutterDllSuffix).dll</OutputFile>
-      <ModuleDefinitionFile>$(IntDir)\clutter.def</ModuleDefinitionFile>
-      <ImportLibrary>$(TargetDir)$(ProjectName)-$(ClutterApiVersion).lib</ImportLibrary>
+      <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
@@ -332,10 +312,10 @@
   </ItemDefinitionGroup>
     <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_GDK|x64'">
     <PreBuildEvent>
-      <Command>$(PreBuildGDK)$(PreBuildCmd2)</Command>
+      <Command>$(DoConfigs)</Command>
     </PreBuildEvent>
     <ClCompile>
-      <AdditionalIncludeDirectories>..\..\..\clutter;..\..\..\clutter\win32;..\..\..\clutter\deprecated;..\..\..\clutter\cally;$(GlibEtcInstallRoot)\include\gtk-3.0;$(GlibEtcInstallRoot)\include\gdk-pixbuf-2.0;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\clutter;..\..\..\clutter\cally;$(GlibEtcInstallRoot)\include\gtk-3.0;$(GlibEtcInstallRoot)\include\gdk-pixbuf-2.0;$(SolutionDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>$(ReleaseLibBuildDefines);$(ClutterBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <PrecompiledHeader>
@@ -343,14 +323,10 @@
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
-    <PreLinkEvent>
-      <Command>$(GenerateClutterGDKDef)</Command>
-    </PreLinkEvent>
     <Link>
       <AdditionalDependencies>opengl32.lib;winmm.lib;intl.lib;json-glib-1.0.lib;gdk-3.0.lib;pangocairo-1.0.lib;pango-1.0.lib;cairo-gobject.lib;cairo.lib;atk-1.0.lib;gmodule-2.0.lib;gio-2.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)$(ClutterDllPrefix)$(ProjectName)$(ClutterDllSuffix).dll</OutputFile>
-      <ModuleDefinitionFile>$(IntDir)\clutter.def</ModuleDefinitionFile>
-      <ImportLibrary>$(TargetDir)$(ProjectName)-$(ClutterApiVersion).lib</ImportLibrary>
+      <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
@@ -397,10 +373,144 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
   </ItemGroup>
+  <ItemGroup>
+    <CustomBuild Include="..\..\..\clutter\config.h.win32">
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug_GDK|Win32'">Copying config.h from config.h.win32...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug_GDK|Win32'">$(CopyConfigH)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug_GDK|Win32'">..\..\..\clutter\config.h;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Copying config.h from config.h.win32...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(CopyConfigH)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\clutter\config.h;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug_GDK|x64'">Copying config.h from config.h.win32...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug_GDK|x64'">$(CopyConfigH)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug_GDK|x64'">..\..\..\clutter\config.h;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Copying config.h from config.h.win32...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(CopyConfigH)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\clutter\config.h;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release_GDK|Win32'">Copying config.h from config.h.win32...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release_GDK|Win32'">$(CopyConfigH)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release_GDK|Win32'">..\..\..\clutter\config.h;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Copying config.h from config.h.win32...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(CopyConfigH)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\clutter\config.h;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release_GDK|x64'">Copying config.h from config.h.win32...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release_GDK|x64'">$(CopyConfigH)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release_GDK|x64'">..\..\..\clutter\config.h;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Copying config.h from config.h.win32...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(CopyConfigH)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\clutter\config.h;%(Outputs)</Outputs>
+    </CustomBuild>
+    <CustomBuild Include="..\..\..\clutter\clutter-config.h.win32_GDK">
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug_GDK|Win32'">Copying clutter-config.h from clutter-config.h.win32_GDK...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug_GDK|Win32'">$(CopyClutterConfigGDKH)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug_GDK|Win32'">..\..\..\clutter\clutter-config.h;clutter.bld.GDK.win32;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug_GDK|x64'">Copying clutter-config.h from clutter-config.h.win32_GDK...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug_GDK|x64'">$(CopyClutterConfigGDKH)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug_GDK|x64'">..\..\..\clutter\clutter-config.h;clutter.bld.GDK.win32;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release_GDK|Win32'">Copying clutter-config.h from clutter-config.h.win32_GDK...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release_GDK|Win32'">$(CopyClutterConfigGDKH)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release_GDK|Win32'">..\..\..\clutter\clutter-config.h;clutter.bld.GDK.win32;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release_GDK|x64'">Copying clutter-config.h from clutter-config.h.win32_GDK...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release_GDK|x64'">$(CopyClutterConfigGDKH)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release_GDK|x64'">..\..\..\clutter\clutter-config.h;clutter.bld.GDK.win32;%(Outputs)</Outputs>
+    </CustomBuild>
+    <CustomBuild Include="..\..\..\clutter\clutter-config.h.win32">
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Copying clutter-config.h from clutter-config.h.win32...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(CopyClutterConfigH)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\clutter\clutter-config.h;clutter.bld.win32.win32;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Copying clutter-config.h from clutter-config.h.win32...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(CopyClutterConfigH)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\clutter\clutter-config.h;clutter.bld.win32.win32;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Copying clutter-config.h from clutter-config.h.win32...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(CopyClutterConfigH)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\clutter\clutter-config.h;clutter.bld.win32.win32;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Copying clutter-config.h from clutter-config.h.win32...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(CopyClutterConfigH)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\clutter\clutter-config.h;clutter.bld.win32.win32;%(Outputs)</Outputs>
+    </CustomBuild>
+    <CustomBuild Include="..\..\..\clutter\clutter-marshal.list">
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug_GDK|Win32'">Generating Marshalling Sources...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug_GDK|Win32'">$(GenMarshalSrc)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug_GDK|Win32'">..\..\..\clutter\clutter-marshal.h;..\..\..\clutter\clutter-marshal.c;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating Marshalling Sources...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GenMarshalSrc)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\clutter\clutter-marshal.h;..\..\..\clutter\clutter-marshal.c;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug_GDK|x64'">Generating Marshalling Sources...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug_GDK|x64'">$(GenMarshalSrc)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug_GDK|x64'">..\..\..\clutter\clutter-marshal.h;..\..\..\clutter\clutter-marshal.c;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Generating Marshalling Sources...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GenMarshalSrc)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\clutter\clutter-marshal.h;..\..\..\clutter\clutter-marshal.c;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release_GDK|Win32'">Generating Marshalling Sources...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release_GDK|Win32'">$(GenMarshalSrc)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release_GDK|Win32'">..\..\..\clutter\clutter-marshal.h;..\..\..\clutter\clutter-marshal.c;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Generating Marshalling Sources...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GenMarshalSrc)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\clutter\clutter-marshal.h;..\..\..\clutter\clutter-marshal.c;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release_GDK|x64'">Generating Marshalling Sources...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release_GDK|x64'">$(GenMarshalSrc)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release_GDK|x64'">..\..\..\clutter\clutter-marshal.h;..\..\..\clutter\clutter-marshal.c;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Generating Marshalling Sources...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GenMarshalSrc)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\clutter\clutter-marshal.h;..\..\..\clutter\clutter-marshal.c;%(Outputs)</Outputs>
+    </CustomBuild>
+    <CustomBuild Include="..\..\..\clutter\clutter-enum-types.h.in">
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug_GDK|Win32'">Generating Enumeration Header...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug_GDK|Win32'">$(GenEnumsSrcGDKH)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug_GDK|Win32'">..\..\..\clutter\clutter-enum-types.h;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating Enumeration Header...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GenEnumsSrcH)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\clutter\clutter-enum-types.h;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug_GDK|x64'">Generating Enumeration Header...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug_GDK|x64'">$(GenEnumsSrcGDKH)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug_GDK|x64'">..\..\..\clutter\clutter-enum-types.h;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Generating Enumeration Header...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GenEnumsSrcH)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\clutter\clutter-enum-types.h;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release_GDK|Win32'">Generating Enumeration Header...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release_GDK|Win32'">$(GenEnumsSrcGDKH)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release_GDK|Win32'">..\..\..\clutter\clutter-enum-types.h;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Generating Enumeration Header...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GenEnumsSrcH)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\clutter\clutter-enum-types.h;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release_GDK|x64'">Generating Enumeration Header...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release_GDK|x64'">$(GenEnumsSrcGDKH)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release_GDK|x64'">..\..\..\clutter\clutter-enum-types.h;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Generating Enumeration Header...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GenEnumsSrcH)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\clutter\clutter-enum-types.h;%(Outputs)</Outputs>
+    </CustomBuild>
+    <CustomBuild Include="..\..\..\clutter\clutter-enum-types.c.in">
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug_GDK|Win32'">Generating Enumeration Sources...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug_GDK|Win32'">$(GenEnumsSrcGDKC)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug_GDK|Win32'">..\..\..\clutter\clutter-enum-types.c;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating Enumeration Sources...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GenEnumsSrcC)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\clutter\clutter-enum-types.c;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug_GDK|x64'">Generating Enumeration Sources...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug_GDK|x64'">$(GenEnumsSrcGDKC)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug_GDK|x64'">..\..\..\clutter\clutter-enum-types.c;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Generating Enumeration Sources...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GenEnumsSrcC)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\clutter\clutter-enum-types.c;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release_GDK|Win32'">Generating Enumeration Sources...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release_GDK|Win32'">$(GenEnumsSrcGDKC)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release_GDK|Win32'">..\..\..\clutter\clutter-enum-types.c;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Generating Enumeration Sources...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GenEnumsSrcC)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\clutter\clutter-enum-types.c;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release_GDK|x64'">Generating Enumeration Sources...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release_GDK|x64'">$(GenEnumsSrcGDKC)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release_GDK|x64'">..\..\..\clutter\clutter-enum-types.c;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Generating Enumeration Sources...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GenEnumsSrcC)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\clutter\clutter-enum-types.c;%(Outputs)</Outputs>
+    </CustomBuild>
+  </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\..\..\clutter\win32\resources.rc" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/build/win32/vs10/install.vcxproj b/build/win32/vs10/install.vcxproj
index 30a906cad..e87e91ef7 100644
--- a/build/win32/vs10/install.vcxproj
+++ b/build/win32/vs10/install.vcxproj
@@ -5,34 +5,18 @@
       <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug_GDK|Win32">
-      <Configuration>Debug_GDK</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug|x64">
       <Configuration>Debug</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug_GDK|x64">
-      <Configuration>Debug_GDK</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|Win32">
       <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="Release_GDK|Win32">
-      <Configuration>Release_GDK</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|x64">
       <Configuration>Release</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="Release_GDK|x64">
-      <Configuration>Release_GDK</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{35B2A4AC-7235-4FC7-995D-469D59195041}</ProjectGuid>
@@ -43,128 +27,76 @@
     <ConfigurationType>Utility</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_GDK|Win32'" Label="Configuration">
-    <ConfigurationType>Utility</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Utility</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_GDK|Win32'" Label="Configuration">
-    <ConfigurationType>Utility</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Utility</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_GDK|x64'" Label="Configuration">
-    <ConfigurationType>Utility</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Utility</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_GDK|x64'" Label="Configuration">
-    <ConfigurationType>Utility</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="clutter.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_GDK|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="clutter.props" />
+    <Import Project="clutter-install.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="clutter.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug_GDK|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="clutter.props" />
+    <Import Project="clutter-install.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="clutter.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_GDK|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="clutter.props" />
+    <Import Project="clutter-install.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="clutter.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug_GDK|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="clutter.props" />
+    <Import Project="clutter-install.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GlibEtcInstallRoot)\</OutDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug_GDK|Win32'">$(GlibEtcInstallRoot)\</OutDir>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GlibEtcInstallRoot)\</OutDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug_GDK|x64'">$(GlibEtcInstallRoot)\</OutDir>
     <ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='Debug_GDK|x64'" />
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GlibEtcInstallRoot)\</OutDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release_GDK|Win32'">$(GlibEtcInstallRoot)\</OutDir>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GlibEtcInstallRoot)\</OutDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release_GDK|x64'">$(GlibEtcInstallRoot)\</OutDir>
     <ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-    <ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='Release_GDK|x64'" />
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <PostBuildEvent>
-      <Command>$(ClutterDoInstallDebugBin) $(ClutterDoInstall)</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_GDK|Win32'">
-    <PostBuildEvent>
-      <Command>$(ClutterDoInstallDebugBin) $(ClutterDoInstall) $(ClutterDoInstallGDK)</Command>
-    </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <PreBuildEvent>
-      <Command>$(ClutterDoInstallDebugBin) $(ClutterDoInstall)</Command>
-    </PreBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_GDK|x64'">
-    <PreBuildEvent>
-      <Command>$(ClutterDoInstallDebugBin) $(ClutterDoInstall) $(ClutterDoInstallGDK)</Command>
-    </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <PostBuildEvent>
-      <Command>$(ClutterDoInstallReleaseBin) $(ClutterDoInstall)</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_GDK|Win32'">
-    <PostBuildEvent>
-      <Command>$(ClutterDoInstallReleaseBin) $(ClutterDoInstall) $(ClutterDoInstallGDK)</Command>
-    </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <PreBuildEvent>
-      <Command>$(ClutterDoInstallReleaseBin) $(ClutterDoInstall)</Command>
-    </PreBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_GDK|x64'">
-    <PreBuildEvent>
-      <Command>$(ClutterDoInstallReleaseBin) $(ClutterDoInstall) $(ClutterDoInstallGDK)</Command>
-    </PreBuildEvent>
   </ItemDefinitionGroup>
+  <ItemGroup>
+    <CustomBuild Include="..\..\..\config.h.win32">
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Installing Build Results...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ClutterDoInstall)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(InstalledDlls);$(InstalledBins);%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Installing Build Results...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ClutterDoInstall)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(InstalledDlls);$(InstalledBins);%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Installing Build Results...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ClutterDoInstall)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(InstalledDlls);$(InstalledBins);%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Installing Build Results...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ClutterDoInstall)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(InstalledDlls);$(InstalledBins);%(Outputs)</Outputs>
+    </CustomBuild>
+  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="cally-atkcomponent-example.vcxproj">
       <Project>{4b2c0ee0-f1bd-499c-acad-260cf14c352e}</Project>
@@ -194,10 +126,6 @@
       <Project>{0da94d83-b64e-40ac-8074-96c2416bbbe8}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
-    <ProjectReference Include="test-conformance-clutter.vcxproj">
-      <Project>{0f08f253-de1a-40cb-a890-93ae3ca23ade}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
     <ProjectReference Include="test-interactive-clutter.vcxproj">
       <Project>{75f9e5af-040c-448e-96be-c282efffe2d9}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
@@ -250,4 +178,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/build/win32/vs10/test-cogl-perf.vcxproj b/build/win32/vs10/test-cogl-perf.vcxproj
index 17d55c491..0017cf88a 100644
--- a/build/win32/vs10/test-cogl-perf.vcxproj
+++ b/build/win32/vs10/test-cogl-perf.vcxproj
@@ -28,38 +28,42 @@
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="clutter.props" />
+    <Import Project="clutter-build-defines.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="clutter.props" />
+    <Import Project="clutter-build-defines.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="clutter.props" />
+    <Import Project="clutter-build-defines.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="clutter.props" />
+    <Import Project="clutter-build-defines.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
@@ -71,7 +75,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_DEBUG;$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);$(AvoidSDLMain)%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -89,7 +93,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_DEBUG;$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);$(AvoidSDLMain)%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -113,7 +117,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);$(AvoidSDLMain)%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <PrecompiledHeader>
@@ -131,7 +135,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
-      <PreprocessorDefinitions>$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);$(AvoidSDLMain)%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <PrecompiledHeader>
       </PrecompiledHeader>
@@ -163,4 +167,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/build/win32/vs10/test-cogl-perf.vcxproj.filters b/build/win32/vs10/test-cogl-perf.vcxproj.filters
index c351e2255..e4a80eee3 100644
--- a/build/win32/vs10/test-cogl-perf.vcxproj.filters
+++ b/build/win32/vs10/test-cogl-perf.vcxproj.filters
@@ -11,4 +11,4 @@
       <Filter>Sources</Filter>
     </ClCompile>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/build/win32/vs10/test-conformance-clutter.vcxproj.filtersin b/build/win32/vs10/test-conformance-clutter.vcxproj.filtersin
deleted file mode 100644
index 8028da3d1..000000000
--- a/build/win32/vs10/test-conformance-clutter.vcxproj.filtersin
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Sources">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-#include "testconformance.vs10.sourcefiles.filters"
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/build/win32/vs10/test-conformance-clutter.vcxprojin b/build/win32/vs10/test-conformance-clutter.vcxprojin
deleted file mode 100644
index be31e13ea..000000000
--- a/build/win32/vs10/test-conformance-clutter.vcxprojin
+++ /dev/null
@@ -1,168 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{0F08F253-DE1A-40CB-A890-93AE3CA23ADE}</ProjectGuid>
-    <RootNamespace>testconformanceclutter</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="clutter.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="clutter.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="clutter.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="clutter.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_DEBUG;COGL_ENABLE_EXPERIMENTAL_API;$(TestProgDef);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>pango-1.0.lib;cairo.lib;atk-1.0.lib;OpenGL32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_DEBUG;COGL_ENABLE_EXPERIMENTAL_API;$(TestProgDef);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAs>CompileAsC</CompileAs>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>pango-1.0.lib;cairo.lib;atk-1.0.lib;OpenGL32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>COGL_ENABLE_EXPERIMENTAL_API;$(TestProgDef);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>pango-1.0.lib;cairo.lib;atk-1.0.lib;OpenGL32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <PreprocessorDefinitions>COGL_ENABLE_EXPERIMENTAL_API;$(TestProgDef);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAs>CompileAsC</CompileAs>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>pango-1.0.lib;cairo.lib;atk-1.0.lib;OpenGL32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-#include "testconformance.vs10.sourcefiles"
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="clutter.vcxproj">
-      <Project>{ea036190-0950-4640-84f9-d459a33b33a8}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/build/win32/vs10/test-interactive-clutter.vcxproj.filtersin b/build/win32/vs10/test-interactive-clutter.vcxproj.filtersin
index a5f15fa43..926c30eb7 100644
--- a/build/win32/vs10/test-interactive-clutter.vcxproj.filtersin
+++ b/build/win32/vs10/test-interactive-clutter.vcxproj.filtersin
@@ -9,4 +9,4 @@
   <ItemGroup>
 #include "testinteractive.vs10.sourcefiles.filters"
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/build/win32/vs10/test-interactive-clutter.vcxprojin b/build/win32/vs10/test-interactive-clutter.vcxprojin
index cab15264b..2511fafdb 100644
--- a/build/win32/vs10/test-interactive-clutter.vcxprojin
+++ b/build/win32/vs10/test-interactive-clutter.vcxprojin
@@ -28,38 +28,42 @@
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="clutter.props" />
+    <Import Project="clutter-build-defines.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="clutter.props" />
+    <Import Project="clutter-build-defines.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="clutter.props" />
+    <Import Project="clutter-build-defines.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="clutter.props" />
+    <Import Project="clutter-build-defines.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
@@ -169,4 +173,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/build/win32/vs10/test-picking-performance.vcxproj b/build/win32/vs10/test-picking-performance.vcxproj
index 3ca2c1000..e179adeea 100644
--- a/build/win32/vs10/test-picking-performance.vcxproj
+++ b/build/win32/vs10/test-picking-performance.vcxproj
@@ -1,169 +1,173 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{2035D56A-E748-475F-B3D5-C123BF652143}</ProjectGuid>
-    <RootNamespace>testpickingperformance</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="clutter.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="clutter.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="clutter.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="clutter.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_DEBUG;$(TestPerfProgDef);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_DEBUG;$(TestPerfProgDef);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAs>CompileAsC</CompileAs>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>$(TestPerfProgDef);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <PreprocessorDefinitions>$(TestPerfProgDef);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAs>CompileAsC</CompileAs>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\tests\performance\test-picking.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\..\tests\performance\test-common.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="clutter.vcxproj">
-      <Project>{ea036190-0950-4640-84f9-d459a33b33a8}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{2035D56A-E748-475F-B3D5-C123BF652143}</ProjectGuid>
+    <RootNamespace>testpickingperformance</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v100</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v100</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v100</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v100</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="clutter-build-defines.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="clutter-build-defines.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="clutter-build-defines.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="clutter-build-defines.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>_DEBUG;$(TestPerfProgDef);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>_DEBUG;$(TestPerfProgDef);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>CompileAsC</CompileAs>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <TargetMachine>MachineX64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>$(TestPerfProgDef);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <PreprocessorDefinitions>$(TestPerfProgDef);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>CompileAsC</CompileAs>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <TargetMachine>MachineX64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\tests\performance\test-picking.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\tests\performance\test-common.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="clutter.vcxproj">
+      <Project>{ea036190-0950-4640-84f9-d459a33b33a8}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
diff --git a/build/win32/vs10/test-picking-performance.vcxproj.filters b/build/win32/vs10/test-picking-performance.vcxproj.filters
index f90e6956f..8ffda0997 100644
--- a/build/win32/vs10/test-picking-performance.vcxproj.filters
+++ b/build/win32/vs10/test-picking-performance.vcxproj.filters
@@ -1,23 +1,23 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Sources">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Headers">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\tests\performance\test-picking.c">
-      <Filter>Sources</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\..\tests\performance\test-common.h">
-      <Filter>Headers</Filter>
-    </ClInclude>
-  </ItemGroup>
-</Project>
\ No newline at end of file
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Sources">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Headers">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\tests\performance\test-picking.c">
+      <Filter>Sources</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\tests\performance\test-common.h">
+      <Filter>Headers</Filter>
+    </ClInclude>
+  </ItemGroup>
+</Project>
diff --git a/build/win32/vs10/test-picking.vcxproj b/build/win32/vs10/test-picking.vcxproj
index 940cbc287..f33e9f50b 100644
--- a/build/win32/vs10/test-picking.vcxproj
+++ b/build/win32/vs10/test-picking.vcxproj
@@ -28,38 +28,42 @@
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="clutter.props" />
+    <Import Project="clutter-build-defines.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="clutter.props" />
+    <Import Project="clutter-build-defines.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="clutter.props" />
+    <Import Project="clutter-build-defines.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="clutter.props" />
+    <Import Project="clutter-build-defines.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
@@ -71,7 +75,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_DEBUG;$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);$(AvoidSDLMain)%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -90,7 +94,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_DEBUG;$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);$(AvoidSDLMain)%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -114,7 +118,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);$(AvoidSDLMain)%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <PrecompiledHeader>
@@ -132,7 +136,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
-      <PreprocessorDefinitions>$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);$(AvoidSDLMain)%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <PrecompiledHeader>
       </PrecompiledHeader>
@@ -164,4 +168,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/build/win32/vs10/test-picking.vcxproj.filters b/build/win32/vs10/test-picking.vcxproj.filters
index 43d775421..27fac1be5 100644
--- a/build/win32/vs10/test-picking.vcxproj.filters
+++ b/build/win32/vs10/test-picking.vcxproj.filters
@@ -11,4 +11,4 @@
       <Filter>Sources</Filter>
     </ClCompile>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/build/win32/vs10/test-random-text.vcxproj b/build/win32/vs10/test-random-text.vcxproj
index 0386ab3dc..50d58256f 100644
--- a/build/win32/vs10/test-random-text.vcxproj
+++ b/build/win32/vs10/test-random-text.vcxproj
@@ -28,38 +28,42 @@
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="clutter.props" />
+    <Import Project="clutter-build-defines.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="clutter.props" />
+    <Import Project="clutter-build-defines.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="clutter.props" />
+    <Import Project="clutter-build-defines.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="clutter.props" />
+    <Import Project="clutter-build-defines.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
@@ -71,7 +75,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_DEBUG;$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);$(AvoidSDLMain)%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -89,7 +93,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_DEBUG;$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);$(AvoidSDLMain)%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -113,7 +117,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);$(AvoidSDLMain)%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <PrecompiledHeader>
@@ -131,7 +135,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
-      <PreprocessorDefinitions>$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);$(AvoidSDLMain)%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <PrecompiledHeader>
       </PrecompiledHeader>
@@ -163,4 +167,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/build/win32/vs10/test-random-text.vcxproj.filters b/build/win32/vs10/test-random-text.vcxproj.filters
index 22be023a1..9cfb50c71 100644
--- a/build/win32/vs10/test-random-text.vcxproj.filters
+++ b/build/win32/vs10/test-random-text.vcxproj.filters
@@ -11,4 +11,4 @@
       <Filter>Sources</Filter>
     </ClCompile>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/build/win32/vs10/test-state-hidden-performance.vcxproj b/build/win32/vs10/test-state-hidden-performance.vcxproj
index 15f68716d..daf9cc54c 100644
--- a/build/win32/vs10/test-state-hidden-performance.vcxproj
+++ b/build/win32/vs10/test-state-hidden-performance.vcxproj
@@ -1,169 +1,173 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{2D60135E-2E37-4F54-A1C5-43BCD5BBBA4F}</ProjectGuid>
-    <RootNamespace>teststatehiddenperformance</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="clutter.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="clutter.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="clutter.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="clutter.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_DEBUG;$(TestPerfProgDef);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_DEBUG;$(TestPerfProgDef);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAs>CompileAsC</CompileAs>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>$(TestPerfProgDef);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <PreprocessorDefinitions>$(TestPerfProgDef);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAs>CompileAsC</CompileAs>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\tests\performance\test-state-hidden.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\..\tests\performance\test-common.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="clutter.vcxproj">
-      <Project>{ea036190-0950-4640-84f9-d459a33b33a8}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{2D60135E-2E37-4F54-A1C5-43BCD5BBBA4F}</ProjectGuid>
+    <RootNamespace>teststatehiddenperformance</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v100</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v100</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v100</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v100</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="clutter-build-defines.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="clutter-build-defines.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="clutter-build-defines.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="clutter-build-defines.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>_DEBUG;$(TestPerfProgDef);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>_DEBUG;$(TestPerfProgDef);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>CompileAsC</CompileAs>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <TargetMachine>MachineX64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>$(TestPerfProgDef);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <PreprocessorDefinitions>$(TestPerfProgDef);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>CompileAsC</CompileAs>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <TargetMachine>MachineX64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\tests\performance\test-state-hidden.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\tests\performance\test-common.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="clutter.vcxproj">
+      <Project>{ea036190-0950-4640-84f9-d459a33b33a8}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
diff --git a/build/win32/vs10/test-state-hidden-performance.vcxproj.filters b/build/win32/vs10/test-state-hidden-performance.vcxproj.filters
index c0ceb02c7..91e778e77 100644
--- a/build/win32/vs10/test-state-hidden-performance.vcxproj.filters
+++ b/build/win32/vs10/test-state-hidden-performance.vcxproj.filters
@@ -1,23 +1,23 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Sources">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Headers">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\tests\performance\test-state-hidden.c">
-      <Filter>Sources</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\..\tests\performance\test-common.h">
-      <Filter>Headers</Filter>
-    </ClInclude>
-  </ItemGroup>
-</Project>
\ No newline at end of file
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Sources">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Headers">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\tests\performance\test-state-hidden.c">
+      <Filter>Sources</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\tests\performance\test-common.h">
+      <Filter>Headers</Filter>
+    </ClInclude>
+  </ItemGroup>
+</Project>
diff --git a/build/win32/vs10/test-state-interactive-performance.vcxproj b/build/win32/vs10/test-state-interactive-performance.vcxproj
index a431a1f4a..fd3fe7d10 100644
--- a/build/win32/vs10/test-state-interactive-performance.vcxproj
+++ b/build/win32/vs10/test-state-interactive-performance.vcxproj
@@ -1,169 +1,173 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{011F9197-F986-44BD-A8F2-045C746B1B70}</ProjectGuid>
-    <RootNamespace>teststateinteractiveperformance</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="clutter.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="clutter.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="clutter.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="clutter.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_DEBUG;$(TestPerfProgDef);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_DEBUG;$(TestPerfProgDef);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAs>CompileAsC</CompileAs>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>$(TestPerfProgDef);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <PreprocessorDefinitions>$(TestPerfProgDef);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAs>CompileAsC</CompileAs>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\tests\performance\test-state-interactive.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\..\tests\performance\test-common.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="clutter.vcxproj">
-      <Project>{ea036190-0950-4640-84f9-d459a33b33a8}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{011F9197-F986-44BD-A8F2-045C746B1B70}</ProjectGuid>
+    <RootNamespace>teststateinteractiveperformance</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v100</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v100</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v100</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v100</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="clutter-build-defines.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="clutter-build-defines.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="clutter-build-defines.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="clutter-build-defines.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>_DEBUG;$(TestPerfProgDef);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>_DEBUG;$(TestPerfProgDef);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>CompileAsC</CompileAs>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <TargetMachine>MachineX64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>$(TestPerfProgDef);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <PreprocessorDefinitions>$(TestPerfProgDef);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>CompileAsC</CompileAs>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <TargetMachine>MachineX64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\tests\performance\test-state-interactive.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\tests\performance\test-common.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="clutter.vcxproj">
+      <Project>{ea036190-0950-4640-84f9-d459a33b33a8}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
diff --git a/build/win32/vs10/test-state-interactive-performance.vcxproj.filters b/build/win32/vs10/test-state-interactive-performance.vcxproj.filters
index a72cd2688..ddb63cc3e 100644
--- a/build/win32/vs10/test-state-interactive-performance.vcxproj.filters
+++ b/build/win32/vs10/test-state-interactive-performance.vcxproj.filters
@@ -1,23 +1,23 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Sources">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Headers">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\tests\performance\test-state-interactive.c">
-      <Filter>Sources</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\..\tests\performance\test-common.h">
-      <Filter>Headers</Filter>
-    </ClInclude>
-  </ItemGroup>
-</Project>
\ No newline at end of file
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Sources">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Headers">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\tests\performance\test-state-interactive.c">
+      <Filter>Sources</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\tests\performance\test-common.h">
+      <Filter>Headers</Filter>
+    </ClInclude>
+  </ItemGroup>
+</Project>
diff --git a/build/win32/vs10/test-state-mini-performance.vcxproj b/build/win32/vs10/test-state-mini-performance.vcxproj
index ca45df1f3..ad910de5a 100644
--- a/build/win32/vs10/test-state-mini-performance.vcxproj
+++ b/build/win32/vs10/test-state-mini-performance.vcxproj
@@ -1,169 +1,173 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{D4A09850-E35B-4124-A9FF-784AB5BBCD2C}</ProjectGuid>
-    <RootNamespace>teststateminiperformance</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="clutter.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="clutter.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="clutter.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="clutter.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_DEBUG;$(TestPerfProgDef);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_DEBUG;$(TestPerfProgDef);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAs>CompileAsC</CompileAs>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>$(TestPerfProgDef);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <PreprocessorDefinitions>$(TestPerfProgDef);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAs>CompileAsC</CompileAs>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\tests\performance\test-state-mini.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\..\tests\performance\test-common.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="clutter.vcxproj">
-      <Project>{ea036190-0950-4640-84f9-d459a33b33a8}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{D4A09850-E35B-4124-A9FF-784AB5BBCD2C}</ProjectGuid>
+    <RootNamespace>teststateminiperformance</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v100</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v100</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v100</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v100</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="clutter-build-defines.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="clutter-build-defines.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="clutter-build-defines.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="clutter-build-defines.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>_DEBUG;$(TestPerfProgDef);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>_DEBUG;$(TestPerfProgDef);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>CompileAsC</CompileAs>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <TargetMachine>MachineX64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>$(TestPerfProgDef);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <PreprocessorDefinitions>$(TestPerfProgDef);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>CompileAsC</CompileAs>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <TargetMachine>MachineX64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\tests\performance\test-state-mini.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\tests\performance\test-common.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="clutter.vcxproj">
+      <Project>{ea036190-0950-4640-84f9-d459a33b33a8}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
diff --git a/build/win32/vs10/test-state-mini-performance.vcxproj.filters b/build/win32/vs10/test-state-mini-performance.vcxproj.filters
index e9339f2b6..fe9e2b735 100644
--- a/build/win32/vs10/test-state-mini-performance.vcxproj.filters
+++ b/build/win32/vs10/test-state-mini-performance.vcxproj.filters
@@ -1,23 +1,23 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Sources">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Headers">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\tests\performance\test-state-mini.c">
-      <Filter>Sources</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\..\tests\performance\test-common.h">
-      <Filter>Headers</Filter>
-    </ClInclude>
-  </ItemGroup>
-</Project>
\ No newline at end of file
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Sources">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Headers">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\tests\performance\test-state-mini.c">
+      <Filter>Sources</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\tests\performance\test-common.h">
+      <Filter>Headers</Filter>
+    </ClInclude>
+  </ItemGroup>
+</Project>
diff --git a/build/win32/vs10/test-state-performance.vcxproj b/build/win32/vs10/test-state-performance.vcxproj
index de7e08912..d54733fd0 100644
--- a/build/win32/vs10/test-state-performance.vcxproj
+++ b/build/win32/vs10/test-state-performance.vcxproj
@@ -1,169 +1,173 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{BEE86058-B4BF-4AA5-91BF-E3620538ED5E}</ProjectGuid>
-    <RootNamespace>teststateperformance</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="clutter.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="clutter.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="clutter.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="clutter.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_DEBUG;$(TestPerfProgDef);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_DEBUG;$(TestPerfProgDef);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAs>CompileAsC</CompileAs>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>$(TestPerfProgDef);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <PreprocessorDefinitions>$(TestPerfProgDef);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAs>CompileAsC</CompileAs>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\tests\performance\test-state.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\..\tests\performance\test-common.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="clutter.vcxproj">
-      <Project>{ea036190-0950-4640-84f9-d459a33b33a8}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{BEE86058-B4BF-4AA5-91BF-E3620538ED5E}</ProjectGuid>
+    <RootNamespace>teststateperformance</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v100</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v100</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v100</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v100</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="clutter-build-defines.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="clutter-build-defines.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="clutter-build-defines.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="clutter-build-defines.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>_DEBUG;$(TestPerfProgDef);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>_DEBUG;$(TestPerfProgDef);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>CompileAsC</CompileAs>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <TargetMachine>MachineX64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>$(TestPerfProgDef);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <PreprocessorDefinitions>$(TestPerfProgDef);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>CompileAsC</CompileAs>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <TargetMachine>MachineX64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\tests\performance\test-state.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\tests\performance\test-common.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="clutter.vcxproj">
+      <Project>{ea036190-0950-4640-84f9-d459a33b33a8}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
diff --git a/build/win32/vs10/test-state-performance.vcxproj.filters b/build/win32/vs10/test-state-performance.vcxproj.filters
index 932d24e12..c94c7dc6d 100644
--- a/build/win32/vs10/test-state-performance.vcxproj.filters
+++ b/build/win32/vs10/test-state-performance.vcxproj.filters
@@ -1,23 +1,23 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Sources">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Headers">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\tests\performance\test-state.c">
-      <Filter>Sources</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\..\tests\performance\test-common.h">
-      <Filter>Headers</Filter>
-    </ClInclude>
-  </ItemGroup>
-</Project>
\ No newline at end of file
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Sources">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Headers">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\tests\performance\test-state.c">
+      <Filter>Sources</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\tests\performance\test-common.h">
+      <Filter>Headers</Filter>
+    </ClInclude>
+  </ItemGroup>
+</Project>
diff --git a/build/win32/vs10/test-state-pick-performance.vcxproj b/build/win32/vs10/test-state-pick-performance.vcxproj
index f375446f9..5ac7c375e 100644
--- a/build/win32/vs10/test-state-pick-performance.vcxproj
+++ b/build/win32/vs10/test-state-pick-performance.vcxproj
@@ -1,169 +1,173 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{0C1E8E6C-1563-4F95-A994-6366EE992CB3}</ProjectGuid>
-    <RootNamespace>teststatepickperformance</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="clutter.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="clutter.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="clutter.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="clutter.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_DEBUG;$(TestPerfProgDef);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_DEBUG;$(TestPerfProgDef);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAs>CompileAsC</CompileAs>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>$(TestPerfProgDef);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <PreprocessorDefinitions>$(TestPerfProgDef);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAs>CompileAsC</CompileAs>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\tests\performance\test-state-pick.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\..\tests\performance\test-common.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="clutter.vcxproj">
-      <Project>{ea036190-0950-4640-84f9-d459a33b33a8}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{0C1E8E6C-1563-4F95-A994-6366EE992CB3}</ProjectGuid>
+    <RootNamespace>teststatepickperformance</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v100</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v100</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v100</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v100</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="clutter-build-defines.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="clutter-build-defines.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="clutter-build-defines.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="clutter-build-defines.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>_DEBUG;$(TestPerfProgDef);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>_DEBUG;$(TestPerfProgDef);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>CompileAsC</CompileAs>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <TargetMachine>MachineX64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>$(TestPerfProgDef);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <PreprocessorDefinitions>$(TestPerfProgDef);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>CompileAsC</CompileAs>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <TargetMachine>MachineX64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\tests\performance\test-state-pick.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\tests\performance\test-common.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="clutter.vcxproj">
+      <Project>{ea036190-0950-4640-84f9-d459a33b33a8}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
diff --git a/build/win32/vs10/test-state-pick-performance.vcxproj.filters b/build/win32/vs10/test-state-pick-performance.vcxproj.filters
index ea7b375ce..138e63f65 100644
--- a/build/win32/vs10/test-state-pick-performance.vcxproj.filters
+++ b/build/win32/vs10/test-state-pick-performance.vcxproj.filters
@@ -1,23 +1,23 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Sources">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Headers">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\tests\performance\test-state-pick.c">
-      <Filter>Sources</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\..\tests\performance\test-common.h">
-      <Filter>Headers</Filter>
-    </ClInclude>
-  </ItemGroup>
-</Project>
\ No newline at end of file
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Sources">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Headers">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\tests\performance\test-state-pick.c">
+      <Filter>Sources</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\tests\performance\test-common.h">
+      <Filter>Headers</Filter>
+    </ClInclude>
+  </ItemGroup>
+</Project>
diff --git a/build/win32/vs10/test-text-perf-performance.vcxproj b/build/win32/vs10/test-text-perf-performance.vcxproj
index f0ee2a89a..a18d544eb 100644
--- a/build/win32/vs10/test-text-perf-performance.vcxproj
+++ b/build/win32/vs10/test-text-perf-performance.vcxproj
@@ -1,169 +1,173 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{8AF1EA8E-305B-42C0-919D-12B1843B21A4}</ProjectGuid>
-    <RootNamespace>testtextperfperformance</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="clutter.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="clutter.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="clutter.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="clutter.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_DEBUG;$(TestPerfProgDef);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_DEBUG;$(TestPerfProgDef);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAs>CompileAsC</CompileAs>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>$(TestPerfProgDef);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <PreprocessorDefinitions>$(TestPerfProgDef);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAs>CompileAsC</CompileAs>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\tests\performance\test-text-perf.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\..\tests\performance\test-common.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="clutter.vcxproj">
-      <Project>{ea036190-0950-4640-84f9-d459a33b33a8}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{8AF1EA8E-305B-42C0-919D-12B1843B21A4}</ProjectGuid>
+    <RootNamespace>testtextperfperformance</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v100</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v100</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v100</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v100</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="clutter-build-defines.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="clutter-build-defines.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="clutter-build-defines.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="clutter-build-defines.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>_DEBUG;$(TestPerfProgDef);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>_DEBUG;$(TestPerfProgDef);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>CompileAsC</CompileAs>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <TargetMachine>MachineX64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>$(TestPerfProgDef);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <PreprocessorDefinitions>$(TestPerfProgDef);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>CompileAsC</CompileAs>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <TargetMachine>MachineX64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\tests\performance\test-text-perf.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\tests\performance\test-common.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="clutter.vcxproj">
+      <Project>{ea036190-0950-4640-84f9-d459a33b33a8}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
diff --git a/build/win32/vs10/test-text-perf-performance.vcxproj.filters b/build/win32/vs10/test-text-perf-performance.vcxproj.filters
index 31cce6d30..940822ea1 100644
--- a/build/win32/vs10/test-text-perf-performance.vcxproj.filters
+++ b/build/win32/vs10/test-text-perf-performance.vcxproj.filters
@@ -1,23 +1,23 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Sources">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Headers">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\tests\performance\test-text-perf.c">
-      <Filter>Sources</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\..\tests\performance\test-common.h">
-      <Filter>Headers</Filter>
-    </ClInclude>
-  </ItemGroup>
-</Project>
\ No newline at end of file
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Sources">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Headers">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\tests\performance\test-text-perf.c">
+      <Filter>Sources</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\tests\performance\test-common.h">
+      <Filter>Headers</Filter>
+    </ClInclude>
+  </ItemGroup>
+</Project>
diff --git a/build/win32/vs10/test-text-perf.vcxproj b/build/win32/vs10/test-text-perf.vcxproj
index c82d9f796..24160a747 100644
--- a/build/win32/vs10/test-text-perf.vcxproj
+++ b/build/win32/vs10/test-text-perf.vcxproj
@@ -28,38 +28,42 @@
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="clutter.props" />
+    <Import Project="clutter-build-defines.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="clutter.props" />
+    <Import Project="clutter-build-defines.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="clutter.props" />
+    <Import Project="clutter-build-defines.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="clutter.props" />
+    <Import Project="clutter-build-defines.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
@@ -71,7 +75,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_DEBUG;$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);$(AvoidSDLMain)%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -89,7 +93,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_DEBUG;$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);$(AvoidSDLMain)%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -113,7 +117,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);$(AvoidSDLMain)%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <PrecompiledHeader>
@@ -131,7 +135,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
-      <PreprocessorDefinitions>$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);$(AvoidSDLMain)%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <PrecompiledHeader>
       </PrecompiledHeader>
@@ -163,4 +167,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/build/win32/vs10/test-text-perf.vcxproj.filters b/build/win32/vs10/test-text-perf.vcxproj.filters
index c8b96c7a8..d153208e4 100644
--- a/build/win32/vs10/test-text-perf.vcxproj.filters
+++ b/build/win32/vs10/test-text-perf.vcxproj.filters
@@ -11,4 +11,4 @@
       <Filter>Sources</Filter>
     </ClCompile>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/build/win32/vs10/test-text.vcxproj b/build/win32/vs10/test-text.vcxproj
index 4b975f596..3fad71277 100644
--- a/build/win32/vs10/test-text.vcxproj
+++ b/build/win32/vs10/test-text.vcxproj
@@ -28,38 +28,42 @@
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="clutter.props" />
+    <Import Project="clutter-build-defines.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="clutter.props" />
+    <Import Project="clutter-build-defines.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="clutter.props" />
+    <Import Project="clutter-build-defines.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="clutter.props" />
+    <Import Project="clutter-build-defines.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
@@ -71,7 +75,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_DEBUG;$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);$(AvoidSDLMain)%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -89,7 +93,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_DEBUG;$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);$(AvoidSDLMain)%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -113,7 +117,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);$(AvoidSDLMain)%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <PrecompiledHeader>
@@ -131,7 +135,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
-      <PreprocessorDefinitions>$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);$(AvoidSDLMain)%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <PrecompiledHeader>
       </PrecompiledHeader>
@@ -163,4 +167,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/build/win32/vs10/test-text.vcxproj.filters b/build/win32/vs10/test-text.vcxproj.filters
index dba7a2684..e37673fdf 100644
--- a/build/win32/vs10/test-text.vcxproj.filters
+++ b/build/win32/vs10/test-text.vcxproj.filters
@@ -11,4 +11,4 @@
       <Filter>Sources</Filter>
     </ClCompile>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/build/win32/vs9/Makefile.am b/build/win32/vs9/Makefile.am
index b11bf625b..b78f076c6 100644
--- a/build/win32/vs9/Makefile.am
+++ b/build/win32/vs9/Makefile.am
@@ -7,11 +7,12 @@ EXTRA_DIST = \
 	clutter.sln			\
 	clutter.vcproj		\
 	clutter.vcprojin	\
-	clutter.vsprops		\
+	clutter-build-defines.vsprops	\
+	clutter-gen-srcs.vsprops	\
+	clutter-install.vsprops	\
+	clutter-version-paths.vsprops	\
 	install.vcproj	\
 	test-cogl-perf.vcproj		\
-	test-conformance-clutter.vcproj		\
-	test-conformance-clutter.vcprojin	\
 	test-interactive-clutter.vcproj		\
 	test-interactive-clutter.vcprojin	\
 	test-picking.vcproj		\
diff --git a/build/win32/vs9/cally-atkcomponent-example.vcproj b/build/win32/vs9/cally-atkcomponent-example.vcproj
index 6eccb4b08..0e170cb48 100644
--- a/build/win32/vs9/cally-atkcomponent-example.vcproj
+++ b/build/win32/vs9/cally-atkcomponent-example.vcproj
@@ -21,7 +21,7 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			InheritedPropertySheets=".\clutter.vsprops"
+			InheritedPropertySheets=".\clutter-build-defines.vsprops"
 			ConfigurationType="1"
 			CharacterSet="2"
 			>
@@ -51,7 +51,7 @@
 		<Configuration
 			Name="Debug|x64"
 			ConfigurationType="1"
-			InheritedPropertySheets=".\clutter.vsprops"
+			InheritedPropertySheets=".\clutter-build-defines.vsprops"
 			CharacterSet="2"
 			>
 			<Tool
@@ -82,7 +82,7 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			InheritedPropertySheets=".\clutter.vsprops"
+			InheritedPropertySheets=".\clutter-build-defines.vsprops"
 			ConfigurationType="1"
 			CharacterSet="2"
 			WholeProgramOptimization="1"
@@ -115,7 +115,7 @@
 		<Configuration
 			Name="Release|x64"
 			ConfigurationType="1"
-			InheritedPropertySheets=".\clutter.vsprops"
+			InheritedPropertySheets=".\clutter-build-defines.vsprops"
 			CharacterSet="2"
 			WholeProgramOptimization="1"
 			>
diff --git a/build/win32/vs9/cally-atkeditabletext-example.vcproj b/build/win32/vs9/cally-atkeditabletext-example.vcproj
index 1aa1a9c2c..a151ce203 100644
--- a/build/win32/vs9/cally-atkeditabletext-example.vcproj
+++ b/build/win32/vs9/cally-atkeditabletext-example.vcproj
@@ -21,7 +21,7 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			InheritedPropertySheets=".\clutter.vsprops"
+			InheritedPropertySheets=".\clutter-build-defines.vsprops"
 			ConfigurationType="1"
 			CharacterSet="2"
 			>
@@ -51,7 +51,7 @@
 		<Configuration
 			Name="Debug|x64"
 			ConfigurationType="1"
-			InheritedPropertySheets=".\clutter.vsprops"
+			InheritedPropertySheets=".\clutter-build-defines.vsprops"
 			CharacterSet="2"
 			>
 			<Tool
@@ -82,7 +82,7 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			InheritedPropertySheets=".\clutter.vsprops"
+			InheritedPropertySheets=".\clutter-build-defines.vsprops"
 			ConfigurationType="1"
 			CharacterSet="2"
 			WholeProgramOptimization="1"
@@ -115,7 +115,7 @@
 		<Configuration
 			Name="Release|x64"
 			ConfigurationType="1"
-			InheritedPropertySheets=".\clutter.vsprops"
+			InheritedPropertySheets=".\clutter-build-defines.vsprops"
 			CharacterSet="2"
 			WholeProgramOptimization="1"
 			>
diff --git a/build/win32/vs9/cally-atkevents-example.vcproj b/build/win32/vs9/cally-atkevents-example.vcproj
index 2ea075e04..e00954ef0 100644
--- a/build/win32/vs9/cally-atkevents-example.vcproj
+++ b/build/win32/vs9/cally-atkevents-example.vcproj
@@ -21,7 +21,7 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			InheritedPropertySheets=".\clutter.vsprops"
+			InheritedPropertySheets=".\clutter-build-defines.vsprops"
 			ConfigurationType="1"
 			CharacterSet="2"
 			>
@@ -52,7 +52,7 @@
 		<Configuration
 			Name="Debug|x64"
 			ConfigurationType="1"
-			InheritedPropertySheets=".\clutter.vsprops"
+			InheritedPropertySheets=".\clutter-build-defines.vsprops"
 			CharacterSet="2"
 			>
 			<Tool
@@ -84,7 +84,7 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			InheritedPropertySheets=".\clutter.vsprops"
+			InheritedPropertySheets=".\clutter-build-defines.vsprops"
 			ConfigurationType="1"
 			CharacterSet="2"
 			WholeProgramOptimization="1"
@@ -118,7 +118,7 @@
 		<Configuration
 			Name="Release|x64"
 			ConfigurationType="1"
-			InheritedPropertySheets=".\clutter.vsprops"
+			InheritedPropertySheets=".\clutter-build-defines.vsprops"
 			CharacterSet="2"
 			WholeProgramOptimization="1"
 			>
diff --git a/build/win32/vs9/cally-atktext-example.vcproj b/build/win32/vs9/cally-atktext-example.vcproj
index 0e656d0d7..d4d4bae4d 100644
--- a/build/win32/vs9/cally-atktext-example.vcproj
+++ b/build/win32/vs9/cally-atktext-example.vcproj
@@ -21,7 +21,7 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			InheritedPropertySheets=".\clutter.vsprops"
+			InheritedPropertySheets=".\clutter-build-defines.vsprops"
 			ConfigurationType="1"
 			CharacterSet="2"
 			>
@@ -51,7 +51,7 @@
 		<Configuration
 			Name="Debug|x64"
 			ConfigurationType="1"
-			InheritedPropertySheets=".\clutter.vsprops"
+			InheritedPropertySheets=".\clutter-build-defines.vsprops"
 			CharacterSet="2"
 			>
 			<Tool
@@ -82,7 +82,7 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			InheritedPropertySheets=".\clutter.vsprops"
+			InheritedPropertySheets=".\clutter-build-defines.vsprops"
 			ConfigurationType="1"
 			CharacterSet="2"
 			WholeProgramOptimization="1"
@@ -115,7 +115,7 @@
 		<Configuration
 			Name="Release|x64"
 			ConfigurationType="1"
-			InheritedPropertySheets=".\clutter.vsprops"
+			InheritedPropertySheets=".\clutter-build-defines.vsprops"
 			CharacterSet="2"
 			WholeProgramOptimization="1"
 			>
diff --git a/build/win32/vs9/cally-clone-example.vcproj b/build/win32/vs9/cally-clone-example.vcproj
index 11dfc367e..ef0f12ace 100644
--- a/build/win32/vs9/cally-clone-example.vcproj
+++ b/build/win32/vs9/cally-clone-example.vcproj
@@ -21,7 +21,7 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			InheritedPropertySheets=".\clutter.vsprops"
+			InheritedPropertySheets=".\clutter-build-defines.vsprops"
 			ConfigurationType="1"
 			CharacterSet="2"
 			>
@@ -51,7 +51,7 @@
 		<Configuration
 			Name="Debug|x64"
 			ConfigurationType="1"
-			InheritedPropertySheets=".\clutter.vsprops"
+			InheritedPropertySheets=".\clutter-build-defines.vsprops"
 			CharacterSet="2"
 			>
 			<Tool
@@ -82,7 +82,7 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			InheritedPropertySheets=".\clutter.vsprops"
+			InheritedPropertySheets=".\clutter-build-defines.vsprops"
 			ConfigurationType="1"
 			CharacterSet="2"
 			WholeProgramOptimization="1"
@@ -115,7 +115,7 @@
 		<Configuration
 			Name="Release|x64"
 			ConfigurationType="1"
-			InheritedPropertySheets=".\clutter.vsprops"
+			InheritedPropertySheets=".\clutter-build-defines.vsprops"
 			CharacterSet="2"
 			WholeProgramOptimization="1"
 			>
diff --git a/build/win32/vs9/clutter-build-defines.vsprops b/build/win32/vs9/clutter-build-defines.vsprops
new file mode 100644
index 000000000..829161bc8
--- /dev/null
+++ b/build/win32/vs9/clutter-build-defines.vsprops
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioPropertySheet
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="clutterbuilddefinesprops"
+	OutputDirectory="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin"
+	IntermediateDirectory="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\obj\$(ProjectName)"
+	InheritedPropertySheets=".\clutter-version-paths.vsprops"
+	>
+	<Tool
+		Name="VCCLCompilerTool"
+		AdditionalIncludeDirectories="..\..\..;..\..\..\clutter;$(GlibEtcInstallRoot)\include\cogl-1.0;$(GlibEtcInstallRoot)\include\pango-1.0;$(GlibEtcInstallRoot)\include\atk-1.0;$(GlibEtcInstallRoot)\include\json-glib-1.0;$(GlibEtcInstallRoot)\include;$(GlibEtcInstallRoot)\include\glib-2.0;$(GlibEtcInstallRoot)\lib\glib-2.0\include;$(GlibEtcInstallRoot)\include\cairo;$(GlibEtcInstallRoot)\include"
+		PreprocessorDefinitions="G_DISABLE_SINGLE_INCLUDES"
+		ForcedIncludeFiles="msvc_recommended_pragmas.h"
+	/>
+	<Tool
+		Name="VCLinkerTool"
+		AdditionalDependencies="cogl-pango-1.0.lib cogl-path-1.0.lib cogl-1.0.lib glib-2.0.lib gobject-2.0.lib"
+		AdditionalLibraryDirectories="$(GlibEtcInstallRoot)\lib"
+	/>
+	<UserMacro
+		Name="BaseWinBuildDef"
+		Value="_WIN32_WINNT=0x0501"
+	/>
+	<UserMacro
+		Name="ClutterBuildDefines"
+		Value="$(BaseWinBuildDef);G_LOG_DOMAIN=\&quot;Clutter\&quot;;CLUTTER_LOCALEDIR=\&quot;../share/locale\&quot;;CLUTTER_SYSCONFDIR=\&quot;../etc\&quot;;COGL_DISABLE_DEPRECATION_WARNINGS"
+	/>
+	<UserMacro
+		Name="ClutterDisableDeprecationWarnings"
+		Value="CLUTTER_DISABLE_DEPRECATION_WARNINGS;GLIB_DISABLE_DEPRECATION_WARNINGS"
+	/>
+	<UserMacro
+		Name="AvoidSDLMain"
+		Value="SDL_MAIN_HANDLED"
+	/>
+	<UserMacro
+		Name="CallyTestDefs"
+		Value="$(BaseWinBuildDef);PREFIXDIR=\&quot;/some/dummy/dir\&quot;;$(ClutterDisableDeprecationWarnings);$(AvoidSDLMain)"
+	/>
+	<UserMacro
+		Name="TestProgDef"
+		Value="$(BaseWinBuildDef);TESTS_DATADIR=\&quot;../share/clutter-$(ApiVersion)/data\&quot;;TESTS_DATA_DIR=\&quot;../share/clutter-$(ApiVersion)/data\&quot;;$(AvoidSDLMain)"
+	/>
+	<UserMacro
+		Name="TestPerfProgDef"
+		Value="$(TestProgDef);$(ClutterDisableDeprecationWarnings)"
+	/>
+	<UserMacro
+		Name="LibBuildDefines"
+		Value="HAVE_CONFIG_H;CLUTTER_COMPILATION;COGL_ENABLE_EXPERIMENTAL_API;DLL_EXPORT"
+	/>
+	<UserMacro
+		Name="DebugLibBuildDefines"
+		Value="$(LibBuildDefines);_DEBUG;CLUTTER_ENABLE_DEBUG"
+	/>
+	<UserMacro
+		Name="ReleaseLibBuildDefines"
+		Value="$(LibBuildDefines);G_DISABLE_ASSERT;G_DISABLE_CHECKS;G_DISABLE_CAST_CHECKS"
+	/>
+</VisualStudioPropertySheet>
diff --git a/build/win32/vs9/clutter-gen-srcs.vsprops b/build/win32/vs9/clutter-gen-srcs.vsprops
new file mode 100644
index 000000000..e9a7e757b
--- /dev/null
+++ b/build/win32/vs9/clutter-gen-srcs.vsprops
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioPropertySheet
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="cluttergensrcsprops"
+	InheritedPropertySheets=".\clutter-build-defines.vsprops"
+	>
+	<UserMacro
+		Name="CopyConfigH"
+		Value="copy ..\..\..\clutter\config.h.win32 ..\..\..\clutter\config.h"
+	/>
+	<UserMacro
+		Name="CopyClutterConfigH"
+		Value="
+if exist ..\..\..\clutter\clutter.bld.win32.win32 goto DONE_CLUTTER_CONFIG_H&#x0D;&#x0A;
+if exist clutter.bld.GDK.win32 del clutter.bld.GDK.win32&#x0D;&#x0A;
+copy ..\..\..\clutter\clutter-config.h.win32 clutter.bld.win32.win32&#x0D;&#x0A;
+copy ..\..\..\clutter\clutter-config.h.win32 ..\..\..\clutter\clutter-config.h&#x0D;&#x0A;
+
+:DONE_CLUTTER_CONFIG_H&#x0D;&#x0A;
+		      "
+	/>
+	<UserMacro
+		Name="CopyClutterConfigGDKH"
+		Value="
+if exist ..\..\..\clutter\clutter.bld.GDK.win32 goto DONE_CLUTTER_CONFIG_H&#x0D;&#x0A;
+if exist clutter.bld.win32.win32 del clutter.bld.win32.win32&#x0D;&#x0A;
+copy ..\..\..\clutter\clutter-config.h.win32_GDK clutter.bld.GDK.win32&#x0D;&#x0A;
+copy ..\..\..\clutter\clutter-config.h.win32_GDK ..\..\..\clutter\clutter-config.h&#x0D;&#x0A;
+
+:DONE_CLUTTER_CONFIG_H&#x0D;&#x0A;
+			  "
+	/>
+	<UserMacro
+		Name="GenMarshalSrc"
+		Value="
+$(GlibEtcInstallRoot)\bin\glib-genmarshal --prefix=_clutter_marshal --header ..\..\..\clutter\clutter-marshal.list &gt; ..\..\..\clutter\clutter-marshal.h&#x0D;&#x0A;
+
+echo #include &quot;clutter-marshal.h&quot; &gt; ..\..\..\clutter\clutter-marshal.c&#x0D;&#x0A;
+$(GlibEtcInstallRoot)\bin\glib-genmarshal --prefix=_clutter_marshal --body ..\..\..\clutter\clutter-marshal.list &gt;&gt; ..\..\..\clutter\clutter-marshal.c&#x0D;&#x0A;
+		       "
+	/>
+	<UserMacro
+		Name="EnumHeaders"
+		Value="..\..\..\clutter\clutter-action.h ..\..\..\clutter\clutter-actor-meta.h ..\..\..\clutter\clutter-actor.h ..\..\..\clutter\clutter-align-constraint.h ..\..\..\clutter\clutter-animatable.h ..\..\..\clutter\clutter-backend.h ..\..\..\clutter\clutter-bind-constraint.h ..\..\..\clutter\clutter-binding-pool.h ..\..\..\clutter\clutter-bin-layout.h ..\..\..\clutter\clutter-blur-effect.h ..\..\..\clutter\clutter-box-layout.h ..\..\..\clutter\clutter-brightness-contrast-effect.h ..\..\..\clutter\clutter-cairo.h ..\..\..\clutter\clutter-canvas.h ..\..\..\clutter\clutter-child-meta.h ..\..\..\clutter\clutter-click-action.h ..\..\..\clutter\clutter-cogl-compat.h ..\..\..\clutter\clutter-clone.h ..\..\..\clutter\clutter-color-static.h ..\..\..\clutter\clutter-color.h ..\..\..\clutter\clutter-colorize-effect.h ..\..\..\clutter\clutter-constraint.h ..\..\..\clutter\clutter-container.h ..\..\..\clutter\clutter-content.h ..\..\..\clutter\clutter-deform-effect.h ..\..\..\clutter\clutter-deprecated.h ..\..\..\clutter\clutter-desaturate-effect.h ..\..\..\clutter\clutter-device-manager.h ..\..\..\clutter\clutter-drag-action.h ..\..\..\clutter\clutter-drop-action.h ..\..\..\clutter\clutter-effect.h ..\..\..\clutter\clutter-enums.h ..\..\..\clutter\clutter-event.h ..\..\..\clutter\clutter-feature.h ..\..\..\clutter\clutter-fixed-layout.h ..\..\..\clutter\clutter-flow-layout.h ..\..\..\clutter\clutter-gesture-action.h ..\..\..\clutter\clutter-grid-layout.h ..\..\..\clutter\clutter-group.h ..\..\..\clutter\clutter-image.h ..\..\..\clutter\clutter-input-device.h ..\..\..\clutter\clutter-interval.h ..\..\..\clutter\clutter-keyframe-transition.h ..\..\..\clutter\clutter-keysyms.h ..\..\..\clutter\clutter-layout-manager.h ..\..\..\clutter\clutter-layout-meta.h ..\..\..\clutter\clutter-list-model.h ..\..\..\clutter\clutter-macros.h ..\..\..\clutter\clutter-main.h ..\..\..\clutter\clutter-model.h ..\..\..\clutter\clutter-offscreen-effect.h ..\..\..\clutter\clutter-page-turn-effect.h ..\..\..\clutter\clutter-paint-nodes.h ..\..\..\clutter\clutter-paint-node.h ..\..\..\clutter\clutter-pan-action.h ..\..\..\clutter\clutter-path-constraint.h ..\..\..\clutter\clutter-path.h ..\..\..\clutter\clutter-property-transition.h ..\..\..\clutter\clutter-rotate-action.h ..\..\..\clutter\clutter-script.h ..\..\..\clutter\clutter-scriptable.h ..\..\..\clutter\clutter-scroll-actor.h ..\..\..\clutter\clutter-settings.h ..\..\..\clutter\clutter-shader-effect.h ..\..\..\clutter\clutter-shader-types.h ..\..\..\clutter\clutter-swipe-action.h ..\..\..\clutter\clutter-snap-constraint.h ..\..\..\clutter\clutter-stage.h ..\..\..\clutter\clutter-stage-manager.h ..\..\..\clutter\clutter-tap-action.h ..\..\..\clutter\clutter-test-utils.h ..\..\..\clutter\clutter-texture.h ..\..\..\clutter\clutter-text.h ..\..\..\clutter\clutter-text-buffer.h ..\..\..\clutter\clutter-timeline.h ..\..\..\clutter\clutter-transition-group.h ..\..\..\clutter\clutter-transition.h ..\..\..\clutter\clutter-types.h ..\..\..\clutter\clutter-units.h ..\..\..\clutter\clutter-zoom-action.h ..\..\..\clutter\win32\clutter-win32.h"
+	/>
+	<UserMacro
+		Name="GdkEnumHeader"
+		Value="..\..\..\clutter\gdk\clutter-gdk.h"
+	/>
+	<UserMacro
+		Name="GenEnumsSrcH"
+		Value="perl $(GlibEtcInstallRoot)\bin\glib-mkenums --template ..\..\..\clutter\clutter-enum-types.h.in $(EnumHeaders) &gt; ..\..\..\clutter\clutter-enum-types.h"
+	/>
+	<UserMacro
+		Name="GenEnumsSrcC"
+		Value="perl $(GlibEtcInstallRoot)\bin\glib-mkenums --template ..\..\..\clutter\clutter-enum-types.c.in $(EnumHeaders) &gt; ..\..\..\clutter\clutter-enum-types.c"
+	/>
+	<UserMacro
+		Name="GenEnumsSrcGDKH"
+		Value="perl $(GlibEtcInstallRoot)\bin\glib-mkenums --template ..\..\..\clutter\clutter-enum-types.h.in $(EnumHeaders) $(GdkEnumHeader) &gt; ..\..\..\clutter\clutter-enum-types.h"
+	/>
+	<UserMacro
+		Name="GenEnumsSrcGDKC"
+		Value="perl $(GlibEtcInstallRoot)\bin\glib-mkenums --template ..\..\..\clutter\clutter-enum-types.c.in $(EnumHeaders) $(GdkEnumHeader) &gt; ..\..\..\clutter\clutter-enum-types.c"
+	/>
+</VisualStudioPropertySheet>
diff --git a/build/win32/vs9/clutter-install.vsprops b/build/win32/vs9/clutter-install.vsprops
new file mode 100644
index 000000000..e1362d11d
--- /dev/null
+++ b/build/win32/vs9/clutter-install.vsprops
@@ -0,0 +1,182 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioPropertySheet
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="clutterinstallprops"
+	InheritedPropertySheets=".\clutter-build-defines.vsprops"
+	>
+	<UserMacro
+		Name="ClutterDoInstall"
+		Value="
+mkdir $(CopyDir)&#x0D;&#x0A;
+mkdir $(CopyDir)\bin&#x0D;&#x0A;
+mkdir $(CopyDir)\share\clutter-$(ApiVersion)\data&#x0D;&#x0A;
+copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\*.dll $(CopyDir)\bin&#x0D;&#x0A;
+
+copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\*.exe $(CopyDir)\bin&#x0D;&#x0A;
+copy ..\..\..\tests\interactive\*.png $(CopyDir)\share\clutter-$(ApiVersion)\data&#x0D;&#x0A;
+copy ..\..\..\tests\clutter-1.0.suppressions $(CopyDir)\share\clutter-$(ApiVersion)\data&#x0D;&#x0A;
+copy ..\..\..\tests\interactive\*.json $(CopyDir)\share\clutter-$(ApiVersion)\data&#x0D;&#x0A;
+
+mkdir $(CopyDir)\lib&#x0D;&#x0A;
+copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\*-$(ApiVersion).lib $(CopyDir)\lib&#x0D;&#x0A;
+
+if &quot;$(ConfigurationName)&quot; == &quot;Release&quot; goto DO_INSTALL_COMMON_HEADERS&#x0D;&#x0A;
+if &quot;$(ConfigurationName)&quot; == &quot;Debug&quot; goto DO_INSTALL_COMMON_HEADERS&#x0D;&#x0A;
+
+$(ClutterDoInstallGDK)
+
+:DO_INSTALL_COMMON_HEADERS&#x0D;&#x0A;
+
+mkdir $(CopyDir)\include\clutter-$(ApiVersion)\clutter\win32&#x0D;&#x0A;
+
+copy ..\..\..\clutter\clutter.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter&#x0D;&#x0A;
+copy ..\..\..\clutter\clutter-action.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter&#x0D;&#x0A;
+copy ..\..\..\clutter\clutter-actor-meta.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter&#x0D;&#x0A;
+copy ..\..\..\clutter\clutter-actor.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter&#x0D;&#x0A;
+copy ..\..\..\clutter\clutter-align-constraint.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter&#x0D;&#x0A;
+copy ..\..\..\clutter\clutter-animatable.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter&#x0D;&#x0A;
+copy ..\..\..\clutter\clutter-backend.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter&#x0D;&#x0A;
+copy ..\..\..\clutter\clutter-bind-constraint.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter&#x0D;&#x0A;
+copy ..\..\..\clutter\clutter-binding-pool.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter&#x0D;&#x0A;
+copy ..\..\..\clutter\clutter-bin-layout.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter&#x0D;&#x0A;
+copy ..\..\..\clutter\clutter-blur-effect.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter&#x0D;&#x0A;
+copy ..\..\..\clutter\clutter-box-layout.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter&#x0D;&#x0A;
+copy ..\..\..\clutter\clutter-brightness-contrast-effect.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter&#x0D;&#x0A;
+copy ..\..\..\clutter\clutter-cairo.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter&#x0D;&#x0A;
+copy ..\..\..\clutter\clutter-canvas.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter&#x0D;&#x0A;
+copy ..\..\..\clutter\clutter-child-meta.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter&#x0D;&#x0A;
+copy ..\..\..\clutter\clutter-click-action.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter&#x0D;&#x0A;
+copy ..\..\..\clutter\clutter-clone.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter&#x0D;&#x0A;
+copy ..\..\..\clutter\clutter-cogl-compat.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter&#x0D;&#x0A;
+copy ..\..\..\clutter\clutter-color-static.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter&#x0D;&#x0A;
+copy ..\..\..\clutter\clutter-color.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter&#x0D;&#x0A;
+copy ..\..\..\clutter\clutter-colorize-effect.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter&#x0D;&#x0A;
+copy ..\..\..\clutter\clutter-config.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter&#x0D;&#x0A;
+copy ..\..\..\clutter\clutter-constraint.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter&#x0D;&#x0A;
+copy ..\..\..\clutter\clutter-content.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter&#x0D;&#x0A;
+copy ..\..\..\clutter\clutter-container.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter&#x0D;&#x0A;
+copy ..\..\..\clutter\clutter-deform-effect.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter&#x0D;&#x0A;
+copy ..\..\..\clutter\clutter-deprecated.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter&#x0D;&#x0A;
+copy ..\..\..\clutter\clutter-desaturate-effect.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter&#x0D;&#x0A;
+copy ..\..\..\clutter\clutter-device-manager.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter&#x0D;&#x0A;
+copy ..\..\..\clutter\clutter-drag-action.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter&#x0D;&#x0A;
+copy ..\..\..\clutter\clutter-drop-action.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter&#x0D;&#x0A;
+copy ..\..\..\clutter\clutter-effect.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter&#x0D;&#x0A;
+copy ..\..\..\clutter\clutter-enums.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter&#x0D;&#x0A;
+copy ..\..\..\clutter\clutter-enum-types.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter&#x0D;&#x0A;
+copy ..\..\..\clutter\clutter-event.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter&#x0D;&#x0A;
+copy ..\..\..\clutter\clutter-feature.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter&#x0D;&#x0A;
+copy ..\..\..\clutter\clutter-fixed-layout.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter&#x0D;&#x0A;
+copy ..\..\..\clutter\clutter-flow-layout.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter&#x0D;&#x0A;
+copy ..\..\..\clutter\clutter-gesture-action.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter&#x0D;&#x0A;
+copy ..\..\..\clutter\clutter-grid-layout.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter&#x0D;&#x0A;
+copy ..\..\..\clutter\clutter-group.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter&#x0D;&#x0A;
+copy ..\..\..\clutter\clutter-image.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter&#x0D;&#x0A;
+copy ..\..\..\clutter\clutter-input-device.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter&#x0D;&#x0A;
+copy ..\..\..\clutter\clutter-interval.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter&#x0D;&#x0A;
+copy ..\..\..\clutter\clutter-layout-manager.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter&#x0D;&#x0A;
+copy ..\..\..\clutter\clutter-layout-meta.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter&#x0D;&#x0A;
+copy ..\..\..\clutter\clutter-list-model.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter&#x0D;&#x0A;
+copy ..\..\..\clutter\clutter-keyframe-transition.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter&#x0D;&#x0A;
+copy ..\..\..\clutter\clutter-keysyms.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter&#x0D;&#x0A;
+copy ..\..\..\clutter\clutter-macros.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter&#x0D;&#x0A;
+copy ..\..\..\clutter\clutter-main.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter&#x0D;&#x0A;
+copy ..\..\..\clutter\clutter-marshal.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter&#x0D;&#x0A;
+copy ..\..\..\clutter\clutter-model.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter&#x0D;&#x0A;
+copy ..\..\..\clutter\clutter-offscreen-effect.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter&#x0D;&#x0A;
+copy ..\..\..\clutter\clutter-page-turn-effect.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter&#x0D;&#x0A;
+copy ..\..\..\clutter\clutter-paint-node.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter&#x0D;&#x0A;
+copy ..\..\..\clutter\clutter-paint-nodes.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter&#x0D;&#x0A;
+copy ..\..\..\clutter\clutter-pan-action.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter&#x0D;&#x0A;
+copy ..\..\..\clutter\clutter-path-constraint.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter&#x0D;&#x0A;
+copy ..\..\..\clutter\clutter-path.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter&#x0D;&#x0A;
+copy ..\..\..\clutter\clutter-property-transition.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter&#x0D;&#x0A;
+copy ..\..\..\clutter\clutter-rotate-action.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter&#x0D;&#x0A;
+copy ..\..\..\clutter\clutter-script.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter&#x0D;&#x0A;
+copy ..\..\..\clutter\clutter-scriptable.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter&#x0D;&#x0A;
+copy ..\..\..\clutter\clutter-scroll-actor.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter&#x0D;&#x0A;
+copy ..\..\..\clutter\clutter-settings.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter&#x0D;&#x0A;
+copy ..\..\..\clutter\clutter-shader-effect.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter&#x0D;&#x0A;
+copy ..\..\..\clutter\clutter-shader-types.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter&#x0D;&#x0A;
+copy ..\..\..\clutter\clutter-snap-constraint.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter&#x0D;&#x0A;
+copy ..\..\..\clutter\clutter-stage.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter&#x0D;&#x0A;
+copy ..\..\..\clutter\clutter-stage-manager.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter&#x0D;&#x0A;
+copy ..\..\..\clutter\clutter-stage-window.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter&#x0D;&#x0A;
+copy ..\..\..\clutter\clutter-swipe-action.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter&#x0D;&#x0A;
+copy ..\..\..\clutter\clutter-tap-action.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter&#x0D;&#x0A;
+copy ..\..\..\clutter\clutter-test-utils.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter&#x0D;&#x0A;
+copy ..\..\..\clutter\clutter-texture.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter&#x0D;&#x0A;
+copy ..\..\..\clutter\clutter-text.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter&#x0D;&#x0A;
+copy ..\..\..\clutter\clutter-text-buffer.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter&#x0D;&#x0A;
+copy ..\..\..\clutter\clutter-timeline.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter&#x0D;&#x0A;
+copy ..\..\..\clutter\clutter-transition.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter&#x0D;&#x0A;
+copy ..\..\..\clutter\clutter-transition-group.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter&#x0D;&#x0A;
+copy ..\..\..\clutter\clutter-types.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter&#x0D;&#x0A;
+copy ..\..\..\clutter\clutter-units.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter&#x0D;&#x0A;
+copy ..\..\..\clutter\clutter-version.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter&#x0D;&#x0A;
+copy ..\..\..\clutter\clutter-zoom-action.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter&#x0D;&#x0A;
+copy ..\..\..\clutter\win32\clutter-win32.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter\win32&#x0D;&#x0A;
+
+mkdir $(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated&#x0D;&#x0A;
+copy ..\..\..\clutter\deprecated\clutter-actor.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated&#x0D;&#x0A;
+copy ..\..\..\clutter\deprecated\clutter-alpha.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated&#x0D;&#x0A;
+copy ..\..\..\clutter\deprecated\clutter-animatable.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated&#x0D;&#x0A;
+copy ..\..\..\clutter\deprecated\clutter-animation.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated&#x0D;&#x0A;
+copy ..\..\..\clutter\deprecated\clutter-animator.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated&#x0D;&#x0A;
+copy ..\..\..\clutter\deprecated\clutter-backend.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated&#x0D;&#x0A;
+copy ..\..\..\clutter\deprecated\clutter-behaviour.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated&#x0D;&#x0A;
+copy ..\..\..\clutter\deprecated\clutter-behaviour-depth.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated&#x0D;&#x0A;
+copy ..\..\..\clutter\deprecated\clutter-behaviour-ellipse.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated&#x0D;&#x0A;
+copy ..\..\..\clutter\deprecated\clutter-behaviour-opacity.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated&#x0D;&#x0A;
+copy ..\..\..\clutter\deprecated\clutter-behaviour-path.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated&#x0D;&#x0A;
+copy ..\..\..\clutter\deprecated\clutter-behaviour-rotate.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated&#x0D;&#x0A;
+copy ..\..\..\clutter\deprecated\clutter-behaviour-scale.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated&#x0D;&#x0A;
+copy ..\..\..\clutter\deprecated\clutter-bin-layout.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated&#x0D;&#x0A;
+copy ..\..\..\clutter\deprecated\clutter-box.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated&#x0D;&#x0A;
+copy ..\..\..\clutter\deprecated\clutter-cairo-texture.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated&#x0D;&#x0A;
+copy ..\..\..\clutter\deprecated\clutter-container.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated&#x0D;&#x0A;
+copy ..\..\..\clutter\deprecated\clutter-fixed.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated&#x0D;&#x0A;
+copy ..\..\..\clutter\deprecated\clutter-frame-source.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated&#x0D;&#x0A;
+copy ..\..\..\clutter\deprecated\clutter-group.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated&#x0D;&#x0A;
+copy ..\..\..\clutter\deprecated\clutter-input-device.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated&#x0D;&#x0A;
+copy ..\..\..\clutter\deprecated\clutter-keysyms.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated&#x0D;&#x0A;
+copy ..\..\..\clutter\deprecated\clutter-main.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated&#x0D;&#x0A;
+copy ..\..\..\clutter\deprecated\clutter-media.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated&#x0D;&#x0A;
+copy ..\..\..\clutter\deprecated\clutter-rectangle.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated&#x0D;&#x0A;
+copy ..\..\..\clutter\deprecated\clutter-score.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated&#x0D;&#x0A;
+copy ..\..\..\clutter\deprecated\clutter-shader.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated&#x0D;&#x0A;
+copy ..\..\..\clutter\deprecated\clutter-stage.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated&#x0D;&#x0A;
+copy ..\..\..\clutter\deprecated\clutter-stage-manager.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated&#x0D;&#x0A;
+copy ..\..\..\clutter\deprecated\clutter-state.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated&#x0D;&#x0A;
+copy ..\..\..\clutter\deprecated\clutter-table-layout.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated&#x0D;&#x0A;
+copy ..\..\..\clutter\deprecated\clutter-texture.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated&#x0D;&#x0A;
+copy ..\..\..\clutter\deprecated\clutter-timeline.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated&#x0D;&#x0A;
+copy ..\..\..\clutter\deprecated\clutter-timeout-pool.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated&#x0D;&#x0A;
+copy ..\..\..\clutter\deprecated\clutter-util.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated&#x0D;&#x0A;
+
+mkdir $(CopyDir)\include\clutter-$(ApiVersion)\cally&#x0D;&#x0A;
+copy ..\..\..\clutter\cally\cally-actor.h $(CopyDir)\include\clutter-$(ApiVersion)\cally&#x0D;&#x0A;
+copy ..\..\..\clutter\cally\cally-clone.h $(CopyDir)\include\clutter-$(ApiVersion)\cally&#x0D;&#x0A;
+copy ..\..\..\clutter\cally\cally-factory.h $(CopyDir)\include\clutter-$(ApiVersion)\cally&#x0D;&#x0A;
+copy ..\..\..\clutter\cally\cally-group.h $(CopyDir)\include\clutter-$(ApiVersion)\cally&#x0D;&#x0A;
+copy ..\..\..\clutter\cally\cally.h $(CopyDir)\include\clutter-$(ApiVersion)\cally&#x0D;&#x0A;
+copy ..\..\..\clutter\cally\cally-main.h $(CopyDir)\include\clutter-$(ApiVersion)\cally&#x0D;&#x0A;
+copy ..\..\..\clutter\cally\cally-rectangle.h $(CopyDir)\include\clutter-$(ApiVersion)\cally&#x0D;&#x0A;
+copy ..\..\..\clutter\cally\cally-root.h $(CopyDir)\include\clutter-$(ApiVersion)\cally&#x0D;&#x0A;
+copy ..\..\..\clutter\cally\cally-stage.h $(CopyDir)\include\clutter-$(ApiVersion)\cally&#x0D;&#x0A;
+copy ..\..\..\clutter\cally\cally-text.h $(CopyDir)\include\clutter-$(ApiVersion)\cally&#x0D;&#x0A;
+copy ..\..\..\clutter\cally\cally-texture.h $(CopyDir)\include\clutter-$(ApiVersion)\cally&#x0D;&#x0A;
+copy ..\..\..\clutter\cally\cally-util.h $(CopyDir)\include\clutter-$(ApiVersion)\cally&#x0D;&#x0A;
+
+"
+	/>
+	<UserMacro
+		Name="ClutterDoInstallGDK"
+		Value="
+mkdir $(CopyDir)\include\clutter-$(ApiVersion)\clutter\gdk&#x0D;&#x0A;
+
+copy ..\..\..\clutter\gdk\clutter-gdk.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter\gdk&#x0D;&#x0A;
+			  "
+	/>
+</VisualStudioPropertySheet>
diff --git a/build/win32/vs9/clutter-version-paths.vsprops b/build/win32/vs9/clutter-version-paths.vsprops
new file mode 100644
index 000000000..7b988195a
--- /dev/null
+++ b/build/win32/vs9/clutter-version-paths.vsprops
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioPropertySheet
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="clutterversionpathsprops"
+	>
+	<UserMacro
+		Name="VSVer"
+		Value="9"
+	/>
+	<UserMacro
+		Name="GlibEtcInstallRoot"
+		Value="$(SolutionDir)\..\..\..\..\vs$(VSVer)\$(PlatformName)"
+	/>
+	<UserMacro
+		Name="CopyDir"
+		Value="$(GlibEtcInstallRoot)"
+	/>
+	<UserMacro
+		Name="DefDir"
+		Value="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\obj\$(ProjectName)"
+	/>
+	<UserMacro
+		Name="ApiVersion"
+		Value="1.0"
+	/>
+	<UserMacro
+		Name="ClutterLibtoolCompatibleDllPrefix"
+		Value="lib"
+	/>
+	<UserMacro
+		Name="ClutterLibtoolCompatibleDllSuffix"
+		Value="-$(ApiVersion)-0"
+	/>
+	<UserMacro
+		Name="ClutterSeparateVSDllPrefix"
+		Value=""
+	/>
+	<UserMacro
+		Name="ClutterSeparateVSDllSuffix"
+		Value="-1-vs$(VSVer)"
+	/>
+	<!-- Change these two to ClutterLibtoolCompatibleDllPrefix and
+	ClutterLibtoolCompatibleDllSuffix if using LibTool-style DLL names
+	is desired -->
+	<UserMacro
+		Name="ClutterDllPrefix"
+		Value="$(ClutterSeparateVSDllPrefix)"
+	/>
+	<UserMacro
+		Name="ClutterDllSuffix"
+		Value="$(ClutterSeparateVSDllSuffix)"
+	/>
+</VisualStudioPropertySheet>
diff --git a/build/win32/vs9/clutter.sln b/build/win32/vs9/clutter.sln
index 3b527ba46..2610fd6bd 100644
--- a/build/win32/vs9/clutter.sln
+++ b/build/win32/vs9/clutter.sln
@@ -88,11 +88,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cally-clone-example", "call
 		{EA036190-0950-4640-84F9-D459A33B33A8} = {EA036190-0950-4640-84F9-D459A33B33A8}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-conformance-clutter", "test-conformance-clutter.vcproj", "{0F08F253-DE1A-40CB-A890-93AE3CA23ADE}"
-	ProjectSection(ProjectDependencies) = postProject
-		{EA036190-0950-4640-84F9-D459A33B33A8} = {EA036190-0950-4640-84F9-D459A33B33A8}
-	EndProjectSection
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-interactive-clutter", "test-interactive-clutter.vcproj", "{75F9E5AF-040C-448E-96BE-C282EFFFE2D9}"
 	ProjectSection(ProjectDependencies) = postProject
 		{EA036190-0950-4640-84F9-D459A33B33A8} = {EA036190-0950-4640-84F9-D459A33B33A8}
@@ -118,7 +113,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "install", "install.vcproj",
 		{E77D40D0-19D4-4865-BE20-B6DA05BA234D} = {E77D40D0-19D4-4865-BE20-B6DA05BA234D}
 		{4B2C0EE0-F1BD-499C-ACAD-260CF14C352E} = {4B2C0EE0-F1BD-499C-ACAD-260CF14C352E}
 		{C8EC4CE0-9C6A-4733-A0DD-477689FAF5F4} = {C8EC4CE0-9C6A-4733-A0DD-477689FAF5F4}
-		{0F08F253-DE1A-40CB-A890-93AE3CA23ADE} = {0F08F253-DE1A-40CB-A890-93AE3CA23ADE}
 		{75F9E5AF-040C-448E-96BE-C282EFFFE2D9} = {75F9E5AF-040C-448E-96BE-C282EFFFE2D9}
 	EndProjectSection
 EndProject
@@ -422,22 +416,6 @@ Global
 		{E77D40D0-19D4-4865-BE20-B6DA05BA234D}.Debug_GDK|x64.Build.0 = Debug|x64
 		{E77D40D0-19D4-4865-BE20-B6DA05BA234D}.Release_GDK|x64.ActiveCfg = Release|x64
 		{E77D40D0-19D4-4865-BE20-B6DA05BA234D}.Release_GDK|x64.Build.0 = Release|x64
-		{0F08F253-DE1A-40CB-A890-93AE3CA23ADE}.Debug|Win32.ActiveCfg = Debug|Win32
-		{0F08F253-DE1A-40CB-A890-93AE3CA23ADE}.Debug|Win32.Build.0 = Debug|Win32
-		{0F08F253-DE1A-40CB-A890-93AE3CA23ADE}.Release|Win32.ActiveCfg = Release|Win32
-		{0F08F253-DE1A-40CB-A890-93AE3CA23ADE}.Release|Win32.Build.0 = Release|Win32
-		{0F08F253-DE1A-40CB-A890-93AE3CA23ADE}.Debug|x64.ActiveCfg = Debug|x64
-		{0F08F253-DE1A-40CB-A890-93AE3CA23ADE}.Debug|x64.Build.0 = Debug|x64
-		{0F08F253-DE1A-40CB-A890-93AE3CA23ADE}.Release|x64.ActiveCfg = Release|x64
-		{0F08F253-DE1A-40CB-A890-93AE3CA23ADE}.Release|x64.Build.0 = Release|x64
-		{0F08F253-DE1A-40CB-A890-93AE3CA23ADE}.Debug_GDK|Win32.ActiveCfg = Debug|Win32
-		{0F08F253-DE1A-40CB-A890-93AE3CA23ADE}.Debug_GDK|Win32.Build.0 = Debug|Win32
-		{0F08F253-DE1A-40CB-A890-93AE3CA23ADE}.Release_GDK|Win32.ActiveCfg = Release|Win32
-		{0F08F253-DE1A-40CB-A890-93AE3CA23ADE}.Release_GDK|Win32.Build.0 = Release|Win32
-		{0F08F253-DE1A-40CB-A890-93AE3CA23ADE}.Debug_GDK|x64.ActiveCfg = Debug|x64
-		{0F08F253-DE1A-40CB-A890-93AE3CA23ADE}.Debug_GDK|x64.Build.0 = Debug|x64
-		{0F08F253-DE1A-40CB-A890-93AE3CA23ADE}.Release_GDK|x64.ActiveCfg = Release|x64
-		{0F08F253-DE1A-40CB-A890-93AE3CA23ADE}.Release_GDK|x64.Build.0 = Release|x64
 		{75F9E5AF-040C-448E-96BE-C282EFFFE2D9}.Debug|Win32.ActiveCfg = Debug|Win32
 		{75F9E5AF-040C-448E-96BE-C282EFFFE2D9}.Debug|Win32.Build.0 = Debug|Win32
 		{75F9E5AF-040C-448E-96BE-C282EFFFE2D9}.Release|Win32.ActiveCfg = Release|Win32
@@ -462,14 +440,14 @@ Global
 		{35B2A4AC-7235-4FC7-995D-469D59195041}.Debug|x64.Build.0 = Debug|x64
 		{35B2A4AC-7235-4FC7-995D-469D59195041}.Release|x64.ActiveCfg = Release|x64
 		{35B2A4AC-7235-4FC7-995D-469D59195041}.Release|x64.Build.0 = Release|x64
-		{35B2A4AC-7235-4FC7-995D-469D59195041}.Debug_GDK|Win32.ActiveCfg = Debug_GDK|Win32
-		{35B2A4AC-7235-4FC7-995D-469D59195041}.Debug_GDK|Win32.Build.0 = Debug_GDK|Win32
-		{35B2A4AC-7235-4FC7-995D-469D59195041}.Release_GDK|Win32.ActiveCfg = Release_GDK|Win32
-		{35B2A4AC-7235-4FC7-995D-469D59195041}.Release_GDK|Win32.Build.0 = Release_GDK|Win32
-		{35B2A4AC-7235-4FC7-995D-469D59195041}.Debug_GDK|x64.ActiveCfg = Debug_GDK|x64
-		{35B2A4AC-7235-4FC7-995D-469D59195041}.Debug_GDK|x64.Build.0 = Debug_GDK|x64
-		{35B2A4AC-7235-4FC7-995D-469D59195041}.Release_GDK|x64.ActiveCfg = Release_GDK|x64
-		{35B2A4AC-7235-4FC7-995D-469D59195041}.Release_GDK|x64.Build.0 = Release_GDK|x64
+		{35B2A4AC-7235-4FC7-995D-469D59195041}.Debug_GDK|Win32.ActiveCfg = Debug|Win32
+		{35B2A4AC-7235-4FC7-995D-469D59195041}.Debug_GDK|Win32.Build.0 = Debug|Win32
+		{35B2A4AC-7235-4FC7-995D-469D59195041}.Release_GDK|Win32.ActiveCfg = Release|Win32
+		{35B2A4AC-7235-4FC7-995D-469D59195041}.Release_GDK|Win32.Build.0 = Release|Win32
+		{35B2A4AC-7235-4FC7-995D-469D59195041}.Debug_GDK|x64.ActiveCfg = Debug|x64
+		{35B2A4AC-7235-4FC7-995D-469D59195041}.Debug_GDK|x64.Build.0 = Debug|x64
+		{35B2A4AC-7235-4FC7-995D-469D59195041}.Release_GDK|x64.ActiveCfg = Release|x64
+		{35B2A4AC-7235-4FC7-995D-469D59195041}.Release_GDK|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/build/win32/vs9/clutter.vcprojin b/build/win32/vs9/clutter.vcprojin
index 6366a57fc..5c23a3bae 100644
--- a/build/win32/vs9/clutter.vcprojin
+++ b/build/win32/vs9/clutter.vcprojin
@@ -21,18 +21,18 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			InheritedPropertySheets=".\clutter.vsprops"
+			InheritedPropertySheets=".\clutter-gen-srcs.vsprops"
 			ConfigurationType="2"
 			CharacterSet="2"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="$(PreBuildWin)$(PreBuildCmd2)"
+				CommandLine=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\clutter;..\..\..\clutter\win32;..\..\..\clutter\deprecated;..\..\..\clutter\cally"
+				AdditionalIncludeDirectories="..\..\..\clutter;..\..\..\clutter\cally;$(SolutionDir)"
 				PreprocessorDefinitions="$(DebugLibBuildDefines);$(ClutterBuildDefines)"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -41,17 +41,12 @@
 				WarningLevel="3"
 				DebugInformationFormat="4"
 			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-				CommandLine="$(GenerateClutterDef)"
-			/>
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="opengl32.lib winmm.lib intl.lib json-glib-1.0.lib pangocairo-1.0.lib pango-1.0.lib cairo-gobject.lib cairo.lib atk-1.0.lib gmodule-2.0.lib gio-2.0.lib"
 				OutputFile="$(OutDir)\$(ClutterDllPrefix)$(ProjectName)$(ClutterDllSuffix).dll"
 				LinkIncremental="2"
-				ModuleDefinitionFile="$(IntDir)\clutter.def"
-				ImportLibrary="$(TargetDir)$(ProjectName)-$(ClutterApiVersion).lib"
+				ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				TargetMachine="1"
@@ -59,19 +54,19 @@
 		</Configuration>
 		<Configuration
 			Name="Debug_GDK|Win32"
-			InheritedPropertySheets=".\clutter.vsprops"
+			InheritedPropertySheets=".\clutter-gen-srcs.vsprops"
 			OutputDirectory="$(SolutionDir)\Debug\$(PlatformName)\bin"
 			ConfigurationType="2"
 			CharacterSet="2"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="$(PreBuildGDK)$(PreBuildCmd2)"
+				CommandLine=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\clutter;..\..\..\clutter\win32;..\..\..\clutter\deprecated;..\..\..\clutter\cally;$(GlibEtcInstallRoot)\include\gtk-3.0;$(GlibEtcInstallRoot)\include\gdk-pixbuf-2.0"
+				AdditionalIncludeDirectories="..\..\..\clutter;..\..\..\clutter\cally;$(GlibEtcInstallRoot)\include\gtk-3.0;$(GlibEtcInstallRoot)\include\gdk-pixbuf-2.0;$(SolutionDir)"
 				PreprocessorDefinitions="$(DebugLibBuildDefines);$(ClutterBuildDefines)"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -80,17 +75,12 @@
 				WarningLevel="3"
 				DebugInformationFormat="4"
 			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-				CommandLine="$(GenerateClutterGDKDef)"
-			/>
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="opengl32.lib winmm.lib intl.lib json-glib-1.0.lib gdk-3.0.lib pangocairo-1.0.lib pango-1.0.lib cairo-gobject.lib cairo.lib atk-1.0.lib gmodule-2.0.lib gio-2.0.lib"
 				OutputFile="$(OutDir)\$(ClutterDllPrefix)$(ProjectName)$(ClutterDllSuffix).dll"
 				LinkIncremental="2"
-				ModuleDefinitionFile="$(IntDir)\clutter.def"
-				ImportLibrary="$(TargetDir)$(ProjectName)-$(ClutterApiVersion).lib"
+				ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				TargetMachine="1"
@@ -98,18 +88,18 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			InheritedPropertySheets=".\clutter.vsprops"
+			InheritedPropertySheets=".\clutter-gen-srcs.vsprops"
 			ConfigurationType="2"
 			CharacterSet="2"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="$(PreBuildWin)$(PreBuildCmd2)"
+				CommandLine=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\clutter;..\..\..\clutter\win32;..\..\..\clutter\deprecated;..\..\..\clutter\cally"
+				AdditionalIncludeDirectories="..\..\..\clutter;..\..\..\clutter\cally;$(SolutionDir)"
 				PreprocessorDefinitions="$(DebugLibBuildDefines);$(ClutterBuildDefines)"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -118,17 +108,12 @@
 				WarningLevel="3"
 				DebugInformationFormat="3"
 			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-				CommandLine="$(GenerateClutterDef)"
-			/>
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="opengl32.lib winmm.lib intl.lib json-glib-1.0.lib pangocairo-1.0.lib pango-1.0.lib cairo-gobject.lib cairo.lib atk-1.0.lib gmodule-2.0.lib gio-2.0.lib"
 				OutputFile="$(OutDir)\$(ClutterDllPrefix)$(ProjectName)$(ClutterDllSuffix).dll"
 				LinkIncremental="2"
-				ModuleDefinitionFile="$(IntDir)\clutter.def"
-				ImportLibrary="$(TargetDir)$(ProjectName)-$(ClutterApiVersion).lib"
+				ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				TargetMachine="17"
@@ -136,19 +121,19 @@
 		</Configuration>
 		<Configuration
 			Name="Debug_GDK|x64"
-			InheritedPropertySheets=".\clutter.vsprops"
+			InheritedPropertySheets=".\clutter-gen-srcs.vsprops"
 			OutputDirectory="$(SolutionDir)\Debug\$(PlatformName)\bin"
 			ConfigurationType="2"
 			CharacterSet="2"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="$(PreBuildGDK)$(PreBuildCmd2)"
+				CommandLine=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\clutter;..\..\..\clutter\win32;..\..\..\clutter\deprecated;..\..\..\clutter\cally;$(GlibEtcInstallRoot)\include\gtk-3.0;$(GlibEtcInstallRoot)\include\gdk-pixbuf-2.0"
+				AdditionalIncludeDirectories="..\..\..\clutter;..\..\..\clutter\cally;$(GlibEtcInstallRoot)\include\gtk-3.0;$(GlibEtcInstallRoot)\include\gdk-pixbuf-2.0;$(SolutionDir)"
 				PreprocessorDefinitions="$(DebugLibBuildDefines);$(ClutterBuildDefines)"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -157,17 +142,12 @@
 				WarningLevel="3"
 				DebugInformationFormat="3"
 			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-				CommandLine="$(GenerateClutterGDKDef)"
-			/>
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="opengl32.lib winmm.lib intl.lib json-glib-1.0.lib gdk-3.0.lib pangocairo-1.0.lib pango-1.0.lib cairo-gobject.lib cairo.lib atk-1.0.lib gmodule-2.0.lib gio-2.0.lib"
 				OutputFile="$(OutDir)\$(ClutterDllPrefix)$(ProjectName)$(ClutterDllSuffix).dll"
 				LinkIncremental="2"
-				ModuleDefinitionFile="$(IntDir)\clutter.def"
-				ImportLibrary="$(TargetDir)$(ProjectName)-$(ClutterApiVersion).lib"
+				ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				TargetMachine="17"
@@ -175,20 +155,20 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			InheritedPropertySheets=".\clutter.vsprops"
+			InheritedPropertySheets=".\clutter-gen-srcs.vsprops"
 			ConfigurationType="2"
 			CharacterSet="2"
 			WholeProgramOptimization="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="$(PreBuildWin)$(PreBuildCmd2)"
+				CommandLine=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..\..\..\clutter;..\..\..\clutter\win32;..\..\..\clutter\deprecated;..\..\..\clutter\cally"
+				AdditionalIncludeDirectories="..\..\..\clutter;..\..\..\clutter\cally;$(SolutionDir)"
 				PreprocessorDefinitions="$(ReleaseLibBuildDefines);$(ClutterBuildDefines)"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
@@ -196,17 +176,12 @@
 				WarningLevel="3"
 				DebugInformationFormat="3"
 			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-				CommandLine="$(GenerateClutterDef)"
-			/>
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="opengl32.lib winmm.lib intl.lib json-glib-1.0.lib pangocairo-1.0.lib pango-1.0.lib cairo-gobject.lib cairo.lib atk-1.0.lib gmodule-2.0.lib gio-2.0.lib"
 				OutputFile="$(OutDir)\$(ClutterDllPrefix)$(ProjectName)$(ClutterDllSuffix).dll"
 				LinkIncremental="1"
-				ModuleDefinitionFile="$(IntDir)\clutter.def"
-				ImportLibrary="$(TargetDir)$(ProjectName)-$(ClutterApiVersion).lib"
+				ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				OptimizeReferences="2"
@@ -216,7 +191,7 @@
 		</Configuration>
 		<Configuration
 			Name="Release_GDK|Win32"
-			InheritedPropertySheets=".\clutter.vsprops"
+			InheritedPropertySheets=".\clutter-gen-srcs.vsprops"
 			OutputDirectory="$(SolutionDir)\Release\$(PlatformName)\bin"
 			ConfigurationType="2"
 			CharacterSet="2"
@@ -224,13 +199,13 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="$(PreBuildGDK)$(PreBuildCmd2)"
+				CommandLine=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..\..\..\clutter;..\..\..\clutter\win32;..\..\..\clutter\deprecated;..\..\..\clutter\cally;$(GlibEtcInstallRoot)\include\gtk-3.0;$(GlibEtcInstallRoot)\include\gdk-pixbuf-2.0"
+				AdditionalIncludeDirectories="..\..\..\clutter;..\..\..\clutter\cally;$(GlibEtcInstallRoot)\include\gtk-3.0;$(GlibEtcInstallRoot)\include\gdk-pixbuf-2.0;$(SolutionDir)"
 				PreprocessorDefinitions="$(ReleaseLibBuildDefines);$(ClutterBuildDefines)"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
@@ -238,17 +213,12 @@
 				WarningLevel="3"
 				DebugInformationFormat="3"
 			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-				CommandLine="$(GenerateClutterGDKDef)"
-			/>
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="opengl32.lib winmm.lib intl.lib json-glib-1.0.lib gdk-3.0.lib pangocairo-1.0.lib pango-1.0.lib cairo-gobject.lib cairo.lib atk-1.0.lib gmodule-2.0.lib gio-2.0.lib"
 				OutputFile="$(OutDir)\$(ClutterDllPrefix)$(ProjectName)$(ClutterDllSuffix).dll"
 				LinkIncremental="1"
-				ModuleDefinitionFile="$(IntDir)\clutter.def"
-				ImportLibrary="$(TargetDir)$(ProjectName)-$(ClutterApiVersion).lib"
+				ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				OptimizeReferences="2"
@@ -258,34 +228,29 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			InheritedPropertySheets=".\clutter.vsprops"
+			InheritedPropertySheets=".\clutter-gen-srcs.vsprops"
 			ConfigurationType="2"
 			CharacterSet="2"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="$(PreBuildWin)$(PreBuildCmd2)"
+				CommandLine=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\..\clutter;..\..\..\clutter\win32;..\..\..\clutter\deprecated;..\..\..\clutter\cally"
+				AdditionalIncludeDirectories="..\..\..\clutter;..\..\..\clutter\cally;$(SolutionDir)"
 				PreprocessorDefinitions="$(ReleaseLibBuildDefines);$(ClutterBuildDefines)"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				DebugInformationFormat="3"
 			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-				CommandLine="$(GenerateClutterDef)"
-			/>
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="opengl32.lib winmm.lib intl.lib json-glib-1.0.lib pangocairo-1.0.lib pango-1.0.lib cairo-gobject.lib cairo.lib atk-1.0.lib gmodule-2.0.lib gio-2.0.lib"
 				OutputFile="$(OutDir)\$(ClutterDllPrefix)$(ProjectName)$(ClutterDllSuffix).dll"
 				LinkIncremental="2"
-				ModuleDefinitionFile="$(IntDir)\clutter.def"
-				ImportLibrary="$(TargetDir)$(ProjectName)-$(ClutterApiVersion).lib"
+				ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				OptimizeReferences="2"
@@ -295,35 +260,30 @@
 		</Configuration>
 		<Configuration
 			Name="Release_GDK|x64"
-			InheritedPropertySheets=".\clutter.vsprops"
+			InheritedPropertySheets=".\clutter-gen-srcs.vsprops"
 			OutputDirectory="$(SolutionDir)\Release\$(PlatformName)\bin"
 			ConfigurationType="2"
 			CharacterSet="2"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="$(PreBuildGDK)$(PreBuildCmd2)"
+				CommandLine=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\..\clutter;..\..\..\clutter\win32;..\..\..\clutter\deprecated;..\..\..\clutter\cally;$(GlibEtcInstallRoot)\include\gtk-3.0;$(GlibEtcInstallRoot)\include\gdk-pixbuf-2.0"
+				AdditionalIncludeDirectories="..\..\..\clutter;..\..\..\clutter\cally;$(GlibEtcInstallRoot)\include\gtk-3.0;$(GlibEtcInstallRoot)\include\gdk-pixbuf-2.0;$(SolutionDir)"
 				PreprocessorDefinitions="$(ReleaseLibBuildDefines);$(ClutterBuildDefines)"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				DebugInformationFormat="3"
 			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-				CommandLine="$(GenerateClutterGDKDef)"
-			/>
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="opengl32.lib winmm.lib intl.lib json-glib-1.0.lib gdk-3.0.lib pangocairo-1.0.lib pango-1.0.lib cairo-gobject.lib cairo.lib atk-1.0.lib gmodule-2.0.lib gio-2.0.lib"
 				OutputFile="$(OutDir)\$(ClutterDllPrefix)$(ProjectName)$(ClutterDllSuffix).dll"
 				LinkIncremental="2"
-				ModuleDefinitionFile="$(IntDir)\clutter.def"
-				ImportLibrary="$(TargetDir)$(ProjectName)-$(ClutterApiVersion).lib"
+				ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				OptimizeReferences="2"
@@ -386,6 +346,338 @@
 			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
 			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
 			>
+			<File RelativePath="..\..\..\clutter\config.h.win32">
+				<FileConfiguration Name="Debug|Win32">
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Copying config.h from config.h.win32..."
+						CommandLine="$(CopyConfigH)"
+						Outputs="..\..\..\clutter\config.h"
+					/>
+				</FileConfiguration>
+				<FileConfiguration Name="Debug_GDK|Win32">
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Copying config.h from config.h.win32..."
+						CommandLine="$(CopyConfigH)"
+						Outputs="..\..\..\clutter\config.h"
+					/>
+				</FileConfiguration>
+				<FileConfiguration Name="Release|Win32">
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Copying config.h from config.h.win32..."
+						CommandLine="$(CopyConfigH)"
+						Outputs="..\..\..\clutter\config.h"
+					/>
+				</FileConfiguration>
+				<FileConfiguration Name="Release_GDK|Win32">
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Copying config.h from config.h.win32..."
+						CommandLine="$(CopyConfigH)"
+						Outputs="..\..\..\clutter\config.h"
+					/>
+				</FileConfiguration>
+				<FileConfiguration Name="Debug|x64">
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Copying config.h from config.h.win32..."
+						CommandLine="$(CopyConfigH)"
+						Outputs="..\..\..\clutter\config.h"
+					/>
+				</FileConfiguration>
+				<FileConfiguration Name="Debug_GDK|x64">
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Copying config.h from config.h.win32..."
+						CommandLine="$(CopyConfigH)"
+						Outputs="..\..\..\clutter\config.h"
+					/>
+				</FileConfiguration>
+				<FileConfiguration Name="Release|x64">
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Copying config.h from config.h.win32..."
+						CommandLine="$(CopyConfigH)"
+						Outputs="..\..\..\clutter\config.h"
+					/>
+				</FileConfiguration>
+				<FileConfiguration Name="Release_GDK|x64">
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Copying config.h from config.h.win32..."
+						CommandLine="$(CopyConfigH)"
+						Outputs="..\..\..\clutter\config.h"
+					/>
+				</FileConfiguration>
+			</File>
+			<File RelativePath="..\..\..\clutter\clutter-config.h.win32_GDK">
+				<FileConfiguration Name="Debug_GDK|Win32">
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Copying clutter-config.h from clutter-config.h.win32_GDK..."
+						CommandLine="$(CopyClutterConfigGDKH)"
+						Outputs="..\..\..\clutter\clutter-config.h;clutter.bld.GDK.win32"
+					/>
+				</FileConfiguration>
+				<FileConfiguration Name="Release_GDK|Win32">
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Copying clutter-config.h from clutter-config.h.win32_GDK..."
+						CommandLine="$(CopyClutterConfigGDKH)"
+						Outputs="..\..\..\clutter\clutter-config.h;clutter.bld.GDK.win32"
+					/>
+				</FileConfiguration>
+				<FileConfiguration Name="Debug_GDK|x64">
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Copying clutter-config.h from clutter-config.h.win32_GDK..."
+						CommandLine="$(CopyClutterConfigGDKH)"
+						Outputs="..\..\..\clutter\clutter-config.h;clutter.bld.GDK.win32"
+					/>
+				</FileConfiguration>
+				<FileConfiguration Name="Release_GDK|x64">
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Copying clutter-config.h from clutter-config.h.win32_GDK..."
+						CommandLine="$(CopyClutterConfigGDKH)"
+						Outputs="..\..\..\clutter\clutter-config.h;clutter.bld.GDK.win32"
+					/>
+				</FileConfiguration>
+			</File>
+			<File RelativePath="..\..\..\clutter\clutter-config.h.win32">
+				<FileConfiguration Name="Debug|Win32">
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Copying clutter-config.h from clutter-config.h.win32..."
+						CommandLine="$(CopyClutterConfigH)"
+						Outputs="..\..\..\clutter\clutter-config.h;clutter.bld.win32.win32"
+					/>
+				</FileConfiguration>
+				<FileConfiguration Name="Release|Win32">
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Copying clutter-config.h from clutter-config.h.win32..."
+						CommandLine="$(CopyClutterConfigH)"
+						Outputs="..\..\..\clutter\clutter-config.h;clutter.bld.win32.win32"
+					/>
+				</FileConfiguration>
+				<FileConfiguration Name="Debug|x64">
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Copying clutter-config.h from clutter-config.h.win32..."
+						CommandLine="$(CopyClutterConfigH)"
+						Outputs="..\..\..\clutter\clutter-config.h;clutter.bld.win32.win32"
+					/>
+				</FileConfiguration>
+				<FileConfiguration Name="Release|x64">
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Copying clutter-config.h from clutter-config.h.win32..."
+						CommandLine="$(CopyClutterConfigH)"
+						Outputs="..\..\..\clutter\clutter-config.h;clutter.bld.win32.win32"
+					/>
+				</FileConfiguration>
+			</File>
+			<File RelativePath="..\..\..\clutter\clutter-enum-types.h.in">
+				<FileConfiguration Name="Debug|Win32">
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Generating Enumeration Sources..."
+						CommandLine="$(GenEnumsSrcH)"
+						Outputs="..\..\..\clutter\clutter-enum-types.h"
+					/>
+				</FileConfiguration>
+				<FileConfiguration Name="Debug_GDK|Win32">
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Generating Enumeration Header..."
+						CommandLine="$(GenEnumsSrcGDKH)"
+						Outputs="..\..\..\clutter\clutter-enum-types.h"
+					/>
+				</FileConfiguration>
+				<FileConfiguration Name="Release|Win32">
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Generating Enumeration Header..."
+						CommandLine="$(GenEnumsSrcH)"
+						Outputs="..\..\..\clutter\clutter-enum-types.h"
+					/>
+				</FileConfiguration>
+				<FileConfiguration Name="Release_GDK|Win32">
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Generating Enumeration Header..."
+						CommandLine="$(GenEnumsSrcGDKH)"
+						Outputs="..\..\..\clutter\clutter-enum-types.h"
+					/>
+				</FileConfiguration>
+				<FileConfiguration Name="Debug|x64">
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Generating Enumeration Header..."
+						CommandLine="$(GenEnumsSrcH)"
+						Outputs="..\..\..\clutter\clutter-enum-types.h"
+					/>
+				</FileConfiguration>
+				<FileConfiguration Name="Debug_GDK|x64">
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Generating Enumeration Header..."
+						CommandLine="$(GenEnumsSrcGDKH)"
+						Outputs="..\..\..\clutter\clutter-enum-types.h"
+					/>
+				</FileConfiguration>
+				<FileConfiguration Name="Release|x64">
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Generating Enumeration Header..."
+						CommandLine="$(GenEnumsSrcH)"
+						Outputs="..\..\..\clutter\clutter-enum-types.h"
+					/>
+				</FileConfiguration>
+				<FileConfiguration Name="Release_GDK|x64">
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Generating Enumeration Header..."
+						CommandLine="$(GenEnumsSrcGDKH)"
+						Outputs="..\..\..\clutter\clutter-enum-types.h"
+					/>
+				</FileConfiguration>
+			</File>
+			<File RelativePath="..\..\..\clutter\clutter-enum-types.c.in">
+				<FileConfiguration Name="Debug|Win32">
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Generating Enumeration Sources..."
+						CommandLine="$(GenEnumsSrcC)"
+						Outputs="..\..\..\clutter\clutter-enum-types.c"
+					/>
+				</FileConfiguration>
+				<FileConfiguration Name="Debug_GDK|Win32">
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Generating Enumeration Sources..."
+						CommandLine="$(GenEnumsSrcGDKC)"
+						Outputs="..\..\..\clutter\clutter-enum-types.c"
+					/>
+				</FileConfiguration>
+				<FileConfiguration Name="Release|Win32">
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Generating Enumeration Sources..."
+						CommandLine="$(GenEnumsSrcC)"
+						Outputs="..\..\..\clutter\clutter-enum-types.c"
+					/>
+				</FileConfiguration>
+				<FileConfiguration Name="Release_GDK|Win32">
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Generating Enumeration Sources..."
+						CommandLine="$(GenEnumsSrcGDKC)"
+						Outputs="..\..\..\clutter\clutter-enum-types.c"
+					/>
+				</FileConfiguration>
+				<FileConfiguration Name="Debug|x64">
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Generating Enumeration Sources..."
+						CommandLine="$(GenEnumsSrcC)"
+						Outputs="..\..\..\clutter\clutter-enum-types.c"
+					/>
+				</FileConfiguration>
+				<FileConfiguration Name="Debug_GDK|x64">
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Generating Enumeration Sources..."
+						CommandLine="$(GenEnumsSrcGDKC)"
+						Outputs="..\..\..\clutter\clutter-enum-types.c"
+					/>
+				</FileConfiguration>
+				<FileConfiguration Name="Release|x64">
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Generating Enumeration Sources..."
+						CommandLine="$(GenEnumsSrcC)"
+						Outputs="..\..\..\clutter\clutter-enum-types.c"
+					/>
+				</FileConfiguration>
+				<FileConfiguration Name="Release_GDK|x64">
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Generating Enumeration Sources..."
+						CommandLine="$(GenEnumsSrcGDKC)"
+						Outputs="..\..\..\clutter\clutter-enum-types.c"
+					/>
+				</FileConfiguration>
+			</File>
+			<File RelativePath="..\..\..\clutter\clutter-marshal.list">
+				<FileConfiguration Name="Debug|Win32">
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Generating Marshalling Sources..."
+						CommandLine="$(GenMarshalSrc)"
+						Outputs="..\..\..\clutter\clutter-marshal.h;..\..\..\clutter\clutter-marshal.c"
+					/>
+				</FileConfiguration>
+				<FileConfiguration Name="Debug_GDK|Win32">
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Generating Marshalling Sources..."
+						CommandLine="$(GenMarshalSrc)"
+						Outputs="..\..\..\clutter\clutter-marshal.h;..\..\..\clutter\clutter-marshal.c"
+					/>
+				</FileConfiguration>
+				<FileConfiguration Name="Release|Win32">
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Generating Marshalling Sources..."
+						CommandLine="$(GenMarshalSrc)"
+						Outputs="..\..\..\clutter\clutter-marshal.h;..\..\..\clutter\clutter-marshal.c"
+					/>
+				</FileConfiguration>
+				<FileConfiguration Name="Release_GDK|Win32">
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Generating Marshalling Sources..."
+						CommandLine="$(GenMarshalSrc)"
+						Outputs="..\..\..\clutter\clutter-marshal.h;..\..\..\clutter\clutter-marshal.c"
+					/>
+				</FileConfiguration>
+				<FileConfiguration Name="Debug|x64">
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Generating Marshalling Sources..."
+						CommandLine="$(GenMarshalSrc)"
+						Outputs="..\..\..\clutter\clutter-marshal.h;..\..\..\clutter\clutter-marshal.c"
+					/>
+				</FileConfiguration>
+				<FileConfiguration Name="Debug_GDK|x64">
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Generating Marshalling Sources..."
+						CommandLine="$(GenMarshalSrc)"
+						Outputs="..\..\..\clutter\clutter-marshal.h;..\..\..\clutter\clutter-marshal.c"
+					/>
+				</FileConfiguration>
+				<FileConfiguration Name="Release|x64">
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Generating Marshalling Sources..."
+						CommandLine="$(GenMarshalSrc)"
+						Outputs="..\..\..\clutter\clutter-marshal.h;..\..\..\clutter\clutter-marshal.c"
+					/>
+				</FileConfiguration>
+				<FileConfiguration Name="Release_GDK|x64">
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Generating Marshalling Sources..."
+						CommandLine="$(GenMarshalSrc)"
+						Outputs="..\..\..\clutter\clutter-marshal.h;..\..\..\clutter\clutter-marshal.c"
+					/>
+				</FileConfiguration>
+			</File>
 			<File RelativePath="..\..\..\clutter\win32\resources.rc" />
 		</Filter>
 	</Files>
diff --git a/build/win32/vs9/clutter.vsprops b/build/win32/vs9/clutter.vsprops
deleted file mode 100644
index c7d91eb67..000000000
--- a/build/win32/vs9/clutter.vsprops
+++ /dev/null
@@ -1,353 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioPropertySheet
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="clutterprops"
-	OutputDirectory="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin"
-	IntermediateDirectory="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\obj\$(ProjectName)"
-	>
-	<Tool
-		Name="VCCLCompilerTool"
-		AdditionalIncludeDirectories="..\..\..;..\..\..\clutter;$(GlibEtcInstallRoot)\include;$(GlibEtcInstallRoot)\include\glib-2.0;$(GlibEtcInstallRoot)\include\cairo;$(GlibEtcInstallRoot)\include\atk-1.0;$(GlibEtcInstallRoot)\include\pango-1.0;$(GlibEtcInstallRoot)\include\cogl-1.0;$(GlibEtcInstallRoot)\include\json-glib-1.0;$(GlibEtcInstallRoot)\lib\glib-2.0\include"
-		PreprocessorDefinitions="G_DISABLE_SINGLE_INCLUDES"
-		ForcedIncludeFiles="msvc_recommended_pragmas.h"
-	/>
-	<Tool
-		Name="VCLinkerTool"
-		AdditionalDependencies="cogl-pango-1.0.lib cogl-1.0.lib glib-2.0.lib gobject-2.0.lib"
-		AdditionalLibraryDirectories="$(GlibEtcInstallRoot)\lib"
-	/>
-	<UserMacro
-		Name="GlibEtcInstallRoot"
-		Value="..\..\..\..\vs9\$(PlatformName)"
-	/>
-	<UserMacro
-		Name="CopyDir"
-		Value="$(GlibEtcInstallRoot)"
-	/>
-	<UserMacro
-		Name="DefDir"
-		Value="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\obj\$(ProjectName)"
-	/>
-	<UserMacro
-		Name="GlibMkEnumsPath"
-		Value="..\..\..\vs9\$(PlatformName)"
-	/>
-	<UserMacro
-		Name="GlibGenMarshalPath"
-		Value="..\..\vs9\$(PlatformName)"
-	/>
-	<UserMacro
-		Name="ClutterApiVersion"
-		Value="1.0"
-	/>
-	<UserMacro
-		Name="BaseWinBuildDef"
-		Value="_WIN32_WINNT=0x0500"
-	/>
-	<UserMacro
-		Name="BaseBuildDef"
-		Value="$(BaseWinBuildDef)"
-	/>
-	<UserMacro
-		Name="LibBuildDefines"
-		Value="HAVE_CONFIG_H;CLUTTER_COMPILATION;COGL_ENABLE_EXPERIMENTAL_API;COGL_HAS_WIN32_SUPPORT;CLUTTER_ENABLE_EXPERIMENTAL_API"
-	/>
-	<UserMacro
-		Name="DebugLibBuildDefines"
-		Value="$(LibBuildDefines);_DEBUG;CLUTTER_ENABLE_DEBUG"
-	/>
-	<UserMacro
-		Name="ReleaseLibBuildDefines"
-		Value="$(LibBuildDefines);G_DISABLE_ASSERT;G_DISABLE_CHECKS;G_DISABLE_CAST_CHECKS"
-	/>
-	<UserMacro
-		Name="ClutterBuildDefines"
-		Value="$(BaseBuildDef);G_LOG_DOMAIN=\&quot;Clutter\&quot;;CLUTTER_LOCALEDIR=\&quot;../share/locale\&quot;;CLUTTER_SYSCONFDIR=\&quot;../etc\&quot;"
-	/>
-	<UserMacro
-		Name="ClutterDisableDeprecationWarnings"
-		Value="CLUTTER_DISABLE_DEPRECATION_WARNINGS;GLIB_DISABLE_DEPRECATION_WARNINGS"
-	/>
-	<UserMacro
-		Name="CallyTestDefs"
-		Value="$(BaseWinBuildDef);PREFIXDIR=\&quot;/some/dummy/dir\&quot;;$(ClutterDisableDeprecationWarnings)"
-	/>
-	<UserMacro
-		Name="TestProgDef"
-		Value="$(BaseBuildDef);TESTS_DATADIR=\&quot;../share/clutter-$(ClutterApiVersion)/data\&quot;"
-	/>
-	<UserMacro
-		Name="TestPerfProgDef"
-		Value="$(BaseBuildDef);TESTS_DATA_DIR=\&quot;../share/clutter-$(ClutterApiVersion)/data\&quot;;$(ClutterDisableDeprecationWarnings)"
-	/>
-	<UserMacro
-		Name="PreBuildWin"
-		Value="
-if exist ..\..\..\clutter\config.h goto DONE_CONFIG_H&#x0D;&#x0A;
-copy ..\..\..\clutter\config.h.win32 ..\..\..\clutter\config.h&#x0D;&#x0A;
-:DONE_CONFIG_H&#x0D;&#x0A;
-if exist ..\..\..\clutter\clutter.bld.win32.win32 goto DONE_CLUTTER_CONFIG_H&#x0D;&#x0A;
-del clutter.bld.*.win32&#x0D;&#x0A;
-copy ..\..\..\clutter\clutter-config.h.win32 clutter.bld.win32.win32&#x0D;&#x0A;
-copy ..\..\..\clutter\clutter-config.h.win32 ..\..\..\clutter\clutter-config.h&#x0D;&#x0A;
-:DONE_CLUTTER_CONFIG_H&#x0D;&#x0A;
-			  "
-	/>
-	<UserMacro
-		Name="PreBuildGDK"
-		Value="
-if exist ..\..\..\clutter\config.h goto DONE_CONFIG_H&#x0D;&#x0A;
-copy ..\..\..\clutter\config.h.win32 ..\..\..\clutter\config.h&#x0D;&#x0A;
-:DONE_CONFIG_H&#x0D;&#x0A;
-if exist ..\..\..\clutter\clutter.bld.GDK.win32 goto DONE_CLUTTER_CONFIG_H&#x0D;&#x0A;
-del clutter.bld.*.win32&#x0D;&#x0A;
-copy ..\..\..\clutter\clutter-config.h.win32_GDK clutter.bld.GDK.win32&#x0D;&#x0A;
-copy ..\..\..\clutter\clutter-config.h.win32_GDK ..\..\..\clutter\clutter-config.h&#x0D;&#x0A;
-:DONE_CLUTTER_CONFIG_H&#x0D;&#x0A;
-			  "
-	/>
-	<UserMacro
-		Name="PreBuildCmd2"
-		Value="
-if exist ..\..\..\clutter\clutter-marshal.h goto DONE_CLUTTER_MARSHAL_H&#x0D;&#x0A;
-cd ..\..\..\clutter&#x0D;&#x0A;
-$(GlibGenMarshalPath)\bin\glib-genmarshal --prefix=_clutter_marshal --header clutter-marshal.list &gt; clutter-marshal.h&#x0D;&#x0A;
-cd ..\build\win32\vs9&#x0D;&#x0A;
-:DONE_CLUTTER_MARSHAL_H&#x0D;&#x0A;
-
-if exist ..\..\..\clutter\clutter-marshal.c goto DONE_CLUTTER_MARSHAL_C&#x0D;&#x0A;
-cd ..\..\..\clutter&#x0D;&#x0A;
-echo #include &quot;clutter-marshal.h&quot; &gt; clutter-marshal.c&#x0D;&#x0A;
-$(GlibGenMarshalPath)\bin\glib-genmarshal --prefix=_clutter_marshal --body clutter-marshal.list &gt;&gt; clutter-marshal.c&#x0D;&#x0A;
-cd ..\build\win32\vs9&#x0D;&#x0A;
-:DONE_CLUTTER_MARSHAL_C&#x0D;&#x0A;
-
-cd ..&#x0D;&#x0A;
-gen-enums.bat $(GlibMkEnumsPath)&#x0D;&#x0A;
-cd .\vs9&#x0D;&#x0A;
-"
-	/>
-	<UserMacro
-		Name="ClutterDoInstall"
-		Value="
-mkdir $(CopyDir)&#x0D;&#x0A;
-mkdir $(CopyDir)\bin&#x0D;&#x0A;
-mkdir $(CopyDir)\share\clutter-$(ClutterApiVersion)\data&#x0D;&#x0A;
-copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\*.dll $(CopyDir)\bin&#x0D;&#x0A;
-
-copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\*.exe $(CopyDir)\bin&#x0D;&#x0A;
-copy ..\*.bat $(CopyDir)\bin&#x0D;&#x0A;
-copy ..\..\..\tests\data\*.png $(CopyDir)\share\clutter-$(ClutterApiVersion)\data&#x0D;&#x0A;
-copy ..\..\..\tests\data\clutter-1.0.suppressions $(CopyDir)\share\clutter-$(ClutterApiVersion)\data&#x0D;&#x0A;
-copy ..\..\..\tests\data\*.json $(CopyDir)\share\clutter-$(ClutterApiVersion)\data&#x0D;&#x0A;
-
-mkdir $(CopyDir)\lib&#x0D;&#x0A;
-copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\*-$(ClutterApiVersion).lib $(CopyDir)\lib&#x0D;&#x0A;
-
-mkdir $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter\win32&#x0D;&#x0A;
-
-copy ..\..\..\clutter\clutter.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter&#x0D;&#x0A;
-copy ..\..\..\clutter\clutter-action.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter&#x0D;&#x0A;
-copy ..\..\..\clutter\clutter-actor-meta.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter&#x0D;&#x0A;
-copy ..\..\..\clutter\clutter-actor.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter&#x0D;&#x0A;
-copy ..\..\..\clutter\clutter-align-constraint.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter&#x0D;&#x0A;
-copy ..\..\..\clutter\clutter-alpha.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter&#x0D;&#x0A;
-copy ..\..\..\clutter\clutter-animatable.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter&#x0D;&#x0A;
-copy ..\..\..\clutter\clutter-animation.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter&#x0D;&#x0A;
-copy ..\..\..\clutter\clutter-animator.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter&#x0D;&#x0A;
-copy ..\..\..\clutter\clutter-backend.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter&#x0D;&#x0A;
-copy ..\..\..\clutter\clutter-bind-constraint.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter&#x0D;&#x0A;
-copy ..\..\..\clutter\clutter-binding-pool.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter&#x0D;&#x0A;
-copy ..\..\..\clutter\clutter-bin-layout.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter&#x0D;&#x0A;
-copy ..\..\..\clutter\clutter-blur-effect.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter&#x0D;&#x0A;
-copy ..\..\..\clutter\clutter-box-layout.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter&#x0D;&#x0A;
-copy ..\..\..\clutter\clutter-brightness-contrast-effect.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter&#x0D;&#x0A;
-copy ..\..\..\clutter\clutter-cairo-texture.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter&#x0D;&#x0A;
-copy ..\..\..\clutter\clutter-canvas.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter&#x0D;&#x0A;
-copy ..\..\..\clutter\clutter-child-meta.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter&#x0D;&#x0A;
-copy ..\..\..\clutter\clutter-click-action.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter&#x0D;&#x0A;
-copy ..\..\..\clutter\clutter-clone.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter&#x0D;&#x0A;
-copy ..\..\..\clutter\clutter-cogl-compat.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter&#x0D;&#x0A;
-copy ..\..\..\clutter\clutter-color-static.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter&#x0D;&#x0A;
-copy ..\..\..\clutter\clutter-color.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter&#x0D;&#x0A;
-copy ..\..\..\clutter\clutter-colorize-effect.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter&#x0D;&#x0A;
-copy ..\..\..\clutter\clutter-config.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter&#x0D;&#x0A;
-copy ..\..\..\clutter\clutter-constraint.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter&#x0D;&#x0A;
-copy ..\..\..\clutter\clutter-content.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter&#x0D;&#x0A;
-copy ..\..\..\clutter\clutter-container.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter&#x0D;&#x0A;
-copy ..\..\..\clutter\clutter-deform-effect.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter&#x0D;&#x0A;
-copy ..\..\..\clutter\clutter-deprecated.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter&#x0D;&#x0A;
-copy ..\..\..\clutter\clutter-desaturate-effect.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter&#x0D;&#x0A;
-copy ..\..\..\clutter\clutter-device-manager.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter&#x0D;&#x0A;
-copy ..\..\..\clutter\clutter-drag-action.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter&#x0D;&#x0A;
-copy ..\..\..\clutter\clutter-drop-action.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter&#x0D;&#x0A;
-copy ..\..\..\clutter\clutter-effect.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter&#x0D;&#x0A;
-copy ..\..\..\clutter\clutter-enums.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter&#x0D;&#x0A;
-copy ..\..\..\clutter\clutter-enum-types.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter&#x0D;&#x0A;
-copy ..\..\..\clutter\clutter-event.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter&#x0D;&#x0A;
-copy ..\..\..\clutter\clutter-feature.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter&#x0D;&#x0A;
-copy ..\..\..\clutter\clutter-fixed-layout.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter&#x0D;&#x0A;
-copy ..\..\..\clutter\clutter-flow-layout.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter&#x0D;&#x0A;
-copy ..\..\..\clutter\clutter-gesture-action.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter&#x0D;&#x0A;
-copy ..\..\..\clutter\clutter-group.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter&#x0D;&#x0A;
-copy ..\..\..\clutter\clutter-image.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter&#x0D;&#x0A;
-copy ..\..\..\clutter\clutter-input-device.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter&#x0D;&#x0A;
-copy ..\..\..\clutter\clutter-interval.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter&#x0D;&#x0A;
-copy ..\..\..\clutter\clutter-layout-manager.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter&#x0D;&#x0A;
-copy ..\..\..\clutter\clutter-layout-meta.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter&#x0D;&#x0A;
-copy ..\..\..\clutter\clutter-list-model.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter&#x0D;&#x0A;
-copy ..\..\..\clutter\clutter-keysyms.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter&#x0D;&#x0A;
-copy ..\..\..\clutter\clutter-macros.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter&#x0D;&#x0A;
-copy ..\..\..\clutter\clutter-main.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter&#x0D;&#x0A;
-copy ..\..\..\clutter\clutter-marshal.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter&#x0D;&#x0A;
-copy ..\..\..\clutter\clutter-media.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter&#x0D;&#x0A;
-copy ..\..\..\clutter\clutter-model.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter&#x0D;&#x0A;
-copy ..\..\..\clutter\clutter-offscreen-effect.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter&#x0D;&#x0A;
-copy ..\..\..\clutter\clutter-page-turn-effect.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter&#x0D;&#x0A;
-copy ..\..\..\clutter\clutter-paint-node.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter&#x0D;&#x0A;
-copy ..\..\..\clutter\clutter-paint-nodes.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter&#x0D;&#x0A;
-copy ..\..\..\clutter\clutter-path-constraint.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter&#x0D;&#x0A;
-copy ..\..\..\clutter\clutter-path.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter&#x0D;&#x0A;
-copy ..\..\..\clutter\clutter-property-transition.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter&#x0D;&#x0A;
-copy ..\..\..\clutter\clutter-script.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter&#x0D;&#x0A;
-copy ..\..\..\clutter\clutter-scriptable.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter&#x0D;&#x0A;
-copy ..\..\..\clutter\clutter-settings.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter&#x0D;&#x0A;
-copy ..\..\..\clutter\clutter-shader-effect.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter&#x0D;&#x0A;
-copy ..\..\..\clutter\clutter-shader-types.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter&#x0D;&#x0A;
-copy ..\..\..\clutter\clutter-snap-constraint.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter&#x0D;&#x0A;
-copy ..\..\..\clutter\clutter-stage.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter&#x0D;&#x0A;
-copy ..\..\..\clutter\clutter-stage-manager.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter&#x0D;&#x0A;
-copy ..\..\..\clutter\clutter-stage-window.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter&#x0D;&#x0A;
-copy ..\..\..\clutter\clutter-state.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter&#x0D;&#x0A;
-copy ..\..\..\clutter\clutter-swipe-action.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter&#x0D;&#x0A;
-copy ..\..\..\clutter\clutter-table-layout.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter&#x0D;&#x0A;
-copy ..\..\..\clutter\clutter-texture.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter&#x0D;&#x0A;
-copy ..\..\..\clutter\clutter-text.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter&#x0D;&#x0A;
-copy ..\..\..\clutter\clutter-text-buffer.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter&#x0D;&#x0A;
-copy ..\..\..\clutter\clutter-timeline.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter&#x0D;&#x0A;
-copy ..\..\..\clutter\clutter-transition.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter&#x0D;&#x0A;
-copy ..\..\..\clutter\clutter-types.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter&#x0D;&#x0A;
-copy ..\..\..\clutter\clutter-units.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter&#x0D;&#x0A;
-copy ..\..\..\clutter\clutter-version.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter&#x0D;&#x0A;
-copy ..\..\..\clutter\win32\clutter-win32.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter\win32&#x0D;&#x0A;
-
-mkdir $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter\deprecated&#x0D;&#x0A;
-copy ..\..\..\clutter\deprecated\clutter-actor.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter\deprecated&#x0D;&#x0A;
-copy ..\..\..\clutter\deprecated\clutter-animatable.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter\deprecated&#x0D;&#x0A;
-copy ..\..\..\clutter\deprecated\clutter-animation.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter\deprecated&#x0D;&#x0A;
-copy ..\..\..\clutter\deprecated\clutter-backend.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter\deprecated&#x0D;&#x0A;
-copy ..\..\..\clutter\deprecated\clutter-behaviour.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter\deprecated&#x0D;&#x0A;
-copy ..\..\..\clutter\deprecated\clutter-behaviour-depth.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter\deprecated&#x0D;&#x0A;
-copy ..\..\..\clutter\deprecated\clutter-behaviour-ellipse.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter\deprecated&#x0D;&#x0A;
-copy ..\..\..\clutter\deprecated\clutter-behaviour-opacity.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter\deprecated&#x0D;&#x0A;
-copy ..\..\..\clutter\deprecated\clutter-behaviour-path.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter\deprecated&#x0D;&#x0A;
-copy ..\..\..\clutter\deprecated\clutter-behaviour-rotate.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter\deprecated&#x0D;&#x0A;
-copy ..\..\..\clutter\deprecated\clutter-behaviour-scale.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter\deprecated&#x0D;&#x0A;
-copy ..\..\..\clutter\deprecated\clutter-box.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter\deprecated&#x0D;&#x0A;
-copy ..\..\..\clutter\deprecated\clutter-cairo-texture.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter\deprecated&#x0D;&#x0A;
-copy ..\..\..\clutter\deprecated\clutter-container.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter\deprecated&#x0D;&#x0A;
-copy ..\..\..\clutter\deprecated\clutter-group.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter\deprecated&#x0D;&#x0A;
-copy ..\..\..\clutter\deprecated\clutter-fixed.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter\deprecated&#x0D;&#x0A;
-copy ..\..\..\clutter\deprecated\clutter-frame-source.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter\deprecated&#x0D;&#x0A;
-copy ..\..\..\clutter\deprecated\clutter-keysyms.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter\deprecated&#x0D;&#x0A;
-copy ..\..\..\clutter\deprecated\clutter-main.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter\deprecated&#x0D;&#x0A;
-copy ..\..\..\clutter\deprecated\clutter-rectangle.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter\deprecated&#x0D;&#x0A;
-copy ..\..\..\clutter\deprecated\clutter-score.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter\deprecated&#x0D;&#x0A;
-copy ..\..\..\clutter\deprecated\clutter-shader.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter\deprecated&#x0D;&#x0A;
-copy ..\..\..\clutter\deprecated\clutter-stage.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter\deprecated&#x0D;&#x0A;
-copy ..\..\..\clutter\deprecated\clutter-stage-manager.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter\deprecated&#x0D;&#x0A;
-copy ..\..\..\clutter\deprecated\clutter-texture.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter\deprecated&#x0D;&#x0A;
-copy ..\..\..\clutter\deprecated\clutter-timeline.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter\deprecated&#x0D;&#x0A;
-copy ..\..\..\clutter\deprecated\clutter-timeout-pool.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter\deprecated&#x0D;&#x0A;
-copy ..\..\..\clutter\deprecated\clutter-util.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter\deprecated&#x0D;&#x0A;
-
-mkdir $(CopyDir)\include\clutter-$(ClutterApiVersion)\cally&#x0D;&#x0A;
-copy ..\..\..\clutter\cally\cally-actor.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\cally&#x0D;&#x0A;
-copy ..\..\..\clutter\cally\cally-clone.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\cally&#x0D;&#x0A;
-copy ..\..\..\clutter\cally\cally-factory.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\cally&#x0D;&#x0A;
-copy ..\..\..\clutter\cally\cally-group.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\cally&#x0D;&#x0A;
-copy ..\..\..\clutter\cally\cally.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\cally&#x0D;&#x0A;
-copy ..\..\..\clutter\cally\cally-main.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\cally&#x0D;&#x0A;
-copy ..\..\..\clutter\cally\cally-rectangle.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\cally&#x0D;&#x0A;
-copy ..\..\..\clutter\cally\cally-root.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\cally&#x0D;&#x0A;
-copy ..\..\..\clutter\cally\cally-stage.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\cally&#x0D;&#x0A;
-copy ..\..\..\clutter\cally\cally-text.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\cally&#x0D;&#x0A;
-copy ..\..\..\clutter\cally\cally-texture.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\cally&#x0D;&#x0A;
-copy ..\..\..\clutter\cally\cally-util.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\cally&#x0D;&#x0A;
-
-"
-	/>
-	<UserMacro
-		Name="ClutterDoInstallGDK"
-		Value="
-mkdir $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter\gdk&#x0D;&#x0A;
-
-copy ..\..\..\clutter\gdk\clutter-gdk.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter\gdk&#x0D;&#x0A;
-			  "
-	/>
-	<UserMacro
-		Name="ClutterDoInstallReleaseBin"
-		Value="
-mkdir $(CopyDir)\bin&#x0D;&#x0A;
-copy $(SolutionDir)Release\$(PlatformName)\bin\*.dll $(CopyDir)\bin&#x0D;&#x0A;
-
-copy $(SolutionDir)Release\$(PlatformName)\bin\*.exe $(CopyDir)\bin&#x0D;&#x0A;
-
-mkdir $(CopyDir)\lib&#x0D;&#x0A;
-copy $(SolutionDir)Release\$(PlatformName)\bin\*-$(ClutterApiVersion).lib $(CopyDir)\lib&#x0D;&#x0A;
-			  "
-	/>
-		<UserMacro
-		Name="ClutterDoInstallDebugBin"
-		Value="
-mkdir $(CopyDir)\bin&#x0D;&#x0A;
-copy $(SolutionDir)Debug\$(PlatformName)\bin\*.dll $(CopyDir)\bin&#x0D;&#x0A;
-
-copy $(SolutionDir)Debug\$(PlatformName)\bin\*.exe $(CopyDir)\bin&#x0D;&#x0A;
-
-mkdir $(CopyDir)\lib&#x0D;&#x0A;
-copy $(SolutionDir)Debug\$(PlatformName)\bin\*-$(ClutterApiVersion).lib $(CopyDir)\lib&#x0D;&#x0A;
-			  "
-	/>
-	<UserMacro
-		Name="GenerateClutterDef"
-		Value="
-		       echo EXPORTS &gt; $(DefDir)\clutter.def&#x0D;&#x0A;
-			   cl -EP -DHAVE_CAIRO -DCLUTTER_WINDOWING_WIN32 -DCLUTTER_ENABLE_EXPERIMENTAL_API ..\..\..\clutter\clutter.symbols &gt;&gt; $(DefDir)\clutter.def&#x0D;&#x0A;
-			  "
-	/>
-	<UserMacro
-		Name="GenerateClutterGDKDef"
-		Value="
-		       echo EXPORTS &gt; $(DefDir)\clutter.def&#x0D;&#x0A;
-			   cl -EP -DHAVE_CAIRO -DCLUTTER_WINDOWING_WIN32 -DCLUTTER_WINDOWING_GDK -DCLUTTER_ENABLE_EXPERIMENTAL_API ..\..\..\clutter\clutter.symbols &gt;&gt; $(DefDir)\clutter.def&#x0D;&#x0A;
-			  "
-	/>
-	<UserMacro
-		Name="ClutterLibtoolCompatibleDllPrefix"
-		Value="lib"
-	/>
-	<UserMacro
-		Name="ClutterLibtoolCompatibleDllSuffix"
-		Value="-$(ClutterApiVersion)-0"
-	/>
-	<UserMacro
-		Name="ClutterSeparateVS9DllPrefix"
-		Value=""
-	/>
-	<UserMacro
-		Name="ClutterSeparateVS9DllSuffix"
-		Value="-1-vs9"
-	/>
-	<!-- Change these two to GlibLibtoolCompatibleDllPrefix and
-	GlibLibtoolCompatibleDllSuffix if that is what you want -->
-	<UserMacro
-		Name="ClutterDllPrefix"
-		Value="$(ClutterSeparateVS9DllPrefix)"
-	/>
-	<UserMacro
-		Name="ClutterDllSuffix"
-		Value="$(ClutterSeparateVS9DllSuffix)"
-	/>
-</VisualStudioPropertySheet>
diff --git a/build/win32/vs9/install.vcproj b/build/win32/vs9/install.vcproj
index 713a2b590..2121c4eeb 100644
--- a/build/win32/vs9/install.vcproj
+++ b/build/win32/vs9/install.vcproj
@@ -20,31 +20,19 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			InheritedPropertySheets=".\clutter.vsprops"
+			InheritedPropertySheets=".\clutter-install.vsprops"
 			OutputDirectory="$(GlibEtcInstallRoot)"
 			ConfigurationType="10"
 			CharacterSet="2"
 			>
 			<Tool
 				Name="VCPostBuildEventTool"
-				CommandLine="$(ClutterDoInstallDebugBin) $(ClutterDoInstall)"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug_GDK|Win32"
-			InheritedPropertySheets=".\clutter.vsprops"
-			OutputDirectory="$(GlibEtcInstallRoot)"
-			ConfigurationType="10"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine="$(ClutterDoInstallDebugBin) $(ClutterDoInstall) $(ClutterDoInstallGDK)"
+				CommandLine="$(ClutterDoInstall)"
 			/>
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			InheritedPropertySheets=".\clutter.vsprops"
+			InheritedPropertySheets=".\clutter-install.vsprops"
 			OutputDirectory="$(GlibEtcInstallRoot)"
 			ConfigurationType="10"
 			CharacterSet="2"
@@ -52,25 +40,12 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="$(ClutterDoInstallDebugBin) $(ClutterDoInstall)"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug_GDK|x64"
-			InheritedPropertySheets=".\clutter.vsprops"
-			OutputDirectory="$(GlibEtcInstallRoot)"
-			ConfigurationType="10"
-			CharacterSet="2"
-			DeleteExtensionsOnClean=""
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-				CommandLine="$(ClutterDoInstallDebugBin) $(ClutterDoInstall) $(ClutterDoInstallGDK)"
+				CommandLine="$(ClutterDoInstall)"
 			/>
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			InheritedPropertySheets=".\clutter.vsprops"
+			InheritedPropertySheets=".\clutter-install.vsprops"
 			OutputDirectory="$(GlibEtcInstallRoot)"
 			ConfigurationType="10"
 			CharacterSet="2"
@@ -78,25 +53,12 @@
 			>
 			<Tool
 				Name="VCPostBuildEventTool"
-				CommandLine="$(ClutterDoInstallReleaseBin) $(ClutterDoInstall)"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release_GDK|Win32"
-			InheritedPropertySheets=".\clutter.vsprops"
-			OutputDirectory="$(GlibEtcInstallRoot)"
-			ConfigurationType="10"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine="$(ClutterDoInstallReleaseBin) $(ClutterDoInstall) $(ClutterDoInstallGDK)"
+				CommandLine="$(ClutterDoInstall)"
 			/>
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			InheritedPropertySheets=".\clutter.vsprops"
+			InheritedPropertySheets=".\clutter-install.vsprops"
 			OutputDirectory="$(GlibEtcInstallRoot)"
 			ConfigurationType="10"
 			CharacterSet="2"
@@ -105,21 +67,7 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="$(ClutterDoInstallReleaseBin) $(ClutterDoInstall)"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release_GDK|x64"
-			InheritedPropertySheets=".\clutter.vsprops"
-			OutputDirectory="$(GlibEtcInstallRoot)"
-			ConfigurationType="10"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			DeleteExtensionsOnClean=""
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-				CommandLine="$(ClutterDoInstallReleaseBin) $(ClutterDoInstall) $(ClutterDoInstallGDK)"
+				CommandLine="$(ClutterDoInstall)"
 			/>
 		</Configuration>
 	</Configurations>
diff --git a/build/win32/vs9/test-cogl-perf.vcproj b/build/win32/vs9/test-cogl-perf.vcproj
index e737e1ebf..9326e6431 100644
--- a/build/win32/vs9/test-cogl-perf.vcproj
+++ b/build/win32/vs9/test-cogl-perf.vcproj
@@ -21,7 +21,7 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			InheritedPropertySheets=".\clutter.vsprops"
+			InheritedPropertySheets=".\clutter-build-defines.vsprops"
 			ConfigurationType="1"
 			CharacterSet="2"
 			>
@@ -31,7 +31,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				PreprocessorDefinitions="_DEBUG;$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings)"
+				PreprocessorDefinitions="_DEBUG;$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);$(AvoidSDLMain)"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -50,7 +50,7 @@
 		<Configuration
 			Name="Debug|x64"
 			ConfigurationType="1"
-			InheritedPropertySheets=".\clutter.vsprops"
+			InheritedPropertySheets=".\clutter-build-defines.vsprops"
 			CharacterSet="2"
 			>
 			<Tool
@@ -59,7 +59,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				PreprocessorDefinitions="_DEBUG;$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings)"
+				PreprocessorDefinitions="_DEBUG;$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);$(AvoidSDLMain)"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -81,7 +81,7 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			InheritedPropertySheets=".\clutter.vsprops"
+			InheritedPropertySheets=".\clutter-build-defines.vsprops"
 			ConfigurationType="1"
 			CharacterSet="2"
 			WholeProgramOptimization="1"
@@ -93,7 +93,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
-				PreprocessorDefinitions="$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings)"
+				PreprocessorDefinitions="$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);$(AvoidSDLMain)"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="0"
@@ -113,7 +113,7 @@
 		<Configuration
 			Name="Release|x64"
 			ConfigurationType="1"
-			InheritedPropertySheets=".\clutter.vsprops"
+			InheritedPropertySheets=".\clutter-build-defines.vsprops"
 			CharacterSet="2"
 			WholeProgramOptimization="1"
 			>
@@ -122,7 +122,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				PreprocessorDefinitions="$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings)"
+				PreprocessorDefinitions="$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);$(AvoidSDLMain)"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
diff --git a/build/win32/vs9/test-conformance-clutter.vcprojin b/build/win32/vs9/test-conformance-clutter.vcprojin
deleted file mode 100644
index 036936330..000000000
--- a/build/win32/vs9/test-conformance-clutter.vcprojin
+++ /dev/null
@@ -1,161 +0,0 @@
-<?xml version="1.0" encoding="big5"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="test-conformance-clutter"
-	ProjectGUID="{0F08F253-DE1A-40CB-A890-93AE3CA23ADE}"
-	RootNamespace="testconformanceclutter"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="196613"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			InheritedPropertySheets=".\clutter.vsprops"
-			ConfigurationType="1"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				PreprocessorDefinitions="_DEBUG;COGL_ENABLE_EXPERIMENTAL_API;$(TestProgDef)"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="2"
-				AdditionalDependencies="pango-1.0.lib cairo.lib atk-1.0.lib OpenGL32.lib"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				TargetMachine="1"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			ConfigurationType="1"
-			InheritedPropertySheets=".\clutter.vsprops"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				PreprocessorDefinitions="_DEBUG;COGL_ENABLE_EXPERIMENTAL_API;$(TestProgDef)"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="pango-1.0.lib cairo.lib atk-1.0.lib OpenGL32.lib"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="17"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			InheritedPropertySheets=".\clutter.vsprops"
-			ConfigurationType="1"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				EnableIntrinsicFunctions="true"
-				PreprocessorDefinitions="COGL_ENABLE_EXPERIMENTAL_API;$(TestProgDef)"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="1"
-				AdditionalDependencies="pango-1.0.lib cairo.lib atk-1.0.lib OpenGL32.lib"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			ConfigurationType="1"
-			InheritedPropertySheets=".\clutter.vsprops"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				PreprocessorDefinitions="COGL_ENABLE_EXPERIMENTAL_API;$(TestProgDef)"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="pango-1.0.lib cairo.lib atk-1.0.lib OpenGL32.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="17"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Sources"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-#include "testconformance.sourcefiles"
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/build/win32/vs9/test-interactive-clutter.vcprojin b/build/win32/vs9/test-interactive-clutter.vcprojin
index b283debdd..f5add5279 100644
--- a/build/win32/vs9/test-interactive-clutter.vcprojin
+++ b/build/win32/vs9/test-interactive-clutter.vcprojin
@@ -21,7 +21,7 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			InheritedPropertySheets=".\clutter.vsprops"
+			InheritedPropertySheets=".\clutter-build-defines.vsprops"
 			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\obj\test-interactive"
 			ConfigurationType="1"
 			CharacterSet="2"
@@ -53,7 +53,7 @@
 		<Configuration
 			Name="Debug|x64"
 			ConfigurationType="1"
-			InheritedPropertySheets=".\clutter.vsprops"
+			InheritedPropertySheets=".\clutter-build-defines.vsprops"
 			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\obj\test-interactive"
 			CharacterSet="2"
 			>
@@ -86,7 +86,7 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			InheritedPropertySheets=".\clutter.vsprops"
+			InheritedPropertySheets=".\clutter-build-defines.vsprops"
 			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\obj\test-interactive"
 			ConfigurationType="1"
 			CharacterSet="2"
@@ -121,7 +121,7 @@
 		<Configuration
 			Name="Release|x64"
 			ConfigurationType="1"
-			InheritedPropertySheets=".\clutter.vsprops"
+			InheritedPropertySheets=".\clutter-build-defines.vsprops"
 			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\obj\test-interactive"
 			CharacterSet="2"
 			WholeProgramOptimization="1"
diff --git a/build/win32/vs9/test-picking-performance.vcproj b/build/win32/vs9/test-picking-performance.vcproj
index 2abeedd3f..9fa7b6071 100644
--- a/build/win32/vs9/test-picking-performance.vcproj
+++ b/build/win32/vs9/test-picking-performance.vcproj
@@ -1,166 +1,166 @@
-<?xml version="1.0" encoding="big5"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="test-picking-performance"
-	ProjectGUID="{2035D56A-E748-475F-B3D5-C123BF652143}"
-	RootNamespace="testpickingperformance"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="196613"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			InheritedPropertySheets=".\clutter.vsprops"
-			ConfigurationType="1"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				PreprocessorDefinitions="_DEBUG;$(TestPerfProgDef)"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				TargetMachine="1"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			ConfigurationType="1"
-			InheritedPropertySheets=".\clutter.vsprops"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				PreprocessorDefinitions="_DEBUG;$(TestPerfProgDef)"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies=""
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="17"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			InheritedPropertySheets=".\clutter.vsprops"
-			ConfigurationType="1"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				EnableIntrinsicFunctions="true"
-				PreprocessorDefinitions="$(TestPerfProgDef)"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			ConfigurationType="1"
-			InheritedPropertySheets=".\clutter.vsprops"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				PreprocessorDefinitions="$(TestPerfProgDef)"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies=""
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="17"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Sources"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File RelativePath="..\..\..\tests\performance\test-picking.c" />
-		</Filter>
-		<Filter
-			Name="Headers"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File RelativePath="..\..\..\tests\performance\test-common.h" />
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
+<?xml version="1.0" encoding="big5"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9.00"
+	Name="test-picking-performance"
+	ProjectGUID="{2035D56A-E748-475F-B3D5-C123BF652143}"
+	RootNamespace="testpickingperformance"
+	Keyword="Win32Proj"
+	TargetFrameworkVersion="196613"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+		<Platform
+			Name="x64"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			InheritedPropertySheets=".\clutter-build-defines.vsprops"
+			ConfigurationType="1"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				PreprocessorDefinitions="_DEBUG;$(TestPerfProgDef)"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="4"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				LinkIncremental="2"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				TargetMachine="1"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|x64"
+			ConfigurationType="1"
+			InheritedPropertySheets=".\clutter-build-defines.vsprops"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				PreprocessorDefinitions="_DEBUG;$(TestPerfProgDef)"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+				CompileAs="1"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies=""
+				LinkIncremental="2"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="17"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			InheritedPropertySheets=".\clutter-build-defines.vsprops"
+			ConfigurationType="1"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				EnableIntrinsicFunctions="true"
+				PreprocessorDefinitions="$(TestPerfProgDef)"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				LinkIncremental="1"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|x64"
+			ConfigurationType="1"
+			InheritedPropertySheets=".\clutter-build-defines.vsprops"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				PreprocessorDefinitions="$(TestPerfProgDef)"
+				RuntimeLibrary="2"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+				CompileAs="1"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies=""
+				LinkIncremental="1"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="17"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Sources"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File RelativePath="..\..\..\tests\performance\test-picking.c" />
+		</Filter>
+		<Filter
+			Name="Headers"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File RelativePath="..\..\..\tests\performance\test-common.h" />
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/build/win32/vs9/test-picking.vcproj b/build/win32/vs9/test-picking.vcproj
index 7caf1a542..f635e9cea 100644
--- a/build/win32/vs9/test-picking.vcproj
+++ b/build/win32/vs9/test-picking.vcproj
@@ -21,7 +21,7 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			InheritedPropertySheets=".\clutter.vsprops"
+			InheritedPropertySheets=".\clutter-build-defines.vsprops"
 			ConfigurationType="1"
 			CharacterSet="2"
 			>
@@ -31,7 +31,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				PreprocessorDefinitions="_DEBUG;$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings)"
+				PreprocessorDefinitions="_DEBUG;$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);$(AvoidSDLMain)"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -51,7 +51,7 @@
 		<Configuration
 			Name="Debug|x64"
 			ConfigurationType="1"
-			InheritedPropertySheets=".\clutter.vsprops"
+			InheritedPropertySheets=".\clutter-build-defines.vsprops"
 			CharacterSet="2"
 			>
 			<Tool
@@ -60,7 +60,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				PreprocessorDefinitions="_DEBUG;$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings)"
+				PreprocessorDefinitions="_DEBUG;$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);$(AvoidSDLMain)"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -82,7 +82,7 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			InheritedPropertySheets=".\clutter.vsprops"
+			InheritedPropertySheets=".\clutter-build-defines.vsprops"
 			ConfigurationType="1"
 			CharacterSet="2"
 			WholeProgramOptimization="1"
@@ -94,7 +94,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
-				PreprocessorDefinitions="$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings)"
+				PreprocessorDefinitions="$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);$(AvoidSDLMain)"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="0"
@@ -114,7 +114,7 @@
 		<Configuration
 			Name="Release|x64"
 			ConfigurationType="1"
-			InheritedPropertySheets=".\clutter.vsprops"
+			InheritedPropertySheets=".\clutter-build-defines.vsprops"
 			CharacterSet="2"
 			WholeProgramOptimization="1"
 			>
@@ -123,7 +123,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				PreprocessorDefinitions="$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings)"
+				PreprocessorDefinitions="$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);$(AvoidSDLMain)"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
diff --git a/build/win32/vs9/test-random-text.vcproj b/build/win32/vs9/test-random-text.vcproj
index 05cbdde17..f8b5d8e4f 100644
--- a/build/win32/vs9/test-random-text.vcproj
+++ b/build/win32/vs9/test-random-text.vcproj
@@ -21,7 +21,7 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			InheritedPropertySheets=".\clutter.vsprops"
+			InheritedPropertySheets=".\clutter-build-defines.vsprops"
 			ConfigurationType="1"
 			CharacterSet="2"
 			>
@@ -31,7 +31,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				PreprocessorDefinitions="_DEBUG;$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings)"
+				PreprocessorDefinitions="_DEBUG;$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);$(AvoidSDLMain)"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -50,7 +50,7 @@
 		<Configuration
 			Name="Debug|x64"
 			ConfigurationType="1"
-			InheritedPropertySheets=".\clutter.vsprops"
+			InheritedPropertySheets=".\clutter-build-defines.vsprops"
 			CharacterSet="2"
 			>
 			<Tool
@@ -59,7 +59,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				PreprocessorDefinitions="_DEBUG;$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings)"
+				PreprocessorDefinitions="_DEBUG;$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);$(AvoidSDLMain)"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -81,7 +81,7 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			InheritedPropertySheets=".\clutter.vsprops"
+			InheritedPropertySheets=".\clutter-build-defines.vsprops"
 			ConfigurationType="1"
 			CharacterSet="2"
 			WholeProgramOptimization="1"
@@ -93,7 +93,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
-				PreprocessorDefinitions="$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings)"
+				PreprocessorDefinitions="$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);$(AvoidSDLMain)"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="0"
@@ -113,7 +113,7 @@
 		<Configuration
 			Name="Release|x64"
 			ConfigurationType="1"
-			InheritedPropertySheets=".\clutter.vsprops"
+			InheritedPropertySheets=".\clutter-build-defines.vsprops"
 			CharacterSet="2"
 			WholeProgramOptimization="1"
 			>
@@ -122,7 +122,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				PreprocessorDefinitions="$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings)"
+				PreprocessorDefinitions="$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);$(AvoidSDLMain)"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
diff --git a/build/win32/vs9/test-state-hidden-performance.vcproj b/build/win32/vs9/test-state-hidden-performance.vcproj
index 271691904..8fe32b736 100644
--- a/build/win32/vs9/test-state-hidden-performance.vcproj
+++ b/build/win32/vs9/test-state-hidden-performance.vcproj
@@ -1,166 +1,166 @@
-<?xml version="1.0" encoding="big5"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="test-state-hidden-performance"
-	ProjectGUID="{2D60135E-2E37-4F54-A1C5-43BCD5BBBA4F}"
-	RootNamespace="teststatehiddenperformance"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="196613"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			InheritedPropertySheets=".\clutter.vsprops"
-			ConfigurationType="1"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				PreprocessorDefinitions="_DEBUG;$(TestPerfProgDef)"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				TargetMachine="1"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			ConfigurationType="1"
-			InheritedPropertySheets=".\clutter.vsprops"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				PreprocessorDefinitions="_DEBUG;$(TestPerfProgDef)"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies=""
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="17"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			InheritedPropertySheets=".\clutter.vsprops"
-			ConfigurationType="1"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				EnableIntrinsicFunctions="true"
-				PreprocessorDefinitions="$(TestPerfProgDef)"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			ConfigurationType="1"
-			InheritedPropertySheets=".\clutter.vsprops"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				PreprocessorDefinitions="$(TestPerfProgDef)"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies=""
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="17"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Sources"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File RelativePath="..\..\..\tests\performance\test-state-hidden.c" />
-		</Filter>
-		<Filter
-			Name="Headers"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File RelativePath="..\..\..\tests\performance\test-common.h" />
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
+<?xml version="1.0" encoding="big5"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9.00"
+	Name="test-state-hidden-performance"
+	ProjectGUID="{2D60135E-2E37-4F54-A1C5-43BCD5BBBA4F}"
+	RootNamespace="teststatehiddenperformance"
+	Keyword="Win32Proj"
+	TargetFrameworkVersion="196613"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+		<Platform
+			Name="x64"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			InheritedPropertySheets=".\clutter-build-defines.vsprops"
+			ConfigurationType="1"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				PreprocessorDefinitions="_DEBUG;$(TestPerfProgDef)"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="4"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				LinkIncremental="2"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				TargetMachine="1"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|x64"
+			ConfigurationType="1"
+			InheritedPropertySheets=".\clutter-build-defines.vsprops"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				PreprocessorDefinitions="_DEBUG;$(TestPerfProgDef)"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+				CompileAs="1"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies=""
+				LinkIncremental="2"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="17"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			InheritedPropertySheets=".\clutter-build-defines.vsprops"
+			ConfigurationType="1"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				EnableIntrinsicFunctions="true"
+				PreprocessorDefinitions="$(TestPerfProgDef)"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				LinkIncremental="1"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|x64"
+			ConfigurationType="1"
+			InheritedPropertySheets=".\clutter-build-defines.vsprops"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				PreprocessorDefinitions="$(TestPerfProgDef)"
+				RuntimeLibrary="2"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+				CompileAs="1"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies=""
+				LinkIncremental="1"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="17"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Sources"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File RelativePath="..\..\..\tests\performance\test-state-hidden.c" />
+		</Filter>
+		<Filter
+			Name="Headers"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File RelativePath="..\..\..\tests\performance\test-common.h" />
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/build/win32/vs9/test-state-interactive-performance.vcproj b/build/win32/vs9/test-state-interactive-performance.vcproj
index 8dd2989b9..2f4d01121 100644
--- a/build/win32/vs9/test-state-interactive-performance.vcproj
+++ b/build/win32/vs9/test-state-interactive-performance.vcproj
@@ -1,166 +1,166 @@
-<?xml version="1.0" encoding="big5"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="test-state-interactive-performance"
-	ProjectGUID="{011F9197-F986-44BD-A8F2-045C746B1B70}"
-	RootNamespace="teststateinteractiveperformance"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="196613"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			InheritedPropertySheets=".\clutter.vsprops"
-			ConfigurationType="1"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				PreprocessorDefinitions="_DEBUG;$(TestPerfProgDef)"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				TargetMachine="1"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			ConfigurationType="1"
-			InheritedPropertySheets=".\clutter.vsprops"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				PreprocessorDefinitions="_DEBUG;$(TestPerfProgDef)"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies=""
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="17"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			InheritedPropertySheets=".\clutter.vsprops"
-			ConfigurationType="1"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				EnableIntrinsicFunctions="true"
-				PreprocessorDefinitions="$(TestPerfProgDef)"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			ConfigurationType="1"
-			InheritedPropertySheets=".\clutter.vsprops"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				PreprocessorDefinitions="$(TestPerfProgDef)"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies=""
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="17"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Sources"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File RelativePath="..\..\..\tests\performance\test-state-interactive.c" />
-		</Filter>
-		<Filter
-			Name="Headers"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File RelativePath="..\..\..\tests\performance\test-common.h" />
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
+<?xml version="1.0" encoding="big5"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9.00"
+	Name="test-state-interactive-performance"
+	ProjectGUID="{011F9197-F986-44BD-A8F2-045C746B1B70}"
+	RootNamespace="teststateinteractiveperformance"
+	Keyword="Win32Proj"
+	TargetFrameworkVersion="196613"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+		<Platform
+			Name="x64"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			InheritedPropertySheets=".\clutter-build-defines.vsprops"
+			ConfigurationType="1"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				PreprocessorDefinitions="_DEBUG;$(TestPerfProgDef)"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="4"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				LinkIncremental="2"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				TargetMachine="1"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|x64"
+			ConfigurationType="1"
+			InheritedPropertySheets=".\clutter-build-defines.vsprops"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				PreprocessorDefinitions="_DEBUG;$(TestPerfProgDef)"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+				CompileAs="1"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies=""
+				LinkIncremental="2"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="17"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			InheritedPropertySheets=".\clutter-build-defines.vsprops"
+			ConfigurationType="1"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				EnableIntrinsicFunctions="true"
+				PreprocessorDefinitions="$(TestPerfProgDef)"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				LinkIncremental="1"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|x64"
+			ConfigurationType="1"
+			InheritedPropertySheets=".\clutter-build-defines.vsprops"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				PreprocessorDefinitions="$(TestPerfProgDef)"
+				RuntimeLibrary="2"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+				CompileAs="1"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies=""
+				LinkIncremental="1"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="17"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Sources"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File RelativePath="..\..\..\tests\performance\test-state-interactive.c" />
+		</Filter>
+		<Filter
+			Name="Headers"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File RelativePath="..\..\..\tests\performance\test-common.h" />
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/build/win32/vs9/test-state-mini-performance.vcproj b/build/win32/vs9/test-state-mini-performance.vcproj
index efdf2889c..7c9f8380a 100644
--- a/build/win32/vs9/test-state-mini-performance.vcproj
+++ b/build/win32/vs9/test-state-mini-performance.vcproj
@@ -1,166 +1,166 @@
-<?xml version="1.0" encoding="big5"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="test-state-mini-performance"
-	ProjectGUID="{D4A09850-E35B-4124-A9FF-784AB5BBCD2C}"
-	RootNamespace="teststateminiperformance"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="196613"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			InheritedPropertySheets=".\clutter.vsprops"
-			ConfigurationType="1"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				PreprocessorDefinitions="_DEBUG;$(TestPerfProgDef)"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				TargetMachine="1"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			ConfigurationType="1"
-			InheritedPropertySheets=".\clutter.vsprops"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				PreprocessorDefinitions="_DEBUG;$(TestPerfProgDef)"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies=""
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="17"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			InheritedPropertySheets=".\clutter.vsprops"
-			ConfigurationType="1"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				EnableIntrinsicFunctions="true"
-				PreprocessorDefinitions="$(TestPerfProgDef)"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			ConfigurationType="1"
-			InheritedPropertySheets=".\clutter.vsprops"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				PreprocessorDefinitions="$(TestPerfProgDef)"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies=""
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="17"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Sources"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File RelativePath="..\..\..\tests\performance\test-state-mini.c" />
-		</Filter>
-		<Filter
-			Name="Headers"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File RelativePath="..\..\..\tests\performance\test-common.h" />
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
+<?xml version="1.0" encoding="big5"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9.00"
+	Name="test-state-mini-performance"
+	ProjectGUID="{D4A09850-E35B-4124-A9FF-784AB5BBCD2C}"
+	RootNamespace="teststateminiperformance"
+	Keyword="Win32Proj"
+	TargetFrameworkVersion="196613"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+		<Platform
+			Name="x64"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			InheritedPropertySheets=".\clutter-build-defines.vsprops"
+			ConfigurationType="1"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				PreprocessorDefinitions="_DEBUG;$(TestPerfProgDef)"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="4"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				LinkIncremental="2"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				TargetMachine="1"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|x64"
+			ConfigurationType="1"
+			InheritedPropertySheets=".\clutter-build-defines.vsprops"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				PreprocessorDefinitions="_DEBUG;$(TestPerfProgDef)"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+				CompileAs="1"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies=""
+				LinkIncremental="2"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="17"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			InheritedPropertySheets=".\clutter-build-defines.vsprops"
+			ConfigurationType="1"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				EnableIntrinsicFunctions="true"
+				PreprocessorDefinitions="$(TestPerfProgDef)"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				LinkIncremental="1"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|x64"
+			ConfigurationType="1"
+			InheritedPropertySheets=".\clutter-build-defines.vsprops"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				PreprocessorDefinitions="$(TestPerfProgDef)"
+				RuntimeLibrary="2"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+				CompileAs="1"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies=""
+				LinkIncremental="1"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="17"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Sources"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File RelativePath="..\..\..\tests\performance\test-state-mini.c" />
+		</Filter>
+		<Filter
+			Name="Headers"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File RelativePath="..\..\..\tests\performance\test-common.h" />
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/build/win32/vs9/test-state-performance.vcproj b/build/win32/vs9/test-state-performance.vcproj
index 784cfb961..71f5c4219 100644
--- a/build/win32/vs9/test-state-performance.vcproj
+++ b/build/win32/vs9/test-state-performance.vcproj
@@ -1,166 +1,166 @@
-<?xml version="1.0" encoding="big5"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="test-state-performance"
-	ProjectGUID="{BEE86058-B4BF-4AA5-91BF-E3620538ED5E}"
-	RootNamespace="teststateperformance"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="196613"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			InheritedPropertySheets=".\clutter.vsprops"
-			ConfigurationType="1"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				PreprocessorDefinitions="_DEBUG;$(TestPerfProgDef)"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				TargetMachine="1"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			ConfigurationType="1"
-			InheritedPropertySheets=".\clutter.vsprops"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				PreprocessorDefinitions="_DEBUG;$(TestPerfProgDef)"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies=""
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="17"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			InheritedPropertySheets=".\clutter.vsprops"
-			ConfigurationType="1"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				EnableIntrinsicFunctions="true"
-				PreprocessorDefinitions="$(TestPerfProgDef)"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			ConfigurationType="1"
-			InheritedPropertySheets=".\clutter.vsprops"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				PreprocessorDefinitions="$(TestPerfProgDef)"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies=""
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="17"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Sources"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File RelativePath="..\..\..\tests\performance\test-state.c" />
-		</Filter>
-		<Filter
-			Name="Headers"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File RelativePath="..\..\..\tests\performance\test-common.h" />
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
+<?xml version="1.0" encoding="big5"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9.00"
+	Name="test-state-performance"
+	ProjectGUID="{BEE86058-B4BF-4AA5-91BF-E3620538ED5E}"
+	RootNamespace="teststateperformance"
+	Keyword="Win32Proj"
+	TargetFrameworkVersion="196613"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+		<Platform
+			Name="x64"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			InheritedPropertySheets=".\clutter-build-defines.vsprops"
+			ConfigurationType="1"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				PreprocessorDefinitions="_DEBUG;$(TestPerfProgDef)"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="4"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				LinkIncremental="2"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				TargetMachine="1"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|x64"
+			ConfigurationType="1"
+			InheritedPropertySheets=".\clutter-build-defines.vsprops"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				PreprocessorDefinitions="_DEBUG;$(TestPerfProgDef)"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+				CompileAs="1"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies=""
+				LinkIncremental="2"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="17"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			InheritedPropertySheets=".\clutter-build-defines.vsprops"
+			ConfigurationType="1"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				EnableIntrinsicFunctions="true"
+				PreprocessorDefinitions="$(TestPerfProgDef)"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				LinkIncremental="1"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|x64"
+			ConfigurationType="1"
+			InheritedPropertySheets=".\clutter-build-defines.vsprops"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				PreprocessorDefinitions="$(TestPerfProgDef)"
+				RuntimeLibrary="2"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+				CompileAs="1"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies=""
+				LinkIncremental="1"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="17"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Sources"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File RelativePath="..\..\..\tests\performance\test-state.c" />
+		</Filter>
+		<Filter
+			Name="Headers"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File RelativePath="..\..\..\tests\performance\test-common.h" />
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/build/win32/vs9/test-state-pick-performance.vcproj b/build/win32/vs9/test-state-pick-performance.vcproj
index b8bc4578e..5775970b8 100644
--- a/build/win32/vs9/test-state-pick-performance.vcproj
+++ b/build/win32/vs9/test-state-pick-performance.vcproj
@@ -1,166 +1,166 @@
-<?xml version="1.0" encoding="big5"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="test-state-pick-performance"
-	ProjectGUID="{0C1E8E6C-1563-4F95-A994-6366EE992CB3}"
-	RootNamespace="teststatepickperformance"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="196613"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			InheritedPropertySheets=".\clutter.vsprops"
-			ConfigurationType="1"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				PreprocessorDefinitions="_DEBUG;$(TestPerfProgDef)"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				TargetMachine="1"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			ConfigurationType="1"
-			InheritedPropertySheets=".\clutter.vsprops"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				PreprocessorDefinitions="_DEBUG;$(TestPerfProgDef)"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies=""
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="17"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			InheritedPropertySheets=".\clutter.vsprops"
-			ConfigurationType="1"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				EnableIntrinsicFunctions="true"
-				PreprocessorDefinitions="$(TestPerfProgDef)"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			ConfigurationType="1"
-			InheritedPropertySheets=".\clutter.vsprops"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				PreprocessorDefinitions="$(TestPerfProgDef)"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies=""
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="17"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Sources"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File RelativePath="..\..\..\tests\performance\test-state-pick.c" />
-		</Filter>
-		<Filter
-			Name="Headers"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File RelativePath="..\..\..\tests\performance\test-common.h" />
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
+<?xml version="1.0" encoding="big5"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9.00"
+	Name="test-state-pick-performance"
+	ProjectGUID="{0C1E8E6C-1563-4F95-A994-6366EE992CB3}"
+	RootNamespace="teststatepickperformance"
+	Keyword="Win32Proj"
+	TargetFrameworkVersion="196613"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+		<Platform
+			Name="x64"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			InheritedPropertySheets=".\clutter-build-defines.vsprops"
+			ConfigurationType="1"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				PreprocessorDefinitions="_DEBUG;$(TestPerfProgDef)"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="4"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				LinkIncremental="2"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				TargetMachine="1"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|x64"
+			ConfigurationType="1"
+			InheritedPropertySheets=".\clutter-build-defines.vsprops"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				PreprocessorDefinitions="_DEBUG;$(TestPerfProgDef)"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+				CompileAs="1"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies=""
+				LinkIncremental="2"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="17"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			InheritedPropertySheets=".\clutter-build-defines.vsprops"
+			ConfigurationType="1"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				EnableIntrinsicFunctions="true"
+				PreprocessorDefinitions="$(TestPerfProgDef)"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				LinkIncremental="1"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|x64"
+			ConfigurationType="1"
+			InheritedPropertySheets=".\clutter-build-defines.vsprops"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				PreprocessorDefinitions="$(TestPerfProgDef)"
+				RuntimeLibrary="2"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+				CompileAs="1"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies=""
+				LinkIncremental="1"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="17"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Sources"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File RelativePath="..\..\..\tests\performance\test-state-pick.c" />
+		</Filter>
+		<Filter
+			Name="Headers"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File RelativePath="..\..\..\tests\performance\test-common.h" />
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/build/win32/vs9/test-text-perf-performance.vcproj b/build/win32/vs9/test-text-perf-performance.vcproj
index 71c3e84a7..3c0afe6aa 100644
--- a/build/win32/vs9/test-text-perf-performance.vcproj
+++ b/build/win32/vs9/test-text-perf-performance.vcproj
@@ -1,166 +1,166 @@
-<?xml version="1.0" encoding="big5"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="test-text-perf-performance"
-	ProjectGUID="{8AF1EA8E-305B-42C0-919D-12B1843B21A4}"
-	RootNamespace="testtextperfperformance"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="196613"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			InheritedPropertySheets=".\clutter.vsprops"
-			ConfigurationType="1"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				PreprocessorDefinitions="_DEBUG;$(TestPerfProgDef)"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				TargetMachine="1"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			ConfigurationType="1"
-			InheritedPropertySheets=".\clutter.vsprops"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				PreprocessorDefinitions="_DEBUG;$(TestPerfProgDef)"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies=""
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="17"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			InheritedPropertySheets=".\clutter.vsprops"
-			ConfigurationType="1"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				EnableIntrinsicFunctions="true"
-				PreprocessorDefinitions="$(TestPerfProgDef)"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			ConfigurationType="1"
-			InheritedPropertySheets=".\clutter.vsprops"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				PreprocessorDefinitions="$(TestPerfProgDef)"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies=""
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="17"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Sources"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File RelativePath="..\..\..\tests\performance\test-text-perf.c" />
-		</Filter>
-		<Filter
-			Name="Headers"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File RelativePath="..\..\..\tests\performance\test-common.h" />
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
+<?xml version="1.0" encoding="big5"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9.00"
+	Name="test-text-perf-performance"
+	ProjectGUID="{8AF1EA8E-305B-42C0-919D-12B1843B21A4}"
+	RootNamespace="testtextperfperformance"
+	Keyword="Win32Proj"
+	TargetFrameworkVersion="196613"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+		<Platform
+			Name="x64"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			InheritedPropertySheets=".\clutter-build-defines.vsprops"
+			ConfigurationType="1"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				PreprocessorDefinitions="_DEBUG;$(TestPerfProgDef)"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="4"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				LinkIncremental="2"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				TargetMachine="1"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|x64"
+			ConfigurationType="1"
+			InheritedPropertySheets=".\clutter-build-defines.vsprops"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				PreprocessorDefinitions="_DEBUG;$(TestPerfProgDef)"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+				CompileAs="1"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies=""
+				LinkIncremental="2"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="17"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			InheritedPropertySheets=".\clutter-build-defines.vsprops"
+			ConfigurationType="1"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				EnableIntrinsicFunctions="true"
+				PreprocessorDefinitions="$(TestPerfProgDef)"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				LinkIncremental="1"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|x64"
+			ConfigurationType="1"
+			InheritedPropertySheets=".\clutter-build-defines.vsprops"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				PreprocessorDefinitions="$(TestPerfProgDef)"
+				RuntimeLibrary="2"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+				CompileAs="1"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies=""
+				LinkIncremental="1"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="17"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Sources"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File RelativePath="..\..\..\tests\performance\test-text-perf.c" />
+		</Filter>
+		<Filter
+			Name="Headers"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File RelativePath="..\..\..\tests\performance\test-common.h" />
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/build/win32/vs9/test-text-perf.vcproj b/build/win32/vs9/test-text-perf.vcproj
index 09288051f..385451410 100644
--- a/build/win32/vs9/test-text-perf.vcproj
+++ b/build/win32/vs9/test-text-perf.vcproj
@@ -21,7 +21,7 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			InheritedPropertySheets=".\clutter.vsprops"
+			InheritedPropertySheets=".\clutter-build-defines.vsprops"
 			ConfigurationType="1"
 			CharacterSet="2"
 			>
@@ -31,7 +31,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				PreprocessorDefinitions="_DEBUG;$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings)"
+				PreprocessorDefinitions="_DEBUG;$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);$(AvoidSDLMain)"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -50,7 +50,7 @@
 		<Configuration
 			Name="Debug|x64"
 			ConfigurationType="1"
-			InheritedPropertySheets=".\clutter.vsprops"
+			InheritedPropertySheets=".\clutter-build-defines.vsprops"
 			CharacterSet="2"
 			>
 			<Tool
@@ -59,7 +59,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				PreprocessorDefinitions="_DEBUG;$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings)"
+				PreprocessorDefinitions="_DEBUG;$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);$(AvoidSDLMain)"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -81,7 +81,7 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			InheritedPropertySheets=".\clutter.vsprops"
+			InheritedPropertySheets=".\clutter-build-defines.vsprops"
 			ConfigurationType="1"
 			CharacterSet="2"
 			WholeProgramOptimization="1"
@@ -93,7 +93,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
-				PreprocessorDefinitions="$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings)"
+				PreprocessorDefinitions="$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);$(AvoidSDLMain)"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="0"
@@ -113,7 +113,7 @@
 		<Configuration
 			Name="Release|x64"
 			ConfigurationType="1"
-			InheritedPropertySheets=".\clutter.vsprops"
+			InheritedPropertySheets=".\clutter-build-defines.vsprops"
 			CharacterSet="2"
 			WholeProgramOptimization="1"
 			>
@@ -122,7 +122,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				PreprocessorDefinitions="$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings)"
+				PreprocessorDefinitions="$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);$(AvoidSDLMain)"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
diff --git a/build/win32/vs9/test-text.vcproj b/build/win32/vs9/test-text.vcproj
index 2fe2c1735..56f5a3d12 100644
--- a/build/win32/vs9/test-text.vcproj
+++ b/build/win32/vs9/test-text.vcproj
@@ -21,7 +21,7 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			InheritedPropertySheets=".\clutter.vsprops"
+			InheritedPropertySheets=".\clutter-build-defines.vsprops"
 			ConfigurationType="1"
 			CharacterSet="2"
 			>
@@ -31,7 +31,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				PreprocessorDefinitions="_DEBUG;$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings)"
+				PreprocessorDefinitions="_DEBUG;$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);$(AvoidSDLMain)"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -50,7 +50,7 @@
 		<Configuration
 			Name="Debug|x64"
 			ConfigurationType="1"
-			InheritedPropertySheets=".\clutter.vsprops"
+			InheritedPropertySheets=".\clutter-build-defines.vsprops"
 			CharacterSet="2"
 			>
 			<Tool
@@ -59,7 +59,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				PreprocessorDefinitions="_DEBUG;$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings)"
+				PreprocessorDefinitions="_DEBUG;$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);$(AvoidSDLMain)"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -81,7 +81,7 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			InheritedPropertySheets=".\clutter.vsprops"
+			InheritedPropertySheets=".\clutter-build-defines.vsprops"
 			ConfigurationType="1"
 			CharacterSet="2"
 			WholeProgramOptimization="1"
@@ -93,7 +93,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
-				PreprocessorDefinitions="$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings)"
+				PreprocessorDefinitions="$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);$(AvoidSDLMain)"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="0"
@@ -113,7 +113,7 @@
 		<Configuration
 			Name="Release|x64"
 			ConfigurationType="1"
-			InheritedPropertySheets=".\clutter.vsprops"
+			InheritedPropertySheets=".\clutter-build-defines.vsprops"
 			CharacterSet="2"
 			WholeProgramOptimization="1"
 			>
@@ -122,7 +122,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				PreprocessorDefinitions="$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings)"
+				PreprocessorDefinitions="$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);$(AvoidSDLMain)"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
diff --git a/clutter.doap b/clutter.doap
index 19938fbe2..309500456 100644
--- a/clutter.doap
+++ b/clutter.doap
@@ -7,6 +7,7 @@
 
   <name>Clutter</name>
   <shortname>clutter</shortname>
+  <category rdf:resource="http://api.gnome.org/doap-extensions#core" />
 
   <shortdesc xml:lang="en">A toolkit for creating fast, portable, compelling dynamic UIs</shortdesc>
 
diff --git a/clutter/Makefile.am b/clutter/Makefile.am
index c0d3d5a74..d04dc6f54 100644
--- a/clutter/Makefile.am
+++ b/clutter/Makefile.am
@@ -1,3 +1,5 @@
+AUTOMAKE_OPTIONS = subdir-objects
+
 include $(top_srcdir)/build/autotools/Makefile.am.silent
 
 # preamble
@@ -11,14 +13,6 @@ BUILT_SOURCES =
 
 lib_LTLIBRARIES =
 
-INCLUDES = \
-	-I$(top_srcdir) 				\
-	-I$(top_srcdir)/clutter				\
-	-I$(top_srcdir)/clutter/cally			\
-	-I$(top_builddir)				\
-	-I$(top_builddir)/clutter			\
-	$(NULL)
-
 AM_CPPFLAGS = \
 	-DCLUTTER_PREFIX=\""$(prefix)"\"	\
 	-DCLUTTER_LIBDIR=\""$(libdir)"\"	\
@@ -27,10 +21,17 @@ AM_CPPFLAGS = \
 	-DCLUTTER_SYSCONFDIR=\""$(sysconfdir)"\" \
 	-DCLUTTER_COMPILATION=1			\
 	-DCOGL_ENABLE_EXPERIMENTAL_API		\
+	-DCOGL_DISABLE_DEPRECATION_WARNINGS	\
 	-DG_LOG_DOMAIN=\"Clutter\" 		\
+	-I$(top_srcdir) 			\
+	-I$(top_srcdir)/clutter			\
+	-I$(top_srcdir)/clutter/cally		\
+	-I$(top_builddir)			\
+	-I$(top_builddir)/clutter		\
 	$(CLUTTER_DEPRECATED_CFLAGS)		\
 	$(CLUTTER_DEBUG_CFLAGS)			\
 	$(CLUTTER_PROFILE_CFLAGS)		\
+	$(CLUTTER_HIDDEN_VISIBILITY_CFLAGS)	\
 	$(NULL)
 
 AM_CFLAGS = $(CLUTTER_CFLAGS) $(MAINTAINER_CFLAGS)
@@ -48,285 +49,288 @@ pc_files =
 
 # common sources - please, keep these sorted alphabetically
 source_h =					\
-	$(srcdir)/clutter-action.h		\
-	$(srcdir)/clutter-actor-meta.h		\
-	$(srcdir)/clutter-actor.h		\
-	$(srcdir)/clutter-align-constraint.h	\
-	$(srcdir)/clutter-animatable.h          \
-	$(srcdir)/clutter-backend.h		\
-	$(srcdir)/clutter-bind-constraint.h	\
-	$(srcdir)/clutter-binding-pool.h 	\
-	$(srcdir)/clutter-bin-layout.h		\
-	$(srcdir)/clutter-blur-effect.h		\
-	$(srcdir)/clutter-box-layout.h		\
-	$(srcdir)/clutter-brightness-contrast-effect.h	\
-	$(srcdir)/clutter-cairo.h		\
-	$(srcdir)/clutter-canvas.h		\
-	$(srcdir)/clutter-child-meta.h		\
-	$(srcdir)/clutter-click-action.h	\
-	$(srcdir)/clutter-cogl-compat.h 	\
-	$(srcdir)/clutter-clone.h		\
-	$(srcdir)/clutter-color-static.h	\
-	$(srcdir)/clutter-color.h		\
-	$(srcdir)/clutter-colorize-effect.h	\
-	$(srcdir)/clutter-constraint.h		\
-	$(srcdir)/clutter-container.h		\
-	$(srcdir)/clutter-content.h		\
-	$(srcdir)/clutter-deform-effect.h	\
-	$(srcdir)/clutter-deprecated.h		\
-	$(srcdir)/clutter-desaturate-effect.h	\
-	$(srcdir)/clutter-device-manager.h	\
-	$(srcdir)/clutter-drag-action.h		\
-	$(srcdir)/clutter-drop-action.h		\
-	$(srcdir)/clutter-effect.h		\
-	$(srcdir)/clutter-enums.h		\
-	$(srcdir)/clutter-event.h 		\
-	$(srcdir)/clutter-feature.h 		\
-	$(srcdir)/clutter-fixed-layout.h	\
-	$(srcdir)/clutter-flow-layout.h		\
-	$(srcdir)/clutter-gesture-action.h 	\
-	$(srcdir)/clutter-grid-layout.h 	\
-	$(srcdir)/clutter-group.h 		\
-	$(srcdir)/clutter-image.h		\
-	$(srcdir)/clutter-input-device.h	\
-        $(srcdir)/clutter-interval.h            \
-	$(srcdir)/clutter-keyframe-transition.h	\
-	$(srcdir)/clutter-keysyms.h 		\
-	$(srcdir)/clutter-layout-manager.h	\
-	$(srcdir)/clutter-layout-meta.h		\
-	$(srcdir)/clutter-list-model.h		\
-	$(srcdir)/clutter-macros.h		\
-	$(srcdir)/clutter-main.h		\
-	$(srcdir)/clutter-model.h		\
-	$(srcdir)/clutter-offscreen-effect.h	\
-	$(srcdir)/clutter-page-turn-effect.h	\
-	$(srcdir)/clutter-paint-nodes.h		\
-	$(srcdir)/clutter-paint-node.h		\
-	$(srcdir)/clutter-pan-action.h		\
-	$(srcdir)/clutter-path-constraint.h	\
-	$(srcdir)/clutter-path.h		\
-	$(srcdir)/clutter-property-transition.h	\
-	$(srcdir)/clutter-rotate-action.h	\
-	$(srcdir)/clutter-script.h		\
-	$(srcdir)/clutter-scriptable.h		\
-	$(srcdir)/clutter-scroll-actor.h	\
-	$(srcdir)/clutter-settings.h		\
-	$(srcdir)/clutter-shader-effect.h	\
-	$(srcdir)/clutter-shader-types.h	\
-	$(srcdir)/clutter-swipe-action.h	\
-	$(srcdir)/clutter-snap-constraint.h	\
-	$(srcdir)/clutter-stage.h 		\
-	$(srcdir)/clutter-stage-manager.h	\
-	$(srcdir)/clutter-table-layout.h	\
-	$(srcdir)/clutter-tap-action.h		\
-	$(srcdir)/clutter-texture.h 		\
-	$(srcdir)/clutter-text.h		\
-	$(srcdir)/clutter-text-buffer.h		\
-	$(srcdir)/clutter-timeline.h 		\
-	$(srcdir)/clutter-transition-group.h	\
-	$(srcdir)/clutter-transition.h		\
-	$(srcdir)/clutter-types.h		\
-	$(srcdir)/clutter-units.h 		\
-	$(srcdir)/clutter-zoom-action.h		\
+	clutter-action.h		\
+	clutter-actor-meta.h		\
+	clutter-actor.h		\
+	clutter-align-constraint.h	\
+	clutter-animatable.h          \
+	clutter-backend.h		\
+	clutter-bind-constraint.h	\
+	clutter-binding-pool.h 	\
+	clutter-bin-layout.h		\
+	clutter-blur-effect.h		\
+	clutter-box-layout.h		\
+	clutter-brightness-contrast-effect.h	\
+	clutter-cairo.h		\
+	clutter-canvas.h		\
+	clutter-child-meta.h		\
+	clutter-click-action.h	\
+	clutter-cogl-compat.h 	\
+	clutter-clone.h		\
+	clutter-color-static.h	\
+	clutter-color.h		\
+	clutter-colorize-effect.h	\
+	clutter-constraint.h		\
+	clutter-container.h		\
+	clutter-content.h		\
+	clutter-deform-effect.h	\
+	clutter-deprecated.h		\
+	clutter-desaturate-effect.h	\
+	clutter-device-manager.h	\
+	clutter-drag-action.h		\
+	clutter-drop-action.h		\
+	clutter-effect.h		\
+	clutter-enums.h		\
+	clutter-event.h 		\
+	clutter-feature.h 		\
+	clutter-fixed-layout.h	\
+	clutter-flow-layout.h		\
+	clutter-gesture-action.h 	\
+	clutter-grid-layout.h 	\
+	clutter-group.h 		\
+	clutter-image.h		\
+	clutter-input-device.h	\
+        clutter-interval.h            \
+	clutter-keyframe-transition.h	\
+	clutter-keysyms.h 		\
+	clutter-layout-manager.h	\
+	clutter-layout-meta.h		\
+	clutter-list-model.h		\
+	clutter-macros.h		\
+	clutter-main.h		\
+	clutter-model.h		\
+	clutter-offscreen-effect.h	\
+	clutter-page-turn-effect.h	\
+	clutter-paint-nodes.h		\
+	clutter-paint-node.h		\
+	clutter-pan-action.h		\
+	clutter-path-constraint.h	\
+	clutter-path.h		\
+	clutter-property-transition.h	\
+	clutter-rotate-action.h	\
+	clutter-script.h		\
+	clutter-scriptable.h		\
+	clutter-scroll-actor.h	\
+	clutter-settings.h		\
+	clutter-shader-effect.h	\
+	clutter-shader-types.h	\
+	clutter-swipe-action.h	\
+	clutter-snap-constraint.h	\
+	clutter-stage.h 		\
+	clutter-stage-manager.h	\
+	clutter-tap-action.h		\
+	clutter-test-utils.h		\
+	clutter-texture.h 		\
+	clutter-text.h		\
+	clutter-text-buffer.h		\
+	clutter-timeline.h 		\
+	clutter-transition-group.h	\
+	clutter-transition.h		\
+	clutter-types.h		\
+	clutter-units.h 		\
+	clutter-zoom-action.h		\
 	$(NULL)
 
 source_c = \
-	$(srcdir)/clutter-action.c		\
-	$(srcdir)/clutter-actor-box.c		\
-	$(srcdir)/clutter-actor-meta.c		\
-	$(srcdir)/clutter-actor.c		\
-	$(srcdir)/clutter-align-constraint.c	\
-	$(srcdir)/clutter-animatable.c		\
-	$(srcdir)/clutter-backend.c		\
-	$(srcdir)/clutter-base-types.c		\
-	$(srcdir)/clutter-bezier.c		\
-	$(srcdir)/clutter-bind-constraint.c	\
-	$(srcdir)/clutter-binding-pool.c	\
-	$(srcdir)/clutter-bin-layout.c		\
-	$(srcdir)/clutter-blur-effect.c		\
-	$(srcdir)/clutter-box-layout.c		\
-	$(srcdir)/clutter-brightness-contrast-effect.c	\
-	$(srcdir)/clutter-cairo.c		\
-	$(srcdir)/clutter-canvas.c		\
-	$(srcdir)/clutter-child-meta.c		\
-	$(srcdir)/clutter-click-action.c	\
-	$(srcdir)/clutter-clone.c		\
-	$(srcdir)/clutter-color.c 		\
-	$(srcdir)/clutter-colorize-effect.c	\
-	$(srcdir)/clutter-constraint.c		\
-	$(srcdir)/clutter-container.c		\
-	$(srcdir)/clutter-content.c		\
-	$(srcdir)/clutter-deform-effect.c	\
-	$(srcdir)/clutter-desaturate-effect.c	\
-	$(srcdir)/clutter-device-manager.c	\
-	$(srcdir)/clutter-drag-action.c		\
-	$(srcdir)/clutter-drop-action.c		\
-	$(srcdir)/clutter-effect.c		\
-	$(srcdir)/clutter-event.c 		\
-	$(srcdir)/clutter-feature.c 		\
-	$(srcdir)/clutter-fixed-layout.c	\
-	$(srcdir)/clutter-flatten-effect.c	\
-	$(srcdir)/clutter-flow-layout.c		\
-	$(srcdir)/clutter-gesture-action.c 	\
-	$(srcdir)/clutter-grid-layout.c 	\
-	$(srcdir)/clutter-image.c		\
-	$(srcdir)/clutter-input-device.c	\
-	$(srcdir)/clutter-interval.c            \
-	$(srcdir)/clutter-keyframe-transition.c	\
-	$(srcdir)/clutter-keysyms-table.c	\
-	$(srcdir)/clutter-layout-manager.c	\
-	$(srcdir)/clutter-layout-meta.c		\
-	$(srcdir)/clutter-list-model.c		\
-	$(srcdir)/clutter-main.c 		\
-	$(srcdir)/clutter-master-clock.c	\
-	$(srcdir)/clutter-model.c		\
-	$(srcdir)/clutter-offscreen-effect.c	\
-	$(srcdir)/clutter-page-turn-effect.c	\
-	$(srcdir)/clutter-paint-nodes.c		\
-	$(srcdir)/clutter-paint-node.c		\
-	$(srcdir)/clutter-pan-action.c		\
-	$(srcdir)/clutter-path-constraint.c	\
-	$(srcdir)/clutter-path.c		\
-	$(srcdir)/clutter-property-transition.c	\
-	$(srcdir)/clutter-rotate-action.c	\
-	$(srcdir)/clutter-script.c		\
-	$(srcdir)/clutter-script-parser.c	\
-	$(srcdir)/clutter-scriptable.c		\
-	$(srcdir)/clutter-scroll-actor.c	\
-	$(srcdir)/clutter-settings.c		\
-	$(srcdir)/clutter-shader-effect.c	\
-	$(srcdir)/clutter-shader-types.c	\
-	$(srcdir)/clutter-swipe-action.c	\
-	$(srcdir)/clutter-snap-constraint.c	\
-	$(srcdir)/clutter-stage.c		\
-	$(srcdir)/clutter-stage-manager.c	\
-	$(srcdir)/clutter-stage-window.c	\
-	$(srcdir)/clutter-table-layout.c	\
-	$(srcdir)/clutter-tap-action.c		\
-	$(srcdir)/clutter-text.c		\
-	$(srcdir)/clutter-text-buffer.c		\
-	$(srcdir)/clutter-transition-group.c	\
-	$(srcdir)/clutter-transition.c		\
-	$(srcdir)/clutter-timeline.c 		\
-	$(srcdir)/clutter-units.c		\
-	$(srcdir)/clutter-util.c 		\
-	$(srcdir)/clutter-paint-volume.c 	\
-	$(srcdir)/clutter-zoom-action.c 	\
+	clutter-action.c		\
+	clutter-actor-box.c		\
+	clutter-actor-meta.c		\
+	clutter-actor.c		\
+	clutter-align-constraint.c	\
+	clutter-animatable.c		\
+	clutter-backend.c		\
+	clutter-base-types.c		\
+	clutter-bezier.c		\
+	clutter-bind-constraint.c	\
+	clutter-binding-pool.c	\
+	clutter-bin-layout.c		\
+	clutter-blur-effect.c		\
+	clutter-box-layout.c		\
+	clutter-brightness-contrast-effect.c	\
+	clutter-cairo.c		\
+	clutter-canvas.c		\
+	clutter-child-meta.c		\
+	clutter-click-action.c	\
+	clutter-clone.c		\
+	clutter-color.c 		\
+	clutter-colorize-effect.c	\
+	clutter-constraint.c		\
+	clutter-container.c		\
+	clutter-content.c		\
+	clutter-deform-effect.c	\
+	clutter-desaturate-effect.c	\
+	clutter-device-manager.c	\
+	clutter-drag-action.c		\
+	clutter-drop-action.c		\
+	clutter-effect.c		\
+	clutter-event.c 		\
+	clutter-feature.c 		\
+	clutter-fixed-layout.c	\
+	clutter-flatten-effect.c	\
+	clutter-flow-layout.c		\
+	clutter-gesture-action.c 	\
+	clutter-grid-layout.c 	\
+	clutter-image.c		\
+	clutter-input-device.c	\
+	clutter-interval.c            \
+	clutter-keyframe-transition.c	\
+	clutter-keysyms-table.c	\
+	clutter-layout-manager.c	\
+	clutter-layout-meta.c		\
+	clutter-list-model.c		\
+	clutter-main.c 		\
+	clutter-master-clock.c	\
+	clutter-model.c		\
+	clutter-offscreen-effect.c	\
+	clutter-page-turn-effect.c	\
+	clutter-paint-nodes.c		\
+	clutter-paint-node.c		\
+	clutter-pan-action.c		\
+	clutter-path-constraint.c	\
+	clutter-path.c		\
+	clutter-property-transition.c	\
+	clutter-rotate-action.c	\
+	clutter-script.c		\
+	clutter-script-parser.c	\
+	clutter-scriptable.c		\
+	clutter-scroll-actor.c	\
+	clutter-settings.c		\
+	clutter-shader-effect.c	\
+	clutter-shader-types.c	\
+	clutter-swipe-action.c	\
+	clutter-snap-constraint.c	\
+	clutter-stage.c		\
+	clutter-stage-manager.c	\
+	clutter-stage-window.c	\
+	clutter-tap-action.c		\
+	clutter-test-utils.c		\
+	clutter-text.c		\
+	clutter-text-buffer.c		\
+	clutter-transition-group.c	\
+	clutter-transition.c		\
+	clutter-timeline.c 		\
+	clutter-units.c		\
+	clutter-util.c 		\
+	clutter-paint-volume.c 	\
+	clutter-zoom-action.c 	\
 	$(NULL)
 
 # private headers; these should not be distributed or introspected
 source_h_priv = \
-	$(srcdir)/clutter-actor-meta-private.h		\
-	$(srcdir)/clutter-actor-private.h		\
-	$(srcdir)/clutter-backend-private.h		\
-	$(srcdir)/clutter-bezier.h			\
-	$(srcdir)/clutter-content-private.h		\
-	$(srcdir)/clutter-debug.h 			\
-	$(srcdir)/clutter-device-manager-private.h	\
-	$(srcdir)/clutter-easing.h			\
-	$(srcdir)/clutter-effect-private.h		\
-	$(srcdir)/clutter-event-translator.h		\
-	$(srcdir)/clutter-event-private.h		\
-	$(srcdir)/clutter-flatten-effect.h		\
-	$(srcdir)/clutter-gesture-action-private.h	\
-	$(srcdir)/clutter-id-pool.h 			\
-	$(srcdir)/clutter-master-clock.h		\
-	$(srcdir)/clutter-model-private.h		\
-	$(srcdir)/clutter-offscreen-effect-private.h	\
-	$(srcdir)/clutter-paint-node-private.h		\
-	$(srcdir)/clutter-paint-volume-private.h	\
-	$(srcdir)/clutter-private.h 			\
-	$(srcdir)/clutter-profile.h			\
-	$(srcdir)/clutter-script-private.h		\
-	$(srcdir)/clutter-settings-private.h		\
-	$(srcdir)/clutter-stage-manager-private.h	\
-	$(srcdir)/clutter-stage-private.h		\
-	$(srcdir)/clutter-stage-window.h		\
+	clutter-actor-meta-private.h		\
+	clutter-actor-private.h			\
+	clutter-backend-private.h		\
+	clutter-bezier.h			\
+	clutter-constraint-private.h		\
+	clutter-content-private.h		\
+	clutter-debug.h 			\
+	clutter-device-manager-private.h	\
+	clutter-easing.h			\
+	clutter-effect-private.h		\
+	clutter-event-translator.h		\
+	clutter-event-private.h			\
+	clutter-flatten-effect.h		\
+	clutter-gesture-action-private.h	\
+	clutter-id-pool.h 			\
+	clutter-master-clock.h			\
+	clutter-model-private.h			\
+	clutter-offscreen-effect-private.h	\
+	clutter-paint-node-private.h		\
+	clutter-paint-volume-private.h		\
+	clutter-private.h 			\
+	clutter-profile.h			\
+	clutter-script-private.h		\
+	clutter-settings-private.h		\
+	clutter-stage-manager-private.h		\
+	clutter-stage-private.h			\
+	clutter-stage-window.h			\
 	$(NULL)
 
 # private source code; these should not be introspected
 source_c_priv = \
-	$(srcdir)/clutter-easing.c		\
-	$(srcdir)/clutter-event-translator.c	\
-	$(srcdir)/clutter-id-pool.c 		\
-	$(srcdir)/clutter-profile.c		\
+	clutter-easing.c		\
+	clutter-event-translator.c	\
+	clutter-id-pool.c 		\
+	clutter-profile.c		\
 	$(NULL)
 
 # deprecated installed headers
 deprecated_h = \
-	$(srcdir)/deprecated/clutter-actor.h			\
-	$(srcdir)/deprecated/clutter-alpha.h 			\
-	$(srcdir)/deprecated/clutter-animatable.h		\
-	$(srcdir)/deprecated/clutter-animation.h		\
-	$(srcdir)/deprecated/clutter-animator.h			\
-	$(srcdir)/deprecated/clutter-backend.h			\
-	$(srcdir)/deprecated/clutter-behaviour.h 		\
-	$(srcdir)/deprecated/clutter-behaviour-depth.h 		\
-	$(srcdir)/deprecated/clutter-behaviour-ellipse.h	\
-	$(srcdir)/deprecated/clutter-behaviour-opacity.h 	\
-	$(srcdir)/deprecated/clutter-behaviour-path.h 		\
-	$(srcdir)/deprecated/clutter-behaviour-rotate.h 	\
-	$(srcdir)/deprecated/clutter-behaviour-scale.h 		\
-	$(srcdir)/deprecated/clutter-bin-layout.h		\
-	$(srcdir)/deprecated/clutter-box.h			\
-	$(srcdir)/deprecated/clutter-cairo-texture.h		\
-	$(srcdir)/deprecated/clutter-container.h		\
-	$(srcdir)/deprecated/clutter-fixed.h			\
-	$(srcdir)/deprecated/clutter-frame-source.h		\
-	$(srcdir)/deprecated/clutter-group.h			\
-	$(srcdir)/deprecated/clutter-input-device.h		\
-	$(srcdir)/deprecated/clutter-keysyms.h			\
-	$(srcdir)/deprecated/clutter-main.h			\
-	$(srcdir)/deprecated/clutter-media.h			\
-	$(srcdir)/deprecated/clutter-rectangle.h		\
-	$(srcdir)/deprecated/clutter-score.h 			\
-	$(srcdir)/deprecated/clutter-shader.h 			\
-	$(srcdir)/deprecated/clutter-stage-manager.h		\
-	$(srcdir)/deprecated/clutter-stage.h			\
-	$(srcdir)/deprecated/clutter-state.h			\
-	$(srcdir)/deprecated/clutter-texture.h			\
-	$(srcdir)/deprecated/clutter-timeline.h 		\
-	$(srcdir)/deprecated/clutter-timeout-pool.h 		\
-	$(srcdir)/deprecated/clutter-util.h 			\
+	deprecated/clutter-actor.h			\
+	deprecated/clutter-alpha.h 			\
+	deprecated/clutter-animatable.h		\
+	deprecated/clutter-animation.h		\
+	deprecated/clutter-animator.h			\
+	deprecated/clutter-backend.h			\
+	deprecated/clutter-behaviour.h 		\
+	deprecated/clutter-behaviour-depth.h 		\
+	deprecated/clutter-behaviour-ellipse.h	\
+	deprecated/clutter-behaviour-opacity.h 	\
+	deprecated/clutter-behaviour-path.h 		\
+	deprecated/clutter-behaviour-rotate.h 	\
+	deprecated/clutter-behaviour-scale.h 		\
+	deprecated/clutter-bin-layout.h		\
+	deprecated/clutter-box.h			\
+	deprecated/clutter-cairo-texture.h		\
+	deprecated/clutter-container.h		\
+	deprecated/clutter-fixed.h			\
+	deprecated/clutter-frame-source.h		\
+	deprecated/clutter-group.h			\
+	deprecated/clutter-input-device.h		\
+	deprecated/clutter-keysyms.h			\
+	deprecated/clutter-main.h			\
+	deprecated/clutter-media.h			\
+	deprecated/clutter-rectangle.h		\
+	deprecated/clutter-score.h 			\
+	deprecated/clutter-shader.h 			\
+	deprecated/clutter-stage-manager.h		\
+	deprecated/clutter-stage.h			\
+	deprecated/clutter-state.h			\
+	deprecated/clutter-table-layout.h		\
+	deprecated/clutter-texture.h			\
+	deprecated/clutter-timeline.h 		\
+	deprecated/clutter-timeout-pool.h 		\
+	deprecated/clutter-util.h 			\
 	$(NULL)
 
 # deprecated source code
 deprecated_c = \
-	$(srcdir)/deprecated/clutter-actor-deprecated.c		\
-	$(srcdir)/deprecated/clutter-alpha.c 			\
-	$(srcdir)/deprecated/clutter-animation.c		\
-	$(srcdir)/deprecated/clutter-animator.c			\
-	$(srcdir)/deprecated/clutter-behaviour.c 		\
-	$(srcdir)/deprecated/clutter-behaviour-depth.c		\
-	$(srcdir)/deprecated/clutter-behaviour-ellipse.c	\
-	$(srcdir)/deprecated/clutter-behaviour-opacity.c	\
-	$(srcdir)/deprecated/clutter-behaviour-path.c		\
-	$(srcdir)/deprecated/clutter-behaviour-rotate.c		\
-	$(srcdir)/deprecated/clutter-behaviour-scale.c		\
-	$(srcdir)/deprecated/clutter-box.c			\
-	$(srcdir)/deprecated/clutter-cairo-texture.c		\
-	$(srcdir)/deprecated/clutter-fixed.c			\
-	$(srcdir)/deprecated/clutter-frame-source.c		\
-	$(srcdir)/deprecated/clutter-group.c 			\
-	$(srcdir)/deprecated/clutter-input-device-deprecated.c	\
-	$(srcdir)/deprecated/clutter-layout-manager-deprecated.c \
-	$(srcdir)/deprecated/clutter-media.c			\
-	$(srcdir)/deprecated/clutter-rectangle.c 		\
-	$(srcdir)/deprecated/clutter-score.c 			\
-	$(srcdir)/deprecated/clutter-shader.c 			\
-	$(srcdir)/deprecated/clutter-state.c			\
-	$(srcdir)/deprecated/clutter-texture.c 			\
-	$(srcdir)/deprecated/clutter-timeout-pool.c		\
+	deprecated/clutter-actor-deprecated.c		\
+	deprecated/clutter-alpha.c 			\
+	deprecated/clutter-animation.c		\
+	deprecated/clutter-animator.c			\
+	deprecated/clutter-behaviour.c 		\
+	deprecated/clutter-behaviour-depth.c		\
+	deprecated/clutter-behaviour-ellipse.c	\
+	deprecated/clutter-behaviour-opacity.c	\
+	deprecated/clutter-behaviour-path.c		\
+	deprecated/clutter-behaviour-rotate.c		\
+	deprecated/clutter-behaviour-scale.c		\
+	deprecated/clutter-box.c			\
+	deprecated/clutter-cairo-texture.c		\
+	deprecated/clutter-fixed.c			\
+	deprecated/clutter-frame-source.c		\
+	deprecated/clutter-group.c 			\
+	deprecated/clutter-input-device-deprecated.c	\
+	deprecated/clutter-layout-manager-deprecated.c \
+	deprecated/clutter-media.c			\
+	deprecated/clutter-rectangle.c 		\
+	deprecated/clutter-score.c 			\
+	deprecated/clutter-shader.c 			\
+	deprecated/clutter-state.c			\
+	deprecated/clutter-table-layout.c		\
+	deprecated/clutter-texture.c 			\
+	deprecated/clutter-timeout-pool.c		\
 	$(NULL)
 
 # deprecated private headers; these should not be installed
 deprecated_h_priv = \
-	$(srcdir)/deprecated/clutter-timeout-interval.h	\
+	deprecated/clutter-timeout-interval.h	\
 	$(NULL)
 
 # deprecated private source code; these should not be introspected
 deprecated_c_priv = \
-	$(srcdir)/deprecated/clutter-timeout-interval.c	\
+	deprecated/clutter-timeout-interval.c	\
 	$(NULL)
 
 # built sources
@@ -383,45 +387,45 @@ backend_source_built =
 
 # X11 backend rules
 x11_source_c = \
-	$(srcdir)/x11/clutter-backend-x11.c		\
-	$(srcdir)/x11/clutter-device-manager-core-x11.c	\
-	$(srcdir)/x11/clutter-event-x11.c		\
-	$(srcdir)/x11/clutter-input-device-core-x11.c	\
-	$(srcdir)/x11/clutter-keymap-x11.c		\
-	$(srcdir)/x11/clutter-stage-x11.c		\
-	$(srcdir)/x11/clutter-x11-texture-pixmap.c	\
+	x11/clutter-backend-x11.c		\
+	x11/clutter-device-manager-core-x11.c	\
+	x11/clutter-event-x11.c		\
+	x11/clutter-input-device-core-x11.c	\
+	x11/clutter-keymap-x11.c		\
+	x11/clutter-stage-x11.c		\
+	x11/clutter-x11-texture-pixmap.c	\
 	$(NULL)
 
 x11_source_h = \
-	$(srcdir)/x11/clutter-x11.h			\
-	$(srcdir)/x11/clutter-x11-texture-pixmap.h	\
+	x11/clutter-x11.h			\
+	x11/clutter-x11-texture-pixmap.h	\
 	$(NULL)
 
 x11_source_h_priv = \
-	$(srcdir)/x11/clutter-backend-x11.h		\
-	$(srcdir)/x11/clutter-device-manager-core-x11.h	\
-	$(srcdir)/x11/clutter-input-device-core-x11.h	\
-	$(srcdir)/x11/clutter-keymap-x11.h		\
-	$(srcdir)/x11/clutter-settings-x11.h		\
-	$(srcdir)/x11/clutter-stage-x11.h		\
+	x11/clutter-backend-x11.h		\
+	x11/clutter-device-manager-core-x11.h	\
+	x11/clutter-input-device-core-x11.h	\
+	x11/clutter-keymap-x11.h		\
+	x11/clutter-settings-x11.h		\
+	x11/clutter-stage-x11.h		\
 	$(NULL)
 
 x11_source_c_priv = \
-	$(srcdir)/x11/xsettings/xsettings-client.c	\
-	$(srcdir)/x11/xsettings/xsettings-client.h	\
-	$(srcdir)/x11/xsettings/xsettings-common.c	\
-	$(srcdir)/x11/xsettings/xsettings-common.h	\
+	x11/xsettings/xsettings-client.c	\
+	x11/xsettings/xsettings-client.h	\
+	x11/xsettings/xsettings-common.c	\
+	x11/xsettings/xsettings-common.h	\
 	$(NULL)
 
 if BUILD_XI2
 x11_source_c += \
-	$(srcdir)/x11/clutter-device-manager-xi2.c	\
-	$(srcdir)/x11/clutter-input-device-xi2.c	\
+	x11/clutter-device-manager-xi2.c	\
+	x11/clutter-input-device-xi2.c	\
 	$(NULL)
 
 x11_source_h_priv += \
-	$(srcdir)/x11/clutter-device-manager-xi2.h	\
-	$(srcdir)/x11/clutter-input-device-xi2.h	\
+	x11/clutter-device-manager-xi2.h	\
+	x11/clutter-input-device-xi2.h	\
 	$(NULL)
 endif # BUILD_XI2
 
@@ -447,11 +451,11 @@ endif # SUPPORT_X11
 cogl_source_h =
 
 cogl_source_c = \
-	$(srcdir)/cogl/clutter-stage-cogl.c	\
+	cogl/clutter-stage-cogl.c	\
 	$(NULL)
 
 cogl_source_h_priv = \
-	$(srcdir)/cogl/clutter-stage-cogl.h	\
+	cogl/clutter-stage-cogl.h	\
 	$(NULL)
 
 cogl_source_c_priv =
@@ -473,9 +477,9 @@ endif
 #
 # Note: there wasn't actually anything GLX specific so we can add
 # the compatibility if clutter supports x11
-glx_source_c = $(srcdir)/x11/clutter-glx-texture-pixmap.c
-glx_source_h = $(srcdir)/x11/clutter-glx-texture-pixmap.h \
-	       $(srcdir)/x11/clutter-glx.h
+glx_source_c = x11/clutter-glx-texture-pixmap.c
+glx_source_h = x11/clutter-glx-texture-pixmap.h \
+	       x11/clutter-glx.h
 
 if SUPPORT_X11
 backend_source_h += $(glx_source_h)
@@ -496,23 +500,23 @@ endif
 
 # GDK backend rules
 gdk_source_c = \
-	$(srcdir)/gdk/clutter-backend-gdk.c 		\
-	$(srcdir)/gdk/clutter-device-manager-gdk.c 	\
-	$(srcdir)/gdk/clutter-input-device-gdk.c 	\
-	$(srcdir)/gdk/clutter-event-gdk.c 		\
-	$(srcdir)/gdk/clutter-stage-gdk.c		\
+	gdk/clutter-backend-gdk.c 		\
+	gdk/clutter-device-manager-gdk.c 	\
+	gdk/clutter-input-device-gdk.c 	\
+	gdk/clutter-event-gdk.c 		\
+	gdk/clutter-stage-gdk.c		\
 	$(NULL)
 
 gdk_source_h = \
-	$(srcdir)/gdk/clutter-gdk.h			\
+	gdk/clutter-gdk.h			\
 	$(NULL)
 
 gdk_source_h_priv = \
-	$(srcdir)/gdk/clutter-settings-gdk.h		\
-	$(srcdir)/gdk/clutter-backend-gdk.h 		\
-	$(srcdir)/gdk/clutter-device-manager-gdk.h 	\
-	$(srcdir)/gdk/clutter-input-device-gdk.h 	\
-	$(srcdir)/gdk/clutter-stage-gdk.h		\
+	gdk/clutter-settings-gdk.h		\
+	gdk/clutter-backend-gdk.h 		\
+	gdk/clutter-device-manager-gdk.h 	\
+	gdk/clutter-input-device-gdk.h 	\
+	gdk/clutter-stage-gdk.h		\
 	$(NULL)
 
 if SUPPORT_GDK
@@ -533,20 +537,20 @@ endif # SUPPORT_GDK
 
 # Windows backend rules
 win32_source_c = \
-	$(srcdir)/win32/clutter-backend-win32.c		\
-	$(srcdir)/win32/clutter-device-manager-win32.c	\
-	$(srcdir)/win32/clutter-event-win32.c		\
-	$(srcdir)/win32/clutter-stage-win32.c		\
+	win32/clutter-backend-win32.c		\
+	win32/clutter-device-manager-win32.c	\
+	win32/clutter-event-win32.c		\
+	win32/clutter-stage-win32.c		\
 	$(NULL)
 
 win32_source_h = \
-	$(srcdir)/win32/clutter-win32.h			\
+	win32/clutter-win32.h			\
 	$(NULL)
 
 win32_source_h_priv = \
-	$(srcdir)/win32/clutter-backend-win32.h		\
-	$(srcdir)/win32/clutter-device-manager-win32.h	\
-	$(srcdir)/win32/clutter-stage-win32.h		\
+	win32/clutter-backend-win32.h		\
+	win32/clutter-device-manager-win32.h	\
+	win32/clutter-stage-win32.h		\
 	$(NULL)
 
 if SUPPORT_WIN32
@@ -559,7 +563,7 @@ if SUPPORT_WIN32
 	mkdir -p win32
 	$(WINDRES) -I$(srcdir)/win32 $< $@
 
-win32/resources.o : $(srcdir)/win32/invisible-cursor.cur
+win32/resources.o : win32/invisible-cursor.cur
 
 win32_resources = win32/resources.o
 win32_resources_ldflag = -Wl,win32/resources.o
@@ -578,12 +582,12 @@ pc_files += clutter-win32-$(CLUTTER_API_VERSION).pc
 endif # SUPPORT_WIN32
 
 EXTRA_DIST += \
-	$(srcdir)/win32/invisible-cursor.cur 	\
-	$(srcdir)/win32/resources.rc		\
+	win32/invisible-cursor.cur 	\
+	win32/resources.rc		\
 	$(NULL)
 
-egl_tslib_h = $(srcdir)/tslib/clutter-event-tslib.h
-egl_tslib_c = $(srcdir)/tslib/clutter-event-tslib.c
+egl_tslib_h = tslib/clutter-event-tslib.h
+egl_tslib_c = tslib/clutter-event-tslib.c
 
 if USE_TSLIB
 backend_source_c_priv += $(egl_tslib_c)
@@ -591,14 +595,14 @@ backend_source_h_priv += $(egl_tslib_h)
 endif # SUPPORT_TSLIB
 
 evdev_c_priv = \
-	$(srcdir)/evdev/clutter-device-manager-evdev.c	\
-	$(srcdir)/evdev/clutter-input-device-evdev.c	\
+	evdev/clutter-device-manager-evdev.c	\
+	evdev/clutter-input-device-evdev.c	\
 	$(NULL)
 evdev_h_priv = \
-	$(srcdir)/evdev/clutter-device-manager-evdev.h	\
-	$(srcdir)/evdev/clutter-input-device-evdev.h	\
+	evdev/clutter-device-manager-evdev.h	\
+	evdev/clutter-input-device-evdev.h	\
 	$(NULL)
-evdev_h = $(srcdir)/evdev/clutter-evdev.h
+evdev_h = evdev/clutter-evdev.h
 
 if USE_EVDEV
 backend_source_c_priv += $(evdev_c_priv)
@@ -610,12 +614,12 @@ clutterevdev_include_HEADERS = $(evdev_h)
 endif # SUPPORT_EVDEV
 
 if NEED_XKB_UTILS
-backend_source_c += $(srcdir)/evdev/clutter-xkb-utils.c
-backend_source_h_priv += $(srcdir)/evdev/clutter-xkb-utils.h
+backend_source_c += evdev/clutter-xkb-utils.c
+backend_source_h_priv += evdev/clutter-xkb-utils.h
 endif
 
-cex_source_h_priv = $(srcdir)/cex100/clutter-backend-cex100.h
-cex_source_c = $(srcdir)/cex100/clutter-backend-cex100.c
+cex_source_h_priv = cex100/clutter-backend-cex100.h
+cex_source_c = cex100/clutter-backend-cex100.c
 cex_h = cex100/clutter-cex100.h
 BUILT_SOURCES += $(cex_h)
 EXTRA_DIST += $(srcdir)/$(cex_h).in
@@ -640,33 +644,33 @@ endif # SUPPORT_CEX100
 
 # EGL backend rules
 egl_source_h = \
-	$(srcdir)/egl/clutter-egl-headers.h	\
-	$(srcdir)/egl/clutter-egl.h		\
+	egl/clutter-egl-headers.h	\
+	egl/clutter-egl.h		\
 	$(NULL)
 
-egl_source_h_priv = $(srcdir)/egl/clutter-backend-eglnative.h
-egl_source_c = $(srcdir)/egl/clutter-backend-eglnative.c
+egl_source_h_priv = egl/clutter-backend-eglnative.h egl/clutter-stage-eglnative.h
+egl_source_c = egl/clutter-backend-eglnative.c egl/clutter-stage-eglnative.c
 
 # Wayland backend rules
 if SUPPORT_WAYLAND
 backend_source_h_priv += \
-       $(srcdir)/wayland/clutter-backend-wayland.h             \
-       $(srcdir)/wayland/clutter-backend-wayland-priv.h        \
-       $(srcdir)/wayland/clutter-stage-wayland.h               \
-       $(srcdir)/wayland/clutter-event-wayland.h               \
-       $(srcdir)/wayland/clutter-input-device-wayland.h        \
-       $(srcdir)/wayland/clutter-device-manager-wayland.h
+       wayland/clutter-backend-wayland.h             \
+       wayland/clutter-backend-wayland-priv.h        \
+       wayland/clutter-stage-wayland.h               \
+       wayland/clutter-event-wayland.h               \
+       wayland/clutter-input-device-wayland.h        \
+       wayland/clutter-device-manager-wayland.h
 
 backend_source_c += \
-       $(srcdir)/wayland/clutter-backend-wayland.c             \
-       $(srcdir)/wayland/clutter-stage-wayland.c               \
-       $(srcdir)/wayland/clutter-event-wayland.c               \
-       $(srcdir)/wayland/clutter-input-device-wayland.c        \
-       $(srcdir)/wayland/clutter-device-manager-wayland.c
+       wayland/clutter-backend-wayland.c             \
+       wayland/clutter-stage-wayland.c               \
+       wayland/clutter-event-wayland.c               \
+       wayland/clutter-input-device-wayland.c        \
+       wayland/clutter-device-manager-wayland.c
 
 
 clutterwayland_includedir = $(clutter_includedir)/wayland
-clutterwayland_include_HEADERS = $(srcdir)/wayland/clutter-wayland.h
+clutterwayland_include_HEADERS = wayland/clutter-wayland.h
 
 clutter-wayland-$(CLUTTER_API_VERSION).pc: clutter-$(CLUTTER_API_VERSION).pc
 	$(QUIET_GEN)cp -f $< $(@F)
@@ -676,11 +680,11 @@ endif # SUPPORT_WAYLAND
 
 if SUPPORT_WAYLAND_COMPOSITOR
 wayland_compositor_source_h = \
-	$(srcdir)/wayland/clutter-wayland-compositor.h		\
-	$(srcdir)/wayland/clutter-wayland-surface.h
+	wayland/clutter-wayland-compositor.h		\
+	wayland/clutter-wayland-surface.h
 backend_source_h += $(wayland_compositor_source_h)
 backend_source_c += \
-	$(srcdir)/wayland/clutter-wayland-surface.c
+	wayland/clutter-wayland-surface.c
 
 wayland_compositor_includedir = $(clutter_includedir)/wayland
 wayland_compositor_include_HEADERS = $(wayland_compositor_source_h)
@@ -707,23 +711,23 @@ endif # SUPPORT_EGL
 
 # OSX backend rules
 osx_source_c = \
-	$(srcdir)/osx/clutter-backend-osx.c	\
-	$(srcdir)/osx/clutter-stage-osx.c	\
+	osx/clutter-backend-osx.c	\
+	osx/clutter-stage-osx.c	\
 	$(NULL)
 
-osx_source_h = $(srcdir)/osx/clutter-osx.h
+osx_source_h = osx/clutter-osx.h
 
 osx_source_h_priv = \
-	$(srcdir)/osx/clutter-backend-osx.h	\
-	$(srcdir)/osx/clutter-event-loop-osx.h	\
-	$(srcdir)/osx/clutter-stage-osx.h	\
-	$(srcdir)/osx/clutter-device-manager-osx.h \
+	osx/clutter-backend-osx.h	\
+	osx/clutter-event-loop-osx.h	\
+	osx/clutter-stage-osx.h	\
+	osx/clutter-device-manager-osx.h \
 	$(NULL)
 
 osx_source_c_priv = \
-	$(srcdir)/osx/clutter-event-loop-osx.c	\
-	$(srcdir)/osx/clutter-event-osx.c	\
-	$(srcdir)/osx/clutter-device-manager-osx.c \
+	osx/clutter-event-loop-osx.c	\
+	osx/clutter-event-osx.c	\
+	osx/clutter-device-manager-osx.c \
 	$(NULL)
 
 if SUPPORT_OSX
@@ -747,35 +751,35 @@ endif # SUPPORT_OSX
 
 # cally
 cally_sources_h = \
-	$(srcdir)/cally/cally-actor.h		\
-	$(srcdir)/cally/cally-clone.h		\
-	$(srcdir)/cally/cally-factory.h		\
-	$(srcdir)/cally/cally-group.h		\
-	$(srcdir)/cally/cally.h			\
-	$(srcdir)/cally/cally-main.h		\
-	$(srcdir)/cally/cally-rectangle.h	\
-	$(srcdir)/cally/cally-root.h		\
-	$(srcdir)/cally/cally-stage.h		\
-	$(srcdir)/cally/cally-text.h		\
-	$(srcdir)/cally/cally-texture.h		\
-	$(srcdir)/cally/cally-util.h		\
+	cally/cally-actor.h		\
+	cally/cally-clone.h		\
+	cally/cally-factory.h		\
+	cally/cally-group.h		\
+	cally/cally.h			\
+	cally/cally-main.h		\
+	cally/cally-rectangle.h	\
+	cally/cally-root.h		\
+	cally/cally-stage.h		\
+	cally/cally-text.h		\
+	cally/cally-texture.h		\
+	cally/cally-util.h		\
 	$(NULL)
 
 cally_sources_c = \
-	$(srcdir)/cally/cally-actor.c		\
-	$(srcdir)/cally/cally.c			\
-	$(srcdir)/cally/cally-clone.c		\
-	$(srcdir)/cally/cally-group.c		\
-	$(srcdir)/cally/cally-rectangle.c	\
-	$(srcdir)/cally/cally-root.c		\
-	$(srcdir)/cally/cally-stage.c		\
-	$(srcdir)/cally/cally-text.c		\
-	$(srcdir)/cally/cally-texture.c		\
-	$(srcdir)/cally/cally-util.c		\
+	cally/cally-actor.c		\
+	cally/cally.c			\
+	cally/cally-clone.c		\
+	cally/cally-group.c		\
+	cally/cally-rectangle.c	\
+	cally/cally-root.c		\
+	cally/cally-stage.c		\
+	cally/cally-text.c		\
+	cally/cally-texture.c		\
+	cally/cally-util.c		\
 	$(NULL)
 
 cally_sources_private = \
-	$(srcdir)/cally/cally-actor-private.h	\
+	cally/cally-actor-private.h	\
 	$(NULL)
 
 cally_includedir = $(clutter_base_includedir)/cally
@@ -795,7 +799,7 @@ include $(top_srcdir)/build/autotools/Makefile.am.marshal
 # glib-mkenums rules
 glib_enum_h = clutter-enum-types.h
 glib_enum_c = clutter-enum-types.c
-glib_enum_headers = $(source_h) $(backend_source_h)
+glib_enum_headers = $(source_h) $(deprecated_h) $(backend_source_h)
 include $(top_srcdir)/build/autotools/Makefile.am.enums
 
 pkgconfigdir = $(libdir)/pkgconfig
@@ -804,11 +808,11 @@ DISTCLEANFILES += $(pc_files)
 
 clutter_include_HEADERS = \
 	$(source_h) \
-	$(top_srcdir)/clutter/clutter.h \
-	$(top_builddir)/clutter/clutter-version.h
+	clutter.h \
+	clutter-version.h
 
 nodist_clutter_include_HEADERS = \
-	$(top_builddir)/clutter/clutter-config.h \
+	clutter-config.h \
 	$(built_source_h)
 
 clutter_deprecated_HEADERS = $(deprecated_h)
@@ -850,7 +854,6 @@ libclutter_@CLUTTER_API_VERSION@_la_LDFLAGS = \
 	$(CLUTTER_LINK_FLAGS) \
 	$(CLUTTER_LT_LDFLAGS) \
 	-export-dynamic \
-	-export-symbols-regex "^(clutter|cally).*" \
 	-rpath $(libdir) \
 	$(win32_resources_ldflag) \
 	$(NULL)
@@ -930,7 +933,6 @@ clutter.vsenums_c:
 EXTRA_DIST += \
 	clutter-config.h.win32	\
 	clutter-config.h.win32_GDK	\
-	clutter.symbols	\
 	$(NULL)
 
 # Let the VS9/VS10 Project files be cleared out before they are re-expanded...
@@ -970,7 +972,7 @@ Clutter_@CLUTTER_API_VERSION_AM@_gir_FILES = \
 	$(source_c) \
 	$(deprecated_c) \
 	$(built_source_c)
-Clutter_@CLUTTER_API_VERSION_AM@_gir_CFLAGS = $(INCLUDES) $(CLUTTER_CFLAGS) $(AM_CPPFLAGS)
+Clutter_@CLUTTER_API_VERSION_AM@_gir_CFLAGS = $(AM_CPPFLAGS) $(CLUTTER_CFLAGS)
 Clutter_@CLUTTER_API_VERSION_AM@_gir_INCLUDES = GL-1.0 GObject-2.0 cairo-1.0 Cogl-1.0 CoglPango-1.0 Atk-1.0 Json-1.0
 Clutter_@CLUTTER_API_VERSION_AM@_gir_SCANNERFLAGS = \
 	--warn-all \
@@ -985,7 +987,7 @@ Cally_@CLUTTER_API_VERSION_AM@_gir_NAMESPACE = Cally
 Cally_@CLUTTER_API_VERSION_AM@_gir_VERSION = @CLUTTER_API_VERSION@
 Cally_@CLUTTER_API_VERSION_AM@_gir_LIBS = libclutter-@CLUTTER_API_VERSION@.la
 Cally_@CLUTTER_API_VERSION_AM@_gir_FILES = $(cally_sources_h) $(cally_sources_c)
-Cally_@CLUTTER_API_VERSION_AM@_gir_CFLAGS = $(INCLUDES) $(CLUTTER_CFLAGS) $(AM_CPPFLAGS)
+Cally_@CLUTTER_API_VERSION_AM@_gir_CFLAGS = $(AM_CPPFLAGS) $(CLUTTER_CFLAGS)
 Cally_@CLUTTER_API_VERSION_AM@_gir_SCANNERFLAGS = \
 	--warn-all \
 	--identifier-prefix=Cally \
@@ -1009,7 +1011,7 @@ ClutterX11_@CLUTTER_API_VERSION_AM@_gir_SCANNERFLAGS = \
 ClutterX11_@CLUTTER_API_VERSION_AM@_gir_INCLUDES = xlib-2.0
 ClutterX11_@CLUTTER_API_VERSION_AM@_gir_LIBS = libclutter-@CLUTTER_API_VERSION@.la
 ClutterX11_@CLUTTER_API_VERSION_AM@_gir_FILES = $(x11_introspection)
-ClutterX11_@CLUTTER_API_VERSION_AM@_gir_CFLAGS = $(INCLUDES) $(CLUTTER_CFLAGS) $(AM_CPPFLAGS)
+ClutterX11_@CLUTTER_API_VERSION_AM@_gir_CFLAGS = $(AM_CPPFLAGS) $(CLUTTER_CFLAGS)
 
 INTROSPECTION_GIRS += ClutterX11-@CLUTTER_API_VERSION@.gir
 endif # SUPPORT_X11
@@ -1026,7 +1028,7 @@ ClutterGdk_@CLUTTER_API_VERSION_AM@_gir_SCANNERFLAGS = \
 ClutterGdk_@CLUTTER_API_VERSION_AM@_gir_INCLUDES = Gdk-3.0
 ClutterGdk_@CLUTTER_API_VERSION_AM@_gir_LIBS = libclutter-@CLUTTER_API_VERSION@.la
 ClutterGdk_@CLUTTER_API_VERSION_AM@_gir_FILES = $(gdk_introspection)
-ClutterGdk_@CLUTTER_API_VERSION_AM@_gir_CFLAGS = $(INCLUDES) $(CLUTTER_CFLAGS) $(AM_CPPFLAGS)
+ClutterGdk_@CLUTTER_API_VERSION_AM@_gir_CFLAGS = $(AM_CPPFLAGS) $(CLUTTER_CFLAGS)
 
 INTROSPECTION_GIRS += ClutterGdk-@CLUTTER_API_VERSION@.gir
 endif # SUPPORT_GDK
@@ -1041,21 +1043,3 @@ typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
 
 CLEANFILES += $(gir_DATA) $(typelib_DATA)
 endif # HAVE_INTROSPECTION
-
-# Test
-clutter_all_c_sources = \
-	$(backend_source_c) \
-	$(backend_source_c_priv) \
-	$(source_c) \
-	$(source_c_priv) \
-	$(deprecated_c) \
-	$(deprecated_c_priv) \
-	$(cally_sources_c) \
-	$(built_source_c)
-
-TESTS_ENVIRONMENT = srcdir="$(srcdir)" CLUTTER_BACKENDS="$(CLUTTER_BACKENDS)"
-if OS_LINUX
-TESTS = abicheck.sh
-endif
-
-EXTRA_DIST += abicheck.sh
diff --git a/clutter/abicheck.sh b/clutter/abicheck.sh
deleted file mode 100755
index 7106dd61a..000000000
--- a/clutter/abicheck.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#! /bin/sh
-
-has_x11_backend=no
-has_gdk_backend=no
-has_wayland_backend=no
-for backend in ${CLUTTER_BACKENDS}; do
-        case "$backend" in
-                x11) has_x11_backend=yes ;;
-                gdk) has_gdk_backend=yes ;;
-                wayland) has_wayland_backend=yes ;;
-        esac
-done
-
-cppargs="-DG_OS_UNIX"
-if [ $has_x11_backend = "yes" ]; then
-        cppargs="$cppargs -DCLUTTER_WINDOWING_X11 -DCLUTTER_WINDOWING_GLX"
-fi
-
-if [ $has_gdk_backend = "yes" ]; then
-        cppargs="$cppargs -DCLUTTER_WINDOWING_GDK"
-fi
-
-if [ $has_wayland_backend = "yes" ]; then
-        cppargs="$cppargs -DCLUTTER_WINDOWING_WAYLAND"
-fi
-
-cpp -P ${cppargs} ${srcdir:-.}/clutter.symbols | sed -e '/^$/d' -e 's/ G_GNUC.*$//' -e 's/ PRIVATE//' -e 's/ DATA//' | sort > expected-abi
-
-nm -D -g --defined-only .libs/libclutter-1.0.so | cut -d ' ' -f 3 | egrep -v '^(__bss_start|_edata|_end)' | sort > actual-abi
-diff -u expected-abi actual-abi && rm -f expected-abi actual-abi
diff --git a/clutter/cally/cally-actor.c b/clutter/cally/cally-actor.c
index 2b9142a6f..7783e5fa0 100644
--- a/clutter/cally/cally-actor.c
+++ b/clutter/cally/cally-actor.c
@@ -173,18 +173,6 @@ static void cally_actor_notify_clutter          (GObject    *obj,
 static void cally_actor_real_notify_clutter     (GObject    *obj,
                                                  GParamSpec *pspec);
 
-G_DEFINE_TYPE_WITH_CODE (CallyActor,
-                         cally_actor,
-                         ATK_TYPE_GOBJECT_ACCESSIBLE,
-                         G_IMPLEMENT_INTERFACE (ATK_TYPE_COMPONENT,
-                                                cally_actor_component_interface_init)
-                         G_IMPLEMENT_INTERFACE (ATK_TYPE_ACTION,
-                                                cally_actor_action_interface_init));
-
-#define CALLY_ACTOR_GET_PRIVATE(obj) \
-  (G_TYPE_INSTANCE_GET_PRIVATE ((obj), CALLY_TYPE_ACTOR, CallyActorPrivate))
-
-
 struct _CallyActorPrivate
 {
   GQueue *action_queue;
@@ -194,6 +182,15 @@ struct _CallyActorPrivate
   GList *children;
 };
 
+G_DEFINE_TYPE_WITH_CODE (CallyActor,
+                         cally_actor,
+                         ATK_TYPE_GOBJECT_ACCESSIBLE,
+                         G_ADD_PRIVATE (CallyActor)
+                         G_IMPLEMENT_INTERFACE (ATK_TYPE_COMPONENT,
+                                                cally_actor_component_interface_init)
+                         G_IMPLEMENT_INTERFACE (ATK_TYPE_ACTION,
+                                                cally_actor_action_interface_init));
+
 /**
  * cally_actor_new:
  * @actor: a #ClutterActor
@@ -287,18 +284,16 @@ cally_actor_class_init (CallyActorClass *klass)
   class->get_n_children      = cally_actor_get_n_children;
   class->ref_child           = cally_actor_ref_child;
   class->get_attributes      = cally_actor_get_attributes;
-
-  g_type_class_add_private (gobject_class, sizeof (CallyActorPrivate));
 }
 
 static void
 cally_actor_init (CallyActor *cally_actor)
 {
-  CallyActorPrivate *priv = CALLY_ACTOR_GET_PRIVATE (cally_actor);
+  CallyActorPrivate *priv = cally_actor_get_instance_private (cally_actor);
 
   cally_actor->priv = priv;
 
-  priv->action_queue        = NULL;
+  priv->action_queue = NULL;
   priv->action_idle_handler = 0;
 
   priv->action_list = NULL;
@@ -306,7 +301,6 @@ cally_actor_init (CallyActor *cally_actor)
   priv->children = NULL;
 }
 
-
 static void
 cally_actor_finalize (GObject *obj)
 {
@@ -1105,7 +1099,7 @@ cally_actor_add_action (CallyActor      *cally_actor,
 }
 
 /**
- * cally_actor_add_action_full:
+ * cally_actor_add_action_full: (rename-to cally_actor_add_action)
  * @cally_actor: a #CallyActor
  * @action_name: the action name
  * @action_description: the action description
@@ -1118,8 +1112,6 @@ cally_actor_add_action (CallyActor      *cally_actor,
  *
  * Return value: added action id, or -1 if failure
  *
- * Rename to: cally_actor_add_action
- *
  * Since: 1.6
  */
 guint
diff --git a/clutter/cally/cally-actor.h b/clutter/cally/cally-actor.h
index 415054eeb..c17c26ea6 100644
--- a/clutter/cally/cally-actor.h
+++ b/clutter/cally/cally-actor.h
@@ -22,13 +22,13 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef __CALLY_ACTOR_H__
+#define __CALLY_ACTOR_H__
+
 #if !defined(__CALLY_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
 #error "Only <cally/cally.h> can be included directly."
 #endif
 
-#ifndef __CALLY_ACTOR_H__
-#define __CALLY_ACTOR_H__
-
 #include <atk/atk.h>
 #include <clutter/clutter.h>
 
@@ -126,16 +126,19 @@ struct _CallyActorClass
   gpointer _padding_dummy[32];
 };
 
-
+CLUTTER_AVAILABLE_IN_1_4
 GType      cally_actor_get_type              (void) G_GNUC_CONST;
 
+CLUTTER_AVAILABLE_IN_1_4
 AtkObject* cally_actor_new                   (ClutterActor        *actor);
 
+CLUTTER_AVAILABLE_IN_1_4
 guint      cally_actor_add_action            (CallyActor          *cally_actor,
                                               const gchar         *action_name,
                                               const gchar         *action_description,
                                               const gchar         *action_keybinding,
                                               CallyActionFunc      action_func);
+CLUTTER_AVAILABLE_IN_1_6
 guint      cally_actor_add_action_full       (CallyActor          *cally_actor,
                                               const gchar         *action_name,
                                               const gchar         *action_description,
@@ -144,9 +147,11 @@ guint      cally_actor_add_action_full       (CallyActor          *cally_actor,
                                               gpointer             user_data,
                                               GDestroyNotify       notify);
 
+CLUTTER_AVAILABLE_IN_1_4
 gboolean   cally_actor_remove_action         (CallyActor          *cally_actor,
                                               gint                 action_id);
 
+CLUTTER_AVAILABLE_IN_1_4
 gboolean   cally_actor_remove_action_by_name (CallyActor          *cally_actor,
                                               const gchar         *action_name);
 
diff --git a/clutter/cally/cally-clone.c b/clutter/cally/cally-clone.c
index 3f2704919..9672ce32a 100644
--- a/clutter/cally/cally-clone.c
+++ b/clutter/cally/cally-clone.c
@@ -69,6 +69,7 @@
  * a11y POV should still be managed as a image (with the proper properties,
  * position, size, etc.).
  */
+#include "config.h"
 
 #include "cally-clone.h"
 #include "cally-actor-private.h"
diff --git a/clutter/cally/cally-clone.h b/clutter/cally/cally-clone.h
index 4e187b9d9..3a3777035 100644
--- a/clutter/cally/cally-clone.h
+++ b/clutter/cally/cally-clone.h
@@ -18,15 +18,15 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef __CALLY_CLONE_H__
+#define __CALLY_CLONE_H__
+
 #if !defined(__CALLY_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
 #error "Only <cally/cally.h> can be included directly."
 #endif
 
-#ifndef __CALLY_CLONE_H__
-#define __CALLY_CLONE_H__
-
-#include <cally/cally-actor.h>
 #include <clutter/clutter.h>
+#include <cally/cally-actor.h>
 
 G_BEGIN_DECLS
 
@@ -74,7 +74,9 @@ struct _CallyCloneClass
   gpointer _padding_dummy[8];
 };
 
+CLUTTER_AVAILABLE_IN_1_4
 GType      cally_clone_get_type (void) G_GNUC_CONST;
+CLUTTER_AVAILABLE_IN_1_4
 AtkObject *cally_clone_new      (ClutterActor *actor);
 
 G_END_DECLS
diff --git a/clutter/cally/cally-group.c b/clutter/cally/cally-group.c
index f3b1a1290..fce8a75d5 100644
--- a/clutter/cally/cally-group.c
+++ b/clutter/cally/cally-group.c
@@ -30,14 +30,12 @@
  * @see_also: #ClutterGroup
  *
  * #CallyGroup implements the required ATK interfaces of #ClutterGroup
- * In particular it exposes:
- *
- * <itemizedlist>
- *   <listitem><simpara>Each of the Clutter actors contained in the
- *   Group.</simpara></listitem>
- * </itemizedlist>
+ * In particular it exposes each of the Clutter actors contained in the
+ * group.
  */
 
+#include "config.h"
+
 #include "cally-group.h"
 #include "cally-actor-private.h"
 
diff --git a/clutter/cally/cally-group.h b/clutter/cally/cally-group.h
index 0f0bd170a..4efd25902 100644
--- a/clutter/cally/cally-group.h
+++ b/clutter/cally/cally-group.h
@@ -21,13 +21,13 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef __CALLY_GROUP_H__
+#define __CALLY_GROUP_H__
+
 #if !defined(__CALLY_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
 #error "Only <cally/cally.h> can be included directly."
 #endif
 
-#ifndef __CALLY_GROUP_H__
-#define __CALLY_GROUP_H__
-
 #include <cally/cally-actor.h>
 #include <clutter/clutter.h>
 
@@ -77,7 +77,9 @@ struct _CallyGroupClass
   gpointer _padding_dummy[8];
 };
 
+CLUTTER_AVAILABLE_IN_1_4
 GType      cally_group_get_type (void) G_GNUC_CONST;
+CLUTTER_AVAILABLE_IN_1_4
 AtkObject* cally_group_new      (ClutterActor *actor);
 
 G_END_DECLS
diff --git a/clutter/cally/cally-main.h b/clutter/cally/cally-main.h
index 00e613601..62931979b 100644
--- a/clutter/cally/cally-main.h
+++ b/clutter/cally/cally-main.h
@@ -22,16 +22,21 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef __CALLY_MAIN_H__
+#define __CALLY_MAIN_H__
+
 #if !defined(__CALLY_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
 #error "Only <cally/cally.h> can be included directly."
 #endif
 
-#ifndef __CALLY_MAIN_H__
-#define __CALLY_MAIN_H__
+#include <glib.h>
+#include <atk/atk.h>
 
 G_BEGIN_DECLS
 
+CLUTTER_AVAILABLE_IN_1_4
 gboolean cally_get_cally_initialized (void);
+CLUTTER_AVAILABLE_IN_1_4
 gboolean cally_accessibility_init    (void);
 
 G_END_DECLS
diff --git a/clutter/cally/cally-rectangle.c b/clutter/cally/cally-rectangle.c
index 51a9863bc..ec792efed 100644
--- a/clutter/cally/cally-rectangle.c
+++ b/clutter/cally/cally-rectangle.c
@@ -30,11 +30,16 @@
  * In particular it sets a proper role for the rectangle.
  */
 
+#include "config.h"
+
 #define CLUTTER_DISABLE_DEPRECATION_WARNINGS
 
 #include "cally-rectangle.h"
 #include "cally-actor-private.h"
 
+#include "clutter-color.h"
+#include "deprecated/clutter-rectangle.h"
+
 /* AtkObject */
 static void                  cally_rectangle_real_initialize (AtkObject *obj,
                                                               gpointer   data);
diff --git a/clutter/cally/cally-rectangle.h b/clutter/cally/cally-rectangle.h
index 6cd245765..0a205c5e6 100644
--- a/clutter/cally/cally-rectangle.h
+++ b/clutter/cally/cally-rectangle.h
@@ -18,13 +18,13 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef __CALLY_RECTANGLE_H__
+#define __CALLY_RECTANGLE_H__
+
 #if !defined(__CALLY_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
 #error "Only <cally/cally.h> can be included directly."
 #endif
 
-#ifndef __CALLY_RECTANGLE_H__
-#define __CALLY_RECTANGLE_H__
-
 #include <cally/cally-actor.h>
 #include <clutter/clutter.h>
 
@@ -74,7 +74,9 @@ struct _CallyRectangleClass
   gpointer _padding_dummy[8];
 };
 
+CLUTTER_AVAILABLE_IN_1_4
 GType      cally_rectangle_get_type (void) G_GNUC_CONST;
+CLUTTER_AVAILABLE_IN_1_4
 AtkObject* cally_rectangle_new      (ClutterActor *actor);
 
 G_END_DECLS
diff --git a/clutter/cally/cally-root.c b/clutter/cally/cally-root.c
index ee921dcce..aae37c6ab 100644
--- a/clutter/cally/cally-root.c
+++ b/clutter/cally/cally-root.c
@@ -35,9 +35,15 @@
  * #ClutterStageManager).
  */
 
-#include <clutter/clutter.h>
+#include "config.h"
+
 #include "cally-root.h"
 
+#include "clutter-actor.h"
+#include "clutter-stage-private.h"
+#include "clutter-stage-manager.h"
+
+
 /* GObject */
 static void cally_root_finalize   (GObject *object);
 
@@ -58,10 +64,6 @@ static void             cally_util_stage_removed_cb     (ClutterStageManager *st
                                                          ClutterStage *stage,
                                                          gpointer data);
 
-#define CALLY_ROOT_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), CALLY_TYPE_ROOT, CallyRootPrivate))
-
-G_DEFINE_TYPE (CallyRoot, cally_root,  ATK_TYPE_GOBJECT_ACCESSIBLE)
-
 struct _CallyRootPrivate
 {
 /* We save the CallyStage objects. Other option could save the stage
@@ -77,6 +79,8 @@ struct _CallyRootPrivate
   guint stage_removed_id;
 };
 
+G_DEFINE_TYPE_WITH_PRIVATE (CallyRoot, cally_root,  ATK_TYPE_GOBJECT_ACCESSIBLE)
+
 static void
 cally_root_class_init (CallyRootClass *klass)
 {
@@ -91,14 +95,12 @@ cally_root_class_init (CallyRootClass *klass)
   class->get_parent = cally_root_get_parent;
   class->initialize = cally_root_initialize;
   class->get_name = cally_root_get_name;
-
-  g_type_class_add_private (gobject_class, sizeof (CallyRootPrivate));
 }
 
 static void
-cally_root_init (CallyRoot      *root)
+cally_root_init (CallyRoot *root)
 {
-  root->priv = CALLY_ROOT_GET_PRIVATE (root);
+  root->priv = cally_root_get_instance_private (root);
 
   root->priv->stage_list = NULL;
   root->priv->stage_added_id = 0;
diff --git a/clutter/cally/cally-root.h b/clutter/cally/cally-root.h
index fd3dcbfd0..10674942f 100644
--- a/clutter/cally/cally-root.h
+++ b/clutter/cally/cally-root.h
@@ -18,14 +18,15 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef __CALLY_ROOT_H__
+#define __CALLY_ROOT_H__
+
 #if !defined(__CALLY_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
 #error "Only <cally/cally.h> can be included directly."
 #endif
 
-#ifndef __CALLY_ROOT_H__
-#define __CALLY_ROOT_H__
-
 #include <atk/atk.h>
+#include <clutter/clutter.h>
 
 G_BEGIN_DECLS
 
@@ -73,8 +74,9 @@ struct _CallyRootClass
   gpointer _padding_dummy[16];
 };
 
-
+CLUTTER_AVAILABLE_IN_1_4
 GType      cally_root_get_type (void) G_GNUC_CONST;
+CLUTTER_AVAILABLE_IN_1_4
 AtkObject *cally_root_new      (void);
 
 G_END_DECLS
diff --git a/clutter/cally/cally-stage.c b/clutter/cally/cally-stage.c
index 2b1cfd179..25bb321b5 100644
--- a/clutter/cally/cally-stage.c
+++ b/clutter/cally/cally-stage.c
@@ -34,6 +34,7 @@
  * being a canvas. Anyway, this is required for applications using
  * just clutter, or directly #ClutterStage
  */
+#include "config.h"
 
 #include "cally-stage.h"
 #include "cally-actor-private.h"
@@ -52,16 +53,6 @@ static void                  cally_stage_activate_cb     (ClutterStage *stage,
 static void                  cally_stage_deactivate_cb   (ClutterStage *stage,
                                                           gpointer      data);
 
-
-G_DEFINE_TYPE_WITH_CODE (CallyStage,
-                         cally_stage,
-                         CALLY_TYPE_GROUP,
-                         G_IMPLEMENT_INTERFACE (ATK_TYPE_WINDOW,
-                                                cally_stage_window_interface_init));
-
-#define CALLY_STAGE_GET_PRIVATE(obj) \
-  (G_TYPE_INSTANCE_GET_PRIVATE ((obj), CALLY_TYPE_STAGE, CallyStagePrivate))
-
 struct _CallyStagePrivate
 {
   /* NULL means that the stage will receive the focus */
@@ -70,24 +61,27 @@ struct _CallyStagePrivate
   gboolean active;
 };
 
+G_DEFINE_TYPE_WITH_CODE (CallyStage,
+                         cally_stage,
+                         CALLY_TYPE_GROUP,
+                         G_ADD_PRIVATE (CallyStage)
+                         G_IMPLEMENT_INTERFACE (ATK_TYPE_WINDOW,
+                                                cally_stage_window_interface_init));
+
 static void
 cally_stage_class_init (CallyStageClass *klass)
 {
-  GObjectClass   *gobject_class = G_OBJECT_CLASS (klass);
-  AtkObjectClass *class         = ATK_OBJECT_CLASS (klass);
-/*   CallyActorClass *cally_class  = CALLY_ACTOR_CLASS (klass); */
+  AtkObjectClass *class = ATK_OBJECT_CLASS (klass);
 
   /* AtkObject */
   class->initialize = cally_stage_real_initialize;
   class->ref_state_set = cally_stage_ref_state_set;
-
-  g_type_class_add_private (gobject_class, sizeof (CallyStagePrivate));
 }
 
 static void
 cally_stage_init (CallyStage *cally_stage)
 {
-  CallyStagePrivate *priv = CALLY_STAGE_GET_PRIVATE (cally_stage);
+  CallyStagePrivate *priv = cally_stage_get_instance_private (cally_stage);
 
   cally_stage->priv = priv;
 
@@ -139,7 +133,11 @@ cally_stage_notify_key_focus_cb (ClutterStage *stage,
       AtkObject *old = NULL;
 
       if (self->priv->key_focus != NULL)
-        old = clutter_actor_get_accessible (self->priv->key_focus);
+        {
+          g_object_remove_weak_pointer (G_OBJECT (self->priv->key_focus),
+                                        (gpointer *) &self->priv->key_focus);
+          old = clutter_actor_get_accessible (self->priv->key_focus);
+        }
       else
         old = clutter_actor_get_accessible (CLUTTER_ACTOR (stage));
 
@@ -154,7 +152,19 @@ cally_stage_notify_key_focus_cb (ClutterStage *stage,
   self->priv->key_focus = key_focus;
 
   if (key_focus != NULL)
-    new = clutter_actor_get_accessible (key_focus);
+    {
+      /* ensure that if the key focus goes away, the field inside
+       * CallyStage is reset. see bug:
+       *
+       * https://bugzilla.gnome.org/show_bug.cgi?id=692706
+       *
+       * we remove the weak pointer above.
+       */
+      g_object_add_weak_pointer (G_OBJECT (self->priv->key_focus),
+                                 (gpointer *) &self->priv->key_focus);
+
+      new = clutter_actor_get_accessible (key_focus);
+    }
   else
     new = clutter_actor_get_accessible (CLUTTER_ACTOR (stage));
 
diff --git a/clutter/cally/cally-stage.h b/clutter/cally/cally-stage.h
index 7ce4bb21f..c95d2ca13 100644
--- a/clutter/cally/cally-stage.h
+++ b/clutter/cally/cally-stage.h
@@ -18,13 +18,13 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef __CALLY_STAGE_H__
+#define __CALLY_STAGE_H__
+
 #if !defined(__CALLY_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
 #error "Only <cally/cally.h> can be included directly."
 #endif
 
-#ifndef __CALLY_STAGE_H__
-#define __CALLY_STAGE_H__
-
 #include <cally/cally-group.h>
 #include <clutter/clutter.h>
 
@@ -74,7 +74,9 @@ struct _CallyStageClass
   gpointer _padding_dummy[16];
 };
 
+CLUTTER_AVAILABLE_IN_1_4
 GType      cally_stage_get_type (void) G_GNUC_CONST;
+CLUTTER_AVAILABLE_IN_1_4
 AtkObject *cally_stage_new      (ClutterActor *actor);
 
 G_END_DECLS
diff --git a/clutter/cally/cally-text.c b/clutter/cally/cally-text.c
index cf6dfcec3..0b6606f4a 100644
--- a/clutter/cally/cally-text.c
+++ b/clutter/cally/cally-text.c
@@ -46,7 +46,9 @@
 #include "cally-text.h"
 #include "cally-actor-private.h"
 
+#include "clutter-color.h"
 #include "clutter-main.h"
+#include "clutter-text.h"
 
 static void cally_text_finalize   (GObject *obj);
 
@@ -172,17 +174,6 @@ static int                  _cally_misc_get_index_at_point (ClutterText *clutter
                                                             gint         y,
                                                             AtkCoordType coords);
 
-G_DEFINE_TYPE_WITH_CODE (CallyText,
-                         cally_text,
-                         CALLY_TYPE_ACTOR,
-                         G_IMPLEMENT_INTERFACE (ATK_TYPE_TEXT,
-                                                cally_text_text_interface_init)
-                         G_IMPLEMENT_INTERFACE (ATK_TYPE_EDITABLE_TEXT,
-                                                cally_text_editable_text_interface_init));
-
-#define CALLY_TEXT_GET_PRIVATE(obj) \
-  (G_TYPE_INSTANCE_GET_PRIVATE ((obj), CALLY_TYPE_TEXT, CallyTextPrivate))
-
 struct _CallyTextPrivate
 {
   /* Cached ClutterText values*/
@@ -204,6 +195,15 @@ struct _CallyTextPrivate
   guint activate_action_id;
 };
 
+G_DEFINE_TYPE_WITH_CODE (CallyText,
+                         cally_text,
+                         CALLY_TYPE_ACTOR,
+                         G_ADD_PRIVATE (CallyText)
+                         G_IMPLEMENT_INTERFACE (ATK_TYPE_TEXT,
+                                                cally_text_text_interface_init)
+                         G_IMPLEMENT_INTERFACE (ATK_TYPE_EDITABLE_TEXT,
+                                                cally_text_editable_text_interface_init));
+
 static void
 cally_text_class_init (CallyTextClass *klass)
 {
@@ -217,14 +217,12 @@ cally_text_class_init (CallyTextClass *klass)
   class->ref_state_set = cally_text_ref_state_set;
 
   cally_class->notify_clutter = cally_text_notify_clutter;
-
-  g_type_class_add_private (gobject_class, sizeof (CallyTextPrivate));
 }
 
 static void
 cally_text_init (CallyText *cally_text)
 {
-  CallyTextPrivate *priv = CALLY_TEXT_GET_PRIVATE (cally_text);
+  CallyTextPrivate *priv = cally_text_get_instance_private (cally_text);
 
   cally_text->priv = priv;
 
@@ -1237,6 +1235,7 @@ cally_text_get_n_selections (AtkText *text)
 {
   ClutterActor *actor           = NULL;
   gint          selection_bound = -1;
+  gint          cursor_position = -1;
 
   actor = CALLY_GET_CLUTTER_ACTOR (text);
   if (actor == NULL) /* State is defunct */
@@ -1246,11 +1245,12 @@ cally_text_get_n_selections (AtkText *text)
     return 0;
 
   selection_bound = clutter_text_get_selection_bound (CLUTTER_TEXT (actor));
+  cursor_position = clutter_text_get_cursor_position (CLUTTER_TEXT (actor));
 
-  if (selection_bound > 0)
-    return 1;
-  else
+  if (selection_bound == cursor_position)
     return 0;
+  else
+    return 1;
 }
 
 static gchar*
diff --git a/clutter/cally/cally-text.h b/clutter/cally/cally-text.h
index ea4b6889f..ce3c0cba0 100644
--- a/clutter/cally/cally-text.h
+++ b/clutter/cally/cally-text.h
@@ -18,15 +18,15 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef __CALLY_TEXT_H__
+#define __CALLY_TEXT_H__
+
 #if !defined(__CALLY_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
 #error "Only <cally/cally.h> can be included directly."
 #endif
 
-#ifndef __CALLY_TEXT_H__
-#define __CALLY_TEXT_H__
-
-#include <cally/cally-actor.h>
 #include <clutter/clutter.h>
+#include <cally/cally-actor.h>
 
 G_BEGIN_DECLS
 
@@ -74,7 +74,9 @@ struct _CallyTextClass
   gpointer _padding_dummy[8];
 };
 
+CLUTTER_AVAILABLE_IN_1_4
 GType      cally_text_get_type (void) G_GNUC_CONST;
+CLUTTER_AVAILABLE_IN_1_4
 AtkObject* cally_text_new      (ClutterActor *actor);
 
 G_END_DECLS
diff --git a/clutter/cally/cally-texture.c b/clutter/cally/cally-texture.c
index d59bc3ad6..12964bd5e 100644
--- a/clutter/cally/cally-texture.c
+++ b/clutter/cally/cally-texture.c
@@ -30,10 +30,15 @@
  *
  * In particular it sets a proper role for the texture.
  */
+#include "config.h"
+
+#define CLUTTER_DISABLE_DEPRECATION_WARNINGS
 
 #include "cally-texture.h"
 #include "cally-actor-private.h"
 
+#include "deprecated/clutter-texture.h"
+
 /* AtkObject */
 static void                  cally_texture_real_initialize (AtkObject *obj,
                                                            gpointer   data);
diff --git a/clutter/cally/cally-texture.h b/clutter/cally/cally-texture.h
index ff594c96a..dad576c14 100644
--- a/clutter/cally/cally-texture.h
+++ b/clutter/cally/cally-texture.h
@@ -18,15 +18,15 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef __CALLY_TEXTURE_H__
+#define __CALLY_TEXTURE_H__
+
 #if !defined(__CALLY_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
 #error "Only <cally/cally.h> can be included directly."
 #endif
 
-#ifndef __CALLY_TEXTURE_H__
-#define __CALLY_TEXTURE_H__
-
-#include <cally/cally-actor.h>
 #include <clutter/clutter.h>
+#include <cally/cally-actor.h>
 
 G_BEGIN_DECLS
 
@@ -74,7 +74,9 @@ struct _CallyTextureClass
   gpointer _padding_dummy[8];
 };
 
+CLUTTER_AVAILABLE_IN_1_4
 GType      cally_texture_get_type (void) G_GNUC_CONST;
+CLUTTER_AVAILABLE_IN_1_4
 AtkObject *cally_texture_new      (ClutterActor *actor);
 
 G_END_DECLS
diff --git a/clutter/cally/cally-util.c b/clutter/cally/cally-util.c
index fdef2951d..ce37869d8 100644
--- a/clutter/cally/cally-util.c
+++ b/clutter/cally/cally-util.c
@@ -438,3 +438,15 @@ cally_util_stage_removed_cb (ClutterStageManager *stage_manager,
 
   g_signal_handlers_disconnect_by_func (stage, cally_key_snooper_cb, NULL);
 }
+
+void
+_cally_util_override_atk_util (void)
+{
+  AtkUtilClass *atk_class = ATK_UTIL_CLASS (g_type_class_ref (ATK_TYPE_UTIL));
+
+  atk_class->add_key_event_listener = cally_util_add_key_event_listener;
+  atk_class->remove_key_event_listener = cally_util_remove_key_event_listener;
+  atk_class->get_root = cally_util_get_root;
+  atk_class->get_toolkit_name = cally_util_get_toolkit_name;
+  atk_class->get_toolkit_version = cally_util_get_toolkit_version;
+}
diff --git a/clutter/cally/cally-util.h b/clutter/cally/cally-util.h
index 23d386ce6..76f36be7e 100644
--- a/clutter/cally/cally-util.h
+++ b/clutter/cally/cally-util.h
@@ -18,13 +18,14 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef __CALLY_UTIL_H__
+#define __CALLY_UTIL_H__
+
 #if !defined(__CALLY_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
 #error "Only <cally/cally.h> can be included directly."
 #endif
 
-#ifndef __CALLY_UTIL_H__
-#define __CALLY_UTIL_H__
-
+#include <clutter/clutter.h>
 #include <atk/atk.h>
 
 G_BEGIN_DECLS
@@ -73,8 +74,11 @@ struct _CallyUtilClass
   gpointer _padding_dummy[8];
 };
 
+CLUTTER_AVAILABLE_IN_1_4
 GType cally_util_get_type (void) G_GNUC_CONST;
 
+void _cally_util_override_atk_util (void);
+
 G_END_DECLS
 
 #endif /* __CALLY_UTIL_H__ */
diff --git a/clutter/cally/cally.c b/clutter/cally/cally.c
index 2edcdf82b..4f23d20a4 100644
--- a/clutter/cally/cally.c
+++ b/clutter/cally/cally.c
@@ -53,8 +53,6 @@
 #include "clutter-debug.h"
 #include "clutter-private.h"
 
-static int cally_initialized = FALSE;
-
 /* factories initialization*/
 CALLY_ACCESSIBLE_FACTORY (CALLY_TYPE_ACTOR, cally_actor, cally_actor_new)
 CALLY_ACCESSIBLE_FACTORY (CALLY_TYPE_GROUP, cally_group, cally_group_new)
@@ -77,11 +75,6 @@ CALLY_ACCESSIBLE_FACTORY (CALLY_TYPE_CLONE, cally_clone, cally_clone_new)
 gboolean
 cally_accessibility_init (void)
 {
-  if (cally_initialized)
-    return TRUE;
-
-  cally_initialized = TRUE;
-
   /* setting the factories */
   CALLY_ACTOR_SET_FACTORY (CLUTTER_TYPE_ACTOR, cally_actor);
   CALLY_ACTOR_SET_FACTORY (CLUTTER_TYPE_GROUP, cally_group);
@@ -92,11 +85,11 @@ cally_accessibility_init (void)
   CALLY_ACTOR_SET_FACTORY (CLUTTER_TYPE_CLONE, cally_clone);
 
   /* Initialize the CallyUtility class */
-  g_type_class_unref (g_type_class_ref (CALLY_TYPE_UTIL));
+  _cally_util_override_atk_util ();
 
   CLUTTER_NOTE (MISC, "Clutter Accessibility initialized");
 
-  return cally_initialized;
+  return TRUE;
 }
 
 /**
@@ -111,5 +104,5 @@ cally_accessibility_init (void)
  */
 gboolean cally_get_cally_initialized (void)
 {
-  return cally_initialized;
+  return !g_strcmp0 (atk_get_toolkit_name (), "clutter");
 }
diff --git a/clutter/cex100/clutter-backend-cex100.c b/clutter/cex100/clutter-backend-cex100.c
index 264dc0044..4bd498f8a 100644
--- a/clutter/cex100/clutter-backend-cex100.c
+++ b/clutter/cex100/clutter-backend-cex100.c
@@ -142,7 +142,7 @@ clutter_backend_cex100_init (ClutterBackendCex100 *backend_cex100)
  * the stage will be drawn. By default Clutter will pick UPP_C
  * (GDL_PLANE_ID_UPP_C).
  *
- * <note>This function has to be called before clutter_init()</note>
+ * This function has to be called before clutter_init().
  *
  * Since: 1.6
  */
@@ -164,7 +164,7 @@ clutter_cex100_set_plane (gdl_plane_id_t plane)
  *
  * Clutter defaults to %CLUTTER_CEX100_TRIPLE_BUFFERING.
  *
- * <note>This function has to be called before clutter_init()</note>
+ * This function has to be called before clutter_init().
  *
  * Since: 1.6
  */
diff --git a/clutter/cex100/clutter-cex100.h.in b/clutter/cex100/clutter-cex100.h.in
index 57e241df4..c1ea011df 100644
--- a/clutter/cex100/clutter-cex100.h.in
+++ b/clutter/cex100/clutter-cex100.h.in
@@ -29,8 +29,7 @@
  * The CEX100 backend for Clutter provides some Intel CE3100/CE4100
  * specific API
  *
- * You need to include
- * <filename class="headerfile">&lt;clutter/cex100/clutter-cex100.h&gt;</filename>
+ * You need to include `clutter/cex100/clutter-cex100.h`
  * to have access to the functions documented here.
  */
 
diff --git a/clutter/clutter-action.h b/clutter/clutter-action.h
index d2e98db6d..56f31bb73 100644
--- a/clutter/clutter-action.h
+++ b/clutter/clutter-action.h
@@ -45,8 +45,8 @@ typedef struct _ClutterActionClass      ClutterActionClass;
 /**
  * ClutterAction:
  *
- * The <structname>ClutterAction</structname> structure contains only
- * private data and should be accessed using the provided API
+ * The #ClutterAction structure contains only private data and
+ * should be accessed using the provided API.
  *
  * Since: 1.4
  */
@@ -59,8 +59,7 @@ struct _ClutterAction
 /**
  * ClutterActionClass:
  *
- * The <structname>ClutterActionClass</structname> structure contains
- * only private data
+ * The ClutterActionClass structure contains only private data
  *
  * Since: 1.4
  */
@@ -79,24 +78,33 @@ struct _ClutterActionClass
   void (* _clutter_action8) (void);
 };
 
+CLUTTER_AVAILABLE_IN_1_4
 GType clutter_action_get_type (void) G_GNUC_CONST;
 
 /* ClutterActor API */
+CLUTTER_AVAILABLE_IN_1_4
 void           clutter_actor_add_action            (ClutterActor  *self,
                                                     ClutterAction *action);
+CLUTTER_AVAILABLE_IN_1_4
 void           clutter_actor_add_action_with_name  (ClutterActor  *self,
                                                     const gchar   *name,
                                                     ClutterAction *action);
+CLUTTER_AVAILABLE_IN_1_4
 void           clutter_actor_remove_action         (ClutterActor  *self,
                                                     ClutterAction *action);
+CLUTTER_AVAILABLE_IN_1_4
 void           clutter_actor_remove_action_by_name (ClutterActor  *self,
                                                     const gchar   *name);
+CLUTTER_AVAILABLE_IN_1_4
 ClutterAction *clutter_actor_get_action            (ClutterActor  *self,
                                                     const gchar   *name);
+CLUTTER_AVAILABLE_IN_1_4
 GList *        clutter_actor_get_actions           (ClutterActor  *self);
+CLUTTER_AVAILABLE_IN_1_4
 void           clutter_actor_clear_actions         (ClutterActor  *self);
 
-gboolean        clutter_actor_has_actions          (ClutterActor  *self);
+CLUTTER_AVAILABLE_IN_1_10
+gboolean       clutter_actor_has_actions           (ClutterActor  *self);
 
 G_END_DECLS
 
diff --git a/clutter/clutter-actor-box.c b/clutter/clutter-actor-box.c
index 538917660..3f3179dbd 100644
--- a/clutter/clutter-actor-box.c
+++ b/clutter/clutter-actor-box.c
@@ -455,7 +455,7 @@ clutter_actor_box_clamp_to_pixel (ClutterActorBox *box)
 
 /**
  * clutter_actor_box_union:
- * @a: (in) the first #ClutterActorBox
+ * @a: (in): the first #ClutterActorBox
  * @b: (in): the second #ClutterActorBox
  * @result: (out): the #ClutterActorBox representing a union
  *   of @a and @b
diff --git a/clutter/clutter-actor-meta.c b/clutter/clutter-actor-meta.c
index a58c773c5..583e81693 100644
--- a/clutter/clutter-actor-meta.c
+++ b/clutter/clutter-actor-meta.c
@@ -75,9 +75,9 @@ enum
 
 static GParamSpec *obj_props[PROP_LAST];
 
-G_DEFINE_ABSTRACT_TYPE (ClutterActorMeta,
-                        clutter_actor_meta,
-                        G_TYPE_INITIALLY_UNOWNED);
+G_DEFINE_ABSTRACT_TYPE_WITH_PRIVATE (ClutterActorMeta,
+                                     clutter_actor_meta,
+                                     G_TYPE_INITIALLY_UNOWNED)
 
 static void
 on_actor_destroy (ClutterActor     *actor,
@@ -177,8 +177,6 @@ clutter_actor_meta_class_init (ClutterActorMetaClass *klass)
 {
   GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
 
-  g_type_class_add_private (klass, sizeof (ClutterActorMetaPrivate));
-
   klass->set_actor = clutter_actor_meta_real_set_actor;
 
   /**
@@ -234,12 +232,8 @@ clutter_actor_meta_class_init (ClutterActorMetaClass *klass)
 void
 clutter_actor_meta_init (ClutterActorMeta *self)
 {
-  self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self,
-                                            CLUTTER_TYPE_ACTOR_META,
-                                            ClutterActorMetaPrivate);
-
+  self->priv = clutter_actor_meta_get_instance_private (self);
   self->priv->is_enabled = TRUE;
-
   self->priv->priority = CLUTTER_ACTOR_META_PRIORITY_DEFAULT;
 }
 
diff --git a/clutter/clutter-actor-meta.h b/clutter/clutter-actor-meta.h
index fa3fafe59..25b904c2c 100644
--- a/clutter/clutter-actor-meta.h
+++ b/clutter/clutter-actor-meta.h
@@ -46,7 +46,7 @@ typedef struct _ClutterActorMetaClass           ClutterActorMetaClass;
 /**
  * ClutterActorMeta:
  *
- * The <structname>ClutterActorMeta</structname> structure contains only
+ * The #ClutterActorMeta structure contains only
  * private data and should be accessed using the provided API
  *
  * Since: 1.4
@@ -64,7 +64,7 @@ struct _ClutterActorMeta
  * @set_actor: virtual function, invoked when attaching and detaching
  *   a #ClutterActorMeta instance to a #ClutterActor
  *
- * The <structname>ClutterActorMetaClass</structname> structure contains
+ * The #ClutterActorMetaClass structure contains
  * only private data
  *
  * Since: 1.4
@@ -97,15 +97,21 @@ struct _ClutterActorMetaClass
   void (* _clutter_meta7) (void);
 };
 
+CLUTTER_AVAILABLE_IN_1_4
 GType clutter_actor_meta_get_type (void) G_GNUC_CONST;
 
+CLUTTER_AVAILABLE_IN_1_4
 void            clutter_actor_meta_set_name     (ClutterActorMeta *meta,
                                                  const gchar      *name);
+CLUTTER_AVAILABLE_IN_1_4
 const gchar *   clutter_actor_meta_get_name     (ClutterActorMeta *meta);
+CLUTTER_AVAILABLE_IN_1_4
 void            clutter_actor_meta_set_enabled  (ClutterActorMeta *meta,
                                                  gboolean          is_enabled);
+CLUTTER_AVAILABLE_IN_1_4
 gboolean        clutter_actor_meta_get_enabled  (ClutterActorMeta *meta);
 
+CLUTTER_AVAILABLE_IN_1_4
 ClutterActor *  clutter_actor_meta_get_actor    (ClutterActorMeta *meta);
 
 G_END_DECLS
diff --git a/clutter/clutter-actor-private.h b/clutter/clutter-actor-private.h
index 1c6f16524..29376a6f4 100644
--- a/clutter/clutter-actor-private.h
+++ b/clutter/clutter-actor-private.h
@@ -318,6 +318,9 @@ void                            _clutter_actor_detach_clone
                                                                                          ClutterActor *clone);
 void                            _clutter_actor_queue_redraw_on_clones                   (ClutterActor *actor);
 void                            _clutter_actor_queue_relayout_on_clones                 (ClutterActor *actor);
+void                            _clutter_actor_queue_only_relayout                      (ClutterActor *actor);
+
+CoglFramebuffer *               _clutter_actor_get_active_framebuffer                   (ClutterActor *actor);
 
 G_END_DECLS
 
diff --git a/clutter/clutter-actor.c b/clutter/clutter-actor.c
index 096361559..5735edfb7 100644
--- a/clutter/clutter-actor.c
+++ b/clutter/clutter-actor.c
@@ -30,131 +30,121 @@
  * and it encapsulates the position, size, and transformations of a node in
  * the graph.
  *
- * <refsect2 id="ClutterActor-transformations">
- *   <title>Actor transformations</title>
- *   <para>Each actor can be transformed using methods like
- *   clutter_actor_set_scale() or clutter_actor_set_rotation(). The order
- *   in which the transformations are applied is decided by Clutter and it is
- *   the following:</para>
- *   <orderedlist>
- *     <listitem><para>translation by the origin of the #ClutterActor:allocation;</para></listitem>
- *     <listitem><para>translation by the actor's #ClutterActor:depth;</para></listitem>
- *     <listitem><para>scaling by the #ClutterActor:scale-x and #ClutterActor:scale-y factors;</para></listitem>
- *     <listitem><para>rotation around the #ClutterActor:rotation-angle-x and #ClutterActor:rotation-center-x;</para></listitem>
- *     <listitem><para>rotation around the #ClutterActor:rotation-angle-y and #ClutterActor:rotation-center-y;</para></listitem>
- *     <listitem><para>rotation around the #ClutterActor:rotation-angle-z and #ClutterActor:rotation-center-z;</para></listitem>
- *     <listitem><para>negative translation by the #ClutterActor:anchor-x and #ClutterActor:anchor-y point.</para></listitem>
- *   </orderedlist>
- * </refsect2>
+ * ## Actor transformations
  *
- * <refsect2 id="ClutterActor-geometry">
- *   <title>Modifying an actor's geometry</title>
- *   <para>Each actor has a bounding box, called #ClutterActor:allocation
- *   which is either set by its parent or explicitly through the
- *   clutter_actor_set_position() and clutter_actor_set_size() methods.
- *   Each actor also has an implicit preferred size.</para>
- *   <para>An actor’s preferred size can be defined by any subclass by
- *   overriding the #ClutterActorClass.get_preferred_width() and the
- *   #ClutterActorClass.get_preferred_height() virtual functions, or it can
- *   be explicitly set by using clutter_actor_set_width() and
- *   clutter_actor_set_height().</para>
- *   <para>An actor’s position can be set explicitly by using
- *   clutter_actor_set_x() and clutter_actor_set_y(); the coordinates are
- *   relative to the origin of the actor’s parent.</para>
- * </refsect2>
+ * Each actor can be transformed using methods like clutter_actor_set_scale()
+ * or clutter_actor_set_rotation(). The order in which the transformations are
+ * applied is decided by Clutter and it is the following:
  *
- * <refsect2 id="ClutterActor-children">
- *   <title>Managing actor children</title>
- *   <para>Each actor can have multiple children, by calling
- *   clutter_actor_add_child() to add a new child actor, and
- *   clutter_actor_remove_child() to remove an existing child. #ClutterActor
- *   will hold a reference on each child actor, which will be released when
- *   the child is removed from its parent, or destroyed using
- *   clutter_actor_destroy().</para>
- *   <informalexample><programlisting>
+ *  1. translation by the origin of the #ClutterActor:allocation property
+ *  2. translation by the actor's #ClutterActor:z-position property
+ *  3. translation by the actor's #ClutterActor:pivot-point property
+ *  4. scaling by the #ClutterActor:scale-x and #ClutterActor:scale-y factors
+ *  5. rotation around the #ClutterActor:rotation-angle-x and #ClutterActor:rotation-center-x
+ *  6. rotation around the #ClutterActor:rotation-angle-y and #ClutterActor:rotation-center-y
+ *  7. rotation around the #ClutterActor:rotation-angle-z and #ClutterActor:rotation-center-z
+ *  8. negative translation by the #ClutterActor:anchor-x and #ClutterActor:anchor-y point.
+ *  9. negative translation by the actor's #ClutterActor:pivot-point
+ *
+ * ## Modifying an actor's geometry
+ *
+ * Each actor has a bounding box, called #ClutterActor:allocation
+ * which is either set by its parent or explicitly through the
+ * clutter_actor_set_position() and clutter_actor_set_size() methods.
+ * Each actor also has an implicit preferred size.
+ *
+ * An actor’s preferred size can be defined by any subclass by
+ * overriding the #ClutterActorClass.get_preferred_width() and the
+ * #ClutterActorClass.get_preferred_height() virtual functions, or it can
+ * be explicitly set by using clutter_actor_set_width() and
+ * clutter_actor_set_height().
+ *
+ * An actor’s position can be set explicitly by using
+ * clutter_actor_set_x() and clutter_actor_set_y(); the coordinates are
+ * relative to the origin of the actor’s parent.
+ *
+ * ## Managing actor children
+ *
+ * Each actor can have multiple children, by calling
+ * clutter_actor_add_child() to add a new child actor, and
+ * clutter_actor_remove_child() to remove an existing child. #ClutterActor
+ * will hold a reference on each child actor, which will be released when
+ * the child is removed from its parent, or destroyed using
+ * clutter_actor_destroy().
+ *
+ * |[<!-- language="C" -->
  *  ClutterActor *actor = clutter_actor_new ();
  *
- *  /&ast; set the bounding box of the actor &ast;/
+ *  // set the bounding box of the actor
  *  clutter_actor_set_position (actor, 0, 0);
  *  clutter_actor_set_size (actor, 480, 640);
  *
- *  /&ast; set the background color of the actor &ast;/
+ *  // set the background color of the actor
  *  clutter_actor_set_background_color (actor, CLUTTER_COLOR_Orange);
  *
- *  /&ast; set the bounding box of the child, relative to the parent &ast;/
+ *  // set the bounding box of the child, relative to the parent
  *  ClutterActor *child = clutter_actor_new ();
  *  clutter_actor_set_position (child, 20, 20);
  *  clutter_actor_set_size (child, 80, 240);
  *
- *  /&ast; set the background color of the child &ast;/
+ *  // set the background color of the child
  *  clutter_actor_set_background_color (child, CLUTTER_COLOR_Blue);
  *
- *  /&ast; add the child to the actor &ast;/
+ *  // add the child to the actor
  *  clutter_actor_add_child (actor, child);
- *   </programlisting></informalexample>
- *   <para>Children can be inserted at a given index, or above and below
- *   another child actor. The order of insertion determines the order of the
- *   children when iterating over them. Iterating over children is performed
- *   by using clutter_actor_get_first_child(), clutter_actor_get_previous_sibling(),
- *   clutter_actor_get_next_sibling(), and clutter_actor_get_last_child(). It is
- *   also possible to retrieve a list of children by using
- *   clutter_actor_get_children(), as well as retrieving a specific child at a
- *   given index by using clutter_actor_get_child_at_index().</para>
- *   <para>If you need to track additions of children to a #ClutterActor, use
- *   the #ClutterContainer::actor-added signal; similarly, to track removals
- *   of children from a ClutterActor, use the #ClutterContainer::actor-removed
- *   signal.</para>
- *   <informalexample><programlisting>
- * <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" parse="text" href="../../../../examples/basic-actor.c">
- *   <xi:fallback>FIXME: MISSING XINCLUDE CONTENT</xi:fallback>
- * </xi:include>
- *   </programlisting></informalexample>
- *   <figure id="actor-example-image">
- *     <title>Actors</title>
- *     <graphic fileref="actor-example.png" format="PNG"/>
- *   </figure>
- * </refsect2>
+ * ]|
  *
- * <refsect2 id="ClutterActor-painting">
- *   <title>Painting an actor</title>
- *   <para>There are three ways to paint an actor:</para>
- *   <itemizedlist>
- *     <listitem><para>set a delegate #ClutterContent as the value for the
- *     #ClutterActor:content property of the actor;</para></listitem>
- *     <listitem><para>subclass #ClutterActor and override the
- *     #ClutterActorClass.paint_node() virtual function;</para></listitem>
- *     <listitem><para>subclass #ClutterActor and override the
- *     #ClutterActorClass.paint() virtual function.</para></listitem>
- *   </itemizedlist>
- *   <formalpara>
- *     <title>Setting the Content property</title>
- *     <para>A #ClutterContent is a delegate object that takes over the
- *     painting operation of one, or more actors. The #ClutterContent
- *     painting will be performed on top of the #ClutterActor:background-color
- *     of the actor, and before calling the #ClutterActorClass.paint_node()
- *     virtual function.</para>
- *     <informalexample><programlisting>
+ * Children can be inserted at a given index, or above and below
+ * another child actor. The order of insertion determines the order of the
+ * children when iterating over them. Iterating over children is performed
+ * by using clutter_actor_get_first_child(), clutter_actor_get_previous_sibling(),
+ * clutter_actor_get_next_sibling(), and clutter_actor_get_last_child(). It is
+ * also possible to retrieve a list of children by using
+ * clutter_actor_get_children(), as well as retrieving a specific child at a
+ * given index by using clutter_actor_get_child_at_index().
+ *
+ * If you need to track additions of children to a #ClutterActor, use
+ * the #ClutterContainer::actor-added signal; similarly, to track removals
+ * of children from a ClutterActor, use the #ClutterContainer::actor-removed
+ * signal.
+ *
+ * See [basic-actor.c](https://git.gnome.org/browse/clutter/tree/examples/basic-actor.c?h=clutter-1.18).
+ *
+ * ## Painting an actor
+ *
+ * There are three ways to paint an actor:
+ *
+ *  - set a delegate #ClutterContent as the value for the #ClutterActor:content property of the actor
+ *  - subclass #ClutterActor and override the #ClutterActorClass.paint_node() virtual function
+ *  - subclass #ClutterActor and override the #ClutterActorClass.paint() virtual function.
+ *
+ * A #ClutterContent is a delegate object that takes over the painting
+ * operations of one, or more actors. The #ClutterContent painting will
+ * be performed on top of the #ClutterActor:background-color of the actor,
+ * and before calling the actor's own implementation of the
+ * #ClutterActorClass.paint_node() virtual function.
+ *
+ * |[<!-- language="C" -->
  * ClutterActor *actor = clutter_actor_new ();
  *
- * /&ast; set the bounding box &ast;/
+ * // set the bounding box
  * clutter_actor_set_position (actor, 50, 50);
  * clutter_actor_set_size (actor, 100, 100);
  *
- * /&ast; set the content; the image_content variable is set elsewhere &ast;/
+ * // set the content; the image_content variable is set elsewhere
  * clutter_actor_set_content (actor, image_content);
- *     </programlisting></informalexample>
- *   </formalpara>
- *   <formalpara>
- *     <title>Overriding the paint_node virtual function</title>
- *     <para>The #ClutterActorClass.paint_node() virtual function is invoked
- *     whenever an actor needs to be painted. The implementation of the
- *     virtual function must only paint the contents of the actor itself,
- *     and not the contents of its children, if the actor has any.</para>
- *     <para>The #ClutterPaintNode passed to the virtual function is the
- *     local root of the render tree; any node added to it will be
- *     rendered at the correct position, as defined by the actor's
- *     #ClutterActor:allocation.</para>
- *     <informalexample><programlisting>
+ * ]|
+ *
+ * The #ClutterActorClass.paint_node() virtual function is invoked whenever
+ * an actor needs to be painted. The implementation of the virtual function
+ * must only paint the contents of the actor itself, and not the contents of
+ * its children, if the actor has any.
+ *
+ * The #ClutterPaintNode passed to the virtual function is the local root of
+ * the render tree; any node added to it will be rendered at the correct
+ * position, as defined by the actor's #ClutterActor:allocation.
+ *
+ * |[<!-- language="C" -->
  * static void
  * my_actor_paint_node (ClutterActor     *actor,
  *                      ClutterPaintNode *root)
@@ -162,112 +152,131 @@
  *   ClutterPaintNode *node;
  *   ClutterActorBox box;
  *
- *   /&ast; where the content of the actor should be painted &ast;/
+ *   // where the content of the actor should be painted
  *   clutter_actor_get_allocation_box (actor, &box);
  *
- *   /&ast; the cogl_texture variable is set elsewhere &ast;/
+ *   // the cogl_texture variable is set elsewhere
  *   node = clutter_texture_node_new (cogl_texture, CLUTTER_COLOR_White,
  *                                    CLUTTER_SCALING_FILTER_TRILINEAR,
  *                                    CLUTTER_SCALING_FILTER_LINEAR);
  *
- *   /&ast; paint the content of the node using the allocation &ast;/
+ *   // paint the content of the node using the allocation
  *   clutter_paint_node_add_rectangle (node, &box);
  *
- *   /&ast; add the node, and transfer ownership &ast;/
+ *   // add the node, and transfer ownership
  *   clutter_paint_node_add_child (root, node);
  *   clutter_paint_node_unref (node);
  * }
- *     </programlisting></informalexample>
- *   </formalpara>
- *   <formalpara>
- *     <title>Overriding the paint virtual function</title>
- *     <para>The #ClutterActorClass.paint() virtual function is invoked
- *     when the #ClutterActor::paint signal is emitted, and after the other
- *     signal handlers have been invoked. Overriding the paint virtual
- *     function gives total control to the paint sequence of the actor
- *     itself, including the children of the actor, if any.</para>
- *     <warning><para>It is strongly discouraged to override the
- *     #ClutterActorClass.paint() virtual function, as well as connecting
- *     to the #ClutterActor::paint signal. These hooks into the paint
- *     sequence are considered legacy, and will be removed when the Clutter
- *     API changes.</para></warning>
- *   </formalpara>
- * </refsect2>
  *
- * <refsect2 id="ClutterActor-events">
- *   <title>Handling events on an actor</title>
- *   <para>A #ClutterActor can receive and handle input device events, for
- *   instance pointer events and key events, as long as its
- *   #ClutterActor:reactive property is set to %TRUE.</para>
- *   <para>Once an actor has been determined to be the source of an event,
- *   Clutter will traverse the scene graph from the top-level actor towards the
- *   event source, emitting the #ClutterActor::captured-event signal on each
- *   ancestor until it reaches the source; this phase is also called
- *   <emphasis>the capture phase</emphasis>. If the event propagation was not
- *   stopped, the graph is walked backwards, from the source actor to the
- *   top-level, and the #ClutterActor::event signal, along with other event
- *   signals if needed, is emitted; this phase is also called <emphasis>the
- *   bubble phase</emphasis>. At any point of the signal emission, signal
- *   handlers can stop the propagation through the scene graph by returning
- *   %CLUTTER_EVENT_STOP; otherwise, they can continue the propagation by
- *   returning %CLUTTER_EVENT_PROPAGATE.</para>
- * </refsect2>
+ * The #ClutterActorClass.paint() virtual function is invoked when the
+ * #ClutterActor::paint signal is emitted, and after the other signal
+ * handlers have been invoked. Overriding the paint virtual function
+ * gives total control to the paint sequence of the actor itself,
+ * including the children of the actor, if any.
  *
- * <refsect2 id="ClutterActor-animation">
- *   <title>Animation</title>
- *   <para>Animation is a core concept of modern user interfaces; Clutter
- *   provides a complete and powerful animation framework that automatically
- *   tweens the actor's state without requiring direct, frame by frame
- *   manipulation from your application code.</para>
- *   <formalpara>
- *     <title>Implicit animations</title>
- *     <para>The implicit animation model of Clutter assumes that all the
- *     changes in an actor state should be gradual and asynchronous; Clutter
- *     will automatically transition an actor's property change between the
- *     current state and the desired one without manual intervention, if the
- *     property is defined to be animatable in its documentation.</para>
- *     <note><para>By default, in the 1.0 API series, the transition happens
- *     with a duration of zero milliseconds, and the implicit animation is an
- *     opt in feature to retain backwards compatibility.</para></note>
- *     <para>Implicit animations depend on the current easing state; in order
- *     to use the default easing state for an actor you should call the
- *     clutter_actor_save_easing_state() function:</para>
- *     <informalexample><programlisting>
- * /&ast; assume that the actor is currently positioned at (100, 100) &ast;/
+ * It is strongly discouraged to override the #ClutterActorClass.paint()
+ * virtual function, as well as connecting to the #ClutterActor::paint
+ * signal. These hooks into the paint sequence are considered legacy, and
+ * will be removed when the Clutter API changes.
+ *
+ * ## Handling events on an actor
+ *
+ * A #ClutterActor can receive and handle input device events, for
+ * instance pointer events and key events, as long as its
+ * #ClutterActor:reactive property is set to %TRUE.
+ *
+ * Once an actor has been determined to be the source of an event,
+ * Clutter will traverse the scene graph from the top-level actor towards the
+ * event source, emitting the #ClutterActor::captured-event signal on each
+ * ancestor until it reaches the source; this phase is also called
+ * the "capture" phase. If the event propagation was not stopped, the graph
+ * is walked backwards, from the source actor to the top-level, and the
+ * #ClutterActor::event signal is emitted, alongside eventual event-specific
+ * signals like #ClutterActor::button-press-event or #ClutterActor::motion-event;
+ * this phase is also called the "bubble" phase.
+ *
+ * At any point of the signal emission, signal handlers can stop the propagation
+ * through the scene graph by returning %CLUTTER_EVENT_STOP; otherwise, they can
+ * continue the propagation by returning %CLUTTER_EVENT_PROPAGATE.
+ *
+ * ## Animation
+ *
+ * Animation is a core concept of modern user interfaces; Clutter provides a
+ * complete and powerful animation framework that automatically tweens the
+ * actor's state without requiring direct, frame by frame manipulation from
+ * your application code. You have two models at your disposal:
+ *
+ *  - an implicit animation model
+ *  - an explicit animation model
+ *
+ * The implicit animation model of Clutter assumes that all the
+ * changes in an actor state should be gradual and asynchronous; Clutter
+ * will automatically transition an actor's property change between the
+ * current state and the desired one without manual intervention, if the
+ * property is defined to be animatable in its documentation.
+ *
+ * By default, in the 1.0 API series, the transition happens with a duration
+ * of zero milliseconds, and the implicit animation is an opt in feature to
+ * retain backwards compatibility.
+ *
+ * Implicit animations depend on the current easing state; in order to use
+ * the default easing state for an actor you should call the
+ * clutter_actor_save_easing_state() function:
+ *
+ * |[<!-- language="C" -->
+ * // assume that the actor is currently positioned at (100, 100)
+ *
+ * // store the current easing state and reset the new easing state to
+ * // its default values
  * clutter_actor_save_easing_state (actor);
+ *
+ * // change the actor's position
  * clutter_actor_set_position (actor, 500, 500);
+ *
+ * // restore the previously saved easing state
  * clutter_actor_restore_easing_state (actor);
- *     </programlisting></informalexample>
- *     <para>The example above will trigger an implicit animation of the
- *     actor between its current position to a new position.</para>
- *     <para>It is possible to animate multiple properties of an actor
- *     at the same time, and you can animate multiple actors at the same
- *     time as well, for instance:</para>
- *     <informalexample><programlisting>
- * /&ast; animate the actor's opacity and depth &ast;/
+ * ]|
+ *
+ * The example above will trigger an implicit animation of the
+ * actor between its current position to a new position.
+ *
+ * Implicit animations use a default duration of 250 milliseconds,
+ * and a default easing mode of %CLUTTER_EASE_OUT_CUBIC, unless you call
+ * clutter_actor_set_easing_mode() and clutter_actor_set_easing_duration()
+ * after changing the easing state of the actor.
+ *
+ * It is possible to animate multiple properties of an actor
+ * at the same time, and you can animate multiple actors at the same
+ * time as well, for instance:
+ *
+ * |[<!-- language="C" -->
  * clutter_actor_save_easing_state (actor);
+ *
+ * // animate the actor's opacity and depth
  * clutter_actor_set_opacity (actor, 0);
  * clutter_actor_set_depth (actor, -100);
+ *
  * clutter_actor_restore_easing_state (actor);
  *
- * /&ast; animate another actor's opacity &ast;/
  * clutter_actor_save_easing_state (another_actor);
+ *
+ * // animate another actor's opacity
  * clutter_actor_set_opacity (another_actor, 255);
  * clutter_actor_set_depth (another_actor, 100);
+ *
  * clutter_actor_restore_easing_state (another_actor);
- *     </programlisting></informalexample>
- *     <para>Implicit animations use a default duration of 250 milliseconds,
- *     and a default easing mode of %CLUTTER_EASE_OUT_CUBIC, unless you call
- *     clutter_actor_set_easing_mode() and clutter_actor_set_easing_duration()
- *     after changing the easing state of the actor.</para>
- *     <para>Changing the easing state will affect all the following property
- *     transitions, but will not affect existing transitions.</para>
- *     <para>It is important to note that if you modify the state on an
- *     animatable property while a transition is in flight, the transition's
- *     final value will be updated, as well as its duration and progress
- *     mode by using the current easing state; for instance, in the following
- *     example:</para>
- *     <informalexample><programlisting>
+ * ]|
+ *
+ * Changing the easing state will affect all the following property
+ * transitions, but will not affect existing transitions.
+ *
+ * It is important to note that if you modify the state on an
+ * animatable property while a transition is in flight, the transition's
+ * final value will be updated, as well as its duration and progress
+ * mode by using the current easing state; for instance, in the following
+ * example:
+ *
+ * |[<!-- language="C" -->
  * clutter_actor_save_easing_state (actor);
  * clutter_actor_set_easing_duration (actor, 1000);
  * clutter_actor_set_x (actor, 200);
@@ -277,23 +286,30 @@
  * clutter_actor_set_easing_duration (actor, 500);
  * clutter_actor_set_x (actor, 100);
  * clutter_actor_restore_easing_state (actor);
- *     </programlisting></informalexample>
- *     <para>the first call to clutter_actor_set_x() will begin a transition
- *     of the #ClutterActor:x property from the current value to the value of
- *     200 over a duration of one second; the second call to clutter_actor_set_x()
- *     will change the transition's final value to 100 and the duration to 500
- *     milliseconds.</para>
- *     <para>It is possible to retrieve the #ClutterTransition used by the
- *     animatable properties by using clutter_actor_get_transition() and using
- *     the property name as the transition name.</para>
- *   </formalpara>
- *   <formalpara>
- *     <title>Explicit animations</title>
- *     <para>The explicit animation model supported by Clutter requires that
- *     you create a #ClutterTransition object, and set the initial and
- *     final values. The transition will not start unless you add it to the
- *     #ClutterActor.</para>
- *     <informalexample><programlisting>
+ * ]|
+ *
+ * the first call to clutter_actor_set_x() will begin a transition
+ * of the #ClutterActor:x property from the current value to the value of
+ * 200 over a duration of one second; the second call to clutter_actor_set_x()
+ * will change the transition's final value to 100 and the duration to 500
+ * milliseconds.
+ *
+ * It is possible to receive a notification of the completion of an
+ * implicit transition by using the #ClutterActor::transition-stopped
+ * signal, decorated with the name of the property. In case you want to
+ * know when all the currently in flight transitions are complete, use
+ * the #ClutterActor::transitions-completed signal instead.
+ *
+ * It is possible to retrieve the #ClutterTransition used by the
+ * animatable properties by using clutter_actor_get_transition() and using
+ * the property name as the transition name.
+ *
+ * The explicit animation model supported by Clutter requires that
+ * you create a #ClutterTransition object, and optionally set the initial
+ * and final values. The transition will not start unless you add it to the
+ * #ClutterActor.
+ *
+ * |[<!-- language="C" -->
  * ClutterTransition *transition;
  *
  * transition = clutter_property_transition_new ("opacity");
@@ -304,144 +320,144 @@
  * clutter_transition_set_to (transition, G_TYPE_UINT, 0);
  *
  * clutter_actor_add_transition (actor, "animate-opacity", transition);
- *     </programlisting></informalexample>
- *     <para>The example above will animate the #ClutterActor:opacity property
- *     of an actor between fully opaque and fully transparent, and back, over
- *     a span of 3 seconds. The animation does not begin until it is added to
- *     the actor.</para>
- *     <para>The explicit animation API applies to all #GObject properties,
- *     as well as the custom properties defined through the #ClutterAnimatable
- *     interface, regardless of whether they are defined as implicitly
- *     animatable or not.</para>
- *     <para>The explicit animation API should also be used when using custom
- *     animatable properties for #ClutterAction, #ClutterConstraint, and
- *     #ClutterEffect instances associated to an actor; see the section on
- *     <ulink linkend="ClutterActor-custom-animatable-properties">custom
- *     animatable properties below</ulink> for an example.</para>
- *     <para>Finally, explicit animations are useful for creating animations
- *     that run continuously, for instance:</para>
- *     <informalexample><programlisting>
- * /&ast; this animation will pulse the actor's opacity continuously &ast;/
+ * ]|
+ *
+ * The example above will animate the #ClutterActor:opacity property
+ * of an actor between fully opaque and fully transparent, and back, over
+ * a span of 3 seconds. The animation does not begin until it is added to
+ * the actor.
+ *
+ * The explicit animation API applies to all #GObject properties,
+ * as well as the custom properties defined through the #ClutterAnimatable
+ * interface, regardless of whether they are defined as implicitly
+ * animatable or not.
+ *
+ * The explicit animation API should also be used when using custom
+ * animatable properties for #ClutterAction, #ClutterConstraint, and
+ * #ClutterEffect instances associated to an actor; see the section on
+ * custom animatable properties below for an example.
+ *
+ * Finally, explicit animations are useful for creating animations
+ * that run continuously, for instance:
+ *
+ * |[<!-- language="C" -->
+ * // this animation will pulse the actor's opacity continuously
  * ClutterTransition *transition;
  * ClutterInterval *interval;
  *
  * transition = clutter_property_transition_new ("opacity");
  *
- * /&ast; we want to animate the opacity between 0 and 255 &ast;/
+ * // we want to animate the opacity between 0 and 255
  * clutter_transition_set_from (transition, G_TYPE_UINT, 0);
  * clutter_transition_set_to (transition, G_TYPE_UINT, 255);
  *
- * /&ast; over a one second duration, running an infinite amount of times &ast;/
+ * // over a one second duration, running an infinite amount of times
  * clutter_timeline_set_duration (CLUTTER_TIMELINE (transition), 1000);
  * clutter_timeline_set_repeat_count (CLUTTER_TIMELINE (transition), -1);
  *
- * /&ast; we want to fade in and out, so we need to auto-reverse the transition &ast;/
+ * // we want to fade in and out, so we need to auto-reverse the transition
  * clutter_timeline_set_auto_reverse (CLUTTER_TIMELINE (transition), TRUE);
  *
- * /&ast; and we want to use an easing function that eases both in and out &ast;/
+ * // and we want to use an easing function that eases both in and out
  * clutter_timeline_set_progress_mode (CLUTTER_TIMELINE (transition),
  *                                     CLUTTER_EASE_IN_OUT_CUBIC);
  *
- * /&ast; add the transition to the desired actor; this will
- *  &ast; start the animation.
- *  &ast;/
+ * // add the transition to the desired actor to start it
  * clutter_actor_add_transition (actor, "opacityAnimation", transition);
- *     </programlisting></informalexample>
- *   </formalpara>
- * </refsect2>
+ * ]|
  *
- * <refsect2 id="ClutterActor-subclassing">
- *   <title>Implementing an actor</title>
- *   <para>Careful consideration should be given when deciding to implement
- *   a #ClutterActor sub-class. It is generally recommended to implement a
- *   sub-class of #ClutterActor only for actors that should be used as leaf
- *   nodes of a scene graph.</para>
- *   <para>If your actor should be painted in a custom way, you should
- *   override the #ClutterActor::paint signal class handler. You can either
- *   opt to chain up to the parent class implementation or decide to fully
- *   override the default paint implementation; Clutter will set up the
- *   transformations and clip regions prior to emitting the #ClutterActor::paint
- *   signal.</para>
- *   <para>By overriding the #ClutterActorClass.get_preferred_width() and
- *   #ClutterActorClass.get_preferred_height() virtual functions it is
- *   possible to change or provide the preferred size of an actor; similarly,
- *   by overriding the #ClutterActorClass.allocate() virtual function it is
- *   possible to control the layout of the children of an actor. Make sure to
- *   always chain up to the parent implementation of the
- *   #ClutterActorClass.allocate() virtual function.</para>
- *   <para>In general, it is strongly encouraged to use delegation and
- *   composition instead of direct subclassing.</para>
- * </refsect2>
+ * ## Implementing an actor
  *
- * <refsect2 id="ClutterActor-script">
- *   <title>ClutterActor custom properties for #ClutterScript</title>
- *   <para>#ClutterActor defines a custom "rotation" property which
- *   allows a short-hand description of the rotations to be applied
- *   to an actor.</para>
- *   <para>The syntax of the "rotation" property is the following:</para>
- *   <informalexample>
- *     <programlisting>
- * "rotation" : [
- *   { "&lt;axis&gt;" : [ &lt;angle&gt;, [ &lt;center&gt; ] ] }
- * ]
- *     </programlisting>
- *   </informalexample>
- *   <para>where the <emphasis>axis</emphasis> is the name of an enumeration
- *   value of type #ClutterRotateAxis and <emphasis>angle</emphasis> is a
- *   floating point value representing the rotation angle on the given axis,
- *   in degrees.</para>
- *   <para>The <emphasis>center</emphasis> array is optional, and if present
- *   it must contain the center of rotation as described by two coordinates:
- *   Y and Z for "x-axis"; X and Z for "y-axis"; and X and Y for
- *   "z-axis".</para>
- *   <para>#ClutterActor also defines a scriptable "margin" property which
- *   follows the CSS "margin" shorthand.
- *   <informalexample>
- *     <programlisting>
- * // 4 values
- * "margin" : [ &lt;top&gt;, &lt;right&gt;, &lt;bottom&gt; &lt;left&gt; ]
- * // 3 values
- * "margin" : [ &lt;top&gt;, &lt;left/right&gt;, &lt;bottom&gt; ]
- * // 2 values
- * "margin" : [ &lt;top/bottom&gt;, &lt;left/right&gt; ]
- * // 1 value
- * "margin" : [ &lt;top/right/bottom/left&gt; ]
- *     </programlisting>
- *   </informalexample>
- *   </para>
- *   <para>#ClutterActor will also parse every positional and dimensional
- *   property defined as a string through clutter_units_from_string(); you
- *   should read the documentation for the #ClutterUnits parser format for
- *   the valid units and syntax.</para>
- * </refsect2>
+ * Careful consideration should be given when deciding to implement
+ * a #ClutterActor sub-class. It is generally recommended to implement a
+ * sub-class of #ClutterActor only for actors that should be used as leaf
+ * nodes of a scene graph.
  *
- * <refsect2 id="ClutterActor-custom-animatable-properties">
- *   <title>Custom animatable properties</title>
- *   <para>#ClutterActor allows accessing properties of #ClutterAction,
- *   #ClutterEffect, and #ClutterConstraint instances associated to an actor
- *   instance for animation purposes.</para>
- *   <para>In order to access a specific #ClutterAction or a #ClutterConstraint
- *   property it is necessary to set the #ClutterActorMeta:name property on the
- *   given action or constraint.</para>
- *   <para>The property can be accessed using the following syntax:</para>
- *   <informalexample>
- *     <programlisting>
- * @&lt;section&gt;.&lt;meta-name&gt;.&lt;property-name&gt;
- *     </programlisting>
- *   </informalexample>
- *   <para>The initial <emphasis>@</emphasis> is mandatory.</para>
- *   <para>The <emphasis>section</emphasis> fragment can be one between
- *   "actions", "constraints" and "effects".</para>
- *   <para>The <emphasis>meta-name</emphasis> fragment is the name of the
- *   action or constraint, as specified by the #ClutterActorMeta:name
- *   property.</para>
- *   <para>The <emphasis>property-name</emphasis> fragment is the name of the
- *   action or constraint property to be animated.</para>
- *   <para>The example below animates a #ClutterBindConstraint applied to an
- *   actor using clutter_actor_animate(). The <emphasis>rect</emphasis> has
- *   a binding constraint for the <emphasis>origin</emphasis> actor, and in
- *   its initial state is overlapping the actor to which is bound to.</para>
- *   <informalexample><programlisting>
+ * If your actor should be painted in a custom way, you should
+ * override the #ClutterActor::paint signal class handler. You can either
+ * opt to chain up to the parent class implementation or decide to fully
+ * override the default paint implementation; Clutter will set up the
+ * transformations and clip regions prior to emitting the #ClutterActor::paint
+ * signal.
+ *
+ * By overriding the #ClutterActorClass.get_preferred_width() and
+ * #ClutterActorClass.get_preferred_height() virtual functions it is
+ * possible to change or provide the preferred size of an actor; similarly,
+ * by overriding the #ClutterActorClass.allocate() virtual function it is
+ * possible to control the layout of the children of an actor. Make sure to
+ * always chain up to the parent implementation of the
+ * #ClutterActorClass.allocate() virtual function.
+ *
+ * In general, it is strongly encouraged to use delegation and composition
+ * instead of direct subclassing.
+ *
+ * ## ClutterActor custom properties for ClutterScript
+ *
+ * #ClutterActor defines a custom "rotation" property which allows a short-hand
+ * description of the rotations to be applied to an actor.
+ *
+ * The syntax of the "rotation" property is the following:
+ *
+ * |[
+ * "rotation" : [ { "<axis>" : [ <angle>, [ <center-point> ] ] } ]
+ * ]|
+ *
+ * where:
+ *
+ *  - axis is the name of an enumeration value of type #ClutterRotateAxis
+ *  - angle is a floating point value representing the rotation angle on the given axis in degrees
+ *  - center-point is an optional array, and if present it must contain the center of rotation as described by two coordinates:
+ *    - Y and Z for "x-axis"
+ *    - X and Z for "y-axis"
+ *    - X and Y for "z-axis".
+ *
+ * #ClutterActor also defines a scriptable "margin" property which follows the CSS "margin" shorthand.
+ *
+ * |[
+ *   // 4 values
+ *   "margin" : [ top, right, bottom, left ]
+ *   // 3 values
+ *   "margin" : [ top, left/right, bottom ]
+ *   // 2 values
+ *   "margin" : [ top/bottom, left/right ]
+ *   // 1 value
+ *   "margin" : [ top/right/bottom/left ]
+ * ]|
+ *
+ * #ClutterActor will also parse every positional and dimensional
+ * property defined as a string through clutter_units_from_string(); you
+ * should read the documentation for the #ClutterUnits parser format for
+ * the valid units and syntax.
+ *
+ * ## Custom animatable properties
+ *
+ * #ClutterActor allows accessing properties of #ClutterAction,
+ * #ClutterEffect, and #ClutterConstraint instances associated to an actor
+ * instance for animation purposes.
+ *
+ * In order to access a specific #ClutterAction or a #ClutterConstraint
+ * property it is necessary to set the #ClutterActorMeta:name property on the
+ * given action or constraint.
+ *
+ * The property can be accessed using the following syntax:
+ *
+ * |[
+ *   @<section>.<meta-name>.<property-name>
+ * ]|
+ *
+ *  - the initial `@` is mandatory
+ *  - the `section` fragment can be one between "actions", "constraints" and "effects"
+ *  - the `meta-name` fragment is the name of the action, effect, or constraint, as
+ *    specified by the #ClutterActorMeta:name property of #ClutterActorMeta
+ *  - the `property-name` fragment is the name of the action, effect, or constraint
+ *    property to be animated.
+ *
+ * The example below animates a #ClutterBindConstraint applied to an actor
+ * using an explicit transition. The `rect` actor has a binding constraint
+ * on the `origin` actor, and in its initial state is overlapping the actor
+ * to which is bound to.
+ *
+ * |[<!-- language="C" -->
  * constraint = clutter_bind_constraint_new (origin, CLUTTER_BIND_X, 0.0);
  * clutter_actor_meta_set_name (CLUTTER_ACTOR_META (constraint), "bind-x");
  * clutter_actor_add_constraint (rect, constraint);
@@ -455,11 +471,13 @@
  * g_signal_connect (origin, "button-press-event",
  *                   G_CALLBACK (on_button_press),
  *                   rect);
- *   </programlisting></informalexample>
- *   <para>On button press, the rectangle "slides" from behind the actor to
- *   which is bound to, using the #ClutterBindConstraint:offset property to
- *   achieve the effect:</para>
- *   <informalexample><programlisting>
+ * ]|
+ *
+ * On button press, the rectangle "slides" from behind the actor to
+ * which is bound to, using the #ClutterBindConstraint:offset property to
+ * achieve the effect:
+ *
+ * |[<!-- language="C" -->
  * gboolean
  * on_button_press (ClutterActor *origin,
  *                  ClutterEvent *event,
@@ -467,43 +485,39 @@
  * {
  *   ClutterTransition *transition;
  *
- *   /&ast; the offset that we want to apply; this will make the actor
- *    &ast; slide in from behind the origin and rest at the right of
- *    &ast; the origin, plus a padding value.
- *    &ast;/
+ *   // the offset that we want to apply; this will make the actor
+ *   // slide in from behind the origin and rest at the right of
+ *   // the origin, plus a padding value
  *   float new_offset = clutter_actor_get_width (origin) + h_padding;
  *
- *   /&ast; the property we wish to animate; the "@constraints" section
- *    &ast; tells Clutter to check inside the constraints associated
- *    &ast; with the actor; the "bind-x" section is the name of the
- *    &ast; constraint; and the "offset" is the name of the property
- *    &ast; on the constraint.
- *    &ast;/
+ *   // the property we wish to animate; the "@constraints" section
+ *   // tells Clutter to check inside the constraints associated
+ *   // with the actor; the "bind-x" section is the name of the
+ *   // constraint; and the "offset" is the name of the property
+ *   // on the constraint
  *   const char *prop = "@constraints.bind-x.offset";
  *
- *   /&ast; create a new transition for the given property &ast;/
+ *   // create a new transition for the given property
  *   transition = clutter_property_transition_new (prop);
  *
- *   /&ast; set the easing mode and duration &ast;/
+ *   // set the easing mode and duration
  *   clutter_timeline_set_progress_mode (CLUTTER_TIMELINE (transition),
  *                                       CLUTTER_EASE_OUT_CUBIC);
  *   clutter_timeline_set_duration (CLUTTER_TIMELINE (transition), 500);
  *
- *   /&ast; create the interval with the initial and final values &ast;/
+ *   // create the interval with the initial and final values
  *   clutter_transition_set_from (transition, G_TYPE_FLOAT, 0.f);
  *   clutter_transition_set_to (transition, G_TYPE_FLOAT, new_offset);
  *
- *   /&ast; add the transition to the actor; this causes the animation
- *    &ast; to start. the name "offsetAnimation" can be used to retrieve
- *    &ast; the transition later.
- *    &ast;/
+ *   // add the transition to the actor; this causes the animation
+ *   // to start. the name "offsetAnimation" can be used to retrieve
+ *   // the transition later
  *   clutter_actor_add_transition (rect, "offsetAnimation", transition);
  *
- *   /&ast; we handled the event &ast;/
+ *   // we handled the event
  *   return CLUTTER_EVENT_STOP;
  * }
- *   </programlisting></informalexample>
- * </refsect2>
+ * ]|
  */
 
 /**
@@ -579,9 +593,7 @@
  * Since: 0.6
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include <math.h>
 
@@ -599,7 +611,7 @@
 #include "clutter-animatable.h"
 #include "clutter-color-static.h"
 #include "clutter-color.h"
-#include "clutter-constraint.h"
+#include "clutter-constraint-private.h"
 #include "clutter-container.h"
 #include "clutter-content-private.h"
 #include "clutter-debug.h"
@@ -628,9 +640,6 @@
 #include "deprecated/clutter-behaviour.h"
 #include "deprecated/clutter-container.h"
 
-#define CLUTTER_ACTOR_GET_PRIVATE(obj) \
-(G_TYPE_INSTANCE_GET_PRIVATE ((obj), CLUTTER_TYPE_ACTOR, ClutterActorPrivate))
-
 /* Internal enum used to control mapped state update.  This is a hint
  * which indicates when to do something other than just enforce
  * invariants.
@@ -704,7 +713,6 @@ struct _ClutterActorPrivate
   gint age;
 
   gchar *name; /* a non-unique name, used for debugging */
-  guint32 id; /* unique id, used for backward compatibility */
 
   gint32 pick_id; /* per-stage unique id, used for picking */
 
@@ -816,7 +824,6 @@ struct _ClutterActorPrivate
   guint needs_compute_expand        : 1;
   guint needs_x_expand              : 1;
   guint needs_y_expand              : 1;
-  guint was_painted                 : 1;
 };
 
 enum
@@ -1041,8 +1048,6 @@ static void           clutter_anchor_coord_set_gravity (AnchorCoord       *coord
 
 static gboolean clutter_anchor_coord_is_zero (const AnchorCoord *coord);
 
-static void _clutter_actor_queue_only_relayout (ClutterActor *self);
-
 static void _clutter_actor_get_relative_transformation_matrix (ClutterActor *self,
                                                                ClutterActor *ancestor,
                                                                CoglMatrix *matrix);
@@ -1068,7 +1073,8 @@ static void clutter_actor_set_transform_internal (ClutterActor        *self,
 static void clutter_actor_set_child_transform_internal (ClutterActor        *self,
                                                         const ClutterMatrix *transform);
 
-static inline gboolean clutter_actor_has_mapped_clones (ClutterActor *self);
+static void     clutter_actor_realize_internal          (ClutterActor *self);
+static void     clutter_actor_unrealize_internal        (ClutterActor *self);
 
 /* Helper macro which translates by the anchor coord, applies the
    given transformation and then translates back */
@@ -1087,6 +1093,7 @@ static GQuark quark_actor_animation_info = 0;
 G_DEFINE_TYPE_WITH_CODE (ClutterActor,
                          clutter_actor,
                          G_TYPE_INITIALLY_UNOWNED,
+                         G_ADD_PRIVATE (ClutterActor)
                          G_IMPLEMENT_INTERFACE (CLUTTER_TYPE_CONTAINER,
                                                 clutter_container_iface_init)
                          G_IMPLEMENT_INTERFACE (CLUTTER_TYPE_SCRIPTABLE,
@@ -1488,12 +1495,6 @@ clutter_actor_real_map (ClutterActor *self)
   stage = _clutter_actor_get_stage_internal (self);
   priv->pick_id = _clutter_stage_acquire_pick_id (CLUTTER_STAGE (stage), self);
 
-  /* reset the was_painted flag here: unmapped actors are not going to
-   * be painted in any case, and this allows us to catch the case of
-   * cloned actors.
-   */
-  priv->was_painted = FALSE;
-
   CLUTTER_NOTE (ACTOR, "Pick id '%d' for actor '%s'",
                 priv->pick_id,
                 _clutter_actor_get_debug_name (self));
@@ -1607,11 +1608,11 @@ clutter_actor_real_unmap (ClutterActor *self)
  * When overriding #ClutterActorClass.unmap(), it is mandatory to
  * chain up to the parent implementation.
  *
- * <note>It is important to note that the implementation of the
+ * It is important to note that the implementation of the
  * #ClutterActorClass.unmap() virtual function may be called after
  * the #ClutterActorClass.destroy() or the #GObjectClass.dispose()
  * implementation, but it is guaranteed to be called before the
- * #GObjectClass.finalize() implementation.</note>
+ * #GObjectClass.finalize() implementation.
  *
  * Since: 1.0
  */
@@ -1888,15 +1889,22 @@ clutter_actor_hide_all (ClutterActor *self)
  * This function does not realize child actors, except in the special
  * case that realizing the stage, when the stage is visible, will
  * suddenly map (and thus realize) the children of the stage.
- **/
+ *
+ * Deprecated: 1.16: Actors are automatically realized, and nothing
+ *   requires explicit realization.
+ */
 void
 clutter_actor_realize (ClutterActor *self)
 {
-  ClutterActorPrivate *priv;
-
   g_return_if_fail (CLUTTER_IS_ACTOR (self));
 
-  priv = self->priv;
+  clutter_actor_realize_internal (self);
+}
+
+static void
+clutter_actor_realize_internal (ClutterActor *self)
+{
+  ClutterActorPrivate *priv = self->priv;
 
 #ifdef CLUTTER_ENABLE_DEBUG
   clutter_actor_verify_map_state (self);
@@ -1968,14 +1976,8 @@ clutter_actor_real_unrealize (ClutterActor *self)
  * may not be expecting.
  *
  * This function should not be called by application code.
- */
-void
-clutter_actor_unrealize (ClutterActor *self)
-{
-  g_return_if_fail (CLUTTER_IS_ACTOR (self));
-  g_return_if_fail (!CLUTTER_ACTOR_IS_MAPPED (self));
-
-/* This function should not really be in the public API, because
+ *
+ * This function should not really be in the public API, because
  * there isn't a good reason to call it. ClutterActor will already
  * unrealize things for you when it's important to do so.
  *
@@ -1987,12 +1989,26 @@ clutter_actor_unrealize (ClutterActor *self)
  * unrealizing children of your container, then don't, ClutterActor
  * will already take care of that.
  *
- * If you were using clutter_actor_unrealize() to re-realize to
+ * Deprecated: 1.16: Actors are automatically unrealized, and nothing
+ *   requires explicit realization.
+ */
+void
+clutter_actor_unrealize (ClutterActor *self)
+{
+  g_return_if_fail (CLUTTER_IS_ACTOR (self));
+  g_return_if_fail (!CLUTTER_ACTOR_IS_MAPPED (self));
+
+  clutter_actor_unrealize_internal (self);
+}
+
+/* If you were using clutter_actor_unrealize() to re-realize to
  * create your resources in a different way, then use
  * _clutter_actor_rerealize() (inside Clutter) or just call your
  * code that recreates your resources directly (outside Clutter).
  */
-
+static void
+clutter_actor_unrealize_internal (ClutterActor *self)
+{
 #ifdef CLUTTER_ENABLE_DEBUG
   clutter_actor_verify_map_state (self);
 #endif
@@ -2788,10 +2804,10 @@ clutter_actor_apply_transform_to_point (ClutterActor        *self,
  * using cogl_set_modelview_matrix() for example then you would want a matrix
  * that transforms into eye coordinates.
  *
- * <note><para>This function explicitly initializes the given @matrix. If you just
+ * Note: This function explicitly initializes the given @matrix. If you just
  * want clutter to multiply a relative transformation with an existing matrix
  * you can use clutter_actor_apply_relative_transformation_matrix()
- * instead.</para></note>
+ * instead.
  *
  */
 /* XXX: We should consider caching the stage relative modelview along with
@@ -2843,12 +2859,11 @@ _clutter_actor_transform_and_project_box (ClutterActor          *self,
  * Calculates the transformed coordinates of the four corners of the
  * actor in the plane of @ancestor. The returned vertices relate to
  * the #ClutterActorBox coordinates as follows:
- * <itemizedlist>
- *   <listitem><para>@verts[0] contains (x1, y1)</para></listitem>
- *   <listitem><para>@verts[1] contains (x2, y1)</para></listitem>
- *   <listitem><para>@verts[2] contains (x1, y2)</para></listitem>
- *   <listitem><para>@verts[3] contains (x2, y2)</para></listitem>
- * </itemizedlist>
+ *
+ *  - @verts[0] contains (x1, y1)
+ *  - @verts[1] contains (x2, y1)
+ *  - @verts[2] contains (x1, y2)
+ *  - @verts[3] contains (x2, y2)
  *
  * If @ancestor is %NULL the ancestor will be the #ClutterStage. In
  * this case, the coordinates returned will be the coordinates on
@@ -2932,12 +2947,11 @@ clutter_actor_get_allocation_vertices (ClutterActor  *self,
  * Calculates the transformed screen coordinates of the four corners of
  * the actor; the returned vertices relate to the #ClutterActorBox
  * coordinates  as follows:
- * <itemizedlist>
- *   <listitem><para>v[0] contains (x1, y1)</para></listitem>
- *   <listitem><para>v[1] contains (x2, y1)</para></listitem>
- *   <listitem><para>v[2] contains (x1, y2)</para></listitem>
- *   <listitem><para>v[3] contains (x2, y2)</para></listitem>
- * </itemizedlist>
+ *
+ *  - v[0] contains (x1, y1)
+ *  - v[1] contains (x2, y1)
+ *  - v[2] contains (x1, y2)
+ *  - v[3] contains (x2, y2)
  *
  * Since: 0.4
  */
@@ -3147,11 +3161,11 @@ _clutter_actor_apply_modelview_transform (ClutterActor  *self,
  * using cogl_set_modelview_matrix() for example then you would want a matrix
  * that transforms into eye coordinates.
  *
- * <note>This function doesn't initialize the given @matrix, it simply
+ * This function doesn't initialize the given @matrix, it simply
  * multiplies the requested transformation matrix with the existing contents of
  * @matrix. You can use cogl_matrix_init_identity() to initialize the @matrix
  * before calling this function, or you can use
- * clutter_actor_get_relative_transformation_matrix() instead.</note>
+ * clutter_actor_get_relative_transformation_matrix() instead.
  */
 void
 _clutter_actor_apply_relative_transformation_matrix (ClutterActor *self,
@@ -3347,10 +3361,11 @@ in_clone_paint (void)
  * means there's no point in trying to cull descendants of the current
  * node. */
 static gboolean
-cull_actor (ClutterActor *self, ClutterCullResult *result_out)
+cull_actor (ClutterActor      *self,
+            ClutterCullResult *result_out)
 {
   ClutterActorPrivate *priv = self->priv;
-  ClutterActor *stage;
+  ClutterStage *stage;
   const ClutterPlane *stage_clip;
 
   if (!priv->last_paint_volume_valid)
@@ -3364,8 +3379,8 @@ cull_actor (ClutterActor *self, ClutterCullResult *result_out)
   if (G_UNLIKELY (clutter_paint_debug_flags & CLUTTER_DEBUG_DISABLE_CULLING))
     return FALSE;
 
-  stage = _clutter_actor_get_stage_internal (self);
-  stage_clip = _clutter_stage_get_clip (CLUTTER_STAGE (stage));
+  stage = (ClutterStage *) _clutter_actor_get_stage_internal (self);
+  stage_clip = _clutter_stage_get_clip (stage);
   if (G_UNLIKELY (!stage_clip))
     {
       CLUTTER_NOTE (CLIPPING, "Bail from cull_actor without culling (%s): "
@@ -3374,8 +3389,7 @@ cull_actor (ClutterActor *self, ClutterCullResult *result_out)
       return FALSE;
     }
 
-  if (cogl_get_draw_framebuffer () !=
-      _clutter_stage_get_active_framebuffer (CLUTTER_STAGE (stage)))
+  if (cogl_get_draw_framebuffer () != _clutter_stage_get_active_framebuffer (stage))
     {
       CLUTTER_NOTE (CLIPPING, "Bail from cull_actor without culling (%s): "
                     "Current framebuffer doesn't correspond to stage",
@@ -3385,6 +3399,7 @@ cull_actor (ClutterActor *self, ClutterCullResult *result_out)
 
   *result_out =
     _clutter_paint_volume_cull (&priv->last_paint_volume, stage_clip);
+
   return TRUE;
 }
 
@@ -3556,23 +3571,51 @@ clutter_actor_paint_node (ClutterActor     *actor,
                           ClutterPaintNode *root)
 {
   ClutterActorPrivate *priv = actor->priv;
+  ClutterActorBox box;
+  ClutterColor bg_color;
 
   if (root == NULL)
     return FALSE;
 
-  if (priv->bg_color_set &&
-      !clutter_color_equal (&priv->bg_color, CLUTTER_COLOR_Transparent))
+  box.x1 = 0.f;
+  box.y1 = 0.f;
+  box.x2 = clutter_actor_box_get_width (&priv->allocation);
+  box.y2 = clutter_actor_box_get_height (&priv->allocation);
+
+  bg_color = priv->bg_color;
+
+  if (CLUTTER_ACTOR_IS_TOPLEVEL (actor))
     {
       ClutterPaintNode *node;
-      ClutterColor bg_color;
-      ClutterActorBox box;
+      CoglFramebuffer *fb;
+      CoglBufferBit clear_flags;
 
-      box.x1 = 0.f;
-      box.y1 = 0.f;
-      box.x2 = clutter_actor_box_get_width (&priv->allocation);
-      box.y2 = clutter_actor_box_get_height (&priv->allocation);
+      fb = _clutter_stage_get_active_framebuffer (CLUTTER_STAGE (actor));
+
+      if (clutter_stage_get_use_alpha (CLUTTER_STAGE (actor)))
+        {
+          bg_color.alpha = clutter_actor_get_paint_opacity_internal (actor)
+                         * priv->bg_color.alpha
+                         / 255;
+        }
+      else
+        bg_color.alpha = 255;
+
+      clear_flags = COGL_BUFFER_BIT_DEPTH;
+      if (!clutter_stage_get_no_clear_hint (CLUTTER_STAGE (actor)))
+        clear_flags |= COGL_BUFFER_BIT_COLOR;
+
+      node = _clutter_root_node_new (fb, &bg_color, clear_flags);
+      clutter_paint_node_set_name (node, "stageClear");
+      clutter_paint_node_add_rectangle (node, &box);
+      clutter_paint_node_add_child (root, node);
+      clutter_paint_node_unref (node);
+    }
+  else if (priv->bg_color_set &&
+           !clutter_color_equal (&priv->bg_color, CLUTTER_COLOR_Transparent))
+    {
+      ClutterPaintNode *node;
 
-      bg_color = priv->bg_color;
       bg_color.alpha = clutter_actor_get_paint_opacity_internal (actor)
                      * priv->bg_color.alpha
                      / 255;
@@ -3631,6 +3674,7 @@ clutter_actor_paint (ClutterActor *self)
   ClutterPickMode pick_mode;
   gboolean clip_set = FALSE;
   gboolean shader_applied = FALSE;
+  ClutterStage *stage;
 
   CLUTTER_STATIC_COUNTER (actor_paint_counter,
                           "Actor real-paint counter",
@@ -3670,10 +3714,12 @@ clutter_actor_paint (ClutterActor *self)
   if (!CLUTTER_ACTOR_IS_MAPPED (self))
     return;
 
+  stage = (ClutterStage *) _clutter_actor_get_stage_internal (self);
+
   /* mark that we are in the paint process */
   CLUTTER_SET_PRIVATE_FLAGS (self, CLUTTER_IN_PAINT);
 
-  cogl_push_matrix();
+  cogl_push_matrix ();
 
   if (priv->enable_model_view_transform)
     {
@@ -3728,20 +3774,23 @@ clutter_actor_paint (ClutterActor *self)
 
   if (priv->has_clip)
     {
-      cogl_clip_push_rectangle (priv->clip.origin.x,
-                                priv->clip.origin.y,
-                                priv->clip.origin.x + priv->clip.size.width,
-                                priv->clip.origin.y + priv->clip.size.height);
+      CoglFramebuffer *fb = _clutter_stage_get_active_framebuffer (stage);
+      cogl_framebuffer_push_rectangle_clip (fb,
+                                            priv->clip.origin.x,
+                                            priv->clip.origin.y,
+                                            priv->clip.origin.x + priv->clip.size.width,
+                                            priv->clip.origin.y + priv->clip.size.height);
       clip_set = TRUE;
     }
   else if (priv->clip_to_allocation)
     {
+      CoglFramebuffer *fb = _clutter_stage_get_active_framebuffer (stage);
       gfloat width, height;
 
       width  = priv->allocation.x2 - priv->allocation.x1;
       height = priv->allocation.y2 - priv->allocation.y1;
 
-      cogl_clip_push_rectangle (0, 0, width, height);
+      cogl_framebuffer_push_rectangle_clip (fb, 0, 0, width, height);
       clip_set = TRUE;
     }
 
@@ -3838,9 +3887,13 @@ done:
     priv->is_dirty = FALSE;
 
   if (clip_set)
-    cogl_clip_pop();
+    {
+      CoglFramebuffer *fb = _clutter_stage_get_active_framebuffer (stage);
 
-  cogl_pop_matrix();
+      cogl_framebuffer_pop_clip (fb);
+    }
+
+  cogl_pop_matrix ();
 
   /* paint sequence complete */
   CLUTTER_UNSET_PRIVATE_FLAGS (self, CLUTTER_IN_PAINT);
@@ -3899,9 +3952,6 @@ clutter_actor_continue_paint (ClutterActor *self)
 
           /* XXX:2.0 - Call the paint() virtual directly */
           g_signal_emit (self, actor_signals[PAINT], 0);
-
-          /* the actor was painted at least once */
-          priv->was_painted = TRUE;
         }
       else
         {
@@ -5347,7 +5397,7 @@ clutter_actor_get_property (GObject    *object,
       break;
 
     case PROP_OFFSCREEN_REDIRECT:
-      g_value_set_enum (value, priv->offscreen_redirect);
+      g_value_set_flags (value, priv->offscreen_redirect);
       break;
 
     case PROP_NAME:
@@ -5774,10 +5824,10 @@ clutter_actor_dispose (GObject *object)
   ClutterActor *self = CLUTTER_ACTOR (object);
   ClutterActorPrivate *priv = self->priv;
 
-  CLUTTER_NOTE (MISC, "Disposing of object (id=%d) of type '%s' (ref_count:%d)",
-		priv->id,
-		g_type_name (G_OBJECT_TYPE (self)),
-                object->ref_count);
+  CLUTTER_NOTE (MISC, "Dispose actor (name='%s', ref_count:%d) of type '%s'",
+		_clutter_actor_get_debug_name (self),
+                object->ref_count,
+		g_type_name (G_OBJECT_TYPE (self)));
 
   g_signal_emit (self, actor_signals[DESTROY], 0);
 
@@ -5841,14 +5891,9 @@ clutter_actor_finalize (GObject *object)
 {
   ClutterActorPrivate *priv = CLUTTER_ACTOR (object)->priv;
 
-  CLUTTER_NOTE (MISC, "Finalize actor (name='%s', id=%d) of type '%s'",
-                priv->name != NULL ? priv->name : "<none>",
-		priv->id,
-		g_type_name (G_OBJECT_TYPE (object)));
-
-  clutter_actor_restore_easing_state (CLUTTER_ACTOR (object));
-
-  _clutter_context_release_id (priv->id);
+  CLUTTER_NOTE (MISC, "Finalize actor (name='%s') of type '%s'",
+                _clutter_actor_get_debug_name ((ClutterActor *) object),
+                g_type_name (G_OBJECT_TYPE (object)));
 
   g_free (priv->name);
 
@@ -5918,6 +5963,12 @@ clutter_actor_update_default_paint_volume (ClutterActor       *self,
   ClutterActorPrivate *priv = self->priv;
   gboolean res = TRUE;
 
+  /* this should be checked before we call this function, but it's a
+   * good idea to be explicit when it costs us nothing
+   */
+  if (priv->needs_allocation)
+    return FALSE;
+
   /* we start from the allocation */
   clutter_paint_volume_set_width (volume,
                                   priv->allocation.x2 - priv->allocation.x1);
@@ -5970,7 +6021,13 @@ clutter_actor_update_default_paint_volume (ClutterActor       *self,
         {
           const ClutterPaintVolume *child_volume;
 
-          if (!CLUTTER_ACTOR_IS_MAPPED (child))
+          /* we ignore unmapped children, since they won't be painted.
+           *
+           * XXX: we also have to ignore mapped children without a valid
+           * allocation, because apparently some code above Clutter allows
+           * them.
+           */
+          if (!CLUTTER_ACTOR_IS_MAPPED (child) || !clutter_actor_has_allocation (child))
             continue;
 
           child_volume = clutter_actor_get_transformed_paint_volume (child, self);
@@ -6159,8 +6216,6 @@ clutter_actor_class_init (ClutterActorClass *klass)
   klass->paint = clutter_actor_real_paint;
   klass->destroy = clutter_actor_real_destroy;
 
-  g_type_class_add_private (klass, sizeof (ClutterActorPrivate));
-
   /**
    * ClutterActor:x:
    *
@@ -6502,7 +6557,7 @@ clutter_actor_class_init (ClutterActorClass *klass)
    *
    * For instance:
    *
-   * |[
+   * |[<!-- language="C" -->
    *   ClutterRequestMode mode;
    *   gfloat natural_width, min_width;
    *   gfloat natural_height, min_height;
@@ -6511,20 +6566,30 @@ clutter_actor_class_init (ClutterActorClass *klass)
    *   if (mode == CLUTTER_REQUEST_HEIGHT_FOR_WIDTH)
    *     {
    *       clutter_actor_get_preferred_width (child, -1,
-   *                                          &amp;min_width,
-   *                                          &amp;natural_width);
+   *                                          &min_width,
+   *                                          &natural_width);
    *       clutter_actor_get_preferred_height (child, natural_width,
-   *                                           &amp;min_height,
-   *                                           &amp;natural_height);
+   *                                           &min_height,
+   *                                           &natural_height);
    *     }
-   *   else
+   *   else if (mode == CLUTTER_REQUEST_WIDTH_FOR_HEIGHT)
    *     {
    *       clutter_actor_get_preferred_height (child, -1,
-   *                                           &amp;min_height,
-   *                                           &amp;natural_height);
+   *                                           &min_height,
+   *                                           &natural_height);
    *       clutter_actor_get_preferred_width (child, natural_height,
-   *                                          &amp;min_width,
-   *                                          &amp;natural_width);
+   *                                          &min_width,
+   *                                          &natural_width);
+   *     }
+   *   else if (mode == CLUTTER_REQUEST_CONTENT_SIZE)
+   *     {
+   *       ClutterContent *content = clutter_actor_get_content (child);
+   *
+   *       min_width, min_height = 0;
+   *       natural_width = natural_height = 0;
+   *
+   *       if (content != NULL)
+   *         clutter_content_get_preferred_size (content, &natural_width, &natural_height);
    *     }
    * ]|
    *
@@ -6813,7 +6878,7 @@ clutter_actor_class_init (ClutterActorClass *klass)
     g_param_spec_double ("scale-x",
                          P_("Scale X"),
                          P_("Scale factor on the X axis"),
-                         0.0, G_MAXDOUBLE,
+                         -G_MAXDOUBLE, G_MAXDOUBLE,
                          1.0,
                          G_PARAM_READWRITE |
                          G_PARAM_STATIC_STRINGS |
@@ -6832,7 +6897,7 @@ clutter_actor_class_init (ClutterActorClass *klass)
     g_param_spec_double ("scale-y",
                          P_("Scale Y"),
                          P_("Scale factor on the Y axis"),
-                         0.0, G_MAXDOUBLE,
+                         -G_MAXDOUBLE, G_MAXDOUBLE,
                          1.0,
                          G_PARAM_READWRITE |
                          G_PARAM_STATIC_STRINGS |
@@ -6851,7 +6916,7 @@ clutter_actor_class_init (ClutterActorClass *klass)
     g_param_spec_double ("scale-z",
                          P_("Scale Z"),
                          P_("Scale factor on the Z axis"),
-                         0.0, G_MAXDOUBLE,
+                         -G_MAXDOUBLE, G_MAXDOUBLE,
                          1.0,
                          G_PARAM_READWRITE |
                          G_PARAM_STATIC_STRINGS |
@@ -7050,14 +7115,14 @@ clutter_actor_class_init (ClutterActorClass *klass)
    * The X coordinate of an actor's anchor point, relative to
    * the actor coordinate space, in pixels.
    *
-   * <warning>It is highly recommended not to use #ClutterActor:anchor-x,
+   * It is highly recommended not to use #ClutterActor:anchor-x,
    * #ClutterActor:anchor-y, and #ClutterActor:anchor-gravity in newly
    * written code; the anchor point adds an additional translation that
    * will affect the actor's relative position with regards to its
    * parent, as well as the position of its children. This change needs
    * to always be taken into account when positioning the actor. It is
    * recommended to use the #ClutterActor:pivot-point property instead,
-   * as it will affect only the transformations.</warning>
+   * as it will affect only the transformations.
    *
    * Since: 0.8
    *
@@ -7079,14 +7144,14 @@ clutter_actor_class_init (ClutterActorClass *klass)
    * The Y coordinate of an actor's anchor point, relative to
    * the actor coordinate space, in pixels
    *
-   * <warning>It is highly recommended not to use #ClutterActor:anchor-x,
+   * It is highly recommended not to use #ClutterActor:anchor-x,
    * #ClutterActor:anchor-y, and #ClutterActor:anchor-gravity in newly
    * written code; the anchor point adds an additional translation that
    * will affect the actor's relative position with regards to its
    * parent, as well as the position of its children. This change needs
    * to always be taken into account when positioning the actor. It is
    * recommended to use the #ClutterActor:pivot-point property instead,
-   * as it will affect only the transformations.</warning>
+   * as it will affect only the transformations.
    *
    * Since: 0.8
    *
@@ -7107,14 +7172,14 @@ clutter_actor_class_init (ClutterActorClass *klass)
    *
    * The anchor point expressed as a #ClutterGravity
    *
-   * <warning>It is highly recommended not to use #ClutterActor:anchor-x,
+   * It is highly recommended not to use #ClutterActor:anchor-x,
    * #ClutterActor:anchor-y, and #ClutterActor:anchor-gravity in newly
    * written code; the anchor point adds an additional translation that
    * will affect the actor's relative position with regards to its
    * parent, as well as the position of its children. This change needs
    * to always be taken into account when positioning the actor. It is
    * recommended to use the #ClutterActor:pivot-point property instead,
-   * as it will affect only the transformations.</warning>
+   * as it will affect only the transformations.
    *
    * Since: 1.0
    *
@@ -7811,33 +7876,32 @@ clutter_actor_class_init (ClutterActorClass *klass)
    * GSignal API, redraw the UI and then call clutter_stage_ensure_redraw()
    * themselves, like:
    *
-   * |[
+   * |[<!-- language="C" -->
    *   static void
    *   on_redraw_complete (gpointer data)
    *   {
    *     ClutterStage *stage = data;
    *
-   *     /&ast; execute the Clutter drawing pipeline &ast;/
+   *     // execute the Clutter drawing pipeline
    *     clutter_stage_ensure_redraw (stage);
    *   }
    *
    *   static void
    *   on_stage_queue_redraw (ClutterStage *stage)
    *   {
-   *     /&ast; this prevents the default handler to run &ast;/
+   *     // this prevents the default handler to run
    *     g_signal_stop_emission_by_name (stage, "queue-redraw");
    *
-   *     /&ast; queue a redraw with the host toolkit and call
-   *      &ast; a function when the redraw has been completed
-   *      &ast;/
+   *     // queue a redraw with the host toolkit and call
+   *     // a function when the redraw has been completed
    *     queue_a_redraw (G_CALLBACK (on_redraw_complete), stage);
    *   }
    * ]|
    *
-   * <note><para>This signal is emitted before the Clutter paint
+   * Note: This signal is emitted before the Clutter paint
    * pipeline is executed. If you want to know when the pipeline has
-   * been completed you should connect to the ::paint signal on the
-   * Stage with g_signal_connect_after().</para></note>
+   * been completed you should use clutter_threads_add_repaint_func()
+   * or clutter_threads_add_repaint_func_full().
    *
    * Since: 1.0
    */
@@ -8152,12 +8216,12 @@ clutter_actor_class_init (ClutterActorClass *klass)
    * Subclasses of #ClutterActor should override the #ClutterActorClass.paint
    * virtual function paint themselves in that function.
    *
-   * <warning>It is strongly discouraged to connect a signal handler to
+   * It is strongly discouraged to connect a signal handler to
    * the #ClutterActor::paint signal; if you want to change the paint
    * sequence of an existing #ClutterActor instance, either create a new
    * #ClutterActor class and override the #ClutterActorClass.paint virtual
    * function, or use a #ClutterEffect. The #ClutterActor::paint signal
-   * will be removed in a future version of Clutter.</warning>
+   * will be removed in a future version of Clutter.
    *
    * Since: 0.8
    *
@@ -8183,11 +8247,14 @@ clutter_actor_class_init (ClutterActorClass *klass)
    * realized.
    *
    * Since: 0.8
+   *
+   * Deprecated: 1.16: The signal should not be used in newly
+   *   written code
    */
   actor_signals[REALIZE] =
     g_signal_new (I_("realize"),
                   G_TYPE_FROM_CLASS (object_class),
-                  G_SIGNAL_RUN_LAST,
+                  G_SIGNAL_RUN_LAST | G_SIGNAL_DEPRECATED,
                   G_STRUCT_OFFSET (ClutterActorClass, realize),
                   NULL, NULL,
                   _clutter_marshal_VOID__VOID,
@@ -8200,11 +8267,14 @@ clutter_actor_class_init (ClutterActorClass *klass)
    * unrealized.
    *
    * Since: 0.8
+   *
+   * Deprecated: 1.16: The signal should not be used in newly
+   *   written code
    */
   actor_signals[UNREALIZE] =
     g_signal_new (I_("unrealize"),
                   G_TYPE_FROM_CLASS (object_class),
-                  G_SIGNAL_RUN_LAST,
+                  G_SIGNAL_RUN_LAST | G_SIGNAL_DEPRECATED,
                   G_STRUCT_OFFSET (ClutterActorClass, unrealize),
                   NULL, NULL,
                   _clutter_marshal_VOID__VOID,
@@ -8313,10 +8383,14 @@ clutter_actor_class_init (ClutterActorClass *klass)
   /**
    * ClutterActor::touch-event:
    * @actor: a #ClutterActor
+   * @event: a #ClutterEvent
    *
    * The ::touch-event signal is emitted each time a touch
    * begin/end/update/cancel event.
    *
+   * Return value: %CLUTTER_EVENT_STOP if the event has been handled by
+   *   the actor, or %CLUTTER_EVENT_PROPAGATE to continue the emission.
+   *
    * Since: 1.12
    */
   actor_signals[TOUCH_EVENT] =
@@ -8335,9 +8409,8 @@ clutter_actor_init (ClutterActor *self)
 {
   ClutterActorPrivate *priv;
 
-  self->priv = priv = CLUTTER_ACTOR_GET_PRIVATE (self);
+  self->priv = priv = clutter_actor_get_instance_private (self);
 
-  priv->id = _clutter_context_acquire_id (self);
   priv->pick_id = -1;
 
   priv->opacity = 0xff;
@@ -8376,6 +8449,9 @@ clutter_actor_init (ClutterActor *self)
    */
   priv->needs_compute_expand = FALSE;
 
+  /* we start with an easing state with duration forcibly set
+   * to 0, for backward compatibility.
+   */
   clutter_actor_save_easing_state (self);
   clutter_actor_set_easing_duration (self, 0);
 }
@@ -8822,7 +8898,7 @@ _clutter_actor_queue_redraw_with_clip (ClutterActor       *self,
                                     NULL /* effect */);
 }
 
-static void
+void
 _clutter_actor_queue_only_relayout (ClutterActor *self)
 {
   ClutterActorPrivate *priv = self->priv;
@@ -8968,7 +9044,7 @@ clutter_actor_get_preferred_size (ClutterActor *self,
                                           &min_height,
                                           &natural_height);
     }
-  else
+  else if (priv->request_mode == CLUTTER_REQUEST_WIDTH_FOR_HEIGHT)
     {
       CLUTTER_NOTE (LAYOUT, "Preferred size (width-for-height)");
       clutter_actor_get_preferred_height (self, -1,
@@ -8978,6 +9054,17 @@ clutter_actor_get_preferred_size (ClutterActor *self,
                                          &min_width,
                                          &natural_width);
     }
+  else if (priv->request_mode == CLUTTER_REQUEST_CONTENT_SIZE)
+    {
+      CLUTTER_NOTE (LAYOUT, "Preferred size (content-size)");
+
+      if (priv->content != NULL)
+        clutter_content_get_preferred_size (priv->content, &natural_width, &natural_height);
+    }
+  else
+    {
+      CLUTTER_NOTE (LAYOUT, "Unknown request mode");
+    }
 
   if (min_width_p)
     *min_width_p = min_width;
@@ -9215,6 +9302,46 @@ _clutter_actor_get_cached_size_request (gfloat         for_size,
   return FALSE;
 }
 
+static void
+clutter_actor_update_preferred_size_for_constraints (ClutterActor *self,
+                                                     ClutterOrientation direction,
+                                                     float for_size,
+                                                     float *minimum_size,
+                                                     float *natural_size)
+{
+  ClutterActorPrivate *priv = self->priv;
+  const GList *constraints, *l;
+
+  if (priv->constraints == NULL)
+    return;
+
+  constraints = _clutter_meta_group_peek_metas (priv->constraints);
+  for (l = constraints; l != NULL; l = l->next)
+    {
+      ClutterConstraint *constraint = l->data;
+      ClutterActorMeta *meta = l->data;
+
+      if (!clutter_actor_meta_get_enabled (meta))
+        continue;
+
+      clutter_constraint_update_preferred_size (constraint, self,
+                                                direction,
+                                                for_size,
+                                                minimum_size,
+                                                natural_size);
+
+      CLUTTER_NOTE (LAYOUT,
+                    "Preferred %s of '%s' after constraint '%s': "
+                    "{ min:%.2f, nat:%.2f }",
+                    direction == CLUTTER_ORIENTATION_HORIZONTAL
+                      ? "width"
+                      : "height",
+                    _clutter_actor_get_debug_name (self),
+                    _clutter_actor_meta_get_debug_name (meta),
+                    *minimum_size, *natural_size);
+    }
+}
+
 /**
  * clutter_actor_get_preferred_width:
  * @self: A #ClutterActor
@@ -9313,6 +9440,13 @@ clutter_actor_get_preferred_width (ClutterActor *self,
                                   &minimum_width,
                                   &natural_width);
 
+      /* adjust for constraints */
+      clutter_actor_update_preferred_size_for_constraints (self,
+                                                           CLUTTER_ORIENTATION_HORIZONTAL,
+                                                           for_height,
+                                                           &minimum_width,
+                                                           &natural_width);
+
       /* adjust for the margin */
       minimum_width += (info->margin.left + info->margin.right);
       natural_width += (info->margin.left + info->margin.right);
@@ -9449,6 +9583,13 @@ clutter_actor_get_preferred_height (ClutterActor *self,
                                    &minimum_height,
                                    &natural_height);
 
+      /* adjust for constraints */
+      clutter_actor_update_preferred_size_for_constraints (self,
+                                                           CLUTTER_ORIENTATION_VERTICAL,
+                                                           for_width,
+                                                           &minimum_height,
+                                                           &natural_height);
+
       /* adjust for margin */
       minimum_height += (info->margin.top + info->margin.bottom);
       natural_height += (info->margin.top + info->margin.bottom);
@@ -9501,9 +9642,9 @@ clutter_actor_get_preferred_height (ClutterActor *self,
  * An allocation does not incorporate the actor's scale or anchor point;
  * those transformations do not affect layout, only rendering.
  *
- * <note>Do not call any of the clutter_actor_get_allocation_*() family
+ * Do not call any of the clutter_actor_get_allocation_*() family
  * of functions inside the implementation of the get_preferred_width()
- * or get_preferred_height() virtual functions.</note>
+ * or get_preferred_height() virtual functions.
  *
  * Since: 0.8
  */
@@ -9559,19 +9700,21 @@ clutter_actor_update_constraints (ClutterActor    *self,
 
       if (clutter_actor_meta_get_enabled (meta))
         {
-          _clutter_constraint_update_allocation (constraint,
-                                                 self,
-                                                 allocation);
+          gboolean changed =
+            clutter_constraint_update_allocation (constraint,
+                                                  self,
+                                                  allocation);
 
           CLUTTER_NOTE (LAYOUT,
                         "Allocation of '%s' after constraint '%s': "
-                        "{ %.2f, %.2f, %.2f, %.2f }",
+                        "{ %.2f, %.2f, %.2f, %.2f } (changed:%s)",
                         _clutter_actor_get_debug_name (self),
                         _clutter_actor_meta_get_debug_name (meta),
                         allocation->x1,
                         allocation->y1,
                         allocation->x2,
-                        allocation->y2);
+                        allocation->y2,
+                        changed ? "yes" : "no");
         }
     }
 }
@@ -9619,6 +9762,14 @@ clutter_actor_adjust_allocation (ClutterActor    *self,
                                          &min_width,
                                          &nat_width);
     }
+  else if (req_mode == CLUTTER_REQUEST_CONTENT_SIZE)
+    {
+      min_width = min_height = 0;
+      nat_width = nat_height = 0;
+
+      if (self->priv->content != NULL)
+        clutter_content_get_preferred_size (self->priv->content, &nat_width, &nat_height);
+    }
 
 #ifdef CLUTTER_ENABLE_DEBUG
   /* warn about underallocations */
@@ -9700,7 +9851,9 @@ clutter_actor_allocate_internal (ClutterActor           *self,
 
   CLUTTER_UNSET_PRIVATE_FLAGS (self, CLUTTER_IN_RELAYOUT);
 
-  clutter_actor_queue_redraw (self);
+  /* Caller should call clutter_actor_queue_redraw() if needed
+   * for that particular case.
+   */
 }
 
 /**
@@ -9809,6 +9962,14 @@ clutter_actor_allocate (ClutterActor           *self,
       return;
     }
 
+  if (!stage_allocation_changed)
+    {
+      /* If the actor didn't move but needs_allocation is set, we just
+       * need to allocate the children */
+      clutter_actor_allocate_internal (self, &real_allocation, flags);
+      return;
+    }
+
   /* When ABSOLUTE_ORIGIN_CHANGED is passed in to
    * clutter_actor_allocate(), it indicates whether the parent has its
    * absolute origin moved; when passed in to ClutterActor::allocate()
@@ -9865,7 +10026,7 @@ clutter_actor_allocate (ClutterActor           *self,
  * expected that the subclass will call clutter_layout_manager_allocate()
  * by itself. For instance, the following code:
  *
- * |[
+ * |[<!-- language="C" -->
  * static void
  * my_actor_allocate (ClutterActor *actor,
  *                    const ClutterActorBox *allocation,
@@ -9874,18 +10035,18 @@ clutter_actor_allocate (ClutterActor           *self,
  *   ClutterActorBox new_alloc;
  *   ClutterAllocationFlags new_flags;
  *
- *   adjust_allocation (allocation, &amp;new_alloc);
+ *   adjust_allocation (allocation, &new_alloc);
  *
  *   new_flags = flags | CLUTTER_DELEGATE_LAYOUT;
  *
- *   /&ast; this will use the layout manager set on the actor &ast;/
- *   clutter_actor_set_allocation (actor, &amp;new_alloc, new_flags);
+ *   // this will use the layout manager set on the actor
+ *   clutter_actor_set_allocation (actor, &new_alloc, new_flags);
  * }
  * ]|
  *
  * is equivalent to this:
  *
- * |[
+ * |[<!-- language="C" -->
  * static void
  * my_actor_allocate (ClutterActor *actor,
  *                    const ClutterActorBox *allocation,
@@ -9894,14 +10055,14 @@ clutter_actor_allocate (ClutterActor           *self,
  *   ClutterLayoutManager *layout;
  *   ClutterActorBox new_alloc;
  *
- *   adjust_allocation (allocation, &amp;new_alloc);
+ *   adjust_allocation (allocation, &new_alloc);
  *
- *   clutter_actor_set_allocation (actor, &amp;new_alloc, flags);
+ *   clutter_actor_set_allocation (actor, &new_alloc, flags);
  *
  *   layout = clutter_actor_get_layout_manager (actor);
  *   clutter_layout_manager_allocate (layout,
  *                                    CLUTTER_CONTAINER (actor),
- *                                    &amp;new_alloc,
+ *                                    &new_alloc,
  *                                    flags);
  * }
  * ]|
@@ -10593,7 +10754,7 @@ clutter_actor_get_transformed_position (ClutterActor *self,
  * If you want the transformed allocation, see
  * clutter_actor_get_abs_allocation_vertices() instead.
  *
- * <note>When the actor (or one of its ancestors) is rotated around the
+ * When the actor (or one of its ancestors) is rotated around the
  * X or Y axis, it no longer appears as on the stage as a rectangle, but
  * as a generic quadrangle; in that case this function returns the size
  * of the smallest rectangle that encapsulates the entire quad. Please
@@ -10601,7 +10762,7 @@ clutter_actor_get_transformed_position (ClutterActor *self,
  * position of this envelope to the absolute position of the actor, as
  * returned by clutter_actor_get_transformed_position(); if you need this
  * information, you need to use clutter_actor_get_abs_allocation_vertices()
- * to get the coords of the actual quadrangle.</note>
+ * to get the coords of the actual quadrangle.
  *
  * Since: 0.8
  */
@@ -10711,9 +10872,11 @@ clutter_actor_get_width (ClutterActor *self)
     {
       gfloat natural_width = 0;
 
-      if (self->priv->request_mode == CLUTTER_REQUEST_HEIGHT_FOR_WIDTH)
-        clutter_actor_get_preferred_width (self, -1, NULL, &natural_width);
-      else
+      if (priv->request_mode == CLUTTER_REQUEST_HEIGHT_FOR_WIDTH)
+        {
+          clutter_actor_get_preferred_width (self, -1, NULL, &natural_width);
+        }
+      else if (priv->request_mode == CLUTTER_REQUEST_WIDTH_FOR_HEIGHT)
         {
           gfloat natural_height = 0;
 
@@ -10722,6 +10885,10 @@ clutter_actor_get_width (ClutterActor *self)
                                              NULL,
                                              &natural_width);
         }
+      else if (priv->request_mode == CLUTTER_REQUEST_CONTENT_SIZE && priv->content != NULL)
+        {
+          clutter_content_get_preferred_size (priv->content, &natural_width, NULL);
+        }
 
       return natural_width;
     }
@@ -10775,8 +10942,14 @@ clutter_actor_get_height (ClutterActor *self)
           clutter_actor_get_preferred_height (self, natural_width,
                                               NULL, &natural_height);
         }
-      else
-        clutter_actor_get_preferred_height (self, -1, NULL, &natural_height);
+      else if (priv->request_mode == CLUTTER_REQUEST_WIDTH_FOR_HEIGHT)
+        {
+          clutter_actor_get_preferred_height (self, -1, NULL, &natural_height);
+        }
+      else if (priv->request_mode == CLUTTER_REQUEST_CONTENT_SIZE && priv->content != NULL)
+        {
+          clutter_content_get_preferred_size (priv->content, NULL, &natural_height);
+        }
 
       return natural_height;
     }
@@ -11629,14 +11802,15 @@ clutter_actor_get_name (ClutterActor *self)
  *
  * Since: 0.6
  *
- * Deprecated: 1.8: The id is not used any longer.
+ * Deprecated: 1.8: The id is not used any longer, and this function
+ *   always returns 0.
  */
 guint32
 clutter_actor_get_gid (ClutterActor *self)
 {
   g_return_val_if_fail (CLUTTER_IS_ACTOR (self), 0);
 
-  return self->priv->id;
+  return 0;
 }
 
 static inline void
@@ -11888,11 +12062,10 @@ clutter_actor_get_depth (ClutterActor *self)
  * Sets the rotation angle of @self around the given axis.
  *
  * The rotation center coordinates used depend on the value of @axis:
- * <itemizedlist>
- *   <listitem><para>%CLUTTER_X_AXIS requires @y and @z</para></listitem>
- *   <listitem><para>%CLUTTER_Y_AXIS requires @x and @z</para></listitem>
- *   <listitem><para>%CLUTTER_Z_AXIS requires @x and @y</para></listitem>
- * </itemizedlist>
+ *
+ *  - %CLUTTER_X_AXIS requires @y and @z
+ *  - %CLUTTER_Y_AXIS requires @x and @z
+ *  - %CLUTTER_Z_AXIS requires @x and @y
  *
  * The rotation coordinates are relative to the anchor point of the
  * actor, set using clutter_actor_set_anchor_point(). If no anchor
@@ -13314,6 +13487,7 @@ clutter_actor_set_child_above_sibling (ClutterActor *self,
                                     ADD_CHILD_NOTIFY_FIRST_LAST,
                                     insert_child_above,
                                     sibling);
+  g_object_unref(child);
 
   clutter_actor_queue_relayout (self);
 }
@@ -13360,6 +13534,7 @@ clutter_actor_set_child_below_sibling (ClutterActor *self,
                                     ADD_CHILD_NOTIFY_FIRST_LAST,
                                     insert_child_below,
                                     sibling);
+  g_object_unref(child);
 
   clutter_actor_queue_relayout (self);
 }
@@ -13398,6 +13573,7 @@ clutter_actor_set_child_at_index (ClutterActor *self,
                                     ADD_CHILD_NOTIFY_FIRST_LAST,
                                     insert_child_at_index,
                                     GINT_TO_POINTER (index_));
+  g_object_unref (child);
 
   clutter_actor_queue_relayout (self);
 }
@@ -14677,6 +14853,7 @@ clutter_actor_set_animatable_property (ClutterActor *actor,
       clutter_actor_allocate_internal (actor,
                                        g_value_get_boxed (value),
                                        actor->priv->allocation_flags);
+      clutter_actor_queue_redraw (actor);
       break;
 
     case PROP_DEPTH:
@@ -14815,10 +14992,10 @@ clutter_animatable_iface_init (ClutterAnimatableIface *iface)
  * nature of the operation. In general the error grows when the skewing
  * of the actor rectangle on screen increases.
  *
- * <note><para>This function can be computationally intensive.</para></note>
+ * This function can be computationally intensive.
  *
- * <note><para>This function only works when the allocation is up-to-date,
- * i.e. inside of paint().</para></note>
+ * This function only works when the allocation is up-to-date, i.e. inside of
+ * the #ClutterActorClass.paint() implementation
  *
  * Return value: %TRUE if conversion was successful.
  *
@@ -15069,7 +15246,7 @@ clutter_actor_get_stage (ClutterActor *actor)
  *   actor's natural height
  * @flags: flags controlling the allocation
  *
- * Allocates @self taking into account the #ClutterActor<!-- -->'s
+ * Allocates @self taking into account the #ClutterActor's
  * preferred size, but limiting it to the maximum available width
  * and height provided.
  *
@@ -15078,36 +15255,43 @@ clutter_actor_get_stage (ClutterActor *actor)
  *
  * The implementation of this function is equivalent to:
  *
- * |[
+ * |[<!-- language="C" -->
  *   if (request_mode == CLUTTER_REQUEST_HEIGHT_FOR_WIDTH)
  *     {
  *       clutter_actor_get_preferred_width (self, available_height,
- *                                          &amp;min_width,
- *                                          &amp;natural_width);
+ *                                          &min_width,
+ *                                          &natural_width);
  *       width = CLAMP (natural_width, min_width, available_width);
  *
  *       clutter_actor_get_preferred_height (self, width,
- *                                           &amp;min_height,
- *                                           &amp;natural_height);
+ *                                           &min_height,
+ *                                           &natural_height);
  *       height = CLAMP (natural_height, min_height, available_height);
  *     }
- *   else
+ *   else if (request_mode == CLUTTER_REQUEST_WIDTH_FOR_HEIGHT)
  *     {
  *       clutter_actor_get_preferred_height (self, available_width,
- *                                           &amp;min_height,
- *                                           &amp;natural_height);
+ *                                           &min_height,
+ *                                           &natural_height);
  *       height = CLAMP (natural_height, min_height, available_height);
  *
  *       clutter_actor_get_preferred_width (self, height,
- *                                          &amp;min_width,
- *                                          &amp;natural_width);
+ *                                          &min_width,
+ *                                          &natural_width);
  *       width = CLAMP (natural_width, min_width, available_width);
  *     }
+ *   else if (request_mode == CLUTTER_REQUEST_CONTENT_SIZE)
+ *     {
+ *       clutter_content_get_preferred_size (content, &natural_width, &natural_height);
+ *
+ *       width = CLAMP (natural_width, 0, available_width);
+ *       height = CLAMP (natural_height, 0, available_height);
+ *     }
  *
  *   box.x1 = x; box.y1 = y;
  *   box.x2 = box.x1 + available_width;
  *   box.y2 = box.y1 + available_height;
- *   clutter_actor_allocate (self, &amp;box, flags);
+ *   clutter_actor_allocate (self, &box, flags);
  * ]|
  *
  * This function can be used by fluid layout managers to allocate
@@ -15161,6 +15345,16 @@ clutter_actor_allocate_available_size (ClutterActor           *self,
                                          &natural_width);
       width  = CLAMP (natural_width, min_width, available_width);
       break;
+
+    case CLUTTER_REQUEST_CONTENT_SIZE:
+      if (priv->content != NULL)
+        {
+          clutter_content_get_preferred_size (priv->content, &natural_width, &natural_height);
+
+          width = CLAMP (natural_width, 0, available_width);
+          height = CLAMP (natural_height, 0, available_height);
+        }
+      break;
     }
 
 
@@ -15326,7 +15520,7 @@ clutter_actor_allocate_align_fill (ClutterActor           *self,
           child_height = CLAMP (natural_height, min_height, available_height);
         }
     }
-  else
+  else if (priv->request_mode == CLUTTER_REQUEST_WIDTH_FOR_HEIGHT)
     {
       gfloat min_width, natural_width;
       gfloat min_height, natural_height;
@@ -15349,22 +15543,28 @@ clutter_actor_allocate_align_fill (ClutterActor           *self,
           child_width = CLAMP (natural_width, min_width, available_width);
         }
     }
+  else if (priv->request_mode == CLUTTER_REQUEST_CONTENT_SIZE && priv->content != NULL)
+    {
+      gfloat natural_width, natural_height;
+
+      clutter_content_get_preferred_size (priv->content, &natural_width, &natural_height);
+
+      if (!x_fill)
+        child_width = CLAMP (natural_width, 0, available_width);
+
+      if (!y_fill)
+        child_height = CLAMP (natural_height, 0, available_height);
+    }
 
   /* invert the horizontal alignment for RTL languages */
   if (priv->text_direction == CLUTTER_TEXT_DIRECTION_RTL)
     x_align = 1.0 - x_align;
 
   if (!x_fill)
-    {
-      allocation.x1 += ((available_width - child_width) * x_align);
-      allocation.x2 = allocation.x1 + child_width;
-    }
+    allocation.x1 += ((available_width - child_width) * x_align);
 
   if (!y_fill)
-    {
-      allocation.y1 += ((available_height - child_height) * y_align);
-      allocation.y2 = allocation.y1 + child_height;
-    }
+    allocation.y1 += ((available_height - child_height) * y_align);
 
 out:
 
@@ -15397,6 +15597,46 @@ clutter_actor_grab_key_focus (ClutterActor *self)
     clutter_stage_set_key_focus (CLUTTER_STAGE (stage), self);
 }
 
+static void
+update_pango_context (ClutterBackend *backend,
+                      PangoContext   *context)
+{
+  ClutterSettings *settings;
+  PangoFontDescription *font_desc;
+  const cairo_font_options_t *font_options;
+  gchar *font_name;
+  PangoDirection pango_dir;
+  gdouble resolution;
+
+  settings = clutter_settings_get_default ();
+
+  /* update the text direction */
+  if (clutter_get_default_text_direction () == CLUTTER_TEXT_DIRECTION_RTL)
+    pango_dir = PANGO_DIRECTION_RTL;
+  else
+    pango_dir = PANGO_DIRECTION_LTR;
+
+  pango_context_set_base_dir (context, pango_dir);
+
+  g_object_get (settings, "font-name", &font_name, NULL);
+
+  /* get the configuration for the PangoContext from the backend */
+  font_options = clutter_backend_get_font_options (backend);
+  resolution = clutter_backend_get_resolution (backend);
+
+  font_desc = pango_font_description_from_string (font_name);
+
+  if (resolution < 0)
+    resolution = 96.0; /* fall back */
+
+  pango_context_set_font_description (context, font_desc);
+  pango_cairo_context_set_font_options (context, font_options);
+  pango_cairo_context_set_resolution (context, resolution);
+
+  pango_font_description_free (font_desc);
+  g_free (font_name);
+}
+
 /**
  * clutter_actor_get_pango_context:
  * @self: a #ClutterActor
@@ -15423,16 +15663,23 @@ PangoContext *
 clutter_actor_get_pango_context (ClutterActor *self)
 {
   ClutterActorPrivate *priv;
+  ClutterBackend *backend = clutter_get_default_backend ();
 
   g_return_val_if_fail (CLUTTER_IS_ACTOR (self), NULL);
 
   priv = self->priv;
 
-  if (priv->pango_context != NULL)
-    return priv->pango_context;
+  if (G_UNLIKELY (priv->pango_context == NULL))
+    {
+      priv->pango_context = clutter_actor_create_pango_context (self);
 
-  priv->pango_context = _clutter_context_get_pango_context ();
-  g_object_ref (priv->pango_context);
+      g_signal_connect_object (backend, "resolution-changed",
+                               G_CALLBACK (update_pango_context), priv->pango_context, 0);
+      g_signal_connect_object (backend, "font-changed",
+                               G_CALLBACK (update_pango_context), priv->pango_context, 0);
+    }
+  else
+    update_pango_context (backend, priv->pango_context);
 
   return priv->pango_context;
 }
@@ -15456,15 +15703,22 @@ clutter_actor_get_pango_context (ClutterActor *self)
 PangoContext *
 clutter_actor_create_pango_context (ClutterActor *self)
 {
-  g_return_val_if_fail (CLUTTER_IS_ACTOR (self), NULL);
+  CoglPangoFontMap *font_map;
+  PangoContext *context;
 
-  return _clutter_context_create_pango_context ();
+  font_map = COGL_PANGO_FONT_MAP (clutter_get_font_map ());
+
+  context = cogl_pango_font_map_create_context (font_map);
+  update_pango_context (clutter_get_default_backend (), context);
+  pango_context_set_language (context, pango_language_get_default ());
+
+  return context;
 }
 
 /**
  * clutter_actor_create_pango_layout:
  * @self: a #ClutterActor
- * @text: (allow-none) the text to set on the #PangoLayout, or %NULL
+ * @text: (allow-none): the text to set on the #PangoLayout, or %NULL
  *
  * Creates a new #PangoLayout from the same #PangoContext used
  * by the #ClutterActor. The #PangoLayout is already configured
@@ -16103,33 +16357,31 @@ clutter_actor_get_text_direction (ClutterActor *self)
  * Should be used by actors implementing the #ClutterContainer and with
  * internal children added through clutter_actor_set_parent(), for instance:
  *
- * |[
+ * |[<!-- language="C" -->
  *   static void
  *   my_actor_init (MyActor *self)
  *   {
- *     self->priv = SELF_ACTOR_GET_PRIVATE (self);
+ *     self->priv = my_actor_get_instance_private (self);
  *
  *     clutter_actor_push_internal (CLUTTER_ACTOR (self));
  *
- *     /&ast; calling clutter_actor_set_parent() now will result in
- *      &ast; the internal flag being set on a child of MyActor
- *      &ast;/
+ *     // calling clutter_actor_set_parent() now will result in
+ *     // the internal flag being set on a child of MyActor
  *
- *     /&ast; internal child - a background texture &ast;/
+ *     // internal child - a background texture
  *     self->priv->background_tex = clutter_texture_new ();
  *     clutter_actor_set_parent (self->priv->background_tex,
  *                               CLUTTER_ACTOR (self));
  *
- *     /&ast; internal child - a label &ast;/
+ *     // internal child - a label
  *     self->priv->label = clutter_text_new ();
  *     clutter_actor_set_parent (self->priv->label,
  *                               CLUTTER_ACTOR (self));
  *
  *     clutter_actor_pop_internal (CLUTTER_ACTOR (self));
  *
- *     /&ast; calling clutter_actor_set_parent() now will not result in
- *      &ast; the internal flag being set on a child of MyActor
- *      &ast;/
+ *     // calling clutter_actor_set_parent() now will not result in
+ *     // the internal flag being set on a child of MyActor
  *   }
  * ]|
  *
@@ -16313,7 +16565,7 @@ clutter_actor_add_action (ClutterActor  *self,
  *
  * This function is the logical equivalent of:
  *
- * |[
+ * |[<!-- language="C" -->
  *   clutter_actor_meta_set_name (CLUTTER_ACTOR_META (action), name);
  *   clutter_actor_add_action (self, action);
  * ]|
@@ -16519,7 +16771,7 @@ clutter_actor_add_constraint (ClutterActor      *self,
  *
  * This function is the logical equivalent of:
  *
- * |[
+ * |[<!-- language="C" -->
  *   clutter_actor_meta_set_name (CLUTTER_ACTOR_META (constraint), name);
  *   clutter_actor_add_constraint (self, constraint);
  * ]|
@@ -16769,7 +17021,7 @@ clutter_actor_add_effect (ClutterActor  *self,
  *
  * This function is the logical equivalent of:
  *
- * |[
+ * |[<!-- language="C" -->
  *   clutter_actor_meta_set_name (CLUTTER_ACTOR_META (effect), name);
  *   clutter_actor_add_effect (self, effect);
  * ]|
@@ -17102,16 +17354,16 @@ _clutter_actor_get_paint_volume_mutable (ClutterActor *self)
  * The paint volume is defined as the 3D space occupied by an actor
  * when being painted.
  *
- * This function will call the <function>get_paint_volume()</function>
+ * This function will call the #ClutterActorClass.get_paint_volume()
  * virtual function of the #ClutterActor class. Sub-classes of #ClutterActor
  * should not usually care about overriding the default implementation,
  * unless they are, for instance: painting outside their allocation, or
  * actors with a depth factor (not in terms of #ClutterActor:depth but real
  * 3D depth).
  *
- * <note>2D actors overriding <function>get_paint_volume()</function>
- * ensure their volume has a depth of 0. (This will be true so long as
- * you don't call clutter_paint_volume_set_depth().)</note>
+ * Note: 2D actors overriding #ClutterActorClass.get_paint_volume()
+ * should ensure that their volume has a depth of 0. (This will be true
+ * as long as you don't call clutter_paint_volume_set_depth().)
  *
  * Return value: (transfer none): a pointer to a #ClutterPaintVolume,
  *   or %NULL if no volume could be determined. The returned pointer
@@ -17241,7 +17493,7 @@ clutter_actor_get_paint_box (ClutterActor    *self,
  * the opacity property.
  *
  * Custom actors can override the default response by implementing the
- * #ClutterActor <function>has_overlaps</function> virtual function. See
+ * #ClutterActorClass.has_overlaps() virtual function. See
  * clutter_actor_set_offscreen_redirect() for more information.
  *
  * Return value: %TRUE if the actor may have overlapping primitives, and
@@ -17295,7 +17547,10 @@ clutter_actor_has_constraints (ClutterActor *self)
 {
   g_return_val_if_fail (CLUTTER_IS_ACTOR (self), FALSE);
 
-  return self->priv->constraints != NULL;
+  if (self->priv->constraints == NULL)
+    return FALSE;
+
+  return _clutter_meta_group_has_metas_no_internal (self->priv->constraints);
 }
 
 /**
@@ -17314,7 +17569,10 @@ clutter_actor_has_actions (ClutterActor *self)
 {
   g_return_val_if_fail (CLUTTER_IS_ACTOR (self), FALSE);
 
-  return self->priv->actions != NULL;
+  if (self->priv->actions == NULL)
+    return FALSE;
+
+  return _clutter_meta_group_has_metas_no_internal (self->priv->actions);
 }
 
 /**
@@ -18276,14 +18534,14 @@ typedef struct _RealActorIter
  * Modifying the scene graph section that contains @root will invalidate
  * the iterator.
  *
- * |[
+ * |[<!-- language="C" -->
  *   ClutterActorIter iter;
  *   ClutterActor *child;
  *
  *   clutter_actor_iter_init (&iter, container);
  *   while (clutter_actor_iter_next (&iter, &child))
  *     {
- *       /&ast; do something with child &ast;/
+ *       // do something with child
  *     }
  * ]|
  *
@@ -18706,6 +18964,45 @@ clutter_actor_add_transition_internal (ClutterActor *self,
   clutter_timeline_start (timeline);
 }
 
+static gboolean
+should_skip_implicit_transition (ClutterActor *self,
+                                 GParamSpec   *pspec)
+{
+  ClutterActorPrivate *priv = self->priv;
+  const ClutterAnimationInfo *info;
+
+  /* this function is called from _clutter_actor_create_transition() which
+   * calls _clutter_actor_get_animation_info() first, so we're guaranteed
+   * to have the correct ClutterAnimationInfo pointer
+   */
+  info = _clutter_actor_get_animation_info_or_defaults (self);
+
+  /* if the easing state has a non-zero duration we always want an
+   * implicit transition to occur
+   */
+  if (info->cur_state->easing_duration == 0)
+    return TRUE;
+
+  /* on the other hand, if the actor hasn't been allocated yet, we want to
+   * skip all transitions on the :allocation, to avoid actors "flying in"
+   * into their new position and size
+   */
+  if (pspec == obj_props[PROP_ALLOCATION] && priv->needs_allocation)
+    return TRUE;
+
+  /* if the actor is not mapped and is not part of a branch of the scene
+   * graph that is being cloned, then we always skip implicit transitions
+   * on the account of the fact that the actor is not going to be visible
+   * when those transitions happen
+   */
+  if (!CLUTTER_ACTOR_IS_MAPPED (self) &&
+      priv->in_cloned_branch == 0 &&
+      !clutter_actor_has_mapped_clones (self))
+    return TRUE;
+
+  return FALSE;
+}
+
 /*< private >*
  * _clutter_actor_create_transition:
  * @actor: a #ClutterActor
@@ -18783,31 +19080,23 @@ _clutter_actor_create_transition (ClutterActor *actor,
       goto out;
     }
 
-  if (info->cur_state->easing_duration == 0 ||
-      !actor->priv->was_painted ||
-      (!CLUTTER_ACTOR_IS_MAPPED (actor) &&
-       actor->priv->in_cloned_branch == 0 &&
-       !clutter_actor_has_mapped_clones (actor)))
+  if (should_skip_implicit_transition (actor, pspec))
     {
-      /* don't bother creating the transition if one is not necessary
-       * because the actor doesn't want one, or if the actor is not
-       * visible: we just set the final value directly on the actor.
-       *
-       * we also don't go through the Animatable interface because we
-       * already know we got here through an animatable property.
-       */
-      CLUTTER_NOTE (ANIMATION, "Easing duration=0 was_painted=%s, immediate set for '%s::%s'",
-                    actor->priv->was_painted ? "yes" : "no",
+      CLUTTER_NOTE (ANIMATION, "Skipping implicit transition for '%s::%s'",
                     _clutter_actor_get_debug_name (actor),
                     pspec->name);
 
       /* remove a transition, if one exists */
       clutter_actor_remove_transition (actor, pspec->name);
 
+      /* we don't go through the Animatable interface because we
+       * already know we got here through an animatable property.
+       */
       clutter_actor_set_animatable_property (actor,
                                              pspec->param_id,
                                              &final,
                                              pspec);
+
       g_value_unset (&initial);
       g_value_unset (&final);
 
@@ -18817,12 +19106,10 @@ _clutter_actor_create_transition (ClutterActor *actor,
   clos = g_hash_table_lookup (info->transitions, pspec->name);
   if (clos == NULL)
     {
-      interval = clutter_interval_new_with_values (ptype, &initial, &final);
-
       res = clutter_property_transition_new (pspec->name);
 
+      interval = clutter_interval_new_with_values (ptype, &initial, &final);
       clutter_transition_set_interval (res, interval);
-      clutter_transition_set_remove_on_complete (res, TRUE);
 
       timeline = CLUTTER_TIMELINE (res);
       clutter_timeline_set_delay (timeline, info->cur_state->easing_delay);
@@ -18830,26 +19117,27 @@ _clutter_actor_create_transition (ClutterActor *actor,
       clutter_timeline_set_progress_mode (timeline, info->cur_state->easing_mode);
 
 #ifdef CLUTTER_ENABLE_DEBUG
-      {
-        gchar *initial_v, *final_v;
+      if (CLUTTER_HAS_DEBUG (ANIMATION))
+        {
+          gchar *initial_v, *final_v;
 
-        initial_v = g_strdup_value_contents (&initial);
-        final_v = g_strdup_value_contents (&final);
+          initial_v = g_strdup_value_contents (&initial);
+          final_v = g_strdup_value_contents (&final);
 
-        CLUTTER_NOTE (ANIMATION,
-                      "Created transition for %s:%s "
-                      "(len:%u, mode:%s, delay:%u) "
-                      "initial:%s, final:%s",
-                      _clutter_actor_get_debug_name (actor),
-                      pspec->name,
-                      info->cur_state->easing_duration,
-                      clutter_get_easing_name_for_mode (info->cur_state->easing_mode),
-                      info->cur_state->easing_delay,
-                      initial_v, final_v);
+          CLUTTER_NOTE (ANIMATION,
+                        "Created transition for %s:%s "
+                        "(len:%u, mode:%s, delay:%u) "
+                        "initial:%s, final:%s",
+                        _clutter_actor_get_debug_name (actor),
+                        pspec->name,
+                        info->cur_state->easing_duration,
+                        clutter_get_easing_name_for_mode (info->cur_state->easing_mode),
+                        info->cur_state->easing_delay,
+                        initial_v, final_v);
 
-        g_free (initial_v);
-        g_free (final_v);
-      }
+          g_free (initial_v);
+          g_free (final_v);
+        }
 #endif /* CLUTTER_ENABLE_DEBUG */
 
       /* this will start the transition as well */
@@ -19203,7 +19491,7 @@ clutter_actor_get_easing_delay (ClutterActor *self)
  * Transitions created for animatable properties use the name of the
  * property itself, for instance the code below:
  *
- * |[
+ * |[<!-- language="C" -->
  *   clutter_actor_set_easing_duration (actor, 1000);
  *   clutter_actor_set_rotation (actor, CLUTTER_Y_AXIS, 360.0, x, y, z);
  *
@@ -19213,8 +19501,8 @@ clutter_actor_get_easing_delay (ClutterActor *self)
  *                     actor);
  * ]|
  *
- * will call the <function>on_transition_stopped</function> callback when
- * the transition is finished.
+ * will call the `on_transition_stopped` callback when the transition
+ * is finished.
  *
  * If you just want to get notifications of the completion of a transition,
  * you should use the #ClutterActor::transition-stopped signal, using the
@@ -19340,6 +19628,9 @@ clutter_actor_set_content (ClutterActor   *self,
 
   priv = self->priv;
 
+  if (priv->content == content)
+    return;
+
   if (priv->content != NULL)
     {
       _clutter_content_detached (priv->content, self);
@@ -19354,9 +19645,12 @@ clutter_actor_set_content (ClutterActor   *self,
       _clutter_content_attached (priv->content, self);
     }
 
-  /* given that the content is always painted within the allocation,
-   * we only need to queue a redraw here
+  /* if the actor's preferred size is the content's preferred size,
+   * then we need to conditionally queue a relayout here...
    */
+  if (priv->request_mode == CLUTTER_REQUEST_CONTENT_SIZE)
+    _clutter_actor_queue_only_relayout (self);
+
   clutter_actor_queue_redraw (self);
 
   g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_CONTENT]);
@@ -19368,7 +19662,25 @@ clutter_actor_set_content (ClutterActor   *self,
    * do.
    */
   if (priv->content_gravity != CLUTTER_CONTENT_GRAVITY_RESIZE_FILL)
-    g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_CONTENT_BOX]);
+    {
+      if (priv->content_box_valid)
+        {
+          ClutterActorBox from_box, to_box;
+
+          clutter_actor_get_content_box (self, &from_box);
+
+          /* invalidate the cached content box */
+          priv->content_box_valid = FALSE;
+          clutter_actor_get_content_box (self, &to_box);
+
+          if (!clutter_actor_box_equal (&from_box, &to_box))
+            _clutter_actor_create_transition (self, obj_props[PROP_CONTENT_BOX],
+                                              &from_box,
+                                              &to_box);
+        }
+
+      g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_CONTENT_BOX]);
+   }
 }
 
 /**
@@ -20286,13 +20598,27 @@ _clutter_actor_queue_relayout_on_clones (ClutterActor *self)
     clutter_actor_queue_relayout (key);
 }
 
-static inline gboolean
+/**
+ * clutter_actor_has_mapped_clones:
+ * @self: a #ClutterActor
+ *
+ * Returns whether a #ClutterActor has any mapped clones.
+ *
+ * Return: %TRUE if the actor has mapped clones, and %FALSE otherwise
+ *
+ * Since: 1.16
+ */
+gboolean
 clutter_actor_has_mapped_clones (ClutterActor *self)
 {
-  ClutterActorPrivate *priv = self->priv;
+  ClutterActorPrivate *priv;
   GHashTableIter iter;
   gpointer key;
 
+  g_return_val_if_fail (CLUTTER_IS_ACTOR (self), FALSE);
+
+  priv = self->priv;
+
   if (priv->clones == NULL)
     return FALSE;
 
@@ -20305,3 +20631,29 @@ clutter_actor_has_mapped_clones (ClutterActor *self)
 
   return FALSE;
 }
+
+CoglFramebuffer *
+_clutter_actor_get_active_framebuffer (ClutterActor *self)
+{
+  ClutterStage *stage;
+
+  if (!CLUTTER_ACTOR_IN_PAINT (self))
+    {
+      g_critical ("The active framebuffer of actor '%s' can only be "
+                  "retrieved during the paint sequence. Please, check "
+                  "your code.",
+                  _clutter_actor_get_debug_name (self));
+      return NULL;
+    }
+
+  stage = (ClutterStage *) _clutter_actor_get_stage_internal (self);
+  if (stage == NULL)
+    {
+      g_critical ("The active framebuffer of actor '%s' is only available "
+                  "if the actor is associated to a ClutterStage.",
+                  _clutter_actor_get_debug_name (self));
+      return NULL;
+    }
+
+  return _clutter_stage_get_active_framebuffer (stage);
+}
diff --git a/clutter/clutter-actor.h b/clutter/clutter-actor.h
index 50e9e04d5..af2e47b43 100644
--- a/clutter/clutter-actor.h
+++ b/clutter/clutter-actor.h
@@ -129,9 +129,13 @@ struct _ClutterActor
  *   clutter_actor_hide(). This virtual function is deprecated and it
  *   should not be overridden.
  * @realize: virtual function, used to allocate resources for the actor;
- *   it should chain up to the parent's implementation
+ *   it should chain up to the parent's implementation. This virtual
+ *   function is deprecated and should not be overridden in newly
+ *   written code.
  * @unrealize: virtual function, used to deallocate resources allocated
- *   in ::realize; it should chain up to the parent's implementation
+ *   in ::realize; it should chain up to the parent's implementation. This
+ *   function is deprecated and should not be overridden in newly
+ *   written code.
  * @map: virtual function for containers and composite actors, to
  *   map their children; it must chain up to the parent's implementation.
  *   Overriding this function is optional.
@@ -147,12 +151,13 @@ struct _ClutterActor
  *   clutter_actor_get_preferred_height()
  * @allocate: virtual function, used when settings the coordinates of an
  *   actor; it is used by clutter_actor_allocate(); it must chain up to
- *   the parent's implementation
+ *   the parent's implementation, or call clutter_actor_set_allocation()
  * @apply_transform: virtual function, used when applying the transformations
  *   to an actor before painting it or when transforming coordinates or
  *   the allocation; it must chain up to the parent's implementation
  * @parent_set: signal class handler for the #ClutterActor::parent-set
- * @destroy: signal class handler for #ClutterActor::destroy
+ * @destroy: signal class handler for #ClutterActor::destroy. It must
+ *   chain up to the parent's implementation
  * @pick: virtual function, used to draw an outline of the actor with
  *   the given color
  * @queue_redraw: class handler for #ClutterActor::queue-redraw
@@ -278,7 +283,7 @@ struct _ClutterActorClass
  * An iterator structure that allows to efficiently iterate over a
  * section of the scene graph.
  *
- * The contents of the <structname>ClutterActorIter</structname> structure
+ * The contents of the #ClutterActorIter structure
  * are private and should only be accessed using the provided API.
  *
  * Since: 1.10
@@ -293,62 +298,90 @@ struct _ClutterActorIter
   gpointer CLUTTER_PRIVATE_FIELD (dummy5);
 };
 
+CLUTTER_AVAILABLE_IN_ALL
 GType clutter_actor_get_type (void) G_GNUC_CONST;
 
+CLUTTER_AVAILABLE_IN_1_10
 ClutterActor *                  clutter_actor_new                               (void);
 
+CLUTTER_AVAILABLE_IN_ALL
 void                            clutter_actor_set_flags                         (ClutterActor                *self,
                                                                                  ClutterActorFlags            flags);
+CLUTTER_AVAILABLE_IN_ALL
 void                            clutter_actor_unset_flags                       (ClutterActor                *self,
                                                                                  ClutterActorFlags            flags);
+CLUTTER_AVAILABLE_IN_ALL
 ClutterActorFlags               clutter_actor_get_flags                         (ClutterActor                *self);
+CLUTTER_AVAILABLE_IN_ALL
 void                            clutter_actor_show                              (ClutterActor                *self);
+CLUTTER_AVAILABLE_IN_ALL
 void                            clutter_actor_hide                              (ClutterActor                *self);
+CLUTTER_AVAILABLE_IN_ALL
 void                            clutter_actor_realize                           (ClutterActor                *self);
+CLUTTER_AVAILABLE_IN_ALL
 void                            clutter_actor_unrealize                         (ClutterActor                *self);
+CLUTTER_AVAILABLE_IN_ALL
 void                            clutter_actor_map                               (ClutterActor                *self);
+CLUTTER_AVAILABLE_IN_ALL
 void                            clutter_actor_unmap                             (ClutterActor                *self);
+CLUTTER_AVAILABLE_IN_ALL
 void                            clutter_actor_paint                             (ClutterActor                *self);
+CLUTTER_AVAILABLE_IN_ALL
 void                            clutter_actor_continue_paint                    (ClutterActor                *self);
+CLUTTER_AVAILABLE_IN_ALL
 void                            clutter_actor_queue_redraw                      (ClutterActor                *self);
 CLUTTER_AVAILABLE_IN_1_10
 void                            clutter_actor_queue_redraw_with_clip            (ClutterActor                *self,
                                                                                  const cairo_rectangle_int_t *clip);
+CLUTTER_AVAILABLE_IN_ALL
 void                            clutter_actor_queue_relayout                    (ClutterActor                *self);
+CLUTTER_AVAILABLE_IN_ALL
 void                            clutter_actor_destroy                           (ClutterActor                *self);
+CLUTTER_AVAILABLE_IN_ALL
 void                            clutter_actor_set_name                          (ClutterActor                *self,
                                                                                  const gchar                 *name);
+CLUTTER_AVAILABLE_IN_ALL
 const gchar *                   clutter_actor_get_name                          (ClutterActor                *self);
+CLUTTER_AVAILABLE_IN_ALL
 AtkObject *                     clutter_actor_get_accessible                    (ClutterActor                *self);
 
 /* Size negotiation */
+CLUTTER_AVAILABLE_IN_ALL
 void                            clutter_actor_set_request_mode                  (ClutterActor                *self,
                                                                                  ClutterRequestMode           mode);
+CLUTTER_AVAILABLE_IN_ALL
 ClutterRequestMode              clutter_actor_get_request_mode                  (ClutterActor                *self);
+CLUTTER_AVAILABLE_IN_ALL
 void                            clutter_actor_get_preferred_width               (ClutterActor                *self,
                                                                                  gfloat                       for_height,
                                                                                  gfloat                      *min_width_p,
                                                                                  gfloat                      *natural_width_p);
+CLUTTER_AVAILABLE_IN_ALL
 void                            clutter_actor_get_preferred_height              (ClutterActor                *self,
                                                                                  gfloat                       for_width,
                                                                                  gfloat                      *min_height_p,
                                                                                  gfloat                      *natural_height_p);
+CLUTTER_AVAILABLE_IN_ALL
 void                            clutter_actor_get_preferred_size                (ClutterActor                *self,
                                                                                  gfloat                      *min_width_p,
                                                                                  gfloat                      *min_height_p,
                                                                                  gfloat                      *natural_width_p,
                                                                                  gfloat                      *natural_height_p);
+CLUTTER_AVAILABLE_IN_ALL
 void                            clutter_actor_allocate                          (ClutterActor                *self,
                                                                                  const ClutterActorBox       *box,
                                                                                  ClutterAllocationFlags       flags);
+CLUTTER_AVAILABLE_IN_ALL
 void                            clutter_actor_allocate_preferred_size           (ClutterActor                *self,
                                                                                  ClutterAllocationFlags       flags);
+CLUTTER_AVAILABLE_IN_ALL
 void                            clutter_actor_allocate_available_size           (ClutterActor                *self,
                                                                                  gfloat                       x,
                                                                                  gfloat                       y,
                                                                                  gfloat                       available_width,
                                                                                  gfloat                       available_height,
                                                                                  ClutterAllocationFlags       flags);
+CLUTTER_AVAILABLE_IN_ALL
 void                            clutter_actor_allocate_align_fill               (ClutterActor                *self,
                                                                                  const ClutterActorBox       *box,
                                                                                  gdouble                      x_align,
@@ -356,45 +389,64 @@ void                            clutter_actor_allocate_align_fill
                                                                                  gboolean                     x_fill,
                                                                                  gboolean                     y_fill,
                                                                                  ClutterAllocationFlags       flags);
+CLUTTER_AVAILABLE_IN_1_10
 void                            clutter_actor_set_allocation                    (ClutterActor                *self,
                                                                                  const ClutterActorBox       *box,
                                                                                  ClutterAllocationFlags       flags);
+CLUTTER_AVAILABLE_IN_ALL
 void                            clutter_actor_get_allocation_box                (ClutterActor                *self,
                                                                                  ClutterActorBox             *box);
+CLUTTER_AVAILABLE_IN_ALL
 void                            clutter_actor_get_allocation_vertices           (ClutterActor                *self,
                                                                                  ClutterActor                *ancestor,
                                                                                  ClutterVertex                verts[]);
+CLUTTER_AVAILABLE_IN_ALL
 gboolean                        clutter_actor_has_allocation                    (ClutterActor                *self);
+CLUTTER_AVAILABLE_IN_ALL
 void                            clutter_actor_set_size                          (ClutterActor                *self,
                                                                                  gfloat                       width,
                                                                                  gfloat                       height);
+CLUTTER_AVAILABLE_IN_ALL
 void                            clutter_actor_get_size                          (ClutterActor                *self,
                                                                                  gfloat                      *width,
                                                                                  gfloat                      *height);
+CLUTTER_AVAILABLE_IN_ALL
 void                            clutter_actor_set_position                      (ClutterActor                *self,
                                                                                  gfloat                       x,
                                                                                  gfloat                       y);
+CLUTTER_AVAILABLE_IN_ALL
 void                            clutter_actor_get_position                      (ClutterActor                *self,
                                                                                  gfloat                      *x,
                                                                                  gfloat                      *y);
+CLUTTER_AVAILABLE_IN_ALL
 gboolean                        clutter_actor_get_fixed_position_set            (ClutterActor                *self);
+CLUTTER_AVAILABLE_IN_ALL
 void                            clutter_actor_set_fixed_position_set            (ClutterActor                *self,
                                                                                  gboolean                     is_set);
+CLUTTER_AVAILABLE_IN_ALL
 void                            clutter_actor_move_by                           (ClutterActor                *self,
                                                                                  gfloat                       dx,
                                                                                  gfloat                       dy);
 
 /* Actor geometry */
+CLUTTER_AVAILABLE_IN_ALL
 gfloat                          clutter_actor_get_width                         (ClutterActor                *self);
+CLUTTER_AVAILABLE_IN_ALL
 gfloat                          clutter_actor_get_height                        (ClutterActor                *self);
+CLUTTER_AVAILABLE_IN_ALL
 void                            clutter_actor_set_width                         (ClutterActor                *self,
                                                                                  gfloat                       width);
+CLUTTER_AVAILABLE_IN_ALL
 void                            clutter_actor_set_height                        (ClutterActor                *self,
                                                                                  gfloat                       height);
+CLUTTER_AVAILABLE_IN_ALL
 gfloat                          clutter_actor_get_x                             (ClutterActor                *self);
+CLUTTER_AVAILABLE_IN_ALL
 gfloat                          clutter_actor_get_y                             (ClutterActor                *self);
+CLUTTER_AVAILABLE_IN_ALL
 void                            clutter_actor_set_x                             (ClutterActor                *self,
                                                                                  gfloat                       x);
+CLUTTER_AVAILABLE_IN_ALL
 void                            clutter_actor_set_y                             (ClutterActor                *self,
                                                                                  gfloat                       y);
 CLUTTER_AVAILABLE_IN_1_12
@@ -458,33 +510,49 @@ gboolean                        clutter_actor_needs_expand
                                                                                  ClutterOrientation           orientation);
 
 /* Paint */
+CLUTTER_AVAILABLE_IN_ALL
 void                            clutter_actor_set_clip                          (ClutterActor                *self,
                                                                                  gfloat                       xoff,
                                                                                  gfloat                       yoff,
                                                                                  gfloat                       width,
                                                                                  gfloat                       height);
+CLUTTER_AVAILABLE_IN_ALL
 void                            clutter_actor_remove_clip                       (ClutterActor               *self);
+CLUTTER_AVAILABLE_IN_ALL
 gboolean                        clutter_actor_has_clip                          (ClutterActor               *self);
+CLUTTER_AVAILABLE_IN_ALL
 void                            clutter_actor_get_clip                          (ClutterActor               *self,
                                                                                  gfloat                     *xoff,
                                                                                  gfloat                     *yoff,
                                                                                  gfloat                     *width,
                                                                                  gfloat                     *height);
+CLUTTER_AVAILABLE_IN_ALL
 void                            clutter_actor_set_clip_to_allocation            (ClutterActor               *self,
                                                                                  gboolean                    clip_set);
+CLUTTER_AVAILABLE_IN_ALL
 gboolean                        clutter_actor_get_clip_to_allocation            (ClutterActor               *self);
+CLUTTER_AVAILABLE_IN_ALL
 void                            clutter_actor_set_opacity                       (ClutterActor               *self,
                                                                                  guint8                      opacity);
+CLUTTER_AVAILABLE_IN_ALL
 guint8                          clutter_actor_get_opacity                       (ClutterActor               *self);
+CLUTTER_AVAILABLE_IN_ALL
 guint8                          clutter_actor_get_paint_opacity                 (ClutterActor               *self);
+CLUTTER_AVAILABLE_IN_ALL
 gboolean                        clutter_actor_get_paint_visibility              (ClutterActor               *self);
+CLUTTER_AVAILABLE_IN_1_8
 void                            clutter_actor_set_offscreen_redirect            (ClutterActor               *self,
                                                                                  ClutterOffscreenRedirect    redirect);
+CLUTTER_AVAILABLE_IN_1_8
 ClutterOffscreenRedirect        clutter_actor_get_offscreen_redirect            (ClutterActor               *self);
+CLUTTER_AVAILABLE_IN_ALL
 gboolean                        clutter_actor_should_pick_paint                 (ClutterActor               *self);
+CLUTTER_AVAILABLE_IN_ALL
 gboolean                        clutter_actor_is_in_clone_paint                 (ClutterActor               *self);
+CLUTTER_AVAILABLE_IN_ALL
 gboolean                        clutter_actor_get_paint_box                     (ClutterActor               *self,
                                                                                  ClutterActorBox            *box);
+CLUTTER_AVAILABLE_IN_1_8
 gboolean                        clutter_actor_has_overlaps                      (ClutterActor               *self);
 
 /* Content */
@@ -520,30 +588,43 @@ void                            clutter_actor_set_background_color
 CLUTTER_AVAILABLE_IN_1_10
 void                            clutter_actor_get_background_color              (ClutterActor               *self,
                                                                                  ClutterColor               *color);
+CLUTTER_AVAILABLE_IN_1_6
 const ClutterPaintVolume *      clutter_actor_get_paint_volume                  (ClutterActor               *self);
+CLUTTER_AVAILABLE_IN_1_6
 const ClutterPaintVolume *      clutter_actor_get_transformed_paint_volume      (ClutterActor               *self,
                                                                                  ClutterActor               *relative_to_ancestor);
 CLUTTER_AVAILABLE_IN_1_10
 const ClutterPaintVolume *      clutter_actor_get_default_paint_volume          (ClutterActor               *self);
 
 /* Events */
+CLUTTER_AVAILABLE_IN_ALL
 void                            clutter_actor_set_reactive                      (ClutterActor               *actor,
                                                                                  gboolean                    reactive);
+CLUTTER_AVAILABLE_IN_ALL
 gboolean                        clutter_actor_get_reactive                      (ClutterActor               *actor);
+CLUTTER_AVAILABLE_IN_ALL
 gboolean                        clutter_actor_has_key_focus                     (ClutterActor               *self);
+CLUTTER_AVAILABLE_IN_ALL
 void                            clutter_actor_grab_key_focus                    (ClutterActor               *self);
+CLUTTER_AVAILABLE_IN_ALL
 gboolean                        clutter_actor_event                             (ClutterActor               *actor,
                                                                                  const ClutterEvent         *event,
                                                                                  gboolean                    capture);
+CLUTTER_AVAILABLE_IN_ALL
 gboolean                        clutter_actor_has_pointer                       (ClutterActor               *self);
 
 /* Text */
+CLUTTER_AVAILABLE_IN_ALL
 PangoContext *                  clutter_actor_get_pango_context                 (ClutterActor               *self);
+CLUTTER_AVAILABLE_IN_ALL
 PangoContext *                  clutter_actor_create_pango_context              (ClutterActor               *self);
+CLUTTER_AVAILABLE_IN_ALL
 PangoLayout *                   clutter_actor_create_pango_layout               (ClutterActor               *self,
                                                                                  const gchar                *text);
+CLUTTER_AVAILABLE_IN_ALL
 void                            clutter_actor_set_text_direction                (ClutterActor               *self,
                                                                                  ClutterTextDirection        text_dir);
+CLUTTER_AVAILABLE_IN_ALL
 ClutterTextDirection            clutter_actor_get_text_direction                (ClutterActor               *self);
 
 /* Actor hierarchy */
@@ -588,9 +669,12 @@ CLUTTER_AVAILABLE_IN_1_10
 ClutterActor *                  clutter_actor_get_first_child                   (ClutterActor               *self);
 CLUTTER_AVAILABLE_IN_1_10
 ClutterActor *                  clutter_actor_get_last_child                    (ClutterActor               *self);
+CLUTTER_AVAILABLE_IN_ALL
 ClutterActor *                  clutter_actor_get_parent                        (ClutterActor               *self);
+CLUTTER_AVAILABLE_IN_1_4
 gboolean                        clutter_actor_contains                          (ClutterActor               *self,
                                                                                  ClutterActor               *descendant);
+CLUTTER_AVAILABLE_IN_ALL
 ClutterActor*                   clutter_actor_get_stage                         (ClutterActor               *actor);
 CLUTTER_AVAILABLE_IN_1_10
 void                            clutter_actor_set_child_below_sibling           (ClutterActor               *self,
@@ -621,7 +705,9 @@ CLUTTER_AVAILABLE_IN_1_12
 gboolean                        clutter_actor_iter_is_valid                     (const ClutterActorIter     *iter);
 
 /* Transformations */
+CLUTTER_AVAILABLE_IN_ALL
 gboolean                        clutter_actor_is_rotated                        (ClutterActor               *self);
+CLUTTER_AVAILABLE_IN_ALL
 gboolean                        clutter_actor_is_scaled                         (ClutterActor               *self);
 CLUTTER_AVAILABLE_IN_1_12
 void                            clutter_actor_set_pivot_point                   (ClutterActor               *self,
@@ -643,9 +729,11 @@ void                            clutter_actor_set_rotation_angle
 CLUTTER_AVAILABLE_IN_1_12
 gdouble                         clutter_actor_get_rotation_angle                (ClutterActor               *self,
                                                                                  ClutterRotateAxis           axis);
+CLUTTER_AVAILABLE_IN_ALL
 void                            clutter_actor_set_scale                         (ClutterActor               *self,
                                                                                  gdouble                     scale_x,
                                                                                  gdouble                     scale_y);
+CLUTTER_AVAILABLE_IN_ALL
 void                            clutter_actor_get_scale                         (ClutterActor               *self,
                                                                                  gdouble                    *scale_x,
                                                                                  gdouble                    *scale_y);
@@ -676,22 +764,28 @@ void                            clutter_actor_set_child_transform
 CLUTTER_AVAILABLE_IN_1_12
 void                            clutter_actor_get_child_transform               (ClutterActor               *self,
                                                                                  ClutterMatrix              *transform);
+CLUTTER_AVAILABLE_IN_ALL
 void                            clutter_actor_get_transformed_position          (ClutterActor               *self,
                                                                                  gfloat                     *x,
                                                                                  gfloat                     *y);
+CLUTTER_AVAILABLE_IN_ALL
 void                            clutter_actor_get_transformed_size              (ClutterActor               *self,
                                                                                  gfloat                     *width,
                                                                                  gfloat                     *height);
+CLUTTER_AVAILABLE_IN_ALL
 gboolean                        clutter_actor_transform_stage_point             (ClutterActor               *self,
                                                                                  gfloat                      x,
                                                                                  gfloat                      y,
                                                                                  gfloat                     *x_out,
                                                                                  gfloat                     *y_out);
+CLUTTER_AVAILABLE_IN_ALL
 void                            clutter_actor_get_abs_allocation_vertices       (ClutterActor               *self,
                                                                                  ClutterVertex               verts[]);
+CLUTTER_AVAILABLE_IN_ALL
 void                            clutter_actor_apply_transform_to_point          (ClutterActor               *self,
                                                                                  const ClutterVertex        *point,
                                                                                  ClutterVertex              *vertex);
+CLUTTER_AVAILABLE_IN_ALL
 void                            clutter_actor_apply_relative_transform_to_point (ClutterActor               *self,
                                                                                  ClutterActor               *ancestor,
                                                                                  const ClutterVertex        *point,
@@ -730,6 +824,13 @@ void                            clutter_actor_remove_transition
 CLUTTER_AVAILABLE_IN_1_10
 void                            clutter_actor_remove_all_transitions            (ClutterActor               *self);
 
+
+/* Experimental API */
+#ifdef CLUTTER_ENABLE_EXPERIMENTAL_API
+CLUTTER_AVAILABLE_IN_1_16
+gboolean                        clutter_actor_has_mapped_clones                 (ClutterActor *self);
+#endif
+
 G_END_DECLS
 
 #endif /* __CLUTTER_ACTOR_H__ */
diff --git a/clutter/clutter-align-constraint.h b/clutter/clutter-align-constraint.h
index 6ff855ecc..9b63f4208 100644
--- a/clutter/clutter-align-constraint.h
+++ b/clutter/clutter-align-constraint.h
@@ -40,7 +40,7 @@ G_BEGIN_DECLS
 /**
  * ClutterAlignConstraint:
  *
- * <structname>ClutterAlignConstraint</structname> is an opaque structure
+ * #ClutterAlignConstraint is an opaque structure
  * whose members cannot be directly accesses
  *
  * Since: 1.4
@@ -48,20 +48,28 @@ G_BEGIN_DECLS
 typedef struct _ClutterAlignConstraint          ClutterAlignConstraint;
 typedef struct _ClutterAlignConstraintClass     ClutterAlignConstraintClass;
 
+CLUTTER_AVAILABLE_IN_1_4
 GType clutter_align_constraint_get_type (void) G_GNUC_CONST;
 
+CLUTTER_AVAILABLE_IN_1_4
 ClutterConstraint *clutter_align_constraint_new            (ClutterActor           *source,
                                                             ClutterAlignAxis        axis,
                                                             gfloat                  factor);
 
+CLUTTER_AVAILABLE_IN_1_4
 void               clutter_align_constraint_set_source     (ClutterAlignConstraint *align,
                                                             ClutterActor           *source);
+CLUTTER_AVAILABLE_IN_1_4
 ClutterActor *     clutter_align_constraint_get_source     (ClutterAlignConstraint *align);
+CLUTTER_AVAILABLE_IN_1_4
 void               clutter_align_constraint_set_align_axis (ClutterAlignConstraint *align,
                                                             ClutterAlignAxis        axis);
+CLUTTER_AVAILABLE_IN_1_4
 ClutterAlignAxis   clutter_align_constraint_get_align_axis (ClutterAlignConstraint *align);
+CLUTTER_AVAILABLE_IN_1_4
 void               clutter_align_constraint_set_factor     (ClutterAlignConstraint *align,
                                                             gfloat                  factor);
+CLUTTER_AVAILABLE_IN_1_4
 gfloat             clutter_align_constraint_get_factor     (ClutterAlignConstraint *align);
 
 G_END_DECLS
diff --git a/clutter/clutter-animatable.h b/clutter/clutter-animatable.h
index 78a796fae..7d20c5a57 100644
--- a/clutter/clutter-animatable.h
+++ b/clutter/clutter-animatable.h
@@ -95,16 +95,21 @@ struct _ClutterAnimatableIface
                                      GValue            *value);
 };
 
+CLUTTER_AVAILABLE_IN_1_0
 GType clutter_animatable_get_type (void) G_GNUC_CONST;
 
+CLUTTER_AVAILABLE_IN_1_0
 GParamSpec *clutter_animatable_find_property     (ClutterAnimatable *animatable,
                                                   const gchar       *property_name);
+CLUTTER_AVAILABLE_IN_1_0
 void        clutter_animatable_get_initial_state (ClutterAnimatable *animatable,
                                                   const gchar       *property_name,
                                                   GValue            *value);
+CLUTTER_AVAILABLE_IN_1_0
 void        clutter_animatable_set_final_state   (ClutterAnimatable *animatable,
                                                   const gchar       *property_name,
                                                   const GValue      *value);
+CLUTTER_AVAILABLE_IN_1_8
 gboolean    clutter_animatable_interpolate_value (ClutterAnimatable *animatable,
                                                   const gchar       *property_name,
                                                   ClutterInterval   *interval,
diff --git a/clutter/clutter-backend-private.h b/clutter/clutter-backend-private.h
index 72563a3b1..a9e7ae270 100644
--- a/clutter/clutter-backend-private.h
+++ b/clutter/clutter-backend-private.h
@@ -93,12 +93,16 @@ struct _ClutterBackendClass
                                                 gpointer            native,
                                                 ClutterEvent       *event);
 
+  PangoDirection        (* get_keymap_direction) (ClutterBackend   *backend);
+
   /* signals */
   void (* resolution_changed) (ClutterBackend *backend);
   void (* font_changed)       (ClutterBackend *backend);
   void (* settings_changed)   (ClutterBackend *backend);
 };
 
+ClutterBackend *        _clutter_create_backend                         (void);
+
 ClutterStageWindow *    _clutter_backend_create_stage                   (ClutterBackend         *backend,
                                                                          ClutterStage           *wrapper,
                                                                          GError                **error);
@@ -136,6 +140,8 @@ gfloat                  _clutter_backend_get_units_per_em               (Clutter
                                                                          PangoFontDescription   *font_desc);
 gint32                  _clutter_backend_get_units_serial               (ClutterBackend         *backend);
 
+PangoDirection          _clutter_backend_get_keymap_direction           (ClutterBackend         *backend);
+
 G_END_DECLS
 
 #endif /* __CLUTTER_BACKEND_PRIVATE_H__ */
diff --git a/clutter/clutter-backend.c b/clutter/clutter-backend.c
index c174ae817..d255eee8b 100644
--- a/clutter/clutter-backend.c
+++ b/clutter/clutter-backend.c
@@ -83,6 +83,9 @@
 /* XXX - should probably warn, here */
 #include "tslib/clutter-event-tslib.h"
 #endif
+#ifdef CLUTTER_WINDOWING_EGL
+#include "egl/clutter-backend-eglnative.h"
+#endif
 #ifdef CLUTTER_INPUT_WAYLAND
 #include "wayland/clutter-device-manager-wayland.h"
 #endif
@@ -93,13 +96,8 @@
 #include "wayland/clutter-wayland-compositor.h"
 #endif
 
-G_DEFINE_ABSTRACT_TYPE (ClutterBackend, clutter_backend, G_TYPE_OBJECT);
-
 #define DEFAULT_FONT_NAME       "Sans 10"
 
-#define CLUTTER_BACKEND_GET_PRIVATE(obj) \
-(G_TYPE_INSTANCE_GET_PRIVATE ((obj), CLUTTER_TYPE_BACKEND, ClutterBackendPrivate))
-
 struct _ClutterBackendPrivate
 {
   cairo_font_options_t *font_options;
@@ -121,6 +119,8 @@ enum
   LAST_SIGNAL
 };
 
+G_DEFINE_ABSTRACT_TYPE_WITH_PRIVATE (ClutterBackend, clutter_backend, G_TYPE_OBJECT)
+
 static guint backend_signals[LAST_SIGNAL] = { 0, };
 
 /* Global for being able to specify a compositor side wayland display
@@ -129,6 +129,7 @@ static guint backend_signals[LAST_SIGNAL] = { 0, };
 static struct wl_display *_wayland_compositor_display;
 #endif
 
+static const char *allowed_backend;
 
 static void
 clutter_backend_dispose (GObject *gobject)
@@ -466,6 +467,58 @@ clutter_backend_real_create_stage (ClutterBackend  *backend,
                        NULL);
 }
 
+ClutterBackend *
+_clutter_create_backend (void)
+{
+  const char *backend = allowed_backend;
+  ClutterBackend *retval = NULL;
+
+  if (backend == NULL)
+    {
+      const char *backend_env = g_getenv ("CLUTTER_BACKEND");
+
+      if (backend_env != NULL)
+	backend = g_intern_string (backend_env);
+    }
+
+#ifdef CLUTTER_WINDOWING_OSX
+  if (backend == NULL || backend == I_(CLUTTER_WINDOWING_OSX))
+    retval = g_object_new (CLUTTER_TYPE_BACKEND_OSX, NULL);
+  else
+#endif
+#ifdef CLUTTER_WINDOWING_WIN32
+  if (backend == NULL || backend == I_(CLUTTER_WINDOWING_WIN32))
+    retval = g_object_new (CLUTTER_TYPE_BACKEND_WIN32, NULL);
+  else
+#endif
+#ifdef CLUTTER_WINDOWING_X11
+  if (backend == NULL || backend == I_(CLUTTER_WINDOWING_X11))
+    retval = g_object_new (CLUTTER_TYPE_BACKEND_X11, NULL);
+  else
+#endif
+#ifdef CLUTTER_WINDOWING_WAYLAND
+  if (backend == NULL || backend == I_(CLUTTER_WINDOWING_WAYLAND))
+    retval = g_object_new (CLUTTER_TYPE_BACKEND_WAYLAND, NULL);
+  else
+#endif
+#ifdef CLUTTER_WINDOWING_EGL
+  if (backend == NULL || backend == I_(CLUTTER_WINDOWING_EGL))
+    retval = g_object_new (CLUTTER_TYPE_BACKEND_EGL_NATIVE, NULL);
+  else
+#endif
+#ifdef CLUTTER_WINDOWING_GDK
+  if (backend == NULL || backend == I_(CLUTTER_WINDOWING_GDK))
+    retval = g_object_new (CLUTTER_TYPE_BACKEND_GDK, NULL);
+  else
+#endif
+  if (backend == NULL)
+    g_error ("No default Clutter backend found.");
+  else
+    g_error ("Unsupported Clutter backend: '%s'", backend);
+
+  return retval;
+}
+
 static void
 clutter_backend_real_init_events (ClutterBackend *backend)
 {
@@ -509,8 +562,12 @@ clutter_backend_real_init_events (ClutterBackend *backend)
 #endif
 #ifdef CLUTTER_INPUT_EVDEV
   /* Evdev can be used regardless of the windowing system */
-  if (input_backend != NULL &&
-      strcmp (input_backend, CLUTTER_INPUT_EVDEV) == 0)
+  if ((input_backend != NULL && strcmp (input_backend, CLUTTER_INPUT_EVDEV) == 0)
+#ifdef CLUTTER_WINDOWING_EGL
+      /* but we do want to always use it for EGL native */
+      || clutter_check_windowing_backend (CLUTTER_WINDOWING_EGL)
+#endif
+      )
     {
       _clutter_events_evdev_init (backend);
     }
@@ -591,8 +648,6 @@ clutter_backend_class_init (ClutterBackendClass *klass)
   gobject_class->dispose = clutter_backend_dispose;
   gobject_class->finalize = clutter_backend_finalize;
 
-  g_type_class_add_private (gobject_class, sizeof (ClutterBackendPrivate));
-
   klass->stage_window_type = G_TYPE_INVALID;
 
   /**
@@ -662,14 +717,11 @@ clutter_backend_class_init (ClutterBackendClass *klass)
 }
 
 static void
-clutter_backend_init (ClutterBackend *backend)
+clutter_backend_init (ClutterBackend *self)
 {
-  ClutterBackendPrivate *priv;
-
-  priv = backend->priv = CLUTTER_BACKEND_GET_PRIVATE (backend);
-
-  priv->units_per_em = -1.0;
-  priv->units_serial = 1;
+  self->priv = clutter_backend_get_instance_private (self);
+  self->priv->units_per_em = -1.0;
+  self->priv->units_serial = 1;
 }
 
 void
@@ -1292,14 +1344,14 @@ _clutter_backend_remove_event_translator (ClutterBackend         *backend,
  * @backend. A #CoglContext is required when using some of the
  * experimental 2.0 Cogl API.
  *
- * <note>Since CoglContext is itself experimental API this API should
- * be considered experimental too.</note>
+ * Since CoglContext is itself experimental API this API should
+ * be considered experimental too.
  *
- * <note>This API is not yet supported on OSX because OSX still
+ * This API is not yet supported on OSX because OSX still
  * uses the stub Cogl winsys and the Clutter backend doesn't
- * explicitly create a CoglContext.</note>
+ * explicitly create a CoglContext.
  *
- * Return value: The #CoglContext associated with @backend.
+ * Return value: (transfer none): The #CoglContext associated with @backend.
  *
  * Since: 1.8
  * Stability: unstable
@@ -1334,3 +1386,33 @@ clutter_wayland_set_compositor_display (void *display)
   _wayland_compositor_display = display;
 }
 #endif
+
+/**
+ * clutter_set_windowing_backend:
+ * @backend_type: the name of a clutter window backend
+ *
+ * Restricts clutter to only use the specified backend.
+ * This must be called before the first API call to clutter, including
+ * clutter_get_option_context()
+ *
+ * Since: 1.16
+ */
+void
+clutter_set_windowing_backend (const char *backend_type)
+{
+  g_return_if_fail (backend_type != NULL);
+
+  allowed_backend = g_intern_string (backend_type);
+}
+
+PangoDirection
+_clutter_backend_get_keymap_direction (ClutterBackend *backend)
+{
+  ClutterBackendClass *klass;
+
+  klass = CLUTTER_BACKEND_GET_CLASS (backend);
+  if (klass->get_keymap_direction != NULL)
+    return klass->get_keymap_direction (backend);
+
+  return PANGO_DIRECTION_NEUTRAL;
+}
diff --git a/clutter/clutter-backend.h b/clutter/clutter-backend.h
index 474c4264e..e14d5d2c6 100644
--- a/clutter/clutter-backend.h
+++ b/clutter/clutter-backend.h
@@ -47,7 +47,7 @@ G_BEGIN_DECLS
 /**
  * ClutterBackend:
  *
- * <structname>ClutterBackend</structname> is an opaque structure whose
+ * #ClutterBackend is an opaque structure whose
  * members cannot be directly accessed.
  *
  * Since: 0.4
@@ -55,18 +55,27 @@ G_BEGIN_DECLS
 typedef struct _ClutterBackend          ClutterBackend;
 typedef struct _ClutterBackendClass     ClutterBackendClass;
 
-GType clutter_backend_get_type    (void) G_GNUC_CONST;
+CLUTTER_AVAILABLE_IN_ALL
+GType clutter_backend_get_type (void) G_GNUC_CONST;
 
-ClutterBackend *clutter_get_default_backend (void);
+CLUTTER_AVAILABLE_IN_ALL
+ClutterBackend *                clutter_get_default_backend             (void);
 
-gdouble                     clutter_backend_get_resolution            (ClutterBackend             *backend);
+CLUTTER_AVAILABLE_IN_1_16
+void                            clutter_set_windowing_backend           (const char *backend_type);
 
-void                        clutter_backend_set_font_options          (ClutterBackend             *backend,
-                                                                       const cairo_font_options_t *options);
-const cairo_font_options_t *clutter_backend_get_font_options          (ClutterBackend             *backend);
+CLUTTER_AVAILABLE_IN_ALL
+gdouble                         clutter_backend_get_resolution          (ClutterBackend             *backend);
+
+CLUTTER_AVAILABLE_IN_ALL
+void                            clutter_backend_set_font_options        (ClutterBackend             *backend,
+                                                                         const cairo_font_options_t *options);
+CLUTTER_AVAILABLE_IN_ALL
+const cairo_font_options_t *    clutter_backend_get_font_options        (ClutterBackend             *backend);
 
 #if defined (COGL_ENABLE_EXPERIMENTAL_API) && defined (CLUTTER_ENABLE_EXPERIMENTAL_API)
-CoglContext                *clutter_backend_get_cogl_context          (ClutterBackend             *backend);
+CLUTTER_AVAILABLE_IN_1_8
+CoglContext *                   clutter_backend_get_cogl_context        (ClutterBackend             *backend);
 #endif
 
 G_END_DECLS
diff --git a/clutter/clutter-bin-layout.c b/clutter/clutter-bin-layout.c
index de7370ee7..2ee8012a8 100644
--- a/clutter/clutter-bin-layout.c
+++ b/clutter/clutter-bin-layout.c
@@ -29,34 +29,16 @@
  * #ClutterBinLayout is a layout manager which implements the following
  * policy:
  *
- * <itemizedlist>
- *   <listitem><simpara>the preferred size is the maximum preferred size
+ *   - the preferred size is the maximum preferred size
  *   between all the children of the container using the
- *   layout;</simpara></listitem>
- *   <listitem><simpara>each child is allocated in "layers", on on top
- *   of the other;</simpara></listitem>
- *   <listitem><simpara>for each layer there are horizontal and vertical
- *   alignment policies.</simpara></listitem>
- * </itemizedlist>
+ *   layout;
+ *   - each child is allocated in "layers", on on top
+ *   of the other;
+ *   - for each layer there are horizontal and vertical
+ *   alignment policies.
  *
- * <figure id="bin-layout">
- *   <title>Bin layout</title>
- *   <para>The image shows a #ClutterBinLayout with three layers:
- *   a background #ClutterCairoTexture, set to fill on both the X
- *   and Y axis; a #ClutterTexture, set to center on both the X and
- *   Y axis; and a #ClutterRectangle, set to %CLUTTER_BIN_ALIGNMENT_END
- *   on both the X and Y axis.</para>
- *   <graphic fileref="bin-layout.png" format="PNG"/>
- * </figure>
- *
- * <example id="example-clutter-bin-layout">
- *  <title>How to pack actors inside a BinLayout</title>
- *  <programlisting>
- * <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" parse="text" href="../../../../examples/bin-layout.c">
- *   <xi:fallback>FIXME: MISSING XINCLUDE CONTENT</xi:fallback>
- * </xi:include>
- *  </programlisting>
- * </example>
+ * The [bin-layout example](https://git.gnome.org/browse/clutter/tree/examples/bin-layout.c?h=clutter-1.18)
+ * shows how to pack actors inside a #ClutterBinLayout.
  *
  * #ClutterBinLayout is available since Clutter 1.2
  */
@@ -83,8 +65,6 @@
 #define CLUTTER_BIN_LAYER(obj)          (G_TYPE_CHECK_INSTANCE_CAST ((obj), CLUTTER_TYPE_BIN_LAYER, ClutterBinLayer))
 #define CLUTTER_IS_BIN_LAYER(obj)       (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CLUTTER_TYPE_BIN_LAYER))
 
-#define CLUTTER_BIN_LAYOUT_GET_PRIVATE(obj)     (G_TYPE_INSTANCE_GET_PRIVATE ((obj), CLUTTER_TYPE_BIN_LAYOUT, ClutterBinLayoutPrivate))
-
 typedef struct _ClutterBinLayer         ClutterBinLayer;
 typedef struct _ClutterLayoutMetaClass  ClutterBinLayerClass;
 
@@ -131,11 +111,11 @@ GType clutter_bin_layer_get_type (void);
 
 G_DEFINE_TYPE (ClutterBinLayer,
                clutter_bin_layer,
-               CLUTTER_TYPE_LAYOUT_META);
+               CLUTTER_TYPE_LAYOUT_META)
 
-G_DEFINE_TYPE (ClutterBinLayout,
-               clutter_bin_layout,
-               CLUTTER_TYPE_LAYOUT_MANAGER);
+G_DEFINE_TYPE_WITH_PRIVATE (ClutterBinLayout,
+                            clutter_bin_layout,
+                            CLUTTER_TYPE_LAYOUT_MANAGER)
 
 /*
  * ClutterBinLayer
@@ -491,8 +471,8 @@ clutter_bin_layout_allocate (ClutterLayoutManager   *manager,
       else
         child_alloc.y1 = allocation_y;
 
-      child_alloc.x2 = available_w;
-      child_alloc.y2 = available_h;
+      child_alloc.x2 = allocation_x + available_w;
+      child_alloc.y2 = allocation_y + available_h;
 
       if (clutter_actor_needs_expand (child, CLUTTER_ORIENTATION_HORIZONTAL))
         {
@@ -637,8 +617,6 @@ clutter_bin_layout_class_init (ClutterBinLayoutClass *klass)
   ClutterLayoutManagerClass *layout_class =
     CLUTTER_LAYOUT_MANAGER_CLASS (klass);
 
-  g_type_class_add_private (klass, sizeof (ClutterBinLayoutPrivate));
-
   /**
    * ClutterBinLayout:x-align:
    *
@@ -694,7 +672,7 @@ clutter_bin_layout_class_init (ClutterBinLayoutClass *klass)
 static void
 clutter_bin_layout_init (ClutterBinLayout *self)
 {
-  self->priv = CLUTTER_BIN_LAYOUT_GET_PRIVATE (self);
+  self->priv = clutter_bin_layout_get_instance_private (self);
 
   self->priv->x_align = CLUTTER_BIN_ALIGNMENT_CENTER;
   self->priv->y_align = CLUTTER_BIN_ALIGNMENT_CENTER;
diff --git a/clutter/clutter-bin-layout.h b/clutter/clutter-bin-layout.h
index 6f52ba182..fc89e0bd6 100644
--- a/clutter/clutter-bin-layout.h
+++ b/clutter/clutter-bin-layout.h
@@ -74,10 +74,12 @@ struct _ClutterBinLayoutClass
   ClutterLayoutManagerClass parent_class;
 };
 
+CLUTTER_AVAILABLE_IN_1_2
 GType clutter_bin_layout_get_type (void) G_GNUC_CONST;
 
-ClutterLayoutManager *clutter_bin_layout_new           (ClutterBinAlignment  x_align,
-                                                        ClutterBinAlignment  y_align);
+CLUTTER_AVAILABLE_IN_1_2
+ClutterLayoutManager *  clutter_bin_layout_new  (ClutterBinAlignment x_align,
+                                                 ClutterBinAlignment y_align);
 
 G_END_DECLS
 
diff --git a/clutter/clutter-bind-constraint.c b/clutter/clutter-bind-constraint.c
index b9e45aba5..53cbbba8f 100644
--- a/clutter/clutter-bind-constraint.c
+++ b/clutter/clutter-bind-constraint.c
@@ -36,14 +36,14 @@
  * can also be animated. For instance, the following code will set up three
  * actors to be bound to the same origin:
  *
- * |[
- * /&ast; source &ast;/
- * rect[0] = clutter_rectangle_new_with_color (&amp;red_color);
+ * |[<!-- language="C" -->
+ * // source
+ * rect[0] = clutter_rectangle_new_with_color (&red_color);
  * clutter_actor_set_position (rect[0], x_pos, y_pos);
  * clutter_actor_set_size (rect[0], 100, 100);
  *
- * /&ast; second rectangle &ast;/
- * rect[1] = clutter_rectangle_new_with_color (&amp;green_color);
+ * // second rectangle
+ * rect[1] = clutter_rectangle_new_with_color (&green_color);
  * clutter_actor_set_size (rect[1], 100, 100);
  * clutter_actor_set_opacity (rect[1], 0);
  *
@@ -52,8 +52,8 @@
  * constraint = clutter_bind_constraint_new (rect[0], CLUTTER_BIND_Y, 0.0);
  * clutter_actor_add_constraint_with_name (rect[1], "green-y", constraint);
  *
- * /&ast; third rectangle &ast;/
- * rect[2] = clutter_rectangle_new_with_color (&amp;blue_color);
+ * // third rectangle
+ * rect[2] = clutter_rectangle_new_with_color (&blue_color);
  * clutter_actor_set_size (rect[2], 100, 100);
  * clutter_actor_set_opacity (rect[2], 0);
  *
@@ -66,7 +66,7 @@
  * The following code animates the second and third rectangles to "expand"
  * them horizontally from underneath the first rectangle:
  *
- * |[
+ * |[<!-- language="C" -->
  * clutter_actor_animate (rect[1], CLUTTER_EASE_OUT_CUBIC, 250,
  *                        "@constraints.green-x.offset", 100.0,
  *                        "opacity", 255,
@@ -77,21 +77,6 @@
  *                        NULL);
  * ]|
  *
- * <example id="bind-constraint-example">
- *   <title>Animating the offset property of ClutterBindConstraint</title>
- *   <programlisting>
- * <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" parse="text" href="../../../../tests/interactive/test-bind-constraint.c">
- *   <xi:fallback>FIXME: MISSING XINCLUDE CONTENT</xi:fallback>
- * </xi:include>
- *   </programlisting>
- *   <para>The example above creates eight rectangles and binds them to a
- *   rectangle positioned in the center of the stage; when the user presses
- *   the center rectangle, the #ClutterBindConstraint:offset property is
- *   animated through the clutter_actor_animate() function to lay out the
- *   eight rectangles around the center one. Pressing one of the outer
- *   rectangles will animate the offset back to 0.</para>
- * </example>
- *
  * #ClutterBindConstraint is available since Clutter 1.4
  */
 
@@ -151,7 +136,7 @@ source_queue_relayout (ClutterActor          *source,
                        ClutterBindConstraint *bind)
 {
   if (bind->actor != NULL)
-    clutter_actor_queue_relayout (bind->actor);
+    _clutter_actor_queue_only_relayout (bind->actor);
 }
 
 static void
diff --git a/clutter/clutter-bind-constraint.h b/clutter/clutter-bind-constraint.h
index 3ce1d59da..36e2b484e 100644
--- a/clutter/clutter-bind-constraint.h
+++ b/clutter/clutter-bind-constraint.h
@@ -40,7 +40,7 @@ G_BEGIN_DECLS
 /**
  * ClutterBindConstraint:
  *
- * <structname>ClutterBindConstraint</structname> is an opaque structure
+ * #ClutterBindConstraint is an opaque structure
  * whose members cannot be directly accessed
  *
  * Since: 1.4
@@ -48,20 +48,28 @@ G_BEGIN_DECLS
 typedef struct _ClutterBindConstraint           ClutterBindConstraint;
 typedef struct _ClutterBindConstraintClass      ClutterBindConstraintClass;
 
+CLUTTER_AVAILABLE_IN_1_4
 GType clutter_bind_constraint_get_type (void) G_GNUC_CONST;
 
+CLUTTER_AVAILABLE_IN_1_4
 ClutterConstraint *   clutter_bind_constraint_new            (ClutterActor          *source,
                                                               ClutterBindCoordinate  coordinate,
                                                               gfloat                 offset);
 
+CLUTTER_AVAILABLE_IN_1_4
 void                  clutter_bind_constraint_set_source     (ClutterBindConstraint *constraint,
                                                               ClutterActor          *source);
+CLUTTER_AVAILABLE_IN_1_4
 ClutterActor *        clutter_bind_constraint_get_source     (ClutterBindConstraint *constraint);
+CLUTTER_AVAILABLE_IN_1_4
 void                  clutter_bind_constraint_set_coordinate (ClutterBindConstraint *constraint,
                                                               ClutterBindCoordinate  coordinate);
+CLUTTER_AVAILABLE_IN_1_4
 ClutterBindCoordinate clutter_bind_constraint_get_coordinate (ClutterBindConstraint *constraint);
+CLUTTER_AVAILABLE_IN_1_4
 void                  clutter_bind_constraint_set_offset     (ClutterBindConstraint *constraint,
                                                               gfloat                 offset);
+CLUTTER_AVAILABLE_IN_1_4
 gfloat                clutter_bind_constraint_get_offset     (ClutterBindConstraint *constraint);
 
 G_END_DECLS
diff --git a/clutter/clutter-binding-pool.c b/clutter/clutter-binding-pool.c
index 6bce92334..66959c784 100644
--- a/clutter/clutter-binding-pool.c
+++ b/clutter/clutter-binding-pool.c
@@ -38,7 +38,7 @@
  * inside their class initialization function and then install actions
  * like this:
  *
- * |[
+ * |[<!-- language="C" -->
  * static void
  * foo_class_init (FooClass *klass)
  * {
@@ -59,7 +59,7 @@
  *
  * The callback has a signature of:
  *
- * |[
+ * |[<!-- language="C" -->
  *    gboolean (* callback) (GObject             *instance,
  *                           const gchar         *action_name,
  *                           guint                key_val,
@@ -71,19 +71,18 @@
  * use clutter_binding_pool_activate() to match a #ClutterKeyEvent structure
  * to one of the actions:
  *
- * |[
+ * |[<!-- language="C" -->
  *   ClutterBindingPool *pool;
  *
- *   /&ast; retrieve the binding pool for the type of the actor &ast;/
+ *   // retrieve the binding pool for the type of the actor
  *   pool = clutter_binding_pool_find (G_OBJECT_TYPE_NAME (actor));
  *
- *   /&ast; activate any callback matching the key symbol and modifiers
- *    &ast; mask of the key event. the returned value can be directly
- *    &ast; used to signal that the actor has handled the event.
- *    &ast;/
+ *   // activate any callback matching the key symbol and modifiers
+ *   // mask of the key event. the returned value can be directly
+ *   // used to signal that the actor has handled the event.
  *   return clutter_binding_pool_activate (pool,
- *                                         key_event-&gt;keyval,
- *                                         key_event-&gt;modifier_state,
+ *                                         key_event->keyval,
+ *                                         key_event->modifier_state,
  *                                         G_OBJECT (actor));
  * ]|
  *
diff --git a/clutter/clutter-binding-pool.h b/clutter/clutter-binding-pool.h
index cdba0378e..6df5260b3 100644
--- a/clutter/clutter-binding-pool.h
+++ b/clutter/clutter-binding-pool.h
@@ -71,12 +71,17 @@ typedef gboolean (* ClutterBindingActionFunc) (GObject             *gobject,
                                                ClutterModifierType  modifiers,
                                                gpointer             user_data);
 
+CLUTTER_AVAILABLE_IN_1_0
 GType clutter_binding_pool_get_type (void) G_GNUC_CONST;
 
+CLUTTER_AVAILABLE_IN_1_0
 ClutterBindingPool *  clutter_binding_pool_new              (const gchar         *name);
+CLUTTER_AVAILABLE_IN_1_0
 ClutterBindingPool *  clutter_binding_pool_get_for_class    (gpointer             klass);
+CLUTTER_AVAILABLE_IN_1_0
 ClutterBindingPool *  clutter_binding_pool_find             (const gchar         *name);
 
+CLUTTER_AVAILABLE_IN_1_0
 void                  clutter_binding_pool_install_action   (ClutterBindingPool  *pool,
                                                              const gchar         *action_name,
                                                              guint                key_val,
@@ -84,36 +89,44 @@ void                  clutter_binding_pool_install_action   (ClutterBindingPool
                                                              GCallback            callback,
                                                              gpointer             data,
                                                              GDestroyNotify       notify);
+CLUTTER_AVAILABLE_IN_1_0
 void                  clutter_binding_pool_install_closure  (ClutterBindingPool  *pool,
                                                              const gchar         *action_name,
                                                              guint                key_val,
                                                              ClutterModifierType  modifiers,
                                                              GClosure            *closure);
+CLUTTER_AVAILABLE_IN_1_0
 void                  clutter_binding_pool_override_action  (ClutterBindingPool  *pool,
                                                              guint                key_val,
                                                              ClutterModifierType  modifiers,
                                                              GCallback            callback,
                                                              gpointer             data,
                                                              GDestroyNotify       notify);
+CLUTTER_AVAILABLE_IN_1_0
 void                  clutter_binding_pool_override_closure (ClutterBindingPool  *pool,
                                                              guint                key_val,
                                                              ClutterModifierType  modifiers,
                                                              GClosure            *closure);
 
+CLUTTER_AVAILABLE_IN_1_0
 const gchar *         clutter_binding_pool_find_action      (ClutterBindingPool  *pool,
                                                              guint                key_val,
                                                              ClutterModifierType  modifiers);
+CLUTTER_AVAILABLE_IN_1_0
 void                  clutter_binding_pool_remove_action    (ClutterBindingPool  *pool,
                                                              guint                key_val,
                                                              ClutterModifierType  modifiers);
 
+CLUTTER_AVAILABLE_IN_1_0
 gboolean              clutter_binding_pool_activate         (ClutterBindingPool  *pool,
                                                              guint                key_val,
                                                              ClutterModifierType  modifiers,
                                                              GObject             *gobject);
 
+CLUTTER_AVAILABLE_IN_1_0
 void                  clutter_binding_pool_block_action     (ClutterBindingPool  *pool,
                                                              const gchar         *action_name);
+CLUTTER_AVAILABLE_IN_1_0
 void                  clutter_binding_pool_unblock_action   (ClutterBindingPool  *pool,
                                                              const gchar         *action_name);
 
diff --git a/clutter/clutter-blur-effect.h b/clutter/clutter-blur-effect.h
index 27466bb48..ca96d8081 100644
--- a/clutter/clutter-blur-effect.h
+++ b/clutter/clutter-blur-effect.h
@@ -40,7 +40,7 @@ G_BEGIN_DECLS
 /**
  * ClutterBlurEffect:
  *
- * <structname>ClutterBlurEffect</structname> is an opaque structure
+ * #ClutterBlurEffect is an opaque structure
  * whose members cannot be accessed directly
  *
  * Since: 1.4
@@ -48,8 +48,10 @@ G_BEGIN_DECLS
 typedef struct _ClutterBlurEffect       ClutterBlurEffect;
 typedef struct _ClutterBlurEffectClass  ClutterBlurEffectClass;
 
+CLUTTER_AVAILABLE_IN_1_4
 GType clutter_blur_effect_get_type (void) G_GNUC_CONST;
 
+CLUTTER_AVAILABLE_IN_1_4
 ClutterEffect *clutter_blur_effect_new (void);
 
 G_END_DECLS
diff --git a/clutter/clutter-box-layout.c b/clutter/clutter-box-layout.c
index a87b32bf2..20b2628a1 100644
--- a/clutter/clutter-box-layout.c
+++ b/clutter/clutter-box-layout.c
@@ -31,30 +31,16 @@
  *
  * The #ClutterBoxLayout is a #ClutterLayoutManager implementing the
  * following layout policy:
- * <itemizedlist>
- *   <listitem><para>all children are arranged on a single
- *   line;</para></listitem>
- *   <listitem><para>the axis used is controlled by the
- *   #ClutterBoxLayout:orientation property;</para></listitem>
- *   <listitem><para>the order of the packing is determined by the
- *   #ClutterBoxLayout:pack-start boolean property;</para></listitem>
- *   <listitem><para>each child will be allocated to its natural
- *   size or, if #ClutterActor:x-expand/#ClutterActor:y-expand
- *   is set, the available size;</para></listitem>
- *   <listitem><para>honours the #ClutterActor's #ClutterActor:x-align
- *   and #ClutterActor:y-align properties to fill the available
- *   size;</para></listitem>
- *   <listitem><para>if the #ClutterBoxLayout:homogeneous boolean property
- *   is set, then all widgets will get the same size, ignoring expand
- *   settings and the preferred sizes</para></listitem>
- * </itemizedlist>
  *
- *  <figure id="box-layout">
- *   <title>Box layout</title>
- *   <para>The image shows a #ClutterBoxLayout with the
- *   #ClutterBoxLayout:vertical property set to %FALSE.</para>
- *   <graphic fileref="box-layout.png" format="PNG"/>
- * </figure>
+ *  - all children are arranged on a single line
+ *  - the axis used is controlled by the #ClutterBoxLayout:orientation property
+ *  - the order of the packing is determined by the #ClutterBoxLayout:pack-start boolean property
+ *  - each child will be allocated to its natural size or, if #ClutterActor:x-expand or
+ *  #ClutterActor:y-expand are set, the available size
+ *  - honours the #ClutterActor's #ClutterActor:x-align and #ClutterActor:y-align properties
+ *  to fill the available size
+ *  - if the #ClutterBoxLayout:homogeneous boolean propert is set, then all widgets will
+ *  get the same size, ignoring expand settings and the preferred sizes
  *
  * It is possible to control the spacing between children of a
  * #ClutterBoxLayout by using clutter_box_layout_set_spacing().
@@ -85,8 +71,6 @@
 #define CLUTTER_BOX_CHILD(obj)          (G_TYPE_CHECK_INSTANCE_CAST ((obj), CLUTTER_TYPE_BOX_CHILD, ClutterBoxChild))
 #define CLUTTER_IS_BOX_CHILD(obj)       (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CLUTTER_TYPE_BOX_CHILD))
 
-#define CLUTTER_BOX_LAYOUT_GET_PRIVATE(obj)     (G_TYPE_INSTANCE_GET_PRIVATE ((obj), CLUTTER_TYPE_BOX_LAYOUT, ClutterBoxLayoutPrivate))
-
 typedef struct _ClutterBoxChild         ClutterBoxChild;
 typedef struct _ClutterLayoutMetaClass  ClutterBoxChildClass;
 
@@ -153,11 +137,11 @@ GType clutter_box_child_get_type (void);
 
 G_DEFINE_TYPE (ClutterBoxChild,
                clutter_box_child,
-               CLUTTER_TYPE_LAYOUT_META);
+               CLUTTER_TYPE_LAYOUT_META)
 
-G_DEFINE_TYPE (ClutterBoxLayout,
-               clutter_box_layout,
-               CLUTTER_TYPE_LAYOUT_MANAGER);
+G_DEFINE_TYPE_WITH_PRIVATE (ClutterBoxLayout,
+                            clutter_box_layout,
+                            CLUTTER_TYPE_LAYOUT_MANAGER)
 
 
 typedef struct _RequestedSize
@@ -979,7 +963,7 @@ clutter_box_layout_allocate (ClutterLayoutManager   *layout,
   gint extra;
   gint n_extra_widgets = 0; /* Number of widgets that receive 1 extra px */
   gint x = 0, y = 0, i;
-  gint child_size;
+  gfloat child_size;
 
   count_expand_children (layout, container, &nvis_children, &nexpand_children);
 
@@ -1102,7 +1086,7 @@ clutter_box_layout_allocate (ClutterLayoutManager   *layout,
   if (priv->orientation == CLUTTER_ORIENTATION_VERTICAL)
     {
       child_allocation.x1 = box->x1;
-      child_allocation.x2 = MAX (1.0, box->x2 - box->x1);
+      child_allocation.x2 = MAX (1.0, box->x2);
       if (priv->is_pack_start)
         y = box->y2 - box->y1;
       else
@@ -1111,7 +1095,7 @@ clutter_box_layout_allocate (ClutterLayoutManager   *layout,
   else
     {
       child_allocation.y1 = box->y1;
-      child_allocation.y2 = MAX (1.0, box->y2 - box->y1);
+      child_allocation.y2 = MAX (1.0, box->y2);
       if (priv->is_pack_start)
         x = box->x2 - box->x1;
       else
@@ -1166,7 +1150,7 @@ clutter_box_layout_allocate (ClutterLayoutManager   *layout,
       if (priv->orientation == CLUTTER_ORIENTATION_VERTICAL)
         {
           if (clutter_actor_needs_expand (child, priv->orientation) ||
-              box_child->y_fill)
+              box_child->expand)
             {
               child_allocation.y1 = y;
               child_allocation.y2 = child_allocation.y1 + MAX (1.0, child_size);
@@ -1192,7 +1176,7 @@ clutter_box_layout_allocate (ClutterLayoutManager   *layout,
       else /* CLUTTER_ORIENTATION_HORIZONTAL */
         {
           if (clutter_actor_needs_expand (child, priv->orientation) ||
-              box_child->x_fill)
+              box_child->expand)
             {
               child_allocation.x1 = x;
               child_allocation.x2 = child_allocation.x1 + MAX (1.0, child_size);
@@ -1219,10 +1203,8 @@ clutter_box_layout_allocate (ClutterLayoutManager   *layout,
             {
               gfloat width = child_allocation.x2 - child_allocation.x1;
 
-              child_allocation.x1 = box->x2 - box->x1
-                                  - child_allocation.x1
-                                  - (child_allocation.x2 - child_allocation.x1);
-              child_allocation.x2 = child_allocation.x1 + width;
+              child_allocation.x2 = box->x1 + (box->x2 - child_allocation.x1);
+              child_allocation.x1 = child_allocation.x2 - width;
             }
 
         }
@@ -1348,8 +1330,6 @@ clutter_box_layout_class_init (ClutterBoxLayoutClass *klass)
   layout_class->set_container = clutter_box_layout_set_container;
   layout_class->get_child_meta_type = clutter_box_layout_get_child_meta_type;
 
-  g_type_class_add_private (klass, sizeof (ClutterBoxLayoutPrivate));
-
   /**
    * ClutterBoxLayout:vertical:
    *
@@ -1503,20 +1483,18 @@ clutter_box_layout_class_init (ClutterBoxLayoutClass *klass)
 }
 
 static void
-clutter_box_layout_init (ClutterBoxLayout *layout)
+clutter_box_layout_init (ClutterBoxLayout *self)
 {
-  ClutterBoxLayoutPrivate *priv;
+  self->priv = clutter_box_layout_get_instance_private (self);
 
-  layout->priv = priv = CLUTTER_BOX_LAYOUT_GET_PRIVATE (layout);
+  self->priv->orientation = CLUTTER_ORIENTATION_HORIZONTAL;
+  self->priv->is_homogeneous = FALSE;
+  self->priv->is_pack_start = FALSE;
+  self->priv->spacing = 0;
 
-  priv->orientation = CLUTTER_ORIENTATION_HORIZONTAL;
-  priv->is_homogeneous = FALSE;
-  priv->is_pack_start = FALSE;
-  priv->spacing = 0;
-
-  priv->use_animations = FALSE;
-  priv->easing_mode = CLUTTER_EASE_OUT_CUBIC;
-  priv->easing_duration = 500;
+  self->priv->use_animations = FALSE;
+  self->priv->easing_mode = CLUTTER_EASE_OUT_CUBIC;
+  self->priv->easing_duration = 500;
 }
 
 /**
diff --git a/clutter/clutter-box-layout.h b/clutter/clutter-box-layout.h
index 32daca861..3c5547ea9 100644
--- a/clutter/clutter-box-layout.h
+++ b/clutter/clutter-box-layout.h
@@ -77,8 +77,10 @@ struct _ClutterBoxLayoutClass
   ClutterLayoutManagerClass parent_class;
 };
 
+CLUTTER_AVAILABLE_IN_1_2
 GType clutter_box_layout_get_type (void) G_GNUC_CONST;
 
+CLUTTER_AVAILABLE_IN_1_2
 ClutterLayoutManager *  clutter_box_layout_new                 (void);
 
 CLUTTER_AVAILABLE_IN_1_12
@@ -87,14 +89,20 @@ void                    clutter_box_layout_set_orientation      (ClutterBoxLayou
 CLUTTER_AVAILABLE_IN_1_12
 ClutterOrientation      clutter_box_layout_get_orientation      (ClutterBoxLayout    *layout);
 
+CLUTTER_AVAILABLE_IN_1_2
 void                    clutter_box_layout_set_spacing          (ClutterBoxLayout    *layout,
                                                                  guint                spacing);
+CLUTTER_AVAILABLE_IN_1_2
 guint                   clutter_box_layout_get_spacing          (ClutterBoxLayout    *layout);
+CLUTTER_AVAILABLE_IN_1_2
 void                    clutter_box_layout_set_homogeneous      (ClutterBoxLayout    *layout,
                                                                  gboolean             homogeneous);
+CLUTTER_AVAILABLE_IN_1_2
 gboolean                clutter_box_layout_get_homogeneous      (ClutterBoxLayout    *layout);
+CLUTTER_AVAILABLE_IN_1_2
 void                    clutter_box_layout_set_pack_start       (ClutterBoxLayout    *layout,
                                                                  gboolean             pack_start);
+CLUTTER_AVAILABLE_IN_1_2
 gboolean                clutter_box_layout_get_pack_start       (ClutterBoxLayout    *layout);
 
 CLUTTER_DEPRECATED_IN_1_12_FOR(clutter_box_layout_set_orientation)
@@ -103,6 +111,7 @@ void                    clutter_box_layout_set_vertical         (ClutterBoxLayou
 CLUTTER_DEPRECATED_IN_1_12_FOR(clutter_box_layout_get_orientation)
 gboolean                clutter_box_layout_get_vertical         (ClutterBoxLayout    *layout);
 
+CLUTTER_AVAILABLE_IN_1_2
 void                    clutter_box_layout_pack                 (ClutterBoxLayout    *layout,
                                                                  ClutterActor        *actor,
                                                                  gboolean             expand,
diff --git a/clutter/clutter-brightness-contrast-effect.h b/clutter/clutter-brightness-contrast-effect.h
index b4b3a4007..f7a204f49 100644
--- a/clutter/clutter-brightness-contrast-effect.h
+++ b/clutter/clutter-brightness-contrast-effect.h
@@ -41,7 +41,7 @@ G_BEGIN_DECLS
 /**
  * ClutterBrightnessContrastEffect:
  *
- * <structname>ClutterBrightnessContrastEffect</structname> is an opaque structure
+ * #ClutterBrightnessContrastEffect is an opaque structure
  * whose members cannot be directly accessed
  *
  * Since: 1.10
@@ -49,27 +49,35 @@ G_BEGIN_DECLS
 typedef struct _ClutterBrightnessContrastEffect         ClutterBrightnessContrastEffect;
 typedef struct _ClutterBrightnessContrastEffectClass    ClutterBrightnessContrastEffectClass;
 
+CLUTTER_AVAILABLE_IN_1_10
 GType clutter_brightness_contrast_effect_get_type (void) G_GNUC_CONST;
 
+CLUTTER_AVAILABLE_IN_1_10
 ClutterEffect * clutter_brightness_contrast_effect_new                          (void);
 
+CLUTTER_AVAILABLE_IN_1_10
 void            clutter_brightness_contrast_effect_set_brightness_full          (ClutterBrightnessContrastEffect *effect,
                                                                                  float                            red,
                                                                                  float                            green,
                                                                                  float                            blue);
+CLUTTER_AVAILABLE_IN_1_10
 void            clutter_brightness_contrast_effect_set_brightness               (ClutterBrightnessContrastEffect *effect,
                                                                                  float                            brightness);
+CLUTTER_AVAILABLE_IN_1_10
 void            clutter_brightness_contrast_effect_get_brightness               (ClutterBrightnessContrastEffect *effect,
                                                                                  float                           *red,
                                                                                  float                           *green,
                                                                                  float                           *blue);
 
+CLUTTER_AVAILABLE_IN_1_10
 void            clutter_brightness_contrast_effect_set_contrast_full            (ClutterBrightnessContrastEffect *effect,
                                                                                  float                            red,
                                                                                  float                            green,
                                                                                  float                            blue);
+CLUTTER_AVAILABLE_IN_1_10
 void            clutter_brightness_contrast_effect_set_contrast                 (ClutterBrightnessContrastEffect *effect,
                                                                                  float                            contrast);
+CLUTTER_AVAILABLE_IN_1_10
 void            clutter_brightness_contrast_effect_get_contrast                 (ClutterBrightnessContrastEffect *effect,
                                                                                  float                           *red,
                                                                                  float                           *green,
diff --git a/clutter/clutter-cairo.h b/clutter/clutter-cairo.h
index f6bd9d85f..993b3e1b4 100644
--- a/clutter/clutter-cairo.h
+++ b/clutter/clutter-cairo.h
@@ -50,7 +50,9 @@ G_BEGIN_DECLS
 #define CLUTTER_CAIRO_FORMAT_ARGB32     (COGL_PIXEL_FORMAT_ARGB_8888_PRE)
 #endif
 
+CLUTTER_AVAILABLE_IN_1_12
 void    clutter_cairo_clear             (cairo_t               *cr);
+CLUTTER_AVAILABLE_IN_1_0
 void    clutter_cairo_set_source_color  (cairo_t               *cr,
                                          const ClutterColor    *color);
 
diff --git a/clutter/clutter-canvas.c b/clutter/clutter-canvas.c
index 43c0e7524..e75375404 100644
--- a/clutter/clutter-canvas.c
+++ b/clutter/clutter-canvas.c
@@ -36,13 +36,8 @@
  * that can be used to draw. #ClutterCanvas will emit the #ClutterCanvas::draw
  * signal when invalidated using clutter_content_invalidate().
  *
- * <informalexample id="canvas-example">
- *   <programlisting>
- * <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" parse="text" href="../../../../examples/canvas.c">
- *   <xi:fallback>FIXME: MISSING XINCLUDE CONTENT</xi:fallback>
- * </xi:include>
- *   </programlisting>
- * </informalexample>
+ * See [canvas.c](https://git.gnome.org/browse/clutter/tree/examples/canvas.c?h=clutter-1.18)
+ * for an example of how to use #ClutterCanvas.
  *
  * #ClutterCanvas is available since Clutter 1.10.
  */
@@ -62,10 +57,12 @@
 #include "clutter-cairo.h"
 #include "clutter-color.h"
 #include "clutter-content-private.h"
+#include "clutter-debug.h"
 #include "clutter-marshal.h"
 #include "clutter-paint-node.h"
 #include "clutter-paint-nodes.h"
 #include "clutter-private.h"
+#include "clutter-settings.h"
 
 struct _ClutterCanvasPrivate
 {
@@ -74,7 +71,13 @@ struct _ClutterCanvasPrivate
   int width;
   int height;
 
+  CoglTexture *texture;
+  gboolean dirty;
+
   CoglBitmap *buffer;
+
+  int scale_factor;
+  guint scale_factor_set : 1;
 };
 
 enum
@@ -83,6 +86,8 @@ enum
 
   PROP_WIDTH,
   PROP_HEIGHT,
+  PROP_SCALE_FACTOR,
+  PROP_SCALE_FACTOR_SET,
 
   LAST_PROP
 };
@@ -101,6 +106,7 @@ static guint canvas_signals[LAST_SIGNAL] = { 0, };
 static void clutter_content_iface_init (ClutterContentIface *iface);
 
 G_DEFINE_TYPE_WITH_CODE (ClutterCanvas, clutter_canvas, G_TYPE_OBJECT,
+                         G_ADD_PRIVATE (ClutterCanvas)
                          G_IMPLEMENT_INTERFACE (CLUTTER_TYPE_CONTENT,
                                                 clutter_content_iface_init))
 
@@ -137,6 +143,8 @@ clutter_canvas_finalize (GObject *gobject)
       priv->buffer = NULL;
     }
 
+  g_clear_pointer (&priv->texture, cogl_object_unref);
+
   G_OBJECT_CLASS (clutter_canvas_parent_class)->finalize (gobject);
 }
 
@@ -151,19 +159,34 @@ clutter_canvas_set_property (GObject      *gobject,
   switch (prop_id)
     {
     case PROP_WIDTH:
-      if (priv->width != g_value_get_int (value))
-        {
-          priv->width = g_value_get_int (value);
-          clutter_content_invalidate (CLUTTER_CONTENT (gobject));
-        }
+      {
+        gint new_size = g_value_get_int (value);
+
+        if (priv->width != new_size)
+          {
+            priv->width = new_size;
+
+            clutter_content_invalidate (CLUTTER_CONTENT (gobject));
+          }
+      }
       break;
 
     case PROP_HEIGHT:
-      if (priv->height != g_value_get_int (value))
-        {
-          priv->height = g_value_get_int (value);
-          clutter_content_invalidate (CLUTTER_CONTENT (gobject));
-        }
+      {
+        gint new_size = g_value_get_int (value);
+
+        if (priv->height != new_size)
+          {
+            priv->height = new_size;
+
+            clutter_content_invalidate (CLUTTER_CONTENT (gobject));
+          }
+      }
+      break;
+
+    case PROP_SCALE_FACTOR:
+      clutter_canvas_set_scale_factor (CLUTTER_CANVAS (gobject),
+                                       g_value_get_int (value));
       break;
 
     default:
@@ -190,6 +213,17 @@ clutter_canvas_get_property (GObject    *gobject,
       g_value_set_int (value, priv->height);
       break;
 
+    case PROP_SCALE_FACTOR:
+      if (priv->scale_factor_set)
+        g_value_set_int (value, priv->scale_factor);
+      else
+        g_value_set_int (value, -1);
+      break;
+
+    case PROP_SCALE_FACTOR_SET:
+      g_value_set_boolean (value, priv->scale_factor_set);
+      break;
+
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (gobject, prop_id, pspec);
       break;
@@ -201,8 +235,6 @@ clutter_canvas_class_init (ClutterCanvasClass *klass)
 {
   GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
 
-  g_type_class_add_private (klass, sizeof (ClutterCanvasPrivate));
-
   /**
    * ClutterCanvas:width:
    *
@@ -235,6 +267,47 @@ clutter_canvas_class_init (ClutterCanvasClass *klass)
                       G_PARAM_READWRITE |
                       G_PARAM_STATIC_STRINGS);
 
+  /**
+   * ClutterCanvas:scale-factor-set:
+   *
+   * Whether the #ClutterCanvas:scale-factor property is set.
+   *
+   * If the #ClutterCanvas:scale-factor-set property is %FALSE
+   * then #ClutterCanvas will use the #ClutterSettings:window-scaling-factor
+   * property.
+   *
+   * Since: 1.18
+   */
+  obj_props[PROP_SCALE_FACTOR_SET] =
+    g_param_spec_boolean ("scale-factor-set",
+                          P_("Scale Factor Set"),
+                          P_("Whether the scale-factor property is set"),
+                          FALSE,
+                          G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
+
+  /**
+   * ClutterCanvas:scale-factor:
+   *
+   * The scaling factor to be applied to the Cairo surface used for
+   * drawing.
+   *
+   * If #ClutterCanvas:scale-factor is set to a negative value, the
+   * value of the #ClutterSettings:window-scaling-factor property is
+   * used instead.
+   *
+   * Use #ClutterCanvas:scale-factor-set to check if the scale factor
+   * is set.
+   *
+   * Since: 1.18
+   */
+  obj_props[PROP_SCALE_FACTOR] =
+    g_param_spec_int ("scale-factor",
+                      P_("Scale Factor"),
+                      P_("The scaling factor for the surface"),
+                      -1, 1000,
+                      -1,
+                      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
+
   /**
    * ClutterCanvas::draw:
    * @canvas: the #ClutterCanvas that emitted the signal
@@ -276,11 +349,11 @@ clutter_canvas_class_init (ClutterCanvasClass *klass)
 static void
 clutter_canvas_init (ClutterCanvas *self)
 {
-  self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, CLUTTER_TYPE_CANVAS,
-                                            ClutterCanvasPrivate);
+  self->priv = clutter_canvas_get_instance_private (self);
 
   self->priv->width = -1;
   self->priv->height = -1;
+  self->priv->scale_factor = -1;
 }
 
 static void
@@ -289,21 +362,26 @@ clutter_canvas_paint_content (ClutterContent   *content,
                               ClutterPaintNode *root)
 {
   ClutterCanvas *self = CLUTTER_CANVAS (content);
+  ClutterCanvasPrivate *priv = self->priv;
   ClutterPaintNode *node;
-  CoglTexture *texture;
   ClutterActorBox box;
   ClutterColor color;
   guint8 paint_opacity;
   ClutterScalingFilter min_f, mag_f;
   ClutterContentRepeat repeat;
 
-  if (self->priv->buffer == NULL)
+  if (priv->buffer == NULL)
     return;
 
-  texture = cogl_texture_new_from_bitmap (self->priv->buffer,
-                                          COGL_TEXTURE_NO_SLICING,
-                                          CLUTTER_CAIRO_FORMAT_ARGB32);
-  if (texture == NULL)
+  if (priv->texture && priv->dirty)
+    g_clear_pointer (&priv->texture, cogl_object_unref);
+
+  if (!priv->texture)
+    priv->texture = cogl_texture_new_from_bitmap (self->priv->buffer,
+                                                  COGL_TEXTURE_NO_SLICING,
+                                                  CLUTTER_CAIRO_FORMAT_ARGB32);
+
+  if (priv->texture == NULL)
     return;
 
   clutter_actor_get_content_box (actor, &box);
@@ -311,13 +389,12 @@ clutter_canvas_paint_content (ClutterContent   *content,
   clutter_actor_get_content_scaling_filters (actor, &min_f, &mag_f);
   repeat = clutter_actor_get_content_repeat (actor);
 
-  color.red = paint_opacity;
-  color.green = paint_opacity;
-  color.blue = paint_opacity;
+  color.red = 255;
+  color.green = 255;
+  color.blue = 255;
   color.alpha = paint_opacity;
 
-  node = clutter_texture_node_new (texture, &color, min_f, mag_f);
-  cogl_object_unref (texture);
+  node = clutter_texture_node_new (priv->texture, &color, min_f, mag_f);
 
   clutter_paint_node_set_name (node, "Canvas");
 
@@ -328,10 +405,10 @@ clutter_canvas_paint_content (ClutterContent   *content,
       float t_w = 1.f, t_h = 1.f;
 
       if ((repeat & CLUTTER_REPEAT_X_AXIS) != FALSE)
-        t_w = (box.x2 - box.x1) / cogl_texture_get_width (texture);
+        t_w = (box.x2 - box.x1) / cogl_texture_get_width (priv->texture);
 
       if ((repeat & CLUTTER_REPEAT_Y_AXIS) != FALSE)
-        t_h = (box.y2 - box.y1) / cogl_texture_get_height (texture);
+        t_h = (box.y2 - box.y1) / cogl_texture_get_height (priv->texture);
 
       clutter_paint_node_add_texture_rectangle (node, &box,
                                                 0.f, 0.f,
@@ -340,29 +417,50 @@ clutter_canvas_paint_content (ClutterContent   *content,
 
   clutter_paint_node_add_child (root, node);
   clutter_paint_node_unref (node);
+
+  priv->dirty = FALSE;
 }
 
 static void
 clutter_canvas_emit_draw (ClutterCanvas *self)
 {
   ClutterCanvasPrivate *priv = self->priv;
+  int real_width, real_height;
   cairo_surface_t *surface;
   gboolean mapped_buffer;
   unsigned char *data;
   CoglBuffer *buffer;
+  int window_scale = 1;
   gboolean res;
   cairo_t *cr;
 
   g_assert (priv->width > 0 && priv->width > 0);
 
+  priv->dirty = TRUE;
+
+  if (priv->scale_factor_set)
+    window_scale = priv->scale_factor;
+  else
+    g_object_get (clutter_settings_get_default (),
+                  "window-scaling-factor", &window_scale,
+                  NULL);
+
+  real_width = priv->width * window_scale;
+  real_height = priv->height * window_scale;
+
+  CLUTTER_NOTE (MISC, "Creating Cairo surface with size %d x %d (real: %d x %d, scale: %d)",
+                priv->width, priv->height,
+                real_width, real_height,
+                window_scale);
+
   if (priv->buffer == NULL)
     {
       CoglContext *ctx;
 
       ctx = clutter_backend_get_cogl_context (clutter_get_default_backend ());
       priv->buffer = cogl_bitmap_new_with_size (ctx,
-                                                priv->width,
-                                                priv->height,
+                                                real_width,
+                                                real_height,
                                                 CLUTTER_CAIRO_FORMAT_ARGB32);
     }
 
@@ -382,20 +480,24 @@ clutter_canvas_emit_draw (ClutterCanvas *self)
 
       surface = cairo_image_surface_create_for_data (data,
                                                      CAIRO_FORMAT_ARGB32,
-                                                     priv->width,
-                                                     priv->height,
+                                                     real_width,
+                                                     real_height,
                                                      bitmap_stride);
       mapped_buffer = TRUE;
     }
   else
     {
       surface = cairo_image_surface_create (CAIRO_FORMAT_ARGB32,
-                                            priv->width,
-                                            priv->height);
+                                            real_width,
+                                            real_height);
 
       mapped_buffer = FALSE;
     }
 
+#ifdef HAVE_CAIRO_SURFACE_SET_DEVICE_SCALE
+  cairo_surface_set_device_scale (surface, window_scale, window_scale);
+#endif
+
   self->priv->cr = cr = cairo_create (surface);
 
   g_signal_emit (self, canvas_signals[DRAW], 0,
@@ -494,28 +596,14 @@ clutter_canvas_new (void)
   return g_object_new (CLUTTER_TYPE_CANVAS, NULL);
 }
 
-/**
- * clutter_canvas_set_size:
- * @canvas: a #ClutterCanvas
- * @width: the width of the canvas, in pixels
- * @height: the height of the canvas, in pixels
- *
- * Sets the size of the @canvas.
- *
- * This function will cause the @canvas to be invalidated.
- *
- * Since: 1.10
- */
-void
-clutter_canvas_set_size (ClutterCanvas *canvas,
-                         int            width,
-                         int            height)
+static gboolean
+clutter_canvas_invalidate_internal (ClutterCanvas *canvas,
+                                    int            width,
+                                    int            height)
 {
-  GObject *obj;
   gboolean width_changed = FALSE, height_changed = FALSE;
-
-  g_return_if_fail (CLUTTER_IS_CANVAS (canvas));
-  g_return_if_fail (width >= -1 && height >= -1);
+  gboolean res = FALSE;
+  GObject *obj;
 
   obj = G_OBJECT (canvas);
 
@@ -538,7 +626,126 @@ clutter_canvas_set_size (ClutterCanvas *canvas,
     }
 
   if (width_changed || height_changed)
-    clutter_content_invalidate (CLUTTER_CONTENT (canvas));
+    {
+      clutter_content_invalidate (CLUTTER_CONTENT (canvas));
+      res = TRUE;
+    }
 
   g_object_thaw_notify (obj);
+
+  return res;
+}
+
+/**
+ * clutter_canvas_set_size:
+ * @canvas: a #ClutterCanvas
+ * @width: the width of the canvas, in pixels
+ * @height: the height of the canvas, in pixels
+ *
+ * Sets the size of the @canvas, and invalidates the content.
+ *
+ * This function will cause the @canvas to be invalidated only
+ * if the size of the canvas surface has changed.
+ *
+ * If you want to invalidate the contents of the @canvas when setting
+ * the size, you can use the return value of the function to conditionally
+ * call clutter_content_invalidate():
+ *
+ * |[
+ *   if (!clutter_canvas_set_size (canvas, width, height))
+ *     clutter_content_invalidate (CLUTTER_CONTENT (canvas));
+ * ]|
+ *
+ * Return value: this function returns %TRUE if the size change
+ *   caused a content invalidation, and %FALSE otherwise
+ *
+ * Since: 1.10
+ */
+gboolean
+clutter_canvas_set_size (ClutterCanvas *canvas,
+                         int            width,
+                         int            height)
+{
+  g_return_val_if_fail (CLUTTER_IS_CANVAS (canvas), FALSE);
+  g_return_val_if_fail (width >= -1 && height >= -1, FALSE);
+
+  return clutter_canvas_invalidate_internal (canvas, width, height);
+}
+
+/**
+ * clutter_canvas_set_scale_factor:
+ * @canvas: a #ClutterCanvas
+ * @scale: the scale factor, or -1 for the default
+ *
+ * Sets the scaling factor for the Cairo surface used by @canvas.
+ *
+ * This function should rarely be used.
+ *
+ * The default scaling factor of a #ClutterCanvas content uses the
+ * #ClutterSettings:window-scaling-factor property, which is set by
+ * the windowing system. By using this function it is possible to
+ * override that setting.
+ *
+ * Changing the scale factor will invalidate the @canvas.
+ *
+ * Since: 1.18
+ */
+void
+clutter_canvas_set_scale_factor (ClutterCanvas *canvas,
+                                 int            scale)
+{
+  ClutterCanvasPrivate *priv;
+  GObject *obj;
+
+  g_return_if_fail (CLUTTER_IS_CANVAS (canvas));
+  g_return_if_fail (scale != 0);
+
+  priv = canvas->priv;
+
+  if (scale < 0)
+    {
+      if (!priv->scale_factor_set)
+        return;
+
+      priv->scale_factor_set = FALSE;
+      priv->scale_factor = -1;
+    }
+  else
+    {
+      if (priv->scale_factor_set && priv->scale_factor == scale)
+        return;
+
+      priv->scale_factor_set = TRUE;
+      priv->scale_factor = scale;
+    }
+
+  clutter_content_invalidate (CLUTTER_CONTENT (canvas));
+
+  obj = G_OBJECT (canvas);
+
+  g_object_notify_by_pspec (obj, obj_props[PROP_SCALE_FACTOR]);
+  g_object_notify_by_pspec (obj, obj_props[PROP_SCALE_FACTOR_SET]);
+}
+
+/**
+ * clutter_canvas_get_scale_factor:
+ * @canvas: a #ClutterCanvas
+ *
+ * Retrieves the scaling factor of @canvas, as set using
+ * clutter_canvas_set_scale_factor().
+ *
+ * Return value: the scaling factor, or -1 if the @canvas
+ *   uses the default from #ClutterSettings
+ *
+ * Since: 1.18
+ */
+int
+clutter_canvas_get_scale_factor (ClutterCanvas *canvas)
+{
+  g_return_val_if_fail (CLUTTER_IS_CANVAS (canvas), -1);
+
+  if (!canvas->priv->scale_factor_set)
+    return -1;
+
+  return canvas->priv->scale_factor;
 }
diff --git a/clutter/clutter-canvas.h b/clutter/clutter-canvas.h
index c0c27fdee..a1ab28a5f 100644
--- a/clutter/clutter-canvas.h
+++ b/clutter/clutter-canvas.h
@@ -47,7 +47,7 @@ typedef struct _ClutterCanvasClass      ClutterCanvasClass;
 /**
  * ClutterCanvas:
  *
- * The <structname>ClutterCanvas</structname> structure contains
+ * The #ClutterCanvas structure contains
  * private data and should only be accessed using the provided
  * API.
  *
@@ -65,7 +65,7 @@ struct _ClutterCanvas
  * ClutterCanvasClass:
  * @draw: class handler for the #ClutterCanvas::draw signal
  *
- * The <structname>ClutterCanvasClass</structname> structure contains
+ * The #ClutterCanvasClass structure contains
  * private data.
  *
  * Since: 1.10
@@ -89,11 +89,17 @@ CLUTTER_AVAILABLE_IN_1_10
 GType clutter_canvas_get_type (void) G_GNUC_CONST;
 
 CLUTTER_AVAILABLE_IN_1_10
-ClutterContent *        clutter_canvas_new              (void);
+ClutterContent *        clutter_canvas_new                      (void);
 CLUTTER_AVAILABLE_IN_1_10
-void                    clutter_canvas_set_size         (ClutterCanvas *canvas,
-                                                         int            width,
-                                                         int            height);
+gboolean                clutter_canvas_set_size                 (ClutterCanvas *canvas,
+                                                                 int            width,
+                                                                 int            height);
+
+CLUTTER_AVAILABLE_IN_1_18
+void                    clutter_canvas_set_scale_factor         (ClutterCanvas *canvas,
+                                                                 int            scale);
+CLUTTER_AVAILABLE_IN_1_18
+int                     clutter_canvas_get_scale_factor         (ClutterCanvas *canvas);
 
 G_END_DECLS
 
diff --git a/clutter/clutter-child-meta.h b/clutter/clutter-child-meta.h
index 0a249f07c..7e785a907 100644
--- a/clutter/clutter-child-meta.h
+++ b/clutter/clutter-child-meta.h
@@ -63,14 +63,14 @@ typedef struct _ClutterChildMetaClass           ClutterChildMetaClass;
  * static void
  * my_container_iface_init (ClutterContainerIface *iface)
  * {
- *   /&ast; set the rest of the #ClutterContainer vtable &ast;/
+ *   // set the rest of the #ClutterContainer vtable
  *
  *   container_iface->child_meta_type  = MY_TYPE_CHILD_META;
  * }
  * ]|
  *
  * This will automatically create a #ClutterChildMeta of type
- * MY_TYPE_CHILD_META for every actor that is added to the container.
+ * `MY_TYPE_CHILD_META` for every actor that is added to the container.
  *
  * The child data for an actor can be retrieved using the
  * clutter_container_get_child_meta() function.
@@ -81,9 +81,8 @@ typedef struct _ClutterChildMetaClass           ClutterChildMetaClass;
  *
  * You can provide hooks for your own storage as well as control the
  * instantiation by overriding the #ClutterContainerIface virtual functions
- * <function>create_child_meta</function>,
- * <function>destroy_child_meta</function>,
- * and <function>get_child_meta</function>.
+ * #ClutterContainerIface.create_child_meta(), #ClutterContainerIface.destroy_child_meta(),
+ * and #ClutterContainerIface.get_child_meta().
  *
  * Since: 0.8
  */
@@ -110,10 +109,13 @@ struct _ClutterChildMetaClass
   GObjectClass parent_class;
 }; 
 
-GType             clutter_child_meta_get_type      (void) G_GNUC_CONST;
+CLUTTER_AVAILABLE_IN_ALL
+GType clutter_child_meta_get_type (void) G_GNUC_CONST;
 
-ClutterContainer *clutter_child_meta_get_container (ClutterChildMeta *data);
-ClutterActor     *clutter_child_meta_get_actor     (ClutterChildMeta *data);
+CLUTTER_AVAILABLE_IN_ALL
+ClutterContainer *      clutter_child_meta_get_container        (ClutterChildMeta *data);
+CLUTTER_AVAILABLE_IN_ALL
+ClutterActor     *      clutter_child_meta_get_actor            (ClutterChildMeta *data);
 
 G_END_DECLS
 
diff --git a/clutter/clutter-click-action.c b/clutter/clutter-click-action.c
index 3fe164cfa..92aba0b70 100644
--- a/clutter/clutter-click-action.c
+++ b/clutter/clutter-click-action.c
@@ -150,7 +150,7 @@ enum
 
 static guint click_signals[LAST_SIGNAL] = { 0, };
 
-G_DEFINE_TYPE (ClutterClickAction, clutter_click_action, CLUTTER_TYPE_ACTION);
+G_DEFINE_TYPE_WITH_PRIVATE (ClutterClickAction, clutter_click_action, CLUTTER_TYPE_ACTION)
 
 /* forward declaration */
 static gboolean on_captured_event (ClutterActor       *stage,
@@ -534,16 +534,43 @@ clutter_click_action_get_property (GObject    *gobject,
     }
 }
 
+static void
+clutter_click_action_dispose (GObject *gobject)
+{
+  ClutterClickActionPrivate *priv = CLUTTER_CLICK_ACTION (gobject)->priv;
+
+  if (priv->event_id)
+    {
+      g_signal_handler_disconnect (clutter_actor_meta_get_actor (CLUTTER_ACTOR_META (gobject)),
+                                   priv->event_id);
+      priv->event_id = 0;
+    }
+
+  if (priv->capture_id)
+    {
+      g_signal_handler_disconnect (priv->stage, priv->capture_id);
+      priv->capture_id = 0;
+    }
+
+  if (priv->long_press_id)
+    {
+      g_source_remove (priv->long_press_id);
+      priv->long_press_id = 0;
+    }
+
+  G_OBJECT_CLASS (clutter_click_action_parent_class)->dispose (gobject);
+}
+
+
 static void
 clutter_click_action_class_init (ClutterClickActionClass *klass)
 {
   GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
   ClutterActorMetaClass *meta_class = CLUTTER_ACTOR_META_CLASS (klass);
 
-  g_type_class_add_private (klass, sizeof (ClutterClickActionPrivate));
-
   meta_class->set_actor = clutter_click_action_set_actor;
 
+  gobject_class->dispose = clutter_click_action_dispose;
   gobject_class->set_property = clutter_click_action_set_property;
   gobject_class->get_property = clutter_click_action_get_property;
 
@@ -680,9 +707,7 @@ clutter_click_action_class_init (ClutterClickActionClass *klass)
 static void
 clutter_click_action_init (ClutterClickAction *self)
 {
-  self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, CLUTTER_TYPE_CLICK_ACTION,
-                                            ClutterClickActionPrivate);
-
+  self->priv = clutter_click_action_get_instance_private (self);
   self->priv->long_press_threshold = -1;
   self->priv->long_press_duration = -1;
 }
diff --git a/clutter/clutter-click-action.h b/clutter/clutter-click-action.h
index 36c572731..bd8d3e24c 100644
--- a/clutter/clutter-click-action.h
+++ b/clutter/clutter-click-action.h
@@ -51,7 +51,7 @@ typedef struct _ClutterClickActionClass         ClutterClickActionClass;
 /**
  * ClutterClickAction:
  *
- * The <structname>ClutterClickAction</structname> structure contains
+ * The #ClutterClickAction structure contains
  * only private data and should be accessed using the provided API
  *
  * Since: 1.4
@@ -69,7 +69,7 @@ struct _ClutterClickAction
  * @clicked: class handler for the #ClutterClickAction::clicked signal
  * @long_press: class handler for the #ClutterClickAction::long-press signal
  *
- * The <structname>ClutterClickActionClass</structname> structure
+ * The #ClutterClickActionClass structure
  * contains only private data
  *
  * Since: 1.4
@@ -97,16 +97,22 @@ struct _ClutterClickActionClass
   void (* _clutter_click_action7) (void);
 };
 
+CLUTTER_AVAILABLE_IN_1_4
 GType clutter_click_action_get_type (void) G_GNUC_CONST;
 
+CLUTTER_AVAILABLE_IN_1_4
 ClutterAction *        clutter_click_action_new        (void);
 
+CLUTTER_AVAILABLE_IN_1_4
 guint                  clutter_click_action_get_button (ClutterClickAction *action);
+CLUTTER_AVAILABLE_IN_1_4
 ClutterModifierType    clutter_click_action_get_state  (ClutterClickAction *action);
+CLUTTER_AVAILABLE_IN_1_8
 void                   clutter_click_action_get_coords (ClutterClickAction *action,
                                                         gfloat             *press_x,
                                                         gfloat             *press_y);
 
+CLUTTER_AVAILABLE_IN_1_4
 void                   clutter_click_action_release    (ClutterClickAction *action);
 
 G_END_DECLS
diff --git a/clutter/clutter-clone.c b/clutter/clutter-clone.c
index 1f94ab2b7..3bcd0c387 100644
--- a/clutter/clutter-clone.c
+++ b/clutter/clutter-clone.c
@@ -30,9 +30,9 @@
  *
  * #ClutterClone can be used to efficiently clone any other actor.
  *
- * <note><para>This is different from clutter_texture_new_from_actor()
- * which requires support for FBOs in the underlying GL
- * implementation.</para></note>
+ * Unlike clutter_texture_new_from_actor(), #ClutterClone does not require
+ * the presence of support for FBOs in the underlying GL or GLES
+ * implementation.
  *
  * #ClutterClone is available since Clutter 1.0
  */
@@ -50,7 +50,12 @@
 
 #include "cogl/cogl.h"
 
-G_DEFINE_TYPE (ClutterClone, clutter_clone, CLUTTER_TYPE_ACTOR);
+struct _ClutterClonePrivate
+{
+  ClutterActor *clone_source;
+};
+
+G_DEFINE_TYPE_WITH_PRIVATE (ClutterClone, clutter_clone, CLUTTER_TYPE_ACTOR)
 
 enum
 {
@@ -63,13 +68,6 @@ enum
 
 static GParamSpec *obj_props[PROP_LAST];
 
-#define CLUTTER_CLONE_GET_PRIVATE(obj)  (G_TYPE_INSTANCE_GET_PRIVATE ((obj), CLUTTER_TYPE_CLONE, ClutterClonePrivate))
-
-struct _ClutterClonePrivate
-{
-  ClutterActor *clone_source;
-};
-
 static void clutter_clone_set_source_internal (ClutterClone *clone,
 					       ClutterActor *source);
 static void
@@ -319,8 +317,6 @@ clutter_clone_class_init (ClutterCloneClass *klass)
   GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
   ClutterActorClass *actor_class = CLUTTER_ACTOR_CLASS (klass);
 
-  g_type_class_add_private (gobject_class, sizeof (ClutterClonePrivate));
-
   actor_class->apply_transform = clutter_clone_apply_transform;
   actor_class->paint = clutter_clone_paint;
   actor_class->get_paint_volume = clutter_clone_get_paint_volume;
@@ -354,11 +350,7 @@ clutter_clone_class_init (ClutterCloneClass *klass)
 static void
 clutter_clone_init (ClutterClone *self)
 {
-  ClutterClonePrivate *priv;
-
-  self->priv = priv = CLUTTER_CLONE_GET_PRIVATE (self);
-
-  priv->clone_source = NULL;
+  self->priv = clutter_clone_get_instance_private (self);
 }
 
 /**
diff --git a/clutter/clutter-clone.h b/clutter/clutter-clone.h
index 14fef88f2..24958deb9 100644
--- a/clutter/clutter-clone.h
+++ b/clutter/clutter-clone.h
@@ -78,12 +78,16 @@ struct _ClutterCloneClass
   void (*_clutter_actor_clone4) (void);
 };
 
+CLUTTER_AVAILABLE_IN_1_0
 GType clutter_clone_get_type (void) G_GNUC_CONST;
 
-ClutterActor *clutter_clone_new        (ClutterActor *source);
-void          clutter_clone_set_source (ClutterClone *self,
-                                        ClutterActor *source);
-ClutterActor *clutter_clone_get_source (ClutterClone *self);
+CLUTTER_AVAILABLE_IN_1_0
+ClutterActor *  clutter_clone_new               (ClutterActor *source);
+CLUTTER_AVAILABLE_IN_1_0
+void            clutter_clone_set_source        (ClutterClone *self,
+                                                 ClutterActor *source);
+CLUTTER_AVAILABLE_IN_1_0
+ClutterActor *  clutter_clone_get_source        (ClutterClone *self);
 
 G_END_DECLS
 
diff --git a/clutter/clutter-color.c b/clutter/clutter-color.c
index dd49ed3d7..96dde9482 100644
--- a/clutter/clutter-color.c
+++ b/clutter/clutter-color.c
@@ -624,28 +624,12 @@ parse_hsla (ClutterColor *color,
  *
  * The format of @str can be either one of:
  *
- * <itemizedlist>
- * <listitem>
- *   <para>a standard name (as taken from the X11 rgb.txt file)</para>
- * </listitem>
- * <listitem>
- *   <para>an hexadecimal value in the form: <literal>&num;rgb</literal>,
- *   <literal>&num;rrggbb</literal>, <literal>&num;rgba</literal> or
- *   <literal>&num;rrggbbaa</literal></para>
- * </listitem>
- * <listitem>
- *   <para>a RGB color in the form: <literal>rgb(r, g, b)</literal></para>
- * </listitem>
- * <listitem>
- *   <para>a RGB color in the form: <literal>rgba(r, g, b, a)</literal></para>
- * </listitem>
- * <listitem>
- *   <para>a HSL color in the form: <literal>hsl(h, s, l)</literal></para>
- * </listitem>
- * <listitem>
- *   <para>a HSL color in the form: <literal>hsla(h, s, l, a)</literal></para>
- * </listitem>
- * </itemizedlist>
+ *   - a standard name (as taken from the X11 rgb.txt file)
+ *   - an hexadecimal value in the form: `#rgb`, `#rrggbb`, `#rgba`, or `#rrggbbaa`
+ *   - a RGB color in the form: `rgb(r, g, b)`
+ *   - a RGB color in the form: `rgba(r, g, b, a)`
+ *   - a HSL color in the form: `hsl(h, s, l)`
+ *    -a HSL color in the form: `hsla(h, s, l, a)`
  *
  * where 'r', 'g', 'b' and 'a' are (respectively) the red, green, blue color
  * intensities and the opacity. The 'h', 's' and 'l' are (respectively) the
@@ -656,9 +640,9 @@ parse_hsla (ClutterColor *color,
  * and 100%; the percentages require the '%' character. The 'a' value, if
  * specified, can only be a floating point value between 0.0 and 1.0.
  *
- * In the hls() and hlsa() formats, the 'h' value (hue) it's an angle between
+ * In the hls() and hlsa() formats, the 'h' value (hue) is an angle between
  * 0 and 360.0 degrees; the 'l' and 's' values (luminance and saturation) are
- * a floating point value between 0.0 and 1.0. The 'a' value, if specified,
+ * percentage values in the range between 0% and 100%. The 'a' value, if specified,
  * can only be a floating point value between 0.0 and 1.0.
  *
  * Whitespace inside the definitions is ignored; no leading whitespace
diff --git a/clutter/clutter-color.h b/clutter/clutter-color.h
index 393eee4b7..cd8e5ccd5 100644
--- a/clutter/clutter-color.h
+++ b/clutter/clutter-color.h
@@ -68,56 +68,76 @@ struct _ClutterColor
  */
 #define CLUTTER_COLOR_INIT(r,g,b,a)     { (r), (g), (b), (a) }
 
-GType         clutter_color_get_type   (void) G_GNUC_CONST;
+CLUTTER_AVAILABLE_IN_ALL
+GType clutter_color_get_type (void) G_GNUC_CONST;
 
+CLUTTER_AVAILABLE_IN_ALL
 ClutterColor *clutter_color_new         (guint8              red,
                                          guint8              green,
                                          guint8              blue,
                                          guint8              alpha);
+CLUTTER_AVAILABLE_IN_1_12
 ClutterColor *clutter_color_alloc       (void);
+CLUTTER_AVAILABLE_IN_1_12
 ClutterColor *clutter_color_init        (ClutterColor       *color,
                                          guint8              red,
                                          guint8              green,
                                          guint8              blue,
                                          guint8              alpha);
+CLUTTER_AVAILABLE_IN_ALL
 ClutterColor *clutter_color_copy        (const ClutterColor *color);
+CLUTTER_AVAILABLE_IN_ALL
 void          clutter_color_free        (ClutterColor       *color);
 
+CLUTTER_AVAILABLE_IN_ALL
 void          clutter_color_add         (const ClutterColor *a,
                                          const ClutterColor *b,
                                          ClutterColor       *result);
+CLUTTER_AVAILABLE_IN_ALL
 void          clutter_color_subtract    (const ClutterColor *a,
                                          const ClutterColor *b,
                                          ClutterColor       *result);
+CLUTTER_AVAILABLE_IN_ALL
 void          clutter_color_lighten     (const ClutterColor *color,
                                          ClutterColor       *result);
+CLUTTER_AVAILABLE_IN_ALL
 void          clutter_color_darken      (const ClutterColor *color,
                                          ClutterColor       *result);
+CLUTTER_AVAILABLE_IN_ALL
 void          clutter_color_shade       (const ClutterColor *color,
                                          gdouble             factor,
                                          ClutterColor       *result);
 
+CLUTTER_AVAILABLE_IN_ALL
 gchar *       clutter_color_to_string   (const ClutterColor *color);
+CLUTTER_AVAILABLE_IN_1_0
 gboolean      clutter_color_from_string (ClutterColor       *color,
                                          const gchar        *str);
 
+CLUTTER_AVAILABLE_IN_ALL
 void          clutter_color_to_hls      (const ClutterColor *color,
                                          gfloat             *hue,
 					 gfloat             *luminance,
 					 gfloat             *saturation);
+CLUTTER_AVAILABLE_IN_ALL
 void          clutter_color_from_hls    (ClutterColor       *color,
                                          gfloat              hue,
                                          gfloat              luminance,
                                          gfloat              saturation);
 
+CLUTTER_AVAILABLE_IN_ALL
 guint32       clutter_color_to_pixel    (const ClutterColor *color);
+CLUTTER_AVAILABLE_IN_ALL
 void          clutter_color_from_pixel  (ClutterColor       *color,
                                          guint32             pixel);
 
+CLUTTER_AVAILABLE_IN_1_0
 guint         clutter_color_hash        (gconstpointer       v);
+CLUTTER_AVAILABLE_IN_ALL
 gboolean      clutter_color_equal       (gconstpointer       v1,
                                          gconstpointer       v2);
 
+CLUTTER_AVAILABLE_IN_1_6
 void          clutter_color_interpolate (const ClutterColor *initial,
                                          const ClutterColor *final,
                                          gdouble             progress,
@@ -157,17 +177,22 @@ struct _ClutterParamSpecColor
   ClutterColor *default_value;
 };
 
+CLUTTER_AVAILABLE_IN_1_0
 void                    clutter_value_set_color         (GValue             *value,
                                                          const ClutterColor *color);
+CLUTTER_AVAILABLE_IN_1_0
 const ClutterColor *    clutter_value_get_color         (const GValue       *value);
 
-GType       clutter_param_color_get_type (void) G_GNUC_CONST;
-GParamSpec *clutter_param_spec_color     (const gchar        *name,
-                                          const gchar        *nick,
-                                          const gchar        *blurb,
-                                          const ClutterColor *default_value,
-                                          GParamFlags         flags);
+CLUTTER_AVAILABLE_IN_1_0
+GType clutter_param_color_get_type (void) G_GNUC_CONST;
+CLUTTER_AVAILABLE_IN_1_0
+GParamSpec *    clutter_param_spec_color        (const gchar        *name,
+                                                 const gchar        *nick,
+                                                 const gchar        *blurb,
+                                                 const ClutterColor *default_value,
+                                                 GParamFlags         flags);
 
+CLUTTER_AVAILABLE_IN_1_6
 const ClutterColor *clutter_color_get_static (ClutterStaticColor color);
 
 G_END_DECLS
diff --git a/clutter/clutter-colorize-effect.h b/clutter/clutter-colorize-effect.h
index ddc761fa8..fb4d37937 100644
--- a/clutter/clutter-colorize-effect.h
+++ b/clutter/clutter-colorize-effect.h
@@ -41,7 +41,7 @@ G_BEGIN_DECLS
 /**
  * ClutterColorizeEffect:
  *
- * <structname>ClutterColorizeEffect</structname> is an opaque structure
+ * #ClutterColorizeEffect is an opaque structure
  * whose members cannot be directly accessed
  *
  * Since: 1.4
@@ -49,12 +49,16 @@ G_BEGIN_DECLS
 typedef struct _ClutterColorizeEffect           ClutterColorizeEffect;
 typedef struct _ClutterColorizeEffectClass      ClutterColorizeEffectClass;
 
+CLUTTER_AVAILABLE_IN_1_4
 GType clutter_colorize_effect_get_type (void) G_GNUC_CONST;
 
+CLUTTER_AVAILABLE_IN_1_4
 ClutterEffect *clutter_colorize_effect_new      (const ClutterColor *tint);
 
+CLUTTER_AVAILABLE_IN_1_4
 void           clutter_colorize_effect_set_tint (ClutterColorizeEffect *effect,
                                                  const ClutterColor    *tint);
+CLUTTER_AVAILABLE_IN_1_4
 void           clutter_colorize_effect_get_tint (ClutterColorizeEffect *effect,
                                                  ClutterColor          *tint);
 
diff --git a/clutter/clutter-constraint-private.h b/clutter/clutter-constraint-private.h
new file mode 100644
index 000000000..2bed47be2
--- /dev/null
+++ b/clutter/clutter-constraint-private.h
@@ -0,0 +1,42 @@
+/*
+ * Clutter.
+ *
+ * An OpenGL based 'interactive canvas' library.
+ *
+ * Copyright (C) 2010  Intel Corporation.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef __CLUTTER_CONSTRAINT_PRIVATE_H__
+#define __CLUTTER_CONSTRAINT_PRIVATE_H__
+
+#include "clutter-constraint.h"
+
+G_BEGIN_DECLS
+
+gboolean clutter_constraint_update_allocation (ClutterConstraint *constraint,
+                                               ClutterActor      *actor,
+                                               ClutterActorBox   *allocation);
+
+void clutter_constraint_update_preferred_size (ClutterConstraint  *constraint,
+                                               ClutterActor       *actor,
+                                               ClutterOrientation  direction,
+                                               float               for_size,
+                                               float              *minimum_size,
+                                               float              *natural_size);
+
+G_END_DECLS
+
+#endif /* __CLUTTER_CONSTRAINT_PRIVATE_H__ */
diff --git a/clutter/clutter-constraint.c b/clutter/clutter-constraint.c
index 9b481b572..2e7eb7659 100644
--- a/clutter/clutter-constraint.c
+++ b/clutter/clutter-constraint.c
@@ -1,3 +1,27 @@
+/*
+ * Clutter.
+ *
+ * An OpenGL based 'interactive canvas' library.
+ *
+ * Copyright (C) 2010  Intel Corporation.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Author:
+ *   Emmanuele Bassi <ebassi@linux.intel.com>
+ */
+
 /**
  * SECTION:clutter-constraint
  * @Title: ClutterConstraint
@@ -13,126 +37,95 @@
  * allocation of the actor to which they are applied by overriding the
  * #ClutterConstraintClass.update_allocation() virtual function.
  *
- * <refsect2 id="ClutterConstraint-usage">
- *   <title>Using Constraints</title>
- *   <para>Constraints can be used with fixed layout managers, like
- *   #ClutterFixedLayout, or with actors implicitly using a fixed layout
- *   manager, like #ClutterGroup and #ClutterStage.</para>
- *   <para>Constraints provide a way to build user interfaces by using
- *   relations between #ClutterActor<!-- -->s, without explicit fixed
- *   positioning and sizing, similarly to how fluid layout managers like
- *   #ClutterBoxLayout and #ClutterTableLayout lay out their children.</para>
- *   <para>Constraints are attached to a #ClutterActor, and are available
- *   for inspection using clutter_actor_get_constraints().</para>
- *   <para>Clutter provides different implementation of the #ClutterConstraint
- *   abstract class, for instance:</para>
- *   <variablelist>
- *     <varlistentry>
- *       <term>#ClutterAlignConstraint</term>
- *       <listitem><simpara>this constraint can be used to align an actor
- *       to another one, on either the horizontal or the vertical axis; the
- *       #ClutterAlignConstraint uses a normalized offset between 0.0 (the
- *       top or the left of the source actor, depending on the axis) and
- *       1.0 (the bottom or the right of the source actor, depending on the
- *       axis).</simpara></listitem>
- *     </varlistentry>
- *     <varlistentry>
- *       <term>#ClutterBindConstraint</term>
- *       <listitem><simpara>this constraint binds the X, Y, width or height
- *       of an actor to the corresponding position or size of a source
- *       actor; it can also apply an offset.</simpara></listitem>
- *     </varlistentry>
- *     <varlistentry>
- *       <term>#ClutterSnapConstraint</term>
- *       <listitem><simpara>this constraint "snaps" together the edges of
- *       two #ClutterActor<!-- -->s; if an actor uses two constraints on
- *       both its horizontal or vertical edges then it can also expand to
- *       fit the empty space.</simpara></listitem>
- *     </varlistentry>
- *   </variablelist>
- *   <example id="ClutterConstraint-usage-example">
- *     <title>Usage of constraints</title>
- *     <para>The example below uses various #ClutterConstraint<!-- -->s to
- *     lay out three actors on a resizable stage. Only the central actor has
- *     an explicit size, and no actor has an explicit position.</para>
- *     <orderedlist>
- *       <listitem><simpara>The #ClutterRectangle with #ClutterActor:name
- *       <emphasis>layerA</emphasis> is explicitly sized to 100 pixels by 25
- *       pixels, and it's added to the #ClutterStage;</simpara></listitem>
- *       <listitem><simpara>two #ClutterAlignConstraint<!-- -->s are used
- *       to anchor <emphasis>layerA</emphasis> to the center of the stage,
- *       by using 0.5 as the alignment #ClutterAlignConstraint:factor on
- *       both the X and Y axis.</simpara></listitem>
- *       <listitem><simpara>the #ClutterRectangle with #ClutterActor:name
- *       <emphasis>layerB</emphasis> is added to the #ClutterStage with
- *       no explicit size;</simpara></listitem>
- *       <listitem><simpara>the #ClutterActor:x and #ClutterActor:width
- *       of <emphasis>layerB</emphasis> are bound to the same properties
- *       of <emphasis>layerA</emphasis> using two #ClutterBindConstraint
- *       objects, thus keeping <emphasis>layerB</emphasis> aligned to
- *       <emphasis>layerA</emphasis>;</simpara></listitem>
- *       <listitem><simpara>the top edge of <emphasis>layerB</emphasis> is
- *       snapped together with the bottom edge of <emphasis>layerA</emphasis>;
- *       the bottom edge of <emphasis>layerB</emphasis> is also snapped
- *       together with the bottom edge of the #ClutterStage; an offset is
- *       given to the two #ClutterSnapConstraint<!-- -->s to allow for some
- *       padding; since <emphasis>layerB</emphasis> is snapped between two
- *       different #ClutterActor<!-- -->s, its height is stretched to match
- *       the gap;</simpara></listitem>
- *       <listitem><simpara>the #ClutterRectangle with #ClutterActor:name
- *       <emphasis>layerC</emphasis> mirrors <emphasis>layerB</emphasis>,
- *       snapping the top edge of the #ClutterStage to the top edge of
- *       <emphasis>layerC</emphasis> and the top edge of
- *       <emphasis>layerA</emphasis> to the bottom edge of
- *       <emphasis>layerC</emphasis>;</simpara></listitem>
- *     </orderedlist>
- *     <figure id="constraints-example">
- *       <title>Constraints</title>
- *       <graphic fileref="constraints-example.png" format="PNG"/>
- *     </figure>
- *     <programlisting>
- *<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="../../../../examples/constraints.c" parse="text">
- *  <xi:fallback>FIXME: MISSING XINCLUDE CONTENT</xi:fallback>
- *</xi:include>
- *     </programlisting>
- *     <para>You can try resizing interactively the #ClutterStage and verify
- *     that the three #ClutterActor<!-- -->s maintain the same position and
- *     size relative to each other, and to the #ClutterStage.</para>
- *   </example>
- *   <warning><para>It's important to note that Clutter does not avoid loops
- *   or competing constraints; if two or more #ClutterConstraint<!-- -->s
- *   are operating on the same positional or dimensional attributes of an
- *   actor, or if the constraints on two different actors depend on each
- *   other, then the behavior is undefined.</para></warning>
- * </refsect2>
- *
- * <refsect2 id="ClutterConstraint-implementation">
- *   <title>Implementing a ClutterConstraint</title>
- *   <para>Creating a sub-class of #ClutterConstraint requires the
- *   implementation of the <function>update_allocation()</function>
- *   virtual function.</para>
- *   <para>The <function>update_allocation()</function> virtual function
- *   is called during the allocation sequence of a #ClutterActor, and
- *   allows any #ClutterConstraint attached to that actor to modify the
- *   allocation before it is passed to the <function>allocate()</function>
- *   implementation.</para>
- *   <para>The #ClutterActorBox passed to the
- *   <function>update_allocation()</function> implementation contains the
- *   original allocation of the #ClutterActor, plus the eventual modifications
- *   applied by the other #ClutterConstraint<!-- -->s.</para>
- *   <note><para>Constraints are queried in the same order as they were
- *   applied using clutter_actor_add_constraint() or
- *   clutter_actor_add_constraint_with_name().</para></note>
- *   <para>It is not necessary for a #ClutterConstraint sub-class to chain
- *   up to the parent's implementation.</para>
- *   <para>If a #ClutterConstraint is parametrized - i.e. if it contains
- *   properties that affect the way the constraint is implemented - it should
- *   call clutter_actor_queue_relayout() on the actor to which it is attached
- *   to whenever any parameter is changed. The actor to which it is attached
- *   can be recovered at any point using clutter_actor_meta_get_actor().</para>
- * </refsect2>
- *
  * #ClutterConstraint is available since Clutter 1.4
+ *
+ * ## Using Constraints
+ *
+ * Constraints can be used with fixed layout managers, like
+ * #ClutterFixedLayout, or with actors implicitly using a fixed layout
+ * manager, like #ClutterGroup and #ClutterStage.
+ *
+ * Constraints provide a way to build user interfaces by using
+ * relations between #ClutterActors, without explicit fixed
+ * positioning and sizing, similarly to how fluid layout managers like
+ * #ClutterBoxLayout and #ClutterTableLayout lay out their children.
+ *
+ * Constraints are attached to a #ClutterActor, and are available
+ * for inspection using clutter_actor_get_constraints().
+ *
+ * Clutter provides different implementation of the #ClutterConstraint
+ * abstract class, for instance:
+ *
+ *  - #ClutterAlignConstraint, a constraint that can be used to align
+ *  an actor to another one on either the horizontal or the vertical
+ *  axis, using a normalized value between 0 and 1.
+ *  - #ClutterBindConstraint, a constraint binds the X, Y, width or height
+ *  of an actor to the corresponding position or size of a source actor,
+ *  with or without an offset.
+ *  - #ClutterSnapConstraint, a constraint that "snaps" together the edges
+ *  of two #ClutterActors; if an actor uses two constraints on both its
+ *  horizontal or vertical edges then it can also expand to fit the empty
+ *  space.
+ *
+ * The [constraints example](https://git.gnome.org/browse/clutter/tree/examples/constraints.c?h=clutter-1.18)
+ * uses various types of #ClutterConstraints to lay out three actors on a
+ * resizable stage. Only the central actor has an explicit size, and no
+ * actor has an explicit position.
+ *
+ *  - The #ClutterActor with #ClutterActor:name `layerA` is explicitly
+ *  sized to 100 pixels by 25 pixels, and it's added to the #ClutterStage
+ *  - two #ClutterAlignConstraints are used to anchor `layerA` to the
+ *  center of the stage, by using 0.5 as the alignment #ClutterAlignConstraint:factor on
+ *  both the X and Y axis
+ *  - the #ClutterActor with #ClutterActor:name `layerB` is added to the
+ *  #ClutterStage with no explicit size
+ *  - the #ClutterActor:x and #ClutterActor:width of `layerB` are bound
+ *  to the same properties of `layerA` using two #ClutterBindConstraint
+ *  objects, thus keeping `layerB` aligned to `layerA`
+ *  - the top edge of `layerB` is snapped together with the bottom edge
+ *  of `layerA`; the bottom edge of `layerB` is also snapped together with
+ *  the bottom edge of the #ClutterStage; an offset is  given to the two
+ *  #ClutterSnapConstraintss to allow for some padding; since `layerB` is
+ *  snapped between two different #ClutterActors, its height is stretched
+ *  to match the gap
+ *  - the #ClutterActor with #ClutterActor:name `layerC` mirrors `layerB`,
+ *  snapping the top edge of the #ClutterStage to the top edge of `layerC`
+ *  and the top edge of `layerA` to the bottom edge of `layerC`
+ *
+ * You can try resizing interactively the #ClutterStage and verify
+ * that the three #ClutterActors maintain the same position and
+ * size relative to each other, and to the #ClutterStage.
+ *
+ * It is important to note that Clutter does not avoid loops or
+ * competing constraints; if two or more #ClutterConstraints
+ * are operating on the same positional or dimensional attributes of an
+ * actor, or if the constraints on two different actors depend on each
+ * other, then the behavior is undefined.
+ *
+ * ## Implementing a ClutterConstraint
+ *
+ * Creating a sub-class of #ClutterConstraint requires the
+ * implementation of the #ClutterConstraintClass.update_allocation()
+ * virtual function.
+ *
+ * The `update_allocation()` virtual function is called during the
+ * allocation sequence of a #ClutterActor, and allows any #ClutterConstraint
+ * attached to that actor to modify the allocation before it is passed to
+ * the actor's #ClutterActorClass.allocate() implementation.
+ *
+ * The #ClutterActorBox passed to the `update_allocation()` implementation
+ * contains the original allocation of the #ClutterActor, plus the eventual
+ * modifications applied by the other #ClutterConstraints, in the same order
+ * the constraints have been applied to the actor.
+ *
+ * It is not necessary for a #ClutterConstraint sub-class to chain
+ * up to the parent's implementation.
+ *
+ * If a #ClutterConstraint is parametrized - i.e. if it contains
+ * properties that affect the way the constraint is implemented - it should
+ * call clutter_actor_queue_relayout() on the actor to which it is attached
+ * to whenever any parameter is changed. The actor to which it is attached
+ * can be recovered at any point using clutter_actor_meta_get_actor().
  */
 
 #ifdef HAVE_CONFIG_H
@@ -141,7 +134,7 @@
 
 #include <string.h>
 
-#include "clutter-constraint.h"
+#include "clutter-constraint-private.h"
 
 #include "clutter-actor.h"
 #include "clutter-actor-meta-private.h"
@@ -158,6 +151,16 @@ constraint_update_allocation (ClutterConstraint *constraint,
 {
 }
 
+static void
+constraint_update_preferred_size (ClutterConstraint  *constraint,
+                                  ClutterActor       *actor,
+                                  ClutterOrientation  direction,
+                                  float               for_size,
+                                  float              *minimum_size,
+                                  float              *natural_size)
+{
+}
+
 static void
 clutter_constraint_notify (GObject    *gobject,
                            GParamSpec *pspec)
@@ -183,6 +186,7 @@ clutter_constraint_class_init (ClutterConstraintClass *klass)
   gobject_class->notify = clutter_constraint_notify;
 
   klass->update_allocation = constraint_update_allocation;
+  klass->update_preferred_size = constraint_update_preferred_size;
 }
 
 static void
@@ -190,16 +194,50 @@ clutter_constraint_init (ClutterConstraint *self)
 {
 }
 
-void
-_clutter_constraint_update_allocation (ClutterConstraint *constraint,
-                                       ClutterActor      *actor,
-                                       ClutterActorBox   *allocation)
+/*< private >
+ * clutter_constraint_update_allocation:
+ * @constraint: a #ClutterConstraint
+ * @actor: a #ClutterActor
+ * @allocation: (inout): the allocation to modify
+ *
+ * Asks the @constraint to update the @allocation of a #ClutterActor.
+ *
+ * Returns: %TRUE if the allocation was updated
+ */
+gboolean
+clutter_constraint_update_allocation (ClutterConstraint *constraint,
+                                      ClutterActor      *actor,
+                                      ClutterActorBox   *allocation)
 {
-  g_return_if_fail (CLUTTER_IS_CONSTRAINT (constraint));
-  g_return_if_fail (CLUTTER_IS_ACTOR (actor));
-  g_return_if_fail (allocation != NULL);
+  ClutterActorBox old_alloc;
+
+  g_return_val_if_fail (CLUTTER_IS_CONSTRAINT (constraint), FALSE);
+  g_return_val_if_fail (CLUTTER_IS_ACTOR (actor), FALSE);
+  g_return_val_if_fail (allocation != NULL, FALSE);
+
+  old_alloc = *allocation;
 
   CLUTTER_CONSTRAINT_GET_CLASS (constraint)->update_allocation (constraint,
                                                                 actor,
                                                                 allocation);
+
+  return !clutter_actor_box_equal (allocation, &old_alloc);
+}
+
+void
+clutter_constraint_update_preferred_size (ClutterConstraint  *constraint,
+                                          ClutterActor       *actor,
+                                          ClutterOrientation  direction,
+                                          float               for_size,
+                                          float              *minimum_size,
+                                          float              *natural_size)
+{
+  g_return_if_fail (CLUTTER_IS_CONSTRAINT (constraint));
+  g_return_if_fail (CLUTTER_IS_ACTOR (actor));
+
+  CLUTTER_CONSTRAINT_GET_CLASS (constraint)->update_preferred_size (constraint, actor,
+                                                                    direction,
+                                                                    for_size,
+                                                                    minimum_size,
+                                                                    natural_size);
 }
diff --git a/clutter/clutter-constraint.h b/clutter/clutter-constraint.h
index 777df5596..ccd20cb2d 100644
--- a/clutter/clutter-constraint.h
+++ b/clutter/clutter-constraint.h
@@ -45,7 +45,7 @@ typedef struct _ClutterConstraintClass          ClutterConstraintClass;
 /**
  * ClutterConstraint:
  *
- * The <structname>ClutterConstraint</structname> structure contains only
+ * The #ClutterConstraint structure contains only
  * private data and should be accessed using the provided API
  *
  * Since: 1.4
@@ -58,8 +58,13 @@ struct _ClutterConstraint
 
 /**
  * ClutterConstraintClass:
+ * @update_allocation: virtual function used to update the allocation
+ *   of the #ClutterActor using the #ClutterConstraint
+ * @update_preferred_size: virtual function used to update the preferred
+ *   size of the #ClutterActor using the #ClutterConstraint; optional,
+ *   since 1.22
  *
- * The <structname>ClutterConstraintClass</structname> structure contains
+ * The #ClutterConstraintClass structure contains
  * only private data
  *
  * Since: 1.4
@@ -69,10 +74,18 @@ struct _ClutterConstraintClass
   /*< private >*/
   ClutterActorMetaClass parent_class;
 
+  /*< public >*/
   void (* update_allocation) (ClutterConstraint *constraint,
                               ClutterActor      *actor,
                               ClutterActorBox   *allocation);
 
+  void (* update_preferred_size) (ClutterConstraint  *constraint,
+                                  ClutterActor       *actor,
+                                  ClutterOrientation  direction,
+                                  float               for_size,
+                                  float              *minimum_size,
+                                  float              *natural_size);
+
   /*< private >*/
   void (* _clutter_constraint1) (void);
   void (* _clutter_constraint2) (void);
@@ -81,27 +94,35 @@ struct _ClutterConstraintClass
   void (* _clutter_constraint5) (void);
   void (* _clutter_constraint6) (void);
   void (* _clutter_constraint7) (void);
-  void (* _clutter_constraint8) (void);
 };
 
+CLUTTER_AVAILABLE_IN_1_4
 GType clutter_constraint_get_type (void) G_GNUC_CONST;
 
 /* ClutterActor API */
+CLUTTER_AVAILABLE_IN_1_4
 void               clutter_actor_add_constraint            (ClutterActor      *self,
                                                             ClutterConstraint *constraint);
+CLUTTER_AVAILABLE_IN_1_4
 void               clutter_actor_add_constraint_with_name  (ClutterActor      *self,
                                                             const gchar       *name,
                                                             ClutterConstraint *constraint);
+CLUTTER_AVAILABLE_IN_1_4
 void               clutter_actor_remove_constraint         (ClutterActor      *self,
                                                             ClutterConstraint *constraint);
+CLUTTER_AVAILABLE_IN_1_4
 void               clutter_actor_remove_constraint_by_name (ClutterActor      *self,
                                                             const gchar       *name);
+CLUTTER_AVAILABLE_IN_1_4
 GList *            clutter_actor_get_constraints           (ClutterActor      *self);
+CLUTTER_AVAILABLE_IN_1_4
 ClutterConstraint *clutter_actor_get_constraint            (ClutterActor      *self,
                                                             const gchar       *name);
+CLUTTER_AVAILABLE_IN_1_4
 void               clutter_actor_clear_constraints         (ClutterActor      *self);
 
-gboolean           clutter_actor_has_constraints           (ClutterActor *self);
+CLUTTER_AVAILABLE_IN_1_10
+gboolean           clutter_actor_has_constraints           (ClutterActor      *self);
 
 G_END_DECLS
 
diff --git a/clutter/clutter-container.c b/clutter/clutter-container.c
index 8c64151fc..72d40fafe 100644
--- a/clutter/clutter-container.c
+++ b/clutter/clutter-container.c
@@ -393,7 +393,7 @@ clutter_container_add (ClutterContainer *container,
 }
 
 /**
- * clutter_container_add_actor:
+ * clutter_container_add_actor: (virtual add)
  * @container: a #ClutterContainer
  * @actor: the first #ClutterActor to add
  *
@@ -406,8 +406,6 @@ clutter_container_add (ClutterContainer *container,
  * deprecated virtual function. The default implementation will
  * call clutter_actor_add_child().
  *
- * Virtual: add
- *
  * Since: 0.4
  *
  * Deprecated: 1.10: Use clutter_actor_add_child() instead.
@@ -485,7 +483,7 @@ clutter_container_remove (ClutterContainer *container,
 }
 
 /**
- * clutter_container_remove_actor:
+ * clutter_container_remove_actor: (virtual remove)
  * @container: a #ClutterContainer
  * @actor: a #ClutterActor
  *
@@ -498,8 +496,6 @@ clutter_container_remove (ClutterContainer *container,
  * deprecated virtual function. The default implementation will call
  * clutter_actor_remove_child().
  *
- * Virtual: remove
- *
  * Since: 0.4
  *
  * Deprecated: 1.10: Use clutter_actor_remove_child() instead.
@@ -672,7 +668,7 @@ clutter_container_foreach_with_internals (ClutterContainer *container,
 }
 
 /**
- * clutter_container_raise_child:
+ * clutter_container_raise_child: (virtual raise)
  * @container: a #ClutterContainer
  * @actor: the actor to raise
  * @sibling: (allow-none): the sibling to raise to, or %NULL to raise
@@ -684,8 +680,6 @@ clutter_container_foreach_with_internals (ClutterContainer *container,
  * which has been deprecated. The default implementation will call
  * clutter_actor_set_child_above_sibling().
  *
- * Virtual: raise
- *
  * Since: 0.6
  *
  * Deprecated: 1.10: Use clutter_actor_set_child_above_sibling() instead.
@@ -743,7 +737,7 @@ clutter_container_raise_child (ClutterContainer *container,
 }
 
 /**
- * clutter_container_lower_child:
+ * clutter_container_lower_child: (virtual lower)
  * @container: a #ClutterContainer
  * @actor: the actor to raise
  * @sibling: (allow-none): the sibling to lower to, or %NULL to lower
@@ -755,8 +749,6 @@ clutter_container_raise_child (ClutterContainer *container,
  * which has been deprecated. The default implementation will call
  * clutter_actor_set_child_below_sibling().
  *
- * Virtual: lower
- *
  * Since: 0.6
  *
  * Deprecated: 1.10: Use clutter_actor_set_child_below_sibling() instead.
diff --git a/clutter/clutter-container.h b/clutter/clutter-container.h
index b7e3f2b6c..990ffb732 100644
--- a/clutter/clutter-container.h
+++ b/clutter/clutter-container.h
@@ -141,43 +141,55 @@ struct _ClutterContainerIface
                           GParamSpec       *pspec);
 };
 
-GType         clutter_container_get_type         (void) G_GNUC_CONST;
+CLUTTER_AVAILABLE_IN_ALL
+GType clutter_container_get_type (void) G_GNUC_CONST;
 
-ClutterActor *clutter_container_find_child_by_name     (ClutterContainer *container,
-                                                        const gchar      *child_name);
+CLUTTER_AVAILABLE_IN_ALL
+ClutterActor *          clutter_container_find_child_by_name            (ClutterContainer *container,
+                                                                         const gchar      *child_name);
 
-GParamSpec *      clutter_container_class_find_child_property   (GObjectClass     *klass,
-                                                                 const gchar      *property_name);
-GParamSpec **     clutter_container_class_list_child_properties (GObjectClass     *klass,
-                                                                 guint            *n_properties);
+CLUTTER_AVAILABLE_IN_ALL
+GParamSpec *            clutter_container_class_find_child_property     (GObjectClass     *klass,
+                                                                         const gchar      *property_name);
+CLUTTER_AVAILABLE_IN_ALL
+GParamSpec **           clutter_container_class_list_child_properties   (GObjectClass     *klass,
+                                                                         guint            *n_properties);
 
-void              clutter_container_create_child_meta           (ClutterContainer *container,
-                                                                 ClutterActor     *actor);
-void              clutter_container_destroy_child_meta          (ClutterContainer *container,
-                                                                 ClutterActor     *actor);
-ClutterChildMeta *clutter_container_get_child_meta              (ClutterContainer *container,
-                                                                 ClutterActor     *actor);
+CLUTTER_AVAILABLE_IN_ALL
+void                    clutter_container_create_child_meta             (ClutterContainer *container,
+                                                                         ClutterActor     *actor);
+CLUTTER_AVAILABLE_IN_ALL
+void                    clutter_container_destroy_child_meta            (ClutterContainer *container,
+                                                                         ClutterActor     *actor);
+CLUTTER_AVAILABLE_IN_ALL
+ClutterChildMeta *      clutter_container_get_child_meta                (ClutterContainer *container,
+                                                                         ClutterActor     *actor);
 
-void              clutter_container_child_set_property          (ClutterContainer *container,
-                                                                 ClutterActor     *child,
-                                                                 const gchar      * property,
-                                                                 const GValue     *value);
-void              clutter_container_child_get_property          (ClutterContainer *container,
-                                                                 ClutterActor     *child,
-                                                                 const gchar      *property,
-                                                                 GValue           *value);
-void              clutter_container_child_set                   (ClutterContainer *container,
-                                                                 ClutterActor     *actor,
-                                                                 const gchar      *first_prop,
-                                                                 ...) G_GNUC_NULL_TERMINATED;
-void              clutter_container_child_get                   (ClutterContainer *container,
-                                                                 ClutterActor     *actor,
-                                                                 const gchar      *first_prop,
-                                                                 ...) G_GNUC_NULL_TERMINATED;
+CLUTTER_AVAILABLE_IN_ALL
+void                    clutter_container_child_set_property            (ClutterContainer *container,
+                                                                         ClutterActor     *child,
+                                                                         const gchar      * property,
+                                                                         const GValue     *value);
+CLUTTER_AVAILABLE_IN_ALL
+void                    clutter_container_child_get_property            (ClutterContainer *container,
+                                                                         ClutterActor     *child,
+                                                                         const gchar      *property,
+                                                                         GValue           *value);
+CLUTTER_AVAILABLE_IN_ALL
+void                    clutter_container_child_set                     (ClutterContainer *container,
+                                                                         ClutterActor     *actor,
+                                                                         const gchar      *first_prop,
+                                                                         ...) G_GNUC_NULL_TERMINATED;
+CLUTTER_AVAILABLE_IN_ALL
+void                    clutter_container_child_get                     (ClutterContainer *container,
+                                                                         ClutterActor     *actor,
+                                                                         const gchar      *first_prop,
+                                                                         ...) G_GNUC_NULL_TERMINATED;
 
-void              clutter_container_child_notify                (ClutterContainer *container,
-                                                                 ClutterActor     *child,
-                                                                 GParamSpec       *pspec);
+CLUTTER_AVAILABLE_IN_ALL
+void                    clutter_container_child_notify                  (ClutterContainer *container,
+                                                                         ClutterActor     *child,
+                                                                         GParamSpec       *pspec);
 
 G_END_DECLS
 
diff --git a/clutter/clutter-content.h b/clutter/clutter-content.h
index df5aa838c..1ca45de7f 100644
--- a/clutter/clutter-content.h
+++ b/clutter/clutter-content.h
@@ -43,7 +43,7 @@ typedef struct _ClutterContentIface     ClutterContentIface;
 /**
  * ClutterContent:
  *
- * The <structname>ClutterContent</structname> structure is an opaque type
+ * The #ClutterContent structure is an opaque type
  * whose members cannot be acccessed directly.
  *
  * Since: 1.10
@@ -62,7 +62,7 @@ typedef struct _ClutterContentIface     ClutterContentIface;
  * @invalidate: virtual function; called each time a #ClutterContent state
  *   is changed.
  *
- * The <structname>ClutterContentIface</structname> structure contains only
+ * The #ClutterContentIface structure contains only
  * private data.
  *
  * Since: 1.10
diff --git a/clutter/clutter-deform-effect.c b/clutter/clutter-deform-effect.c
index a7ab5cb01..925866a85 100644
--- a/clutter/clutter-deform-effect.c
+++ b/clutter/clutter-deform-effect.c
@@ -39,17 +39,16 @@
  * a #ClutterActor and then the Cogl vertex buffers API to submit the
  * geometry to the GPU.
  *
- * <refsect2>
- *   <title>Implementing ClutterDeformEffect</title>
- *   <para>Sub-classes of #ClutterDeformEffect should override the
- *   #ClutterDeformEffectClass.deform_vertex() virtual function; this function
- *   is called on every vertex that needs to be deformed by the effect.
- *   Each passed vertex is an in-out parameter that initially contains the
- *   position of the vertex and should be modified according to a specific
- *   deformation algorithm.</para>
- * </refsect2>
- *
  * #ClutterDeformEffect is available since Clutter 1.4
+ *
+ * ## Implementing ClutterDeformEffect
+ *
+ * Sub-classes of #ClutterDeformEffect should override the
+ * #ClutterDeformEffectClass.deform_vertex() virtual function; this function
+ * is called on every vertex that needs to be deformed by the effect.
+ * Each passed vertex is an in-out parameter that initially contains the
+ * position of the vertex and should be modified according to a specific
+ * deformation algorithm.
  */
 
 #ifdef HAVE_CONFIG_H
@@ -102,9 +101,9 @@ enum
 
 static GParamSpec *obj_props[PROP_LAST];
 
-G_DEFINE_ABSTRACT_TYPE (ClutterDeformEffect,
-                        clutter_deform_effect,
-                        CLUTTER_TYPE_OFFSCREEN_EFFECT);
+G_DEFINE_ABSTRACT_TYPE_WITH_PRIVATE (ClutterDeformEffect,
+                                     clutter_deform_effect,
+                                     CLUTTER_TYPE_OFFSCREEN_EFFECT)
 
 static void
 clutter_deform_effect_real_deform_vertex (ClutterDeformEffect *effect,
@@ -305,7 +304,7 @@ clutter_deform_effect_paint_target (ClutterOffscreenEffect *effect)
          instead we make a temporary copy */
       back_pipeline = cogl_pipeline_copy (priv->back_pipeline);
       cogl_pipeline_set_depth_state (back_pipeline, &depth_state, NULL);
-      cogl_pipeline_set_cull_face_mode (pipeline,
+      cogl_pipeline_set_cull_face_mode (back_pipeline,
                                         COGL_PIPELINE_CULL_FACE_MODE_FRONT);
 
       cogl_framebuffer_draw_primitive (fb, back_pipeline, priv->primitive);
@@ -577,8 +576,6 @@ clutter_deform_effect_class_init (ClutterDeformEffectClass *klass)
   ClutterActorMetaClass *meta_class = CLUTTER_ACTOR_META_CLASS (klass);
   ClutterOffscreenEffectClass *offscreen_class = CLUTTER_OFFSCREEN_EFFECT_CLASS (klass);
 
-  g_type_class_add_private (klass, sizeof (ClutterDeformEffectPrivate));
-
   klass->deform_vertex = clutter_deform_effect_real_deform_vertex;
 
   /**
@@ -645,9 +642,7 @@ clutter_deform_effect_class_init (ClutterDeformEffectClass *klass)
 static void
 clutter_deform_effect_init (ClutterDeformEffect *self)
 {
-  self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, CLUTTER_TYPE_DEFORM_EFFECT,
-                                            ClutterDeformEffectPrivate);
-
+  self->priv = clutter_deform_effect_get_instance_private (self);
   self->priv->x_tiles = self->priv->y_tiles = DEFAULT_N_TILES;
   self->priv->back_pipeline = NULL;
 
diff --git a/clutter/clutter-deform-effect.h b/clutter/clutter-deform-effect.h
index 7650e7100..dc6eabccd 100644
--- a/clutter/clutter-deform-effect.h
+++ b/clutter/clutter-deform-effect.h
@@ -48,7 +48,7 @@ typedef struct _ClutterDeformEffectClass        ClutterDeformEffectClass;
 /**
  * ClutterDeformEffect:
  *
- * The <structname>ClutterDeformEffect</structname> structure contains
+ * The #ClutterDeformEffect structure contains
  * only private data and should be accessed using the provided API
  *
  * Since: 1.4
@@ -66,7 +66,7 @@ struct _ClutterDeformEffect
  * @deform_vertex: virtual function; sub-classes should override this
  *   function to compute the deformation of each vertex
  *
- * The <structname>ClutterDeformEffectClass</structname> structure contains
+ * The #ClutterDeformEffectClass structure contains
  * only private data
  *
  * Since: 1.4
@@ -92,19 +92,25 @@ struct _ClutterDeformEffectClass
   void (*_clutter_deform7) (void);
 };
 
+CLUTTER_AVAILABLE_IN_1_4
 GType clutter_deform_effect_get_type (void) G_GNUC_CONST;
 
-void       clutter_deform_effect_set_back_material (ClutterDeformEffect *effect,
-                                                    CoglHandle           material);
-CoglHandle clutter_deform_effect_get_back_material (ClutterDeformEffect *effect);
-void       clutter_deform_effect_set_n_tiles       (ClutterDeformEffect *effect,
-                                                    guint                x_tiles,
-                                                    guint                y_tiles);
-void       clutter_deform_effect_get_n_tiles       (ClutterDeformEffect *effect,
-                                                    guint               *x_tiles,
-                                                    guint               *y_tiles);
+CLUTTER_AVAILABLE_IN_1_4
+void            clutter_deform_effect_set_back_material (ClutterDeformEffect *effect,
+                                                         CoglHandle           material);
+CLUTTER_AVAILABLE_IN_1_4
+CoglHandle      clutter_deform_effect_get_back_material (ClutterDeformEffect *effect);
+CLUTTER_AVAILABLE_IN_1_4
+void            clutter_deform_effect_set_n_tiles       (ClutterDeformEffect *effect,
+                                                         guint                x_tiles,
+                                                         guint                y_tiles);
+CLUTTER_AVAILABLE_IN_1_4
+void            clutter_deform_effect_get_n_tiles       (ClutterDeformEffect *effect,
+                                                         guint               *x_tiles,
+                                                         guint               *y_tiles);
 
-void       clutter_deform_effect_invalidate        (ClutterDeformEffect *effect);
+CLUTTER_AVAILABLE_IN_1_4
+void            clutter_deform_effect_invalidate        (ClutterDeformEffect *effect);
 
 G_END_DECLS
 
diff --git a/clutter/clutter-deprecated.h b/clutter/clutter-deprecated.h
index 1f400299f..fc40557dc 100644
--- a/clutter/clutter-deprecated.h
+++ b/clutter/clutter-deprecated.h
@@ -33,6 +33,7 @@
 #include "deprecated/clutter-stage-manager.h"
 #include "deprecated/clutter-stage.h"
 #include "deprecated/clutter-state.h"
+#include "deprecated/clutter-table-layout.h"
 #include "deprecated/clutter-texture.h"
 #include "deprecated/clutter-timeline.h"
 #include "deprecated/clutter-timeout-pool.h"
diff --git a/clutter/clutter-desaturate-effect.h b/clutter/clutter-desaturate-effect.h
index d73ed734d..08c1583f5 100644
--- a/clutter/clutter-desaturate-effect.h
+++ b/clutter/clutter-desaturate-effect.h
@@ -40,7 +40,7 @@ G_BEGIN_DECLS
 /**
  * ClutterDesaturateEffect:
  *
- * <structname>ClutterDesaturateEffect</structname> is an opaque structure
+ * #ClutterDesaturateEffect is an opaque structure
  * whose members cannot be directly accessed
  *
  * Since: 1.4
@@ -48,12 +48,16 @@ G_BEGIN_DECLS
 typedef struct _ClutterDesaturateEffect         ClutterDesaturateEffect;
 typedef struct _ClutterDesaturateEffectClass    ClutterDesaturateEffectClass;
 
+CLUTTER_AVAILABLE_IN_1_4
 GType clutter_desaturate_effect_get_type (void) G_GNUC_CONST;
 
+CLUTTER_AVAILABLE_IN_1_4
 ClutterEffect *clutter_desaturate_effect_new        (gdouble                  factor);
 
+CLUTTER_AVAILABLE_IN_1_4
 void           clutter_desaturate_effect_set_factor (ClutterDesaturateEffect *effect,
                                                      gdouble                  factor);
+CLUTTER_AVAILABLE_IN_1_4
 gdouble        clutter_desaturate_effect_get_factor (ClutterDesaturateEffect *effect);
 
 G_END_DECLS
diff --git a/clutter/clutter-device-manager-private.h b/clutter/clutter-device-manager-private.h
index 8bc5330d7..2f18b6e12 100644
--- a/clutter/clutter-device-manager-private.h
+++ b/clutter/clutter-device-manager-private.h
@@ -65,8 +65,8 @@ typedef struct _ClutterTouchInfo
   ClutterEventSequence *sequence;
   ClutterActor *actor;
 
-  gint current_x;
-  gint current_y;
+  gfloat current_x;
+  gfloat current_y;
 } ClutterTouchInfo;
 
 struct _ClutterInputDevice
@@ -106,8 +106,8 @@ struct _ClutterInputDevice
   ClutterStage *stage;
 
   /* the current state */
-  gint current_x;
-  gint current_y;
+  gfloat current_x;
+  gfloat current_y;
   guint32 current_time;
   gint current_button_number;
   ClutterModifierType current_state;
@@ -137,9 +137,6 @@ struct _ClutterInputDeviceClass
 {
   GObjectClass parent_class;
 
-  void (* select_stage_events) (ClutterInputDevice *device,
-                                ClutterStage       *stage,
-                                gint                event_mask);
   gboolean (* keycode_to_evdev) (ClutterInputDevice *device,
                                  guint               hardware_keycode,
                                  guint              *evdev_keycode);
@@ -152,8 +149,7 @@ void            _clutter_device_manager_remove_device           (ClutterDeviceMa
                                                                  ClutterInputDevice   *device);
 void            _clutter_device_manager_update_devices          (ClutterDeviceManager *device_manager);
 void            _clutter_device_manager_select_stage_events     (ClutterDeviceManager *device_manager,
-                                                                 ClutterStage         *stage,
-                                                                 gint                  event_mask);
+                                                                 ClutterStage         *stage);
 ClutterBackend *_clutter_device_manager_get_backend             (ClutterDeviceManager *device_manager);
 
 /* input device */
@@ -165,8 +161,8 @@ void            _clutter_input_device_remove_event_sequence     (ClutterInputDev
                                                                  ClutterEvent         *event);
 void            _clutter_input_device_set_coords                (ClutterInputDevice   *device,
                                                                  ClutterEventSequence *sequence,
-                                                                 gint                  x,
-                                                                 gint                  y,
+                                                                 gfloat                x,
+                                                                 gfloat                y,
                                                                  ClutterStage         *stage);
 void            _clutter_input_device_set_state                 (ClutterInputDevice   *device,
                                                                  ClutterModifierType   state);
@@ -198,10 +194,6 @@ void            _clutter_input_device_add_slave                 (ClutterInputDev
 void            _clutter_input_device_remove_slave              (ClutterInputDevice   *master,
                                                                  ClutterInputDevice   *slave);
 
-void            _clutter_input_device_select_stage_events       (ClutterInputDevice   *device,
-                                                                 ClutterStage         *stage,
-                                                                 gint                  event_flags);
-
 gboolean        _clutter_input_device_translate_axis            (ClutterInputDevice   *device,
                                                                  guint                 index_,
                                                                  gdouble               value,
diff --git a/clutter/clutter-device-manager.c b/clutter/clutter-device-manager.c
index 2dc67be01..32a6e8a4a 100644
--- a/clutter/clutter-device-manager.c
+++ b/clutter/clutter-device-manager.c
@@ -48,8 +48,6 @@
 #include "clutter-private.h"
 #include "clutter-stage-private.h"
 
-#define CLUTTER_DEVICE_MANAGER_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), CLUTTER_TYPE_DEVICE_MANAGER, ClutterDeviceManagerPrivate))
-
 struct _ClutterDeviceManagerPrivate
 {
   /* back-pointer to the backend */
@@ -77,9 +75,9 @@ enum
 
 static guint manager_signals[LAST_SIGNAL] = { 0, };
 
-G_DEFINE_ABSTRACT_TYPE (ClutterDeviceManager,
-                        clutter_device_manager,
-                        G_TYPE_OBJECT);
+G_DEFINE_ABSTRACT_TYPE_WITH_PRIVATE (ClutterDeviceManager,
+                                     clutter_device_manager,
+                                     G_TYPE_OBJECT)
 
 static void
 clutter_device_manager_set_property (GObject      *gobject,
@@ -124,8 +122,6 @@ clutter_device_manager_class_init (ClutterDeviceManagerClass *klass)
 {
   GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
 
-  g_type_class_add_private (klass, sizeof (ClutterDeviceManagerPrivate));
-
   obj_props[PROP_BACKEND] =
     g_param_spec_object ("backend",
                          P_("Backend"),
@@ -183,7 +179,7 @@ clutter_device_manager_class_init (ClutterDeviceManagerClass *klass)
 static void
 clutter_device_manager_init (ClutterDeviceManager *self)
 {
-  self->priv = CLUTTER_DEVICE_MANAGER_GET_PRIVATE (self);
+  self->priv = clutter_device_manager_get_instance_private (self);
 }
 
 /**
@@ -308,24 +304,15 @@ clutter_device_manager_get_core_device (ClutterDeviceManager   *device_manager,
 
 void
 _clutter_device_manager_select_stage_events (ClutterDeviceManager *device_manager,
-                                             ClutterStage         *stage,
-                                             gint                  event_flags)
+                                             ClutterStage         *stage)
 {
   ClutterDeviceManagerClass *manager_class;
-  const GSList *devices, *d;
 
   g_return_if_fail (CLUTTER_IS_DEVICE_MANAGER (device_manager));
 
   manager_class = CLUTTER_DEVICE_MANAGER_GET_CLASS (device_manager);
-  devices = manager_class->get_devices (device_manager);
-
-  for (d = devices; d != NULL; d = d->next)
-    {
-      ClutterInputDevice *device = d->data;
-
-      if (device->is_enabled)
-        _clutter_input_device_select_stage_events (device, stage, event_flags);
-    }
+  if (manager_class->select_stage_events)
+    manager_class->select_stage_events (device_manager, stage);
 }
 
 /*
@@ -381,9 +368,14 @@ _clutter_device_manager_remove_device (ClutterDeviceManager *device_manager,
   manager_class = CLUTTER_DEVICE_MANAGER_GET_CLASS (device_manager);
   g_assert (manager_class->remove_device != NULL);
 
-  manager_class->remove_device (device_manager, device);
+  /* The subclass remove_device() method will likely unref it but we
+     have to keep it alive during the signal emission. */
+  g_object_ref (device);
 
+  manager_class->remove_device (device_manager, device);
   g_signal_emit (device_manager, manager_signals[DEVICE_REMOVED], 0, device);
+
+  g_object_unref (device);
 }
 
 /*
diff --git a/clutter/clutter-device-manager.h b/clutter/clutter-device-manager.h
index 94cde3d17..177d45280 100644
--- a/clutter/clutter-device-manager.h
+++ b/clutter/clutter-device-manager.h
@@ -81,21 +81,27 @@ struct _ClutterDeviceManagerClass
                                            ClutterInputDevice     *device);
   void                (* remove_device)   (ClutterDeviceManager   *manager,
                                            ClutterInputDevice     *device);
+  void                (* select_stage_events) (ClutterDeviceManager *manager,
+                                               ClutterStage       *stage);
 
   /* padding */
-  gpointer _padding[8];
+  gpointer _padding[7];
 };
 
-
-
+CLUTTER_AVAILABLE_IN_1_2
 GType clutter_device_manager_get_type (void) G_GNUC_CONST;
 
+CLUTTER_AVAILABLE_IN_1_2
 ClutterDeviceManager *clutter_device_manager_get_default     (void);
+CLUTTER_AVAILABLE_IN_1_2
 GSList *              clutter_device_manager_list_devices    (ClutterDeviceManager   *device_manager);
+CLUTTER_AVAILABLE_IN_1_2
 const GSList *        clutter_device_manager_peek_devices    (ClutterDeviceManager   *device_manager);
 
+CLUTTER_AVAILABLE_IN_1_2
 ClutterInputDevice *  clutter_device_manager_get_device      (ClutterDeviceManager   *device_manager,
                                                               gint                    device_id);
+CLUTTER_AVAILABLE_IN_1_2
 ClutterInputDevice *  clutter_device_manager_get_core_device (ClutterDeviceManager   *device_manager,
                                                               ClutterInputDeviceType  device_type);
 
diff --git a/clutter/clutter-drag-action.c b/clutter/clutter-drag-action.c
index 669240c1b..13145221e 100644
--- a/clutter/clutter-drag-action.c
+++ b/clutter/clutter-drag-action.c
@@ -34,7 +34,7 @@
  * a #ClutterActor and setting it as reactive; for instance, the following
  * code:
  *
- * |[
+ * |[<!-- language="C" -->
  *   clutter_actor_add_action (actor, clutter_drag_action_new ());
  *   clutter_actor_set_reactive (actor, TRUE);
  * ]|
@@ -54,19 +54,11 @@
  * parented and exist between the emission of #ClutterDragAction::drag-begin
  * and #ClutterDragAction::drag-end.
  *
- * <example id="drag-action-example">
- *   <title>A simple draggable actor</title>
- *   <programlisting>
- * <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" parse="text" href="../../../../examples/drag-action.c">
- *   <xi:fallback>FIXME: MISSING XINCLUDE CONTENT</xi:fallback>
- * </xi:include>
- *   </programlisting>
- *   <para>The example program above allows dragging the rectangle around
- *   the stage using a #ClutterDragAction. When pressing the
- *   <keycap>Shift</keycap> key the actor that is going to be dragged is a
- *   separate rectangle, and when the drag ends, the original rectangle will
- *   be animated to the final coordinates.</para>
- * </example>
+ * The [drag-action example](https://git.gnome.org/browse/clutter/tree/examples/drag-action.c?h=clutter-1.18)
+ * allows dragging the rectangle around the stage using a #ClutterDragAction.
+ * When pressing the `Shift` key the actor that is being dragged will be a
+ * separate rectangle, and when the drag ends, the original rectangle will be
+ * animated to the final drop coordinates.
  *
  * #ClutterDragAction is available since Clutter 1.4
  */
@@ -150,7 +142,7 @@ static gboolean on_captured_event (ClutterActor      *stage,
                                    ClutterEvent      *event,
                                    ClutterDragAction *action);
 
-G_DEFINE_TYPE (ClutterDragAction, clutter_drag_action, CLUTTER_TYPE_ACTION);
+G_DEFINE_TYPE_WITH_PRIVATE (ClutterDragAction, clutter_drag_action, CLUTTER_TYPE_ACTION)
 
 static void
 get_drag_threshold (ClutterDragAction *action,
@@ -364,14 +356,14 @@ on_captured_event (ClutterActor      *stage,
   if (!priv->in_drag)
     return CLUTTER_EVENT_PROPAGATE;
 
-  if (clutter_event_get_device (event) != priv->device)
+  if (clutter_event_get_device (event) != priv->device ||
+      clutter_event_get_event_sequence (event) != priv->sequence)
     return CLUTTER_EVENT_PROPAGATE;
 
   switch (clutter_event_type (event))
     {
     case CLUTTER_TOUCH_UPDATE:
-      if (clutter_event_get_event_sequence (event) == priv->sequence)
-        emit_drag_motion (action, actor, event);
+      emit_drag_motion (action, actor, event);
       break;
 
     case CLUTTER_MOTION:
@@ -391,8 +383,7 @@ on_captured_event (ClutterActor      *stage,
 
     case CLUTTER_TOUCH_END:
     case CLUTTER_TOUCH_CANCEL:
-      if (clutter_event_get_event_sequence (event) == priv->sequence)
-        emit_drag_end (action, actor, event);
+      emit_drag_end (action, actor, event);
       break;
 
     case CLUTTER_BUTTON_RELEASE:
@@ -427,6 +418,8 @@ on_drag_begin (ClutterActor      *actor,
   switch (clutter_event_type (event))
     {
     case CLUTTER_BUTTON_PRESS:
+      if (priv->sequence != NULL)
+        return CLUTTER_EVENT_PROPAGATE;
       if (clutter_event_get_button (event) != CLUTTER_BUTTON_PRIMARY)
         return CLUTTER_EVENT_PROPAGATE;
       break;
@@ -710,8 +703,6 @@ clutter_drag_action_class_init (ClutterDragActionClass *klass)
   ClutterActorMetaClass *meta_class = CLUTTER_ACTOR_META_CLASS (klass);
   GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
 
-  g_type_class_add_private (klass, sizeof (ClutterDragActionPrivate));
-
   meta_class->set_actor = clutter_drag_action_set_actor;
 
   klass->drag_progress = clutter_drag_action_real_drag_progress;
@@ -991,8 +982,7 @@ clutter_drag_action_class_init (ClutterDragActionClass *klass)
 static void
 clutter_drag_action_init (ClutterDragAction *self)
 {
-  self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, CLUTTER_TYPE_DRAG_ACTION,
-                                            ClutterDragActionPrivate);
+  self->priv = clutter_drag_action_get_instance_private (self);
 }
 
 /**
@@ -1141,14 +1131,18 @@ clutter_drag_action_set_drag_handle (ClutterDragAction *action,
 
   priv->transformed_press_x = priv->press_x;
   priv->transformed_press_y = priv->press_y;
-  clutter_actor_transform_stage_point (handle, priv->press_x, priv->press_y,
-                                       &priv->transformed_press_x,
-                                       &priv->transformed_press_y);
 
   if (priv->drag_handle != NULL)
-    g_signal_connect (priv->drag_handle, "destroy",
-                      G_CALLBACK (on_drag_handle_destroy),
-                      action);
+    {
+      clutter_actor_transform_stage_point (priv->drag_handle,
+                                           priv->press_x,
+                                           priv->press_y,
+					   &priv->transformed_press_x,
+					   &priv->transformed_press_y);
+      g_signal_connect (priv->drag_handle, "destroy",
+			G_CALLBACK (on_drag_handle_destroy),
+			action);
+    }
 
   g_object_notify_by_pspec (G_OBJECT (action), drag_props[PROP_DRAG_HANDLE]);
 }
diff --git a/clutter/clutter-drag-action.h b/clutter/clutter-drag-action.h
index b2503dd43..3e0ed26df 100644
--- a/clutter/clutter-drag-action.h
+++ b/clutter/clutter-drag-action.h
@@ -48,7 +48,7 @@ typedef struct _ClutterDragActionClass          ClutterDragActionClass;
 /**
  * ClutterDragAction:
  *
- * The <structname>ClutterDragAction</structname> structure contains only
+ * The #ClutterDragAction structure contains only
  * private data and should be accessed using the provided API
  *
  * Since: 1.4
@@ -68,7 +68,7 @@ struct _ClutterDragAction
  * @drag_end: class handler of the #ClutterDragAction::drag-end signal
  * @drag_progress: class handler of the #ClutterDragAction::drag-progress signal
  *
- * The <structname>ClutterDragActionClass</structname> structure contains
+ * The #ClutterDragActionClass structure contains
  * only private data
  *
  * Since: 1.4
@@ -105,26 +105,36 @@ struct _ClutterDragActionClass
   void (* _clutter_drag_action4) (void);
 };
 
+CLUTTER_AVAILABLE_IN_1_4
 GType clutter_drag_action_get_type (void) G_GNUC_CONST;
 
+CLUTTER_AVAILABLE_IN_1_4
 ClutterAction * clutter_drag_action_new                   (void);
 
+CLUTTER_AVAILABLE_IN_1_4
 void            clutter_drag_action_set_drag_threshold (ClutterDragAction *action,
                                                         gint               x_threshold,
                                                         gint               y_threshold);
+CLUTTER_AVAILABLE_IN_1_4
 void            clutter_drag_action_get_drag_threshold (ClutterDragAction *action,
                                                         guint             *x_threshold,
                                                         guint             *y_threshold);
+CLUTTER_AVAILABLE_IN_1_4
 void            clutter_drag_action_set_drag_handle    (ClutterDragAction *action,
                                                         ClutterActor      *handle);
+CLUTTER_AVAILABLE_IN_1_4
 ClutterActor *  clutter_drag_action_get_drag_handle    (ClutterDragAction *action);
+CLUTTER_AVAILABLE_IN_1_4
 void            clutter_drag_action_set_drag_axis      (ClutterDragAction *action,
                                                         ClutterDragAxis    axis);
+CLUTTER_AVAILABLE_IN_1_4
 ClutterDragAxis clutter_drag_action_get_drag_axis      (ClutterDragAction *action);
 
+CLUTTER_AVAILABLE_IN_1_4
 void            clutter_drag_action_get_press_coords   (ClutterDragAction *action,
                                                         gfloat            *press_x,
                                                         gfloat            *press_y);
+CLUTTER_AVAILABLE_IN_1_4
 void            clutter_drag_action_get_motion_coords  (ClutterDragAction *action,
                                                         gfloat            *motion_x,
                                                         gfloat            *motion_y);
diff --git a/clutter/clutter-drop-action.c b/clutter/clutter-drop-action.c
index adf6aeb9f..d1940dd2a 100644
--- a/clutter/clutter-drop-action.c
+++ b/clutter/clutter-drop-action.c
@@ -36,7 +36,7 @@
  * #ClutterDropAction::drop signal and handling the drop from there,
  * for instance:
  *
- * |[
+ * |[<!-- language="C" -->
  *   ClutterAction *action = clutter_drop_action ();
  *
  *   g_signal_connect (action, "drop", G_CALLBACK (on_drop), NULL);
@@ -49,18 +49,12 @@
  * cause the #ClutterDropAction::drop signal to be skipped when the input
  * device button is released.
  *
- * <example id="drop-action-example">
- *   <title>Drop targets</title>
- *   <programlisting>
- * <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" parse="text" href="../../../../examples/drop-action.c">
- *   <xi:fallback>FIXME: MISSING XINCLUDE CONTENT</xi:fallback>
- * </xi:include>
- *   </programlisting>
- * </example>
- *
  * It's important to note that #ClutterDropAction will only work with
  * actors dragged using #ClutterDragAction.
  *
+ * See [drop-action.c](https://git.gnome.org/browse/clutter/tree/examples/drop-action.c?h=clutter-1.18)
+ * for an example of how to use #ClutterDropAction.
+ *
  * #ClutterDropAction is available since Clutter 1.8
  */
 
@@ -108,7 +102,7 @@ enum
 
 static guint drop_signals[LAST_SIGNAL] = { 0, };
 
-G_DEFINE_TYPE (ClutterDropAction, clutter_drop_action, CLUTTER_TYPE_ACTION)
+G_DEFINE_TYPE_WITH_PRIVATE (ClutterDropAction, clutter_drop_action, CLUTTER_TYPE_ACTION)
 
 static void
 drop_target_free (gpointer _data)
@@ -129,23 +123,25 @@ on_stage_capture (ClutterStage *stage,
   gfloat event_x, event_y;
   ClutterActor *actor, *drag_actor;
   ClutterDropAction *drop_action;
+  ClutterInputDevice *device;
   gboolean was_reactive;
 
   switch (clutter_event_type (event))
     {
     case CLUTTER_MOTION:
     case CLUTTER_BUTTON_RELEASE:
-      {
-        ClutterInputDevice *device;
+      if (clutter_event_type (event) == CLUTTER_MOTION &&
+          !(clutter_event_get_state (event) & CLUTTER_BUTTON1_MASK))
+        return CLUTTER_EVENT_PROPAGATE;
 
-        if (!(clutter_event_get_state (event) & CLUTTER_BUTTON1_MASK))
-          return CLUTTER_EVENT_PROPAGATE;
+      if (clutter_event_type (event) == CLUTTER_BUTTON_RELEASE &&
+          clutter_event_get_button (event) != CLUTTER_BUTTON_PRIMARY)
+        return CLUTTER_EVENT_PROPAGATE;
 
-        device = clutter_event_get_device (event);
-        drag_actor = _clutter_stage_get_pointer_drag_actor (stage, device);
-        if (drag_actor == NULL)
-          return CLUTTER_EVENT_PROPAGATE;
-      }
+      device = clutter_event_get_device (event);
+      drag_actor = _clutter_stage_get_pointer_drag_actor (stage, device);
+      if (drag_actor == NULL)
+        return CLUTTER_EVENT_PROPAGATE;
       break;
 
     case CLUTTER_TOUCH_UPDATE:
@@ -384,8 +380,6 @@ clutter_drop_action_class_init (ClutterDropActionClass *klass)
 {
   ClutterActorMetaClass *meta_class = CLUTTER_ACTOR_META_CLASS (klass);
 
-  g_type_class_add_private (klass, sizeof (ClutterDropActionPrivate));
-
   meta_class->set_actor = clutter_drop_action_set_actor;
 
   klass->can_drop = clutter_drop_action_real_can_drop;
@@ -518,8 +512,7 @@ clutter_drop_action_class_init (ClutterDropActionClass *klass)
 static void
 clutter_drop_action_init (ClutterDropAction *self)
 {
-  self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, CLUTTER_TYPE_DROP_ACTION,
-                                            ClutterDropActionPrivate);
+  self->priv = clutter_drop_action_get_instance_private (self);
 }
 
 /**
diff --git a/clutter/clutter-drop-action.h b/clutter/clutter-drop-action.h
index 732baad57..9c58242d6 100644
--- a/clutter/clutter-drop-action.h
+++ b/clutter/clutter-drop-action.h
@@ -47,7 +47,7 @@ typedef struct _ClutterDropActionClass          ClutterDropActionClass;
 /**
  * ClutterDropAction:
  *
- * The <structname>ClutterDropAction</structname> structure contains only
+ * The #ClutterDropAction structure contains only
  * private data and should be accessed using the provided API.
  *
  * Since: 1.8
@@ -67,7 +67,7 @@ struct _ClutterDropAction
  * @over_out: class handler for the #ClutterDropAction::over-out signal
  * @drop: class handler for the #ClutterDropAction::drop signal
  *
- * The <structname>ClutterDropActionClass</structname> structure contains
+ * The #ClutterDropActionClass structure contains
  * only private data.
  *
  * Since: 1.8
@@ -104,8 +104,10 @@ struct _ClutterDropActionClass
   void (*_clutter_drop_action8) (void);
 };
 
+CLUTTER_AVAILABLE_IN_1_8
 GType clutter_drop_action_get_type (void) G_GNUC_CONST;
 
+CLUTTER_AVAILABLE_IN_1_8
 ClutterAction *         clutter_drop_action_new         (void);
 
 G_END_DECLS
diff --git a/clutter/clutter-effect.c b/clutter/clutter-effect.c
index 8430a7616..33d8f1387 100644
--- a/clutter/clutter-effect.c
+++ b/clutter/clutter-effect.c
@@ -36,78 +36,50 @@
  * actor without sub-classing the actor itself and overriding the
  * #ClutterActorClass.paint()_ virtual function.
  *
- * <refsect2 id="ClutterEffect-implementation">
- *   <title>Implementing a ClutterEffect</title>
- *   <para>
- *     Creating a sub-class of #ClutterEffect requires overriding the
- *     ‘paint’ method. The implementation of the function should look
- *     something like this:
- *   </para>
- *   <programlisting>
+ * ## Implementing a ClutterEffect
+ *
+ * Creating a sub-class of #ClutterEffect requires overriding the
+ * #ClutterEffectClass.paint() method. The implementation of the function should look
+ * something like this:
+ *
+ * |[
  * void effect_paint (ClutterEffect *effect, ClutterEffectPaintFlags flags)
  * {
- *   /&ast; Set up initialisation of the paint such as binding a
- *      CoglOffscreen or other operations &ast;/
+ *   // Set up initialisation of the paint such as binding a
+ *   // CoglOffscreen or other operations
  *
- *   /&ast; Chain to the next item in the paint sequence. This will either call
- *      ‘paint’ on the next effect or just paint the actor if this is
- *      the last effect. &ast;/
+ *   // Chain to the next item in the paint sequence. This will either call
+ *   // ‘paint’ on the next effect or just paint the actor if this is
+ *   // the last effect.
  *   ClutterActor *actor =
  *     clutter_actor_meta_get_actor (CLUTTER_ACTOR_META (effect));
+ *
  *   clutter_actor_continue_paint (actor);
  *
- *   /&ast; perform any cleanup of state, such as popping the
- *      CoglOffscreen &ast;/
+ *   // perform any cleanup of state, such as popping the CoglOffscreen
  * }
- *   </programlisting>
- *   <para>
- *     The effect can optionally avoid calling
- *     clutter_actor_continue_paint() to skip any further stages of
- *     the paint sequence. This is useful for example if the effect
- *     contains a cached image of the actor. In that case it can
- *     optimise painting by avoiding the actor paint and instead
- *     painting the cached image. The %CLUTTER_EFFECT_PAINT_ACTOR_DIRTY
- *     flag is useful in this case. Clutter will set this flag when a
- *     redraw has been queued on the actor since it was last
- *     painted. The effect can use this information to decide if the
- *     cached image is still valid.
- *   </para>
- *   <para>
- *     The ‘paint’ virtual was added in Clutter 1.8. Prior to that there
- *     were two separate functions as follows.
- *   </para>
- *   <itemizedlist>
- *     <listitem><simpara><function>pre_paint()</function>, which is called
- *     before painting the #ClutterActor.</simpara></listitem>
- *     <listitem><simpara><function>post_paint()</function>, which is called
- *     after painting the #ClutterActor.</simpara></listitem>
- *   </itemizedlist>
- *   <para>The <function>pre_paint()</function> function was used to set
- *   up the #ClutterEffect right before the #ClutterActor's paint
- *   sequence. This function can fail, and return %FALSE; in that case, no
- *   <function>post_paint()</function> invocation will follow.</para>
- *   <para>The <function>post_paint()</function> function was called after the
- *   #ClutterActor's paint sequence.</para>
- *   <para>
- *     With these two functions it is not possible to skip the rest of
- *     the paint sequence. The default implementation of the ‘paint’
- *     virtual calls #ClutterEffectClass.pre_paint(), clutter_actor_continue_paint()
- *     and then #ClutterEffectClass.post_paint() so that existing actors that aren't
- *     using the #ClutterEffectClass.paint() virtual will continue to work. New
- *     effects using the #ClutterEffectClass.paint() virtual do not need to implement
- *     pre or post paint.
- *   </para>
- *   <example id="ClutterEffect-example">
- *     <title>A simple ClutterEffect implementation</title>
- *     <para>The example below creates two rectangles: one will be
- *     painted "behind" the actor, while another will be painted "on
- *     top" of the actor.  The #ClutterActorMetaClass.set_actor()
- *     implementation will create the two materials used for the two
- *     different rectangles; the #ClutterEffectClass.paint() implementation
- *     will paint the first material using cogl_rectangle(), before
- *     continuing and then it will paint paint the second material
- *     after.</para>
- *     <programlisting>
+ * ]|
+ *
+ * The effect can optionally avoid calling clutter_actor_continue_paint() to skip any
+ * further stages of the paint sequence. This is useful for example if the effect
+ * contains a cached image of the actor. In that case it can optimise painting by
+ * avoiding the actor paint and instead painting the cached image.
+ *
+ * The %CLUTTER_EFFECT_PAINT_ACTOR_DIRTY flag is useful in this case. Clutter will set
+ * this flag when a redraw has been queued on the actor since it was last painted. The
+ * effect can use this information to decide if the cached image is still valid.
+ *
+ * ## A simple ClutterEffect implementation
+ *
+ * The example below creates two rectangles: one will be painted "behind" the actor,
+ * while another will be painted "on top" of the actor.
+ *
+ * The #ClutterActorMetaClass.set_actor() implementation will create the two materials
+ * used for the two different rectangles; the #ClutterEffectClass.paint() implementation
+ * will paint the first material using cogl_rectangle(), before continuing and then it
+ * will paint paint the second material after.
+ *
+ *  |[
  *  typedef struct {
  *    ClutterEffect parent_instance;
  *
@@ -125,35 +97,33 @@
  *  {
  *    MyEffect *self = MY_EFFECT (meta);
  *
- *    /&ast; Clear the previous state &ast;/
- *    if (self-&gt;rect_1)
+ *    // Clear the previous state //
+ *    if (self->rect_1)
  *      {
- *        cogl_handle_unref (self-&gt;rect_1);
- *        self-&gt;rect_1 = NULL;
+ *        cogl_handle_unref (self->rect_1);
+ *        self->rect_1 = NULL;
  *      }
  *
- *    if (self-&gt;rect_2)
+ *    if (self->rect_2)
  *      {
- *        cogl_handle_unref (self-&gt;rect_2);
- *        self-&gt;rect_2 = NULL;
+ *        cogl_handle_unref (self->rect_2);
+ *        self->rect_2 = NULL;
  *      }
  *
- *    /&ast; Maintain a pointer to the actor &ast;
- *    self-&gt;actor = actor;
+ *    // Maintain a pointer to the actor
+ *    self->actor = actor;
  *
- *    /&ast; If we've been detached by the actor then we should
- *     &ast; just bail out here
- *     &ast;/
- *    if (self-&gt;actor == NULL)
+ *    // If we've been detached by the actor then we should just bail out here
+ *    if (self->actor == NULL)
  *      return;
  *
- *    /&ast; Create a red material &ast;/
- *    self-&gt;rect_1 = cogl_material_new ();
- *    cogl_material_set_color4f (self-&gt;rect_1, 1.0, 0.0, 0.0, 1.0);
+ *    // Create a red material
+ *    self->rect_1 = cogl_material_new ();
+ *    cogl_material_set_color4f (self->rect_1, 1.0, 0.0, 0.0, 1.0);
  *
- *    /&ast; Create a green material &ast;/
- *    self-&gt;rect_2 = cogl_material_new ();
- *    cogl_material_set_color4f (self-&gt;rect_2, 0.0, 1.0, 0.0, 1.0);
+ *    // Create a green material
+ *    self->rect_2 = cogl_material_new ();
+ *    cogl_material_set_color4f (self->rect_2, 0.0, 1.0, 0.0, 1.0);
  *  }
  *
  *  static gboolean
@@ -162,17 +132,17 @@
  *    MyEffect *self = MY_EFFECT (effect);
  *    gfloat width, height;
  *
- *    clutter_actor_get_size (self-&gt;actor, &amp;width, &amp;height);
+ *    clutter_actor_get_size (self->actor, &width, &height);
  *
- *    /&ast; Paint the first rectangle in the upper left quadrant &ast;/
- *    cogl_set_source (self-&gt;rect_1);
+ *    // Paint the first rectangle in the upper left quadrant
+ *    cogl_set_source (self->rect_1);
  *    cogl_rectangle (0, 0, width / 2, height / 2);
  *
- *    /&ast; Continue to the rest of the paint sequence &ast;/
- *    clutter_actor_continue_paint (self-&gt;actor);
+ *    // Continue to the rest of the paint sequence
+ *    clutter_actor_continue_paint (self->actor);
  *
- *    /&ast; Paint the second rectangle in the lower right quadrant &ast;/
- *    cogl_set_source (self-&gt;rect_2);
+ *    // Paint the second rectangle in the lower right quadrant
+ *    cogl_set_source (self->rect_2);
  *    cogl_rectangle (width / 2, height / 2, width, height);
  *  }
  *
@@ -181,13 +151,11 @@
  *  {
  *    ClutterActorMetaClas *meta_class = CLUTTER_ACTOR_META_CLASS (klass);
  *
- *    meta_class-&gt;set_actor = my_effect_set_actor;
+ *    meta_class->set_actor = my_effect_set_actor;
  *
- *    klass-&gt;paint = my_effect_paint;
+ *    klass->paint = my_effect_paint;
  *  }
- *     </programlisting>
- *   </example>
- * </refsect2>
+ * ]|
  *
  * #ClutterEffect is available since Clutter 1.4
  */
diff --git a/clutter/clutter-effect.h b/clutter/clutter-effect.h
index cad454801..b5286fd79 100644
--- a/clutter/clutter-effect.h
+++ b/clutter/clutter-effect.h
@@ -91,29 +91,39 @@ struct _ClutterEffectClass
   void (* _clutter_effect6) (void);
 };
 
+CLUTTER_AVAILABLE_IN_1_4
 GType clutter_effect_get_type (void) G_GNUC_CONST;
 
+CLUTTER_AVAILABLE_IN_1_8
 void    clutter_effect_queue_repaint    (ClutterEffect *effect);
 
 /*
  * ClutterActor API
  */
 
+CLUTTER_AVAILABLE_IN_1_4
 void           clutter_actor_add_effect            (ClutterActor  *self,
                                                     ClutterEffect *effect);
+CLUTTER_AVAILABLE_IN_1_4
 void           clutter_actor_add_effect_with_name  (ClutterActor  *self,
                                                     const gchar   *name,
                                                     ClutterEffect *effect);
+CLUTTER_AVAILABLE_IN_1_4
 void           clutter_actor_remove_effect         (ClutterActor  *self,
                                                     ClutterEffect *effect);
+CLUTTER_AVAILABLE_IN_1_4
 void           clutter_actor_remove_effect_by_name (ClutterActor  *self,
                                                     const gchar   *name);
+CLUTTER_AVAILABLE_IN_1_4
 GList *        clutter_actor_get_effects           (ClutterActor  *self);
+CLUTTER_AVAILABLE_IN_1_4
 ClutterEffect *clutter_actor_get_effect            (ClutterActor  *self,
                                                     const gchar   *name);
+CLUTTER_AVAILABLE_IN_1_4
 void           clutter_actor_clear_effects         (ClutterActor  *self);
 
-gboolean        clutter_actor_has_effects           (ClutterActor *self);
+CLUTTER_AVAILABLE_IN_1_10
+gboolean       clutter_actor_has_effects           (ClutterActor  *self);
 
 G_END_DECLS
 
diff --git a/clutter/clutter-enum-types.c.in b/clutter/clutter-enum-types.c.in
index 19fb9e502..39bffd4a7 100644
--- a/clutter/clutter-enum-types.c.in
+++ b/clutter/clutter-enum-types.c.in
@@ -1,4 +1,5 @@
 /*** BEGIN file-header ***/
+#include "config.h"
 #include "clutter-enum-types.h"
 /*** END file-header ***/
 
diff --git a/clutter/clutter-enum-types.h.in b/clutter/clutter-enum-types.h.in
index a6131c3dc..aea757ed0 100644
--- a/clutter/clutter-enum-types.h.in
+++ b/clutter/clutter-enum-types.h.in
@@ -2,7 +2,11 @@
 #ifndef __CLUTTER_ENUM_TYPES_H__
 #define __CLUTTER_ENUM_TYPES_H__
 
-#include <glib-object.h>
+#if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
+#error "Only <clutter/clutter.h> can be included directly."
+#endif
+
+#include <clutter/clutter-types.h>
 
 G_BEGIN_DECLS
 
@@ -12,15 +16,14 @@ G_BEGIN_DECLS
 /* enumerations from "@filename@" */
 /*** END file-production ***/
 
+/*** BEGIN value-header ***/
+CLUTTER_AVAILABLE_IN_ALL GType @enum_name@_get_type (void) G_GNUC_CONST;
+#define CLUTTER_TYPE_@ENUMSHORT@ (@enum_name@_get_type())
+
+/*** END value-header ***/
+
 /*** BEGIN file-tail ***/
 G_END_DECLS
 
 #endif /* !__CLUTTER_ENUM_TYPES_H__ */
 /*** END file-tail ***/
-
-/*** BEGIN value-header ***/
-GType @enum_name@_get_type (void) G_GNUC_CONST;
-#define CLUTTER_TYPE_@ENUMSHORT@ (@enum_name@_get_type())
-
-/*** END value-header ***/
-
diff --git a/clutter/clutter-enums.h b/clutter/clutter-enums.h
index f2a666285..fd6dd6d59 100644
--- a/clutter/clutter-enums.h
+++ b/clutter/clutter-enums.h
@@ -96,6 +96,8 @@ typedef enum { /*< prefix=CLUTTER_ROTATE >*/
  * ClutterRequestMode:
  * @CLUTTER_REQUEST_HEIGHT_FOR_WIDTH: Height for width requests
  * @CLUTTER_REQUEST_WIDTH_FOR_HEIGHT: Width for height requests
+ * @CLUTTER_REQUEST_CONTENT_SIZE: Use the preferred size of the
+ *   #ClutterContent, if it has any (available since 1.22)
  *
  * Specifies the type of requests for a #ClutterActor.
  *
@@ -103,7 +105,8 @@ typedef enum { /*< prefix=CLUTTER_ROTATE >*/
  */
 typedef enum { /*< prefix=CLUTTER_REQUEST >*/
   CLUTTER_REQUEST_HEIGHT_FOR_WIDTH,
-  CLUTTER_REQUEST_WIDTH_FOR_HEIGHT
+  CLUTTER_REQUEST_WIDTH_FOR_HEIGHT,
+  CLUTTER_REQUEST_CONTENT_SIZE
 } ClutterRequestMode;
 
 /**
@@ -1357,6 +1360,29 @@ typedef enum { /*< prefix=CLUTTER_ZOOM >*/
   CLUTTER_ZOOM_BOTH
 } ClutterZoomAxis;
 
+/**
+ * ClutterGestureTriggerEdge:
+ * @CLUTTER_GESTURE_TRIGGER_EDGE_NONE: Tell #ClutterGestureAction that
+ * the gesture must begin immediately and there's no drag limit that
+ * will cause its cancellation;
+ * @CLUTTER_GESTURE_TRIGGER_EDGE_AFTER: Tell #ClutterGestureAction that
+ * it needs to wait until the drag threshold has been exceeded before
+ * considering that the gesture has begun;
+ * @CLUTTER_GESTURE_TRIGGER_EDGE_BEFORE: Tell #ClutterGestureAction that
+ * the gesture must begin immediately and that it must be cancelled
+ * once the drag exceed the configured threshold.
+ *
+ * Enum passed to the clutter_gesture_action_set_threshold_trigger_edge()
+ * function.
+ *
+ * Since: 1.18
+ */
+typedef enum {
+  CLUTTER_GESTURE_TRIGGER_EDGE_NONE  = 0,
+  CLUTTER_GESTURE_TRIGGER_EDGE_AFTER,
+  CLUTTER_GESTURE_TRIGGER_EDGE_BEFORE
+} ClutterGestureTriggerEdge;
+
 G_END_DECLS
 
 #endif /* __CLUTTER_ENUMS_H__ */
diff --git a/clutter/clutter-event-private.h b/clutter/clutter-event-private.h
index eeb10800b..00d627d12 100644
--- a/clutter/clutter-event-private.h
+++ b/clutter/clutter-event-private.h
@@ -11,6 +11,8 @@ void            _clutter_event_set_pointer_emulated     (ClutterEvent       *eve
 /* Reinjecting queued events for processing */
 void            _clutter_process_event                  (ClutterEvent       *event);
 
+gboolean        _clutter_event_process_filters          (ClutterEvent       *event);
+
 /* clears the event queue inside the main context */
 void            _clutter_clear_events_queue             (void);
 void            _clutter_clear_events_queue_for_stage   (ClutterStage       *stage);
@@ -19,6 +21,13 @@ void            _clutter_event_set_platform_data        (ClutterEvent       *eve
                                                          gpointer            data);
 gpointer        _clutter_event_get_platform_data        (const ClutterEvent *event);
 
+void            _clutter_event_set_state_full           (ClutterEvent        *event,
+							 ClutterModifierType  button_state,
+							 ClutterModifierType  base_state,
+							 ClutterModifierType  latched_state,
+							 ClutterModifierType  locked_state,
+							 ClutterModifierType  effective_state);
+
 void            _clutter_event_push                     (const ClutterEvent *event,
                                                          gboolean            do_copy);
 
diff --git a/clutter/clutter-event.c b/clutter/clutter-event.c
index 2547572ca..26d561153 100644
--- a/clutter/clutter-event.c
+++ b/clutter/clutter-event.c
@@ -56,15 +56,46 @@ typedef struct _ClutterEventPrivate {
 
   gpointer platform_data;
 
+  ClutterModifierType button_state;
+  ClutterModifierType base_state;
+  ClutterModifierType latched_state;
+  ClutterModifierType locked_state;
+
   guint is_pointer_emulated : 1;
 } ClutterEventPrivate;
 
+typedef struct _ClutterEventFilter {
+  int id;
+
+  ClutterStage *stage;
+  ClutterEventFilterFunc func;
+  GDestroyNotify notify;
+  gpointer user_data;
+} ClutterEventFilter;
+
 static GHashTable *all_events = NULL;
 
 G_DEFINE_BOXED_TYPE (ClutterEvent, clutter_event,
                      clutter_event_copy,
                      clutter_event_free);
 
+static ClutterEventSequence *
+clutter_event_sequence_copy (ClutterEventSequence *sequence)
+{
+  /* Nothing to copy here */
+  return sequence;
+}
+
+static void
+clutter_event_sequence_free (ClutterEventSequence *sequence)
+{
+  /* Nothing to free here */
+}
+
+G_DEFINE_BOXED_TYPE (ClutterEventSequence, clutter_event_sequence,
+                     clutter_event_sequence_copy,
+                     clutter_event_sequence_free);
+
 static gboolean
 is_event_allocated (const ClutterEvent *event)
 {
@@ -178,7 +209,9 @@ clutter_event_set_time (ClutterEvent *event,
  * clutter_event_get_state:
  * @event: a #ClutterEvent
  *
- * Retrieves the modifier state of the event.
+ * Retrieves the modifier state of the event. In case the window system
+ * supports reporting latched and locked modifiers, this function returns
+ * the effective state.
  *
  * Return value: the modifier state parameter, or 0
  *
@@ -265,6 +298,63 @@ clutter_event_set_state (ClutterEvent        *event,
     }
 }
 
+void
+_clutter_event_set_state_full (ClutterEvent        *event,
+			       ClutterModifierType  button_state,
+			       ClutterModifierType  base_state,
+			       ClutterModifierType  latched_state,
+			       ClutterModifierType  locked_state,
+			       ClutterModifierType  effective_state)
+{
+  ClutterEventPrivate *private = (ClutterEventPrivate*) event;
+
+  private->button_state = button_state;
+  private->base_state = base_state;
+  private->latched_state = latched_state;
+  private->locked_state = locked_state;
+
+  clutter_event_set_state (event, effective_state);
+}
+
+/**
+ * clutter_event_get_state_full:
+ * @event: a #ClutterEvent
+ * @button_state: (out) (allow-none): the pressed buttons as a mask
+ * @base_state: (out) (allow-none): the regular pressed modifier keys
+ * @latched_state: (out) (allow-none): the latched modifier keys (currently released but still valid for one key press/release)
+ * @locked_state: (out) (allow-none): the locked modifier keys (valid until the lock key is pressed and released again)
+ * @effective_state: (out) (allow-none): the logical OR of all the state bits above
+ *
+ * Retrieves the decomposition of the keyboard state into button, base,
+ * latched, locked and effective. This can be used to transmit to other
+ * applications, for example when implementing a wayland compositor.
+ *
+ * Since: 1.16
+ */
+void
+clutter_event_get_state_full (const ClutterEvent  *event,
+			      ClutterModifierType *button_state,
+			      ClutterModifierType *base_state,
+			      ClutterModifierType *latched_state,
+			      ClutterModifierType *locked_state,
+			      ClutterModifierType *effective_state)
+{
+  const ClutterEventPrivate *private = (const ClutterEventPrivate*) event;
+
+  g_return_if_fail (event != NULL);
+
+  if (button_state)
+    *button_state = private->button_state;
+  if (base_state)
+    *base_state = private->base_state;
+  if (latched_state)
+    *latched_state = private->latched_state;
+  if (locked_state)
+    *locked_state = private->locked_state;
+  if (effective_state)
+    *effective_state = clutter_event_get_state (event);
+}
+
 /**
  * clutter_event_get_coords:
  * @event: a #ClutterEvent
@@ -1015,6 +1105,8 @@ clutter_event_set_device (ClutterEvent       *event,
  * @event: a #ClutterEvent
  *
  * Retrieves the #ClutterInputDevice for the event.
+ * If you want the physical device the event originated from, use
+ * clutter_event_get_source_device().
  *
  * The #ClutterInputDevice structure is completely opaque and should
  * be cast to the platform-specific implementation.
@@ -1143,6 +1235,10 @@ clutter_event_copy (const ClutterEvent *event)
       new_real_event->delta_x = real_event->delta_x;
       new_real_event->delta_y = real_event->delta_y;
       new_real_event->is_pointer_emulated = real_event->is_pointer_emulated;
+      new_real_event->base_state = real_event->base_state;
+      new_real_event->button_state = real_event->button_state;
+      new_real_event->latched_state = real_event->latched_state;
+      new_real_event->locked_state = real_event->locked_state;
     }
 
   device = clutter_event_get_device (event);
@@ -1650,3 +1746,100 @@ clutter_event_is_pointer_emulated (const ClutterEvent *event)
 
   return ((ClutterEventPrivate *) event)->is_pointer_emulated;
 }
+
+gboolean
+_clutter_event_process_filters (ClutterEvent *event)
+{
+  ClutterMainContext *context = _clutter_context_get_default ();
+  GList *l, *next;
+
+  /* Event filters are handled in order from least recently added to
+   * most recently added */
+
+  for (l = context->event_filters; l; l = next)
+    {
+      ClutterEventFilter *event_filter = l->data;
+
+      next = l->next;
+
+      if (event_filter->stage && event_filter->stage != event->any.stage)
+        continue;
+
+      if (event_filter->func (event, event_filter->user_data) == CLUTTER_EVENT_STOP)
+        return CLUTTER_EVENT_STOP;
+    }
+
+  return CLUTTER_EVENT_PROPAGATE;
+}
+
+/**
+ * clutter_event_add_filter:
+ * @stage: (allow-none): The #ClutterStage to capture events for
+ * @func: The callback function which will be passed all events.
+ * @notify: A #GDestroyNotify
+ * @user_data: A data pointer to pass to the function.
+ *
+ * Adds a function which will be called for all events that Clutter
+ * processes. The function will be called before any signals are
+ * emitted for the event and it will take precedence over any grabs.
+ *
+ * Return value: an identifier for the event filter, to be used
+ *   with clutter_event_remove_filter().
+ *
+ * Since: 1.18
+ */
+guint
+clutter_event_add_filter (ClutterStage          *stage,
+                          ClutterEventFilterFunc func,
+                          GDestroyNotify         notify,
+                          gpointer               user_data)
+{
+  ClutterMainContext *context = _clutter_context_get_default ();
+  ClutterEventFilter *event_filter = g_slice_new (ClutterEventFilter);
+  static guint event_filter_id = 0;
+
+  event_filter->stage = stage;
+  event_filter->id = ++event_filter_id;
+  event_filter->func = func;
+  event_filter->notify = notify;
+  event_filter->user_data = user_data;
+
+  /* The event filters are kept in order from least recently added to
+   * most recently added so we must add it to the end */
+  context->event_filters = g_list_append (context->event_filters, event_filter);
+
+  return event_filter->id;
+}
+
+/**
+ * clutter_event_remove_filter:
+ * @id: The ID of the event filter, as returned from clutter_event_add_filter()
+ *
+ * Removes an event filter that was previously added with
+ * clutter_event_add_filter().
+ *
+ * Since: 1.18
+ */
+void
+clutter_event_remove_filter (guint id)
+{
+  ClutterMainContext *context = _clutter_context_get_default ();
+  GList *l;
+
+  for (l = context->event_filters; l; l = l->next)
+    {
+      ClutterEventFilter *event_filter = l->data;
+
+      if (event_filter->id == id)
+        {
+          if (event_filter->notify)
+            event_filter->notify (event_filter->user_data);
+
+          context->event_filters = g_list_delete_link (context->event_filters, l);
+          g_slice_free (ClutterEventFilter, event_filter);
+          return;
+        }
+    }
+
+  g_warning ("No event filter found for id: %d\n", id);
+}
diff --git a/clutter/clutter-event.h b/clutter/clutter-event.h
index 65ba1511f..9e3969349 100644
--- a/clutter/clutter-event.h
+++ b/clutter/clutter-event.h
@@ -34,6 +34,7 @@
 G_BEGIN_DECLS
 
 #define CLUTTER_TYPE_EVENT	        (clutter_event_get_type ())
+#define CLUTTER_TYPE_EVENT_SEQUENCE	(clutter_event_sequence_get_type ())
 
 /**
  * CLUTTER_PRIORITY_EVENTS:
@@ -146,7 +147,8 @@ struct _ClutterAnyEvent
  * @keyval: raw key value
  * @hardware_keycode: raw hardware key value
  * @unicode_value: Unicode representation
- * @device: reserved for future use
+ * @device: the device that originated the event. If you want the physical
+ * device the event originated from, use clutter_event_get_source_device()
  *
  * Key event
  *
@@ -181,7 +183,8 @@ struct _ClutterKeyEvent
  * @click_count: number of button presses within the default time
  *   and radius
  * @axes: reserved for future use
- * @device: reserved for future use
+ * @device: the device that originated the event. If you want the physical
+ * device the event originated from, use clutter_event_get_source_device()
  *
  * Button event.
  *
@@ -218,7 +221,8 @@ struct _ClutterButtonEvent
  * @x: event X coordinate
  * @y: event Y coordinate
  * @related: actor related to the crossing
- * @device: reserved for future use
+ * @device: the device that originated the event. If you want the physical
+ * device the event originated from, use clutter_event_get_source_device()
  *
  * Event for the movement of the pointer across different actors
  *
@@ -249,7 +253,8 @@ struct _ClutterCrossingEvent
  * @y: event Y coordinate
  * @modifier_state: button modifiers
  * @axes: reserved for future use
- * @device: reserved for future use
+ * @device: the device that originated the event. If you want the physical
+ * device the event originated from, use clutter_event_get_source_device()
  *
  * Event for the pointer motion
  *
@@ -282,7 +287,8 @@ struct _ClutterMotionEvent
  * @direction: direction of the scrolling
  * @modifier_state: button modifiers
  * @axes: reserved for future use
- * @device: reserved for future use
+ * @device: the device that originated the event. If you want the physical
+ * device the event originated from, use clutter_event_get_source_device()
  *
  * Scroll wheel (or similar device) event
  *
@@ -344,7 +350,8 @@ struct _ClutterStageStateEvent
  *   of modifier keys (e.g. Control, Shift, and Alt) and the pointer
  *   buttons. See #ClutterModifierType
  * @axes: reserved 
- * @device: the device that originated the event
+ * @device: the device that originated the event. If you want the physical
+ * device the event originated from, use clutter_event_get_source_device()
  *
  * Used for touch events.
  *
@@ -399,47 +406,108 @@ union _ClutterEvent
   ClutterTouchEvent touch;
 };
 
+/**
+ * ClutterEventFilterFunc:
+ * @event: the event that is going to be emitted
+ * @user_data: the data pointer passed to clutter_event_add_filter()
+ *
+ * A function pointer type used by event filters that are added with
+ * clutter_event_add_filter().
+ *
+ * Return value: %CLUTTER_EVENT_STOP to indicate that the event
+ *   has been handled or %CLUTTER_EVENT_PROPAGATE otherwise.
+ *   Returning %CLUTTER_EVENT_STOP skips any further filter
+ *   functions and prevents the signal emission for the event.
+ *
+ * Since: 1.18
+ */
+typedef gboolean (* ClutterEventFilterFunc) (const ClutterEvent *event,
+                                             gpointer            user_data);
+
+CLUTTER_AVAILABLE_IN_ALL
 GType clutter_event_get_type (void) G_GNUC_CONST;
 
+CLUTTER_AVAILABLE_IN_1_20
+GType clutter_event_sequence_get_type (void) G_GNUC_CONST;
+
+CLUTTER_AVAILABLE_IN_ALL
 gboolean                clutter_events_pending                  (void);
+CLUTTER_AVAILABLE_IN_ALL
 ClutterEvent *          clutter_event_get                       (void);
+CLUTTER_AVAILABLE_IN_ALL
 ClutterEvent *          clutter_event_peek                      (void);
+CLUTTER_AVAILABLE_IN_ALL
 void                    clutter_event_put                       (const ClutterEvent     *event);
 
+CLUTTER_AVAILABLE_IN_1_18
+guint                   clutter_event_add_filter                (ClutterStage          *stage,
+                                                                 ClutterEventFilterFunc func,
+                                                                 GDestroyNotify         notify,
+                                                                 gpointer               user_data);
+CLUTTER_AVAILABLE_IN_1_18
+void                    clutter_event_remove_filter             (guint                  id);
+
+CLUTTER_AVAILABLE_IN_ALL
 ClutterEvent *          clutter_event_new                       (ClutterEventType        type);
+CLUTTER_AVAILABLE_IN_ALL
 ClutterEvent *          clutter_event_copy                      (const ClutterEvent     *event);
+CLUTTER_AVAILABLE_IN_ALL
 void                    clutter_event_free                      (ClutterEvent           *event);
 
+CLUTTER_AVAILABLE_IN_ALL
 ClutterEventType        clutter_event_type                      (const ClutterEvent     *event);
+CLUTTER_AVAILABLE_IN_1_8
 void                    clutter_event_set_flags                 (ClutterEvent           *event,
                                                                  ClutterEventFlags       flags);
+CLUTTER_AVAILABLE_IN_1_0
 ClutterEventFlags       clutter_event_get_flags                 (const ClutterEvent     *event);
+CLUTTER_AVAILABLE_IN_1_8
 void                    clutter_event_set_time                  (ClutterEvent           *event,
                                                                  guint32                 time_);
+CLUTTER_AVAILABLE_IN_ALL
 guint32                 clutter_event_get_time                  (const ClutterEvent     *event);
+CLUTTER_AVAILABLE_IN_1_8
 void                    clutter_event_set_state                 (ClutterEvent           *event,
                                                                  ClutterModifierType     state);
+CLUTTER_AVAILABLE_IN_ALL
 ClutterModifierType     clutter_event_get_state                 (const ClutterEvent     *event);
+CLUTTER_AVAILABLE_IN_1_16
+void                    clutter_event_get_state_full            (const ClutterEvent     *event,
+								 ClutterModifierType    *button_state,
+								 ClutterModifierType    *base_state,
+								 ClutterModifierType    *latched_state,
+								 ClutterModifierType    *locked_state,
+								 ClutterModifierType    *effective_state);
+CLUTTER_AVAILABLE_IN_1_6
 void                    clutter_event_set_device                (ClutterEvent           *event,
                                                                  ClutterInputDevice     *device);
+CLUTTER_AVAILABLE_IN_1_6
 ClutterInputDevice *    clutter_event_get_device                (const ClutterEvent     *event);
+CLUTTER_AVAILABLE_IN_1_6
 void                    clutter_event_set_source_device         (ClutterEvent           *event,
                                                                  ClutterInputDevice     *device);
 
+CLUTTER_AVAILABLE_IN_1_6
 ClutterInputDevice *    clutter_event_get_source_device         (const ClutterEvent     *event);
+CLUTTER_AVAILABLE_IN_1_8
 void                    clutter_event_set_source                (ClutterEvent           *event,
                                                                  ClutterActor           *actor);
+CLUTTER_AVAILABLE_IN_ALL
 ClutterActor *          clutter_event_get_source                (const ClutterEvent     *event);
+CLUTTER_AVAILABLE_IN_1_8
 void                    clutter_event_set_stage                 (ClutterEvent           *event,
                                                                  ClutterStage           *stage);
+CLUTTER_AVAILABLE_IN_ALL
 ClutterStage *          clutter_event_get_stage                 (const ClutterEvent     *event);
-
+CLUTTER_AVAILABLE_IN_ALL
 gint                    clutter_event_get_device_id             (const ClutterEvent     *event);
+CLUTTER_AVAILABLE_IN_1_0
 ClutterInputDeviceType  clutter_event_get_device_type           (const ClutterEvent     *event);
-
+CLUTTER_AVAILABLE_IN_1_8
 void                    clutter_event_set_coords                (ClutterEvent           *event,
                                                                  gfloat                  x,
                                                                  gfloat                  y);
+CLUTTER_AVAILABLE_IN_ALL
 void                    clutter_event_get_coords                (const ClutterEvent     *event,
                                                                  gfloat                 *x,
                                                                  gfloat                 *y);
@@ -452,38 +520,46 @@ float                   clutter_event_get_distance              (const ClutterEv
 CLUTTER_AVAILABLE_IN_1_12
 double                  clutter_event_get_angle                 (const ClutterEvent     *source,
                                                                  const ClutterEvent     *target);
-
+CLUTTER_AVAILABLE_IN_1_6
 gdouble *               clutter_event_get_axes                  (const ClutterEvent     *event,
                                                                  guint                  *n_axes);
-
 CLUTTER_AVAILABLE_IN_1_12
 gboolean                clutter_event_has_shift_modifier        (const ClutterEvent     *event);
 CLUTTER_AVAILABLE_IN_1_12
 gboolean                clutter_event_has_control_modifier      (const ClutterEvent     *event);
 CLUTTER_AVAILABLE_IN_1_12
 gboolean                clutter_event_is_pointer_emulated       (const ClutterEvent     *event);
-
+CLUTTER_AVAILABLE_IN_1_8
 void                    clutter_event_set_key_symbol            (ClutterEvent           *event,
                                                                  guint                   key_sym);
+CLUTTER_AVAILABLE_IN_1_0
 guint                   clutter_event_get_key_symbol            (const ClutterEvent     *event);
+CLUTTER_AVAILABLE_IN_1_8
 void                    clutter_event_set_key_code              (ClutterEvent           *event,
                                                                  guint16                 key_code);
+CLUTTER_AVAILABLE_IN_1_0
 guint16                 clutter_event_get_key_code              (const ClutterEvent     *event);
+CLUTTER_AVAILABLE_IN_1_8
 void                    clutter_event_set_key_unicode           (ClutterEvent           *event,
                                                                  gunichar                key_unicode);
+CLUTTER_AVAILABLE_IN_1_0
 gunichar                clutter_event_get_key_unicode           (const ClutterEvent     *event);
-
+CLUTTER_AVAILABLE_IN_1_8
 void                    clutter_event_set_button                (ClutterEvent           *event,
                                                                  guint32                 button);
+CLUTTER_AVAILABLE_IN_1_0
 guint32                 clutter_event_get_button                (const ClutterEvent     *event);
+CLUTTER_AVAILABLE_IN_1_0
 guint                   clutter_event_get_click_count           (const ClutterEvent     *event);
-
+CLUTTER_AVAILABLE_IN_1_8
 void                    clutter_event_set_related               (ClutterEvent           *event,
                                                                  ClutterActor           *actor);
+CLUTTER_AVAILABLE_IN_1_0
 ClutterActor *          clutter_event_get_related               (const ClutterEvent     *event);
-
+CLUTTER_AVAILABLE_IN_1_8
 void                    clutter_event_set_scroll_direction      (ClutterEvent           *event,
                                                                  ClutterScrollDirection  direction);
+CLUTTER_AVAILABLE_IN_1_0
 ClutterScrollDirection  clutter_event_get_scroll_direction      (const ClutterEvent     *event);
 CLUTTER_AVAILABLE_IN_1_10
 void                    clutter_event_set_scroll_delta          (ClutterEvent           *event,
@@ -497,11 +573,14 @@ void                    clutter_event_get_scroll_delta          (const ClutterEv
 CLUTTER_AVAILABLE_IN_1_10
 ClutterEventSequence *  clutter_event_get_event_sequence        (const ClutterEvent     *event);
 
+CLUTTER_AVAILABLE_IN_ALL
 guint32                 clutter_keysym_to_unicode               (guint                   keyval);
 CLUTTER_AVAILABLE_IN_1_10
 guint                   clutter_unicode_to_keysym               (guint32                 wc);
 
+CLUTTER_AVAILABLE_IN_1_0
 guint32                 clutter_get_current_event_time          (void);
+CLUTTER_AVAILABLE_IN_1_2
 const ClutterEvent *    clutter_get_current_event               (void);
 
 G_END_DECLS
diff --git a/clutter/clutter-feature.h b/clutter/clutter-feature.h
index 4242ce0fb..083f1a9cc 100644
--- a/clutter/clutter-feature.h
+++ b/clutter/clutter-feature.h
@@ -32,7 +32,9 @@
 
 G_BEGIN_DECLS
 
+CLUTTER_AVAILABLE_IN_ALL
 gboolean            clutter_feature_available       (ClutterFeatureFlags feature);
+CLUTTER_AVAILABLE_IN_ALL
 ClutterFeatureFlags clutter_feature_get_all         (void);
 
 G_END_DECLS
diff --git a/clutter/clutter-fixed-layout.h b/clutter/clutter-fixed-layout.h
index 32273bc00..a64d900a9 100644
--- a/clutter/clutter-fixed-layout.h
+++ b/clutter/clutter-fixed-layout.h
@@ -71,8 +71,10 @@ struct _ClutterFixedLayoutClass
   ClutterLayoutManagerClass parent_class;
 };
 
+CLUTTER_AVAILABLE_IN_1_2
 GType clutter_fixed_layout_get_type (void) G_GNUC_CONST;
 
+CLUTTER_AVAILABLE_IN_1_2
 ClutterLayoutManager *clutter_fixed_layout_new (void);
 
 G_END_DECLS
diff --git a/clutter/clutter-flow-layout.c b/clutter/clutter-flow-layout.c
index 97524b219..064566643 100644
--- a/clutter/clutter-flow-layout.c
+++ b/clutter/clutter-flow-layout.c
@@ -29,40 +29,25 @@
  * #ClutterFlowLayout is a layout manager which implements the following
  * policy:
  *
- * <itemizedlist>
- *   <listitem><para>the preferred natural size depends on the value
+ *   - the preferred natural size depends on the value
  *   of the #ClutterFlowLayout:orientation property; the layout will try
  *   to maintain all its children on a single row or
- *   column;</para></listitem>
- *   <listitem><para>if either the width or the height allocated are
+ *   column;
+ *   - if either the width or the height allocated are
  *   smaller than the preferred ones, the layout will wrap; in this case,
  *   the preferred height or width, respectively, will take into account
- *   the amount of columns and rows;</para></listitem>
- *   <listitem><para>each line (either column or row) in reflowing will
+ *   the amount of columns and rows;
+ *   - each line (either column or row) in reflowing will
  *   have the size of the biggest cell on that line; if the
  *   #ClutterFlowLayout:homogeneous property is set to %FALSE the actor
  *   will be allocated within that area, and if set to %TRUE instead the
- *   actor will be given exactly that area;</para></listitem>
- *   <listitem><para>the size of the columns or rows can be controlled
+ *   actor will be given exactly that area;
+ *   - the size of the columns or rows can be controlled
  *   for both minimum and maximum; the spacing can also be controlled
- *   in both columns and rows.</para></listitem>
- * </itemizedlist>
+ *   in both columns and rows.
  *
- * <figure id="flow-layout-image">
- *   <title>Horizontal flow layout</title>
- *   <para>The image shows a #ClutterFlowLayout with the
- *   #ClutterFlowLayout:orientation propert set to
- *   %CLUTTER_FLOW_HORIZONTAL.</para>
- *   <graphic fileref="flow-layout.png" format="PNG"/>
- * </figure>
- *
- * <informalexample>
- *  <programlisting>
- * <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" parse="text" href="../../../../examples/flow-layout.c">
- *   <xi:fallback>FIXME: MISSING XINCLUDE CONTENT</xi:fallback>
- * </xi:include>
- *  </programlisting>
- * </informalexample>
+ * The [flow-layout example](https://git.gnome.org/browse/clutter/tree/examples/flow-layout.c?h=clutter-1.18)
+ * shows how to use the #ClutterFlowLayout.
  *
  * #ClutterFlowLayout is available since Clutter 1.2
  */
@@ -85,8 +70,6 @@
 #include "clutter-layout-meta.h"
 #include "clutter-private.h"
 
-#define CLUTTER_FLOW_LAYOUT_GET_PRIVATE(obj)    (G_TYPE_INSTANCE_GET_PRIVATE ((obj), CLUTTER_TYPE_FLOW_LAYOUT, ClutterFlowLayoutPrivate))
-
 struct _ClutterFlowLayoutPrivate
 {
   ClutterContainer *container;
@@ -113,6 +96,7 @@ struct _ClutterFlowLayoutPrivate
   guint line_count;
 
   guint is_homogeneous : 1;
+  guint snap_to_grid : 1;
 };
 
 enum
@@ -131,14 +115,16 @@ enum
   PROP_MIN_ROW_HEGHT,
   PROP_MAX_ROW_HEIGHT,
 
+  PROP_SNAP_TO_GRID,
+
   N_PROPERTIES
 };
 
 static GParamSpec *flow_properties[N_PROPERTIES] = { NULL, };
 
-G_DEFINE_TYPE (ClutterFlowLayout,
-               clutter_flow_layout,
-               CLUTTER_TYPE_LAYOUT_MANAGER);
+G_DEFINE_TYPE_WITH_PRIVATE (ClutterFlowLayout,
+                            clutter_flow_layout,
+                            CLUTTER_TYPE_LAYOUT_MANAGER)
 
 static gint
 get_columns (ClutterFlowLayout *self,
@@ -258,7 +244,12 @@ clutter_flow_layout_get_preferred_width (ClutterLayoutManager *manager,
 
       if (priv->orientation == CLUTTER_FLOW_VERTICAL && for_height > 0)
         {
-          if (line_item_count == n_rows)
+          clutter_actor_get_preferred_height (child, -1,
+                                              &child_min,
+                                              &child_natural);
+
+          if ((priv->snap_to_grid && line_item_count == n_rows) ||
+              (!priv->snap_to_grid && item_y + child_natural > for_height))
             {
               total_min_width += line_min_width;
               total_natural_width += line_natural_width;
@@ -275,9 +266,17 @@ clutter_flow_layout_get_preferred_width (ClutterLayoutManager *manager,
               item_y = 0;
             }
 
-          new_y = ((line_item_count + 1) * (for_height + priv->row_spacing))
-                / n_rows;
-          item_height = new_y - item_y - priv->row_spacing;
+          if (priv->snap_to_grid)
+            {
+              new_y = ((line_item_count + 1) * (for_height + priv->row_spacing))
+                    / n_rows;
+              item_height = new_y - item_y - priv->row_spacing;
+            }
+          else
+            {
+              new_y = item_y + child_natural + priv->row_spacing;
+              item_height = child_natural;
+            }
 
           clutter_actor_get_preferred_width (child, item_height,
                                              &child_min,
@@ -436,7 +435,12 @@ clutter_flow_layout_get_preferred_height (ClutterLayoutManager *manager,
 
       if (priv->orientation == CLUTTER_FLOW_HORIZONTAL && for_width > 0)
         {
-          if (line_item_count == n_columns)
+          clutter_actor_get_preferred_width (child, -1,
+                                             &child_min,
+                                             &child_natural);
+
+          if ((priv->snap_to_grid && line_item_count == n_columns) ||
+              (!priv->snap_to_grid && item_x + child_natural > for_width))
             {
               total_min_height += line_min_height;
               total_natural_height += line_natural_height;
@@ -453,9 +457,17 @@ clutter_flow_layout_get_preferred_height (ClutterLayoutManager *manager,
               item_x = 0;
             }
 
-          new_x = ((line_item_count + 1) * (for_width + priv->col_spacing))
-                / n_columns;
-          item_width = new_x - item_x - priv->col_spacing;
+          if (priv->snap_to_grid)
+            {
+              new_x = ((line_item_count + 1) * (for_width + priv->col_spacing))
+                    / n_columns;
+              item_width = new_x - item_x - priv->col_spacing;
+            }
+          else
+            {
+              new_x = item_x + child_natural + priv->col_spacing;
+              item_width = child_natural;
+            }
 
           clutter_actor_get_preferred_height (child, item_width,
                                               &child_min,
@@ -606,15 +618,24 @@ clutter_flow_layout_allocate (ClutterLayoutManager   *manager,
       ClutterActorBox child_alloc;
       gfloat item_width, item_height;
       gfloat new_x, new_y;
+      gfloat child_min, child_natural;
 
       if (!CLUTTER_ACTOR_IS_VISIBLE (child))
         continue;
 
       new_x = new_y = 0;
 
+      if (!priv->snap_to_grid)
+        clutter_actor_get_preferred_size (child,
+                                          NULL, NULL,
+                                          &item_width,
+                                          &item_height);
+
       if (priv->orientation == CLUTTER_FLOW_HORIZONTAL)
         {
-          if (line_item_count == items_per_line && line_item_count > 0)
+          if ((priv->snap_to_grid &&
+               line_item_count == items_per_line && line_item_count > 0) ||
+              (!priv->snap_to_grid && item_x + item_width > avail_width))
             {
               item_y += g_array_index (priv->line_natural,
                                        gfloat,
@@ -629,31 +650,27 @@ clutter_flow_layout_allocate (ClutterLayoutManager   *manager,
               item_x = x_off;
             }
 
-          new_x = x_off + ((line_item_count + 1) * (avail_width + priv->col_spacing))
-                / items_per_line;
-          item_width = new_x - item_x - priv->col_spacing;
+          if (priv->snap_to_grid)
+            {
+              new_x = x_off + ((line_item_count + 1) * (avail_width + priv->col_spacing))
+                    / items_per_line;
+              item_width = new_x - item_x - priv->col_spacing;
+            }
+          else
+            {
+              new_x = item_x + item_width + priv->col_spacing;
+            }
+
           item_height = g_array_index (priv->line_natural,
                                        gfloat,
                                        line_index);
 
-          if (!priv->is_homogeneous)
-            {
-              gfloat child_min, child_natural;
-
-              clutter_actor_get_preferred_width (child, item_height,
-                                                 &child_min,
-                                                 &child_natural);
-              item_width = MIN (item_width, child_natural);
-
-              clutter_actor_get_preferred_height (child, item_width,
-                                                  &child_min,
-                                                  &child_natural);
-              item_height = MIN (item_height, child_natural);
-            }
         }
       else
         {
-          if (line_item_count == items_per_line && line_item_count > 0)
+          if ((priv->snap_to_grid &&
+               line_item_count == items_per_line && line_item_count > 0) ||
+              (!priv->snap_to_grid && item_y + item_height > avail_height))
             {
               item_x += g_array_index (priv->line_natural,
                                        gfloat,
@@ -668,27 +685,40 @@ clutter_flow_layout_allocate (ClutterLayoutManager   *manager,
               item_y = y_off;
             }
 
-          new_y = y_off + ((line_item_count + 1) * (avail_height + priv->row_spacing))
-                / items_per_line;
-          item_height = new_y - item_y - priv->row_spacing;
+          if (priv->snap_to_grid)
+            {
+              new_y = y_off + ((line_item_count + 1) * (avail_height + priv->row_spacing))
+                    / items_per_line;
+              item_height = new_y - item_y - priv->row_spacing;
+            }
+          else
+            {
+              new_y = item_y + item_height + priv->row_spacing;
+            }
+
           item_width = g_array_index (priv->line_natural,
                                       gfloat,
                                       line_index);
+        }
 
-          if (!priv->is_homogeneous)
-            {
-              gfloat child_min, child_natural;
+      if (!priv->is_homogeneous &&
+          !clutter_actor_needs_expand (child,
+                                       CLUTTER_ORIENTATION_HORIZONTAL))
+        {
+          clutter_actor_get_preferred_width (child, item_height,
+                                             &child_min,
+                                             &child_natural);
+          item_width = MIN (item_width, child_natural);
+        }
 
-              clutter_actor_get_preferred_width (child, item_height,
-                                                 &child_min,
-                                                 &child_natural);
-              item_width = MIN (item_width, child_natural);
-
-              clutter_actor_get_preferred_height (child, item_width,
-                                                  &child_min,
-                                                  &child_natural);
-              item_height = MIN (item_height, child_natural);
-            }
+      if (!priv->is_homogeneous &&
+          !clutter_actor_needs_expand (child,
+                                       CLUTTER_ORIENTATION_VERTICAL))
+        {
+          clutter_actor_get_preferred_height (child, item_width,
+                                              &child_min,
+                                              &child_natural);
+          item_height = MIN (item_height, child_natural);
         }
 
       CLUTTER_NOTE (LAYOUT,
@@ -789,6 +819,11 @@ clutter_flow_layout_set_property (GObject      *gobject,
                                           g_value_get_float (value));
       break;
 
+    case PROP_SNAP_TO_GRID:
+      clutter_flow_layout_set_snap_to_grid (self,
+                                            g_value_get_boolean (value));
+      break;
+
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (gobject, prop_id, pspec);
       break;
@@ -837,6 +872,10 @@ clutter_flow_layout_get_property (GObject    *gobject,
       g_value_set_float (value, priv->max_row_height);
       break;
 
+    case PROP_SNAP_TO_GRID:
+      g_value_set_boolean (value, priv->snap_to_grid);
+      break;
+
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (gobject, prop_id, pspec);
       break;
@@ -863,8 +902,6 @@ clutter_flow_layout_class_init (ClutterFlowLayoutClass *klass)
   GObjectClass *gobject_class;
   ClutterLayoutManagerClass *layout_class;
 
-  g_type_class_add_private (klass, sizeof (ClutterFlowLayoutPrivate));
-
   gobject_class = G_OBJECT_CLASS (klass);
   layout_class = CLUTTER_LAYOUT_MANAGER_CLASS (klass);
 
@@ -1004,6 +1041,21 @@ clutter_flow_layout_class_init (ClutterFlowLayoutClass *klass)
                         -1.0,
                         CLUTTER_PARAM_READWRITE);
 
+  /**
+   * ClutterFlowLayout:snap-to-grid:
+   *
+   * Whether the #ClutterFlowLayout should arrange its children
+   * on a grid
+   *
+   * Since: 1.16
+   */
+  flow_properties[PROP_SNAP_TO_GRID] =
+    g_param_spec_boolean ("snap-to-grid",
+                          P_("Snap to grid"),
+                          P_("Snap to grid"),
+                          TRUE,
+                          CLUTTER_PARAM_READWRITE);
+
   gobject_class->finalize = clutter_flow_layout_finalize;
   gobject_class->set_property = clutter_flow_layout_set_property;
   gobject_class->get_property = clutter_flow_layout_get_property;
@@ -1017,7 +1069,7 @@ clutter_flow_layout_init (ClutterFlowLayout *self)
 {
   ClutterFlowLayoutPrivate *priv;
 
-  self->priv = priv = CLUTTER_FLOW_LAYOUT_GET_PRIVATE (self);
+  self->priv = priv = clutter_flow_layout_get_instance_private (self);
 
   priv->orientation = CLUTTER_FLOW_HORIZONTAL;
 
@@ -1029,6 +1081,7 @@ clutter_flow_layout_init (ClutterFlowLayout *self)
 
   priv->line_min = NULL;
   priv->line_natural = NULL;
+  priv->snap_to_grid = TRUE;
 }
 
 /**
@@ -1434,3 +1487,51 @@ clutter_flow_layout_get_row_height (ClutterFlowLayout *layout,
   if (max_height)
     *max_height = layout->priv->max_row_height;
 }
+
+/**
+ * clutter_flow_layout_set_snap_to_grid:
+ * @layout: a #ClutterFlowLayout
+ * @snap_to_grid: %TRUE if @layout should place its children on a grid
+ *
+ * Whether the @layout should place its children on a grid.
+ *
+ * Since: 1.16
+ */
+void
+clutter_flow_layout_set_snap_to_grid (ClutterFlowLayout *layout,
+                                      gboolean           snap_to_grid)
+{
+  ClutterFlowLayoutPrivate *priv;
+
+  g_return_if_fail (CLUTTER_IS_FLOW_LAYOUT (layout));
+
+  priv = layout->priv;
+
+  if (priv->snap_to_grid != snap_to_grid)
+    {
+      priv->snap_to_grid = snap_to_grid;
+
+      clutter_layout_manager_layout_changed (CLUTTER_LAYOUT_MANAGER (layout));
+
+      g_object_notify_by_pspec (G_OBJECT (layout),
+                                flow_properties[PROP_SNAP_TO_GRID]);
+    }
+}
+
+/**
+ * clutter_flow_layout_get_snap_to_grid:
+ * @layout: a #ClutterFlowLayout
+ *
+ * Retrieves the value of #ClutterFlowLayout:snap-to-grid property
+ *
+ * Return value: %TRUE if the @layout is placing its children on a grid
+ *
+ * Since: 1.16
+ */
+gboolean
+clutter_flow_layout_get_snap_to_grid (ClutterFlowLayout *layout)
+{
+  g_return_val_if_fail (CLUTTER_IS_FLOW_LAYOUT (layout), FALSE);
+
+  return layout->priv->snap_to_grid;
+}
diff --git a/clutter/clutter-flow-layout.h b/clutter/clutter-flow-layout.h
index abbf82c85..f552c54a6 100644
--- a/clutter/clutter-flow-layout.h
+++ b/clutter/clutter-flow-layout.h
@@ -74,36 +74,55 @@ struct _ClutterFlowLayoutClass
   ClutterLayoutManagerClass parent_class;
 };
 
+CLUTTER_AVAILABLE_IN_1_2
 GType clutter_flow_layout_get_type (void) G_GNUC_CONST;
 
+CLUTTER_AVAILABLE_IN_1_2
 ClutterLayoutManager * clutter_flow_layout_new                (ClutterFlowOrientation  orientation);
 
+CLUTTER_AVAILABLE_IN_1_2
 void                   clutter_flow_layout_set_orientation    (ClutterFlowLayout      *layout,
                                                                ClutterFlowOrientation  orientation);
+CLUTTER_AVAILABLE_IN_1_2
 ClutterFlowOrientation clutter_flow_layout_get_orientation    (ClutterFlowLayout      *layout);
+CLUTTER_AVAILABLE_IN_1_2
 void                   clutter_flow_layout_set_homogeneous    (ClutterFlowLayout      *layout,
                                                                gboolean                homogeneous);
+CLUTTER_AVAILABLE_IN_1_2
 gboolean               clutter_flow_layout_get_homogeneous    (ClutterFlowLayout      *layout);
 
+CLUTTER_AVAILABLE_IN_1_2
 void                   clutter_flow_layout_set_column_spacing (ClutterFlowLayout      *layout,
                                                                gfloat                  spacing);
+CLUTTER_AVAILABLE_IN_1_2
 gfloat                 clutter_flow_layout_get_column_spacing (ClutterFlowLayout      *layout);
+CLUTTER_AVAILABLE_IN_1_2
 void                   clutter_flow_layout_set_row_spacing    (ClutterFlowLayout      *layout,
                                                                gfloat                  spacing);
+CLUTTER_AVAILABLE_IN_1_2
 gfloat                 clutter_flow_layout_get_row_spacing    (ClutterFlowLayout      *layout);
 
+CLUTTER_AVAILABLE_IN_1_2
 void                   clutter_flow_layout_set_column_width   (ClutterFlowLayout      *layout,
                                                                gfloat                  min_width,
                                                                gfloat                  max_width);
+CLUTTER_AVAILABLE_IN_1_2
 void                   clutter_flow_layout_get_column_width   (ClutterFlowLayout      *layout,
                                                                gfloat                 *min_width,
                                                                gfloat                 *max_width);
+CLUTTER_AVAILABLE_IN_1_2
 void                   clutter_flow_layout_set_row_height     (ClutterFlowLayout      *layout,
                                                                gfloat                  min_height,
                                                                gfloat                  max_height);
+CLUTTER_AVAILABLE_IN_1_2
 void                   clutter_flow_layout_get_row_height     (ClutterFlowLayout      *layout,
                                                                gfloat                 *min_height,
                                                                gfloat                 *max_height);
+CLUTTER_AVAILABLE_IN_1_16
+void                   clutter_flow_layout_set_snap_to_grid   (ClutterFlowLayout      *layout,
+                                                               gboolean                snap_to_grid);
+CLUTTER_AVAILABLE_IN_1_16
+gboolean               clutter_flow_layout_get_snap_to_grid   (ClutterFlowLayout      *layout);
 
 G_END_DECLS
 
diff --git a/clutter/clutter-gesture-action-private.h b/clutter/clutter-gesture-action-private.h
index d3eb8659a..cd804abc7 100644
--- a/clutter/clutter-gesture-action-private.h
+++ b/clutter/clutter-gesture-action-private.h
@@ -26,34 +26,6 @@
 
 G_BEGIN_DECLS
 
-/*< private >
- * ClutterGestureTriggerEdge:
- * @CLUTTER_GESTURE_TRIGGER_NONE: Tell #ClutterGestureAction that
- * the gesture must begin immediately and there's no drag limit that
- * will cause its cancellation;
- * @CLUTTER_GESTURE_TRIGGER_AFTER: Tell #ClutterGestureAction that
- * it needs to wait until the drag threshold has been exceeded before
- * considering that the gesture has begun;
- * @CLUTTER_GESTURE_TRIGGER_BEFORE: Tell #ClutterGestureAction that
- * the gesture must begin immegiately and that it must be cancelled
- * once the drag exceed the configured threshold.
- *
- * Enum passed to the _clutter_gesture_action_set_threshold_trigger_edge()
- * function.
- *
- * Since: 1.14
- */
-typedef enum
-{
-  CLUTTER_GESTURE_TRIGGER_EDGE_NONE  = 0,
-  CLUTTER_GESTURE_TRIGGER_EDGE_AFTER,
-  CLUTTER_GESTURE_TRIGGER_EDGE_BEFORE
-} ClutterGestureTriggerEdge;
-
-
-void    _clutter_gesture_action_set_threshold_trigger_edge (ClutterGestureAction     *action,
-                                                            ClutterGestureTriggerEdge edge);
-
 G_END_DECLS
 
 #endif /* __CLUTTER_GESTURE_ACTION_PRIVATE_H__ */
diff --git a/clutter/clutter-gesture-action.c b/clutter/clutter-gesture-action.c
index 751555a44..6eca26f9c 100644
--- a/clutter/clutter-gesture-action.c
+++ b/clutter/clutter-gesture-action.c
@@ -38,7 +38,7 @@
  * To use #ClutterGestureAction you just need to apply it to a #ClutterActor
  * using clutter_actor_add_action() and connect to the signals:
  *
- * |[
+ * |[<!-- language="C" -->
  *   ClutterAction *action = clutter_gesture_action_new ();
  *
  *   clutter_actor_add_action (actor, action);
@@ -48,37 +48,37 @@
  *   g_signal_connect (action, "gesture-end", G_CALLBACK (on_gesture_end), NULL);
  * ]|
  *
- * <refsect2 id="creating-gesture-action">
- *   <title>Creating Gesture actions</title>
- *   <para>A #ClutterGestureAction provides four separate states that can be
- *   used to recognize or ignore gestures when writing a new action class:</para>
- *   <informalexample><programlisting><![CDATA[
-  Prepare -> Cancel
-  Prepare -> Begin -> Cancel
-  Prepare -> Begin -> End
-  Prepare -> Begin -> Progress -> Cancel
-  Prepare -> Begin -> Progress -> End
- * ]]>
- *   </programlisting></informalexample>
- *   <para>Each #ClutterGestureAction starts in the "prepare" state, and calls
- *   the #ClutterGestureActionClass.gesture_prepare() virtual function; this
- *   state can be used to reset the internal state of a #ClutterGestureAction
- *   subclass, but it can also immediately cancel a gesture without going
- *   through the rest of the states.</para>
- *   <para>The "begin" state follows the "prepare" state, and calls the
- *   #ClutterGestureActionClass.gesture_begin() virtual function. This state
- *   signals the start of a gesture recognizing process. From the "begin" state
- *   the gesture recognition process can successfully end, by going to the
- *   "end" state; it can continue in the "progress" state, in case of a
- *   continuous gesture; or it can be terminated, by moving to the "cancel"
- *   state.</para>
- *   <para>In case of continuous gestures, the #ClutterGestureAction will use
- *   the "progress" state, calling the #ClutterGestureActionClass.gesture_progress()
- *   virtual function; the "progress" state will continue until the end of the
- *   gesture, in which case the "end" state will be reached, or until the
- *   gesture is cancelled, in which case the "cancel" gesture will be used
- *   instead.</para>
- * </refsect2>
+ * ## Creating Gesture actions
+ *
+ * A #ClutterGestureAction provides four separate states that can be
+ * used to recognize or ignore gestures when writing a new action class:
+ *
+ *  - Prepare -> Cancel
+ *  - Prepare -> Begin -> Cancel
+ *  - Prepare -> Begin -> End
+ *  - Prepare -> Begin -> Progress -> Cancel
+ *  - Prepare -> Begin -> Progress -> End
+ *
+ * Each #ClutterGestureAction starts in the "prepare" state, and calls
+ * the #ClutterGestureActionClass.gesture_prepare() virtual function; this
+ * state can be used to reset the internal state of a #ClutterGestureAction
+ * subclass, but it can also immediately cancel a gesture without going
+ * through the rest of the states.
+ *
+ * The "begin" state follows the "prepare" state, and calls the
+ * #ClutterGestureActionClass.gesture_begin() virtual function. This state
+ * signals the start of a gesture recognizing process. From the "begin" state
+ * the gesture recognition process can successfully end, by going to the
+ * "end" state; it can continue in the "progress" state, in case of a
+ * continuous gesture; or it can be terminated, by moving to the "cancel"
+ * state.
+ *
+ * In case of continuous gestures, the #ClutterGestureAction will use
+ * the "progress" state, calling the #ClutterGestureActionClass.gesture_progress()
+ * virtual function; the "progress" state will continue until the end of the
+ * gesture, in which case the "end" state will be reached, or until the
+ * gesture is cancelled, in which case the "cancel" gesture will be used
+ * instead.
  *
  * Since: 1.8
  */
@@ -124,10 +124,23 @@ struct _ClutterGestureActionPrivate
   gulong stage_capture_id;
 
   ClutterGestureTriggerEdge edge;
+  float distance_x, distance_y;
 
   guint in_gesture : 1;
 };
 
+enum
+{
+  PROP_0,
+
+  PROP_N_TOUCH_POINTS,
+  PROP_THRESHOLD_TRIGGER_EDGE,
+  PROP_THRESHOLD_TRIGGER_DISTANCE_X,
+  PROP_THRESHOLD_TRIGGER_DISTANCE_Y,
+
+  PROP_LAST
+};
+
 enum
 {
   GESTURE_BEGIN,
@@ -138,9 +151,10 @@ enum
   LAST_SIGNAL
 };
 
+static GParamSpec *gesture_props[PROP_LAST];
 static guint gesture_signals[LAST_SIGNAL] = { 0, };
 
-G_DEFINE_TYPE (ClutterGestureAction, clutter_gesture_action, CLUTTER_TYPE_ACTION);
+G_DEFINE_TYPE_WITH_PRIVATE (ClutterGestureAction, clutter_gesture_action, CLUTTER_TYPE_ACTION)
 
 static GesturePoint *
 gesture_register_point (ClutterGestureAction *action, ClutterEvent *event)
@@ -210,11 +224,54 @@ gesture_unregister_point (ClutterGestureAction *action, gint position)
 {
   ClutterGestureActionPrivate *priv = action->priv;
 
+  if (action->priv->points->len == 0)
+    return;
+
   g_array_remove_index (priv->points, position);
 }
 
+static void
+gesture_update_motion_point (GesturePoint *point,
+                             ClutterEvent *event)
+{
+  gfloat motion_x, motion_y;
+  gint64 _time;
+
+  clutter_event_get_coords (event, &motion_x, &motion_y);
+
+  clutter_event_free (point->last_event);
+  point->last_event = clutter_event_copy (event);
+
+  point->last_delta_x = motion_x - point->last_motion_x;
+  point->last_delta_y = motion_y - point->last_motion_y;
+  point->last_motion_x = motion_x;
+  point->last_motion_y = motion_y;
+
+  _time = clutter_event_get_time (event);
+  point->last_delta_time = _time - point->last_motion_time;
+  point->last_motion_time = _time;
+}
+
+static void
+gesture_update_release_point (GesturePoint *point,
+                              ClutterEvent *event)
+{
+  gint64 _time;
+
+  clutter_event_get_coords (event, &point->release_x, &point->release_y);
+
+  clutter_event_free (point->last_event);
+  point->last_event = clutter_event_copy (event);
+
+  /* Treat the release event as the continuation of the last motion,
+   * in case the user keeps the pointer still for a while before
+   * releasing it. */
+   _time = clutter_event_get_time (event);
+   point->last_delta_time += _time - point->last_motion_time;
+}
+
 static gint
-gesture_get_threshold (ClutterGestureAction *action)
+gesture_get_default_threshold (void)
 {
   gint threshold;
   ClutterSettings *settings = clutter_settings_get_default ();
@@ -222,6 +279,23 @@ gesture_get_threshold (ClutterGestureAction *action)
   return threshold;
 }
 
+static gboolean
+gesture_point_pass_threshold (ClutterGestureAction *action,
+                              GesturePoint         *point,
+                              ClutterEvent         *event)
+{
+  float threshold_x, threshold_y;
+  gfloat motion_x, motion_y;
+
+  clutter_event_get_coords (event, &motion_x, &motion_y);
+  clutter_gesture_action_get_threshold_trigger_distance (action, &threshold_x, &threshold_y);
+
+  if ((fabsf (point->press_y - motion_y) < threshold_y) &&
+      (fabsf (point->press_x - motion_x) < threshold_x))
+    return TRUE;
+  return FALSE;
+}
+
 static void
 gesture_point_unset (GesturePoint *point)
 {
@@ -281,17 +355,25 @@ begin_gesture (ClutterGestureAction *action,
 }
 
 static gboolean
-stage_captured_event_cb (ClutterActor       *stage,
-                         ClutterEvent       *event,
+stage_captured_event_cb (ClutterActor         *stage,
+                         ClutterEvent         *event,
                          ClutterGestureAction *action)
 {
   ClutterGestureActionPrivate *priv = action->priv;
   ClutterActor *actor;
-  gint position, drag_threshold;
+  gint position;
+  float threshold_x, threshold_y;
   gboolean return_value;
   GesturePoint *point;
-  gfloat motion_x, motion_y;
-  gint64 time;
+  ClutterEventType event_type;
+
+  event_type = clutter_event_type (event);
+  if (event_type != CLUTTER_TOUCH_CANCEL &&
+      event_type != CLUTTER_TOUCH_UPDATE &&
+      event_type != CLUTTER_TOUCH_END &&
+      event_type != CLUTTER_MOTION &&
+      event_type != CLUTTER_BUTTON_RELEASE)
+    return CLUTTER_EVENT_PROPAGATE;
 
   if ((point = gesture_find_point (action, event, &position)) == NULL)
     return CLUTTER_EVENT_PROPAGATE;
@@ -317,39 +399,35 @@ stage_captured_event_cb (ClutterActor       *stage,
       /* Follow same code path as a touch event update */
 
     case CLUTTER_TOUCH_UPDATE:
-      clutter_event_get_coords (event,
-                                &motion_x,
-                                &motion_y);
-
-      if (priv->points->len < priv->requested_nb_points)
-        return CLUTTER_EVENT_PROPAGATE;
-
-      drag_threshold = gesture_get_threshold (action);
-
       if (!priv->in_gesture)
         {
+          if (priv->points->len < priv->requested_nb_points)
+            {
+              gesture_update_motion_point (point, event);
+              return CLUTTER_EVENT_PROPAGATE;
+            }
+
           /* Wait until the drag threshold has been exceeded
            * before starting _TRIGGER_EDGE_AFTER gestures. */
           if (priv->edge == CLUTTER_GESTURE_TRIGGER_EDGE_AFTER &&
-              (fabsf (point->press_y - motion_y) < drag_threshold) &&
-              (fabsf (point->press_x - motion_x) < drag_threshold))
-            return CLUTTER_EVENT_PROPAGATE;
+              gesture_point_pass_threshold (action, point, event))
+            {
+              gesture_update_motion_point (point, event);
+              return CLUTTER_EVENT_PROPAGATE;
+            }
 
-          if (!begin_gesture(action, actor))
+          if (!begin_gesture (action, actor))
+            {
+              if ((point = gesture_find_point (action, event, &position)) != NULL)
+                gesture_update_motion_point (point, event);
+              return CLUTTER_EVENT_PROPAGATE;
+            }
+
+          if ((point = gesture_find_point (action, event, &position)) == NULL)
             return CLUTTER_EVENT_PROPAGATE;
         }
 
-      clutter_event_free (point->last_event);
-      point->last_event = clutter_event_copy (event);
-
-      point->last_delta_x = motion_x - point->last_motion_x;
-      point->last_delta_y = motion_y - point->last_motion_y;
-      point->last_motion_x = motion_x;
-      point->last_motion_y = motion_y;
-
-      time = clutter_event_get_time (event);
-      point->last_delta_time = time - point->last_motion_time;
-      point->last_motion_time = time;
+      gesture_update_motion_point (point, event);
 
       g_signal_emit (action, gesture_signals[GESTURE_PROGRESS], 0, actor,
                      &return_value);
@@ -361,9 +439,10 @@ stage_captured_event_cb (ClutterActor       *stage,
 
       /* Check if a _TRIGGER_EDGE_BEFORE gesture needs to be cancelled because
        * the drag threshold has been exceeded. */
+      clutter_gesture_action_get_threshold_trigger_distance (action, &threshold_x, &threshold_y);
       if (priv->edge == CLUTTER_GESTURE_TRIGGER_EDGE_BEFORE &&
-          ((fabsf (point->press_y - motion_y) > drag_threshold) ||
-           (fabsf (point->press_x - motion_x) > drag_threshold)))
+          ((fabsf (point->press_y - point->last_motion_y) > threshold_y) ||
+           (fabsf (point->press_x - point->last_motion_x) > threshold_x)))
         {
           cancel_gesture (action);
           return CLUTTER_EVENT_PROPAGATE;
@@ -373,20 +452,11 @@ stage_captured_event_cb (ClutterActor       *stage,
     case CLUTTER_BUTTON_RELEASE:
     case CLUTTER_TOUCH_END:
       {
-        clutter_event_get_coords (event, &point->release_x, &point->release_y);
-
-        clutter_event_free (point->last_event);
-        point->last_event = clutter_event_copy (event);
+        gesture_update_release_point (point, event);
 
         if (priv->in_gesture &&
             ((priv->points->len - 1) < priv->requested_nb_points))
           {
-            /* Treat the release event as the continuation of the last motion,
-             * in case the user keeps the pointer still for a while before
-             * releasing it. */
-            time = clutter_event_get_time (event);
-            point->last_delta_time += time - point->last_motion_time;
-
             priv->in_gesture = FALSE;
             g_signal_emit (action, gesture_signals[GESTURE_END], 0, actor);
           }
@@ -397,6 +467,8 @@ stage_captured_event_cb (ClutterActor       *stage,
 
     case CLUTTER_TOUCH_CANCEL:
       {
+        gesture_update_release_point (point, event);
+
         if (priv->in_gesture)
           {
             priv->in_gesture = FALSE;
@@ -411,7 +483,7 @@ stage_captured_event_cb (ClutterActor       *stage,
       break;
     }
 
-  if (priv->points->len == 0)
+  if (priv->points->len == 0 && priv->stage_capture_id)
     {
       g_signal_handler_disconnect (priv->stage, priv->stage_capture_id);
       priv->stage_capture_id = 0;
@@ -448,7 +520,8 @@ actor_captured_event_cb (ClutterActor *actor,
 
   /* Start the gesture immediately if the gesture has no
    * _TRIGGER_EDGE_AFTER drag threshold. */
-  if (priv->edge != CLUTTER_GESTURE_TRIGGER_EDGE_AFTER)
+  if ((priv->points->len >= priv->requested_nb_points) &&
+      (priv->edge != CLUTTER_GESTURE_TRIGGER_EDGE_AFTER))
     begin_gesture (action, actor);
 
   return CLUTTER_EVENT_PROPAGATE;
@@ -499,32 +572,95 @@ default_event_handler (ClutterGestureAction *action,
   return TRUE;
 }
 
-
-/*< private >
- * _clutter_gesture_action_set_threshold_trigger_edge:
- * @action: a #ClutterGestureAction
- * @edge: the %ClutterGestureTriggerEdge
- *
- * Sets the edge trigger for the gesture drag threshold, if any.
- *
- * This function can be called by #ClutterGestureAction subclasses that needs
- * to change the %CLUTTER_GESTURE_TRIGGER_EDGE_AFTER default.
- *
- * Since: 1.14
- */
-void
-_clutter_gesture_action_set_threshold_trigger_edge  (ClutterGestureAction     *action,
-                                                     ClutterGestureTriggerEdge edge)
+static void
+clutter_gesture_action_set_property (GObject      *gobject,
+                                     guint         prop_id,
+                                     const GValue *value,
+                                     GParamSpec   *pspec)
 {
-  action->priv->edge = edge;
+  ClutterGestureAction *self = CLUTTER_GESTURE_ACTION (gobject);
+
+  switch (prop_id)
+    {
+    case PROP_N_TOUCH_POINTS:
+      clutter_gesture_action_set_n_touch_points (self, g_value_get_int (value));
+      break;
+
+    case PROP_THRESHOLD_TRIGGER_EDGE:
+      clutter_gesture_action_set_threshold_trigger_edge (self, g_value_get_enum (value));
+      break;
+
+    case PROP_THRESHOLD_TRIGGER_DISTANCE_X:
+      clutter_gesture_action_set_threshold_trigger_distance (self, g_value_get_float (value), self->priv->distance_y);
+      break;
+
+    case PROP_THRESHOLD_TRIGGER_DISTANCE_Y:
+      clutter_gesture_action_set_threshold_trigger_distance (self, self->priv->distance_x, g_value_get_float (value));
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (gobject, prop_id, pspec);
+      break;
+    }
+}
+
+static void
+clutter_gesture_action_get_property (GObject    *gobject,
+                                     guint       prop_id,
+                                     GValue     *value,
+                                     GParamSpec *pspec)
+{
+  ClutterGestureAction *self = CLUTTER_GESTURE_ACTION (gobject);
+
+  switch (prop_id)
+    {
+    case PROP_N_TOUCH_POINTS:
+      g_value_set_int (value, self->priv->requested_nb_points);
+      break;
+
+    case PROP_THRESHOLD_TRIGGER_EDGE:
+      g_value_set_enum (value, self->priv->edge);
+      break;
+
+    case PROP_THRESHOLD_TRIGGER_DISTANCE_X:
+      if (self->priv->distance_x > 0.0)
+        g_value_set_float (value, self->priv->distance_x);
+      else
+        g_value_set_float (value, gesture_get_default_threshold ());
+      break;
+
+    case PROP_THRESHOLD_TRIGGER_DISTANCE_Y:
+      if (self->priv->distance_y > 0.0)
+        g_value_set_float (value, self->priv->distance_y);
+      else
+        g_value_set_float (value, gesture_get_default_threshold ());
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (gobject, prop_id, pspec);
+      break;
+    }
+}
+
+static void
+clutter_gesture_action_finalize (GObject *gobject)
+{
+  ClutterGestureActionPrivate *priv = CLUTTER_GESTURE_ACTION (gobject)->priv;
+
+  g_array_unref (priv->points);
+
+  G_OBJECT_CLASS (clutter_gesture_action_parent_class)->finalize (gobject);
 }
 
 static void
 clutter_gesture_action_class_init (ClutterGestureActionClass *klass)
 {
+  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
   ClutterActorMetaClass *meta_class = CLUTTER_ACTOR_META_CLASS (klass);
 
-  g_type_class_add_private (klass, sizeof (ClutterGestureActionPrivate));
+  gobject_class->finalize = clutter_gesture_action_finalize;
+  gobject_class->set_property = clutter_gesture_action_set_property;
+  gobject_class->get_property = clutter_gesture_action_get_property;
 
   meta_class->set_actor = clutter_gesture_action_set_actor;
 
@@ -532,6 +668,80 @@ clutter_gesture_action_class_init (ClutterGestureActionClass *klass)
   klass->gesture_progress = default_event_handler;
   klass->gesture_prepare = default_event_handler;
 
+  /**
+   * ClutterGestureAction:n-touch-points:
+   *
+   * Number of touch points to trigger a gesture action.
+   *
+   * Since: 1.16
+   */
+  gesture_props[PROP_N_TOUCH_POINTS] =
+    g_param_spec_int ("n-touch-points",
+                      P_("Number touch points"),
+                      P_("Number of touch points"),
+                      1, G_MAXINT, 1,
+                      CLUTTER_PARAM_READWRITE);
+
+  /**
+   * ClutterGestureAction:threshold-trigger-edge:
+   *
+   * The trigger edge to be used by the action to either emit the
+   * #ClutterGestureAction::gesture-begin signal or to emit the
+   * #ClutterGestureAction::gesture-cancel signal.
+   *
+   * Since: 1.18
+   */
+  gesture_props[PROP_THRESHOLD_TRIGGER_EDGE] =
+    g_param_spec_enum ("threshold-trigger-edge",
+                       P_("Threshold Trigger Edge"),
+                       P_("The trigger edge used by the action"),
+                       CLUTTER_TYPE_GESTURE_TRIGGER_EDGE,
+                       CLUTTER_GESTURE_TRIGGER_EDGE_NONE,
+                       CLUTTER_PARAM_READWRITE |
+                       G_PARAM_CONSTRUCT_ONLY);
+
+  /**
+   * ClutterGestureAction:threshold-trigger-distance-x:
+   *
+   * The horizontal trigger distance to be used by the action to either
+   * emit the #ClutterGestureAction::gesture-begin signal or to emit
+   * the #ClutterGestureAction::gesture-cancel signal.
+   *
+   * A negative value will be interpreted as the default drag threshold.
+   *
+   * Since: 1.18
+   */
+  gesture_props[PROP_THRESHOLD_TRIGGER_DISTANCE_X] =
+    g_param_spec_float ("threshold-trigger-distance-x",
+                        P_("Threshold Trigger Horizontal Distance"),
+                        P_("The horizontal trigger distance used by the action"),
+                        -1.0, G_MAXFLOAT, -1.0,
+                        CLUTTER_PARAM_READWRITE |
+                        G_PARAM_CONSTRUCT_ONLY);
+
+  /**
+   * ClutterGestureAction:threshold-trigger-distance-y:
+   *
+   * The vertical trigger distance to be used by the action to either
+   * emit the #ClutterGestureAction::gesture-begin signal or to emit
+   * the #ClutterGestureAction::gesture-cancel signal.
+   *
+   * A negative value will be interpreted as the default drag threshold.
+   *
+   * Since: 1.18
+   */
+  gesture_props[PROP_THRESHOLD_TRIGGER_DISTANCE_Y] =
+    g_param_spec_float ("threshold-trigger-distance-y",
+                        P_("Threshold Trigger Vertical Distance"),
+                        P_("The vertical trigger distance used by the action"),
+                        -1.0, G_MAXFLOAT, -1.0,
+                        CLUTTER_PARAM_READWRITE |
+                        G_PARAM_CONSTRUCT_ONLY);
+
+  g_object_class_install_properties (gobject_class,
+                                     PROP_LAST,
+                                     gesture_props);
+
   /**
    * ClutterGestureAction::gesture-begin:
    * @action: the #ClutterGestureAction that emitted the signal
@@ -628,14 +838,13 @@ clutter_gesture_action_class_init (ClutterGestureActionClass *klass)
 static void
 clutter_gesture_action_init (ClutterGestureAction *self)
 {
-  self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, CLUTTER_TYPE_GESTURE_ACTION,
-                                            ClutterGestureActionPrivate);
+  self->priv = clutter_gesture_action_get_instance_private (self);
 
   self->priv->points = g_array_sized_new (FALSE, TRUE, sizeof (GesturePoint), 3);
   g_array_set_clear_func (self->priv->points, (GDestroyNotify) gesture_point_unset);
 
   self->priv->requested_nb_points = 1;
-  self->priv->edge = CLUTTER_GESTURE_TRIGGER_EDGE_AFTER;
+  self->priv->edge = CLUTTER_GESTURE_TRIGGER_EDGE_NONE;
 }
 
 /**
@@ -884,6 +1093,9 @@ clutter_gesture_action_set_n_touch_points (ClutterGestureAction *action,
 
   priv = action->priv;
 
+  if (priv->requested_nb_points == nb_points)
+    return;
+
   priv->requested_nb_points = nb_points;
 
   if (priv->in_gesture)
@@ -897,16 +1109,17 @@ clutter_gesture_action_set_n_touch_points (ClutterGestureAction *action,
         {
           ClutterActor *actor =
             clutter_actor_meta_get_actor (CLUTTER_ACTOR_META (action));
-          gint i, drag_threshold;
+          gint i;
+          float threshold_x, threshold_y;
 
-          drag_threshold = gesture_get_threshold (action);
+          clutter_gesture_action_get_threshold_trigger_distance (action, &threshold_x, &threshold_y);
 
           for (i = 0; i < priv->points->len; i++)
             {
               GesturePoint *point = &g_array_index (priv->points, GesturePoint, i);
 
-              if ((ABS (point->press_y - point->last_motion_y) >= drag_threshold) ||
-                  (ABS (point->press_x - point->last_motion_x) >= drag_threshold))
+              if ((fabsf (point->press_y - point->last_motion_y) >= threshold_y) ||
+                  (fabsf (point->press_x - point->last_motion_x) >= threshold_x))
                 {
                   begin_gesture (action, actor);
                   break;
@@ -914,6 +1127,9 @@ clutter_gesture_action_set_n_touch_points (ClutterGestureAction *action,
             }
         }
     }
+
+  g_object_notify_by_pspec (G_OBJECT (action),
+                            gesture_props[PROP_N_TOUCH_POINTS]);
 }
 
 /**
@@ -1018,3 +1234,135 @@ clutter_gesture_action_cancel (ClutterGestureAction *action)
 
   cancel_gesture (action);
 }
+
+/**
+ * clutter_gesture_action_set_threshold_trigger_edge:
+ * @action: a #ClutterGestureAction
+ * @edge: the %ClutterGestureTriggerEdge
+ *
+ * Sets the edge trigger for the gesture drag threshold, if any.
+ *
+ * This function should only be called by sub-classes of
+ * #ClutterGestureAction during their construction phase.
+ *
+ * Since: 1.18
+ */
+void
+clutter_gesture_action_set_threshold_trigger_edge (ClutterGestureAction      *action,
+                                                   ClutterGestureTriggerEdge  edge)
+{
+  g_return_if_fail (CLUTTER_IS_GESTURE_ACTION (action));
+
+  if (action->priv->edge == edge)
+    return;
+
+  action->priv->edge = edge;
+
+  g_object_notify_by_pspec (G_OBJECT (action), gesture_props[PROP_THRESHOLD_TRIGGER_EDGE]);
+}
+
+/**
+ * clutter_gesture_action_get_threshold_trigger_edge:
+ * @action: a #ClutterGestureAction
+ *
+ * Retrieves the edge trigger of the gesture @action, as set using
+ * clutter_gesture_action_set_threshold_trigger_edge().
+ *
+ * Return value: the edge trigger
+ *
+ * Since: 1.20
+ */
+ClutterGestureTriggerEdge
+clutter_gesture_action_get_threshold_trigger_edge (ClutterGestureAction *action)
+{
+  g_return_val_if_fail (CLUTTER_IS_GESTURE_ACTION (action),
+                        CLUTTER_GESTURE_TRIGGER_EDGE_NONE);
+
+  return action->priv->edge;
+}
+
+/**
+ * clutter_gesture_action_get_threshold_trigger_egde:
+ * @action: a #ClutterGestureAction
+ *
+ * Retrieves the edge trigger of the gesture @action, as set using
+ * clutter_gesture_action_set_threshold_trigger_edge().
+ *
+ * Return value: the edge trigger
+ *
+ * Since: 1.18
+ *
+ * Deprecated: 1.20: Use clutter_gesture_action_get_threshold_trigger_edge() instead.
+ */
+ClutterGestureTriggerEdge
+clutter_gesture_action_get_threshold_trigger_egde (ClutterGestureAction *action)
+{
+  return clutter_gesture_action_get_threshold_trigger_edge (action);
+}
+
+/**
+ * clutter_gesture_action_set_threshold_trigger_distance:
+ * @action: a #ClutterGestureAction
+ * @x: the distance on the horizontal axis
+ * @y: the distance on the vertical axis
+ *
+ * Sets the threshold trigger distance for the gesture drag threshold, if any.
+ *
+ * This function should only be called by sub-classes of
+ * #ClutterGestureAction during their construction phase.
+ *
+ * Since: 1.18
+ */
+void
+clutter_gesture_action_set_threshold_trigger_distance (ClutterGestureAction      *action,
+                                                       float                      x,
+                                                       float                      y)
+{
+  g_return_if_fail (CLUTTER_IS_GESTURE_ACTION (action));
+
+  if (fabsf (x - action->priv->distance_x) > FLOAT_EPSILON)
+    {
+      action->priv->distance_x = x;
+      g_object_notify_by_pspec (G_OBJECT (action), gesture_props[PROP_THRESHOLD_TRIGGER_DISTANCE_X]);
+    }
+
+  if (fabsf (y - action->priv->distance_y) > FLOAT_EPSILON)
+    {
+      action->priv->distance_y = y;
+      g_object_notify_by_pspec (G_OBJECT (action), gesture_props[PROP_THRESHOLD_TRIGGER_DISTANCE_Y]);
+    }
+}
+
+/**
+ * clutter_gesture_action_get_threshold_trigger_distance:
+ * @action: a #ClutterGestureAction
+ * @x: (out) (allow-none): The return location for the horizontal distance, or %NULL
+ * @y: (out) (allow-none): The return location for the vertical distance, or %NULL
+ *
+ * Retrieves the threshold trigger distance of the gesture @action,
+ * as set using clutter_gesture_action_set_threshold_trigger_distance().
+ *
+ * Since: 1.18
+ */
+void
+clutter_gesture_action_get_threshold_trigger_distance (ClutterGestureAction *action,
+                                                       float                *x,
+                                                       float                *y)
+{
+  g_return_if_fail (CLUTTER_IS_GESTURE_ACTION (action));
+
+  if (x != NULL)
+    {
+      if (action->priv->distance_x > 0.0)
+        *x = action->priv->distance_x;
+      else
+        *x = gesture_get_default_threshold ();
+    }
+  if (y != NULL)
+    {
+      if (action->priv->distance_y > 0.0)
+        *y = action->priv->distance_y;
+      else
+        *y = gesture_get_default_threshold ();
+    }
+}
diff --git a/clutter/clutter-gesture-action.h b/clutter/clutter-gesture-action.h
index ab38b4b23..ca7db12ce 100644
--- a/clutter/clutter-gesture-action.h
+++ b/clutter/clutter-gesture-action.h
@@ -48,7 +48,7 @@ typedef struct _ClutterGestureActionClass         ClutterGestureActionClass;
 /**
  * ClutterGestureAction:
  *
- * The <structname>ClutterGestureAction</structname> structure contains
+ * The #ClutterGestureAction structure contains
  * only private data and should be accessed using the provided API
  *
  * Since: 1.8
@@ -70,7 +70,7 @@ struct _ClutterGestureAction
  * @gesture_prepare: virtual function called before emitting the
  *   #ClutterGestureAction::gesture-cancel signal
  *
- * The <structname>ClutterGestureClass</structname> structure contains only
+ * The #ClutterGestureClass structure contains only
  * private data.
  *
  * Since: 1.8
@@ -101,17 +101,23 @@ struct _ClutterGestureActionClass
   void (* _clutter_gesture_action6) (void);
 };
 
+CLUTTER_AVAILABLE_IN_1_8
 GType clutter_gesture_action_get_type (void) G_GNUC_CONST;
 
+CLUTTER_AVAILABLE_IN_1_8
 ClutterAction *        clutter_gesture_action_new                      (void);
 
+CLUTTER_AVAILABLE_IN_1_8
 gint                   clutter_gesture_action_get_n_touch_points   (ClutterGestureAction *action);
+CLUTTER_AVAILABLE_IN_1_8
 void                   clutter_gesture_action_set_n_touch_points   (ClutterGestureAction *action,
                                                                     gint                  nb_points);
+CLUTTER_AVAILABLE_IN_1_8
 void                   clutter_gesture_action_get_press_coords     (ClutterGestureAction *action,
                                                                     guint                 point,
                                                                     gfloat               *press_x,
                                                                     gfloat               *press_y);
+CLUTTER_AVAILABLE_IN_1_8
 void                   clutter_gesture_action_get_motion_coords    (ClutterGestureAction *action,
                                                                     guint                 point,
                                                                     gfloat               *motion_x,
@@ -121,6 +127,7 @@ gfloat                 clutter_gesture_action_get_motion_delta     (ClutterGestu
                                                                     guint                 point,
                                                                     gfloat               *delta_x,
                                                                     gfloat               *delta_y);
+CLUTTER_AVAILABLE_IN_1_8
 void                   clutter_gesture_action_get_release_coords   (ClutterGestureAction *action,
                                                                     guint                 point,
                                                                     gfloat               *release_x,
@@ -149,6 +156,24 @@ const ClutterEvent *   clutter_gesture_action_get_last_event       (ClutterGestu
 CLUTTER_AVAILABLE_IN_1_12
 void                   clutter_gesture_action_cancel               (ClutterGestureAction *action);
 
+CLUTTER_AVAILABLE_IN_1_18
+void                            clutter_gesture_action_set_threshold_trigger_edge       (ClutterGestureAction      *action,
+                                                                                         ClutterGestureTriggerEdge  edge);
+CLUTTER_DEPRECATED_IN_1_20_FOR(clutter_gesture_action_get_threshold_trigger_edge)
+ClutterGestureTriggerEdge       clutter_gesture_action_get_threshold_trigger_egde       (ClutterGestureAction      *action);
+CLUTTER_AVAILABLE_IN_1_20
+ClutterGestureTriggerEdge       clutter_gesture_action_get_threshold_trigger_edge       (ClutterGestureAction      *action);
+
+CLUTTER_AVAILABLE_IN_1_18
+void                            clutter_gesture_action_set_threshold_trigger_distance   (ClutterGestureAction      *action,
+                                                                                         float                      x,
+                                                                                         float                      y);
+
+CLUTTER_AVAILABLE_IN_1_18
+void                            clutter_gesture_action_get_threshold_trigger_distance   (ClutterGestureAction *action,
+                                                                                         float                *x,
+                                                                                         float                *y);
+
 G_END_DECLS
 
 #endif /* __CLUTTER_GESTURE_ACTION_H__ */
diff --git a/clutter/clutter-grid-layout.c b/clutter/clutter-grid-layout.c
index 8c419bbc9..e9ef8f7bb 100644
--- a/clutter/clutter-grid-layout.c
+++ b/clutter/clutter-grid-layout.c
@@ -66,7 +66,6 @@
 #define CLUTTER_TYPE_GRID_CHILD          (clutter_grid_child_get_type ())
 #define CLUTTER_GRID_CHILD(obj)          (G_TYPE_CHECK_INSTANCE_CAST ((obj), CLUTTER_TYPE_GRID_CHILD, ClutterGridChild))
 #define CLUTTER_IS_GRID_CHILD(obj)       (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CLUTTER_TYPE_GRID_CHILD))
-#define CLUTTER_GRID_LAYOUT_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), CLUTTER_TYPE_GRID_LAYOUT, ClutterGridLayoutPrivate))
 
 typedef struct _ClutterGridChild        ClutterGridChild;
 typedef struct _ClutterLayoutMetaClass  ClutterGridChildClass;
@@ -173,9 +172,11 @@ static GParamSpec *child_props[PROP_CHILD_LAST];
 GType clutter_grid_child_get_type (void);
 
 G_DEFINE_TYPE (ClutterGridChild, clutter_grid_child,
-               CLUTTER_TYPE_LAYOUT_META);
-G_DEFINE_TYPE (ClutterGridLayout, clutter_grid_layout,
-               CLUTTER_TYPE_LAYOUT_MANAGER);
+               CLUTTER_TYPE_LAYOUT_META)
+
+G_DEFINE_TYPE_WITH_PRIVATE (ClutterGridLayout,
+                            clutter_grid_layout,
+                            CLUTTER_TYPE_LAYOUT_MANAGER)
 
 
 #define GET_GRID_CHILD(grid, child) \
@@ -509,7 +510,7 @@ compute_request_for_child (ClutterGridRequest *request,
     }
   else
     {
-      if (orientation == CLUTTER_ORIENTATION_VERTICAL)
+      if (orientation == CLUTTER_ORIENTATION_HORIZONTAL)
         clutter_actor_get_preferred_width (child, -1, minimum, natural);
       else
         clutter_actor_get_preferred_height (child, -1, minimum, natural);
@@ -1527,8 +1528,6 @@ clutter_grid_layout_class_init (ClutterGridLayoutClass *klass)
 
   layout_class = CLUTTER_LAYOUT_MANAGER_CLASS (klass);
 
-  g_type_class_add_private (klass, sizeof (ClutterGridLayoutPrivate));
-
   object_class->set_property = clutter_grid_layout_set_property;
   object_class->get_property = clutter_grid_layout_get_property;
 
@@ -1616,17 +1615,15 @@ clutter_grid_layout_class_init (ClutterGridLayoutClass *klass)
 static void
 clutter_grid_layout_init (ClutterGridLayout *self)
 {
-  ClutterGridLayoutPrivate *priv;
+  self->priv = clutter_grid_layout_get_instance_private (self);
 
-  self->priv = priv = CLUTTER_GRID_LAYOUT_GET_PRIVATE (self);
+  self->priv->orientation = CLUTTER_ORIENTATION_HORIZONTAL;
 
-  priv->orientation = CLUTTER_ORIENTATION_HORIZONTAL;
+  self->priv->linedata[0].spacing = 0;
+  self->priv->linedata[1].spacing = 0;
 
-  priv->linedata[0].spacing = 0;
-  priv->linedata[1].spacing = 0;
-
-  priv->linedata[0].homogeneous = FALSE;
-  priv->linedata[1].homogeneous = FALSE;
+  self->priv->linedata[0].homogeneous = FALSE;
+  self->priv->linedata[1].homogeneous = FALSE;
 }
 
 /**
diff --git a/clutter/clutter-group.h b/clutter/clutter-group.h
index 31f8c0374..20afe5723 100644
--- a/clutter/clutter-group.h
+++ b/clutter/clutter-group.h
@@ -88,6 +88,7 @@ struct _ClutterGroupClass
   void (*_clutter_reserved6) (void);
 };
 
+CLUTTER_AVAILABLE_IN_ALL
 GType clutter_group_get_type (void) G_GNUC_CONST;
 
 G_END_DECLS
diff --git a/clutter/clutter-image.c b/clutter/clutter-image.c
index 7ae9839ee..880b7344e 100644
--- a/clutter/clutter-image.c
+++ b/clutter/clutter-image.c
@@ -28,13 +28,10 @@
  * @Short_Description: Image data content
  *
  * #ClutterImage is a #ClutterContent implementation that displays
- * image data.
+ * image data inside a #ClutterActor.
  *
- * <informalexample><programlisting>
- * <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" parse="text" href="../../../../examples/image-content.c">
- *   <xi:fallback>FIXME: MISSING XINCLUDE CONTENT</xi:fallback>
- * </xi:include>
- * </programlisting></informalexample>
+ * See [image.c](https://git.gnome.org/browse/clutter/tree/examples/image-content.c?h=clutter-1.18)
+ * for an example of how to use #ClutterImage.
  *
  * #ClutterImage is available since Clutter 1.10.
  */
@@ -62,6 +59,7 @@ struct _ClutterImagePrivate
 static void clutter_content_iface_init (ClutterContentIface *iface);
 
 G_DEFINE_TYPE_WITH_CODE (ClutterImage, clutter_image, G_TYPE_OBJECT,
+                         G_ADD_PRIVATE (ClutterImage)
                          G_IMPLEMENT_INTERFACE (CLUTTER_TYPE_CONTENT,
                                                 clutter_content_iface_init))
 
@@ -88,16 +86,13 @@ clutter_image_finalize (GObject *gobject)
 static void
 clutter_image_class_init (ClutterImageClass *klass)
 {
-  g_type_class_add_private (klass, sizeof (ClutterImagePrivate));
-
   G_OBJECT_CLASS (klass)->finalize = clutter_image_finalize;
 }
 
 static void
 clutter_image_init (ClutterImage *self)
 {
-  self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, CLUTTER_TYPE_IMAGE,
-                                            ClutterImagePrivate);
+  self->priv = clutter_image_get_instance_private (self);
 }
 
 static void
@@ -121,9 +116,12 @@ clutter_image_paint_content (ClutterContent   *content,
   clutter_actor_get_content_scaling_filters (actor, &min_f, &mag_f);
   repeat = clutter_actor_get_content_repeat (actor);
 
-  color.red = paint_opacity;
-  color.green = paint_opacity;
-  color.blue = paint_opacity;
+  /* ClutterTextureNode will premultiply the blend color, so we
+   * want it to be white with the paint opacity
+   */
+  color.red = 255;
+  color.green = 255;
+  color.blue = 255;
   color.alpha = paint_opacity;
 
   node = clutter_texture_node_new (priv->texture, &color, min_f, mag_f);
@@ -211,6 +209,28 @@ clutter_image_new (void)
  *
  * The image data is copied in texture memory.
  *
+ * The image data is expected to be a linear array of RGBA or RGB pixel data;
+ * how to retrieve that data is left to platform specific image loaders. For
+ * instance, if you use the GdkPixbuf library:
+ *
+ * |[<!-- language="C" -->
+ *   ClutterContent *image = clutter_image_new ();
+ *
+ *   GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (filename, NULL);
+ *
+ *   clutter_image_set_data (CLUTTER_IMAGE (image),
+ *                           gdk_pixbuf_get_pixels (pixbuf),
+ *                           gdk_pixbuf_has_alpha (pixbuf)
+ *                             ? COGL_PIXEL_FORMAT_RGBA_8888
+ *                             : COGL_PIXEL_FORMAT_RGB_888,
+ *                           gdk_pixbuf_get_width (pixbuf),
+ *                           gdk_pixbuf_get_height (pixbuf),
+ *                           gdk_pixbuf_get_rowstride (pixbuf),
+ *                           &error);
+ *
+ *   g_object_unref (pixbuf);
+ * ]|
+ *
  * Return value: %TRUE if the image data was successfully loaded,
  *   and %FALSE otherwise.
  *
@@ -226,6 +246,7 @@ clutter_image_set_data (ClutterImage     *image,
                         GError          **error)
 {
   ClutterImagePrivate *priv;
+  CoglTextureFlags flags;
 
   g_return_val_if_fail (CLUTTER_IS_IMAGE (image), FALSE);
   g_return_val_if_fail (data != NULL, FALSE);
@@ -235,8 +256,12 @@ clutter_image_set_data (ClutterImage     *image,
   if (priv->texture != NULL)
     cogl_object_unref (priv->texture);
 
+  flags = COGL_TEXTURE_NONE;
+  if (width >= 512 && height >= 512)
+    flags |= COGL_TEXTURE_NO_ATLAS;
+
   priv->texture = cogl_texture_new_from_data (width, height,
-                                              COGL_TEXTURE_NONE,
+                                              flags,
                                               pixel_format,
                                               COGL_PIXEL_FORMAT_ANY,
                                               row_stride,
@@ -289,6 +314,7 @@ clutter_image_set_bytes (ClutterImage     *image,
                          GError          **error)
 {
   ClutterImagePrivate *priv;
+  CoglTextureFlags flags;
 
   g_return_val_if_fail (CLUTTER_IS_IMAGE (image), FALSE);
   g_return_val_if_fail (data != NULL, FALSE);
@@ -298,8 +324,12 @@ clutter_image_set_bytes (ClutterImage     *image,
   if (priv->texture != NULL)
     cogl_object_unref (priv->texture);
 
+  flags = COGL_TEXTURE_NONE;
+  if (width >= 512 && height >= 512)
+    flags |= COGL_TEXTURE_NO_ATLAS;
+
   priv->texture = cogl_texture_new_from_data (width, height,
-                                              COGL_TEXTURE_NONE,
+                                              flags,
                                               pixel_format,
                                               COGL_PIXEL_FORMAT_ANY,
                                               row_stride,
@@ -364,9 +394,14 @@ clutter_image_set_area (ClutterImage                 *image,
 
   if (priv->texture == NULL)
     {
+      CoglTextureFlags flags = COGL_TEXTURE_NONE;
+
+      if (area->width >= 512 && area->height >= 512)
+        flags |= COGL_TEXTURE_NO_ATLAS;
+
       priv->texture = cogl_texture_new_from_data (area->width,
                                                   area->height,
-                                                  COGL_TEXTURE_NONE,
+                                                  flags,
                                                   pixel_format,
                                                   COGL_PIXEL_FORMAT_ANY,
                                                   row_stride,
diff --git a/clutter/clutter-image.h b/clutter/clutter-image.h
index af8df1e6d..2819b79af 100644
--- a/clutter/clutter-image.h
+++ b/clutter/clutter-image.h
@@ -70,7 +70,7 @@ typedef enum {
 /**
  * ClutterImage:
  *
- * The <structname>ClutterImage</structname> structure contains
+ * The #ClutterImage structure contains
  * private data and should only be accessed using the provided
  * API.
  *
@@ -87,7 +87,7 @@ struct _ClutterImage
 /**
  * ClutterImageClass:
  *
- * The <structname>ClutterImageClass</structname> structure contains
+ * The #ClutterImageClass structure contains
  * private data.
  *
  * Since: 1.10
diff --git a/clutter/clutter-input-device.c b/clutter/clutter-input-device.c
index e92cf22a7..b7de58630 100644
--- a/clutter/clutter-input-device.c
+++ b/clutter/clutter-input-device.c
@@ -46,6 +46,8 @@
 #include "clutter-private.h"
 #include "clutter-stage-private.h"
 
+#include <math.h>
+
 enum
 {
   PROP_0,
@@ -79,7 +81,7 @@ clutter_input_device_dispose (GObject *gobject)
 {
   ClutterInputDevice *device = CLUTTER_INPUT_DEVICE (gobject);
 
-  g_free (device->device_name);
+  g_clear_pointer (&device->device_name, g_free);
 
   if (device->associated != NULL)
     {
@@ -91,23 +93,10 @@ clutter_input_device_dispose (GObject *gobject)
       device->associated = NULL;
     }
 
-  if (device->axes != NULL)
-    {
-      g_array_free (device->axes, TRUE);
-      device->axes = NULL;
-    }
-
-  if (device->keys != NULL)
-    {
-      g_array_free (device->keys, TRUE);
-      device->keys = NULL;
-    }
-
-  if (device->touch_sequences_info)
-    {
-      g_hash_table_unref (device->touch_sequences_info);
-      device->touch_sequences_info = NULL;
-    }
+  g_clear_pointer (&device->axes, g_array_unref);
+  g_clear_pointer (&device->keys, g_array_unref);
+  g_clear_pointer (&device->scroll_info, g_array_unref);
+  g_clear_pointer (&device->touch_sequences_info, g_hash_table_unref);
 
   if (device->inv_touch_sequence_actors)
     {
@@ -428,8 +417,8 @@ _clutter_input_device_ensure_touch_info (ClutterInputDevice *device,
 void
 _clutter_input_device_set_coords (ClutterInputDevice   *device,
                                   ClutterEventSequence *sequence,
-                                  gint                  x,
-                                  gint                  y,
+                                  gfloat                x,
+                                  gfloat                y,
                                   ClutterStage         *stage)
 {
   g_return_if_fail (CLUTTER_IS_INPUT_DEVICE (device));
@@ -467,6 +456,25 @@ _clutter_input_device_set_state (ClutterInputDevice  *device,
   device->current_state = state;
 }
 
+/**
+ * clutter_input_device_get_modifier_state:
+ * @device: a #ClutterInputDevice
+ *
+ * Retrieves the current modifiers state of the device, as seen
+ * by the last event Clutter processed.
+ *
+ * Return value: the last known modifier state
+ *
+ * Since: 1.16
+ */
+ClutterModifierType
+clutter_input_device_get_modifier_state (ClutterInputDevice *device)
+{
+  g_return_val_if_fail (CLUTTER_IS_INPUT_DEVICE (device), 0);
+
+  return device->current_state;
+}
+
 /*< private >
  * clutter_input_device_set_time:
  * @device: a #ClutterInputDevice
@@ -1028,9 +1036,9 @@ clutter_input_device_get_device_mode (ClutterInputDevice *device)
  * |[
  *   ClutterEvent c_event;
  *
- *   translate_native_event_to_clutter (native_event, &amp;c_event);
+ *   translate_native_event_to_clutter (native_event, &c_event);
  *
- *   clutter_do_event (&amp;c_event);
+ *   clutter_do_event (&c_event);
  * ]|
  *
  * Before letting clutter_do_event() process the event, it is necessary to call
@@ -1041,20 +1049,18 @@ clutter_input_device_get_device_mode (ClutterInputDevice *device)
  *   ClutterDeviceManager *manager;
  *   ClutterInputDevice *device;
  *
- *   translate_native_event_to_clutter (native_event, &amp;c_event);
+ *   translate_native_event_to_clutter (native_event, &c_event);
  *
- *   /&ast; get the device manager &ast;/
+ *   // get the device manager
  *   manager = clutter_device_manager_get_default ();
  *
- *   /&ast; use the default Core Pointer that Clutter
- *    &ast; backends register by default
- *    &ast;/
+ *   // use the default Core Pointer that Clutter backends register by default
  *   device = clutter_device_manager_get_core_device (manager, %CLUTTER_POINTER_DEVICE);
  *
- *   /&ast; update the state of the input device &ast;/
- *   clutter_input_device_update_from_event (device, &amp;c_event, FALSE);
+ *   // update the state of the input device
+ *   clutter_input_device_update_from_event (device, &c_event, FALSE);
  *
- *   clutter_do_event (&amp;c_event);
+ *   clutter_do_event (&c_event);
  * ]|
  *
  * The @update_stage boolean argument should be used when the input device
@@ -1199,6 +1205,9 @@ _clutter_input_device_translate_axis (ClutterInputDevice *device,
       info->axis == CLUTTER_INPUT_AXIS_Y)
     return FALSE;
 
+  if (fabs (info->max_value - info->min_value) < 0.0000001)
+    return FALSE;
+
   width = info->max_value - info->min_value;
   real_value = (info->max_axis * (value - info->min_value)
              + info->min_axis * (info->max_value - value))
@@ -1261,7 +1270,7 @@ clutter_input_device_get_axis (ClutterInputDevice *device,
  *
  *   clutter_input_device_get_axis_value (device, axes,
  *                                        CLUTTER_INPUT_AXIS_PRESSURE,
- *                                        &amp;pressure_value);
+ *                                        &pressure_value);
  * ]|
  *
  * Return value: %TRUE if the value was set, and %FALSE otherwise
@@ -1520,12 +1529,10 @@ _clutter_input_device_remove_event_sequence (ClutterInputDevice *device,
 
       g_hash_table_replace (device->inv_touch_sequence_actors,
                             info->actor, sequences);
+      _clutter_input_device_set_actor (device, sequence, NULL, TRUE);
     }
 
   g_hash_table_remove (device->touch_sequences_info, sequence);
-
-  if (g_hash_table_size (device->touch_sequences_info) == 0)
-    _clutter_input_device_set_stage (device, NULL);
 }
 
 /**
@@ -1615,28 +1622,6 @@ clutter_input_device_get_associated_device (ClutterInputDevice *device)
   return device->associated;
 }
 
-/*< internal >
- * clutter_input_device_select_stage_events:
- * @device: a #ClutterInputDevice
- * @stage: the #ClutterStage to select events on
- * @event_mask: platform-specific mask of events
- *
- * Selects input device events on @stage.
- *
- * The implementation of this function depends on the backend used.
- */
-void
-_clutter_input_device_select_stage_events (ClutterInputDevice *device,
-                                           ClutterStage       *stage,
-                                           gint                event_mask)
-{
-  ClutterInputDeviceClass *device_class;
-
-  device_class = CLUTTER_INPUT_DEVICE_GET_CLASS (device);
-  if (device_class->select_stage_events != NULL)
-    device_class->select_stage_events (device, stage, event_mask);
-}
-
 /**
  * clutter_input_device_keycode_to_evdev:
  * @device: A #ClutterInputDevice
diff --git a/clutter/clutter-input-device.h b/clutter/clutter-input-device.h
index 1a5a4a1c5..4fcdfc758 100644
--- a/clutter/clutter-input-device.h
+++ b/clutter/clutter-input-device.h
@@ -47,45 +47,66 @@ G_BEGIN_DECLS
  */
 typedef struct _ClutterInputDeviceClass ClutterInputDeviceClass;
 
+CLUTTER_AVAILABLE_IN_1_0
 GType clutter_input_device_get_type (void) G_GNUC_CONST;
 
+CLUTTER_AVAILABLE_IN_1_0
 ClutterInputDeviceType  clutter_input_device_get_device_type    (ClutterInputDevice  *device);
+CLUTTER_AVAILABLE_IN_1_0
 gint                    clutter_input_device_get_device_id      (ClutterInputDevice  *device);
 
 CLUTTER_AVAILABLE_IN_1_12
 gboolean                clutter_input_device_get_coords        (ClutterInputDevice   *device,
                                                                 ClutterEventSequence *sequence,
                                                                 ClutterPoint         *point);
+CLUTTER_AVAILABLE_IN_1_16
+ClutterModifierType     clutter_input_device_get_modifier_state (ClutterInputDevice  *device);
+CLUTTER_AVAILABLE_IN_1_2
 ClutterActor *          clutter_input_device_get_pointer_actor  (ClutterInputDevice  *device);
+CLUTTER_AVAILABLE_IN_1_2
 ClutterStage *          clutter_input_device_get_pointer_stage  (ClutterInputDevice  *device);
+CLUTTER_AVAILABLE_IN_1_2
 const gchar *           clutter_input_device_get_device_name    (ClutterInputDevice  *device);
+CLUTTER_AVAILABLE_IN_1_2
 ClutterInputMode        clutter_input_device_get_device_mode    (ClutterInputDevice  *device);
+CLUTTER_AVAILABLE_IN_1_2
 gboolean                clutter_input_device_get_has_cursor     (ClutterInputDevice  *device);
+CLUTTER_AVAILABLE_IN_1_2
 void                    clutter_input_device_set_enabled        (ClutterInputDevice  *device,
                                                                  gboolean             enabled);
+CLUTTER_AVAILABLE_IN_1_2
 gboolean                clutter_input_device_get_enabled        (ClutterInputDevice  *device);
 
+CLUTTER_AVAILABLE_IN_1_2
 guint                   clutter_input_device_get_n_axes         (ClutterInputDevice  *device);
+CLUTTER_AVAILABLE_IN_1_2
 ClutterInputAxis        clutter_input_device_get_axis           (ClutterInputDevice  *device,
                                                                  guint                index_);
+CLUTTER_AVAILABLE_IN_1_2
 gboolean                clutter_input_device_get_axis_value     (ClutterInputDevice  *device,
                                                                  gdouble             *axes,
                                                                  ClutterInputAxis     axis,
                                                                  gdouble             *value);
 
+CLUTTER_AVAILABLE_IN_1_2
 guint                   clutter_input_device_get_n_keys         (ClutterInputDevice  *device);
+CLUTTER_AVAILABLE_IN_1_2
 void                    clutter_input_device_set_key            (ClutterInputDevice  *device,
                                                                  guint                index_,
                                                                  guint                keyval,
                                                                  ClutterModifierType  modifiers);
+CLUTTER_AVAILABLE_IN_1_2
 gboolean                clutter_input_device_get_key            (ClutterInputDevice  *device,
                                                                  guint                index_,
                                                                  guint               *keyval,
                                                                  ClutterModifierType *modifiers);
 
+CLUTTER_AVAILABLE_IN_1_2
 ClutterInputDevice *    clutter_input_device_get_associated_device (ClutterInputDevice *device);
+CLUTTER_AVAILABLE_IN_1_2
 GList *                 clutter_input_device_get_slave_devices  (ClutterInputDevice  *device);
 
+CLUTTER_AVAILABLE_IN_1_2
 void                    clutter_input_device_update_from_event  (ClutterInputDevice  *device,
                                                                  ClutterEvent        *event,
                                                                  gboolean             update_stage);
@@ -109,6 +130,7 @@ CLUTTER_AVAILABLE_IN_1_12
 ClutterActor *          clutter_input_device_sequence_get_grabbed_actor (ClutterInputDevice   *device,
                                                                          ClutterEventSequence *sequence);
 
+CLUTTER_AVAILABLE_IN_1_10
 gboolean                clutter_input_device_keycode_to_evdev   (ClutterInputDevice *device,
                                                                  guint               hardware_keycode,
                                                                  guint              *evdev_keycode);
diff --git a/clutter/clutter-interval.c b/clutter/clutter-interval.c
index 13649ad16..782f82655 100644
--- a/clutter/clutter-interval.c
+++ b/clutter/clutter-interval.c
@@ -46,9 +46,7 @@
  * #ClutterInterval is available since Clutter 1.0
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include <stdlib.h>
 #include <string.h>
@@ -61,7 +59,10 @@
 #include "clutter-interval.h"
 #include "clutter-private.h"
 #include "clutter-units.h"
+#include "clutter-scriptable.h"
+#include "clutter-script-private.h"
 
+#define CLUTTER_DISABLE_DEPRECATION_WARNINGS
 #include "deprecated/clutter-fixed.h"
 
 enum
@@ -86,8 +87,6 @@ enum
   N_VALUES
 };
 
-#define CLUTTER_INTERVAL_GET_PRIVATE(obj)  (G_TYPE_INSTANCE_GET_PRIVATE ((obj), CLUTTER_TYPE_INTERVAL, ClutterIntervalPrivate))
-
 struct _ClutterIntervalPrivate
 {
   GType value_type;
@@ -95,7 +94,15 @@ struct _ClutterIntervalPrivate
   GValue *values;
 };
 
-G_DEFINE_TYPE (ClutterInterval, clutter_interval, G_TYPE_INITIALLY_UNOWNED);
+static void clutter_scriptable_iface_init (ClutterScriptableIface *iface);
+
+G_DEFINE_TYPE_WITH_CODE (ClutterInterval,
+                         clutter_interval,
+                         G_TYPE_INITIALLY_UNOWNED,
+                         G_ADD_PRIVATE (ClutterInterval)
+                         G_IMPLEMENT_INTERFACE (CLUTTER_TYPE_SCRIPTABLE,
+                                                clutter_scriptable_iface_init));
+
 
 static gboolean
 clutter_interval_real_validate (ClutterInterval *interval,
@@ -103,6 +110,8 @@ clutter_interval_real_validate (ClutterInterval *interval,
 {
   GType pspec_gtype = G_PARAM_SPEC_VALUE_TYPE (pspec);
 
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
+
   /* check the GTypes we provide first */
   if (pspec_gtype == COGL_TYPE_FIXED)
     {
@@ -118,6 +127,8 @@ clutter_interval_real_validate (ClutterInterval *interval,
         return FALSE;
     }
 
+G_GNUC_END_IGNORE_DEPRECATIONS;
+
   /* then check the fundamental types */
   switch (G_TYPE_FUNDAMENTAL (pspec_gtype))
     {
@@ -420,7 +431,8 @@ clutter_interval_set_property (GObject      *gobject,
                                const GValue *value,
                                GParamSpec   *pspec)
 {
-  ClutterIntervalPrivate *priv = CLUTTER_INTERVAL_GET_PRIVATE (gobject);
+  ClutterInterval *self = CLUTTER_INTERVAL (gobject);
+  ClutterIntervalPrivate *priv = clutter_interval_get_instance_private (self);
 
   switch (prop_id)
     {
@@ -430,16 +442,14 @@ clutter_interval_set_property (GObject      *gobject,
 
     case PROP_INITIAL:
       if (g_value_get_boxed (value) != NULL)
-        clutter_interval_set_initial_value (CLUTTER_INTERVAL (gobject),
-                                            g_value_get_boxed (value));
+        clutter_interval_set_initial_value (self, g_value_get_boxed (value));
       else if (G_IS_VALUE (&priv->values[INITIAL]))
         g_value_unset (&priv->values[INITIAL]);
       break;
 
     case PROP_FINAL:
       if (g_value_get_boxed (value) != NULL)
-        clutter_interval_set_final_value (CLUTTER_INTERVAL (gobject),
-                                          g_value_get_boxed (value));
+        clutter_interval_set_final_value (self, g_value_get_boxed (value));
       else if (G_IS_VALUE (&priv->values[FINAL]))
         g_value_unset (&priv->values[FINAL]);
       break;
@@ -456,7 +466,9 @@ clutter_interval_get_property (GObject    *gobject,
                                GValue     *value,
                                GParamSpec *pspec)
 {
-  ClutterIntervalPrivate *priv = CLUTTER_INTERVAL_GET_PRIVATE (gobject);
+  ClutterIntervalPrivate *priv;
+  
+  priv = clutter_interval_get_instance_private (CLUTTER_INTERVAL (gobject));
 
   switch (prop_id)
     {
@@ -480,13 +492,52 @@ clutter_interval_get_property (GObject    *gobject,
     }
 }
 
+static gboolean
+clutter_interval_parse_custom_node (ClutterScriptable *scriptable,
+                                    ClutterScript     *script,
+                                    GValue            *value,
+                                    const gchar       *name,
+                                    JsonNode          *node)
+{
+  ClutterIntervalPrivate *priv = CLUTTER_INTERVAL (scriptable)->priv;
+
+  if ((strcmp (name, "initial") == 0) || (strcmp (name, "final") == 0))
+    {
+      g_value_init (value, priv->value_type);
+      return _clutter_script_parse_node (script, value, name, node, NULL);
+    }
+
+  return FALSE;
+}
+
+static void
+clutter_interval_set_custom_property (ClutterScriptable *scriptable,
+                                      ClutterScript     *script,
+                                      const gchar       *name,
+                                      const GValue      *value)
+{
+  ClutterInterval *self = CLUTTER_INTERVAL (scriptable);
+
+  if (strcmp (name, "initial") == 0)
+    clutter_interval_set_initial_value (self, value);
+  else if (strcmp (name, "final") == 0)
+    clutter_interval_set_final_value (self, value);
+  else
+    g_object_set_property (G_OBJECT (scriptable), name, value);
+}
+
+static void
+clutter_scriptable_iface_init (ClutterScriptableIface *iface)
+{
+  iface->parse_custom_node = clutter_interval_parse_custom_node;
+  iface->set_custom_property = clutter_interval_set_custom_property;
+}
+
 static void
 clutter_interval_class_init (ClutterIntervalClass *klass)
 {
   GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
 
-  g_type_class_add_private (klass, sizeof (ClutterIntervalPrivate));
-
   klass->validate = clutter_interval_real_validate;
   klass->compute_value = clutter_interval_real_compute_value;
 
@@ -546,12 +597,10 @@ clutter_interval_class_init (ClutterIntervalClass *klass)
 static void
 clutter_interval_init (ClutterInterval *self)
 {
-  ClutterIntervalPrivate *priv;
+  self->priv = clutter_interval_get_instance_private (self);
 
-  self->priv = priv = CLUTTER_INTERVAL_GET_PRIVATE (self);
-
-  priv->value_type = G_TYPE_INVALID;
-  priv->values = g_malloc0 (sizeof (GValue) * N_VALUES);
+  self->priv->value_type = G_TYPE_INVALID;
+  self->priv->values = g_malloc0 (sizeof (GValue) * N_VALUES);
 }
 
 static inline void
@@ -836,15 +885,13 @@ clutter_interval_get_value_type (ClutterInterval *interval)
 }
 
 /**
- * clutter_interval_set_initial_value:
+ * clutter_interval_set_initial_value: (rename-to clutter_interval_set_initial)
  * @interval: a #ClutterInterval
  * @value: a #GValue
  *
  * Sets the initial value of @interval to @value. The value is copied
  * inside the #ClutterInterval.
  *
- * Rename to: clutter_interval_set_initial
- *
  * Since: 1.0
  */
 void
@@ -928,15 +975,13 @@ clutter_interval_peek_initial_value (ClutterInterval *interval)
 }
 
 /**
- * clutter_interval_set_final_value:
+ * clutter_interval_set_final_value: (rename-to clutter_interval_set_final)
  * @interval: a #ClutterInterval
  * @value: a #GValue
  *
  * Sets the final value of @interval to @value. The value is
  * copied inside the #ClutterInterval.
  *
- * Rename to: clutter_interval_set_final
- *
  * Since: 1.0
  */
 void
diff --git a/clutter/clutter-interval.h b/clutter/clutter-interval.h
index b0c371463..fa36698e0 100644
--- a/clutter/clutter-interval.h
+++ b/clutter/clutter-interval.h
@@ -92,44 +92,62 @@ struct _ClutterIntervalClass
   void (*_clutter_reserved6) (void);
 };
 
+CLUTTER_AVAILABLE_IN_1_0
 GType            clutter_interval_get_type           (void) G_GNUC_CONST;
 
+CLUTTER_AVAILABLE_IN_1_0
 ClutterInterval *clutter_interval_new                (GType            gtype,
                                                       ...);
+CLUTTER_AVAILABLE_IN_1_0
 ClutterInterval *clutter_interval_new_with_values    (GType            gtype,
                                                       const GValue    *initial,
                                                       const GValue    *final);
 
+CLUTTER_AVAILABLE_IN_1_0
 ClutterInterval *clutter_interval_clone              (ClutterInterval *interval);
 
+CLUTTER_AVAILABLE_IN_1_0
 GType            clutter_interval_get_value_type     (ClutterInterval *interval);
 
+CLUTTER_AVAILABLE_IN_1_10
 void             clutter_interval_set_initial        (ClutterInterval *interval,
                                                       ...);
+CLUTTER_AVAILABLE_IN_1_0
 void             clutter_interval_set_initial_value  (ClutterInterval *interval,
                                                       const GValue    *value);
+CLUTTER_AVAILABLE_IN_1_0
 void             clutter_interval_get_initial_value  (ClutterInterval *interval,
                                                       GValue          *value);
+CLUTTER_AVAILABLE_IN_1_0
 GValue *         clutter_interval_peek_initial_value (ClutterInterval *interval);
+CLUTTER_AVAILABLE_IN_1_10
 void             clutter_interval_set_final          (ClutterInterval *interval,
                                                       ...);
+CLUTTER_AVAILABLE_IN_1_0
 void             clutter_interval_set_final_value    (ClutterInterval *interval,
                                                       const GValue    *value);
+CLUTTER_AVAILABLE_IN_1_0
 void             clutter_interval_get_final_value    (ClutterInterval *interval,
                                                       GValue          *value);
+CLUTTER_AVAILABLE_IN_1_0
 GValue *         clutter_interval_peek_final_value   (ClutterInterval *interval);
 
+CLUTTER_AVAILABLE_IN_1_0
 void             clutter_interval_set_interval       (ClutterInterval *interval,
                                                       ...);
+CLUTTER_AVAILABLE_IN_1_0
 void             clutter_interval_get_interval       (ClutterInterval *interval,
                                                       ...);
 
+CLUTTER_AVAILABLE_IN_1_0
 gboolean         clutter_interval_validate           (ClutterInterval *interval,
                                                       GParamSpec      *pspec);
+CLUTTER_AVAILABLE_IN_1_0
 gboolean         clutter_interval_compute_value      (ClutterInterval *interval,
                                                       gdouble          factor,
                                                       GValue          *value);
 
+CLUTTER_AVAILABLE_IN_1_4
 const GValue *   clutter_interval_compute            (ClutterInterval *interval,
                                                       gdouble          factor);
 
diff --git a/clutter/clutter-keyframe-transition.c b/clutter/clutter-keyframe-transition.c
index 007be9caf..54b670b73 100644
--- a/clutter/clutter-keyframe-transition.c
+++ b/clutter/clutter-keyframe-transition.c
@@ -96,9 +96,9 @@ struct _ClutterKeyframeTransitionPrivate
   gint current_frame;
 };
 
-G_DEFINE_TYPE (ClutterKeyframeTransition,
-               clutter_keyframe_transition,
-               CLUTTER_TYPE_PROPERTY_TRANSITION)
+G_DEFINE_TYPE_WITH_PRIVATE (ClutterKeyframeTransition,
+                            clutter_keyframe_transition,
+                            CLUTTER_TYPE_PROPERTY_TRANSITION)
 
 static void
 key_frame_free (gpointer data)
@@ -295,8 +295,8 @@ clutter_keyframe_transition_compute_value (ClutterTransition *transition,
   /* update the interval to be used to interpolate the property */
   real_interval = cur_frame->interval;
 
-  /* normalize the progress */
-  real_progress = (p - cur_frame->start) / (cur_frame->end - cur_frame->start);
+  /* normalize the progress and apply the easing mode */
+  real_progress = clutter_easing_for_mode ( cur_frame->mode, (p - cur_frame->start), (cur_frame->end - cur_frame->start));
 
 #ifdef CLUTTER_ENABLE_DEBUG
   if (CLUTTER_HAS_DEBUG (ANIMATION))
@@ -375,8 +375,6 @@ clutter_keyframe_transition_class_init (ClutterKeyframeTransitionClass *klass)
   ClutterTimelineClass *timeline_class = CLUTTER_TIMELINE_CLASS (klass);
   ClutterTransitionClass *transition_class = CLUTTER_TRANSITION_CLASS (klass);
 
-  g_type_class_add_private (klass, sizeof (ClutterKeyframeTransitionPrivate));
-
   gobject_class->finalize = clutter_keyframe_transition_finalize;
 
   timeline_class->started = clutter_keyframe_transition_started;
@@ -388,9 +386,7 @@ clutter_keyframe_transition_class_init (ClutterKeyframeTransitionClass *klass)
 static void
 clutter_keyframe_transition_init (ClutterKeyframeTransition *self)
 {
-  self->priv =
-    G_TYPE_INSTANCE_GET_PRIVATE (self, CLUTTER_TYPE_KEYFRAME_TRANSITION,
-                                 ClutterKeyframeTransitionPrivate);
+  self->priv = clutter_keyframe_transition_get_instance_private (self);
 }
 
 /**
diff --git a/clutter/clutter-keysyms-table.c b/clutter/clutter-keysyms-table.c
index 785059c4b..310d103b1 100644
--- a/clutter/clutter-keysyms-table.c
+++ b/clutter/clutter-keysyms-table.c
@@ -1,3 +1,5 @@
+#include "config.h"
+
 #include <glib.h>
 
 #include "clutter-event.h"
diff --git a/clutter/clutter-keysyms.h b/clutter/clutter-keysyms.h
index 4be94d4b2..b128bab10 100644
--- a/clutter/clutter-keysyms.h
+++ b/clutter/clutter-keysyms.h
@@ -278,6 +278,10 @@
 #define CLUTTER_KEY_dead_invertedbreve 0xfe6d
 #define CLUTTER_KEY_dead_belowcomma 0xfe6e
 #define CLUTTER_KEY_dead_currency 0xfe6f
+#define CLUTTER_KEY_dead_lowline 0xfe90
+#define CLUTTER_KEY_dead_aboveverticalline 0xfe91
+#define CLUTTER_KEY_dead_belowverticalline 0xfe92
+#define CLUTTER_KEY_dead_longsolidusoverlay 0xfe93
 #define CLUTTER_KEY_dead_a 0xfe80
 #define CLUTTER_KEY_dead_A 0xfe81
 #define CLUTTER_KEY_dead_e 0xfe82
@@ -2282,6 +2286,7 @@
 #define CLUTTER_KEY_TouchpadToggle 0x1008ffa9
 #define CLUTTER_KEY_TouchpadOn 0x1008ffb0
 #define CLUTTER_KEY_TouchpadOff 0x1008ffb1
+#define CLUTTER_KEY_AudioMicMute 0x1008ffb2
 #define CLUTTER_KEY_Switch_VT_1 0x1008fe01
 #define CLUTTER_KEY_Switch_VT_2 0x1008fe02
 #define CLUTTER_KEY_Switch_VT_3 0x1008fe03
diff --git a/clutter/clutter-layout-manager.c b/clutter/clutter-layout-manager.c
index 9f3ef5605..3b731c928 100644
--- a/clutter/clutter-layout-manager.c
+++ b/clutter/clutter-layout-manager.c
@@ -38,227 +38,36 @@
  * Clutter provides some simple #ClutterLayoutManager sub-classes, like
  * #ClutterFlowLayout and #ClutterBinLayout.
  *
- * <refsect2 id="ClutterLayoutManager-use-in-Actor">
- *   <title>Using a Layout Manager inside an Actor</title>
- *   <para>In order to use a #ClutterLayoutManager inside a #ClutterActor
- *   sub-class you should invoke clutter_layout_manager_get_preferred_width()
- *   inside the #ClutterActorClass.get_preferred_width() virtual function and
- *   clutter_layout_manager_get_preferred_height() inside the
- *   #ClutterActorClass.get_preferred_height() virtual functions implementation.
- *   You should also call clutter_layout_manager_allocate() inside the
- *   implementation of the #ClutterActorClass.allocate() virtual function.</para>
- *   <para>In order to receive notifications for changes in the layout
- *   manager policies you should also connect to the
- *   #ClutterLayoutManager::layout-changed signal and queue a relayout
- *   on your actor. The following code should be enough if the actor
- *   does not need to perform specific operations whenever a layout
- *   manager changes:</para>
- *   <informalexample><programlisting>
- *  g_signal_connect_swapped (layout_manager,
- *                            "layout-changed",
- *                            G_CALLBACK (clutter_actor_queue_relayout),
- *                            actor);
- *   </programlisting></informalexample>
- * </refsect2>
+ * ## Implementing a ClutterLayoutManager
+ * The implementation of a layout manager does not differ from  the
+ * implementation of the size requisition and allocation bits of
+ * #ClutterActor, so you should read the relative documentation
+ * forr subclassing #ClutterActor.
  *
- * <refsect2 id="ClutterLayoutManager-implementation">
- *   <title>Implementing a ClutterLayoutManager</title>
- *   <para>The implementation of a layout manager does not differ from
- *   the implementation of the size requisition and allocation bits of
- *   #ClutterActor, so you should read the relative documentation
- *   <link linkend="clutter-subclassing-ClutterActor">for subclassing
- *   ClutterActor</link>.</para>
- *   <para>The layout manager implementation can hold a back pointer
- *   to the #ClutterContainer by implementing the
- *   <function>set_container()</function> virtual function. The layout manager
- *   should not hold a real reference (i.e. call g_object_ref()) on the
- *   container actor, to avoid reference cycles.</para>
- *   <para>If a layout manager has properties affecting the layout
- *   policies then it should emit the #ClutterLayoutManager::layout-changed
- *   signal on itself by using the clutter_layout_manager_layout_changed()
- *   function whenever one of these properties changes.</para>
- * </refsect2>
+ * The layout manager implementation can hold a back pointer to the
+ * #ClutterContainer by implementing the #ClutterLayoutManagerClass.set_container()
+ * virtual function. The layout manager should not hold a real reference (i.e.
+ * call g_object_ref()) on the container actor, to avoid reference cycles.
  *
- * <refsect2 id="ClutterLayoutManager-animation">
- *   <title>Animating a ClutterLayoutManager</title>
- *   <para>A layout manager is used to let a #ClutterContainer take complete
- *   ownership over the layout (that is: the position and sizing) of its
- *   children; this means that using the Clutter animation API, like
- *   clutter_actor_animate(), to animate the position and sizing of a child of
- *   a layout manager it is not going to work properly, as the animation will
- *   automatically override any setting done by the layout manager
- *   itself.</para>
- *   <para>It is possible for a #ClutterLayoutManager sub-class to animate its
- *   children layout by using the base class animation support. The
- *   #ClutterLayoutManager animation support consists of three virtual
- *   functions: #ClutterLayoutManagerClass.begin_animation(),
- *   #ClutterLayoutManagerClass.get_animation_progress(), and
- *   #ClutterLayoutManagerClass.end_animation().</para>
- *   <variablelist>
- *     <varlistentry>
- *       <term><function>begin_animation (duration, easing)</function></term>
- *       <listitem><para>This virtual function is invoked when the layout
- *       manager should begin an animation. The implementation should set up
- *       the state for the animation and create the ancillary objects for
- *       animating the layout. The default implementation creates a
- *       #ClutterTimeline for the given duration and a #ClutterAlpha binding
- *       the timeline to the given easing mode. This function returns a
- *       #ClutterAlpha which should be used to control the animation from
- *       the caller perspective.</para></listitem>
- *     </varlistentry>
- *     <varlistentry>
- *       <term><function>get_animation_progress()</function></term>
- *       <listitem><para>This virtual function should be invoked when animating
- *       a layout manager. It returns the progress of the animation, using the
- *       same semantics as the #ClutterAlpha:alpha value.</para></listitem>
- *     </varlistentry>
- *     <varlistentry>
- *       <term><function>end_animation()</function></term>
- *       <listitem><para>This virtual function is invoked when the animation of
- *       a layout manager ends, and it is meant to be used for bookkeeping the
- *       objects created in the <function>begin_animation()</function>
- *       function. The default implementation will call it implicitly when the
- *       timeline is complete.</para></listitem>
- *     </varlistentry>
- *   </variablelist>
- *   <para>The simplest way to animate a layout is to create a #ClutterTimeline
- *   inside the <function>begin_animation()</function> virtual function, along
- *   with a #ClutterAlpha, and for each #ClutterTimeline::new-frame signal
- *   emission call clutter_layout_manager_layout_changed(), which will cause a
- *   relayout. The #ClutterTimeline::completed signal emission should cause
- *   clutter_layout_manager_end_animation() to be called. The default
- *   implementation provided internally by #ClutterLayoutManager does exactly
- *   this, so most sub-classes should either not override any animation-related
- *   virtual function or simply override #ClutterLayoutManagerClass.begin_animation()
- *   and #ClutterLayoutManagerClass.end_animation() to set up ad hoc state, and then
- *   chain up to the parent's implementation.</para>
- *   <example id="example-ClutterLayoutManager-animation">
- *     <title>Animation of a Layout Manager</title>
- *     <para>The code below shows how a #ClutterLayoutManager sub-class should
- *     provide animating the allocation of its children from within the
- *     #ClutterLayoutManagerClass.allocate() virtual function implementation. The
- *     animation is computed between the last stable allocation performed
- *     before the animation started and the desired final allocation.</para>
- *     <para>The <varname>is_animating</varname> variable is stored inside the
- *     #ClutterLayoutManager sub-class and it is updated by overriding the
- *     #ClutterLayoutManagerClass.begin_animation() and the
- *     #ClutterLayoutManagerClass.end_animation() virtual functions and chaining up
- *     to the base class implementation.</para>
- *     <para>The last stable allocation is stored within a #ClutterLayoutMeta
- *     sub-class used by the implementation.</para>
- *     <programlisting>
- * static void
- * my_layout_manager_allocate (ClutterLayoutManager   *manager,
- *                             ClutterContainer       *container,
- *                             const ClutterActorBox  *allocation,
- *                             ClutterAllocationFlags  flags)
- * {
- *   MyLayoutManager *self = MY_LAYOUT_MANAGER (manager);
- *   ClutterActor *child;
+ * If a layout manager has properties affecting the layout policies then it should
+ * emit the #ClutterLayoutManager::layout-changed signal on itself by using the
+ * clutter_layout_manager_layout_changed() function whenever one of these properties
+ * changes.
  *
- *   for (child = clutter_actor_get_first_child (CLUTTER_ACTOR (container));
- *        child != NULL;
- *        child = clutter_actor_get_next_sibling (child))
- *     {
- *       ClutterLayoutMeta *meta;
- *       MyLayoutMeta *my_meta;
+ * ## Layout Properties
  *
- *       /&ast; retrieve the layout meta-object &ast;/
- *       meta = clutter_layout_manager_get_child_meta (manager,
- *                                                     container,
- *                                                     child);
- *       my_meta = MY_LAYOUT_META (meta);
+ * If a layout manager has layout properties, that is properties that
+ * should exist only as the result of the presence of a specific (layout
+ * manager, container actor, child actor) combination, and it wishes to store
+ * those properties inside a #ClutterLayoutMeta, then it should override the
+ * #ClutterLayoutManagerClass.get_child_meta_type() virtual function to return
+ * the #GType of the #ClutterLayoutMeta sub-class used to store the layout
+ * properties; optionally, the #ClutterLayoutManager sub-class might also
+ * override the #ClutterLayoutManagerClass.create_child_meta() virtual function
+ * to control how the #ClutterLayoutMeta instance is created, otherwise the
+ * default implementation will be equivalent to:
  *
- *       /&ast; compute the desired allocation for the child &ast;/
- *       compute_allocation (self, my_meta, child,
- *                           allocation, flags,
- *                           &amp;child_box);
- *
- *       /&ast; this is the additional code that deals with the animation
- *        &ast; of the layout manager
- *        &ast;/
- *       if (!self-&gt;is_animating)
- *         {
- *           /&ast; store the last stable allocation for later use &ast;/
- *           my_meta-&gt;last_alloc = clutter_actor_box_copy (&amp;child_box);
- *         }
- *       else
- *         {
- *           ClutterActorBox end = { 0, };
- *           gdouble p;
- *
- *           /&ast; get the progress of the animation &ast;/
- *           p = clutter_layout_manager_get_animation_progress (manager);
- *
- *           if (my_meta-&gt;last_alloc != NULL)
- *             {
- *               /&ast; copy the desired allocation as the final state &ast;/
- *               end = child_box;
- *
- *               /&ast; then interpolate the initial and final state
- *                &ast; depending on the progress of the animation,
- *                &ast; and put the result inside the box we will use
- *                &ast; to allocate the child
- *                &ast;/
- *               clutter_actor_box_interpolate (my_meta-&gt;last_alloc,
- *                                              &amp;end,
- *                                              p,
- *                                              &amp;child_box);
- *             }
- *           else
- *             {
- *               /&ast; if there is no stable allocation then the child was
- *                &ast; added while animating; one possible course of action
- *                &ast; is to just bail out and fall through to the allocation
- *                &ast; to position the child directly at its final state
- *                &ast;/
- *               my_meta-&gt;last_alloc =
- *                 clutter_actor_box_copy (&amp;child_box);
- *             }
- *         }
- *
- *       /&ast; allocate the child &ast;/
- *       clutter_actor_allocate (child, &child_box, flags);
- *     }
- * }
- *     </programlisting>
- *   </example>
- *   <para>Sub-classes of #ClutterLayoutManager that support animations of the
- *   layout changes should call clutter_layout_manager_begin_animation()
- *   whenever a layout property changes value, e.g.:</para>
- *   <informalexample>
- *     <programlisting>
- * if (self->orientation != new_orientation)
- *   {
- *     ClutterLayoutManager *manager;
- *
- *     self->orientation = new_orientation;
- *
- *     manager = CLUTTER_LAYOUT_MANAGER (self);
- *     clutter_layout_manager_layout_changed (manager);
- *     clutter_layout_manager_begin_animation (manager, 500, CLUTTER_LINEAR);
- *
- *     g_object_notify (G_OBJECT (self), "orientation");
- *   }
- *     </programlisting>
- *   </informalexample>
- *   <para>The code above will animate a change in the
- *   <varname>orientation</varname> layout property of a layout manager.</para>
- * </refsect2>
- *
- * <refsect2 id="clutter-layout-properties">
- *   <title>Layout Properties</title>
- *   <para>If a layout manager has layout properties, that is properties that
- *   should exist only as the result of the presence of a specific (layout
- *   manager, container actor, child actor) combination, and it wishes to store
- *   those properties inside a #ClutterLayoutMeta, then it should override the
- *   #ClutterLayoutManagerClass.get_child_meta_type() virtual function to return
- *   the #GType of the #ClutterLayoutMeta sub-class used to store the layout
- *   properties; optionally, the #ClutterLayoutManager sub-class might also
- *   override the #ClutterLayoutManagerClass.create_child_meta() virtual function
- *   to control how the #ClutterLayoutMeta instance is created, otherwise the
- *   default implementation will be equivalent to:</para>
- *   <informalexample><programlisting>
+ * |[
  *  ClutterLayoutManagerClass *klass;
  *  GType meta_type;
  *
@@ -270,22 +79,23 @@
  *                       "container", container,
  *                       "actor", actor,
  *                       NULL);
- *   </programlisting></informalexample>
- *   <para>Where <varname>manager</varname> is the  #ClutterLayoutManager,
- *   <varname>container</varname> is the #ClutterContainer using the
- *   #ClutterLayoutManager and <varname>actor</varname> is the #ClutterActor
- *   child of the #ClutterContainer.</para>
- * </refsect2>
+ * ]|
  *
- * <refsect2 id="clutter-layout-script">
- *   <title>Using ClutterLayoutManager with ClutterScript</title>
- *   <para>#ClutterLayoutManager instance can be created in the same way
- *   as other objects in #ClutterScript; properties can be set using the
- *   common syntax.</para>
- *   <para>Layout properties can be set on children of a container with
- *   a #ClutterLayoutManager using the <emphasis>layout::</emphasis>
- *   modifier on the property name, for instance:</para>
- *   <informalexample><programlisting>
+ * Where `manager` is the  #ClutterLayoutManager, `container` is the
+ * #ClutterContainer using the #ClutterLayoutManager, and `actor` is
+ * the #ClutterActor child of the #ClutterContainer.
+ *
+ * ## Using ClutterLayoutManager with ClutterScript
+ *
+ * #ClutterLayoutManager instances can be created in the same way
+ * as other objects in #ClutterScript; properties can be set using the
+ * common syntax.
+ *
+ * Layout properties can be set on children of a container with
+ * a #ClutterLayoutManager using the `layout::` modifier on the property
+ * name, for instance:
+ *
+ * |[
  * {
  *   "type" : "ClutterBox",
  *   "layout-manager" : { "type" : "ClutterTableLayout" },
@@ -314,8 +124,7 @@
  *     }
  *   ]
  * }
- *   </programlisting></informalexample>
- * </refsect2>
+ * ]|
  *
  * #ClutterLayoutManager is available since Clutter 1.2
  */
@@ -345,11 +154,6 @@
                    G_OBJECT_TYPE_NAME (_obj),                           \
                    (method));                           } G_STMT_END
 
-struct _ClutterLayoutManagerPrivate
-{
-  gpointer dummy;
-};
-
 enum
 {
   LAYOUT_CHANGED,
@@ -359,7 +163,7 @@ enum
 
 G_DEFINE_ABSTRACT_TYPE (ClutterLayoutManager,
                         clutter_layout_manager,
-                        G_TYPE_INITIALLY_UNOWNED);
+                        G_TYPE_INITIALLY_UNOWNED)
 
 static GQuark quark_layout_meta  = 0;
 static GQuark quark_layout_alpha = 0;
@@ -595,8 +399,6 @@ clutter_layout_manager_class_init (ClutterLayoutManagerClass *klass)
   quark_layout_alpha =
     g_quark_from_static_string ("clutter-layout-manager-alpha");
 
-  g_type_class_add_private (klass, sizeof (ClutterLayoutManagerPrivate));
-
   klass->get_preferred_width = layout_manager_real_get_preferred_width;
   klass->get_preferred_height = layout_manager_real_get_preferred_height;
   klass->allocate = layout_manager_real_allocate;
@@ -652,9 +454,6 @@ clutter_layout_manager_class_init (ClutterLayoutManagerClass *klass)
 static void
 clutter_layout_manager_init (ClutterLayoutManager *manager)
 {
-  manager->priv =
-    G_TYPE_INSTANCE_GET_PRIVATE (manager, CLUTTER_TYPE_LAYOUT_MANAGER,
-                                 ClutterLayoutManagerPrivate);
 }
 
 /**
diff --git a/clutter/clutter-layout-manager.h b/clutter/clutter-layout-manager.h
index d19d56337..cbfac1e82 100644
--- a/clutter/clutter-layout-manager.h
+++ b/clutter/clutter-layout-manager.h
@@ -40,7 +40,6 @@ G_BEGIN_DECLS
 #define CLUTTER_IS_LAYOUT_MANAGER_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE ((klass), CLUTTER_TYPE_LAYOUT_MANAGER))
 #define CLUTTER_LAYOUT_MANAGER_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS ((obj), CLUTTER_TYPE_LAYOUT_MANAGER, ClutterLayoutManagerClass))
 
-typedef struct _ClutterLayoutManagerPrivate     ClutterLayoutManagerPrivate;
 typedef struct _ClutterLayoutManagerClass       ClutterLayoutManagerClass;
 
 /**
@@ -56,7 +55,7 @@ struct _ClutterLayoutManager
   /*< private >*/
   GInitiallyUnowned parent_instance;
 
-  ClutterLayoutManagerPrivate *priv;
+  gpointer CLUTTER_PRIVATE_FIELD (dummy);
 };
 
 /**
@@ -150,51 +149,64 @@ struct _ClutterLayoutManagerClass
   void (* _clutter_padding_8) (void);
 };
 
+CLUTTER_AVAILABLE_IN_1_2
 GType clutter_layout_manager_get_type (void) G_GNUC_CONST;
 
+CLUTTER_AVAILABLE_IN_1_2
 void               clutter_layout_manager_get_preferred_width   (ClutterLayoutManager   *manager,
                                                                  ClutterContainer       *container,
                                                                  gfloat                  for_height,
                                                                  gfloat                 *min_width_p,
                                                                  gfloat                 *nat_width_p);
+CLUTTER_AVAILABLE_IN_1_2
 void               clutter_layout_manager_get_preferred_height  (ClutterLayoutManager   *manager,
                                                                  ClutterContainer       *container,
                                                                  gfloat                  for_width,
                                                                  gfloat                 *min_height_p,
                                                                  gfloat                 *nat_height_p);
+CLUTTER_AVAILABLE_IN_1_2
 void               clutter_layout_manager_allocate              (ClutterLayoutManager   *manager,
                                                                  ClutterContainer       *container,
                                                                  const ClutterActorBox  *allocation,
                                                                  ClutterAllocationFlags  flags);
 
+CLUTTER_AVAILABLE_IN_1_2
 void               clutter_layout_manager_set_container         (ClutterLayoutManager   *manager,
                                                                  ClutterContainer       *container);
+CLUTTER_AVAILABLE_IN_1_2
 void               clutter_layout_manager_layout_changed        (ClutterLayoutManager   *manager);
 
+CLUTTER_AVAILABLE_IN_1_2
 GParamSpec *       clutter_layout_manager_find_child_property   (ClutterLayoutManager   *manager,
                                                                  const gchar            *name);
+CLUTTER_AVAILABLE_IN_1_2
 GParamSpec **      clutter_layout_manager_list_child_properties (ClutterLayoutManager   *manager,
                                                                  guint                  *n_pspecs);
 
+CLUTTER_AVAILABLE_IN_1_2
 ClutterLayoutMeta *clutter_layout_manager_get_child_meta        (ClutterLayoutManager   *manager,
                                                                  ClutterContainer       *container,
                                                                  ClutterActor           *actor);
 
+CLUTTER_AVAILABLE_IN_1_2
 void               clutter_layout_manager_child_set             (ClutterLayoutManager   *manager,
                                                                  ClutterContainer       *container,
                                                                  ClutterActor           *actor,
                                                                  const gchar            *first_property,
                                                                  ...) G_GNUC_NULL_TERMINATED;
+CLUTTER_AVAILABLE_IN_1_2
 void               clutter_layout_manager_child_get             (ClutterLayoutManager   *manager,
                                                                  ClutterContainer       *container,
                                                                  ClutterActor           *actor,
                                                                  const gchar            *first_property,
                                                                  ...) G_GNUC_NULL_TERMINATED;
+CLUTTER_AVAILABLE_IN_1_2
 void               clutter_layout_manager_child_set_property    (ClutterLayoutManager   *manager,
                                                                  ClutterContainer       *container,
                                                                  ClutterActor           *actor,
                                                                  const gchar            *property_name,
                                                                  const GValue           *value);
+CLUTTER_AVAILABLE_IN_1_2
 void               clutter_layout_manager_child_get_property    (ClutterLayoutManager   *manager,
                                                                  ClutterContainer       *container,
                                                                  ClutterActor           *actor,
diff --git a/clutter/clutter-layout-meta.h b/clutter/clutter-layout-meta.h
index 0f7e7e82e..88ab97018 100644
--- a/clutter/clutter-layout-meta.h
+++ b/clutter/clutter-layout-meta.h
@@ -92,8 +92,10 @@ struct _ClutterLayoutMetaClass
   void (*_clutter_padding4) (void);
 };
 
+CLUTTER_AVAILABLE_IN_1_2
 GType clutter_layout_meta_get_type (void) G_GNUC_CONST;
 
+CLUTTER_AVAILABLE_IN_1_2
 ClutterLayoutManager *clutter_layout_meta_get_manager (ClutterLayoutMeta *data);
 
 G_END_DECLS
diff --git a/clutter/clutter-list-model.c b/clutter/clutter-list-model.c
index 49ac9df9d..b1dec9b84 100644
--- a/clutter/clutter-list-model.c
+++ b/clutter/clutter-list-model.c
@@ -76,8 +76,6 @@
 typedef struct _ClutterListModelIter    ClutterListModelIter;
 typedef struct _ClutterModelIterClass   ClutterListModelIterClass;
 
-#define CLUTTER_LIST_MODEL_GET_PRIVATE(obj)     (G_TYPE_INSTANCE_GET_PRIVATE ((obj), CLUTTER_TYPE_LIST_MODEL, ClutterListModelPrivate))
-
 struct _ClutterListModelPrivate
 {
   GSequence *sequence;
@@ -102,7 +100,7 @@ GType clutter_list_model_iter_get_type (void);
 
 G_DEFINE_TYPE (ClutterListModelIter,
                clutter_list_model_iter,
-               CLUTTER_TYPE_MODEL_ITER);
+               CLUTTER_TYPE_MODEL_ITER)
 
 static void
 clutter_list_model_iter_get_value (ClutterModelIter *iter,
@@ -434,7 +432,7 @@ clutter_list_model_iter_init (ClutterListModelIter *iter)
  * ClutterListModel
  */
 
-G_DEFINE_TYPE (ClutterListModel, clutter_list_model, CLUTTER_TYPE_MODEL);
+G_DEFINE_TYPE_WITH_PRIVATE (ClutterListModel, clutter_list_model, CLUTTER_TYPE_MODEL)
 
 static ClutterModelIter *
 clutter_list_model_get_iter_at_row (ClutterModel *model,
@@ -698,24 +696,21 @@ clutter_list_model_class_init (ClutterListModelClass *klass)
   GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
   ClutterModelClass *model_class = CLUTTER_MODEL_CLASS (klass);
 
-  g_type_class_add_private (klass, sizeof (ClutterListModelPrivate));
-
   gobject_class->finalize = clutter_list_model_finalize;
   gobject_class->dispose = clutter_list_model_dispose;
 
   model_class->get_iter_at_row = clutter_list_model_get_iter_at_row;
-  model_class->insert_row      = clutter_list_model_insert_row;
-  model_class->remove_row      = clutter_list_model_remove_row;
-  model_class->resort          = clutter_list_model_resort;
-  model_class->get_n_rows      = clutter_list_model_get_n_rows;
-
-  model_class->row_removed     = clutter_list_model_row_removed;
+  model_class->insert_row = clutter_list_model_insert_row;
+  model_class->remove_row = clutter_list_model_remove_row;
+  model_class->resort = clutter_list_model_resort;
+  model_class->get_n_rows = clutter_list_model_get_n_rows;
+  model_class->row_removed = clutter_list_model_row_removed;
 }
 
 static void
 clutter_list_model_init (ClutterListModel *model)
 {
-  model->priv = CLUTTER_LIST_MODEL_GET_PRIVATE (model);
+  model->priv = clutter_list_model_get_instance_private (model);
 
   model->priv->sequence = g_sequence_new (NULL);
   model->priv->temp_iter = g_object_new (CLUTTER_TYPE_LIST_MODEL_ITER,
diff --git a/clutter/clutter-list-model.h b/clutter/clutter-list-model.h
index e84cef581..ed52823fb 100644
--- a/clutter/clutter-list-model.h
+++ b/clutter/clutter-list-model.h
@@ -75,10 +75,13 @@ struct _ClutterListModelClass
   ClutterModelClass parent_class;
 };
 
+CLUTTER_AVAILABLE_IN_ALL
 GType         clutter_list_model_get_type (void) G_GNUC_CONST;
 
+CLUTTER_AVAILABLE_IN_ALL
 ClutterModel *clutter_list_model_new      (guint                n_columns,
                                               ...);
+CLUTTER_AVAILABLE_IN_ALL
 ClutterModel *clutter_list_model_newv     (guint                n_columns,
                                            GType               *types,
                                            const gchar * const  names[]);
diff --git a/clutter/clutter-macros.h b/clutter/clutter-macros.h
index db797d9a4..dc593f15f 100644
--- a/clutter/clutter-macros.h
+++ b/clutter/clutter-macros.h
@@ -92,6 +92,10 @@
 #define CLUTTER_PRIVATE_FIELD(x)        clutter_private_ ## x
 #endif
 
+#ifndef _CLUTTER_EXTERN
+#define _CLUTTER_EXTERN extern
+#endif
+
 /* these macros are used to mark deprecated functions, and thus have to be
  * exposed in a public header.
  *
@@ -99,15 +103,17 @@
  * and G_DEPRECATED_FOR, or use your own wrappers around them.
  */
 #ifdef CLUTTER_DISABLE_DEPRECATION_WARNINGS
-#define CLUTTER_DEPRECATED
-#define CLUTTER_DEPRECATED_FOR(f)
-#define CLUTTER_UNAVAILABLE(maj,min)
+#define CLUTTER_DEPRECATED _CLUTTER_EXTERN
+#define CLUTTER_DEPRECATED_FOR(f) _CLUTTER_EXTERN
+#define CLUTTER_UNAVAILABLE(maj,min) _CLUTTER_EXTERN
 #else
-#define CLUTTER_DEPRECATED G_DEPRECATED
-#define CLUTTER_DEPRECATED_FOR(f) G_DEPRECATED_FOR(f)
-#define CLUTTER_UNAVAILABLE(maj,min) G_UNAVAILABLE(maj,min)
+#define CLUTTER_DEPRECATED G_DEPRECATED _CLUTTER_EXTERN
+#define CLUTTER_DEPRECATED_FOR(f) G_DEPRECATED_FOR(f) _CLUTTER_EXTERN
+#define CLUTTER_UNAVAILABLE(maj,min) G_UNAVAILABLE(maj,min) _CLUTTER_EXTERN
 #endif
 
+#define CLUTTER_AVAILABLE_IN_ALL _CLUTTER_EXTERN
+
 /**
  * CLUTTER_VERSION_MIN_REQUIRED:
  *
@@ -168,126 +174,168 @@
 # define CLUTTER_DEPRECATED_IN_1_0              CLUTTER_DEPRECATED
 # define CLUTTER_DEPRECATED_IN_1_0_FOR(f)       CLUTTER_DEPRECATED_FOR(f)
 #else
-# define CLUTTER_DEPRECATED_IN_1_0
-# define CLUTTER_DEPRECATED_IN_1_0_FOR(f)
+# define CLUTTER_DEPRECATED_IN_1_0              _CLUTTER_EXTERN
+# define CLUTTER_DEPRECATED_IN_1_0_FOR(f)       _CLUTTER_EXTERN
 #endif
 
 #if CLUTTER_VERSION_MAX_ALLOWED < CLUTTER_VERSION_1_0
 # define CLUTTER_AVAILABLE_IN_1_0               CLUTTER_UNAVAILABLE(1, 0)
 #else
-# define CLUTTER_AVAILABLE_IN_1_0
+# define CLUTTER_AVAILABLE_IN_1_0               _CLUTTER_EXTERN
 #endif
 
 #if CLUTTER_VERSION_MIN_REQUIRED >= CLUTTER_VERSION_1_2
 # define CLUTTER_DEPRECATED_IN_1_2              CLUTTER_DEPRECATED
 # define CLUTTER_DEPRECATED_IN_1_2_FOR(f)       CLUTTER_DEPRECATED_FOR(f)
 #else
-# define CLUTTER_DEPRECATED_IN_1_2
-# define CLUTTER_DEPRECATED_IN_1_2_FOR(f)
+# define CLUTTER_DEPRECATED_IN_1_2              _CLUTTER_EXTERN
+# define CLUTTER_DEPRECATED_IN_1_2_FOR(f)       _CLUTTER_EXTERN
 #endif
 
 #if CLUTTER_VERSION_MAX_ALLOWED < CLUTTER_VERSION_1_2
 # define CLUTTER_AVAILABLE_IN_1_2               CLUTTER_UNAVAILABLE(1, 2)
 #else
-# define CLUTTER_AVAILABLE_IN_1_2
+# define CLUTTER_AVAILABLE_IN_1_2               _CLUTTER_EXTERN
 #endif
 
 #if CLUTTER_VERSION_MIN_REQUIRED >= CLUTTER_VERSION_1_4
 # define CLUTTER_DEPRECATED_IN_1_4              CLUTTER_DEPRECATED
 # define CLUTTER_DEPRECATED_IN_1_4_FOR(f)       CLUTTER_DEPRECATED_FOR(f)
 #else
-# define CLUTTER_DEPRECATED_IN_1_4
-# define CLUTTER_DEPRECATED_IN_1_4_FOR(f)
+# define CLUTTER_DEPRECATED_IN_1_4              _CLUTTER_EXTERN
+# define CLUTTER_DEPRECATED_IN_1_4_FOR(f)       _CLUTTER_EXTERN
 #endif
 
 #if CLUTTER_VERSION_MAX_ALLOWED < CLUTTER_VERSION_1_4
 # define CLUTTER_AVAILABLE_IN_1_4               CLUTTER_UNAVAILABLE(1, 4)
 #else
-# define CLUTTER_AVAILABLE_IN_1_4
+# define CLUTTER_AVAILABLE_IN_1_4               _CLUTTER_EXTERN
 #endif
 
 #if CLUTTER_VERSION_MIN_REQUIRED >= CLUTTER_VERSION_1_6
 # define CLUTTER_DEPRECATED_IN_1_6              CLUTTER_DEPRECATED
 # define CLUTTER_DEPRECATED_IN_1_6_FOR(f)       CLUTTER_DEPRECATED_FOR(f)
 #else
-# define CLUTTER_DEPRECATED_IN_1_6
-# define CLUTTER_DEPRECATED_IN_1_6_FOR(f)
+# define CLUTTER_DEPRECATED_IN_1_6              _CLUTTER_EXTERN
+# define CLUTTER_DEPRECATED_IN_1_6_FOR(f)       _CLUTTER_EXTERN
 #endif
 
 #if CLUTTER_VERSION_MAX_ALLOWED < CLUTTER_VERSION_1_6
 # define CLUTTER_AVAILABLE_IN_1_6               CLUTTER_UNAVAILABLE(1, 6)
 #else
-# define CLUTTER_AVAILABLE_IN_1_6
+# define CLUTTER_AVAILABLE_IN_1_6               _CLUTTER_EXTERN
 #endif
 
 #if CLUTTER_VERSION_MIN_REQUIRED >= CLUTTER_VERSION_1_8
 # define CLUTTER_DEPRECATED_IN_1_8              CLUTTER_DEPRECATED
 # define CLUTTER_DEPRECATED_IN_1_8_FOR(f)       CLUTTER_DEPRECATED_FOR(f)
 #else
-# define CLUTTER_DEPRECATED_IN_1_8
-# define CLUTTER_DEPRECATED_IN_1_8_FOR(f)
+# define CLUTTER_DEPRECATED_IN_1_8              _CLUTTER_EXTERN
+# define CLUTTER_DEPRECATED_IN_1_8_FOR(f)       _CLUTTER_EXTERN
 #endif
 
 #if CLUTTER_VERSION_MAX_ALLOWED < CLUTTER_VERSION_1_8
 # define CLUTTER_AVAILABLE_IN_1_8               CLUTTER_UNAVAILABLE(1, 8)
 #else
-# define CLUTTER_AVAILABLE_IN_1_8
+# define CLUTTER_AVAILABLE_IN_1_8               _CLUTTER_EXTERN
 #endif
 
 #if CLUTTER_VERSION_MIN_REQUIRED >= CLUTTER_VERSION_1_10
 # define CLUTTER_DEPRECATED_IN_1_10             CLUTTER_DEPRECATED
 # define CLUTTER_DEPRECATED_IN_1_10_FOR(f)      CLUTTER_DEPRECATED_FOR(f)
 #else
-# define CLUTTER_DEPRECATED_IN_1_10
-# define CLUTTER_DEPRECATED_IN_1_10_FOR(f)
+# define CLUTTER_DEPRECATED_IN_1_10             _CLUTTER_EXTERN
+# define CLUTTER_DEPRECATED_IN_1_10_FOR(f)      _CLUTTER_EXTERN
 #endif
 
 #if CLUTTER_VERSION_MAX_ALLOWED < CLUTTER_VERSION_1_10
 # define CLUTTER_AVAILABLE_IN_1_10              CLUTTER_UNAVAILABLE(1, 10)
 #else
-# define CLUTTER_AVAILABLE_IN_1_10
+# define CLUTTER_AVAILABLE_IN_1_10              _CLUTTER_EXTERN
 #endif
 
 #if CLUTTER_VERSION_MIN_REQUIRED >= CLUTTER_VERSION_1_12
 # define CLUTTER_DEPRECATED_IN_1_12             CLUTTER_DEPRECATED
 # define CLUTTER_DEPRECATED_IN_1_12_FOR(f)      CLUTTER_DEPRECATED_FOR(f)
 #else
-# define CLUTTER_DEPRECATED_IN_1_12
-# define CLUTTER_DEPRECATED_IN_1_12_FOR(f)
+# define CLUTTER_DEPRECATED_IN_1_12             _CLUTTER_EXTERN
+# define CLUTTER_DEPRECATED_IN_1_12_FOR(f)      _CLUTTER_EXTERN
 #endif
 
 #if CLUTTER_VERSION_MAX_ALLOWED < CLUTTER_VERSION_1_12
 # define CLUTTER_AVAILABLE_IN_1_12              CLUTTER_UNAVAILABLE(1, 12)
 #else
-# define CLUTTER_AVAILABLE_IN_1_12
+# define CLUTTER_AVAILABLE_IN_1_12              _CLUTTER_EXTERN
 #endif
 
 #if CLUTTER_VERSION_MIN_REQUIRED >= CLUTTER_VERSION_1_14
 # define CLUTTER_DEPRECATED_IN_1_14             CLUTTER_DEPRECATED
 # define CLUTTER_DEPRECATED_IN_1_14_FOR(f)      CLUTTER_DEPRECATED_FOR(f)
 #else
-# define CLUTTER_DEPRECATED_IN_1_14
-# define CLUTTER_DEPRECATED_IN_1_14_FOR(f)
+# define CLUTTER_DEPRECATED_IN_1_14             _CLUTTER_EXTERN
+# define CLUTTER_DEPRECATED_IN_1_14_FOR(f)      _CLUTTER_EXTERN
 #endif
 
 #if CLUTTER_VERSION_MAX_ALLOWED < CLUTTER_VERSION_1_14
 # define CLUTTER_AVAILABLE_IN_1_14              CLUTTER_UNAVAILABLE(1, 14)
 #else
-# define CLUTTER_AVAILABLE_IN_1_14
+# define CLUTTER_AVAILABLE_IN_1_14              _CLUTTER_EXTERN
 #endif
 
 #if CLUTTER_VERSION_MIN_REQUIRED >= CLUTTER_VERSION_1_16
 # define CLUTTER_DEPRECATED_IN_1_16             CLUTTER_DEPRECATED
 # define CLUTTER_DEPRECATED_IN_1_16_FOR(f)      CLUTTER_DEPRECATED_FOR(f)
 #else
-# define CLUTTER_DEPRECATED_IN_1_16
-# define CLUTTER_DEPRECATED_IN_1_16_FOR(f)
+# define CLUTTER_DEPRECATED_IN_1_16             _CLUTTER_EXTERN
+# define CLUTTER_DEPRECATED_IN_1_16_FOR(f)      _CLUTTER_EXTERN
 #endif
 
 #if CLUTTER_VERSION_MAX_ALLOWED < CLUTTER_VERSION_1_16
 # define CLUTTER_AVAILABLE_IN_1_16              CLUTTER_UNAVAILABLE(1, 16)
 #else
-# define CLUTTER_AVAILABLE_IN_1_16
+# define CLUTTER_AVAILABLE_IN_1_16              _CLUTTER_EXTERN
+#endif
+
+#if CLUTTER_VERSION_MIN_REQUIRED >= CLUTTER_VERSION_1_18
+# define CLUTTER_DEPRECATED_IN_1_18             CLUTTER_DEPRECATED
+# define CLUTTER_DEPRECATED_IN_1_18_FOR(f)      CLUTTER_DEPRECATED_FOR(f)
+#else
+# define CLUTTER_DEPRECATED_IN_1_18             _CLUTTER_EXTERN
+# define CLUTTER_DEPRECATED_IN_1_18_FOR(f)      _CLUTTER_EXTERN
+#endif
+
+#if CLUTTER_VERSION_MAX_ALLOWED < CLUTTER_VERSION_1_18
+# define CLUTTER_AVAILABLE_IN_1_18              CLUTTER_UNAVAILABLE(1, 18)
+#else
+# define CLUTTER_AVAILABLE_IN_1_18              _CLUTTER_EXTERN
+#endif
+
+#if CLUTTER_VERSION_MIN_REQUIRED >= CLUTTER_VERSION_1_20
+# define CLUTTER_DEPRECATED_IN_1_20             CLUTTER_DEPRECATED
+# define CLUTTER_DEPRECATED_IN_1_20_FOR(f)      CLUTTER_DEPRECATED_FOR(f)
+#else
+# define CLUTTER_DEPRECATED_IN_1_20             _CLUTTER_EXTERN
+# define CLUTTER_DEPRECATED_IN_1_20_FOR(f)      _CLUTTER_EXTERN
+#endif
+
+#if CLUTTER_VERSION_MAX_ALLOWED < CLUTTER_VERSION_1_20
+# define CLUTTER_AVAILABLE_IN_1_20              CLUTTER_UNAVAILABLE(1, 20)
+#else
+# define CLUTTER_AVAILABLE_IN_1_20              _CLUTTER_EXTERN
+#endif
+
+#if CLUTTER_VERSION_MIN_REQUIRED >= CLUTTER_VERSION_1_22
+# define CLUTTER_DEPRECATED_IN_1_22             CLUTTER_DEPRECATED
+# define CLUTTER_DEPRECATED_IN_1_22_FOR(f)      CLUTTER_DEPRECATED_FOR(f)
+#else
+# define CLUTTER_DEPRECATED_IN_1_22             _CLUTTER_EXTERN
+# define CLUTTER_DEPRECATED_IN_1_22_FOR(f)      _CLUTTER_EXTERN
+#endif
+
+#if CLUTTER_VERSION_MAX_ALLOWED < CLUTTER_VERSION_1_22
+# define CLUTTER_AVAILABLE_IN_1_22              CLUTTER_UNAVAILABLE(1, 22)
+#else
+# define CLUTTER_AVAILABLE_IN_1_22              _CLUTTER_EXTERN
 #endif
 
 #endif /* __CLUTTER_MACROS_H__ */
diff --git a/clutter/clutter-main.c b/clutter/clutter-main.c
index d0d6185e2..c21f897d2 100644
--- a/clutter/clutter-main.c
+++ b/clutter/clutter-main.c
@@ -23,70 +23,28 @@
 
 /**
  * SECTION:clutter-main
- * @short_description: Various 'global' clutter functions.
+ * @short_description: Various 'global' Clutter functions.
  *
  * Functions to retrieve various global Clutter resources and other utility
  * functions for mainloops, events and threads
  *
- * <refsect2 id="clutter-Threading-Model">
- *   <title>Threading Model</title>
- *   <para>Clutter is <emphasis>thread-aware</emphasis>: all operations
- *   performed by Clutter are assumed to be under the big Clutter lock,
- *   which is created when the threading is initialized through
- *   clutter_init().</para>
- *   <example id="example-Thread-Init">
- *     <title>Thread Initialization</title>
- *     <para>The code below shows how to correctly initialize Clutter
- *     in a multi-threaded environment. These operations are mandatory for
- *     applications that wish to use threads with Clutter.</para>
- *     <programlisting>
- * int
- * main (int argc, char *argv[])
- * {
- *   /&ast; initialize Clutter &ast;/
- *   clutter_init (&amp;argc, &amp;argv);
+ * ## The Clutter Threading Model
  *
- *   /&ast; program code &ast;/
+ * Clutter is *thread-aware*: all operations performed by Clutter are assumed
+ * to be under the Big Clutter Lock, which is created when the threading is
+ * initialized through clutter_init(), and entered when calling user-related
+ * code during event handling and actor drawing.
  *
- *   /&ast; acquire the main lock &ast;/
- *   clutter_threads_enter ();
+ * The only safe and portable way to use the Clutter API in a multi-threaded
+ * environment is to only access the Clutter API from a thread that did called
+ * clutter_init() and clutter_main().
  *
- *   /&ast; start the main loop &ast;/
- *   clutter_main ();
+ * The common pattern for using threads with Clutter is to use worker threads
+ * to perform blocking operations and then install idle or timeout sources with
+ * the result when the thread finishes, and update the UI from those callbacks.
  *
- *   /&ast; release the main lock &ast;/
- *   clutter_threads_leave ();
- *
- *   /&ast; clean up &ast;/
- *   return 0;
- * }
- *     </programlisting>
- *   </example>
- *   <para>This threading model has the caveat that it is only safe to call
- *   Clutter's API when the lock has been acquired &mdash; which happens
- *   between pairs of clutter_threads_enter() and clutter_threads_leave()
- *   calls.</para>
- *   <para>The only safe and portable way to use the Clutter API in a
- *   multi-threaded environment is to never access the API from a thread that
- *   did not call clutter_init() and clutter_main().</para>
- *   <para>The common pattern for using threads with Clutter is to use worker
- *   threads to perform blocking operations and then install idle or timeout
- *   sources with the result when the thread finished.</para>
- *   <para>Clutter provides thread-aware variants of g_idle_add() and
- *   g_timeout_add() that acquire the Clutter lock before invoking the provided
- *   callback: clutter_threads_add_idle() and
- *   clutter_threads_add_timeout().</para>
- *   <para>The example below shows how to use a worker thread to perform a
- *   blocking operation, and perform UI updates using the main loop.</para>
- *   <example id="worker-thread-example">
- *     <title>A worker thread example</title>
- *     <programlisting>
- * <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" parse="text" href="../../../../examples/threads.c">
- *   <xi:fallback>FIXME: MISSING XINCLUDE CONTENT</xi:fallback>
- * </xi:include>
- *     </programlisting>
- *   </example>
- * </refsect2>
+ * For a working example of how to use a worker thread to update the UI, see
+ * [threads.c](https://git.gnome.org/browse/clutter/tree/examples/threads.c?h=clutter-1.18)
  */
 
 #ifdef HAVE_CONFIG_H
@@ -556,12 +514,10 @@ clutter_redraw (ClutterStage *stage)
  * all #ClutterStage<!-- -->s managed by Clutter.
  *
  * If @enable is %FALSE the following events will not work:
- * <itemizedlist>
- *   <listitem><para>ClutterActor::motion-event, unless on the
- *     #ClutterStage</para></listitem>
- *   <listitem><para>ClutterActor::enter-event</para></listitem>
- *   <listitem><para>ClutterActor::leave-event</para></listitem>
- * </itemizedlist>
+ *
+ *  - ClutterActor::motion-event, except on the #ClutterStage
+ *  - ClutterActor::enter-event
+ *  - ClutterActor::leave-event
  *
  * Since: 0.6
  *
@@ -611,20 +567,6 @@ clutter_get_motion_events_enabled (void)
   return _clutter_context_get_motion_events_enabled ();
 }
 
-ClutterActor *
-_clutter_get_actor_by_id (ClutterStage *stage,
-                          guint32       actor_id)
-{
-  if (stage == NULL)
-    {
-      ClutterMainContext *context = _clutter_context_get_default ();
-
-      return _clutter_id_pool_lookup (context->id_pool, actor_id);
-    }
-
-  return _clutter_stage_get_actor_by_pick_id (stage, actor_id);
-}
-
 void
 _clutter_id_to_color (guint         id_,
                       ClutterColor *col)
@@ -808,86 +750,6 @@ clutter_get_text_direction (void)
   return dir;
 }
 
-static void
-update_pango_context (ClutterBackend *backend,
-                      PangoContext   *context)
-{
-  ClutterSettings *settings;
-  PangoFontDescription *font_desc;
-  const cairo_font_options_t *font_options;
-  gchar *font_name;
-  PangoDirection pango_dir;
-  gdouble resolution;
-
-  settings = clutter_settings_get_default ();
-
-  /* update the text direction */
-  if (clutter_text_direction == CLUTTER_TEXT_DIRECTION_RTL)
-    pango_dir = PANGO_DIRECTION_RTL;
-  else
-    pango_dir = PANGO_DIRECTION_LTR;
-
-  pango_context_set_base_dir (context, pango_dir);
-
-  g_object_get (settings, "font-name", &font_name, NULL);
-
-  /* get the configuration for the PangoContext from the backend */
-  font_options = clutter_backend_get_font_options (backend);
-  resolution = clutter_backend_get_resolution (backend);
-
-  font_desc = pango_font_description_from_string (font_name);
-
-  if (resolution < 0)
-    resolution = 96.0; /* fall back */
-
-  pango_context_set_font_description (context, font_desc);
-  pango_cairo_context_set_font_options (context, font_options);
-  pango_cairo_context_set_resolution (context, resolution);
-
-  pango_font_description_free (font_desc);
-  g_free (font_name);
-}
-
-PangoContext *
-_clutter_context_get_pango_context (void)
-{
-  ClutterMainContext *self = _clutter_context_get_default ();
-
-  if (G_UNLIKELY (self->pango_context == NULL))
-    {
-      PangoContext *context;
-
-      context = _clutter_context_create_pango_context ();
-      self->pango_context = context;
-
-      g_signal_connect (self->backend, "resolution-changed",
-                        G_CALLBACK (update_pango_context),
-                        self->pango_context);
-      g_signal_connect (self->backend, "font-changed",
-                        G_CALLBACK (update_pango_context),
-                        self->pango_context);
-    }
-  else
-    update_pango_context (self->backend, self->pango_context);
-
-  return self->pango_context;
-}
-
-PangoContext *
-_clutter_context_create_pango_context (void)
-{
-  CoglPangoFontMap *font_map;
-  PangoContext *context;
-
-  font_map = clutter_context_get_pango_fontmap ();
-
-  context = cogl_pango_font_map_create_context (font_map);
-  update_pango_context (clutter_get_default_backend (), context);
-  pango_context_set_language (context, pango_language_get_default ());
-
-  return context;
-}
-
 /**
  * clutter_main_quit:
  *
@@ -896,7 +758,15 @@ _clutter_context_create_pango_context (void)
 void
 clutter_main_quit (void)
 {
-  g_return_if_fail (main_loops != NULL);
+  if (main_loops == NULL)
+    {
+      g_critical ("Calling clutter_main_quit() without calling clutter_main() "
+                  "is not allowed. If you are using another main loop, use the "
+                  "appropriate API to terminate it.");
+      return;
+    }
+
+  CLUTTER_NOTE (MISC, "Terminating main loop level %d", clutter_main_loop_level);
 
   g_main_loop_quit (main_loops->data);
 }
@@ -945,14 +815,6 @@ void
 clutter_main (void)
 {
   GMainLoop *loop;
-  CLUTTER_STATIC_TIMER (mainloop_timer,
-                        NULL, /* no parent */
-                        "Mainloop",
-                        "The time spent in the clutter mainloop",
-                        0 /* no application private data */);
-
-  if (clutter_main_loop_level == 0)
-    CLUTTER_TIMER_START (uprof_get_mainloop_context (), mainloop_timer);
 
   if (!_clutter_context_is_initialized ())
     {
@@ -961,8 +823,6 @@ clutter_main (void)
       return;
     }
 
-  clutter_main_loop_level++;
-
 #ifdef CLUTTER_ENABLE_PROFILE
   if (!prev_poll)
     {
@@ -971,6 +831,10 @@ clutter_main (void)
     }
 #endif
 
+  clutter_main_loop_level++;
+
+  CLUTTER_NOTE (MISC, "Entering main loop level %d", clutter_main_loop_level);
+
   loop = g_main_loop_new (NULL, TRUE);
   main_loops = g_slist_prepend (main_loops, loop);
 
@@ -985,10 +849,9 @@ clutter_main (void)
 
   g_main_loop_unref (loop);
 
-  clutter_main_loop_level--;
+  CLUTTER_NOTE (MISC, "Leaving main loop level %d", clutter_main_loop_level);
 
-  if (clutter_main_loop_level == 0)
-    CLUTTER_TIMER_STOP (uprof_get_mainloop_context (), mainloop_timer);
+  clutter_main_loop_level--;
 }
 
 /**
@@ -1088,7 +951,7 @@ _clutter_threads_dispatch_free (gpointer data)
 }
 
 /**
- * clutter_threads_add_idle_full:
+ * clutter_threads_add_idle_full: (rename-to clutter_threads_add_idle)
  * @priority: the priority of the timeout source. Typically this will be in the
  *    range between #G_PRIORITY_DEFAULT_IDLE and #G_PRIORITY_HIGH_IDLE
  * @func: function to call
@@ -1110,13 +973,13 @@ _clutter_threads_dispatch_free (gpointer data)
  *    SafeClosure *closure = data;
  *    gboolean res = FALSE;
  *
- *    /&ast; mark the critical section &ast;/
+ *    // mark the critical section //
  *
  *    clutter_threads_enter();
  *
- *    /&ast; the callback does not need to acquire the Clutter
- *     &ast; lock itself, as it is held by the this proxy handler
- *     &ast;/
+ *    // the callback does not need to acquire the Clutter
+ *     / lock itself, as it is held by the this proxy handler
+ *     //
  *    res = closure->callback (closure->data);
  *
  *    clutter_threads_leave();
@@ -1129,8 +992,8 @@ _clutter_threads_dispatch_free (gpointer data)
  * {
  *   SafeClosure *closure = g_new0 (SafeClosure, 1);
  *
- *   closure-&gt;callback = callback;
- *   closure-&gt;data = data;
+ *   closure->callback = callback;
+ *   closure->data = data;
  *
  *   return g_idle_add_full (G_PRIORITY_DEFAULT_IDLE,
  *                           idle_safe_callback,
@@ -1151,24 +1014,24 @@ _clutter_threads_dispatch_free (gpointer data)
  * {
  *   SomeClosure *closure = data;
  *
- *   /&ast; it is safe to call Clutter API from this function because
- *    &ast; it is invoked from the same thread that started the main
- *    &ast; loop and under the Clutter thread lock
- *    &ast;/
- *   clutter_label_set_text (CLUTTER_LABEL (closure-&gt;label),
- *                           closure-&gt;text);
+ *   // it is safe to call Clutter API from this function because
+ *    / it is invoked from the same thread that started the main
+ *    / loop and under the Clutter thread lock
+ *    //
+ *   clutter_label_set_text (CLUTTER_LABEL (closure->label),
+ *                           closure->text);
  *
- *   g_object_unref (closure-&gt;label);
+ *   g_object_unref (closure->label);
  *   g_free (closure);
  *
  *   return FALSE;
  * }
  *
- *   /&ast; within another thread &ast;/
+ *   // within another thread //
  *   closure = g_new0 (SomeClosure, 1);
- *   /&ast; always take a reference on GObject instances &ast;/
- *   closure-&gt;label = g_object_ref (my_application-&gt;label);
- *   closure-&gt;text = g_strdup (processed_text_to_update_the_label);
+ *   // always take a reference on GObject instances //
+ *   closure->label = g_object_ref (my_application->label);
+ *   closure->text = g_strdup (processed_text_to_update_the_label);
  *
  *   clutter_threads_add_idle_full (G_PRIORITY_HIGH_IDLE,
  *                                  update_ui,
@@ -1176,8 +1039,6 @@ _clutter_threads_dispatch_free (gpointer data)
  *                                  NULL);
  * ]|
  *
- * Rename to: clutter_threads_add_idle
- *
  * Return value: the ID (greater than 0) of the event source.
  *
  * Since: 0.4
@@ -1226,7 +1087,7 @@ clutter_threads_add_idle (GSourceFunc func,
 }
 
 /**
- * clutter_threads_add_timeout_full:
+ * clutter_threads_add_timeout_full: (rename-to clutter_threads_add_timeout)
  * @priority: the priority of the timeout source. Typically this will be in the
  *            range between #G_PRIORITY_DEFAULT and #G_PRIORITY_HIGH.
  * @interval: the time between calls to the function, in milliseconds
@@ -1248,8 +1109,6 @@ clutter_threads_add_idle (GSourceFunc func,
  *
  * See also clutter_threads_add_idle_full().
  *
- * Rename to: clutter_threads_add_timeout
- *
  * Return value: the ID (greater than 0) of the event source.
  *
  * Since: 0.4
@@ -1390,53 +1249,6 @@ _clutter_context_is_initialized (void)
   return ClutterCntx->is_initialized;
 }
 
-static ClutterBackend *
-clutter_create_backend (void)
-{
-  const char *backend = g_getenv ("CLUTTER_BACKEND");
-  ClutterBackend *retval = NULL;
-
-  if (backend != NULL)
-    backend = g_intern_string (backend);
-
-#ifdef CLUTTER_WINDOWING_OSX
-  if (backend == NULL || backend == I_(CLUTTER_WINDOWING_OSX))
-    retval = g_object_new (CLUTTER_TYPE_BACKEND_OSX, NULL);
-  else
-#endif
-#ifdef CLUTTER_WINDOWING_WIN32
-  if (backend == NULL || backend == I_(CLUTTER_WINDOWING_WIN32))
-    retval = g_object_new (CLUTTER_TYPE_BACKEND_WIN32, NULL);
-  else
-#endif
-#ifdef CLUTTER_WINDOWING_X11
-  if (backend == NULL || backend == I_(CLUTTER_WINDOWING_X11))
-    retval = g_object_new (CLUTTER_TYPE_BACKEND_X11, NULL);
-  else
-#endif
-#ifdef CLUTTER_WINDOWING_WAYLAND
-  if (backend == NULL || backend == I_(CLUTTER_WINDOWING_WAYLAND))
-    retval = g_object_new (CLUTTER_TYPE_BACKEND_WAYLAND, NULL);
-  else
-#endif
-#ifdef CLUTTER_WINDOWING_EGL
-  if (backend == NULL || backend == I_(CLUTTER_WINDOWING_EGL))
-    retval = g_object_new (CLUTTER_TYPE_BACKEND_EGL_NATIVE, NULL);
-  else
-#endif
-#ifdef CLUTTER_WINDOWING_GDK
-  if (backend == NULL || backend == I_(CLUTTER_WINDOWING_GDK))
-    retval = g_object_new (CLUTTER_TYPE_BACKEND_GDK, NULL);
-  else
-#endif
-  if (backend == NULL)
-    g_error ("No default Clutter backend found.");
-  else
-    g_error ("Unsupported Clutter backend: '%s'", backend);
-
-  return retval;
-}
-
 static ClutterMainContext *
 clutter_context_get_default_unlocked (void)
 {
@@ -1449,7 +1261,7 @@ clutter_context_get_default_unlocked (void)
       ctx->is_initialized = FALSE;
 
       /* create the windowing system backend */
-      ctx->backend = clutter_create_backend ();
+      ctx->backend = _clutter_create_backend ();
 
       /* create the default settings object, and store a back pointer to
        * the backend singleton
@@ -1584,6 +1396,14 @@ clutter_init_real (GError **error)
   ClutterMainContext *ctx;
   ClutterBackend *backend;
 
+#ifdef CLUTTER_ENABLE_PROFILE
+  CLUTTER_STATIC_TIMER (mainloop_timer,
+                        NULL, /* no parent */
+                        "Mainloop",
+                        "The time spent in the clutter mainloop",
+                        0 /* no application private data */);
+#endif
+
   /* Note, creates backend if not already existing, though parse args will
    * have likely created it
    */
@@ -1645,6 +1465,8 @@ clutter_init_real (GError **error)
   uprof_init (NULL, NULL);
   _clutter_uprof_init ();
 
+  CLUTTER_TIMER_START (uprof_get_mainloop_context (), mainloop_timer);
+
   if (clutter_profile_flags & CLUTTER_PROFILE_PICKING_ONLY)
     _clutter_profile_suspend ();
 #endif
@@ -1726,8 +1548,6 @@ pre_parse_hook (GOptionContext  *context,
 
   clutter_context = _clutter_context_get_default ();
 
-  clutter_context->id_pool = _clutter_id_pool_new (256);
-
   backend = clutter_context->backend;
   g_assert (CLUTTER_IS_BACKEND (backend));
 
@@ -1856,13 +1676,13 @@ post_parse_hook (GOptionContext  *context,
  *
  * |[
  *   g_option_context_set_main_group (context, clutter_get_option_group ());
- *   res = g_option_context_parse (context, &amp;argc, &amp;argc, NULL);
+ *   res = g_option_context_parse (context, &argc, &argc, NULL);
  * ]|
  *
  * is functionally equivalent to:
  *
  * |[
- *   clutter_init (&amp;argc, &amp;argv);
+ *   clutter_init (&argc, &argv);
  * ]|
  *
  * After g_option_context_parse() on a #GOptionContext containing the
@@ -1912,7 +1732,7 @@ clutter_get_option_group (void)
  * the #GOptionGroup returned by this function requires a subsequent explicit
  * call to clutter_init(); use this function when needing to set foreign
  * display connection with clutter_x11_set_display(), or with
- * <function>gtk_clutter_init()</function>.
+ * `gtk_clutter_init()`.
  *
  * Return value: (transfer full): a #GOptionGroup for the commandline arguments
  *   recognized by Clutter
@@ -2097,12 +1917,12 @@ clutter_parse_args (int      *argc,
  *
  * It is safe to call this function multiple times.
  *
- * <note>This function will not abort in case of errors during
+ * This function will not abort in case of errors during
  * initialization; clutter_init() will print out the error message on
  * stderr, and will return an error code. It is up to the application
  * code to handle this case. If you need to display the error message
  * yourself, you can use clutter_init_with_args(), which takes a #GError
- * pointer.</note>
+ * pointer.
  *
  * If this function fails, and returns an error code, any subsequent
  * Clutter API will have undefined behaviour - including segmentation
@@ -2326,6 +2146,9 @@ emit_pointer_event (ClutterEvent       *event,
 {
   ClutterMainContext *context = _clutter_context_get_default ();
 
+  if (_clutter_event_process_filters (event))
+    return;
+
   if (context->pointer_grab_actor == NULL &&
       (device == NULL || device->pointer_grab_actor == NULL))
     {
@@ -2353,6 +2176,9 @@ emit_touch_event (ClutterEvent       *event,
 {
   ClutterActor *grab_actor = NULL;
 
+  if (_clutter_event_process_filters (event))
+    return;
+
   if (device->sequence_grab_actors != NULL)
     {
       grab_actor = g_hash_table_lookup (device->sequence_grab_actors,
@@ -2377,6 +2203,9 @@ emit_keyboard_event (ClutterEvent       *event,
 {
   ClutterMainContext *context = _clutter_context_get_default ();
 
+  if (_clutter_event_process_filters (event))
+    return;
+
   if (context->keyboard_grab_actor == NULL &&
       (device == NULL || device->keyboard_grab_actor == NULL))
     {
@@ -2448,7 +2277,7 @@ clutter_do_event (ClutterEvent *event)
    * because we've "looked ahead" and know all motion events that
    * will occur before drawing the frame.
    */
-  _clutter_stage_queue_event (event->any.stage, event);
+  _clutter_stage_queue_event (event->any.stage, event, TRUE);
 }
 
 static void
@@ -2540,6 +2369,10 @@ _clutter_process_event_details (ClutterActor        *stage,
       case CLUTTER_DESTROY_NOTIFY:
       case CLUTTER_DELETE:
         event->any.source = stage;
+
+        if (_clutter_event_process_filters (event))
+          break;
+
         /* the stage did not handle the event, so we just quit */
         clutter_stage_event (CLUTTER_STAGE (stage), event);
         break;
@@ -2552,6 +2385,9 @@ _clutter_process_event_details (ClutterActor        *stage,
             /* Only stage gets motion events */
             event->any.source = stage;
 
+            if (_clutter_event_process_filters (event))
+              break;
+
             /* global grabs */
             if (context->pointer_grab_actor != NULL)
               {
@@ -2679,6 +2515,9 @@ _clutter_process_event_details (ClutterActor        *stage,
             /* Only stage gets motion events */
             event->any.source = stage;
 
+            if (_clutter_event_process_filters (event))
+              break;
+
             /* global grabs */
             if (device->sequence_grab_actors != NULL)
               {
@@ -2782,7 +2621,8 @@ _clutter_process_event_details (ClutterActor        *stage,
       case CLUTTER_STAGE_STATE:
         /* fullscreen / focus - forward to stage */
         event->any.source = stage;
-        clutter_stage_event (CLUTTER_STAGE (stage), event);
+        if (!_clutter_event_process_filters (event))
+          clutter_stage_event (CLUTTER_STAGE (stage), event);
         break;
 
       case CLUTTER_CLIENT_MESSAGE:
@@ -2837,12 +2677,14 @@ _clutter_process_event (ClutterEvent *event)
  *
  * Since: 0.6
  *
- * Deprecated: 1.8: The id is not used any longer.
+ * Deprecated: 1.8: The id is deprecated, and this function always returns
+ *   %NULL. Use the proper scene graph API in #ClutterActor to find a child
+ *   of the stage.
  */
 ClutterActor *
 clutter_get_actor_by_gid (guint32 id_)
 {
-  return _clutter_get_actor_by_id (NULL, id_);
+  return NULL;
 }
 
 void
@@ -2946,10 +2788,10 @@ on_grab_actor_destroy (ClutterActor       *actor,
  * the event delivery chain. The source set in the event will be the actor
  * that would have received the event if the pointer grab was not in effect.
  *
- * <note><para>Grabs completely override the entire event delivery chain
+ * Grabs completely override the entire event delivery chain
  * done by Clutter. Pointer grabs should only be used as a last resource;
  * using the #ClutterActor::captured-event signal should always be the
- * preferred way to intercept event delivery to reactive actors.</para></note>
+ * preferred way to intercept event delivery to reactive actors.
  *
  * This function should rarely be used.
  *
@@ -3348,7 +3190,6 @@ clutter_clear_glyph_cache (void)
 void
 clutter_set_font_flags (ClutterFontFlags flags)
 {
-  ClutterMainContext *context = _clutter_context_get_default ();
   CoglPangoFontMap *font_map;
   ClutterFontFlags old_flags, changed_flags;
   const cairo_font_options_t *font_options;
@@ -3398,10 +3239,6 @@ clutter_set_font_flags (ClutterFontFlags flags)
   clutter_backend_set_font_options (backend, new_font_options);
 
   cairo_font_options_destroy (new_font_options);
-
-  /* update the default pango context, if any */
-  if (context->pango_context != NULL)
-    update_pango_context (backend, context->pango_context);
 }
 
 /**
@@ -3806,22 +3643,6 @@ _clutter_clear_events_queue (void)
     }
 }
 
-guint32
-_clutter_context_acquire_id (gpointer key)
-{
-  ClutterMainContext *context = _clutter_context_get_default ();
-
-  return _clutter_id_pool_add (context->id_pool, key);
-}
-
-void
-_clutter_context_release_id (guint32 id_)
-{
-  ClutterMainContext *context = _clutter_context_get_default ();
-
-  _clutter_id_pool_remove (context->id_pool, id_);
-}
-
 void
 _clutter_clear_events_queue_for_stage (ClutterStage *stage)
 {
@@ -3905,20 +3726,20 @@ _clutter_context_get_motion_events_enabled (void)
  * windowing system; for instance:
  *
  * |[
- * &num;ifdef CLUTTER_WINDOWING_X11
+ * #ifdef CLUTTER_WINDOWING_X11
  *   if (clutter_check_windowing_backend (CLUTTER_WINDOWING_X11))
  *     {
- *       /&ast; it is safe to use the clutter_x11_* API &ast;/
+ *       // it is safe to use the clutter_x11_* API
  *     }
  *   else
- * &num;endif
- * &num;ifdef CLUTTER_WINDOWING_WIN32
+ * #endif
+ * #ifdef CLUTTER_WINDOWING_WIN32
  *   if (clutter_check_windowing_backend (CLUTTER_WINDOWING_WIN32))
  *     {
- *       /&ast; it is safe to use the clutter_win32_* API &ast;/
+ *       // it is safe to use the clutter_win32_* API
  *     }
  *   else
- * &num;endif
+ * #endif
  *     g_error ("Unknown Clutter backend.");
  * ]|
  *
@@ -3975,6 +3796,12 @@ clutter_check_windowing_backend (const char *backend_type)
   return FALSE;
 }
 
+void
+_clutter_set_sync_to_vblank (gboolean sync_to_vblank)
+{
+  clutter_sync_to_vblank = !!sync_to_vblank;
+}
+
 gboolean
 _clutter_get_sync_to_vblank (void)
 {
diff --git a/clutter/clutter-main.h b/clutter/clutter-main.h
index b7c856585..c7f246075 100644
--- a/clutter/clutter-main.h
+++ b/clutter/clutter-main.h
@@ -61,6 +61,7 @@ typedef enum {
   CLUTTER_INIT_ERROR_INTERNAL = -3
 } ClutterInitError;
 
+CLUTTER_AVAILABLE_IN_ALL
 GQuark clutter_init_error_quark (void);
 
 /**
@@ -77,9 +78,12 @@ GQuark clutter_init_error_quark (void);
 #define CLUTTER_PRIORITY_REDRAW         (G_PRIORITY_HIGH_IDLE + 50)
 
 /* Initialisation */
+CLUTTER_AVAILABLE_IN_ALL
 void                    clutter_base_init                       (void);
+CLUTTER_AVAILABLE_IN_ALL
 ClutterInitError        clutter_init                            (int          *argc,
                                                                  char       ***argv) G_GNUC_WARN_UNUSED_RESULT;
+CLUTTER_AVAILABLE_IN_ALL
 ClutterInitError        clutter_init_with_args                  (int          *argc,
                                                                  char       ***argv,
                                                                  const char   *parameter_string,
@@ -87,39 +91,52 @@ ClutterInitError        clutter_init_with_args                  (int          *a
                                                                  const char   *translation_domain,
                                                                  GError      **error) G_GNUC_WARN_UNUSED_RESULT;
 
+CLUTTER_AVAILABLE_IN_ALL
 GOptionGroup *          clutter_get_option_group                (void);
+CLUTTER_AVAILABLE_IN_ALL
 GOptionGroup *          clutter_get_option_group_without_init   (void);
 
 /* Mainloop */
+CLUTTER_AVAILABLE_IN_ALL
 void                    clutter_main                            (void);
+CLUTTER_AVAILABLE_IN_ALL
 void                    clutter_main_quit                       (void);
+CLUTTER_AVAILABLE_IN_ALL
 gint                    clutter_main_level                      (void);
 
+CLUTTER_AVAILABLE_IN_ALL
 void                    clutter_do_event                        (ClutterEvent *event);
 
 /* Debug utility functions */
+CLUTTER_AVAILABLE_IN_1_4
 gboolean                clutter_get_accessibility_enabled       (void);
 
 CLUTTER_AVAILABLE_IN_1_14
 void                    clutter_disable_accessibility           (void);
 
 /* Threading functions */
+CLUTTER_AVAILABLE_IN_ALL
 void                    clutter_threads_set_lock_functions      (GCallback enter_fn,
                                                                  GCallback leave_fn);
+CLUTTER_AVAILABLE_IN_ALL
 guint                   clutter_threads_add_idle                (GSourceFunc    func,
                                                                  gpointer       data);
+CLUTTER_AVAILABLE_IN_ALL
 guint                   clutter_threads_add_idle_full           (gint           priority,
                                                                  GSourceFunc    func,
                                                                  gpointer       data,
                                                                  GDestroyNotify notify);
+CLUTTER_AVAILABLE_IN_ALL
 guint                   clutter_threads_add_timeout             (guint          interval,
                                                                  GSourceFunc    func,
                                                                  gpointer       data);
+CLUTTER_AVAILABLE_IN_ALL
 guint                   clutter_threads_add_timeout_full        (gint           priority,
                                                                  guint          interval,
                                                                  GSourceFunc    func,
                                                                  gpointer       data,
                                                                  GDestroyNotify notify);
+CLUTTER_AVAILABLE_IN_1_0
 guint                   clutter_threads_add_repaint_func        (GSourceFunc    func,
                                                                  gpointer       data,
                                                                  GDestroyNotify notify);
@@ -128,21 +145,40 @@ guint                   clutter_threads_add_repaint_func_full   (ClutterRepaintF
                                                                  GSourceFunc    func,
                                                                  gpointer       data,
                                                                  GDestroyNotify notify);
+CLUTTER_AVAILABLE_IN_1_0
 void                    clutter_threads_remove_repaint_func     (guint          handle_id);
 
+CLUTTER_AVAILABLE_IN_ALL
 void                    clutter_grab_pointer                    (ClutterActor  *actor);
+CLUTTER_AVAILABLE_IN_ALL
 void                    clutter_ungrab_pointer                  (void);
+CLUTTER_AVAILABLE_IN_ALL
 ClutterActor *          clutter_get_pointer_grab                (void);
+CLUTTER_AVAILABLE_IN_ALL
 void                    clutter_grab_keyboard                   (ClutterActor  *actor);
+CLUTTER_AVAILABLE_IN_ALL
 void                    clutter_ungrab_keyboard                 (void);
+CLUTTER_AVAILABLE_IN_ALL
 ClutterActor *          clutter_get_keyboard_grab               (void);
 
+CLUTTER_AVAILABLE_IN_ALL
 PangoFontMap *          clutter_get_font_map                    (void);
 
+CLUTTER_AVAILABLE_IN_ALL
 ClutterTextDirection    clutter_get_default_text_direction      (void);
 
+CLUTTER_AVAILABLE_IN_ALL
 guint                   clutter_get_default_frame_rate          (void);
 
+CLUTTER_AVAILABLE_IN_1_2
+gboolean                clutter_check_version                   (guint major,
+                                                                 guint minor,
+                                                                 guint micro);
+
+CLUTTER_AVAILABLE_IN_1_10
+gboolean                clutter_check_windowing_backend         (const char *backend_type);
+
+
 G_END_DECLS
 
 #endif /* _CLUTTER_MAIN_H__ */
diff --git a/clutter/clutter-master-clock.c b/clutter/clutter-master-clock.c
index 104ea0c81..b830818bc 100644
--- a/clutter/clutter-master-clock.c
+++ b/clutter/clutter-master-clock.c
@@ -52,8 +52,9 @@
   gint64 __budget = master_clock->remaining_budget;                                     \
   if (__budget > 0 && __delta >= __budget) {                                            \
     _clutter_diagnostic_message ("%s took %" G_GINT64_FORMAT " microseconds "           \
-                                 "over a budget of %" G_GINT64_FORMAT " microseconds",  \
-                                 section, __delta, __budget);                           \
+                                 "more than the remaining budget of %" G_GINT64_FORMAT  \
+                                 " microseconds",                                       \
+                                 section, __delta - __budget, __budget);                \
   }                                                                     } G_STMT_END
 #else
 #define clutter_warn_if_over_budget(master_clock,start_time,section)
@@ -92,6 +93,8 @@ struct _ClutterMasterClock
    */
   guint idle : 1;
   guint ensure_next_iteration : 1;
+
+  guint paused : 1;
 };
 
 struct _ClutterMasterClockClass
@@ -142,6 +145,9 @@ master_clock_is_running (ClutterMasterClock *master_clock)
 
   stages = clutter_stage_manager_peek_stages (stage_manager);
 
+  if (master_clock->paused)
+    return FALSE;
+
   if (master_clock->timelines)
     return TRUE;
 
@@ -635,6 +641,7 @@ clutter_master_clock_init (ClutterMasterClock *self)
 
   self->idle = FALSE;
   self->ensure_next_iteration = FALSE;
+  self->paused = FALSE;
 
 #ifdef CLUTTER_ENABLE_DEBUG
   self->frame_budget = G_USEC_PER_SEC / 60;
@@ -739,3 +746,12 @@ _clutter_master_clock_ensure_next_iteration (ClutterMasterClock *master_clock)
 
   master_clock->ensure_next_iteration = TRUE;
 }
+
+void
+_clutter_master_clock_set_paused (ClutterMasterClock *master_clock,
+                                  gboolean            paused)
+{
+  g_return_if_fail (CLUTTER_IS_MASTER_CLOCK (master_clock));
+
+  master_clock->paused = !!paused;
+}
diff --git a/clutter/clutter-master-clock.h b/clutter/clutter-master-clock.h
index 211f378ba..771a26d77 100644
--- a/clutter/clutter-master-clock.h
+++ b/clutter/clutter-master-clock.h
@@ -43,6 +43,8 @@ void                    _clutter_master_clock_remove_timeline           (Clutter
                                                                          ClutterTimeline    *timeline);
 void                    _clutter_master_clock_start_running             (ClutterMasterClock *master_clock);
 void                    _clutter_master_clock_ensure_next_iteration     (ClutterMasterClock *master_clock);
+void                    _clutter_master_clock_set_paused                (ClutterMasterClock *master_clock,
+                                                                         gboolean            paused);
 
 void                    _clutter_timeline_advance                       (ClutterTimeline    *timeline,
                                                                          gint64              tick_time);
diff --git a/clutter/clutter-model.c b/clutter/clutter-model.c
index 5ebaefa05..28ed76874 100644
--- a/clutter/clutter-model.c
+++ b/clutter/clutter-model.c
@@ -37,8 +37,11 @@
  * The #ClutterModel class is a list model which can accept most GObject 
  * types as a column type.
  * 
- * Creating a simple clutter model:
- * <informalexample><programlisting>
+ * ## Creating a simple ClutterModel
+ *
+ * The example below shows how to create a simple list model.
+ *
+ * |[<!-- language="C" -->
  * enum
  * {
  *   COLUMN_INT,
@@ -51,10 +54,10 @@
  *   ClutterModel *model;
  *   gint i;
  *
- *   model = clutter_model_default_new (N_COLUMNS,
- *                                      /<!-- -->* column type, column title *<!-- -->/
- *                                      G_TYPE_INT,     "my integers",
- *                                      G_TYPE_STRING,  "my strings");
+ *   model = clutter_list_model_new (N_COLUMNS,
+ *                                   // column type, title
+ *                                   G_TYPE_INT,     "my integers",
+ *                                   G_TYPE_STRING,  "my strings");
  *   for (i = 0; i < 10; i++)
  *     {
  *       gchar *string = g_strdup_printf ("String %d", i);
@@ -67,7 +70,9 @@
  *
  *   
  * }
- * </programlisting></informalexample>
+ * ]|
+ *
+ * ## Iterating through a ClutterModel
  *
  * Iterating through the model consists of retrieving a new #ClutterModelIter
  * pointing to the starting row, and calling clutter_model_iter_next() or
@@ -79,8 +84,7 @@
  * after the last row. In an empty sequence, the first and last iterators are
  * the same.
  *
- * Iterating a #ClutterModel:
- * <informalexample><programlisting>
+ * |[<!-- language="C" -->
  * enum
  * {
  *   COLUMN_INT,
@@ -93,10 +97,10 @@
  *   ClutterModel *model;
  *   ClutterModelIter *iter = NULL;
  *
- *   /<!-- -->*  Fill the model *<!-- -->/
+ *   // fill the model
  *   model = populate_model ();
  *
- *   /<!-- -->* Get the first iter *<!-- -->/
+ *   // get the iterator for the first row in the model
  *   iter = clutter_model_get_first_iter (model);
  *   while (!clutter_model_iter_is_last (iter))
  *     {
@@ -105,32 +109,33 @@
  *       iter = clutter_model_iter_next (iter);
  *     }
  *
- *   /<!-- -->* Make sure to unref the iter *<!-- -->/
+ *   // Make sure to unref the iter
  *   g_object_unref (iter);
  * }
- * </programlisting></informalexample>
+ * ]|
  *
  * #ClutterModel is an abstract class. Clutter provides a list model
  * implementation called #ClutterListModel which has been optimised
  * for insertion and look up in sorted lists.
  *
- * <refsect2 id="ClutterModel-script">
- *   <title>ClutterModel custom properties for #ClutterScript</title>
- *   <para>#ClutterModel defines a custom property "columns" for #ClutterScript
- *   which allows defining the column names and types. It also defines a custom
- *   "rows" property which allows filling the #ClutterModel with some
- *   data.</para>
- *   <example id="ClutterModel-script-example">
- *     <title>Example of the "columns" and "rows" custom properties</title>
- *     <para>The definition below will create a #ClutterListModel with three
- *     columns: the first one with name "Name" and containing strings; the
- *     second one with name "Score" and containing integers; the third one with
- *     name "Icon" and containing #ClutterTexture<!-- -->s. The model is filled
- *     with three rows. A row can be defined either with an array that holds
- *     all columns of a row, or an object that holds "column-name" :
- *     "column-value" pairs.
- *     </para>
- *     <programlisting>
+ * #ClutterModel is available since Clutter 0.6
+ *
+ * ## ClutterModel custom properties for ClutterScript
+ *
+ * #ClutterModel defines a custom property "columns" for #ClutterScript
+ * which allows defining the column names and types. It also defines a custom
+ * "rows" property which allows filling the #ClutterModel with some
+ * data.
+ *
+ * The definition below will create a #ClutterListModel with three
+ * columns: the first one with name "Name" and containing strings; the
+ * second one with name "Score" and containing integers; the third one with
+ * name "Icon" and containing #ClutterTextures. The model is filled
+ * with three rows. A row can be defined either with an array that holds
+ * all columns of a row, or an object that holds "column-name" :
+ * "column-value" pairs.
+ *
+ * |[
  *  {
  *    "type" : "ClutterListModel",
  *    "id" : "teams-model",
@@ -145,11 +150,6 @@
  *      { "Name" : "Team 3", "Icon" : "team3-icon-script-id" }
  *    ]
  *  }
- *     </programlisting>
- *   </example>
- * </refsect2>
- *
- * #ClutterModel is available since Clutter 0.6
  */
 
 
@@ -170,13 +170,6 @@
 #include "clutter-scriptable.h"
 #include "clutter-script-private.h"
 
-static void clutter_scriptable_iface_init (ClutterScriptableIface *iface);
-
-G_DEFINE_ABSTRACT_TYPE_WITH_CODE
-        (ClutterModel, clutter_model, G_TYPE_OBJECT,
-         G_IMPLEMENT_INTERFACE (CLUTTER_TYPE_SCRIPTABLE,
-                                clutter_scriptable_iface_init));
-
 enum
 {
   PROP_0,
@@ -198,9 +191,6 @@ enum
 
 static guint model_signals[LAST_SIGNAL] = { 0, };
 
-#define CLUTTER_MODEL_GET_PRIVATE(obj) \
-  (G_TYPE_INSTANCE_GET_PRIVATE ((obj), CLUTTER_TYPE_MODEL, ClutterModelPrivate))
-
 struct _ClutterModelPrivate
 {
   GType                  *column_types;
@@ -226,6 +216,13 @@ struct _ClutterModelPrivate
   GDestroyNotify          sort_notify;
 };
 
+static void clutter_scriptable_iface_init (ClutterScriptableIface *iface);
+
+G_DEFINE_ABSTRACT_TYPE_WITH_CODE (ClutterModel, clutter_model, G_TYPE_OBJECT,
+                                  G_ADD_PRIVATE (ClutterModel)
+                                  G_IMPLEMENT_INTERFACE (CLUTTER_TYPE_SCRIPTABLE,
+                                                         clutter_scriptable_iface_init))
+
 static GType
 clutter_model_real_get_column_type (ClutterModel *model,
                                     guint         column)
@@ -347,8 +344,6 @@ clutter_model_class_init (ClutterModelClass *klass)
   gobject_class->get_property = clutter_model_get_property;
   gobject_class->finalize = clutter_model_finalize;
 
-  g_type_class_add_private (gobject_class, sizeof (ClutterModelPrivate));
-
   klass->get_column_name  = clutter_model_real_get_column_name;
   klass->get_column_type  = clutter_model_real_get_column_type;
   klass->get_n_columns    = clutter_model_real_get_n_columns;
@@ -470,7 +465,7 @@ clutter_model_init (ClutterModel *self)
 {
   ClutterModelPrivate *priv;
   
-  self->priv = priv = CLUTTER_MODEL_GET_PRIVATE (self);
+  self->priv = priv = clutter_model_get_instance_private (self);
 
   priv->n_columns = -1;
   priv->column_types = NULL;
@@ -1757,12 +1752,6 @@ clutter_model_get_filter_set (ClutterModel *model)
  * #ClutterModelIter is available since Clutter 0.6
  */
 
-G_DEFINE_ABSTRACT_TYPE (ClutterModelIter, clutter_model_iter, G_TYPE_OBJECT);
-
-#define CLUTTER_MODEL_ITER_GET_PRIVATE(obj) \
-  (G_TYPE_INSTANCE_GET_PRIVATE ((obj), \
-  CLUTTER_TYPE_MODEL_ITER, ClutterModelIterPrivate))
-
 struct _ClutterModelIterPrivate
 {
   ClutterModel  *model;
@@ -1770,6 +1759,8 @@ struct _ClutterModelIterPrivate
   gint row;
 };
 
+G_DEFINE_ABSTRACT_TYPE_WITH_PRIVATE (ClutterModelIter, clutter_model_iter, G_TYPE_OBJECT)
+
 enum
 {
   ITER_PROP_0,
@@ -1964,19 +1955,12 @@ clutter_model_iter_class_init (ClutterModelIterClass *klass)
                              0, G_MAXUINT, 0,
                              CLUTTER_PARAM_READWRITE);
   g_object_class_install_property (gobject_class, ITER_PROP_ROW, pspec);
-  
-  g_type_class_add_private (gobject_class, sizeof (ClutterModelIterPrivate));
 }
 
 static void
 clutter_model_iter_init (ClutterModelIter *self)
 {
-  ClutterModelIterPrivate *priv;
-  
-  self->priv = priv = CLUTTER_MODEL_ITER_GET_PRIVATE (self);
-
-  priv->model = NULL;
-  priv->row = 0;
+  self->priv = clutter_model_iter_get_instance_private (self);
 }
 
 /*
diff --git a/clutter/clutter-model.h b/clutter/clutter-model.h
index a8217ba89..a2dad66d9 100644
--- a/clutter/clutter-model.h
+++ b/clutter/clutter-model.h
@@ -30,7 +30,7 @@
 #ifndef __CLUTTER_MODEL_H__
 #define __CLUTTER_MODEL_H__
 
-#include <glib-object.h>
+#include <clutter/clutter-types.h>
 
 G_BEGIN_DECLS
 
@@ -188,75 +188,102 @@ struct _ClutterModelClass
   void (*_clutter_model_8) (void);
 };
 
+CLUTTER_AVAILABLE_IN_ALL
 GType                 clutter_model_get_type           (void) G_GNUC_CONST;
 
+CLUTTER_AVAILABLE_IN_ALL
 void                  clutter_model_set_types          (ClutterModel     *model,
                                                         guint             n_columns,
                                                         GType            *types);
+CLUTTER_AVAILABLE_IN_ALL
 void                  clutter_model_set_names          (ClutterModel     *model,
                                                         guint             n_columns,
                                                         const gchar * const names[]);
 
+CLUTTER_AVAILABLE_IN_ALL
 void                  clutter_model_append             (ClutterModel     *model,
                                                         ...);
+CLUTTER_AVAILABLE_IN_ALL
 void                  clutter_model_appendv            (ClutterModel     *model,
                                                         guint             n_columns,
                                                         guint            *columns,
                                                         GValue           *values);
+CLUTTER_AVAILABLE_IN_ALL
 void                  clutter_model_prepend            (ClutterModel     *model,
                                                         ...);
+CLUTTER_AVAILABLE_IN_ALL
 void                  clutter_model_prependv           (ClutterModel     *model,
                                                         guint             n_columns,
                                                         guint            *columns,
                                                         GValue           *values);
+CLUTTER_AVAILABLE_IN_ALL
 void                  clutter_model_insert             (ClutterModel     *model,
                                                         guint             row,
                                                         ...);
+CLUTTER_AVAILABLE_IN_ALL
 void                  clutter_model_insertv            (ClutterModel     *model,
                                                         guint             row,
                                                         guint             n_columns,
                                                         guint            *columns,
                                                         GValue           *values);
+CLUTTER_AVAILABLE_IN_ALL
 void                  clutter_model_insert_value       (ClutterModel     *model,
                                                         guint             row,
                                                         guint             column,
                                                         const GValue     *value);
+CLUTTER_AVAILABLE_IN_ALL
 void                  clutter_model_remove             (ClutterModel     *model,
                                                         guint             row);
 
+CLUTTER_AVAILABLE_IN_ALL
 guint                 clutter_model_get_n_rows         (ClutterModel     *model);
+CLUTTER_AVAILABLE_IN_ALL
 guint                 clutter_model_get_n_columns      (ClutterModel     *model);
+CLUTTER_AVAILABLE_IN_ALL
 const gchar *         clutter_model_get_column_name    (ClutterModel     *model,
                                                         guint             column);
+CLUTTER_AVAILABLE_IN_ALL
 GType                 clutter_model_get_column_type    (ClutterModel     *model,
                                                         guint             column);
 
+CLUTTER_AVAILABLE_IN_ALL
 ClutterModelIter *    clutter_model_get_first_iter     (ClutterModel     *model);
+CLUTTER_AVAILABLE_IN_ALL
 ClutterModelIter *    clutter_model_get_last_iter      (ClutterModel     *model);
+CLUTTER_AVAILABLE_IN_ALL
 ClutterModelIter *    clutter_model_get_iter_at_row    (ClutterModel     *model,
                                                         guint             row);
 
+CLUTTER_AVAILABLE_IN_ALL
 void                  clutter_model_set_sorting_column (ClutterModel     *model,
                                                         gint              column);
+CLUTTER_AVAILABLE_IN_ALL
 gint                  clutter_model_get_sorting_column (ClutterModel     *model);
 
+CLUTTER_AVAILABLE_IN_ALL
 void                  clutter_model_foreach            (ClutterModel     *model,
                                                         ClutterModelForeachFunc func, 
                                                         gpointer          user_data);
+CLUTTER_AVAILABLE_IN_ALL
 void                  clutter_model_set_sort           (ClutterModel     *model, 
                                                         gint              column,
                                                         ClutterModelSortFunc func, 
                                                         gpointer          user_data,
                                                         GDestroyNotify    notify);
+CLUTTER_AVAILABLE_IN_ALL
 void                  clutter_model_set_filter         (ClutterModel     *model, 
                                                         ClutterModelFilterFunc func, 
                                                         gpointer          user_data,
                                                         GDestroyNotify    notify);
+CLUTTER_AVAILABLE_IN_ALL
 gboolean              clutter_model_get_filter_set     (ClutterModel     *model);
 
+CLUTTER_AVAILABLE_IN_ALL
 void                  clutter_model_resort             (ClutterModel     *model);
+CLUTTER_AVAILABLE_IN_ALL
 gboolean              clutter_model_filter_row         (ClutterModel     *model,
                                                         guint             row);
+CLUTTER_AVAILABLE_IN_ALL
 gboolean              clutter_model_filter_iter        (ClutterModel     *model,
                                                         ClutterModelIter *iter);
 
@@ -349,31 +376,45 @@ struct _ClutterModelIterClass
   void (*_clutter_model_iter_8) (void);
 };
 
+CLUTTER_AVAILABLE_IN_ALL
 GType             clutter_model_iter_get_type   (void) G_GNUC_CONST;
 
+CLUTTER_AVAILABLE_IN_ALL
 void              clutter_model_iter_get        (ClutterModelIter *iter,
                                                  ...);
+CLUTTER_AVAILABLE_IN_ALL
 void              clutter_model_iter_get_valist (ClutterModelIter *iter,
                                                  va_list          args);
+CLUTTER_AVAILABLE_IN_ALL
 void              clutter_model_iter_get_value  (ClutterModelIter *iter,
                                                  guint             column,
                                                  GValue           *value);
+CLUTTER_AVAILABLE_IN_ALL
 void              clutter_model_iter_set        (ClutterModelIter *iter,
                                                  ...);
+CLUTTER_AVAILABLE_IN_ALL
 void              clutter_model_iter_set_valist (ClutterModelIter *iter,
                                                  va_list          args);
+CLUTTER_AVAILABLE_IN_ALL
 void              clutter_model_iter_set_value  (ClutterModelIter *iter,
                                                  guint             column,
                                                  const GValue     *value);
 
+CLUTTER_AVAILABLE_IN_ALL
 gboolean          clutter_model_iter_is_first   (ClutterModelIter *iter);
+CLUTTER_AVAILABLE_IN_ALL
 gboolean          clutter_model_iter_is_last    (ClutterModelIter *iter);
+CLUTTER_AVAILABLE_IN_ALL
 ClutterModelIter *clutter_model_iter_next       (ClutterModelIter *iter);
+CLUTTER_AVAILABLE_IN_ALL
 ClutterModelIter *clutter_model_iter_prev       (ClutterModelIter *iter);
 
+CLUTTER_AVAILABLE_IN_ALL
 ClutterModel *    clutter_model_iter_get_model  (ClutterModelIter *iter);
+CLUTTER_AVAILABLE_IN_ALL
 guint             clutter_model_iter_get_row    (ClutterModelIter *iter);
 
+CLUTTER_AVAILABLE_IN_ALL
 ClutterModelIter *clutter_model_iter_copy       (ClutterModelIter *iter);
 
 G_END_DECLS
diff --git a/clutter/clutter-offscreen-effect.c b/clutter/clutter-offscreen-effect.c
index 8d8c8522b..c30811339 100644
--- a/clutter/clutter-offscreen-effect.c
+++ b/clutter/clutter-offscreen-effect.c
@@ -40,25 +40,26 @@
  * offscreen framebuffer, the redirection and the final paint of the texture on
  * the desired stage.
  *
- * <refsect2 id="ClutterOffscreenEffect-implementing">
- *   <title>Implementing a ClutterOffscreenEffect</title>
- *   <para>Creating a sub-class of #ClutterOffscreenEffect requires, in case
- *   of overriding the #ClutterEffect virtual functions, to chain up to the
- *   #ClutterOffscreenEffect's implementation.</para>
- *   <para>On top of the #ClutterEffect's virtual functions,
- *   #ClutterOffscreenEffect also provides a #ClutterOffscreenEffectClass.paint_target()
- *   function, which encapsulates the effective painting of the texture that
- *   contains the result of the offscreen redirection.</para>
- *   <para>The size of the target material is defined to be as big as the
- *   transformed size of the #ClutterActor using the offscreen effect.
- *   Sub-classes of #ClutterOffscreenEffect can change the texture creation
- *   code to provide bigger textures by overriding the
- *   #ClutterOffscreenEffectClass.create_texture() virtual function; no chain up
- *   to the #ClutterOffscreenEffect implementation is required in this
- *   case.</para>
- * </refsect2>
- *
  * #ClutterOffscreenEffect is available since Clutter 1.4
+ *
+ * ## Implementing a ClutterOffscreenEffect
+ *
+ * Creating a sub-class of #ClutterOffscreenEffect requires, in case
+ * of overriding the #ClutterEffect virtual functions, to chain up to the
+ * #ClutterOffscreenEffect's implementation.
+ *
+ * On top of the #ClutterEffect's virtual functions,
+ * #ClutterOffscreenEffect also provides a #ClutterOffscreenEffectClass.paint_target()
+ * function, which encapsulates the effective painting of the texture that
+ * contains the result of the offscreen redirection.
+ *
+ * The size of the target material is defined to be as big as the
+ * transformed size of the #ClutterActor using the offscreen effect.
+ * Sub-classes of #ClutterOffscreenEffect can change the texture creation
+ * code to provide bigger textures by overriding the
+ * #ClutterOffscreenEffectClass.create_texture() virtual function; no chain up
+ * to the #ClutterOffscreenEffect implementation is required in this
+ * case.
  */
 
 #ifdef HAVE_CONFIG_H
@@ -108,9 +109,9 @@ struct _ClutterOffscreenEffectPrivate
   CoglMatrix last_matrix_drawn;
 };
 
-G_DEFINE_ABSTRACT_TYPE (ClutterOffscreenEffect,
-                        clutter_offscreen_effect,
-                        CLUTTER_TYPE_EFFECT);
+G_DEFINE_ABSTRACT_TYPE_WITH_PRIVATE (ClutterOffscreenEffect,
+                                     clutter_offscreen_effect,
+                                     CLUTTER_TYPE_EFFECT)
 
 static void
 clutter_offscreen_effect_set_actor (ClutterActorMeta *meta,
@@ -223,9 +224,11 @@ clutter_offscreen_effect_pre_paint (ClutterEffect *effect)
   ClutterOffscreenEffect *self = CLUTTER_OFFSCREEN_EFFECT (effect);
   ClutterOffscreenEffectPrivate *priv = self->priv;
   ClutterActorBox box;
+  ClutterActor *stage;
   CoglMatrix projection;
   CoglColor transparent;
-  gfloat fbo_width, fbo_height;
+  gfloat stage_width, stage_height;
+  gfloat fbo_width = -1, fbo_height = -1;
   gfloat width, height;
   gfloat xexpand, yexpand;
   int texture_width, texture_height;
@@ -236,6 +239,9 @@ clutter_offscreen_effect_pre_paint (ClutterEffect *effect)
   if (priv->actor == NULL)
     return FALSE;
 
+  stage = _clutter_actor_get_stage_internal (priv->actor);
+  clutter_actor_get_size (stage, &stage_width, &stage_height);
+
   /* The paint box is the bounding box of the actor's paint volume in
    * stage coordinates. This will give us the size for the framebuffer
    * we need to redirect its rendering offscreen and its position will
@@ -244,17 +250,21 @@ clutter_offscreen_effect_pre_paint (ClutterEffect *effect)
     {
       clutter_actor_box_get_size (&box, &fbo_width, &fbo_height);
       clutter_actor_box_get_origin (&box, &priv->x_offset, &priv->y_offset);
+
+      fbo_width = MIN (fbo_width, stage_width);
+      fbo_height = MIN (fbo_height, stage_height);
     }
   else
     {
-      /* If we can't get a valid paint box then we fallback to
-       * creating a full stage size fbo. */
-      ClutterActor *stage = _clutter_actor_get_stage_internal (priv->actor);
-      clutter_actor_get_size (stage, &fbo_width, &fbo_height);
-      priv->x_offset = 0.0f;
-      priv->y_offset = 0.0f;
+      fbo_width = stage_width;
+      fbo_height = stage_height;
     }
 
+  if (fbo_width == stage_width)
+    priv->x_offset = 0.0f;
+  if (fbo_height == stage_height)
+    priv->y_offset = 0.0f;
+
   /* First assert that the framebuffer is the right size... */
   if (!update_fbo (effect, fbo_width, fbo_height))
     return FALSE;
@@ -462,8 +472,6 @@ clutter_offscreen_effect_class_init (ClutterOffscreenEffectClass *klass)
   ClutterEffectClass *effect_class = CLUTTER_EFFECT_CLASS (klass);
   GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
 
-  g_type_class_add_private (klass, sizeof (ClutterOffscreenEffectPrivate));
-
   klass->create_texture = clutter_offscreen_effect_real_create_texture;
   klass->paint_target = clutter_offscreen_effect_real_paint_target;
 
@@ -479,9 +487,7 @@ clutter_offscreen_effect_class_init (ClutterOffscreenEffectClass *klass)
 static void
 clutter_offscreen_effect_init (ClutterOffscreenEffect *self)
 {
-  self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self,
-                                            CLUTTER_TYPE_OFFSCREEN_EFFECT,
-                                            ClutterOffscreenEffectPrivate);
+  self->priv = clutter_offscreen_effect_get_instance_private (self);
 }
 
 /**
@@ -591,7 +597,7 @@ clutter_offscreen_effect_create_texture (ClutterOffscreenEffect *effect,
  * paint the actor to which it has been applied.
  *
  * This function should only be called by #ClutterOffscreenEffect
- * implementations, from within the <function>paint_target()</function>
+ * implementations, from within the #ClutterOffscreenEffectClass.paint_target()
  * virtual function.
  *
  * Return value: %TRUE if the offscreen buffer has a valid size,
@@ -633,7 +639,7 @@ clutter_offscreen_effect_get_target_size (ClutterOffscreenEffect *effect,
  * paint the actor to which it has been applied.
  *
  * This function should only be called by #ClutterOffscreenEffect
- * implementations, from within the <function>paint_target()</function>
+ * implementations, from within the #ClutterOffscreenEffectClass.paint_target()
  * virtual function.
  *
  * Return value: %TRUE if the offscreen buffer has a valid rectangle,
diff --git a/clutter/clutter-offscreen-effect.h b/clutter/clutter-offscreen-effect.h
index 6e70cbe45..8fd547ebc 100644
--- a/clutter/clutter-offscreen-effect.h
+++ b/clutter/clutter-offscreen-effect.h
@@ -92,14 +92,18 @@ struct _ClutterOffscreenEffectClass
   void (* _clutter_offscreen7) (void);
 };
 
+CLUTTER_AVAILABLE_IN_1_4
 GType clutter_offscreen_effect_get_type (void) G_GNUC_CONST;
 
+CLUTTER_AVAILABLE_IN_1_4
 CoglMaterial *  clutter_offscreen_effect_get_target             (ClutterOffscreenEffect *effect);
 
 CLUTTER_AVAILABLE_IN_1_10
 CoglHandle      clutter_offscreen_effect_get_texture            (ClutterOffscreenEffect *effect);
 
+CLUTTER_AVAILABLE_IN_1_4
 void            clutter_offscreen_effect_paint_target           (ClutterOffscreenEffect *effect);
+CLUTTER_AVAILABLE_IN_1_4
 CoglHandle      clutter_offscreen_effect_create_texture         (ClutterOffscreenEffect *effect,
                                                                  gfloat                  width,
                                                                  gfloat                  height);
diff --git a/clutter/clutter-page-turn-effect.h b/clutter/clutter-page-turn-effect.h
index 9a9b2feb7..63beb2039 100644
--- a/clutter/clutter-page-turn-effect.h
+++ b/clutter/clutter-page-turn-effect.h
@@ -43,7 +43,7 @@ G_BEGIN_DECLS
 /**
  * ClutterPageTurnEffect:
  *
- * <structname>ClutterPageTurnEffect</structname> is an opaque structure
+ * #ClutterPageTurnEffect is an opaque structure
  * whose members can only be accessed using the provided API
  *
  * Since: 1.4
@@ -51,20 +51,28 @@ G_BEGIN_DECLS
 typedef struct _ClutterPageTurnEffect           ClutterPageTurnEffect;
 typedef struct _ClutterPageTurnEffectClass      ClutterPageTurnEffectClass;
 
+CLUTTER_AVAILABLE_IN_1_4
 GType clutter_page_turn_effect_get_type (void) G_GNUC_CONST;
 
+CLUTTER_AVAILABLE_IN_1_4
 ClutterEffect *clutter_page_turn_effect_new (gdouble period,
                                              gdouble angle,
                                              gfloat  radius);
 
+CLUTTER_AVAILABLE_IN_1_4
 void    clutter_page_turn_effect_set_period (ClutterPageTurnEffect *effect,
                                              gdouble                period);
+CLUTTER_AVAILABLE_IN_1_4
 gdouble clutter_page_turn_effect_get_period (ClutterPageTurnEffect *effect);
+CLUTTER_AVAILABLE_IN_1_4
 void    clutter_page_turn_effect_set_angle  (ClutterPageTurnEffect *effect,
                                              gdouble                angle);
+CLUTTER_AVAILABLE_IN_1_4
 gdouble clutter_page_turn_effect_get_angle  (ClutterPageTurnEffect *effect);
+CLUTTER_AVAILABLE_IN_1_4
 void    clutter_page_turn_effect_set_radius (ClutterPageTurnEffect *effect,
                                              gfloat                 radius);
+CLUTTER_AVAILABLE_IN_1_4
 gfloat  clutter_page_turn_effect_get_radius (ClutterPageTurnEffect *effect);
 
 G_END_DECLS
diff --git a/clutter/clutter-paint-node-private.h b/clutter/clutter-paint-node-private.h
index b91187fab..2945b78a4 100644
--- a/clutter/clutter-paint-node-private.h
+++ b/clutter/clutter-paint-node-private.h
@@ -68,6 +68,8 @@ struct _ClutterPaintNodeClass
   void     (* post_draw) (ClutterPaintNode *node);
 
   JsonNode*(* serialize) (ClutterPaintNode *node);
+
+  CoglFramebuffer *(* get_framebuffer) (ClutterPaintNode *node);
 };
 
 #define PAINT_OP_INIT   { PAINT_OP_INVALID }
@@ -107,8 +109,7 @@ gpointer                _clutter_paint_node_create                      (GType g
 
 ClutterPaintNode *      _clutter_root_node_new                          (CoglFramebuffer             *framebuffer,
                                                                          const ClutterColor          *clear_color,
-                                                                         CoglBufferBit                clear_flags,
-                                                                         const CoglMatrix            *matrix);
+                                                                         CoglBufferBit                clear_flags);
 ClutterPaintNode *      _clutter_transform_node_new                     (const CoglMatrix            *matrix);
 ClutterPaintNode *      _clutter_dummy_node_new                         (ClutterActor                *actor);
 
@@ -138,6 +139,8 @@ G_GNUC_INTERNAL
 ClutterPaintNode *      clutter_paint_node_get_last_child               (ClutterPaintNode      *node);
 G_GNUC_INTERNAL
 ClutterPaintNode *      clutter_paint_node_get_parent                   (ClutterPaintNode      *node);
+G_GNUC_INTERNAL
+CoglFramebuffer *       clutter_paint_node_get_framebuffer              (ClutterPaintNode      *node);
 
 #define CLUTTER_TYPE_LAYER_NODE                 (_clutter_layer_node_get_type ())
 #define CLUTTER_LAYER_NODE(obj)                 (G_TYPE_CHECK_INSTANCE_CAST ((obj), CLUTTER_TYPE_LAYER_NODE, ClutterLayerNode))
@@ -146,7 +149,7 @@ ClutterPaintNode *      clutter_paint_node_get_parent                   (Clutter
 /*
  * ClutterLayerNode:
  *
- * The <structname>ClutterLayerNode</structname> structure is an opaque
+ * The #ClutterLayerNode structure is an opaque
  * type whose members cannot be directly accessed.
  *
  * Since: 1.10
diff --git a/clutter/clutter-paint-node.c b/clutter/clutter-paint-node.c
index 00987e668..04fe0813c 100644
--- a/clutter/clutter-paint-node.c
+++ b/clutter/clutter-paint-node.c
@@ -42,16 +42,11 @@
  */
 
 /**
- * ClutterPaintNode:
+ * ClutterPaintNode: (ref-func clutter_paint_node_ref) (unref-func clutter_paint_node_unref) (set-value-func clutter_value_set_paint_node) (get-value-func clutter_value_get_paint_node)
  *
  * The <structname>ClutterPaintNode</structname> structure contains only
  * private data and it should be accessed using the provided API.
  *
- * Ref Func: clutter_paint_node_ref
- * Unref Func: clutter_paint_node_unref
- * Set Value Func: clutter_value_set_paint_node
- * Get Value Func: clutter_value_get_paint_node
- *
  * Since: 1.10
  */
 
@@ -1123,3 +1118,31 @@ _clutter_paint_node_create (GType gtype)
 
   return (gpointer) g_type_create_instance (gtype);
 }
+
+static ClutterPaintNode *
+clutter_paint_node_get_root (ClutterPaintNode *node)
+{
+  ClutterPaintNode *iter;
+
+  iter = node;
+  while (iter != NULL && iter->parent != NULL)
+    iter = iter->parent;
+
+  return iter;
+}
+
+CoglFramebuffer *
+clutter_paint_node_get_framebuffer (ClutterPaintNode *node)
+{
+  ClutterPaintNode *root = clutter_paint_node_get_root (node);
+  ClutterPaintNodeClass *klass;
+
+  if (root == NULL)
+    return NULL;
+
+  klass = CLUTTER_PAINT_NODE_GET_CLASS (root);
+  if (klass->get_framebuffer != NULL)
+    return klass->get_framebuffer (root);
+
+  return cogl_get_draw_framebuffer ();
+}
diff --git a/clutter/clutter-paint-nodes.c b/clutter/clutter-paint-nodes.c
index 506e459b8..acb87e52d 100644
--- a/clutter/clutter-paint-nodes.c
+++ b/clutter/clutter-paint-nodes.c
@@ -81,7 +81,7 @@ _clutter_paint_node_init_types (void)
                                         COGL_TEXTURE_TYPE_2D);
   cogl_pipeline_set_color (default_texture_pipeline, &cogl_color);
   cogl_pipeline_set_layer_wrap_mode (default_texture_pipeline, 0,
-                                     COGL_PIPELINE_WRAP_MODE_CLAMP_TO_EDGE);
+                                     COGL_PIPELINE_WRAP_MODE_AUTOMATIC);
 }
 
 /*
@@ -104,7 +104,6 @@ struct _ClutterRootNode
 
   CoglBufferBit clear_flags;
   CoglColor clear_color;
-  CoglMatrix modelview;
 };
 
 G_DEFINE_TYPE (ClutterRootNode, clutter_root_node, CLUTTER_TYPE_PAINT_NODE)
@@ -114,11 +113,6 @@ clutter_root_node_pre_draw (ClutterPaintNode *node)
 {
   ClutterRootNode *rnode = (ClutterRootNode *) node;
 
-  cogl_push_matrix ();
-
-  cogl_framebuffer_set_modelview_matrix (rnode->framebuffer,
-                                         &rnode->modelview);
-
   cogl_framebuffer_clear (rnode->framebuffer,
                           rnode->clear_flags,
                           &rnode->clear_color);
@@ -129,7 +123,6 @@ clutter_root_node_pre_draw (ClutterPaintNode *node)
 static void
 clutter_root_node_post_draw (ClutterPaintNode *node)
 {
-  cogl_pop_matrix ();
 }
 
 static void
@@ -142,6 +135,14 @@ clutter_root_node_finalize (ClutterPaintNode *node)
   CLUTTER_PAINT_NODE_CLASS (clutter_root_node_parent_class)->finalize (node);
 }
 
+static CoglFramebuffer *
+clutter_root_node_get_framebuffer (ClutterPaintNode *node)
+{
+  ClutterRootNode *rnode = (ClutterRootNode *) node;
+
+  return rnode->framebuffer;
+}
+
 static void
 clutter_root_node_class_init (ClutterRootNodeClass *klass)
 {
@@ -150,19 +151,18 @@ clutter_root_node_class_init (ClutterRootNodeClass *klass)
   node_class->pre_draw = clutter_root_node_pre_draw;
   node_class->post_draw = clutter_root_node_post_draw;
   node_class->finalize = clutter_root_node_finalize;
+  node_class->get_framebuffer = clutter_root_node_get_framebuffer;
 }
 
 static void
 clutter_root_node_init (ClutterRootNode *self)
 {
-  cogl_matrix_init_identity (&self->modelview);
 }
 
 ClutterPaintNode *
 _clutter_root_node_new (CoglFramebuffer    *framebuffer,
                         const ClutterColor *clear_color,
-                        CoglBufferBit       clear_flags,
-                        const CoglMatrix   *matrix)
+                        CoglBufferBit       clear_flags)
 {
   ClutterRootNode *res;
 
@@ -175,9 +175,12 @@ _clutter_root_node_new (CoglFramebuffer    *framebuffer,
                             clear_color->alpha);
   cogl_color_premultiply (&res->clear_color);
 
-  res->framebuffer = cogl_object_ref (framebuffer);
+  if (G_LIKELY (framebuffer != NULL))
+    res->framebuffer = cogl_object_ref (framebuffer);
+  else
+    res->framebuffer = cogl_object_ref (cogl_get_draw_framebuffer ());
+
   res->clear_flags = clear_flags;
-  res->modelview = *matrix;
 
   return (ClutterPaintNode *) res;
 }
@@ -268,6 +271,7 @@ struct _ClutterDummyNode
   ClutterPaintNode parent_instance;
 
   ClutterActor *actor;
+  CoglFramebuffer *framebuffer;
 };
 
 G_DEFINE_TYPE (ClutterDummyNode, clutter_dummy_node, CLUTTER_TYPE_PAINT_NODE)
@@ -302,6 +306,14 @@ clutter_dummy_node_serialize (ClutterPaintNode *node)
   return res;
 }
 
+static CoglFramebuffer *
+clutter_dummy_node_get_framebuffer (ClutterPaintNode *node)
+{
+  ClutterDummyNode *dnode = (ClutterDummyNode *) node;
+
+  return dnode->framebuffer;
+}
+
 static void
 clutter_dummy_node_class_init (ClutterDummyNodeClass *klass)
 {
@@ -309,6 +321,7 @@ clutter_dummy_node_class_init (ClutterDummyNodeClass *klass)
 
   node_class->pre_draw = clutter_dummy_node_pre_draw;
   node_class->serialize = clutter_dummy_node_serialize;
+  node_class->get_framebuffer = clutter_dummy_node_get_framebuffer;
 }
 
 static void
@@ -320,10 +333,13 @@ ClutterPaintNode *
 _clutter_dummy_node_new (ClutterActor *actor)
 {
   ClutterPaintNode *res;
+  ClutterDummyNode *dnode;
 
   res = _clutter_paint_node_create (_clutter_dummy_node_get_type ());
 
-  ((ClutterDummyNode *) res)->actor = actor;
+  dnode = (ClutterDummyNode *) res;
+  dnode->actor = actor;
+  dnode->framebuffer = _clutter_actor_get_active_framebuffer (actor);
 
   return res;
 }
@@ -384,6 +400,7 @@ static void
 clutter_pipeline_node_draw (ClutterPaintNode *node)
 {
   ClutterPipelineNode *pnode = CLUTTER_PIPELINE_NODE (node);
+  CoglFramebuffer *fb;
   guint i;
 
   if (pnode->pipeline == NULL)
@@ -392,6 +409,8 @@ clutter_pipeline_node_draw (ClutterPaintNode *node)
   if (node->operations == NULL)
     return;
 
+  fb = clutter_paint_node_get_framebuffer (node);
+
   for (i = 0; i < node->operations->len; i++)
     {
       const ClutterPaintOperation *op;
@@ -419,12 +438,9 @@ clutter_pipeline_node_draw (ClutterPaintNode *node)
           break;
 
         case PAINT_OP_PRIMITIVE:
-          {
-            CoglFramebuffer *fb = cogl_get_draw_framebuffer ();
-
-            cogl_framebuffer_draw_primitive (fb, pnode->pipeline,
-                                             op->op.primitive);
-          }
+          cogl_framebuffer_draw_primitive (fb,
+                                           pnode->pipeline,
+                                           op->op.primitive);
           break;
         }
     }
@@ -658,7 +674,7 @@ clutter_scaling_filter_to_cogl_pipeline_filter (ClutterScalingFilter filter)
 /**
  * clutter_texture_node_new:
  * @texture: a #CoglTexture
- * @color: a #ClutterColor
+ * @color: (allow-none): a #ClutterColor used for blending, or %NULL
  * @min_filter: the minification filter for the texture
  * @mag_filter: the magnification filter for the texture
  *
@@ -667,6 +683,10 @@ clutter_scaling_filter_to_cogl_pipeline_filter (ClutterScalingFilter filter)
  * This function will take a reference on @texture, so it is safe to
  * call cogl_object_unref() on @texture when it returns.
  *
+ * The @color must not be pre-multiplied with its #ClutterColor.alpha
+ * channel value; if @color is %NULL, a fully opaque white color will
+ * be used for blending.
+ *
  * Return value: (transfer full): the newly created #ClutterPaintNode.
  *   Use clutter_paint_node_unref() when done
  *
@@ -692,12 +712,18 @@ clutter_texture_node_new (CoglTexture          *texture,
   mag_f = clutter_scaling_filter_to_cogl_pipeline_filter (mag_filter);
   cogl_pipeline_set_layer_filters (tnode->pipeline, 0, min_f, mag_f);
 
-  cogl_color_init_from_4ub (&cogl_color,
-                            color->red,
-                            color->green,
-                            color->blue,
-                            color->alpha);
-  cogl_color_premultiply (&cogl_color);
+  if (color != NULL)
+    {
+      cogl_color_init_from_4ub (&cogl_color,
+                                color->red,
+                                color->green,
+                                color->blue,
+                                color->alpha);
+      cogl_color_premultiply (&cogl_color);
+    }
+  else
+    cogl_color_init_from_4ub (&cogl_color, 255, 255, 255, 255);
+
   cogl_pipeline_set_color (tnode->pipeline, &cogl_color);
 
   return (ClutterPaintNode *) tnode;
@@ -754,11 +780,14 @@ clutter_text_node_draw (ClutterPaintNode *node)
 {
   ClutterTextNode *tnode = CLUTTER_TEXT_NODE (node);
   PangoRectangle extents;
+  CoglFramebuffer *fb;
   guint i;
 
   if (node->operations == NULL)
     return;
 
+  fb = clutter_paint_node_get_framebuffer (node);
+
   pango_layout_get_pixel_extents (tnode->layout, NULL, &extents);
 
   for (i = 0; i < node->operations->len; i++)
@@ -782,10 +811,11 @@ clutter_text_node_draw (ClutterPaintNode *node)
           if (extents.width > op_width ||
               extents.height > op_height)
             {
-              cogl_clip_push_rectangle (op->op.texrect[0],
-                                        op->op.texrect[1],
-                                        op->op.texrect[2],
-                                        op->op.texrect[3]);
+              cogl_framebuffer_push_rectangle_clip (fb,
+                                                    op->op.texrect[0],
+                                                    op->op.texrect[1],
+                                                    op->op.texrect[2],
+                                                    op->op.texrect[3]);
               clipped = TRUE;
             }
 
@@ -796,7 +826,7 @@ clutter_text_node_draw (ClutterPaintNode *node)
                                     0);
 
           if (clipped)
-            cogl_clip_pop ();
+            cogl_framebuffer_pop_clip (fb);
           break;
 
         case PAINT_OP_PATH:
@@ -940,7 +970,7 @@ clutter_clip_node_pre_draw (ClutterPaintNode *node)
   if (node->operations == NULL)
     return FALSE;
 
-  fb = cogl_get_draw_framebuffer ();
+  fb = clutter_paint_node_get_framebuffer (node);
 
   for (i = 0; i < node->operations->len; i++)
     {
@@ -982,7 +1012,7 @@ clutter_clip_node_post_draw (ClutterPaintNode *node)
   if (node->operations == NULL)
     return;
 
-  fb = cogl_get_draw_framebuffer ();
+  fb = clutter_paint_node_get_framebuffer (node);
 
   for (i = 0; i < node->operations->len; i++)
     {
diff --git a/clutter/clutter-paint-nodes.h b/clutter/clutter-paint-nodes.h
index bd854e816..8842e3fd5 100644
--- a/clutter/clutter-paint-nodes.h
+++ b/clutter/clutter-paint-nodes.h
@@ -41,7 +41,7 @@ G_BEGIN_DECLS
 /**
  * ClutterColorNode:
  *
- * The <structname>ClutterTextNode</structname> structure is an opaque
+ * The #ClutterTextNode structure is an opaque
  * type whose members cannot be directly accessed.
  *
  * Since: 1.10
@@ -62,7 +62,7 @@ ClutterPaintNode *      clutter_color_node_new          (const ClutterColor    *
 /**
  * ClutterTextureNode:
  *
- * The <structname>ClutterTextNode</structname> structure is an opaque
+ * The #ClutterTextNode structure is an opaque
  * type whose members cannot be directly accessed.
  *
  * Since: 1.10
@@ -86,7 +86,7 @@ ClutterPaintNode *      clutter_texture_node_new        (CoglTexture           *
 /**
  * ClutterClipNode:
  *
- * The <structname>ClutterTextNode</structname> structure is an opaque
+ * The #ClutterTextNode structure is an opaque
  * type whose members cannot be directly accessed.
  *
  * Since: 1.10
@@ -107,7 +107,7 @@ ClutterPaintNode *      clutter_clip_node_new           (void);
 /**
  * ClutterPipelineNode:
  *
- * The <structname>ClutterTextNode</structname> structure is an opaque
+ * The #ClutterTextNode structure is an opaque
  * type whose members cannot be directly accessed.
  *
  * Since: 1.10
@@ -130,7 +130,7 @@ ClutterPaintNode *      clutter_pipeline_node_new       (CoglPipeline          *
 /**
  * ClutterTextNode:
  *
- * The <structname>ClutterTextNode</structname> structure is an opaque
+ * The #ClutterTextNode structure is an opaque
  * type whose members cannot be directly accessed.
  *
  * Since: 1.10
diff --git a/clutter/clutter-paint-volume.c b/clutter/clutter-paint-volume.c
index 9eeee1e9b..184e18663 100644
--- a/clutter/clutter-paint-volume.c
+++ b/clutter/clutter-paint-volume.c
@@ -290,20 +290,21 @@ clutter_paint_volume_set_width (ClutterPaintVolume *pv,
  * around the volume. It returns the size of that bounding box as
  * measured along the x-axis.
  *
- * <note><para>If, for example, clutter_actor_get_transformed_paint_volume()
+ * If, for example, clutter_actor_get_transformed_paint_volume()
  * is used to transform a 2D child actor that is 100px wide, 100px
  * high and 0px deep into container coordinates then the width might
  * not simply be 100px if the child actor has a 3D rotation applied to
- * it.</para>
- * <para>Remember; after clutter_actor_get_transformed_paint_volume() is
+ * it.
+ * 
+ * Remember: if clutter_actor_get_transformed_paint_volume() is
  * used then a transformed child volume will be defined relative to the
- * ancestor container actor and so a 2D child actor
- * can have a 3D bounding volume.</para></note>
+ * ancestor container actor and so a 2D child actor can have a 3D
+ * bounding volume.
  *
- * <note>There are no accuracy guarantees for the reported width,
- * except that it must always be >= to the true width. This is
- * because actors may report simple, loose fitting paint-volumes
- * for efficiency</note>
+ * There are no accuracy guarantees for the reported width,
+ * except that it must always be greater than, or equal to, the
+ * actor's width. This is because actors may report simple, loose
+ * fitting paint volumes for efficiency.
 
  * Return value: the width, in units of @pv's local coordinate system.
  *
@@ -381,20 +382,21 @@ clutter_paint_volume_set_height (ClutterPaintVolume *pv,
  * around the volume. It returns the size of that bounding box as
  * measured along the y-axis.
  *
- * <note><para>If, for example, clutter_actor_get_transformed_paint_volume()
+ * If, for example, clutter_actor_get_transformed_paint_volume()
  * is used to transform a 2D child actor that is 100px wide, 100px
  * high and 0px deep into container coordinates then the height might
  * not simply be 100px if the child actor has a 3D rotation applied to
- * it.</para>
- * <para>Remember; after clutter_actor_get_transformed_paint_volume() is
+ * it.
+ *
+ * Remember: if clutter_actor_get_transformed_paint_volume() is
  * used then a transformed child volume will be defined relative to the
  * ancestor container actor and so a 2D child actor
- * can have a 3D bounding volume.</para></note>
+ * can have a 3D bounding volume.
  *
- * <note>There are no accuracy guarantees for the reported height,
- * except that it must always be >= to the true height. This is
- * because actors may report simple, loose fitting paint-volumes
- * for efficiency</note>
+ * There are no accuracy guarantees for the reported height,
+ * except that it must always be greater than, or equal to, the actor's
+ * height. This is because actors may report simple, loose fitting paint
+ * volumes for efficiency.
  *
  * Return value: the height, in units of @pv's local coordinate system.
  *
@@ -473,20 +475,21 @@ clutter_paint_volume_set_depth (ClutterPaintVolume *pv,
  * around the volume. It returns the size of that bounding box as
  * measured along the z-axis.
  *
- * <note><para>If, for example, clutter_actor_get_transformed_paint_volume()
+ * If, for example, clutter_actor_get_transformed_paint_volume()
  * is used to transform a 2D child actor that is 100px wide, 100px
  * high and 0px deep into container coordinates then the depth might
  * not simply be 0px if the child actor has a 3D rotation applied to
- * it.</para>
- * <para>Remember; after clutter_actor_get_transformed_paint_volume() is
+ * it.
+ *
+ * Remember: if clutter_actor_get_transformed_paint_volume() is
  * used then the transformed volume will be defined relative to the
  * container actor and in container coordinates a 2D child actor
- * can have a 3D bounding volume.</para></note>
+ * can have a 3D bounding volume.
  *
- * <note>There are no accuracy guarantees for the reported depth,
- * except that it must always be >= to the true depth. This is
- * because actors may report simple, loose fitting paint-volumes
- * for efficiency.</note>
+ * There are no accuracy guarantees for the reported depth,
+ * except that it must always be greater than, or equal to, the actor's
+ * depth. This is because actors may report simple, loose fitting paint
+ * volumes for efficiency.
  *
  * Return value: the depth, in units of @pv's local coordinate system.
  *
@@ -521,8 +524,8 @@ clutter_paint_volume_get_depth (const ClutterPaintVolume *pv)
  *
  * Updates the geometry of @pv to encompass @pv and @another_pv.
  *
- * <note>There are no guarantees about how precisely the two volumes
- * will be encompassed.</note>
+ * There are no guarantees about how precisely the two volumes
+ * will be unioned.
  *
  * Since: 1.6
  */
@@ -743,9 +746,10 @@ _clutter_paint_volume_complete (ClutterPaintVolume *pv)
  * the paint volume into window coordinates before getting
  * the 2D bounding box.
  *
- * <note>The coordinates of the returned box are not clamped to
- * integer pixel values, if you need them to be clamped you can use
- * clutter_actor_box_clamp_to_pixel()</note>
+ * The coordinates of the returned box are not clamped to
+ * integer pixel values; if you need them to be rounded to the
+ * nearest integer pixel values, you can use the
+ * clutter_actor_box_clamp_to_pixel() function.
  *
  * Since: 1.6
  */
diff --git a/clutter/clutter-pan-action.c b/clutter/clutter-pan-action.c
index 53a32d3e5..a1f61240d 100644
--- a/clutter/clutter-pan-action.c
+++ b/clutter/clutter-pan-action.c
@@ -61,6 +61,7 @@
 
 #include "clutter-debug.h"
 #include "clutter-enum-types.h"
+#include "clutter-gesture-action-private.h"
 #include "clutter-marshal.h"
 #include "clutter-private.h"
 #include <math.h>
@@ -127,8 +128,7 @@ enum
 
 static guint pan_signals[LAST_SIGNAL] = { 0, };
 
-G_DEFINE_TYPE (ClutterPanAction, clutter_pan_action,
-               CLUTTER_TYPE_GESTURE_ACTION);
+G_DEFINE_TYPE_WITH_PRIVATE (ClutterPanAction, clutter_pan_action, CLUTTER_TYPE_GESTURE_ACTION)
 
 static void
 emit_pan (ClutterPanAction *self,
@@ -386,6 +386,15 @@ clutter_pan_action_get_property (GObject    *gobject,
     }
 }
 
+static void
+clutter_pan_action_constructed (GObject *gobject)
+{
+  ClutterGestureAction *gesture;
+
+  gesture = CLUTTER_GESTURE_ACTION (gobject);
+  clutter_gesture_action_set_threshold_trigger_edge (gesture, CLUTTER_GESTURE_TRIGGER_EDGE_AFTER);
+}
+
 static void
 clutter_pan_action_dispose (GObject *gobject)
 {
@@ -424,8 +433,6 @@ clutter_pan_action_class_init (ClutterPanActionClass *klass)
   ClutterGestureActionClass *gesture_class =
       CLUTTER_GESTURE_ACTION_CLASS (klass);
 
-  g_type_class_add_private (klass, sizeof (ClutterPanActionPrivate));
-
   klass->pan = clutter_pan_action_real_pan;
 
   gesture_class->gesture_prepare = gesture_prepare;
@@ -500,6 +507,7 @@ clutter_pan_action_class_init (ClutterPanActionClass *klass)
                          1.0, G_MAXDOUBLE, default_acceleration_factor,
                          CLUTTER_PARAM_READWRITE);
 
+  gobject_class->constructed = clutter_pan_action_constructed;
   gobject_class->set_property = clutter_pan_action_set_property;
   gobject_class->get_property = clutter_pan_action_get_property;
   gobject_class->dispose = clutter_pan_action_dispose;
@@ -559,12 +567,10 @@ clutter_pan_action_class_init (ClutterPanActionClass *klass)
 static void
 clutter_pan_action_init (ClutterPanAction *self)
 {
-  ClutterPanActionPrivate *priv = self->priv =
-    G_TYPE_INSTANCE_GET_PRIVATE (self, CLUTTER_TYPE_PAN_ACTION,
-                                 ClutterPanActionPrivate);
-  priv->deceleration_rate = default_deceleration_rate;
-  priv->acceleration_factor = default_acceleration_factor;
-  priv->state = PAN_STATE_INACTIVE;
+  self->priv = clutter_pan_action_get_instance_private (self);
+  self->priv->deceleration_rate = default_deceleration_rate;
+  self->priv->acceleration_factor = default_acceleration_factor;
+  self->priv->state = PAN_STATE_INACTIVE;
 }
 
 /**
diff --git a/clutter/clutter-pan-action.h b/clutter/clutter-pan-action.h
index 77d6b330c..8d90b7a65 100644
--- a/clutter/clutter-pan-action.h
+++ b/clutter/clutter-pan-action.h
@@ -55,7 +55,7 @@ typedef struct _ClutterPanActionClass         ClutterPanActionClass;
 /**
  * ClutterPanAction:
  *
- * The <structname>ClutterPanAction</structname> structure contains
+ * The #ClutterPanAction structure contains
  * only private data and should be accessed using the provided API
  *
  * Since: 1.12
@@ -73,7 +73,7 @@ struct _ClutterPanAction
  * @pan: class handler for the #ClutterPanAction::pan signal
  * @pan_stopped: class handler for the #ClutterPanAction::pan-stopped signal
  *
- * The <structname>ClutterPanActionClass</structname> structure contains
+ * The #ClutterPanActionClass structure contains
  * only private data.
  *
  * Since: 1.12
diff --git a/clutter/clutter-path-constraint.h b/clutter/clutter-path-constraint.h
index e65555e89..9c77d4fe8 100644
--- a/clutter/clutter-path-constraint.h
+++ b/clutter/clutter-path-constraint.h
@@ -41,7 +41,7 @@ G_BEGIN_DECLS
 /**
  * ClutterPathConstraint:
  *
- * <structname>ClutterPathConstraint</structname> is an opaque structure
+ * #ClutterPathConstraint is an opaque structure
  * whose members cannot be directly accessed
  *
  * Since: 1.6
@@ -49,16 +49,22 @@ G_BEGIN_DECLS
 typedef struct _ClutterPathConstraint           ClutterPathConstraint;
 typedef struct _ClutterPathConstraintClass      ClutterPathConstraintClass;
 
+CLUTTER_AVAILABLE_IN_1_6
 GType clutter_path_constraint_get_type (void) G_GNUC_CONST;
 
+CLUTTER_AVAILABLE_IN_1_6
 ClutterConstraint *clutter_path_constraint_new        (ClutterPath           *path,
                                                        gfloat                 offset);
 
+CLUTTER_AVAILABLE_IN_1_6
 void               clutter_path_constraint_set_path   (ClutterPathConstraint *constraint,
                                                        ClutterPath           *path);
+CLUTTER_AVAILABLE_IN_1_6
 ClutterPath *      clutter_path_constraint_get_path   (ClutterPathConstraint *constraint);
+CLUTTER_AVAILABLE_IN_1_6
 void               clutter_path_constraint_set_offset (ClutterPathConstraint *constraint,
                                                        gfloat                 offset);
+CLUTTER_AVAILABLE_IN_1_6
 gfloat             clutter_path_constraint_get_offset (ClutterPathConstraint *constraint);
 
 G_END_DECLS
diff --git a/clutter/clutter-path.c b/clutter/clutter-path.c
index 799c2e57a..0ff7a2182 100644
--- a/clutter/clutter-path.c
+++ b/clutter/clutter-path.c
@@ -33,32 +33,19 @@
  * The path consists of a series of nodes. Each node is one of the
  * following four types:
  *
- * <variablelist>
- * <varlistentry><term>%CLUTTER_PATH_MOVE_TO</term>
- * <listitem><para>
- * Changes the position of the path to the given pair of
- * coordinates. This is usually used as the first node of a path to
- * mark the start position. If it is used in the middle of a path then
- * the path will be disjoint and the actor will appear to jump to the
- * new position when animated.
- * </para></listitem></varlistentry>
- * <varlistentry><term>%CLUTTER_PATH_LINE_TO</term>
- * <listitem><para>
- * Creates a straight line from the previous point to the given point.
- * </para></listitem></varlistentry>
- * <varlistentry><term>%CLUTTER_PATH_CURVE_TO</term>
- * <listitem><para>
- * Creates a bezier curve. The end of the last node is used as the
- * first control point and the three subsequent coordinates given in
- * the node as used as the other three.
- * </para></listitem></varlistentry>
- * <varlistentry><term>%CLUTTER_PATH_CLOSE</term>
- * <listitem><para>
- * Creates a straight line from the last node to the last
- * %CLUTTER_PATH_MOVE_TO node. This can be used to close a path so
- * that it will appear as a loop when animated.
- * </para></listitem></varlistentry>
- * </variablelist>
+ *  - %CLUTTER_PATH_MOVE_TO, changes the position of the path to the
+ *  given pair of coordinates. This is usually used as the first node
+ *  of a path to mark the start position. If it is used in the middle
+ *  of a path then the path will be disjoint and the actor will appear
+ *  to jump to the new position when animated.
+ *  - %CLUTTER_PATH_LINE_TO, creates a straight line from the previous
+ *  point to the given point.
+ *  - %CLUTTER_PATH_CURVE_TO, creates a bezier curve. The end of the
+ *  last node is used as the first control point and the three
+ *  subsequent coordinates given in the node as used as the other three.
+ *  -%CLUTTER_PATH_CLOSE, creates a straight line from the last node to
+ *  the last %CLUTTER_PATH_MOVE_TO node. This can be used to close a
+ *  path so that it will appear as a loop when animated.
  *
  * The first three types have the corresponding relative versions
  * %CLUTTER_PATH_REL_MOVE_TO, %CLUTTER_PATH_REL_LINE_TO and
@@ -88,10 +75,6 @@
 #include "clutter-bezier.h"
 #include "clutter-private.h"
 
-#define CLUTTER_PATH_GET_PRIVATE(obj) \
-  (G_TYPE_INSTANCE_GET_PRIVATE ((obj), CLUTTER_TYPE_PATH, \
-                                ClutterPathPrivate))
-
 #define CLUTTER_PATH_NODE_TYPE_IS_VALID(t) \
   ((((t) & ~CLUTTER_PATH_RELATIVE) >= CLUTTER_PATH_MOVE_TO      \
     && ((t) & ~CLUTTER_PATH_RELATIVE) <= CLUTTER_PATH_CURVE_TO) \
@@ -149,6 +132,7 @@ G_DEFINE_BOXED_TYPE (ClutterPathNode, clutter_path_node,
 G_DEFINE_TYPE_WITH_CODE (ClutterPath,
                          clutter_path,
                          G_TYPE_INITIALLY_UNOWNED,
+                         G_ADD_PRIVATE (ClutterPath)
                          CLUTTER_REGISTER_VALUE_TRANSFORM_TO (G_TYPE_STRING, clutter_value_transform_path_string)
                          CLUTTER_REGISTER_VALUE_TRANSFORM_FROM (G_TYPE_STRING, clutter_value_transform_string_path));
 
@@ -220,14 +204,12 @@ clutter_path_class_init (ClutterPathClass *klass)
                              CLUTTER_PARAM_READABLE);
   obj_props[PROP_LENGTH] = pspec;
   g_object_class_install_property (gobject_class, PROP_LENGTH, pspec);
-
-  g_type_class_add_private (klass, sizeof (ClutterPathPrivate));
 }
 
 static void
 clutter_path_init (ClutterPath *self)
 {
-  self->priv = CLUTTER_PATH_GET_PRIVATE (self);
+  self->priv = clutter_path_get_instance_private (self);
 }
 
 static void
@@ -716,24 +698,10 @@ clutter_path_add_nodes (ClutterPath *path,
  * coordinates. The coordinates can be separated by spaces or a
  * comma. The types are:
  *
- * <variablelist>
- * <varlistentry><term>M</term>
- * <listitem><para>
- * Adds a %CLUTTER_PATH_MOVE_TO node. Takes one pair of coordinates.
- * </para></listitem></varlistentry>
- * <varlistentry><term>L</term>
- * <listitem><para>
- * Adds a %CLUTTER_PATH_LINE_TO node. Takes one pair of coordinates.
- * </para></listitem></varlistentry>
- * <varlistentry><term>C</term>
- * <listitem><para>
- * Adds a %CLUTTER_PATH_CURVE_TO node. Takes three pairs of coordinates.
- * </para></listitem></varlistentry>
- * <varlistentry><term>z</term>
- * <listitem><para>
- * Adds a %CLUTTER_PATH_CLOSE node. No coordinates are needed.
- * </para></listitem></varlistentry>
- * </variablelist>
+ *  - `M`: Adds a %CLUTTER_PATH_MOVE_TO node. Takes one pair of coordinates.
+ *  - `L`: Adds a %CLUTTER_PATH_LINE_TO node. Takes one pair of coordinates.
+ *  - `C`: Adds a %CLUTTER_PATH_CURVE_TO node. Takes three pairs of coordinates.
+ *  - `z`: Adds a %CLUTTER_PATH_CLOSE node. No coordinates are needed.
  *
  * The M, L and C commands can also be specified in lower case which
  * means the coordinates are relative to the previous node.
@@ -741,11 +709,9 @@ clutter_path_add_nodes (ClutterPath *path,
  * For example, to move an actor in a 100 by 100 pixel square centered
  * on the point 300,300 you could use the following path:
  *
- * <informalexample>
- *  <programlisting>
+ * |[
  *   M 250,350 l 0 -100 L 350,250 l 0 100 z
- *  </programlisting>
- * </informalexample>
+ * ]|
  *
  * If the path description isn't valid %FALSE will be returned and no
  * nodes will be added.
diff --git a/clutter/clutter-path.h b/clutter/clutter-path.h
index 599499a98..c170bb32f 100644
--- a/clutter/clutter-path.h
+++ b/clutter/clutter-path.h
@@ -86,22 +86,30 @@ struct _ClutterPathClass
   GInitiallyUnownedClass parent_class;
 };
 
+CLUTTER_AVAILABLE_IN_1_0
 GType clutter_path_get_type (void) G_GNUC_CONST;
 
+CLUTTER_AVAILABLE_IN_1_0
 ClutterPath *clutter_path_new                  (void);
+CLUTTER_AVAILABLE_IN_1_0
 ClutterPath *clutter_path_new_with_description (const gchar           *desc);
+CLUTTER_AVAILABLE_IN_1_0
 void         clutter_path_add_move_to          (ClutterPath           *path,
                                                 gint                   x,
                                                 gint                   y);
+CLUTTER_AVAILABLE_IN_1_0
 void         clutter_path_add_rel_move_to      (ClutterPath           *path,
                                                 gint                   x,
                                                 gint                   y);
+CLUTTER_AVAILABLE_IN_1_0
 void         clutter_path_add_line_to          (ClutterPath           *path,
                                                 gint                   x,
                                                 gint                   y);
+CLUTTER_AVAILABLE_IN_1_0
 void         clutter_path_add_rel_line_to      (ClutterPath           *path,
                                                 gint                   x,
                                                 gint                   y);
+CLUTTER_AVAILABLE_IN_1_0
 void         clutter_path_add_curve_to         (ClutterPath           *path,
                                                 gint                   x_1,
                                                 gint                   y_1,
@@ -109,6 +117,7 @@ void         clutter_path_add_curve_to         (ClutterPath           *path,
                                                 gint                   y_2,
                                                 gint                   x_3,
                                                 gint                   y_3);
+CLUTTER_AVAILABLE_IN_1_0
 void         clutter_path_add_rel_curve_to     (ClutterPath           *path,
                                                 gint                   x_1,
                                                 gint                   y_1,
@@ -116,38 +125,55 @@ void         clutter_path_add_rel_curve_to     (ClutterPath           *path,
                                                 gint                   y_2,
                                                 gint                   x_3,
                                                 gint                   y_3);
+CLUTTER_AVAILABLE_IN_1_0
 void         clutter_path_add_close            (ClutterPath           *path);
+CLUTTER_AVAILABLE_IN_1_0
 gboolean     clutter_path_add_string           (ClutterPath           *path,
                                                 const gchar           *str);
+CLUTTER_AVAILABLE_IN_1_0
 void         clutter_path_add_node             (ClutterPath           *path,
                                                 const ClutterPathNode *node);
+CLUTTER_AVAILABLE_IN_1_0
 void         clutter_path_add_cairo_path       (ClutterPath           *path,
                                                 const cairo_path_t    *cpath);
+CLUTTER_AVAILABLE_IN_1_0
 guint        clutter_path_get_n_nodes          (ClutterPath           *path);
+CLUTTER_AVAILABLE_IN_1_0
 void         clutter_path_get_node             (ClutterPath           *path,
                                                 guint                  index_,
                                                 ClutterPathNode       *node);
+CLUTTER_AVAILABLE_IN_1_0
 GSList *     clutter_path_get_nodes            (ClutterPath           *path);
+CLUTTER_AVAILABLE_IN_1_0
 void         clutter_path_foreach              (ClutterPath           *path,
                                                 ClutterPathCallback    callback,
                                                 gpointer               user_data);
+CLUTTER_AVAILABLE_IN_1_0
 void         clutter_path_insert_node          (ClutterPath           *path,
                                                 gint                   index_,
                                                 const ClutterPathNode *node);
+CLUTTER_AVAILABLE_IN_1_0
 void         clutter_path_remove_node          (ClutterPath           *path,
                                                 guint                  index_);
+CLUTTER_AVAILABLE_IN_1_0
 void         clutter_path_replace_node         (ClutterPath           *path,
                                                 guint                  index_,
                                                 const ClutterPathNode *node);
+CLUTTER_AVAILABLE_IN_1_0
 gchar *      clutter_path_get_description      (ClutterPath           *path);
+CLUTTER_AVAILABLE_IN_1_0
 gboolean     clutter_path_set_description      (ClutterPath           *path,
                                                 const gchar           *str);
+CLUTTER_AVAILABLE_IN_1_0
 void         clutter_path_clear                (ClutterPath           *path);
+CLUTTER_AVAILABLE_IN_1_0
 void         clutter_path_to_cairo_path        (ClutterPath           *path,
                                                 cairo_t               *cr);
+CLUTTER_AVAILABLE_IN_1_0
 guint        clutter_path_get_position         (ClutterPath           *path,
                                                 gdouble                progress,
                                                 ClutterKnot           *position);
+CLUTTER_AVAILABLE_IN_1_0
 guint        clutter_path_get_length           (ClutterPath           *path);
 
 G_END_DECLS
diff --git a/clutter/clutter-private.h b/clutter/clutter-private.h
index 2136efe75..6621a00ad 100644
--- a/clutter/clutter-private.h
+++ b/clutter/clutter-private.h
@@ -70,7 +70,6 @@ typedef struct _ClutterVertex4          ClutterVertex4;
 #define CLUTTER_ACTOR_IN_REPARENT(a)            ((CLUTTER_PRIVATE_FLAGS (a) & CLUTTER_IN_REPARENT) != FALSE)
 #define CLUTTER_ACTOR_IN_PAINT(a)               ((CLUTTER_PRIVATE_FLAGS (a) & CLUTTER_IN_PAINT) != FALSE)
 #define CLUTTER_ACTOR_IN_RELAYOUT(a)            ((CLUTTER_PRIVATE_FLAGS (a) & CLUTTER_IN_RELAYOUT) != FALSE)
-#define CLUTTER_STAGE_IN_RESIZE(a)              ((CLUTTER_PRIVATE_FLAGS (a) & CLUTTER_IN_RESIZE) != FALSE)
 
 #define CLUTTER_PARAM_READABLE  (G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)
 #define CLUTTER_PARAM_WRITABLE  (G_PARAM_WRITABLE | G_PARAM_STATIC_STRINGS)
@@ -108,14 +107,8 @@ typedef enum {
   /* Used to avoid recursion */
   CLUTTER_IN_RELAYOUT    = 1 << 4,
 
-  /* Used by the stage if resizing is an asynchronous operation (like on
-   * X11) to delay queueing relayouts until we got a notification from the
-   * event handling
-   */
-  CLUTTER_IN_RESIZE      = 1 << 5,
-
-  /* a flag for internal children of Containers */
-  CLUTTER_INTERNAL_CHILD = 1 << 6
+  /* a flag for internal children of Containers (DEPRECATED) */
+  CLUTTER_INTERNAL_CHILD = 1 << 5
 } ClutterPrivateFlags;
 
 /*
@@ -137,10 +130,11 @@ struct _ClutterMainContext
   /* the main event queue */
   GQueue *events_queue;
 
-  ClutterPickMode  pick_mode;
+  /* the event filters added via clutter_event_add_filter. these are
+   * ordered from least recently added to most recently added */
+  GList *event_filters;
 
-  /* mapping between reused integer ids and actors */
-  ClutterIDPool *id_pool;
+  ClutterPickMode  pick_mode;
 
   /* default FPS; this is only used if we cannot sync to vblank */
   guint frame_rate;
@@ -160,7 +154,6 @@ struct _ClutterMainContext
   gint fb_g_mask_used;
   gint fb_b_mask_used;
 
-  PangoContext *pango_context;  /* Global Pango context */
   CoglPangoFontMap *font_map;   /* Global font map */
 
   /* stack of #ClutterEvent */
@@ -201,14 +194,10 @@ ClutterMainContext *    _clutter_context_get_default                    (void);
 void                    _clutter_context_lock                           (void);
 void                    _clutter_context_unlock                         (void);
 gboolean                _clutter_context_is_initialized                 (void);
-PangoContext *          _clutter_context_create_pango_context           (void);
-PangoContext *          _clutter_context_get_pango_context              (void);
 ClutterPickMode         _clutter_context_get_pick_mode                  (void);
 void                    _clutter_context_push_shader_stack              (ClutterActor *actor);
 ClutterActor *          _clutter_context_pop_shader_stack               (ClutterActor *actor);
 ClutterActor *          _clutter_context_peek_shader_stack              (void);
-guint32                 _clutter_context_acquire_id                     (gpointer      key);
-void                    _clutter_context_release_id                     (guint32       id_);
 gboolean                _clutter_context_get_motion_events_enabled      (void);
 gboolean                _clutter_context_get_show_fps                   (void);
 
@@ -224,9 +213,8 @@ void            _clutter_diagnostic_message     (const char *fmt, ...);
 guint           _clutter_pixel_to_id            (guchar        pixel[4]);
 void            _clutter_id_to_color            (guint         id,
                                                  ClutterColor *col);
-ClutterActor *  _clutter_get_actor_by_id        (ClutterStage *stage,
-                                                 guint32       actor_id);
 
+void            _clutter_set_sync_to_vblank     (gboolean      sync_to_vblank);
 gboolean        _clutter_get_sync_to_vblank     (void);
 
 /* use this function as the accumulator if you have a signal with
@@ -249,10 +237,6 @@ gboolean _clutter_boolean_continue_accumulator (GSignalInvocationHint *ihint,
 
 void _clutter_run_repaint_functions (ClutterRepaintFlags flags);
 
-void _clutter_constraint_update_allocation (ClutterConstraint *constraint,
-                                            ClutterActor      *actor,
-                                            ClutterActorBox   *allocation);
-
 GType _clutter_layout_manager_get_child_meta_type (ClutterLayoutManager *manager);
 
 void  _clutter_util_fully_transform_vertices (const CoglMatrix    *modelview,
diff --git a/clutter/clutter-property-transition.c b/clutter/clutter-property-transition.c
index e74490de4..6cdceb2da 100644
--- a/clutter/clutter-property-transition.c
+++ b/clutter/clutter-property-transition.c
@@ -60,7 +60,7 @@ enum
 
 static GParamSpec *obj_props[PROP_LAST] = { NULL, };
 
-G_DEFINE_TYPE (ClutterPropertyTransition, clutter_property_transition, CLUTTER_TYPE_TRANSITION)
+G_DEFINE_TYPE_WITH_PRIVATE (ClutterPropertyTransition, clutter_property_transition, CLUTTER_TYPE_TRANSITION)
 
 static inline void
 clutter_property_transition_ensure_interval (ClutterPropertyTransition *transition,
@@ -249,8 +249,6 @@ clutter_property_transition_class_init (ClutterPropertyTransitionClass *klass)
   ClutterTransitionClass *transition_class = CLUTTER_TRANSITION_CLASS (klass);
   GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
 
-  g_type_class_add_private (klass, sizeof (ClutterPropertyTransitionPrivate));
-
   transition_class->attached = clutter_property_transition_attached;
   transition_class->detached = clutter_property_transition_detached;
   transition_class->compute_value = clutter_property_transition_compute_value;
@@ -279,9 +277,7 @@ clutter_property_transition_class_init (ClutterPropertyTransitionClass *klass)
 static void
 clutter_property_transition_init (ClutterPropertyTransition *self)
 {
-  self->priv =
-    G_TYPE_INSTANCE_GET_PRIVATE (self, CLUTTER_TYPE_PROPERTY_TRANSITION,
-                                 ClutterPropertyTransitionPrivate);
+  self->priv = clutter_property_transition_get_instance_private (self);
 }
 
 /**
diff --git a/clutter/clutter-property-transition.h b/clutter/clutter-property-transition.h
index 0d32f162c..5ea2e9ba9 100644
--- a/clutter/clutter-property-transition.h
+++ b/clutter/clutter-property-transition.h
@@ -46,7 +46,7 @@ typedef struct _ClutterPropertyTransitionClass          ClutterPropertyTransitio
 /**
  * ClutterPropertyTransition:
  *
- * The <structname>ClutterPropertyTransition</structname> structure contains
+ * The #ClutterPropertyTransition structure contains
  * private data and should only be accessed using the provided API.
  *
  * Since: 1.10
@@ -62,7 +62,7 @@ struct _ClutterPropertyTransition
 /**
  * ClutterPropertyTransitionClass:
  *
- * The <structname>ClutterPropertyTransitionClass</structname> structure
+ * The #ClutterPropertyTransitionClass structure
  * contains private data.
  *
  * Since: 1.10
diff --git a/clutter/clutter-rotate-action.c b/clutter/clutter-rotate-action.c
index 567d73fc1..7286c2b08 100644
--- a/clutter/clutter-rotate-action.c
+++ b/clutter/clutter-rotate-action.c
@@ -43,6 +43,7 @@
 
 #include "clutter-debug.h"
 #include "clutter-enum-types.h"
+#include "clutter-gesture-action-private.h"
 #include "clutter-marshal.h"
 #include "clutter-private.h"
 
@@ -62,8 +63,7 @@ enum
 
 static guint rotate_signals[LAST_SIGNAL] = { 0, };
 
-G_DEFINE_TYPE (ClutterRotateAction, clutter_rotate_action,
-               CLUTTER_TYPE_GESTURE_ACTION);
+G_DEFINE_TYPE_WITH_PRIVATE (ClutterRotateAction, clutter_rotate_action, CLUTTER_TYPE_GESTURE_ACTION)
 
 static gboolean
 clutter_rotate_action_real_rotate (ClutterRotateAction *action,
@@ -172,16 +172,27 @@ clutter_rotate_action_gesture_cancel (ClutterGestureAction *action,
                  &retval);
 }
 
+static void
+clutter_rotate_action_constructed (GObject *gobject)
+{
+  ClutterGestureAction *gesture;
+
+  gesture = CLUTTER_GESTURE_ACTION (gobject);
+  clutter_gesture_action_set_threshold_trigger_edge (gesture, CLUTTER_GESTURE_TRIGGER_EDGE_NONE);
+}
+
 static void
 clutter_rotate_action_class_init (ClutterRotateActionClass *klass)
 {
   ClutterGestureActionClass *gesture_class =
     CLUTTER_GESTURE_ACTION_CLASS (klass);
-
-  g_type_class_add_private (klass, sizeof (ClutterRotateActionPrivate));
+  GObjectClass *object_class =
+    G_OBJECT_CLASS (klass);
 
   klass->rotate = clutter_rotate_action_real_rotate;
 
+  object_class->constructed = clutter_rotate_action_constructed;
+
   gesture_class->gesture_begin = clutter_rotate_action_gesture_begin;
   gesture_class->gesture_progress = clutter_rotate_action_gesture_progress;
   gesture_class->gesture_cancel = clutter_rotate_action_gesture_cancel;
@@ -217,10 +228,12 @@ clutter_rotate_action_class_init (ClutterRotateActionClass *klass)
 static void
 clutter_rotate_action_init (ClutterRotateAction *self)
 {
-  self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, CLUTTER_TYPE_ROTATE_ACTION,
-                                            ClutterRotateActionPrivate);
+  ClutterGestureAction *gesture;
 
-  clutter_gesture_action_set_n_touch_points (CLUTTER_GESTURE_ACTION (self), 2);
+  self->priv = clutter_rotate_action_get_instance_private (self);
+
+  gesture = CLUTTER_GESTURE_ACTION (self);
+  clutter_gesture_action_set_n_touch_points (gesture, 2);
 }
 
 /**
diff --git a/clutter/clutter-rotate-action.h b/clutter/clutter-rotate-action.h
index ee41059c2..8f6f27873 100644
--- a/clutter/clutter-rotate-action.h
+++ b/clutter/clutter-rotate-action.h
@@ -47,7 +47,7 @@ typedef struct _ClutterRotateActionClass         ClutterRotateActionClass;
 /**
  * ClutterRotateAction:
  *
- * The <structname>ClutterRotateAction</structname> structure contains
+ * The #ClutterRotateAction structure contains
  * only private data and should be accessed using the provided API
  *
  * Since: 1.12
@@ -64,7 +64,7 @@ struct _ClutterRotateAction
  * ClutterRotateActionClass:
  * @rotate: class handler for the #ClutterRotateAction::rotate signal
  *
- * The <structname>ClutterRotateActionClass</structname> structure contains
+ * The #ClutterRotateActionClass structure contains
  * only private data.
  *
  * Since: 1.12
diff --git a/clutter/clutter-script-parser.c b/clutter/clutter-script-parser.c
index 3ed900cb2..161103734 100644
--- a/clutter/clutter-script-parser.c
+++ b/clutter/clutter-script-parser.c
@@ -1083,6 +1083,7 @@ clutter_script_parser_object_end (JsonParser *json_parser,
       oinfo = g_slice_new0 (ObjectInfo);
       oinfo->merge_id = _clutter_script_get_last_merge_id (script);
       oinfo->id = g_strdup (id_);
+      oinfo->has_unresolved = TRUE;
 
       class_name = json_object_get_string_member (object, "type");
       oinfo->class_name = g_strdup (class_name);
@@ -1107,6 +1108,8 @@ clutter_script_parser_object_end (JsonParser *json_parser,
       oinfo->children = parse_children (oinfo, val);
 
       json_object_remove_member (object, "children");
+
+      oinfo->has_unresolved = TRUE;
     }
 
   if (json_object_has_member (object, "signals"))
@@ -1115,9 +1118,9 @@ clutter_script_parser_object_end (JsonParser *json_parser,
       oinfo->signals = parse_signals (script, oinfo, val);
 
       json_object_remove_member (object, "signals");
-    }
 
-  oinfo->is_actor = FALSE;
+      oinfo->has_unresolved = TRUE;
+    }
 
   if (strcmp (oinfo->class_name, "ClutterStage") == 0 &&
       json_object_has_member (object, "is-default"))
@@ -1132,9 +1135,6 @@ clutter_script_parser_object_end (JsonParser *json_parser,
   else
     oinfo->is_stage_default = FALSE;
 
-  oinfo->is_unmerged = FALSE;
-  oinfo->has_unresolved = TRUE;
-
   members = json_object_get_members (object);
   for (l = members; l; l = l->next)
     {
@@ -1175,6 +1175,7 @@ clutter_script_parser_object_end (JsonParser *json_parser,
       pinfo->is_layout = g_str_has_prefix (name, "layout::") ? TRUE : FALSE;
 
       oinfo->properties = g_list_prepend (oinfo->properties, pinfo);
+      oinfo->has_unresolved = TRUE;
     }
 
   g_list_free (members);
@@ -2169,12 +2170,12 @@ _clutter_script_construct_object (ClutterScript *script,
 
       if (G_UNLIKELY (oinfo->gtype == G_TYPE_INVALID))
         return;
-
-      oinfo->is_actor = g_type_is_a (oinfo->gtype, CLUTTER_TYPE_ACTOR);
-      if (oinfo->is_actor)
-        oinfo->is_stage = g_type_is_a (oinfo->gtype, CLUTTER_TYPE_STAGE);
     }
 
+  oinfo->is_actor = g_type_is_a (oinfo->gtype, CLUTTER_TYPE_ACTOR);
+  if (oinfo->is_actor)
+    oinfo->is_stage = g_type_is_a (oinfo->gtype, CLUTTER_TYPE_STAGE);
+
   if (oinfo->is_stage && oinfo->is_stage_default)
     {
       ClutterStageManager *manager = clutter_stage_manager_get_default ();
diff --git a/clutter/clutter-script.c b/clutter/clutter-script.c
index 6d0b6071f..8df91b2c7 100644
--- a/clutter/clutter-script.c
+++ b/clutter/clutter-script.c
@@ -287,7 +287,7 @@ struct _ClutterScriptPrivate
   guint is_filename : 1;
 };
 
-G_DEFINE_TYPE (ClutterScript, clutter_script, G_TYPE_OBJECT);
+G_DEFINE_TYPE_WITH_PRIVATE (ClutterScript, clutter_script, G_TYPE_OBJECT)
 
 static GType
 clutter_script_real_get_type_from_name (ClutterScript *script,
@@ -448,8 +448,6 @@ clutter_script_class_init (ClutterScriptClass *klass)
 {
   GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
 
-  g_type_class_add_private (klass, sizeof (ClutterScriptPrivate));
-
   klass->get_type_from_name = clutter_script_real_get_type_from_name;
 
   /**
@@ -515,7 +513,7 @@ clutter_script_init (ClutterScript *script)
 {
   ClutterScriptPrivate *priv;
 
-  script->priv = priv = CLUTTER_SCRIPT_GET_PRIVATE (script);
+  script->priv = priv = clutter_script_get_instance_private (script);
 
   priv->parser = g_object_new (CLUTTER_TYPE_SCRIPT_PARSER, NULL);
   priv->parser->script = script;
@@ -758,15 +756,15 @@ clutter_script_get_objects_valist (ClutterScript *script,
  * names/return location pairs should be listed, with a %NULL pointer
  * ending the list, like:
  *
- * <informalexample><programlisting>
+ * |[
  *   GObject *my_label, *a_button, *main_timeline;
  *
  *   clutter_script_get_objects (script,
- *                               "my-label", &amp;my_label,
- *                               "a-button", &amp;a_button,
- *                               "main-timeline", &amp;main_timeline,
+ *                               "my-label", &my_label,
+ *                               "a-button", &a_button,
+ *                               "main-timeline", &main_timeline,
  *                               NULL);
- * </programlisting></informalexample>
+ * ]|
  *
  * Note: This function does not increment the reference count of the
  * returned objects.
diff --git a/clutter/clutter-script.h b/clutter/clutter-script.h
index f2b6222c6..4ac5c8f5d 100644
--- a/clutter/clutter-script.h
+++ b/clutter/clutter-script.h
@@ -93,6 +93,7 @@ typedef enum {
  * Since: 0.6
  */
 #define CLUTTER_SCRIPT_ERROR    (clutter_script_error_quark ())
+CLUTTER_AVAILABLE_IN_ALL
 GQuark clutter_script_error_quark (void);
 
 /**
@@ -143,12 +144,16 @@ struct _ClutterScriptClass
   void (*_clutter_reserved8) (void);
 };
 
+CLUTTER_AVAILABLE_IN_ALL
 GType clutter_script_get_type (void) G_GNUC_CONST;
 
+CLUTTER_AVAILABLE_IN_ALL
 ClutterScript * clutter_script_new                      (void);
+CLUTTER_AVAILABLE_IN_ALL
 guint           clutter_script_load_from_file           (ClutterScript             *script,
                                                          const gchar               *filename,
                                                          GError                   **error);
+CLUTTER_AVAILABLE_IN_ALL
 guint           clutter_script_load_from_data           (ClutterScript             *script,
                                                          const gchar               *data,
                                                          gssize                     length,
@@ -158,14 +163,19 @@ guint           clutter_script_load_from_resource       (ClutterScript
                                                          const gchar               *resource_path,
                                                          GError                   **error);
 
+CLUTTER_AVAILABLE_IN_ALL
 GObject *       clutter_script_get_object               (ClutterScript             *script,
                                                          const gchar               *name);
+CLUTTER_AVAILABLE_IN_ALL
 gint            clutter_script_get_objects              (ClutterScript             *script,
                                                          const gchar               *first_name,
                                                          ...) G_GNUC_NULL_TERMINATED;
+CLUTTER_AVAILABLE_IN_ALL
 GList *         clutter_script_list_objects             (ClutterScript             *script);
+CLUTTER_AVAILABLE_IN_ALL
 void            clutter_script_unmerge_objects          (ClutterScript             *script,
                                                          guint                      merge_id);
+CLUTTER_AVAILABLE_IN_ALL
 void            clutter_script_ensure_objects           (ClutterScript             *script);
 
 CLUTTER_DEPRECATED_IN_1_12
@@ -177,17 +187,22 @@ CLUTTER_DEPRECATED_IN_1_12
 ClutterState *  clutter_script_get_states               (ClutterScript             *script,
                                                          const gchar               *name);
 
+CLUTTER_AVAILABLE_IN_ALL
 void            clutter_script_connect_signals          (ClutterScript             *script,
                                                          gpointer                   user_data);
+CLUTTER_AVAILABLE_IN_ALL
 void            clutter_script_connect_signals_full     (ClutterScript             *script,
                                                          ClutterScriptConnectFunc   func,
                                                          gpointer                   user_data);
 
+CLUTTER_AVAILABLE_IN_ALL
 void            clutter_script_add_search_paths         (ClutterScript             *script,
                                                          const gchar * const        paths[],
                                                          gsize                      n_paths);
+CLUTTER_AVAILABLE_IN_ALL
 gchar *         clutter_script_lookup_filename          (ClutterScript             *script,
                                                          const gchar               *filename) G_GNUC_MALLOC;
+CLUTTER_AVAILABLE_IN_ALL
 GType           clutter_script_get_type_from_name       (ClutterScript             *script,
                                                          const gchar               *type_name);
 
@@ -197,6 +212,7 @@ void            clutter_script_set_translation_domain   (ClutterScript
 CLUTTER_AVAILABLE_IN_1_10
 const gchar *   clutter_script_get_translation_domain   (ClutterScript             *script);
 
+CLUTTER_AVAILABLE_IN_ALL
 const gchar *   clutter_get_script_id                   (GObject                   *gobject);
 
 G_END_DECLS
diff --git a/clutter/clutter-scriptable.h b/clutter/clutter-scriptable.h
index f47aac40c..f66ec863a 100644
--- a/clutter/clutter-scriptable.h
+++ b/clutter/clutter-scriptable.h
@@ -87,16 +87,21 @@ struct _ClutterScriptableIface
                                         const GValue      *value);
 };
 
+CLUTTER_AVAILABLE_IN_ALL
 GType                 clutter_scriptable_get_type            (void) G_GNUC_CONST;
 
+CLUTTER_AVAILABLE_IN_ALL
 void                  clutter_scriptable_set_id              (ClutterScriptable *scriptable,
                                                               const gchar       *id_);
+CLUTTER_AVAILABLE_IN_ALL
 const gchar *         clutter_scriptable_get_id              (ClutterScriptable *scriptable);
+CLUTTER_AVAILABLE_IN_ALL
 gboolean              clutter_scriptable_parse_custom_node   (ClutterScriptable *scriptable,
                                                               ClutterScript     *script,
                                                               GValue            *value,
                                                               const gchar       *name,
                                                               JsonNode          *node);
+CLUTTER_AVAILABLE_IN_ALL
 void                  clutter_scriptable_set_custom_property (ClutterScriptable *scriptable,
                                                               ClutterScript     *script,
                                                               const gchar       *name,
diff --git a/clutter/clutter-scroll-actor.c b/clutter/clutter-scroll-actor.c
index 8783e102a..49f73279b 100644
--- a/clutter/clutter-scroll-actor.c
+++ b/clutter/clutter-scroll-actor.c
@@ -36,13 +36,8 @@
  * #ClutterScrollActor does not provide pointer or keyboard event handling,
  * nor does it provide visible scroll handles.
  *
- * <informalexample>
- *  <programlisting>
- * <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" parse="text" href="../../../../examples/scroll-actor.c">
- *   <xi:fallback>FIXME: MISSING XINCLUDE CONTENT</xi:fallback>
- * </xi:include>
- *  </programlisting>
- * </informalexample>
+ * See [scroll-actor.c](https://git.gnome.org/browse/clutter/tree/examples/scroll-actor.c?h=clutter-1.18)
+ * for an example of how to use #ClutterScrollActor.
  *
  * #ClutterScrollActor is available since Clutter 1.12.
  */
@@ -96,6 +91,7 @@ static ClutterAnimatableIface *parent_animatable_iface = NULL;
 static void     clutter_animatable_iface_init   (ClutterAnimatableIface *iface);
 
 G_DEFINE_TYPE_WITH_CODE (ClutterScrollActor, clutter_scroll_actor, CLUTTER_TYPE_ACTOR,
+                         G_ADD_PRIVATE (ClutterScrollActor)
                          G_IMPLEMENT_INTERFACE (CLUTTER_TYPE_ANIMATABLE,
                                                 clutter_animatable_iface_init))
 
@@ -173,8 +169,6 @@ clutter_scroll_actor_class_init (ClutterScrollActorClass *klass)
 {
   GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
 
-  g_type_class_add_private (klass, sizeof (ClutterScrollActorPrivate));
-
   gobject_class->set_property = clutter_scroll_actor_set_property;
   gobject_class->get_property = clutter_scroll_actor_get_property;
 
@@ -200,9 +194,7 @@ clutter_scroll_actor_class_init (ClutterScrollActorClass *klass)
 static void
 clutter_scroll_actor_init (ClutterScrollActor *self)
 {
-  self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, CLUTTER_TYPE_SCROLL_ACTOR,
-                                            ClutterScrollActorPrivate);
-
+  self->priv = clutter_scroll_actor_get_instance_private (self);
   self->priv->scroll_mode = CLUTTER_SCROLL_BOTH;
 
   clutter_actor_set_clip_to_allocation (CLUTTER_ACTOR (self), TRUE);
diff --git a/clutter/clutter-scroll-actor.h b/clutter/clutter-scroll-actor.h
index cad50814f..4665cfaf6 100644
--- a/clutter/clutter-scroll-actor.h
+++ b/clutter/clutter-scroll-actor.h
@@ -44,7 +44,7 @@ typedef struct _ClutterScrollActorClass         ClutterScrollActorClass;
 /**
  * ClutterScrollActor:
  *
- * The <structname>ClutterScrollActor</structname> structure contains only
+ * The #ClutterScrollActor structure contains only
  * private data, and should be accessed using the provided API.
  *
  * Since: 1.12
@@ -60,7 +60,7 @@ struct _ClutterScrollActor
 /**
  * ClutterScrollActorClass:
  *
- * The <structname>ClutterScrollActor</structname> structure contains only
+ * The #ClutterScrollActor structure contains only
  * private data.
  *
  * Since: 1.12
diff --git a/clutter/clutter-settings-private.h b/clutter/clutter-settings-private.h
index 0e1c463f9..244122c1f 100644
--- a/clutter/clutter-settings-private.h
+++ b/clutter/clutter-settings-private.h
@@ -11,6 +11,10 @@ void    _clutter_settings_set_backend           (ClutterSettings *settings,
 void    _clutter_settings_read_from_key_file    (ClutterSettings *settings,
                                                  GKeyFile        *key_file);
 
+void    clutter_settings_set_property_internal (ClutterSettings *settings,
+                                                const char *property,
+                                                GValue *value);
+
 G_END_DECLS
 
 #endif /* __CLUTTER_SETTINGS_PRIVATE_H__ */
diff --git a/clutter/clutter-settings.c b/clutter/clutter-settings.c
index 55a155b84..a269c3a89 100644
--- a/clutter/clutter-settings.c
+++ b/clutter/clutter-settings.c
@@ -31,6 +31,7 @@
 
 #include "clutter-debug.h"
 #include "clutter-settings-private.h"
+#include "clutter-stage-private.h"
 #include "clutter-private.h"
 
 #define DEFAULT_FONT_NAME       "Sans 12"
@@ -61,6 +62,7 @@ struct _ClutterSettings
   gdouble resolution;
 
   gchar *font_name;
+  gint font_dpi;
 
   gint xft_hinting;
   gint xft_antialias;
@@ -72,6 +74,10 @@ struct _ClutterSettings
   guint last_fontconfig_timestamp;
 
   guint password_hint_time;
+
+  gint window_scaling_factor;
+  gint unscaled_font_dpi;
+  guint fixed_scaling_factor : 1;
 };
 
 struct _ClutterSettingsClass
@@ -104,6 +110,9 @@ enum
 
   PROP_PASSWORD_HINT_TIME,
 
+  PROP_WINDOW_SCALING_FACTOR,
+  PROP_UNSCALED_FONT_DPI,
+
   PROP_LAST
 };
 
@@ -173,14 +182,12 @@ settings_update_font_options (ClutterSettings *self)
                 " - antialias:  %d\n"
                 " - hinting:    %d\n"
                 " - hint-style: %s\n"
-                " - rgba:       %s\n"
-                " - dpi:        %.2f",
+                " - rgba:       %s\n",
                 self->font_name != NULL ? self->font_name : DEFAULT_FONT_NAME,
                 self->xft_antialias,
                 self->xft_hinting,
                 self->xft_hint_style != NULL ? self->xft_hint_style : "<null>",
-                self->xft_rgba != NULL ? self->xft_rgba : "<null>",
-                self->resolution);
+                self->xft_rgba != NULL ? self->xft_rgba : "<null>");
 
   clutter_backend_set_font_options (self->backend, options);
   cairo_font_options_destroy (options);
@@ -198,7 +205,24 @@ settings_update_font_name (ClutterSettings *self)
 static void
 settings_update_resolution (ClutterSettings *self)
 {
-  CLUTTER_NOTE (BACKEND, "New resolution: %.2f", self->resolution);
+  const char *scale_env = NULL;
+
+  if (self->font_dpi > 0)
+    self->resolution = (gdouble) self->font_dpi / 1024.0;
+  else
+    self->resolution = 96.0;
+
+  scale_env = g_getenv ("GDK_DPI_SCALE");
+  if (scale_env != NULL)
+    {
+      double scale = g_ascii_strtod (scale_env, NULL);
+      if (scale != 0 && self->resolution > 0)
+        self->resolution *= scale;
+    }
+
+  CLUTTER_NOTE (BACKEND, "New resolution: %.2f (%s)",
+                self->resolution,
+                self->unscaled_font_dpi > 0 ? "unscaled" : "scaled");
 
   if (self->backend != NULL)
     g_signal_emit_by_name (self->backend, "resolution-changed");
@@ -296,7 +320,7 @@ clutter_settings_set_property (GObject      *gobject,
       break;
 
     case PROP_FONT_DPI:
-      self->resolution = (gdouble) g_value_get_int (value) / 1024.0;
+      self->font_dpi = g_value_get_int (value);
       settings_update_resolution (self);
       break;
 
@@ -329,12 +353,43 @@ clutter_settings_set_property (GObject      *gobject,
       self->password_hint_time = g_value_get_uint (value);
       break;
 
+    case PROP_WINDOW_SCALING_FACTOR:
+      if (!self->fixed_scaling_factor)
+        {
+          self->window_scaling_factor = g_value_get_int (value);
+          self->fixed_scaling_factor = TRUE;
+        }
+      break;
+
+    case PROP_UNSCALED_FONT_DPI:
+      self->font_dpi = g_value_get_int (value);
+      settings_update_resolution (self);
+      break;
+
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (gobject, prop_id, pspec);
       break;
     }
 }
 
+void
+clutter_settings_set_property_internal (ClutterSettings *self,
+                                        const char *property,
+                                        GValue *value)
+{
+
+  property = g_intern_string (property);
+
+  if (property == I_("window-scaling-factor") &&
+      self->fixed_scaling_factor)
+    return;
+
+  g_object_set_property (G_OBJECT (self), property, value);
+
+  if (property == I_("window-scaling-factor"))
+    self->fixed_scaling_factor = FALSE;
+}
+
 static void
 clutter_settings_get_property (GObject    *gobject,
                                guint       prop_id,
@@ -389,6 +444,10 @@ clutter_settings_get_property (GObject    *gobject,
       g_value_set_uint (value, self->password_hint_time);
       break;
 
+    case PROP_WINDOW_SCALING_FACTOR:
+      g_value_set_int (value, self->window_scaling_factor);
+      break;
+
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (gobject, prop_id, pspec);
       break;
@@ -532,6 +591,14 @@ clutter_settings_class_init (ClutterSettingsClass *klass)
                       -1,
                       CLUTTER_PARAM_READWRITE);
 
+  obj_props[PROP_UNSCALED_FONT_DPI] =
+    g_param_spec_int ("unscaled-font-dpi",
+                      P_("Font DPI"),
+                      P_("The resolution of the font, in 1024 * dots/inch, or -1 to use the default"),
+                      -1, 1024 * 1024,
+                      -1,
+                      CLUTTER_PARAM_WRITABLE);
+
   /**
    * ClutterSettings:font-hinting:
    *
@@ -554,12 +621,11 @@ clutter_settings_class_init (ClutterSettingsClass *klass)
    *
    * The style of the hinting used when rendering text. Valid values
    * are:
-   * <itemizedlist>
-   *   <listitem><simpara>hintnone</simpara></listitem>
-   *   <listitem><simpara>hintslight</simpara></listitem>
-   *   <listitem><simpara>hintmedium</simpara></listitem>
-   *   <listitem><simpara>hintfull</simpara></listitem>
-   * </itemizedlist>
+   *
+   *   - hintnone
+   *   - hintslight
+   *   - hintmedium
+   *   - hintfull
    *
    * Since: 1.4
    */
@@ -575,13 +641,12 @@ clutter_settings_class_init (ClutterSettingsClass *klass)
    *
    * The type of sub-pixel antialiasing used when rendering text. Valid
    * values are:
-   * <itemizedlist>
-   *   <listitem><simpara>none</simpara></listitem>
-   *   <listitem><simpara>rgb</simpara></listitem>
-   *   <listitem><simpara>bgr</simpara></listitem>
-   *   <listitem><simpara>vrgb</simpara></listitem>
-   *   <listitem><simpara>vbgr</simpara></listitem>
-   * </itemizedlist>
+   *
+   *   - none
+   *   - rgb
+   *   - bgr
+   *   - vrgb
+   *   - vbgr
    *
    * Since: 1.4
    */
@@ -610,6 +675,14 @@ clutter_settings_class_init (ClutterSettingsClass *klass)
                       500,
                       CLUTTER_PARAM_READWRITE);
 
+  obj_props[PROP_WINDOW_SCALING_FACTOR] =
+    g_param_spec_int ("window-scaling-factor",
+                      P_("Window Scaling Factor"),
+                      P_("The scaling factor to be applied to windows"),
+                      1, G_MAXINT,
+                      1,
+                      CLUTTER_PARAM_READWRITE);
+
   obj_props[PROP_FONTCONFIG_TIMESTAMP] =
     g_param_spec_uint ("fontconfig-timestamp",
                        P_("Fontconfig configuration timestamp"),
@@ -647,8 +720,13 @@ clutter_settings_class_init (ClutterSettingsClass *klass)
 static void
 clutter_settings_init (ClutterSettings *self)
 {
+  const char *scale_str;
+
   self->resolution = -1.0;
 
+  self->font_dpi = -1;
+  self->unscaled_font_dpi = -1;
+
   self->double_click_time = 250;
   self->double_click_distance = 5;
 
@@ -662,6 +740,18 @@ clutter_settings_init (ClutterSettings *self)
   self->xft_rgba = NULL;
 
   self->long_press_duration = 500;
+
+  /* if the scaling factor was set by the environment we ignore
+   * any explicit setting
+   */
+  scale_str = g_getenv ("CLUTTER_SCALE");
+  if (scale_str != NULL)
+    {
+      self->window_scaling_factor = atol (scale_str);
+      self->fixed_scaling_factor = TRUE;
+    }
+  else
+    self->window_scaling_factor = 1;
 }
 
 /**
diff --git a/clutter/clutter-settings.h b/clutter/clutter-settings.h
index aa254ec4a..6e5719aca 100644
--- a/clutter/clutter-settings.h
+++ b/clutter/clutter-settings.h
@@ -16,8 +16,10 @@ G_BEGIN_DECLS
 typedef struct _ClutterSettings         ClutterSettings;
 typedef struct _ClutterSettingsClass    ClutterSettingsClass;
 
+CLUTTER_AVAILABLE_IN_ALL
 GType clutter_settings_get_type (void) G_GNUC_CONST;
 
+CLUTTER_AVAILABLE_IN_ALL
 ClutterSettings *clutter_settings_get_default (void);
 
 G_END_DECLS
diff --git a/clutter/clutter-shader-effect.c b/clutter/clutter-shader-effect.c
index 08b4a92a4..a5169782f 100644
--- a/clutter/clutter-shader-effect.c
+++ b/clutter/clutter-shader-effect.c
@@ -34,35 +34,43 @@
  * GLSL shader (after checking whether the compilation and linking were
  * successfull) to the buffer before painting it on screen.
  *
- * <refsect2 id="ClutterShaderEffect-implementing">
- *   <title>Implementing a ClutterShaderEffect</title>
- *   <para>Creating a sub-class of #ClutterShaderEffect requires the
- *   overriding of the #ClutterOffscreenEffectClass.paint_target() virtual
- *   function from the #ClutterOffscreenEffect class as well as the
- *   <function>get_static_shader_source()</function> virtual from the
- *   #ClutterShaderEffect class.</para>
- *   <para>The #ClutterShaderEffectClass.get_static_shader_source()
- *   function should return a copy of the shader source to use. This
- *   function is only called once per subclass of #ClutterShaderEffect
- *   regardless of how many instances of the effect are created. The
- *   source for the shader is typically stored in a static const
- *   string which is returned from this function via
- *   g_strdup().</para>
- *   <para>The <function>paint_target()</function> should set the
- *   shader's uniforms if any. This is done by calling
- *   clutter_shader_effect_set_uniform_value() or
- *   clutter_shader_effect_set_uniform(). The sub-class should then
- *   chain up to the #ClutterShaderEffect implementation.</para>
- *   <example id="ClutterShaderEffect-example-uniforms">
- *     <title>Setting uniforms on a ClutterShaderEffect</title>
- *     <para>The example below shows a typical implementation of the
- *     <function>get_static_shader_source()</function> and
- *     <function>paint_target()</function> phases of a
- *     #ClutterShaderEffect sub-class.</para>
- *     <programlisting>
+ * #ClutterShaderEffect is available since Clutter 1.4
+ *
+ * ## Implementing a ClutterShaderEffect
+ *
+ * Creating a sub-class of #ClutterShaderEffect requires the
+ * overriding of the #ClutterOffscreenEffectClass.paint_target() virtual
+ * function from the #ClutterOffscreenEffect class. It is also convenient
+ * to implement the #ClutterShaderEffectClass.get_static_shader_source()
+ * virtual function in case you are planning to create more than one
+ * instance of the effect.
+ *
+ * The #ClutterShaderEffectClass.get_static_shader_source()
+ * function should return a copy of the shader source to use. This
+ * function is only called once per subclass of #ClutterShaderEffect
+ * regardless of how many instances of the effect are created. The
+ * source for the shader is typically stored in a static const
+ * string which is returned from this function via
+ * g_strdup().
+ *
+ * The #ClutterOffscreenEffectClass.paint_target() should set the
+ * shader's uniforms if any. This is done by calling
+ * clutter_shader_effect_set_uniform_value() or
+ * clutter_shader_effect_set_uniform(). The sub-class should then
+ * chain up to the #ClutterShaderEffect implementation.
+ *
+ * ## Setting uniforms on a ClutterShaderEffect
+ *
+ * The example below shows a typical implementation of the
+ * #ClutterShaderEffectClass.get_static_shader_source() and
+ * #ClutterOffscreenEffectClass.paint_target() virtual functions
+ * for a #ClutterShaderEffect subclass.
+ *
+ * |[<!-- language="C" -->
  *  static gchar *
  *  my_effect_get_static_shader_source (ClutterShaderEffect *effect)
  *  {
+ *    // shader_source is set elsewhere
  *    return g_strdup (shader_source);
  *  }
  *
@@ -74,21 +82,19 @@
  *    ClutterEffectClass *parent_class;
  *    gfloat component_r, component_g, component_b;
  *
- *    /&ast; the "tex" uniform is declared in the shader as:
- *     &ast;
- *     &ast;   uniform int tex;
- *     &ast;
- *     &ast; and it is passed a constant value of 0
- *     &ast;/
+ *    // the "tex" uniform is declared in the shader as:
+ *    //
+ *    //   uniform int tex;
+ *    //
+ *    // and it is passed a constant value of 0
  *    clutter_shader_effect_set_uniform (shader, "tex", G_TYPE_INT, 1, 0);
  *
- *    /&ast; the "component" uniform is declared in the shader as:
- *     &ast;
- *     &ast;   uniform vec3 component;
- *     &ast;
- *     &ast; and it's defined to contain the normalized components
- *     &ast; of a #ClutterColor
- *     &ast;/
+ *    // the "component" uniform is declared in the shader as:
+ *    //
+ *    //   uniform vec3 component;
+ *    //
+ *    // and it's defined to contain the normalized components
+ *    // of a #ClutterColor
  *    component_r = self->color.red   / 255.0f;
  *    component_g = self->color.green / 255.0f;
  *    component_b = self->color.blue  / 255.0f;
@@ -98,15 +104,11 @@
  *                                       component_g,
  *                                       component_b);
  *
- *    /&ast; chain up to the parent's implementation &ast;/
+ *    // chain up to the parent's implementation
  *    parent_class = CLUTTER_OFFSCREEN_EFFECT_CLASS (my_effect_parent_class);
  *    return parent_class->paint_target (effect);
  *  }
- *     </programlisting>
- *   </example>
- * </refsect2>
- *
- * #ClutterShaderEffect is available since Clutter 1.4
+ * ]|
  */
 
 #ifdef HAVE_CONFIG_H
@@ -171,6 +173,7 @@ static GParamSpec *obj_props[PROP_LAST];
 G_DEFINE_TYPE_WITH_CODE (ClutterShaderEffect,
                          clutter_shader_effect,
                          CLUTTER_TYPE_OFFSCREEN_EFFECT,
+                         G_ADD_PRIVATE (ClutterShaderEffect)
                          g_type_add_class_private (g_define_type_id,
                                                    sizeof (ClutterShaderEffectClassPrivate)))
 
@@ -470,8 +473,6 @@ clutter_shader_effect_class_init (ClutterShaderEffectClass *klass)
 
   offscreen_class = CLUTTER_OFFSCREEN_EFFECT_CLASS (klass);
 
-  g_type_class_add_private (klass, sizeof (ClutterShaderEffectPrivate));
-
   /**
    * ClutterShaderEffect:shader-type:
    *
@@ -503,9 +504,7 @@ clutter_shader_effect_class_init (ClutterShaderEffectClass *klass)
 static void
 clutter_shader_effect_init (ClutterShaderEffect *effect)
 {
-  effect->priv = G_TYPE_INSTANCE_GET_PRIVATE (effect,
-                                              CLUTTER_TYPE_SHADER_EFFECT,
-                                              ClutterShaderEffectPrivate);
+  effect->priv = clutter_shader_effect_get_instance_private (effect);
 }
 
 /**
@@ -808,7 +807,7 @@ add_uniform:
  * argument, and by the @gtype argument. For instance, a uniform named
  * "sampler0" and containing a single integer value is set using:
  *
- * |[
+ * |[<!-- language="C" -->
  *   clutter_shader_effect_set_uniform (effect, "sampler0",
  *                                      G_TYPE_INT, 1,
  *                                      0);
@@ -817,7 +816,7 @@ add_uniform:
  * While a uniform named "components" and containing a 3-elements vector
  * of floating point values (a "vec3") can be set using:
  *
- * |[
+ * |[<!-- language="C" -->
  *   gfloat component_r, component_g, component_b;
  *
  *   clutter_shader_effect_set_uniform (effect, "components",
@@ -829,7 +828,7 @@ add_uniform:
  *
  * or can be set using:
  *
- * |[
+ * |[<!-- language="C" -->
  *   gfloat component_vec[3];
  *
  *   clutter_shader_effect_set_uniform (effect, "components",
@@ -839,7 +838,7 @@ add_uniform:
  *
  * Finally, a uniform named "map" and containing a matrix can be set using:
  *
- * |[
+ * |[<!-- language="C" -->
  *   clutter_shader_effect_set_uniform (effect, "map",
  *                                      CLUTTER_TYPE_SHADER_MATRIX, 1,
  *                                      cogl_matrix_get_array (&matrix));
diff --git a/clutter/clutter-shader-effect.h b/clutter/clutter-shader-effect.h
index 9777b64fa..0891ba570 100644
--- a/clutter/clutter-shader-effect.h
+++ b/clutter/clutter-shader-effect.h
@@ -47,7 +47,7 @@ typedef struct _ClutterShaderEffectClass        ClutterShaderEffectClass;
 /**
  * ClutterShaderEffect:
  *
- * The <structname>ClutterShaderEffect</structname> structure contains
+ * The #ClutterShaderEffect structure contains
  * only private data and should be accessed using the provided API
  *
  * Since: 1.4
@@ -68,7 +68,7 @@ struct _ClutterShaderEffect
  *  many instances are used. It is expected that subclasses will return
  *  a copy of a static string from this function.
  *
- * The <structname>ClutterShaderEffectClass</structname> structure contains
+ * The #ClutterShaderEffectClass structure contains
  * only private data
  *
  * Since: 1.4
@@ -90,23 +90,30 @@ struct _ClutterShaderEffectClass
   void (*_clutter_shader5) (void);
 };
 
+CLUTTER_AVAILABLE_IN_1_4
 GType clutter_shader_effect_get_type (void) G_GNUC_CONST;
 
+CLUTTER_AVAILABLE_IN_1_4
 ClutterEffect * clutter_shader_effect_new               (ClutterShaderType    shader_type);
 
+CLUTTER_AVAILABLE_IN_1_4
 gboolean        clutter_shader_effect_set_shader_source (ClutterShaderEffect *effect,
                                                          const gchar         *source);
 
+CLUTTER_AVAILABLE_IN_1_4
 void            clutter_shader_effect_set_uniform       (ClutterShaderEffect *effect,
                                                          const gchar         *name,
                                                          GType                gtype,
                                                          gsize                n_values,
                                                          ...);
+CLUTTER_AVAILABLE_IN_1_4
 void            clutter_shader_effect_set_uniform_value (ClutterShaderEffect *effect,
                                                          const gchar         *name,
                                                          const GValue        *value);
 
+CLUTTER_AVAILABLE_IN_1_4
 CoglHandle      clutter_shader_effect_get_shader        (ClutterShaderEffect *effect);
+CLUTTER_AVAILABLE_IN_1_4
 CoglHandle      clutter_shader_effect_get_program       (ClutterShaderEffect *effect);
 
 G_END_DECLS
diff --git a/clutter/clutter-shader-types.h b/clutter/clutter-shader-types.h
index 21e54f3a5..0906243a3 100644
--- a/clutter/clutter-shader-types.h
+++ b/clutter/clutter-shader-types.h
@@ -28,7 +28,7 @@
 #ifndef __CLUTTER_SHADER_TYPES_H__
 #define __CLUTTER_SHADER_TYPES_H__
 
-#include <glib-object.h>
+#include <clutter/clutter-types.h>
 
 G_BEGIN_DECLS
 
@@ -70,23 +70,32 @@ typedef struct _ClutterShaderMatrix   ClutterShaderMatrix;
  */
 #define CLUTTER_VALUE_HOLDS_SHADER_MATRIX(x) (G_VALUE_HOLDS ((x), CLUTTER_TYPE_SHADER_MATRIX))
 
+CLUTTER_AVAILABLE_IN_1_0
 GType clutter_shader_float_get_type  (void) G_GNUC_CONST;
+CLUTTER_AVAILABLE_IN_1_0
 GType clutter_shader_int_get_type    (void) G_GNUC_CONST;
+CLUTTER_AVAILABLE_IN_1_0
 GType clutter_shader_matrix_get_type (void) G_GNUC_CONST;
 
+CLUTTER_AVAILABLE_IN_1_0
 void            clutter_value_set_shader_float  (GValue       *value,
                                                  gint          size,
                                                  const gfloat *floats);
+CLUTTER_AVAILABLE_IN_1_0
 void            clutter_value_set_shader_int    (GValue       *value,
                                                  gint          size,
                                                  const gint   *ints);
+CLUTTER_AVAILABLE_IN_1_0
 void            clutter_value_set_shader_matrix (GValue       *value,
                                                  gint          size,
                                                  const gfloat *matrix);
+CLUTTER_AVAILABLE_IN_1_0
 const gfloat *  clutter_value_get_shader_float  (const GValue *value,
                                                  gsize        *length);
+CLUTTER_AVAILABLE_IN_1_0
 const gint   *  clutter_value_get_shader_int    (const GValue *value,
                                                  gsize        *length);
+CLUTTER_AVAILABLE_IN_1_0
 const gfloat *  clutter_value_get_shader_matrix (const GValue *value,
                                                  gsize        *length);
 
diff --git a/clutter/clutter-snap-constraint.c b/clutter/clutter-snap-constraint.c
index c8eaea9ad..b4c558fd0 100644
--- a/clutter/clutter-snap-constraint.c
+++ b/clutter/clutter-snap-constraint.c
@@ -94,7 +94,7 @@ source_queue_relayout (ClutterActor          *source,
                        ClutterSnapConstraint *constraint)
 {
   if (constraint->actor != NULL)
-    clutter_actor_queue_relayout (constraint->actor);
+    _clutter_actor_queue_only_relayout (constraint->actor);
 }
 
 static void
diff --git a/clutter/clutter-snap-constraint.h b/clutter/clutter-snap-constraint.h
index e27821e09..9039536f1 100644
--- a/clutter/clutter-snap-constraint.h
+++ b/clutter/clutter-snap-constraint.h
@@ -40,7 +40,7 @@ G_BEGIN_DECLS
 /**
  * ClutterSnapConstraint:
  *
- * <structname>ClutterSnapConstraint</structname> is an opaque structure
+ * #ClutterSnapConstraint is an opaque structure
  * whose members cannot be directly accesses
  *
  * Since: 1.6
@@ -48,24 +48,32 @@ G_BEGIN_DECLS
 typedef struct _ClutterSnapConstraint           ClutterSnapConstraint;
 typedef struct _ClutterSnapConstraintClass      ClutterSnapConstraintClass;
 
+CLUTTER_AVAILABLE_IN_1_6
 GType clutter_snap_constraint_get_type (void) G_GNUC_CONST;
 
+CLUTTER_AVAILABLE_IN_1_6
 ClutterConstraint *     clutter_snap_constraint_new             (ClutterActor          *source,
                                                                  ClutterSnapEdge        from_edge,
                                                                  ClutterSnapEdge        to_edge,
                                                                  gfloat                 offset);
 
+CLUTTER_AVAILABLE_IN_1_6
 void                    clutter_snap_constraint_set_source      (ClutterSnapConstraint *constraint,
                                                                  ClutterActor          *source);
+CLUTTER_AVAILABLE_IN_1_6
 ClutterActor *          clutter_snap_constraint_get_source      (ClutterSnapConstraint *constraint);
+CLUTTER_AVAILABLE_IN_1_6
 void                    clutter_snap_constraint_set_edges       (ClutterSnapConstraint *constraint,
                                                                  ClutterSnapEdge        from_edge,
                                                                  ClutterSnapEdge        to_edge);
+CLUTTER_AVAILABLE_IN_1_6
 void                    clutter_snap_constraint_get_edges       (ClutterSnapConstraint *constraint,
                                                                  ClutterSnapEdge       *from_edge,
                                                                  ClutterSnapEdge       *to_edge);
+CLUTTER_AVAILABLE_IN_1_6
 void                    clutter_snap_constraint_set_offset      (ClutterSnapConstraint *constraint,
                                                                  gfloat                 offset);
+CLUTTER_AVAILABLE_IN_1_6
 gfloat                  clutter_snap_constraint_get_offset      (ClutterSnapConstraint *constraint);
 
 G_END_DECLS
diff --git a/clutter/clutter-stage-manager.h b/clutter/clutter-stage-manager.h
index b9174b1fc..2838b64cb 100644
--- a/clutter/clutter-stage-manager.h
+++ b/clutter/clutter-stage-manager.h
@@ -69,11 +69,16 @@ struct _ClutterStageManagerClass
                           ClutterStage        *stage);
 };
 
+CLUTTER_AVAILABLE_IN_1_0
 GType clutter_stage_manager_get_type (void) G_GNUC_CONST;
 
+CLUTTER_AVAILABLE_IN_1_0
 ClutterStageManager *clutter_stage_manager_get_default       (void);
+CLUTTER_AVAILABLE_IN_1_0
 ClutterStage *       clutter_stage_manager_get_default_stage (ClutterStageManager *stage_manager);
+CLUTTER_AVAILABLE_IN_1_0
 GSList *             clutter_stage_manager_list_stages       (ClutterStageManager *stage_manager);
+CLUTTER_AVAILABLE_IN_1_0
 const GSList *       clutter_stage_manager_peek_stages       (ClutterStageManager *stage_manager);
 
 G_END_DECLS
diff --git a/clutter/clutter-stage-private.h b/clutter/clutter-stage-private.h
index 9ccba3f5b..7529cdfdd 100644
--- a/clutter/clutter-stage-private.h
+++ b/clutter/clutter-stage-private.h
@@ -62,7 +62,8 @@ gboolean            _clutter_stage_needs_update          (ClutterStage
 gboolean            _clutter_stage_do_update             (ClutterStage          *stage);
 
 void     _clutter_stage_queue_event                       (ClutterStage *stage,
-					                   ClutterEvent *event);
+                                                           ClutterEvent *event,
+                                                           gboolean      copy_event);
 gboolean _clutter_stage_has_queued_events                 (ClutterStage *stage);
 void     _clutter_stage_process_queued_events             (ClutterStage *stage);
 void     _clutter_stage_update_input_devices              (ClutterStage *stage);
@@ -119,6 +120,9 @@ gboolean                _clutter_stage_update_state     (ClutterStage      *stag
                                                          ClutterStageState  unset_state,
                                                          ClutterStageState  set_state);
 
+void                    _clutter_stage_set_scale_factor (ClutterStage      *stage,
+                                                         int                factor);
+
 G_END_DECLS
 
 #endif /* __CLUTTER_STAGE_PRIVATE_H__ */
diff --git a/clutter/clutter-stage-window.c b/clutter/clutter-stage-window.c
index c6c9f1ad8..450d264a1 100644
--- a/clutter/clutter-stage-window.c
+++ b/clutter/clutter-stage-window.c
@@ -333,3 +333,30 @@ _clutter_stage_window_can_clip_redraws (ClutterStageWindow *window)
 
   return FALSE;
 }
+
+void
+_clutter_stage_window_set_scale_factor (ClutterStageWindow *window,
+                                        int                 factor)
+{
+  ClutterStageWindowIface *iface;
+
+  g_return_if_fail (CLUTTER_IS_STAGE_WINDOW (window));
+
+  iface = CLUTTER_STAGE_WINDOW_GET_IFACE (window);
+  if (iface->set_scale_factor != NULL)
+    iface->set_scale_factor (window, factor);
+}
+
+int
+_clutter_stage_window_get_scale_factor (ClutterStageWindow *window)
+{
+  ClutterStageWindowIface *iface;
+
+  g_return_val_if_fail (CLUTTER_IS_STAGE_WINDOW (window), 1);
+
+  iface = CLUTTER_STAGE_WINDOW_GET_IFACE (window);
+  if (iface->get_scale_factor != NULL)
+    return iface->get_scale_factor (window);
+
+  return 1;
+}
diff --git a/clutter/clutter-stage-window.h b/clutter/clutter-stage-window.h
index 9b38994cc..fa8982525 100644
--- a/clutter/clutter-stage-window.h
+++ b/clutter/clutter-stage-window.h
@@ -14,7 +14,7 @@ G_BEGIN_DECLS
 /*
  * ClutterStageWindow: (skip)
  *
- * <structname>ClutterStageWindow</structname> is an opaque structure
+ * #ClutterStageWindow is an opaque structure
  * whose members should not be accessed directly
  *
  * Since: 0.8
@@ -84,6 +84,10 @@ struct _ClutterStageWindowIface
   CoglFramebuffer  *(* get_active_framebuffer)  (ClutterStageWindow *stage_window);
 
   gboolean          (* can_clip_redraws)        (ClutterStageWindow *stage_window);
+
+  void              (* set_scale_factor)        (ClutterStageWindow *stage_window,
+                                                 int                 factor);
+  int               (* get_scale_factor)        (ClutterStageWindow *stage_window);
 };
 
 GType _clutter_stage_window_get_type (void) G_GNUC_CONST;
@@ -137,6 +141,10 @@ CoglFramebuffer  *_clutter_stage_window_get_active_framebuffer  (ClutterStageWin
 
 gboolean          _clutter_stage_window_can_clip_redraws        (ClutterStageWindow *window);
 
+void              _clutter_stage_window_set_scale_factor        (ClutterStageWindow *window,
+                                                                 int                 factor);
+int               _clutter_stage_window_get_scale_factor        (ClutterStageWindow *window);
+
 G_END_DECLS
 
 #endif /* __CLUTTER_STAGE_WINDOW_H__ */
diff --git a/clutter/clutter-stage.c b/clutter/clutter-stage.c
index 333a3d379..d1ec7b483 100644
--- a/clutter/clutter-stage.c
+++ b/clutter/clutter-stage.c
@@ -79,15 +79,6 @@
 
 #include "cogl/cogl.h"
 
-static void clutter_container_iface_init (ClutterContainerIface *iface);
-
-G_DEFINE_TYPE_WITH_CODE (ClutterStage, clutter_stage, CLUTTER_TYPE_GROUP,
-                         G_IMPLEMENT_INTERFACE (CLUTTER_TYPE_CONTAINER,
-                                                clutter_container_iface_init))
-
-#define CLUTTER_STAGE_GET_PRIVATE(obj) \
-(G_TYPE_INSTANCE_GET_PRIVATE ((obj), CLUTTER_TYPE_STAGE, ClutterStagePrivate))
-
 /* <private>
  * ClutterStageHint:
  * @CLUTTER_STAGE_NONE: No hint set
@@ -134,16 +125,12 @@ struct _ClutterStagePrivate
 
   ClutterStageHint stage_hints;
 
-  gint picks_per_frame;
-
   GArray *paint_volume_stack;
 
   ClutterPlane current_clip_planes[4];
 
   GList *pending_queue_redraws;
 
-  ClutterPickMode pick_buffer_mode;
-
   CoglFramebuffer *active_framebuffer;
 
   gint sync_delay;
@@ -159,6 +146,9 @@ struct _ClutterStagePrivate
 
   ClutterStageState current_state;
 
+  gpointer paint_data;
+  GDestroyNotify paint_notify;
+
   guint relayout_pending       : 1;
   guint redraw_pending         : 1;
   guint is_fullscreen          : 1;
@@ -170,7 +160,6 @@ struct _ClutterStagePrivate
   guint min_size_changed       : 1;
   guint dirty_viewport         : 1;
   guint dirty_projection       : 1;
-  guint have_valid_pick_buffer : 1;
   guint accept_focus           : 1;
   guint motion_events_enabled  : 1;
   guint has_custom_perspective : 1;
@@ -202,6 +191,7 @@ enum
   ACTIVATE,
   DEACTIVATE,
   DELETE_EVENT,
+  AFTER_PAINT,
 
   LAST_SIGNAL
 };
@@ -210,9 +200,16 @@ static guint stage_signals[LAST_SIGNAL] = { 0, };
 
 static const ClutterColor default_stage_color = { 255, 255, 255, 255 };
 
-static void _clutter_stage_maybe_finish_queue_redraws (ClutterStage *stage);
+static void clutter_stage_maybe_finish_queue_redraws (ClutterStage *stage);
 static void free_queue_redraw_entry (ClutterStageQueueRedrawEntry *entry);
 
+static void clutter_container_iface_init (ClutterContainerIface *iface);
+
+G_DEFINE_TYPE_WITH_CODE (ClutterStage, clutter_stage, CLUTTER_TYPE_GROUP,
+                         G_ADD_PRIVATE (ClutterStage)
+                         G_IMPLEMENT_INTERFACE (CLUTTER_TYPE_CONTAINER,
+                                                clutter_container_iface_init))
+
 static void
 clutter_stage_real_add (ClutterContainer *container,
                         ClutterActor     *child)
@@ -368,6 +365,7 @@ clutter_stage_allocate (ClutterActor           *self,
   float new_width, new_height;
   float width, height;
   cairo_rectangle_int_t window_size;
+  int scale_factor;
 
   if (priv->impl == NULL)
     return;
@@ -447,11 +445,10 @@ clutter_stage_allocate (ClutterActor           *self,
       override.y2 = window_size.height;
 
       CLUTTER_NOTE (LAYOUT,
-                    "Overriding original allocation of %dx%d "
+                    "Overriding original allocation of %.2fx%.2f "
                     "with %.2fx%.2f (absolute origin %s)",
                     width, height,
-                    (int) (override.x2),
-                    (int) (override.y2),
+                    override.x2, override.y2,
                     (flags & CLUTTER_ABSOLUTE_ORIGIN_CHANGED)
                       ? "changed"
                       : "not changed");
@@ -468,6 +465,12 @@ clutter_stage_allocate (ClutterActor           *self,
    * allocation.
    */
   _clutter_stage_window_get_geometry (priv->impl, &window_size);
+
+  scale_factor = _clutter_stage_window_get_scale_factor (priv->impl);
+
+  window_size.width *= scale_factor;
+  window_size.height *= scale_factor;
+
   cogl_onscreen_clutter_backend_set_size (window_size.width,
                                           window_size.height);
 
@@ -478,10 +481,13 @@ clutter_stage_allocate (ClutterActor           *self,
   if (CLUTTER_NEARBYINT (old_width) != CLUTTER_NEARBYINT (new_width) ||
       CLUTTER_NEARBYINT (old_height) != CLUTTER_NEARBYINT (new_height))
     {
+      int real_width = CLUTTER_NEARBYINT (new_width);
+      int real_height = CLUTTER_NEARBYINT (new_height);
+
       _clutter_stage_set_viewport (CLUTTER_STAGE (self),
                                    0, 0,
-                                   CLUTTER_NEARBYINT (new_width),
-                                   CLUTTER_NEARBYINT (new_height));
+                                   real_width,
+                                   real_height);
 
       /* Note: we don't assume that set_viewport will queue a full redraw
        * since it may bail-out early if something preemptively set the
@@ -626,18 +632,29 @@ _clutter_stage_do_paint (ClutterStage                *stage,
 {
   ClutterStagePrivate *priv = stage->priv;
   float clip_poly[8];
+  float viewport[4];
   cairo_rectangle_int_t geom;
+  int window_scale;
+
+  if (priv->impl == NULL)
+    return;
 
   _clutter_stage_window_get_geometry (priv->impl, &geom);
+  window_scale = _clutter_stage_window_get_scale_factor (priv->impl);
+
+  viewport[0] = priv->viewport[0] * window_scale;
+  viewport[1] = priv->viewport[1] * window_scale;
+  viewport[2] = priv->viewport[2] * window_scale;
+  viewport[3] = priv->viewport[3] * window_scale;
 
   if (clip)
     {
-      clip_poly[0] = MAX (clip->x, 0);
-      clip_poly[1] = MAX (clip->y, 0);
-      clip_poly[2] = MIN (clip->x + clip->width, geom.width);
+      clip_poly[0] = MAX (clip->x * window_scale, 0);
+      clip_poly[1] = MAX (clip->y * window_scale, 0);
+      clip_poly[2] = MIN ((clip->x + clip->width) * window_scale, geom.width * window_scale);
       clip_poly[3] = clip_poly[1];
       clip_poly[4] = clip_poly[2];
-      clip_poly[5] = MIN (clip->y + clip->height, geom.height);
+      clip_poly[5] = MIN ((clip->y + clip->height) * window_scale, geom.height * window_scale);
       clip_poly[6] = clip_poly[0];
       clip_poly[7] = clip_poly[5];
     }
@@ -645,12 +662,12 @@ _clutter_stage_do_paint (ClutterStage                *stage,
     {
       clip_poly[0] = 0;
       clip_poly[1] = 0;
-      clip_poly[2] = geom.width;
+      clip_poly[2] = geom.width * window_scale;
       clip_poly[3] = 0;
-      clip_poly[4] = geom.width;
-      clip_poly[5] = geom.height;
+      clip_poly[4] = geom.width * window_scale;
+      clip_poly[5] = geom.height * window_scale;
       clip_poly[6] = 0;
-      clip_poly[7] = geom.height;
+      clip_poly[7] = geom.height * window_scale;
     }
 
   CLUTTER_NOTE (CLIPPING, "Setting stage clip too: "
@@ -661,7 +678,7 @@ _clutter_stage_do_paint (ClutterStage                *stage,
 
   _cogl_util_get_eye_planes_for_screen_poly (clip_poly,
                                              4,
-                                             priv->viewport,
+                                             viewport,
                                              &priv->projection,
                                              &priv->inverse_projection,
                                              priv->current_clip_planes);
@@ -669,8 +686,27 @@ _clutter_stage_do_paint (ClutterStage                *stage,
   _clutter_stage_paint_volume_stack_free_all (stage);
   _clutter_stage_update_active_framebuffer (stage);
   clutter_actor_paint (CLUTTER_ACTOR (stage));
+
+  g_signal_emit (stage, stage_signals[AFTER_PAINT], 0);
 }
 
+/* If we don't implement this here, we get the paint function
+ * from the deprecated clutter-group class, which doesn't
+ * respect the Z order as it uses our empty sort_depth_order.
+ */
+static void
+clutter_stage_paint (ClutterActor *self)
+{
+  ClutterActorIter iter;
+  ClutterActor *child;
+
+  clutter_actor_iter_init (&iter, self);
+  while (clutter_actor_iter_next (&iter, &child))
+    clutter_actor_paint (child);
+}
+
+#if 0
+/* the Stage is cleared in clutter_actor_paint_node() */
 static void
 clutter_stage_paint (ClutterActor *self)
 {
@@ -717,6 +753,7 @@ clutter_stage_paint (ClutterActor *self)
   while (clutter_actor_iter_next (&iter, &child))
     clutter_actor_paint (child);
 }
+#endif
 
 static void
 clutter_stage_pick (ClutterActor       *self,
@@ -914,7 +951,8 @@ clutter_stage_real_fullscreen (ClutterStage *stage)
 
 void
 _clutter_stage_queue_event (ClutterStage *stage,
-			    ClutterEvent *event)
+                            ClutterEvent *event,
+                            gboolean      copy_event)
 {
   ClutterStagePrivate *priv;
   gboolean first_event;
@@ -926,7 +964,10 @@ _clutter_stage_queue_event (ClutterStage *stage,
 
   first_event = priv->event_queue->length == 0;
 
-  g_queue_push_tail (priv->event_queue, clutter_event_copy (event));
+  if (copy_event)
+    event = clutter_event_copy (event);
+
+  g_queue_push_tail (priv->event_queue, event);
 
   if (first_event)
     {
@@ -1012,19 +1053,31 @@ _clutter_stage_process_queued_events (ClutterStage *stage)
         check_device = TRUE;
 
       /* Skip consecutive motion events coming from the same device */
-      if (priv->throttle_motion_events &&
-          next_event != NULL &&
-	  event->type == CLUTTER_MOTION &&
-	  (next_event->type == CLUTTER_MOTION ||
-	   next_event->type == CLUTTER_LEAVE) &&
-          (!check_device || (device == next_device)))
-	{
-          CLUTTER_NOTE (EVENT,
-                        "Omitting motion event at %d, %d",
-                        (int) event->motion.x,
-                        (int) event->motion.y);
-          goto next_event;
-	}
+      if (priv->throttle_motion_events && next_event != NULL)
+        {
+          if (event->type == CLUTTER_MOTION &&
+              (next_event->type == CLUTTER_MOTION ||
+               next_event->type == CLUTTER_LEAVE) &&
+              (!check_device || (device == next_device)))
+            {
+              CLUTTER_NOTE (EVENT,
+                            "Omitting motion event at %d, %d",
+                            (int) event->motion.x,
+                            (int) event->motion.y);
+              goto next_event;
+            }
+          else if (event->type == CLUTTER_TOUCH_UPDATE &&
+                   next_event->type == CLUTTER_TOUCH_UPDATE &&
+                   event->touch.sequence == next_event->touch.sequence &&
+                   (!check_device || (device == next_device)))
+            {
+              CLUTTER_NOTE (EVENT,
+                            "Omitting touch update event at %d, %d",
+                            (int) event->touch.x,
+                            (int) event->touch.y);
+              goto next_event;
+            }
+        }
 
       _clutter_process_event (event);
 
@@ -1105,28 +1158,6 @@ _clutter_stage_maybe_relayout (ClutterActor *actor)
     }
 }
 
-static gboolean
-_clutter_stage_get_pick_buffer_valid (ClutterStage *stage, ClutterPickMode mode)
-{
-  g_return_val_if_fail (CLUTTER_IS_STAGE (stage), FALSE);
-
-  if (stage->priv->pick_buffer_mode != mode)
-    return FALSE;
-
-  return stage->priv->have_valid_pick_buffer;
-}
-
-static void
-_clutter_stage_set_pick_buffer_valid (ClutterStage   *stage,
-                                      gboolean        valid,
-                                      ClutterPickMode mode)
-{
-  g_return_if_fail (CLUTTER_IS_STAGE (stage));
-
-  stage->priv->have_valid_pick_buffer = !!valid;
-  stage->priv->pick_buffer_mode = mode;
-}
-
 static void
 clutter_stage_do_redraw (ClutterStage *stage)
 {
@@ -1154,9 +1185,6 @@ clutter_stage_do_redraw (ClutterStage *stage)
                 _clutter_actor_get_debug_name (actor),
                 stage);
 
-  _clutter_stage_set_pick_buffer_valid (stage, FALSE, -1);
-  priv->picks_per_frame = 0;
-
   _clutter_backend_ensure_context (backend, stage);
 
   if (_clutter_context_get_show_fps ())
@@ -1226,7 +1254,7 @@ _clutter_stage_do_update (ClutterStage *stage)
   if (!priv->redraw_pending)
     return FALSE;
 
-  _clutter_stage_maybe_finish_queue_redraws (stage);
+  clutter_stage_maybe_finish_queue_redraws (stage);
 
   clutter_stage_do_redraw (stage);
 
@@ -1301,6 +1329,9 @@ clutter_stage_real_queue_redraw (ClutterActor *actor,
       return;
     }
 
+  if (redraw_clip->is_empty)
+    return;
+
   _clutter_paint_volume_get_stage_paint_box (redraw_clip,
                                              stage,
                                              &bounding_box);
@@ -1416,16 +1447,20 @@ _clutter_stage_do_pick (ClutterStage   *stage,
                         gint            y,
                         ClutterPickMode mode)
 {
-  ClutterStagePrivate *priv;
+  ClutterActor *actor = CLUTTER_ACTOR (stage);
+  ClutterStagePrivate *priv = stage->priv;
   ClutterMainContext *context;
   guchar pixel[4] = { 0xff, 0xff, 0xff, 0xff };
   CoglColor stage_pick_id;
   gboolean dither_enabled_save;
+  ClutterActor *retval;
   CoglFramebuffer *fb;
-  ClutterActor *actor;
-  gboolean is_clipped;
+  gint dirty_x;
+  gint dirty_y;
   gint read_x;
   gint read_y;
+  float stage_width, stage_height;
+  int window_scale;
 
   CLUTTER_STATIC_COUNTER (do_pick_counter,
                           "_clutter_stage_do_pick counter",
@@ -1452,12 +1487,20 @@ _clutter_stage_do_pick (ClutterStage   *stage,
                         "The time spent issuing a read pixels",
                         0 /* no application private data */);
 
-  g_return_val_if_fail (CLUTTER_IS_STAGE (stage), NULL);
-
   priv = stage->priv;
 
+  if (CLUTTER_ACTOR_IN_DESTRUCTION (stage))
+    return actor;
+
   if (G_UNLIKELY (clutter_pick_debug_flags & CLUTTER_DEBUG_NOP_PICKING))
-    return CLUTTER_ACTOR (stage);
+    return actor;
+
+  if (G_UNLIKELY (priv->impl == NULL))
+    return actor;
+
+  clutter_actor_get_size (CLUTTER_ACTOR (stage), &stage_width, &stage_height);
+  if (x < 0 || x >= stage_width || y < 0 || y >= stage_height)
+    return actor;
 
 #ifdef CLUTTER_ENABLE_PROFILE
   if (clutter_profile_flags & CLUTTER_PROFILE_PICKING_ONLY)
@@ -1469,73 +1512,36 @@ _clutter_stage_do_pick (ClutterStage   *stage,
 
   context = _clutter_context_get_default ();
   clutter_stage_ensure_current (stage);
+  window_scale = _clutter_stage_window_get_scale_factor (priv->impl);
 
-  /* It's possible that we currently have a static scene and have renderered a
-   * full, unclipped pick buffer. If so we can simply continue to read from
-   * this cached buffer until the scene next changes. */
-  if (_clutter_stage_get_pick_buffer_valid (stage, mode))
-    {
-      CLUTTER_TIMER_START (_clutter_uprof_context, pick_read);
-      cogl_read_pixels (x, y, 1, 1,
-                        COGL_READ_PIXELS_COLOR_BUFFER,
-                        COGL_PIXEL_FORMAT_RGBA_8888_PRE,
-                        pixel);
-      CLUTTER_TIMER_STOP (_clutter_uprof_context, pick_read);
-
-      CLUTTER_NOTE (PICK, "Reusing pick buffer from previous render to fetch "
-                    "actor at %i,%i", x, y);
-
-      goto check_pixel;
-    }
-
-  priv->picks_per_frame++;
+  fb = cogl_get_draw_framebuffer ();
 
   _clutter_backend_ensure_context (context->backend, stage);
 
   /* needed for when a context switch happens */
   _clutter_stage_maybe_setup_viewport (stage);
 
-  /* If we are seeing multiple picks per frame that means the scene is static
-   * so we promote to doing a non-scissored pick render so that all subsequent
-   * picks for the same static scene won't require additional renders */
-  if (priv->picks_per_frame < 2)
-    {
-       gint dirty_x;
-       gint dirty_y;
+  _clutter_stage_window_get_dirty_pixel (priv->impl, &dirty_x, &dirty_y);
 
-      _clutter_stage_window_get_dirty_pixel (priv->impl, &dirty_x, &dirty_y);
+  if (G_LIKELY (!(clutter_pick_debug_flags & CLUTTER_DEBUG_DUMP_PICK_BUFFERS)))
+    cogl_framebuffer_push_scissor_clip (fb, dirty_x * window_scale, dirty_y * window_scale, 1, 1);
 
-      if (G_LIKELY (!(clutter_pick_debug_flags & CLUTTER_DEBUG_DUMP_PICK_BUFFERS)))
-        cogl_clip_push_window_rectangle (dirty_x, dirty_y, 1, 1);
+  cogl_set_viewport (priv->viewport[0] * window_scale - x * window_scale + dirty_x * window_scale,
+                     priv->viewport[1] * window_scale - y * window_scale + dirty_y * window_scale,
+                     priv->viewport[2] * window_scale,
+                     priv->viewport[3] * window_scale);
 
-      cogl_set_viewport (priv->viewport[0] - x + dirty_x,
-                         priv->viewport[1] - y + dirty_y,
-                         priv->viewport[2],
-                         priv->viewport[3]);
+  read_x = dirty_x * window_scale;
+  read_y = dirty_y * window_scale;
 
-      read_x = dirty_x;
-      read_y = dirty_y;
-      is_clipped = TRUE;
-    }
-  else
-    {
-      read_x = x;
-      read_y = y;
-      is_clipped = FALSE;
-    }
+  CLUTTER_NOTE (PICK, "Performing pick at %i,%i", x, y);
 
-  CLUTTER_NOTE (PICK, "Performing %s pick at %i,%i",
-                is_clipped ? "clipped" : "full", x, y);
-
-  cogl_color_init_from_4ub (&stage_pick_id, 255, 255, 255, 255);
   CLUTTER_TIMER_START (_clutter_uprof_context, pick_clear);
-  cogl_clear (&stage_pick_id,
-	      COGL_BUFFER_BIT_COLOR |
-	      COGL_BUFFER_BIT_DEPTH);
+  cogl_color_init_from_4ub (&stage_pick_id, 255, 255, 255, 255);
+  cogl_clear (&stage_pick_id, COGL_BUFFER_BIT_COLOR | COGL_BUFFER_BIT_DEPTH);
   CLUTTER_TIMER_STOP (_clutter_uprof_context, pick_clear);
 
   /* Disable dithering (if any) when doing the painting in pick mode */
-  fb = cogl_get_draw_framebuffer ();
   dither_enabled_save = cogl_framebuffer_get_dither_enabled (fb);
   cogl_framebuffer_set_dither_enabled (fb, FALSE);
 
@@ -1566,12 +1572,10 @@ _clutter_stage_do_pick (ClutterStage   *stage,
     {
       char *file_name =
         g_strconcat ("pick-buffer-",
-                     _clutter_actor_get_debug_name (CLUTTER_ACTOR (stage)),
+                     _clutter_actor_get_debug_name (actor),
                      NULL);
 
-      read_pixels_to_file (file_name, 0, 0,
-                           clutter_actor_get_width (CLUTTER_ACTOR (stage)),
-                           clutter_actor_get_height (CLUTTER_ACTOR (stage)));
+      read_pixels_to_file (file_name, 0, 0, stage_width, stage_height);
 
       g_free (file_name);
     }
@@ -1579,34 +1583,18 @@ _clutter_stage_do_pick (ClutterStage   *stage,
   /* Restore whether GL_DITHER was enabled */
   cogl_framebuffer_set_dither_enabled (fb, dither_enabled_save);
 
-  if (is_clipped)
-  {
-     if (G_LIKELY (!(clutter_pick_debug_flags & CLUTTER_DEBUG_DUMP_PICK_BUFFERS)))
-      cogl_clip_pop ();
+  if (G_LIKELY (!(clutter_pick_debug_flags & CLUTTER_DEBUG_DUMP_PICK_BUFFERS)))
+    cogl_framebuffer_pop_clip (fb);
 
-     _clutter_stage_dirty_viewport (stage);
+  _clutter_stage_dirty_viewport (stage);
 
-    _clutter_stage_set_pick_buffer_valid (stage, FALSE, -1);
-  }
-  else
-  {
-    /* Notify the backend that we have trashed the contents of
-     * the back buffer... */
-    _clutter_stage_window_dirty_back_buffer (priv->impl);
-
-    _clutter_stage_set_pick_buffer_valid (stage, TRUE, mode);
-  }
-
-check_pixel:
   if (pixel[0] == 0xff && pixel[1] == 0xff && pixel[2] == 0xff)
-    {
-      actor = CLUTTER_ACTOR (stage);
-    }
+    retval = actor;
   else
     {
       guint32 id_ = _clutter_pixel_to_id (pixel);
 
-      actor = _clutter_get_actor_by_id (stage, id_);
+      retval = _clutter_stage_get_actor_by_pick_id (stage, id_);
     }
 
   CLUTTER_TIMER_STOP (_clutter_uprof_context, pick_timer);
@@ -1616,11 +1604,9 @@ check_pixel:
     _clutter_profile_suspend ();
 #endif
 
-  return actor;
+  return retval;
 }
 
-
-
 static gboolean
 clutter_stage_real_delete_event (ClutterStage *stage,
                                  ClutterEvent *event)
@@ -1630,7 +1616,7 @@ clutter_stage_real_delete_event (ClutterStage *stage,
   else
     clutter_actor_destroy (CLUTTER_ACTOR (stage));
 
-  return TRUE;
+  return CLUTTER_EVENT_STOP;
 }
 
 static void
@@ -1848,7 +1834,7 @@ clutter_stage_dispose (GObject *object)
       priv->impl = NULL;
     }
 
-  clutter_actor_remove_all_children (CLUTTER_ACTOR (object));
+  clutter_actor_destroy_all_children (CLUTTER_ACTOR (object));
 
   g_list_free_full (priv->pending_queue_redraws,
                     (GDestroyNotify) free_queue_redraw_entry);
@@ -1879,6 +1865,9 @@ clutter_stage_finalize (GObject *object)
   if (priv->fps_timer != NULL)
     g_timer_destroy (priv->fps_timer);
 
+  if (priv->paint_notify != NULL)
+    priv->paint_notify (priv->paint_data);
+
   G_OBJECT_CLASS (clutter_stage_parent_class)->finalize (object);
 }
 
@@ -2205,9 +2194,9 @@ clutter_stage_class_init (ClutterStageClass *klass)
    * It is possible to override the default behaviour by connecting
    * a new handler and returning %TRUE there.
    *
-   * <note>This signal is emitted only on Clutter backends that
+   * This signal is emitted only on Clutter backends that
    * embed #ClutterStage in native windows. It is not emitted for
-   * backends that use a static frame buffer.</note>
+   * backends that use a static frame buffer.
    *
    * Since: 1.2
    */
@@ -2221,12 +2210,27 @@ clutter_stage_class_init (ClutterStageClass *klass)
                   G_TYPE_BOOLEAN, 1,
                   CLUTTER_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
 
+  /**
+   * ClutterStage::after-paint:
+   * @stage: the stage that received the event
+   *
+   * The ::after-paint signal is emitted after the stage is painted,
+   * but before the results are displayed on the screen.
+   *
+   * Since: 1.20
+   */
+  stage_signals[AFTER_PAINT] =
+    g_signal_new (I_("after-paint"),
+                  G_TYPE_FROM_CLASS (gobject_class),
+                  G_SIGNAL_RUN_LAST,
+                  0, /* no corresponding vfunc */
+                  NULL, NULL, NULL,
+                  G_TYPE_NONE, 0);
+
   klass->fullscreen = clutter_stage_real_fullscreen;
   klass->activate = clutter_stage_real_activate;
   klass->deactivate = clutter_stage_real_deactivate;
   klass->delete_event = clutter_stage_real_delete_event;
-
-  g_type_class_add_private (gobject_class, sizeof (ClutterStagePrivate));
 }
 
 static void
@@ -2242,12 +2246,13 @@ clutter_stage_init (ClutterStage *self)
   ClutterStagePrivate *priv;
   ClutterStageWindow *impl;
   ClutterBackend *backend;
+  int window_scale = 1;
   GError *error;
 
   /* a stage is a top-level object */
   CLUTTER_SET_PRIVATE_FLAGS (self, CLUTTER_IS_TOPLEVEL);
 
-  self->priv = priv = CLUTTER_STAGE_GET_PRIVATE (self);
+  self->priv = priv = clutter_stage_get_instance_private (self);
 
   CLUTTER_NOTE (BACKEND, "Creating stage from the default backend");
   backend = clutter_get_default_backend ();
@@ -2259,6 +2264,7 @@ clutter_stage_init (ClutterStage *self)
     {
       _clutter_stage_set_window (self, impl);
       _clutter_stage_window_get_geometry (priv->impl, &geom);
+      window_scale = _clutter_stage_window_get_scale_factor (priv->impl);
     }
   else
     {
@@ -2312,8 +2318,8 @@ clutter_stage_init (ClutterStage *self)
                                       priv->perspective.aspect,
                                       priv->perspective.z_near,
                                       50, /* distance to 2d plane */
-                                      geom.width,
-                                      geom.height);
+                                      geom.width * window_scale,
+                                      geom.height * window_scale);
 
 
   /* FIXME - remove for 2.0 */
@@ -2331,10 +2337,10 @@ clutter_stage_init (ClutterStage *self)
   g_signal_connect (self, "notify::min-height",
                     G_CALLBACK (clutter_stage_notify_min_size), NULL);
 
-  _clutter_stage_set_viewport (self, 0, 0, geom.width, geom.height);
-
-  _clutter_stage_set_pick_buffer_valid (self, FALSE, CLUTTER_PICK_ALL);
-  priv->picks_per_frame = 0;
+  _clutter_stage_set_viewport (self,
+                               0, 0,
+                               geom.width,
+                               geom.height);
 
   priv->paint_volume_stack =
     g_array_new (FALSE, FALSE, sizeof (ClutterPaintVolume));
@@ -2917,6 +2923,8 @@ clutter_stage_get_actor_at_pos (ClutterStage    *stage,
                                 gint             x,
                                 gint             y)
 {
+  g_return_val_if_fail (CLUTTER_IS_STAGE (stage), NULL);
+
   return _clutter_stage_do_pick (stage, x, y, pick_mode);
 }
 
@@ -3218,29 +3226,29 @@ clutter_stage_set_use_fog (ClutterStage *stage,
  *     ClutterColor stage_color = { 0, };
  *     CoglColor fog_color = { 0, };
  *
- *     /&ast; set the fog color to the stage background color &ast;/
- *     clutter_stage_get_color (CLUTTER_STAGE (actor), &amp;stage_color);
- *     cogl_color_init_from_4ub (&amp;fog_color,
+ *     // set the fog color to the stage background color
+ *     clutter_stage_get_color (CLUTTER_STAGE (actor), &stage_color);
+ *     cogl_color_init_from_4ub (&fog_color,
  *                               stage_color.red,
  *                               stage_color.green,
  *                               stage_color.blue,
  *                               stage_color.alpha);
  *
- *     /&ast; enable fog &ast;/
- *     cogl_set_fog (&amp;fog_color,
- *                   COGL_FOG_MODE_EXPONENTIAL, /&ast; mode &ast;/
- *                   0.5,                       /&ast; density &ast;/
- *                   5.0, 30.0);                /&ast; z_near and z_far &ast;/
+ *     // enable fog //
+ *     cogl_set_fog (&fog_color,
+ *                   COGL_FOG_MODE_EXPONENTIAL, // mode
+ *                   0.5,                       // density
+ *                   5.0, 30.0);                // z_near and z_far
  *   }
  * ]|
  *
- * <note>The fogging functions only work correctly when the visible actors use
+ * The fogging functions only work correctly when the visible actors use
  * unmultiplied alpha colors. By default Cogl will premultiply textures and
  * cogl_set_source_color() will premultiply colors, so unless you explicitly
  * load your textures requesting an unmultiplied internal format and use
  * cogl_material_set_color() you can only use fogging with fully opaque actors.
  * Support for premultiplied colors will improve in the future when we can
- * depend on fragment shaders.</note>
+ * depend on fragment shaders.
  *
  * Since: 0.6
  *
@@ -3386,6 +3394,18 @@ clutter_stage_ensure_viewport (ClutterStage *stage)
   clutter_actor_queue_redraw (CLUTTER_ACTOR (stage));
 }
 
+static void
+clutter_stage_apply_scale (ClutterStage *stage)
+{
+  int factor;
+
+  factor = _clutter_stage_window_get_scale_factor (stage->priv->impl);
+  if (factor != 1)
+    cogl_matrix_scale (&stage->priv->view, factor, factor, 1.f);
+}
+
+# define _DEG_TO_RAD(d)         ((d) * ((float) G_PI / 180.0f))
+
 /* This calculates a distance into the view frustum to position the
  * stage so there is a decent amount of space to position geometry
  * between the stage and the near clipping plane.
@@ -3498,13 +3518,26 @@ calculate_z_translation (float z_near)
    *  z_2d = --------------------------- + z_near
    *                 sin (0.5°)
    */
-#define _DEG_TO_RAD (G_PI / 180.0)
-  return z_near * tanf (30.0f * _DEG_TO_RAD) *
-         sinf (120.0f * _DEG_TO_RAD) * cosf (30.5f * _DEG_TO_RAD) /
-         sinf (0.5f * _DEG_TO_RAD) +
-         z_near;
-#undef _DEG_TO_RAD
-   /* We expect the compiler should boil this down to z_near * CONSTANT */
+
+   /* We expect the compiler should boil this down to z_near * CONSTANT
+    * already, but just in case we use precomputed constants
+    */
+#if 0
+# define A      tanf (_DEG_TO_RAD (30.f))
+# define B      sinf (_DEG_TO_RAD (120.f))
+# define C      cosf (_DEG_TO_RAD (30.5f))
+# define D      sinf (_DEG_TO_RAD (.5f))
+#else
+# define A      0.57735025882720947265625f
+# define B      0.866025388240814208984375f
+# define C      0.86162912845611572265625f
+# define D      0.00872653536498546600341796875f
+#endif
+
+  return z_near
+       * A * B * C
+       / D
+       + z_near;
 }
 
 void
@@ -3515,16 +3548,20 @@ _clutter_stage_maybe_setup_viewport (ClutterStage *stage)
   if (priv->dirty_viewport)
     {
       ClutterPerspective perspective;
+      int window_scale;
       float z_2d;
 
       CLUTTER_NOTE (PAINT,
                     "Setting up the viewport { w:%f, h:%f }",
-                    priv->viewport[2], priv->viewport[3]);
+                    priv->viewport[2],
+                    priv->viewport[3]);
 
-      cogl_set_viewport (priv->viewport[0],
-                         priv->viewport[1],
-                         priv->viewport[2],
-                         priv->viewport[3]);
+      window_scale = _clutter_stage_window_get_scale_factor (priv->impl);
+
+      cogl_set_viewport (priv->viewport[0] * window_scale,
+                         priv->viewport[1] * window_scale,
+                         priv->viewport[2] * window_scale,
+                         priv->viewport[3] * window_scale);
 
       perspective = priv->perspective;
 
@@ -3536,15 +3573,13 @@ _clutter_stage_maybe_setup_viewport (ClutterStage *stage)
           perspective.aspect = priv->viewport[2] / priv->viewport[3];
           z_2d = calculate_z_translation (perspective.z_near);
 
-#define _DEG_TO_RAD (G_PI / 180.0)
           /* NB: z_2d is only enough room for 85% of the stage_height between
            * the stage and the z_near plane. For behind the stage plane we
            * want a more consistent gap of 10 times the stage_height before
            * hitting the far plane so we calculate that relative to the final
            * height of the stage plane at the z_2d_distance we got... */
           perspective.z_far = z_2d +
-            tanf ((perspective.fovy / 2.0f) * _DEG_TO_RAD) * z_2d * 20.0f;
-#undef _DEG_TO_RAD
+            tanf (_DEG_TO_RAD (perspective.fovy / 2.0f)) * z_2d * 20.0f;
 
           clutter_stage_set_perspective_internal (stage, &perspective);
         }
@@ -3557,8 +3592,10 @@ _clutter_stage_maybe_setup_viewport (ClutterStage *stage)
                                           perspective.aspect,
                                           perspective.z_near,
                                           z_2d,
-                                          priv->viewport[2],
-                                          priv->viewport[3]);
+                                          priv->viewport[2] * window_scale,
+                                          priv->viewport[3] * window_scale);
+
+      clutter_stage_apply_scale (stage);
 
       priv->dirty_viewport = FALSE;
     }
@@ -3571,6 +3608,8 @@ _clutter_stage_maybe_setup_viewport (ClutterStage *stage)
     }
 }
 
+#undef _DEG_TO_RAD
+
 /**
  * clutter_stage_ensure_redraw:
  * @stage: a #ClutterStage
@@ -3609,8 +3648,8 @@ clutter_stage_ensure_redraw (ClutterStage *stage)
  *
  * Queues a redraw for the passed stage.
  *
- * <note>Applications should call clutter_actor_queue_redraw() and not
- * this function.</note>
+ * Applications should call clutter_actor_queue_redraw() and not
+ * this function.
  *
  * Since: 0.8
  *
@@ -3918,12 +3957,12 @@ _clutter_stage_clear_update_time (ClutterStage *stage)
  * if the stage is always covered - for instance, in a full-screen
  * video player or in a game with a background texture.
  *
- * <note><para>This setting is a hint; Clutter might discard this
- * hint depending on its internal state.</para></note>
+ * This setting is a hint; Clutter might discard this hint
+ * depending on its internal state.
  *
- * <warning><para>If parts of the stage are visible and you disable
- * clearing you might end up with visual artifacts while painting the
- * contents of the stage.</para></warning>
+ * If parts of the stage are visible and you disable clearing you
+ * might end up with visual artifacts while painting the contents of
+ * the stage.
  *
  * Since: 1.4
  */
@@ -4052,16 +4091,6 @@ _clutter_stage_queue_actor_redraw (ClutterStage *stage,
     }
 #endif /* CLUTTER_ENABLE_DEBUG */
 
-  /* We have an optimization in _clutter_stage_do_pick to detect when
-   * the scene is static so we can cache a full, un-clipped pick
-   * buffer to avoid continuous pick renders.
-   *
-   * Currently the assumption is that actors queue a redraw when some
-   * state changes that affects painting *or* picking so we can use
-   * this point to invalidate any currently cached pick buffer.
-   */
-  _clutter_stage_set_pick_buffer_valid (stage, FALSE, -1);
-
   if (entry)
     {
       /* Ignore all requests to queue a redraw for an actor if a full
@@ -4137,7 +4166,7 @@ _clutter_stage_queue_redraw_entry_invalidate (ClutterStageQueueRedrawEntry *entr
 }
 
 static void
-_clutter_stage_maybe_finish_queue_redraws (ClutterStage *stage)
+clutter_stage_maybe_finish_queue_redraws (ClutterStage *stage)
 {
   /* Note: we have to repeat until the pending_queue_redraws list is
    * empty because actors are allowed to queue redraws in response to
@@ -4235,14 +4264,12 @@ clutter_stage_get_accept_focus (ClutterStage *stage)
  *
  * The default is %TRUE.
  *
- * If @enable is %FALSE the following events will not be delivered
- * to the actors children of @stage.
+ * If @enable is %FALSE the following signals will not be emitted
+ * by the actors children of @stage:
  *
- * <itemizedlist>
- *   <listitem><para>#ClutterActor::motion-event</para></listitem>
- *   <listitem><para>#ClutterActor::enter-event</para></listitem>
- *   <listitem><para>#ClutterActor::leave-event</para></listitem>
- * </itemizedlist>
+ *  - #ClutterActor::motion-event
+ *  - #ClutterActor::enter-event
+ *  - #ClutterActor::leave-event
  *
  * The events will still be delivered to the #ClutterStage.
  *
@@ -4581,3 +4608,20 @@ clutter_stage_skip_sync_delay (ClutterStage *stage)
   if (stage_window)
     _clutter_stage_window_schedule_update (stage_window, -1);
 }
+
+void
+_clutter_stage_set_scale_factor (ClutterStage *stage,
+                                 int           factor)
+{
+  ClutterStagePrivate *priv = stage->priv;
+
+  if (CLUTTER_ACTOR_IN_DESTRUCTION (stage))
+    return;
+
+  if (priv->impl == NULL)
+    return;
+
+  _clutter_stage_window_set_scale_factor (priv->impl, factor);
+
+  clutter_actor_queue_redraw (CLUTTER_ACTOR (stage));
+}
diff --git a/clutter/clutter-stage.h b/clutter/clutter-stage.h
index af6b091df..758381144 100644
--- a/clutter/clutter-stage.h
+++ b/clutter/clutter-stage.h
@@ -135,71 +135,106 @@ struct _ClutterFog
   gfloat z_far;
 };
 
+CLUTTER_AVAILABLE_IN_ALL
 GType clutter_perspective_get_type (void) G_GNUC_CONST;
+CLUTTER_DEPRECATED_IN_1_10
 GType clutter_fog_get_type (void) G_GNUC_CONST;
+CLUTTER_AVAILABLE_IN_ALL
 GType clutter_stage_get_type (void) G_GNUC_CONST;
 
+CLUTTER_AVAILABLE_IN_ALL
 ClutterActor *  clutter_stage_new                               (void);
 
+CLUTTER_AVAILABLE_IN_ALL
 void            clutter_stage_set_perspective                   (ClutterStage          *stage,
 			                                         ClutterPerspective    *perspective);
+CLUTTER_AVAILABLE_IN_ALL
 void            clutter_stage_get_perspective                   (ClutterStage          *stage,
 			                                         ClutterPerspective    *perspective);
+CLUTTER_AVAILABLE_IN_ALL
 void            clutter_stage_set_fullscreen                    (ClutterStage          *stage,
                                                                  gboolean               fullscreen);
+CLUTTER_AVAILABLE_IN_ALL
 gboolean        clutter_stage_get_fullscreen                    (ClutterStage          *stage);
+CLUTTER_AVAILABLE_IN_ALL
 void            clutter_stage_show_cursor                       (ClutterStage          *stage);
+CLUTTER_AVAILABLE_IN_ALL
 void            clutter_stage_hide_cursor                       (ClutterStage          *stage);
+CLUTTER_AVAILABLE_IN_ALL
 void            clutter_stage_set_title                         (ClutterStage          *stage,
                                                                  const gchar           *title);
+CLUTTER_AVAILABLE_IN_ALL
 const gchar *   clutter_stage_get_title                         (ClutterStage          *stage);
+CLUTTER_AVAILABLE_IN_ALL
 void            clutter_stage_set_user_resizable                (ClutterStage          *stage,
 						                 gboolean               resizable);
+CLUTTER_AVAILABLE_IN_ALL
 gboolean        clutter_stage_get_user_resizable                (ClutterStage          *stage);
 
+CLUTTER_AVAILABLE_IN_ALL
 void            clutter_stage_set_minimum_size                  (ClutterStage          *stage,
                                                                  guint                  width,
                                                                  guint                  height);
+CLUTTER_AVAILABLE_IN_ALL
 void            clutter_stage_get_minimum_size                  (ClutterStage          *stage,
                                                                  guint                 *width,
                                                                  guint                 *height);
+CLUTTER_AVAILABLE_IN_ALL
 void            clutter_stage_set_no_clear_hint                 (ClutterStage          *stage,
                                                                  gboolean               no_clear);
+CLUTTER_AVAILABLE_IN_ALL
 gboolean        clutter_stage_get_no_clear_hint                 (ClutterStage          *stage);
+CLUTTER_AVAILABLE_IN_ALL
 void            clutter_stage_set_use_alpha                     (ClutterStage          *stage,
                                                                  gboolean               use_alpha);
+CLUTTER_AVAILABLE_IN_ALL
 gboolean        clutter_stage_get_use_alpha                     (ClutterStage          *stage);
 
+CLUTTER_AVAILABLE_IN_ALL
 void            clutter_stage_set_key_focus                     (ClutterStage          *stage,
                                                                  ClutterActor          *actor);
+CLUTTER_AVAILABLE_IN_ALL
 ClutterActor *  clutter_stage_get_key_focus                     (ClutterStage          *stage);
+CLUTTER_AVAILABLE_IN_ALL
 void            clutter_stage_set_throttle_motion_events        (ClutterStage          *stage,
                                                                  gboolean               throttle);
+CLUTTER_AVAILABLE_IN_ALL
 gboolean        clutter_stage_get_throttle_motion_events        (ClutterStage          *stage);
+CLUTTER_AVAILABLE_IN_ALL
 void            clutter_stage_set_motion_events_enabled         (ClutterStage          *stage,
                                                                  gboolean               enabled);
+CLUTTER_AVAILABLE_IN_ALL
 gboolean        clutter_stage_get_motion_events_enabled         (ClutterStage          *stage);
+CLUTTER_AVAILABLE_IN_ALL
 void            clutter_stage_set_accept_focus                  (ClutterStage          *stage,
                                                                  gboolean               accept_focus);
+CLUTTER_AVAILABLE_IN_ALL
 gboolean        clutter_stage_get_accept_focus                  (ClutterStage          *stage);
+CLUTTER_AVAILABLE_IN_ALL
 gboolean        clutter_stage_event                             (ClutterStage          *stage,
                                                                  ClutterEvent          *event);
 
+CLUTTER_AVAILABLE_IN_ALL
 ClutterActor *  clutter_stage_get_actor_at_pos                  (ClutterStage          *stage,
                                                                  ClutterPickMode        pick_mode,
                                                                  gint                   x,
                                                                  gint                   y);
+CLUTTER_AVAILABLE_IN_ALL
 guchar *        clutter_stage_read_pixels                       (ClutterStage          *stage,
                                                                  gint                   x,
                                                                  gint                   y,
                                                                  gint                   width,
                                                                  gint                   height);
 
+CLUTTER_AVAILABLE_IN_ALL
 void            clutter_stage_get_redraw_clip_bounds            (ClutterStage          *stage,
                                                                  cairo_rectangle_int_t *clip);
 
+CLUTTER_AVAILABLE_IN_ALL
 void            clutter_stage_ensure_current                    (ClutterStage          *stage);
+CLUTTER_AVAILABLE_IN_ALL
 void            clutter_stage_ensure_viewport                   (ClutterStage          *stage);
+CLUTTER_AVAILABLE_IN_ALL
 void            clutter_stage_ensure_redraw                     (ClutterStage          *stage);
 
 #ifdef CLUTTER_ENABLE_EXPERIMENTAL_API
diff --git a/clutter/clutter-swipe-action.c b/clutter/clutter-swipe-action.c
index 0b0886bbc..452a5a020 100644
--- a/clutter/clutter-swipe-action.c
+++ b/clutter/clutter-swipe-action.c
@@ -45,6 +45,7 @@
 
 #include "clutter-debug.h"
 #include "clutter-enum-types.h"
+#include "clutter-gesture-action-private.h"
 #include "clutter-marshal.h"
 #include "clutter-private.h"
 
@@ -53,7 +54,7 @@ struct _ClutterSwipeActionPrivate
   ClutterSwipeDirection h_direction;
   ClutterSwipeDirection v_direction;
 
-  int threshold;
+  float distance_x, distance_y;
 };
 
 enum
@@ -66,21 +67,22 @@ enum
 
 static guint swipe_signals[LAST_SIGNAL] = { 0, };
 
-G_DEFINE_TYPE (ClutterSwipeAction, clutter_swipe_action,
-               CLUTTER_TYPE_GESTURE_ACTION);
+G_DEFINE_TYPE_WITH_PRIVATE (ClutterSwipeAction, clutter_swipe_action, CLUTTER_TYPE_GESTURE_ACTION)
 
 static gboolean
 gesture_begin (ClutterGestureAction  *action,
                ClutterActor          *actor)
 {
   ClutterSwipeActionPrivate *priv = CLUTTER_SWIPE_ACTION (action)->priv;
-  ClutterSettings *settings = clutter_settings_get_default ();
 
   /* reset the state at the beginning of a new gesture */
   priv->h_direction = 0;
   priv->v_direction = 0;
 
-  g_object_get (settings, "dnd-drag-threshold", &priv->threshold, NULL);
+  g_object_get (action,
+                "threshold-trigger-distance-x", &priv->distance_x,
+                "threshold-trigger-distance-y", &priv->distance_y,
+                NULL);
 
   return TRUE;
 }
@@ -108,14 +110,14 @@ gesture_progress (ClutterGestureAction *action,
   delta_x = press_x - motion_x;
   delta_y = press_y - motion_y;
 
-  if (delta_x >= priv->threshold)
+  if (delta_x >= priv->distance_x)
     h_direction = CLUTTER_SWIPE_DIRECTION_RIGHT;
-  else if (delta_x < -priv->threshold)
+  else if (delta_x < -priv->distance_x)
     h_direction = CLUTTER_SWIPE_DIRECTION_LEFT;
 
-  if (delta_y >= priv->threshold)
+  if (delta_y >= priv->distance_y)
     v_direction = CLUTTER_SWIPE_DIRECTION_DOWN;
-  else if (delta_y < -priv->threshold)
+  else if (delta_y < -priv->distance_y)
     v_direction = CLUTTER_SWIPE_DIRECTION_UP;
 
   /* cancel gesture on direction reversal */
@@ -152,14 +154,14 @@ gesture_end (ClutterGestureAction *action,
                                              0,
                                              &release_x, &release_y);
 
-  if (release_x - press_x > priv->threshold)
+  if (release_x - press_x > priv->distance_y)
     direction |= CLUTTER_SWIPE_DIRECTION_RIGHT;
-  else if (press_x - release_x > priv->threshold)
+  else if (press_x - release_x > priv->distance_x)
     direction |= CLUTTER_SWIPE_DIRECTION_LEFT;
 
-  if (release_y - press_y > priv->threshold)
+  if (release_y - press_y > priv->distance_y)
     direction |= CLUTTER_SWIPE_DIRECTION_DOWN;
-  else if (press_y - release_y > priv->threshold)
+  else if (press_y - release_y > priv->distance_y)
     direction |= CLUTTER_SWIPE_DIRECTION_UP;
 
   /* XXX:2.0 remove */
@@ -178,13 +180,22 @@ clutter_swipe_action_real_swipe (ClutterSwipeAction    *action,
   return TRUE;
 }
 
+static void
+clutter_swipe_action_constructed (GObject *object)
+{
+  clutter_gesture_action_set_threshold_trigger_edge (CLUTTER_GESTURE_ACTION (object),
+                                                     CLUTTER_GESTURE_TRIGGER_EDGE_AFTER);
+}
+
 static void
 clutter_swipe_action_class_init (ClutterSwipeActionClass *klass)
 {
   ClutterGestureActionClass *gesture_class =
       CLUTTER_GESTURE_ACTION_CLASS (klass);
+  GObjectClass *object_class =
+      G_OBJECT_CLASS (klass);
 
-  g_type_class_add_private (klass, sizeof (ClutterSwipeActionPrivate));
+  object_class->constructed = clutter_swipe_action_constructed;
 
   gesture_class->gesture_begin = gesture_begin;
   gesture_class->gesture_progress = gesture_progress;
@@ -247,8 +258,7 @@ clutter_swipe_action_class_init (ClutterSwipeActionClass *klass)
 static void
 clutter_swipe_action_init (ClutterSwipeAction *self)
 {
-  self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, CLUTTER_TYPE_SWIPE_ACTION,
-                                            ClutterSwipeActionPrivate);
+  self->priv = clutter_swipe_action_get_instance_private (self);
 }
 
 /**
diff --git a/clutter/clutter-swipe-action.h b/clutter/clutter-swipe-action.h
index c35b65ac7..9c18e94ad 100644
--- a/clutter/clutter-swipe-action.h
+++ b/clutter/clutter-swipe-action.h
@@ -51,7 +51,7 @@ typedef struct _ClutterSwipeActionClass         ClutterSwipeActionClass;
 /**
  * ClutterSwipeAction:
  *
- * The <structname>ClutterSwipeAction</structname> structure contains
+ * The #ClutterSwipeAction structure contains
  * only private data and should be accessed using the provided API
  *
  * Since: 1.8
@@ -70,7 +70,7 @@ struct _ClutterSwipeAction
  *   deprecated since 1.14
  * @swipe: class handler for the #ClutterSwipeAction::swipe signal
  *
- * The <structname>ClutterSwipeActionClass</structname> structure contains
+ * The #ClutterSwipeActionClass structure contains
  * only private data.
  *
  * Since: 1.8
@@ -98,8 +98,10 @@ struct _ClutterSwipeActionClass
   void (* _clutter_swipe_action6) (void);
 };
 
+CLUTTER_AVAILABLE_IN_1_8
 GType clutter_swipe_action_get_type (void) G_GNUC_CONST;
 
+CLUTTER_AVAILABLE_IN_1_8
 ClutterAction * clutter_swipe_action_new        (void);
 
 G_END_DECLS
diff --git a/clutter/clutter-tap-action.c b/clutter/clutter-tap-action.c
index caa00a1d1..4d30eb129 100644
--- a/clutter/clutter-tap-action.c
+++ b/clutter/clutter-tap-action.c
@@ -91,11 +91,22 @@ gesture_end (ClutterGestureAction *gesture,
   emit_tap (CLUTTER_TAP_ACTION (gesture), actor);
 }
 
+static void
+clutter_tap_action_constructed (GObject *object)
+{
+  clutter_gesture_action_set_threshold_trigger_edge (CLUTTER_GESTURE_ACTION (object),
+                                                     CLUTTER_GESTURE_TRIGGER_EDGE_BEFORE);
+}
+
 static void
 clutter_tap_action_class_init (ClutterTapActionClass *klass)
 {
   ClutterGestureActionClass *gesture_class =
       CLUTTER_GESTURE_ACTION_CLASS (klass);
+  GObjectClass *object_class =
+      G_OBJECT_CLASS (klass);
+
+  object_class->constructed = clutter_tap_action_constructed;
 
   gesture_class->gesture_end = gesture_end;
 
@@ -122,8 +133,6 @@ clutter_tap_action_class_init (ClutterTapActionClass *klass)
 static void
 clutter_tap_action_init (ClutterTapAction *self)
 {
-  _clutter_gesture_action_set_threshold_trigger_edge (CLUTTER_GESTURE_ACTION (self),
-                                                      CLUTTER_GESTURE_TRIGGER_EDGE_BEFORE);
 }
 
 /**
diff --git a/clutter/clutter-tap-action.h b/clutter/clutter-tap-action.h
index 12f54173c..8bf80a375 100644
--- a/clutter/clutter-tap-action.h
+++ b/clutter/clutter-tap-action.h
@@ -56,7 +56,7 @@ typedef struct _ClutterTapActionClass         ClutterTapActionClass;
 /**
  * ClutterTapAction:
  *
- * The <structname>ClutterTapAction</structname> structure contains
+ * The #ClutterTapAction structure contains
  * only private data and should be accessed using the provided API
  *
  * Since: 1.14
@@ -71,7 +71,7 @@ struct _ClutterTapAction
  * ClutterTapActionClass:
  * @tap: class handler for the #ClutterTapAction::tap signal
  *
- * The <structname>ClutterTapActionClass</structname> structure contains
+ * The #ClutterTapActionClass structure contains
  * only private data.
  */
 struct _ClutterTapActionClass
diff --git a/clutter/clutter-test-utils.c b/clutter/clutter-test-utils.c
new file mode 100644
index 000000000..2f2841231
--- /dev/null
+++ b/clutter/clutter-test-utils.c
@@ -0,0 +1,467 @@
+#include "config.h"
+
+#include "clutter-test-utils.h"
+
+#include <stdlib.h>
+#include <glib-object.h>
+
+#include "clutter-actor.h"
+#include "clutter-color.h"
+#include "clutter-event.h"
+#include "clutter-keysyms.h"
+#include "clutter-main.h"
+#include "clutter-private.h"
+#include "clutter-stage.h"
+
+typedef struct {
+  ClutterActor *stage;
+
+  guint no_display : 1;
+} ClutterTestEnvironment;
+
+static ClutterTestEnvironment *test_environ = NULL;
+
+/*
+ * clutter_test_init:
+ * @argc: (inout): number of arguments in @argv
+ * @argv: (inout) (array length=argc) (nullable): array of arguments
+ *
+ * Initializes the Clutter test environment.
+ *
+ * Since: 1.18
+ */
+void
+clutter_test_init (int    *argc,
+                   char ***argv)
+{
+  gboolean no_display = FALSE;
+
+  if (G_UNLIKELY (test_environ != NULL))
+    g_error ("Attempting to initialize the test suite more than once, "
+             "aborting...\n");
+
+#ifdef CLUTTER_WINDOWING_X11
+  /* on X11 backends we need the DISPLAY environment set.
+   *
+   * check_windowing_backend() will pre-initialize the Clutter
+   * backend object.
+   */
+  if (clutter_check_windowing_backend (CLUTTER_WINDOWING_X11))
+    {
+      const char *display = g_getenv ("DISPLAY");
+
+      if (display == NULL || *display == '\0')
+        {
+          g_test_message ("No DISPLAY environment variable found, but we require a "
+                          "DISPLAY set in order to run the conformance test suite.\n"
+                          "Skipping all tests.\n");
+          no_display = TRUE;
+
+          goto out;
+        }
+    }
+#endif
+
+  /* we explicitly disable the synchronisation to the vertical refresh
+   * rate, and run the master clock using a 60 fps timer instead.
+   */
+  _clutter_set_sync_to_vblank (FALSE);
+
+  /* perform the actual initialization */
+  g_assert (clutter_init (NULL, NULL) == CLUTTER_INIT_SUCCESS);
+
+out:
+  g_test_init (argc, argv, NULL);
+  g_test_bug_base ("https://bugzilla.gnome.org/show_bug.cgi?id=%s");
+
+  /* our global state, accessible from each test unit */
+  test_environ = g_new0 (ClutterTestEnvironment, 1);
+  test_environ->no_display = no_display;
+}
+
+/**
+ * clutter_test_get_stage:
+ *
+ * Retrieves the #ClutterStage used for testing.
+ *
+ * Return value: (transfer none): the stage used for testing
+ *
+ * Since: 1.18
+ */
+ClutterActor *
+clutter_test_get_stage (void)
+{
+  g_assert (test_environ != NULL);
+
+  if (test_environ->stage == NULL)
+    {
+      /* create a stage, and ensure that it goes away at the end */
+      test_environ->stage = clutter_stage_new ();
+      clutter_actor_set_name (test_environ->stage, "Test Stage");
+      g_object_add_weak_pointer (G_OBJECT (test_environ->stage),
+                                 (gpointer *) &test_environ->stage);
+    }
+
+  return test_environ->stage;
+}
+
+typedef struct {
+  gpointer test_func;
+  gpointer test_data;
+  GDestroyNotify test_notify;
+} ClutterTestData;
+
+static void
+clutter_test_func_wrapper (gconstpointer data_)
+{
+  const ClutterTestData *data = data_;
+
+  /* ensure that the previous test state has been cleaned up */
+  g_assert_null (test_environ->stage);
+
+  if (test_environ->no_display)
+    {
+      g_test_skip ("No DISPLAY set");
+      goto out;
+    }
+
+  if (data->test_data != NULL)
+    {
+      GTestDataFunc test_func = data->test_func;
+
+      test_func (data->test_data);
+    }
+  else
+    {
+      GTestFunc test_func = data->test_func;
+
+      test_func ();
+    }
+
+out:
+  if (data->test_notify != NULL)
+    data->test_notify (data->test_data);
+
+  if (test_environ->stage != NULL)
+    {
+      clutter_actor_destroy (test_environ->stage);
+      g_assert_null (test_environ->stage);
+    }
+}
+
+/**
+ * clutter_test_add: (skip)
+ * @test_path:
+ * @test_func:
+ *
+ * Adds a test unit to the Clutter test environment.
+ *
+ * See also: g_test_add()
+ *
+ * Since: 1.18
+ */
+void
+clutter_test_add (const char *test_path,
+                  GTestFunc   test_func)
+{
+  clutter_test_add_data_full (test_path, (GTestDataFunc) test_func, NULL, NULL);
+}
+
+/**
+ * clutter_test_add_data: (skip)
+ * @test_path:
+ * @test_func:
+ * @test_data:
+ *
+ * Adds a test unit to the Clutter test environment.
+ *
+ * See also: g_test_add_data_func()
+ *
+ * Since: 1.18
+ */
+void
+clutter_test_add_data (const char    *test_path,
+                       GTestDataFunc  test_func,
+                       gpointer       test_data)
+{
+  clutter_test_add_data_full (test_path, test_func, test_data, NULL);
+}
+
+/**
+ * clutter_test_add_data_full:
+ * @test_path:
+ * @test_func: (scope notified)
+ * @test_data:
+ * @test_notify:
+ *
+ * Adds a test unit to the Clutter test environment.
+ *
+ * See also: g_test_add_data_func_full()
+ *
+ * Since: 1.18
+ */
+void
+clutter_test_add_data_full (const char     *test_path,
+                            GTestDataFunc   test_func,
+                            gpointer        test_data,
+                            GDestroyNotify  test_notify)
+{
+  ClutterTestData *data;
+
+  g_return_if_fail (test_path != NULL);
+  g_return_if_fail (test_func != NULL);
+
+  g_assert (test_environ != NULL);
+
+  data = g_new (ClutterTestData, 1);
+  data->test_func = test_func;
+  data->test_data = test_data;
+  data->test_notify = test_notify;
+
+  g_test_add_data_func_full (test_path, data,
+                             clutter_test_func_wrapper,
+                             g_free);
+}
+
+/**
+ * clutter_test_run:
+ *
+ * Runs the test suite using the units added by calling
+ * clutter_test_add().
+ *
+ * The typical test suite is composed of a list of functions
+ * called by clutter_test_run(), for instance:
+ *
+ * |[
+ * static void unit_foo (void) { ... }
+ *
+ * static void unit_bar (void) { ... }
+ *
+ * static void unit_baz (void) { ... }
+ *
+ * int
+ * main (int argc, char *argv[])
+ * {
+ *   clutter_test_init (&argc, &argv);
+ *
+ *   clutter_test_add ("/unit/foo", unit_foo);
+ *   clutter_test_add ("/unit/bar", unit_bar);
+ *   clutter_test_add ("/unit/baz", unit_baz);
+ *
+ *   return clutter_test_run ();
+ * }
+ * ]|
+ *
+ * Return value: the exit code for the test suite
+ *
+ * Since: 1.18
+ */
+int
+clutter_test_run (void)
+{
+  int res;
+
+  g_assert (test_environ != NULL);
+  
+  res = g_test_run ();
+
+  g_free (test_environ);
+
+  return res;
+}
+
+typedef struct {
+  ClutterActor *stage;
+
+  ClutterPoint point;
+
+  gpointer result;
+
+  guint check_actor : 1;
+  guint check_color : 1;
+
+  guint was_painted : 1;
+} ValidateData;
+
+static gboolean
+validate_stage (gpointer data_)
+{
+  ValidateData *data = data_;
+
+  if (data->check_actor)
+    {
+      data->result =
+        clutter_stage_get_actor_at_pos (CLUTTER_STAGE (data->stage),
+                                        CLUTTER_PICK_ALL,
+                                        data->point.x,
+                                        data->point.y);
+    }
+
+  if (data->check_color)
+    {
+      data->result =
+        clutter_stage_read_pixels (CLUTTER_STAGE (data->stage),
+                                   data->point.x,
+                                   data->point.y,
+                                   1, 1);
+    }
+
+  if (!g_test_verbose ())
+    {
+      clutter_actor_hide (data->stage);
+      data->was_painted = TRUE;
+    }
+
+  return G_SOURCE_REMOVE;
+}
+
+static gboolean
+on_key_press_event (ClutterActor *stage,
+                    ClutterEvent *event,
+                    gpointer      data_)
+{
+  ValidateData *data = data_;
+
+  if (data->stage == stage &&
+      clutter_event_get_key_symbol (event) == CLUTTER_KEY_Escape)
+    {
+      clutter_actor_hide (stage);
+
+      data->was_painted = TRUE;
+    }
+
+  return CLUTTER_EVENT_PROPAGATE;
+}
+
+/**
+ * clutter_test_check_actor_at_point:
+ * @stage: a #ClutterStage
+ * @point: coordinates to check
+ * @actor: the expected actor at the given coordinates
+ * @result: (out) (nullable): actor at the coordinates
+ *
+ * Checks the given coordinates of the @stage and compares the
+ * actor found there with the given @actor.
+ *
+ * Returns: %TRUE if the actor at the given coordinates matches
+ *
+ * Since: 1.18
+ */
+gboolean
+clutter_test_check_actor_at_point (ClutterActor        *stage,
+                                   const ClutterPoint  *point,
+                                   ClutterActor        *actor,
+                                   ClutterActor       **result)
+{
+  ValidateData *data;
+  guint press_id = 0;
+
+  g_return_val_if_fail (CLUTTER_IS_STAGE (stage), FALSE);
+  g_return_val_if_fail (point != NULL, FALSE);
+  g_return_val_if_fail (CLUTTER_IS_ACTOR (stage), FALSE);
+  g_return_val_if_fail (result != NULL, FALSE);
+
+  data = g_new0 (ValidateData, 1);
+  data->stage = stage;
+  data->point = *point;
+  data->check_actor = TRUE;
+
+  if (g_test_verbose ())
+    {
+      g_printerr ("Press ESC to close the stage and resume the test\n");
+      press_id = g_signal_connect (stage, "key-press-event",
+                                   G_CALLBACK (on_key_press_event),
+                                   data);
+    }
+
+  clutter_actor_show (stage);
+
+  clutter_threads_add_repaint_func_full (CLUTTER_REPAINT_FLAGS_POST_PAINT,
+                                         validate_stage,
+                                         data,
+                                         NULL);
+
+  while (!data->was_painted)
+    g_main_context_iteration (NULL, TRUE);
+
+  *result = data->result;
+
+  if (press_id != 0)
+    g_signal_handler_disconnect (stage, press_id);
+
+  g_free (data);
+
+  return *result == actor;
+}
+
+/**
+ * clutter_test_check_color_at_point:
+ * @stage: a #ClutterStage
+ * @point: coordinates to check
+ * @color: expected color
+ * @result: (out caller-allocates): color at the given coordinates
+ *
+ * Checks the color at the given coordinates on @stage, and matches
+ * it with the red, green, and blue channels of @color. The alpha
+ * component of @color and @result is ignored.
+ *
+ * Returns: %TRUE if the colors match
+ *
+ * Since: 1.18
+ */
+gboolean
+clutter_test_check_color_at_point (ClutterActor       *stage,
+                                   const ClutterPoint *point,
+                                   const ClutterColor *color,
+                                   ClutterColor       *result)
+{
+  ValidateData *data;
+  gboolean retval;
+  guint8 *buffer;
+  guint press_id = 0;
+
+  g_return_val_if_fail (CLUTTER_IS_STAGE (stage), FALSE);
+  g_return_val_if_fail (point != NULL, FALSE);
+  g_return_val_if_fail (color != NULL, FALSE);
+  g_return_val_if_fail (result != NULL, FALSE);
+
+  data = g_new0 (ValidateData, 1);
+  data->stage = stage;
+  data->point = *point;
+  data->check_color = TRUE;
+
+  if (g_test_verbose ())
+    {
+      g_printerr ("Press ESC to close the stage and resume the test\n");
+      press_id = g_signal_connect (stage, "key-press-event",
+                                   G_CALLBACK (on_key_press_event),
+                                   data);
+    }
+
+  clutter_actor_show (stage);
+
+  clutter_threads_add_repaint_func_full (CLUTTER_REPAINT_FLAGS_POST_PAINT,
+                                         validate_stage,
+                                         data,
+                                         NULL);
+
+  while (!data->was_painted)
+    g_main_context_iteration (NULL, TRUE);
+
+  if (press_id != 0)
+    g_signal_handler_disconnect (stage, press_id);
+
+  buffer = data->result;
+
+  clutter_color_init (result, buffer[0], buffer[1], buffer[2], 255);
+
+  /* we only check the color channels, so we can't use clutter_color_equal() */
+  retval = buffer[0] == color->red &&
+           buffer[1] == color->green &&
+           buffer[2] == color->blue;
+
+  g_free (data->result);
+  g_free (data);
+
+  return retval;
+}
diff --git a/clutter/clutter-test-utils.h b/clutter/clutter-test-utils.h
new file mode 100644
index 000000000..81dad9737
--- /dev/null
+++ b/clutter/clutter-test-utils.h
@@ -0,0 +1,164 @@
+/*
+ * Clutter.
+ *
+ * An OpenGL based 'interactive canvas' library.
+ *
+ * Copyright (C) 2013  Emmanuele Bassi <ebassi@gnome.org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef __CLUTTER_TEST_UTILS_H__
+#define __CLUTTER_TEST_UTILS_H__
+
+#if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
+#error "Only <clutter/clutter.h> can be included directly."
+#endif
+
+#include <clutter/clutter-types.h>
+#include <clutter/clutter-actor.h>
+#include <clutter/clutter-color.h>
+
+G_BEGIN_DECLS
+
+/**
+ * CLUTTER_TEST_UNIT:
+ * @path: the GTest path for the test function
+ * @func: the GTestFunc function
+ *
+ * Adds @func at the given @path in the test suite.
+ *
+ * Since: 1.18
+ */
+#define CLUTTER_TEST_UNIT(path,func) \
+  clutter_test_add (path, func);
+
+/**
+ * CLUTTER_TEST_SUITE:
+ * @units: a list of %CLUTTER_TEST_UNIT definitions
+ *
+ * Defines the entry point and initializes a Clutter test unit, e.g.:
+ *
+ * |[
+ * CLUTTER_TEST_SUITE (
+ *   CLUTTER_TEST_UNIT ("/foobarize", foobarize)
+ *   CLUTTER_TEST_UNIT ("/bar-enabled", bar_enabled)
+ * )
+ * ]|
+ *
+ * Expands to:
+ *
+ * |[
+ * int
+ * main (int   argc,
+ *       char *argv[])
+ * {
+ *   clutter_test_init (&argc, &argv);
+ *
+ *   clutter_test_add ("/foobarize", foobarize);
+ *   clutter_test_add ("/bar-enabled", bar_enabled);
+ *
+ *   return clutter_test_run ();
+ * }
+ * ]|
+ *
+ * Since: 1.18
+ */
+#define CLUTTER_TEST_SUITE(units) \
+int \
+main (int argc, char *argv[]) \
+{ \
+  clutter_test_init (&argc, &argv); \
+\
+  { \
+    units \
+  } \
+\
+  return clutter_test_run (); \
+}
+
+CLUTTER_AVAILABLE_IN_1_18
+void            clutter_test_init               (int            *argc,
+                                                 char         ***argv);
+CLUTTER_AVAILABLE_IN_1_18
+int             clutter_test_run                (void);
+
+CLUTTER_AVAILABLE_IN_1_18
+void            clutter_test_add                (const char     *test_path,
+                                                 GTestFunc       test_func);
+CLUTTER_AVAILABLE_IN_1_18
+void            clutter_test_add_data           (const char     *test_path,
+                                                 GTestDataFunc   test_func,
+                                                 gpointer        test_data);
+CLUTTER_AVAILABLE_IN_1_18
+void            clutter_test_add_data_full      (const char     *test_path,
+                                                 GTestDataFunc   test_func,
+                                                 gpointer        test_data,
+                                                 GDestroyNotify  test_notify);
+
+CLUTTER_AVAILABLE_IN_1_18
+ClutterActor *  clutter_test_get_stage          (void);
+
+#define clutter_test_assert_actor_at_point(stage,point,actor) \
+G_STMT_START { \
+  const ClutterPoint *__p = (point); \
+  ClutterActor *__actor = (actor); \
+  ClutterActor *__stage = (stage); \
+  ClutterActor *__res; \
+  if (clutter_test_check_actor_at_point (__stage, __p, actor, &__res)) ; else { \
+    const char *__str1 = clutter_actor_get_name (__actor) != NULL \
+                       ? clutter_actor_get_name (__actor) \
+                       : G_OBJECT_TYPE_NAME (__actor); \
+    const char *__str2 = clutter_actor_get_name (__res) != NULL \
+                       ? clutter_actor_get_name (__res) \
+                       : G_OBJECT_TYPE_NAME (__res); \
+    char *__msg = g_strdup_printf ("assertion failed (actor %s at %.2f,%.2f): found actor %s", \
+                                   __str1, __p->x, __p->y, __str2); \
+    g_assertion_message (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, __msg); \
+    g_free (__msg); \
+  } \
+} G_STMT_END
+
+#define clutter_test_assert_color_at_point(stage,point,color) \
+G_STMT_START { \
+  const ClutterPoint *__p = (point); \
+  const ClutterColor *__c = (color); \
+  ClutterActor *__stage = (stage); \
+  ClutterColor __res; \
+  if (clutter_test_check_color_at_point (__stage, __p, __c, &__res)) ; else { \
+    char *__str1 = clutter_color_to_string (__c); \
+    char *__str2 = clutter_color_to_string (&__res); \
+    char *__msg = g_strdup_printf ("assertion failed (color %s at %.2f,%.2f): found color %s", \
+                                   __str1, __p->x, __p->y, __str2); \
+    g_assertion_message (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, __msg); \
+    g_free (__msg); \
+    g_free (__str1); \
+    g_free (__str2); \
+  } \
+} G_STMT_END
+
+CLUTTER_AVAILABLE_IN_1_18
+gboolean        clutter_test_check_actor_at_point       (ClutterActor       *stage,
+                                                         const ClutterPoint *point,
+                                                         ClutterActor       *actor,
+                                                         ClutterActor      **result);
+CLUTTER_AVAILABLE_IN_1_18
+gboolean        clutter_test_check_color_at_point       (ClutterActor       *stage,
+                                                         const ClutterPoint *point,
+                                                         const ClutterColor *color,
+                                                         ClutterColor       *result);
+
+G_END_DECLS
+
+#endif /* __CLUTTER_TEST_UTILS_H__ */
diff --git a/clutter/clutter-text-buffer.c b/clutter/clutter-text-buffer.c
index 1ee9f4df8..63cab2206 100644
--- a/clutter/clutter-text-buffer.c
+++ b/clutter/clutter-text-buffer.c
@@ -81,7 +81,7 @@ struct _ClutterTextBufferPrivate
   guint  normal_text_chars;
 };
 
-G_DEFINE_TYPE (ClutterTextBuffer, clutter_text_buffer, G_TYPE_OBJECT);
+G_DEFINE_TYPE_WITH_PRIVATE (ClutterTextBuffer, clutter_text_buffer, G_TYPE_OBJECT)
 
 /* --------------------------------------------------------------------------------
  * DEFAULT IMPLEMENTATIONS OF TEXT BUFFER
@@ -246,16 +246,14 @@ clutter_text_buffer_real_deleted_text (ClutterTextBuffer *buffer,
  */
 
 static void
-clutter_text_buffer_init (ClutterTextBuffer *buffer)
+clutter_text_buffer_init (ClutterTextBuffer *self)
 {
-  ClutterTextBufferPrivate *pv;
+  self->priv = clutter_text_buffer_get_instance_private (self);
 
-  pv = buffer->priv = G_TYPE_INSTANCE_GET_PRIVATE (buffer, CLUTTER_TYPE_TEXT_BUFFER, ClutterTextBufferPrivate);
-
-  pv->normal_text = NULL;
-  pv->normal_text_chars = 0;
-  pv->normal_text_bytes = 0;
-  pv->normal_text_size = 0;
+  self->priv->normal_text = NULL;
+  self->priv->normal_text_chars = 0;
+  self->priv->normal_text_bytes = 0;
+  self->priv->normal_text_size = 0;
 }
 
 static void
@@ -337,8 +335,6 @@ clutter_text_buffer_class_init (ClutterTextBufferClass *klass)
   klass->inserted_text = clutter_text_buffer_real_inserted_text;
   klass->deleted_text = clutter_text_buffer_real_deleted_text;
 
-  g_type_class_add_private (gobject_class, sizeof (ClutterTextBufferPrivate));
-
   /**
    * ClutterTextBuffer:text:
    *
diff --git a/clutter/clutter-text-buffer.h b/clutter/clutter-text-buffer.h
index 9b6f8ceee..a524d93b2 100644
--- a/clutter/clutter-text-buffer.h
+++ b/clutter/clutter-text-buffer.h
@@ -53,7 +53,7 @@ typedef struct _ClutterTextBufferPrivate     ClutterTextBufferPrivate;
 /**
  * ClutterTextBuffer:
  *
- * The <structname>ClutterTextBuffer</structname> structure contains private
+ * The #ClutterTextBuffer structure contains private
  * data and it should only be accessed using the provided API.
  *
  * Since: 1.10
@@ -75,7 +75,7 @@ struct _ClutterTextBuffer
  * @insert_text: virtual function
  * @delete_text: virtual function
  *
- * The <structname>ClutterTextBufferClass</structname> structure contains
+ * The #ClutterTextBufferClass structure contains
  * only private data.
  *
  * Since: 1.10
diff --git a/clutter/clutter-text.c b/clutter/clutter-text.c
index e0901cd31..dad50edbb 100644
--- a/clutter/clutter-text.c
+++ b/clutter/clutter-text.c
@@ -49,6 +49,7 @@
 
 #include "clutter-actor-private.h"
 #include "clutter-animatable.h"
+#include "clutter-backend-private.h"
 #include "clutter-binding-pool.h"
 #include "clutter-color.h"
 #include "clutter-debug.h"
@@ -82,29 +83,8 @@
  */
 #define N_CACHED_LAYOUTS        6
 
-#define CLUTTER_TEXT_GET_PRIVATE(obj)   (G_TYPE_INSTANCE_GET_PRIVATE ((obj), CLUTTER_TYPE_TEXT, ClutterTextPrivate))
-
 typedef struct _LayoutCache     LayoutCache;
 
-static const ClutterColor default_cursor_color    = {   0,   0,   0, 255 };
-static const ClutterColor default_selection_color = {   0,   0,   0, 255 };
-static const ClutterColor default_text_color      = {   0,   0,   0, 255 };
-static const ClutterColor default_selected_text_color = {   0,   0,   0, 255 };
-
-static ClutterAnimatableIface *parent_animatable_iface = NULL;
-static ClutterScriptableIface *parent_scriptable_iface = NULL;
-
-static void clutter_scriptable_iface_init (ClutterScriptableIface *iface);
-static void clutter_animatable_iface_init (ClutterAnimatableIface *iface);
-
-G_DEFINE_TYPE_WITH_CODE (ClutterText,
-                         clutter_text,
-                         CLUTTER_TYPE_ACTOR,
-                         G_IMPLEMENT_INTERFACE (CLUTTER_TYPE_SCRIPTABLE,
-                                                clutter_scriptable_iface_init)
-                         G_IMPLEMENT_INTERFACE (CLUTTER_TYPE_ANIMATABLE,
-                                                clutter_animatable_iface_init));
-
 struct _LayoutCache
 {
   /* Cached layout. Pango internally caches the computed extents
@@ -221,6 +201,7 @@ struct _ClutterTextPrivate
   guint paint_volume_valid      : 1;
   guint show_password_hint      : 1;
   guint password_hint_visible   : 1;
+  guint resolved_direction      : 4;
 };
 
 enum
@@ -281,6 +262,26 @@ static void buffer_connect_signals (ClutterText *self);
 static void buffer_disconnect_signals (ClutterText *self);
 static ClutterTextBuffer *get_buffer (ClutterText *self);
 
+static const ClutterColor default_cursor_color    = {   0,   0,   0, 255 };
+static const ClutterColor default_selection_color = {   0,   0,   0, 255 };
+static const ClutterColor default_text_color      = {   0,   0,   0, 255 };
+static const ClutterColor default_selected_text_color = {   0,   0,   0, 255 };
+
+static ClutterAnimatableIface *parent_animatable_iface = NULL;
+static ClutterScriptableIface *parent_scriptable_iface = NULL;
+
+static void clutter_scriptable_iface_init (ClutterScriptableIface *iface);
+static void clutter_animatable_iface_init (ClutterAnimatableIface *iface);
+
+G_DEFINE_TYPE_WITH_CODE (ClutterText,
+                         clutter_text,
+                         CLUTTER_TYPE_ACTOR,
+                         G_ADD_PRIVATE (ClutterText)
+                         G_IMPLEMENT_INTERFACE (CLUTTER_TYPE_SCRIPTABLE,
+                                                clutter_scriptable_iface_init)
+                         G_IMPLEMENT_INTERFACE (CLUTTER_TYPE_ANIMATABLE,
+                                                clutter_animatable_iface_init));
+
 static inline void
 clutter_text_dirty_paint_volume (ClutterText *text)
 {
@@ -345,6 +346,18 @@ clutter_text_clear_selection (ClutterText *self)
     }
 }
 
+static gboolean
+clutter_text_is_empty (ClutterText *self)
+{
+  if (self->priv->buffer == NULL)
+    return TRUE;
+
+  if (clutter_text_buffer_get_length (self->priv->buffer) == 0)
+    return TRUE;
+
+  return FALSE;
+}
+
 static gchar *
 clutter_text_get_display_text (ClutterText *self)
 {
@@ -352,6 +365,13 @@ clutter_text_get_display_text (ClutterText *self)
   ClutterTextBuffer *buffer;
   const gchar *text;
 
+  /* short-circuit the case where the buffer is unset or it's empty,
+   * to avoid creating a pointless TextBuffer and emitting
+   * notifications with it
+   */
+  if (clutter_text_is_empty (self))
+    return g_strdup ("");
+
   buffer = get_buffer (self);
   text = clutter_text_buffer_get_text (buffer);
 
@@ -510,7 +530,38 @@ clutter_text_create_layout_no_cache (ClutterText       *text,
       pango_attr_list_unref (tmp_attrs);
     }
   else
-    pango_layout_set_text (layout, contents, contents_len);
+    {
+      PangoDirection pango_dir;
+
+      if (priv->password_char != 0)
+        pango_dir = PANGO_DIRECTION_NEUTRAL;
+      else
+        pango_dir = pango_find_base_dir (contents, contents_len);
+
+      if (pango_dir == PANGO_DIRECTION_NEUTRAL)
+        {
+          ClutterBackend *backend = clutter_get_default_backend ();
+          ClutterTextDirection text_dir;
+
+          if (clutter_actor_has_key_focus (CLUTTER_ACTOR (text)))
+            pango_dir = _clutter_backend_get_keymap_direction (backend);
+          else
+            {
+              text_dir = clutter_actor_get_text_direction (CLUTTER_ACTOR (text));
+
+              if (text_dir == CLUTTER_TEXT_DIRECTION_RTL)
+                pango_dir = PANGO_DIRECTION_RTL;
+              else
+                pango_dir = PANGO_DIRECTION_LTR;
+           }
+        }
+
+      pango_context_set_base_dir (clutter_actor_get_pango_context (CLUTTER_ACTOR (text)), pango_dir);
+
+      priv->resolved_direction = pango_dir;
+
+      pango_layout_set_text (layout, contents, contents_len);
+    }
 
   /* This will merge the markup attributes and the attributes
    * property if needed */
@@ -568,10 +619,13 @@ clutter_text_dirty_cache (ClutterText *text)
  */
 static inline void
 clutter_text_set_font_description_internal (ClutterText          *self,
-                                            PangoFontDescription *desc)
+                                            PangoFontDescription *desc,
+                                            gboolean              is_default_font)
 {
   ClutterTextPrivate *priv = self->priv;
 
+  priv->is_default_font = is_default_font;
+
   if (priv->font_desc == desc ||
       pango_font_description_equal (priv->font_desc, desc))
     return;
@@ -619,7 +673,7 @@ clutter_text_settings_changed_cb (ClutterText *text)
                     font_name);
 
       font_desc = pango_font_description_from_string (font_name);
-      clutter_text_set_font_description_internal (text, font_desc);
+      clutter_text_set_font_description_internal (text, font_desc, TRUE);
 
       pango_font_description_free (font_desc);
       g_free (font_name);
@@ -1611,6 +1665,11 @@ selection_paint (ClutterText *self)
           PangoLayout *layout = clutter_text_get_layout (self);
           CoglPath *selection_path = cogl_path_new ();
           CoglColor cogl_color = { 0, };
+          CoglFramebuffer *fb;
+
+          fb = _clutter_actor_get_active_framebuffer (actor);
+          if (G_UNLIKELY (fb == NULL))
+            return;
 
           /* Paint selection background */
           if (priv->selection_color_set)
@@ -1632,8 +1691,7 @@ selection_paint (ClutterText *self)
           cogl_path_fill (selection_path);
 
           /* Paint selected text */
-          cogl_framebuffer_push_path_clip (cogl_get_draw_framebuffer (),
-                                           selection_path);
+          cogl_framebuffer_push_path_clip (fb, selection_path);
           cogl_object_unref (selection_path);
 
           if (priv->selected_text_color_set)
@@ -1649,7 +1707,7 @@ selection_paint (ClutterText *self)
 
           cogl_pango_render_layout (layout, priv->text_x, 0, &cogl_color, 0);
 
-          cogl_clip_pop ();
+          cogl_framebuffer_pop_clip (fb);
         }
     }
 }
@@ -2184,6 +2242,7 @@ clutter_text_paint (ClutterActor *self)
 {
   ClutterText *text = CLUTTER_TEXT (self);
   ClutterTextPrivate *priv = text->priv;
+  CoglFramebuffer *fb;
   PangoLayout *layout;
   ClutterActorBox alloc = { 0, };
   CoglColor color = { 0, };
@@ -2193,6 +2252,16 @@ clutter_text_paint (ClutterActor *self)
   gboolean clip_set = FALSE;
   gboolean bg_color_set = FALSE;
   guint n_chars;
+  float alloc_width;
+  float alloc_height;
+
+  /* FIXME: this should not be needed, but apparently the text-cache
+   * test unit manages to get in a situation where the active frame
+   * buffer is NULL
+   */
+  fb = _clutter_actor_get_active_framebuffer (self);
+  if (fb == NULL)
+    fb = cogl_get_draw_framebuffer ();
 
   /* Note that if anything in this paint method changes it needs to be
      reflected in the get_paint_volume implementation which is tightly
@@ -2200,6 +2269,8 @@ clutter_text_paint (ClutterActor *self)
   n_chars = clutter_text_buffer_get_length (get_buffer (text));
 
   clutter_actor_get_allocation_box (self, &alloc);
+  alloc_width = alloc.x2 - alloc.x1;
+  alloc_height = alloc.y2 - alloc.y1;
 
   g_object_get (self, "background-color-set", &bg_color_set, NULL);
   if (bg_color_set)
@@ -2215,7 +2286,7 @@ clutter_text_paint (ClutterActor *self)
                                 bg_color.green,
                                 bg_color.blue,
                                 bg_color.alpha);
-      cogl_rectangle (0, 0, alloc.x2 - alloc.x1, alloc.y2 - alloc.y1);
+      cogl_rectangle (0, 0, alloc_width, alloc_height);
     }
 
   /* don't bother painting an empty text actor, unless it's
@@ -2235,9 +2306,7 @@ clutter_text_paint (ClutterActor *self)
        */
       if (priv->wrap && priv->ellipsize)
         {
-          layout = clutter_text_create_layout (text,
-                                               alloc.x2 - alloc.x1,
-                                               alloc.y2 - alloc.y1);
+          layout = clutter_text_create_layout (text, alloc_width, alloc_height);
         }
       else
         {
@@ -2254,9 +2323,7 @@ clutter_text_paint (ClutterActor *self)
            * in the assigned width, then we clip the actor if the
            * logical rectangle overflows the allocation.
            */
-          layout = clutter_text_create_layout (text,
-                                               alloc.x2 - alloc.x1,
-                                               -1);
+          layout = clutter_text_create_layout (text, alloc_width, -1);
         }
     }
 
@@ -2267,29 +2334,29 @@ clutter_text_paint (ClutterActor *self)
     {
       PangoRectangle logical_rect = { 0, };
       gint actor_width, text_width;
+      gboolean rtl;
 
       pango_layout_get_extents (layout, NULL, &logical_rect);
 
-      cogl_clip_push_rectangle (0, 0,
-                                (alloc.x2 - alloc.x1),
-                                (alloc.y2 - alloc.y1));
+      cogl_framebuffer_push_rectangle_clip (fb, 0, 0, alloc_width, alloc_height);
       clip_set = TRUE;
 
-      actor_width = (alloc.x2 - alloc.x1)
-                  - 2 * TEXT_PADDING;
+      actor_width = alloc_width - 2 * TEXT_PADDING;
       text_width  = logical_rect.width / PANGO_SCALE;
 
+      rtl = priv->resolved_direction == PANGO_DIRECTION_RTL;
+
       if (actor_width < text_width)
         {
           gint cursor_x = clutter_rect_get_x (&priv->cursor_rect);
 
           if (priv->position == -1)
             {
-              text_x = actor_width - text_width;
+              text_x = rtl ? TEXT_PADDING : actor_width - text_width;
             }
           else if (priv->position == 0)
             {
-              text_x = TEXT_PADDING;
+              text_x = rtl ? actor_width - text_width : TEXT_PADDING;
             }
           else
             {
@@ -2305,7 +2372,7 @@ clutter_text_paint (ClutterActor *self)
         }
       else
         {
-          text_x = TEXT_PADDING;
+          text_x = rtl ? actor_width - text_width : TEXT_PADDING;
         }
     }
   else if (!priv->editable && !(priv->wrap && priv->ellipsize))
@@ -2315,12 +2382,10 @@ clutter_text_paint (ClutterActor *self)
       pango_layout_get_pixel_extents (layout, NULL, &logical_rect);
 
       /* don't clip if the layout managed to fit inside our allocation */
-      if (logical_rect.width > (alloc.x2 - alloc.x1) ||
-          logical_rect.height > (alloc.y2 - alloc.y1))
+      if (logical_rect.width > alloc_width ||
+          logical_rect.height > alloc_height)
         {
-          cogl_clip_push_rectangle (0, 0,
-                                    alloc.x2 - alloc.x1,
-                                    alloc.y2 - alloc.y1);
+          cogl_framebuffer_push_rectangle_clip (fb, 0, 0, alloc_width, alloc_height);
           clip_set = TRUE;
         }
 
@@ -2355,7 +2420,7 @@ clutter_text_paint (ClutterActor *self)
   selection_paint (text);
 
   if (clip_set)
-    cogl_clip_pop ();
+    cogl_framebuffer_pop_clip (fb);
 }
 
 static void
@@ -3322,8 +3387,6 @@ clutter_text_class_init (ClutterTextClass *klass)
   ClutterBindingPool *binding_pool;
   GParamSpec *pspec;
 
-  g_type_class_add_private (klass, sizeof (ClutterTextPrivate));
-
   gobject_class->set_property = clutter_text_set_property;
   gobject_class->get_property = clutter_text_get_property;
   gobject_class->dispose = clutter_text_dispose;
@@ -3646,10 +3709,10 @@ clutter_text_class_init (ClutterTextClass *klass)
    * For more informations about the Pango markup format, see
    * pango_layout_set_markup() in the Pango documentation.
    *
-   * <note>It is not possible to round-trip this property between
+   * It is not possible to round-trip this property between
    * %TRUE and %FALSE. Once a string with markup has been set on
    * a #ClutterText actor with :use-markup set to %TRUE, the markup
-   * is stripped from the string.</note>
+   * is stripped from the string.
    *
    * Since: 1.0
    */
@@ -4057,7 +4120,7 @@ clutter_text_init (ClutterText *self)
   gchar *font_name;
   int i, password_hint_time;
 
-  self->priv = priv = CLUTTER_TEXT_GET_PRIVATE (self);
+  self->priv = priv = clutter_text_get_instance_private (self);
 
   priv->alignment     = PANGO_ALIGN_LEFT;
   priv->wrap          = FALSE;
@@ -4227,7 +4290,6 @@ buffer_inserted_text (ClutterTextBuffer *buffer,
   ClutterTextPrivate *priv;
   gint new_position;
   gint new_selection_bound;
-  gsize n_bytes;
 
   priv = self->priv;
   if (priv->position >= 0 || priv->selection_bound >= 0)
@@ -4244,10 +4306,6 @@ buffer_inserted_text (ClutterTextBuffer *buffer,
         clutter_text_set_positions (self, new_position, new_selection_bound);
     }
 
-  n_bytes = g_utf8_offset_to_pointer (chars, n_chars) - chars;
-  g_signal_emit (self, text_signals[INSERT_TEXT], 0, chars,
-                 n_bytes, &position);
-
   /* TODO: What are we supposed to with the out value of position? */
 }
 
@@ -4275,8 +4333,6 @@ buffer_deleted_text (ClutterTextBuffer *buffer,
       if (priv->position != new_position || priv->selection_bound != new_selection_bound)
         clutter_text_set_positions (self, new_position, new_selection_bound);
     }
-
-  g_signal_emit (self, text_signals[DELETE_TEXT], 0, position, position + n_chars);
 }
 
 static void
@@ -4628,7 +4684,8 @@ clutter_text_set_cursor_visible (ClutterText *self,
     {
       priv->cursor_visible = cursor_visible;
 
-      clutter_text_queue_redraw (CLUTTER_ACTOR (self));
+      clutter_text_dirty_cache (self);
+      clutter_actor_queue_relayout (CLUTTER_ACTOR (self));
 
       g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_CURSOR_VISIBLE]);
     }
@@ -4945,7 +5002,8 @@ clutter_text_set_font_description (ClutterText          *self,
 {
   g_return_if_fail (CLUTTER_IS_TEXT (self));
 
-  clutter_text_set_font_description_internal (self, font_desc);
+  clutter_text_set_font_description_internal (self, font_desc,
+                                              font_desc == NULL);
 }
 
 /**
@@ -4999,8 +5057,13 @@ clutter_text_get_font_name (ClutterText *text)
  * like:
  *
  * |[
- *   clutter_text_set_font_name (text, "Sans 10pt");
+ *   // Set the font to the system's Sans, 10 points
+ *   clutter_text_set_font_name (text, "Sans 10");
+ *
+ *   // Set the font to the system's Serif, 16 pixels
  *   clutter_text_set_font_name (text, "Serif 16px");
+ *
+ *   // Set the font to Helvetica, 10 points
  *   clutter_text_set_font_name (text, "Helvetica 10");
  * ]|
  *
@@ -5052,8 +5115,7 @@ clutter_text_set_font_name (ClutterText *self,
     }
 
   /* this will set the font_name field as well */
-  clutter_text_set_font_description_internal (self, desc);
-  priv->is_default_font = is_default_font;
+  clutter_text_set_font_description_internal (self, desc, is_default_font);
 
   g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_FONT_NAME]);
 
@@ -5865,6 +5927,33 @@ clutter_text_get_max_length (ClutterText *self)
   return clutter_text_buffer_get_max_length (get_buffer (self));
 }
 
+static void
+clutter_text_real_insert_text (ClutterText *self,
+                               guint        start_pos,
+                               const gchar *chars,
+                               guint        n_chars)
+{
+  gsize n_bytes;
+
+  n_bytes = g_utf8_offset_to_pointer (chars, n_chars) - chars;
+
+  /*
+   * insert-text is emitted here instead of as part of a
+   * buffer_inserted_text() callback because that should be emitted
+   * before the buffer changes, while ClutterTextBuffer::deleted-text
+   * is emitter after. See BG#722220 for more info.
+   */
+  g_signal_emit (self, text_signals[INSERT_TEXT], 0, chars,
+                 n_bytes, &start_pos);
+
+  /*
+   * The actual insertion from the buffer. This will end firing the
+   * following signal handlers: buffer_inserted_text(),
+   * buffer_notify_text(), buffer_notify_max_length()
+   */
+  clutter_text_buffer_insert_text (get_buffer (self), start_pos, chars, n_chars);
+}
+
 /**
  * clutter_text_insert_unichar:
  * @self: a #ClutterText
@@ -5887,11 +5976,12 @@ clutter_text_insert_unichar (ClutterText *self,
   new = g_string_new ("");
   g_string_append_unichar (new, wc);
 
-  clutter_text_buffer_insert_text (get_buffer (self), priv->position, new->str, 1);
+  clutter_text_real_insert_text (self, priv->position, new->str, 1);
 
   g_string_free (new, TRUE);
 }
 
+
 /**
  * clutter_text_insert_text:
  * @self: a #ClutterText
@@ -5915,10 +6005,32 @@ clutter_text_insert_text (ClutterText *self,
   g_return_if_fail (CLUTTER_IS_TEXT (self));
   g_return_if_fail (text != NULL);
 
-  clutter_text_buffer_insert_text (get_buffer (self), position, text,
-                                   g_utf8_strlen (text, -1));
+  clutter_text_real_insert_text (self, position, text, g_utf8_strlen (text, -1));
 }
 
+static
+void clutter_text_real_delete_text (ClutterText *self,
+                                    gssize       start_pos,
+                                    gssize       end_pos)
+{
+  /*
+   * delete-text is emitted here instead of as part of a
+   * buffer_deleted_text() callback because that should be emitted
+   * before the buffer changes, while ClutterTextBuffer::deleted-text
+   * is emitter after. See BG#722220 for more info.
+   */
+  g_signal_emit (self, text_signals[DELETE_TEXT], 0, start_pos, end_pos);
+
+  /*
+   * The actual deletion from the buffer. This will end firing the
+   * following signal handlers: buffer_deleted_text(),
+   * buffer_notify_text(), buffer_notify_max_length()
+   */
+  clutter_text_buffer_delete_text (get_buffer (self), start_pos, end_pos - start_pos);
+}
+
+
+
 /**
  * clutter_text_delete_text:
  * @self: a #ClutterText
@@ -5940,7 +6052,7 @@ clutter_text_delete_text (ClutterText *self,
 {
   g_return_if_fail (CLUTTER_IS_TEXT (self));
 
-  clutter_text_buffer_delete_text (get_buffer (self), start_pos, end_pos - start_pos);
+  clutter_text_real_delete_text (self, start_pos, end_pos);
 }
 
 /**
@@ -5966,7 +6078,7 @@ clutter_text_delete_chars (ClutterText *self,
 
   priv = self->priv;
 
-  clutter_text_buffer_delete_text (get_buffer (self), priv->position, n_chars);
+  clutter_text_real_delete_text (self, priv->position, priv->position + n_chars);
 
   if (priv->position > 0)
     clutter_text_set_cursor_position (self, priv->position - n_chars);
diff --git a/clutter/clutter-text.h b/clutter/clutter-text.h
index fd6e193de..95e6a661f 100644
--- a/clutter/clutter-text.h
+++ b/clutter/clutter-text.h
@@ -96,12 +96,16 @@ struct _ClutterTextClass
   void (* _clutter_reserved7) (void);
 };
 
+CLUTTER_AVAILABLE_IN_1_0
 GType clutter_text_get_type (void) G_GNUC_CONST;
 
+CLUTTER_AVAILABLE_IN_1_0
 ClutterActor *        clutter_text_new                  (void);
+CLUTTER_AVAILABLE_IN_1_0
 ClutterActor *        clutter_text_new_full             (const gchar          *font_name,
                                                          const gchar          *text,
                                                          const ClutterColor   *color);
+CLUTTER_AVAILABLE_IN_1_0
 ClutterActor *        clutter_text_new_with_text        (const gchar          *font_name,
                                                          const gchar          *text);
 CLUTTER_AVAILABLE_IN_1_10
@@ -111,126 +115,189 @@ ClutterTextBuffer *   clutter_text_get_buffer           (ClutterText          *s
 CLUTTER_AVAILABLE_IN_1_10
 void                  clutter_text_set_buffer           (ClutterText          *self,
                                                          ClutterTextBuffer    *buffer);
+CLUTTER_AVAILABLE_IN_1_0
 const gchar *         clutter_text_get_text             (ClutterText          *self);
+CLUTTER_AVAILABLE_IN_1_0
 void                  clutter_text_set_text             (ClutterText          *self,
                                                          const gchar          *text);
+CLUTTER_AVAILABLE_IN_1_0
 void                  clutter_text_set_markup           (ClutterText          *self,
                                                          const gchar          *markup);
+CLUTTER_AVAILABLE_IN_1_0
 void                  clutter_text_set_color            (ClutterText          *self,
                                                          const ClutterColor   *color);
+CLUTTER_AVAILABLE_IN_1_0
 void                  clutter_text_get_color            (ClutterText          *self,
                                                          ClutterColor         *color);
+CLUTTER_AVAILABLE_IN_1_0
 void                  clutter_text_set_font_name        (ClutterText          *self,
                                                          const gchar          *font_name);
+CLUTTER_AVAILABLE_IN_1_0
 const gchar *         clutter_text_get_font_name        (ClutterText          *self);
+CLUTTER_AVAILABLE_IN_1_2
 void                  clutter_text_set_font_description (ClutterText          *self,
                                                          PangoFontDescription *font_desc);
+CLUTTER_AVAILABLE_IN_1_2
 PangoFontDescription *clutter_text_get_font_description (ClutterText          *self);
 
+CLUTTER_AVAILABLE_IN_1_0
 void                  clutter_text_set_ellipsize        (ClutterText          *self,
                                                          PangoEllipsizeMode    mode);
+CLUTTER_AVAILABLE_IN_1_0
 PangoEllipsizeMode    clutter_text_get_ellipsize        (ClutterText          *self);
+CLUTTER_AVAILABLE_IN_1_0
 void                  clutter_text_set_line_wrap        (ClutterText          *self,
                                                          gboolean              line_wrap);
+CLUTTER_AVAILABLE_IN_1_0
 gboolean              clutter_text_get_line_wrap        (ClutterText          *self);
+CLUTTER_AVAILABLE_IN_1_0
 void                  clutter_text_set_line_wrap_mode   (ClutterText          *self,
                                                          PangoWrapMode         wrap_mode);
+CLUTTER_AVAILABLE_IN_1_0
 PangoWrapMode         clutter_text_get_line_wrap_mode   (ClutterText          *self);
+CLUTTER_AVAILABLE_IN_1_0
 PangoLayout *         clutter_text_get_layout           (ClutterText          *self);
+CLUTTER_AVAILABLE_IN_1_0
 void                  clutter_text_set_attributes       (ClutterText          *self,
                                                          PangoAttrList        *attrs);
+CLUTTER_AVAILABLE_IN_1_0
 PangoAttrList *       clutter_text_get_attributes       (ClutterText          *self);
+CLUTTER_AVAILABLE_IN_1_0
 void                  clutter_text_set_use_markup       (ClutterText          *self,
                                                          gboolean              setting);
+CLUTTER_AVAILABLE_IN_1_0
 gboolean              clutter_text_get_use_markup       (ClutterText          *self);
+CLUTTER_AVAILABLE_IN_1_0
 void                  clutter_text_set_line_alignment   (ClutterText          *self,
                                                          PangoAlignment        alignment);
+CLUTTER_AVAILABLE_IN_1_0
 PangoAlignment        clutter_text_get_line_alignment   (ClutterText          *self);
+CLUTTER_AVAILABLE_IN_1_0
 void                  clutter_text_set_justify          (ClutterText          *self,
                                                          gboolean              justify);
+CLUTTER_AVAILABLE_IN_1_0
 gboolean              clutter_text_get_justify          (ClutterText          *self);
 
+CLUTTER_AVAILABLE_IN_1_0
 void                  clutter_text_insert_unichar       (ClutterText          *self,
                                                          gunichar              wc);
+CLUTTER_AVAILABLE_IN_1_0
 void                  clutter_text_delete_chars         (ClutterText          *self,
                                                          guint                 n_chars);
+CLUTTER_AVAILABLE_IN_1_0
 void                  clutter_text_insert_text          (ClutterText          *self,
                                                          const gchar          *text,
                                                          gssize                position);
+CLUTTER_AVAILABLE_IN_1_0
 void                  clutter_text_delete_text          (ClutterText          *self,
                                                          gssize                start_pos,
                                                          gssize                end_pos);
+CLUTTER_AVAILABLE_IN_1_0
 gchar *               clutter_text_get_chars            (ClutterText          *self,
                                                          gssize                start_pos,
                                                          gssize                end_pos);
+CLUTTER_AVAILABLE_IN_1_0
 void                  clutter_text_set_editable         (ClutterText          *self,
                                                          gboolean              editable);
+CLUTTER_AVAILABLE_IN_1_0
 gboolean              clutter_text_get_editable         (ClutterText          *self);
+CLUTTER_AVAILABLE_IN_1_0
 void                  clutter_text_set_activatable      (ClutterText          *self,
                                                          gboolean              activatable);
+CLUTTER_AVAILABLE_IN_1_0
 gboolean              clutter_text_get_activatable      (ClutterText          *self);
 
+CLUTTER_AVAILABLE_IN_1_0
 gint                  clutter_text_get_cursor_position  (ClutterText          *self);
+CLUTTER_AVAILABLE_IN_1_0
 void                  clutter_text_set_cursor_position  (ClutterText          *self,
                                                          gint                  position);
+CLUTTER_AVAILABLE_IN_1_0
 void                  clutter_text_set_cursor_visible   (ClutterText          *self,
                                                          gboolean              cursor_visible);
+CLUTTER_AVAILABLE_IN_1_0
 gboolean              clutter_text_get_cursor_visible   (ClutterText          *self);
+CLUTTER_AVAILABLE_IN_1_0
 void                  clutter_text_set_cursor_color     (ClutterText          *self,
                                                          const ClutterColor   *color);
+CLUTTER_AVAILABLE_IN_1_0
 void                  clutter_text_get_cursor_color     (ClutterText          *self,
                                                          ClutterColor         *color);
+CLUTTER_AVAILABLE_IN_1_0
 void                  clutter_text_set_cursor_size      (ClutterText          *self,
                                                          gint                  size);
+CLUTTER_AVAILABLE_IN_1_0
 guint                 clutter_text_get_cursor_size      (ClutterText          *self);
+CLUTTER_AVAILABLE_IN_1_16
 void                  clutter_text_get_cursor_rect      (ClutterText          *self,
                                                          ClutterRect          *rect);
+CLUTTER_AVAILABLE_IN_1_0
 void                  clutter_text_set_selectable       (ClutterText          *self,
                                                          gboolean              selectable);
+CLUTTER_AVAILABLE_IN_1_0
 gboolean              clutter_text_get_selectable       (ClutterText          *self);
+CLUTTER_AVAILABLE_IN_1_0
 void                  clutter_text_set_selection_bound  (ClutterText          *self,
                                                          gint                  selection_bound);
+CLUTTER_AVAILABLE_IN_1_0
 gint                  clutter_text_get_selection_bound  (ClutterText          *self);
+CLUTTER_AVAILABLE_IN_1_0
 void                  clutter_text_set_selection        (ClutterText          *self,
                                                          gssize                start_pos,
                                                          gssize                end_pos);
+CLUTTER_AVAILABLE_IN_1_0
 gchar *               clutter_text_get_selection        (ClutterText          *self);
+CLUTTER_AVAILABLE_IN_1_0
 void                  clutter_text_set_selection_color  (ClutterText          *self,
                                                          const ClutterColor   *color);
+CLUTTER_AVAILABLE_IN_1_0
 void                  clutter_text_get_selection_color  (ClutterText          *self,
                                                          ClutterColor         *color);
+CLUTTER_AVAILABLE_IN_1_0
 gboolean              clutter_text_delete_selection     (ClutterText          *self);
+CLUTTER_AVAILABLE_IN_1_0
 void                  clutter_text_set_password_char    (ClutterText          *self,
                                                          gunichar              wc);
+CLUTTER_AVAILABLE_IN_1_0
 gunichar              clutter_text_get_password_char    (ClutterText          *self);
+CLUTTER_AVAILABLE_IN_1_0
 void                  clutter_text_set_max_length       (ClutterText          *self,
                                                          gint                  max);
+CLUTTER_AVAILABLE_IN_1_0
 gint                  clutter_text_get_max_length       (ClutterText          *self);
+CLUTTER_AVAILABLE_IN_1_0
 void                  clutter_text_set_single_line_mode (ClutterText          *self,
                                                          gboolean              single_line);
+CLUTTER_AVAILABLE_IN_1_0
 gboolean              clutter_text_get_single_line_mode (ClutterText          *self);
 
+CLUTTER_AVAILABLE_IN_1_8
 void                  clutter_text_set_selected_text_color  (ClutterText          *self,
                                                              const ClutterColor   *color);
+CLUTTER_AVAILABLE_IN_1_8
 void                  clutter_text_get_selected_text_color  (ClutterText          *self,
                                                              ClutterColor         *color);
 
+CLUTTER_AVAILABLE_IN_1_0
 gboolean              clutter_text_activate             (ClutterText          *self);
 CLUTTER_AVAILABLE_IN_1_10
 gint                  clutter_text_coords_to_position   (ClutterText          *self,
                                                          gfloat                x,
                                                          gfloat                y);
+CLUTTER_AVAILABLE_IN_1_0
 gboolean              clutter_text_position_to_coords   (ClutterText          *self,
                                                          gint                  position,
                                                          gfloat               *x,
                                                          gfloat               *y,
                                                          gfloat               *line_height);
 
+CLUTTER_AVAILABLE_IN_1_2
 void                  clutter_text_set_preedit_string   (ClutterText          *self,
                                                          const gchar          *preedit_str,
                                                          PangoAttrList        *preedit_attrs,
                                                          guint                 cursor_pos);
 
+CLUTTER_AVAILABLE_IN_1_8
 void                  clutter_text_get_layout_offsets   (ClutterText           *self,
                                                          gint                  *x,
                                                          gint                  *y);
diff --git a/clutter/clutter-texture.h b/clutter/clutter-texture.h
index 4781b2c87..95fd17060 100644
--- a/clutter/clutter-texture.h
+++ b/clutter/clutter-texture.h
@@ -67,6 +67,7 @@ typedef enum {
  * Since: 0.4
  */
 #define CLUTTER_TEXTURE_ERROR   (clutter_texture_error_quark ())
+CLUTTER_AVAILABLE_IN_ALL
 GQuark clutter_texture_error_quark (void);
 
 typedef struct _ClutterTexture        ClutterTexture;
@@ -121,6 +122,7 @@ struct _ClutterTextureClass
   void (*_clutter_texture5) (void);
 };
 
+CLUTTER_AVAILABLE_IN_ALL
 GType clutter_texture_get_type (void) G_GNUC_CONST;
 
 G_END_DECLS
diff --git a/clutter/clutter-timeline.c b/clutter/clutter-timeline.c
index 440b2d2e9..f64fd930f 100644
--- a/clutter/clutter-timeline.c
+++ b/clutter/clutter-timeline.c
@@ -19,8 +19,6 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
- *
- *
  */
 
 /**
@@ -57,8 +55,8 @@
  * its #ClutterTimeline:duration.
  *
  * It is possible to connect to specific points in the timeline progress by
- * adding <emphasis>markers</emphasis> using clutter_timeline_add_marker_at_time()
- * and connecting to the #ClutterTimeline::marker-reached signal.
+ * adding markers using clutter_timeline_add_marker_at_time() and connecting
+ * to the #ClutterTimeline::marker-reached signal.
  *
  * Timelines can be made to loop once they reach the end of their duration, by
  * using clutter_timeline_set_repeat_count(); a looping timeline will still
@@ -75,13 +73,14 @@
  * Timelines are used in the Clutter animation framework by classes like
  * #ClutterAnimation, #ClutterAnimator, and #ClutterState.
  *
- * <refsect2 id="timeline-script">
- *  <title>Defining Timelines in ClutterScript</title>
- *  <para>A #ClutterTimeline can be described in #ClutterScript like any
- *  other object. Additionally, it is possible to define markers directly
- *  inside the JSON definition by using the <emphasis>markers</emphasis>
- *  JSON object member, such as:</para>
- *  <informalexample><programlisting><![CDATA[
+ * ## Defining Timelines in ClutterScript
+ *
+ * A #ClutterTimeline can be described in #ClutterScript like any
+ * other object. Additionally, it is possible to define markers directly
+ * inside the JSON definition by using the `markers` JSON object member,
+ * such as:
+ *
+ * |[
 {
   "type" : "ClutterTimeline",
   "duration" : 1000,
@@ -91,8 +90,7 @@
     { "name" : "three-quarters", "time" : 750 }
   ]
 }
- *  ]]></programlisting></informalexample>
- * </refsect2>
+ * ]|
  */
 
 #ifdef HAVE_CONFIG_H
@@ -112,12 +110,6 @@
 
 #include "deprecated/clutter-timeline.h"
 
-static void clutter_scriptable_iface_init (ClutterScriptableIface *iface);
-
-G_DEFINE_TYPE_WITH_CODE (ClutterTimeline, clutter_timeline, G_TYPE_OBJECT,
-                         G_IMPLEMENT_INTERFACE (CLUTTER_TYPE_SCRIPTABLE,
-                                                clutter_scriptable_iface_init));
-
 struct _ClutterTimelinePrivate
 {
   ClutterTimelineDirection direction;
@@ -210,6 +202,13 @@ enum
 
 static guint timeline_signals[LAST_SIGNAL] = { 0, };
 
+static void clutter_scriptable_iface_init (ClutterScriptableIface *iface);
+
+G_DEFINE_TYPE_WITH_CODE (ClutterTimeline, clutter_timeline, G_TYPE_OBJECT,
+                         G_ADD_PRIVATE (ClutterTimeline)
+                         G_IMPLEMENT_INTERFACE (CLUTTER_TYPE_SCRIPTABLE,
+                                                clutter_scriptable_iface_init))
+
 static TimelineMarker *
 timeline_marker_new_time (const gchar *name,
                           guint        msecs)
@@ -575,8 +574,6 @@ clutter_timeline_class_init (ClutterTimelineClass *klass)
 {
   GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
-  g_type_class_add_private (klass, sizeof (ClutterTimelinePrivate));
-
   /**
    * ClutterTimeline:loop:
    *
@@ -846,21 +843,17 @@ clutter_timeline_class_init (ClutterTimelineClass *klass)
 static void
 clutter_timeline_init (ClutterTimeline *self)
 {
-  ClutterTimelinePrivate *priv;
+  self->priv = clutter_timeline_get_instance_private (self);
 
-  self->priv = priv =
-    G_TYPE_INSTANCE_GET_PRIVATE (self, CLUTTER_TYPE_TIMELINE,
-                                 ClutterTimelinePrivate);
-
-  priv->progress_mode = CLUTTER_LINEAR;
+  self->priv->progress_mode = CLUTTER_LINEAR;
 
   /* default steps() parameters are 1, end */
-  priv->n_steps = 1;
-  priv->step_mode = CLUTTER_STEP_MODE_END;
+  self->priv->n_steps = 1;
+  self->priv->step_mode = CLUTTER_STEP_MODE_END;
 
   /* default cubic-bezier() paramereters are (0, 0, 1, 1) */
-  clutter_point_init (&priv->cb_1, 0, 0);
-  clutter_point_init (&priv->cb_2, 1, 1);
+  clutter_point_init (&self->priv->cb_1, 0, 0);
+  clutter_point_init (&self->priv->cb_2, 1, 1);
 }
 
 struct CheckIfMarkerHitClosure
@@ -1371,10 +1364,9 @@ clutter_timeline_skip (ClutterTimeline *timeline,
  * Advance timeline to the requested point. The point is given as a
  * time in milliseconds since the timeline started.
  *
- * <note><para>The @timeline will not emit the #ClutterTimeline::new-frame
+ * The @timeline will not emit the #ClutterTimeline::new-frame
  * signal for the given time. The first ::new-frame signal after the call to
  * clutter_timeline_advance() will be emit the skipped markers.
- * </para></note>
  */
 void
 clutter_timeline_advance (ClutterTimeline *timeline,
@@ -1428,15 +1420,15 @@ clutter_timeline_is_playing (ClutterTimeline *timeline)
  * Create a new #ClutterTimeline instance which has property values
  * matching that of supplied timeline. The cloned timeline will not
  * be started and will not be positioned to the current position of
- * the original @timeline: you will have to start it with clutter_timeline_start().
+ * the original @timeline: you will have to start it with
+ * clutter_timeline_start().
  *
- * <note><para>The only cloned properties are:</para>
- * <itemizedlist>
- *   <listitem><simpara>#ClutterTimeline:duration</simpara></listitem>
- *   <listitem><simpara>#ClutterTimeline:loop</simpara></listitem>
- *   <listitem><simpara>#ClutterTimeline:delay</simpara></listitem>
- *   <listitem><simpara>#ClutterTimeline:direction</simpara></listitem>
- * </itemizedlist></note>
+ * The only cloned properties are:
+ *
+ *  - #ClutterTimeline:duration
+ *  - #ClutterTimeline:loop
+ *  - #ClutterTimeline:delay
+ *  - #ClutterTimeline:direction
  *
  * Return value: (transfer full): a new #ClutterTimeline, cloned
  *   from @timeline
@@ -1939,10 +1931,10 @@ clutter_timeline_list_markers (ClutterTimeline *timeline,
  *
  * Advances @timeline to the time of the given @marker_name.
  *
- * <note><para>Like clutter_timeline_advance(), this function will not
+ * Like clutter_timeline_advance(), this function will not
  * emit the #ClutterTimeline::new-frame for the time where @marker_name
  * is set, nor it will emit #ClutterTimeline::marker-reached for
- * @marker_name.</para></note>
+ * @marker_name.
  *
  * Since: 0.8
  */
@@ -2452,9 +2444,9 @@ clutter_timeline_get_step_progress (ClutterTimeline *timeline,
 {
   g_return_val_if_fail (CLUTTER_IS_TIMELINE (timeline), FALSE);
 
-  if (timeline->priv->progress_mode != CLUTTER_STEPS ||
-      timeline->priv->progress_mode != CLUTTER_STEP_START ||
-      timeline->priv->progress_mode != CLUTTER_STEP_END)
+  if (!(timeline->priv->progress_mode == CLUTTER_STEPS ||
+        timeline->priv->progress_mode == CLUTTER_STEP_START ||
+        timeline->priv->progress_mode == CLUTTER_STEP_END))
     return FALSE;
 
   if (n_steps != NULL)
@@ -2526,11 +2518,11 @@ clutter_timeline_get_cubic_bezier_progress (ClutterTimeline *timeline,
 {
   g_return_val_if_fail (CLUTTER_IS_TIMELINE (timeline), FALSE);
 
-  if (timeline->priv->progress_mode != CLUTTER_CUBIC_BEZIER ||
-      timeline->priv->progress_mode != CLUTTER_EASE ||
-      timeline->priv->progress_mode != CLUTTER_EASE_IN ||
-      timeline->priv->progress_mode != CLUTTER_EASE_OUT ||
-      timeline->priv->progress_mode != CLUTTER_EASE_IN_OUT)
+  if (!(timeline->priv->progress_mode == CLUTTER_CUBIC_BEZIER ||
+        timeline->priv->progress_mode == CLUTTER_EASE ||
+        timeline->priv->progress_mode == CLUTTER_EASE_IN ||
+        timeline->priv->progress_mode == CLUTTER_EASE_OUT ||
+        timeline->priv->progress_mode == CLUTTER_EASE_IN_OUT))
     return FALSE;
 
   if (c_1 != NULL)
diff --git a/clutter/clutter-timeline.h b/clutter/clutter-timeline.h
index c31f8df2e..267dc63d8 100644
--- a/clutter/clutter-timeline.h
+++ b/clutter/clutter-timeline.h
@@ -115,53 +115,78 @@ struct _ClutterTimelineClass
   void (*_clutter_timeline_4) (void);
 };
 
+CLUTTER_AVAILABLE_IN_ALL
 GType clutter_timeline_get_type (void) G_GNUC_CONST;
 
+CLUTTER_AVAILABLE_IN_ALL
 ClutterTimeline *               clutter_timeline_new                            (guint                     msecs);
 
+CLUTTER_AVAILABLE_IN_ALL
 guint                           clutter_timeline_get_duration                   (ClutterTimeline          *timeline);
+CLUTTER_AVAILABLE_IN_ALL
 void                            clutter_timeline_set_duration                   (ClutterTimeline          *timeline,
                                                                                  guint                     msecs);
+CLUTTER_AVAILABLE_IN_ALL
 ClutterTimelineDirection        clutter_timeline_get_direction                  (ClutterTimeline          *timeline);
+CLUTTER_AVAILABLE_IN_ALL
 void                            clutter_timeline_set_direction                  (ClutterTimeline          *timeline,
                                                                                  ClutterTimelineDirection  direction);
+CLUTTER_AVAILABLE_IN_ALL
 void                            clutter_timeline_start                          (ClutterTimeline          *timeline);
+CLUTTER_AVAILABLE_IN_ALL
 void                            clutter_timeline_pause                          (ClutterTimeline          *timeline);
+CLUTTER_AVAILABLE_IN_ALL
 void                            clutter_timeline_stop                           (ClutterTimeline          *timeline);
+CLUTTER_AVAILABLE_IN_1_6
 void                            clutter_timeline_set_auto_reverse               (ClutterTimeline          *timeline,
                                                                                  gboolean                  reverse);
+CLUTTER_AVAILABLE_IN_1_6
 gboolean                        clutter_timeline_get_auto_reverse               (ClutterTimeline          *timeline);
 CLUTTER_AVAILABLE_IN_1_10
 void                            clutter_timeline_set_repeat_count               (ClutterTimeline          *timeline,
                                                                                  gint                      count);
 CLUTTER_AVAILABLE_IN_1_10
 gint                            clutter_timeline_get_repeat_count               (ClutterTimeline          *timeline);
+CLUTTER_AVAILABLE_IN_ALL
 void                            clutter_timeline_rewind                         (ClutterTimeline          *timeline);
+CLUTTER_AVAILABLE_IN_ALL
 void                            clutter_timeline_skip                           (ClutterTimeline          *timeline,
                                                                                  guint                     msecs);
+CLUTTER_AVAILABLE_IN_ALL
 void                            clutter_timeline_advance                        (ClutterTimeline          *timeline,
                                                                                  guint                     msecs);
+CLUTTER_AVAILABLE_IN_ALL
 guint                           clutter_timeline_get_elapsed_time               (ClutterTimeline          *timeline);
+CLUTTER_AVAILABLE_IN_ALL
 gdouble                         clutter_timeline_get_progress                   (ClutterTimeline          *timeline);
+CLUTTER_AVAILABLE_IN_ALL
 gboolean                        clutter_timeline_is_playing                     (ClutterTimeline          *timeline);
+CLUTTER_AVAILABLE_IN_ALL
 void                            clutter_timeline_set_delay                      (ClutterTimeline          *timeline,
                                                                                  guint                     msecs);
+CLUTTER_AVAILABLE_IN_ALL
 guint                           clutter_timeline_get_delay                      (ClutterTimeline          *timeline);
+CLUTTER_AVAILABLE_IN_ALL
 guint                           clutter_timeline_get_delta                      (ClutterTimeline          *timeline);
 CLUTTER_AVAILABLE_IN_1_14
 void                            clutter_timeline_add_marker                     (ClutterTimeline          *timeline,
                                                                                  const gchar              *marker_name,
                                                                                  gdouble                   progress);
+CLUTTER_AVAILABLE_IN_ALL
 void                            clutter_timeline_add_marker_at_time             (ClutterTimeline          *timeline,
                                                                                  const gchar              *marker_name,
                                                                                  guint                     msecs);
+CLUTTER_AVAILABLE_IN_ALL
 void                            clutter_timeline_remove_marker                  (ClutterTimeline          *timeline,
                                                                                  const gchar              *marker_name);
+CLUTTER_AVAILABLE_IN_ALL
 gchar **                        clutter_timeline_list_markers                   (ClutterTimeline          *timeline,
                                                                                  gint                      msecs,
                                                                                  gsize                    *n_markers) G_GNUC_MALLOC;
+CLUTTER_AVAILABLE_IN_ALL
 gboolean                        clutter_timeline_has_marker                     (ClutterTimeline          *timeline,
                                                                                  const gchar              *marker_name);
+CLUTTER_AVAILABLE_IN_ALL
 void                            clutter_timeline_advance_to_marker              (ClutterTimeline          *timeline,
                                                                                  const gchar              *marker_name);
 CLUTTER_AVAILABLE_IN_1_10
diff --git a/clutter/clutter-transition-group.c b/clutter/clutter-transition-group.c
index 1b8e664bb..f479dc44c 100644
--- a/clutter/clutter-transition-group.c
+++ b/clutter/clutter-transition-group.c
@@ -51,7 +51,7 @@ struct _ClutterTransitionGroupPrivate
   GHashTable *transitions;
 };
 
-G_DEFINE_TYPE (ClutterTransitionGroup, clutter_transition_group, CLUTTER_TYPE_TRANSITION)
+G_DEFINE_TYPE_WITH_PRIVATE (ClutterTransitionGroup, clutter_transition_group, CLUTTER_TYPE_TRANSITION)
 
 static void
 clutter_transition_group_new_frame (ClutterTimeline *timeline,
@@ -155,8 +155,6 @@ clutter_transition_group_class_init (ClutterTransitionGroupClass *klass)
   ClutterTimelineClass *timeline_class = CLUTTER_TIMELINE_CLASS (klass);
   ClutterTransitionClass *transition_class = CLUTTER_TRANSITION_CLASS (klass);
 
-  g_type_class_add_private (klass, sizeof (ClutterTransitionGroupPrivate));
-
   gobject_class->finalize = clutter_transition_group_finalize;
 
   timeline_class->started = clutter_transition_group_started;
@@ -169,10 +167,7 @@ clutter_transition_group_class_init (ClutterTransitionGroupClass *klass)
 static void
 clutter_transition_group_init (ClutterTransitionGroup *self)
 {
-  self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self,
-                                            CLUTTER_TYPE_TRANSITION_GROUP,
-                                            ClutterTransitionGroupPrivate);
-
+  self->priv = clutter_transition_group_get_instance_private (self);
   self->priv->transitions =
     g_hash_table_new_full (NULL, NULL, (GDestroyNotify) g_object_unref, NULL);
 }
diff --git a/clutter/clutter-transition-group.h b/clutter/clutter-transition-group.h
index efa9ddb22..0408fc59d 100644
--- a/clutter/clutter-transition-group.h
+++ b/clutter/clutter-transition-group.h
@@ -42,7 +42,7 @@ typedef struct _ClutterTransitionGroupClass             ClutterTransitionGroupCl
 /**
  * ClutterTransitionGroup:
  *
- * The <structname>ClutterTransitionGroup</structname> structure contains
+ * The #ClutterTransitionGroup structure contains
  * private data and should only be accessed using the provided API.
  *
  * Since: 1.12
@@ -58,7 +58,7 @@ struct _ClutterTransitionGroup
 /**
  * ClutterTransitionGroupClass:
  *
- * The <structname>ClutterTransitionGroupClass</structname> structure
+ * The #ClutterTransitionGroupClass structure
  * contains only private data.
  *
  * Since: 1.12
diff --git a/clutter/clutter-transition.c b/clutter/clutter-transition.c
index ec6055b0c..03f91d0af 100644
--- a/clutter/clutter-transition.c
+++ b/clutter/clutter-transition.c
@@ -26,8 +26,8 @@
  * @Title: ClutterTransition
  * @Short_Description: Transition between two values
  *
- * #ClutterTransition is a subclass of #ClutterTimeline that computes
- * the interpolation between two values, stored by a #ClutterInterval.
+ * #ClutterTransition is an abstract subclass of #ClutterTimeline that
+ * computes the interpolation between two values, stored by a #ClutterInterval.
  */
 
 #ifdef HAVE_CONFIG_H
@@ -67,7 +67,7 @@ static GParamSpec *obj_props[PROP_LAST] = { NULL, };
 
 static GQuark quark_animatable_set = 0;
 
-G_DEFINE_ABSTRACT_TYPE (ClutterTransition, clutter_transition, CLUTTER_TYPE_TIMELINE)
+G_DEFINE_ABSTRACT_TYPE_WITH_PRIVATE (ClutterTransition, clutter_transition, CLUTTER_TYPE_TIMELINE)
 
 static void
 clutter_transition_attach (ClutterTransition *transition,
@@ -220,8 +220,6 @@ clutter_transition_class_init (ClutterTransitionClass *klass)
   quark_animatable_set =
     g_quark_from_static_string ("-clutter-transition-animatable-set");
 
-  g_type_class_add_private (klass, sizeof (ClutterTransitionPrivate));
-
   klass->compute_value = clutter_transition_real_compute_value;
   klass->attached = clutter_transition_real_attached;
   klass->detached = clutter_transition_real_detached;
@@ -269,7 +267,7 @@ clutter_transition_class_init (ClutterTransitionClass *klass)
    *
    * Whether the #ClutterTransition should be automatically detached
    * from the #ClutterTransition:animatable instance whenever the
-   * #ClutterTimeline::completed signal is emitted.
+   * #ClutterTimeline::stopped signal is emitted.
    *
    * The #ClutterTransition:remove-on-complete property takes into
    * account the value of the #ClutterTimeline:repeat-count property,
@@ -291,8 +289,7 @@ clutter_transition_class_init (ClutterTransitionClass *klass)
 static void
 clutter_transition_init (ClutterTransition *self)
 {
-  self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, CLUTTER_TYPE_TRANSITION,
-                                            ClutterTransitionPrivate);
+  self->priv = clutter_transition_get_instance_private (self);
 }
 
 /**
@@ -512,7 +509,7 @@ clutter_transition_set_value (ClutterTransition *transition,
 }
 
 /**
- * clutter_transition_set_from_value:
+ * clutter_transition_set_from_value: (rename-to clutter_transition_set_from)
  * @transition: a #ClutterTransition
  * @value: a #GValue with the initial value of the transition
  *
@@ -531,8 +528,6 @@ clutter_transition_set_value (ClutterTransition *transition,
  *
  * This function is meant to be used by language bindings.
  *
- * Rename to: clutter_transition_set_from
- *
  * Since: 1.12
  */
 void
@@ -548,7 +543,7 @@ clutter_transition_set_from_value (ClutterTransition *transition,
 }
 
 /**
- * clutter_transition_set_to_value:
+ * clutter_transition_set_to_value: (rename-to clutter_transition_set_to)
  * @transition: a #ClutterTransition
  * @value: a #GValue with the final value of the transition
  *
@@ -567,8 +562,6 @@ clutter_transition_set_from_value (ClutterTransition *transition,
  *
  * This function is meant to be used by language bindings.
  *
- * Rename to: clutter_transition_set_to
- *
  * Since: 1.12
  */
 void
diff --git a/clutter/clutter-transition.h b/clutter/clutter-transition.h
index c52764d17..f536a4ee5 100644
--- a/clutter/clutter-transition.h
+++ b/clutter/clutter-transition.h
@@ -46,7 +46,7 @@ typedef struct _ClutterTransitionClass          ClutterTransitionClass;
 /**
  * ClutterTransition:
  *
- * The <structname>ClutterTransition</structname> structure contains private
+ * The #ClutterTransition structure contains private
  * data and should only be accessed using the provided API.
  *
  * Since: 1.10
@@ -68,7 +68,7 @@ struct _ClutterTransition
  * @compute_value: virtual function; called each frame to compute and apply
  *   the interpolation of the interval
  *
- * The <structname>ClutterTransitionClass</structname> structure contains
+ * The #ClutterTransitionClass structure contains
  * private data.
  *
  * Since: 1.10
diff --git a/clutter/clutter-types.h b/clutter/clutter-types.h
index 9a66394e2..f9b835a7b 100644
--- a/clutter/clutter-types.h
+++ b/clutter/clutter-types.h
@@ -101,7 +101,7 @@ typedef union _ClutterEvent                     ClutterEvent;
 /**
  * ClutterEventSequence:
  *
- * The <structname>ClutterEventSequence</structname> structure is an opaque
+ * The #ClutterEventSequence structure is an opaque
  * type used to denote the event sequence of a touch event.
  *
  * Since: 1.12
@@ -115,14 +115,14 @@ typedef struct _ClutterShader                   ClutterShader; /* deprecated */
 /**
  * ClutterPaintVolume:
  *
- * <structname>ClutterPaintVolume</structname> is an opaque structure
+ * #ClutterPaintVolume is an opaque structure
  * whose members cannot be directly accessed.
  *
- * A <structname>ClutterPaintVolume</structname> represents an
+ * A #ClutterPaintVolume represents an
  * a bounding volume whose internal representation isn't defined but
  * can be set and queried in terms of an axis aligned bounding box.
  *
- * A <structname>ClutterPaintVolume</structname> for a #ClutterActor
+ * A #ClutterPaintVolume for a #ClutterActor
  * is defined to be relative from the current actor modelview matrix.
  *
  * Other internal representation and methods for describing the
@@ -408,18 +408,24 @@ struct _ClutterVertex
  */
 #define CLUTTER_VERTEX_INIT_ZERO        CLUTTER_VERTEX_INIT (0.f, 0.f, 0.f)
 
+CLUTTER_AVAILABLE_IN_ALL
 GType          clutter_vertex_get_type (void) G_GNUC_CONST;
+CLUTTER_AVAILABLE_IN_ALL
 ClutterVertex *clutter_vertex_new      (gfloat               x,
                                         gfloat               y,
                                         gfloat               z);
 CLUTTER_AVAILABLE_IN_1_12
 ClutterVertex *clutter_vertex_alloc    (void);
+CLUTTER_AVAILABLE_IN_ALL
 ClutterVertex *clutter_vertex_init     (ClutterVertex       *vertex,
                                         gfloat               x,
                                         gfloat               y,
                                         gfloat               z);
+CLUTTER_AVAILABLE_IN_ALL
 ClutterVertex *clutter_vertex_copy     (const ClutterVertex *vertex);
+CLUTTER_AVAILABLE_IN_ALL
 void           clutter_vertex_free     (ClutterVertex       *vertex);
+CLUTTER_AVAILABLE_IN_ALL
 gboolean       clutter_vertex_equal    (const ClutterVertex *vertex_a,
                                         const ClutterVertex *vertex_b);
 
@@ -475,55 +481,76 @@ struct _ClutterActorBox
  */
 #define CLUTTER_ACTOR_BOX_INIT_ZERO                     CLUTTER_ACTOR_BOX_INIT (0.f, 0.f, 0.f, 0.f)
 
+CLUTTER_AVAILABLE_IN_ALL
 GType            clutter_actor_box_get_type      (void) G_GNUC_CONST;
+CLUTTER_AVAILABLE_IN_ALL
 ClutterActorBox *clutter_actor_box_new           (gfloat                 x_1,
                                                   gfloat                 y_1,
                                                   gfloat                 x_2,
                                                   gfloat                 y_2);
 CLUTTER_AVAILABLE_IN_1_12
 ClutterActorBox *clutter_actor_box_alloc         (void);
+CLUTTER_AVAILABLE_IN_ALL
 ClutterActorBox *clutter_actor_box_init          (ClutterActorBox       *box,
                                                   gfloat                 x_1,
                                                   gfloat                 y_1,
                                                   gfloat                 x_2,
                                                   gfloat                 y_2);
+CLUTTER_AVAILABLE_IN_ALL
 void             clutter_actor_box_init_rect     (ClutterActorBox       *box,
                                                   gfloat                 x,
                                                   gfloat                 y,
                                                   gfloat                 width,
                                                   gfloat                 height);
+CLUTTER_AVAILABLE_IN_ALL
 ClutterActorBox *clutter_actor_box_copy          (const ClutterActorBox *box);
+CLUTTER_AVAILABLE_IN_ALL
 void             clutter_actor_box_free          (ClutterActorBox       *box);
+CLUTTER_AVAILABLE_IN_ALL
 gboolean         clutter_actor_box_equal         (const ClutterActorBox *box_a,
                                                   const ClutterActorBox *box_b);
+CLUTTER_AVAILABLE_IN_ALL
 gfloat           clutter_actor_box_get_x         (const ClutterActorBox *box);
+CLUTTER_AVAILABLE_IN_ALL
 gfloat           clutter_actor_box_get_y         (const ClutterActorBox *box);
+CLUTTER_AVAILABLE_IN_ALL
 gfloat           clutter_actor_box_get_width     (const ClutterActorBox *box);
+CLUTTER_AVAILABLE_IN_ALL
 gfloat           clutter_actor_box_get_height    (const ClutterActorBox *box);
+CLUTTER_AVAILABLE_IN_ALL
 void             clutter_actor_box_get_origin    (const ClutterActorBox *box,
                                                   gfloat                *x,
                                                   gfloat                *y);
+CLUTTER_AVAILABLE_IN_ALL
 void             clutter_actor_box_get_size      (const ClutterActorBox *box,
                                                   gfloat                *width,
                                                   gfloat                *height);
+CLUTTER_AVAILABLE_IN_ALL
 gfloat           clutter_actor_box_get_area      (const ClutterActorBox *box);
+CLUTTER_AVAILABLE_IN_ALL
 gboolean         clutter_actor_box_contains      (const ClutterActorBox *box,
                                                   gfloat                 x,
                                                   gfloat                 y);
+CLUTTER_AVAILABLE_IN_ALL
 void             clutter_actor_box_from_vertices (ClutterActorBox       *box,
                                                   const ClutterVertex    verts[]);
+CLUTTER_AVAILABLE_IN_ALL
 void             clutter_actor_box_interpolate   (const ClutterActorBox *initial,
                                                   const ClutterActorBox *final,
                                                   gdouble                progress,
                                                   ClutterActorBox       *result);
+CLUTTER_AVAILABLE_IN_ALL
 void             clutter_actor_box_clamp_to_pixel (ClutterActorBox       *box);
+CLUTTER_AVAILABLE_IN_ALL
 void             clutter_actor_box_union          (const ClutterActorBox *a,
                                                    const ClutterActorBox *b,
                                                    ClutterActorBox       *result);
 
+CLUTTER_AVAILABLE_IN_ALL
 void             clutter_actor_box_set_origin     (ClutterActorBox       *box,
                                                    gfloat                 x,
                                                    gfloat                 y);
+CLUTTER_AVAILABLE_IN_ALL
 void             clutter_actor_box_set_size       (ClutterActorBox       *box,
                                                    gfloat                 width,
                                                    gfloat                 height);
@@ -537,9 +564,9 @@ void             clutter_actor_box_set_size       (ClutterActorBox       *box,
  *
  * The rectangle containing an actor's bounding box, measured in pixels.
  *
- * <warning>You should not use #ClutterGeometry, or operate on its fields
+ * You should not use #ClutterGeometry, or operate on its fields
  * directly; you should use #cairo_rectangle_int_t or #ClutterRect if you
- * need a rectangle type, depending on the precision required.</warning>
+ * need a rectangle type, depending on the precision required.
  *
  * Deprecated: 1.16
  */
@@ -552,6 +579,7 @@ struct _ClutterGeometry
   guint  height;
 };
 
+CLUTTER_AVAILABLE_IN_ALL
 GType clutter_geometry_get_type (void) G_GNUC_CONST;
 
 CLUTTER_DEPRECATED_IN_1_16
@@ -577,9 +605,13 @@ struct _ClutterKnot
   gint y;
 };
 
+CLUTTER_AVAILABLE_IN_ALL
 GType        clutter_knot_get_type (void) G_GNUC_CONST;
+CLUTTER_AVAILABLE_IN_ALL
 ClutterKnot *clutter_knot_copy     (const ClutterKnot *knot);
+CLUTTER_AVAILABLE_IN_ALL
 void         clutter_knot_free     (ClutterKnot       *knot);
+CLUTTER_AVAILABLE_IN_ALL
 gboolean     clutter_knot_equal    (const ClutterKnot *knot_a,
                                     const ClutterKnot *knot_b);
 
@@ -604,10 +636,14 @@ struct _ClutterPathNode
   ClutterKnot points[3];
 };
 
+CLUTTER_AVAILABLE_IN_1_0
 GType clutter_path_node_get_type (void) G_GNUC_CONST;
 
+CLUTTER_AVAILABLE_IN_1_0
 ClutterPathNode *clutter_path_node_copy  (const ClutterPathNode *node);
+CLUTTER_AVAILABLE_IN_1_0
 void             clutter_path_node_free  (ClutterPathNode       *node);
+CLUTTER_AVAILABLE_IN_1_0
 gboolean         clutter_path_node_equal (const ClutterPathNode *node_a,
                                           const ClutterPathNode *node_b);
 
@@ -615,30 +651,43 @@ gboolean         clutter_path_node_equal (const ClutterPathNode *node_a,
  * ClutterPaintVolume
  */
 
+CLUTTER_AVAILABLE_IN_1_2
 GType clutter_paint_volume_get_type (void) G_GNUC_CONST;
 
+CLUTTER_AVAILABLE_IN_1_2
 ClutterPaintVolume *clutter_paint_volume_copy                (const ClutterPaintVolume *pv);
+CLUTTER_AVAILABLE_IN_1_2
 void                clutter_paint_volume_free                (ClutterPaintVolume       *pv);
 
+CLUTTER_AVAILABLE_IN_1_2
 void                clutter_paint_volume_set_origin          (ClutterPaintVolume       *pv,
                                                               const ClutterVertex      *origin);
+CLUTTER_AVAILABLE_IN_1_2
 void                clutter_paint_volume_get_origin          (const ClutterPaintVolume *pv,
                                                               ClutterVertex            *vertex);
+CLUTTER_AVAILABLE_IN_1_2
 void                clutter_paint_volume_set_width           (ClutterPaintVolume       *pv,
                                                               gfloat                    width);
+CLUTTER_AVAILABLE_IN_1_2
 gfloat              clutter_paint_volume_get_width           (const ClutterPaintVolume *pv);
+CLUTTER_AVAILABLE_IN_1_2
 void                clutter_paint_volume_set_height          (ClutterPaintVolume       *pv,
                                                               gfloat                    height);
+CLUTTER_AVAILABLE_IN_1_2
 gfloat              clutter_paint_volume_get_height          (const ClutterPaintVolume *pv);
+CLUTTER_AVAILABLE_IN_1_2
 void                clutter_paint_volume_set_depth           (ClutterPaintVolume       *pv,
                                                               gfloat                    depth);
+CLUTTER_AVAILABLE_IN_1_2
 gfloat              clutter_paint_volume_get_depth           (const ClutterPaintVolume *pv);
+CLUTTER_AVAILABLE_IN_1_2
 void                clutter_paint_volume_union               (ClutterPaintVolume       *pv,
                                                               const ClutterPaintVolume *another_pv);
 CLUTTER_AVAILABLE_IN_1_10
 void                clutter_paint_volume_union_box           (ClutterPaintVolume       *pv,
                                                               const ClutterActorBox    *box);
 
+CLUTTER_AVAILABLE_IN_1_2
 gboolean            clutter_paint_volume_set_from_allocation (ClutterPaintVolume       *pv,
                                                               ClutterActor             *actor);
 
@@ -661,10 +710,14 @@ struct _ClutterMargin
   float bottom;
 };
 
+CLUTTER_AVAILABLE_IN_1_10
 GType clutter_margin_get_type (void) G_GNUC_CONST;
 
+CLUTTER_AVAILABLE_IN_1_10
 ClutterMargin * clutter_margin_new      (void) G_GNUC_MALLOC;
+CLUTTER_AVAILABLE_IN_1_10
 ClutterMargin * clutter_margin_copy     (const ClutterMargin *margin_);
+CLUTTER_AVAILABLE_IN_1_10
 void            clutter_margin_free     (ClutterMargin       *margin_);
 
 /**
@@ -695,6 +748,7 @@ typedef gboolean (* ClutterProgressFunc) (const GValue *a,
                                           gdouble       progress,
                                           GValue       *retval);
 
+CLUTTER_AVAILABLE_IN_1_0
 void clutter_interval_register_progress_func (GType               value_type,
                                               ClutterProgressFunc func);
 
diff --git a/clutter/clutter-units.c b/clutter/clutter-units.c
index f07f0f619..f49df9b99 100644
--- a/clutter/clutter-units.c
+++ b/clutter/clutter-units.c
@@ -466,7 +466,7 @@ clutter_units_to_pixels (ClutterUnits *units)
  *   omg!1!ponies
  * ]|
  *
- * <note><para>If no unit is specified, pixels are assumed.</para></note>
+ * If no unit is specified, pixels are assumed.
  *
  * Return value: %TRUE if the string was successfully parsed,
  *   and %FALSE otherwise
@@ -595,9 +595,9 @@ clutter_unit_type_name (ClutterUnitType unit_type)
  * See clutter_units_from_string() for the units syntax and for
  * examples of output
  *
- * <note>Fractional values are truncated to the second decimal
+ * Fractional values are truncated to the second decimal
  * position for em, mm and cm, and to the first decimal position for
- * typographic points. Pixels are integers.</note>
+ * typographic points. Pixels are integers.
  *
  * Return value: a newly allocated string containing the encoded
  *   #ClutterUnits value. Use g_free() to free the string
diff --git a/clutter/clutter-units.h b/clutter/clutter-units.h
index e50242bf9..c558b10fa 100644
--- a/clutter/clutter-units.h
+++ b/clutter/clutter-units.h
@@ -70,31 +70,45 @@ struct _ClutterUnits
   gint64 __padding_2;
 };
 
+CLUTTER_AVAILABLE_IN_1_0
 GType           clutter_units_get_type         (void) G_GNUC_CONST;
+CLUTTER_AVAILABLE_IN_1_0
 ClutterUnitType clutter_units_get_unit_type    (const ClutterUnits *units);
+CLUTTER_AVAILABLE_IN_1_0
 gfloat          clutter_units_get_unit_value   (const ClutterUnits *units);
 
+CLUTTER_AVAILABLE_IN_1_0
 ClutterUnits *  clutter_units_copy             (const ClutterUnits *units);
+CLUTTER_AVAILABLE_IN_1_0
 void            clutter_units_free             (ClutterUnits       *units);
 
+CLUTTER_AVAILABLE_IN_1_0
 void            clutter_units_from_pixels      (ClutterUnits       *units,
                                                 gint                px);
+CLUTTER_AVAILABLE_IN_1_0
 void            clutter_units_from_em          (ClutterUnits       *units,
                                                 gfloat              em);
+CLUTTER_AVAILABLE_IN_1_0
 void            clutter_units_from_em_for_font (ClutterUnits       *units,
                                                 const gchar        *font_name,
                                                 gfloat              em);
+CLUTTER_AVAILABLE_IN_1_0
 void            clutter_units_from_mm          (ClutterUnits       *units,
                                                 gfloat              mm);
+CLUTTER_AVAILABLE_IN_1_0
 void            clutter_units_from_cm          (ClutterUnits       *units,
                                                 gfloat              cm);
+CLUTTER_AVAILABLE_IN_1_0
 void            clutter_units_from_pt          (ClutterUnits       *units,
                                                 gfloat              pt);
 
+CLUTTER_AVAILABLE_IN_1_0
 gfloat          clutter_units_to_pixels        (ClutterUnits       *units);
 
+CLUTTER_AVAILABLE_IN_1_0
 gboolean        clutter_units_from_string      (ClutterUnits       *units,
                                                 const gchar        *str);
+CLUTTER_AVAILABLE_IN_1_0
 gchar *         clutter_units_to_string        (const ClutterUnits *units);
 
 /* shorthands for the constructors */
@@ -146,8 +160,10 @@ struct _ClutterParamSpecUnits
   gfloat maximum;
 };
 
+CLUTTER_AVAILABLE_IN_1_0
 GType clutter_param_units_get_type (void) G_GNUC_CONST;
 
+CLUTTER_AVAILABLE_IN_1_0
 GParamSpec *            clutter_param_spec_units (const gchar        *name,
                                                   const gchar        *nick,
                                                   const gchar        *blurb,
@@ -157,8 +173,10 @@ GParamSpec *            clutter_param_spec_units (const gchar        *name,
                                                   gfloat              default_value,
                                                   GParamFlags         flags);
 
+CLUTTER_AVAILABLE_IN_1_0
 void                    clutter_value_set_units  (GValue             *value,
                                                   const ClutterUnits *units);
+CLUTTER_AVAILABLE_IN_1_0
 const ClutterUnits *    clutter_value_get_units  (const GValue       *value);
 
 G_END_DECLS
diff --git a/clutter/clutter-version.h.in b/clutter/clutter-version.h.in
index a4703e120..bcee39f69 100644
--- a/clutter/clutter-version.h.in
+++ b/clutter/clutter-version.h.in
@@ -210,10 +210,40 @@ G_BEGIN_DECLS
  * A macro that evaluates to the 1.16 version of Clutter, in a format
  * that can be used by the C pre-processor.
  *
- * Since: 1.14
+ * Since: 1.16
  */
 #define CLUTTER_VERSION_1_16    (G_ENCODE_VERSION (1, 16))
 
+/**
+ * CLUTTER_VERSION_1_18:
+ *
+ * A macro that evaluates to the 1.18 version of Clutter, in a format
+ * that can be used by the C pre-processor.
+ *
+ * Since: 1.18
+ */
+#define CLUTTER_VERSION_1_18    (G_ENCODE_VERSION (1, 18))
+
+/**
+ * CLUTTER_VERSION_1_20:
+ *
+ * A macro that evaluates to the 1.20 version of Clutter, in a format
+ * that can be used by the C pre-processor.
+ *
+ * Since: 1.20
+ */
+#define CLUTTER_VERSION_1_20    (G_ENCODE_VERSION (1, 20))
+
+/**
+ * CLUTTER_VERSION_1_22:
+ *
+ * A macro that evaluates to the 1.22 version of Clutter, in a format
+ * that can be used by the C pre-processor.
+ *
+ * Since: 1.22
+ */
+#define CLUTTER_VERSION_1_22    (G_ENCODE_VERSION (1, 22))
+
 /* evaluates to the current stable version; for development cycles,
  * this means the next stable target
  */
@@ -244,19 +274,22 @@ G_BEGIN_DECLS
          (CLUTTER_MAJOR_VERSION == (major) && CLUTTER_MINOR_VERSION > (minor)) || \
          (CLUTTER_MAJOR_VERSION == (major) && CLUTTER_MINOR_VERSION == (minor) && CLUTTER_MICRO_VERSION >= (micro)))
 
-/* annotation for exported variables
- *
- * XXX: this has to be defined here because clutter-macro.h imports this
- * header file.
- */
-#ifdef _MSC_VER
+#ifndef _CLUTTER_EXTERN
+#define _CLUTTER_EXTERN extern
+#endif
+
+#ifdef CLUTTER_WINDOWING_WIN32
 # ifdef CLUTTER_COMPILATION
-#  define CLUTTER_VAR __declspec(dllexport)
+#  ifdef DLL_EXPORT
+#   define CLUTTER_VAR __declspec(dllexport)
+#  else
+#   define CLUTTER_VAR extern
+#  endif
 # else
-#  define CLUTTER_VAR extern __declspec(dllimport)
+#  define CLUTTER_VAR __declspec(dllimport)
 # endif
 #else
-# define CLUTTER_VAR extern
+# define CLUTTER_VAR _CLUTTER_EXTERN
 #endif
 
 /**
@@ -301,12 +334,6 @@ CLUTTER_VAR const guint clutter_minor_version;
  */
 CLUTTER_VAR const guint clutter_micro_version;
 
-gboolean clutter_check_version (guint major,
-                                guint minor,
-                                guint micro);
-
-gboolean clutter_check_windowing_backend (const char *backend_type);
-
 G_END_DECLS
 
 #endif /* __CLUTTER_VERSION_H__ */
diff --git a/clutter/clutter-zoom-action.c b/clutter/clutter-zoom-action.c
index 5901a6e85..4e844a95a 100644
--- a/clutter/clutter-zoom-action.c
+++ b/clutter/clutter-zoom-action.c
@@ -56,6 +56,7 @@
 
 #include "clutter-debug.h"
 #include "clutter-enum-types.h"
+#include "clutter-gesture-action-private.h"
 #include "clutter-marshal.h"
 #include "clutter-private.h"
 #include "clutter-stage-private.h"
@@ -81,6 +82,7 @@ struct _ClutterZoomActionPrivate
 
   ZoomPoint points[2];
 
+  ClutterPoint initial_focal_point;
   ClutterPoint focal_point;
   ClutterPoint transformed_focal_point;
 
@@ -114,7 +116,7 @@ enum
 
 static guint zoom_signals[LAST_SIGNAL] = { 0, };
 
-G_DEFINE_TYPE (ClutterZoomAction, clutter_zoom_action, CLUTTER_TYPE_GESTURE_ACTION);
+G_DEFINE_TYPE_WITH_PRIVATE (ClutterZoomAction, clutter_zoom_action, CLUTTER_TYPE_GESTURE_ACTION)
 
 static void
 capture_point_initial_position (ClutterGestureAction *action,
@@ -176,6 +178,18 @@ clutter_zoom_action_gesture_begin (ClutterGestureAction *action,
                            &priv->initial_scale_x,
                            &priv->initial_scale_y);
 
+  priv->initial_focal_point.x = (priv->points[0].start_x + priv->points[1].start_x) / 2;
+  priv->initial_focal_point.y = (priv->points[0].start_y + priv->points[1].start_y) / 2;
+  clutter_actor_transform_stage_point (actor,
+                                       priv->initial_focal_point.x,
+                                       priv->initial_focal_point.y,
+                                       &priv->transformed_focal_point.x,
+                                       &priv->transformed_focal_point.y);
+
+  clutter_actor_set_pivot_point (actor,
+                                 priv->transformed_focal_point.x / clutter_actor_get_width (actor),
+                                 priv->transformed_focal_point.y / clutter_actor_get_height (actor));
+
   return TRUE;
 }
 
@@ -200,11 +214,6 @@ clutter_zoom_action_gesture_progress (ClutterGestureAction *action,
 
   priv->focal_point.x = (priv->points[0].update_x + priv->points[1].update_x) / 2;
   priv->focal_point.y = (priv->points[0].update_y + priv->points[1].update_y) / 2;
-  priv->transformed_focal_point.x = (priv->points[0].transformed_update_x +
-                                     priv->points[1].transformed_update_x) / 2;
-  priv->transformed_focal_point.y = (priv->points[0].transformed_update_y +
-                                     priv->points[1].transformed_update_y) / 2;
-
 
   new_scale = distance / priv->zoom_initial_distance;
 
@@ -235,11 +244,16 @@ clutter_zoom_action_real_zoom (ClutterZoomAction *action,
                                gdouble            factor)
 {
   ClutterZoomActionPrivate *priv = action->priv;
-  ClutterActor *parent = clutter_actor_get_parent (actor);
   gfloat x, y, z;
   gdouble scale_x, scale_y;
   ClutterVertex out, in;
 
+  in.x = priv->transformed_focal_point.x;
+  in.y = priv->transformed_focal_point.y;
+  in.z = 0;
+
+  clutter_actor_apply_transform_to_point (actor, &in, &out);
+
   clutter_actor_get_scale (actor, &scale_x, &scale_y);
 
   switch (priv->zoom_axis)
@@ -260,21 +274,10 @@ clutter_zoom_action_real_zoom (ClutterZoomAction *action,
       break;
     }
 
-
-  in.x = priv->transformed_focal_point.x;
-  in.y = priv->transformed_focal_point.y;
-  in.z = 0;
-
-  clutter_actor_apply_relative_transform_to_point (actor,
-                                                   parent,
-                                                   &in, &out);
-
-
-  clutter_actor_get_translation (actor, &x, &y, &z);
-  clutter_actor_set_translation (actor,
-                                 x + priv->focal_point.x - out.x,
-                                 y + priv->focal_point.y - out.y,
-                                 z);
+  x = priv->initial_x + priv->focal_point.x - priv->initial_focal_point.x;
+  y = priv->initial_y + priv->focal_point.y - priv->initial_focal_point.y;
+  clutter_actor_get_translation (actor, NULL, NULL, &z);
+  clutter_actor_set_translation (actor, x, y, z);
 
   return TRUE;
 }
@@ -323,6 +326,15 @@ clutter_zoom_action_dispose (GObject *gobject)
   G_OBJECT_CLASS (clutter_zoom_action_parent_class)->dispose (gobject);
 }
 
+static void
+clutter_zoom_action_constructed (GObject *gobject)
+{
+  ClutterGestureAction *gesture;
+
+  gesture = CLUTTER_GESTURE_ACTION (gobject);
+  clutter_gesture_action_set_threshold_trigger_edge (gesture, CLUTTER_GESTURE_TRIGGER_EDGE_NONE);
+}
+
 static void
 clutter_zoom_action_class_init (ClutterZoomActionClass *klass)
 {
@@ -330,8 +342,7 @@ clutter_zoom_action_class_init (ClutterZoomActionClass *klass)
     CLUTTER_GESTURE_ACTION_CLASS (klass);
   GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
 
-  g_type_class_add_private (klass, sizeof (ClutterZoomActionPrivate));
-
+  gobject_class->constructed = clutter_zoom_action_constructed;
   gobject_class->set_property = clutter_zoom_action_set_property;
   gobject_class->get_property = clutter_zoom_action_get_property;
   gobject_class->dispose = clutter_zoom_action_dispose;
@@ -398,12 +409,13 @@ clutter_zoom_action_class_init (ClutterZoomActionClass *klass)
 static void
 clutter_zoom_action_init (ClutterZoomAction *self)
 {
-  self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, CLUTTER_TYPE_ZOOM_ACTION,
-                                            ClutterZoomActionPrivate);
+  ClutterGestureAction *gesture;
 
+  self->priv = clutter_zoom_action_get_instance_private (self);
   self->priv->zoom_axis = CLUTTER_ZOOM_BOTH;
 
-  clutter_gesture_action_set_n_touch_points (CLUTTER_GESTURE_ACTION (self), 2);
+  gesture = CLUTTER_GESTURE_ACTION (self);
+  clutter_gesture_action_set_n_touch_points (gesture, 2);
 }
 
 /**
diff --git a/clutter/clutter-zoom-action.h b/clutter/clutter-zoom-action.h
index 3111e12d9..7ebbe4f0d 100644
--- a/clutter/clutter-zoom-action.h
+++ b/clutter/clutter-zoom-action.h
@@ -49,7 +49,7 @@ typedef struct _ClutterZoomActionClass          ClutterZoomActionClass;
 /**
  * ClutterZoomAction:
  *
- * The <structname>ClutterZoomAction</structname> structure contains only
+ * The #ClutterZoomAction structure contains only
  * private data and should be accessed using the provided API
  *
  * Since: 1.12
@@ -66,7 +66,7 @@ struct _ClutterZoomAction
  * ClutterZoomActionClass:
  * @zoom: class handler of the #ClutterZoomAction::zoom signal
  *
- * The <structname>ClutterZoomActionClass</structname> structure contains
+ * The #ClutterZoomActionClass structure contains
  * only private data
  *
  * Since: 1.12
diff --git a/clutter/clutter.h b/clutter/clutter.h
index 5bdd6bcf5..cb7985ae2 100644
--- a/clutter/clutter.h
+++ b/clutter/clutter.h
@@ -61,6 +61,7 @@
 #include "clutter-drop-action.h"
 #include "clutter-effect.h"
 #include "clutter-enums.h"
+#include "clutter-enum-types.h"
 #include "clutter-event.h"
 #include "clutter-feature.h"
 #include "clutter-fixed-layout.h"
@@ -98,8 +99,8 @@
 #include "clutter-snap-constraint.h"
 #include "clutter-stage.h"
 #include "clutter-stage-manager.h"
-#include "clutter-table-layout.h"
 #include "clutter-tap-action.h"
+#include "clutter-test-utils.h"
 #include "clutter-texture.h"
 #include "clutter-text.h"
 #include "clutter-timeline.h"
@@ -109,8 +110,6 @@
 #include "clutter-version.h"
 #include "clutter-zoom-action.h"
 
-#include "clutter-enum-types.h"
-
 #include "clutter-deprecated.h"
 
 #undef __CLUTTER_H_INSIDE__
diff --git a/clutter/clutter.symbols b/clutter/clutter.symbols
deleted file mode 100644
index 1ca0b9406..000000000
--- a/clutter/clutter.symbols
+++ /dev/null
@@ -1,1649 +0,0 @@
-cally_accessibility_init
-cally_actor_add_action
-cally_actor_add_action_full
-cally_actor_get_type
-cally_actor_new
-cally_actor_remove_action
-cally_actor_remove_action_by_name
-cally_clone_get_type
-cally_clone_new
-cally_get_cally_initialized
-cally_group_get_type
-cally_group_new
-cally_rectangle_get_type
-cally_rectangle_new
-cally_root_get_type
-cally_root_new
-cally_stage_get_type
-cally_stage_new
-cally_texture_get_type
-cally_texture_new
-cally_text_get_type
-cally_text_new
-cally_util_get_type
-clutter_action_get_type
-clutter_actor_flags_get_type
-clutter_actor_add_action
-clutter_actor_add_action_with_name
-clutter_actor_add_child
-clutter_actor_add_constraint
-clutter_actor_add_constraint_with_name
-clutter_actor_add_effect
-clutter_actor_add_effect_with_name
-clutter_actor_add_transition
-clutter_actor_align_get_type
-clutter_actor_allocate
-clutter_actor_allocate_align_fill
-clutter_actor_allocate_available_size
-clutter_actor_allocate_preferred_size
-clutter_actor_animate
-clutter_actor_animatev
-clutter_actor_animate_with_alpha
-clutter_actor_animate_with_alphav
-clutter_actor_animate_with_timeline
-clutter_actor_animate_with_timelinev
-clutter_actor_apply_transform_to_point
-clutter_actor_apply_relative_transform_to_point
-clutter_actor_box_alloc
-clutter_actor_box_clamp_to_pixel
-clutter_actor_box_contains
-clutter_actor_box_copy
-clutter_actor_box_equal
-clutter_actor_box_free
-clutter_actor_box_from_vertices
-clutter_actor_box_get_area
-clutter_actor_box_get_height
-clutter_actor_box_get_origin
-clutter_actor_box_get_size
-clutter_actor_box_get_type
-clutter_actor_box_get_width
-clutter_actor_box_get_x
-clutter_actor_box_get_y
-clutter_actor_box_init_rect
-clutter_actor_box_init
-clutter_actor_box_interpolate
-clutter_actor_box_new
-clutter_actor_box_set_origin
-clutter_actor_box_set_size
-clutter_actor_box_union
-clutter_actor_clear_actions
-clutter_actor_clear_constraints
-clutter_actor_clear_effects
-clutter_actor_contains
-clutter_actor_continue_paint
-clutter_actor_create_pango_context
-clutter_actor_create_pango_layout
-clutter_actor_destroy
-clutter_actor_destroy_all_children
-clutter_actor_detach_animation
-clutter_actor_event
-clutter_actor_get_abs_allocation_vertices
-clutter_actor_get_accessible
-clutter_actor_get_action
-clutter_actor_get_actions
-clutter_actor_get_allocation_box
-clutter_actor_get_allocation_geometry
-clutter_actor_get_allocation_vertices
-clutter_actor_get_anchor_point
-clutter_actor_get_anchor_point_gravity
-clutter_actor_get_animation
-clutter_actor_get_background_color
-clutter_actor_get_child_at_index
-clutter_actor_get_child_transform
-clutter_actor_get_children
-clutter_actor_get_clip
-clutter_actor_get_clip_to_allocation
-clutter_actor_get_constraint
-clutter_actor_get_constraints
-clutter_actor_get_content
-clutter_actor_get_content_box
-clutter_actor_get_content_gravity
-clutter_actor_get_content_repeat
-clutter_actor_get_content_scaling_filters
-clutter_actor_get_default_paint_volume
-clutter_actor_get_depth
-clutter_actor_get_easing_delay
-clutter_actor_get_easing_duration
-clutter_actor_get_easing_mode
-clutter_actor_get_effect
-clutter_actor_get_effects
-clutter_actor_get_first_child
-clutter_actor_get_fixed_position_set
-clutter_actor_get_flags
-clutter_actor_get_geometry
-clutter_actor_get_gid
-clutter_actor_get_height
-clutter_actor_get_last_child
-clutter_actor_get_layout_manager
-clutter_actor_get_margin_bottom
-clutter_actor_get_margin_left
-clutter_actor_get_margin_right
-clutter_actor_get_margin_top
-clutter_actor_get_margin
-clutter_actor_get_n_children
-clutter_actor_get_name
-clutter_actor_get_next_sibling
-clutter_actor_get_offscreen_redirect
-clutter_actor_get_opacity
-clutter_actor_get_paint_box
-clutter_actor_get_paint_opacity
-clutter_actor_get_paint_visibility
-clutter_actor_get_paint_volume
-clutter_actor_get_pango_context
-clutter_actor_get_parent
-clutter_actor_get_pivot_point_z
-clutter_actor_get_pivot_point
-clutter_actor_get_position
-clutter_actor_get_preferred_height
-clutter_actor_get_preferred_size
-clutter_actor_get_preferred_width
-clutter_actor_get_previous_sibling
-clutter_actor_get_reactive
-clutter_actor_get_request_mode
-clutter_actor_get_rotation_angle
-clutter_actor_get_rotation
-clutter_actor_get_scale
-clutter_actor_get_scale_center
-clutter_actor_get_scale_gravity
-clutter_actor_get_scale_z
-clutter_actor_get_shader
-clutter_actor_get_size
-clutter_actor_get_stage
-clutter_actor_get_text_direction
-clutter_actor_get_transform
-clutter_actor_get_transformation_matrix
-clutter_actor_get_transformed_paint_volume
-clutter_actor_get_transformed_position
-clutter_actor_get_transformed_size
-clutter_actor_get_transition
-clutter_actor_get_translation
-clutter_actor_get_type
-clutter_actor_get_width
-clutter_actor_get_x_align
-clutter_actor_get_x_expand
-clutter_actor_get_x
-clutter_actor_get_y_align
-clutter_actor_get_y_expand
-clutter_actor_get_y
-clutter_actor_get_z_position
-clutter_actor_get_z_rotation_gravity
-clutter_actor_grab_key_focus
-clutter_actor_has_actions
-clutter_actor_has_allocation
-clutter_actor_has_clip
-clutter_actor_has_constraints
-clutter_actor_has_effects
-clutter_actor_has_key_focus
-clutter_actor_has_overlaps
-clutter_actor_has_pointer
-clutter_actor_hide
-clutter_actor_hide_all
-clutter_actor_insert_child_above
-clutter_actor_insert_child_at_index
-clutter_actor_insert_child_below
-clutter_actor_is_in_clone_paint
-clutter_actor_is_rotated
-clutter_actor_is_scaled
-clutter_actor_iter_destroy
-clutter_actor_iter_init
-clutter_actor_iter_is_valid
-clutter_actor_iter_next
-clutter_actor_iter_prev
-clutter_actor_iter_remove
-clutter_actor_lower
-clutter_actor_lower_bottom
-clutter_actor_map
-clutter_actor_meta_get_actor
-clutter_actor_meta_get_enabled
-clutter_actor_meta_get_name
-clutter_actor_meta_get_type
-clutter_actor_meta_set_enabled
-clutter_actor_meta_set_name
-clutter_actor_move_anchor_point
-clutter_actor_move_anchor_point_from_gravity
-clutter_actor_move_by
-clutter_actor_needs_expand
-clutter_actor_new
-clutter_actor_paint
-clutter_actor_pop_internal
-clutter_actor_push_internal
-clutter_actor_queue_redraw
-clutter_actor_queue_redraw_with_clip
-clutter_actor_queue_relayout
-clutter_actor_raise
-clutter_actor_raise_top
-clutter_actor_realize
-clutter_actor_remove_action
-clutter_actor_remove_action_by_name
-clutter_actor_remove_all_children
-clutter_actor_remove_all_transitions
-clutter_actor_remove_constraint
-clutter_actor_remove_constraint_by_name
-clutter_actor_remove_child
-clutter_actor_remove_clip
-clutter_actor_remove_effect
-clutter_actor_remove_effect_by_name
-clutter_actor_remove_transition
-clutter_actor_reparent
-clutter_actor_replace_child
-clutter_actor_restore_easing_state
-clutter_actor_save_easing_state
-clutter_actor_set_allocation
-clutter_actor_set_anchor_point
-clutter_actor_set_anchor_point_from_gravity
-clutter_actor_set_background_color
-clutter_actor_set_child_above_sibling
-clutter_actor_set_child_at_index
-clutter_actor_set_child_below_sibling
-clutter_actor_set_child_transform
-clutter_actor_set_clip
-clutter_actor_set_clip_to_allocation
-clutter_actor_set_content
-clutter_actor_set_content_gravity
-clutter_actor_set_content_repeat
-clutter_actor_set_content_scaling_filters
-clutter_actor_set_depth
-clutter_actor_set_easing_delay
-clutter_actor_set_easing_duration
-clutter_actor_set_easing_mode
-clutter_actor_set_fixed_position_set
-clutter_actor_set_flags
-clutter_actor_set_geometry
-clutter_actor_set_height
-clutter_actor_set_layout_manager
-clutter_actor_set_margin_bottom
-clutter_actor_set_margin_left
-clutter_actor_set_margin_right
-clutter_actor_set_margin_top
-clutter_actor_set_margin
-clutter_actor_set_name
-clutter_actor_set_offscreen_redirect
-clutter_actor_set_opacity
-clutter_actor_set_parent
-clutter_actor_set_pivot_point_z
-clutter_actor_set_pivot_point
-clutter_actor_set_position
-clutter_actor_set_reactive
-clutter_actor_set_request_mode
-clutter_actor_set_rotation_angle
-clutter_actor_set_rotation
-clutter_actor_set_scale
-clutter_actor_set_scale_full
-clutter_actor_set_scale_with_gravity
-clutter_actor_set_scale_z
-clutter_actor_set_shader
-clutter_actor_set_shader_param
-clutter_actor_set_shader_param_float
-clutter_actor_set_shader_param_int
-clutter_actor_set_size
-clutter_actor_set_text_direction
-clutter_actor_set_transform
-clutter_actor_set_translation
-clutter_actor_set_width
-clutter_actor_set_x_align
-clutter_actor_set_x_expand
-clutter_actor_set_x
-clutter_actor_set_y_align
-clutter_actor_set_y_expand
-clutter_actor_set_y
-clutter_actor_set_z_position
-clutter_actor_set_z_rotation_from_gravity
-clutter_actor_should_pick_paint
-clutter_actor_show
-clutter_actor_show_all
-clutter_actor_transform_stage_point
-clutter_actor_unmap
-clutter_actor_unparent
-clutter_actor_unrealize
-clutter_actor_unset_flags
-clutter_align_axis_get_type
-clutter_align_constraint_get_align_axis
-clutter_align_constraint_get_factor
-clutter_align_constraint_get_source
-clutter_align_constraint_get_type
-clutter_align_constraint_new
-clutter_align_constraint_set_align_axis
-clutter_align_constraint_set_factor
-clutter_align_constraint_set_source
-clutter_allocation_flags_get_type
-clutter_alpha_get_alpha
-clutter_alpha_get_mode
-clutter_alpha_get_timeline
-clutter_alpha_get_type
-clutter_alpha_new
-clutter_alpha_new_full
-clutter_alpha_new_with_func
-clutter_alpha_register_closure
-clutter_alpha_register_func
-clutter_alpha_set_closure
-clutter_alpha_set_func
-clutter_alpha_set_mode
-clutter_alpha_set_timeline
-clutter_animatable_animate_property
-clutter_animatable_find_property
-clutter_animatable_get_initial_state
-clutter_animatable_get_type
-clutter_animatable_interpolate_value
-clutter_animatable_set_final_state
-clutter_animation_bind
-clutter_animation_bind_interval
-clutter_animation_completed
-clutter_animation_get_alpha
-clutter_animation_get_duration
-clutter_animation_get_interval
-clutter_animation_get_loop
-clutter_animation_get_mode
-clutter_animation_get_object
-clutter_animation_get_timeline
-clutter_animation_get_type
-clutter_animation_has_property
-clutter_animation_mode_get_type
-clutter_animation_new
-clutter_animation_set_alpha
-clutter_animation_set_duration
-clutter_animation_set_loop
-clutter_animation_set_mode
-clutter_animation_set_object
-clutter_animation_set_timeline
-clutter_animation_unbind_property
-clutter_animation_update
-clutter_animation_update_interval
-clutter_animator_compute_value
-clutter_animator_get_duration
-clutter_animator_get_keys
-clutter_animator_get_timeline
-clutter_animator_get_type
-clutter_animator_key_get_mode
-clutter_animator_key_get_object
-clutter_animator_key_get_property_name
-clutter_animator_key_get_property_type
-clutter_animator_key_get_progress
-clutter_animator_key_get_type
-clutter_animator_key_get_value
-clutter_animator_new
-clutter_animator_property_get_ease_in
-clutter_animator_property_get_interpolation
-clutter_animator_property_set_ease_in
-clutter_animator_property_set_interpolation
-clutter_animator_remove_key
-clutter_animator_set_key
-clutter_animator_set
-clutter_animator_set_duration
-clutter_animator_set_timeline
-clutter_animator_start
-clutter_backend_get_cogl_context
-clutter_backend_get_double_click_distance
-clutter_backend_get_double_click_time
-clutter_backend_get_font_name
-clutter_backend_get_font_options
-clutter_backend_get_resolution
-clutter_backend_get_type
-clutter_backend_set_double_click_distance
-clutter_backend_set_double_click_time
-clutter_backend_set_font_name
-clutter_backend_set_font_options
-clutter_backend_set_resolution
-clutter_base_init
-clutter_behaviour_actors_foreach
-clutter_behaviour_apply
-clutter_behaviour_depth_get_bounds
-clutter_behaviour_depth_get_type
-clutter_behaviour_depth_new
-clutter_behaviour_depth_set_bounds
-clutter_behaviour_ellipse_get_angle_end
-clutter_behaviour_ellipse_get_angle_start
-clutter_behaviour_ellipse_get_angle_tilt
-clutter_behaviour_ellipse_get_center
-clutter_behaviour_ellipse_get_direction
-clutter_behaviour_ellipse_get_height
-clutter_behaviour_ellipse_get_tilt
-clutter_behaviour_ellipse_get_type
-clutter_behaviour_ellipse_get_width
-clutter_behaviour_ellipse_new
-clutter_behaviour_ellipse_set_angle_end
-clutter_behaviour_ellipse_set_angle_start
-clutter_behaviour_ellipse_set_angle_tilt
-clutter_behaviour_ellipse_set_center
-clutter_behaviour_ellipse_set_direction
-clutter_behaviour_ellipse_set_height
-clutter_behaviour_ellipse_set_tilt
-clutter_behaviour_ellipse_set_width
-clutter_behaviour_get_actors
-clutter_behaviour_get_alpha
-clutter_behaviour_get_nth_actor
-clutter_behaviour_get_n_actors
-clutter_behaviour_get_type
-clutter_behaviour_is_applied
-clutter_behaviour_opacity_get_bounds
-clutter_behaviour_opacity_get_type
-clutter_behaviour_opacity_new
-clutter_behaviour_opacity_set_bounds
-clutter_behaviour_path_get_path
-clutter_behaviour_path_get_type
-clutter_behaviour_path_new
-clutter_behaviour_path_new_with_description
-clutter_behaviour_path_new_with_knots
-clutter_behaviour_path_set_path
-clutter_behaviour_remove
-clutter_behaviour_remove_all
-clutter_behaviour_rotate_get_axis
-clutter_behaviour_rotate_get_bounds
-clutter_behaviour_rotate_get_center
-clutter_behaviour_rotate_get_direction
-clutter_behaviour_rotate_get_type
-clutter_behaviour_rotate_new
-clutter_behaviour_rotate_set_axis
-clutter_behaviour_rotate_set_bounds
-clutter_behaviour_rotate_set_center
-clutter_behaviour_rotate_set_direction
-clutter_behaviour_scale_get_bounds
-clutter_behaviour_scale_get_type
-clutter_behaviour_scale_new
-clutter_behaviour_scale_set_bounds
-clutter_behaviour_set_alpha
-clutter_binding_pool_activate
-clutter_binding_pool_block_action
-clutter_binding_pool_find
-clutter_binding_pool_find_action
-clutter_binding_pool_get_for_class
-clutter_binding_pool_get_type
-clutter_binding_pool_install_action
-clutter_binding_pool_install_closure
-clutter_binding_pool_new
-clutter_binding_pool_override_action
-clutter_binding_pool_override_closure
-clutter_binding_pool_remove_action
-clutter_binding_pool_unblock_action
-clutter_bind_constraint_get_coordinate
-clutter_bind_constraint_get_offset
-clutter_bind_constraint_get_source
-clutter_bind_constraint_get_type
-clutter_bind_constraint_new
-clutter_bind_constraint_set_coordinate
-clutter_bind_constraint_set_offset
-clutter_bind_constraint_set_source
-clutter_bind_coordinate_get_type
-clutter_bin_alignment_get_type
-clutter_bin_layer_get_type
-clutter_bin_layout_add
-clutter_bin_layout_get_alignment
-clutter_bin_layout_get_type
-clutter_bin_layout_new
-clutter_bin_layout_set_alignment
-clutter_blur_effect_get_type
-clutter_blur_effect_new
-clutter_box_alignment_get_type
-clutter_box_child_get_type
-clutter_box_get_color
-clutter_box_get_layout_manager
-clutter_box_get_type
-clutter_box_layout_get_alignment
-clutter_box_layout_get_easing_duration
-clutter_box_layout_get_easing_mode
-clutter_box_layout_get_expand
-clutter_box_layout_get_fill
-clutter_box_layout_get_homogeneous
-clutter_box_layout_get_orientation
-clutter_box_layout_get_pack_start
-clutter_box_layout_get_spacing
-clutter_box_layout_get_type
-clutter_box_layout_get_use_animations
-clutter_box_layout_get_vertical
-clutter_box_layout_new
-clutter_box_layout_pack
-clutter_box_layout_set_alignment
-clutter_box_layout_set_expand
-clutter_box_layout_set_fill
-clutter_box_layout_set_easing_duration
-clutter_box_layout_set_easing_mode
-clutter_box_layout_set_homogeneous
-clutter_box_layout_set_orientation
-clutter_box_layout_set_pack_start
-clutter_box_layout_set_spacing
-clutter_box_layout_set_use_animations
-clutter_box_layout_set_vertical
-clutter_box_new
-clutter_box_set_color
-clutter_box_set_layout_manager
-clutter_box_pack
-clutter_box_packv
-clutter_box_pack_after
-clutter_box_pack_at
-clutter_box_pack_before
-clutter_brightness_contrast_effect_get_brightness
-clutter_brightness_contrast_effect_get_contrast
-clutter_brightness_contrast_effect_get_type
-clutter_brightness_contrast_effect_new
-clutter_brightness_contrast_effect_set_brightness_full
-clutter_brightness_contrast_effect_set_brightness
-clutter_brightness_contrast_effect_set_contrast_full
-clutter_brightness_contrast_effect_set_contrast
-clutter_canvas_get_type
-clutter_canvas_new
-clutter_canvas_set_size
-clutter_cairo_clear
-clutter_cairo_set_source_color
-clutter_cairo_texture_clear
-clutter_cairo_texture_create
-clutter_cairo_texture_create_region
-clutter_cairo_texture_get_auto_resize
-clutter_cairo_texture_get_surface_size
-clutter_cairo_texture_get_type
-clutter_cairo_texture_invalidate
-clutter_cairo_texture_invalidate_rectangle
-clutter_cairo_texture_new
-clutter_cairo_texture_set_auto_resize
-clutter_cairo_texture_set_surface_size
-clutter_check_version
-clutter_check_windowing_backend
-clutter_child_meta_get_actor
-clutter_child_meta_get_container
-clutter_child_meta_get_type
-clutter_clear_glyph_cache
-clutter_click_action_get_button
-clutter_click_action_get_coords
-clutter_click_action_get_state
-clutter_click_action_get_type
-clutter_click_action_new
-clutter_click_action_release
-clutter_clip_node_get_type
-clutter_clip_node_new
-clutter_clone_get_source
-clutter_clone_get_type
-clutter_clone_new
-clutter_clone_set_source
-clutter_colorize_effect_get_tint
-clutter_colorize_effect_get_type
-clutter_colorize_effect_new
-clutter_colorize_effect_set_tint
-clutter_color_add
-clutter_color_alloc
-clutter_color_copy
-clutter_color_darken
-clutter_color_equal
-clutter_color_free
-clutter_color_from_hls
-clutter_color_from_pixel
-clutter_color_from_string
-clutter_color_get_static
-clutter_color_get_type
-clutter_color_hash
-clutter_color_init
-clutter_color_interpolate
-clutter_color_lighten
-clutter_color_new
-clutter_color_node_get_type
-clutter_color_node_new
-clutter_color_shade
-clutter_color_subtract
-clutter_color_to_hls
-clutter_color_to_pixel
-clutter_color_to_string
-clutter_container_add
-clutter_container_add_actor
-clutter_container_add_valist
-clutter_container_child_get
-clutter_container_child_get_property
-clutter_container_child_notify
-clutter_container_child_set
-clutter_container_child_set_property
-clutter_container_class_find_child_property
-clutter_container_class_list_child_properties
-clutter_container_create_child_meta
-clutter_container_destroy_child_meta
-clutter_container_find_child_by_name
-clutter_container_foreach
-clutter_container_foreach_with_internals
-clutter_container_get_children
-clutter_container_get_child_meta
-clutter_container_get_type
-clutter_container_lower_child
-clutter_container_raise_child
-clutter_container_remove
-clutter_container_remove_actor
-clutter_container_remove_valist
-clutter_container_sort_depth_order
-clutter_content_get_preferred_size
-clutter_content_get_type
-clutter_content_gravity_get_type
-clutter_content_invalidate
-clutter_content_repeat_get_type
-clutter_constraint_get_type
-clutter_debug_flags DATA
-clutter_deform_effect_get_back_material
-clutter_deform_effect_get_n_tiles
-clutter_deform_effect_get_type
-clutter_deform_effect_invalidate
-clutter_deform_effect_set_back_material
-clutter_deform_effect_set_n_tiles
-clutter_desaturate_effect_get_factor
-clutter_desaturate_effect_get_type
-clutter_desaturate_effect_new
-clutter_desaturate_effect_set_factor
-clutter_device_manager_get_core_device
-clutter_device_manager_get_device
-clutter_device_manager_get_default
-clutter_device_manager_get_type
-clutter_device_manager_list_devices
-clutter_device_manager_peek_devices
-clutter_disable_accessibility
-clutter_do_event
-clutter_drag_action_get_drag_area
-clutter_drag_action_get_drag_axis
-clutter_drag_action_get_drag_handle
-clutter_drag_action_get_drag_threshold
-clutter_drag_action_get_motion_coords
-clutter_drag_action_get_press_coords
-clutter_drag_action_get_type
-clutter_drag_action_new
-clutter_drag_action_set_drag_area
-clutter_drag_action_set_drag_axis
-clutter_drag_action_set_drag_handle
-clutter_drag_action_set_drag_threshold
-clutter_drag_axis_get_type
-clutter_drop_action_get_type
-clutter_drop_action_new
-clutter_effect_get_type
-clutter_effect_paint_flags_get_type
-clutter_effect_queue_repaint
-clutter_events_pending
-clutter_event_copy
-clutter_event_flags_get_type
-clutter_event_free
-clutter_event_get_angle
-clutter_event_get_axes
-clutter_event_get_button
-clutter_event_get_click_count
-clutter_event_get_coords
-clutter_event_get_device
-clutter_event_get_device_id
-clutter_event_get_device_type
-clutter_event_get_distance
-clutter_event_get_event_sequence
-clutter_event_get_flags
-clutter_event_get_key_code
-clutter_event_get_key_symbol
-clutter_event_get_key_unicode
-clutter_event_get_position
-clutter_event_get_related
-clutter_event_get_scroll_delta
-clutter_event_get_scroll_direction
-clutter_event_get_source
-clutter_event_get_source_device
-clutter_event_get_stage
-clutter_event_get_state
-clutter_event_get_type
-clutter_event_get_time
-clutter_event_get
-clutter_event_has_control_modifier
-clutter_event_has_shift_modifier
-clutter_event_is_pointer_emulated
-clutter_event_new
-clutter_event_peek
-clutter_event_put
-clutter_event_set_button
-clutter_event_set_coords
-clutter_event_set_device
-clutter_event_set_flags
-clutter_event_set_key_code
-clutter_event_set_key_symbol
-clutter_event_set_key_unicode
-clutter_event_set_related
-clutter_event_set_scroll_delta
-clutter_event_set_scroll_direction
-clutter_event_set_source
-clutter_event_set_source_device
-clutter_event_set_stage
-clutter_event_set_state
-clutter_event_set_time
-clutter_event_type
-clutter_event_type_get_type
-clutter_feature_available
-clutter_feature_flags_get_type
-clutter_feature_get_all
-clutter_fixed_layout_get_type
-clutter_fixed_layout_new
-clutter_flow_layout_get_column_spacing
-clutter_flow_layout_get_column_width
-clutter_flow_layout_get_homogeneous
-clutter_flow_layout_get_orientation
-clutter_flow_layout_get_row_height
-clutter_flow_layout_get_row_spacing
-clutter_flow_layout_get_type
-clutter_flow_layout_new
-clutter_flow_layout_set_column_spacing
-clutter_flow_layout_set_column_width
-clutter_flow_layout_set_homogeneous
-clutter_flow_layout_set_orientation
-clutter_flow_layout_set_row_height
-clutter_flow_layout_set_row_spacing
-clutter_flow_orientation_get_type
-clutter_fog_get_type
-clutter_font_flags_get_type
-clutter_frame_source_add
-clutter_frame_source_add_full
-#ifdef CLUTTER_WINDOWING_GDK
-clutter_gdk_disable_event_retrieval
-clutter_gdk_get_default_display
-clutter_gdk_get_stage_from_window
-clutter_gdk_get_stage_window
-clutter_gdk_handle_event
-clutter_gdk_set_display
-clutter_gdk_set_stage_foreign
-#endif
-clutter_geometry_get_type
-clutter_geometry_intersects
-clutter_geometry_union
-clutter_gesture_action_cancel
-clutter_gesture_action_get_device
-clutter_gesture_action_get_last_event
-clutter_gesture_action_get_motion_coords
-clutter_gesture_action_get_motion_delta
-clutter_gesture_action_get_n_current_points
-clutter_gesture_action_get_n_touch_points
-clutter_gesture_action_get_press_coords
-clutter_gesture_action_get_release_coords
-clutter_gesture_action_get_sequence
-clutter_gesture_action_get_type
-clutter_gesture_action_get_velocity
-clutter_gesture_action_set_n_touch_points
-clutter_gesture_action_new
-clutter_get_accessibility_enabled
-clutter_get_actor_by_gid
-clutter_get_current_event
-clutter_get_current_event_time
-clutter_get_debug_enabled
-clutter_get_default_backend
-clutter_get_default_frame_rate
-clutter_get_default_text_direction
-clutter_get_font_flags
-clutter_get_font_map
-clutter_get_input_device_for_id
-clutter_get_keyboard_grab
-clutter_get_motion_events_enabled
-clutter_get_option_group
-clutter_get_option_group_without_init
-clutter_get_pointer_grab
-clutter_get_script_id
-clutter_get_show_fps
-clutter_get_timestamp
-#ifdef CLUTTER_WINDOWING_GLX
-clutter_glx_texture_pixmap_get_type
-clutter_glx_texture_pixmap_new
-clutter_glx_texture_pixmap_new_with_pixmap
-clutter_glx_texture_pixmap_new_with_window
-clutter_glx_texture_pixmap_using_extension
-#endif
-clutter_grab_keyboard
-clutter_grab_pointer
-clutter_grab_pointer_for_device
-clutter_gravity_get_type
-clutter_grid_child_get_type
-clutter_grid_layout_get_type
-clutter_grid_layout_new
-clutter_grid_layout_attach
-clutter_grid_layout_attach_next_to
-clutter_grid_layout_get_child_at
-clutter_grid_layout_insert_row
-clutter_grid_layout_insert_column
-clutter_grid_layout_insert_next_to
-clutter_grid_layout_set_orientation
-clutter_grid_layout_get_orientation
-clutter_grid_layout_set_column_spacing
-clutter_grid_layout_get_column_spacing
-clutter_grid_layout_set_row_spacing
-clutter_grid_layout_get_row_spacing
-clutter_grid_layout_set_column_homogeneous
-clutter_grid_layout_get_column_homogeneous
-clutter_grid_layout_set_row_homogeneous
-clutter_grid_layout_get_row_homogeneous
-clutter_grid_position_get_type
-clutter_group_get_nth_child
-clutter_group_get_n_children
-clutter_group_get_type
-clutter_group_new
-clutter_group_remove_all
-clutter_image_error_get_type
-clutter_image_error_quark
-clutter_image_get_texture
-clutter_image_get_type
-clutter_image_new
-clutter_image_set_area
-clutter_image_set_bytes
-clutter_image_set_data
-clutter_init
-clutter_init_error_get_type
-clutter_init_error_quark
-clutter_init_with_args
-clutter_interpolation_get_type
-clutter_interval_clone
-clutter_interval_compute
-clutter_interval_compute_value
-clutter_interval_get_final_value
-clutter_interval_get_initial_value
-clutter_interval_get_interval
-clutter_interval_get_type
-clutter_interval_get_value_type
-clutter_interval_is_valid
-clutter_interval_new
-clutter_interval_new_with_values
-clutter_interval_peek_final_value
-clutter_interval_peek_initial_value
-clutter_interval_register_progress_func
-clutter_interval_set_final_value
-clutter_interval_set_final
-clutter_interval_set_initial_value
-clutter_interval_set_initial
-clutter_interval_set_interval
-clutter_interval_validate
-clutter_input_axis_get_type
-clutter_input_device_get_associated_device
-clutter_input_device_get_axis
-clutter_input_device_get_axis_value
-clutter_input_device_get_coords
-clutter_input_device_get_device_coords
-clutter_input_device_get_device_id
-clutter_input_device_get_device_name
-clutter_input_device_get_device_mode
-clutter_input_device_get_device_type
-clutter_input_device_get_enabled
-clutter_input_device_get_grabbed_actor
-clutter_input_device_get_has_cursor
-clutter_input_device_get_key
-clutter_input_device_get_n_axes
-clutter_input_device_get_n_keys
-clutter_input_device_get_pointer_actor
-clutter_input_device_get_pointer_stage
-clutter_input_device_get_slave_devices
-clutter_input_device_get_type
-clutter_input_device_grab
-clutter_input_device_keycode_to_evdev
-clutter_input_device_sequence_get_grabbed_actor
-clutter_input_device_sequence_grab
-clutter_input_device_sequence_ungrab
-clutter_input_device_set_enabled
-clutter_input_device_set_key
-clutter_input_device_type_get_type
-clutter_input_device_ungrab
-clutter_input_device_update_from_event
-clutter_input_mode_get_type
-clutter_keyframe_transition_clear
-clutter_keyframe_transition_get_key_frame
-clutter_keyframe_transition_get_n_key_frames
-clutter_keyframe_transition_get_type
-clutter_keyframe_transition_new
-clutter_keyframe_transition_set_key_frames
-clutter_keyframe_transition_set_key_frame
-clutter_keyframe_transition_set_modes
-clutter_keyframe_transition_set_values
-clutter_keyframe_transition_set
-clutter_keysym_to_unicode
-clutter_knot_copy
-clutter_knot_equal
-clutter_knot_free
-clutter_knot_get_type
-clutter_layout_meta_get_manager
-clutter_layout_meta_get_type
-clutter_layout_manager_allocate
-clutter_layout_manager_begin_animation
-clutter_layout_manager_child_get
-clutter_layout_manager_child_get_property
-clutter_layout_manager_child_set
-clutter_layout_manager_child_set_property
-clutter_layout_manager_end_animation
-clutter_layout_manager_find_child_property
-clutter_layout_manager_get_animation_progress
-clutter_layout_manager_get_child_meta
-clutter_layout_manager_get_preferred_width
-clutter_layout_manager_get_preferred_height
-clutter_layout_manager_get_type
-clutter_layout_manager_layout_changed
-clutter_layout_manager_list_child_properties
-clutter_layout_manager_set_container
-clutter_list_model_get_type
-clutter_list_model_iter_get_type
-clutter_list_model_new
-clutter_list_model_newv
-clutter_long_press_state_get_type
-clutter_main
-clutter_main_level
-clutter_main_quit
-clutter_major_version DATA
-clutter_margin_copy
-clutter_margin_free
-clutter_margin_get_type
-clutter_margin_new
-clutter_matrix_alloc
-clutter_matrix_free
-clutter_matrix_get_type
-clutter_matrix_init_identity
-clutter_matrix_init_from_array
-clutter_matrix_init_from_matrix
-clutter_media_get_audio_volume
-clutter_media_get_buffer_fill
-clutter_media_get_can_seek
-clutter_media_get_duration
-clutter_media_get_playing
-clutter_media_get_progress
-clutter_media_get_subtitle_font_name
-clutter_media_get_subtitle_uri
-clutter_media_get_type
-clutter_media_get_uri
-clutter_media_set_audio_volume
-clutter_media_set_filename
-clutter_media_set_playing
-clutter_media_set_progress
-clutter_media_set_subtitle_font_name
-clutter_media_set_subtitle_uri
-clutter_media_set_uri
-clutter_micro_version DATA
-clutter_minor_version DATA
-clutter_model_append
-clutter_model_appendv
-clutter_model_filter_iter
-clutter_model_filter_row
-clutter_model_foreach
-clutter_model_get_column_name
-clutter_model_get_column_type
-clutter_model_get_filter_set
-clutter_model_get_first_iter
-clutter_model_get_iter_at_row
-clutter_model_get_last_iter
-clutter_model_get_n_columns
-clutter_model_get_n_rows
-clutter_model_get_sorting_column
-clutter_model_get_type
-clutter_model_insert
-clutter_model_insertv
-clutter_model_insert_value
-clutter_model_iter_copy
-clutter_model_iter_get
-clutter_model_iter_get_model
-clutter_model_iter_get_row
-clutter_model_iter_get_type
-clutter_model_iter_get_valist
-clutter_model_iter_get_value
-clutter_model_iter_is_first
-clutter_model_iter_is_last
-clutter_model_iter_next
-clutter_model_iter_prev
-clutter_model_iter_set
-clutter_model_iter_set_valist
-clutter_model_iter_set_value
-clutter_model_prepend
-clutter_model_prependv
-clutter_model_remove
-clutter_model_resort
-clutter_model_set_filter
-clutter_model_set_names
-clutter_model_set_sort
-clutter_model_set_sorting_column
-clutter_model_set_types
-clutter_modifier_type_get_type
-clutter_offscreen_effect_create_texture
-clutter_offscreen_effect_get_target
-clutter_offscreen_effect_get_target_rect
-clutter_offscreen_effect_get_target_size
-clutter_offscreen_effect_get_texture
-clutter_offscreen_effect_get_type
-clutter_offscreen_effect_paint_target
-clutter_offscreen_redirect_get_type
-clutter_orientation_get_type
-clutter_page_turn_effect_get_angle
-clutter_page_turn_effect_get_period
-clutter_page_turn_effect_get_radius
-clutter_page_turn_effect_get_type
-clutter_page_turn_effect_new
-clutter_page_turn_effect_set_angle
-clutter_page_turn_effect_set_period
-clutter_page_turn_effect_set_radius
-clutter_paint_debug_flags DATA
-clutter_paint_node_add_child
-clutter_paint_node_add_path
-clutter_paint_node_add_primitive
-clutter_paint_node_add_rectangle
-clutter_paint_node_add_texture_rectangle
-clutter_paint_node_get_type
-clutter_paint_node_ref
-clutter_paint_node_set_name
-clutter_paint_node_unref
-clutter_path_add_cairo_path
-clutter_path_add_close
-clutter_path_add_curve_to
-clutter_path_add_line_to
-clutter_path_add_move_to
-clutter_path_add_node
-clutter_path_add_string
-clutter_path_add_rel_curve_to
-clutter_path_add_rel_line_to
-clutter_path_add_rel_move_to
-clutter_path_clear
-clutter_path_constraint_get_offset
-clutter_path_constraint_get_path
-clutter_path_constraint_get_type
-clutter_path_constraint_new
-clutter_path_constraint_set_offset
-clutter_path_constraint_set_path
-clutter_path_foreach
-clutter_path_get_description
-clutter_path_get_length
-clutter_path_get_node
-clutter_path_get_nodes
-clutter_path_get_n_nodes
-clutter_path_get_position
-clutter_path_get_type
-clutter_path_insert_node
-clutter_path_new
-clutter_path_new_with_description
-clutter_path_node_copy
-clutter_path_node_equal
-clutter_path_node_free
-clutter_path_node_get_type
-clutter_path_node_type_get_type
-clutter_path_remove_node
-clutter_path_replace_node
-clutter_path_set_description
-clutter_path_to_cairo_path
-clutter_paint_volume_copy
-clutter_paint_volume_free
-clutter_paint_volume_get_depth
-clutter_paint_volume_get_height
-clutter_paint_volume_get_origin
-clutter_paint_volume_get_type
-clutter_paint_volume_get_width
-clutter_paint_volume_set_depth
-clutter_paint_volume_set_from_allocation
-clutter_paint_volume_set_height
-clutter_paint_volume_set_origin
-clutter_paint_volume_set_width
-clutter_paint_volume_union_box
-clutter_paint_volume_union
-clutter_pan_axis_get_type
-clutter_pan_action_get_type
-clutter_pan_action_get_acceleration_factor
-clutter_pan_action_get_deceleration
-clutter_pan_action_get_interpolated_coords
-clutter_pan_action_get_interpolated_delta
-clutter_pan_action_get_interpolate
-clutter_pan_action_get_motion_coords
-clutter_pan_action_get_motion_delta
-clutter_pan_action_get_pan_axis
-clutter_pan_action_new
-clutter_pan_action_set_acceleration_factor
-clutter_pan_action_set_deceleration
-clutter_pan_action_set_interpolate
-clutter_pan_action_set_pan_axis
-clutter_param_color_get_type
-clutter_param_fixed_get_type
-clutter_param_spec_color
-clutter_param_spec_fixed
-clutter_param_spec_units
-clutter_param_units_get_type
-clutter_perspective_get_type
-clutter_pick_debug_flags DATA
-clutter_pipeline_node_get_type
-clutter_pipeline_node_new
-clutter_pick_mode_get_type
-clutter_point_alloc
-clutter_point_copy
-clutter_point_distance
-clutter_point_equals
-clutter_point_free
-clutter_point_get_type
-clutter_point_init
-clutter_point_zero
-clutter_profile_flags DATA
-clutter_property_transition_get_property_name
-clutter_property_transition_get_type
-clutter_property_transition_new
-clutter_property_transition_set_property_name
-clutter_rect_alloc
-clutter_rect_clamp_to_pixel
-clutter_rect_contains_point
-clutter_rect_contains_rect
-clutter_rect_copy
-clutter_rect_equals
-clutter_rect_free
-clutter_rect_get_center
-clutter_rect_get_height
-clutter_rect_get_type
-clutter_rect_get_width
-clutter_rect_get_x
-clutter_rect_get_y
-clutter_rect_init
-clutter_rect_inset
-clutter_rect_intersection
-clutter_rect_normalize
-clutter_rect_offset
-clutter_rect_union
-clutter_rect_zero
-clutter_rectangle_get_border_color
-clutter_rectangle_get_border_width
-clutter_rectangle_get_color
-clutter_rectangle_get_type
-clutter_rectangle_new
-clutter_rectangle_new_with_color
-clutter_rectangle_set_border_color
-clutter_rectangle_set_border_width
-clutter_rectangle_set_color
-clutter_redraw
-clutter_repaint_flags_get_type
-clutter_request_mode_get_type
-clutter_rotate_action_get_type
-clutter_rotate_action_new
-clutter_rotate_axis_get_type
-clutter_rotate_direction_get_type
-clutter_scaling_filter_get_type
-clutter_score_append
-clutter_score_append_at_marker
-clutter_score_get_loop
-clutter_score_get_timeline
-clutter_score_get_type
-clutter_score_is_playing
-clutter_score_list_timelines
-clutter_score_new
-clutter_score_pause
-clutter_score_remove
-clutter_score_remove_all
-clutter_score_rewind
-clutter_score_set_loop
-clutter_score_start
-clutter_score_stop
-clutter_scriptable_get_id
-clutter_scriptable_get_type
-clutter_scriptable_parse_custom_node
-clutter_scriptable_set_custom_property
-clutter_scriptable_set_id
-clutter_script_add_search_paths
-clutter_script_add_states
-clutter_script_connect_signals
-clutter_script_connect_signals_full
-clutter_script_ensure_objects
-clutter_script_error_get_type
-clutter_script_error_quark
-clutter_script_get_object
-clutter_script_get_objects
-clutter_script_get_states
-clutter_script_get_translation_domain
-clutter_script_get_type
-clutter_script_get_type_from_name
-clutter_script_list_objects
-clutter_script_load_from_data
-clutter_script_load_from_file
-clutter_script_load_from_resource
-clutter_script_lookup_filename
-clutter_script_new
-clutter_script_set_translation_domain
-clutter_script_unmerge_objects
-clutter_scroll_actor_get_scroll_mode
-clutter_scroll_actor_get_type
-clutter_scroll_actor_new
-clutter_scroll_actor_scroll_to_point
-clutter_scroll_actor_scroll_to_rect
-clutter_scroll_actor_set_scroll_mode
-clutter_scroll_direction_get_type
-clutter_scroll_mode_get_type
-clutter_settings_get_default
-clutter_settings_get_type
-clutter_set_default_frame_rate
-clutter_set_font_flags
-clutter_set_motion_events_enabled
-clutter_shader_compile
-clutter_shader_effect_get_program
-clutter_shader_effect_get_shader
-clutter_shader_effect_get_type
-clutter_shader_effect_new
-clutter_shader_effect_set_shader_source
-clutter_shader_effect_set_uniform
-clutter_shader_effect_set_uniform_value
-clutter_shader_error_quark
-clutter_shader_float_get_type
-clutter_shader_get_cogl_fragment_shader
-clutter_shader_get_cogl_program
-clutter_shader_get_cogl_vertex_shader
-clutter_shader_get_fragment_source
-clutter_shader_get_is_enabled
-clutter_shader_get_type
-clutter_shader_get_vertex_source
-clutter_shader_int_get_type
-clutter_shader_is_compiled
-clutter_shader_matrix_get_type
-clutter_shader_new
-clutter_shader_release
-clutter_shader_set_fragment_source
-clutter_shader_set_is_enabled
-clutter_shader_set_uniform
-clutter_shader_set_vertex_source
-clutter_shader_type_get_type
-clutter_size_alloc
-clutter_size_copy
-clutter_size_equals
-clutter_size_free
-clutter_size_get_type
-clutter_size_init
-clutter_snap_constraint_get_edges
-clutter_snap_constraint_get_offset
-clutter_snap_constraint_get_source
-clutter_snap_constraint_get_type
-clutter_snap_constraint_new
-clutter_snap_constraint_set_edges
-clutter_snap_constraint_set_offset
-clutter_snap_constraint_set_source
-clutter_snap_edge_get_type
-clutter_stage_ensure_current
-clutter_stage_ensure_redraw
-clutter_stage_ensure_viewport
-clutter_stage_event
-clutter_stage_get_accept_focus
-clutter_stage_get_actor_at_pos
-clutter_stage_get_color
-clutter_stage_get_default
-clutter_stage_get_fog
-clutter_stage_get_fullscreen
-clutter_stage_get_key_focus
-clutter_stage_get_minimum_size
-clutter_stage_get_motion_events_enabled
-clutter_stage_get_no_clear_hint
-clutter_stage_get_perspective
-clutter_stage_get_throttle_motion_events
-clutter_stage_get_title
-clutter_stage_get_type
-clutter_stage_get_user_resizable
-clutter_stage_get_use_alpha
-clutter_stage_get_use_fog
-clutter_stage_hide_cursor
-clutter_stage_is_default
-clutter_stage_manager_get_default
-clutter_stage_manager_get_default_stage
-clutter_stage_manager_get_type
-clutter_stage_manager_list_stages
-clutter_stage_manager_peek_stages
-clutter_stage_manager_set_default_stage
-
-#ifdef HAVE_CLUTTER_EGL
-
-#ifndef CLUTTER_DISABLE_DEPRECATED
-#ifdef CLUTTER_EGL_BACKEND_CEX100
-clutter_cex100_set_buffering_mode
-#endif
-clutter_eglx_display
-clutter_egl_display
-#endif
-
-clutter_egl_get_egl_display
-#endif
-
-clutter_stage_new
-clutter_stage_queue_redraw
-clutter_stage_read_pixels
-clutter_stage_set_accept_focus
-clutter_stage_set_color
-clutter_stage_set_fog
-clutter_stage_set_fullscreen
-clutter_stage_set_key_focus
-clutter_stage_set_minimum_size
-clutter_stage_set_motion_events_enabled
-clutter_stage_set_no_clear_hint
-clutter_stage_set_perspective
-clutter_stage_set_sync_delay
-clutter_stage_set_throttle_motion_events
-clutter_stage_set_title
-clutter_stage_set_user_resizable
-clutter_stage_set_use_alpha
-clutter_stage_set_use_fog
-clutter_stage_skip_sync_delay
-clutter_stage_state_get_type
-clutter_stage_show_cursor
-clutter_state_get_animator
-clutter_state_get_duration
-clutter_state_get_keys
-clutter_stage_get_redraw_clip_bounds
-clutter_state_get_state
-clutter_state_get_states
-clutter_state_get_timeline
-clutter_state_get_type
-clutter_state_key_get_mode
-clutter_state_key_get_object
-clutter_state_key_get_post_delay
-clutter_state_key_get_pre_delay
-clutter_state_key_get_property_name
-clutter_state_key_get_property_type
-clutter_state_key_get_source_state_name
-clutter_state_key_get_target_state_name
-clutter_state_key_get_type
-clutter_state_key_get_value
-clutter_state_new
-clutter_state_remove_key
-clutter_state_set
-clutter_state_set_animator
-clutter_state_set_duration
-clutter_state_set_key
-clutter_state_set_state
-clutter_state_warp_to_state
-clutter_static_color_get_type
-clutter_step_mode_get_type
-clutter_swipe_action_get_type
-clutter_swipe_action_new
-clutter_swipe_direction_get_type
-clutter_table_alignment_get_type
-clutter_table_child_get_type
-clutter_table_layout_get_alignment
-clutter_table_layout_get_column_count
-clutter_table_layout_get_column_spacing
-clutter_table_layout_get_easing_duration
-clutter_table_layout_get_easing_mode
-clutter_table_layout_get_expand
-clutter_table_layout_get_fill
-clutter_table_layout_get_row_count
-clutter_table_layout_get_row_spacing
-clutter_table_layout_get_span
-clutter_table_layout_get_type
-clutter_table_layout_get_use_animations
-clutter_table_layout_new
-clutter_table_layout_pack
-clutter_table_layout_set_alignment
-clutter_table_layout_set_column_spacing
-clutter_table_layout_set_easing_duration
-clutter_table_layout_set_easing_mode
-clutter_table_layout_set_expand
-clutter_table_layout_set_fill
-clutter_table_layout_set_row_spacing
-clutter_table_layout_set_span
-clutter_table_layout_set_use_animations
-clutter_tap_action_get_type
-clutter_tap_action_new
-clutter_texture_get_base_size
-clutter_texture_get_cogl_texture
-clutter_texture_get_cogl_material
-clutter_texture_error_get_type
-clutter_texture_error_quark
-clutter_texture_flags_get_type
-clutter_texture_get_filter_quality
-clutter_texture_get_keep_aspect_ratio
-clutter_texture_get_load_async
-clutter_texture_get_load_data_async
-clutter_texture_get_max_tile_waste
-clutter_texture_get_pick_with_alpha
-clutter_texture_get_pixel_format
-clutter_texture_get_repeat
-clutter_texture_get_sync_size
-clutter_texture_get_type
-clutter_texture_new
-clutter_texture_new_from_actor
-clutter_texture_new_from_file
-clutter_texture_node_get_type
-clutter_texture_node_new
-clutter_texture_quality_get_type
-clutter_texture_set_area_from_rgb_data
-clutter_texture_set_cogl_material
-clutter_texture_set_cogl_texture
-clutter_texture_set_filter_quality
-clutter_texture_set_from_file
-clutter_texture_set_from_rgb_data
-clutter_texture_set_from_yuv_data
-clutter_texture_set_keep_aspect_ratio
-clutter_texture_set_load_async
-clutter_texture_set_load_data_async
-clutter_texture_set_pick_with_alpha
-clutter_texture_set_repeat
-clutter_texture_set_sync_size
-clutter_text_buffer_emit_deleted_text
-clutter_text_buffer_emit_inserted_text
-clutter_text_buffer_get_bytes
-clutter_text_buffer_get_length
-clutter_text_buffer_get_max_length
-clutter_text_buffer_get_text
-clutter_text_buffer_get_type
-clutter_text_buffer_delete_text
-clutter_text_buffer_insert_text
-clutter_text_buffer_new_with_text
-clutter_text_buffer_new
-clutter_text_buffer_set_max_length
-clutter_text_buffer_set_text
-clutter_text_activate
-clutter_text_coords_to_position
-clutter_text_delete_chars
-clutter_text_delete_selection
-clutter_text_delete_text
-clutter_text_direction_get_type
-clutter_text_get_activatable
-clutter_text_get_attributes
-clutter_text_get_buffer
-clutter_text_get_chars
-clutter_text_get_color
-clutter_text_get_cursor_color
-clutter_text_get_cursor_position
-clutter_text_get_cursor_rect
-clutter_text_get_cursor_size
-clutter_text_get_cursor_visible
-clutter_text_get_editable
-clutter_text_get_ellipsize
-clutter_text_get_font_description
-clutter_text_get_font_name
-clutter_text_get_justify
-clutter_text_get_line_alignment
-clutter_text_get_layout
-clutter_text_get_layout_offsets
-clutter_text_get_line_wrap
-clutter_text_get_line_wrap_mode
-clutter_text_get_max_length
-clutter_text_get_password_char
-clutter_text_get_selectable
-clutter_text_get_selected_text_color
-clutter_text_get_selection
-clutter_text_get_selection_bound
-clutter_text_get_selection_color
-clutter_text_get_single_line_mode
-clutter_text_get_text
-clutter_text_get_type
-clutter_text_get_use_markup
-clutter_text_insert_text
-clutter_text_insert_unichar
-clutter_text_new
-clutter_text_new_full
-clutter_text_new_with_buffer
-clutter_text_new_with_text
-clutter_text_node_get_type
-clutter_text_node_new
-clutter_text_position_to_coords
-clutter_text_set_activatable
-clutter_text_set_attributes
-clutter_text_set_buffer
-clutter_text_set_color
-clutter_text_set_cursor_color
-clutter_text_set_cursor_position
-clutter_text_set_cursor_size
-clutter_text_set_cursor_visible
-clutter_text_set_editable
-clutter_text_set_ellipsize
-clutter_text_set_font_description
-clutter_text_set_font_name
-clutter_text_set_justify
-clutter_text_set_line_alignment
-clutter_text_set_line_wrap
-clutter_text_set_line_wrap_mode
-clutter_text_set_markup
-clutter_text_set_max_length
-clutter_text_set_password_char
-clutter_text_set_preedit_string
-clutter_text_set_selectable
-clutter_text_set_selected_text_color
-clutter_text_set_selection
-clutter_text_set_selection_bound
-clutter_text_set_selection_color
-clutter_text_set_single_line_mode
-clutter_text_set_text
-clutter_text_set_use_markup
-clutter_threads_add_frame_source
-clutter_threads_add_frame_source_full
-clutter_threads_add_idle
-clutter_threads_add_idle_full
-clutter_threads_add_repaint_func
-clutter_threads_add_repaint_func_full
-clutter_threads_add_timeout
-clutter_threads_add_timeout_full
-clutter_threads_enter
-clutter_threads_init
-clutter_threads_leave
-clutter_threads_remove_repaint_func
-clutter_threads_set_lock_functions
-clutter_timeline_add_marker
-clutter_timeline_add_marker_at_time
-clutter_timeline_advance
-clutter_timeline_advance_to_marker
-clutter_timeline_new
-clutter_timeline_clone
-clutter_timeline_direction_get_type
-clutter_timeline_get_auto_reverse
-clutter_timeline_get_cubic_bezier_progress
-clutter_timeline_get_current_repeat
-clutter_timeline_get_delay
-clutter_timeline_get_delta
-clutter_timeline_get_direction
-clutter_timeline_get_duration_hint
-clutter_timeline_get_duration
-clutter_timeline_get_elapsed_time
-clutter_timeline_get_loop
-clutter_timeline_get_progress_mode
-clutter_timeline_get_progress
-clutter_timeline_get_repeat_count
-clutter_timeline_get_step_progress
-clutter_timeline_get_type
-clutter_timeline_has_marker
-clutter_timeline_is_playing
-clutter_timeline_list_markers
-clutter_timeline_pause
-clutter_timeline_remove_marker
-clutter_timeline_rewind
-clutter_timeline_set_auto_reverse
-clutter_timeline_set_cubic_bezier_progress
-clutter_timeline_set_delay
-clutter_timeline_set_direction
-clutter_timeline_set_duration
-clutter_timeline_set_loop
-clutter_timeline_set_progress_func
-clutter_timeline_set_progress_mode
-clutter_timeline_set_repeat_count
-clutter_timeline_set_step_progress
-clutter_timeline_skip
-clutter_timeline_start
-clutter_timeline_stop
-clutter_timeout_pool_add
-clutter_timeout_pool_new
-clutter_timeout_pool_remove
-clutter_transition_group_add_transition
-clutter_transition_group_get_type
-clutter_transition_group_new
-clutter_transition_group_remove_transition
-clutter_transition_group_remove_all
-clutter_transition_get_animatable
-clutter_transition_get_interval
-clutter_transition_get_type
-clutter_transition_get_remove_on_complete
-clutter_transition_set_animatable
-clutter_transition_set_from_value
-clutter_transition_set_from
-clutter_transition_set_interval
-clutter_transition_set_remove_on_complete
-clutter_transition_set_to_value
-clutter_transition_set_to
-clutter_ungrab_keyboard
-clutter_ungrab_pointer
-clutter_ungrab_pointer_for_device
-clutter_unicode_to_keysym
-clutter_units_copy
-clutter_units_free
-clutter_units_from_cm
-clutter_units_from_em
-clutter_units_from_em_for_font
-clutter_units_from_mm
-clutter_units_from_pixels
-clutter_units_from_pt
-clutter_units_from_string
-clutter_units_get_type
-clutter_units_get_unit_type
-clutter_units_get_unit_value
-clutter_units_to_pixels
-clutter_units_to_string
-clutter_unit_type_get_type
-clutter_util_next_p2
-clutter_value_dup_paint_node
-clutter_value_get_color
-clutter_value_get_fixed
-clutter_value_get_paint_node
-clutter_value_get_shader_float
-clutter_value_get_shader_int
-clutter_value_get_shader_matrix
-clutter_value_get_units
-clutter_value_set_color
-clutter_value_set_fixed
-clutter_value_set_paint_node
-clutter_value_set_shader_float
-clutter_value_set_shader_int
-clutter_value_set_shader_matrix
-clutter_value_set_units
-clutter_value_take_paint_node
-clutter_vertex_alloc
-clutter_vertex_copy
-clutter_vertex_equal
-clutter_vertex_free
-clutter_vertex_get_type
-clutter_vertex_init
-clutter_vertex_new
-#ifdef CLUTTER_WINDOWING_WAYLAND
-clutter_wayland_input_device_get_wl_seat
-clutter_wayland_stage_get_wl_shell_surface
-clutter_wayland_stage_get_wl_surface
-#endif
-#ifdef CLUTTER_WINDOWING_WIN32
-clutter_win32_disable_event_retrieval
-clutter_win32_get_stage_from_window
-clutter_win32_get_stage_window
-clutter_win32_set_stage_foreign
-clutter_win32_handle_event
-#endif
-#ifdef CLUTTER_WINDOWING_X11
-clutter_x11_add_filter
-clutter_x11_disable_event_retrieval
-clutter_x11_enable_xinput
-clutter_x11_event_get_key_group
-clutter_x11_event_sequence_get_touch_detail
-clutter_x11_filter_return_get_type
-clutter_x11_get_current_event_time
-clutter_x11_get_default_display
-clutter_x11_get_default_screen
-clutter_x11_get_input_devices
-clutter_x11_get_root_window
-clutter_x11_get_stage_from_window
-clutter_x11_get_stage_visual
-clutter_x11_get_stage_window
-clutter_x11_get_use_argb_visual
-clutter_x11_get_visual_info
-clutter_x11_handle_event
-clutter_x11_has_composite_extension
-clutter_x11_has_event_retrieval
-clutter_x11_has_xinput
-clutter_x11_remove_filter
-clutter_x11_set_use_argb_visual
-clutter_x11_set_display
-clutter_x11_set_stage_foreign
-clutter_x11_texture_pixmap_get_type
-clutter_x11_texture_pixmap_new
-clutter_x11_texture_pixmap_new_with_pixmap
-clutter_x11_texture_pixmap_new_with_window
-clutter_x11_texture_pixmap_set_automatic
-clutter_x11_texture_pixmap_set_pixmap
-clutter_x11_texture_pixmap_set_window
-clutter_x11_texture_pixmap_sync_window
-clutter_x11_texture_pixmap_update_area
-clutter_x11_trap_x_errors
-clutter_x11_untrap_x_errors
-clutter_x11_xinput_event_types_get_type
-#endif
-clutter_zoom_action_get_focal_point
-clutter_zoom_action_get_transformed_focal_point
-clutter_zoom_action_get_type
-clutter_zoom_action_get_zoom_axis
-clutter_zoom_action_new
-clutter_zoom_action_set_zoom_axis
-clutter_zoom_axis_get_type
diff --git a/clutter/cogl/clutter-stage-cogl.c b/clutter/cogl/clutter-stage-cogl.c
index c7fb5be2b..0b8f27987 100644
--- a/clutter/cogl/clutter-stage-cogl.c
+++ b/clutter/cogl/clutter-stage-cogl.c
@@ -160,10 +160,10 @@ clutter_stage_cogl_realize (ClutterStageWindow *stage_window)
    * updated to this size. */
 
   stage_cogl->frame_closure =
-          cogl_onscreen_add_frame_callback (stage_cogl->onscreen,
-                                            frame_cb,
-                                            stage_cogl,
-                                            NULL);
+    cogl_onscreen_add_frame_callback (stage_cogl->onscreen,
+                                      frame_cb,
+                                      stage_cogl,
+                                      NULL);
   return TRUE;
 }
 
@@ -260,8 +260,11 @@ clutter_stage_cogl_get_geometry (ClutterStageWindow    *stage_window,
                                  cairo_rectangle_int_t *geometry)
 {
   ClutterStageCogl *stage_cogl = CLUTTER_STAGE_COGL (stage_window);
+  int window_scale;
 
-  if (geometry)
+  window_scale = _clutter_stage_window_get_scale_factor (stage_window);
+
+  if (geometry != NULL)
     {
       if (stage_cogl->onscreen)
         {
@@ -270,8 +273,8 @@ clutter_stage_cogl_get_geometry (ClutterStageWindow    *stage_window,
 
           geometry->x = geometry->y = 0;
 
-          geometry->width = cogl_framebuffer_get_width (framebuffer);
-          geometry->height = cogl_framebuffer_get_height (framebuffer);
+          geometry->width = cogl_framebuffer_get_width (framebuffer) / window_scale;
+          geometry->height = cogl_framebuffer_get_height (framebuffer) / window_scale;
         }
       else
         {
@@ -284,8 +287,8 @@ clutter_stage_cogl_get_geometry (ClutterStageWindow    *stage_window,
 
 static void
 clutter_stage_cogl_resize (ClutterStageWindow *stage_window,
-                          gint                width,
-                          gint                height)
+                           gint                width,
+                           gint                height)
 {
 }
 
@@ -395,6 +398,8 @@ static void
 clutter_stage_cogl_redraw (ClutterStageWindow *stage_window)
 {
   ClutterStageCogl *stage_cogl = CLUTTER_STAGE_COGL (stage_window);
+  cairo_rectangle_int_t geom;
+  gboolean have_clip;
   gboolean may_use_clipped_redraw;
   gboolean use_clipped_redraw;
   gboolean can_blit_sub_buffer;
@@ -402,6 +407,7 @@ clutter_stage_cogl_redraw (ClutterStageWindow *stage_window)
   ClutterActor *wrapper;
   cairo_rectangle_int_t *clip_region;
   gboolean force_swap;
+  int window_scale;
 
   CLUTTER_STATIC_TIMER (painting_timer,
                         "Redrawing", /* parent */
@@ -431,11 +437,19 @@ clutter_stage_cogl_redraw (ClutterStageWindow *stage_window)
 
   has_buffer_age = cogl_clutter_winsys_has_feature (COGL_WINSYS_FEATURE_BUFFER_AGE);
 
+  _clutter_stage_window_get_geometry (stage_window, &geom);
+
+  /* NB: a zero width redraw clip == full stage redraw */
+  have_clip = (stage_cogl->bounding_redraw_clip.width != 0 &&
+	       !(stage_cogl->bounding_redraw_clip.x == 0 &&
+		 stage_cogl->bounding_redraw_clip.y == 0 &&
+		 stage_cogl->bounding_redraw_clip.width == geom.width &&
+		 stage_cogl->bounding_redraw_clip.height == geom.height));
+
   may_use_clipped_redraw = FALSE;
   if (_clutter_stage_window_can_clip_redraws (stage_window) &&
-      can_blit_sub_buffer &&
-      /* NB: a zero width redraw clip == full stage redraw */
-      stage_cogl->bounding_redraw_clip.width != 0 &&
+      (can_blit_sub_buffer || has_buffer_age) &&
+      have_clip &&
       /* some drivers struggle to get going and produce some junk
        * frames when starting up... */
       stage_cogl->frame_count > 3)
@@ -443,16 +457,19 @@ clutter_stage_cogl_redraw (ClutterStageWindow *stage_window)
       may_use_clipped_redraw = TRUE;
       clip_region = &stage_cogl->bounding_redraw_clip;
     }
+  else
+    clip_region = NULL;
 
   if (may_use_clipped_redraw &&
-      G_LIKELY (!(clutter_paint_debug_flags &
-                  CLUTTER_DEBUG_DISABLE_CLIPPED_REDRAWS)))
+      G_LIKELY (!(clutter_paint_debug_flags & CLUTTER_DEBUG_DISABLE_CLIPPED_REDRAWS)))
     use_clipped_redraw = TRUE;
   else
     use_clipped_redraw = FALSE;
 
   force_swap = FALSE;
 
+  window_scale = _clutter_stage_window_get_scale_factor (stage_window);
+
   if (use_clipped_redraw)
     {
       if (has_buffer_age)
@@ -468,11 +485,12 @@ clutter_stage_cogl_redraw (ClutterStageWindow *stage_window)
 
         stage_cogl->damage_history = g_slist_prepend (stage_cogl->damage_history, current_damage);
 
-        if (age != 0 && !stage_cogl->dirty_backbuffer && g_slist_length (stage_cogl->damage_history) >= age)
+        if (age != 0 && !stage_cogl->dirty_backbuffer && g_slist_length (stage_cogl->damage_history) > age)
           {
             int i = 0;
             GSList *tmp = NULL;
-            for (tmp = stage_cogl->damage_history; tmp; tmp = tmp->next)
+            /* We skip the first entry because it is the clip_region itself */
+            for (tmp = stage_cogl->damage_history->next; tmp; tmp = tmp->next)
               {
                 _clutter_util_rectangle_union (clip_region, tmp->data, clip_region);
                 i++;
@@ -486,10 +504,10 @@ clutter_stage_cogl_redraw (ClutterStageWindow *stage_window)
             force_swap = TRUE;
 
             CLUTTER_NOTE (CLIPPING, "Reusing back buffer - repairing region: x=%d, y=%d, width=%d, height=%d\n",
-                    clip_region->x,
-                    clip_region->y,
-                    clip_region->width,
-                    clip_region->height);
+                          clip_region->x,
+                          clip_region->y,
+                          clip_region->width,
+                          clip_region->height);
 
           }
         else if (age == 0 || stage_cogl->dirty_backbuffer)
@@ -501,7 +519,7 @@ clutter_stage_cogl_redraw (ClutterStageWindow *stage_window)
 
       }
     }
-  else
+  else if (has_buffer_age)
     {
       CLUTTER_NOTE (CLIPPING, "Unclipped redraw: Resetting damage history list.\n");
       g_slist_free_full (stage_cogl->damage_history, g_free);
@@ -513,6 +531,8 @@ clutter_stage_cogl_redraw (ClutterStageWindow *stage_window)
 
   if (use_clipped_redraw)
     {
+      CoglFramebuffer *fb = COGL_FRAMEBUFFER (stage_cogl->onscreen);
+
       CLUTTER_NOTE (CLIPPING,
                     "Stage clip pushed: x=%d, y=%d, width=%d, height=%d\n",
                     clip_region->x,
@@ -522,13 +542,13 @@ clutter_stage_cogl_redraw (ClutterStageWindow *stage_window)
 
       stage_cogl->using_clipped_redraw = TRUE;
 
-      cogl_clip_push_window_rectangle (clip_region->x,
-                                       clip_region->y,
-                                       clip_region->width,
-                                       clip_region->height);
-      _clutter_stage_do_paint (CLUTTER_STAGE (wrapper),
-                               clip_region);
-      cogl_clip_pop ();
+      cogl_framebuffer_push_scissor_clip (fb,
+                                          clip_region->x * window_scale,
+                                          clip_region->y * window_scale,
+                                          clip_region->width * window_scale,
+                                          clip_region->height * window_scale);
+      _clutter_stage_do_paint (CLUTTER_STAGE (wrapper), clip_region);
+      cogl_framebuffer_pop_clip (fb);
 
       stage_cogl->using_clipped_redraw = FALSE;
     }
@@ -538,12 +558,10 @@ clutter_stage_cogl_redraw (ClutterStageWindow *stage_window)
 
       /* If we are trying to debug redraw issues then we want to pass
        * the bounding_redraw_clip so it can be visualized */
-      if (G_UNLIKELY (clutter_paint_debug_flags &
-                      CLUTTER_DEBUG_DISABLE_CLIPPED_REDRAWS) &&
+      if (G_UNLIKELY (clutter_paint_debug_flags & CLUTTER_DEBUG_DISABLE_CLIPPED_REDRAWS) &&
           may_use_clipped_redraw)
         {
-          _clutter_stage_do_paint (CLUTTER_STAGE (wrapper),
-                                   clip_region);
+          _clutter_stage_do_paint (CLUTTER_STAGE (wrapper), clip_region);
         }
       else
         _clutter_stage_do_paint (CLUTTER_STAGE (wrapper), NULL);
@@ -557,10 +575,10 @@ clutter_stage_cogl_redraw (ClutterStageWindow *stage_window)
       static CoglPipeline *outline = NULL;
       cairo_rectangle_int_t *clip = &stage_cogl->bounding_redraw_clip;
       ClutterActor *actor = CLUTTER_ACTOR (wrapper);
-      float x_1 = clip->x;
-      float x_2 = clip->x + clip->width;
-      float y_1 = clip->y;
-      float y_2 = clip->y + clip->height;
+      float x_1 = clip->x * window_scale;
+      float x_2 = clip->x + clip->width * window_scale;
+      float y_1 = clip->y * window_scale;
+      float y_2 = clip->y + clip->height * window_scale;
       CoglVertexP2 quad[4] = {
         { x_1, y_1 },
         { x_2, y_1 },
@@ -609,10 +627,10 @@ clutter_stage_cogl_redraw (ClutterStageWindow *stage_window)
        * artefacts.
        */
 
-      copy_area[0] = clip->x;
-      copy_area[1] = clip->y;
-      copy_area[2] = clip->width;
-      copy_area[3] = clip->height;
+      copy_area[0] = clip->x * window_scale;
+      copy_area[1] = clip->y * window_scale;
+      copy_area[2] = clip->width * window_scale;
+      copy_area[3] = clip->height * window_scale;
 
       CLUTTER_NOTE (BACKEND,
                     "cogl_onscreen_swap_region (onscreen: %p, "
@@ -671,22 +689,24 @@ clutter_stage_cogl_dirty_back_buffer (ClutterStageWindow *stage_window)
 
 static void
 clutter_stage_cogl_get_dirty_pixel (ClutterStageWindow *stage_window,
-                                    int *x, int *y)
+                                    int                *x,
+                                    int                *y)
 {
-    ClutterStageCogl *stage_cogl = CLUTTER_STAGE_COGL (stage_window);
-    gboolean has_buffer_age = cogl_clutter_winsys_has_feature (COGL_WINSYS_FEATURE_BUFFER_AGE);
-    if ((stage_cogl->damage_history == NULL && has_buffer_age) || !has_buffer_age)
-      {
-        *x = 0;
-        *y = 0;
-      }
-    else
-     {
-        cairo_rectangle_int_t *rect;
-        rect = (cairo_rectangle_int_t *) (stage_cogl->damage_history->data);
-        *x = rect->x;
-        *y = rect->y;
-     }
+  ClutterStageCogl *stage_cogl = CLUTTER_STAGE_COGL (stage_window);
+  gboolean has_buffer_age = cogl_clutter_winsys_has_feature (COGL_WINSYS_FEATURE_BUFFER_AGE);
+
+  if ((stage_cogl->damage_history == NULL && has_buffer_age) || !has_buffer_age)
+    {
+      *x = 0;
+      *y = 0;
+    }
+  else
+    {
+      cairo_rectangle_int_t *rect;
+      rect = (cairo_rectangle_int_t *) (stage_cogl->damage_history->data);
+      *x = rect->x;
+      *y = rect->y;
+    }
 }
 
 static void
diff --git a/clutter/config.h.win32.in b/clutter/config.h.win32.in
index 798bfcb73..f53803555 100644
--- a/clutter/config.h.win32.in
+++ b/clutter/config.h.win32.in
@@ -1,10 +1,10 @@
 /* config.h.in.  Generated from configure.ac by autoheader.  */
 
 /* Use CEX100 EGL backend */
-/*#undef CLUTTER_EGL_BACKEND_CEX100*/
+/* #undef CLUTTER_EGL_BACKEND_CEX100 */
 
 /* Use Generic EGL backend */
-/*#undef CLUTTER_EGL_BACKEND_GENERIC*/
+/* #undef CLUTTER_EGL_BACKEND_GENERIC*/
 
 /* Can use Cogl 2.0 API internally */
 #define COGL_ENABLE_EXPERIMENTAL_2_0_API 1
@@ -16,28 +16,31 @@
 /* The prefix for our gettext translation domains. */
 #define GETTEXT_PACKAGE "@GETTEXT_PACKAGE@"
 
+/* Define to 1 if you have the `cairo_surface_set_device_scale' function. */
+/* #undef HAVE_CAIRO_SURFACE_SET_DEVICE_SCALE */
+
 /* Define to 1 if you have the <CE4100/libgdl.h> header file. */
-/*#undef HAVE_CE4100_LIBGDL_H*/
+/* #undef HAVE_CE4100_LIBGDL_H */
 
 /* Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the
    CoreFoundation framework. */
-/*#undef HAVE_CFLOCALECOPYCURRENT*/
+/* #undef HAVE_CFLOCALECOPYCURRENT */
 
 /* Define to 1 if you have the MacOS X function CFPreferencesCopyAppValue in
    the CoreFoundation framework. */
-/*#undef HAVE_CFPREFERENCESCOPYAPPVALUE*/
+/* #undef HAVE_CFPREFERENCESCOPYAPPVALUE */
 
 /* Have the EGL backend */
-/*#undef HAVE_CLUTTER_EGL*/
+/* #undef HAVE_CLUTTER_EGL */
 
 /* Have the GLX backend */
-/*#undef HAVE_CLUTTER_GLX*/
+/* #undef HAVE_CLUTTER_GLX */
 
 /* Have the OSX backend */
-/*#undef HAVE_CLUTTER_OSX*/
+/* #undef HAVE_CLUTTER_OSX */
 
 /* Have the Wayland backend */
-/*#undef HAVE_CLUTTER_WAYLAND*/
+/* #undef HAVE_CLUTTER_WAYLAND */
 
 /* Have Wayland compositor support */
 /* #undef HAVE_CLUTTER_WAYLAND_COMPOSITOR */
@@ -50,10 +53,13 @@
 #define HAVE_DCGETTEXT 1
 
 /* Define to 1 if you have the <dlfcn.h> header file. */
-/*#undef HAVE_DLFCN_H*/
+/* #undef HAVE_DLFCN_H */
 
 /* Have evdev support for input handling */
-/*#undef HAVE_EVDEV*/
+/* #undef HAVE_EVDEV */
+
+/* Whether you have gcov */
+/* #undef HAVE_GCOV */
 
 /* Define if the GNU gettext() function is already present or preinstalled. */
 #define HAVE_GETTEXT 1
@@ -62,10 +68,12 @@
 #define HAVE_ICONV 1
 
 /* Define to 1 if you have the <inttypes.h> header file. */
-/*#undef HAVE_INTTYPES_H*/
+#if !defined (_MSC_VER) || (_MSC_VER >= 1800)
+#define HAVE_INTTYPES_H 1
+#endif
 
 /* Define to 1 if you have the <libgdl.h> header file. */
-/*#undef HAVE_LIBGDL_H*/
+/* #undef HAVE_LIBGDL_H */
 
 /* Define to 1 if you have the <memory.h> header file. */
 #define HAVE_MEMORY_H 1
@@ -74,7 +82,7 @@
 /* #undef HAVE_PANGO_FT2 */
 
 /* Define to 1 if you have the <stdint.h> header file. */
-#if (_MSC_VER >= 1600)
+#if !defined (_MSC_VER) || (_MSC_VER >= 1600)
 #define HAVE_STDINT_H 1
 #endif
 
@@ -82,7 +90,9 @@
 #define HAVE_STDLIB_H 1
 
 /* Define to 1 if you have the <strings.h> header file. */
-/*#undef HAVE_STRINGS_H*/
+#ifndef _MSC_VER
+#define HAVE_STRINGS_H 1
+#endif
 
 /* Define to 1 if you have the <string.h> header file. */
 #define HAVE_STRING_H 1
@@ -94,44 +104,46 @@
 #define HAVE_SYS_TYPES_H 1
 
 /* Have tslib for touchscreen handling */
-/*#undef HAVE_TSLIB*/
+/* #undef HAVE_TSLIB */
 
 /* Define to 1 if you have the <unistd.h> header file. */
-/*#undef HAVE_UNISTD_H*/
+#ifndef _MSC_VER
+#define HAVE_UNISTD_H 1
+#endif
 
 /* Define to 1 if you have the <X11/extensions/XInput2.h> header file. */
-/*#undef HAVE_X11_EXTENSIONS_XINPUT2_H*/
+/* #undef HAVE_X11_EXTENSIONS_XINPUT2_H */
 
 /* Define to 1 if we have the XCOMPOSITE X extension */
-/*#undef HAVE_XCOMPOSITE*/
+/* #undef HAVE_XCOMPOSITE */
 
 /* Define to 1 if we have the XDAMAGE X extension */
-/*#undef HAVE_XDAMAGE*/
+/* #undef HAVE_XDAMAGE */
 
 /* Define to 1 if we have the XEXT X extension */
-/*#undef HAVE_XEXT*/
-
-/* Define to 1 if we have the XFIXES X extension */
-/*#undef HAVE_XFIXES*/
+/* #undef HAVE_XEXT */
 
 /* Define to 1 if X Generic Extensions is available */
 /* #undef HAVE_XGE */
 
-/* Define to 1 if XInput is available */
-/*#undef HAVE_XINPUT*/
-
 /* Define to 1 if XI2 is available */
-/*#undef HAVE_XINPUT_2*/
+/* #undef HAVE_XINPUT_2 */
+
+/* Define to 1 if XInput 2.2 is available */
+/* #undef HAVE_XINPUT_2_2 */
 
 /* Define to use XKB extension */
-/*#undef HAVE_XKB*/
+/* #undef HAVE_XKB */
 
 /* Define to the sub-directory in which libtool stores uninstalled libraries.
    */
 #define LT_OBJDIR ".libs/"
 
 /* Define to 1 if your C compiler doesn't accept -c and -o together. */
-#define NO_MINUS_C_MINUS_O 1
+/* #undef NO_MINUS_C_MINUS_O */
+
+/* Define to 1 if building for Linux */
+/* #undef OS_LINUX */
 
 /* Define to the address where bug reports for this package should be sent. */
 #define PACKAGE_BUGREPORT "https://bugzilla.gnome.org/enter_bug.cgi?product=clutter"
@@ -153,3 +165,10 @@
 
 /* Define to 1 if you have the ANSI C header files. */
 #define STDC_HEADERS 1
+
+/* defines how to decorate public symbols while building */
+#ifdef _MSC_VER
+#define _CLUTTER_EXTERN __declspec(dllexport) extern
+#else
+#define _CLUTTER_EXTERN __attribute__((visibility("default"))) __declspec(dllexport) extern
+#endif
diff --git a/clutter/deprecated/clutter-actor-deprecated.c b/clutter/deprecated/clutter-actor-deprecated.c
index ff3a37c06..e3f381305 100644
--- a/clutter/deprecated/clutter-actor-deprecated.c
+++ b/clutter/deprecated/clutter-actor-deprecated.c
@@ -94,8 +94,8 @@ clutter_actor_get_shader (ClutterActor *self)
  * If @shader is %NULL this function will unset any currently set shader
  * for the actor.
  *
- * <note>Any #ClutterEffect applied to @self will take the precedence
- * over the #ClutterShader set using this function.</note>
+ * Any #ClutterEffect applied to @self will take the precedence
+ * over the #ClutterShader set using this function.
  *
  * Return value: %TRUE if the shader was successfully applied
  *   or removed
diff --git a/clutter/deprecated/clutter-alpha.c b/clutter/deprecated/clutter-alpha.c
index d9548a5ee..def8ec532 100644
--- a/clutter/deprecated/clutter-alpha.c
+++ b/clutter/deprecated/clutter-alpha.c
@@ -32,11 +32,11 @@
  * #ClutterAlpha is a class for calculating an floating point value
  * dependent only on the position of a #ClutterTimeline.
  *
- * <warning>For newly written code, it is recommended to use the
+ * For newly written code, it is recommended to use the
  * #ClutterTimeline:progress-mode property of #ClutterTimeline, or the
  * clutter_timeline_set_progress_func() function instead of #ClutterAlpha.
  * The #ClutterAlpha class will be deprecated in the future, and will not
- * be available any more in the next major version of Clutter.</warning>
+ * be available any more in the next major version of Clutter.
  *
  * A #ClutterAlpha binds a #ClutterTimeline to a progress function which
  * translates the time T into an adimensional factor alpha. The factor can
@@ -62,22 +62,27 @@
  * #ClutterAlpha is used to "drive" a #ClutterBehaviour instance, and it
  * is internally used by the #ClutterAnimation API.
  *
- * <refsect2 id="ClutterAlpha-script">
- *   <title>ClutterAlpha custom properties for #ClutterScript</title>
- *   <para>#ClutterAlpha defines a custom "function" property for
- *   #ClutterScript which allows to reference a custom alpha function
- *   available in the source code. Setting the "function" property
- *   is equivalent to calling clutter_alpha_set_func() with the
- *   specified function name. No user data or #GDestroyNotify is
- *   available to be passed.</para>
- *   <example id="ClutterAlpha-script-example">
- *     <title>Defining a ClutterAlpha in ClutterScript</title>
- *     <para>The following JSON fragment defines a #ClutterAlpha
- *     using a #ClutterTimeline with id "sine-timeline" and an alpha
- *     function called <function>my_sine_alpha</function>. The defined
- *     #ClutterAlpha instance can be reused in multiple #ClutterBehaviour
- *     definitions or for #ClutterAnimation definitions.</para>
- *     <programlisting><![CDATA[
+ * #ClutterAlpha is available since Clutter 0.2.
+ *
+ * #ClutterAlpha is deprecated since Clutter 1.12; use #ClutterTimeline and the
+ * #ClutterTimeline:progress-mode property.
+ *
+ * ## ClutterAlpha custom properties for #ClutterScript
+ *
+ * #ClutterAlpha defines a custom `function` property for
+ * #ClutterScript which allows to reference a custom alpha function
+ * available in the source code. Setting the `function` property
+ * is equivalent to calling clutter_alpha_set_func() with the
+ * specified function name. No user data or #GDestroyNotify is
+ * available to be passed.
+ *
+ * The following JSON fragment defines a #ClutterAlpha
+ * using a #ClutterTimeline with id "sine-timeline" and an alpha
+ * function called `my_sine_alpha`. The defined #ClutterAlpha
+ * instance can be reused in multiple #ClutterBehaviour
+ * definitions or for #ClutterAnimation definitions.
+ *
+ * |[
  * {
  *   "id" : "sine-alpha",
  *   "timeline" : {
@@ -87,19 +92,7 @@
  *   },
  *   "function" : "my_sine_alpha"
  * }
- *    ]]></programlisting>
- *   </example>
- *   <para>For the way to define the #ClutterAlpha:mode property
- *   inside a ClutterScript fragment, see <link
- *   linkend="clutter-AnimationMode-Script">the corresponding section</link>
- *   in #ClutterAnimation.</para>
- * </refsect2>
- *
- * #ClutterAlpha is available since Clutter 0.2.
- *
- * #ClutterAlpha is deprecated since Clutter 1.12; use #ClutterTimeline and the
- * #ClutterTimeline:progress-mode property.
- *
+ * ]|
  */
 
 #ifdef HAVE_CONFIG_H
@@ -122,14 +115,6 @@
 #include "clutter-scriptable.h"
 #include "clutter-script-private.h"
 
-static void clutter_scriptable_iface_init (ClutterScriptableIface *iface);
-
-G_DEFINE_TYPE_WITH_CODE (ClutterAlpha,
-                         clutter_alpha,
-                         G_TYPE_INITIALLY_UNOWNED,
-                         G_IMPLEMENT_INTERFACE (CLUTTER_TYPE_SCRIPTABLE,
-                                                clutter_scriptable_iface_init));
-
 struct _ClutterAlphaPrivate
 {
   ClutterTimeline *timeline;
@@ -159,6 +144,15 @@ enum
 
 static GParamSpec *obj_props[PROP_LAST];
 
+static void clutter_scriptable_iface_init (ClutterScriptableIface *iface);
+
+G_DEFINE_TYPE_WITH_CODE (ClutterAlpha,
+                         clutter_alpha,
+                         G_TYPE_INITIALLY_UNOWNED,
+                         G_ADD_PRIVATE (ClutterAlpha)
+                         G_IMPLEMENT_INTERFACE (CLUTTER_TYPE_SCRIPTABLE,
+                                                clutter_scriptable_iface_init));
+
 static void
 timeline_new_frame_cb (ClutterTimeline *timeline,
                        guint            msecs,
@@ -339,8 +333,6 @@ clutter_alpha_class_init (ClutterAlphaClass *klass)
   object_class->finalize     = clutter_alpha_finalize;
   object_class->dispose      = clutter_alpha_dispose;
 
-  g_type_class_add_private (klass, sizeof (ClutterAlphaPrivate));
-
   /**
    * ClutterAlpha:timeline:
    *
@@ -405,10 +397,7 @@ clutter_alpha_class_init (ClutterAlphaClass *klass)
 static void
 clutter_alpha_init (ClutterAlpha *self)
 {
-  self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self,
-					    CLUTTER_TYPE_ALPHA,
-					    ClutterAlphaPrivate);
-
+  self->priv = clutter_alpha_get_instance_private (self);
   self->priv->mode = CLUTTER_CUSTOM_MODE;
   self->priv->alpha = 0.0;
 }
@@ -926,7 +915,7 @@ clutter_alpha_register_func (ClutterAlphaFunc func,
 }
 
 /**
- * clutter_alpha_register_closure:
+ * clutter_alpha_register_closure: (rename-to clutter_alpha_register_func)
  * @closure: a #GClosure
  *
  * #GClosure variant of clutter_alpha_register_func().
@@ -936,8 +925,6 @@ clutter_alpha_register_func (ClutterAlphaFunc func,
  *
  * The logical id is always greater than %CLUTTER_ANIMATION_LAST.
  *
- * Rename to: clutter_alpha_register_func
- *
  * Return value: the logical id of the alpha function
  *
  * Since: 1.0
diff --git a/clutter/deprecated/clutter-alpha.h b/clutter/deprecated/clutter-alpha.h
index 347ff4a14..8a0dff661 100644
--- a/clutter/deprecated/clutter-alpha.h
+++ b/clutter/deprecated/clutter-alpha.h
@@ -58,6 +58,8 @@ typedef struct _ClutterAlphaPrivate     ClutterAlphaPrivate;
  * Return value: a floating point value
  *
  * Since: 0.2
+ *
+ * Deprecated: 1.12: Use #ClutterTimelineProgressFunc instead.
  */
 typedef gdouble (*ClutterAlphaFunc) (ClutterAlpha *alpha,
                                      gpointer      user_data); 
@@ -70,6 +72,8 @@ typedef gdouble (*ClutterAlphaFunc) (ClutterAlpha *alpha,
  * only be accessed using the provided API.
  *
  * Since: 0.2
+ *
+ * Deprecated: 1.12: Use #ClutterTimeline instead
  */
 struct _ClutterAlpha
 {
@@ -85,6 +89,8 @@ struct _ClutterAlpha
  * Base class for #ClutterAlpha
  *
  * Since: 0.2
+ *
+ * Deprecated: 1.12: Use #ClutterTimeline instead
  */
 struct _ClutterAlphaClass
 {
diff --git a/clutter/deprecated/clutter-animation.c b/clutter/deprecated/clutter-animation.c
index 80f5f6a7b..06a8f8d42 100644
--- a/clutter/deprecated/clutter-animation.c
+++ b/clutter/deprecated/clutter-animation.c
@@ -29,7 +29,7 @@
  *   #ClutterTimeline
  *
  * #ClutterAnimation is an object providing simple, implicit animations
- * for #GObject<!-- -->s.
+ * for #GObjects.
  *
  * #ClutterAnimation instances will bind one or more #GObject properties
  * belonging to a #GObject to a #ClutterInterval, and will then use a
@@ -57,91 +57,40 @@
  * #ClutterAnimatable interface it is possible for that instance to
  * control the way the initial and final states are interpolated.
  *
- * #ClutterAnimation<!-- -->s are distinguished from #ClutterBehaviour<!-- -->s
+ * #ClutterAnimations are distinguished from #ClutterBehaviours
  * because the former can only control #GObject properties of a single
  * #GObject instance, while the latter can control multiple properties
  * using accessor functions inside the #ClutterBehaviour
- * <function>alpha_notify</function> virtual function, and can control
- * multiple #ClutterActor<!-- -->s as well.
+ * `alpha_notify` virtual function, and can control multiple #ClutterActors
+ * as well.
  *
  * For convenience, it is possible to use the clutter_actor_animate()
  * function call which will take care of setting up and tearing down
  * a #ClutterAnimation instance and animate an actor between its current
  * state and the specified final state.
  *
- * <refsect2 id="clutter-AnimationMode-Script">
- *   <title>Defining ClutterAnimationMode inside ClutterScript</title>
- *   <para>When defining a #ClutterAnimation inside a ClutterScript
- *   file or string the #ClutterAnimation:mode can be defined either
- *   using the #ClutterAnimationMode enumeration values through their
- *   "nick" (the short string used inside #GEnumValue), their numeric
- *   id, or using the following strings:</para>
- *   <variablelist>
- *     <varlistentry>
- *       <term>easeInQuad, easeOutQuad, easeInOutQuad</term>
- *       <listitem><para>Corresponding to the quadratic easing
- *       modes</para></listitem>
- *     </varlistentry>
- *     <varlistentry>
- *       <term>easeInCubic, easeOutCubic, easeInOutCubic</term>
- *       <listitem><para>Corresponding to the cubic easing
- *       modes</para></listitem>
- *     </varlistentry>
- *     <varlistentry>
- *       <term>easeInQuart, easeOutQuart, easeInOutQuart</term>
- *       <listitem><para>Corresponding to the quartic easing
- *       modes</para></listitem>
- *     </varlistentry>
- *     <varlistentry>
- *       <term>easeInQuint, easeOutQuint, easeInOutQuint</term>
- *       <listitem><para>Corresponding to the quintic easing
- *       modes</para></listitem>
- *     </varlistentry>
- *     <varlistentry>
- *       <term>easeInSine, easeOutSine, easeInOutSine</term>
- *       <listitem><para>Corresponding to the sine easing
- *       modes</para></listitem>
- *     </varlistentry>
- *     <varlistentry>
- *       <term>easeInExpo, easeOutExpo, easeInOutExpo</term>
- *       <listitem><para>Corresponding to the exponential easing
- *       modes</para></listitem>
- *     </varlistentry>
- *     <varlistentry>
- *       <term>easeInCirc, easeOutCirc, easeInOutCirc</term>
- *       <listitem><para>Corresponding to the circular easing
- *       modes</para></listitem>
- *     </varlistentry>
- *     <varlistentry>
- *       <term>easeInElastic, easeOutElastic, easeInOutElastic</term>
- *       <listitem><para>Corresponding to the overshooting elastic
- *       easing modes</para></listitem>
- *     </varlistentry>
- *     <varlistentry>
- *       <term>easeInBack, easeOutBack, easeInOutBack</term>
- *       <listitem><para>Corresponding to the overshooting cubic
- *       easing modes</para></listitem>
- *     </varlistentry>
- *     <varlistentry>
- *       <term>easeInBounce, easeOutBounce, easeInOutBounce</term>
- *       <listitem><para>Corresponding to the bouncing easing
- *       modes</para></listitem>
- *     </varlistentry>
- *   </variablelist>
- * </refsect2>
- *
- * <example id="example-clutter-animation">
- *   <title>Tweening using clutter_actor_animate()</title>
- *   <programlisting>
- * <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" parse="text" href="../../../../tests/interactive/test-easing.c">
- *   <xi:fallback>FIXME: MISSING XINCLUDE CONTENT</xi:fallback>
- * </xi:include>
- *   </programlisting>
- * </example>
- *
  * #ClutterAnimation is available since Clutter 1.0.
  *
  * #ClutterAnimation has been deprecated in Clutter 1.12.
+ *
+ * ## Defining ClutterAnimationMode inside ClutterScript
+ *
+ * When defining a #ClutterAnimation inside a ClutterScript
+ * file or string the #ClutterAnimation:mode can be defined either
+ * using the #ClutterAnimationMode enumeration values through their
+ * "nick" (the short string used inside #GEnumValue), their numeric
+ * id, or using the following strings:
+ *
+ *  - easeInQuad, easeOutQuad, easeInOutQuad
+ *  - easeInCubic, easeOutCubic, easeInOutCubic
+ *  - easeInQuart, easeOutQuart, easeInOutQuart
+ *  - easeInQuint, easeOutQuint, easeInOutQuint
+ *  - easeInSine, easeOutSine, easeInOutSine
+ *  - easeInExpo, easeOutExpo, easeInOutExpo
+ *  - easeInCirc, easeOutCirc, easeInOutCirc
+ *  - easeInElastic, easeOutElastic, easeInOutElastic
+ *  - easeInBack, easeOutBack, easeInOutBack
+ *  - easeInBounce, easeOutBounce, easeInOutBounce
  */
 
 #ifdef HAVE_CONFIG_H
@@ -190,8 +139,6 @@ enum
   LAST_SIGNAL
 };
 
-#define CLUTTER_ANIMATION_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), CLUTTER_TYPE_ANIMATION, ClutterAnimationPrivate))
-
 struct _ClutterAnimationPrivate
 {
   GObject *object;
@@ -218,6 +165,7 @@ static ClutterAlpha *           clutter_animation_get_alpha_internal    (Clutter
 static ClutterTimeline *        clutter_animation_get_timeline_internal (ClutterAnimation *animation);
 
 G_DEFINE_TYPE_WITH_CODE (ClutterAnimation, clutter_animation, G_TYPE_OBJECT,
+                         G_ADD_PRIVATE (ClutterAnimation)
                          G_IMPLEMENT_INTERFACE (CLUTTER_TYPE_SCRIPTABLE,
                                                 clutter_scriptable_init));
 
@@ -357,6 +305,12 @@ clutter_animation_dispose (GObject *gobject)
   priv->timeline_completed_id = 0;
   priv->timeline_frame_id = 0;
 
+  if (priv->timeline != NULL)
+    {
+      g_object_unref (priv->timeline);
+      priv->timeline = NULL;
+    }
+
   if (priv->alpha != NULL)
     {
       g_object_unref (priv->alpha);
@@ -489,8 +443,6 @@ clutter_animation_class_init (ClutterAnimationClass *klass)
   quark_object_animation =
     g_quark_from_static_string ("clutter-actor-animation");
 
-  g_type_class_add_private (klass, sizeof (ClutterAnimationPrivate));
-
   klass->completed = clutter_animation_real_completed;
 
   gobject_class->set_property = clutter_animation_set_property;
@@ -643,7 +595,7 @@ clutter_animation_class_init (ClutterAnimationClass *klass)
 static void
 clutter_animation_init (ClutterAnimation *self)
 {
-  self->priv = CLUTTER_ANIMATION_GET_PRIVATE (self);
+  self->priv = clutter_animation_get_instance_private (self);
 
   self->priv->properties =
     g_hash_table_new_full (g_str_hash, g_str_equal,
@@ -2236,7 +2188,7 @@ clutter_actor_animate_with_timeline (ClutterActor    *actor,
  *
  * For example, this:
  *
- * |[
+ * |[<!-- language="C" -->
  *   clutter_actor_animate (rectangle, CLUTTER_LINEAR, 250,
  *                          "width", 100.0,
  *                          "height", 100.0,
@@ -2254,10 +2206,10 @@ clutter_actor_animate_with_timeline (ClutterActor    *actor,
  * the animation but not updated during the animation, it should be prefixed
  * by the "fixed::" string, for instance:
  *
- * |[
+ * |[<!-- language="C" -->
  *   clutter_actor_animate (actor, CLUTTER_EASE_IN_SINE, 100,
  *                          "rotation-angle-z", 360.0,
- *                          "fixed::rotation-center-z", &amp;center,
+ *                          "fixed::rotation-center-z", &center,
  *                          NULL);
  * ]|
  *
@@ -2275,8 +2227,7 @@ clutter_actor_animate_with_timeline (ClutterActor    *actor,
  * are used as callback function and data for a signal handler installed on
  * the #ClutterAnimation object for the specified signal name, for instance:
  *
- * |[
- *
+ * |[<!-- language="C" -->
  *   static void
  *   on_animation_completed (ClutterAnimation *animation,
  *                           ClutterActor     *actor)
@@ -2292,7 +2243,7 @@ clutter_actor_animate_with_timeline (ClutterActor    *actor,
  *
  * or, to automatically destroy an actor at the end of the animation:
  *
- * |[
+ * |[<!-- language="C" -->
  *   clutter_actor_animate (actor, CLUTTER_EASE_IN_CUBIC, 100,
  *                          "opacity", 0,
  *                          "signal-swapped-after::completed",
@@ -2317,7 +2268,7 @@ clutter_actor_animate_with_timeline (ClutterActor    *actor,
  * will cause the current animation to change with the new final values,
  * the new easing mode and the new duration - that is, this code:
  *
- * |[
+ * |[<!-- language="C" -->
  *   clutter_actor_animate (actor, CLUTTER_LINEAR, 250,
  *                          "width", 100.0,
  *                          "height", 100.0,
@@ -2331,7 +2282,7 @@ clutter_actor_animate_with_timeline (ClutterActor    *actor,
  *
  * is the equivalent of:
  *
- * |[
+ * |[<!-- language="C" -->
  *   clutter_actor_animate (actor, CLUTTER_EASE_IN_CUBIC, 500,
  *                          "x", 100.0,
  *                          "y", 100.0,
@@ -2340,9 +2291,9 @@ clutter_actor_animate_with_timeline (ClutterActor    *actor,
  *                          NULL);
  * ]|
  *
- * <note>Unless the animation is looping, the #ClutterAnimation created by
+ * Unless the animation is looping, the #ClutterAnimation created by
  * clutter_actor_animate() will become invalid as soon as it is
- * complete.</note>
+ * complete.
  *
  * Since the created #ClutterAnimation instance attached to @actor
  * is guaranteed to be valid throughout the #ClutterAnimation::completed
@@ -2351,7 +2302,7 @@ clutter_actor_animate_with_timeline (ClutterActor    *actor,
  * #ClutterAnimation::completed signal handler unless you use
  * g_signal_connect_after() to connect the callback function, for instance:
  *
- * |[
+ * |[<!-- language="C" -->
  *   static void
  *   on_animation_completed (ClutterAnimation *animation,
  *                           ClutterActor     *actor)
@@ -2427,8 +2378,8 @@ clutter_actor_animate (ClutterActor *actor,
  * This is the vector-based variant of clutter_actor_animate(), useful
  * for language bindings.
  *
- * <warning>Unlike clutter_actor_animate(), this function will not
- * allow you to specify "signal::" names and callbacks.</warning>
+ * Unlike clutter_actor_animate(), this function will not
+ * allow you to specify "signal::" names and callbacks.
  *
  * Return value: (transfer none): a #ClutterAnimation object. The object is
  *   owned by the #ClutterActor and should not be unreferenced with
@@ -2486,8 +2437,8 @@ clutter_actor_animatev (ClutterActor        *actor,
  * This is the vector-based variant of clutter_actor_animate_with_timeline(),
  * useful for language bindings.
  *
- * <warning>Unlike clutter_actor_animate_with_timeline(), this function
- * will not allow you to specify "signal::" names and callbacks.</warning>
+ * Unlike clutter_actor_animate_with_timeline(), this function
+ * will not allow you to specify "signal::" names and callbacks.
  *
  * Return value: (transfer none): a #ClutterAnimation object. The object is
  *    owned by the #ClutterActor and should not be unreferenced with
@@ -2543,8 +2494,8 @@ clutter_actor_animate_with_timelinev (ClutterActor        *actor,
  * This is the vector-based variant of clutter_actor_animate_with_alpha(),
  * useful for language bindings.
  *
- * <warning>Unlike clutter_actor_animate_with_alpha(), this function will
- * not allow you to specify "signal::" names and callbacks.</warning>
+ * Unlike clutter_actor_animate_with_alpha(), this function will
+ * not allow you to specify "signal::" names and callbacks.
  *
  * Return value: (transfer none): a #ClutterAnimation object. The object is owned by the
  *   #ClutterActor and should not be unreferenced with g_object_unref()
diff --git a/clutter/deprecated/clutter-animation.h b/clutter/deprecated/clutter-animation.h
index 4c6aa8bb6..3b2310bb4 100644
--- a/clutter/deprecated/clutter-animation.h
+++ b/clutter/deprecated/clutter-animation.h
@@ -50,6 +50,8 @@ typedef struct _ClutterAnimationClass           ClutterAnimationClass;
  * be accessed using the provided functions.
  *
  * Since: 1.0
+ *
+ * Deprecated: 1.12: Use the implicit animation on #ClutterActor
  */
 struct _ClutterAnimation
 {
@@ -68,6 +70,8 @@ struct _ClutterAnimation
  * should be accessed using the provided functions.
  *
  * Since: 1.0
+ *
+ * Deprecated: 1.12: Use the implicit animation on #ClutterActor
  */
 struct _ClutterAnimationClass
 {
diff --git a/clutter/deprecated/clutter-animator.c b/clutter/deprecated/clutter-animator.c
index 89e4925f4..4a4cf6283 100644
--- a/clutter/deprecated/clutter-animator.c
+++ b/clutter/deprecated/clutter-animator.c
@@ -37,58 +37,55 @@
  * through the #ClutterScript definition format, but it comes with a
  * convenience C API.
  *
- * <refsect2 id="ClutterAnimator-key-frames">
- *   <title>Key Frames</title>
- *   <para>Every animation handled by a #ClutterAnimator can be
- *   described in terms of "key frames". For each #GObject property
- *   there can be multiple key frames, each one defined by the end
- *   value for the property to be computed starting from the current
- *   value to a specific point in time, using a given easing
- *   mode.</para>
- *   <para>The point in time is defined using a value representing
- *   the progress in the normalized interval of [ 0, 1 ]. This maps
- *   the value returned by clutter_timeline_get_duration().</para>
- *   <figure id="easing-modes">
- *     <title>Key Frames</title>
- *     <graphic fileref="animator-key-frames.png" format="PNG"/>
- *   </figure>
- *   <para>In the image above the duration of the animation is
- *   represented by the blue line. Each key frame is the white dot,
- *   along with its progress. The red line represents the computed
- *   function of time given the easing mode.</para>
- * </refsect2>
+ * #ClutterAnimator is available since Clutter 1.2
  *
- * <refsect2 id="ClutterAnimator-script">
- *   <title>ClutterAnimator description for #ClutterScript</title>
- *   <para>#ClutterAnimator defines a custom "properties" property
- *   which allows describing the key frames for objects.</para>
- *   <para>The "properties" property has the following syntax:</para>
- *   <informalexample>
- *     <programlisting><![CDATA[
+ * #ClutterAnimator has been deprecated in Clutter 1.12
+ *
+ * ## Key Frames
+ *
+ * Every animation handled by a #ClutterAnimator can be
+ * described in terms of "key frames". For each #GObject property
+ * there can be multiple key frames, each one defined by the end
+ * value for the property to be computed starting from the current
+ * value to a specific point in time, using a given easing
+ * mode.
+ *
+ * The point in time is defined using a value representing
+ * the progress in the normalized interval of [ 0, 1 ]. This maps
+ * the value returned by clutter_timeline_get_duration().
+ *
+ * ## ClutterAnimator description for ClutterScript
+ *
+ * #ClutterAnimator defines a custom "properties" key
+ * which allows describing the key frames for objects as
+ * an array of key frames.
+ *
+ * The `properties` array has the following syntax:
+ *
+ * |[
  *  {
  *    "properties" : [
  *      {
- *        "object" : &lt;id of an object&gt;,
- *        "name" : &lt;name of the property&gt;,
- *        "ease-in" : &lt;boolean&gt;,
- *        "interpolation" : &lt;#ClutterInterpolation value&gt;,
+ *        "object" : object_id
+ *        "name" : property_name
+ *        "ease-in" : true_or_false
+ *        "interpolation" : interpolation_value
  *        "keys" : [
- *          [ &lt;progress&gt;, &lt;easing mode&gt;, &lt;final value&gt; ]
+ *          [ progress, easing_mode, final_value ]
  *        ]
  *    ]
  *  }
- *     ]]></programlisting>
- *   </informalexample>
- *   <example id="ClutterAnimator-script-example">
- *     <title>ClutterAnimator definition</title>
- *     <para>The following JSON fragment defines a #ClutterAnimator
- *     with the duration of 1 second and operating on the x and y
- *     properties of a #ClutterActor named "rect-01", with two frames
- *     for each property. The first frame will linearly move the actor
- *     from its current position to the 100, 100 position in 20 percent
- *     of the duration of the animation; the second will using a cubic
- *     easing to move the actor to the 200, 200 coordinates.</para>
- *     <programlisting><![CDATA[
+ * ]|
+ *
+ * The following JSON fragment defines a #ClutterAnimator
+ * with the duration of 1 second and operating on the x and y
+ * properties of a #ClutterActor named "rect-01", with two frames
+ * for each property. The first frame will linearly move the actor
+ * from its current position to the 100, 100 position in 20 percent
+ * of the duration of the animation; the second will using a cubic
+ * easing to move the actor to the 200, 200 coordinates.
+ *
+ * |[
  *  {
  *    "type" : "ClutterAnimator",
  *    "duration" : 1000,
@@ -113,13 +110,7 @@
  *      }
  *    ]
  *  }
- *     ]]></programlisting>
- *   </example>
- * </refsect2>
- *
- * #ClutterAnimator is available since Clutter 1.2
- *
- * #ClutterAnimator has been deprecated in Clutter 1.12
+ * ]|
  */
 
 #ifdef HAVE_CONFIG_H
@@ -143,8 +134,6 @@
 #include "clutter-script-private.h"
 #include "clutter-scriptable.h"
 
-#define CLUTTER_ANIMATOR_GET_PRIVATE(obj)       (G_TYPE_INSTANCE_GET_PRIVATE ((obj), CLUTTER_TYPE_ANIMATOR, ClutterAnimatorPrivate))
-
 /* progress values varying by less than this are considered equal */
 #define PROGRESS_EPSILON  0.00001
 
@@ -203,6 +192,7 @@ static void clutter_scriptable_init (ClutterScriptableIface *iface);
 G_DEFINE_TYPE_WITH_CODE (ClutterAnimator,
                          clutter_animator,
                          G_TYPE_OBJECT,
+                         G_ADD_PRIVATE (ClutterAnimator)
                          G_IMPLEMENT_INTERFACE (CLUTTER_TYPE_SCRIPTABLE,
                                                 clutter_scriptable_init));
 /**
@@ -1783,8 +1773,6 @@ clutter_animator_class_init (ClutterAnimatorClass *klass)
 {
   GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
 
-  g_type_class_add_private (klass, sizeof (ClutterAnimatorPrivate));
-
   gobject_class->set_property = clutter_animator_set_property;
   gobject_class->get_property = clutter_animator_get_property;
   gobject_class->dispose = clutter_animator_dispose;
@@ -1834,7 +1822,7 @@ clutter_animator_init (ClutterAnimator *animator)
   ClutterAnimatorPrivate *priv;
   ClutterTimeline *timeline;
 
-  animator->priv = priv = CLUTTER_ANIMATOR_GET_PRIVATE (animator);
+  animator->priv = priv = clutter_animator_get_instance_private (animator);
 
   priv->properties = g_hash_table_new_full (prop_actor_hash,
                                             prop_actor_equal,
diff --git a/clutter/deprecated/clutter-animator.h b/clutter/deprecated/clutter-animator.h
index 54be75b66..a72e27a4c 100644
--- a/clutter/deprecated/clutter-animator.h
+++ b/clutter/deprecated/clutter-animator.h
@@ -54,6 +54,8 @@ typedef struct _ClutterAnimatorPrivate ClutterAnimatorPrivate;
  * A key frame inside a #ClutterAnimator
  *
  * Since: 1.2
+ *
+ * Deprecated: 1.12
  */
 typedef struct _ClutterAnimatorKey     ClutterAnimatorKey;
 
diff --git a/clutter/deprecated/clutter-behaviour-depth.c b/clutter/deprecated/clutter-behaviour-depth.c
index 49a4afc9a..405b14bef 100644
--- a/clutter/deprecated/clutter-behaviour-depth.c
+++ b/clutter/deprecated/clutter-behaviour-depth.c
@@ -54,10 +54,6 @@
  *   instead.
  */
 
-G_DEFINE_TYPE (ClutterBehaviourDepth,
-               clutter_behaviour_depth,
-               CLUTTER_TYPE_BEHAVIOUR);
-
 struct _ClutterBehaviourDepthPrivate
 {
   gint depth_start;
@@ -72,6 +68,10 @@ enum
   PROP_DEPTH_END
 };
 
+G_DEFINE_TYPE_WITH_PRIVATE (ClutterBehaviourDepth,
+                            clutter_behaviour_depth,
+                            CLUTTER_TYPE_BEHAVIOUR)
+
 static void
 alpha_notify_foreach (ClutterBehaviour *behaviour,
                       ClutterActor     *actor,
@@ -159,8 +159,6 @@ clutter_behaviour_depth_class_init (ClutterBehaviourDepthClass *klass)
   GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
   ClutterBehaviourClass *behaviour_class = CLUTTER_BEHAVIOUR_CLASS (klass);
 
-  g_type_class_add_private (klass, sizeof (ClutterBehaviourDepthPrivate));
-
   gobject_class->set_property = clutter_behaviour_depth_set_property;
   gobject_class->get_property = clutter_behaviour_depth_get_property;
 
@@ -204,9 +202,7 @@ clutter_behaviour_depth_class_init (ClutterBehaviourDepthClass *klass)
 static void
 clutter_behaviour_depth_init (ClutterBehaviourDepth *depth)
 {
-  depth->priv = G_TYPE_INSTANCE_GET_PRIVATE (depth,
-                                             CLUTTER_TYPE_BEHAVIOUR_DEPTH,
-                                             ClutterBehaviourDepthPrivate);
+  depth->priv = clutter_behaviour_depth_get_instance_private (depth);
 }
 
 /**
diff --git a/clutter/deprecated/clutter-behaviour-ellipse.c b/clutter/deprecated/clutter-behaviour-ellipse.c
index 103a4aeea..168430cac 100644
--- a/clutter/deprecated/clutter-behaviour-ellipse.c
+++ b/clutter/deprecated/clutter-behaviour-ellipse.c
@@ -33,9 +33,9 @@
  * #ClutterBehaviourEllipse interpolates actors along a path defined by
  *  an ellipse.
  *
- * <note><para>When applying an ellipse behaviour to an actor, the
+ * When applying an ellipse behaviour to an actor, the
  * behaviour will update the actor's position and depth and set them
- * to what is dictated by the ellipses initial position.</para></note>
+ * to what is dictated by the ellipses initial position.
  *
  * Deprecated: 1.6: Use clutter_actor_animate(), #ClutterPath and a
  *   #ClutterPathConstraint instead.
@@ -60,15 +60,6 @@
 #include "clutter-enum-types.h"
 #include "clutter-private.h"
 
-G_DEFINE_TYPE (ClutterBehaviourEllipse,
-               clutter_behaviour_ellipse,
-	       CLUTTER_TYPE_BEHAVIOUR);
-
-#define CLUTTER_BEHAVIOUR_ELLIPSE_GET_PRIVATE(obj)    \
-              (G_TYPE_INSTANCE_GET_PRIVATE ((obj),    \
-               CLUTTER_TYPE_BEHAVIOUR_ELLIPSE,        \
-               ClutterBehaviourEllipsePrivate))
-
 enum
 {
   PROP_0,
@@ -108,6 +99,10 @@ struct _ClutterBehaviourEllipsePrivate
   ClutterRotateDirection direction;
 };
 
+G_DEFINE_TYPE_WITH_PRIVATE (ClutterBehaviourEllipse,
+                            clutter_behaviour_ellipse,
+                            CLUTTER_TYPE_BEHAVIOUR)
+
 typedef struct _knot3d
 {
   gint x;
@@ -382,8 +377,6 @@ clutter_behaviour_ellipse_class_init (ClutterBehaviourEllipseClass *klass)
   ClutterBehaviourClass *behave_class = CLUTTER_BEHAVIOUR_CLASS (klass);
   GParamSpec            *pspec        = NULL;
 
-  g_type_class_add_private (klass, sizeof (ClutterBehaviourEllipsePrivate));
-
   object_class->set_property = clutter_behaviour_ellipse_set_property;
   object_class->get_property = clutter_behaviour_ellipse_get_property;
 
@@ -539,7 +532,7 @@ clutter_behaviour_ellipse_init (ClutterBehaviourEllipse * self)
 {
   ClutterBehaviourEllipsePrivate *priv;
 
-  self->priv = priv = CLUTTER_BEHAVIOUR_ELLIPSE_GET_PRIVATE (self);
+  self->priv = priv = clutter_behaviour_ellipse_get_instance_private (self);
 
   priv->direction = CLUTTER_ROTATE_CW;
 
diff --git a/clutter/deprecated/clutter-behaviour-opacity.c b/clutter/deprecated/clutter-behaviour-opacity.c
index b685be03b..385506754 100644
--- a/clutter/deprecated/clutter-behaviour-opacity.c
+++ b/clutter/deprecated/clutter-behaviour-opacity.c
@@ -50,21 +50,12 @@
 #include "clutter-private.h"
 #include "clutter-debug.h"
 
-G_DEFINE_TYPE (ClutterBehaviourOpacity,
-               clutter_behaviour_opacity,
-	       CLUTTER_TYPE_BEHAVIOUR);
-
 struct _ClutterBehaviourOpacityPrivate
 {
   guint8 opacity_start;
   guint8 opacity_end;
 };
 
-#define CLUTTER_BEHAVIOUR_OPACITY_GET_PRIVATE(obj)    \
-              (G_TYPE_INSTANCE_GET_PRIVATE ((obj),    \
-               CLUTTER_TYPE_BEHAVIOUR_OPACITY,        \
-               ClutterBehaviourOpacityPrivate))
-
 enum
 {
   PROP_0,
@@ -77,6 +68,10 @@ enum
 
 static GParamSpec *obj_props[PROP_LAST];
 
+G_DEFINE_TYPE_WITH_PRIVATE (ClutterBehaviourOpacity,
+                            clutter_behaviour_opacity,
+                            CLUTTER_TYPE_BEHAVIOUR)
+
 static void
 alpha_notify_foreach (ClutterBehaviour *behaviour,
 		      ClutterActor     *actor,
@@ -166,8 +161,6 @@ clutter_behaviour_opacity_class_init (ClutterBehaviourOpacityClass *klass)
   ClutterBehaviourClass *behave_class = CLUTTER_BEHAVIOUR_CLASS (klass);
   GParamSpec *pspec;
 
-  g_type_class_add_private (klass, sizeof (ClutterBehaviourOpacityPrivate));
-
   gobject_class->set_property = clutter_behaviour_opacity_set_property;
   gobject_class->get_property = clutter_behaviour_opacity_get_property;
 
@@ -213,10 +206,7 @@ clutter_behaviour_opacity_class_init (ClutterBehaviourOpacityClass *klass)
 static void
 clutter_behaviour_opacity_init (ClutterBehaviourOpacity *self)
 {
-  self->priv = CLUTTER_BEHAVIOUR_OPACITY_GET_PRIVATE (self);
-
-  self->priv->opacity_start = 0;
-  self->priv->opacity_end = 0;
+  self->priv = clutter_behaviour_opacity_get_instance_private (self);
 }
 
 /**
diff --git a/clutter/deprecated/clutter-behaviour-path.c b/clutter/deprecated/clutter-behaviour-path.c
index 9702a3942..929500c55 100644
--- a/clutter/deprecated/clutter-behaviour-path.c
+++ b/clutter/deprecated/clutter-behaviour-path.c
@@ -53,9 +53,9 @@
  * }
  * ]|
  *
- * <note>If the alpha function is a periodic function, i.e. it returns to
+ * If the alpha function is a periodic function, i.e. it returns to
  * 0.0 after reaching 1.0, then the actors will walk the path back to the
- * starting #ClutterKnot.</note>
+ * starting #ClutterKnot.
  *
  * #ClutterBehaviourPath is available since Clutter 0.2
  *
@@ -83,25 +83,12 @@
 
 #include <math.h>
 
-static void clutter_scriptable_iface_init (ClutterScriptableIface *iface);
-
-G_DEFINE_TYPE_WITH_CODE (ClutterBehaviourPath,
-                         clutter_behaviour_path,
-                         CLUTTER_TYPE_BEHAVIOUR,
-                         G_IMPLEMENT_INTERFACE (CLUTTER_TYPE_SCRIPTABLE,
-                                                clutter_scriptable_iface_init));
-
 struct _ClutterBehaviourPathPrivate
 {
   ClutterPath *path;
   guint        last_knot_passed;
 };
 
-#define CLUTTER_BEHAVIOUR_PATH_GET_PRIVATE(obj)    \
-              (G_TYPE_INSTANCE_GET_PRIVATE ((obj), \
-               CLUTTER_TYPE_BEHAVIOUR_PATH,        \
-               ClutterBehaviourPathPrivate))
-
 enum
 {
   KNOT_REACHED,
@@ -122,6 +109,15 @@ enum
 
 static GParamSpec *obj_props[PROP_LAST];
 
+static void clutter_scriptable_iface_init (ClutterScriptableIface *iface);
+
+G_DEFINE_TYPE_WITH_CODE (ClutterBehaviourPath,
+                         clutter_behaviour_path,
+                         CLUTTER_TYPE_BEHAVIOUR,
+                         G_ADD_PRIVATE (ClutterBehaviourPath)
+                         G_IMPLEMENT_INTERFACE (CLUTTER_TYPE_SCRIPTABLE,
+                                                clutter_scriptable_iface_init))
+
 static void
 actor_apply_knot_foreach (ClutterBehaviour *behaviour,
                           ClutterActor     *actor,
@@ -253,8 +249,6 @@ clutter_behaviour_path_class_init (ClutterBehaviourPathClass *klass)
                   G_TYPE_UINT);
 
   behave_class->alpha_notify = clutter_behaviour_path_alpha_notify;
-
-  g_type_class_add_private (klass, sizeof (ClutterBehaviourPathPrivate));
 }
 
 static ClutterScriptableIface *parent_scriptable_iface = NULL;
@@ -310,12 +304,8 @@ clutter_scriptable_iface_init (ClutterScriptableIface *iface)
 static void
 clutter_behaviour_path_init (ClutterBehaviourPath *self)
 {
-  ClutterBehaviourPathPrivate *priv;
-
-  self->priv = priv = CLUTTER_BEHAVIOUR_PATH_GET_PRIVATE (self);
-
-  priv->path = NULL;
-  priv->last_knot_passed = G_MAXUINT;
+  self->priv = clutter_behaviour_path_get_instance_private (self);
+  self->priv->last_knot_passed = G_MAXUINT;
 }
 
 /**
diff --git a/clutter/deprecated/clutter-behaviour-rotate.c b/clutter/deprecated/clutter-behaviour-rotate.c
index 9ba0f42a6..67ab3e441 100644
--- a/clutter/deprecated/clutter-behaviour-rotate.c
+++ b/clutter/deprecated/clutter-behaviour-rotate.c
@@ -52,10 +52,6 @@
 #include "clutter-main.h"
 #include "clutter-private.h"
 
-G_DEFINE_TYPE (ClutterBehaviourRotate,
-               clutter_behaviour_rotate,
-               CLUTTER_TYPE_BEHAVIOUR);
-
 struct _ClutterBehaviourRotatePrivate
 {
   gdouble angle_start;
@@ -69,11 +65,6 @@ struct _ClutterBehaviourRotatePrivate
   gint center_z;
 };
 
-#define CLUTTER_BEHAVIOUR_ROTATE_GET_PRIVATE(obj) \
-        (G_TYPE_INSTANCE_GET_PRIVATE ((obj), \
-         CLUTTER_TYPE_BEHAVIOUR_ROTATE, \
-         ClutterBehaviourRotatePrivate))
-
 enum
 {
   PROP_0,
@@ -91,6 +82,10 @@ enum
 
 static GParamSpec *obj_props[PROP_LAST];
 
+G_DEFINE_TYPE_WITH_PRIVATE (ClutterBehaviourRotate,
+                            clutter_behaviour_rotate,
+                            CLUTTER_TYPE_BEHAVIOUR)
+
 typedef struct {
   gdouble angle;
 } RotateFrameClosure;
@@ -265,8 +260,6 @@ clutter_behaviour_rotate_class_init (ClutterBehaviourRotateClass *klass)
   ClutterBehaviourClass *behaviour_class = CLUTTER_BEHAVIOUR_CLASS (klass);
   GParamSpec *pspec = NULL;
 
-  g_type_class_add_private (klass, sizeof (ClutterBehaviourRotatePrivate));
-
   gobject_class->set_property = clutter_behaviour_rotate_set_property;
   gobject_class->get_property = clutter_behaviour_rotate_get_property;
 
@@ -400,19 +393,19 @@ clutter_behaviour_rotate_class_init (ClutterBehaviourRotateClass *klass)
 }
 
 static void
-clutter_behaviour_rotate_init (ClutterBehaviourRotate *rotate)
+clutter_behaviour_rotate_init (ClutterBehaviourRotate *self)
 {
-  ClutterBehaviourRotatePrivate *priv;
+  self->priv = clutter_behaviour_rotate_get_instance_private (self);
 
-  rotate->priv = priv = CLUTTER_BEHAVIOUR_ROTATE_GET_PRIVATE (rotate);
+  self->priv->angle_start = 0.0;
+  self->priv->angle_end = 0.0;
 
-  priv->angle_start = priv->angle_end = 0;
+  self->priv->axis = CLUTTER_Z_AXIS;
+  self->priv->direction = CLUTTER_ROTATE_CW;
 
-  priv->axis = CLUTTER_Z_AXIS;
-
-  priv->direction = CLUTTER_ROTATE_CW;
-
-  priv->center_x = priv->center_y = priv->center_z = 0;
+  self->priv->center_x = 0;
+  self->priv->center_y = 0;
+  self->priv->center_z = 0;
 }
 
 /**
diff --git a/clutter/deprecated/clutter-behaviour-scale.c b/clutter/deprecated/clutter-behaviour-scale.c
index 2f78eee11..c0d5fcf03 100644
--- a/clutter/deprecated/clutter-behaviour-scale.c
+++ b/clutter/deprecated/clutter-behaviour-scale.c
@@ -51,10 +51,6 @@
 #include "clutter-main.h"
 #include "clutter-private.h"
 
-G_DEFINE_TYPE (ClutterBehaviourScale,
-               clutter_behaviour_scale,
-	       CLUTTER_TYPE_BEHAVIOUR);
-
 struct _ClutterBehaviourScalePrivate
 {
   gdouble x_scale_start;
@@ -64,8 +60,6 @@ struct _ClutterBehaviourScalePrivate
   gdouble y_scale_end;
 };
 
-#define CLUTTER_BEHAVIOUR_SCALE_GET_PRIVATE(obj)        (G_TYPE_INSTANCE_GET_PRIVATE ((obj), CLUTTER_TYPE_BEHAVIOUR_SCALE, ClutterBehaviourScalePrivate))
-
 enum
 {
   PROP_0,
@@ -80,6 +74,10 @@ enum
 
 static GParamSpec *obj_props[PROP_LAST];
 
+G_DEFINE_TYPE_WITH_PRIVATE (ClutterBehaviourScale,
+                            clutter_behaviour_scale,
+                            CLUTTER_TYPE_BEHAVIOUR)
+
 typedef struct {
   gdouble scale_x;
   gdouble scale_y;
@@ -208,8 +206,6 @@ clutter_behaviour_scale_class_init (ClutterBehaviourScaleClass *klass)
   ClutterBehaviourClass *behave_class = CLUTTER_BEHAVIOUR_CLASS (klass);
   GParamSpec *pspec = NULL;
 
-  g_type_class_add_private (klass, sizeof (ClutterBehaviourScalePrivate));
-
   gobject_class->set_property = clutter_behaviour_scale_set_property;
   gobject_class->get_property = clutter_behaviour_scale_get_property;
 
@@ -298,7 +294,7 @@ clutter_behaviour_scale_init (ClutterBehaviourScale *self)
 {
   ClutterBehaviourScalePrivate *priv;
 
-  self->priv = priv = CLUTTER_BEHAVIOUR_SCALE_GET_PRIVATE (self);
+  self->priv = priv = clutter_behaviour_scale_get_instance_private (self);
 
   priv->x_scale_start = priv->x_scale_end = 1.0;
   priv->y_scale_start = priv->y_scale_end = 1.0;
diff --git a/clutter/deprecated/clutter-behaviour.c b/clutter/deprecated/clutter-behaviour.c
index 08a11f444..95511880d 100644
--- a/clutter/deprecated/clutter-behaviour.c
+++ b/clutter/deprecated/clutter-behaviour.c
@@ -88,14 +88,6 @@
 #include "clutter-scriptable.h"
 #include "clutter-script-private.h"
 
-static void clutter_scriptable_iface_init (ClutterScriptableIface *iface);
-
-G_DEFINE_ABSTRACT_TYPE_WITH_CODE (ClutterBehaviour,
-                                  clutter_behaviour,
-                                  G_TYPE_OBJECT,
-                                  G_IMPLEMENT_INTERFACE (CLUTTER_TYPE_SCRIPTABLE,
-                                                         clutter_scriptable_iface_init));
-
 struct _ClutterBehaviourPrivate
 {
   ClutterAlpha *alpha;
@@ -122,10 +114,14 @@ enum {
 
 static guint behave_signals[LAST_SIGNAL] = { 0 };
 
-#define CLUTTER_BEHAVIOUR_GET_PRIVATE(obj)         \
-              (G_TYPE_INSTANCE_GET_PRIVATE ((obj), \
-               CLUTTER_TYPE_BEHAVIOUR,             \
-               ClutterBehaviourPrivate))
+static void clutter_scriptable_iface_init (ClutterScriptableIface *iface);
+
+G_DEFINE_ABSTRACT_TYPE_WITH_CODE (ClutterBehaviour,
+                                  clutter_behaviour,
+                                  G_TYPE_OBJECT,
+                                  G_ADD_PRIVATE (ClutterBehaviour)
+                                  G_IMPLEMENT_INTERFACE (CLUTTER_TYPE_SCRIPTABLE,
+                                                         clutter_scriptable_iface_init))
 
 static gboolean
 clutter_behaviour_parse_custom_node (ClutterScriptable *scriptable,
@@ -291,14 +287,12 @@ clutter_behaviour_class_init (ClutterBehaviourClass *klass)
 		  _clutter_marshal_VOID__OBJECT,
 		  G_TYPE_NONE, 1,
 		  CLUTTER_TYPE_ACTOR);
-
-  g_type_class_add_private (klass, sizeof (ClutterBehaviourPrivate));
 }
 
 static void
 clutter_behaviour_init (ClutterBehaviour *self)
 {
-  self->priv = CLUTTER_BEHAVIOUR_GET_PRIVATE (self);
+  self->priv = clutter_behaviour_get_instance_private (self);
 }
 
 static void
diff --git a/clutter/deprecated/clutter-box.c b/clutter/deprecated/clutter-box.c
index 51412c633..357b35560 100644
--- a/clutter/deprecated/clutter-box.c
+++ b/clutter/deprecated/clutter-box.c
@@ -30,44 +30,42 @@
  * interface. A Box delegates the whole size requisition and size allocation to
  * a #ClutterLayoutManager instance.
  *
- * <example id="example-clutter-box">
- *   <title>Using ClutterBox</title>
- *   <para>The following code shows how to create a #ClutterBox with
- *   a #ClutterLayoutManager sub-class, and how to add children to
- *   it via clutter_box_pack().</para>
- *   <programlisting>
+ * #ClutterBox is available since Clutter 1.2
+ *
+ * Deprecated: 1.10: Use #ClutterActor instead.
+ *
+ * ## Using ClutterBox
+ *
+ * The following code shows how to create a #ClutterBox with
+ * a #ClutterLayoutManager sub-class, and how to add children to
+ * it via clutter_box_pack().
+ *
+ * |[<!-- language="C" -->
  *  ClutterActor *box;
  *  ClutterLayoutManager *layout;
  *
- *  /&ast; Create the layout manager first &ast;/
+ *  // Create the layout manager first
  *  layout = clutter_box_layout_new ();
  *  clutter_box_layout_set_homogeneous (CLUTTER_BOX_LAYOUT (layout), TRUE);
  *  clutter_box_layout_set_spacing (CLUTTER_BOX_LAYOUT (layout), 12);
  *
- *  /&ast; Then create the ClutterBox actor. The Box will take
- *   &ast; ownership of the ClutterLayoutManager instance by sinking
- *   &ast; its floating reference
- *   &ast;/
+ *  // Then create the ClutterBox actor. The Box will take
+ *  // ownership of the ClutterLayoutManager instance by sinking
+ *  // its floating reference
  *  box = clutter_box_new (layout);
  *
- *  /&ast; Now add children to the Box using the variadic arguments
- *   &ast; function clutter_box_pack() to set layout properties
- *   &ast;/
+ *  // Now add children to the Box using the variadic arguments
+ *  // function clutter_box_pack() to set layout properties
  *  clutter_box_pack (CLUTTER_BOX (box), actor,
  *                    "x-align", CLUTTER_BOX_ALIGNMENT_CENTER,
  *                    "y-align", CLUTTER_BOX_ALIGNMENT_END,
  *                    "expand", TRUE,
  *                    NULL);
- *   </programlisting>
- * </example>
+ * ]|
  *
- * #ClutterBox<!-- -->'s clutter_box_pack() wraps the generic
+ * #ClutterBox's clutter_box_pack() wraps the generic
  * clutter_container_add_actor() function, but it also allows setting
  * layout properties while adding the new child to the box.
- *
- * #ClutterBox is available since Clutter 1.2
- *
- * Deprecated: 1.10: Use #ClutterActor instead.
  */
 
 #ifdef HAVE_CONFIG_H
@@ -89,8 +87,6 @@
 #include "clutter-marshal.h"
 #include "clutter-private.h"
 
-#define CLUTTER_BOX_GET_PRIVATE(obj)    (G_TYPE_INSTANCE_GET_PRIVATE ((obj), CLUTTER_TYPE_BOX, ClutterBoxPrivate))
-
 struct _ClutterBoxPrivate
 {
   ClutterLayoutManager *manager;
@@ -112,7 +108,7 @@ static GParamSpec *obj_props[PROP_LAST] = { NULL, };
 
 static const ClutterColor default_box_color = { 255, 255, 255, 255 };
 
-G_DEFINE_TYPE (ClutterBox, clutter_box, CLUTTER_TYPE_ACTOR);
+G_DEFINE_TYPE_WITH_PRIVATE (ClutterBox, clutter_box, CLUTTER_TYPE_ACTOR)
 
 static inline void
 clutter_box_set_color_internal (ClutterBox         *box,
@@ -238,8 +234,6 @@ clutter_box_class_init (ClutterBoxClass *klass)
   GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
   ClutterActorClass *actor_class = CLUTTER_ACTOR_CLASS (klass);
 
-  g_type_class_add_private (klass, sizeof (ClutterBoxPrivate));
-
   actor_class->destroy = clutter_box_real_destroy;
   actor_class->get_paint_volume = clutter_box_real_get_paint_volume;
 
@@ -282,7 +276,7 @@ clutter_box_class_init (ClutterBoxClass *klass)
 static void
 clutter_box_init (ClutterBox *self)
 {
-  self->priv = CLUTTER_BOX_GET_PRIVATE (self);
+  self->priv = clutter_box_get_instance_private (self);
 }
 
 /**
diff --git a/clutter/deprecated/clutter-cairo-texture.c b/clutter/deprecated/clutter-cairo-texture.c
index d08b6eaba..c69149c81 100644
--- a/clutter/deprecated/clutter-cairo-texture.c
+++ b/clutter/deprecated/clutter-cairo-texture.c
@@ -34,11 +34,11 @@
  * Cairo image surface which will then be uploaded to a GL texture when
  * needed.
  *
- * <note><para>Since #ClutterCairoTexture uses a Cairo image surface
+ * Since #ClutterCairoTexture uses a Cairo image surface
  * internally all the drawing operations will be performed in
  * software and not using hardware acceleration. This can lead to
  * performance degradation if the contents of the texture change
- * frequently.</para></note>
+ * frequently.
  *
  * In order to use a #ClutterCairoTexture you should connect to the
  * #ClutterCairoTexture::draw signal; the signal is emitted each time
@@ -51,18 +51,10 @@
  * is owned by the #ClutterCairoTexture and should not be destroyed
  * explicitly.
  *
- * <example id="cairo-texture-example">
- *   <title>A simple ClutterCairoTexture canvas</title>
- *   <programlisting>
- * <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" parse="text" href="../../../../tests/interactive/test-cairo-clock.c">
- *   <xi:fallback>FIXME: MISSING XINCLUDE CONTENT</xi:fallback>
- * </xi:include>
- *   </programlisting>
- * </example>
- *
  * #ClutterCairoTexture is available since Clutter 1.0.
  *
- * #ClutterCairoTexture is deprecated since Clutter 1.12.
+ * #ClutterCairoTexture is deprecated since Clutter 1.12. You should
+ * use #ClutterCanvas instead.
  */
 
 #ifdef HAVE_CONFIG_H
@@ -86,9 +78,17 @@
 #include "clutter-marshal.h"
 #include "clutter-private.h"
 
-G_DEFINE_TYPE (ClutterCairoTexture,
-               clutter_cairo_texture,
-               CLUTTER_TYPE_TEXTURE);
+struct _ClutterCairoTexturePrivate
+{
+  cairo_surface_t *cr_surface;
+
+  guint surface_width;
+  guint surface_height;
+
+  cairo_t *cr_context;
+
+  guint auto_resize : 1;
+};
 
 enum
 {
@@ -113,6 +113,10 @@ static GParamSpec *obj_props[PROP_LAST] = { NULL, };
 
 static guint cairo_signals[LAST_SIGNAL] = { 0, };
 
+G_DEFINE_TYPE_WITH_PRIVATE (ClutterCairoTexture,
+                            clutter_cairo_texture,
+                            CLUTTER_TYPE_TEXTURE)
+
 #ifdef CLUTTER_ENABLE_DEBUG
 #define clutter_warn_if_paint_fail(obj)                 G_STMT_START {  \
   if (CLUTTER_ACTOR_IN_PAINT (obj)) {                                   \
@@ -124,20 +128,6 @@ static guint cairo_signals[LAST_SIGNAL] = { 0, };
 #define clutter_warn_if_paint_fail(obj)         /* void */
 #endif /* CLUTTER_ENABLE_DEBUG */
 
-#define CLUTTER_CAIRO_TEXTURE_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), CLUTTER_TYPE_CAIRO_TEXTURE, ClutterCairoTexturePrivate))
-
-struct _ClutterCairoTexturePrivate
-{
-  cairo_surface_t *cr_surface;
-
-  guint surface_width;
-  guint surface_height;
-
-  cairo_t *cr_context;
-
-  guint auto_resize : 1;
-};
-
 typedef struct {
   ClutterCairoTexture *texture;
 
@@ -580,8 +570,6 @@ clutter_cairo_texture_class_init (ClutterCairoTextureClass *klass)
 
   klass->create_surface = clutter_cairo_texture_create_surface;
 
-  g_type_class_add_private (gobject_class, sizeof (ClutterCairoTexturePrivate));
-
   /**
    * ClutterCairoTexture:surface-width:
    *
@@ -711,7 +699,7 @@ clutter_cairo_texture_class_init (ClutterCairoTextureClass *klass)
 static void
 clutter_cairo_texture_init (ClutterCairoTexture *self)
 {
-  self->priv = CLUTTER_CAIRO_TEXTURE_GET_PRIVATE (self);
+  self->priv = clutter_cairo_texture_get_instance_private (self);
 
   /* FIXME - we are hardcoding the format; it would be good to have
    * a :surface-format construct-only property for creating
@@ -849,9 +837,9 @@ clutter_cairo_texture_create_region_internal (ClutterCairoTexture *self,
  * Creates a new Cairo context that will updat the region defined
  * by @x_offset, @y_offset, @width and @height.
  *
- * <warning><para>Do not call this function within the paint virtual
+ * Do not call this function within the paint virtual
  * function or from a callback to the #ClutterActor::paint
- * signal.</para></warning>
+ * signal.
  *
  * Return value: a newly created Cairo context. Use cairo_destroy()
  *   to upload the contents of the context when done drawing
@@ -971,9 +959,9 @@ clutter_cairo_texture_invalidate (ClutterCairoTexture *self)
  * and @y_offset of 0, @width equal to the @cairo texture surface width
  * and @height equal to the @cairo texture surface height.
  *
- * <warning><para>Do not call this function within the paint virtual
+ * Do not call this function within the paint virtual
  * function or from a callback to the #ClutterActor::paint
- * signal.</para></warning>
+ * signal.
  *
  * Return value: a newly created Cairo context. Use cairo_destroy()
  *   to upload the contents of the context when done drawing
diff --git a/clutter/deprecated/clutter-fixed.h b/clutter/deprecated/clutter-fixed.h
index c756ef43c..215e6260e 100644
--- a/clutter/deprecated/clutter-fixed.h
+++ b/clutter/deprecated/clutter-fixed.h
@@ -75,6 +75,7 @@ struct _ClutterParamSpecFixed
   CoglFixed default_value;
 };
 
+CLUTTER_DEPRECATED_IN_1_10
 GType        clutter_param_fixed_get_type (void) G_GNUC_CONST;
 
 CLUTTER_DEPRECATED_IN_1_10_FOR(g_value_set_int)
diff --git a/clutter/deprecated/clutter-frame-source.c b/clutter/deprecated/clutter-frame-source.c
index cd2fb06a1..e0a82a2b0 100644
--- a/clutter/deprecated/clutter-frame-source.c
+++ b/clutter/deprecated/clutter-frame-source.c
@@ -60,7 +60,7 @@ static GSourceFuncs clutter_frame_source_funcs =
 };
 
 /**
- * clutter_frame_source_add_full:
+ * clutter_frame_source_add_full: (rename-to clutter_frame_source_add)
  * @priority: the priority of the frame source. Typically this will be in the
  *   range between %G_PRIORITY_DEFAULT and %G_PRIORITY_HIGH.
  * @fps: the number of times per second to call the function
@@ -85,8 +85,6 @@ static GSourceFuncs clutter_frame_source_funcs =
  * multiple times to catch up missing frames if @func takes more than
  * @interval ms to execute.
  *
- * Rename to: clutter_frame_source_add
- *
  * Return value: the ID (greater than 0) of the event source.
  *
  * Since: 0.8
@@ -183,7 +181,7 @@ clutter_frame_source_dispatch (GSource     *source,
 }
 
 /**
- * clutter_threads_add_frame_source_full:
+ * clutter_threads_add_frame_source_full: (rename-to clutter_threads_add_frame_source)
  * @priority: the priority of the frame source. Typically this will be in the
  *   range between %G_PRIORITY_DEFAULT and %G_PRIORITY_HIGH.
  * @fps: the number of times per second to call the function
@@ -209,8 +207,6 @@ clutter_frame_source_dispatch (GSource     *source,
  *
  * See also clutter_threads_add_idle_full().
  *
- * Rename to: clutter_threads_add_frame_source
- *
  * Return value: the ID (greater than 0) of the event source.
  *
  * Since: 0.8
diff --git a/clutter/deprecated/clutter-group.c b/clutter/deprecated/clutter-group.c
index 365b0dc5a..5afaf2b6c 100644
--- a/clutter/deprecated/clutter-group.c
+++ b/clutter/deprecated/clutter-group.c
@@ -65,8 +65,6 @@
 
 #include "cogl/cogl.h"
 
-#define CLUTTER_GROUP_GET_PRIVATE(obj)  (G_TYPE_INSTANCE_GET_PRIVATE ((obj), CLUTTER_TYPE_GROUP, ClutterGroupPrivate))
-
 struct _ClutterGroupPrivate
 {
   GList *children;
@@ -77,6 +75,7 @@ struct _ClutterGroupPrivate
 static void clutter_container_iface_init (ClutterContainerIface *iface);
 
 G_DEFINE_TYPE_WITH_CODE (ClutterGroup, clutter_group, CLUTTER_TYPE_ACTOR,
+                         G_ADD_PRIVATE (ClutterGroup)
                          G_IMPLEMENT_INTERFACE (CLUTTER_TYPE_CONTAINER,
                                                 clutter_container_iface_init));
 
@@ -441,8 +440,6 @@ clutter_group_class_init (ClutterGroupClass *klass)
   GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
   ClutterActorClass *actor_class = CLUTTER_ACTOR_CLASS (klass);
 
-  g_type_class_add_private (klass, sizeof (ClutterGroupPrivate));
-
   actor_class->get_preferred_width = clutter_group_real_get_preferred_width;
   actor_class->get_preferred_height = clutter_group_real_get_preferred_height;
   actor_class->allocate = clutter_group_real_allocate;
@@ -460,7 +457,7 @@ clutter_group_init (ClutterGroup *self)
 {
   ClutterActor *actor = CLUTTER_ACTOR (self);
 
-  self->priv = CLUTTER_GROUP_GET_PRIVATE (self);
+  self->priv = clutter_group_get_instance_private (self);
 
   /* turn on some optimization
    *
diff --git a/clutter/deprecated/clutter-keysyms.h b/clutter/deprecated/clutter-keysyms.h
index ad99ee2ff..18bb4cd8f 100644
--- a/clutter/deprecated/clutter-keysyms.h
+++ b/clutter/deprecated/clutter-keysyms.h
@@ -278,6 +278,10 @@
 #define CLUTTER_dead_invertedbreve 0xfe6d
 #define CLUTTER_dead_belowcomma 0xfe6e
 #define CLUTTER_dead_currency 0xfe6f
+#define CLUTTER_dead_lowline 0xfe90
+#define CLUTTER_dead_aboveverticalline 0xfe91
+#define CLUTTER_dead_belowverticalline 0xfe92
+#define CLUTTER_dead_longsolidusoverlay 0xfe93
 #define CLUTTER_dead_a 0xfe80
 #define CLUTTER_dead_A 0xfe81
 #define CLUTTER_dead_e 0xfe82
@@ -2282,6 +2286,7 @@
 #define CLUTTER_TouchpadToggle 0x1008ffa9
 #define CLUTTER_TouchpadOn 0x1008ffb0
 #define CLUTTER_TouchpadOff 0x1008ffb1
+#define CLUTTER_AudioMicMute 0x1008ffb2
 #define CLUTTER_Switch_VT_1 0x1008fe01
 #define CLUTTER_Switch_VT_2 0x1008fe02
 #define CLUTTER_Switch_VT_3 0x1008fe03
diff --git a/clutter/deprecated/clutter-rectangle.c b/clutter/deprecated/clutter-rectangle.c
index b6236aff5..0565658f5 100644
--- a/clutter/deprecated/clutter-rectangle.c
+++ b/clutter/deprecated/clutter-rectangle.c
@@ -48,7 +48,15 @@
 
 #include "cogl/cogl.h"
 
-G_DEFINE_TYPE (ClutterRectangle, clutter_rectangle, CLUTTER_TYPE_ACTOR);
+struct _ClutterRectanglePrivate
+{
+  ClutterColor color;
+  ClutterColor border_color;
+
+  guint border_width;
+
+  guint has_border : 1;
+};
 
 enum
 {
@@ -62,22 +70,11 @@ enum
   /* FIXME: Add gradient, rounded corner props etc */
 };
 
-#define CLUTTER_RECTANGLE_GET_PRIVATE(obj) \
-(G_TYPE_INSTANCE_GET_PRIVATE ((obj), CLUTTER_TYPE_RECTANGLE, ClutterRectanglePrivate))
-
-struct _ClutterRectanglePrivate
-{
-  ClutterColor color;
-  ClutterColor border_color;
-
-  guint border_width;
-
-  guint has_border : 1;
-};
-
 static const ClutterColor default_color        = { 255, 255, 255, 255 };
 static const ClutterColor default_border_color = {   0,   0,   0, 255 };
 
+G_DEFINE_TYPE_WITH_PRIVATE (ClutterRectangle, clutter_rectangle, CLUTTER_TYPE_ACTOR)
+
 static void
 clutter_rectangle_paint (ClutterActor *self)
 {
@@ -319,8 +316,6 @@ clutter_rectangle_class_init (ClutterRectangleClass *klass)
                                                          P_("Whether the rectangle should have a border"),
                                                          FALSE,
                                                          CLUTTER_PARAM_READWRITE));
-
-  g_type_class_add_private (gobject_class, sizeof (ClutterRectanglePrivate));
 }
 
 static void
@@ -328,7 +323,7 @@ clutter_rectangle_init (ClutterRectangle *self)
 {
   ClutterRectanglePrivate *priv;
 
-  self->priv = priv = CLUTTER_RECTANGLE_GET_PRIVATE (self);
+  self->priv = priv = clutter_rectangle_get_instance_private (self);
 
   priv->color = default_color;
   priv->border_color = default_border_color;
diff --git a/clutter/deprecated/clutter-score.c b/clutter/deprecated/clutter-score.c
index 2991d6591..bae728598 100644
--- a/clutter/deprecated/clutter-score.c
+++ b/clutter/deprecated/clutter-score.c
@@ -114,8 +114,6 @@ struct _ClutterScoreEntry
   GNode *node;
 };
 
-#define CLUTTER_SCORE_GET_PRIVATE(obj)  (G_TYPE_INSTANCE_GET_PRIVATE ((obj), CLUTTER_TYPE_SCORE, ClutterScorePrivate))
-
 struct _ClutterScorePrivate
 {
   GNode      *root;
@@ -149,7 +147,7 @@ enum
 
 static inline void clutter_score_clear (ClutterScore *score);
 
-G_DEFINE_TYPE (ClutterScore, clutter_score, G_TYPE_OBJECT);
+G_DEFINE_TYPE_WITH_PRIVATE (ClutterScore, clutter_score, G_TYPE_OBJECT)
 
 static int score_signals[LAST_SIGNAL] = { 0 }; 
 
@@ -161,7 +159,9 @@ clutter_score_set_property (GObject      *gobject,
 			    const GValue *value,
 			    GParamSpec   *pspec)
 {
-  ClutterScorePrivate *priv = CLUTTER_SCORE_GET_PRIVATE (gobject);
+  ClutterScorePrivate *priv;
+  
+  priv = clutter_score_get_instance_private (CLUTTER_SCORE (gobject));
 
   switch (prop_id)
     {
@@ -180,7 +180,9 @@ clutter_score_get_property (GObject    *gobject,
 			    GValue     *value,
 			    GParamSpec *pspec)
 {
-  ClutterScorePrivate *priv = CLUTTER_SCORE_GET_PRIVATE (gobject);
+  ClutterScorePrivate *priv;
+
+  priv = clutter_score_get_instance_private (CLUTTER_SCORE (gobject));
 
   switch (prop_id)
     {
@@ -213,8 +215,6 @@ clutter_score_class_init (ClutterScoreClass *klass)
   gobject_class->get_property = clutter_score_get_property;
   gobject_class->finalize     = clutter_score_finalize;
 
-  g_type_class_add_private (klass, sizeof (ClutterScorePrivate));
-
   /**
    * ClutterScore:loop:
    *
@@ -330,7 +330,7 @@ clutter_score_init (ClutterScore *self)
 {
   ClutterScorePrivate *priv;
 
-  self->priv = priv = CLUTTER_SCORE_GET_PRIVATE (self);
+  self->priv = priv = clutter_score_get_instance_private (self);
 
   /* sentinel */
   priv->root = g_node_new (NULL);
diff --git a/clutter/deprecated/clutter-shader.c b/clutter/deprecated/clutter-shader.c
index 3e728ca01..8e50c88d5 100644
--- a/clutter/deprecated/clutter-shader.c
+++ b/clutter/deprecated/clutter-shader.c
@@ -71,8 +71,6 @@
 /* global list of shaders */
 static GList *clutter_shaders_list = NULL;
 
-#define CLUTTER_SHADER_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), CLUTTER_TYPE_SHADER, ClutterShaderPrivate))
-
 struct _ClutterShaderPrivate
 {
   guint       compiled         : 1; /* Shader is bound to the GL context */
@@ -103,7 +101,7 @@ enum
 
 static GParamSpec *obj_props[PROP_LAST];
 
-G_DEFINE_TYPE (ClutterShader, clutter_shader, G_TYPE_OBJECT);
+G_DEFINE_TYPE_WITH_PRIVATE (ClutterShader, clutter_shader, G_TYPE_OBJECT)
 
 static inline void
 clutter_shader_release_internal (ClutterShader *shader)
@@ -245,8 +243,6 @@ clutter_shader_class_init (ClutterShaderClass *klass)
   object_class->get_property  = clutter_shader_get_property;
   object_class->constructor   = clutter_shader_constructor;
 
-  g_type_class_add_private (klass, sizeof (ClutterShaderPrivate));
-
   /**
    * ClutterShader:vertex-source:
    *
@@ -323,7 +319,7 @@ clutter_shader_init (ClutterShader *self)
 {
   ClutterShaderPrivate *priv;
 
-  priv = self->priv = CLUTTER_SHADER_GET_PRIVATE (self);
+  priv = self->priv = clutter_shader_get_instance_private (self);
 
   priv->compiled = FALSE;
 
diff --git a/clutter/deprecated/clutter-state.c b/clutter/deprecated/clutter-state.c
index 8df11a178..f482de2ae 100644
--- a/clutter/deprecated/clutter-state.c
+++ b/clutter/deprecated/clutter-state.c
@@ -31,15 +31,20 @@
  * is NULL it is used for transition to the target state unless a specific key
  * exists for transitioning from the current state to the requested state.
  *
- * <example id="ClutterState-example">
- *   <title>A ClutterState example</title>
- *   <para>The following example defines a "base" and a "hover" state in a
- *   #ClutterState instance.</para>
- *   <programlisting>
+ * #ClutterState is available since Clutter 1.4.
+ *
+ * #ClutterState has been deprecated in Clutter 1.12.
+ *
+ * ## Using ClutterState
+ *
+ * The following example defines a "base" and a "hover" state in a
+ * #ClutterState instance.
+ *
+ * |[<!-- language="C" -->
  * ClutterState *state = clutter_state_new ();
  * ClutterColor color = { 0, };
  *
- * /&ast; transition from any state to the "base" state &ast;/
+ * // transition from any state to the "base" state
  * clutter_color_from_string (&color, "rgb(255, 0, 0)");
  * clutter_state_set (state, NULL, "base",
  *                    actor, "color", CLUTTER_LINEAR, &color,
@@ -47,7 +52,7 @@
  *                    actor, "scale-y", CLUTTER_EASE_IN_BOUNCE, 1.0,
  *                    NULL);
  *
- * /&ast; transition from the "base" state to the "hover" state &ast;/
+ * // transition from the "base" state to the "hover" state
  * clutter_color_from_string (&color, "rgb(0, 0, 255)");
  * clutter_state_set (state, "base", "hover",
  *                    actor, "color", CLUTTER_LINEAR, &color,
@@ -55,16 +60,18 @@
  *                    actor, "scale-y", CLUTTER_EASE_OUT_BOUNCE, 1.7,
  *                    NULL);
  *
- * /&ast; the default duration of any transition &ast;/
+ * // the default duration of any transition
  * clutter_state_set_duration (state, NULL, NULL, 500);
  *
- * /&ast; set "base" as the initial state &ast;/
+ * // set "base" as the initial state
  * clutter_state_warp_to_state (state, "base");
- *   </programlisting>
- *   <para>The actor then uses the #ClutterState to animate through the
- *   two states using callbacks for the #ClutterActor::enter-event and
- *   #ClutterActor::leave-event signals.</para>
- *   <programlisting>
+ * ]|
+ *
+ * The actor then uses the #ClutterState to animate through the
+ * two states using callbacks for the #ClutterActor::enter-event and
+ * #ClutterActor::leave-event signals.
+ *
+ * |[<!-- language="C" -->
  * static gboolean
  * on_enter (ClutterActor *actor,
  *           ClutterEvent *event,
@@ -72,7 +79,7 @@
  * {
  *   clutter_state_set_state (state, "hover");
  *
- *   return TRUE;
+ *   return CLUTTER_EVENT_STOP;
  * }
  *
  * static gboolean
@@ -82,67 +89,64 @@
  * {
  *   clutter_state_set_state (state, "base");
  *
- *   return TRUE;
+ *   return CLUTTER_EVENT_STOP;
  * }
- *   </programlisting>
- * </example>
  *
- * <refsect2 id="ClutterState-script">
- *   <title>ClutterState description for #ClutterScript</title>
- *   <para>#ClutterState defines a custom <emphasis>transitions</emphasis>
- *   property which allows describing the states.</para>
- *   <para>The <emphasis>transitions</emphasis> property has the following
- *   syntax:</para>
- *   <informalexample>
- *     <programlisting>
+ * ## ClutterState description for ClutterScript
+ *
+ * #ClutterState defines a custom `transitions` JSON object member which
+ * allows describing the states.
+ *
+ * The `transitions` property has the following syntax:
+ *
+ * |[
  * {
  *   "transitions" : [
  *     {
- *       "source" : "&lt;source-state&gt;",
- *       "target" : "&lt;target-state&gt;",
- *       "duration" : &lt;milliseconds&gt;,
+ *       "source" : "source-state",
+ *       "target" : "target-state",
+ *       "duration" : milliseconds,
  *       "keys" : [
  *         [
- *           "&lt;object-id&gt;",
- *           "&lt;property-name&gt;",
- *           "&lt;easing-mode&gt;",
- *           "&lt;final-value&gt;",
+ *           "object-id",
+ *           "property-name",
+ *           "easing-mode",
+ *           "final-value",
  *         ],
  *         [
- *           "&lt;object-id&gt;",
- *           "&lt;property-name&gt;",
- *           "&lt;easing-mode&gt;",
- *           "&lt;final-value&gt;",
- *           &lt;pre-delay&gt;,
- *           &lt;post-delay&gt;
+ *           "object-id",
+ *           "property-name",
+ *           "easing-mode",
+ *           "final-value",
+ *           pre-delay,
+ *           post-delay;
  *         ],
  *         ...
  *       ]
  *     },
  *     {
- *       "source" : "&lt;source-state&gt;",
- *       "target" : "&lt;target-state&gt;",
- *       "duration" : &lt;milliseconds&gt;,
- *       "animator" : "&lt;animator-definition&gt;"
+ *       "source" : "source-state",
+ *       "target" : "target-state",
+ *       "duration" : milliseconds,
+ *       "animator" : "animator-definition"
  *     },
  *     ...
  *   ]
  * }
- *     </programlisting>
- *   </informalexample>
- *   <para>Each element of the <emphasis>transitions</emphasis> array follows
- *   the same rules as clutter_state_set_key().</para>
- *   <para>The <emphasis>source</emphasis> and <emphasis>target</emphasis>
- *   values control the source and target state of the transition. The
- *   <emphasis>key</emphasis> and <emphasis>animator</emphasis> are mutually
- *   exclusive. The <emphasis>pre-delay</emphasis> and
- *   <emphasis>post-delay</emphasis> values are optional.</para>
- *   <example id="ClutterState-script-example">
- *     <title>ClutterState definition</title>
- *     <para>The example below is a translation into a #ClutterScript
- *     definition of the code in the <ulink linkend="ClutterState-example">example
- *     above</ulink>.</para>
- *     <programlisting>
+ * ]|
+ *
+ * Each element of the transitions array follows the same rules and order
+ * as clutter_state_set_key() function arguments.
+ *
+ * The source and target values control the source and target state of the
+ * transition. The key and animator properties are mutually exclusive.
+ *
+ * The pre-delay and post-delay values are optional.
+ *
+ * The example below is a translation into a #ClutterScript definition of
+ * the code in the #ClutterState example above.
+ *
+ * |[
  * {
  *   "id" : "button-state",
  *   "type" : "ClutterState",
@@ -168,13 +172,7 @@
  *     }
  *   ]
  * }
- *     </programlisting>
- *   </example>
- * </refsect2>
- *
- * #ClutterState is available since Clutter 1.4.
- *
- * #ClutterState has been deprecated in Clutter 1.12.
+ * ]|
  */
 
 #ifdef HAVE_CONFIG_H
@@ -287,14 +285,10 @@ static void clutter_scriptable_iface_init (ClutterScriptableIface *iface);
 
 static guint state_signals[LAST_SIGNAL] = {0, };
 
-#define CLUTTER_STATE_GET_PRIVATE(obj)            \
-              (G_TYPE_INSTANCE_GET_PRIVATE ((obj), \
-               CLUTTER_TYPE_STATE,                \
-               ClutterStatePrivate))
-
 G_DEFINE_TYPE_WITH_CODE (ClutterState, clutter_state, G_TYPE_OBJECT,
+                         G_ADD_PRIVATE (ClutterState)
                          G_IMPLEMENT_INTERFACE (CLUTTER_TYPE_SCRIPTABLE,
-                                                clutter_scriptable_iface_init));
+                                                clutter_scriptable_iface_init))
 
 /**
  * clutter_state_new:
@@ -937,7 +931,7 @@ get_property_from_object (GObject     *gobject,
  *
  * will create a transition from any state (a @source_state_name or NULL is
  * treated as a wildcard) and a state named "hover"; the
- * <emphasis>button</emphasis> object will have the #ClutterActor:opacity
+ * button object will have the #ClutterActor:opacity
  * property animated to a value of 255 using %CLUTTER_LINEAR as the animation
  * mode, and the #ClutterActor:scale-x and #ClutterActor:scale-y properties
  * animated to a value of 1.2 using %CLUTTER_EASE_OUT_CUBIC as the animation
@@ -1462,8 +1456,6 @@ clutter_state_class_init (ClutterStateClass *klass)
   GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
   GParamSpec   *pspec;
 
-  g_type_class_add_private (klass, sizeof (ClutterStatePrivate));
-
   gobject_class->finalize     = clutter_state_finalize;
   gobject_class->set_property = clutter_state_set_property;
   gobject_class->get_property = clutter_state_get_property;
@@ -1533,7 +1525,7 @@ clutter_state_init (ClutterState *self)
 {
   ClutterStatePrivate *priv;
 
-  priv = self->priv = CLUTTER_STATE_GET_PRIVATE (self);
+  priv = self->priv = clutter_state_get_instance_private (self);
 
   priv->states = g_hash_table_new_full (g_direct_hash, g_direct_equal,
                                         NULL,
diff --git a/clutter/deprecated/clutter-state.h b/clutter/deprecated/clutter-state.h
index c446e7784..e33ae0fec 100644
--- a/clutter/deprecated/clutter-state.h
+++ b/clutter/deprecated/clutter-state.h
@@ -42,7 +42,7 @@ typedef struct _ClutterStateClass   ClutterStateClass;
 /**
  * ClutterStateKey:
  *
- * <structname>ClutterStateKey</structname> is an opaque structure whose
+ * #ClutterStateKey is an opaque structure whose
  * members cannot be accessed directly
  *
  * Since: 1.4
@@ -52,7 +52,7 @@ typedef struct _ClutterStateKey     ClutterStateKey;
 /**
  * ClutterState:
  *
- * The <structname>ClutterState</structname> structure contains only
+ * The #ClutterState structure contains only
  * private data and should be accessed using the provided API
  *
  * Since: 1.4
@@ -68,7 +68,7 @@ struct _ClutterState
  * ClutterStateClass:
  * @completed: class handler for the #ClutterState::completed signal
  *
- * The <structname>ClutterStateClass</structname> structure contains
+ * The #ClutterStateClass structure contains
  * only private data
  *
  * Since: 1.4
diff --git a/clutter/clutter-table-layout.c b/clutter/deprecated/clutter-table-layout.c
similarity index 97%
rename from clutter/clutter-table-layout.c
rename to clutter/deprecated/clutter-table-layout.c
index 9927ad59a..28fad3c10 100644
--- a/clutter/clutter-table-layout.c
+++ b/clutter/deprecated/clutter-table-layout.c
@@ -36,22 +36,20 @@
  * The #ClutterTableLayout is a #ClutterLayoutManager implementing the
  * following layout policy:
  *
- * <itemizedlist>
- *   <listitem><para>children are arranged in a table</para></listitem>
- *   <listitem><para>each child specifies the specific row and column
- *   cell to appear;</para></listitem>
- *   <listitem><para>a child can also set a span, and this way, take
- *   more than one cell both horizontally and vertically;</para></listitem>
- *   <listitem><para>each child will be allocated to its natural
- *   size or, if set to expand, the available size;</para></listitem>
- *   <listitem><para>if a child is set to fill on either (or both)
+ *   - children are arranged in a table
+ *   - each child specifies the specific row and column
+ *   cell to appear;
+ *   - a child can also set a span, and this way, take
+ *   more than one cell both horizontally and vertically;
+ *   - each child will be allocated to its natural
+ *   size or, if set to expand, the available size;
+ *   - if a child is set to fill on either (or both)
  *   axis, its allocation will match all the available size; the
  *   fill layout property only makes sense if the expand property is
- *   also set;</para></listitem>
- *   <listitem><para>if a child is set to expand but not to fill then
+ *   also set;
+ *   - if a child is set to expand but not to fill then
  *   it is possible to control the alignment using the horizontal and
- *   vertical alignment layout properties.</para></listitem>
- * </itemizedlist>
+ *   vertical alignment layout properties.
  *
  * It is possible to control the spacing between children of a
  * #ClutterTableLayout by using clutter_table_layout_set_row_spacing()
@@ -67,13 +65,13 @@
  * #ClutterTableLayout:easing-mode and #ClutterTableLayout:easing-duration
  * properties and their accessor functions.
  *
- * <figure id="table-layout-image">
- *   <title>Table layout</title>
- *   <para>The image shows a #ClutterTableLayout.</para>
- *   <graphic fileref="table-layout.png" format="PNG"/>
- * </figure>
- *
  * #ClutterTableLayout is available since Clutter 1.4
+ *
+ * Since Clutter 1.18 it's recommended to use #ClutterGridLayout instead
+ * of #ClutterTableLayout; the former supports right-to-left text direction,
+ * as well as using the alignment and expansion flags on #ClutterActor.
+ *
+ * Deprecated: 1.18
  */
 
 #ifdef HAVE_CONFIG_H
@@ -98,8 +96,6 @@
 #define CLUTTER_TABLE_CHILD(obj)          (G_TYPE_CHECK_INSTANCE_CAST ((obj), CLUTTER_TYPE_TABLE_CHILD, ClutterTableChild))
 #define CLUTTER_IS_TABLE_CHILD(obj)       (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CLUTTER_TYPE_TABLE_CHILD))
 
-#define CLUTTER_TABLE_LAYOUT_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), CLUTTER_TYPE_TABLE_LAYOUT, ClutterTableLayoutPrivate))
-
 typedef struct _ClutterTableChild         ClutterTableChild;
 typedef struct _ClutterLayoutMetaClass    ClutterTableChildClass;
 
@@ -184,13 +180,9 @@ enum
 
 GType clutter_table_child_get_type (void);
 
-G_DEFINE_TYPE (ClutterTableChild,
-               clutter_table_child,
-               CLUTTER_TYPE_LAYOUT_META);
+G_DEFINE_TYPE (ClutterTableChild, clutter_table_child, CLUTTER_TYPE_LAYOUT_META)
 
-G_DEFINE_TYPE (ClutterTableLayout,
-               clutter_table_layout,
-               CLUTTER_TYPE_LAYOUT_MANAGER);
+G_DEFINE_TYPE_WITH_PRIVATE (ClutterTableLayout, clutter_table_layout, CLUTTER_TYPE_LAYOUT_MANAGER)
 
 /*
  * ClutterBoxChild
@@ -574,28 +566,28 @@ clutter_table_child_class_init (ClutterTableChildClass *klass)
   pspec = g_param_spec_boolean ("x-expand",
                                 P_("Horizontal Expand"),
                                 P_("Allocate extra space for the child in horizontal axis"),
-                                FALSE,
+                                TRUE,
                                 CLUTTER_PARAM_READWRITE);
   g_object_class_install_property (gobject_class, PROP_CHILD_X_EXPAND, pspec);
 
   pspec = g_param_spec_boolean ("y-expand",
                                 P_("Vertical Expand"),
                                 P_("Allocate extra space for the child in vertical axis"),
-                                FALSE,
+                                TRUE,
                                 CLUTTER_PARAM_READWRITE);
   g_object_class_install_property (gobject_class, PROP_CHILD_Y_EXPAND, pspec);
 
   pspec = g_param_spec_boolean ("x-fill",
                                 P_("Horizontal Fill"),
                                 P_("Whether the child should receive priority when the container is allocating spare space on the horizontal axis"),
-                                FALSE,
+                                TRUE,
                                 CLUTTER_PARAM_READWRITE);
   g_object_class_install_property (gobject_class, PROP_CHILD_X_FILL, pspec);
 
   pspec = g_param_spec_boolean ("y-fill",
                                 P_("Vertical Fill"),
                                 P_("Whether the child should receive priority when the container is allocating spare space on the vertical axis"),
-                                FALSE,
+                                TRUE,
                                 CLUTTER_PARAM_READWRITE);
   g_object_class_install_property (gobject_class, PROP_CHILD_Y_FILL, pspec);
 
@@ -889,8 +881,8 @@ calculate_col_widths (ClutterTableLayout *self,
             n_expand++;
         }
 
-      pref_width += priv->col_spacing * (priv->n_cols - 1);
-      min_width += priv->col_spacing * (priv->n_cols - 1);
+      pref_width += priv->col_spacing * MAX (priv->visible_cols - 1, 0);
+      min_width += priv->col_spacing * MAX (priv->visible_cols - 1, 0);
 
       if (for_width <= min_width)
         {
@@ -1179,8 +1171,8 @@ calculate_row_heights (ClutterTableLayout *self,
             n_expand++;
         }
 
-      pref_height += priv->row_spacing * (priv->n_rows - 1);
-      min_height += priv->row_spacing * (priv->n_rows - 1);
+      pref_height += priv->row_spacing * MAX (priv->visible_rows - 1, 0);
+      min_height += priv->row_spacing * MAX (priv->visible_rows - 1, 0);
 
       if (for_height <= min_height)
         {
@@ -1297,7 +1289,7 @@ clutter_table_layout_get_preferred_width (ClutterLayoutManager *layout,
   calculate_table_dimensions (self, container, -1, for_height);
   columns = (DimensionData *) (void *) priv->columns->data;
 
-  total_min_width = (priv->visible_cols - 1) * (float) priv->col_spacing;
+  total_min_width = MAX ((priv->visible_cols - 1) * (float) priv->col_spacing, 0);
   total_pref_width = total_min_width;
 
   for (i = 0; i < priv->n_cols; i++)
@@ -1337,7 +1329,7 @@ clutter_table_layout_get_preferred_height (ClutterLayoutManager *layout,
   calculate_table_dimensions (self, container, for_width, -1);
   rows = (DimensionData *) (void *) priv->rows->data;
 
-  total_min_height = (priv->visible_rows - 1) * (float) priv->row_spacing;
+  total_min_height = MAX ((priv->visible_rows - 1) * (float) priv->row_spacing, 0);
   total_pref_height = total_min_height;
 
   for (i = 0; i < self->priv->n_rows; i++)
@@ -1624,14 +1616,14 @@ clutter_table_layout_class_init (ClutterTableLayoutClass *klass)
   layout_class->get_child_meta_type =
     clutter_table_layout_get_child_meta_type;
 
-  g_type_class_add_private (klass, sizeof (ClutterTableLayoutPrivate));
-
   /**
    * ClutterTableLayout:column-spacing:
    *
    * The spacing between columns of the #ClutterTableLayout, in pixels
    *
    * Since: 1.4
+   *
+   * Deprecated: 1.18
    */
   pspec = g_param_spec_uint ("column-spacing",
                              P_("Column Spacing"),
@@ -1646,6 +1638,8 @@ clutter_table_layout_class_init (ClutterTableLayoutClass *klass)
    * The spacing between rows of the #ClutterTableLayout, in pixels
    *
    * Since: 1.4
+   *
+   * Deprecated: 1.18
    */
   pspec = g_param_spec_uint ("row-spacing",
                              P_("Row Spacing"),
@@ -1731,7 +1725,7 @@ clutter_table_layout_init (ClutterTableLayout *layout)
 {
   ClutterTableLayoutPrivate *priv;
 
-  layout->priv = priv = CLUTTER_TABLE_LAYOUT_GET_PRIVATE (layout);
+  layout->priv = priv = clutter_table_layout_get_instance_private (layout);
 
   priv->row_spacing = 0;
   priv->col_spacing = 0;
@@ -1752,6 +1746,8 @@ clutter_table_layout_init (ClutterTableLayout *layout)
  * Return value: the newly created #ClutterTableLayout
  *
  * Since: 1.4
+ *
+ * Deprecated: 1.18: Use #ClutterGridLayout instead
  */
 ClutterLayoutManager *
 clutter_table_layout_new (void)
@@ -1767,6 +1763,8 @@ clutter_table_layout_new (void)
  * Sets the spacing between columns of @layout
  *
  * Since: 1.4
+ *
+ * Deprecated: 1.18: Use #ClutterGridLayout instead
  */
 void
 clutter_table_layout_set_column_spacing (ClutterTableLayout *layout,
@@ -1800,6 +1798,8 @@ clutter_table_layout_set_column_spacing (ClutterTableLayout *layout,
  * Return value: the spacing between columns of the #ClutterTableLayout
  *
  * Since: 1.4
+ *
+ * Deprecated: 1.18: Use #ClutterGridLayout instead
  */
 guint
 clutter_table_layout_get_column_spacing (ClutterTableLayout *layout)
@@ -1817,6 +1817,8 @@ clutter_table_layout_get_column_spacing (ClutterTableLayout *layout)
  * Sets the spacing between rows of @layout
  *
  * Since: 1.4
+ *
+ * Deprecated: 1.18: Use #ClutterGridLayout instead
  */
 void
 clutter_table_layout_set_row_spacing (ClutterTableLayout *layout,
@@ -1850,6 +1852,8 @@ clutter_table_layout_set_row_spacing (ClutterTableLayout *layout,
  * Return value: the spacing between rows of the #ClutterTableLayout
  *
  * Since: 1.4
+ *
+ * Deprecated: 1.18: Use #ClutterGridLayout instead
  */
 guint
 clutter_table_layout_get_row_spacing (ClutterTableLayout *layout)
@@ -1870,6 +1874,8 @@ clutter_table_layout_get_row_spacing (ClutterTableLayout *layout)
  * at the given row and column.
  *
  * Since: 1.4
+ *
+ * Deprecated: 1.18: Use #ClutterGridLayout instead
  */
 void
 clutter_table_layout_pack (ClutterTableLayout  *layout,
@@ -1924,6 +1930,8 @@ clutter_table_layout_pack (ClutterTableLayout  *layout,
  * inside @layout
  *
  * Since: 1.4
+ *
+ * Deprecated: 1.18: Use #ClutterGridLayout instead
  */
 void
 clutter_table_layout_set_span (ClutterTableLayout *layout,
@@ -1978,6 +1986,8 @@ clutter_table_layout_set_span (ClutterTableLayout *layout,
  * clutter_table_layout_pack() or clutter_table_layout_set_span()
  *
  * Since: 1.4
+ *
+ * Deprecated: 1.18: Use #ClutterGridLayout instead
  */
 void
 clutter_table_layout_get_span (ClutterTableLayout *layout,
@@ -2559,6 +2569,8 @@ clutter_table_layout_get_easing_duration (ClutterTableLayout *layout)
  * Returns: the number of rows
  *
  * Since: 1.4
+ *
+ * Deprecated: 1.18: Use #ClutterGridLayout instead
  */
 gint
 clutter_table_layout_get_row_count (ClutterTableLayout *layout)
@@ -2578,6 +2590,8 @@ clutter_table_layout_get_row_count (ClutterTableLayout *layout)
  * Returns: the number of columns
  *
  * Since: 1.4
+ *
+ * Deprecated: 1.18: Use #ClutterGridLayout instead
  */
 gint
 clutter_table_layout_get_column_count (ClutterTableLayout *layout)
diff --git a/clutter/clutter-table-layout.h b/clutter/deprecated/clutter-table-layout.h
similarity index 92%
rename from clutter/clutter-table-layout.h
rename to clutter/deprecated/clutter-table-layout.h
index 06d6e5105..dffbfb777 100644
--- a/clutter/clutter-table-layout.h
+++ b/clutter/deprecated/clutter-table-layout.h
@@ -54,6 +54,8 @@ typedef struct _ClutterTableLayoutClass           ClutterTableLayoutClass;
  * and should be accessed using the provided API
  *
  * Since: 1.4
+ *
+ * Deprecated: 1.18: Use #ClutterGridLayout instead
  */
 struct _ClutterTableLayout
 {
@@ -70,6 +72,8 @@ struct _ClutterTableLayout
  * data and should be accessed using the provided API
  *
  * Since: 1.4
+ *
+ * Deprecated: 1.18: Use #ClutterGridLayout instead
  */
 struct _ClutterTableLayoutClass
 {
@@ -77,26 +81,35 @@ struct _ClutterTableLayoutClass
   ClutterLayoutManagerClass parent_class;
 };
 
+CLUTTER_DEPRECATED_IN_1_18_FOR (clutter_grid_layout_get_type)
 GType clutter_table_layout_get_type (void) G_GNUC_CONST;
 
+CLUTTER_DEPRECATED_IN_1_18_FOR (clutter_grid_layout_new)
 ClutterLayoutManager *clutter_table_layout_new                 (void);
 
+CLUTTER_DEPRECATED_IN_1_18_FOR (clutter_grid_layout_attach)
 void                  clutter_table_layout_pack                (ClutterTableLayout    *layout,
                                                                 ClutterActor          *actor,
                                                                 gint                   column,
                                                                 gint                   row);
 
+CLUTTER_DEPRECATED_IN_1_18_FOR (clutter_grid_layout_set_column_spacing)
 void                  clutter_table_layout_set_column_spacing  (ClutterTableLayout    *layout,
                                                                 guint                  spacing);
+CLUTTER_DEPRECATED_IN_1_18_FOR (clutter_grid_layout_set_row_spacing)
 void                  clutter_table_layout_set_row_spacing     (ClutterTableLayout    *layout,
                                                                 guint                  spacing);
+CLUTTER_DEPRECATED_IN_1_18_FOR (clutter_grid_layout_get_column_spacing)
 guint                 clutter_table_layout_get_column_spacing  (ClutterTableLayout    *layout);
+CLUTTER_DEPRECATED_IN_1_18_FOR (clutter_grid_layout_get_row_spacing)
 guint                 clutter_table_layout_get_row_spacing     (ClutterTableLayout    *layout);
 
+CLUTTER_DEPRECATED_IN_1_18
 void                  clutter_table_layout_set_span            (ClutterTableLayout    *layout,
                                                                 ClutterActor          *actor,
                                                                 gint                   column_span,
                                                                 gint                   row_span);
+CLUTTER_DEPRECATED_IN_1_18
 void                  clutter_table_layout_get_span            (ClutterTableLayout    *layout,
                                                                 ClutterActor          *actor,
                                                                 gint                  *column_span,
@@ -133,7 +146,9 @@ void                  clutter_table_layout_get_expand          (ClutterTableLayo
                                                                 gboolean              *x_expand,
                                                                 gboolean              *y_expand);
 
+CLUTTER_DEPRECATED_IN_1_18
 gint                  clutter_table_layout_get_row_count       (ClutterTableLayout    *layout);
+CLUTTER_DEPRECATED_IN_1_18
 gint                  clutter_table_layout_get_column_count    (ClutterTableLayout    *layout);
 
 CLUTTER_DEPRECATED_IN_1_12
diff --git a/clutter/deprecated/clutter-texture.c b/clutter/deprecated/clutter-texture.c
index 448c8849f..d72f0e3e6 100644
--- a/clutter/deprecated/clutter-texture.c
+++ b/clutter/deprecated/clutter-texture.c
@@ -47,6 +47,9 @@
 #include "config.h"
 #endif
 
+/* sadly, we are still using ClutterShader internally */
+#define CLUTTER_DISABLE_DEPRECATION_WARNINGS
+
 /* This file depends on the glib enum types which aren't exposed
  * by cogl.h when COGL_ENABLE_EXPERIMENTAL_2_0_API is defined.
  *
@@ -58,9 +61,6 @@
 
 #define CLUTTER_ENABLE_EXPERIMENTAL_API
 
-/* sadly, we are still using ClutterShader internally */
-#define CLUTTER_DISABLE_DEPRECATION_WARNINGS
-
 #include "clutter-texture.h"
 
 #include "clutter-actor-private.h"
@@ -78,16 +78,6 @@
 #include "deprecated/clutter-texture.h"
 #include "deprecated/clutter-util.h"
 
-static void clutter_scriptable_iface_init (ClutterScriptableIface *iface);
-
-G_DEFINE_TYPE_WITH_CODE (ClutterTexture,
-                         clutter_texture,
-                         CLUTTER_TYPE_ACTOR,
-                         G_IMPLEMENT_INTERFACE (CLUTTER_TYPE_SCRIPTABLE,
-                                                clutter_scriptable_iface_init));
-
-#define CLUTTER_TEXTURE_GET_PRIVATE(obj)        (G_TYPE_INSTANCE_GET_PRIVATE ((obj), CLUTTER_TYPE_TEXTURE, ClutterTexturePrivate))
-
 typedef struct _ClutterTextureAsyncData ClutterTextureAsyncData;
 
 struct _ClutterTexturePrivate
@@ -194,6 +184,16 @@ static CoglPipeline *texture_template_pipeline = NULL;
 static void
 texture_fbo_free_resources (ClutterTexture *texture);
 
+static void clutter_scriptable_iface_init (ClutterScriptableIface *iface);
+
+G_DEFINE_TYPE_WITH_CODE (ClutterTexture,
+                         clutter_texture,
+                         CLUTTER_TYPE_ACTOR,
+                         G_ADD_PRIVATE (ClutterTexture)
+                         G_IMPLEMENT_INTERFACE (CLUTTER_TYPE_SCRIPTABLE,
+                                                clutter_scriptable_iface_init));
+
+
 GQuark
 clutter_texture_error_quark (void)
 {
@@ -972,8 +972,6 @@ clutter_texture_class_init (ClutterTextureClass *klass)
   ClutterActorClass *actor_class = CLUTTER_ACTOR_CLASS (klass);
   GParamSpec *pspec;
 
-  g_type_class_add_private (klass, sizeof (ClutterTexturePrivate));
-
   actor_class->paint            = clutter_texture_paint;
   actor_class->pick             = clutter_texture_pick;
   actor_class->get_paint_volume = clutter_texture_get_paint_volume;
@@ -1296,7 +1294,7 @@ clutter_texture_init (ClutterTexture *self)
 {
   ClutterTexturePrivate *priv;
 
-  self->priv = priv = CLUTTER_TEXTURE_GET_PRIVATE (self);
+  self->priv = priv = clutter_texture_get_instance_private (self);
 
   priv->repeat_x          = FALSE;
   priv->repeat_y          = FALSE;
@@ -2516,13 +2514,8 @@ fbo_source_queue_relayout_cb (ClutterActor *source,
  *
  * Some tips on usage:
  *
- * <itemizedlist>
- *   <listitem>
- *     <para>The source actor must be made visible (i.e by calling
- *     #clutter_actor_show).</para>
- *   </listitem>
- *   <listitem>
- *     <para>The source actor must have a parent in order for it to be
+ *   - The source actor must be visible
+ *   - The source actor must have a parent in order for it to be
  *     allocated a size from the layouting mechanism. If the source
  *     actor does not have a parent when this function is called then
  *     the ClutterTexture will adopt it and allocate it at its
@@ -2531,10 +2524,8 @@ fbo_source_queue_relayout_cb (ClutterActor *source,
  *     intend to display the source actor then you must make sure that
  *     the actor is parented before calling
  *     clutter_texture_new_from_actor() or that you unparent it before
- *     adding it to a container.</para>
- *   </listitem>
- *   <listitem>
- *     <para>When getting the image for the clone texture, Clutter
+ *     adding it to a container.
+ *   - When getting the image for the clone texture, Clutter
  *     will attempt to render the source actor exactly as it would
  *     appear if it was rendered on screen. The source actor's parent
  *     transformations are taken into account. Therefore if your
@@ -2546,33 +2537,21 @@ fbo_source_queue_relayout_cb (ClutterActor *source,
  *     actor will be projected as if a small section of the screen was
  *     being viewed. Before version 0.8.2, an orthogonal identity
  *     projection was used which meant that the source actor would be
- *     clipped if any part of it was not on the zero Z-plane.</para>
- *   </listitem>
- *   <listitem>
- *     <para>Avoid reparenting the source with the created texture.</para>
- *   </listitem>
- *   <listitem>
- *     <para>A group can be padded with a transparent rectangle as to
+ *     clipped if any part of it was not on the zero Z-plane.
+ *   - Avoid reparenting the source with the created texture.
+ *   - A group can be padded with a transparent rectangle as to
  *     provide a border to contents for shader output (blurring text
- *     for example).</para>
- *   </listitem>
- *   <listitem>
- *     <para>The texture will automatically resize to contain a further
+ *     for example).
+ *   - The texture will automatically resize to contain a further
  *     transformed source. However, this involves overhead and can be
  *     avoided by placing the source actor in a bounding group
- *     sized large enough to contain any child tranformations.</para>
- *   </listitem>
- *   <listitem>
- *     <para>Uploading pixel data to the texture (e.g by using
+ *     sized large enough to contain any child tranformations.
+ *   -  Uploading pixel data to the texture (e.g by using
  *     clutter_texture_set_from_file()) will destroy the offscreen texture
- *     data and end redirection.</para>
- *   </listitem>
- *   <listitem>
- *     <para>cogl_texture_get_data() with the handle returned by
+ *     data and end redirection.
+ *   - cogl_texture_get_data() with the handle returned by
  *     clutter_texture_get_cogl_texture() can be used to read the
  *     offscreen texture pixels into a pixbuf.</para>
- *   </listitem>
- * </itemizedlist>
  *
  * Return value: A newly created #ClutterTexture object, or %NULL on failure.
  *
diff --git a/clutter/deprecated/clutter-timeout-pool.h b/clutter/deprecated/clutter-timeout-pool.h
index 9d7ad1d22..61780e546 100644
--- a/clutter/deprecated/clutter-timeout-pool.h
+++ b/clutter/deprecated/clutter-timeout-pool.h
@@ -42,7 +42,7 @@ G_BEGIN_DECLS
 /**
  * ClutterTimeoutPool: (skip)
  *
- * <structname>ClutterTimeoutPool</structname> is an opaque structure
+ * #ClutterTimeoutPool is an opaque structure
  * whose members cannot be directly accessed.
  *
  * Since: 0.6
diff --git a/clutter/egl/clutter-backend-eglnative.c b/clutter/egl/clutter-backend-eglnative.c
index a99d37491..1eccd31d9 100644
--- a/clutter/egl/clutter-backend-eglnative.c
+++ b/clutter/egl/clutter-backend-eglnative.c
@@ -53,10 +53,16 @@
 #include "clutter-egl.h"
 #endif
 
+#include "clutter-stage-eglnative.h"
+
 #define clutter_backend_egl_native_get_type     _clutter_backend_egl_native_get_type
 
 G_DEFINE_TYPE (ClutterBackendEglNative, clutter_backend_egl_native, CLUTTER_TYPE_BACKEND);
 
+#ifdef COGL_HAS_EGL_PLATFORM_KMS_SUPPORT
+static int _kms_fd = -1;
+#endif
+
 static void
 clutter_backend_egl_native_dispose (GObject *gobject)
 {
@@ -71,6 +77,25 @@ clutter_backend_egl_native_dispose (GObject *gobject)
   G_OBJECT_CLASS (clutter_backend_egl_native_parent_class)->dispose (gobject);
 }
 
+static CoglRenderer *
+clutter_backend_egl_native_get_renderer (ClutterBackend  *backend,
+                                         GError         **error)
+{
+  CoglRenderer *renderer;
+
+  renderer = cogl_renderer_new ();
+
+#ifdef COGL_HAS_EGL_PLATFORM_KMS_SUPPORT
+  if (_kms_fd > -1)
+    {
+      cogl_renderer_set_winsys_id (renderer, COGL_WINSYS_ID_EGL_KMS);
+      cogl_kms_renderer_set_kms_fd (renderer, _kms_fd);
+    }
+#endif
+
+  return renderer;
+}
+
 static void
 clutter_backend_egl_native_class_init (ClutterBackendEglNativeClass *klass)
 {
@@ -79,7 +104,9 @@ clutter_backend_egl_native_class_init (ClutterBackendEglNativeClass *klass)
 
   gobject_class->dispose = clutter_backend_egl_native_dispose;
 
-  backend_class->stage_window_type = CLUTTER_TYPE_STAGE_COGL;
+  backend_class->stage_window_type = CLUTTER_TYPE_STAGE_EGL_NATIVE;
+
+  backend_class->get_renderer = clutter_backend_egl_native_get_renderer;
 }
 
 static void
@@ -157,3 +184,77 @@ clutter_egl_get_egl_display (void)
   return 0;
 #endif
 }
+
+#ifdef COGL_HAS_EGL_PLATFORM_KMS_SUPPORT
+/**
+ * clutter_egl_set_kms_fd:
+ * @fd: The fd to talk to the kms driver with
+ *
+ * Sets the fd that Cogl should use to talk to the kms driver.
+ * Setting this to a negative value effectively reverts this
+ * call, making Cogl open the device itself.
+ *
+ * This can only be called before clutter_init() is called.
+ *
+ * Since: 1.18
+ */
+void
+clutter_egl_set_kms_fd (int fd)
+{
+  _kms_fd = fd;
+}
+#endif
+
+/**
+ * clutter_egl_freeze_master_clock:
+ *
+ * Freezing the master clock makes Clutter stop processing events,
+ * redrawing, and advancing timelines. This is necessary when implementing
+ * a display server, to ensure that Clutter doesn't keep trying to page
+ * flip when DRM master has been dropped, e.g. when VT switched away.
+ *
+ * The master clock starts out running, so if you are VT switched away on
+ * startup, you need to call this immediately.
+ *
+ * If you're also using the evdev backend, make sure to also use
+ * clutter_evdev_release_devices() to make sure that Clutter doesn't also
+ * access revoked evdev devices when VT switched away.
+ *
+ * To unthaw a frozen master clock, use clutter_egl_thaw_master_clock().
+ *
+ * Since: 1.20
+ */
+void
+clutter_egl_freeze_master_clock (void)
+{
+  ClutterMasterClock *master_clock;
+
+  g_return_if_fail (CLUTTER_IS_BACKEND_EGL_NATIVE (clutter_get_default_backend ()));
+
+  master_clock = _clutter_master_clock_get_default ();
+  _clutter_master_clock_set_paused (master_clock, TRUE);
+}
+
+/**
+ * clutter_egl_thaw_master_clock:
+ *
+ * Thaws a master clock that has previously been frozen with
+ * clutter_egl_freeze_master_clock(), and start pumping the master clock
+ * again at the next iteration. Note that if you're switching back to your
+ * own VT, you should probably also queue a stage redraw with
+ * clutter_stage_ensure_redraw().
+ *
+ * Since: 1.20
+ */
+void
+clutter_egl_thaw_master_clock (void)
+{
+  ClutterMasterClock *master_clock;
+
+  g_return_if_fail (CLUTTER_IS_BACKEND_EGL_NATIVE (clutter_get_default_backend ()));
+
+  master_clock = _clutter_master_clock_get_default ();
+  _clutter_master_clock_set_paused (master_clock, FALSE);
+
+  _clutter_master_clock_start_running (master_clock);
+}
diff --git a/clutter/egl/clutter-egl.h b/clutter/egl/clutter-egl.h
index c15cd1556..83b021343 100644
--- a/clutter/egl/clutter-egl.h
+++ b/clutter/egl/clutter-egl.h
@@ -29,9 +29,7 @@
  *
  * The EGL backend for Clutter provides some EGL specific API
  *
- * You need to include
- * <filename class="headerfile">&lt;clutter/egl/clutter-egl.h&gt;</filename>
- * to have access to the functions documented here.
+ * You need to include `clutter-egl.h` to have access to the functions documented here.
  */
 
 #ifndef __CLUTTER_EGL_H__
@@ -46,13 +44,14 @@
 #endif
 
 #include "clutter-egl-headers.h"
+#include <clutter/clutter.h>
 
 G_BEGIN_DECLS
 
 /**
  * clutter_eglx_display:
  *
- * Retrieves the <structname>EGLDisplay</structname> used by Clutter,
+ * Retrieves the #EGLDisplay used by Clutter,
  * if Clutter has been compiled with EGL and X11 support.
  *
  * Return value: the EGL display
@@ -67,7 +66,7 @@ EGLDisplay      clutter_eglx_display            (void);
 /**
  * clutter_egl_display:
  *
- * Retrieves the <structname>EGLDisplay</structname> used by Clutter
+ * Retrieves the #EGLDisplay used by Clutter
  *
  * Return value: the EGL display
  *
@@ -79,14 +78,25 @@ EGLDisplay      clutter_egl_display             (void);
 /**
  * clutter_egl_get_egl_display:
  *
- * Retrieves the  <structname>EGLDisplay</structname> used by Clutter.
+ * Retrieves the  #EGLDisplay used by Clutter.
  *
  * Return value: the EGL display
  *
  * Since: 1.6
  */
+CLUTTER_AVAILABLE_IN_1_6
 EGLDisplay      clutter_egl_get_egl_display     (void);
 
+#ifdef COGL_HAS_EGL_PLATFORM_KMS_SUPPORT
+CLUTTER_AVAILABLE_IN_1_18
+void            clutter_egl_set_kms_fd          (int fd);
+#endif
+
+CLUTTER_AVAILABLE_IN_1_20
+void            clutter_egl_freeze_master_clock (void);
+CLUTTER_AVAILABLE_IN_1_20
+void            clutter_egl_thaw_master_clock   (void);
+
 G_END_DECLS
 
 #endif /* __CLUTTER_EGL_H__ */
diff --git a/clutter/egl/clutter-stage-eglnative.c b/clutter/egl/clutter-stage-eglnative.c
new file mode 100644
index 000000000..d7484bb96
--- /dev/null
+++ b/clutter/egl/clutter-stage-eglnative.c
@@ -0,0 +1,70 @@
+/*
+ * Clutter.
+ *
+ * An OpenGL based 'interactive canvas' library.
+ *
+ * Copyright (C) 2010  Intel Corporation.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+
+ * Authors:
+ *  Adel Gadllah
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <glib.h>
+
+#include "clutter-stage-window.h"
+#include "clutter-stage-private.h"
+#include "clutter-stage-eglnative.h"
+#include <cogl/cogl.h>
+
+static ClutterStageWindowIface *clutter_stage_window_parent_iface = NULL;
+
+static void clutter_stage_window_iface_init (ClutterStageWindowIface *iface);
+
+#define clutter_stage_eglnative_get_type _clutter_stage_eglnative_get_type
+
+G_DEFINE_TYPE_WITH_CODE (ClutterStageEglNative,
+                         clutter_stage_eglnative,
+                         CLUTTER_TYPE_STAGE_COGL,
+                         G_IMPLEMENT_INTERFACE (CLUTTER_TYPE_STAGE_WINDOW,
+                                                clutter_stage_window_iface_init));
+
+static gboolean
+clutter_stage_eglnative_can_clip_redraws (ClutterStageWindow *stage_window)
+{
+  return TRUE;
+}
+
+static void
+clutter_stage_eglnative_class_init (ClutterStageEglNativeClass *klass)
+{
+}
+
+static void
+clutter_stage_eglnative_init (ClutterStageEglNative *stage_eglnative)
+{
+}
+
+static void
+clutter_stage_window_iface_init (ClutterStageWindowIface *iface)
+{
+  clutter_stage_window_parent_iface = g_type_interface_peek_parent (iface);
+
+  iface->can_clip_redraws = clutter_stage_eglnative_can_clip_redraws;
+}
diff --git a/clutter/egl/clutter-stage-eglnative.h b/clutter/egl/clutter-stage-eglnative.h
new file mode 100644
index 000000000..cc64390bc
--- /dev/null
+++ b/clutter/egl/clutter-stage-eglnative.h
@@ -0,0 +1,59 @@
+/*
+ * Clutter.
+ *
+ * An OpenGL based 'interactive canvas' library.
+ *
+ * Copyright (C) 2010,2011  Intel Corporation.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+
+ * Authors:
+ *  Adel Gadllah
+ */
+
+#ifndef __CLUTTER_STAGE_EGL_NATIVE_H__
+#define __CLUTTER_STAGE_EGL_NATIVE_H__
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <glib-object.h>
+#include <clutter/clutter-stage.h>
+
+#include "cogl/clutter-stage-cogl.h"
+
+#define CLUTTER_TYPE_STAGE_EGL_NATIVE                  (_clutter_stage_eglnative_get_type ())
+#define CLUTTER_STAGE_EGL_NATIVE(obj)                  (G_TYPE_CHECK_INSTANCE_CAST ((obj), CLUTTER_TYPE_STAGE_EGL_NATIVE, ClutterStageEglNative))
+#define CLUTTER_IS_STAGE_EGL_NATIVE(obj)               (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CLUTTER_TYPE_STAGE_EGL_NATIVE))
+#define CLUTTER_STAGE_EGL_NATIVE_CLASS(klass)          (G_TYPE_CHECK_CLASS_CAST ((klass), CLUTTER_TYPE_STAGE_EGL_NATIVE, ClutterStageEglNativeClass))
+#define CLUTTER_IS_STAGE_EGL_NATIVE_CLASS(klass)       (G_TYPE_CHECK_CLASS_TYPE ((klass), CLUTTER_TYPE_STAGE_EGL_NATIVE))
+#define CLUTTER_STAGE_EGL_NATIVE_GET_CLASS(obj)        (G_TYPE_INSTANCE_GET_CLASS ((obj), CLUTTER_TYPE_STAGE_EGL_NATIVE, ClutterStageEglNativeClass))
+
+typedef struct _ClutterStageEglNative         ClutterStageEglNative;
+typedef struct _ClutterStageEglNativeClass    ClutterStageEglNativeClass;
+
+struct _ClutterStageEglNative
+{
+  ClutterStageCogl parent_instance;
+};
+
+struct _ClutterStageEglNativeClass
+{
+  ClutterStageCoglClass parent_class;
+};
+
+GType _clutter_stage_eglnative_get_type (void) G_GNUC_CONST;
+
+#endif /* __CLUTTER_STAGE_EGL_NATIVE_H__ */
diff --git a/clutter/evdev/clutter-device-manager-evdev.c b/clutter/evdev/clutter-device-manager-evdev.c
index 101c955fe..7b4848182 100644
--- a/clutter/evdev/clutter-device-manager-evdev.c
+++ b/clutter/evdev/clutter-device-manager-evdev.c
@@ -4,6 +4,7 @@
  * An OpenGL based 'interactive canvas' library.
  *
  * Copyright (C) 2010  Intel Corp.
+ * Copyright (C) 2014  Jonas Ådahl
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -19,12 +20,14 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Damien Lespiau <damien.lespiau@intel.com>
+ * Author: Jonas Ådahl <jadahl@gmail.com>
  */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
+#include <math.h>
 #include <linux/input.h>
 #include <sys/stat.h>
 #include <sys/types.h>
@@ -34,7 +37,7 @@
 #include <unistd.h>
 
 #include <glib.h>
-#include <gudev/gudev.h>
+#include <libinput.h>
 
 #include "clutter-backend.h"
 #include "clutter-debug.h"
@@ -48,51 +51,119 @@
 #include "clutter-xkb-utils.h"
 #include "clutter-backend-private.h"
 #include "clutter-evdev.h"
+#include "clutter-stage-private.h"
 
 #include "clutter-device-manager-evdev.h"
 
-#define CLUTTER_DEVICE_MANAGER_EVDEV_GET_PRIVATE(obj)               \
-  (G_TYPE_INSTANCE_GET_PRIVATE ((obj),                              \
-                                CLUTTER_TYPE_DEVICE_MANAGER_EVDEV,  \
-                                ClutterDeviceManagerEvdevPrivate))
+#define AUTOREPEAT_VALUE 2
 
-G_DEFINE_TYPE (ClutterDeviceManagerEvdev,
-               clutter_device_manager_evdev,
-               CLUTTER_TYPE_DEVICE_MANAGER);
+/* Try to keep the pointer inside the stage. Hopefully no one is using
+ * this backend with stages smaller than this. */
+#define INITIAL_POINTER_X 16
+#define INITIAL_POINTER_Y 16
 
-struct _ClutterDeviceManagerEvdevPrivate
+typedef struct _ClutterTouchState ClutterTouchState;
+typedef struct _ClutterEventFilter ClutterEventFilter;
+
+struct _ClutterTouchState
 {
-  GUdevClient *udev_client;
+  guint32 id;
+  ClutterPoint coords;
+};
 
-  ClutterStage *stage;
-  gboolean released;
+struct _ClutterSeatEvdev
+{
+  struct libinput_seat *libinput_seat;
+  ClutterDeviceManagerEvdev *manager_evdev;
 
-  GSList *devices;          /* list of ClutterInputDeviceEvdevs */
-  GSList *event_sources;    /* list of the event sources */
+  GSList *devices;
 
   ClutterInputDevice *core_pointer;
   ClutterInputDevice *core_keyboard;
 
+  GHashTable *touches;
+
+  struct xkb_state *xkb;
+  xkb_led_index_t caps_lock_led;
+  xkb_led_index_t num_lock_led;
+  xkb_led_index_t scroll_lock_led;
+  uint32_t button_state;
+
+  /* keyboard repeat */
+  gboolean repeat;
+  guint32 repeat_delay;
+  guint32 repeat_interval;
+  guint32 repeat_key;
+  guint32 repeat_count;
+  guint32 repeat_timer;
+  ClutterInputDevice *repeat_device;
+};
+
+struct _ClutterEventFilter
+{
+  ClutterEvdevFilterFunc func;
+  gpointer data;
+  GDestroyNotify destroy_notify;
+};
+
+typedef struct _ClutterEventSource  ClutterEventSource;
+
+struct _ClutterDeviceManagerEvdevPrivate
+{
+  struct libinput *libinput;
+
+  ClutterStage *stage;
+  gboolean released;
+
+  ClutterEventSource *event_source;
+
+  GSList *devices;
+  GSList *seats;
+
+  ClutterSeatEvdev *main_seat;
+  struct xkb_keymap *keymap;
+
+  ClutterPointerConstrainCallback constrain_callback;
+  gpointer                        constrain_data;
+  GDestroyNotify                  constrain_data_notify;
+
   ClutterStageManager *stage_manager;
   guint stage_added_handler;
   guint stage_removed_handler;
+
+  GSList *event_filters;
 };
 
-static const gchar *subsystems[] = { "input", NULL };
+G_DEFINE_TYPE_WITH_PRIVATE (ClutterDeviceManagerEvdev,
+                            clutter_device_manager_evdev,
+                            CLUTTER_TYPE_DEVICE_MANAGER)
+
+static ClutterOpenDeviceCallback  device_open_callback;
+static ClutterCloseDeviceCallback device_close_callback;
+static gpointer                   device_callback_data;
+
+#ifdef CLUTTER_ENABLE_DEBUG
+static const char *device_type_str[] = {
+  "pointer",            /* CLUTTER_POINTER_DEVICE */
+  "keyboard",           /* CLUTTER_KEYBOARD_DEVICE */
+  "extension",          /* CLUTTER_EXTENSION_DEVICE */
+  "joystick",           /* CLUTTER_JOYSTICK_DEVICE */
+  "tablet",             /* CLUTTER_TABLET_DEVICE */
+  "touchpad",           /* CLUTTER_TOUCHPAD_DEVICE */
+  "touchscreen",        /* CLUTTER_TOUCHSCREEN_DEVICE */
+  "pen",                /* CLUTTER_PEN_DEVICE */
+  "eraser",             /* CLUTTER_ERASER_DEVICE */
+  "cursor",             /* CLUTTER_CURSOR_DEVICE */
+};
+#endif /* CLUTTER_ENABLE_DEBUG */
 
 /*
  * ClutterEventSource management
  *
  * The device manager is responsible for managing the GSource when devices
  * appear and disappear from the system.
- *
- * FIXME: For now, we associate a GSource with every single device. Starting
- * from glib 2.28 we can use g_source_add_child_source() to have a single
- * GSource for the device manager, each device becoming a child source. Revisit
- * this once we depend on glib >= 2.28.
  */
 
-
 static const char *option_xkb_layout = "us";
 static const char *option_xkb_variant = "";
 static const char *option_xkb_options = "";
@@ -101,19 +172,17 @@ static const char *option_xkb_options = "";
  * ClutterEventSource for reading input devices
  */
 
-typedef struct _ClutterEventSource  ClutterEventSource;
-
 struct _ClutterEventSource
 {
   GSource source;
 
-  ClutterInputDeviceEvdev *device;    /* back pointer to the evdev device */
-  GPollFD event_poll_fd;              /* file descriptor of the /dev node */
-  struct xkb_state *xkb;              /* XKB state object */
-  gint x, y;                          /* last x, y position for pointers */
-  guint32 modifier_state;             /* key modifiers */
+  ClutterDeviceManagerEvdev *manager_evdev;
+  GPollFD event_poll_fd;
 };
 
+static void
+process_events (ClutterDeviceManagerEvdev *manager_evdev);
+
 static gboolean
 clutter_event_prepare (GSource *source,
                        gint    *timeout)
@@ -149,19 +218,142 @@ clutter_event_check (GSource *source)
 static void
 queue_event (ClutterEvent *event)
 {
-  if (event == NULL)
-    return;
-
   _clutter_event_push (event, FALSE);
 }
 
 static void
-notify_key (ClutterEventSource *source,
-            guint32             time_,
-            guint32             key,
-            guint32             state)
+clear_repeat_timer (ClutterSeatEvdev *seat)
 {
-  ClutterInputDevice *input_device = (ClutterInputDevice *) source->device;
+  if (seat->repeat_timer)
+    {
+      g_source_remove (seat->repeat_timer);
+      seat->repeat_timer = 0;
+      g_clear_object (&seat->repeat_device);
+    }
+}
+
+static gboolean
+keyboard_repeat (gpointer data);
+
+static void
+clutter_seat_evdev_sync_leds (ClutterSeatEvdev *seat);
+
+static void
+notify_key_device (ClutterInputDevice *input_device,
+		   guint32             time_,
+		   guint32             key,
+		   guint32             state,
+		   gboolean            update_keys)
+{
+  ClutterInputDeviceEvdev *device_evdev =
+    CLUTTER_INPUT_DEVICE_EVDEV (input_device);
+  ClutterSeatEvdev *seat = _clutter_input_device_evdev_get_seat (device_evdev);
+  ClutterStage *stage;
+  ClutterEvent *event = NULL;
+  enum xkb_state_component changed_state;
+
+  /* We can drop the event on the floor if no stage has been
+   * associated with the device yet. */
+  stage = _clutter_input_device_get_stage (input_device);
+  if (!stage)
+    {
+      clear_repeat_timer (seat);
+      return;
+    }
+
+  event = _clutter_key_event_new_from_evdev (input_device,
+					     seat->core_keyboard,
+					     stage,
+					     seat->xkb,
+					     seat->button_state,
+					     time_, key, state);
+
+  /* We must be careful and not pass multiple releases to xkb, otherwise it gets
+     confused and locks the modifiers */
+  if (state != AUTOREPEAT_VALUE)
+    {
+      changed_state = xkb_state_update_key (seat->xkb,
+                                            event->key.hardware_keycode,
+                                            state ? XKB_KEY_DOWN : XKB_KEY_UP);
+    }
+  else
+    {
+      changed_state = 0;
+      clutter_event_set_flags (event, CLUTTER_EVENT_FLAG_SYNTHETIC);
+    }
+
+  queue_event (event);
+
+  if (update_keys && (changed_state & XKB_STATE_LEDS))
+    clutter_seat_evdev_sync_leds (seat);
+
+  if (state == 0 ||             /* key release */
+      !seat->repeat ||
+      !xkb_keymap_key_repeats (xkb_state_get_keymap (seat->xkb), event->key.hardware_keycode))
+    {
+      clear_repeat_timer (seat);
+      return;
+    }
+
+  if (state == 1)               /* key press */
+    seat->repeat_count = 0;
+
+  seat->repeat_count += 1;
+  seat->repeat_key = key;
+
+  switch (seat->repeat_count)
+    {
+    case 1:
+    case 2:
+      {
+        guint32 interval;
+
+        clear_repeat_timer (seat);
+        seat->repeat_device = g_object_ref (input_device);
+
+        if (seat->repeat_count == 1)
+          interval = seat->repeat_delay;
+        else
+          interval = seat->repeat_interval;
+
+        seat->repeat_timer =
+          clutter_threads_add_timeout_full (CLUTTER_PRIORITY_EVENTS,
+                                            interval,
+                                            keyboard_repeat,
+                                            seat,
+                                            NULL);
+        return;
+      }
+    default:
+      return;
+    }
+}
+
+static gboolean
+keyboard_repeat (gpointer data)
+{
+  ClutterSeatEvdev *seat = data;
+  guint32 time;
+
+  g_return_val_if_fail (seat->repeat_device != NULL, G_SOURCE_REMOVE);
+
+  time = g_source_get_time (g_main_context_find_source_by_id (NULL, seat->repeat_timer)) / 1000;
+
+  notify_key_device (seat->repeat_device, time, seat->repeat_key, AUTOREPEAT_VALUE, FALSE);
+
+  return G_SOURCE_CONTINUE;
+}
+
+static void
+notify_absolute_motion (ClutterInputDevice *input_device,
+			guint32             time_,
+			gfloat              x,
+			gfloat              y)
+{
+  gfloat stage_width, stage_height;
+  ClutterDeviceManagerEvdev *manager_evdev;
+  ClutterInputDeviceEvdev *device_evdev;
+  ClutterSeatEvdev *seat;
   ClutterStage *stage;
   ClutterEvent *event = NULL;
 
@@ -171,31 +363,79 @@ notify_key (ClutterEventSource *source,
   if (!stage)
     return;
 
-  /* if we have a mapping for that device, use it to generate the event */
-  if (source->xkb)
-  {
-    event =
-      _clutter_key_event_new_from_evdev (input_device,
-                                         stage,
-                                         source->xkb,
-                                         time_, key, state);
-    xkb_state_update_key (source->xkb, key, state ? XKB_KEY_DOWN : XKB_KEY_UP);
-  }
+  device_evdev = CLUTTER_INPUT_DEVICE_EVDEV (input_device);
+  manager_evdev = CLUTTER_DEVICE_MANAGER_EVDEV (input_device->device_manager);
+  seat = _clutter_input_device_evdev_get_seat (device_evdev);
+
+  stage_width = clutter_actor_get_width (CLUTTER_ACTOR (stage));
+  stage_height = clutter_actor_get_height (CLUTTER_ACTOR (stage));
+
+  event = clutter_event_new (CLUTTER_MOTION);
+
+  if (manager_evdev->priv->constrain_callback)
+    {
+      manager_evdev->priv->constrain_callback (seat->core_pointer,
+                                               time_, &x, &y,
+					       manager_evdev->priv->constrain_data);
+    }
+  else
+    {
+      x = CLAMP (x, 0.f, stage_width - 1);
+      y = CLAMP (y, 0.f, stage_height - 1);
+    }
+
+  event->motion.time = time_;
+  event->motion.stage = stage;
+  event->motion.device = seat->core_pointer;
+  _clutter_xkb_translate_state (event, seat->xkb, seat->button_state);
+  event->motion.x = x;
+  event->motion.y = y;
+  clutter_event_set_device (event, seat->core_pointer);
+  clutter_event_set_source_device (event, input_device);
+
+  _clutter_input_device_set_stage (seat->core_pointer, stage);
 
   queue_event (event);
 }
 
+static void
+notify_relative_motion (ClutterInputDevice *input_device,
+                        guint32             time_,
+                        double              dx,
+                        double              dy)
+{
+  gfloat new_x, new_y;
+  ClutterInputDeviceEvdev *device_evdev;
+  ClutterSeatEvdev *seat;
+  ClutterPoint point;
+
+  /* We can drop the event on the floor if no stage has been
+   * associated with the device yet. */
+  if (!_clutter_input_device_get_stage (input_device))
+    return;
+
+  device_evdev = CLUTTER_INPUT_DEVICE_EVDEV (input_device);
+  seat = _clutter_input_device_evdev_get_seat (device_evdev);
+
+  clutter_input_device_get_coords (seat->core_pointer, NULL, &point);
+  new_x = point.x + dx;
+  new_y = point.y + dy;
+
+  notify_absolute_motion (input_device, time_, new_x, new_y);
+}
 
 static void
-notify_motion (ClutterEventSource *source,
+notify_scroll (ClutterInputDevice *input_device,
                guint32             time_,
-               gint                x,
-               gint                y)
+               gdouble             dx,
+               gdouble             dy)
 {
-  ClutterInputDevice *input_device = (ClutterInputDevice *) source->device;
-  gfloat stage_width, stage_height, new_x, new_y;
-  ClutterEvent *event;
+  ClutterInputDeviceEvdev *device_evdev;
+  ClutterSeatEvdev *seat;
   ClutterStage *stage;
+  ClutterEvent *event = NULL;
+  ClutterPoint point;
+  gdouble scroll_factor;
 
   /* We can drop the event on the floor if no stage has been
    * associated with the device yet. */
@@ -203,47 +443,45 @@ notify_motion (ClutterEventSource *source,
   if (!stage)
     return;
 
-  stage_width = clutter_actor_get_width (CLUTTER_ACTOR (stage));
-  stage_height = clutter_actor_get_height (CLUTTER_ACTOR (stage));
+  device_evdev = CLUTTER_INPUT_DEVICE_EVDEV (input_device);
+  seat = _clutter_input_device_evdev_get_seat (device_evdev);
 
-  event = clutter_event_new (CLUTTER_MOTION);
+  event = clutter_event_new (CLUTTER_SCROLL);
 
-  if (x < 0)
-    new_x = 0.f;
-  else if (x >= stage_width)
-    new_x = stage_width - 1;
-  else
-    new_x = x;
+  event->scroll.time = time_;
+  event->scroll.stage = CLUTTER_STAGE (stage);
+  event->scroll.device = seat->core_pointer;
+  _clutter_xkb_translate_state (event, seat->xkb, seat->button_state);
 
-  if (y < 0)
-    new_y = 0.f;
-  else if (y >= stage_height)
-    new_y = stage_height - 1;
-  else
-    new_y = y;
+  /* libinput pointer axis events are in pointer motion coordinate space.
+   * To convert to Xi2 discrete step coordinate space, multiply the factor
+   * 1/10. */
+  event->scroll.direction = CLUTTER_SCROLL_SMOOTH;
+  scroll_factor = 1.0 / 10.0;
+  clutter_event_set_scroll_delta (event,
+                                  scroll_factor * dx,
+                                  scroll_factor * dy);
 
-  source->x = new_x;
-  source->y = new_y;
-
-  event->motion.time = time_;
-  event->motion.stage = stage;
-  event->motion.device = input_device;
-  event->motion.modifier_state = source->modifier_state;
-  event->motion.x = new_x;
-  event->motion.y = new_y;
+  clutter_input_device_get_coords (seat->core_pointer, NULL, &point);
+  event->scroll.x = point.x;
+  event->scroll.y = point.y;
+  clutter_event_set_device (event, seat->core_pointer);
+  clutter_event_set_source_device (event, input_device);
 
   queue_event (event);
 }
 
 static void
-notify_button (ClutterEventSource *source,
+notify_button (ClutterInputDevice *input_device,
                guint32             time_,
                guint32             button,
                guint32             state)
 {
-  ClutterInputDevice *input_device = (ClutterInputDevice *) source->device;
-  ClutterEvent *event;
+  ClutterInputDeviceEvdev *device_evdev;
+  ClutterSeatEvdev *seat;
   ClutterStage *stage;
+  ClutterEvent *event = NULL;
+  ClutterPoint point;
   gint button_nr;
   static gint maskmap[8] =
     {
@@ -257,6 +495,9 @@ notify_button (ClutterEventSource *source,
   if (!stage)
     return;
 
+  device_evdev = CLUTTER_INPUT_DEVICE_EVDEV (input_device);
+  seat = _clutter_input_device_evdev_get_seat (device_evdev);
+
   /* The evdev button numbers don't map sequentially to clutter button
    * numbers (the right and middle mouse buttons are in the opposite
    * order) so we'll map them directly with a switch statement */
@@ -292,162 +533,123 @@ notify_button (ClutterEventSource *source,
 
   /* Update the modifiers */
   if (state)
-    source->modifier_state |= maskmap[button - BTN_LEFT];
+    seat->button_state |= maskmap[button - BTN_LEFT];
   else
-    source->modifier_state &= ~maskmap[button - BTN_LEFT];
+    seat->button_state &= ~maskmap[button - BTN_LEFT];
 
   event->button.time = time_;
   event->button.stage = CLUTTER_STAGE (stage);
-  event->button.device = (ClutterInputDevice *) source->device;
-  event->button.modifier_state = source->modifier_state;
+  event->button.device = seat->core_pointer;
+  _clutter_xkb_translate_state (event, seat->xkb, seat->button_state);
   event->button.button = button_nr;
-  event->button.x = source->x;
-  event->button.y = source->y;
+  clutter_input_device_get_coords (seat->core_pointer, NULL, &point);
+  event->button.x = point.x;
+  event->button.y = point.y;
+  clutter_event_set_device (event, seat->core_pointer);
+  clutter_event_set_source_device (event, input_device);
+
+  _clutter_input_device_set_stage (seat->core_pointer, stage);
 
   queue_event (event);
 }
 
+static void
+notify_touch_event (ClutterInputDevice *input_device,
+		    ClutterEventType    evtype,
+		    guint32             time_,
+		    gint32              slot,
+		    gdouble             x,
+		    gdouble             y)
+{
+  ClutterInputDeviceEvdev *device_evdev;
+  ClutterSeatEvdev *seat;
+  ClutterStage *stage;
+  ClutterEvent *event = NULL;
+
+  /* We can drop the event on the floor if no stage has been
+   * associated with the device yet. */
+  stage = _clutter_input_device_get_stage (input_device);
+  if (!stage)
+    return;
+
+  device_evdev = CLUTTER_INPUT_DEVICE_EVDEV (input_device);
+  seat = _clutter_input_device_evdev_get_seat (device_evdev);
+
+  event = clutter_event_new (evtype);
+
+  event->touch.time = time_;
+  event->touch.stage = CLUTTER_STAGE (stage);
+  event->touch.device = seat->core_pointer;
+  event->touch.x = x;
+  event->touch.y = y;
+  /* "NULL" sequences are special cased in clutter */
+  event->touch.sequence = GINT_TO_POINTER (slot + 1);
+  _clutter_xkb_translate_state (event, seat->xkb, seat->button_state);
+
+  if (evtype == CLUTTER_TOUCH_BEGIN ||
+      evtype == CLUTTER_TOUCH_UPDATE)
+    event->touch.modifier_state |= CLUTTER_BUTTON1_MASK;
+
+  clutter_event_set_device (event, seat->core_pointer);
+  clutter_event_set_source_device (event, input_device);
+
+  queue_event (event);
+}
+
+static void
+dispatch_libinput (ClutterDeviceManagerEvdev *manager_evdev)
+{
+  ClutterDeviceManagerEvdevPrivate *priv = manager_evdev->priv;
+
+  libinput_dispatch (priv->libinput);
+  process_events (manager_evdev);
+}
+
 static gboolean
 clutter_event_dispatch (GSource     *g_source,
                         GSourceFunc  callback,
                         gpointer     user_data)
 {
   ClutterEventSource *source = (ClutterEventSource *) g_source;
-  ClutterInputDevice *input_device = (ClutterInputDevice *) source->device;
-  struct input_event ev[8];
+  ClutterDeviceManagerEvdev *manager_evdev;
   ClutterEvent *event;
-  gint len, i, dx = 0, dy = 0;
-  uint32_t _time;
-  ClutterStage *stage;
 
   _clutter_threads_acquire_lock ();
 
-  stage = _clutter_input_device_get_stage (input_device);
+  manager_evdev = source->manager_evdev;
 
   /* Don't queue more events if we haven't finished handling the previous batch
    */
-  if (!clutter_events_pending ())
-    {
-       len = read (source->event_poll_fd.fd, &ev, sizeof (ev));
-       if (len < 0 || len % sizeof (ev[0]) != 0)
-       {
-         if (errno != EAGAIN)
-           {
-             ClutterDeviceManager *manager;
-             ClutterInputDevice *device;
-             const gchar *device_path;
+  if (clutter_events_pending ())
+    goto queue_event;
 
-             device = CLUTTER_INPUT_DEVICE (source->device);
+  dispatch_libinput (manager_evdev);
 
-             if (CLUTTER_HAS_DEBUG (EVENT))
-               {
-                 device_path =
-                   _clutter_input_device_evdev_get_device_path (source->device);
-
-                 CLUTTER_NOTE (EVENT, "Could not read device (%s), removing.",
-                               device_path);
-               }
-
-             /* remove the faulty device */
-             manager = clutter_device_manager_get_default ();
-             _clutter_device_manager_remove_device (manager, device);
-
-           }
-         goto out;
-       }
-
-       /* Drop events if we don't have any stage to forward them to */
-       if (!stage)
-         goto out;
-
-       for (i = 0; i < len / sizeof (ev[0]); i++)
-         {
-           struct input_event *e = &ev[i];
-
-           _time = e->time.tv_sec * 1000 + e->time.tv_usec / 1000;
-           event = NULL;
-
-           switch (e->type)
-             {
-             case EV_KEY:
-
-               /* don't repeat mouse buttons */
-               if (e->code >= BTN_MOUSE && e->code < KEY_OK)
-                 if (e->value == 2)
-                   continue;
-
-               switch (e->code)
-                 {
-                 case BTN_TOUCH:
-                 case BTN_TOOL_PEN:
-                 case BTN_TOOL_RUBBER:
-                 case BTN_TOOL_BRUSH:
-                 case BTN_TOOL_PENCIL:
-                 case BTN_TOOL_AIRBRUSH:
-                 case BTN_TOOL_FINGER:
-                 case BTN_TOOL_MOUSE:
-                 case BTN_TOOL_LENS:
-                   break;
-
-                 case BTN_LEFT:
-                 case BTN_RIGHT:
-                 case BTN_MIDDLE:
-                 case BTN_SIDE:
-                 case BTN_EXTRA:
-                 case BTN_FORWARD:
-                 case BTN_BACK:
-                 case BTN_TASK:
-                   notify_button(source, _time, e->code, e->value);
-                   break;
-
-                 default:
-                   notify_key (source, _time, e->code, e->value);
-                 break;
-                 }
-               break;
-
-             case EV_SYN:
-               /* Nothing to do here? */
-               break;
-
-             case EV_MSC:
-               /* Nothing to do here? */
-               break;
-
-             case EV_REL:
-               /* compress the EV_REL events in dx/dy */
-               switch (e->code)
-                 {
-                 case REL_X:
-                   dx += e->value;
-                   break;
-                 case REL_Y:
-                   dy += e->value;
-                   break;
-                 }
-               break;
-
-             case EV_ABS:
-             default:
-               g_warning ("Unhandled event of type %d", e->type);
-               break;
-             }
-
-           queue_event (event);
-         }
-
-       if (dx != 0 || dy != 0)
-         notify_motion (source, _time, source->x + dx, source->y + dy);
-    }
-
-  /* Pop an event off the queue if any */
+ queue_event:
   event = clutter_event_get ();
 
   if (event)
     {
+      ClutterModifierType event_state;
+      ClutterInputDevice *input_device =
+        clutter_event_get_source_device (event);
+      ClutterInputDeviceEvdev *device_evdev =
+        CLUTTER_INPUT_DEVICE_EVDEV (input_device);
+      ClutterSeatEvdev *seat =
+        _clutter_input_device_evdev_get_seat (device_evdev);
+
+      /* Drop events if we don't have any stage to forward them to */
+      if (!_clutter_input_device_get_stage (input_device))
+        goto out;
+
       /* forward the event into clutter for emission etc. */
-      clutter_do_event (event);
-      clutter_event_free (event);
+      _clutter_stage_queue_event (event->any.stage, event, FALSE);
+
+      /* update the device states *after* the event */
+      event_state = seat->button_state |
+        xkb_state_serialize_mods (seat->xkb, XKB_STATE_MODS_EFFECTIVE);
+      _clutter_input_device_set_state (seat->core_pointer, event_state);
+      _clutter_input_device_set_state (seat->core_keyboard, event_state);
     }
 
 out:
@@ -462,75 +664,39 @@ static GSourceFuncs event_funcs = {
   NULL
 };
 
-static GSource *
-clutter_event_source_new (ClutterInputDeviceEvdev *input_device)
+static ClutterEventSource *
+clutter_event_source_new (ClutterDeviceManagerEvdev *manager_evdev)
 {
-  GSource *source = g_source_new (&event_funcs, sizeof (ClutterEventSource));
-  ClutterEventSource *event_source = (ClutterEventSource *) source;
-  ClutterInputDeviceType type;
-  const gchar *node_path;
+  ClutterDeviceManagerEvdevPrivate *priv = manager_evdev->priv;
+  GSource *source;
+  ClutterEventSource *event_source;
   gint fd;
 
-  /* grab the udev input device node and open it */
-  node_path = _clutter_input_device_evdev_get_device_path (input_device);
-
-  CLUTTER_NOTE (EVENT, "Creating GSource for device %s", node_path);
-
-  fd = open (node_path, O_RDONLY | O_NONBLOCK);
-  if (fd < 0)
-    {
-      g_warning ("Could not open device %s: %s", node_path, strerror (errno));
-      return NULL;
-    }
+  source = g_source_new (&event_funcs, sizeof (ClutterEventSource));
+  event_source = (ClutterEventSource *) source;
 
   /* setup the source */
-  event_source->device = input_device;
+  event_source->manager_evdev = manager_evdev;
+
+  fd = libinput_get_fd (priv->libinput);
   event_source->event_poll_fd.fd = fd;
   event_source->event_poll_fd.events = G_IO_IN;
 
-  type =
-    clutter_input_device_get_device_type (CLUTTER_INPUT_DEVICE (input_device));
-
-  if (type == CLUTTER_KEYBOARD_DEVICE)
-    {
-      /* create the xkb description */
-      event_source->xkb = _clutter_xkb_state_new (NULL,
-                                                  option_xkb_layout,
-                                                  option_xkb_variant,
-                                                  option_xkb_options);
-      if (G_UNLIKELY (event_source->xkb == NULL))
-        {
-          g_warning ("Could not compile keymap %s:%s:%s", option_xkb_layout,
-                     option_xkb_variant, option_xkb_options);
-          close (fd);
-          g_source_unref (source);
-          return NULL;
-        }
-    }
-  else if (type == CLUTTER_POINTER_DEVICE)
-    {
-      event_source->x = 0;
-      event_source->y = 0;
-    }
-
   /* and finally configure and attach the GSource */
   g_source_set_priority (source, CLUTTER_PRIORITY_EVENTS);
   g_source_add_poll (source, &event_source->event_poll_fd);
   g_source_set_can_recurse (source, TRUE);
   g_source_attach (source, NULL);
 
-  return source;
+  return event_source;
 }
 
 static void
 clutter_event_source_free (ClutterEventSource *source)
 {
   GSource *g_source = (GSource *) source;
-  const gchar *node_path;
 
-  node_path = _clutter_input_device_evdev_get_device_path (source->device);
-
-  CLUTTER_NOTE (EVENT, "Removing GSource for device %s", node_path);
+  CLUTTER_NOTE (EVENT, "Removing GSource for evdev device manager");
 
   /* ignore the return value of close, it's not like we can do something
    * about it */
@@ -540,157 +706,185 @@ clutter_event_source_free (ClutterEventSource *source)
   g_source_unref (g_source);
 }
 
-static ClutterEventSource *
-find_source_by_device (ClutterDeviceManagerEvdev *manager,
-                       ClutterInputDevice        *device)
+static void
+clutter_touch_state_free (ClutterTouchState *touch_state)
 {
-  ClutterDeviceManagerEvdevPrivate *priv = manager->priv;
-  GSList *l;
-
-  for (l = priv->event_sources; l; l = g_slist_next (l))
-    {
-      ClutterEventSource *source = l->data;
-
-      if (source->device == (ClutterInputDeviceEvdev *) device)
-        return source;
-    }
-
-  return NULL;
+  g_slice_free (ClutterTouchState, touch_state);
 }
 
-static gboolean
-is_evdev (const gchar *sysfs_path)
+static void
+clutter_seat_evdev_set_libinput_seat (ClutterSeatEvdev *seat,
+                                      struct libinput_seat *libinput_seat)
 {
-  GRegex *regex;
-  gboolean match;
+  g_assert (seat->libinput_seat == NULL);
 
-  regex = g_regex_new ("/input[0-9]+/event[0-9]+$", 0, 0, NULL);
-  match = g_regex_match (regex, sysfs_path, 0, NULL);
+  libinput_seat_ref (libinput_seat);
+  libinput_seat_set_user_data (libinput_seat, seat);
+  seat->libinput_seat = libinput_seat;
+}
 
-  g_regex_unref (regex);
-  return match;
+static ClutterSeatEvdev *
+clutter_seat_evdev_new (ClutterDeviceManagerEvdev *manager_evdev)
+{
+  ClutterDeviceManager *manager = CLUTTER_DEVICE_MANAGER (manager_evdev);
+  ClutterDeviceManagerEvdevPrivate *priv = manager_evdev->priv;
+  ClutterSeatEvdev *seat;
+  ClutterInputDevice *device;
+  struct xkb_context *ctx;
+  struct xkb_rule_names names;
+  struct xkb_keymap *keymap;
+
+  seat = g_new0 (ClutterSeatEvdev, 1);
+  if (!seat)
+    return NULL;
+
+  device = _clutter_input_device_evdev_new_virtual (
+    manager, seat, CLUTTER_POINTER_DEVICE);
+  _clutter_input_device_set_stage (device, priv->stage);
+  _clutter_input_device_set_coords (device, NULL, INITIAL_POINTER_X, INITIAL_POINTER_Y, NULL);
+  _clutter_device_manager_add_device (manager, device);
+  seat->core_pointer = device;
+
+  device = _clutter_input_device_evdev_new_virtual (
+    manager, seat, CLUTTER_KEYBOARD_DEVICE);
+  _clutter_input_device_set_stage (device, priv->stage);
+  _clutter_device_manager_add_device (manager, device);
+  seat->core_keyboard = device;
+
+  seat->touches = g_hash_table_new_full (NULL, NULL, NULL,
+                                         (GDestroyNotify) clutter_touch_state_free);
+
+  ctx = xkb_context_new(0);
+  g_assert (ctx);
+
+  names.rules = "evdev";
+  names.model = "pc105";
+  names.layout = option_xkb_layout;
+  names.variant = option_xkb_variant;
+  names.options = option_xkb_options;
+
+  keymap = xkb_keymap_new_from_names (ctx, &names, 0);
+  xkb_context_unref(ctx);
+  if (keymap)
+    {
+      seat->xkb = xkb_state_new (keymap);
+
+      seat->caps_lock_led =
+        xkb_keymap_led_get_index (keymap, XKB_LED_NAME_CAPS);
+      seat->num_lock_led =
+        xkb_keymap_led_get_index (keymap, XKB_LED_NAME_NUM);
+      seat->scroll_lock_led =
+        xkb_keymap_led_get_index (keymap, XKB_LED_NAME_SCROLL);
+
+      priv->keymap = keymap;
+    }
+
+  seat->repeat = TRUE;
+  seat->repeat_delay = 250;     /* ms */
+  seat->repeat_interval = 33;   /* ms */
+
+  priv->seats = g_slist_append (priv->seats, seat);
+  return seat;
+}
+
+static void
+clutter_seat_evdev_free (ClutterSeatEvdev *seat)
+{
+  GSList *iter;
+
+  for (iter = seat->devices; iter; iter = g_slist_next (iter))
+    {
+      ClutterInputDevice *device = iter->data;
+
+      g_object_unref (device);
+    }
+  g_slist_free (seat->devices);
+  g_hash_table_unref (seat->touches);
+
+  xkb_state_unref (seat->xkb);
+
+  clear_repeat_timer (seat);
+
+  if (seat->libinput_seat)
+    libinput_seat_unref (seat->libinput_seat);
+
+  g_free (seat);
+}
+
+static void
+clutter_seat_evdev_set_stage (ClutterSeatEvdev *seat, ClutterStage *stage)
+{
+  GSList *l;
+
+  for (l = seat->devices; l; l = l->next)
+    {
+      ClutterInputDevice *device = l->data;
+
+      _clutter_input_device_set_stage (device, stage);
+    }
 }
 
 static void
 evdev_add_device (ClutterDeviceManagerEvdev *manager_evdev,
-                  GUdevDevice               *udev_device)
+                  struct libinput_device    *libinput_device)
 {
   ClutterDeviceManager *manager = (ClutterDeviceManager *) manager_evdev;
-  ClutterInputDeviceType type = CLUTTER_EXTENSION_DEVICE;
+  ClutterDeviceManagerEvdevPrivate *priv = manager_evdev->priv;
+  ClutterInputDeviceType type;
+  struct libinput_seat *libinput_seat;
+  ClutterSeatEvdev *seat;
   ClutterInputDevice *device;
-  const gchar *device_file, *sysfs_path, *device_name;
 
-  device_file = g_udev_device_get_device_file (udev_device);
-  sysfs_path = g_udev_device_get_sysfs_path (udev_device);
-  device_name = g_udev_device_get_name (udev_device);
+  libinput_seat = libinput_device_get_seat (libinput_device);
+  seat = libinput_seat_get_user_data (libinput_seat);
+  if (seat == NULL)
+    {
+      /* Clutter has the notion of global "core" pointers and keyboard devices,
+       * which are located on the main seat. Make whatever seat comes first the
+       * main seat. */
+      if (priv->main_seat->libinput_seat == NULL)
+        seat = priv->main_seat;
+      else
+        seat = clutter_seat_evdev_new (manager_evdev);
 
-  if (device_file == NULL || sysfs_path == NULL)
-    return;
-
-  if (g_udev_device_get_property (udev_device, "ID_INPUT") == NULL)
-    return;
-
-  /* Make sure to only add evdev devices, ie the device with a sysfs path that
-   * finishes by input%d/event%d (We don't rely on the node name as this
-   * policy is enforced by udev rules Vs API/ABI guarantees of sysfs) */
-  if (!is_evdev (sysfs_path))
-    return;
-
-  /* Clutter assumes that device types are exclusive in the
-   * ClutterInputDevice API */
-  if (g_udev_device_has_property (udev_device, "ID_INPUT_KEYBOARD"))
-    type = CLUTTER_KEYBOARD_DEVICE;
-  else if (g_udev_device_has_property (udev_device, "ID_INPUT_MOUSE"))
-    type = CLUTTER_POINTER_DEVICE;
-  else if (g_udev_device_has_property (udev_device, "ID_INPUT_JOYSTICK"))
-    type = CLUTTER_JOYSTICK_DEVICE;
-  else if (g_udev_device_has_property (udev_device, "ID_INPUT_TABLET"))
-    type = CLUTTER_TABLET_DEVICE;
-  else if (g_udev_device_has_property (udev_device, "ID_INPUT_TOUCHPAD"))
-    type = CLUTTER_TOUCHPAD_DEVICE;
-  else if (g_udev_device_has_property (udev_device, "ID_INPUT_TOUCHSCREEN"))
-    type = CLUTTER_TOUCHSCREEN_DEVICE;
-
-  device = g_object_new (CLUTTER_TYPE_INPUT_DEVICE_EVDEV,
-                         "id", 0,
-                         "name", device_name,
-                         "device-type", type,
-                         "sysfs-path", sysfs_path,
-                         "device-path", device_file,
-                         "enabled", TRUE,
-                         NULL);
+      clutter_seat_evdev_set_libinput_seat (seat, libinput_seat);
+    }
 
+  device = _clutter_input_device_evdev_new (manager, seat, libinput_device);
   _clutter_input_device_set_stage (device, manager_evdev->priv->stage);
 
   _clutter_device_manager_add_device (manager, device);
 
-  CLUTTER_NOTE (EVENT, "Added device %s, type %d, sysfs %s",
-                device_file, type, sysfs_path);
-}
+  /* Clutter assumes that device types are exclusive in the
+   * ClutterInputDevice API */
+  type = _clutter_input_device_evdev_determine_type (libinput_device);
 
-static ClutterInputDeviceEvdev *
-find_device_by_udev_device (ClutterDeviceManagerEvdev *manager_evdev,
-                            GUdevDevice               *udev_device)
-{
-  ClutterDeviceManagerEvdevPrivate *priv = manager_evdev->priv;
-  GSList *l;
-  const gchar *sysfs_path;
-
-  sysfs_path = g_udev_device_get_sysfs_path (udev_device);
-  if (sysfs_path == NULL)
+  if (type == CLUTTER_KEYBOARD_DEVICE)
     {
-      g_message ("device file is NULL");
-      return NULL;
+      _clutter_input_device_set_associated_device (device, seat->core_keyboard);
+      _clutter_input_device_add_slave (seat->core_keyboard, device);
+    }
+  else if (type == CLUTTER_POINTER_DEVICE)
+    {
+      _clutter_input_device_set_associated_device (device, seat->core_pointer);
+      _clutter_input_device_add_slave (seat->core_pointer, device);
     }
 
-  for (l = priv->devices; l; l = g_slist_next (l))
-    {
-      ClutterInputDeviceEvdev *device = l->data;
-
-      if (strcmp (sysfs_path,
-                  _clutter_input_device_evdev_get_sysfs_path (device)) == 0)
-        {
-          return device;
-        }
-    }
-
-  return NULL;
+  CLUTTER_NOTE (EVENT, "Added physical device '%s', type %s",
+                clutter_input_device_get_device_name (device),
+                device_type_str[type]);
 }
 
 static void
 evdev_remove_device (ClutterDeviceManagerEvdev *manager_evdev,
-                     GUdevDevice               *device)
+                     ClutterInputDeviceEvdev   *device_evdev)
 {
   ClutterDeviceManager *manager = CLUTTER_DEVICE_MANAGER (manager_evdev);
-  ClutterInputDeviceEvdev *device_evdev;
-  ClutterInputDevice *input_device;
+  ClutterInputDevice *input_device = CLUTTER_INPUT_DEVICE (device_evdev);
 
-  device_evdev = find_device_by_udev_device (manager_evdev, device);
-  if (device_evdev == NULL)
-      return;
-
-  input_device = CLUTTER_INPUT_DEVICE (device_evdev);
   _clutter_device_manager_remove_device (manager, input_device);
 }
 
-static void
-on_uevent (GUdevClient *client,
-           gchar       *action,
-           GUdevDevice *device,
-           gpointer     data)
-{
-  ClutterDeviceManagerEvdev *manager = CLUTTER_DEVICE_MANAGER_EVDEV (data);
-  ClutterDeviceManagerEvdevPrivate *priv = manager->priv;
-
-  if (priv->released)
-    return;
-
-  if (g_strcmp0 (action, "add") == 0)
-    evdev_add_device (manager, device);
-  else if (g_strcmp0 (action, "remove") == 0)
-    evdev_remove_device (manager, device);
-}
-
 /*
  * ClutterDeviceManager implementation
  */
@@ -701,32 +895,16 @@ clutter_device_manager_evdev_add_device (ClutterDeviceManager *manager,
 {
   ClutterDeviceManagerEvdev *manager_evdev;
   ClutterDeviceManagerEvdevPrivate *priv;
-  ClutterInputDeviceType device_type;
   ClutterInputDeviceEvdev *device_evdev;
-  gboolean is_pointer, is_keyboard;
-  GSource *source;
+  ClutterSeatEvdev *seat;
 
   manager_evdev = CLUTTER_DEVICE_MANAGER_EVDEV (manager);
   priv = manager_evdev->priv;
-
   device_evdev = CLUTTER_INPUT_DEVICE_EVDEV (device);
+  seat = _clutter_input_device_evdev_get_seat (device_evdev);
 
-  device_type = clutter_input_device_get_device_type (device);
-  is_pointer  = device_type == CLUTTER_POINTER_DEVICE;
-  is_keyboard = device_type == CLUTTER_KEYBOARD_DEVICE;
-
+  seat->devices = g_slist_prepend (seat->devices, device);
   priv->devices = g_slist_prepend (priv->devices, device);
-
-  if (is_pointer && priv->core_pointer == NULL)
-    priv->core_pointer = device;
-
-  if (is_keyboard && priv->core_keyboard == NULL)
-    priv->core_keyboard = device;
-
-  /* Install the GSource for this device */
-  source = clutter_event_source_new (device_evdev);
-  if (G_LIKELY (source))
-    priv->event_sources = g_slist_prepend (priv->event_sources, source);
 }
 
 static void
@@ -735,24 +913,22 @@ clutter_device_manager_evdev_remove_device (ClutterDeviceManager *manager,
 {
   ClutterDeviceManagerEvdev *manager_evdev;
   ClutterDeviceManagerEvdevPrivate *priv;
-  ClutterEventSource *source;
+  ClutterInputDeviceEvdev *device_evdev;
+  ClutterSeatEvdev *seat;
 
+  device_evdev = CLUTTER_INPUT_DEVICE_EVDEV (device);
+  seat = _clutter_input_device_evdev_get_seat (device_evdev);
   manager_evdev = CLUTTER_DEVICE_MANAGER_EVDEV (manager);
   priv = manager_evdev->priv;
 
   /* Remove the device */
+  seat->devices = g_slist_remove (seat->devices, device);
   priv->devices = g_slist_remove (priv->devices, device);
 
-  /* Remove the source */
-  source = find_source_by_device (manager_evdev, device);
-  if (G_UNLIKELY (source == NULL))
-    {
-      g_warning ("Trying to remove a device without a source installed ?!");
-      return;
-    }
+  if (seat->repeat_timer && seat->repeat_device == device)
+    clear_repeat_timer (seat);
 
-  clutter_event_source_free (source);
-  priv->event_sources = g_slist_remove (priv->event_sources, source);
+  g_object_unref (device);
 }
 
 static const GSList *
@@ -774,10 +950,10 @@ clutter_device_manager_evdev_get_core_device (ClutterDeviceManager   *manager,
   switch (type)
     {
     case CLUTTER_POINTER_DEVICE:
-      return priv->core_pointer;
+      return priv->main_seat->core_pointer;
 
     case CLUTTER_KEYBOARD_DEVICE:
-      return priv->core_keyboard;
+      return priv->main_seat->core_keyboard;
 
     case CLUTTER_EXTENSION_DEVICE:
     default:
@@ -794,38 +970,476 @@ clutter_device_manager_evdev_get_device (ClutterDeviceManager *manager,
   ClutterDeviceManagerEvdev *manager_evdev;
   ClutterDeviceManagerEvdevPrivate *priv;
   GSList *l;
+  GSList *device_it;
 
   manager_evdev = CLUTTER_DEVICE_MANAGER_EVDEV (manager);
   priv = manager_evdev->priv;
 
-  for (l = priv->devices; l; l = l->next)
+  for (l = priv->seats; l; l = l->next)
     {
-      ClutterInputDevice *device = l->data;
+      ClutterSeatEvdev *seat = l->data;
 
-      if (clutter_input_device_get_device_id (device) == id)
-        return device;
+      for (device_it = seat->devices; device_it; device_it = device_it->next)
+        {
+          ClutterInputDevice *device = device_it->data;
+
+          if (clutter_input_device_get_device_id (device) == id)
+            return device;
+        }
     }
 
   return NULL;
 }
 
 static void
-clutter_device_manager_evdev_probe_devices (ClutterDeviceManagerEvdev *self)
+clutter_seat_evdev_sync_leds (ClutterSeatEvdev *seat)
 {
-  ClutterDeviceManagerEvdevPrivate *priv = self->priv;
-  GList *devices, *l;
+  GSList *iter;
+  ClutterInputDeviceEvdev *device_evdev;
+  int caps_lock, num_lock, scroll_lock;
+  enum libinput_led leds = 0;
 
-  devices = g_udev_client_query_by_subsystem (priv->udev_client, subsystems[0]);
-  for (l = devices; l; l = g_list_next (l))
+  caps_lock = xkb_state_led_index_is_active (seat->xkb, seat->caps_lock_led);
+  num_lock = xkb_state_led_index_is_active (seat->xkb, seat->num_lock_led);
+  scroll_lock = xkb_state_led_index_is_active (seat->xkb, seat->scroll_lock_led);
+
+  if (caps_lock)
+    leds |= LIBINPUT_LED_CAPS_LOCK;
+  if (num_lock)
+    leds |= LIBINPUT_LED_NUM_LOCK;
+  if (scroll_lock)
+    leds |= LIBINPUT_LED_SCROLL_LOCK;
+
+  for (iter = seat->devices; iter; iter = iter->next)
     {
-      GUdevDevice *device = l->data;
-
-      evdev_add_device (self, device);
-      g_object_unref (device);
+      device_evdev = iter->data;
+      _clutter_input_device_evdev_update_leds (device_evdev, leds);
     }
-  g_list_free (devices);
 }
 
+static void
+flush_event_queue (void)
+{
+  ClutterEvent *event;
+
+  while ((event = clutter_event_get ()) != NULL)
+    {
+      _clutter_process_event (event);
+      clutter_event_free (event);
+    }
+}
+
+static gboolean
+process_base_event (ClutterDeviceManagerEvdev *manager_evdev,
+                    struct libinput_event *event)
+{
+  ClutterInputDevice *device;
+  struct libinput_device *libinput_device;
+  gboolean handled = TRUE;
+
+  switch (libinput_event_get_type (event))
+    {
+    case LIBINPUT_EVENT_DEVICE_ADDED:
+      libinput_device = libinput_event_get_device (event);
+
+      evdev_add_device (manager_evdev, libinput_device);
+      break;
+
+    case LIBINPUT_EVENT_DEVICE_REMOVED:
+      /* Flush all queued events, there
+       * might be some from this device.
+       */
+      flush_event_queue ();
+
+      libinput_device = libinput_event_get_device (event);
+
+      device = libinput_device_get_user_data (libinput_device);
+      evdev_remove_device (manager_evdev,
+                           CLUTTER_INPUT_DEVICE_EVDEV (device));
+      break;
+
+    default:
+      handled = FALSE;
+    }
+
+  return handled;
+}
+
+static ClutterTouchState *
+_device_seat_add_touch (ClutterInputDevice *input_device,
+                        guint32             id)
+{
+  ClutterInputDeviceEvdev *device_evdev =
+    CLUTTER_INPUT_DEVICE_EVDEV (input_device);
+  ClutterSeatEvdev *seat = _clutter_input_device_evdev_get_seat (device_evdev);
+  ClutterTouchState *touch;
+
+  touch = g_slice_new0 (ClutterTouchState);
+  touch->id = id;
+
+  g_hash_table_insert (seat->touches, GUINT_TO_POINTER (id), touch);
+
+  return touch;
+}
+
+static void
+_device_seat_remove_touch (ClutterInputDevice *input_device,
+                           guint32             id)
+{
+  ClutterInputDeviceEvdev *device_evdev =
+    CLUTTER_INPUT_DEVICE_EVDEV (input_device);
+  ClutterSeatEvdev *seat = _clutter_input_device_evdev_get_seat (device_evdev);
+
+  g_hash_table_remove (seat->touches, GUINT_TO_POINTER (id));
+}
+
+static ClutterTouchState *
+_device_seat_get_touch (ClutterInputDevice *input_device,
+                        guint32             id)
+{
+  ClutterInputDeviceEvdev *device_evdev =
+    CLUTTER_INPUT_DEVICE_EVDEV (input_device);
+  ClutterSeatEvdev *seat = _clutter_input_device_evdev_get_seat (device_evdev);
+
+  return g_hash_table_lookup (seat->touches, GUINT_TO_POINTER (id));
+}
+
+static gboolean
+process_device_event (ClutterDeviceManagerEvdev *manager_evdev,
+                      struct libinput_event *event)
+{
+  gboolean handled = TRUE;
+  struct libinput_device *libinput_device = libinput_event_get_device(event);
+  ClutterInputDevice *device;
+
+  switch (libinput_event_get_type (event))
+    {
+    case LIBINPUT_EVENT_KEYBOARD_KEY:
+      {
+        guint32 time, key, key_state;
+        struct libinput_event_keyboard *key_event =
+          libinput_event_get_keyboard_event (event);
+        device = libinput_device_get_user_data (libinput_device);
+
+        time = libinput_event_keyboard_get_time (key_event);
+        key = libinput_event_keyboard_get_key (key_event);
+        key_state = libinput_event_keyboard_get_key_state (key_event) ==
+                    LIBINPUT_KEY_STATE_PRESSED;
+        notify_key_device (device, time, key, key_state, TRUE);
+
+        break;
+      }
+
+    case LIBINPUT_EVENT_POINTER_MOTION:
+      {
+        guint32 time;
+        double dx, dy;
+        struct libinput_event_pointer *motion_event =
+          libinput_event_get_pointer_event (event);
+        device = libinput_device_get_user_data (libinput_device);
+
+        time = libinput_event_pointer_get_time (motion_event);
+        dx = libinput_event_pointer_get_dx (motion_event);
+        dy = libinput_event_pointer_get_dy (motion_event);
+        notify_relative_motion (device, time, dx, dy);
+
+        break;
+      }
+
+    case LIBINPUT_EVENT_POINTER_MOTION_ABSOLUTE:
+      {
+        guint32 time;
+        double x, y;
+        gfloat stage_width, stage_height;
+        ClutterStage *stage;
+        struct libinput_event_pointer *motion_event =
+          libinput_event_get_pointer_event (event);
+        device = libinput_device_get_user_data (libinput_device);
+
+        stage = _clutter_input_device_get_stage (device);
+        if (!stage)
+          break;
+
+        stage_width = clutter_actor_get_width (CLUTTER_ACTOR (stage));
+        stage_height = clutter_actor_get_height (CLUTTER_ACTOR (stage));
+
+        time = libinput_event_pointer_get_time (motion_event);
+        x = libinput_event_pointer_get_absolute_x_transformed (motion_event,
+                                                               stage_width);
+        y = libinput_event_pointer_get_absolute_y_transformed (motion_event,
+                                                               stage_height);
+        notify_absolute_motion (device, time, x, y);
+
+        break;
+      }
+
+    case LIBINPUT_EVENT_POINTER_BUTTON:
+      {
+        guint32 time, button, button_state;
+        struct libinput_event_pointer *button_event =
+          libinput_event_get_pointer_event (event);
+        device = libinput_device_get_user_data (libinput_device);
+
+        time = libinput_event_pointer_get_time (button_event);
+        button = libinput_event_pointer_get_button (button_event);
+        button_state = libinput_event_pointer_get_button_state (button_event) ==
+                       LIBINPUT_BUTTON_STATE_PRESSED;
+        notify_button (device, time, button, button_state);
+
+        break;
+      }
+
+    case LIBINPUT_EVENT_POINTER_AXIS:
+      {
+        gdouble value, dx = 0.0, dy = 0.0;
+        guint32 time;
+        enum libinput_pointer_axis axis;
+        struct libinput_event_pointer *axis_event =
+          libinput_event_get_pointer_event (event);
+        device = libinput_device_get_user_data (libinput_device);
+
+        time = libinput_event_pointer_get_time (axis_event);
+        value = libinput_event_pointer_get_axis_value (axis_event);
+        axis = libinput_event_pointer_get_axis (axis_event);
+
+        switch (axis)
+          {
+          case LIBINPUT_POINTER_AXIS_SCROLL_VERTICAL:
+            dx = 0;
+            dy = value;
+            break;
+
+          case LIBINPUT_POINTER_AXIS_SCROLL_HORIZONTAL:
+            dx = value;
+            dy = 0;
+            break;
+
+          }
+
+        notify_scroll (device, time, dx, dy);
+        break;
+
+      }
+
+    case LIBINPUT_EVENT_TOUCH_DOWN:
+      {
+        gint32 slot;
+        guint32 time;
+        double x, y;
+        gfloat stage_width, stage_height;
+        ClutterStage *stage;
+        ClutterTouchState *touch_state;
+        struct libinput_event_touch *touch_event =
+          libinput_event_get_touch_event (event);
+        device = libinput_device_get_user_data (libinput_device);
+
+        stage = _clutter_input_device_get_stage (device);
+        if (!stage)
+          break;
+
+        stage_width = clutter_actor_get_width (CLUTTER_ACTOR (stage));
+        stage_height = clutter_actor_get_height (CLUTTER_ACTOR (stage));
+
+        slot = libinput_event_touch_get_slot (touch_event);
+        time = libinput_event_touch_get_time (touch_event);
+        x = libinput_event_touch_get_x_transformed (touch_event,
+                                                    stage_width);
+        y = libinput_event_touch_get_y_transformed (touch_event,
+                                                    stage_height);
+
+        touch_state = _device_seat_add_touch (device, slot);
+        touch_state->coords.x = x;
+        touch_state->coords.y = y;
+
+        notify_touch_event (device, CLUTTER_TOUCH_BEGIN, time, slot,
+                             touch_state->coords.x, touch_state->coords.y);
+        break;
+      }
+
+    case LIBINPUT_EVENT_TOUCH_UP:
+      {
+        gint32 slot;
+        guint32 time;
+        ClutterTouchState *touch_state;
+        struct libinput_event_touch *touch_event =
+          libinput_event_get_touch_event (event);
+        device = libinput_device_get_user_data (libinput_device);
+
+        slot = libinput_event_touch_get_slot (touch_event);
+        time = libinput_event_touch_get_time (touch_event);
+        touch_state = _device_seat_get_touch (device, slot);
+
+        notify_touch_event (device, CLUTTER_TOUCH_END, time, slot,
+			    touch_state->coords.x, touch_state->coords.y);
+        _device_seat_remove_touch (device, slot);
+
+        break;
+      }
+
+    case LIBINPUT_EVENT_TOUCH_MOTION:
+      {
+        gint32 slot;
+        guint32 time;
+        double x, y;
+        gfloat stage_width, stage_height;
+        ClutterStage *stage;
+        ClutterTouchState *touch_state;
+        struct libinput_event_touch *touch_event =
+          libinput_event_get_touch_event (event);
+        device = libinput_device_get_user_data (libinput_device);
+
+        stage = _clutter_input_device_get_stage (device);
+        if (!stage)
+          break;
+
+        stage_width = clutter_actor_get_width (CLUTTER_ACTOR (stage));
+        stage_height = clutter_actor_get_height (CLUTTER_ACTOR (stage));
+
+        slot = libinput_event_touch_get_slot (touch_event);
+        time = libinput_event_touch_get_time (touch_event);
+        x = libinput_event_touch_get_x_transformed (touch_event,
+                                                    stage_width);
+        y = libinput_event_touch_get_y_transformed (touch_event,
+                                                    stage_height);
+
+        touch_state = _device_seat_get_touch (device, slot);
+        touch_state->coords.x = x;
+        touch_state->coords.y = y;
+
+        notify_touch_event (device, CLUTTER_TOUCH_UPDATE, time, slot,
+			    touch_state->coords.x, touch_state->coords.y);
+        break;
+      }
+    case LIBINPUT_EVENT_TOUCH_CANCEL:
+      {
+        ClutterTouchState *touch_state;
+        GHashTableIter iter;
+        guint32 time;
+        struct libinput_event_touch *touch_event =
+          libinput_event_get_touch_event (event);
+        ClutterSeatEvdev *seat;
+
+        device = libinput_device_get_user_data (libinput_device);
+        time = libinput_event_touch_get_time (touch_event);
+        seat = _clutter_input_device_evdev_get_seat (CLUTTER_INPUT_DEVICE_EVDEV (device));
+        g_hash_table_iter_init (&iter, seat->touches);
+
+        while (g_hash_table_iter_next (&iter, NULL, (gpointer*) &touch_state))
+          {
+            notify_touch_event (device, CLUTTER_TOUCH_CANCEL,
+                                time, touch_state->id,
+                                touch_state->coords.x, touch_state->coords.y);
+            g_hash_table_iter_remove (&iter);
+          }
+
+        break;
+      }
+    default:
+      handled = FALSE;
+    }
+
+  return handled;
+}
+
+static gboolean
+filter_event (ClutterDeviceManagerEvdev *manager_evdev,
+              struct libinput_event     *event)
+{
+  gboolean retval = CLUTTER_EVENT_PROPAGATE;
+  ClutterEventFilter *filter;
+  GSList *tmp_list;
+
+  tmp_list = manager_evdev->priv->event_filters;
+
+  while (tmp_list)
+    {
+      filter = tmp_list->data;
+      retval = filter->func (event, filter->data);
+      tmp_list = tmp_list->next;
+
+      if (retval != CLUTTER_EVENT_PROPAGATE)
+        break;
+    }
+
+  return retval;
+}
+
+static void
+process_event (ClutterDeviceManagerEvdev *manager_evdev,
+               struct libinput_event *event)
+{
+  gboolean retval;
+
+  retval = filter_event (manager_evdev, event);
+
+  if (retval != CLUTTER_EVENT_PROPAGATE)
+    return;
+
+  if (process_base_event (manager_evdev, event))
+    return;
+  if (process_device_event (manager_evdev, event))
+    return;
+}
+
+static void
+process_events (ClutterDeviceManagerEvdev *manager_evdev)
+{
+  ClutterDeviceManagerEvdevPrivate *priv = manager_evdev->priv;
+  struct libinput_event *event;
+
+  while ((event = libinput_get_event (priv->libinput)))
+    {
+      process_event(manager_evdev, event);
+      libinput_event_destroy(event);
+    }
+}
+
+static int
+open_restricted (const char *path,
+                 int flags,
+                 void *user_data)
+{
+  gint fd;
+
+  if (device_open_callback)
+    {
+      GError *error = NULL;
+
+      fd = device_open_callback (path, flags, device_callback_data, &error);
+
+      if (fd < 0)
+        {
+          g_warning ("Could not open device %s: %s", path, error->message);
+          g_error_free (error);
+        }
+    }
+  else
+    {
+      fd = open (path, O_RDWR | O_NONBLOCK);
+      if (fd < 0)
+        {
+          g_warning ("Could not open device %s: %s", path, strerror (errno));
+        }
+    }
+
+  return fd;
+}
+
+static void
+close_restricted (int fd,
+                  void *user_data)
+{
+  if (device_close_callback)
+    device_close_callback (fd, device_callback_data);
+  else
+    close (fd);
+}
+
+static const struct libinput_interface libinput_interface = {
+  open_restricted,
+  close_restricted
+};
+
 /*
  * GObject implementation
  */
@@ -835,17 +1449,44 @@ clutter_device_manager_evdev_constructed (GObject *gobject)
 {
   ClutterDeviceManagerEvdev *manager_evdev;
   ClutterDeviceManagerEvdevPrivate *priv;
+  ClutterEventSource *source;
+  struct udev *udev;
+
+  udev = udev_new ();
+  if (G_UNLIKELY (udev == NULL))
+    {
+      g_warning ("Failed to create udev object");
+      return;
+    }
 
   manager_evdev = CLUTTER_DEVICE_MANAGER_EVDEV (gobject);
   priv = manager_evdev->priv;
 
-  priv->udev_client = g_udev_client_new (subsystems);
+  priv->libinput = libinput_udev_create_context (&libinput_interface,
+                                                 manager_evdev,
+                                                 udev);
+  if (priv->libinput == NULL)
+    {
+      g_critical ("Failed to create the libinput object.");
+      return;
+    }
 
-  clutter_device_manager_evdev_probe_devices (manager_evdev);
+  if (libinput_udev_assign_seat (priv->libinput, "seat0") == -1)
+    {
+      g_critical ("Failed to assign a seat to the libinput object.");
+      libinput_unref (priv->libinput);
+      priv->libinput = NULL;
+      return;
+    }
 
-  /* subcribe for events on input devices */
-  g_signal_connect (priv->udev_client, "uevent",
-                    G_CALLBACK (on_uevent), manager_evdev);
+  udev_unref (udev);
+
+  priv->main_seat = clutter_seat_evdev_new (manager_evdev);
+
+  dispatch_libinput (manager_evdev);
+
+  source = clutter_event_source_new (manager_evdev);
+  priv->event_source = source;
 }
 
 static void
@@ -885,28 +1526,24 @@ clutter_device_manager_evdev_finalize (GObject *object)
 {
   ClutterDeviceManagerEvdev *manager_evdev;
   ClutterDeviceManagerEvdevPrivate *priv;
-  GSList *l;
 
   manager_evdev = CLUTTER_DEVICE_MANAGER_EVDEV (object);
   priv = manager_evdev->priv;
 
-  g_object_unref (priv->udev_client);
-
-  for (l = priv->devices; l; l = g_slist_next (l))
-    {
-      ClutterInputDevice *device = l->data;
-
-      g_object_unref (device);
-    }
+  g_slist_free_full (priv->seats, (GDestroyNotify) clutter_seat_evdev_free);
   g_slist_free (priv->devices);
 
-  for (l = priv->event_sources; l; l = g_slist_next (l))
-    {
-      ClutterEventSource *source = l->data;
+  if (priv->keymap)
+    xkb_keymap_unref (priv->keymap);
 
-      clutter_event_source_free (source);
-    }
-  g_slist_free (priv->event_sources);
+  if (priv->event_source != NULL)
+    clutter_event_source_free (priv->event_source);
+
+  if (priv->constrain_data_notify != NULL)
+    priv->constrain_data_notify (priv->constrain_data);
+
+  if (priv->libinput != NULL)
+    libinput_unref (priv->libinput);
 
   G_OBJECT_CLASS (clutter_device_manager_evdev_parent_class)->finalize (object);
 }
@@ -914,10 +1551,8 @@ clutter_device_manager_evdev_finalize (GObject *object)
 static void
 clutter_device_manager_evdev_class_init (ClutterDeviceManagerEvdevClass *klass)
 {
+  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
   ClutterDeviceManagerClass *manager_class;
-  GObjectClass *gobject_class = (GObjectClass *) klass;
-
-  g_type_class_add_private (klass, sizeof (ClutterDeviceManagerEvdevPrivate));
 
   gobject_class->constructed = clutter_device_manager_evdev_constructed;
   gobject_class->finalize = clutter_device_manager_evdev_finalize;
@@ -949,12 +1584,11 @@ clutter_device_manager_evdev_stage_added_cb (ClutterStageManager *manager,
   priv->stage = stage;
 
   /* Set the stage of any devices that don't already have a stage */
-  for (l = priv->devices; l; l = l->next)
+  for (l = priv->seats; l; l = l->next)
     {
-      ClutterInputDevice *device = l->data;
+      ClutterSeatEvdev *seat = l->data;
 
-      if (_clutter_input_device_get_stage (device) == NULL)
-        _clutter_input_device_set_stage (device, stage);
+      clutter_seat_evdev_set_stage (seat, stage);
     }
 
   /* We only want to do this once so we can catch the default
@@ -975,12 +1609,11 @@ clutter_device_manager_evdev_stage_removed_cb (ClutterStageManager *manager,
 
   /* Remove the stage of any input devices that were pointing to this
      stage so we don't send events to invalid stages */
-  for (l = priv->devices; l; l = l->next)
+  for (l = priv->seats; l; l = l->next)
     {
-      ClutterInputDevice *device = l->data;
+      ClutterSeatEvdev *seat = l->data;
 
-      if (_clutter_input_device_get_stage (device) == stage)
-        _clutter_input_device_set_stage (device, NULL);
+      clutter_seat_evdev_set_stage (seat, NULL);
     }
 }
 
@@ -989,7 +1622,7 @@ clutter_device_manager_evdev_init (ClutterDeviceManagerEvdev *self)
 {
   ClutterDeviceManagerEvdevPrivate *priv;
 
-  priv = self->priv = CLUTTER_DEVICE_MANAGER_EVDEV_GET_PRIVATE (self);
+  priv = self->priv = clutter_device_manager_evdev_get_instance_private (self);
 
   priv->stage_manager = clutter_stage_manager_get_default ();
   g_object_ref (priv->stage_manager);
@@ -1046,9 +1679,8 @@ void
 clutter_evdev_release_devices (void)
 {
   ClutterDeviceManager *manager = clutter_device_manager_get_default ();
-  ClutterDeviceManagerEvdev *evdev_manager;
+  ClutterDeviceManagerEvdev *manager_evdev;
   ClutterDeviceManagerEvdevPrivate *priv;
-  GSList *l, *next;
 
   if (!manager)
     {
@@ -1059,8 +1691,8 @@ clutter_evdev_release_devices (void)
 
   g_return_if_fail (CLUTTER_IS_DEVICE_MANAGER_EVDEV (manager));
 
-  evdev_manager = CLUTTER_DEVICE_MANAGER_EVDEV (manager);
-  priv = evdev_manager->priv;
+  manager_evdev = CLUTTER_DEVICE_MANAGER_EVDEV (manager);
+  priv = manager_evdev->priv;
 
   if (priv->released)
     {
@@ -1070,19 +1702,48 @@ clutter_evdev_release_devices (void)
       return;
     }
 
-  for (l = priv->devices; l; l = next)
-    {
-      ClutterInputDevice *device = l->data;
-
-      /* Be careful about the list we're iterating being modified... */
-      next = l->next;
-
-      _clutter_device_manager_remove_device (manager, device);
-    }
+  libinput_suspend (priv->libinput);
+  process_events (manager_evdev);
 
   priv->released = TRUE;
 }
 
+static void
+clutter_evdev_update_xkb_state (ClutterDeviceManagerEvdev *manager_evdev)
+{
+  ClutterDeviceManagerEvdevPrivate *priv;
+  GSList *iter;
+  ClutterSeatEvdev *seat;
+  xkb_mod_mask_t latched_mods;
+  xkb_mod_mask_t locked_mods;
+
+  priv = manager_evdev->priv;
+
+  for (iter = priv->seats; iter; iter = iter->next)
+    {
+      seat = iter->data;
+
+      latched_mods = xkb_state_serialize_mods (seat->xkb,
+                                               XKB_STATE_MODS_LATCHED);
+      locked_mods = xkb_state_serialize_mods (seat->xkb,
+                                              XKB_STATE_MODS_LOCKED);
+      xkb_state_unref (seat->xkb);
+      seat->xkb = xkb_state_new (priv->keymap);
+
+      xkb_state_update_mask (seat->xkb,
+                             0, /* depressed */
+                             latched_mods,
+                             locked_mods,
+                             0, 0, 0);
+
+      seat->caps_lock_led = xkb_keymap_led_get_index (priv->keymap, XKB_LED_NAME_CAPS);
+      seat->num_lock_led = xkb_keymap_led_get_index (priv->keymap, XKB_LED_NAME_NUM);
+      seat->scroll_lock_led = xkb_keymap_led_get_index (priv->keymap, XKB_LED_NAME_SCROLL);
+
+      clutter_seat_evdev_sync_leds (seat);
+    }
+}
+
 /**
  * clutter_evdev_reclaim_devices:
  *
@@ -1101,20 +1762,9 @@ void
 clutter_evdev_reclaim_devices (void)
 {
   ClutterDeviceManager *manager = clutter_device_manager_get_default ();
-  ClutterDeviceManagerEvdev *evdev_manager;
-  ClutterDeviceManagerEvdevPrivate *priv;
-
-  if (!manager)
-    {
-      g_warning ("clutter_evdev_reclaim_devices shouldn't be called "
-                 "before clutter_init()");
-      return;
-    }
-
-  g_return_if_fail (CLUTTER_IS_DEVICE_MANAGER_EVDEV (manager));
-
-  evdev_manager = CLUTTER_DEVICE_MANAGER_EVDEV (manager);
-  priv = evdev_manager->priv;
+  ClutterDeviceManagerEvdev *manager_evdev =
+    CLUTTER_DEVICE_MANAGER_EVDEV (manager);
+  ClutterDeviceManagerEvdevPrivate *priv = manager_evdev->priv;
 
   if (!priv->released)
     {
@@ -1123,6 +1773,312 @@ clutter_evdev_reclaim_devices (void)
       return;
     }
 
+  libinput_resume (priv->libinput);
+  clutter_evdev_update_xkb_state (manager_evdev);
+  process_events (manager_evdev);
+
   priv->released = FALSE;
-  clutter_device_manager_evdev_probe_devices (evdev_manager);
+}
+
+/**
+ * clutter_evdev_set_device_callbacks: (skip)
+ * @open_callback: the user replacement for open()
+ * @close_callback: the user replacement for close()
+ * @user_data: user data for @callback
+ *
+ * Through this function, the application can set a custom callback
+ * to invoked when Clutter is about to open an evdev device. It can do
+ * so if special handling is needed, for example to circumvent permission
+ * problems.
+ *
+ * Setting @callback to %NULL will reset the default behavior.
+ *
+ * For reliable effects, this function must be called before clutter_init().
+ *
+ * Since: 1.16
+ * Stability: unstable
+ */
+void
+clutter_evdev_set_device_callbacks (ClutterOpenDeviceCallback  open_callback,
+                                    ClutterCloseDeviceCallback close_callback,
+                                    gpointer                   user_data)
+{
+  device_open_callback = open_callback;
+  device_close_callback = close_callback;
+  device_callback_data = user_data;
+}
+
+/**
+ * clutter_evdev_set_keyboard_map: (skip)
+ * @evdev: the #ClutterDeviceManager created by the evdev backend
+ * @keymap: the new keymap
+ *
+ * Instructs @evdev to use the speficied keyboard map. This will cause
+ * the backend to drop the state and create a new one with the new
+ * map. To avoid state being lost, callers should ensure that no key
+ * is pressed when calling this function.
+ *
+ * Since: 1.16
+ * Stability: unstable
+ */
+void
+clutter_evdev_set_keyboard_map (ClutterDeviceManager *evdev,
+				struct xkb_keymap    *keymap)
+{
+  ClutterDeviceManagerEvdev *manager_evdev;
+  ClutterDeviceManagerEvdevPrivate *priv;
+
+  g_return_if_fail (CLUTTER_IS_DEVICE_MANAGER_EVDEV (evdev));
+
+  manager_evdev = CLUTTER_DEVICE_MANAGER_EVDEV (evdev);
+  priv = manager_evdev->priv;
+
+  if (priv->keymap)
+    xkb_keymap_unref (priv->keymap);
+
+  priv->keymap = xkb_keymap_ref (keymap);
+  clutter_evdev_update_xkb_state (manager_evdev);
+}
+
+/**
+ * clutter_evdev_get_keyboard_map: (skip)
+ * @evdev: the #ClutterDeviceManager created by the evdev backend
+ *
+ * Retrieves the #xkb_keymap in use by the evdev backend.
+ *
+ * Return value: the #xkb_keymap.
+ *
+ * Since: 1.18
+ * Stability: unstable
+ */
+struct xkb_keymap *
+clutter_evdev_get_keyboard_map (ClutterDeviceManager *evdev)
+{
+  ClutterDeviceManagerEvdev *manager_evdev;
+
+  g_return_val_if_fail (CLUTTER_IS_DEVICE_MANAGER_EVDEV (evdev), NULL);
+
+  manager_evdev = CLUTTER_DEVICE_MANAGER_EVDEV (evdev);
+
+  return xkb_state_get_keymap (manager_evdev->priv->main_seat->xkb);
+}
+
+/**
+ * clutter_evdev_set_keyboard_layout_index: (skip)
+ * @evdev: the #ClutterDeviceManager created by the evdev backend
+ * @idx: the xkb layout index to set
+ *
+ * Sets the xkb layout index on the backend's #xkb_state .
+ *
+ * Since: 1.20
+ * Stability: unstable
+ */
+void
+clutter_evdev_set_keyboard_layout_index (ClutterDeviceManager *evdev,
+                                         xkb_layout_index_t    idx)
+{
+  ClutterDeviceManagerEvdev *manager_evdev;
+  xkb_mod_mask_t depressed_mods;
+  xkb_mod_mask_t latched_mods;
+  xkb_mod_mask_t locked_mods;
+  struct xkb_state *state;
+
+  g_return_if_fail (CLUTTER_IS_DEVICE_MANAGER_EVDEV (evdev));
+
+  manager_evdev = CLUTTER_DEVICE_MANAGER_EVDEV (evdev);
+  state = manager_evdev->priv->main_seat->xkb;
+
+  depressed_mods = xkb_state_serialize_mods (state, XKB_STATE_MODS_DEPRESSED);
+  latched_mods = xkb_state_serialize_mods (state, XKB_STATE_MODS_LATCHED);
+  locked_mods = xkb_state_serialize_mods (state, XKB_STATE_MODS_LOCKED);
+
+  xkb_state_update_mask (state, depressed_mods, latched_mods, locked_mods, 0, 0, idx);
+}
+
+/**
+ * clutter_evdev_set_pointer_constrain_callback:
+ * @evdev: the #ClutterDeviceManager created by the evdev backend
+ * @callback: the callback
+ * @user_data:
+ * @user_data_notify:
+ *
+ * Sets a callback to be invoked for every pointer motion. The callback
+ * can then modify the new pointer coordinates to constrain movement within
+ * a specific region.
+ *
+ * Since: 1.16
+ * Stability: unstable
+ */
+void
+clutter_evdev_set_pointer_constrain_callback (ClutterDeviceManager            *evdev,
+					      ClutterPointerConstrainCallback  callback,
+					      gpointer                         user_data,
+					      GDestroyNotify                   user_data_notify)
+{
+  ClutterDeviceManagerEvdev *manager_evdev;
+  ClutterDeviceManagerEvdevPrivate *priv;
+
+  g_return_if_fail (CLUTTER_IS_DEVICE_MANAGER_EVDEV (evdev));
+
+  manager_evdev = CLUTTER_DEVICE_MANAGER_EVDEV (evdev);
+  priv = manager_evdev->priv;
+
+  if (priv->constrain_data_notify)
+    priv->constrain_data_notify (priv->constrain_data);
+
+  priv->constrain_callback = callback;
+  priv->constrain_data = user_data;
+  priv->constrain_data_notify = user_data_notify;
+}
+
+/**
+ * clutter_evdev_set_keyboard_repeat:
+ * @evdev: the #ClutterDeviceManager created by the evdev backend
+ * @repeat: whether to enable or disable keyboard repeat events
+ * @delay: the delay in ms between the hardware key press event and
+ * the first synthetic event
+ * @interval: the period in ms between consecutive synthetic key
+ * press events
+ *
+ * Enables or disables sythetic key press events, allowing for initial
+ * delay and interval period to be specified.
+ *
+ * Since: 1.18
+ * Stability: unstable
+ */
+void
+clutter_evdev_set_keyboard_repeat (ClutterDeviceManager *evdev,
+                                   gboolean              repeat,
+                                   guint32               delay,
+                                   guint32               interval)
+{
+  ClutterDeviceManagerEvdev *manager_evdev;
+  ClutterSeatEvdev *seat;
+
+  g_return_if_fail (CLUTTER_IS_DEVICE_MANAGER_EVDEV (evdev));
+
+  manager_evdev = CLUTTER_DEVICE_MANAGER_EVDEV (evdev);
+  seat = manager_evdev->priv->main_seat;
+
+  seat->repeat = repeat;
+  seat->repeat_delay = delay;
+  seat->repeat_interval = interval;
+}
+
+/**
+ * clutter_evdev_add_filter: (skip)
+ * @func: (closure data): a filter function
+ * @data: (allow-none): user data to be passed to the filter function, or %NULL
+ * @destroy_notify: (allow-none): function to call on @data when the filter is removed, or %NULL
+ *
+ * Adds an event filter function.
+ *
+ * Since: 1.20
+ * Stability: unstable
+ */
+void
+clutter_evdev_add_filter (ClutterEvdevFilterFunc func,
+                          gpointer               data,
+                          GDestroyNotify         destroy_notify)
+{
+  ClutterDeviceManagerEvdev *manager_evdev;
+  ClutterDeviceManager *manager;
+  ClutterEventFilter *filter;
+
+  g_return_if_fail (func != NULL);
+
+  manager = clutter_device_manager_get_default ();
+
+  if (!CLUTTER_IS_DEVICE_MANAGER_EVDEV (manager))
+    {
+      g_critical ("The Clutter input backend is not a evdev backend");
+      return;
+    }
+
+  manager_evdev = CLUTTER_DEVICE_MANAGER_EVDEV (manager);
+
+  filter = g_new0 (ClutterEventFilter, 1);
+  filter->func = func;
+  filter->data = data;
+  filter->destroy_notify = destroy_notify;
+
+  manager_evdev->priv->event_filters =
+    g_slist_append (manager_evdev->priv->event_filters, filter);
+}
+
+/**
+ * clutter_evdev_remove_filter: (skip)
+ * @func: a filter function
+ * @data: (allow-none): user data to be passed to the filter function, or %NULL
+ *
+ * Removes the given filter function.
+ *
+ * Since: 1.20
+ * Stability: unstable
+ */
+void
+clutter_evdev_remove_filter (ClutterEvdevFilterFunc func,
+                             gpointer               data)
+{
+  ClutterDeviceManagerEvdev *manager_evdev;
+  ClutterDeviceManager *manager;
+  ClutterEventFilter *filter;
+  GSList *tmp_list;
+
+  g_return_if_fail (func != NULL);
+
+  manager = clutter_device_manager_get_default ();
+
+  if (!CLUTTER_IS_DEVICE_MANAGER_EVDEV (manager))
+    {
+      g_critical ("The Clutter input backend is not a evdev backend");
+      return;
+    }
+
+  manager_evdev = CLUTTER_DEVICE_MANAGER_EVDEV (manager);
+  tmp_list = manager_evdev->priv->event_filters;
+
+  while (tmp_list)
+    {
+      filter = tmp_list->data;
+
+      if (filter->func == func && filter->data == data)
+        {
+          if (filter->destroy_notify)
+            filter->destroy_notify (filter->data);
+          g_free (filter);
+          manager_evdev->priv->event_filters =
+            g_slist_delete_link (manager_evdev->priv->event_filters, tmp_list);
+          return;
+        }
+
+      tmp_list = tmp_list->next;
+    }
+}
+
+/**
+ * clutter_evdev_warp_pointer:
+ * @pointer_device: the pointer device to warp
+ * @time: the timestamp for the warp event
+ * @x: the new X position of the pointer
+ * @y: the new Y position of the pointer
+ *
+ * Warps the pointer to a new location. Technically, this is
+ * processed the same way as an absolute motion event from
+ * libinput: it simply generates an absolute motion event that
+ * will be processed on the next iteration of the mainloop.
+ *
+ * The intended use for this is for display servers that need
+ * to warp cursor the cursor to a new location.
+ *
+ * Since: 1.20
+ * Stability: unstable
+ */
+void
+clutter_evdev_warp_pointer (ClutterInputDevice   *pointer_device,
+                            guint32               time_,
+                            int                   x,
+                            int                   y)
+{
+  notify_absolute_motion (pointer_device, time_, x, y);
 }
diff --git a/clutter/evdev/clutter-evdev.h b/clutter/evdev/clutter-evdev.h
index cc5e18edd..423913948 100644
--- a/clutter/evdev/clutter-evdev.h
+++ b/clutter/evdev/clutter-evdev.h
@@ -26,13 +26,109 @@
 
 #include <glib.h>
 #include <glib-object.h>
+#include <xkbcommon/xkbcommon.h>
 #include <clutter/clutter.h>
+#include <libinput.h>
 
 G_BEGIN_DECLS
 
+#if !defined(CLUTTER_ENABLE_COMPOSITOR_API) && !defined(CLUTTER_COMPILATION)
+#error "You need to define CLUTTER_ENABLE_COMPOSITOR_API before including clutter-evdev.h"
+#endif
+
+/**
+ * ClutterOpenDeviceCallback:
+ * @path: the device path
+ * @flags: flags to be passed to open
+ *
+ * This callback will be called when Clutter needs to access an input
+ * device. It should return an open file descriptor for the file at @path,
+ * or -1 if opening failed.
+ */
+typedef int (*ClutterOpenDeviceCallback) (const char  *path,
+					  int          flags,
+					  gpointer     user_data,
+					  GError     **error);
+typedef void (*ClutterCloseDeviceCallback) (int          fd,
+					    gpointer     user_data);
+
+CLUTTER_AVAILABLE_IN_1_16
+void  clutter_evdev_set_device_callbacks (ClutterOpenDeviceCallback  open_callback,
+                                          ClutterCloseDeviceCallback close_callback,
+                                          gpointer                   user_data);
+
+CLUTTER_AVAILABLE_IN_1_10
 void  clutter_evdev_release_devices (void);
+CLUTTER_AVAILABLE_IN_1_10
 void  clutter_evdev_reclaim_devices (void);
 
+/**
+ * ClutterPointerConstrainCallback:
+ * @device: the core pointer device
+ * @time: the event time in milliseconds
+ * @x: (inout): the new X coordinate
+ * @y: (inout): the new Y coordinate
+ * @user_data:
+ *
+ * This callback will be called for all pointer motion events, and should
+ * update (@x, @y) to constrain the pointer position appropriately.
+ * The subsequent motion event will use the updated values as the new coordinates.
+ * Note that the coordinates are not clamped to the stage size, and the callback
+ * must make sure that this happens before it returns.
+ * Also note that the event will be emitted even if the pointer is constrained
+ * to be in the same position.
+ */
+typedef void (*ClutterPointerConstrainCallback) (ClutterInputDevice *device,
+						 guint32             time,
+						 float              *x,
+						 float              *y,
+						 gpointer            user_data);
+
+CLUTTER_AVAILABLE_IN_1_16
+void  clutter_evdev_set_pointer_constrain_callback (ClutterDeviceManager            *evdev,
+						    ClutterPointerConstrainCallback  callback,
+						    gpointer                         user_data,
+						    GDestroyNotify                   user_data_notify);
+
+CLUTTER_AVAILABLE_IN_1_16
+void               clutter_evdev_set_keyboard_map   (ClutterDeviceManager *evdev,
+						     struct xkb_keymap    *keymap);
+
+CLUTTER_AVAILABLE_IN_1_18
+struct xkb_keymap * clutter_evdev_get_keyboard_map (ClutterDeviceManager *evdev);
+
+CLUTTER_AVAILABLE_IN_1_20
+void clutter_evdev_set_keyboard_layout_index (ClutterDeviceManager *evdev,
+                                              xkb_layout_index_t    idx);
+
+CLUTTER_AVAILABLE_IN_1_18
+void clutter_evdev_set_keyboard_repeat (ClutterDeviceManager *evdev,
+                                        gboolean              repeat,
+                                        guint32               delay,
+                                        guint32               interval);
+
+typedef gboolean (* ClutterEvdevFilterFunc) (struct libinput_event *event,
+                                             gpointer               data);
+
+CLUTTER_AVAILABLE_IN_1_20
+void clutter_evdev_add_filter    (ClutterEvdevFilterFunc func,
+                                  gpointer               data,
+                                  GDestroyNotify         destroy_notify);
+CLUTTER_AVAILABLE_IN_1_20
+void clutter_evdev_remove_filter (ClutterEvdevFilterFunc func,
+                                  gpointer               data);
+CLUTTER_AVAILABLE_IN_1_20
+struct libinput_device * clutter_evdev_input_device_get_libinput_device (ClutterInputDevice *device);
+
+CLUTTER_AVAILABLE_IN_1_20
+gint32 clutter_evdev_event_sequence_get_slot (const ClutterEventSequence *sequence);
+
+CLUTTER_AVAILABLE_IN_1_20
+void clutter_evdev_warp_pointer (ClutterInputDevice   *pointer_device,
+                                 guint32               time_,
+                                 int                   x,
+                                 int                   y);
+
 G_END_DECLS
 
 #endif /* __CLUTTER_EVDEV_H__ */
diff --git a/clutter/evdev/clutter-input-device-evdev.c b/clutter/evdev/clutter-input-device-evdev.c
index 7eccbe58d..cdd38a7cb 100644
--- a/clutter/evdev/clutter-input-device-evdev.c
+++ b/clutter/evdev/clutter-input-device-evdev.c
@@ -4,6 +4,7 @@
  * An OpenGL based 'interactive canvas' library.
  *
  * Copyright (C) 2010 Intel Corp.
+ * Copyright (C) 2014 Jonas Ådahl
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -19,6 +20,7 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Damien Lespiau <damien.lespiau@intel.com>
+ * Author: Jonas Ådahl <jadahl@gmail.com>
  */
 
 #ifdef HAVE_CONFIG_H
@@ -27,98 +29,37 @@
 
 #include "clutter/clutter-device-manager-private.h"
 #include "clutter-private.h"
+#include "clutter-evdev.h"
 
 #include "clutter-input-device-evdev.h"
 
 typedef struct _ClutterInputDeviceClass        ClutterInputDeviceEvdevClass;
-typedef struct _ClutterInputDeviceEvdevPrivate ClutterInputDeviceEvdevPrivate;
 
-#define INPUT_DEVICE_EVDEV_PRIVATE(o)                             \
-  (G_TYPE_INSTANCE_GET_PRIVATE ((o),                              \
-                                CLUTTER_TYPE_INPUT_DEVICE_EVDEV,  \
-                                ClutterInputDeviceEvdevPrivate))
-
-enum
-{
-  PROP_0,
-
-  PROP_SYSFS_PATH,
-  PROP_DEVICE_PATH,
-
-  PROP_LAST
-};
-
-struct _ClutterInputDeviceEvdevPrivate
-{
-  gchar *sysfs_path;
-  gchar *device_path;
-};
-
-struct _ClutterInputDeviceEvdev
-{
-  ClutterInputDevice parent;
-
-  ClutterInputDeviceEvdevPrivate *priv;
-};
+#define clutter_input_device_evdev_get_type _clutter_input_device_evdev_get_type
 
 G_DEFINE_TYPE (ClutterInputDeviceEvdev,
                clutter_input_device_evdev,
                CLUTTER_TYPE_INPUT_DEVICE)
 
-static GParamSpec *obj_props[PROP_LAST];
+/*
+ * Clutter makes the assumption that two core devices have ID's 2 and 3 (core
+ * pointer and core keyboard).
+ *
+ * Since the two first devices that will ever be created will be the virtual
+ * pointer and virtual keyboard of the first seat, we fulfill the made
+ * assumptions by having the first device having ID 2 and following 3.
+ */
+#define INITIAL_DEVICE_ID 2
 
-static void
-clutter_input_device_evdev_get_property (GObject    *object,
-                                         guint       property_id,
-                                         GValue     *value,
-                                         GParamSpec *pspec)
-{
-  ClutterInputDeviceEvdev  *input = CLUTTER_INPUT_DEVICE_EVDEV (object);
-  ClutterInputDeviceEvdevPrivate *priv = input->priv;
-
-  switch (property_id)
-    {
-    case PROP_SYSFS_PATH:
-      g_value_set_string (value, priv->sysfs_path);
-      break;
-    case PROP_DEVICE_PATH:
-      g_value_set_string (value, priv->device_path);
-      break;
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-    }
-}
-
-static void
-clutter_input_device_evdev_set_property (GObject      *object,
-                                         guint         property_id,
-                                         const GValue *value,
-                                         GParamSpec   *pspec)
-{
-  ClutterInputDeviceEvdev  *input = CLUTTER_INPUT_DEVICE_EVDEV (object);
-  ClutterInputDeviceEvdevPrivate *priv = input->priv;
-
-  switch (property_id)
-    {
-    case PROP_SYSFS_PATH:
-      priv->sysfs_path = g_value_dup_string (value);
-      break;
-    case PROP_DEVICE_PATH:
-      priv->device_path = g_value_dup_string (value);
-      break;
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-    }
-}
+static gint global_device_id_next = INITIAL_DEVICE_ID;
 
 static void
 clutter_input_device_evdev_finalize (GObject *object)
 {
-  ClutterInputDeviceEvdev  *input = CLUTTER_INPUT_DEVICE_EVDEV (object);
-  ClutterInputDeviceEvdevPrivate *priv = input->priv;
+  ClutterInputDeviceEvdev *device = CLUTTER_INPUT_DEVICE_EVDEV (object);
 
-  g_free (priv->sysfs_path);
-  g_free (priv->device_path);
+  if (device->libinput_device)
+    libinput_device_unref (device->libinput_device);
 
   G_OBJECT_CLASS (clutter_input_device_evdev_parent_class)->finalize (object);
 }
@@ -128,9 +69,11 @@ clutter_input_device_evdev_keycode_to_evdev (ClutterInputDevice *device,
                                              guint hardware_keycode,
                                              guint *evdev_keycode)
 {
-  /* The hardware keycodes from the evdev backend are already evdev
-     keycodes */
-  *evdev_keycode = hardware_keycode;
+  /* The hardware keycodes from the evdev backend are almost evdev
+     keycodes: we use the evdev keycode file, but xkb rules have an
+     offset by 8. See the comment in _clutter_key_event_new_from_evdev()
+  */
+  *evdev_keycode = hardware_keycode - 8;
   return TRUE;
 }
 
@@ -138,72 +81,168 @@ static void
 clutter_input_device_evdev_class_init (ClutterInputDeviceEvdevClass *klass)
 {
   GObjectClass *object_class = G_OBJECT_CLASS (klass);
-  GParamSpec *pspec;
 
-  g_type_class_add_private (klass, sizeof (ClutterInputDeviceEvdevPrivate));
-
-  object_class->get_property = clutter_input_device_evdev_get_property;
-  object_class->set_property = clutter_input_device_evdev_set_property;
   object_class->finalize = clutter_input_device_evdev_finalize;
   klass->keycode_to_evdev = clutter_input_device_evdev_keycode_to_evdev;
-
-  /*
-   * ClutterInputDeviceEvdev:udev-device:
-   *
-   * The Sysfs path of the device
-   *
-   * Since: 1.6
-   */
-  pspec =
-    g_param_spec_string ("sysfs-path",
-                         P_("sysfs Path"),
-                         P_("Path of the device in sysfs"),
-                         NULL,
-                         G_PARAM_CONSTRUCT_ONLY | CLUTTER_PARAM_READWRITE);
-  obj_props[PROP_SYSFS_PATH] = pspec;
-  g_object_class_install_property (object_class, PROP_SYSFS_PATH, pspec);
-
-  /*
-   * ClutterInputDeviceEvdev:device-path
-   *
-   * The path of the device file.
-   *
-   * Since: 1.6
-   */
-  pspec =
-    g_param_spec_string ("device-path",
-                         P_("Device Path"),
-                         P_("Path of the device node"),
-                         NULL,
-                         G_PARAM_CONSTRUCT_ONLY | CLUTTER_PARAM_READWRITE);
-  obj_props[PROP_DEVICE_PATH] = pspec;
-  g_object_class_install_property (object_class, PROP_DEVICE_PATH, pspec);
 }
 
 static void
 clutter_input_device_evdev_init (ClutterInputDeviceEvdev *self)
 {
-  self->priv = INPUT_DEVICE_EVDEV_PRIVATE (self);
 }
 
-ClutterInputDeviceEvdev *
-_clutter_input_device_evdev_new (void)
+/*
+ * _clutter_input_device_evdev_new:
+ * @manager: the device manager
+ * @seat: the seat the device will belong to
+ * @libinput_device: the libinput device
+ *
+ * Create a new ClutterInputDevice given a libinput device and associate
+ * it with the provided seat.
+ */
+ClutterInputDevice *
+_clutter_input_device_evdev_new (ClutterDeviceManager *manager,
+                                 ClutterSeatEvdev *seat,
+                                 struct libinput_device *libinput_device)
 {
-  return g_object_new (CLUTTER_TYPE_INPUT_DEVICE_EVDEV, NULL);
+  ClutterInputDeviceEvdev *device;
+  ClutterInputDeviceType type;
+
+  type = _clutter_input_device_evdev_determine_type (libinput_device);
+  device = g_object_new (CLUTTER_TYPE_INPUT_DEVICE_EVDEV,
+                         "id", global_device_id_next++,
+                         "name", libinput_device_get_sysname (libinput_device),
+                         "device-manager", manager,
+                         "device-type", type,
+                         "device-mode", CLUTTER_INPUT_MODE_SLAVE,
+                         "enabled", TRUE,
+                         NULL);
+
+  device->seat = seat;
+  device->libinput_device = libinput_device;
+
+  libinput_device_set_user_data (libinput_device, device);
+  libinput_device_ref (libinput_device);
+
+  return CLUTTER_INPUT_DEVICE (device);
 }
 
-const gchar *
-_clutter_input_device_evdev_get_sysfs_path (ClutterInputDeviceEvdev *device)
+/*
+ * _clutter_input_device_evdev_new_virtual:
+ * @manager: the device manager
+ * @seat: the seat the device will belong to
+ * @type: the input device type
+ *
+ * Create a new virtual ClutterInputDevice of the given type.
+ */
+ClutterInputDevice *
+_clutter_input_device_evdev_new_virtual (ClutterDeviceManager *manager,
+                                         ClutterSeatEvdev *seat,
+                                         ClutterInputDeviceType type)
 {
+  ClutterInputDeviceEvdev *device;
+  const char *name;
+
+  switch (type)
+    {
+    case CLUTTER_KEYBOARD_DEVICE:
+      name = "Virtual keyboard device for seat";
+      break;
+    case CLUTTER_POINTER_DEVICE:
+      name = "Virtual pointer device for seat";
+      break;
+    default:
+      name = "Virtual device for seat";
+      break;
+    };
+
+  device = g_object_new (CLUTTER_TYPE_INPUT_DEVICE_EVDEV,
+                         "id", global_device_id_next++,
+                         "name", name,
+                         "device-manager", manager,
+                         "device-type", type,
+                         "device-mode", CLUTTER_INPUT_MODE_MASTER,
+                         "enabled", TRUE,
+                         NULL);
+
+  device->seat = seat;
+
+  return CLUTTER_INPUT_DEVICE (device);
+}
+
+ClutterSeatEvdev *
+_clutter_input_device_evdev_get_seat (ClutterInputDeviceEvdev *device)
+{
+  return device->seat;
+}
+
+void
+_clutter_input_device_evdev_update_leds (ClutterInputDeviceEvdev *device,
+                                         enum libinput_led leds)
+{
+  if (!device->libinput_device)
+    return;
+
+  libinput_device_led_update (device->libinput_device, leds);
+}
+
+ClutterInputDeviceType
+_clutter_input_device_evdev_determine_type (struct libinput_device *ldev)
+{
+  /* This setting is specific to touchpads and alike, only in these
+   * devices there is this additional layer of touch event interpretation.
+   */
+  if (libinput_device_config_tap_get_finger_count (ldev) > 0)
+    return CLUTTER_TOUCHPAD_DEVICE;
+  else if (libinput_device_has_capability (ldev, LIBINPUT_DEVICE_CAP_POINTER))
+    return CLUTTER_POINTER_DEVICE;
+  else if (libinput_device_has_capability (ldev, LIBINPUT_DEVICE_CAP_TOUCH))
+    return CLUTTER_TOUCHSCREEN_DEVICE;
+  else if (libinput_device_has_capability (ldev, LIBINPUT_DEVICE_CAP_KEYBOARD))
+    return CLUTTER_KEYBOARD_DEVICE;
+  else
+    return CLUTTER_EXTENSION_DEVICE;
+}
+
+/**
+ * clutter_evdev_input_device_get_libinput_device:
+ * @device: a #ClutterInputDevice
+ *
+ * Retrieves the libinput_device struct held in @device.
+ *
+ * Returns: The libinput_device struct
+ *
+ * Since: 1.20
+ * Stability: unstable
+ **/
+struct libinput_device *
+clutter_evdev_input_device_get_libinput_device (ClutterInputDevice *device)
+{
+  ClutterInputDeviceEvdev *device_evdev;
+
   g_return_val_if_fail (CLUTTER_IS_INPUT_DEVICE_EVDEV (device), NULL);
 
-  return device->priv->sysfs_path;
+  device_evdev = CLUTTER_INPUT_DEVICE_EVDEV (device);
+
+  return device_evdev->libinput_device;
 }
 
-const gchar *
-_clutter_input_device_evdev_get_device_path (ClutterInputDeviceEvdev *device)
+/**
+ * clutter_evdev_event_sequence_get_slot:
+ * @sequence: a #ClutterEventSequence
+ *
+ * Retrieves the touch slot triggered by this @sequence
+ *
+ * Returns: the libinput touch slot.
+ *
+ * Since: 1.20
+ * Stability: unstable
+ **/
+gint32
+clutter_evdev_event_sequence_get_slot (const ClutterEventSequence *sequence)
 {
-  g_return_val_if_fail (CLUTTER_IS_INPUT_DEVICE_EVDEV (device), NULL);
+  if (!sequence)
+    return -1;
 
-  return device->priv->device_path;
+  return GPOINTER_TO_INT (sequence) - 1;
 }
diff --git a/clutter/evdev/clutter-input-device-evdev.h b/clutter/evdev/clutter-input-device-evdev.h
index 4b76e6223..06f3d8615 100644
--- a/clutter/evdev/clutter-input-device-evdev.h
+++ b/clutter/evdev/clutter-input-device-evdev.h
@@ -4,6 +4,7 @@
  * An OpenGL based 'interactive canvas' library.
  *
  * Copyright (C) 2010 Intel Corp.
+ * Copyright (C) 2014 Jonas Ådahl
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -19,19 +20,20 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Damien Lespiau <damien.lespiau@intel.com>
+ * Author: Jonas Ådahl <jadahl@gmail.com>
  */
 
 #ifndef __CLUTTER_INPUT_DEVICE_EVDEV_H__
 #define __CLUTTER_INPUT_DEVICE_EVDEV_H__
 
 #include <glib-object.h>
-#include <gudev/gudev.h>
+#include <libinput.h>
 
 #include <clutter/clutter-input-device.h>
 
 G_BEGIN_DECLS
 
-#define CLUTTER_TYPE_INPUT_DEVICE_EVDEV clutter_input_device_evdev_get_type()
+#define CLUTTER_TYPE_INPUT_DEVICE_EVDEV _clutter_input_device_evdev_get_type()
 
 #define CLUTTER_INPUT_DEVICE_EVDEV(obj) \
   (G_TYPE_CHECK_INSTANCE_CAST ((obj), \
@@ -54,12 +56,32 @@ G_BEGIN_DECLS
   CLUTTER_TYPE_INPUT_DEVICE_EVDEV, ClutterInputDeviceEvdevClass))
 
 typedef struct _ClutterInputDeviceEvdev ClutterInputDeviceEvdev;
+typedef struct _ClutterSeatEvdev ClutterSeatEvdev;
 
-GType                     clutter_input_device_evdev_get_type         (void) G_GNUC_CONST;
+struct _ClutterInputDeviceEvdev
+{
+  ClutterInputDevice parent;
 
-ClutterInputDeviceEvdev * _clutter_input_device_evdev_new             (void);
-const gchar *             _clutter_input_device_evdev_get_sysfs_path  (ClutterInputDeviceEvdev *device);
-const gchar *             _clutter_input_device_evdev_get_device_path (ClutterInputDeviceEvdev *device);
+  struct libinput_device *libinput_device;
+  ClutterSeatEvdev *seat;
+};
+
+GType                     _clutter_input_device_evdev_get_type        (void) G_GNUC_CONST;
+
+ClutterInputDevice *      _clutter_input_device_evdev_new             (ClutterDeviceManager    *manager,
+                                                                       ClutterSeatEvdev        *seat,
+                                                                       struct libinput_device  *libinput_device);
+
+ClutterInputDevice *      _clutter_input_device_evdev_new_virtual     (ClutterDeviceManager    *manager,
+                                                                       ClutterSeatEvdev        *seat,
+                                                                       ClutterInputDeviceType   type);
+
+ClutterSeatEvdev *        _clutter_input_device_evdev_get_seat        (ClutterInputDeviceEvdev *device);
+
+void                      _clutter_input_device_evdev_update_leds     (ClutterInputDeviceEvdev *device,
+                                                                       enum libinput_led        leds);
+
+ClutterInputDeviceType    _clutter_input_device_evdev_determine_type  (struct libinput_device  *libinput_device);
 
 G_END_DECLS
 
diff --git a/clutter/evdev/clutter-xkb-utils.c b/clutter/evdev/clutter-xkb-utils.c
index 7f50858ee..fd6e0f121 100644
--- a/clutter/evdev/clutter-xkb-utils.c
+++ b/clutter/evdev/clutter-xkb-utils.c
@@ -24,6 +24,7 @@
  */
 
 #include "clutter-keysyms.h"
+#include "clutter-event-private.h"
 #include "clutter-xkb-utils.h"
 
 /*
@@ -42,8 +43,10 @@
  */
 ClutterEvent *
 _clutter_key_event_new_from_evdev (ClutterInputDevice *device,
+				   ClutterInputDevice *core_device,
                                    ClutterStage       *stage,
                                    struct xkb_state   *xkb_state,
+				   uint32_t            button_state,
                                    uint32_t            _time,
                                    xkb_keycode_t       key,
                                    uint32_t            state)
@@ -71,13 +74,13 @@ _clutter_key_event_new_from_evdev (ClutterInputDevice *device,
   else
     sym = XKB_KEY_NoSymbol;
 
-  event->key.device = device;
+  event->key.device = core_device;
   event->key.stage = stage;
   event->key.time = _time;
-  event->key.modifier_state =
-    xkb_state_serialize_mods (xkb_state, XKB_STATE_EFFECTIVE);
+  _clutter_xkb_translate_state (event, xkb_state, button_state);
   event->key.hardware_keycode = key;
   event->key.keyval = sym;
+  clutter_event_set_source_device (event, device);
 
   n = xkb_keysym_to_utf8 (sym, buffer, sizeof (buffer));
 
@@ -96,45 +99,15 @@ _clutter_key_event_new_from_evdev (ClutterInputDevice *device,
   return event;
 }
 
-/*
- * _clutter_xkb_state_new:
- *
- * Create a new xkbcommon keymap and state object.
- *
- * FIXME: We need a way to override the layout here, a fixed or runtime
- * detected layout is provided by the backend calling _clutter_xkb_state_new();
- */
-struct xkb_state *
-_clutter_xkb_state_new (const gchar *model,
-                        const gchar *layout,
-                        const gchar *variant,
-                        const gchar *options)
+void
+_clutter_xkb_translate_state (ClutterEvent     *event,
+			      struct xkb_state *state,
+			      uint32_t          button_state)
 {
-  struct xkb_context *ctx;
-  struct xkb_keymap *keymap;
-  struct xkb_state *state;
-  struct xkb_rule_names names;
-
-  ctx = xkb_context_new(0);
-  if (!ctx)
-    return NULL;
-
-  names.rules = "evdev";
-  if (model)
-    names.model = model;
-  else
-    names.model = "pc105";
-  names.layout = layout;
-  names.variant = variant;
-  names.options = options;
-
-  keymap = xkb_map_new_from_names(ctx, &names, 0);
-  xkb_context_unref(ctx);
-  if (!keymap)
-    return NULL;
-
-  state = xkb_state_new(keymap);
-  xkb_map_unref(keymap);
-
-  return state;
+  _clutter_event_set_state_full (event,
+				 button_state,
+				 xkb_state_serialize_mods (state, XKB_STATE_MODS_DEPRESSED),
+				 xkb_state_serialize_mods (state, XKB_STATE_MODS_LATCHED),
+				 xkb_state_serialize_mods (state, XKB_STATE_MODS_LOCKED),
+				 xkb_state_serialize_mods (state, XKB_STATE_MODS_EFFECTIVE) | button_state);
 }
diff --git a/clutter/evdev/clutter-xkb-utils.h b/clutter/evdev/clutter-xkb-utils.h
index f732f5b86..ae057dd6f 100644
--- a/clutter/evdev/clutter-xkb-utils.h
+++ b/clutter/evdev/clutter-xkb-utils.h
@@ -32,14 +32,15 @@
 #include "clutter-input-device.h"
 
 ClutterEvent *    _clutter_key_event_new_from_evdev (ClutterInputDevice *device,
+						     ClutterInputDevice *core_keyboard,
                                                      ClutterStage       *stage,
                                                      struct xkb_state   *xkb_state,
+						     uint32_t            button_state,
                                                      uint32_t            _time,
                                                      uint32_t            key,
                                                      uint32_t            state);
-struct xkb_state * _clutter_xkb_state_new           (const gchar *model,
-                                                     const gchar *layout,
-                                                     const gchar *variant,
-                                                     const gchar *options);
+void               _clutter_xkb_translate_state     (ClutterEvent       *event,
+						     struct xkb_state   *xkb_state,
+						     uint32_t            button_state);
 
 #endif /* __CLUTTER_XKB_UTILS_H__ */
diff --git a/clutter/gdk/clutter-backend-gdk.c b/clutter/gdk/clutter-backend-gdk.c
index 988b37075..7f14feb6e 100644
--- a/clutter/gdk/clutter-backend-gdk.c
+++ b/clutter/gdk/clutter-backend-gdk.c
@@ -65,6 +65,7 @@
 #include "clutter-event-private.h"
 #include "clutter-main.h"
 #include "clutter-private.h"
+#include "clutter-settings-private.h"
 
 #define clutter_backend_gdk_get_type _clutter_backend_gdk_get_type
 G_DEFINE_TYPE (ClutterBackendGdk, clutter_backend_gdk, CLUTTER_TYPE_BACKEND);
@@ -88,9 +89,9 @@ clutter_backend_gdk_init_settings (ClutterBackendGdk *backend_gdk)
       gdk_screen_get_setting (backend_gdk->screen,
 			      CLUTTER_SETTING_GDK_NAME(i),
 			      &val);
-      g_object_set_property (G_OBJECT (settings),
-			     CLUTTER_SETTING_PROPERTY(i),
-			     &val);
+      clutter_settings_set_property_internal (settings,
+                                              CLUTTER_SETTING_PROPERTY (i),
+                                              &val);
       g_value_unset (&val);
     }
 }
@@ -112,9 +113,9 @@ _clutter_backend_gdk_update_setting (ClutterBackendGdk *backend_gdk,
 	  gdk_screen_get_setting (backend_gdk->screen,
 				  CLUTTER_SETTING_GDK_NAME (i),
 				  &val);
-	  g_object_set_property (G_OBJECT (settings),
-				 CLUTTER_SETTING_PROPERTY (i),
-				 &val);
+	  clutter_settings_set_property_internal (settings,
+	  	  	  	  	  	  CLUTTER_SETTING_PROPERTY (i),
+	  	  	  	  	  	  &val);
 	  g_value_unset (&val);
 
 	  break;
@@ -128,9 +129,10 @@ cogl_gdk_filter (GdkXEvent  *xevent,
 		 gpointer    data)
 {
 #ifdef GDK_WINDOWING_X11
+  ClutterBackend *backend = data;
   CoglFilterReturn ret;
 
-  ret = cogl_xlib_handle_event ((XEvent*)xevent);
+  ret = cogl_xlib_renderer_handle_event (backend->cogl_renderer, (XEvent *) xevent);
   switch (ret)
     {
     case COGL_FILTER_REMOVE:
@@ -170,7 +172,7 @@ _clutter_backend_gdk_post_parse (ClutterBackend  *backend,
   backend_gdk->screen = gdk_display_get_default_screen (backend_gdk->display);
 
   /* add event filter for Cogl events */
-  gdk_window_add_filter (NULL, cogl_gdk_filter, NULL);
+  gdk_window_add_filter (NULL, cogl_gdk_filter, backend_gdk);
 
   clutter_backend_gdk_init_settings (backend_gdk);
 
@@ -210,7 +212,7 @@ clutter_backend_gdk_finalize (GObject *gobject)
 {
   ClutterBackendGdk *backend_gdk = CLUTTER_BACKEND_GDK (gobject);
 
-  gdk_window_remove_filter (NULL, cogl_gdk_filter, NULL);
+  gdk_window_remove_filter (NULL, cogl_gdk_filter, backend_gdk);
   g_object_unref (backend_gdk->display);
 
   G_OBJECT_CLASS (clutter_backend_gdk_parent_class)->finalize (gobject);
@@ -278,6 +280,7 @@ clutter_backend_gdk_get_renderer (ClutterBackend  *backend,
     {
       /* Force a WGL winsys on windows */
       cogl_renderer_set_winsys_id (renderer, COGL_WINSYS_ID_WGL);
+      cogl_win32_renderer_set_event_retrieval_enabled (renderer, FALSE);
     }
   else
 #endif
diff --git a/clutter/gdk/clutter-event-gdk.c b/clutter/gdk/clutter-event-gdk.c
index d9ce5deff..7675cc18e 100644
--- a/clutter/gdk/clutter-event-gdk.c
+++ b/clutter/gdk/clutter-event-gdk.c
@@ -184,6 +184,33 @@ clutter_gdk_handle_event (GdkEvent *gdk_event)
                     event->button.y);
       break;
 
+    case GDK_TOUCH_BEGIN:
+    case GDK_TOUCH_END:
+    case GDK_TOUCH_CANCEL:
+    case GDK_TOUCH_UPDATE:
+      event = clutter_event_new (gdk_event->type == GDK_TOUCH_BEGIN ?
+                                 CLUTTER_TOUCH_BEGIN :
+                                 ((gdk_event->type == GDK_TOUCH_END) ?
+                                  CLUTTER_TOUCH_END :
+                                  (gdk_event->type == GDK_TOUCH_UPDATE ?
+                                   CLUTTER_TOUCH_UPDATE :
+                                   CLUTTER_TOUCH_CANCEL)));
+      event->touch.time = gdk_event->touch.time;
+      event->touch.x = gdk_event->touch.x;
+      event->touch.y = gdk_event->touch.y;
+      event->touch.sequence = (ClutterEventSequence *) gdk_event->touch.sequence;
+      event->touch.modifier_state = gdk_event->touch.state;
+      clutter_event_set_device (event, device);
+      clutter_event_set_source_device (event, source_device);
+      CLUTTER_NOTE (EVENT, "Touch %p %s [%",
+                    event->touch.sequence,
+                    event->type == CLUTTER_TOUCH_BEGIN ? "begin" :
+                    (event->type == CLUTTER_TOUCH_END ? "end" :
+                     (event->type == CLUTTER_TOUCH_UPDATE ? "update"
+                      : "cancel")),
+                    event->touch.x, event->touch.y);
+      break;
+
     case GDK_2BUTTON_PRESS:
     case GDK_3BUTTON_PRESS:
       /* these are handled by clutter-main.c updating click_count */
@@ -309,8 +336,7 @@ clutter_gdk_handle_event (GdkEvent *gdk_event)
       while (spin > 0 && (event = clutter_event_get ()))
 	{
 	  /* forward the event into clutter for emission etc. */
-	  clutter_do_event (event);
-	  clutter_event_free (event);
+          _clutter_stage_queue_event (event->any.stage, event, FALSE);
 	  --spin;
 	}
 
diff --git a/clutter/gdk/clutter-gdk.h b/clutter/gdk/clutter-gdk.h
index f569718d4..a009378c5 100644
--- a/clutter/gdk/clutter-gdk.h
+++ b/clutter/gdk/clutter-gdk.h
@@ -41,17 +41,24 @@
 
 G_BEGIN_DECLS
 
+CLUTTER_AVAILABLE_IN_1_10
 GdkDisplay *    clutter_gdk_get_default_display         (void);
+CLUTTER_AVAILABLE_IN_1_10
 void            clutter_gdk_set_display                 (GdkDisplay   *display);
 
+CLUTTER_AVAILABLE_IN_1_10
 GdkWindow *     clutter_gdk_get_stage_window            (ClutterStage *stage);
+CLUTTER_AVAILABLE_IN_1_10
 gboolean        clutter_gdk_set_stage_foreign           (ClutterStage *stage,
                                                          GdkWindow    *window);
 
+CLUTTER_AVAILABLE_IN_1_10
 GdkFilterReturn clutter_gdk_handle_event                (GdkEvent     *event);
 
+CLUTTER_AVAILABLE_IN_1_10
 ClutterStage *  clutter_gdk_get_stage_from_window       (GdkWindow    *window);
 
+CLUTTER_AVAILABLE_IN_1_10
 void            clutter_gdk_disable_event_retrieval     (void);
 
 G_END_DECLS
diff --git a/clutter/gdk/clutter-settings-gdk.h b/clutter/gdk/clutter-settings-gdk.h
index c2b576e01..9c0fd4f1f 100644
--- a/clutter/gdk/clutter-settings-gdk.h
+++ b/clutter/gdk/clutter-settings-gdk.h
@@ -7,6 +7,7 @@ static const struct {
   const char *settings_property;
   GType       type;
 } _clutter_settings_map[] = {
+  { "gdk-window-scaling-factor", "window-scaling-factor", G_TYPE_INT },
   { "gtk-double-click-time",     "double-click-time",     G_TYPE_INT },
   { "gtk-double-click-distance", "double-click-distance", G_TYPE_INT },
   { "gtk-dnd-drag-threshold",    "dnd-drag-threshold",    G_TYPE_INT },
diff --git a/clutter/gdk/clutter-stage-gdk.c b/clutter/gdk/clutter-stage-gdk.c
index 342906a9e..c0188e0c0 100644
--- a/clutter/gdk/clutter-stage-gdk.c
+++ b/clutter/gdk/clutter-stage-gdk.c
@@ -28,10 +28,16 @@
 #endif
 
 #include <cogl/cogl.h>
+
+#define GDK_DISABLE_DEPRECATION_WARNINGS
+
 #include <gdk/gdk.h>
 #ifdef GDK_WINDOWING_X11
 #include <gdk/gdkx.h>
 #endif
+#ifdef GDK_WINDOWING_WAYLAND
+#include <gdk/gdkwayland.h>
+#endif
 #ifdef GDK_WINDOWING_WIN32
 #include <gdk/gdkwin32.h>
 #endif
@@ -143,9 +149,6 @@ clutter_stage_gdk_resize (ClutterStageWindow *stage_window,
 
   CLUTTER_NOTE (BACKEND, "New size received: (%d, %d)", width, height);
 
-  CLUTTER_SET_PRIVATE_FLAGS (CLUTTER_STAGE_COGL (stage_gdk)->wrapper,
-			     CLUTTER_IN_RESIZE);
-
   gdk_window_resize (stage_gdk->window, width, height);
 }
 
@@ -225,7 +228,7 @@ clutter_stage_gdk_realize (ClutterStageWindow *stage_window)
           if (!cursor_visible)
             {
               if (stage_gdk->blank_cursor == NULL)
-                stage_gdk->blank_cursor = gdk_cursor_new (GDK_BLANK_CURSOR);
+                stage_gdk->blank_cursor = gdk_cursor_new_for_display (backend_gdk->display, GDK_BLANK_CURSOR);
 
               attributes.cursor = stage_gdk->blank_cursor;
             }
@@ -273,6 +276,14 @@ clutter_stage_gdk_realize (ClutterStageWindow *stage_window)
     }
   else
 #endif
+#if defined(GDK_WINDOWING_WAYLAND) && defined(COGL_HAS_EGL_PLATFORM_WAYLAND_SUPPORT)
+  if (GDK_IS_WAYLAND_WINDOW (stage_gdk->window))
+    {
+      cogl_wayland_onscreen_set_foreign_surface (stage_cogl->onscreen,
+                                                 gdk_wayland_window_get_wl_surface (stage_gdk->window));
+    }
+  else
+#endif
 #if defined(GDK_WINDOWING_WIN32) && defined(COGL_HAS_WIN32_SUPPORT)
   if (GDK_IS_WIN32_WINDOW (stage_gdk->window))
     {
@@ -336,7 +347,11 @@ clutter_stage_gdk_set_cursor_visible (ClutterStageWindow *stage_window,
   else
     {
       if (stage_gdk->blank_cursor == NULL)
-	stage_gdk->blank_cursor = gdk_cursor_new (GDK_BLANK_CURSOR);
+        {
+          GdkDisplay *display = clutter_gdk_get_default_display ();
+
+	  stage_gdk->blank_cursor = gdk_cursor_new_for_display (display, GDK_BLANK_CURSOR);
+        }
 
       gdk_window_set_cursor (stage_gdk->window, stage_gdk->blank_cursor);
     }
diff --git a/clutter/osx/clutter-backend-osx.c b/clutter/osx/clutter-backend-osx.c
index 1438a50f5..90f5e6c17 100644
--- a/clutter/osx/clutter-backend-osx.c
+++ b/clutter/osx/clutter-backend-osx.c
@@ -42,6 +42,9 @@
 
 G_DEFINE_TYPE (ClutterBackendOSX, clutter_backend_osx, CLUTTER_TYPE_BACKEND)
 
+/* various flags corresponding to pre init setup calls */
+static gboolean _no_event_retrieval = FALSE;
+
 /*************************************************************************/
 static gboolean
 clutter_backend_osx_post_parse (ClutterBackend  *backend,
@@ -73,6 +76,19 @@ clutter_backend_osx_post_parse (ClutterBackend  *backend,
   return TRUE;
 }
 
+void
+clutter_osx_disable_event_retrieval (void)
+{
+  if (_clutter_context_is_initialized ())
+    {
+      g_warning ("clutter_osx_disable_event_retrieval() can only be "
+                 "called before clutter_init()");
+      return;
+    }
+
+  _no_event_retrieval = TRUE;
+}
+
 static ClutterFeatureFlags
 clutter_backend_osx_get_features (ClutterBackend *backend)
 {
@@ -95,7 +111,8 @@ _clutter_backend_osx_events_init (ClutterBackend *backend)
                   "backend", CLUTTER_BACKEND(backend_osx),
                   NULL);
 
-  _clutter_osx_event_loop_init ();
+  if (!_no_event_retrieval)
+    _clutter_osx_event_loop_init ();
 }
 
 static gboolean
diff --git a/clutter/osx/clutter-backend-osx.h b/clutter/osx/clutter-backend-osx.h
index b1720abb9..cef4e0e72 100644
--- a/clutter/osx/clutter-backend-osx.h
+++ b/clutter/osx/clutter-backend-osx.h
@@ -61,7 +61,13 @@ struct _ClutterBackendOSXClass
 
 GType _clutter_backend_osx_get_type (void) G_GNUC_CONST;
 
-void            _clutter_backend_osx_events_init        (ClutterBackend *backend);
+void _clutter_backend_osx_events_init (ClutterBackend *backend);
+
+#define CLUTTER_OSX_POOL_ALLOC()        NSAutoreleasePool *autorelease_pool = [[NSAutoreleasePool alloc] init]
+#define CLUTTER_OSX_POOL_RELEASE()      [autorelease_pool release];
+
+void _clutter_event_osx_put (NSEvent *nsevent,
+                             ClutterStage *wrapper);
 
 G_END_DECLS
 
diff --git a/clutter/osx/clutter-event-loop-osx.c b/clutter/osx/clutter-event-loop-osx.c
index 6b3a561ef..77a4330ab 100644
--- a/clutter/osx/clutter-event-loop-osx.c
+++ b/clutter/osx/clutter-event-loop-osx.c
@@ -712,8 +712,7 @@ clutter_event_dispatch (GSource     *source,
   if (event)
     {
       /* forward the event into clutter for emission etc. */
-      clutter_do_event (event);
-      clutter_event_free (event);
+      _clutter_stage_queue_event (event->any.stage, event, FALSE);
     }
 
   _clutter_threads_release_lock ();
diff --git a/clutter/osx/clutter-event-osx.c b/clutter/osx/clutter-event-osx.c
index 1f9ee77d3..4b53fefad 100644
--- a/clutter/osx/clutter-event-osx.c
+++ b/clutter/osx/clutter-event-osx.c
@@ -24,6 +24,7 @@
 
 #include "clutter-osx.h"
 
+#include "clutter-backend-osx.h"
 #include "clutter-device-manager-osx.h"
 #include "clutter-stage-osx.h"
 
diff --git a/clutter/osx/clutter-osx.h b/clutter/osx/clutter-osx.h
index b8ea62854..8930b0ad1 100644
--- a/clutter/osx/clutter-osx.h
+++ b/clutter/osx/clutter-osx.h
@@ -24,19 +24,14 @@
 
 #import <AppKit/AppKit.h>
 
-#include <clutter/clutter-stage.h>
+#include <clutter/clutter.h>
 
 @class NSEvent;
 
 G_BEGIN_DECLS
 
-#define CLUTTER_OSX_POOL_ALLOC()        NSAutoreleasePool *autorelease_pool = [[NSAutoreleasePool alloc] init]
-#define CLUTTER_OSX_POOL_RELEASE()      [autorelease_pool release];
-
-void _clutter_events_osx_init   (void);
-void _clutter_events_osx_uninit (void);
-
-void _clutter_event_osx_put     (NSEvent *nsevent, ClutterStage *wrapper);
+CLUTTER_AVAILABLE_IN_1_22
+void clutter_osx_disable_event_retrieval (void);
 
 G_END_DECLS
 
diff --git a/clutter/tslib/clutter-event-tslib.c b/clutter/tslib/clutter-event-tslib.c
index 260562565..8ed27f347 100644
--- a/clutter/tslib/clutter-event-tslib.c
+++ b/clutter/tslib/clutter-event-tslib.c
@@ -267,8 +267,7 @@ clutter_event_dispatch (GSource     *source,
   if (event)
     {
       /* forward the event into clutter for emission etc. */
-      clutter_do_event (event);
-      clutter_event_free (event);
+      _clutter_stage_queue_event (event->any.stage, event, FALSE);
     }
 
 out:
diff --git a/clutter/wayland/clutter-backend-wayland-priv.h b/clutter/wayland/clutter-backend-wayland-priv.h
index e917b7f8c..a278754ba 100644
--- a/clutter/wayland/clutter-backend-wayland-priv.h
+++ b/clutter/wayland/clutter-backend-wayland-priv.h
@@ -62,6 +62,8 @@ struct _ClutterBackendWayland
   GTimer *event_timer;
 };
 
+void _clutter_backend_wayland_ensure_cursor (ClutterBackendWayland *backend_wayland);
+
 G_END_DECLS
 
 #endif /* __CLUTTER_BACKEND_WAYLAND_PRIV_H__ */
diff --git a/clutter/wayland/clutter-backend-wayland.c b/clutter/wayland/clutter-backend-wayland.c
index 77ed8c4be..dcc7c65a1 100644
--- a/clutter/wayland/clutter-backend-wayland.c
+++ b/clutter/wayland/clutter-backend-wayland.c
@@ -46,6 +46,7 @@
 #include "wayland/clutter-device-manager-wayland.h"
 #include "wayland/clutter-event-wayland.h"
 #include "wayland/clutter-stage-wayland.h"
+#include "wayland/clutter-wayland.h"
 #include "cogl/clutter-stage-cogl.h"
 
 #include <wayland-client.h>
@@ -59,7 +60,8 @@
 
 G_DEFINE_TYPE (ClutterBackendWayland, clutter_backend_wayland, CLUTTER_TYPE_BACKEND);
 
-static void clutter_backend_wayland_load_cursor (ClutterBackendWayland *backend_wayland);
+static struct wl_display *_foreign_display = NULL;
+static gboolean _no_event_dispatch = FALSE;
 
 static void
 clutter_backend_wayland_dispose (GObject *gobject)
@@ -175,7 +177,10 @@ clutter_backend_wayland_post_parse (ClutterBackend  *backend,
   ClutterBackendWayland *backend_wayland = CLUTTER_BACKEND_WAYLAND (backend);
 
   /* TODO: expose environment variable/commandline option for this... */
-  backend_wayland->wayland_display = wl_display_connect (NULL);
+  backend_wayland->wayland_display = _foreign_display;
+  if (backend_wayland->wayland_display == NULL)
+    backend_wayland->wayland_display = wl_display_connect (NULL);
+
   if (!backend_wayland->wayland_display)
     {
       g_set_error (error, CLUTTER_INIT_ERROR,
@@ -217,9 +222,6 @@ clutter_backend_wayland_post_parse (ClutterBackend  *backend,
            backend_wayland->wayland_shell))
     wl_display_roundtrip (backend_wayland->wayland_display);
 
-  /* We need the shm object before we can create the cursor */
-  clutter_backend_wayland_load_cursor (backend_wayland);
-
   return TRUE;
 }
 
@@ -234,14 +236,11 @@ clutter_backend_wayland_get_renderer (ClutterBackend  *backend,
 
   renderer = cogl_renderer_new ();
 
+  cogl_wayland_renderer_set_event_dispatch_enabled (renderer, !_no_event_dispatch);
   cogl_renderer_set_winsys_id (renderer, COGL_WINSYS_ID_EGL_WAYLAND);
 
   cogl_wayland_renderer_set_foreign_display (renderer,
                                              backend_wayland->wayland_display);
-  cogl_wayland_renderer_set_foreign_compositor (renderer,
-                                                backend_wayland->wayland_compositor);
-  cogl_wayland_renderer_set_foreign_shell (renderer,
-                                           backend_wayland->wayland_shell);
 
   return renderer;
 }
@@ -292,8 +291,8 @@ clutter_backend_wayland_class_init (ClutterBackendWaylandClass *klass)
   backend_class->get_display = clutter_backend_wayland_get_display;
 }
 
-static void
-clutter_backend_wayland_load_cursor (ClutterBackendWayland *backend_wayland)
+void
+_clutter_backend_wayland_ensure_cursor (ClutterBackendWayland *backend_wayland)
 {
   struct wl_cursor *cursor;
 
@@ -322,3 +321,59 @@ static void
 clutter_backend_wayland_init (ClutterBackendWayland *backend_wayland)
 {
 }
+
+/**
+ * clutter_wayland_set_display
+ * @display: pointer to a wayland display
+ *
+ * Sets the display connection Clutter should use; must be called
+ * before clutter_init(), clutter_init_with_args() or other functions
+ * pertaining Clutter's initialization process.
+ *
+ * If you are parsing the command line arguments by retrieving Clutter's
+ * #GOptionGroup with clutter_get_option_group() and calling
+ * g_option_context_parse() yourself, you should also call
+ * clutter_wayland_set_display() before g_option_context_parse().
+ *
+ * Since: 1.16
+ */
+void
+clutter_wayland_set_display (struct wl_display *display)
+{
+  if (_clutter_context_is_initialized ())
+    {
+      g_warning ("%s() can only be used before calling clutter_init()",
+                 G_STRFUNC);
+      return;
+    }
+
+  _foreign_display = display;
+}
+
+/**
+ * clutter_wayland_disable_event_retrieval:
+ *
+ * Disables the dispatch of the events in the main loop.
+ *
+ * This is useful for integrating Clutter with another library that will do the
+ * event dispatch; in general only a single source should be acting on changes
+ * on the Wayland file descriptor.
+ *
+ * This function can only be called before calling clutter_init().
+ *
+ * This function should not be normally used by applications.
+ *
+ * Since: 1.16
+ */
+void
+clutter_wayland_disable_event_retrieval (void)
+{
+  if (_clutter_context_is_initialized ())
+    {
+      g_warning ("%s() can only be used before calling clutter_init()",
+                 G_STRFUNC);
+      return;
+    }
+
+  _no_event_dispatch = TRUE;
+}
diff --git a/clutter/wayland/clutter-event-wayland.c b/clutter/wayland/clutter-event-wayland.c
index 8ba2f3cb4..c832d80b8 100644
--- a/clutter/wayland/clutter-event-wayland.c
+++ b/clutter/wayland/clutter-event-wayland.c
@@ -35,13 +35,13 @@
 #include "clutter-event.h"
 #include "clutter-main.h"
 #include "clutter-private.h"
+#include "clutter-stage-private.h"
 
 #include "clutter-event-wayland.h"
 
 typedef struct _ClutterEventSourceWayland
 {
   GSource source;
-  GPollFD pfd;
   struct wl_display *display;
 } ClutterEventSourceWayland;
 
@@ -70,12 +70,11 @@ clutter_event_source_wayland_prepare (GSource *base, gint *timeout)
 static gboolean
 clutter_event_source_wayland_check (GSource *base)
 {
-  ClutterEventSourceWayland *source = (ClutterEventSourceWayland *) base;
   gboolean retval;
 
   _clutter_threads_acquire_lock ();
 
-  retval = clutter_events_pending () || source->pfd.revents;
+  retval = clutter_events_pending ();
 
   _clutter_threads_release_lock ();
 
@@ -87,24 +86,16 @@ clutter_event_source_wayland_dispatch (GSource *base,
 				       GSourceFunc callback,
 				       gpointer data)
 {
-  ClutterEventSourceWayland *source = (ClutterEventSourceWayland *) base;
   ClutterEvent *event;
 
   _clutter_threads_acquire_lock ();
 
-  if (source->pfd.revents)
-    {
-      wl_display_dispatch (source->display);
-      source->pfd.revents = 0;
-    }
-
   event = clutter_event_get ();
 
   if (event)
     {
       /* forward the event into clutter for emission etc. */
-      clutter_do_event (event);
-      clutter_event_free (event);
+      _clutter_stage_queue_event (event->any.stage, event, FALSE);
     }
 
   _clutter_threads_release_lock ();
@@ -129,10 +120,6 @@ _clutter_event_source_wayland_new (struct wl_display *display)
     g_source_new (&clutter_event_source_wayland_funcs,
                   sizeof (ClutterEventSourceWayland));
   source->display = display;
-  source->pfd.fd =
-    wl_display_get_fd (display);
-  source->pfd.events = G_IO_IN | G_IO_ERR;
-  g_source_add_poll (&source->source, &source->pfd);
 
   return &source->source;
 }
diff --git a/clutter/wayland/clutter-input-device-wayland.c b/clutter/wayland/clutter-input-device-wayland.c
index 8f08ff6db..7bfb615b7 100644
--- a/clutter/wayland/clutter-input-device-wayland.c
+++ b/clutter/wayland/clutter-input-device-wayland.c
@@ -44,6 +44,7 @@
 #include "clutter-backend-wayland.h"
 #include "clutter-backend-wayland-priv.h"
 #include "clutter-stage-private.h"
+#include "clutter-stage-wayland.h"
 #include "clutter-wayland.h"
 
 #include "cogl/clutter-stage-cogl.h"
@@ -57,6 +58,16 @@ G_DEFINE_TYPE (ClutterInputDeviceWayland,
                clutter_input_device_wayland,
                CLUTTER_TYPE_INPUT_DEVICE);
 
+/* This gives us a fake time source for higher level abstractions to have an
+ * understanding of when an event happens. All that matters are that this is a
+ * monotonic increasing millisecond accurate time for events to be compared with.
+ */
+static guint32
+_clutter_wayland_get_time (void)
+{
+  return g_get_monotonic_time () / 1000;
+}
+
 static void
 clutter_wayland_handle_motion (void *data,
                                struct wl_pointer *pointer,
@@ -64,16 +75,21 @@ clutter_wayland_handle_motion (void *data,
                                wl_fixed_t x, wl_fixed_t y)
 {
   ClutterInputDeviceWayland *device = data;
-  ClutterStageCogl          *stage_cogl = device->pointer_focus;
+  ClutterStageCogl          *stage_cogl;
   ClutterEvent              *event;
 
+  if (!device->pointer_focus)
+    return;
+
+  stage_cogl = device->pointer_focus;
+
   event = clutter_event_new (CLUTTER_MOTION);
   event->motion.stage = stage_cogl->wrapper;
   event->motion.device = CLUTTER_INPUT_DEVICE (device);
-  event->motion.time = _time;
+  event->motion.time = _clutter_wayland_get_time ();
   event->motion.modifier_state = 0;
-  event->motion.x = wl_fixed_to_double(x);
-  event->motion.y = wl_fixed_to_double(y);
+  event->motion.x = wl_fixed_to_double (x);
+  event->motion.y = wl_fixed_to_double (y);
 
   device->x = event->motion.x;
   device->y = event->motion.y;
@@ -88,9 +104,15 @@ clutter_wayland_handle_button (void *data,
                                uint32_t button, uint32_t state)
 {
   ClutterInputDeviceWayland *device = data;
-  ClutterStageCogl          *stage_cogl = device->pointer_focus;
+  ClutterStageCogl          *stage_cogl;
   ClutterEvent              *event;
   ClutterEventType           type;
+  ClutterModifierType        modifier_mask = 0;
+
+  if (!device->pointer_focus)
+    return;
+
+  stage_cogl = device->pointer_focus;
 
   if (state)
     type = CLUTTER_BUTTON_PRESS;
@@ -100,25 +122,37 @@ clutter_wayland_handle_button (void *data,
   event = clutter_event_new (type);
   event->button.stage = stage_cogl->wrapper;
   event->button.device = CLUTTER_INPUT_DEVICE (device);
-  event->button.time = /*_time*/ serial;
+  event->button.time = _clutter_wayland_get_time ();
   event->button.x = device->x;
   event->button.y = device->y;
-  event->button.modifier_state =
-    xkb_state_serialize_mods (device->xkb, XKB_STATE_EFFECTIVE);
+  _clutter_xkb_translate_state (event, device->xkb, 0);
 
   /* evdev button codes */
   switch (button) {
   case 272:
     event->button.button = 1;
+    modifier_mask = CLUTTER_BUTTON1_MASK;
     break;
   case 273:
     event->button.button = 3;
+    modifier_mask = CLUTTER_BUTTON2_MASK;
     break;
   case 274:
     event->button.button = 2;
+    modifier_mask = CLUTTER_BUTTON3_MASK;
     break;
   }
 
+  if (modifier_mask)
+    {
+      if (state)
+        device->button_modifier_state |= modifier_mask;
+      else
+        device->button_modifier_state &= ~modifier_mask;
+    }
+
+  event->button.modifier_state = device->button_modifier_state;
+
   _clutter_event_push (event, FALSE);
 }
 
@@ -130,31 +164,39 @@ clutter_wayland_handle_axis (void *data,
                              wl_fixed_t value)
 {
   ClutterInputDeviceWayland *device = data;
-  ClutterStageCogl          *stage_cogl = device->pointer_focus;
+  ClutterStageCogl          *stage_cogl;
   ClutterEvent              *event;
   gdouble                    delta_x, delta_y;
+  gdouble                    delta_factor;
 
+  if (!device->pointer_focus)
+    return;
+
+  stage_cogl = device->pointer_focus;
   event = clutter_event_new (CLUTTER_SCROLL);
-  event->scroll.time = time;
+  event->scroll.time = _clutter_wayland_get_time ();
   event->scroll.stage = stage_cogl->wrapper;
   event->scroll.direction = CLUTTER_SCROLL_SMOOTH;
   event->scroll.x = device->x;
   event->scroll.y = device->y;
 
+  /* Wayland pointer axis events are in pointer motion coordinate space.
+   * To convert to Xi2 discrete step coordinate space, multiply the factor
+   * 1/10. */
+  delta_factor = 1.0 / 10.0;
   if (axis == WL_POINTER_AXIS_HORIZONTAL_SCROLL)
     {
-      delta_x = -wl_fixed_to_double(value) * 23;
+      delta_x = wl_fixed_to_double (value) * delta_factor;
       delta_y = 0;
     }
   else
     {
       delta_x = 0;
-      delta_y = -wl_fixed_to_double(value) * 23; /* XXX: based on my bcm5794 */
+      delta_y = wl_fixed_to_double (value) * delta_factor;
     }
   clutter_event_set_scroll_delta (event, delta_x, delta_y);
 
-  event->scroll.modifier_state =
-    xkb_state_serialize_mods(device->xkb, XKB_STATE_EFFECTIVE);
+  _clutter_xkb_translate_state (event, device->xkb, 0);
 
   _clutter_event_push (event, FALSE);
 }
@@ -193,7 +235,7 @@ clutter_wayland_handle_keymap (void *data,
   map_str = mmap (NULL, size, PROT_READ, MAP_SHARED, fd, 0);
   if (map_str == MAP_FAILED)
     {
-      close(fd);
+      close (fd);
       return;
     }
 
@@ -211,7 +253,7 @@ clutter_wayland_handle_keymap (void *data,
       return;
     }
 
-  device->xkb = xkb_state_new(keymap);
+  device->xkb = xkb_state_new (keymap);
   xkb_map_unref (keymap);
   if (!device->xkb)
     {
@@ -232,8 +274,9 @@ clutter_wayland_repeat_key (void *data)
   ClutterEvent              *event;
 
   event = _clutter_key_event_new_from_evdev ((ClutterInputDevice *) device,
+					     (ClutterInputDevice*) device,
                                              stage_cogl->wrapper,
-                                             device->xkb,
+                                             device->xkb, 0,
                                              device->repeat_time,
                                              device->repeat_key,
                                              1);
@@ -262,13 +305,17 @@ clutter_wayland_handle_key (void *data,
   ClutterStageCogl          *stage_cogl = device->keyboard_focus;
   ClutterEvent              *event;
 
+  if (!device->keyboard_focus)
+    return;
   if (!device->xkb)
     return;
 
   event = _clutter_key_event_new_from_evdev ((ClutterInputDevice *) device,
+					     (ClutterInputDevice *) device,
                                              stage_cogl->wrapper,
-                                             device->xkb,
-                                             _time, key, state);
+                                             device->xkb, 0,
+                                             _clutter_wayland_get_time (),
+                                             key, state);
 
   _clutter_event_push (event, FALSE);
 
@@ -324,12 +371,17 @@ clutter_wayland_handle_pointer_enter (void *data,
                                       wl_fixed_t x, wl_fixed_t y)
 {
   ClutterInputDeviceWayland *device = data;
+  ClutterStageWayland       *stage_wayland;
   ClutterStageCogl          *stage_cogl;
   ClutterEvent              *event;
   ClutterBackend            *backend;
   ClutterBackendWayland     *backend_wayland;
 
-  stage_cogl = wl_surface_get_user_data (surface);
+  stage_wayland = wl_surface_get_user_data (surface);
+
+  if (!CLUTTER_IS_STAGE_COGL (stage_wayland))
+    return;
+  stage_cogl = CLUTTER_STAGE_COGL (stage_wayland);
 
   device->pointer_focus = stage_cogl;
   _clutter_input_device_set_stage (CLUTTER_INPUT_DEVICE (device),
@@ -337,9 +389,9 @@ clutter_wayland_handle_pointer_enter (void *data,
 
   event = clutter_event_new (CLUTTER_ENTER);
   event->crossing.stage = stage_cogl->wrapper;
-  event->crossing.time = 0; /* ?! */
-  event->crossing.x = wl_fixed_to_double(x);
-  event->crossing.y = wl_fixed_to_double(y);
+  event->crossing.time = _clutter_wayland_get_time ();
+  event->crossing.x = wl_fixed_to_double (x);
+  event->crossing.y = wl_fixed_to_double (y);
   event->crossing.source = CLUTTER_ACTOR (stage_cogl->wrapper);
   event->crossing.device = CLUTTER_INPUT_DEVICE (device);
 
@@ -348,26 +400,35 @@ clutter_wayland_handle_pointer_enter (void *data,
 
   _clutter_event_push (event, FALSE);
 
-  /* Set the cursor to the cursor loaded at backend initialisation */
-  backend = clutter_get_default_backend ();
-  backend_wayland = CLUTTER_BACKEND_WAYLAND (backend);
+  if (stage_wayland->cursor_visible)
+    {
+      /* Set the cursor to the cursor loaded at backend initialisation */
+      backend = clutter_get_default_backend ();
+      backend_wayland = CLUTTER_BACKEND_WAYLAND (backend);
 
-  wl_pointer_set_cursor (pointer,
-                         serial,
-                         backend_wayland->cursor_surface,
-                         backend_wayland->cursor_x,
-                         backend_wayland->cursor_y);
-  wl_surface_attach (backend_wayland->cursor_surface,
-                     backend_wayland->cursor_buffer,
-                     0,
-                     0);
-  wl_surface_damage (backend_wayland->cursor_surface,
-                     0,
-                     0,
-                     32, /* XXX: FFS */
-                     32);
+      _clutter_backend_wayland_ensure_cursor (backend_wayland);
 
-  wl_surface_commit (backend_wayland->cursor_surface);
+      wl_pointer_set_cursor (pointer,
+                             serial,
+                             backend_wayland->cursor_surface,
+                             backend_wayland->cursor_x,
+                             backend_wayland->cursor_y);
+      wl_surface_attach (backend_wayland->cursor_surface,
+                         backend_wayland->cursor_buffer,
+                         0,
+                         0);
+      wl_surface_damage (backend_wayland->cursor_surface,
+                         0,
+                         0,
+                         32, /* XXX: FFS */
+                         32);
+
+      wl_surface_commit (backend_wayland->cursor_surface);
+    }
+  else
+    {
+      wl_pointer_set_cursor (pointer, serial, NULL, 0, 0);
+    }
 }
 
 static void
@@ -380,12 +441,18 @@ clutter_wayland_handle_pointer_leave (void *data,
   ClutterStageCogl          *stage_cogl;
   ClutterEvent              *event;
 
+  if (surface == NULL)
+    return;
+
+  if (!CLUTTER_IS_STAGE_COGL (wl_surface_get_user_data (surface)))
+    return;
+
   stage_cogl = wl_surface_get_user_data (surface);
   g_assert (device->pointer_focus == stage_cogl);
 
   event = clutter_event_new (CLUTTER_LEAVE);
   event->crossing.stage = stage_cogl->wrapper;
-  event->crossing.time = 0; /* ?! */
+  event->crossing.time = _clutter_wayland_get_time ();
   event->crossing.x = device->x;
   event->crossing.y = device->y;
   event->crossing.source = CLUTTER_ACTOR (stage_cogl->wrapper);
@@ -407,6 +474,9 @@ clutter_wayland_handle_keyboard_enter (void *data,
   ClutterInputDeviceWayland *device = data;
   ClutterStageCogl          *stage_cogl;
 
+  if (!CLUTTER_IS_STAGE_COGL (wl_surface_get_user_data (surface)))
+    return;
+
   stage_cogl = wl_surface_get_user_data (surface);
   g_assert (device->keyboard_focus == NULL);
   device->keyboard_focus = stage_cogl;
@@ -425,6 +495,11 @@ clutter_wayland_handle_keyboard_leave (void *data,
   ClutterInputDeviceWayland *device = data;
   ClutterStageCogl          *stage_cogl;
 
+  if (!surface)
+    return;
+  if (!CLUTTER_IS_STAGE_COGL (wl_surface_get_user_data (surface)))
+    return;
+
   stage_cogl = wl_surface_get_user_data (surface);
   g_assert (device->keyboard_focus == stage_cogl);
 
@@ -525,8 +600,7 @@ clutter_input_device_wayland_init (ClutterInputDeviceWayland *self)
 }
 
 /**
- * clutter_wayland_input_device_get_wl_input_device: (skip)
- *
+ * clutter_wayland_input_device_get_wl_seat: (skip)
  * @device: a #ClutterInputDevice
  *
  * Access the underlying data structure representing the Wayland device that is
diff --git a/clutter/wayland/clutter-input-device-wayland.h b/clutter/wayland/clutter-input-device-wayland.h
index 22de8b1cf..d242ac41c 100644
--- a/clutter/wayland/clutter-input-device-wayland.h
+++ b/clutter/wayland/clutter-input-device-wayland.h
@@ -53,6 +53,7 @@ struct _ClutterInputDeviceWayland
   guint                   repeat_time;
   guint                   repeat_source;
   gboolean                is_initial_repeat;
+  ClutterModifierType     button_modifier_state;
 };
 
 GType _clutter_input_device_wayland_get_type (void) G_GNUC_CONST;
diff --git a/clutter/wayland/clutter-stage-wayland.c b/clutter/wayland/clutter-stage-wayland.c
index 2a3346b52..a9658bfca 100644
--- a/clutter/wayland/clutter-stage-wayland.c
+++ b/clutter/wayland/clutter-stage-wayland.c
@@ -113,15 +113,17 @@ clutter_stage_wayland_realize (ClutterStageWindow *stage_window)
 
   wl_surface = cogl_wayland_onscreen_get_surface (stage_cogl->onscreen);
   wl_surface_set_user_data (wl_surface, stage_wayland);
-
-  wl_shell_surface =
-    cogl_wayland_onscreen_get_shell_surface (stage_cogl->onscreen);
-  wl_shell_surface_add_listener (wl_shell_surface,
-                                 &shell_surface_listener,
-                                 stage_wayland);
-
   stage_wayland->wayland_surface = wl_surface;
-  stage_wayland->wayland_shell_surface = wl_shell_surface;
+
+  if (!stage_wayland->foreign_wl_surface)
+    {
+      wl_shell_surface =
+        cogl_wayland_onscreen_get_shell_surface (stage_cogl->onscreen);
+      wl_shell_surface_add_listener (wl_shell_surface,
+                                     &shell_surface_listener,
+                                     stage_wayland);
+      stage_wayland->wayland_shell_surface = wl_shell_surface;
+    }
 
   if (stage_wayland->fullscreen)
     clutter_stage_wayland_set_fullscreen (stage_window, TRUE);
@@ -134,9 +136,15 @@ clutter_stage_wayland_show (ClutterStageWindow *stage_window,
                             gboolean            do_raise)
 {
   ClutterStageCogl *stage_cogl = CLUTTER_STAGE_COGL (stage_window);
+  ClutterStageWayland *stage_wayland = CLUTTER_STAGE_WAYLAND (stage_window);
 
   clutter_stage_window_parent_iface->show (stage_window, do_raise);
 
+  if (stage_wayland->wayland_shell_surface)
+    wl_shell_surface_set_toplevel (stage_wayland->wayland_shell_surface);
+
+  stage_wayland->shown = TRUE;
+
   /* We need to queue a redraw after the stage is shown because all of
    * the other queue redraws up to this point will have been ignored
    * because the actor was not visible. The other backends do not need
@@ -145,6 +153,15 @@ clutter_stage_wayland_show (ClutterStageWindow *stage_window,
   clutter_actor_queue_redraw (CLUTTER_ACTOR (stage_cogl->wrapper));
 }
 
+static void
+clutter_stage_wayland_set_cursor_visible (ClutterStageWindow *stage_window,
+                                          gboolean            cursor_visible)
+{
+  ClutterStageWayland *stage_wayland = CLUTTER_STAGE_WAYLAND (stage_window);
+
+  stage_wayland->cursor_visible = cursor_visible;
+}
+
 static void
 clutter_stage_wayland_set_fullscreen (ClutterStageWindow *stage_window,
                                       gboolean            fullscreen)
@@ -157,7 +174,7 @@ clutter_stage_wayland_set_fullscreen (ClutterStageWindow *stage_window,
 
   stage_wayland->fullscreen = fullscreen;
 
-  if (!stage_wayland->wayland_shell_surface) /* Not realized yet */
+  if (!stage_wayland->wayland_shell_surface)
     return;
 
   if (fullscreen)
@@ -199,18 +216,29 @@ clutter_stage_wayland_resize (ClutterStageWindow *stage_window,
                               gint                height)
 {
   ClutterStageCogl *stage_cogl = CLUTTER_STAGE_COGL (stage_window);
+  ClutterStageWayland *stage_wayland = CLUTTER_STAGE_WAYLAND (stage_window);
 
   /* Resize preserving top left */
   if (stage_cogl->onscreen)
     {
       cogl_wayland_onscreen_resize (stage_cogl->onscreen, width, height, 0, 0);
-      _clutter_stage_window_redraw (stage_window);
+
+      /* Only trigger a redraw if the stage window has been shown */
+      if (stage_wayland->shown)
+        _clutter_stage_window_redraw (stage_window);
     }
 }
 
+static gboolean
+clutter_stage_wayland_can_clip_redraws (ClutterStageWindow *stage_window)
+{
+  return TRUE;
+}
+
 static void
 clutter_stage_wayland_init (ClutterStageWayland *stage_wayland)
 {
+  stage_wayland->cursor_visible = TRUE;
 }
 
 static void
@@ -221,7 +249,9 @@ clutter_stage_window_iface_init (ClutterStageWindowIface *iface)
   iface->realize = clutter_stage_wayland_realize;
   iface->show = clutter_stage_wayland_show;
   iface->set_fullscreen = clutter_stage_wayland_set_fullscreen;
+  iface->set_cursor_visible = clutter_stage_wayland_set_cursor_visible;
   iface->resize = clutter_stage_wayland_resize;
+  iface->can_clip_redraws = clutter_stage_wayland_can_clip_redraws;
 }
 
 static void
@@ -231,7 +261,6 @@ clutter_stage_wayland_class_init (ClutterStageWaylandClass *klass)
 
 /**
  * clutter_wayland_stage_get_wl_shell_surface: (skip)
- *
  * @stage: a #ClutterStage
  *
  * Access the underlying data structure representing the shell surface that is
@@ -240,7 +269,7 @@ clutter_stage_wayland_class_init (ClutterStageWaylandClass *klass)
  * Note: this function can only be called when running on the Wayland
  * platform. Calling this function at any other time will return %NULL.
  *
- * Returns: (transfer non): the Wayland shell surface associated with
+ * Returns: (transfer none): the Wayland shell surface associated with
  * @stage
  *
  * Since: 1.10
@@ -261,7 +290,6 @@ clutter_wayland_stage_get_wl_shell_surface (ClutterStage *stage)
 
 /**
  * clutter_wayland_stage_get_wl_surface: (skip)
- *
  * @stage: a #ClutterStage
  *
  * Access the underlying data structure representing the surface that is
@@ -271,6 +299,8 @@ clutter_wayland_stage_get_wl_shell_surface (ClutterStage *stage)
  * platform. Calling this function at any other time will return %NULL.
  *
  * Returns: (transfer none): the Wayland surface associated with @stage
+ *
+ * Since: 1.10
  */
 struct wl_surface *
 clutter_wayland_stage_get_wl_surface (ClutterStage *stage)
@@ -286,3 +316,50 @@ clutter_wayland_stage_get_wl_surface (ClutterStage *stage)
   return stage_wayland->wayland_surface;
 
 }
+
+/**
+ * clutter_wayland_stage_set_wl_surface:
+ * @stage: a #ClutterStage
+ * @surface: A Wayland surface to associate with the @stage.
+ *
+ * Allows you to explicitly provide an existing Wayland surface to associate
+ * with @stage, preventing Cogl from allocating a surface and shell surface for
+ * the stage automatically.
+ *
+ * This function must be called before @stage is shown.
+ *
+ * Note: this function can only be called when running on the Wayland
+ * platform. Calling this function at any other time has no effect.
+ *
+ * Since: 1.16
+ */
+void
+clutter_wayland_stage_set_wl_surface (ClutterStage *stage,
+                                      struct wl_surface *surface)
+{
+  ClutterStageWindow *stage_window = _clutter_stage_get_window (stage);
+  ClutterStageWayland *stage_wayland;
+  ClutterStageCogl *stage_cogl;
+
+  if (!CLUTTER_IS_STAGE_WAYLAND (stage_window))
+    return;
+
+  stage_cogl = CLUTTER_STAGE_COGL (stage_window);
+
+  if (stage_cogl->onscreen == NULL)
+    {
+      ClutterBackend *backend = clutter_get_default_backend ();
+
+      /* Use the same default dimensions as clutter_stage_cogl_realize() */
+      stage_cogl->onscreen = cogl_onscreen_new (backend->cogl_context,
+                                                800, 600);
+
+      cogl_wayland_onscreen_set_foreign_surface (stage_cogl->onscreen,
+                                                 surface);
+
+      stage_wayland = CLUTTER_STAGE_WAYLAND (stage_window);
+      stage_wayland->foreign_wl_surface = TRUE;
+    }
+  else
+    g_warning (G_STRLOC ": cannot set foreign surface for stage");
+}
diff --git a/clutter/wayland/clutter-stage-wayland.h b/clutter/wayland/clutter-stage-wayland.h
index 3c7eb4209..46092c3c2 100644
--- a/clutter/wayland/clutter-stage-wayland.h
+++ b/clutter/wayland/clutter-stage-wayland.h
@@ -53,6 +53,9 @@ struct _ClutterStageWayland
   struct wl_surface *wayland_surface;
   struct wl_shell_surface *wayland_shell_surface;
   gboolean fullscreen;
+  gboolean foreign_wl_surface;
+  gboolean shown;
+  gboolean cursor_visible;
 };
 
 struct _ClutterStageWaylandClass
diff --git a/clutter/wayland/clutter-wayland-compositor.h b/clutter/wayland/clutter-wayland-compositor.h
index a3e797113..703a7e2f5 100644
--- a/clutter/wayland/clutter-wayland-compositor.h
+++ b/clutter/wayland/clutter-wayland-compositor.h
@@ -37,8 +37,8 @@
 
 G_BEGIN_DECLS
 
-void
-clutter_wayland_set_compositor_display (void *display);
+CLUTTER_AVAILABLE_IN_1_10
+void    clutter_wayland_set_compositor_display  (void *display);
 
 G_END_DECLS
 
diff --git a/clutter/wayland/clutter-wayland-surface.c b/clutter/wayland/clutter-wayland-surface.c
index becd917cd..9ee40359a 100644
--- a/clutter/wayland/clutter-wayland-surface.c
+++ b/clutter/wayland/clutter-wayland-surface.c
@@ -78,9 +78,9 @@ struct _ClutterWaylandSurfacePrivate
   CoglPipeline *pipeline;
 };
 
-G_DEFINE_TYPE (ClutterWaylandSurface,
-               clutter_wayland_surface,
-               CLUTTER_TYPE_ACTOR);
+G_DEFINE_TYPE_WITH_PRIVATE (ClutterWaylandSurface,
+                            clutter_wayland_surface,
+                            CLUTTER_TYPE_ACTOR)
 
 static gboolean
 clutter_wayland_surface_get_paint_volume (ClutterActor *self,
@@ -156,11 +156,9 @@ opacity_change_cb (ClutterWaylandSurface *self)
 static void
 clutter_wayland_surface_init (ClutterWaylandSurface *self)
 {
-  ClutterWaylandSurfacePrivate *priv =
-      G_TYPE_INSTANCE_GET_PRIVATE (self,
-                                   CLUTTER_WAYLAND_TYPE_SURFACE,
-                                   ClutterWaylandSurfacePrivate);
-
+  ClutterWaylandSurfacePrivate *priv;
+  
+  priv = clutter_wayland_surface_get_instance_private (self);
   priv->surface = NULL;
   priv->width = 0;
   priv->height = 0;
@@ -405,8 +403,6 @@ clutter_wayland_surface_class_init (ClutterWaylandSurfaceClass *klass)
   ClutterActorClass *actor_class = CLUTTER_ACTOR_CLASS (klass);
   GParamSpec *pspec;
 
-  g_type_class_add_private (klass, sizeof (ClutterWaylandSurfacePrivate));
-
   actor_class->get_paint_volume = clutter_wayland_surface_get_paint_volume;
   actor_class->paint = clutter_wayland_surface_paint;
   actor_class->get_preferred_width =
@@ -515,7 +511,7 @@ clutter_wayland_surface_new (struct wl_surface *surface)
 /**
  * clutter_wayland_surface_attach_buffer:
  * @self: A #ClutterWaylandSurface actor
- * @buffer: A compositor side struct wl_buffer pointer
+ * @buffer: A compositor side resource representing a wl_buffer
  * @error: A #GError
  *
  * This associates a client's buffer with the #ClutterWaylandSurface
@@ -527,7 +523,7 @@ clutter_wayland_surface_new (struct wl_surface *surface)
  */
 gboolean
 clutter_wayland_surface_attach_buffer (ClutterWaylandSurface *self,
-                                       struct wl_buffer *buffer,
+                                       struct wl_resource *buffer,
                                        GError **error)
 {
   ClutterWaylandSurfacePrivate *priv;
@@ -540,8 +536,6 @@ clutter_wayland_surface_attach_buffer (ClutterWaylandSurface *self,
 
   free_surface_buffers (self);
 
-  set_size (self, buffer->width, buffer->height);
-
   priv->buffer =
     cogl_wayland_texture_2d_new_from_buffer (context, buffer, error);
 
@@ -555,13 +549,17 @@ clutter_wayland_surface_attach_buffer (ClutterWaylandSurface *self,
   if (!priv->buffer)
     return FALSE;
 
+  set_size (self,
+            cogl_texture_get_width (COGL_TEXTURE (priv->buffer)),
+            cogl_texture_get_height (COGL_TEXTURE (priv->buffer)));
+
   return TRUE;
 }
 
 /**
  * clutter_wayland_surface_damage_buffer:
  * @self: A #ClutterWaylandSurface actor
- * @buffer: A compositor side struct wl_buffer pointer
+ * @buffer: A wayland resource for a buffer
  * @x: The x coordinate of the damaged rectangle
  * @y: The y coordinate of the damaged rectangle
  * @width: The width of the damaged rectangle
@@ -579,23 +577,26 @@ clutter_wayland_surface_attach_buffer (ClutterWaylandSurface *self,
  */
 void
 clutter_wayland_surface_damage_buffer (ClutterWaylandSurface *self,
-                                       struct wl_buffer *buffer,
+                                       struct wl_resource *buffer,
                                        gint32 x,
                                        gint32 y,
                                        gint32 width,
                                        gint32 height)
 {
   ClutterWaylandSurfacePrivate *priv;
+  struct wl_shm_buffer *shm_buffer;
 
   g_return_if_fail (CLUTTER_WAYLAND_IS_SURFACE (self));
 
   priv = self->priv;
 
-  if (priv->buffer && wl_buffer_is_shm (buffer))
+  shm_buffer = wl_shm_buffer_get (buffer);
+
+  if (priv->buffer && shm_buffer)
     {
       CoglPixelFormat format;
 
-      switch (wl_shm_buffer_get_format (buffer))
+      switch (wl_shm_buffer_get_format (shm_buffer))
         {
 #if G_BYTE_ORDER == G_BIG_ENDIAN
           case WL_SHM_FORMAT_ARGB8888:
@@ -623,8 +624,8 @@ clutter_wayland_surface_damage_buffer (ClutterWaylandSurface *self,
                                width, height,
                                width, height,
                                format,
-                               wl_shm_buffer_get_stride (buffer),
-                               wl_shm_buffer_get_data (buffer));
+                               wl_shm_buffer_get_stride (shm_buffer),
+                               wl_shm_buffer_get_data (shm_buffer));
     }
 
   g_signal_emit (self, signals[QUEUE_DAMAGE_REDRAW],
diff --git a/clutter/wayland/clutter-wayland-surface.h b/clutter/wayland/clutter-wayland-surface.h
index b68483ec7..f674af88a 100644
--- a/clutter/wayland/clutter-wayland-surface.h
+++ b/clutter/wayland/clutter-wayland-surface.h
@@ -88,21 +88,28 @@ struct _ClutterWaylandSurfaceClass
   gpointer _padding_dummy[8];
 };
 
+CLUTTER_AVAILABLE_IN_1_10
 GType clutter_wayland_surface_get_type (void) G_GNUC_CONST;
 
+CLUTTER_AVAILABLE_IN_1_8
 ClutterActor *clutter_wayland_surface_new               (struct wl_surface *surface);
+CLUTTER_AVAILABLE_IN_1_10
 void          clutter_wayland_surface_set_surface       (ClutterWaylandSurface *self,
                                                          struct wl_surface *surface);
+CLUTTER_AVAILABLE_IN_1_10
 struct wl_surface *clutter_wayland_surface_get_surface  (ClutterWaylandSurface *self);
+CLUTTER_AVAILABLE_IN_1_8
 gboolean      clutter_wayland_surface_attach_buffer     (ClutterWaylandSurface *self,
-                                                         struct wl_buffer *buffer,
+                                                         struct wl_resource *buffer,
                                                          GError **error);
+CLUTTER_AVAILABLE_IN_1_8
 void          clutter_wayland_surface_damage_buffer     (ClutterWaylandSurface *self,
-                                                         struct wl_buffer *buffer,
+                                                         struct wl_resource *buffer,
                                                          gint32 x,
                                                          gint32 y,
                                                          gint32 width,
                                                          gint32 height);
+CLUTTER_AVAILABLE_IN_1_10
 CoglTexture  *clutter_wayland_surface_get_cogl_texture  (ClutterWaylandSurface *self);
 
 G_END_DECLS
diff --git a/clutter/wayland/clutter-wayland.h b/clutter/wayland/clutter-wayland.h
index b9ffb1bc4..08f63a8dd 100644
--- a/clutter/wayland/clutter-wayland.h
+++ b/clutter/wayland/clutter-wayland.h
@@ -40,9 +40,23 @@
 #include <clutter/clutter.h>
 G_BEGIN_DECLS
 
+CLUTTER_AVAILABLE_IN_1_10
 struct wl_seat *clutter_wayland_input_device_get_wl_seat (ClutterInputDevice *device);
-struct wl_shell_surface *clutter_wayland_stage_get_wl_shell_surface (ClutterStage *stage);
-struct wl_surface *clutter_wayland_stage_get_wl_surface (ClutterStage *stage);
-G_END_DECLS
 
+CLUTTER_AVAILABLE_IN_1_10
+struct wl_shell_surface *clutter_wayland_stage_get_wl_shell_surface (ClutterStage *stage);
+
+CLUTTER_AVAILABLE_IN_1_10
+struct wl_surface *clutter_wayland_stage_get_wl_surface (ClutterStage *stage);
+
+CLUTTER_AVAILABLE_IN_1_16
+void clutter_wayland_stage_set_wl_surface (ClutterStage *stage, struct wl_surface *surface);
+
+CLUTTER_AVAILABLE_IN_1_16
+void clutter_wayland_set_display (struct wl_display *display);
+
+CLUTTER_AVAILABLE_IN_1_16
+void clutter_wayland_disable_event_retrieval (void);
+
+G_END_DECLS
 #endif /* __CLUTTER_WAYLAND_H__ */
diff --git a/clutter/win32/clutter-backend-win32.c b/clutter/win32/clutter-backend-win32.c
index cb990797b..fc7c6042b 100644
--- a/clutter/win32/clutter-backend-win32.c
+++ b/clutter/win32/clutter-backend-win32.c
@@ -178,6 +178,24 @@ clutter_win32_disable_event_retrieval (void)
   _no_event_retrieval = TRUE;
 }
 
+static CoglRenderer *
+clutter_backend_win32_get_renderer (ClutterBackend  *backend,
+                                    GError         **error)
+{
+  CoglRenderer *renderer;
+
+  CLUTTER_NOTE (BACKEND, "Creating a new WGL renderer");
+
+  renderer = cogl_renderer_new ();
+  cogl_renderer_set_winsys_id (renderer, COGL_WINSYS_ID_WGL);
+
+  /* We don't want Cogl to install its default event handler because
+   * we'll handle them manually */
+  cogl_win32_renderer_set_event_retrieval_enabled (renderer, FALSE);
+
+  return renderer;
+}
+
 static void
 clutter_backend_win32_class_init (ClutterBackendWin32Class *klass)
 {
@@ -192,6 +210,7 @@ clutter_backend_win32_class_init (ClutterBackendWin32Class *klass)
 
   backend_class->init_events = clutter_backend_win32_init_events;
   backend_class->get_features = clutter_backend_win32_get_features;
+  backend_class->get_renderer = clutter_backend_win32_get_renderer;
 }
 
 static void
diff --git a/clutter/win32/clutter-event-win32.c b/clutter/win32/clutter-event-win32.c
index 504011114..7a360c625 100644
--- a/clutter/win32/clutter-event-win32.c
+++ b/clutter/win32/clutter-event-win32.c
@@ -294,8 +294,8 @@ clutter_event_dispatch (GSource     *source,
   if ((event = clutter_event_get ()))
     {
       /* forward the event into clutter for emission etc. */
-      clutter_do_event (event);
-      clutter_event_free (event);
+      if (event->any.stage)
+        _clutter_stage_queue_event (event->any.stage, event, FALSE);
     }
 
   _clutter_threads_release_lock ();
diff --git a/clutter/win32/clutter-stage-win32.c b/clutter/win32/clutter-stage-win32.c
index bcc39a7d3..cdc1fc69b 100644
--- a/clutter/win32/clutter-stage-win32.c
+++ b/clutter/win32/clutter-stage-win32.c
@@ -138,11 +138,26 @@ get_full_window_size (ClutterStageWin32 *stage_win32,
     = clutter_stage_get_user_resizable (stage_win32->wrapper);
   /* The window size passed to CreateWindow includes the window
      decorations */
-  *width_out = width_in + GetSystemMetrics (resizable ? SM_CXSIZEFRAME
-					    : SM_CXFIXEDFRAME) * 2;
-  *height_out = height_in + GetSystemMetrics (resizable ? SM_CYSIZEFRAME
-					      : SM_CYFIXEDFRAME) * 2
-    + GetSystemMetrics (SM_CYCAPTION);
+  gint frame_width, frame_height;
+
+#if !defined (_MSC_VER) || (_MSC_VER < 1700)
+  frame_width = GetSystemMetrics (resizable ? SM_CXSIZEFRAME : SM_CXFIXEDFRAME);
+  frame_height = GetSystemMetrics (resizable ? SM_CYSIZEFRAME : SM_CYFIXEDFRAME);
+#else
+  /* MSVC 2012 and later returns wrong values from GetSystemMetrics()
+   * http://connect.microsoft.com/VisualStudio/feedback/details/753224/regression-getsystemmetrics-delivers-different-values
+   *
+   * For AdjustWindowRectEx(), it doesn't matter much whether the Window is resizble.
+   */
+
+  RECT cxrect = {0, 0, 0, 0};
+  AdjustWindowRectEx (&cxrect, WS_POPUP | WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_THICKFRAME | WS_DLGFRAME, FALSE, 0);
+
+  frame_width = abs (cxrect.bottom);
+  frame_height = abs (cxrect.left);
+#endif
+  *width_out = width_in + frame_width * 2;
+  *height_out = height_in + frame_height * 2 + GetSystemMetrics (SM_CYCAPTION);
 }
 
 void
diff --git a/clutter/win32/clutter-win32.h b/clutter/win32/clutter-win32.h
index c6fd863dc..5112c3928 100644
--- a/clutter/win32/clutter-win32.h
+++ b/clutter/win32/clutter-win32.h
@@ -43,14 +43,19 @@
 
 G_BEGIN_DECLS
 
+CLUTTER_AVAILABLE_IN_ALL
 HWND          clutter_win32_get_stage_window        (ClutterStage *stage);
+CLUTTER_AVAILABLE_IN_ALL
 ClutterStage *clutter_win32_get_stage_from_window   (HWND          hwnd);
 
+CLUTTER_AVAILABLE_IN_ALL
 gboolean      clutter_win32_set_stage_foreign       (ClutterStage *stage,
                                                      HWND          hwnd);
 
+CLUTTER_AVAILABLE_IN_ALL
 void          clutter_win32_disable_event_retrieval (void);
 
+CLUTTER_AVAILABLE_IN_ALL
 gboolean      clutter_win32_handle_event            (const MSG *msg);
 
 G_END_DECLS
diff --git a/clutter/x11/clutter-backend-x11.c b/clutter/x11/clutter-backend-x11.c
index b7cfcc477..d52296677 100644
--- a/clutter/x11/clutter-backend-x11.c
+++ b/clutter/x11/clutter-backend-x11.c
@@ -50,10 +50,6 @@
 #include <X11/extensions/Xcomposite.h>
 #endif
 
-#if HAVE_XINPUT
-#include <X11/extensions/XInput.h>
-#endif
-
 #if HAVE_XINPUT_2
 #include <X11/extensions/XInput2.h>
 #endif
@@ -67,6 +63,7 @@
 #include "clutter-event-private.h"
 #include "clutter-main.h"
 #include "clutter-private.h"
+#include "clutter-settings-private.h"
 
 #define clutter_backend_x11_get_type    _clutter_backend_x11_get_type
 
@@ -128,10 +125,11 @@ cogl_xlib_filter (XEvent       *xevent,
                   ClutterEvent *event,
                   gpointer      data)
 {
+  ClutterBackend *backend = data;
   ClutterX11FilterReturn retval;
   CoglFilterReturn ret;
 
-  ret = cogl_xlib_handle_event (xevent);
+  ret = cogl_xlib_renderer_handle_event (backend->cogl_renderer, xevent);
   switch (ret)
     {
     case COGL_FILTER_REMOVE:
@@ -168,7 +166,7 @@ clutter_backend_x11_xsettings_notify (const char       *name,
     {
       if (g_strcmp0 (name, CLUTTER_SETTING_X11_NAME (i)) == 0)
         {
-          GValue value = { 0, };
+          GValue value = G_VALUE_INIT;
 
           switch (setting->type)
             {
@@ -206,9 +204,9 @@ clutter_backend_x11_xsettings_notify (const char       *name,
                         CLUTTER_SETTING_X11_NAME (i),
                         CLUTTER_SETTING_PROPERTY (i));
 
-          g_object_set_property (G_OBJECT (settings),
-                                 CLUTTER_SETTING_PROPERTY (i),
-                                 &value);
+          clutter_settings_set_property_internal (settings,
+                                                  CLUTTER_SETTING_PROPERTY (i),
+                                                  &value);
 
           g_value_unset (&value);
 
@@ -222,71 +220,55 @@ clutter_backend_x11_xsettings_notify (const char       *name,
 static void
 clutter_backend_x11_create_device_manager (ClutterBackendX11 *backend_x11)
 {
-  if (G_UNLIKELY (backend_x11->device_manager == NULL))
-    {
-      ClutterEventTranslator *translator;
-      ClutterBackend *backend;
+  ClutterEventTranslator *translator;
+  ClutterBackend *backend;
 
-#if defined(HAVE_XINPUT) || defined(HAVE_XINPUT_2)
-      if (clutter_enable_xinput)
-        {
-          int event_base, first_event, first_error;
-
-          if (XQueryExtension (backend_x11->xdpy, "XInputExtension",
-                               &event_base,
-                               &first_event,
-                               &first_error))
-            {
 #ifdef HAVE_XINPUT_2
-              int major = 2;
-              int minor = 3;
+  if (clutter_enable_xinput)
+    {
+      int event_base, first_event, first_error;
 
-              if (XIQueryVersion (backend_x11->xdpy, &major, &minor) != BadRequest)
-                {
-                  CLUTTER_NOTE (BACKEND, "Creating XI2 device manager");
-                  backend_x11->has_xinput = TRUE;
-                  backend_x11->device_manager =
-                    g_object_new (CLUTTER_TYPE_DEVICE_MANAGER_XI2,
-                                  "backend", backend_x11,
-                                  "opcode", event_base,
-                                  NULL);
+      if (XQueryExtension (backend_x11->xdpy, "XInputExtension",
+                           &event_base,
+                           &first_event,
+                           &first_error))
+        {
+          int major = 2;
+          int minor = 3;
 
-                  backend_x11->xi_minor = minor;
-                }
-              else
-#endif /* HAVE_XINPUT_2 */
-                {
-                  CLUTTER_NOTE (BACKEND, "Creating Core+XI device manager");
-                  backend_x11->has_xinput = TRUE;
-                  backend_x11->device_manager =
-                    g_object_new (CLUTTER_TYPE_DEVICE_MANAGER_X11,
-                                  "backend", backend_x11,
-                                  "event-base", first_event,
-                                  NULL);
+          if (XIQueryVersion (backend_x11->xdpy, &major, &minor) != BadRequest)
+            {
+              CLUTTER_NOTE (BACKEND, "Creating XI2 device manager");
+              backend_x11->has_xinput = TRUE;
+              backend_x11->device_manager =
+                g_object_new (CLUTTER_TYPE_DEVICE_MANAGER_XI2,
+                              "backend", backend_x11,
+                              "opcode", event_base,
+                              NULL);
 
-                  backend_x11->xi_minor = -1;
-                }
+              backend_x11->xi_minor = minor;
             }
         }
-      else
-#endif /* HAVE_XINPUT || HAVE_XINPUT_2 */
-        {
-          CLUTTER_NOTE (BACKEND, "Creating Core device manager");
-          backend_x11->has_xinput = FALSE;
-          backend_x11->device_manager =
-            g_object_new (CLUTTER_TYPE_DEVICE_MANAGER_X11,
-                          "backend", backend_x11,
-                          NULL);
-
-          backend_x11->xi_minor = -1;
-        }
-
-      backend = CLUTTER_BACKEND (backend_x11);
-      backend->device_manager = backend_x11->device_manager;
-
-      translator = CLUTTER_EVENT_TRANSLATOR (backend_x11->device_manager);
-      _clutter_backend_add_event_translator (backend, translator);
     }
+
+  if (backend_x11->device_manager == NULL)
+#endif /* HAVE_XINPUT_2 */
+    {
+      CLUTTER_NOTE (BACKEND, "Creating Core device manager");
+      backend_x11->has_xinput = FALSE;
+      backend_x11->device_manager =
+        g_object_new (CLUTTER_TYPE_DEVICE_MANAGER_X11,
+                      "backend", backend_x11,
+                      NULL);
+
+      backend_x11->xi_minor = -1;
+    }
+
+  backend = CLUTTER_BACKEND (backend_x11);
+  backend->device_manager = backend_x11->device_manager;
+
+  translator = CLUTTER_EVENT_TRANSLATOR (backend_x11->device_manager);
+  _clutter_backend_add_event_translator (backend, translator);
 }
 
 static void
@@ -391,7 +373,7 @@ clutter_backend_x11_post_parse (ClutterBackend  *backend,
   settings = clutter_settings_get_default ();
 
   /* add event filter for Cogl events */
-  clutter_x11_add_filter (cogl_xlib_filter, NULL);
+  clutter_x11_add_filter (cogl_xlib_filter, backend);
 
   if (clutter_screen == -1)
     backend_x11->xscreen = DefaultScreenOfDisplay (backend_x11->xdpy);
@@ -517,14 +499,14 @@ static const GOptionEntry entries[] =
     G_OPTION_ARG_NONE, &clutter_synchronise,
     N_("Make X calls synchronous"), NULL
   },
-#if defined(HAVE_XINPUT) || defined(HAVE_XINPUT_2)
+#ifdef HAVE_XINPUT_2
   {
     "disable-xinput", 0,
     G_OPTION_FLAG_REVERSE,
     G_OPTION_ARG_NONE, &clutter_enable_xinput,
     N_("Disable XInput support"), NULL
   },
-#endif /* HAVE_XINPUT */
+#endif /* HAVE_XINPUT_2 */
   { NULL }
 };
 
@@ -542,7 +524,7 @@ clutter_backend_x11_finalize (GObject *gobject)
 
   g_free (backend_x11->display_name);
 
-  clutter_x11_remove_filter (cogl_xlib_filter, NULL);
+  clutter_x11_remove_filter (cogl_xlib_filter, gobject);
 
   clutter_x11_remove_filter (xsettings_filter, backend_x11);
   _clutter_xsettings_client_destroy (backend_x11->xsettings);
@@ -785,7 +767,7 @@ clutter_backend_x11_create_stage (ClutterBackend  *backend,
   translator = CLUTTER_EVENT_TRANSLATOR (stage);
   _clutter_backend_add_event_translator (backend, translator);
 
-  CLUTTER_NOTE (MISC, "X11 stage created (display:%p, screen:%d, root:%u)",
+  CLUTTER_NOTE (BACKEND, "X11 stage created (display:%p, screen:%d, root:%u)",
                 CLUTTER_BACKEND_X11 (backend)->xdpy,
                 CLUTTER_BACKEND_X11 (backend)->xscreen_num,
                 (unsigned int) CLUTTER_BACKEND_X11 (backend)->xwin_root);
@@ -793,6 +775,17 @@ clutter_backend_x11_create_stage (ClutterBackend  *backend,
   return stage;
 }
 
+static PangoDirection
+clutter_backend_x11_get_keymap_direction (ClutterBackend *backend)
+{
+  ClutterBackendX11 *backend_x11 = CLUTTER_BACKEND_X11 (backend);
+
+  if (G_UNLIKELY (backend_x11->keymap == NULL))
+    return PANGO_DIRECTION_NEUTRAL;
+
+  return _clutter_keymap_x11_get_direction (backend_x11->keymap);
+}
+
 static void
 clutter_backend_x11_class_init (ClutterBackendX11Class *klass)
 {
@@ -816,6 +809,8 @@ clutter_backend_x11_class_init (ClutterBackendX11Class *klass)
   backend_class->get_renderer = clutter_backend_x11_get_renderer;
   backend_class->get_display = clutter_backend_x11_get_display;
   backend_class->create_stage = clutter_backend_x11_create_stage;
+
+  backend_class->get_keymap_direction = clutter_backend_x11_get_keymap_direction;
 }
 
 static void
@@ -955,15 +950,14 @@ clutter_x11_enable_xinput (void)
  * You also must call clutter_x11_handle_event() to let Clutter process
  * events and maintain its internal state.
  *
- * <warning>This function can only be called before calling
- * clutter_init().</warning>
+ * This function can only be called before calling clutter_init().
  *
- * <note>Even with event handling disabled, Clutter will still select
+ * Even with event handling disabled, Clutter will still select
  * all the events required to maintain its internal state on the stage
  * Window; compositors using Clutter and input regions to pass events
  * through to application windows should not rely on an empty input
  * region, and should instead clear it themselves explicitly using the
- * XFixes extension.</note>
+ * XFixes extension.
  *
  * This function should not be normally used by applications.
  *
@@ -1191,7 +1185,7 @@ clutter_x11_get_input_devices (void)
 gboolean
 clutter_x11_has_xinput (void)
 {
-#if defined(HAVE_XINPUT) || defined(HAVE_XINPUT_2)
+#ifdef HAVE_XINPUT_2
  ClutterBackend *backend = clutter_get_default_backend ();
 
   if (backend == NULL)
@@ -1268,13 +1262,13 @@ clutter_x11_has_composite_extension (void)
  *
  * By default, Clutter requests RGB visuals.
  *
- * <note>If no ARGB visuals are found, the X11 backend will fall back to
- * requesting a RGB visual instead.</note>
+ * If no ARGB visuals are found, the X11 backend will fall back to
+ * requesting a RGB visual instead.
  *
  * ARGB visuals are required for the #ClutterStage:use-alpha property to work.
  *
- * <note>This function can only be called once, and before clutter_init() is
- * called.</note>
+ * This function can only be called once, and before clutter_init() is
+ * called.
  *
  * Since: 1.2
  */
@@ -1363,11 +1357,8 @@ _clutter_x11_input_device_translate_screen_coord (ClutterInputDevice *device,
     return FALSE;
 
   info = &g_array_index (device->axes, ClutterAxisInfo, index_);
-  if (info->axis != CLUTTER_INPUT_AXIS_X ||
-      info->axis != CLUTTER_INPUT_AXIS_Y)
-    {
-      return FALSE;
-    }
+  if (!(info->axis == CLUTTER_INPUT_AXIS_X || info->axis == CLUTTER_INPUT_AXIS_Y))
+    return FALSE;
 
   width = info->max_value - info->min_value;
 
diff --git a/clutter/x11/clutter-device-manager-core-x11.c b/clutter/x11/clutter-device-manager-core-x11.c
index f4701893b..f47e3b888 100644
--- a/clutter/x11/clutter-device-manager-core-x11.c
+++ b/clutter/x11/clutter-device-manager-core-x11.c
@@ -37,17 +37,6 @@
 #include "clutter-stage-private.h"
 #include "clutter-private.h"
 
-#ifdef HAVE_XINPUT
-#include <X11/extensions/XInput.h>
-
-/* old versions of XI.h don't define these */
-#ifndef IsXExtensionKeyboard
-#define IsXExtensionKeyboard 3
-#define IsXExtensionPointer  4
-#endif
-
-#endif /* HAVE_XINPUT */
-
 enum
 {
   PROP_0,
@@ -69,146 +58,6 @@ G_DEFINE_TYPE_WITH_CODE (ClutterDeviceManagerX11,
                          G_IMPLEMENT_INTERFACE (CLUTTER_TYPE_EVENT_TRANSLATOR,
                                                 clutter_event_translator_iface_init));
 
-#ifdef HAVE_XINPUT
-static void
-translate_class_info (ClutterInputDevice *device,
-                      XDeviceInfo        *info)
-{
-  XAnyClassPtr any_class;
-  gint i;
-
-  any_class = info->inputclassinfo;
-
-  for (i = 0; i < info->num_classes; i++)
-    {
-      switch (any_class->class)
-        {
-        case ButtonClass:
-          break;
-
-        case KeyClass:
-          {
-            XKeyInfo *xk_info = (XKeyInfo *) any_class;
-            ClutterInputDeviceX11 *device_x11;
-            guint n_keys;
-
-            device_x11 = CLUTTER_INPUT_DEVICE_X11 (device);
-
-            n_keys = xk_info->max_keycode - xk_info->min_keycode + 1;
-
-            _clutter_input_device_set_n_keys (device, n_keys);
-            _clutter_input_device_x11_set_keycodes (device_x11,
-                                                    xk_info->min_keycode,
-                                                    xk_info->max_keycode);
-          }
-          break;
-
-        case ValuatorClass:
-          {
-            XValuatorInfo *xv_info = (XValuatorInfo *) any_class;
-            gint j;
-
-            for (j = 0; j < xv_info->num_axes; j++)
-              {
-                ClutterInputAxis axis;
-
-                switch (j)
-                  {
-                  case 0:
-                    axis = CLUTTER_INPUT_AXIS_X;
-                    break;
-
-                  case 1:
-                    axis = CLUTTER_INPUT_AXIS_Y;
-                    break;
-
-                  case 2:
-                    axis = CLUTTER_INPUT_AXIS_PRESSURE;
-                    break;
-
-                  case 3:
-                    axis = CLUTTER_INPUT_AXIS_XTILT;
-                    break;
-
-                  case 4:
-                    axis = CLUTTER_INPUT_AXIS_YTILT;
-                    break;
-
-                  case 5:
-                    axis = CLUTTER_INPUT_AXIS_WHEEL;
-                    break;
-
-                  default:
-                    axis = CLUTTER_INPUT_AXIS_IGNORE;
-                    break;
-                  }
-
-                _clutter_input_device_add_axis (device, axis,
-                                                xv_info->axes[j].min_value,
-                                                xv_info->axes[j].max_value,
-                                                xv_info->axes[j].resolution);
-              }
-          }
-          break;
-        }
-
-      any_class = (XAnyClassPtr) (((char *) any_class) + any_class->length);
-    }
-}
-
-static ClutterInputDevice *
-create_device (ClutterDeviceManagerX11 *manager_x11,
-               ClutterBackendX11       *backend_x11,
-               XDeviceInfo             *info)
-{
-  ClutterInputDeviceType source;
-  ClutterInputDevice *retval;
-
-  if (info->use != IsXExtensionPointer &&
-      info->use != IsXExtensionKeyboard)
-    return NULL;
-
-  if (info->use == IsXExtensionKeyboard)
-    source = CLUTTER_KEYBOARD_DEVICE;
-  else
-    {
-      gchar *name;
-
-      name = g_ascii_strdown (info->name, -1);
-
-      if (strstr (name, "eraser") != NULL)
-        source = CLUTTER_ERASER_DEVICE;
-      else if (strstr (name, "cursor") != NULL)
-        source = CLUTTER_CURSOR_DEVICE;
-      else if (strstr (name, "wacom") != NULL || strstr (name, "pen") != NULL)
-        source = CLUTTER_PEN_DEVICE;
-      else
-        source = CLUTTER_POINTER_DEVICE;
-
-      g_free (name);
-    }
-
-  retval = g_object_new (CLUTTER_TYPE_INPUT_DEVICE_X11,
-                         "name", info->name,
-                         "id", info->id,
-                         "has-cursor", FALSE,
-                         "device-manager", manager_x11,
-                         "device-type", source,
-                         "device-mode", CLUTTER_INPUT_MODE_FLOATING,
-                         "backend", backend_x11,
-                         "enabled", FALSE,
-                         NULL);
-  translate_class_info (retval, info);
-
-  CLUTTER_NOTE (BACKEND,
-                "XI Device '%s' (id: %d) created",
-                info->name,
-                (int) info->id);
-
-  return retval;
-}
-#endif /* HAVE_XINPUT */
-
 static inline void
 translate_key_event (ClutterBackendX11       *backend_x11,
                      ClutterDeviceManagerX11 *manager_x11,
@@ -275,20 +124,6 @@ out:
   return;
 }
 
-#ifdef HAVE_XINPUT
-static ClutterInputDevice *
-get_device_from_event (ClutterDeviceManagerX11 *manager_x11,
-                       XEvent                  *xevent)
-{
-  guint32 device_id;
-
-  device_id = ((XDeviceButtonEvent *) xevent)->deviceid;
-
-  return g_hash_table_lookup (manager_x11->devices_by_id,
-                              GINT_TO_POINTER (device_id));
-}
-#endif /* HAVE_XINPUT */
-
 static ClutterTranslateReturn
 clutter_device_manager_x11_translate_event (ClutterEventTranslator *translator,
                                             gpointer                native,
@@ -300,9 +135,7 @@ clutter_device_manager_x11_translate_event (ClutterEventTranslator *translator,
   ClutterTranslateReturn res;
   ClutterStage *stage;
   XEvent *xevent;
-#ifdef HAVE_XINPUT
-  ClutterInputDevice *device;
-#endif
+  int window_scale;
 
   manager_x11 = CLUTTER_DEVICE_MANAGER_X11 (translator);
   backend_x11 = CLUTTER_BACKEND_X11 (clutter_get_default_backend ());
@@ -318,27 +151,12 @@ clutter_device_manager_x11_translate_event (ClutterEventTranslator *translator,
 
   stage_x11 = CLUTTER_STAGE_X11 (_clutter_stage_get_window (stage));
 
+  window_scale = stage_x11->scale_factor;
+
   event->any.stage = stage;
 
   res = CLUTTER_TRANSLATE_CONTINUE;
 
-#ifdef HAVE_XINPUT
-  device = get_device_from_event (manager_x11, xevent);
-  if (device != NULL)
-    {
-      ClutterInputDeviceX11 *device_x11;
-      gboolean retval;
-
-      device_x11 = CLUTTER_INPUT_DEVICE_X11 (device);
-      retval = _clutter_input_device_x11_translate_xi_event (device_x11,
-                                                             stage_x11,
-                                                             xevent,
-                                                             event);
-      if (retval)
-        return CLUTTER_TRANSLATE_QUEUE;
-    }
-#endif /* HAVE_XINPUT */
-
   switch (xevent->type)
     {
     case KeyPress:
@@ -407,8 +225,8 @@ clutter_device_manager_x11_translate_event (ClutterEventTranslator *translator,
             event->scroll.direction = CLUTTER_SCROLL_RIGHT;
 
           event->scroll.time = xevent->xbutton.time;
-          event->scroll.x = xevent->xbutton.x;
-          event->scroll.y = xevent->xbutton.y;
+          event->scroll.x = xevent->xbutton.x / window_scale;
+          event->scroll.y = xevent->xbutton.y / window_scale;
           event->scroll.modifier_state = xevent->xbutton.state;
           event->scroll.axes = NULL;
           break;
@@ -416,8 +234,8 @@ clutter_device_manager_x11_translate_event (ClutterEventTranslator *translator,
         default:
           event->button.type = event->type = CLUTTER_BUTTON_PRESS;
           event->button.time = xevent->xbutton.time;
-          event->button.x = xevent->xbutton.x;
-          event->button.y = xevent->xbutton.y;
+          event->button.x = xevent->xbutton.x / window_scale;
+          event->button.y = xevent->xbutton.y / window_scale;
           event->button.modifier_state = xevent->xbutton.state;
           event->button.button = xevent->xbutton.button;
           event->button.axes = NULL;
@@ -450,8 +268,8 @@ clutter_device_manager_x11_translate_event (ClutterEventTranslator *translator,
 
       event->button.type = event->type = CLUTTER_BUTTON_RELEASE;
       event->button.time = xevent->xbutton.time;
-      event->button.x = xevent->xbutton.x;
-      event->button.y = xevent->xbutton.y;
+      event->button.x = xevent->xbutton.x / window_scale;
+      event->button.y = xevent->xbutton.y / window_scale;
       event->button.modifier_state = xevent->xbutton.state;
       event->button.button = xevent->xbutton.button;
       event->button.axes = NULL;
@@ -468,8 +286,8 @@ clutter_device_manager_x11_translate_event (ClutterEventTranslator *translator,
 
       event->motion.type = event->type = CLUTTER_MOTION;
       event->motion.time = xevent->xmotion.time;
-      event->motion.x = xevent->xmotion.x;
-      event->motion.y = xevent->xmotion.y;
+      event->motion.x = xevent->xmotion.x / window_scale;
+      event->motion.y = xevent->xmotion.y / window_scale;
       event->motion.modifier_state = xevent->xmotion.state;
       event->motion.axes = NULL;
       clutter_event_set_device (event, manager_x11->core_pointer);
@@ -482,8 +300,8 @@ clutter_device_manager_x11_translate_event (ClutterEventTranslator *translator,
 
       event->crossing.type = CLUTTER_ENTER;
       event->crossing.time = xevent->xcrossing.time;
-      event->crossing.x = xevent->xcrossing.x;
-      event->crossing.y = xevent->xcrossing.y;
+      event->crossing.x = xevent->xcrossing.x / window_scale;
+      event->crossing.y = xevent->xcrossing.y / window_scale;
       event->crossing.source = CLUTTER_ACTOR (stage);
       event->crossing.related = NULL;
       clutter_event_set_device (event, manager_x11->core_pointer);
@@ -508,8 +326,8 @@ clutter_device_manager_x11_translate_event (ClutterEventTranslator *translator,
 
       event->crossing.type = CLUTTER_LEAVE;
       event->crossing.time = xevent->xcrossing.time;
-      event->crossing.x = xevent->xcrossing.x;
-      event->crossing.y = xevent->xcrossing.y;
+      event->crossing.x = xevent->xcrossing.x / window_scale;
+      event->crossing.y = xevent->xcrossing.y / window_scale;
       event->crossing.source = CLUTTER_ACTOR (stage);
       event->crossing.related = NULL;
       clutter_event_set_device (event, manager_x11->core_pointer);
@@ -537,57 +355,12 @@ clutter_device_manager_x11_constructed (GObject *gobject)
 {
   ClutterDeviceManagerX11 *manager_x11;
   ClutterBackendX11 *backend_x11;
-#ifdef HAVE_XINPUT
-  ClutterDeviceManager *manager;
-  XDeviceInfo *x_devices = NULL;
-  int i, n_devices;
-#endif /* HAVE_XINPUT */
 
   manager_x11 = CLUTTER_DEVICE_MANAGER_X11 (gobject);
 
   g_object_get (gobject, "backend", &backend_x11, NULL);
   g_assert (backend_x11 != NULL);
 
-#ifdef HAVE_XINPUT
-  manager = CLUTTER_DEVICE_MANAGER (gobject);
-  x_devices = XListInputDevices (backend_x11->xdpy, &n_devices);
-  if (n_devices == 0)
-    {
-      CLUTTER_NOTE (BACKEND, "No XInput devices found");
-      goto default_device;
-    }
-
-  for (i = 0; i < n_devices; i++)
-    {
-      XDeviceInfo *info = x_devices + i;
-      ClutterInputDevice *device;
-
-      CLUTTER_NOTE (BACKEND,
-                    "Considering device %li with type %d, %d of %d",
-                    info->id,
-                    info->use,
-                    i, n_devices);
-
-      device = create_device (manager_x11, backend_x11, info);
-      if (device != NULL)
-        _clutter_device_manager_add_device (manager, device);
-    }
-
-  XFreeDeviceList (x_devices);
-
-default_device:
-#endif /* HAVE_XINPUT */
-
-  /* fallback code in case:
-   *
-   *  - we do not have XInput support compiled in
-   *  - we do not have the XInput extension
-   *
-   * we register two default devices, one for the pointer
-   * and one for the keyboard. this block must also be
-   * executed for the XInput support because XI does not
-   * cover core devices
-   */
   manager_x11->core_pointer =
     g_object_new (CLUTTER_TYPE_INPUT_DEVICE_X11,
                   "name", "Core Pointer",
diff --git a/clutter/x11/clutter-device-manager-xi2.c b/clutter/x11/clutter-device-manager-xi2.c
index 6a06cec0d..223e87515 100644
--- a/clutter/x11/clutter-device-manager-xi2.c
+++ b/clutter/x11/clutter-device-manager-xi2.c
@@ -254,6 +254,8 @@ create_device (ClutterDeviceManagerXI2 *manager_xi2,
         source = CLUTTER_CURSOR_DEVICE;
       else if (strstr (name, "wacom") != NULL || strstr (name, "pen") != NULL)
         source = CLUTTER_PEN_DEVICE;
+      else if (strstr (name, "touchpad") != NULL)
+        source = CLUTTER_TOUCHPAD_DEVICE;
       else
         source = CLUTTER_POINTER_DEVICE;
 
@@ -319,7 +321,7 @@ add_device (ClutterDeviceManagerXI2 *manager_xi2,
    */
   g_hash_table_replace (manager_xi2->devices_by_id,
                         GINT_TO_POINTER (info->deviceid),
-                        g_object_ref (device));
+                        device);
 
   if (info->use == XIMasterPointer ||
       info->use == XIMasterKeyboard)
@@ -401,17 +403,25 @@ translate_hierarchy_event (ClutterBackendX11       *backend_x11,
 
   for (i = 0; i < ev->num_info; i++)
     {
-      if (ev->info[i].flags & XIDeviceEnabled)
+      if (ev->info[i].flags & XIDeviceEnabled &&
+          !g_hash_table_lookup (manager_xi2->devices_by_id,
+                                GINT_TO_POINTER (ev->info[i].deviceid)))
         {
           XIDeviceInfo *info;
           int n_devices;
 
           CLUTTER_NOTE (EVENT, "Hierarchy event: device enabled");
 
+          clutter_x11_trap_x_errors ();
           info = XIQueryDevice (backend_x11->xdpy,
                                 ev->info[i].deviceid,
                                 &n_devices);
-          add_device (manager_xi2, backend_x11, &info[0], FALSE);
+          clutter_x11_untrap_x_errors ();
+          if (info != NULL)
+            {
+              add_device (manager_xi2, backend_x11, &info[0], FALSE);
+              XIFreeDeviceInfo (info);
+            }
         }
       else if (ev->info[i].flags & XIDeviceDisabled)
         {
@@ -448,16 +458,24 @@ translate_hierarchy_event (ClutterBackendX11       *backend_x11,
           /* and attach the slave to the new master if needed */
           if (ev->info[i].flags & XISlaveAttached)
             {
+              clutter_x11_trap_x_errors ();
               info = XIQueryDevice (backend_x11->xdpy,
                                     ev->info[i].deviceid,
                                     &n_devices);
-              master = g_hash_table_lookup (manager_xi2->devices_by_id,
-                                            GINT_TO_POINTER (info->attachment));
-              _clutter_input_device_set_associated_device (slave, master);
-              _clutter_input_device_add_slave (master, slave);
+              clutter_x11_untrap_x_errors ();
+              if (info != NULL)
+                {
+                  master = g_hash_table_lookup (manager_xi2->devices_by_id,
+                                                GINT_TO_POINTER (info->attachment));
+                  if (master != NULL)
+                    {
+                      _clutter_input_device_set_associated_device (slave, master);
+                      _clutter_input_device_add_slave (master, slave);
 
-              send_changed = TRUE;
-              XIFreeDeviceInfo (info);
+                      send_changed = TRUE;
+                    }
+                  XIFreeDeviceInfo (info);
+                }
             }
 
           if (send_changed)
@@ -588,7 +606,6 @@ static gdouble *
 translate_axes (ClutterInputDevice *device,
                 gdouble             x,
                 gdouble             y,
-                ClutterStageX11    *stage_x11,
                 XIValuatorState    *valuators)
 {
   guint n_axes = clutter_input_device_get_n_axes (device);
@@ -629,6 +646,24 @@ translate_axes (ClutterInputDevice *device,
   return retval;
 }
 
+static void
+translate_coords (ClutterStageX11 *stage_x11,
+                  gdouble          event_x,
+                  gdouble          event_y,
+                  gfloat          *x_out,
+                  gfloat          *y_out)
+{
+  ClutterStageCogl *stage_cogl = CLUTTER_STAGE_COGL (stage_x11);
+  ClutterActor *stage = CLUTTER_ACTOR (stage_cogl->wrapper);
+  gfloat stage_width;
+  gfloat stage_height;
+
+  clutter_actor_get_size (stage, &stage_width, &stage_height);
+
+  *x_out = CLAMP (event_x, 0, stage_width)  / stage_x11->scale_factor;
+  *y_out = CLAMP (event_y, 0, stage_height) / stage_x11->scale_factor;
+}
+
 static gdouble
 scroll_valuators_changed (ClutterInputDevice *device,
                           XIValuatorState    *valuators,
@@ -674,6 +709,49 @@ scroll_valuators_changed (ClutterInputDevice *device,
   return retval;
 }
 
+static void
+clutter_device_manager_xi2_select_stage_events (ClutterDeviceManager *manager,
+                                                ClutterStage         *stage)
+{
+  ClutterBackendX11 *backend_x11;
+  ClutterStageX11 *stage_x11;
+  XIEventMask xi_event_mask;
+  unsigned char *mask;
+  int len;
+
+  backend_x11 = CLUTTER_BACKEND_X11 (clutter_get_default_backend ());
+  stage_x11 = CLUTTER_STAGE_X11 (_clutter_stage_get_window (stage));
+
+  len = XIMaskLen (XI_LASTEVENT);
+  mask = g_new0 (unsigned char, len);
+
+  XISetMask (mask, XI_Motion);
+  XISetMask (mask, XI_ButtonPress);
+  XISetMask (mask, XI_ButtonRelease);
+  XISetMask (mask, XI_KeyPress);
+  XISetMask (mask, XI_KeyRelease);
+  XISetMask (mask, XI_Enter);
+  XISetMask (mask, XI_Leave);
+
+#ifdef HAVE_XINPUT_2_2
+  /* enable touch event support if we're running on XInput 2.2 */
+  if (backend_x11->xi_minor >= 2)
+    {
+      XISetMask (mask, XI_TouchBegin);
+      XISetMask (mask, XI_TouchUpdate);
+      XISetMask (mask, XI_TouchEnd);
+    }
+#endif /* HAVE_XINPUT_2_2 */
+
+  xi_event_mask.deviceid = XIAllMasterDevices;
+  xi_event_mask.mask = mask;
+  xi_event_mask.mask_len = len;
+
+  XISelectEvents (backend_x11->xdpy, stage_x11->xwin, &xi_event_mask, 1);
+
+  g_free (mask);
+}
+
 static ClutterTranslateReturn
 clutter_device_manager_xi2_translate_event (ClutterEventTranslator *translator,
                                             gpointer                native,
@@ -764,8 +842,7 @@ clutter_device_manager_xi2_translate_event (ClutterEventTranslator *translator,
 
         event->key.time = xev->time;
         event->key.stage = stage;
-        event->key.modifier_state =
-          _clutter_input_device_xi2_translate_state (&xev->mods, &xev->buttons, &xev->group);
+	_clutter_input_device_xi2_translate_state (event, &xev->mods, &xev->buttons, &xev->group);
         event->key.hardware_keycode = xev->detail;
 
           /* keyval is the key ignoring all modifiers ('1' vs. '!') */
@@ -871,12 +948,11 @@ clutter_device_manager_xi2_translate_event (ClutterEventTranslator *translator,
             event->scroll.stage = stage;
 
             event->scroll.time = xev->time;
-            event->scroll.x = xev->event_x;
-            event->scroll.y = xev->event_y;
-            event->scroll.modifier_state =
-              _clutter_input_device_xi2_translate_state (&xev->mods,
-                                                         &xev->buttons,
-                                                         &xev->group);
+            translate_coords (stage_x11, xev->event_x, xev->event_y, &event->scroll.x, &event->scroll.y);
+	    _clutter_input_device_xi2_translate_state (event,
+						       &xev->mods,
+						       &xev->buttons,
+						       &xev->group);
 
             clutter_event_set_source_device (event, source_device);
             clutter_event_set_device (event, device);
@@ -884,7 +960,6 @@ clutter_device_manager_xi2_translate_event (ClutterEventTranslator *translator,
             event->scroll.axes = translate_axes (event->scroll.device,
                                                  event->scroll.x,
                                                  event->scroll.y,
-                                                 stage_x11,
                                                  &xev->valuators);
 
             CLUTTER_NOTE (EVENT,
@@ -919,13 +994,12 @@ clutter_device_manager_xi2_translate_event (ClutterEventTranslator *translator,
             event->button.stage = stage;
 
             event->button.time = xev->time;
-            event->button.x = xev->event_x;
-            event->button.y = xev->event_y;
+            translate_coords (stage_x11, xev->event_x, xev->event_y, &event->button.x, &event->button.y);
             event->button.button = xev->detail;
-            event->button.modifier_state =
-              _clutter_input_device_xi2_translate_state (&xev->mods,
-                                                         &xev->buttons,
-                                                         &xev->group);
+	    _clutter_input_device_xi2_translate_state (event,
+						       &xev->mods,
+						       &xev->buttons,
+						       &xev->group);
 
             clutter_event_set_source_device (event, source_device);
             clutter_event_set_device (event, device);
@@ -933,7 +1007,6 @@ clutter_device_manager_xi2_translate_event (ClutterEventTranslator *translator,
             event->button.axes = translate_axes (event->button.device,
                                                  event->button.x,
                                                  event->button.y,
-                                                 stage_x11,
                                                  &xev->valuators);
 
             CLUTTER_NOTE (EVENT,
@@ -1002,12 +1075,11 @@ clutter_device_manager_xi2_translate_event (ClutterEventTranslator *translator,
 
             event->scroll.stage = stage;
             event->scroll.time = xev->time;
-            event->scroll.x = xev->event_x;
-            event->scroll.y = xev->event_y;
-            event->scroll.modifier_state =
-              _clutter_input_device_xi2_translate_state (&xev->mods,
-                                                         &xev->buttons,
-                                                         &xev->group);
+            translate_coords (stage_x11, xev->event_x, xev->event_y, &event->scroll.x, &event->scroll.y);
+	    _clutter_input_device_xi2_translate_state (event,
+						       &xev->mods,
+						       &xev->buttons,
+						       &xev->group);
 
             clutter_event_set_scroll_delta (event, delta_x, delta_y);
             clutter_event_set_source_device (event, source_device);
@@ -1031,12 +1103,11 @@ clutter_device_manager_xi2_translate_event (ClutterEventTranslator *translator,
         event->motion.stage = stage;
 
         event->motion.time = xev->time;
-        event->motion.x = xev->event_x;
-        event->motion.y = xev->event_y;
-        event->motion.modifier_state =
-          _clutter_input_device_xi2_translate_state (&xev->mods,
-                                                     &xev->buttons,
-                                                     &xev->group);
+        translate_coords (stage_x11, xev->event_x, xev->event_y, &event->motion.x, &event->motion.y);
+	_clutter_input_device_xi2_translate_state (event,
+						   &xev->mods,
+						   &xev->buttons,
+						   &xev->group);
 
         clutter_event_set_source_device (event, source_device);
         clutter_event_set_device (event, device);
@@ -1044,7 +1115,6 @@ clutter_device_manager_xi2_translate_event (ClutterEventTranslator *translator,
         event->motion.axes = translate_axes (event->motion.device,
                                              event->motion.x,
                                              event->motion.y,
-                                             stage_x11,
                                              &xev->valuators);
 
         if (source_device != NULL && device->stage != NULL)
@@ -1069,6 +1139,14 @@ clutter_device_manager_xi2_translate_event (ClutterEventTranslator *translator,
 
 #ifdef HAVE_XINPUT_2_2
     case XI_TouchBegin:
+      {
+        XIDeviceEvent *xev = (XIDeviceEvent *) xi_event;
+        device = g_hash_table_lookup (manager_xi2->devices_by_id,
+                                      GINT_TO_POINTER (xev->deviceid));
+        if (!_clutter_input_device_get_stage (device))
+          _clutter_input_device_set_stage (device, stage);
+      }
+      /* Fall through */
     case XI_TouchEnd:
       {
         XIDeviceEvent *xev = (XIDeviceEvent *) xi_event;
@@ -1083,12 +1161,11 @@ clutter_device_manager_xi2_translate_event (ClutterEventTranslator *translator,
 
         event->touch.stage = stage;
         event->touch.time = xev->time;
-        event->touch.x = xev->event_x;
-        event->touch.y = xev->event_y;
-        event->touch.modifier_state =
-          _clutter_input_device_xi2_translate_state (&xev->mods,
-                                                     &xev->buttons,
-                                                     &xev->group);
+        translate_coords (stage_x11, xev->event_x, xev->event_y, &event->touch.x, &event->touch.y);
+	_clutter_input_device_xi2_translate_state (event,
+						   &xev->mods,
+						   &xev->buttons,
+						   &xev->group);
 
         clutter_event_set_source_device (event, source_device);
 
@@ -1099,7 +1176,6 @@ clutter_device_manager_xi2_translate_event (ClutterEventTranslator *translator,
         event->touch.axes = translate_axes (event->touch.device,
                                             event->motion.x,
                                             event->motion.y,
-                                            stage_x11,
                                             &xev->valuators);
 
         if (xi_event->evtype == XI_TouchBegin)
@@ -1139,8 +1215,7 @@ clutter_device_manager_xi2_translate_event (ClutterEventTranslator *translator,
         event->touch.stage = stage;
         event->touch.time = xev->time;
         event->touch.sequence = GUINT_TO_POINTER (xev->detail);
-        event->touch.x = xev->event_x;
-        event->touch.y = xev->event_y;
+        translate_coords (stage_x11, xev->event_x, xev->event_y, &event->touch.x, &event->touch.y);
 
         clutter_event_set_source_device (event, source_device);
 
@@ -1151,13 +1226,12 @@ clutter_device_manager_xi2_translate_event (ClutterEventTranslator *translator,
         event->touch.axes = translate_axes (event->touch.device,
                                             event->motion.x,
                                             event->motion.y,
-                                            stage_x11,
                                             &xev->valuators);
 
-        event->touch.modifier_state =
-          _clutter_input_device_xi2_translate_state (&xev->mods,
-                                                     &xev->buttons,
-                                                     &xev->group);
+	_clutter_input_device_xi2_translate_state (event,
+						   &xev->mods,
+						   &xev->buttons,
+						   &xev->group);
         event->touch.modifier_state |= CLUTTER_BUTTON1_MASK;
 
         if (xev->flags & XITouchEmulatingPointer)
@@ -1197,8 +1271,7 @@ clutter_device_manager_xi2_translate_event (ClutterEventTranslator *translator,
             event->crossing.related = NULL;
 
             event->crossing.time = xev->time;
-            event->crossing.x = xev->event_x;
-            event->crossing.y = xev->event_y;
+            translate_coords (stage_x11, xev->event_x, xev->event_y, &event->crossing.x, &event->crossing.y);
 
             _clutter_input_device_set_stage (device, stage);
           }
@@ -1221,8 +1294,7 @@ clutter_device_manager_xi2_translate_event (ClutterEventTranslator *translator,
             event->crossing.related = NULL;
 
             event->crossing.time = xev->time;
-            event->crossing.x = xev->event_x;
-            event->crossing.y = xev->event_y;
+            translate_coords (stage_x11, xev->event_x, xev->event_y, &event->crossing.x, &event->crossing.y);
 
             _clutter_input_device_set_stage (device, NULL);
           }
@@ -1301,25 +1373,29 @@ clutter_device_manager_xi2_get_core_device (ClutterDeviceManager   *manager,
                                             ClutterInputDeviceType  device_type)
 {
   ClutterDeviceManagerXI2 *manager_xi2 = CLUTTER_DEVICE_MANAGER_XI2 (manager);
-  ClutterBackendX11 *backend_x11;
-  ClutterInputDevice *device;
-  int device_id;
+  ClutterInputDevice *pointer = NULL;
+  GList *l;
 
-  backend_x11 =
-    CLUTTER_BACKEND_X11 (_clutter_device_manager_get_backend (manager));
+  for (l = manager_xi2->master_devices; l != NULL ; l = l->next)
+    {
+      ClutterInputDevice *device = l->data;
+      if (clutter_input_device_get_device_type (device) == CLUTTER_POINTER_DEVICE)
+        {
+          pointer = device;
+          break;
+        }
+    }
 
-  XIGetClientPointer (backend_x11->xdpy, None, &device_id);
-
-  device = g_hash_table_lookup (manager_xi2->devices_by_id,
-                                GINT_TO_POINTER (device_id));
+  if (pointer == NULL)
+    return NULL;
 
   switch (device_type)
     {
     case CLUTTER_POINTER_DEVICE:
-      return device;
+      return pointer;
 
     case CLUTTER_KEYBOARD_DEVICE:
-      return clutter_input_device_get_associated_device (device);
+      return clutter_input_device_get_associated_device (pointer);
 
     default:
       break;
@@ -1382,6 +1458,9 @@ clutter_device_manager_xi2_constructed (GObject *gobject)
     {
       XIDeviceInfo *xi_device = &info[i];
 
+      if (!xi_device->enabled)
+        continue;
+
       add_device (manager_xi2, backend_x11, xi_device, TRUE);
 
       if (xi_device->use == XIMasterPointer ||
@@ -1419,6 +1498,8 @@ clutter_device_manager_xi2_constructed (GObject *gobject)
                                             clutter_x11_get_root_window (),
                                             &event_mask);
 
+  XSync (backend_x11->xdpy, False);
+
   if (G_OBJECT_CLASS (clutter_device_manager_xi2_parent_class)->constructed)
     G_OBJECT_CLASS (clutter_device_manager_xi2_parent_class)->constructed (gobject);
 }
@@ -1469,6 +1550,7 @@ clutter_device_manager_xi2_class_init (ClutterDeviceManagerXI2Class *klass)
   manager_class->get_devices = clutter_device_manager_xi2_get_devices;
   manager_class->get_core_device = clutter_device_manager_xi2_get_core_device;
   manager_class->get_device = clutter_device_manager_xi2_get_device;
+  manager_class->select_stage_events = clutter_device_manager_xi2_select_stage_events;
 }
 
 static void
diff --git a/clutter/x11/clutter-device-manager-xi2.h b/clutter/x11/clutter-device-manager-xi2.h
index ec54cbdb4..2ceb623a6 100644
--- a/clutter/x11/clutter-device-manager-xi2.h
+++ b/clutter/x11/clutter-device-manager-xi2.h
@@ -49,8 +49,6 @@ struct _ClutterDeviceManagerXI2
   GList *master_devices;
   GList *slave_devices;
 
-  ClutterInputDevice *client_pointer;
-
   int opcode;
 };
 
diff --git a/clutter/x11/clutter-event-x11.c b/clutter/x11/clutter-event-x11.c
index 9eedbcd2a..3305063c3 100644
--- a/clutter/x11/clutter-event-x11.c
+++ b/clutter/x11/clutter-event-x11.c
@@ -34,6 +34,7 @@
 #include "clutter-event-private.h"
 #include "clutter-main.h"
 #include "clutter-private.h"
+#include "clutter-stage-private.h"
 
 #include <string.h>
 
@@ -220,8 +221,7 @@ clutter_x11_handle_event (XEvent *xevent)
   while (spin > 0 && (event = clutter_event_get ()))
     {
       /* forward the event into clutter for emission etc. */
-      clutter_do_event (event);
-      clutter_event_free (event);
+      _clutter_stage_queue_event (event->any.stage, event, FALSE);
       --spin;
     }
 
@@ -321,8 +321,7 @@ clutter_event_dispatch (GSource     *source,
   if (event != NULL)
     {
       /* forward the event into clutter for emission etc. */
-      clutter_do_event (event);
-      clutter_event_free (event);
+      _clutter_stage_queue_event (event->any.stage, event, FALSE);
     }
 
   _clutter_threads_release_lock ();
diff --git a/clutter/x11/clutter-glx-texture-pixmap.h b/clutter/x11/clutter-glx-texture-pixmap.h
index 1563f92de..ffc967087 100644
--- a/clutter/x11/clutter-glx-texture-pixmap.h
+++ b/clutter/x11/clutter-glx-texture-pixmap.h
@@ -73,6 +73,7 @@ struct _ClutterGLXTexturePixmap
   ClutterGLXTexturePixmapPrivate *priv;
 };
 
+CLUTTER_DEPRECATED_FOR(clutter_x11_texture_pixmap_get_type)
 GType clutter_glx_texture_pixmap_get_type (void);
 
 CLUTTER_DEPRECATED_FOR(clutter_x11_texture_pixmap_new)
diff --git a/clutter/x11/clutter-input-device-core-x11.c b/clutter/x11/clutter-input-device-core-x11.c
index 6c78a3024..c7eda97cf 100644
--- a/clutter/x11/clutter-input-device-core-x11.c
+++ b/clutter/x11/clutter-input-device-core-x11.c
@@ -33,12 +33,6 @@
 #include "clutter-backend-x11.h"
 #include "clutter-stage-x11.h"
 
-#ifdef HAVE_XINPUT
-#include <X11/extensions/XInput.h>
-#endif
-
-#define MAX_DEVICE_CLASSES      13
-
 typedef struct _ClutterInputDeviceClass         ClutterInputDeviceX11Class;
 
 /* a specific X11 input device */
@@ -46,22 +40,6 @@ struct _ClutterInputDeviceX11
 {
   ClutterInputDevice device;
 
-#ifdef HAVE_XINPUT
-  XDevice *xdevice;
-
-  XEventClass event_classes[MAX_DEVICE_CLASSES];
-  int num_classes;
-
-  int button_press_type;
-  int button_release_type;
-  int motion_notify_type;
-  int state_notify_type;
-  int key_press_type;
-  int key_release_type;
-#endif /* HAVE_XINPUT */
-
-  gint *axis_data;
-
   int min_keycode;
   int max_keycode;
 };
@@ -72,134 +50,6 @@ G_DEFINE_TYPE (ClutterInputDeviceX11,
                clutter_input_device_x11,
                CLUTTER_TYPE_INPUT_DEVICE);
 
-static void
-clutter_input_device_x11_select_stage_events (ClutterInputDevice *device,
-                                              ClutterStage       *stage,
-                                              gint                event_mask)
-{
-#if HAVE_XINPUT
-  ClutterBackendX11 *backend_x11 = CLUTTER_BACKEND_X11 (device->backend);
-  ClutterInputDeviceX11 *device_x11;
-  ClutterStageX11 *stage_x11;
-  XEventClass class;
-  gint i;
-
-  device_x11 = CLUTTER_INPUT_DEVICE_X11 (device);
-
-  stage_x11 = CLUTTER_STAGE_X11 (_clutter_stage_get_window (stage));
-
-  i = 0;
-
-  if (event_mask & ButtonPressMask)
-    {
-      DeviceButtonPress (device_x11->xdevice,
-                         device_x11->button_press_type,
-                         class);
-      if (class != 0)
-        device_x11->event_classes[i++] = class;
-
-      DeviceButtonPressGrab (device_x11->xdevice, 0, class);
-      if (class != 0)
-        device_x11->event_classes[i++] = class;
-    }
-
-  if (event_mask & ButtonReleaseMask)
-    {
-      DeviceButtonRelease (device_x11->xdevice,
-                           device_x11->button_release_type,
-                           class);
-      if (class != 0)
-        device_x11->event_classes[i++] = class;
-    }
-
-  if (event_mask & PointerMotionMask)
-    {
-      DeviceMotionNotify (device_x11->xdevice,
-                          device_x11->motion_notify_type,
-                          class);
-      if (class != 0)
-        device_x11->event_classes[i++] = class;
-
-      DeviceStateNotify (device_x11->xdevice,
-                         device_x11->state_notify_type,
-                         class);
-      if (class != 0)
-        device_x11->event_classes[i++] = class;
-    }
-
-  if (event_mask & KeyPressMask)
-    {
-      DeviceKeyPress (device_x11->xdevice,
-                      device_x11->key_press_type,
-                      class);
-      if (class != 0)
-        device_x11->event_classes[i++] = class;
-    }
-
-  if (event_mask & KeyReleaseMask)
-    {
-      DeviceKeyRelease (device_x11->xdevice,
-                        device_x11->key_release_type,
-                        class);
-      if (class != 0)
-        device_x11->event_classes[i++] = class;
-    }
-
-  device_x11->num_classes = i;
-
-  XSelectExtensionEvent (backend_x11->xdpy,
-                         stage_x11->xwin,
-                         device_x11->event_classes,
-                         device_x11->num_classes);
-#endif /* HAVE_XINPUT */
-}
-
-static void
-clutter_input_device_x11_dispose (GObject *gobject)
-{
-  ClutterInputDeviceX11 *device_x11 = CLUTTER_INPUT_DEVICE_X11 (gobject);
-
-#ifdef HAVE_XINPUT
-  if (device_x11->xdevice)
-    {
-      ClutterInputDevice *device = CLUTTER_INPUT_DEVICE (gobject);
-      ClutterBackendX11 *backend_x11 = CLUTTER_BACKEND_X11 (device->backend);
-
-      XCloseDevice (backend_x11->xdpy, device_x11->xdevice);
-      device_x11->xdevice = NULL;
-    }
-#endif /* HAVE_XINPUT */
-
-  g_free (device_x11->axis_data);
-
-  G_OBJECT_CLASS (clutter_input_device_x11_parent_class)->dispose (gobject);
-}
-
-static void
-clutter_input_device_x11_constructed (GObject *gobject)
-{
-#ifdef HAVE_XINPUT
-  ClutterInputDeviceX11 *device_x11 = CLUTTER_INPUT_DEVICE_X11 (gobject);
-  ClutterInputDevice *device = CLUTTER_INPUT_DEVICE (gobject);
-  ClutterBackendX11 *backend_x11;
-
-  backend_x11 = CLUTTER_BACKEND_X11 (device->backend);
-
-  clutter_x11_trap_x_errors ();
-
-  device_x11->xdevice = XOpenDevice (backend_x11->xdpy, device->id);
-
-  if (clutter_x11_untrap_x_errors ())
-    {
-      g_warning ("Device '%s' cannot be opened",
-                 clutter_input_device_get_device_name (device));
-    }
-#endif /* HAVE_XINPUT */
-
-  if (G_OBJECT_CLASS (clutter_input_device_x11_parent_class)->constructed)
-    G_OBJECT_CLASS (clutter_input_device_x11_parent_class)->constructed (gobject);
-}
-
 static gboolean
 clutter_input_device_x11_keycode_to_evdev (ClutterInputDevice *device,
                                            guint hardware_keycode,
@@ -217,13 +67,8 @@ clutter_input_device_x11_keycode_to_evdev (ClutterInputDevice *device,
 static void
 clutter_input_device_x11_class_init (ClutterInputDeviceX11Class *klass)
 {
-  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
   ClutterInputDeviceClass *device_class = CLUTTER_INPUT_DEVICE_CLASS (klass);
 
-  gobject_class->constructed = clutter_input_device_x11_constructed;
-  gobject_class->dispose = clutter_input_device_x11_dispose;
-
-  device_class->select_stage_events = clutter_input_device_x11_select_stage_events;
   device_class->keycode_to_evdev = clutter_input_device_x11_keycode_to_evdev;
 }
 
@@ -231,243 +76,3 @@ static void
 clutter_input_device_x11_init (ClutterInputDeviceX11 *self)
 {
 }
-
-void
-_clutter_input_device_x11_set_keycodes (ClutterInputDeviceX11 *device_x11,
-                                        int                    min_keycode,
-                                        int                    max_keycode)
-{
-  device_x11->min_keycode = min_keycode;
-  device_x11->max_keycode = max_keycode;
-}
-
-int
-_clutter_input_device_x11_get_min_keycode (ClutterInputDeviceX11 *device_x11)
-{
-  return device_x11->min_keycode;
-}
-
-int
-_clutter_input_device_x11_get_max_keycode (ClutterInputDeviceX11 *device_x11)
-{
-  return device_x11->max_keycode;
-}
-
-#ifdef HAVE_XINPUT
-static void
-update_axes (ClutterInputDeviceX11 *device_x11,
-             guint                  n_axes,
-             gint                   first_axis,
-             gint                  *axes_data)
-{
-  ClutterInputDevice *device = CLUTTER_INPUT_DEVICE (device_x11);
-  gint i;
-
-  if (device_x11->axis_data == NULL)
-    {
-      device_x11->axis_data =
-        g_new0 (gint, clutter_input_device_get_n_axes (device));
-    }
-
-  for (i = 0; i < n_axes; i++)
-    device_x11->axis_data[first_axis + i] = axes_data[i];
-}
-
-static gdouble *
-translate_axes (ClutterInputDeviceX11 *device_x11,
-                ClutterStageX11       *stage_x11,
-                gfloat                *event_x,
-                gfloat                *event_y)
-{
-  ClutterInputDevice *device = CLUTTER_INPUT_DEVICE (device_x11);
-  gint root_x, root_y;
-  gint n_axes, i;
-  gdouble x, y;
-  gdouble *retval;
-
-  if (!_clutter_stage_x11_get_root_coords (stage_x11, &root_x, &root_y))
-    return NULL;
-
-  x = y = 0.0f;
-  n_axes = clutter_input_device_get_n_axes (device);
-
-  retval = g_new0 (gdouble, n_axes);
-
-  for (i = 0; i < n_axes; i++)
-    {
-      ClutterInputAxis axis;
-
-      axis = clutter_input_device_get_axis (device, i);
-      switch (axis)
-        {
-        case CLUTTER_INPUT_AXIS_X:
-        case CLUTTER_INPUT_AXIS_Y:
-          _clutter_x11_input_device_translate_screen_coord (device,
-                                                            root_x, root_y,
-                                                            i,
-                                                            device_x11->axis_data[i],
-                                                            &retval[i]);
-          if (axis == CLUTTER_INPUT_AXIS_X)
-            x = retval[i];
-          else if (axis == CLUTTER_INPUT_AXIS_Y)
-            y = retval[i];
-          break;
-
-        default:
-          _clutter_input_device_translate_axis (device, i,
-                                                device_x11->axis_data[i],
-                                                &retval[i]);
-          break;
-        }
-    }
-
-  if (event_x)
-    *event_x = x;
-
-  if (event_y)
-    *event_y = y;
-
-  return retval;
-}
-
-/*
- * translate_state:
- * @state: the keyboard state of the core device
- * @device_state: the button state of the device
- *
- * Trivially translates the state and the device state into a
- * single bitmask.
- */
-static guint
-translate_state (guint state,
-                 guint device_state)
-{
-  return device_state | (state & 0xff);
-}
-#endif /* HAVE_XINPUT */
-
-gboolean
-_clutter_input_device_x11_translate_xi_event (ClutterInputDeviceX11 *device_x11,
-                                              ClutterStageX11       *stage_x11,
-                                              XEvent                *xevent,
-                                              ClutterEvent          *event)
-{
-#ifdef HAVE_XINPUT
-  ClutterInputDevice *device = CLUTTER_INPUT_DEVICE (device_x11);
-
-  if ((xevent->type == device_x11->button_press_type) ||
-      (xevent->type == device_x11->button_release_type))
-    {
-      XDeviceButtonEvent *xdbe = (XDeviceButtonEvent *) xevent;
-
-      event->button.type = event->type =
-        (xdbe->type == device_x11->button_press_type) ? CLUTTER_BUTTON_PRESS
-                                                      : CLUTTER_BUTTON_RELEASE;
-      event->button.device = device;
-      event->button.time = xdbe->time;
-      event->button.button = xdbe->button;
-      event->button.modifier_state =
-        translate_state (xdbe->state, xdbe->device_state);
-
-      update_axes (device_x11,
-                   xdbe->axes_count,
-                   xdbe->first_axis,
-                   xdbe->axis_data);
-
-      event->button.axes = translate_axes (device_x11, stage_x11,
-                                           &event->button.x,
-                                           &event->button.y);
-
-      _clutter_stage_x11_set_user_time (stage_x11, event->button.time);
-
-      return TRUE;
-    }
-
-  if ((xevent->type == device_x11->key_press_type) ||
-      (xevent->type == device_x11->key_release_type))
-    {
-      XDeviceKeyEvent *xdke = (XDeviceKeyEvent *) xevent;
-
-      if (xdke->keycode < device_x11->min_keycode ||
-          xdke->keycode >= device_x11->max_keycode)
-        {
-          g_warning ("Invalid device key code received: %d", xdke->keycode);
-          return FALSE;
-        }
-
-      clutter_input_device_get_key (device,
-                                    xdke->keycode - device_x11->min_keycode,
-                                    &event->key.keyval,
-                                    &event->key.modifier_state);
-      if (event->key.keyval == 0)
-        return FALSE;
-
-      event->key.type = event->type =
-        (xdke->type == device_x11->key_press_type) ? CLUTTER_KEY_PRESS
-                                                   : CLUTTER_KEY_RELEASE;
-      event->key.time = xdke->time;
-      event->key.modifier_state |=
-        translate_state (xdke->state, xdke->device_state);
-      event->key.device = device;
-
-#if 0
-      if ((event->key.keyval >= 0x20) && (event->key.keyval <= 0xff))
-        {
-          event->key.unicode = (gunichar) event->key.keyval;
-        }
-#endif
-
-      _clutter_stage_x11_set_user_time (stage_x11, event->key.time);
-
-      return TRUE;
-    }
-
-  if (xevent->type == device_x11->motion_notify_type)
-    {
-      XDeviceMotionEvent *xdme = (XDeviceMotionEvent *) xevent;
-
-      event->motion.type = event->type = CLUTTER_MOTION;
-      event->motion.time = xdme->time;
-      event->motion.modifier_state =
-        translate_state (xdme->state, xdme->device_state);
-      event->motion.device = device;
-
-      event->motion.axes =
-        g_new0 (gdouble, clutter_input_device_get_n_axes (device));
-
-      update_axes (device_x11,
-                   xdme->axes_count,
-                   xdme->first_axis,
-                   xdme->axis_data);
-
-      event->motion.axes = translate_axes (device_x11, stage_x11,
-                                           &event->motion.x,
-                                           &event->motion.y);
-
-      return TRUE;
-    }
-
-  if (xevent->type == device_x11->state_notify_type)
-    {
-      XDeviceStateNotifyEvent *xdse = (XDeviceStateNotifyEvent *) xevent;
-      XInputClass *input_class = (XInputClass *) xdse->data;
-      gint n_axes = clutter_input_device_get_n_axes (device);
-      int i;
-
-      for (i = 0; i < xdse->num_classes; i++)
-        {
-          if (input_class->class == ValuatorClass)
-            {
-              int *axis_data = ((XValuatorState *) input_class)->valuators;
-
-              update_axes (device_x11, n_axes, 0, axis_data);
-            }
-
-          input_class =
-            (XInputClass *)(((char *) input_class) + input_class->length);
-        }
-    }
-#endif /* HAVE_XINPUT */
-
-  return FALSE;
-}
diff --git a/clutter/x11/clutter-input-device-core-x11.h b/clutter/x11/clutter-input-device-core-x11.h
index af4ed59cb..c264051e5 100644
--- a/clutter/x11/clutter-input-device-core-x11.h
+++ b/clutter/x11/clutter-input-device-core-x11.h
@@ -39,17 +39,6 @@ typedef struct _ClutterInputDeviceX11           ClutterInputDeviceX11;
 
 GType _clutter_input_device_x11_get_type (void) G_GNUC_CONST;
 
-void _clutter_input_device_x11_set_keycodes (ClutterInputDeviceX11 *device_x11,
-                                             int                    min_keycode,
-                                             int                    max_keycode);
-int _clutter_input_device_x11_get_min_keycode (ClutterInputDeviceX11 *device_x11);
-int _clutter_input_device_x11_get_max_keycode (ClutterInputDeviceX11 *device_x11);
-
-gboolean _clutter_input_device_x11_translate_xi_event (ClutterInputDeviceX11 *device_x11,
-                                                       ClutterStageX11       *stage_x11,
-                                                       XEvent                *xevent,
-                                                       ClutterEvent          *event);
-
 G_END_DECLS
 
 #endif /* __CLUTTER_INPUT_DEVICE_X11_H__ */
diff --git a/clutter/x11/clutter-input-device-xi2.c b/clutter/x11/clutter-input-device-xi2.c
index 5923977d3..9490c521e 100644
--- a/clutter/x11/clutter-input-device-xi2.c
+++ b/clutter/x11/clutter-input-device-xi2.c
@@ -27,6 +27,7 @@
 
 #include "clutter-debug.h"
 #include "clutter-device-manager-private.h"
+#include "clutter-event-private.h"
 #include "clutter-private.h"
 #include "clutter-stage-private.h"
 
@@ -53,67 +54,6 @@ G_DEFINE_TYPE (ClutterInputDeviceXI2,
                clutter_input_device_xi2,
                CLUTTER_TYPE_INPUT_DEVICE);
 
-static void
-clutter_input_device_xi2_select_stage_events (ClutterInputDevice *device,
-                                              ClutterStage       *stage,
-                                              gint                event_mask)
-{
-  ClutterInputDeviceXI2 *device_xi2 = CLUTTER_INPUT_DEVICE_XI2 (device);
-  ClutterBackendX11 *backend_x11;
-  ClutterStageX11 *stage_x11;
-  XIEventMask xi_event_mask;
-  unsigned char *mask;
-  int len;
-
-  backend_x11 = CLUTTER_BACKEND_X11 (device->backend);
-  stage_x11 = CLUTTER_STAGE_X11 (_clutter_stage_get_window (stage));
-
-  len = XIMaskLen (XI_LASTEVENT);
-  mask = g_new0 (unsigned char, len);
-
-  if (event_mask & PointerMotionMask)
-    XISetMask (mask, XI_Motion);
-
-  if (event_mask & ButtonPressMask)
-    XISetMask (mask, XI_ButtonPress);
-
-  if (event_mask & ButtonReleaseMask)
-    XISetMask (mask, XI_ButtonRelease);
-
-  if (event_mask & KeyPressMask)
-    XISetMask (mask, XI_KeyPress);
-
-  if (event_mask & KeyReleaseMask)
-    XISetMask (mask, XI_KeyRelease);
-
-  if (event_mask & EnterWindowMask)
-    XISetMask (mask, XI_Enter);
-
-  if (event_mask & LeaveWindowMask)
-    XISetMask (mask, XI_Leave);
-
-#ifdef HAVE_XINPUT_2_2
-  /* enable touch event support if we're running on XInput 2.2 */
-  if (backend_x11->xi_minor >= 2)
-    {
-      XISetMask (mask, XI_TouchBegin);
-      XISetMask (mask, XI_TouchUpdate);
-      XISetMask (mask, XI_TouchEnd);
-    }
-#endif /* HAVE_XINPUT_2_2 */
-
-  xi_event_mask.deviceid = device_xi2->device_id;
-  xi_event_mask.mask = mask;
-  xi_event_mask.mask_len = len;
-
-  CLUTTER_NOTE (BACKEND, "Selecting device id '%d' events",
-                device_xi2->device_id);
-
-  XISelectEvents (backend_x11->xdpy, stage_x11->xwin, &xi_event_mask, 1);
-
-  g_free (mask);
-}
-
 static void
 clutter_input_device_xi2_constructed (GObject *gobject)
 {
@@ -147,7 +87,6 @@ clutter_input_device_xi2_class_init (ClutterInputDeviceXI2Class *klass)
 
   gobject_class->constructed = clutter_input_device_xi2_constructed;
 
-  device_class->select_stage_events = clutter_input_device_xi2_select_stage_events;
   device_class->keycode_to_evdev = clutter_input_device_xi2_keycode_to_evdev;
 }
 
@@ -156,15 +95,44 @@ clutter_input_device_xi2_init (ClutterInputDeviceXI2 *self)
 {
 }
 
-guint
-_clutter_input_device_xi2_translate_state (XIModifierState *modifiers_state,
+static ClutterModifierType
+get_modifier_for_button (int i)
+{
+  switch (i)
+    {
+    case 1:
+      return CLUTTER_BUTTON1_MASK;
+    case 2:
+      return CLUTTER_BUTTON2_MASK;
+    case 3:
+      return CLUTTER_BUTTON3_MASK;
+    case 4:
+      return CLUTTER_BUTTON4_MASK;
+    case 5:
+      return CLUTTER_BUTTON5_MASK;
+    default:
+      return 0;
+    }
+}
+
+void
+_clutter_input_device_xi2_translate_state (ClutterEvent    *event,
+					   XIModifierState *modifiers_state,
                                            XIButtonState   *buttons_state,
                                            XIGroupState    *group_state)
 {
-  guint retval = 0;
+  guint button = 0;
+  guint base = 0;
+  guint latched = 0;
+  guint locked = 0;
+  guint effective;
 
   if (modifiers_state)
-    retval = (guint) modifiers_state->effective;
+    {
+      base = (guint) modifiers_state->base;
+      latched = (guint) modifiers_state->latched;
+      locked = (guint) modifiers_state->locked;
+    }
 
   if (buttons_state)
     {
@@ -177,36 +145,30 @@ _clutter_input_device_xi2_translate_state (XIModifierState *modifiers_state,
           if (!XIMaskIsSet (buttons_state->mask, i))
             continue;
 
-          switch (i)
-            {
-            case 1:
-              retval |= CLUTTER_BUTTON1_MASK;
-              break;
-
-            case 2:
-              retval |= CLUTTER_BUTTON2_MASK;
-              break;
-
-            case 3:
-              retval |= CLUTTER_BUTTON3_MASK;
-              break;
-
-            case 4:
-              retval |= CLUTTER_BUTTON4_MASK;
-              break;
-
-            case 5:
-              retval |= CLUTTER_BUTTON5_MASK;
-              break;
-
-            default:
-              break;
-            }
+          button |= get_modifier_for_button (i);
         }
     }
 
-  if (group_state)
-    retval |= (group_state->effective) << 13;
+  /* The XIButtonState sent in the event specifies the
+   * state of the buttons before the event. In order to
+   * get the current state of the buttons, we need to
+   * filter out the current button.
+   */
+  switch (event->type)
+    {
+    case CLUTTER_BUTTON_PRESS:
+      button |=  (get_modifier_for_button (event->button.button));
+      break;
+    case CLUTTER_BUTTON_RELEASE:
+      button &= ~(get_modifier_for_button (event->button.button));
+      break;
+    default:
+      break;
+    }
 
-  return retval;
+  effective = button | base | latched | locked;
+  if (group_state)
+    effective |= (group_state->effective) << 13;
+
+  _clutter_event_set_state_full (event, button, base, latched, locked, effective);
 }
diff --git a/clutter/x11/clutter-input-device-xi2.h b/clutter/x11/clutter-input-device-xi2.h
index b86401fb9..92dadc965 100644
--- a/clutter/x11/clutter-input-device-xi2.h
+++ b/clutter/x11/clutter-input-device-xi2.h
@@ -37,9 +37,10 @@ typedef struct _ClutterInputDeviceXI2           ClutterInputDeviceXI2;
 
 GType _clutter_input_device_xi2_get_type (void) G_GNUC_CONST;
 
-guint _clutter_input_device_xi2_translate_state (XIModifierState *modifiers_state,
-                                                 XIButtonState   *buttons_state,
-                                                 XIGroupState    *group_state);
+void  _clutter_input_device_xi2_translate_state (ClutterEvent    *event,
+						 XIModifierState *modifiers_state,
+						 XIButtonState   *buttons_state,
+						 XIGroupState    *group_state);
 
 G_END_DECLS
 
diff --git a/clutter/x11/clutter-keymap-x11.c b/clutter/x11/clutter-keymap-x11.c
index e5de3ee7e..2e9bae423 100644
--- a/clutter/x11/clutter-keymap-x11.c
+++ b/clutter/x11/clutter-keymap-x11.c
@@ -37,6 +37,14 @@
 #endif
 
 typedef struct _ClutterKeymapX11Class   ClutterKeymapX11Class;
+typedef struct _DirectionCacheEntry     DirectionCacheEntry;
+
+struct _DirectionCacheEntry
+{
+  guint serial;
+  Atom group_atom;
+  PangoDirection direction;
+};
 
 struct _ClutterKeymapX11
 {
@@ -52,14 +60,20 @@ struct _ClutterKeymapX11
   ClutterModifierType num_lock_mask;
   ClutterModifierType scroll_lock_mask;
 
+  PangoDirection current_direction;
+
 #ifdef HAVE_XKB
   XkbDescPtr xkb_desc;
   int xkb_event_base;
   guint xkb_map_serial;
+  Atom current_group_atom;
+  guint current_cache_serial;
+  DirectionCacheEntry group_direction_cache[4];
 #endif
 
   guint caps_lock_state : 1;
   guint num_lock_state  : 1;
+  guint has_direction   : 1;
 };
 
 struct _ClutterKeymapX11Class
@@ -217,6 +231,128 @@ update_locked_mods (ClutterKeymapX11 *keymap_x11,
 }
 #endif /* HAVE_XKB */
 
+#ifdef HAVE_XKB
+/* the code to retrieve the keymap direction and cache it
+ * is taken from GDK:
+ *      gdk/x11/gdkkeys-x11.c
+ */
+static PangoDirection
+get_direction (XkbDescPtr xkb,
+               int        group)
+{
+  int rtl_minus_ltr = 0; /* total number of RTL keysyms minus LTR ones */
+  int code;
+
+  for (code = xkb->min_key_code;
+       code <= xkb->max_key_code;
+       code += 1)
+    {
+      int level = 0;
+      KeySym sym = XkbKeySymEntry (xkb, code, level, group);
+      PangoDirection dir = pango_unichar_direction (clutter_keysym_to_unicode (sym));
+
+      switch (dir)
+        {
+        case PANGO_DIRECTION_RTL:
+          rtl_minus_ltr++;
+          break;
+
+        case PANGO_DIRECTION_LTR:
+          rtl_minus_ltr--;
+          break;
+
+        default:
+          break;
+        }
+    }
+
+  if (rtl_minus_ltr > 0)
+    return PANGO_DIRECTION_RTL;
+
+  return PANGO_DIRECTION_LTR;
+}
+
+static PangoDirection
+get_direction_from_cache (ClutterKeymapX11 *keymap_x11,
+                          XkbDescPtr        xkb,
+                          int               group)
+{
+  Atom group_atom = xkb->names->groups[group];
+  gboolean cache_hit = FALSE;
+  DirectionCacheEntry *cache = keymap_x11->group_direction_cache;
+  PangoDirection direction = PANGO_DIRECTION_NEUTRAL;
+  int i;
+
+  if (keymap_x11->has_direction)
+    {
+      /* look up in the cache */
+      for (i = 0; i < G_N_ELEMENTS (keymap_x11->group_direction_cache); i++)
+        {
+          if (cache[i].group_atom == group_atom)
+            {
+              cache_hit = TRUE;
+              cache[i].serial = keymap_x11->current_cache_serial++;
+              direction = cache[i].direction;
+              group_atom = cache[i].group_atom;
+              break;
+            }
+        }
+    }
+  else
+    {
+      /* initialize the cache */
+      for (i = 0; i < G_N_ELEMENTS (keymap_x11->group_direction_cache); i++)
+        {
+          cache[i].group_atom = 0;
+          cache[i].direction = PANGO_DIRECTION_NEUTRAL;
+          cache[i].serial = keymap_x11->current_cache_serial;
+        }
+
+      keymap_x11->current_cache_serial += 1;
+    }
+
+  /* insert the new entry in the cache */
+  if (!cache_hit)
+    {
+      int oldest = 0;
+
+      direction = get_direction (xkb, group);
+
+      /* replace the oldest entry */
+      for (i = 0; i < G_N_ELEMENTS (keymap_x11->group_direction_cache); i++)
+        {
+          if (cache[i].serial < cache[oldest].serial)
+            oldest = i;
+        }
+
+      cache[oldest].group_atom = group_atom;
+      cache[oldest].direction = direction;
+      cache[oldest].serial = keymap_x11->current_cache_serial++;
+    }
+
+  return direction;
+}
+#endif /* HAVE_XKB */
+
+static void
+update_direction (ClutterKeymapX11 *keymap_x11,
+                  int               group)
+{
+#ifdef HAVE_XKB
+  XkbDescPtr xkb = get_xkb (keymap_x11);
+  Atom group_atom;
+
+  group_atom = xkb->names->groups[group];
+
+  if (!keymap_x11->has_direction || keymap_x11->current_group_atom != group_atom)
+    {
+      keymap_x11->current_direction = get_direction_from_cache (keymap_x11, xkb, group);
+      keymap_x11->current_group_atom = group_atom;
+      keymap_x11->has_direction = TRUE;
+    }
+#endif /* HAVE_XKB */
+}
+
 static void
 clutter_keymap_x11_constructed (GObject *gobject)
 {
@@ -332,6 +468,7 @@ clutter_keymap_x11_class_init (ClutterKeymapX11Class *klass)
 static void
 clutter_keymap_x11_init (ClutterKeymapX11 *keymap)
 {
+  keymap->current_direction = PANGO_DIRECTION_NEUTRAL;
 }
 
 static ClutterTranslateReturn
@@ -360,7 +497,8 @@ clutter_keymap_x11_translate_event (ClutterEventTranslator *translator,
       switch (xkb_event->any.xkb_type)
         {
         case XkbStateNotify:
-          CLUTTER_NOTE (EVENT, "Updating locked modifiers");
+          CLUTTER_NOTE (EVENT, "Updating keyboard state");
+          update_direction (keymap_x11, XkbStateGroup (&xkb_event->state));
           update_locked_mods (keymap_x11, xkb_event->state.locked_mods);
           retval = CLUTTER_TRANSLATE_REMOVE;
           break;
@@ -503,3 +641,27 @@ _clutter_keymap_x11_get_is_modifier (ClutterKeymapX11 *keymap,
 
   return FALSE;
 }
+
+PangoDirection
+_clutter_keymap_x11_get_direction (ClutterKeymapX11 *keymap)
+{
+  g_return_val_if_fail (CLUTTER_IS_KEYMAP_X11 (keymap), PANGO_DIRECTION_NEUTRAL);
+
+#ifdef HAVE_XKB
+  if (CLUTTER_BACKEND_X11 (keymap->backend)->use_xkb)
+    {
+      if (!keymap->has_direction)
+        {
+          Display *xdisplay = CLUTTER_BACKEND_X11 (keymap->backend)->xdpy;
+          XkbStateRec state_rec;
+
+          XkbGetState (xdisplay, XkbUseCoreKbd, &state_rec);
+          update_direction (keymap, XkbStateGroup (&state_rec));
+        }
+
+      return keymap->current_direction;
+    }
+  else
+#endif
+    return PANGO_DIRECTION_NEUTRAL;
+}
diff --git a/clutter/x11/clutter-keymap-x11.h b/clutter/x11/clutter-keymap-x11.h
index 30327852d..ad673a2a7 100644
--- a/clutter/x11/clutter-keymap-x11.h
+++ b/clutter/x11/clutter-keymap-x11.h
@@ -25,6 +25,7 @@
 #define __CLUTTER_KEYMAP_X11_H__
 
 #include <glib-object.h>
+#include <pango/pango.h>
 #include <clutter/clutter-event.h>
 
 G_BEGIN_DECLS
@@ -48,6 +49,8 @@ gint     _clutter_keymap_x11_translate_key_state (ClutterKeymapX11    *keymap,
 gboolean _clutter_keymap_x11_get_is_modifier     (ClutterKeymapX11    *keymap,
                                                   gint                 keycode);
 
+PangoDirection _clutter_keymap_x11_get_direction (ClutterKeymapX11    *keymap);
+
 G_END_DECLS
 
 #endif /* __CLUTTER_KEYMAP_X11_H__ */
diff --git a/clutter/x11/clutter-settings-x11.h b/clutter/x11/clutter-settings-x11.h
index fd2efc629..b06565bed 100644
--- a/clutter/x11/clutter-settings-x11.h
+++ b/clutter/x11/clutter-settings-x11.h
@@ -16,6 +16,8 @@ static const struct {
   { "Xft/HintStyle",           "font-hint-style" },
   { "Xft/RGBA",                "font-subpixel-order" },
   { "Fontconfig/Timestamp",    "fontconfig-timestamp" },
+  { "Gdk/WindowScalingFactor", "window-scaling-factor" },
+  { "Gdk/UnscaledDPI",         "unscaled-font-dpi" },
 };
 
 static const gint _n_clutter_settings_map = G_N_ELEMENTS (_clutter_settings_map);
diff --git a/clutter/x11/clutter-stage-x11.c b/clutter/x11/clutter-stage-x11.c
index 230172cc9..aecd978a7 100644
--- a/clutter/x11/clutter-stage-x11.c
+++ b/clutter/x11/clutter-stage-x11.c
@@ -22,6 +22,7 @@
 #include "config.h"
 
 #include <math.h>
+#include <stdlib.h>
 
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
@@ -45,10 +46,6 @@
 #include "clutter-private.h"
 #include "clutter-stage-private.h"
 
-#ifdef HAVE_XFIXES
-#include <X11/extensions/Xfixes.h>
-#endif
-
 #define STAGE_X11_IS_MAPPED(s)  ((((ClutterStageX11 *) (s))->wm_state & STAGE_X11_WITHDRAWN) == 0)
 
 static ClutterStageWindowIface *clutter_stage_window_parent_iface = NULL;
@@ -151,10 +148,10 @@ clutter_stage_x11_fix_window_size (ClutterStageX11 *stage_x11,
                                       &min_height);
 
       if (new_width <= 0)
-        new_width = min_width;
+        new_width = min_width * stage_x11->scale_factor;
 
       if (new_height <= 0)
-        new_height = min_height;
+        new_height = min_height * stage_x11->scale_factor;
 
       size_hints->flags = 0;
 
@@ -164,8 +161,8 @@ clutter_stage_x11_fix_window_size (ClutterStageX11 *stage_x11,
         {
           if (resize)
             {
-              size_hints->min_width = min_width;
-              size_hints->min_height = min_height;
+              size_hints->min_width = min_width * stage_x11->scale_factor;
+              size_hints->min_height = min_height * stage_x11->scale_factor;
               size_hints->flags = PMinSize;
             }
           else
@@ -225,8 +222,8 @@ clutter_stage_x11_get_geometry (ClutterStageWindow    *stage_window,
       return;
     }
 
-  geometry->width = stage_x11->xwin_width;
-  geometry->height = stage_x11->xwin_height;
+  geometry->width = stage_x11->xwin_width / stage_x11->scale_factor;
+  geometry->height = stage_x11->xwin_height / stage_x11->scale_factor;
 }
 
 static void
@@ -244,8 +241,8 @@ clutter_stage_x11_resize (ClutterStageWindow *stage_window,
        * so we need to manually set the size and queue a relayout on the
        * stage here (as is normally done in response to ConfigureNotify).
        */
-      stage_x11->xwin_width = width;
-      stage_x11->xwin_height = height;
+      stage_x11->xwin_width = width * stage_x11->scale_factor;
+      stage_x11->xwin_height = height * stage_x11->scale_factor;
       clutter_actor_queue_relayout (CLUTTER_ACTOR (stage_cogl->wrapper));
       return;
     }
@@ -266,6 +263,9 @@ clutter_stage_x11_resize (ClutterStageWindow *stage_window,
 
   CLUTTER_NOTE (BACKEND, "New size received: (%d, %d)", width, height);
 
+  width *= stage_x11->scale_factor;
+  height *= stage_x11->scale_factor;
+
   if (stage_x11->xwin != None)
     {
       clutter_stage_x11_fix_window_size (stage_x11, width, height);
@@ -279,9 +279,6 @@ clutter_stage_x11_resize (ClutterStageWindow *stage_window,
                         width,
                         height);
 
-          CLUTTER_SET_PRIVATE_FLAGS (stage_cogl->wrapper,
-                                     CLUTTER_IN_RESIZE);
-
           /* XXX: in this case we can rely on a subsequent
            * ConfigureNotify that will result in the stage
            * being reallocated so we don't actively do anything
@@ -292,6 +289,14 @@ clutter_stage_x11_resize (ClutterStageWindow *stage_window,
                          height);
         }
     }
+  else
+    {
+      /* if the backing window hasn't been created yet, we just
+       * need to store the new window size
+       */
+      stage_x11->xwin_width = width;
+      stage_x11->xwin_height = height;
+    }
 }
 
 static inline void
@@ -362,22 +367,10 @@ set_cursor_visible (ClutterStageX11 *stage_x11)
 
   if (stage_x11->is_cursor_visible)
     {
-#if HAVE_XFIXES
-      if (stage_x11->cursor_hidden_xfixes)
-        {
-          XFixesShowCursor (backend_x11->xdpy, stage_x11->xwin);
-          stage_x11->cursor_hidden_xfixes = FALSE;
-        }
-#else
       XUndefineCursor (backend_x11->xdpy, stage_x11->xwin);
-#endif /* HAVE_XFIXES */
     }
   else
     {
-#if HAVE_XFIXES
-      XFixesHideCursor (backend_x11->xdpy, stage_x11->xwin);
-      stage_x11->cursor_hidden_xfixes = TRUE;
-#else
       XColor col;
       Pixmap pix;
       Cursor curs;
@@ -390,10 +383,23 @@ set_cursor_visible (ClutterStageX11 *stage_x11)
                                   1, 1);
       XFreePixmap (backend_x11->xdpy, pix);
       XDefineCursor (backend_x11->xdpy, stage_x11->xwin, curs);
-#endif /* HAVE_XFIXES */
     }
 }
 
+static void
+on_window_scaling_factor_notify (GObject         *settings,
+                                 GParamSpec      *pspec,
+                                 ClutterStageX11 *stage_x11)
+{
+  g_object_get (settings,
+                "window-scaling-factor", &stage_x11->scale_factor,
+                NULL);
+
+  clutter_stage_x11_resize (CLUTTER_STAGE_WINDOW (stage_x11),
+                            stage_x11->xwin_width,
+                            stage_x11->xwin_height);
+}
+
 static void
 clutter_stage_x11_unrealize (ClutterStageWindow *stage_window)
 {
@@ -547,14 +553,10 @@ _clutter_stage_x11_events_device_changed (ClutterStageX11 *stage_x11,
                                           ClutterDeviceManager *device_manager)
 {
   ClutterStageCogl *stage_cogl = CLUTTER_STAGE_COGL (stage_x11);
-  int event_flags = 0;
 
   if (clutter_input_device_get_device_mode (device) == CLUTTER_INPUT_MODE_FLOATING)
-    event_flags = CLUTTER_STAGE_X11_EVENT_MASK;
-
-  _clutter_device_manager_select_stage_events (device_manager,
-                                               stage_cogl->wrapper,
-                                               event_flags);
+    _clutter_device_manager_select_stage_events (device_manager,
+                                                 stage_cogl->wrapper);
 }
 
 static void
@@ -564,12 +566,10 @@ stage_events_device_added (ClutterDeviceManager *device_manager,
 {
   ClutterStageWindow *stage_window = user_data;
   ClutterStageCogl *stage_cogl = CLUTTER_STAGE_COGL (stage_window);
-  int event_flags = CLUTTER_STAGE_X11_EVENT_MASK;
 
   if (clutter_input_device_get_device_mode (device) == CLUTTER_INPUT_MODE_FLOATING)
     _clutter_device_manager_select_stage_events (device_manager,
-                                                 stage_cogl->wrapper,
-                                                 event_flags);
+                                                 stage_cogl->wrapper);
 }
 
 static gboolean
@@ -580,14 +580,20 @@ clutter_stage_x11_realize (ClutterStageWindow *stage_window)
   ClutterBackend *backend = CLUTTER_BACKEND (stage_cogl->backend);
   ClutterBackendX11 *backend_x11 = CLUTTER_BACKEND_X11 (backend);
   ClutterDeviceManager *device_manager;
-  int event_flags;
   gfloat width, height;
 
-  clutter_actor_get_size (CLUTTER_ACTOR (stage_cogl->wrapper),
-			  &width, &height);
+  clutter_actor_get_size (CLUTTER_ACTOR (stage_cogl->wrapper), &width, &height);
 
-  stage_cogl->onscreen = cogl_onscreen_new (backend->cogl_context,
-                                            width, height);
+  CLUTTER_NOTE (BACKEND, "Wrapper size: %.2f x %.2f", width, height);
+
+  width = width * (float) stage_x11->scale_factor;
+  height = height * (float) stage_x11->scale_factor;
+
+  CLUTTER_NOTE (BACKEND, "Creating a new Cogl onscreen surface: %.2f x %.2f (factor: %d)",
+                width, height,
+                stage_x11->scale_factor);
+
+  stage_cogl->onscreen = cogl_onscreen_new (backend->cogl_context, width, height);
 
   /* We just created a window of the size of the actor. No need to fix
      the size of the stage, just update it. */
@@ -623,14 +629,6 @@ clutter_stage_x11_realize (ClutterStageWindow *stage_window)
   set_wm_title (stage_x11);
   set_cursor_visible (stage_x11);
 
-
-  /* the masks for the events we want to select on a stage window;
-   * KeyPressMask and KeyReleaseMask are necessary even with XI1
-   * because key events are broken with that extension, and will
-   * be fixed by XI2
-   */
-  event_flags = CLUTTER_STAGE_X11_EVENT_MASK;
-
   /* we unconditionally select input events even with event retrieval
    * disabled because we need to guarantee that the Clutter internal
    * state is maintained when calling clutter_x11_handle_event() without
@@ -648,7 +646,7 @@ clutter_stage_x11_realize (ClutterStageWindow *stage_window)
    * for an example of things that break if we do conditional event
    * selection.
    */
-  XSelectInput (backend_x11->xdpy, stage_x11->xwin, event_flags);
+  XSelectInput (backend_x11->xdpy, stage_x11->xwin, CLUTTER_STAGE_X11_EVENT_MASK);
 
   /* input events also depent on the actual device, so we need to
    * use the device manager to let every device select them, using
@@ -658,8 +656,7 @@ clutter_stage_x11_realize (ClutterStageWindow *stage_window)
   if (G_UNLIKELY (device_manager != NULL))
     {
       _clutter_device_manager_select_stage_events (device_manager,
-                                                   stage_cogl->wrapper,
-                                                   event_flags);
+                                                   stage_cogl->wrapper);
 
       g_signal_connect (device_manager, "device-added",
                         G_CALLBACK (stage_events_device_added),
@@ -832,12 +829,33 @@ clutter_stage_x11_can_clip_redraws (ClutterStageWindow *stage_window)
   ClutterStageX11 *stage_x11 = CLUTTER_STAGE_X11 (stage_window);
 
   /* while resizing a window, clipped redraws are disabled in order to
-   * avoid artefacts. see clutter-event-x11.c:event_translate for a more
-   * detailed explanation
+   * avoid artefacts.
    */
   return stage_x11->clipped_redraws_cool_off == 0;
 }
 
+static void
+clutter_stage_x11_set_scale_factor (ClutterStageWindow *stage_window,
+                                    int                 factor)
+{
+  ClutterStageX11 *stage_x11 = CLUTTER_STAGE_X11 (stage_window);
+
+  if (stage_x11->scale_factor == factor)
+    return;
+
+  stage_x11->scale_factor = factor;
+
+  clutter_stage_x11_resize (stage_window, stage_x11->xwin_width, stage_x11->xwin_height);
+}
+
+static int
+clutter_stage_x11_get_scale_factor (ClutterStageWindow *stage_window)
+{
+  ClutterStageX11 *stage_x11 = CLUTTER_STAGE_X11 (stage_window);
+
+  return stage_x11->scale_factor;
+}
+
 static void
 clutter_stage_x11_finalize (GObject *gobject)
 {
@@ -871,6 +889,8 @@ clutter_stage_x11_class_init (ClutterStageX11Class *klass)
 static void
 clutter_stage_x11_init (ClutterStageX11 *stage)
 {
+  ClutterSettings *settings;
+
   stage->xwin = None;
   stage->xwin_width = 640;
   stage->xwin_height = 480;
@@ -880,10 +900,15 @@ clutter_stage_x11_init (ClutterStageX11 *stage)
   stage->is_foreign_xwin = FALSE;
   stage->fullscreening = FALSE;
   stage->is_cursor_visible = TRUE;
-  stage->cursor_hidden_xfixes = FALSE;
   stage->accept_focus = TRUE;
 
   stage->title = NULL;
+
+  settings = clutter_settings_get_default ();
+  g_signal_connect (settings, "notify::window-scaling-factor",
+                    G_CALLBACK (on_window_scaling_factor_notify),
+                    stage);
+  on_window_scaling_factor_notify (G_OBJECT (settings), NULL, stage);
 }
 
 static void
@@ -903,6 +928,8 @@ clutter_stage_window_iface_init (ClutterStageWindowIface *iface)
   iface->realize = clutter_stage_x11_realize;
   iface->unrealize = clutter_stage_x11_unrealize;
   iface->can_clip_redraws = clutter_stage_x11_can_clip_redraws;
+  iface->set_scale_factor = clutter_stage_x11_set_scale_factor;
+  iface->get_scale_factor = clutter_stage_x11_get_scale_factor;
 }
 
 static inline void
@@ -1024,10 +1051,8 @@ clutter_stage_x11_translate_event (ClutterEventTranslator *translator,
             }
 
           clutter_actor_set_size (CLUTTER_ACTOR (stage),
-                                  xevent->xconfigure.width,
-                                  xevent->xconfigure.height);
-
-          CLUTTER_UNSET_PRIVATE_FLAGS (stage_cogl->wrapper, CLUTTER_IN_RESIZE);
+                                  xevent->xconfigure.width / stage_x11->scale_factor,
+                                  xevent->xconfigure.height / stage_x11->scale_factor);
 
           if (size_changed)
             {
@@ -1161,26 +1186,6 @@ clutter_stage_x11_translate_event (ClutterEventTranslator *translator,
         }
       break;
 
-    case EnterNotify:
-#if HAVE_XFIXES
-      if (!stage_x11->is_cursor_visible && !stage_x11->cursor_hidden_xfixes)
-        {
-          XFixesHideCursor (backend_x11->xdpy, stage_x11->xwin);
-          stage_x11->cursor_hidden_xfixes = TRUE;
-        }
-#endif
-      break;
-
-    case LeaveNotify:
-#if HAVE_XFIXES
-      if (stage_x11->cursor_hidden_xfixes)
-        {
-          XFixesShowCursor (backend_x11->xdpy, stage_x11->xwin);
-          stage_x11->cursor_hidden_xfixes = FALSE;
-        }
-#endif
-      break;
-
     case Expose:
       {
         XExposeEvent *expose = (XExposeEvent *) xevent;
@@ -1197,10 +1202,10 @@ clutter_stage_x11_translate_event (ClutterEventTranslator *translator,
                       expose->width,
                       expose->height);
 
-        clip.x = expose->x;
-        clip.y = expose->y;
-        clip.width = expose->width;
-        clip.height = expose->height;
+        clip.x = expose->x / stage_x11->scale_factor;
+        clip.y = expose->y / stage_x11->scale_factor;
+        clip.width = expose->width / stage_x11->scale_factor;
+        clip.height = expose->height / stage_x11->scale_factor;
         clutter_actor_queue_redraw_with_clip (CLUTTER_ACTOR (stage), &clip);
       }
       break;
@@ -1366,8 +1371,8 @@ set_foreign_window_callback (ClutterActor *actor,
   fwd->stage_x11->xwin = fwd->xwindow;
   fwd->stage_x11->is_foreign_xwin = TRUE;
 
-  fwd->stage_x11->xwin_width = fwd->geom.width;
-  fwd->stage_x11->xwin_height = fwd->geom.height;
+  fwd->stage_x11->xwin_width = fwd->geom.width * fwd->stage_x11->scale_factor;
+  fwd->stage_x11->xwin_height = fwd->geom.height * fwd->stage_x11->scale_factor;
 
   clutter_actor_set_size (actor, fwd->geom.width, fwd->geom.height);
 
@@ -1467,8 +1472,8 @@ clutter_x11_set_stage_foreign (ClutterStage *stage,
 
   fwd.geom.x = x;
   fwd.geom.y = y;
-  fwd.geom.width = width;
-  fwd.geom.height = height;
+  fwd.geom.width = width / stage_x11->scale_factor;
+  fwd.geom.height = height / stage_x11->scale_factor;
 
   actor = CLUTTER_ACTOR (stage);
 
diff --git a/clutter/x11/clutter-stage-x11.h b/clutter/x11/clutter-stage-x11.h
index c7a7a1b3c..a359c991a 100644
--- a/clutter/x11/clutter-stage-x11.h
+++ b/clutter/x11/clutter-stage-x11.h
@@ -61,13 +61,14 @@ struct _ClutterStageX11
 
   ClutterStageX11State wm_state;
 
+  int scale_factor;
+
   guint is_foreign_xwin       : 1;
   guint fullscreening         : 1;
   guint is_cursor_visible     : 1;
   guint viewport_initialized  : 1;
   guint accept_focus          : 1;
   guint fullscreen_on_realize : 1;
-  guint cursor_hidden_xfixes  : 1;
 };
 
 struct _ClutterStageX11Class
@@ -86,7 +87,7 @@ struct _ClutterStageX11Class
   KeyReleaseMask | \
   ButtonPressMask | \
   ButtonReleaseMask | \
-  PointerMotionMask;
+  PointerMotionMask
 
 GType _clutter_stage_x11_get_type (void) G_GNUC_CONST;
 
diff --git a/clutter/x11/clutter-x11-texture-pixmap.c b/clutter/x11/clutter-x11-texture-pixmap.c
index 62add1971..119fd4693 100644
--- a/clutter/x11/clutter-x11-texture-pixmap.c
+++ b/clutter/x11/clutter-x11-texture-pixmap.c
@@ -136,9 +136,9 @@ struct _ClutterX11TexturePixmapPrivate
 
 static int _damage_event_base = 0;
 
-G_DEFINE_TYPE (ClutterX11TexturePixmap,
-               clutter_x11_texture_pixmap,
-               CLUTTER_TYPE_TEXTURE);
+G_DEFINE_TYPE_WITH_PRIVATE (ClutterX11TexturePixmap,
+                            clutter_x11_texture_pixmap,
+                            CLUTTER_TYPE_TEXTURE)
 
 static gboolean
 check_extensions (ClutterX11TexturePixmap *texture)
@@ -384,10 +384,7 @@ clutter_x11_texture_pixmap_real_queue_damage_redraw (
 static void
 clutter_x11_texture_pixmap_init (ClutterX11TexturePixmap *self)
 {
-  self->priv =
-      G_TYPE_INSTANCE_GET_PRIVATE (self,
-                                   CLUTTER_X11_TYPE_TEXTURE_PIXMAP,
-                                   ClutterX11TexturePixmapPrivate);
+  self->priv = clutter_x11_texture_pixmap_get_instance_private (self);
 
   if (!check_extensions (self))
     {
@@ -525,8 +522,6 @@ clutter_x11_texture_pixmap_class_init (ClutterX11TexturePixmapClass *klass)
   ClutterActorClass *actor_class = CLUTTER_ACTOR_CLASS (klass);
   GParamSpec        *pspec;
 
-  g_type_class_add_private (klass, sizeof (ClutterX11TexturePixmapPrivate));
-
   actor_class->get_paint_volume = clutter_x11_texture_pixmap_get_paint_volume;
 
   object_class->dispose      = clutter_x11_texture_pixmap_dispose;
@@ -649,6 +644,10 @@ clutter_x11_texture_pixmap_class_init (ClutterX11TexturePixmapClass *klass)
   /**
    * ClutterX11TexturePixmap::update-area:
    * @texture: the object which received the signal
+   * @x: X coordinate of the area to update
+   * @y: Y coordinate of the area to update
+   * @width: width of the area to update
+   * @height: height of the area to update
    *
    * The ::update-area signal is emitted to ask the texture to update its
    * content from its source pixmap.
diff --git a/clutter/x11/clutter-x11-texture-pixmap.h b/clutter/x11/clutter-x11-texture-pixmap.h
index ee963551e..8d2dc3338 100644
--- a/clutter/x11/clutter-x11-texture-pixmap.h
+++ b/clutter/x11/clutter-x11-texture-pixmap.h
@@ -81,21 +81,30 @@ struct _ClutterX11TexturePixmapClass
                         gint                     height);
 };
 
+CLUTTER_AVAILABLE_IN_ALL
 GType clutter_x11_texture_pixmap_get_type (void) G_GNUC_CONST;
 
+CLUTTER_AVAILABLE_IN_ALL
 ClutterActor *clutter_x11_texture_pixmap_new             (void);
+CLUTTER_AVAILABLE_IN_ALL
 ClutterActor *clutter_x11_texture_pixmap_new_with_pixmap (Pixmap      pixmap);
+CLUTTER_AVAILABLE_IN_ALL
 ClutterActor *clutter_x11_texture_pixmap_new_with_window (Window      window);
 
+CLUTTER_AVAILABLE_IN_ALL
 void          clutter_x11_texture_pixmap_set_automatic   (ClutterX11TexturePixmap *texture,
                                                           gboolean                 setting);
+CLUTTER_AVAILABLE_IN_ALL
 void          clutter_x11_texture_pixmap_set_pixmap      (ClutterX11TexturePixmap *texture,
                                                           Pixmap                   pixmap);
+CLUTTER_AVAILABLE_IN_ALL
 void          clutter_x11_texture_pixmap_set_window      (ClutterX11TexturePixmap *texture,
                                                           Window                   window,
                                                           gboolean                 automatic);
 
+CLUTTER_AVAILABLE_IN_ALL
 void          clutter_x11_texture_pixmap_sync_window     (ClutterX11TexturePixmap *texture);
+CLUTTER_AVAILABLE_IN_ALL
 void          clutter_x11_texture_pixmap_update_area     (ClutterX11TexturePixmap *texture,
                                                           gint                     x,
                                                           gint                     y,
diff --git a/clutter/x11/clutter-x11.h b/clutter/x11/clutter-x11.h
index 6913280b9..285ea511d 100644
--- a/clutter/x11/clutter-x11.h
+++ b/clutter/x11/clutter-x11.h
@@ -85,7 +85,7 @@ typedef struct _ClutterX11XInputDevice ClutterX11XInputDevice;
  * ClutterX11FilterFunc:
  * @xev: Native X11 event structure
  * @cev: Clutter event structure
- * @data: user data passed to the filter function
+ * @data: (closure): user data passed to the filter function
  *
  * Filter function for X11 native events.
  *
@@ -97,32 +97,47 @@ typedef ClutterX11FilterReturn (*ClutterX11FilterFunc) (XEvent        *xev,
                                                         ClutterEvent  *cev,
                                                         gpointer       data);
 
+CLUTTER_AVAILABLE_IN_ALL
 void     clutter_x11_trap_x_errors       (void);
+CLUTTER_AVAILABLE_IN_ALL
 gint     clutter_x11_untrap_x_errors     (void);
 
+CLUTTER_AVAILABLE_IN_ALL
 Display *clutter_x11_get_default_display (void);
+CLUTTER_AVAILABLE_IN_ALL
 int      clutter_x11_get_default_screen  (void);
+CLUTTER_AVAILABLE_IN_ALL
 Window   clutter_x11_get_root_window     (void);
+CLUTTER_AVAILABLE_IN_ALL
 XVisualInfo *clutter_x11_get_visual_info (void);
+CLUTTER_AVAILABLE_IN_ALL
 void     clutter_x11_set_display         (Display * xdpy);
 
 CLUTTER_DEPRECATED_FOR(clutter_x11_get_visual_info)
 XVisualInfo *clutter_x11_get_stage_visual  (ClutterStage *stage);
 
+CLUTTER_AVAILABLE_IN_ALL
 Window       clutter_x11_get_stage_window  (ClutterStage *stage);
+CLUTTER_AVAILABLE_IN_ALL
 gboolean     clutter_x11_set_stage_foreign (ClutterStage *stage,
                                             Window        xwindow);
 
+CLUTTER_AVAILABLE_IN_ALL
 void         clutter_x11_add_filter    (ClutterX11FilterFunc func,
                                         gpointer             data);
+CLUTTER_AVAILABLE_IN_ALL
 void         clutter_x11_remove_filter (ClutterX11FilterFunc func,
                                         gpointer             data);
 
+CLUTTER_AVAILABLE_IN_ALL
 ClutterX11FilterReturn clutter_x11_handle_event (XEvent *xevent);
 
+CLUTTER_AVAILABLE_IN_ALL
 void     clutter_x11_disable_event_retrieval (void);
+CLUTTER_AVAILABLE_IN_ALL
 gboolean clutter_x11_has_event_retrieval (void);
 
+CLUTTER_AVAILABLE_IN_ALL
 ClutterStage *clutter_x11_get_stage_from_window (Window win);
 
 CLUTTER_DEPRECATED_FOR(clutter_device_manager_peek_devices)
@@ -130,17 +145,24 @@ const GSList* clutter_x11_get_input_devices (void);
 
 CLUTTER_DEPRECATED_IN_1_14
 void     clutter_x11_enable_xinput (void);
+CLUTTER_AVAILABLE_IN_ALL
 gboolean clutter_x11_has_xinput (void);
 
+CLUTTER_AVAILABLE_IN_ALL
 gboolean clutter_x11_has_composite_extension (void);
 
+CLUTTER_AVAILABLE_IN_ALL
 void     clutter_x11_set_use_argb_visual (gboolean use_argb);
+CLUTTER_AVAILABLE_IN_ALL
 gboolean clutter_x11_get_use_argb_visual (void);
 
+CLUTTER_AVAILABLE_IN_ALL
 Time clutter_x11_get_current_event_time (void);
 
+CLUTTER_AVAILABLE_IN_ALL
 gint clutter_x11_event_get_key_group (const ClutterEvent *event);
 
+CLUTTER_AVAILABLE_IN_ALL
 guint clutter_x11_event_sequence_get_touch_detail (const ClutterEventSequence *sequence);
 
 G_END_DECLS
diff --git a/configure.ac b/configure.ac
index 48beaedae..0a9a58000 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,8 +9,8 @@
 # - increase clutter_micro_version to the next odd number
 # - increase clutter_interface_version to the next odd number
 m4_define([clutter_major_version], [1])
-m4_define([clutter_minor_version], [15])
-m4_define([clutter_micro_version], [1])
+m4_define([clutter_minor_version], [21])
+m4_define([clutter_micro_version], [3])
 
 # • for stable releases: increase the interface age by 1 for each release;
 #   if the API changes, set to 0. interface_age and binary_age are used to
@@ -135,18 +135,19 @@ LT_INIT([disable-static])
 AC_HEADER_STDC
 
 # required versions for dependencies
-m4_define([glib_req_version],           [2.31.19])
-m4_define([cogl_req_version],           [1.14.0])
+m4_define([glib_req_version],           [2.39.0])
+m4_define([cogl_req_version],           [1.17.5])
 m4_define([json_glib_req_version],      [0.12.0])
 m4_define([atk_req_version],            [2.5.3])
-m4_define([cairo_req_version],          [1.10])
+m4_define([cairo_req_version],          [1.12.0])
 m4_define([pango_req_version],          [1.30])
-m4_define([gi_req_version],             [0.9.5])
+m4_define([gi_req_version],             [1.39.0])
 m4_define([uprof_req_version],          [0.3])
-m4_define([gtk_doc_req_version],        [1.15])
-m4_define([xfixes_req_version],         [3])
+m4_define([gtk_doc_req_version],        [1.20])
 m4_define([xcomposite_req_version],     [0.4])
 m4_define([gdk_req_version],            [3.3.18])
+m4_define([libinput_req_version],       [0.4.0])
+m4_define([libudev_req_version],        [136])
 
 AC_SUBST([GLIB_REQ_VERSION],       [glib_req_version])
 AC_SUBST([COGL_REQ_VERSION],       [cogl_req_version])
@@ -157,9 +158,10 @@ AC_SUBST([PANGO_REQ_VERSION],      [pango_req_version])
 AC_SUBST([GI_REQ_VERSION],         [gi_req_version])
 AC_SUBST([UPROF_REQ_VERSION],      [uprof_req_version])
 AC_SUBST([GTK_DOC_REQ_VERSION],    [gtk_doc_req_version])
-AC_SUBST([XFIXES_REQ_VERSION],     [xfixes_req_version])
 AC_SUBST([XCOMPOSITE_REQ_VERSION], [xcomposite_req_version])
 AC_SUBST([GDK_REQ_VERSION],        [gdk_req_version])
+AC_SUBST([LIBINPUT_REQ_VERSION],   [libinput_req_version])
+AC_SUBST([LIBUDEV_REQ_VERSION],    [libudev_req_version])
 
 # Checks for typedefs, structures, and compiler characteristics.
 AM_PATH_GLIB_2_0([glib_req_version],
@@ -191,6 +193,36 @@ AC_ARG_ENABLE([Bsymbolic],
 AS_IF([test "x$enable_Bsymbolic" = "xyes"], [CLUTTER_LINK_FLAGS=-Wl[,]-Bsymbolic-functions])
 AC_SUBST(CLUTTER_LINK_FLAGS)
 
+# Check for the visibility flags
+CLUTTER_HIDDEN_VISIBILITY_CFLAGS=""
+case "$host" in
+  *-*-mingw*)
+    dnl on mingw32 we do -fvisibility=hidden and __declspec(dllexport)
+    AC_DEFINE([_CLUTTER_EXTERN], [__attribute__((visibility("default"))) __declspec(dllexport) extern],
+              [defines how to decorate public symbols while building])
+    CFLAGS="${CFLAGS} -fvisibility=hidden"
+    ;;
+  *)
+    dnl on other compilers, check if we can do -fvisibility=hidden
+    SAVED_CFLAGS="${CFLAGS}"
+    CFLAGS="-fvisibility=hidden"
+    AC_MSG_CHECKING([for -fvisibility=hidden compiler flag])
+    AC_TRY_COMPILE([], [int main (void) { return 0; }],
+                   AC_MSG_RESULT(yes)
+                   enable_fvisibility_hidden=yes,
+                   AC_MSG_RESULT(no)
+                   enable_fvisibility_hidden=no)
+    CFLAGS="${SAVED_CFLAGS}"
+
+    AS_IF([test "${enable_fvisibility_hidden}" = "yes"], [
+      AC_DEFINE([_CLUTTER_EXTERN], [__attribute__((visibility("default"))) extern],
+                [defines how to decorate public symbols while building])
+      CLUTTER_HIDDEN_VISIBILITY_CFLAGS="-fvisibility=hidden"
+    ])
+    ;;
+esac
+AC_SUBST(CLUTTER_HIDDEN_VISIBILITY_CFLAGS)
+
 AC_CACHE_SAVE
 
 dnl ========================================================================
@@ -205,7 +237,7 @@ experimental_backend=no
 experimental_input_backend=no
 
 # base dependencies for core
-CLUTTER_BASE_PC_FILES="cogl-1.0 >= $COGL_REQ_VERSION cairo-gobject >= $CAIRO_REQ_VERSION atk >= $ATK_REQ_VERSION pangocairo >= $PANGO_REQ_VERSION cogl-pango-1.0 json-glib-1.0 >= $JSON_GLIB_REQ_VERSION"
+CLUTTER_BASE_PC_FILES="cogl-1.0 >= $COGL_REQ_VERSION cogl-path-1.0 cairo-gobject >= $CAIRO_REQ_VERSION atk >= $ATK_REQ_VERSION pangocairo >= $PANGO_REQ_VERSION cogl-pango-1.0 json-glib-1.0 >= $JSON_GLIB_REQ_VERSION"
 
 # private base dependencies
 CLUTTER_BASE_PC_FILES_PRIVATE=""
@@ -307,9 +339,8 @@ AS_IF([test "x$enable_wayland" = "xyes"],
         CLUTTER_BACKENDS="$CLUTTER_BACKENDS wayland"
         CLUTTER_INPUT_BACKENDS="$CLUTTER_INPUT_BACKENDS wayland"
 
-        experimental_backend="yes"
-
         SUPPORT_WAYLAND=1
+        SUPPORT_COGL=1
 
         PKG_CHECK_EXISTS([wayland-client wayland-cursor xkbcommon gdk-pixbuf-2.0],
                          [
@@ -337,7 +368,10 @@ AS_IF([test "x$enable_wayland_compositor" = "xyes"],
       [
         PKG_CHECK_EXISTS([wayland-server],
 			 [BACKEND_PC_FILES="$BACKEND_PC_FILES wayland-server"], [])
+
         SUPPORT_WAYLAND_COMPOSITOR=1
+        SUPPORT_COGL=1
+
 	CLUTTER_CONFIG_DEFINES="$CLUTTER_CONFIG_DEFINES
 #define CLUTTER_HAS_WAYLAND_COMPOSITOR_SUPPORT 1"
         AC_DEFINE([HAVE_CLUTTER_WAYLAND_COMPOSITOR], [1], [Have Wayland compositor support])
@@ -359,8 +393,8 @@ AS_IF([test "x$enable_cex100" = "xyes"],
 
         experimental_backend="yes"
 
-        SUPPORT_COGL=1
         SUPPORT_CEX100=1
+        SUPPORT_COGL=1
 
         have_gdl=no
         AC_CHECK_HEADERS([libgdl.h], [have_gdl=yes])
@@ -470,8 +504,7 @@ AS_IF([test "x$enable_evdev" = "xyes"],
         AS_IF([test "x$have_evdev" = "xyes"],
               [
                 CLUTTER_INPUT_BACKENDS="$CLUTTER_INPUT_BACKENDS evdev"
-                BACKEND_PC_FILES="$BACKEND_PC_FILES gudev-1.0 xkbcommon"
-                experimental_input_backend="yes"
+                BACKEND_PC_FILES_PRIVATE="$BACKEND_PC_FILES_PRIVATE libudev >= $LIBUDEV_REQ_VERSION libinput >= $LIBINPUT_REQ_VERSION xkbcommon"
                 AC_DEFINE([HAVE_EVDEV], [1], [Have evdev support for input handling])
                 SUPPORT_EVDEV=1
               ])
@@ -623,22 +656,6 @@ AS_IF([test "x$SUPPORT_X11" = "x1"],
               [AC_MSG_ERROR([Not found])]
         )
 
-        # XFIXES (required)
-        AC_MSG_CHECKING([for XFIXES extension >= $XFIXES_REQ_VERSION])
-        PKG_CHECK_EXISTS([xfixes >= $XFIXES_REQ_VERSION], [have_xfixes=yes], [have_xfixes=no])
-        AS_IF([test "x$have_xfixes" = "xyes"],
-              [
-                AC_DEFINE(HAVE_XFIXES, [1], [Define to 1 if we have the XFIXES X extension])
-
-                X11_LIBS="$X11_LIBS -lXfixes"
-                X11_PC_FILES="$X11_PC_FILES xfixes >= $XFIXES_REQ_VERSION"
-                X11_EXTS="$X11_EXTS xfixes"
-
-                AC_MSG_RESULT([found])
-              ],
-              [AC_MSG_ERROR([Not found])]
-        )
-
         # XDAMAGE (required)
         AC_MSG_CHECKING([for XDAMAGE extension])
         PKG_CHECK_EXISTS([xdamage], [have_xdamage=yes], [have_xdamage=no])
@@ -713,12 +730,6 @@ AS_IF([test "x$SUPPORT_X11" = "x1"],
                                      AC_DEFINE([HAVE_XINPUT_2],
                                                [1],
                                                [Define to 1 if XI2 is available])
-                                   ],
-                                   [
-                                     have_xinput2=no
-                                     AC_DEFINE([HAVE_XINPUT],
-                                               [1],
-                                               [Define to 1 if XInput is available])
                                    ])
 
                   clutter_save_LIBS="$LIBS"
@@ -811,6 +822,18 @@ AS_CASE([$enable_pixbuf],
 
 AM_CONDITIONAL([PIXBUF_TESTS], [test "x$pixbuf_tests" = "xyes"])
 
+# Check for cairo_set_device_scale, as we don't want to depend hard on
+# this until there is a stable release with it
+saved_CFLAGS="$CFLAGS"
+saved_LIBS="$LIBS"
+CAIRO_CFLAGS=`$PKG_CONFIG --cflags cairo`
+CAIRO_LIBS=`$PKG_CONFIG --libs cairo`
+CFLAGS="$CFLAGS $CAIRO_CFLAGS"
+LIBS="$CAIRO_LIBS $LIBS"
+AC_CHECK_FUNCS(cairo_surface_set_device_scale)
+LIBS="$saved_LIBS"
+CFLAGS="$saved_CFLAGS"
+
 dnl === Enable debug level ====================================================
 
 m4_define([debug_default], [m4_if(m4_eval(clutter_minor_version % 2), [1], [yes], [minimum])])
@@ -924,6 +947,7 @@ MAINTAINER_COMPILER_FLAGS="$MAINTAINER_COMPILER_FLAGS
                            -Wcast-align
                            -Wuninitialized
                            -Wno-strict-aliasing
+                           -Werror=logical-op
                            -Werror=pointer-arith
                            -Werror=missing-declarations
                            -Werror=redundant-decls
@@ -1009,7 +1033,7 @@ AS_IF([test "x$use_gcov" = "xyes"],
           AC_MSG_ERROR([ccache must be disabled when --enable-gcov option is used. You can disable ccache by setting environment variable CCACHE_DISABLE=1.])
         fi
 
-        ltp_version_list="1.6 1.7 1.8 1.9"
+        ltp_version_list="1.6 1.7 1.8 1.9 1.10"
         AC_CHECK_PROG(LTP, lcov, lcov)
         AC_CHECK_PROG(LTP_GENHTML, genhtml, genhtml)
 
@@ -1137,16 +1161,7 @@ dnl = Build optionals =========================================================
 
 dnl === Conformance test suite ================================================
 
-AC_ARG_ENABLE([conformance],
-              [AS_HELP_STRING([--disable-conformance], [Whether the conformance tests should be built])],
-              [],
-              [enable_conformance=yes])
-
-AC_ARG_ENABLE([tests],
-              [AS_HELP_STRING([--disable-tests], [Whether tests should be built])],
-              [],
-              [enable_tests=yes])
-AM_CONDITIONAL(BUILD_TESTS, [test "x$enable_tests" = "xyes" && test "x$enable_conformance" = "xyes"])
+GLIB_TESTS
 
 AC_ARG_ENABLE([examples],
               [AS_HELP_STRING([--disable-examples], [Whether examples should be built])],
@@ -1180,8 +1195,6 @@ AC_CONFIG_FILES([
 	tests/Makefile
 	tests/accessibility/Makefile
 	tests/conform/Makefile
-	tests/conform/test-launcher.sh
-	tests/data/Makefile
 	tests/interactive/Makefile
 	tests/interactive/wrapper.sh
 	tests/micro-bench/Makefile
@@ -1236,11 +1249,13 @@ echo "        Build Additional Documentation: ${enable_docs} (Generate PDF: ${en
 echo ""
 echo " • Extra:"
 echo "        Build introspection data: ${enable_introspection}"
-echo "        Build test suites: ${enable_tests}"
-if test "x$enable_tests" = "xyes"; then
+if test "x$x11_tests" = "xyes"; then
 echo "        Build X11-specific tests: ${x11_tests}"
+fi
+if test "x$pixbuf_tests" = "xyes"; then
 echo "        Build tests using GDK-Pixbuf: ${pixbuf_tests}"
 fi
+echo "        Install test suites: ${enable_installed_tests}"
 echo "        Build examples: ${enable_examples}"
 
 # Clutter backend related flags
@@ -1279,7 +1294,7 @@ fi
 echo ""
 
 # General warning about experimental features
-if test "x$experimental_backend" = "xyes"; then
+if test "x$experimental_backend" = xyes -o "x$experimental_input_backend" = xyes; then
 echo ""
 echo "☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠"
 echo "*WARNING* *WARNING* *WARNING* *WARNING* *WARNING* *WARNING* *WARNING*"
diff --git a/doc/cookbook/examples/Makefile.am b/doc/cookbook/examples/Makefile.am
index 054128f7b..236edf27a 100644
--- a/doc/cookbook/examples/Makefile.am
+++ b/doc/cookbook/examples/Makefile.am
@@ -4,7 +4,12 @@ NULL =
 
 EXTRA_DIST =
 
-noinst_PROGRAMS = \
+noinst_PROGRAMS =
+examples_DATA =
+
+examplesdir = $(datadir)/clutter-1.0/cookbook/examples
+
+all_examples = \
 	actors-composite-main 			\
 	animations-complex			\
 	animations-looping-animator		\
@@ -51,22 +56,19 @@ noinst_PROGRAMS = \
 	events-buttons-lasso			\
 	$(NULL)
 
-INCLUDES = \
-	-I$(top_srcdir)/ \
-	-I$(top_builddir)/ \
-	-I$(top_srcdir)/clutter \
-	-I$(top_builddir)/clutter \
-	$(NULL)
-
 LDADD = $(top_builddir)/clutter/libclutter-@CLUTTER_API_VERSION@.la -lm
 
 AM_CFLAGS = $(CLUTTER_CFLAGS)
 
 AM_CPPFLAGS = \
+	-I$(top_srcdir)/ \
+	-I$(top_builddir)/ \
+	-I$(top_srcdir)/clutter \
+	-I$(top_builddir)/clutter \
 	-DG_DISABLE_SINGLE_INCLUDES \
-	-DCOGL_DISABLE_DEPRECATED \
+	-DCOGL_DISABLE_DEPRECATION_WARNINGS \
 	-DCLUTTER_DISABLE_DEPRECATION_WARNINGS \
-	-DTESTS_DATA_DIR=\""$(top_srcdir)/tests/data/"\"
+	$(NULL)
 
 AM_LDFLAGS = $(CLUTTER_LIBS) -export-dynamic
 
@@ -129,7 +131,14 @@ ui_data = \
 	$(srcdir)/script-ui.json			\
 	$(NULL)
 
-examplesdir = $(datadir)/clutter-1.0/cookbook/examples
-examples_DATA = $(uidata) $(srcdir)/*.c $(srcdir)/*.h
+img_data = \
+	$(srcdir)/redhand.png \
+	$(srcdir)/smiley.png \
+	$(NULL)
+
+EXTRA_DIST += $(ui_data) $(img_data)
+
+examples_DATA += $(ui_data) $(img_data) $(srcdir)/*.c $(srcdir)/*.h
+noinst_PROGRAMS += $(all_examples)
 
 -include $(top_srcdir)/build/autotools/Makefile.am.gitignore
diff --git a/doc/cookbook/examples/animations-rotating.c b/doc/cookbook/examples/animations-rotating.c
index 411d5b849..4c2d39f43 100644
--- a/doc/cookbook/examples/animations-rotating.c
+++ b/doc/cookbook/examples/animations-rotating.c
@@ -52,7 +52,7 @@ main (int argc, char *argv[])
                                 clutter_align_constraint_new (stage, CLUTTER_ALIGN_Y_AXIS, 0.5));
   clutter_texture_set_sync_size (CLUTTER_TEXTURE (texture), TRUE);
   clutter_texture_set_from_file (CLUTTER_TEXTURE (texture),
-                                 TESTS_DATA_DIR "/redhand.png",
+                                 "redhand.png",
                                  &error);
 
   if (error != NULL)
diff --git a/doc/cookbook/examples/events-mouse-scroll.c b/doc/cookbook/examples/events-mouse-scroll.c
index e491c14de..1b2c8386b 100644
--- a/doc/cookbook/examples/events-mouse-scroll.c
+++ b/doc/cookbook/examples/events-mouse-scroll.c
@@ -68,7 +68,7 @@ main (int argc, char *argv[])
   ClutterActor *viewport;
   ClutterActor *texture;
 
-  gchar *image_file_path = TESTS_DATA_DIR "/redhand.png";
+  const gchar *image_file_path = "redhand.png";
 
   if (argc > 1)
     {
diff --git a/doc/cookbook/examples/events-pointer-motion-scribbler.c b/doc/cookbook/examples/events-pointer-motion-scribbler.c
index 4d5168dc9..de065332e 100644
--- a/doc/cookbook/examples/events-pointer-motion-scribbler.c
+++ b/doc/cookbook/examples/events-pointer-motion-scribbler.c
@@ -2,6 +2,7 @@
  * Simple scribble application: move mouse over the dark yellow
  * rectangle to draw brighter yellow lines
  */
+
 #include <clutter/clutter.h>
 
 static const ClutterColor stage_color = { 0x33, 0x33, 0x55, 0xff };
diff --git a/doc/cookbook/examples/layouts-bind-constraint-overlay.c b/doc/cookbook/examples/layouts-bind-constraint-overlay.c
index 77c209f7f..856955c70 100644
--- a/doc/cookbook/examples/layouts-bind-constraint-overlay.c
+++ b/doc/cookbook/examples/layouts-bind-constraint-overlay.c
@@ -73,7 +73,7 @@ main (int argc, char *argv[])
   ClutterAction *click;
   GError *error = NULL;
 
-  gchar *filename = TESTS_DATA_DIR "/redhand.png";
+  const gchar *filename = "redhand.png";
 
   if (argc > 1)
     filename = argv[1];
diff --git a/doc/cookbook/examples/layouts-stacking.c b/doc/cookbook/examples/layouts-stacking.c
index 9ee340b4c..d1d6321a5 100644
--- a/doc/cookbook/examples/layouts-stacking.c
+++ b/doc/cookbook/examples/layouts-stacking.c
@@ -20,7 +20,7 @@ main (int argc, char *argv[])
   GError *error = NULL;
   gfloat width;
 
-  gchar *filename = TESTS_DATA_DIR "/redhand.png";
+  const gchar *filename = "redhand.png";
 
   if (argc > 1)
     filename = argv[1];
diff --git a/tests/data/redhand.png b/doc/cookbook/examples/redhand.png
similarity index 100%
rename from tests/data/redhand.png
rename to doc/cookbook/examples/redhand.png
diff --git a/doc/cookbook/examples/textures-reflection.c b/doc/cookbook/examples/textures-reflection.c
index 170e701c2..03c970d66 100644
--- a/doc/cookbook/examples/textures-reflection.c
+++ b/doc/cookbook/examples/textures-reflection.c
@@ -86,7 +86,7 @@ main (int argc, char *argv[])
 
   texture = clutter_texture_new ();
   clutter_texture_set_from_file (CLUTTER_TEXTURE (texture),
-                                 TESTS_DATA_DIR "/redhand.png",
+                                 "redhand.png",
                                  &error);
   clutter_actor_add_constraint (texture, clutter_align_constraint_new (stage, CLUTTER_ALIGN_X_AXIS, 0.5));
   clutter_actor_add_constraint (texture, clutter_align_constraint_new (stage, CLUTTER_ALIGN_Y_AXIS, 0.2));
diff --git a/doc/reference/cally/Makefile.am b/doc/reference/cally/Makefile.am
index 797d463e6..107cf22da 100644
--- a/doc/reference/cally/Makefile.am
+++ b/doc/reference/cally/Makefile.am
@@ -29,7 +29,7 @@ SCAN_OPTIONS=--deprecated-guards="CALLY_DISABLE_DEPRECATED"
 
 # Extra options to supply to gtkdoc-mkdb.
 # e.g. MKDB_OPTIONS=--sgml-mode --output-format=xml
-MKDB_OPTIONS=--sgml-mode --output-format=xml --name-space=cally
+MKDB_OPTIONS=--output-format=xml --name-space=cally
 
 # Extra options to supply to gtkdoc-mktmpl
 # e.g. MKTMPL_OPTIONS=--only-section-tmpl
@@ -78,7 +78,12 @@ expand_content_files= \
 # e.g. INCLUDES=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS)
 # e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib)
 
-INCLUDES=-I$(top_srcdir) -I$(top_srcdir)/clutter -I$(top_srcdir)/clutter/cogl -I$(top_builddir) -I$(top_builddir)/clutter -I$(top_builddir)/clutter/cogl $(CLUTTER_CFLAGS)
+AM_CPPFLAGS = \
+	-I$(top_srcdir) \
+	-I$(top_srcdir)/clutter \
+	-I$(top_builddir) \
+	-I$(top_builddir)/clutter
+AM_CFLAGS = $(CLUTTER_CFLAGS)
 GTKDOC_LIBS=$(top_builddir)/clutter/libclutter-@CLUTTER_API_VERSION@.la $(CLUTTER_LIBS)
 
 # This includes the standard gtk-doc make rules, copied by gtkdocize.
diff --git a/doc/reference/clutter/Makefile.am b/doc/reference/clutter/Makefile.am
index 0fb073746..8a280691e 100644
--- a/doc/reference/clutter/Makefile.am
+++ b/doc/reference/clutter/Makefile.am
@@ -16,7 +16,7 @@ SCAN_OPTIONS = --deprecated-guards="CLUTTER_DISABLE_DEPRECATED"
 
 # Extra options to supply to gtkdoc-mkdb.
 # e.g. MKDB_OPTIONS=--sgml-mode --output-format=xml
-MKDB_OPTIONS = --sgml-mode --output-format=xml --name-space=clutter
+MKDB_OPTIONS = --output-format=xml --name-space=clutter
 
 # Extra options to supply to gtkdoc-mktmpl
 # e.g. MKTMPL_OPTIONS=--only-section-tmpl
@@ -37,13 +37,15 @@ FIXXREF_OPTIONS = \
 HFILE_GLOB = \
 	$(top_srcdir)/clutter/*.h \
 	$(top_builddir)/clutter/*.h \
+	$(top_srcdir)/clutter/deprecated/*.h \
 	$(top_srcdir)/clutter/x11/clutter-x11.h \
 	$(top_srcdir)/clutter/x11/clutter-x11-texture-pixmap.h \
 	$(top_srcdir)/clutter/x11/clutter-glx-texture-pixmap.h \
 	$(top_srcdir)/clutter/egl/clutter-egl.h \
-	$(top_srcdir)/clutter/cex100/clutter-cex100.h \
+	$(top_builddir)/clutter/cex100/clutter-cex100.h \
 	$(top_srcdir)/clutter/win32/clutter-win32.h \
 	$(top_srcdir)/clutter/gdk/clutter-gdk.h \
+	$(top_srcdir)/clutter/wayland/clutter-wayland.h \
 	$(top_srcdir)/clutter/wayland/clutter-wayland-compositor.h \
 	$(top_srcdir)/clutter/wayland/clutter-wayland-surface.h
 
@@ -55,7 +57,8 @@ CFILE_GLOB = \
 	$(top_srcdir)/clutter/gdk/*.c \
 	$(top_srcdir)/clutter/cex100/*.c \
 	$(top_srcdir)/clutter/egl/*.c \
-	$(top_srcdir)/clutter/wayland/*.c
+	$(top_srcdir)/clutter/wayland/*.c \
+	$(top_srcdir)/clutter/deprecated/*.c
 
 # Header files to ignore when scanning.
 # e.g. IGNORE_HFILES=gtkdebug.h gtkintl.h
@@ -69,6 +72,7 @@ IGNORE_HFILES = \
 	clutter-cogl-compat.h		\
 	clutter-color-static.h		\
 	clutter-config.h		\
+	clutter-constraint-private.h	\
 	clutter-debug.h 		\
 	clutter-deprecated.h 		\
 	clutter-device-manager-private.h	\
@@ -89,6 +93,7 @@ IGNORE_HFILES = \
 	clutter-private.h 		\
 	clutter-profile.h		\
 	clutter-script-private.h 	\
+	clutter-settings-private.h	\
 	clutter-stage-manager-private.h	\
 	clutter-stage-private.h		\
 	clutter-stage-window.h 		\
@@ -113,6 +118,7 @@ EXTRA_HFILES = \
 	$(top_srcdir)/clutter/cex100/clutter-cex100.h \
 	$(top_srcdir)/clutter/win32/clutter-win32.h \
 	$(top_srcdir)/clutter/gdk/clutter-gdk.h \
+	$(top_srcdir)/clutter/wayland/clutter-wayland.h \
 	$(top_srcdir)/clutter/wayland/clutter-wayland-compositor.h \
 	$(top_srcdir)/clutter/wayland/clutter-wayland-surface.h
 
@@ -168,7 +174,13 @@ expand_content_files = \
 # e.g. INCLUDES=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS)
 # e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib)
 
-INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/clutter -I$(top_builddir) -I$(top_builddir)/clutter $(CLUTTER_CFLAGS) -DCLUTTER_DISABLE_DEPRECATION_WARNINGS
+AM_CPPFLAGS = \
+	-I$(top_srcdir) \
+	-I$(top_srcdir)/clutter \
+	-I$(top_builddir) \
+	-I$(top_builddir)/clutter \
+	-DCLUTTER_DISABLE_DEPRECATION_WARNINGS
+AM_CFLAGS = $(CLUTTER_CFLAGS)
 GTKDOC_LIBS = $(top_builddir)/clutter/libclutter-@CLUTTER_API_VERSION@.la $(CLUTTER_LIBS)
 
 # This includes the standard gtk-doc make rules, copied by gtkdocize.
diff --git a/doc/reference/clutter/clutter-docs.xml.in b/doc/reference/clutter/clutter-docs.xml.in
index 032f6931b..e00ccf9ba 100644
--- a/doc/reference/clutter/clutter-docs.xml.in
+++ b/doc/reference/clutter/clutter-docs.xml.in
@@ -72,7 +72,6 @@
     <chapter>
       <title>Base actors</title>
       <xi:include href="xml/clutter-stage.xml"/>
-      <xi:include href="xml/clutter-texture.xml"/>
       <xi:include href="xml/clutter-clone.xml"/>
       <xi:include href="xml/clutter-text.xml"/>
       <xi:include href="xml/clutter-scroll-actor.xml"/>
@@ -85,7 +84,6 @@
       <xi:include href="xml/clutter-bin-layout.xml"/>
       <xi:include href="xml/clutter-flow-layout.xml"/>
       <xi:include href="xml/clutter-box-layout.xml"/>
-      <xi:include href="xml/clutter-table-layout.xml"/>
       <xi:include href="xml/clutter-grid-layout.xml"/>
     </chapter>
 
@@ -222,6 +220,7 @@
     <xi:include href="xml/clutter-egl.xml"/>
     <xi:include href="xml/clutter-cex100.xml"/>
     <xi:include href="xml/clutter-gdk.xml"/>
+    <xi:include href="xml/clutter-wayland.xml"/>
     <xi:include href="xml/clutter-wayland-compositor.xml"/>
     <xi:include href="xml/clutter-wayland-surface.xml"/>
   </part>
@@ -262,6 +261,8 @@
       <xi:include href="xml/clutter-score.xml"/>
       <xi:include href="xml/clutter-shader.xml"/>
       <xi:include href="xml/clutter-state.xml"/>
+      <xi:include href="xml/clutter-table-layout.xml"/>
+      <xi:include href="xml/clutter-texture.xml"/>
   </part>
 
   <part id="clutterobjects">
@@ -357,6 +358,26 @@
     <xi:include href="xml/api-index-1.14.xml"><xi:fallback /></xi:include>
   </index>
 
+  <index role="1.16">
+    <title>Index of new symbols in 1.16</title>
+    <xi:include href="xml/api-index-1.16.xml"><xi:fallback /></xi:include>
+  </index>
+
+  <index role="1.18">
+    <title>Index of new symbols in 1.18</title>
+    <xi:include href="xml/api-index-1.18.xml"><xi:fallback /></xi:include>
+  </index>
+
+  <index role="1.20">
+    <title>Index of new symbols in 1.20</title>
+    <xi:include href="xml/api-index-1.20.xml"><xi:fallback /></xi:include>
+  </index>
+
+  <index role="1.22">
+    <title>Index of new symbols in 1.22</title>
+    <xi:include href="xml/api-index-1.22.xml"><xi:fallback /></xi:include>
+  </index>
+
   <appendix id="license">
     <title>License</title>
 
diff --git a/doc/reference/clutter/clutter-sections.txt b/doc/reference/clutter/clutter-sections.txt
index 1fd6837c6..5248a0500 100644
--- a/doc/reference/clutter/clutter-sections.txt
+++ b/doc/reference/clutter/clutter-sections.txt
@@ -297,6 +297,7 @@ clutter_actor_unrealize
 clutter_actor_paint
 clutter_actor_continue_paint
 clutter_actor_queue_redraw
+clutter_actor_queue_redraw_with_clip
 clutter_actor_queue_relayout
 clutter_actor_destroy
 clutter_actor_event
@@ -304,6 +305,7 @@ clutter_actor_should_pick_paint
 clutter_actor_map
 clutter_actor_unmap
 clutter_actor_has_overlaps
+clutter_actor_has_mapped_clones
 
 <SUBSECTION>
 ClutterAllocationFlags
@@ -624,26 +626,14 @@ clutter_texture_get_type
 <TITLE>ClutterStage</TITLE>
 ClutterStage
 ClutterStageClass
-CLUTTER_STAGE_WIDTH
-CLUTTER_STAGE_HEIGHT
-clutter_stage_get_default
 clutter_stage_new
-clutter_stage_is_default
 
 <SUBSECTION>
-clutter_stage_set_color
-clutter_stage_get_color
-clutter_stage_set_fullscreen
-clutter_stage_get_fullscreen
-clutter_stage_show_cursor
-clutter_stage_hide_cursor
 ClutterPickMode
 clutter_stage_get_actor_at_pos
 clutter_stage_ensure_current
 clutter_stage_ensure_viewport
 clutter_stage_ensure_redraw
-clutter_stage_queue_redraw
-clutter_actor_queue_redraw_with_clip
 clutter_stage_event
 clutter_stage_set_key_focus
 clutter_stage_get_key_focus
@@ -657,8 +647,6 @@ clutter_stage_get_minimum_size
 clutter_stage_set_no_clear_hint
 clutter_stage_get_no_clear_hint
 clutter_stage_get_redraw_clip_bounds
-clutter_stage_set_accept_focus
-clutter_stage_get_accept_focus
 clutter_stage_get_motion_events_enabled
 clutter_stage_set_motion_events_enabled
 
@@ -672,8 +660,25 @@ clutter_stage_set_title
 clutter_stage_get_title
 clutter_stage_set_user_resizable
 clutter_stage_get_user_resizable
+clutter_stage_set_fullscreen
+clutter_stage_get_fullscreen
+clutter_stage_show_cursor
+clutter_stage_hide_cursor
+clutter_stage_set_accept_focus
+clutter_stage_get_accept_focus
 
 <SUBSECTION>
+clutter_stage_set_sync_delay
+clutter_stage_skip_sync_delay
+
+<SUBSECTION>
+CLUTTER_STAGE_WIDTH
+CLUTTER_STAGE_HEIGHT
+clutter_stage_get_default
+clutter_stage_is_default
+clutter_stage_set_color
+clutter_stage_get_color
+clutter_stage_queue_redraw
 ClutterFog
 clutter_stage_set_use_fog
 clutter_stage_get_use_fog
@@ -971,6 +976,7 @@ clutter_backend_get_cogl_context
 
 <SUBSECTION>
 clutter_check_windowing_backend
+clutter_set_windowing_backend
 
 <SUBSECTION Standard>
 CLUTTER_BACKEND
@@ -1101,6 +1107,7 @@ clutter_event_set_coords
 clutter_event_get_coords
 clutter_event_set_state
 clutter_event_get_state
+clutter_event_get_state_full
 clutter_event_set_time
 clutter_event_get_time
 clutter_event_set_source
@@ -1123,6 +1130,9 @@ clutter_event_get
 clutter_event_peek
 clutter_event_put
 clutter_events_pending
+ClutterEventFilterFunc
+clutter_event_add_filter
+clutter_event_remove_filter
 
 <SUBSECTION>
 CLUTTER_BUTTON_PRIMARY
@@ -1165,9 +1175,11 @@ clutter_get_current_event_time
 clutter_get_current_event
 
 <SUBSECTION Standard>
+CLUTTER_TYPE_EVENT_SEQUENCE
 CLUTTER_TYPE_EVENT
 <SUBSECTION Private>
 ClutterAnyEvent
+clutter_event_sequence_get_type
 clutter_event_get_type
 </SECTION>
 
@@ -1187,6 +1199,7 @@ clutter_input_device_set_enabled
 clutter_input_device_get_enabled
 clutter_input_device_get_associated_device
 clutter_input_device_get_slave_devices
+clutter_input_device_get_modifier_state
 clutter_input_device_keycode_to_evdev
 
 <SUBSECTION>
@@ -1321,6 +1334,18 @@ clutter_ungrab_pointer_for_device
 <SUBSECTION>
 clutter_do_event
 
+<SUBSECTION Private>
+CLUTTER_TEST_UNIT
+CLUTTER_TEST_SUITE
+clutter_test_init
+clutter_test_run
+clutter_test_add
+clutter_test_add_data
+clutter_test_add_data_full
+clutter_test_get_stage
+clutter_test_check_actor_at_point
+clutter_test_check_color_at_point
+
 <SUBSECTION Standard>
 CLUTTER_INIT_ERROR
 <SUBSECTION Private>
@@ -1423,6 +1448,17 @@ ClutterGLXTexturePixmapPrivate
 clutter_glx_texture_pixmap_get_type
 </SECTION>
 
+<SECTION>
+<FILE>clutter-wayland</FILE>
+<TITLE>Wayland specific support</TITLE>
+clutter_wayland_input_device_get_wl_seat
+clutter_wayland_stage_get_wl_shell_surface
+clutter_wayland_stage_get_wl_surface
+clutter_wayland_stage_set_wl_surface
+clutter_wayland_set_display
+clutter_wayland_disable_event_retrieval
+</SECTION>
+
 <SECTION>
 <FILE>clutter-wayland-compositor</FILE>
 <TITLE>Wayland compositor specific support</TITLE>
@@ -1501,6 +1537,10 @@ CLUTTER_VERSION_1_8
 CLUTTER_VERSION_1_10
 CLUTTER_VERSION_1_12
 CLUTTER_VERSION_1_14
+CLUTTER_VERSION_1_16
+CLUTTER_VERSION_1_18
+CLUTTER_VERSION_1_20
+CLUTTER_VERSION_1_22
 CLUTTER_VERSION_MAX_ALLOWED
 CLUTTER_VERSION_MIN_REQUIRED
 
@@ -1513,6 +1553,7 @@ clutter_check_version
 <SUBSECTION Private>
 CLUTTER_VERSION_CUR_STABLE
 CLUTTER_VERSION_PREV_STABLE
+CLUTTER_AVAILABLE_IN_ALL
 CLUTTER_AVAILABLE_IN_1_0
 CLUTTER_AVAILABLE_IN_1_2
 CLUTTER_AVAILABLE_IN_1_4
@@ -1521,6 +1562,10 @@ CLUTTER_AVAILABLE_IN_1_8
 CLUTTER_AVAILABLE_IN_1_10
 CLUTTER_AVAILABLE_IN_1_12
 CLUTTER_AVAILABLE_IN_1_14
+CLUTTER_AVAILABLE_IN_1_16
+CLUTTER_AVAILABLE_IN_1_18
+CLUTTER_AVAILABLE_IN_1_20
+CLUTTER_AVAILABLE_IN_1_22
 CLUTTER_DEPRECATED_IN_1_0
 CLUTTER_DEPRECATED_IN_1_0_FOR
 CLUTTER_DEPRECATED_IN_1_2
@@ -1537,6 +1582,14 @@ CLUTTER_DEPRECATED_IN_1_12
 CLUTTER_DEPRECATED_IN_1_12_FOR
 CLUTTER_DEPRECATED_IN_1_14
 CLUTTER_DEPRECATED_IN_1_14_FOR
+CLUTTER_DEPRECATED_IN_1_16
+CLUTTER_DEPRECATED_IN_1_16_FOR
+CLUTTER_DEPRECATED_IN_1_18
+CLUTTER_DEPRECATED_IN_1_18_FOR
+CLUTTER_DEPRECATED_IN_1_20
+CLUTTER_DEPRECATED_IN_1_20_FOR
+CLUTTER_DEPRECATED_IN_1_22
+CLUTTER_DEPRECATED_IN_1_22_FOR
 CLUTTER_UNAVAILABLE
 </SECTION>
 
@@ -2038,6 +2091,7 @@ clutter_text_set_cursor_visible
 clutter_text_get_cursor_visible
 clutter_text_set_cursor_size
 clutter_text_get_cursor_size
+clutter_text_get_cursor_rect
 
 <SUBSECTION>
 clutter_text_activate
@@ -2120,6 +2174,10 @@ clutter_binding_pool_get_type
 clutter_egl_display
 clutter_eglx_display
 clutter_egl_get_egl_display
+clutter_egl_set_kms_fd
+clutter_egl_freeze_master_clock
+clutter_egl_thaw_master_clock
+
 </SECTION>
 
 <SECTION>
@@ -2298,6 +2356,8 @@ clutter_flow_layout_set_homogeneous
 clutter_flow_layout_get_homogeneous
 clutter_flow_layout_set_orientation
 clutter_flow_layout_get_orientation
+clutter_flow_layout_set_snap_to_grid
+clutter_flow_layout_get_snap_to_grid
 
 <SUBSECTION>
 clutter_flow_layout_set_column_spacing
@@ -2958,6 +3018,11 @@ clutter_gesture_action_set_n_touch_points
 clutter_gesture_action_get_n_current_points
 clutter_gesture_action_get_sequence
 clutter_gesture_action_get_device
+clutter_gesture_action_get_threshold_trigger_distance
+clutter_gesture_action_set_threshold_trigger_distance
+ClutterGestureTriggerEdge
+clutter_gesture_action_set_threshold_trigger_edge
+clutter_gesture_action_get_threshold_trigger_edge
 clutter_gesture_action_cancel
 <SUBSECTION Standard>
 CLUTTER_GESTURE_ACTION
@@ -2969,6 +3034,7 @@ CLUTTER_TYPE_GESTURE_ACTION
 <SUBSECTION Private>
 ClutterGestureActionPrivate
 clutter_gesture_action_get_type
+clutter_gesture_action_get_threshold_trigger_egde
 </SECTION>
 
 <SECTION>
@@ -3192,6 +3258,8 @@ ClutterCanvas
 ClutterCanvasClass
 clutter_canvas_new
 clutter_canvas_set_size
+clutter_canvas_set_scale_factor
+clutter_canvas_get_scale_factor
 <SUBSECTION Standard>
 CLUTTER_TYPE_CANVAS
 CLUTTER_CANVAS
diff --git a/doc/reference/clutter/running-clutter.xml b/doc/reference/clutter/running-clutter.xml
index 0469ead38..081174431 100644
--- a/doc/reference/clutter/running-clutter.xml
+++ b/doc/reference/clutter/running-clutter.xml
@@ -26,6 +26,51 @@
       </para>
 
       <variablelist>
+        <varlistentry>
+          <term>CLUTTER_BACKEND</term>
+          <listitem>
+            <para>Changes the windowing system backend used by Clutter.
+            The allowed values for this environment variable depend on
+            the configuration options used when compiling Clutter. The
+            available values are:</para>
+            <itemizedlist>
+              <listitem><simpara>x11, for the X11 backend</simpara></listitem>
+              <listitem><simpara>wayland, for the Wayland backend</simpara></listitem>
+              <listitem><simpara>win32, for the Windows backend</simpara></listitem>
+              <listitem><simpara>osx, for the MacOS X backend</simpara></listitem>
+              <listitem><simpara>gsk, for the GDK backend</simpara></listitem>
+              <listitem><simpara>eglnative, for the EGL/KMS backend</simpara></listitem>
+              <listitem><simpara>cex100, for the CEx100 backend</simpara></listitem>
+            </itemizedlist>
+            <para>All of the above options except for the <varname>eglnative</varname>
+            and <varname>cex100</varname> backends also have an input backend.</para>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term>CLUTTER_INPUT_BACKEND</term>
+          <listitem>
+            <para>Changes the input backend used by Clutter.
+            The allowed values for this environment variable depend on
+            the configuration options used when compiling Clutter. The
+            available values are:</para>
+            <itemizedlist>
+              <listitem><simpara>tslib</simpara></listitem>
+              <listitem><simpara>evdev</simpara></listitem>
+              <listitem><simpara>null</simpara></listitem>
+            </itemizedlist>
+            <para>This environment variable is only useful for setting the input
+            backend when using a windowing system backend that does not have an
+            input API, like the <varname>eglnative</varname> or the <varname>cex100</varname>
+            windowing system backends.</para>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term>CLUTTER_SCALE</term>
+          <listitem>
+            <para>Forces the window scaling factor to that value
+            inside Clutter instead of relying on what backends detect.</para>
+          </listitem>
+        </varlistentry>
         <varlistentry>
           <term>CLUTTER_TEXT_DIRECTION</term>
           <listitem>
diff --git a/examples/Makefile.am b/examples/Makefile.am
index 4c6998f64..cb80c9ff3 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -22,12 +22,6 @@ all_examples += \
 	image-content
 endif
 
-INCLUDES = \
-	-I$(top_srcdir)			\
-	-I$(top_builddir)		\
-	-I$(top_srcdir)/clutter 	\
-	-I$(top_builddir)/clutter
-
 LDADD = \
 	$(top_builddir)/clutter/libclutter-@CLUTTER_API_VERSION@.la \
 	$(CLUTTER_LIBS) \
@@ -37,10 +31,15 @@ LDADD = \
 AM_CFLAGS = $(CLUTTER_CFLAGS) $(GDK_PIXBUF_CFLAGS) $(MAINTAINER_CFLAGS)
 
 AM_CPPFLAGS = \
-	-DTESTS_DATADIR=\""$(abs_top_srcdir)/tests/data"\" \
 	-DG_DISABLE_SINGLE_INCLUDES \
-	-DGLIB_DISABLE_DEPRECATION_WARNINGS
+	-DGLIB_DISABLE_DEPRECATION_WARNINGS \
+	-I$(top_srcdir)	\
+	-I$(top_builddir) \
+	-I$(top_srcdir)/clutter \
+	-I$(top_builddir)/clutter
 
 noinst_PROGRAMS = $(all_examples)
 
+EXTRA_DIST = redhand.png
+
 -include $(top_srcdir)/build/autotools/Makefile.am.gitignore
diff --git a/examples/bin-layout.c b/examples/bin-layout.c
index 7dc9b967d..b6098d6fe 100644
--- a/examples/bin-layout.c
+++ b/examples/bin-layout.c
@@ -222,7 +222,7 @@ main (int argc, char *argv[])
                     canvas);
 
   /* we use GdkPixbuf to load an image from our data directory */
-  pixbuf = gdk_pixbuf_new_from_file (TESTS_DATADIR G_DIR_SEPARATOR_S "redhand.png", NULL);
+  pixbuf = gdk_pixbuf_new_from_file ("redhand.png", NULL);
   image = clutter_image_new ();
   clutter_image_set_data (CLUTTER_IMAGE (image),
                           gdk_pixbuf_get_pixels (pixbuf),
diff --git a/examples/drop-action.c b/examples/drop-action.c
index c369dba15..55615e120 100644
--- a/examples/drop-action.c
+++ b/examples/drop-action.c
@@ -47,7 +47,6 @@ on_drag_end (ClutterDragAction   *action,
       clutter_actor_set_easing_mode (handle, CLUTTER_EASE_OUT_BOUNCE);
       clutter_actor_set_position (handle, x_pos, y_pos);
       clutter_actor_set_opacity (handle, 0);
-      clutter_actor_restore_easing_state (handle);
 
     }
   else
diff --git a/examples/flow-layout.c b/examples/flow-layout.c
index f21c3a45b..f68888467 100644
--- a/examples/flow-layout.c
+++ b/examples/flow-layout.c
@@ -9,6 +9,7 @@ static gboolean is_homogeneous = FALSE;
 static gboolean vertical       = FALSE;
 static gboolean random_size    = FALSE;
 static gboolean fixed_size     = FALSE;
+static gboolean snap_to_grid   = TRUE;
 
 static gint     n_rects        = N_RECTS;
 static gint     x_spacing      = 0;
@@ -64,6 +65,13 @@ static GOptionEntry entries[] = {
     &fixed_size,
     "Fix the layout size", NULL
   },
+  {
+    "no-snap-to-grid", 's',
+    G_OPTION_FLAG_REVERSE,
+    G_OPTION_ARG_NONE,
+    &snap_to_grid,
+    "Don't snap elements to grid", NULL
+  },
   { NULL }
 };
 
@@ -102,6 +110,8 @@ main (int argc, char *argv[])
                                           x_spacing);
   clutter_flow_layout_set_row_spacing (CLUTTER_FLOW_LAYOUT (layout),
                                        y_spacing);
+  clutter_flow_layout_set_snap_to_grid (CLUTTER_FLOW_LAYOUT (layout),
+                                        snap_to_grid);
 
   box = clutter_actor_new ();
   clutter_actor_set_layout_manager (box, layout);
diff --git a/examples/image-content.c b/examples/image-content.c
index a661d2caa..c9c01c6ec 100644
--- a/examples/image-content.c
+++ b/examples/image-content.c
@@ -27,8 +27,8 @@ static int cur_gravity = 0;
 
 static void
 on_tap (ClutterTapAction *action,
-        ClutterActor       *actor,
-        ClutterText        *label)
+        ClutterActor     *actor,
+        ClutterText      *label)
 {
   gchar *str;
 
@@ -49,7 +49,7 @@ on_tap (ClutterTapAction *action,
 int
 main (int argc, char *argv[])
 {
-  ClutterActor *stage, *box, *text;
+  ClutterActor *stage, *text;
   ClutterContent *image;
   ClutterAction *action;
   GdkPixbuf *pixbuf;
@@ -63,18 +63,13 @@ main (int argc, char *argv[])
   clutter_stage_set_title (CLUTTER_STAGE (stage), "Content Box");
   clutter_stage_set_user_resizable (CLUTTER_STAGE (stage), TRUE);
   g_signal_connect (stage, "destroy", G_CALLBACK (clutter_main_quit), NULL);
+  clutter_actor_set_margin_top (stage, 12);
+  clutter_actor_set_margin_right (stage, 12);
+  clutter_actor_set_margin_bottom (stage, 12);
+  clutter_actor_set_margin_left (stage, 12);
   clutter_actor_show (stage);
 
-  box = clutter_actor_new ();
-  clutter_actor_set_name (box, "Image");
-  clutter_actor_set_margin_top (box, 12);
-  clutter_actor_set_margin_right (box, 12);
-  clutter_actor_set_margin_bottom (box, 12);
-  clutter_actor_set_margin_left (box, 12);
-  clutter_actor_add_constraint (box, clutter_bind_constraint_new (stage, CLUTTER_BIND_SIZE, 0.0));
-  clutter_actor_add_child (stage, box);
-
-  pixbuf = gdk_pixbuf_new_from_file (TESTS_DATADIR G_DIR_SEPARATOR_S "redhand.png", NULL);
+  pixbuf = gdk_pixbuf_new_from_file ("redhand.png", NULL);
   image = clutter_image_new ();
   clutter_image_set_data (CLUTTER_IMAGE (image),
                           gdk_pixbuf_get_pixels (pixbuf),
@@ -87,11 +82,11 @@ main (int argc, char *argv[])
                           NULL);
   g_object_unref (pixbuf);
 
-  clutter_actor_set_content_scaling_filters (box,
+  clutter_actor_set_content_scaling_filters (stage,
                                              CLUTTER_SCALING_FILTER_TRILINEAR,
                                              CLUTTER_SCALING_FILTER_LINEAR);
-  clutter_actor_set_content_gravity (box, gravities[n_gravities - 1].gravity);
-  clutter_actor_set_content (box, image);
+  clutter_actor_set_content_gravity (stage, gravities[n_gravities - 1].gravity);
+  clutter_actor_set_content (stage, image);
   g_object_unref (image);
 
   str = g_strconcat ("Content gravity: ",
@@ -107,8 +102,7 @@ main (int argc, char *argv[])
 
   action = clutter_tap_action_new ();
   g_signal_connect (action, "tap", G_CALLBACK (on_tap), text);
-  clutter_actor_set_reactive (box, TRUE);
-  clutter_actor_add_action (box, action);
+  clutter_actor_add_action (stage, action);
 
   clutter_main ();
 
diff --git a/examples/pan-action.c b/examples/pan-action.c
index 71dcb24ae..e8733056b 100644
--- a/examples/pan-action.c
+++ b/examples/pan-action.c
@@ -15,7 +15,7 @@ create_content_actor (void)
   content = clutter_actor_new ();
   clutter_actor_set_size (content, 720, 720);
 
-  pixbuf = gdk_pixbuf_new_from_file (TESTS_DATADIR G_DIR_SEPARATOR_S "redhand.png", NULL);
+  pixbuf = gdk_pixbuf_new_from_file ("redhand.png", NULL);
   image = clutter_image_new ();
   clutter_image_set_data (CLUTTER_IMAGE (image),
                           gdk_pixbuf_get_pixels (pixbuf),
diff --git a/examples/redhand.png b/examples/redhand.png
new file mode 100644
index 000000000..c07d8acd3
Binary files /dev/null and b/examples/redhand.png differ
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 91c013a3f..1eb2e0efb 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -45,7 +45,6 @@ clutter/clutter-snap-constraint.c
 clutter/clutter-stage.c
 clutter/clutter-stage-window.c
 clutter/clutter-swipe-action.c
-clutter/clutter-table-layout.c
 clutter/clutter-tap-action.c
 clutter/clutter-text-buffer.c
 clutter/clutter-text.c
@@ -71,6 +70,7 @@ clutter/deprecated/clutter-media.c
 clutter/deprecated/clutter-rectangle.c
 clutter/deprecated/clutter-shader.c
 clutter/deprecated/clutter-state.c
+clutter/deprecated/clutter-table-layout.c
 clutter/deprecated/clutter-texture.c
 clutter/evdev/clutter-input-device-evdev.c
 clutter/gdk/clutter-backend-gdk.c
diff --git a/po/an.po b/po/an.po
new file mode 100644
index 000000000..f61a5af5e
--- /dev/null
+++ b/po/an.po
@@ -0,0 +1,2841 @@
+# Aragonese translation for clutter.
+# Copyright (C) 2013 clutter's COPYRIGHT HOLDER
+# This file is distributed under the same license as the clutter package.
+# Daniel Martínez <dmartinez@src.gnome.org>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: clutter clutter-1.16\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+"product=clutter&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2014-02-08 16:11+0000\n"
+"PO-Revision-Date: 2014-02-08 19:13+0100\n"
+"Last-Translator: Jorge Pérez Pérez <jorgtum@gmail.com>\n"
+"Language-Team: Aragonese <softaragones@googlegroups.com>\n"
+"Language: an\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Poedit 1.6.3\n"
+
+#: ../clutter/clutter-actor.c:6214
+msgid "X coordinate"
+msgstr "Coordenada X"
+
+#: ../clutter/clutter-actor.c:6215
+msgid "X coordinate of the actor"
+msgstr "X coordinate of the actor"
+
+#: ../clutter/clutter-actor.c:6233
+msgid "Y coordinate"
+msgstr "Coordenada Y"
+
+#: ../clutter/clutter-actor.c:6234
+msgid "Y coordinate of the actor"
+msgstr "A coordenada Y de l'actor"
+
+#: ../clutter/clutter-actor.c:6256
+msgid "Position"
+msgstr "Posición"
+
+#: ../clutter/clutter-actor.c:6257
+msgid "The position of the origin of the actor"
+msgstr "A posición d'orichen de l'actor"
+
+#: ../clutter/clutter-actor.c:6274 ../clutter/clutter-canvas.c:247
+#: ../clutter/clutter-grid-layout.c:1239
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:474
+msgid "Width"
+msgstr "Amplaria"
+
+#: ../clutter/clutter-actor.c:6275
+msgid "Width of the actor"
+msgstr "Amplaria de l'actor"
+
+#: ../clutter/clutter-actor.c:6293 ../clutter/clutter-canvas.c:263
+#: ../clutter/clutter-grid-layout.c:1246
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:490
+msgid "Height"
+msgstr "Altura"
+
+#: ../clutter/clutter-actor.c:6294
+msgid "Height of the actor"
+msgstr "Altura de l'actor"
+
+#: ../clutter/clutter-actor.c:6315
+msgid "Size"
+msgstr "Grandaria"
+
+#: ../clutter/clutter-actor.c:6316
+msgid "The size of the actor"
+msgstr "A grandaria de l'actor"
+
+#: ../clutter/clutter-actor.c:6334
+msgid "Fixed X"
+msgstr "X fixa"
+
+#: ../clutter/clutter-actor.c:6335
+msgid "Forced X position of the actor"
+msgstr "Posición X aforzada de l'actor"
+
+#: ../clutter/clutter-actor.c:6352
+msgid "Fixed Y"
+msgstr "Y fixa"
+
+#: ../clutter/clutter-actor.c:6353
+msgid "Forced Y position of the actor"
+msgstr "Posición Y aforzada de l'actor"
+
+#: ../clutter/clutter-actor.c:6368
+msgid "Fixed position set"
+msgstr "Posición fixa establida"
+
+#: ../clutter/clutter-actor.c:6369
+msgid "Whether to use fixed positioning for the actor"
+msgstr "Indica si s'usa una posición fixa ta l'actor"
+
+#: ../clutter/clutter-actor.c:6387
+msgid "Min Width"
+msgstr "Amplaria minima"
+
+#: ../clutter/clutter-actor.c:6388
+msgid "Forced minimum width request for the actor"
+msgstr "Solicitut d'amplaria minima aforzada ta l'actor"
+
+#: ../clutter/clutter-actor.c:6406
+msgid "Min Height"
+msgstr "Altura minima"
+
+#: ../clutter/clutter-actor.c:6407
+msgid "Forced minimum height request for the actor"
+msgstr "Solicitut d'altura minima aforzada ta l'actor"
+
+#: ../clutter/clutter-actor.c:6425
+msgid "Natural Width"
+msgstr "Amplaria natural"
+
+#: ../clutter/clutter-actor.c:6426
+msgid "Forced natural width request for the actor"
+msgstr "Solicitut d'amplaria natural aforzada ta l'actor"
+
+#: ../clutter/clutter-actor.c:6444
+msgid "Natural Height"
+msgstr "Altura natural"
+
+#: ../clutter/clutter-actor.c:6445
+msgid "Forced natural height request for the actor"
+msgstr "Solicitut d'altura natural aforzada ta l'actor"
+
+#: ../clutter/clutter-actor.c:6460
+msgid "Minimum width set"
+msgstr "Amplaria minima establida"
+
+#: ../clutter/clutter-actor.c:6461
+msgid "Whether to use the min-width property"
+msgstr "Indica si s'usa a propiedat «amplaria minima»"
+
+#: ../clutter/clutter-actor.c:6475
+msgid "Minimum height set"
+msgstr "Altura minima establida"
+
+#: ../clutter/clutter-actor.c:6476
+msgid "Whether to use the min-height property"
+msgstr "Indica si s'usa a propiedat «altura minima»"
+
+#: ../clutter/clutter-actor.c:6490
+msgid "Natural width set"
+msgstr "Amplaria natural establida"
+
+#: ../clutter/clutter-actor.c:6491
+msgid "Whether to use the natural-width property"
+msgstr "Indica si s'usa a propiedat «amplaria natural»"
+
+#: ../clutter/clutter-actor.c:6505
+msgid "Natural height set"
+msgstr "Altura natural establida"
+
+#: ../clutter/clutter-actor.c:6506
+msgid "Whether to use the natural-height property"
+msgstr "Indica si s'usa a propiedat «altura natural»"
+
+#: ../clutter/clutter-actor.c:6522
+msgid "Allocation"
+msgstr "Asignación"
+
+#: ../clutter/clutter-actor.c:6523
+msgid "The actor's allocation"
+msgstr "L'asignación de l'actor"
+
+#: ../clutter/clutter-actor.c:6580
+msgid "Request Mode"
+msgstr "Modo de solicitut"
+
+#: ../clutter/clutter-actor.c:6581
+msgid "The actor's request mode"
+msgstr "O modo de solicitut de l'actor"
+
+#: ../clutter/clutter-actor.c:6605
+msgid "Depth"
+msgstr "Profundidat"
+
+#: ../clutter/clutter-actor.c:6606
+msgid "Position on the Z axis"
+msgstr "Posición en l'eixe Z"
+
+#: ../clutter/clutter-actor.c:6633
+msgid "Z Position"
+msgstr "Posición Z"
+
+#: ../clutter/clutter-actor.c:6634
+msgid "The actor's position on the Z axis"
+msgstr "Posición de l'actor en l'eixe Z"
+
+#: ../clutter/clutter-actor.c:6651
+msgid "Opacity"
+msgstr "Opacidat"
+
+#: ../clutter/clutter-actor.c:6652
+msgid "Opacity of an actor"
+msgstr "Opacidat d'un actor"
+
+#: ../clutter/clutter-actor.c:6672
+msgid "Offscreen redirect"
+msgstr "Redirección difuera d'a pantalla"
+
+#: ../clutter/clutter-actor.c:6673
+msgid "Flags controlling when to flatten the actor into a single image"
+msgstr "Opcions que controlan si cal aplanar l'actor en una sola imachen"
+
+#: ../clutter/clutter-actor.c:6687
+msgid "Visible"
+msgstr "Visible"
+
+#: ../clutter/clutter-actor.c:6688
+msgid "Whether the actor is visible or not"
+msgstr "Indica si l'actor ye visible u no pas"
+
+#: ../clutter/clutter-actor.c:6702
+msgid "Mapped"
+msgstr "Mapeyau"
+
+#: ../clutter/clutter-actor.c:6703
+msgid "Whether the actor will be painted"
+msgstr "Indica si se dibuixará l'actor"
+
+#: ../clutter/clutter-actor.c:6716
+msgid "Realized"
+msgstr "Realizau"
+
+#: ../clutter/clutter-actor.c:6717
+msgid "Whether the actor has been realized"
+msgstr "Indica si l'actor s'ha realizau"
+
+#: ../clutter/clutter-actor.c:6732
+msgid "Reactive"
+msgstr "Reactivo"
+
+#: ../clutter/clutter-actor.c:6733
+msgid "Whether the actor is reactive to events"
+msgstr "Indica si l'actor ye reactivo a eventos"
+
+#: ../clutter/clutter-actor.c:6744
+msgid "Has Clip"
+msgstr "Tien retalle"
+
+#: ../clutter/clutter-actor.c:6745
+msgid "Whether the actor has a clip set"
+msgstr "Indica si l'actor tien un conchunto de retalles"
+
+#: ../clutter/clutter-actor.c:6758
+msgid "Clip"
+msgstr "Retallar"
+
+#: ../clutter/clutter-actor.c:6759
+msgid "The clip region for the actor"
+msgstr "A rechión de retalle de l'actor"
+
+#: ../clutter/clutter-actor.c:6778
+msgid "Clip Rectangle"
+msgstr "Retallar un rectanglo"
+
+#: ../clutter/clutter-actor.c:6779
+msgid "The visible region of the actor"
+msgstr "A rechión visible de l'actor"
+
+#: ../clutter/clutter-actor.c:6793 ../clutter/clutter-actor-meta.c:205
+#: ../clutter/clutter-binding-pool.c:319 ../clutter/clutter-input-device.c:247
+msgid "Name"
+msgstr "Nombre"
+
+#: ../clutter/clutter-actor.c:6794
+msgid "Name of the actor"
+msgstr "Nombre de l'actor"
+
+#: ../clutter/clutter-actor.c:6815
+msgid "Pivot Point"
+msgstr "Punto de pivote"
+
+#: ../clutter/clutter-actor.c:6816
+msgid "The point around which the scaling and rotation occur"
+msgstr "O punto arredol d'o como succede o escalau y a rotación"
+
+#: ../clutter/clutter-actor.c:6834
+msgid "Pivot Point Z"
+msgstr "Punto de pivote Z"
+
+#: ../clutter/clutter-actor.c:6835
+msgid "Z component of the pivot point"
+msgstr "Componente Z d'o punto de pivote"
+
+#: ../clutter/clutter-actor.c:6853
+msgid "Scale X"
+msgstr "Escala en X"
+
+#: ../clutter/clutter-actor.c:6854
+msgid "Scale factor on the X axis"
+msgstr "Factor d'escala en l'eixe X"
+
+#: ../clutter/clutter-actor.c:6872
+msgid "Scale Y"
+msgstr "Escala en Y"
+
+#: ../clutter/clutter-actor.c:6873
+msgid "Scale factor on the Y axis"
+msgstr "Factor d'escala en l'eixe Y"
+
+#: ../clutter/clutter-actor.c:6891
+msgid "Scale Z"
+msgstr "Escala en Z"
+
+#: ../clutter/clutter-actor.c:6892
+msgid "Scale factor on the Z axis"
+msgstr "Factor d'escala en l'eixe Z"
+
+#: ../clutter/clutter-actor.c:6910
+msgid "Scale Center X"
+msgstr "Centro X del'escalau"
+
+#: ../clutter/clutter-actor.c:6911
+msgid "Horizontal scale center"
+msgstr "Centro d'a escala horizontal"
+
+#: ../clutter/clutter-actor.c:6929
+msgid "Scale Center Y"
+msgstr "Centro Y de l'escalau"
+
+#: ../clutter/clutter-actor.c:6930
+msgid "Vertical scale center"
+msgstr "Centro d'a escala vertical"
+
+#: ../clutter/clutter-actor.c:6948
+msgid "Scale Gravity"
+msgstr "Gravedat de l'escalau"
+
+#: ../clutter/clutter-actor.c:6949
+msgid "The center of scaling"
+msgstr "O centro de l'escalau"
+
+#: ../clutter/clutter-actor.c:6967
+msgid "Rotation Angle X"
+msgstr "Anglo de rotación X"
+
+#: ../clutter/clutter-actor.c:6968
+msgid "The rotation angle on the X axis"
+msgstr "L'anglo de rotación en l'eixe X"
+
+#: ../clutter/clutter-actor.c:6986
+msgid "Rotation Angle Y"
+msgstr "Anglo de rotación Y"
+
+#: ../clutter/clutter-actor.c:6987
+msgid "The rotation angle on the Y axis"
+msgstr "L'anglo de rotación en l'eixe Y"
+
+#: ../clutter/clutter-actor.c:7005
+msgid "Rotation Angle Z"
+msgstr "Anglo de rotación Z"
+
+#: ../clutter/clutter-actor.c:7006
+msgid "The rotation angle on the Z axis"
+msgstr "L'anglo de rotación en l'eixe Z"
+
+#: ../clutter/clutter-actor.c:7024
+msgid "Rotation Center X"
+msgstr "Centro de rotación X"
+
+#: ../clutter/clutter-actor.c:7025
+msgid "The rotation center on the X axis"
+msgstr "O centro de rotación en l'eixe Y"
+
+#: ../clutter/clutter-actor.c:7042
+msgid "Rotation Center Y"
+msgstr "Centro de rotación Y"
+
+#: ../clutter/clutter-actor.c:7043
+msgid "The rotation center on the Y axis"
+msgstr "O centro d'a rotación en l'eixe Y"
+
+#: ../clutter/clutter-actor.c:7060
+msgid "Rotation Center Z"
+msgstr "Centro de rotación Z"
+
+#: ../clutter/clutter-actor.c:7061
+msgid "The rotation center on the Z axis"
+msgstr "O centro de rotación en l'eixe Z"
+
+#: ../clutter/clutter-actor.c:7078
+msgid "Rotation Center Z Gravity"
+msgstr "Gravedat d'o centro de rotación Z"
+
+#: ../clutter/clutter-actor.c:7079
+msgid "Center point for rotation around the Z axis"
+msgstr "Punto central d'a rotación arredol de l'eixe Z"
+
+#: ../clutter/clutter-actor.c:7107
+msgid "Anchor X"
+msgstr "Ancora X"
+
+#: ../clutter/clutter-actor.c:7108
+msgid "X coordinate of the anchor point"
+msgstr "Coordenada X d'o punto d'ancorau"
+
+#: ../clutter/clutter-actor.c:7136
+msgid "Anchor Y"
+msgstr "Ancora Y"
+
+#: ../clutter/clutter-actor.c:7137
+msgid "Y coordinate of the anchor point"
+msgstr "Coordenada Y d'o punto d'ancorau"
+
+#: ../clutter/clutter-actor.c:7164
+msgid "Anchor Gravity"
+msgstr "Gravedat de l'ancora"
+
+#: ../clutter/clutter-actor.c:7165
+msgid "The anchor point as a ClutterGravity"
+msgstr "O punto d'ancorau como un «ClutterGravity»"
+
+#: ../clutter/clutter-actor.c:7184
+msgid "Translation X"
+msgstr "Translación X"
+
+#: ../clutter/clutter-actor.c:7185
+msgid "Translation along the X axis"
+msgstr "Translación alo luengo de l'eixe X"
+
+#: ../clutter/clutter-actor.c:7204
+msgid "Translation Y"
+msgstr "Translación Y"
+
+#: ../clutter/clutter-actor.c:7205
+msgid "Translation along the Y axis"
+msgstr "Translación a lo luengo de l'eixe Y"
+
+#: ../clutter/clutter-actor.c:7224
+msgid "Translation Z"
+msgstr "Translación Z"
+
+#: ../clutter/clutter-actor.c:7225
+msgid "Translation along the Z axis"
+msgstr "Translación a lo luengo de l'eixe Z"
+
+#: ../clutter/clutter-actor.c:7255
+msgid "Transform"
+msgstr "Transformar"
+
+#: ../clutter/clutter-actor.c:7256
+msgid "Transformation matrix"
+msgstr "Matriz de transformación"
+
+#: ../clutter/clutter-actor.c:7271
+msgid "Transform Set"
+msgstr "Transformar un conchunto"
+
+#: ../clutter/clutter-actor.c:7272
+msgid "Whether the transform property is set"
+msgstr "Indica si a propiedat de transformación ye establida"
+
+#: ../clutter/clutter-actor.c:7293
+msgid "Child Transform"
+msgstr "Transformar o fillo"
+
+#: ../clutter/clutter-actor.c:7294
+msgid "Children transformation matrix"
+msgstr "Matriz de transformación d'o fillo"
+
+#: ../clutter/clutter-actor.c:7309
+msgid "Child Transform Set"
+msgstr "Transformar o fillo establida"
+
+#: ../clutter/clutter-actor.c:7310
+msgid "Whether the child-transform property is set"
+msgstr "Indica si a propiedat de transformación d'o fillo ye establida"
+
+#: ../clutter/clutter-actor.c:7327
+msgid "Show on set parent"
+msgstr "Amostrar en o conchunto pai"
+
+#: ../clutter/clutter-actor.c:7328
+msgid "Whether the actor is shown when parented"
+msgstr "Indica si l'actor s'amuestra quan tien pai"
+
+#: ../clutter/clutter-actor.c:7345
+msgid "Clip to Allocation"
+msgstr "Retallar a l'asignación"
+
+#: ../clutter/clutter-actor.c:7346
+msgid "Sets the clip region to track the actor's allocation"
+msgstr "Estableix a rechión de retalle ta seguir a ubicación de l'actor"
+
+#: ../clutter/clutter-actor.c:7359
+msgid "Text Direction"
+msgstr "Adreza d'o texto"
+
+#: ../clutter/clutter-actor.c:7360
+msgid "Direction of the text"
+msgstr "Adreza d'o texto"
+
+#: ../clutter/clutter-actor.c:7375
+msgid "Has Pointer"
+msgstr "Tien puntero"
+
+#: ../clutter/clutter-actor.c:7376
+msgid "Whether the actor contains the pointer of an input device"
+msgstr "Indica si l'actor contién un puntero enta un dispositivo de dentrada"
+
+#: ../clutter/clutter-actor.c:7389
+msgid "Actions"
+msgstr "Accions"
+
+#: ../clutter/clutter-actor.c:7390
+msgid "Adds an action to the actor"
+msgstr "Adhibe una acción a l'actor"
+
+#: ../clutter/clutter-actor.c:7403
+msgid "Constraints"
+msgstr "Restriccions"
+
+#: ../clutter/clutter-actor.c:7404
+msgid "Adds a constraint to the actor"
+msgstr "Adhibe una restricción a l'actor"
+
+#: ../clutter/clutter-actor.c:7417
+msgid "Effect"
+msgstr "Efecto"
+
+#: ../clutter/clutter-actor.c:7418
+msgid "Add an effect to be applied on the actor"
+msgstr "Adhibir un efecto que aplicar a l'actor"
+
+#: ../clutter/clutter-actor.c:7432
+msgid "Layout Manager"
+msgstr "Chestor de distribución"
+
+#: ../clutter/clutter-actor.c:7433
+msgid "The object controlling the layout of an actor's children"
+msgstr "L'obchecto que controla a distribución d'o fillo d'un actor"
+
+#: ../clutter/clutter-actor.c:7447
+msgid "X Expand"
+msgstr "Expansión X"
+
+#: ../clutter/clutter-actor.c:7448
+msgid "Whether extra horizontal space should be assigned to the actor"
+msgstr "Indica si cal asignar a l'actor l'espacio horizontal adicional"
+
+#: ../clutter/clutter-actor.c:7463
+msgid "Y Expand"
+msgstr "Expansión Y"
+
+#: ../clutter/clutter-actor.c:7464
+msgid "Whether extra vertical space should be assigned to the actor"
+msgstr "Indica si cal asignar a l'actor l'espacio vertical adicional"
+
+#: ../clutter/clutter-actor.c:7480
+msgid "X Alignment"
+msgstr "Alineación X"
+
+#: ../clutter/clutter-actor.c:7481
+msgid "The alignment of the actor on the X axis within its allocation"
+msgstr "L'aliniación de l'actor en l'eixe X en a l'asignación d'ell"
+
+#: ../clutter/clutter-actor.c:7496
+msgid "Y Alignment"
+msgstr "Alineación Y"
+
+#: ../clutter/clutter-actor.c:7497
+msgid "The alignment of the actor on the Y axis within its allocation"
+msgstr "L'aliniación de l'actor en l'eixe Y en a l'asignación d'ell"
+
+#: ../clutter/clutter-actor.c:7516
+msgid "Margin Top"
+msgstr "Marguin superior"
+
+#: ../clutter/clutter-actor.c:7517
+msgid "Extra space at the top"
+msgstr "Espacio superior adicional"
+
+#: ../clutter/clutter-actor.c:7538
+msgid "Margin Bottom"
+msgstr "Marguin inferior"
+
+#: ../clutter/clutter-actor.c:7539
+msgid "Extra space at the bottom"
+msgstr "Espacio inferior adicional"
+
+#: ../clutter/clutter-actor.c:7560
+msgid "Margin Left"
+msgstr "Marguin cucha"
+
+#: ../clutter/clutter-actor.c:7561
+msgid "Extra space at the left"
+msgstr "Espacio adicional a la cucha"
+
+#: ../clutter/clutter-actor.c:7582
+msgid "Margin Right"
+msgstr "Marguin dreita"
+
+#: ../clutter/clutter-actor.c:7583
+msgid "Extra space at the right"
+msgstr "Espacio adicional a la dreita"
+
+#: ../clutter/clutter-actor.c:7599
+msgid "Background Color Set"
+msgstr "Conchunto de colors de fondo"
+
+#: ../clutter/clutter-actor.c:7600 ../clutter/deprecated/clutter-box.c:271
+msgid "Whether the background color is set"
+msgstr "Indica si a color de fondo ye establida"
+
+#: ../clutter/clutter-actor.c:7616
+msgid "Background color"
+msgstr "Color de fondo"
+
+#: ../clutter/clutter-actor.c:7617
+msgid "The actor's background color"
+msgstr "A color de fondo de l'actor"
+
+#: ../clutter/clutter-actor.c:7632
+msgid "First Child"
+msgstr "Primer fillo"
+
+#: ../clutter/clutter-actor.c:7633
+msgid "The actor's first child"
+msgstr "O primer fillo de l'actor"
+
+#: ../clutter/clutter-actor.c:7646
+msgid "Last Child"
+msgstr "Zaguer fillo"
+
+#: ../clutter/clutter-actor.c:7647
+msgid "The actor's last child"
+msgstr "O zaguer fillo de l'actor"
+
+#: ../clutter/clutter-actor.c:7661
+msgid "Content"
+msgstr "Conteniu"
+
+#: ../clutter/clutter-actor.c:7662
+msgid "Delegate object for painting the actor's content"
+msgstr "Delegar l'obchecto ta pintar o conteniu de l'actor"
+
+#: ../clutter/clutter-actor.c:7687
+msgid "Content Gravity"
+msgstr "Gravedat d'o conteniu"
+
+#: ../clutter/clutter-actor.c:7688
+msgid "Alignment of the actor's content"
+msgstr "Aliniación d'o conteniu de l'actor"
+
+#: ../clutter/clutter-actor.c:7708
+msgid "Content Box"
+msgstr "Caixa d'o conteniu"
+
+#: ../clutter/clutter-actor.c:7709
+msgid "The bounding box of the actor's content"
+msgstr "A caixa que rodia a lo conteniu de l'actor"
+
+#: ../clutter/clutter-actor.c:7717
+msgid "Minification Filter"
+msgstr "Filtro de reducción"
+
+#: ../clutter/clutter-actor.c:7718
+msgid "The filter used when reducing the size of the content"
+msgstr "O filtro usau en reducir a grandaria d'o conteniu"
+
+#: ../clutter/clutter-actor.c:7725
+msgid "Magnification Filter"
+msgstr "Filtro d'enampladura"
+
+#: ../clutter/clutter-actor.c:7726
+msgid "The filter used when increasing the size of the content"
+msgstr "O filtro usau en aumentar a grandaria d'o conteniu"
+
+#: ../clutter/clutter-actor.c:7740
+msgid "Content Repeat"
+msgstr "Segundiar o conteniu"
+
+#: ../clutter/clutter-actor.c:7741
+msgid "The repeat policy for the actor's content"
+msgstr "A politica de segundiada d'o conteniu de l'actor"
+
+#: ../clutter/clutter-actor-meta.c:191 ../clutter/clutter-child-meta.c:142
+msgid "Actor"
+msgstr "Actor"
+
+#: ../clutter/clutter-actor-meta.c:192
+msgid "The actor attached to the meta"
+msgstr "L'actor adchunto a la meta"
+
+#: ../clutter/clutter-actor-meta.c:206
+msgid "The name of the meta"
+msgstr "O nombre d'a meta"
+
+#: ../clutter/clutter-actor-meta.c:219 ../clutter/clutter-input-device.c:326
+#: ../clutter/deprecated/clutter-shader.c:309
+msgid "Enabled"
+msgstr "Activada"
+
+#: ../clutter/clutter-actor-meta.c:220
+msgid "Whether the meta is enabled"
+msgstr "Indica si a meta ye activada"
+
+#: ../clutter/clutter-align-constraint.c:279
+#: ../clutter/clutter-bind-constraint.c:358 ../clutter/clutter-clone.c:341
+#: ../clutter/clutter-snap-constraint.c:321
+msgid "Source"
+msgstr "Fuent"
+
+#: ../clutter/clutter-align-constraint.c:280
+msgid "The source of the alignment"
+msgstr "A fuent de l'aliniación"
+
+#: ../clutter/clutter-align-constraint.c:293
+msgid "Align Axis"
+msgstr "Aliniar os eixes"
+
+#: ../clutter/clutter-align-constraint.c:294
+msgid "The axis to align the position to"
+msgstr "L'eixe a lo que aliniar a posición"
+
+#: ../clutter/clutter-align-constraint.c:313
+#: ../clutter/clutter-desaturate-effect.c:270
+msgid "Factor"
+msgstr "Factor"
+
+#: ../clutter/clutter-align-constraint.c:314
+msgid "The alignment factor, between 0.0 and 1.0"
+msgstr "O factor d'aliniación, entre 0.0 y 1.0"
+
+#: ../clutter/clutter-backend.c:380
+msgid "Unable to initialize the Clutter backend"
+msgstr "No s'ha puesto inicializar o backend de Clutter"
+
+#: ../clutter/clutter-backend.c:454
+#, c-format
+msgid "The backend of type '%s' does not support creating multiple stages"
+msgstr "O backend d'a mena «%s» no suporta a creyación de multiples escenarios"
+
+#: ../clutter/clutter-bind-constraint.c:359
+msgid "The source of the binding"
+msgstr "L'orichen d'o ligallo"
+
+#: ../clutter/clutter-bind-constraint.c:372
+msgid "Coordinate"
+msgstr "Coordenada"
+
+#: ../clutter/clutter-bind-constraint.c:373
+msgid "The coordinate to bind"
+msgstr "A coordenada que ligar"
+
+#: ../clutter/clutter-bind-constraint.c:387
+#: ../clutter/clutter-path-constraint.c:226
+#: ../clutter/clutter-snap-constraint.c:366
+msgid "Offset"
+msgstr "Desplazamiento"
+
+#: ../clutter/clutter-bind-constraint.c:388
+msgid "The offset in pixels to apply to the binding"
+msgstr "O desplazamiento en pixels que aplicar a lo ligallo"
+
+#: ../clutter/clutter-binding-pool.c:320
+msgid "The unique name of the binding pool"
+msgstr "O nombre solo d'o ligallo de l'agrupación"
+
+#: ../clutter/clutter-bin-layout.c:238 ../clutter/clutter-bin-layout.c:651
+#: ../clutter/clutter-box-layout.c:388
+#: ../clutter/deprecated/clutter-table-layout.c:610
+msgid "Horizontal Alignment"
+msgstr "Aliniación horizontal"
+
+#: ../clutter/clutter-bin-layout.c:239
+msgid "Horizontal alignment for the actor inside the layout manager"
+msgstr "Aliniación horizontal de l'actor adentro d'o chestor de distribución"
+
+#: ../clutter/clutter-bin-layout.c:247 ../clutter/clutter-bin-layout.c:671
+#: ../clutter/clutter-box-layout.c:397
+#: ../clutter/deprecated/clutter-table-layout.c:625
+msgid "Vertical Alignment"
+msgstr "Alineación vertical"
+
+#: ../clutter/clutter-bin-layout.c:248
+msgid "Vertical alignment for the actor inside the layout manager"
+msgstr "Alineación vertical de l'actor adentro d'o chestor de distribución"
+
+#: ../clutter/clutter-bin-layout.c:652
+msgid "Default horizontal alignment for the actors inside the layout manager"
+msgstr ""
+"Aliniación horizontal predeterminada d'os actors adentro d'o chestor de "
+"distribución"
+
+#: ../clutter/clutter-bin-layout.c:672
+msgid "Default vertical alignment for the actors inside the layout manager"
+msgstr ""
+"Aliniación vertical predeterminada d'os actors adentro d'o chestor de "
+"distribución"
+
+#: ../clutter/clutter-box-layout.c:363
+msgid "Expand"
+msgstr "Desplegar"
+
+#: ../clutter/clutter-box-layout.c:364
+msgid "Allocate extra space for the child"
+msgstr "Asignar espacio adicional ta lo fillo"
+
+#: ../clutter/clutter-box-layout.c:370
+#: ../clutter/deprecated/clutter-table-layout.c:589
+msgid "Horizontal Fill"
+msgstr "Replenau horizontal"
+
+#: ../clutter/clutter-box-layout.c:371
+#: ../clutter/deprecated/clutter-table-layout.c:590
+msgid ""
+"Whether the child should receive priority when the container is allocating "
+"spare space on the horizontal axis"
+msgstr ""
+"Indica si o fillo debe tener prioridat quan o contenedor reserve espacio "
+"libre en l'eixe horizontal"
+
+#: ../clutter/clutter-box-layout.c:379
+#: ../clutter/deprecated/clutter-table-layout.c:596
+msgid "Vertical Fill"
+msgstr "Replenau vertical"
+
+#: ../clutter/clutter-box-layout.c:380
+#: ../clutter/deprecated/clutter-table-layout.c:597
+msgid ""
+"Whether the child should receive priority when the container is allocating "
+"spare space on the vertical axis"
+msgstr ""
+"Indica si o fillo debe tener prioridat quan o contenedor reserve espacio "
+"libre en l'eixe vertical"
+
+#: ../clutter/clutter-box-layout.c:389
+#: ../clutter/deprecated/clutter-table-layout.c:611
+msgid "Horizontal alignment of the actor within the cell"
+msgstr "Aliniación horizontal de l'actor en a celda"
+
+#: ../clutter/clutter-box-layout.c:398
+#: ../clutter/deprecated/clutter-table-layout.c:626
+msgid "Vertical alignment of the actor within the cell"
+msgstr "Alineación vertical de l'actor en a celda"
+
+#: ../clutter/clutter-box-layout.c:1359
+msgid "Vertical"
+msgstr "Vertical"
+
+#: ../clutter/clutter-box-layout.c:1360
+msgid "Whether the layout should be vertical, rather than horizontal"
+msgstr "Indica si a distribución cal estar vertical, en cuenta d'horizontal"
+
+#: ../clutter/clutter-box-layout.c:1377 ../clutter/clutter-flow-layout.c:942
+#: ../clutter/clutter-grid-layout.c:1549
+msgid "Orientation"
+msgstr "Orientación"
+
+#: ../clutter/clutter-box-layout.c:1378 ../clutter/clutter-flow-layout.c:943
+#: ../clutter/clutter-grid-layout.c:1550
+msgid "The orientation of the layout"
+msgstr "A orientación d'a distribución"
+
+#: ../clutter/clutter-box-layout.c:1394 ../clutter/clutter-flow-layout.c:958
+msgid "Homogeneous"
+msgstr "Homochénea"
+
+#: ../clutter/clutter-box-layout.c:1395
+msgid ""
+"Whether the layout should be homogeneous, i.e. all childs get the same size"
+msgstr ""
+"Indica si a distribución debe estar homochénea, eix. totz os fillos tienen a "
+"mesma grandaria"
+
+#: ../clutter/clutter-box-layout.c:1410
+msgid "Pack Start"
+msgstr "Empaquetar a lo prencipio"
+
+#: ../clutter/clutter-box-layout.c:1411
+msgid "Whether to pack items at the start of the box"
+msgstr "Indica si s'empaquetan os elementos a lo prencipio d'a caixa"
+
+#: ../clutter/clutter-box-layout.c:1424
+msgid "Spacing"
+msgstr "Espaciau"
+
+#: ../clutter/clutter-box-layout.c:1425
+msgid "Spacing between children"
+msgstr "Espaciau entre fillos"
+
+#: ../clutter/clutter-box-layout.c:1442
+#: ../clutter/deprecated/clutter-table-layout.c:1677
+msgid "Use Animations"
+msgstr "Fer servir animacions"
+
+#: ../clutter/clutter-box-layout.c:1443
+#: ../clutter/deprecated/clutter-table-layout.c:1678
+msgid "Whether layout changes should be animated"
+msgstr "Indica si cal puixar os cambeos en a distribución"
+
+#: ../clutter/clutter-box-layout.c:1467
+#: ../clutter/deprecated/clutter-table-layout.c:1702
+msgid "Easing Mode"
+msgstr "Modo de desacceleración"
+
+#: ../clutter/clutter-box-layout.c:1468
+#: ../clutter/deprecated/clutter-table-layout.c:1703
+msgid "The easing mode of the animations"
+msgstr "O modo de desacceleración d'as animacions"
+
+#: ../clutter/clutter-box-layout.c:1488
+#: ../clutter/deprecated/clutter-table-layout.c:1723
+msgid "Easing Duration"
+msgstr "Durada d'a desacceleración"
+
+#: ../clutter/clutter-box-layout.c:1489
+#: ../clutter/deprecated/clutter-table-layout.c:1724
+msgid "The duration of the animations"
+msgstr "A durada d'as animacions"
+
+#: ../clutter/clutter-brightness-contrast-effect.c:321
+msgid "Brightness"
+msgstr "Brilo"
+
+#: ../clutter/clutter-brightness-contrast-effect.c:322
+msgid "The brightness change to apply"
+msgstr "O cambeo d'o brilo que aplicar"
+
+#: ../clutter/clutter-brightness-contrast-effect.c:341
+msgid "Contrast"
+msgstr "Concarada"
+
+#: ../clutter/clutter-brightness-contrast-effect.c:342
+msgid "The contrast change to apply"
+msgstr "O cambeo d'a concarada que aplicar"
+
+#: ../clutter/clutter-canvas.c:248
+msgid "The width of the canvas"
+msgstr "L'amplaria de l'estopazo"
+
+#: ../clutter/clutter-canvas.c:264
+msgid "The height of the canvas"
+msgstr "L'altura de l'estopazo"
+
+#: ../clutter/clutter-canvas.c:283
+msgid "Scale Factor Set"
+msgstr "Factor d'escalau establiu"
+
+#: ../clutter/clutter-canvas.c:284
+msgid "Whether the scale-factor property is set"
+msgstr "Indica si a propiedat factor d'escalau ye establida"
+
+#: ../clutter/clutter-canvas.c:305
+msgid "Scale Factor"
+msgstr "Factor d'escalau"
+
+#: ../clutter/clutter-canvas.c:306
+msgid "The scaling factor for the surface"
+msgstr "O factor d'escalau ta la superficie"
+
+#: ../clutter/clutter-child-meta.c:127
+msgid "Container"
+msgstr "Contenedor"
+
+#: ../clutter/clutter-child-meta.c:128
+msgid "The container that created this data"
+msgstr "O contenedor que creyó istos datos"
+
+#: ../clutter/clutter-child-meta.c:143
+msgid "The actor wrapped by this data"
+msgstr "L'actor embolicau por istos datos"
+
+#: ../clutter/clutter-click-action.c:586
+msgid "Pressed"
+msgstr "Pretau"
+
+#: ../clutter/clutter-click-action.c:587
+msgid "Whether the clickable should be in pressed state"
+msgstr "Indica si o pretable cal estar en estau «pretau»"
+
+#: ../clutter/clutter-click-action.c:600
+msgid "Held"
+msgstr "Reteniu"
+
+#: ../clutter/clutter-click-action.c:601
+msgid "Whether the clickable has a grab"
+msgstr "Indica si o dispositivo tien un tirador"
+
+#: ../clutter/clutter-click-action.c:618 ../clutter/clutter-settings.c:653
+msgid "Long Press Duration"
+msgstr "Durada d'a pulsación luenga"
+
+#: ../clutter/clutter-click-action.c:619
+msgid "The minimum duration of a long press to recognize the gesture"
+msgstr "A durada minima d'una pulsación luenga ta reconoixer o cenyo"
+
+#: ../clutter/clutter-click-action.c:637
+msgid "Long Press Threshold"
+msgstr "Branquil d'a pulsación luenga"
+
+#: ../clutter/clutter-click-action.c:638
+msgid "The maximum threshold before a long press is cancelled"
+msgstr "O branquil maximo antes de cancelar una pulsación luenga"
+
+#: ../clutter/clutter-clone.c:342
+msgid "Specifies the actor to be cloned"
+msgstr "Especifica qué actor clonar"
+
+#: ../clutter/clutter-colorize-effect.c:251
+msgid "Tint"
+msgstr "Matiz"
+
+#: ../clutter/clutter-colorize-effect.c:252
+msgid "The tint to apply"
+msgstr "O matiz que aplicar"
+
+#: ../clutter/clutter-deform-effect.c:592
+msgid "Horizontal Tiles"
+msgstr "Quadros horizontals"
+
+#: ../clutter/clutter-deform-effect.c:593
+msgid "The number of horizontal tiles"
+msgstr "O numero de quadros horizontals"
+
+#: ../clutter/clutter-deform-effect.c:608
+msgid "Vertical Tiles"
+msgstr "Quadros verticals"
+
+#: ../clutter/clutter-deform-effect.c:609
+msgid "The number of vertical tiles"
+msgstr "O número de quadros verticals"
+
+#: ../clutter/clutter-deform-effect.c:626
+msgid "Back Material"
+msgstr "Material zaguero"
+
+#: ../clutter/clutter-deform-effect.c:627
+msgid "The material to be used when painting the back of the actor"
+msgstr "O material que fer servir ta pintar a parti zaguera de l'actor"
+
+#: ../clutter/clutter-desaturate-effect.c:271
+msgid "The desaturation factor"
+msgstr "O factor de desaturación"
+
+#: ../clutter/clutter-device-manager.c:127
+#: ../clutter/clutter-input-device.c:355
+#: ../clutter/x11/clutter-keymap-x11.c:321
+msgid "Backend"
+msgstr "Backend"
+
+#: ../clutter/clutter-device-manager.c:128
+msgid "The ClutterBackend of the device manager"
+msgstr "O «ClutterBackend» d'o chestor de dispositivos"
+
+#: ../clutter/clutter-drag-action.c:741
+msgid "Horizontal Drag Threshold"
+msgstr "Branquil d'arrociegue horizontal"
+
+#: ../clutter/clutter-drag-action.c:742
+msgid "The horizontal amount of pixels required to start dragging"
+msgstr "A cantidat de pixels horizontals requerius ta empecipiar a arrocegar"
+
+#: ../clutter/clutter-drag-action.c:769
+msgid "Vertical Drag Threshold"
+msgstr "Branquil d'arrociegue vertical"
+
+#: ../clutter/clutter-drag-action.c:770
+msgid "The vertical amount of pixels required to start dragging"
+msgstr "A cantidat de pixels verticals requerius ta empecipiar a arrocegar"
+
+#: ../clutter/clutter-drag-action.c:791
+msgid "Drag Handle"
+msgstr "Arrocegar o tirador"
+
+#: ../clutter/clutter-drag-action.c:792
+msgid "The actor that is being dragged"
+msgstr "L'actor que se ye arrocegando"
+
+#: ../clutter/clutter-drag-action.c:805
+msgid "Drag Axis"
+msgstr "Arrocegar os eixes"
+
+#: ../clutter/clutter-drag-action.c:806
+msgid "Constraints the dragging to an axis"
+msgstr "Restrinche l'arrocegau a un eixe"
+
+#: ../clutter/clutter-drag-action.c:822
+msgid "Drag Area"
+msgstr "Arrocegar l'aria"
+
+#: ../clutter/clutter-drag-action.c:823
+msgid "Constrains the dragging to a rectangle"
+msgstr "Restrinche l'arrocegau a un rectanglo"
+
+#: ../clutter/clutter-drag-action.c:836
+msgid "Drag Area Set"
+msgstr "Arrocegar l'aria establida"
+
+#: ../clutter/clutter-drag-action.c:837
+msgid "Whether the drag area is set"
+msgstr "Indica si a propiedat d'arrocegar l'aria ye establida"
+
+#: ../clutter/clutter-flow-layout.c:959
+msgid "Whether each item should receive the same allocation"
+msgstr "Indica si cada elemento debe recibir a mesma asignación"
+
+#: ../clutter/clutter-flow-layout.c:974
+#: ../clutter/deprecated/clutter-table-layout.c:1637
+msgid "Column Spacing"
+msgstr "Espaciau entre columnas"
+
+#: ../clutter/clutter-flow-layout.c:975
+msgid "The spacing between columns"
+msgstr "L'espaciau entre columnas"
+
+#: ../clutter/clutter-flow-layout.c:991
+#: ../clutter/deprecated/clutter-table-layout.c:1653
+msgid "Row Spacing"
+msgstr "Espaciau entre ringleras"
+
+#: ../clutter/clutter-flow-layout.c:992
+msgid "The spacing between rows"
+msgstr "L'espaciau entre ringleras"
+
+#: ../clutter/clutter-flow-layout.c:1006
+msgid "Minimum Column Width"
+msgstr "Amplaria minima d'a columna"
+
+#: ../clutter/clutter-flow-layout.c:1007
+msgid "Minimum width for each column"
+msgstr "Amplaria minima de cada columna"
+
+#: ../clutter/clutter-flow-layout.c:1022
+msgid "Maximum Column Width"
+msgstr "Amplaria maxima d'a columna"
+
+#: ../clutter/clutter-flow-layout.c:1023
+msgid "Maximum width for each column"
+msgstr "Amplaria maxima de cada columna"
+
+#: ../clutter/clutter-flow-layout.c:1037
+msgid "Minimum Row Height"
+msgstr "Altura minima d'a ringlera"
+
+#: ../clutter/clutter-flow-layout.c:1038
+msgid "Minimum height for each row"
+msgstr "Altura minima de cada ringlera"
+
+#: ../clutter/clutter-flow-layout.c:1053
+msgid "Maximum Row Height"
+msgstr "Altura maxima d'a ringlera"
+
+#: ../clutter/clutter-flow-layout.c:1054
+msgid "Maximum height for each row"
+msgstr "Altura maxima de cada ringlera"
+
+#: ../clutter/clutter-flow-layout.c:1069 ../clutter/clutter-flow-layout.c:1070
+msgid "Snap to grid"
+msgstr "Achustar a la quadricula"
+
+#: ../clutter/clutter-gesture-action.c:639
+msgid "Number touch points"
+msgstr "Numero de puntos de contacto"
+
+#: ../clutter/clutter-gesture-action.c:640
+msgid "Number of touch points"
+msgstr "Numero de puntos de contacto"
+
+#: ../clutter/clutter-gesture-action.c:655
+msgid "Threshold Trigger Edge"
+msgstr "Canto d'o disparador d'o branquil"
+
+#: ../clutter/clutter-gesture-action.c:656
+msgid "The trigger edge used by the action"
+msgstr "O canto d'o disparador emplegau por l'acción"
+
+#: ../clutter/clutter-grid-layout.c:1223
+msgid "Left attachment"
+msgstr "Acoplau cucho"
+
+#: ../clutter/clutter-grid-layout.c:1224
+msgid "The column number to attach the left side of the child to"
+msgstr "O número de columnas que acoplar a lo costau cucho d'o fillo"
+
+#: ../clutter/clutter-grid-layout.c:1231
+msgid "Top attachment"
+msgstr "Acoplau superior"
+
+#: ../clutter/clutter-grid-layout.c:1232
+msgid "The row number to attach the top side of a child widget to"
+msgstr "O número de ringlera que acoplar a la parti superior d'un widget fillo"
+
+#: ../clutter/clutter-grid-layout.c:1240
+msgid "The number of columns that a child spans"
+msgstr "O número de columnas que un fillo s'expande"
+
+#: ../clutter/clutter-grid-layout.c:1247
+msgid "The number of rows that a child spans"
+msgstr "O número de ringleras que un fillo s'expande"
+
+#: ../clutter/clutter-grid-layout.c:1564
+msgid "Row spacing"
+msgstr "Espaciau entre ringleras"
+
+#: ../clutter/clutter-grid-layout.c:1565
+msgid "The amount of space between two consecutive rows"
+msgstr "A cantidat d'espacio entre dos ringleras consecutivas"
+
+#: ../clutter/clutter-grid-layout.c:1578
+msgid "Column spacing"
+msgstr "Espaciau entre columnas"
+
+#: ../clutter/clutter-grid-layout.c:1579
+msgid "The amount of space between two consecutive columns"
+msgstr "A cantidat d'espacio entre dos columnas consecutivas"
+
+#: ../clutter/clutter-grid-layout.c:1593
+msgid "Row Homogeneous"
+msgstr "Ringlera homochénea"
+
+#: ../clutter/clutter-grid-layout.c:1594
+msgid "If TRUE, the rows are all the same height"
+msgstr "Si ye cierto, todas as ringleras tienen a mesma altura"
+
+#: ../clutter/clutter-grid-layout.c:1607
+msgid "Column Homogeneous"
+msgstr "Columna homochénea"
+
+#: ../clutter/clutter-grid-layout.c:1608
+msgid "If TRUE, the columns are all the same width"
+msgstr "Si ye cierto, todas as columnas tienen a mesma altura"
+
+#: ../clutter/clutter-image.c:249 ../clutter/clutter-image.c:312
+#: ../clutter/clutter-image.c:400
+msgid "Unable to load image data"
+msgstr "No s'han puesto cargar os datos d'a imachen"
+
+#: ../clutter/clutter-input-device.c:231
+msgid "Id"
+msgstr "ID"
+
+#: ../clutter/clutter-input-device.c:232
+msgid "Unique identifier of the device"
+msgstr "Identificador único d'o dispositivo"
+
+#: ../clutter/clutter-input-device.c:248
+msgid "The name of the device"
+msgstr "O nombre d'o dispositivo"
+
+#: ../clutter/clutter-input-device.c:262
+msgid "Device Type"
+msgstr "Mena de dispositivo"
+
+#: ../clutter/clutter-input-device.c:263
+msgid "The type of the device"
+msgstr "A mena d'o dispositivo"
+
+#: ../clutter/clutter-input-device.c:278
+msgid "Device Manager"
+msgstr "Chestor de dispositivos"
+
+#: ../clutter/clutter-input-device.c:279
+msgid "The device manager instance"
+msgstr "A instancia d'o chestor de dispositivos"
+
+#: ../clutter/clutter-input-device.c:292
+msgid "Device Mode"
+msgstr "Modo d'o dispositivo"
+
+#: ../clutter/clutter-input-device.c:293
+msgid "The mode of the device"
+msgstr "O modo d'o dispositivo"
+
+#: ../clutter/clutter-input-device.c:307
+msgid "Has Cursor"
+msgstr "Tien un cursor"
+
+#: ../clutter/clutter-input-device.c:308
+msgid "Whether the device has a cursor"
+msgstr "Indica si o dispositivo tien un cursor"
+
+#: ../clutter/clutter-input-device.c:327
+msgid "Whether the device is enabled"
+msgstr "indica si o dispositivo ye activau"
+
+#: ../clutter/clutter-input-device.c:340
+msgid "Number of Axes"
+msgstr "Numero d'eixes"
+
+#: ../clutter/clutter-input-device.c:341
+msgid "The number of axes on the device"
+msgstr "O numero d'eixes en o dispositivo"
+
+#: ../clutter/clutter-input-device.c:356
+msgid "The backend instance"
+msgstr "A instancia d'o backend"
+
+#: ../clutter/clutter-interval.c:553
+msgid "Value Type"
+msgstr "Mena de valor"
+
+#: ../clutter/clutter-interval.c:554
+msgid "The type of the values in the interval"
+msgstr "A mena de valors en l'intervalo"
+
+#: ../clutter/clutter-interval.c:569
+msgid "Initial Value"
+msgstr "Valor inicial"
+
+#: ../clutter/clutter-interval.c:570
+msgid "Initial value of the interval"
+msgstr "Valor inicial de l'intervalo"
+
+#: ../clutter/clutter-interval.c:584
+msgid "Final Value"
+msgstr "Valor final"
+
+#: ../clutter/clutter-interval.c:585
+msgid "Final value of the interval"
+msgstr "Valor final de l'intervalo"
+
+#: ../clutter/clutter-layout-meta.c:117
+msgid "Manager"
+msgstr "Chestor"
+
+#: ../clutter/clutter-layout-meta.c:118
+msgid "The manager that created this data"
+msgstr "O chestor que ha creyau iste dato"
+
+#. Translators: Leave this UNTRANSLATED if your language is
+#. * left-to-right.  If your language is right-to-left
+#. * (e.g. Hebrew, Arabic), translate it to "default:RTL".
+#. *
+#. * Do NOT translate it to non-English e.g. "predefinito:LTR"! If
+#. * it isn't default:LTR or default:RTL it will not work.
+#.
+#: ../clutter/clutter-main.c:795
+msgid "default:LTR"
+msgstr "default:LTR"
+
+#: ../clutter/clutter-main.c:1622
+msgid "Show frames per second"
+msgstr "Amostrar fotogramas por segundo"
+
+#: ../clutter/clutter-main.c:1624
+msgid "Default frame rate"
+msgstr "Velocidat de fotogramas predeterminada"
+
+#: ../clutter/clutter-main.c:1626
+msgid "Make all warnings fatal"
+msgstr "Fer que totz os avisos actúen como errors"
+
+#: ../clutter/clutter-main.c:1629
+msgid "Direction for the text"
+msgstr "Adreza d'o texto"
+
+#: ../clutter/clutter-main.c:1632
+msgid "Disable mipmapping on text"
+msgstr "Desactivar o «mipmapping» en o texto"
+
+#: ../clutter/clutter-main.c:1635
+msgid "Use 'fuzzy' picking"
+msgstr "Fer servir a selección «fosca»"
+
+#: ../clutter/clutter-main.c:1638
+msgid "Clutter debugging flags to set"
+msgstr "Opcions de depuración de Clutter que establir"
+
+#: ../clutter/clutter-main.c:1640
+msgid "Clutter debugging flags to unset"
+msgstr "Opcions de depuración de Clutter que no establir"
+
+#: ../clutter/clutter-main.c:1644
+msgid "Clutter profiling flags to set"
+msgstr "Opcions de perfil de Clutter que establir"
+
+#: ../clutter/clutter-main.c:1646
+msgid "Clutter profiling flags to unset"
+msgstr "Opcions de perfil de Clutter que no establir"
+
+#: ../clutter/clutter-main.c:1649
+msgid "Enable accessibility"
+msgstr "Activar l'accesibilidat"
+
+#: ../clutter/clutter-main.c:1841
+msgid "Clutter Options"
+msgstr "Opcions de Clutter"
+
+#: ../clutter/clutter-main.c:1842
+msgid "Show Clutter Options"
+msgstr "Amostrar as opcions de Clutter"
+
+#: ../clutter/clutter-pan-action.c:446
+msgid "Pan Axis"
+msgstr "Eixe de movimiento horizontal"
+
+#: ../clutter/clutter-pan-action.c:447
+msgid "Constraints the panning to an axis"
+msgstr "Restrinche o movimiento horizontal a un eixe"
+
+#: ../clutter/clutter-pan-action.c:461
+msgid "Interpolate"
+msgstr "Interpolar"
+
+#: ../clutter/clutter-pan-action.c:462
+msgid "Whether interpolated events emission is enabled."
+msgstr "Indica si a emisión d'eventos interpolaus ye activada."
+
+#: ../clutter/clutter-pan-action.c:478
+msgid "Deceleration"
+msgstr "Deceleración"
+
+#: ../clutter/clutter-pan-action.c:479
+msgid "Rate at which the interpolated panning will decelerate in"
+msgstr "Velocidat a la quala o movimiento horizontal interpolau decelerará"
+
+#: ../clutter/clutter-pan-action.c:496
+msgid "Initial acceleration factor"
+msgstr "Factor inicial d'acceleración"
+
+#: ../clutter/clutter-pan-action.c:497
+msgid "Factor applied to the momentum when starting the interpolated phase"
+msgstr "Factor aplicau a l'inte en encetar a fase d'interpolación"
+
+#: ../clutter/clutter-path-constraint.c:212
+#: ../clutter/deprecated/clutter-behaviour-path.c:221
+msgid "Path"
+msgstr "Rota"
+
+#: ../clutter/clutter-path-constraint.c:213
+msgid "The path used to constrain an actor"
+msgstr "A rota usada ta restrinchir a un actor"
+
+#: ../clutter/clutter-path-constraint.c:227
+msgid "The offset along the path, between -1.0 and 2.0"
+msgstr "O desplazamiento sobre a rota, entre -1.0 y 2.0"
+
+#: ../clutter/clutter-property-transition.c:269
+msgid "Property Name"
+msgstr "Nombre d'a propiedat"
+
+#: ../clutter/clutter-property-transition.c:270
+msgid "The name of the property to animate"
+msgstr "O nombre d'a propiedat que puixar"
+
+#: ../clutter/clutter-script.c:464
+msgid "Filename Set"
+msgstr "Conchunto de nombres de fichero"
+
+#: ../clutter/clutter-script.c:465
+msgid "Whether the :filename property is set"
+msgstr "Indica si a propiedat «:filename» ye establida"
+
+#: ../clutter/clutter-script.c:479
+#: ../clutter/deprecated/clutter-texture.c:1080
+msgid "Filename"
+msgstr "Nombre de fichero"
+
+#: ../clutter/clutter-script.c:480
+msgid "The path of the currently parsed file"
+msgstr "A rota d'o fichero analisau actualment"
+
+#: ../clutter/clutter-script.c:497
+msgid "Translation Domain"
+msgstr "Dominio de traducción"
+
+#: ../clutter/clutter-script.c:498
+msgid "The translation domain used to localize string"
+msgstr "O dominio de traducción emplegau ta localizar cadenas"
+
+#: ../clutter/clutter-scroll-actor.c:189
+msgid "Scroll Mode"
+msgstr "Modo de desplazamiento"
+
+#: ../clutter/clutter-scroll-actor.c:190
+msgid "The scrolling direction"
+msgstr "L'adreza d'o desplazamiento"
+
+#: ../clutter/clutter-settings.c:486
+msgid "Double Click Time"
+msgstr "Tiempo d'o dople clic"
+
+#: ../clutter/clutter-settings.c:487
+msgid "The time between clicks necessary to detect a multiple click"
+msgstr "O tiempo necesario entre clics ta detectar un clic multiple"
+
+#: ../clutter/clutter-settings.c:502
+msgid "Double Click Distance"
+msgstr "Distancia d'o dople clic"
+
+#: ../clutter/clutter-settings.c:503
+msgid "The distance between clicks necessary to detect a multiple click"
+msgstr "A distancia necesaria entre clics ta detectar un clic múltiple"
+
+#: ../clutter/clutter-settings.c:518
+msgid "Drag Threshold"
+msgstr "Branquil d'arrociegue"
+
+#: ../clutter/clutter-settings.c:519
+msgid "The distance the cursor should travel before starting to drag"
+msgstr "A distancia que o cursor cal recorrer antis d'empecipiar a arrocegar"
+
+#: ../clutter/clutter-settings.c:534 ../clutter/clutter-text.c:3404
+msgid "Font Name"
+msgstr "Nombre d'a fuent"
+
+#: ../clutter/clutter-settings.c:535
+msgid ""
+"The description of the default font, as one that could be parsed by Pango"
+msgstr ""
+"A descripción d'a fuent predeterminada, como una que Pango pueda analisar"
+
+#: ../clutter/clutter-settings.c:550
+msgid "Font Antialias"
+msgstr "suavezau d'a tipografía"
+
+#: ../clutter/clutter-settings.c:551
+msgid ""
+"Whether to use antialiasing (1 to enable, 0 to disable, and -1 to use the "
+"default)"
+msgstr ""
+"Indica si cal fer servir o suavezau (1 ta activar-ne, 0 ta desactivar-ne y "
+"-1 ta fer servir a opción predeterminada)"
+
+#: ../clutter/clutter-settings.c:567 ../clutter/clutter-settings.c:575
+msgid "Font DPI"
+msgstr "PPP d'a fuent"
+
+#: ../clutter/clutter-settings.c:568 ../clutter/clutter-settings.c:576
+msgid ""
+"The resolution of the font, in 1024 * dots/inch, or -1 to use the default"
+msgstr ""
+"A resolución d'a fuent, en 1024 * puntos/pulgada, u -1 ta fer servir a "
+"predeterminada"
+
+#: ../clutter/clutter-settings.c:592
+msgid "Font Hinting"
+msgstr "Redolín d'a fuent"
+
+#: ../clutter/clutter-settings.c:593
+msgid ""
+"Whether to use hinting (1 to enable, 0 to disable and -1 to use the default)"
+msgstr ""
+"Indica si cal fer servir o redolín (1 ta activar-ne, 0 ta desactivar-ne y -1 "
+"ta fer servir a opción predeterminada)"
+
+#: ../clutter/clutter-settings.c:614
+msgid "Font Hint Style"
+msgstr "Estilo de redolín d'a fuent"
+
+#: ../clutter/clutter-settings.c:615
+msgid "The style of hinting (hintnone, hintslight, hintmedium, hintfull)"
+msgstr ""
+"L'estilo d'o redolín («hintnone», «hintslight», «hintmedium», «hintfull»)"
+
+#: ../clutter/clutter-settings.c:636
+msgid "Font Subpixel Order"
+msgstr "Orden de fuents d'o subpíxel"
+
+#: ../clutter/clutter-settings.c:637
+msgid "The type of subpixel antialiasing (none, rgb, bgr, vrgb, vbgr)"
+msgstr "A mena de suavezau d'o subpíxel («none», «rgb», «bgr», «vrgb», «vbgr»)"
+
+#: ../clutter/clutter-settings.c:654
+msgid "The minimum duration for a long press gesture to be recognized"
+msgstr "A durada minima d'una pulsación luenga ta reconoixer o cenyo"
+
+#: ../clutter/clutter-settings.c:661
+msgid "Window Scaling Factor"
+msgstr "Factor d'escalau d'a finestra"
+
+#: ../clutter/clutter-settings.c:662
+msgid "The scaling factor to be applied to windows"
+msgstr "O factor d'escalau que aplicar a las finestras"
+
+#: ../clutter/clutter-settings.c:669
+msgid "Fontconfig configuration timestamp"
+msgstr "Configuración d'a marca de tiempo de fontconfig"
+
+#: ../clutter/clutter-settings.c:670
+msgid "Timestamp of the current fontconfig configuration"
+msgstr "Marca de tiempo d'a configuración actual de fontconfig"
+
+#: ../clutter/clutter-settings.c:687
+msgid "Password Hint Time"
+msgstr "Tiempo d'a sucherencia d'a clau"
+
+#: ../clutter/clutter-settings.c:688
+msgid "How long to show the last input character in hidden entries"
+msgstr "Quánto tiempo amostrar o zaguer caracter en dentradas amagadas"
+
+#: ../clutter/clutter-shader-effect.c:485
+msgid "Shader Type"
+msgstr "Mena de uembrau"
+
+#: ../clutter/clutter-shader-effect.c:486
+msgid "The type of shader used"
+msgstr "A mena de uembrau emplegau"
+
+#: ../clutter/clutter-snap-constraint.c:322
+msgid "The source of the constraint"
+msgstr "A fuent d'a restricción"
+
+#: ../clutter/clutter-snap-constraint.c:335
+msgid "From Edge"
+msgstr "Dende lo canto"
+
+#: ../clutter/clutter-snap-constraint.c:336
+msgid "The edge of the actor that should be snapped"
+msgstr "O canto de l'actor que caldría trencar"
+
+#: ../clutter/clutter-snap-constraint.c:350
+msgid "To Edge"
+msgstr "A lo canto"
+
+#: ../clutter/clutter-snap-constraint.c:351
+msgid "The edge of the source that should be snapped"
+msgstr "O canto d'a fuent que cal trencar"
+
+#: ../clutter/clutter-snap-constraint.c:367
+msgid "The offset in pixels to apply to the constraint"
+msgstr "O desplazamiento en pixels que aplicar a la restricción"
+
+#: ../clutter/clutter-stage.c:1899
+msgid "Fullscreen Set"
+msgstr "Conchunto a pantalla completa"
+
+#: ../clutter/clutter-stage.c:1900
+msgid "Whether the main stage is fullscreen"
+msgstr "Indica si l'escenario prencipal ye a pantalla completa"
+
+#: ../clutter/clutter-stage.c:1914
+msgid "Offscreen"
+msgstr "Difuera d'a pantalla"
+
+#: ../clutter/clutter-stage.c:1915
+msgid "Whether the main stage should be rendered offscreen"
+msgstr ""
+"Indica si l'escenario prencipal se debe renderizar difuera d'a pantalla"
+
+#: ../clutter/clutter-stage.c:1927 ../clutter/clutter-text.c:3518
+msgid "Cursor Visible"
+msgstr "Cursor visible"
+
+#: ../clutter/clutter-stage.c:1928
+msgid "Whether the mouse pointer is visible on the main stage"
+msgstr "Indica si lo puntero d'o churi ye visible en l'escenario prencipal"
+
+#: ../clutter/clutter-stage.c:1942
+msgid "User Resizable"
+msgstr "Redimensionable por l'usuario"
+
+#: ../clutter/clutter-stage.c:1943
+msgid "Whether the stage is able to be resized via user interaction"
+msgstr ""
+"Indica si l'escenario se puet redimensionar por meyo d'interacción de "
+"l'usuario"
+
+#: ../clutter/clutter-stage.c:1958 ../clutter/deprecated/clutter-box.c:256
+#: ../clutter/deprecated/clutter-rectangle.c:270
+msgid "Color"
+msgstr "Color"
+
+#: ../clutter/clutter-stage.c:1959
+msgid "The color of the stage"
+msgstr "A color de l'escenario"
+
+#: ../clutter/clutter-stage.c:1974
+msgid "Perspective"
+msgstr "Prespectiva"
+
+#: ../clutter/clutter-stage.c:1975
+msgid "Perspective projection parameters"
+msgstr "Parametros de prochección de prespectiva"
+
+#: ../clutter/clutter-stage.c:1990
+msgid "Title"
+msgstr "Titol"
+
+#: ../clutter/clutter-stage.c:1991
+msgid "Stage Title"
+msgstr "Titol de l'escenario"
+
+#: ../clutter/clutter-stage.c:2008
+msgid "Use Fog"
+msgstr "Fer servir a boira"
+
+#: ../clutter/clutter-stage.c:2009
+msgid "Whether to enable depth cueing"
+msgstr "Indica si activar l'indicador de profundidat"
+
+#: ../clutter/clutter-stage.c:2025
+msgid "Fog"
+msgstr "Boira"
+
+#: ../clutter/clutter-stage.c:2026
+msgid "Settings for the depth cueing"
+msgstr "Configuración ta l'indicador de profundidat"
+
+#: ../clutter/clutter-stage.c:2042
+msgid "Use Alpha"
+msgstr "Fer servir l'alfa"
+
+#: ../clutter/clutter-stage.c:2043
+msgid "Whether to honour the alpha component of the stage color"
+msgstr "Indica si se fa servir a componente alfa d'a color de l'escenario"
+
+#: ../clutter/clutter-stage.c:2059
+msgid "Key Focus"
+msgstr "Foco d'a tecla"
+
+#: ../clutter/clutter-stage.c:2060
+msgid "The currently key focused actor"
+msgstr "L'actor que actualment tien o foco"
+
+#: ../clutter/clutter-stage.c:2076
+msgid "No Clear Hint"
+msgstr "No escarrar o redolín"
+
+#: ../clutter/clutter-stage.c:2077
+msgid "Whether the stage should clear its contents"
+msgstr "Indica si l'escenario debe escarrar o conteniu d'ell"
+
+#: ../clutter/clutter-stage.c:2090
+msgid "Accept Focus"
+msgstr "Acceptar o foco"
+
+#: ../clutter/clutter-stage.c:2091
+msgid "Whether the stage should accept focus on show"
+msgstr "Indica si L'escenario debe acceptar o foco en amostrar-se"
+
+#: ../clutter/clutter-text-buffer.c:347 ../clutter/clutter-text.c:3439
+msgid "Text"
+msgstr "Texto"
+
+#: ../clutter/clutter-text-buffer.c:348
+msgid "The contents of the buffer"
+msgstr "O conteniu d'o búfer"
+
+#: ../clutter/clutter-text-buffer.c:361
+msgid "Text length"
+msgstr "Longaria d'o texto"
+
+#: ../clutter/clutter-text-buffer.c:362
+msgid "Length of the text currently in the buffer"
+msgstr "Longaria d'o texto actualment en o búfer"
+
+#: ../clutter/clutter-text-buffer.c:375
+msgid "Maximum length"
+msgstr "Longaria máxima"
+
+#: ../clutter/clutter-text-buffer.c:376
+msgid "Maximum number of characters for this entry. Zero if no maximum"
+msgstr "Número máximo de caracters ta ista dentrada. Zero si no bi ha máximo"
+
+#: ../clutter/clutter-text.c:3386
+msgid "Buffer"
+msgstr "Búfer"
+
+#: ../clutter/clutter-text.c:3387
+msgid "The buffer for the text"
+msgstr "O búfer ta lo texto"
+
+#: ../clutter/clutter-text.c:3405
+msgid "The font to be used by the text"
+msgstr "A fuent que se fa servir ta lo texto"
+
+#: ../clutter/clutter-text.c:3422
+msgid "Font Description"
+msgstr "Descripción d'a fuent"
+
+#: ../clutter/clutter-text.c:3423
+msgid "The font description to be used"
+msgstr "A descripción d'a fuent que fer servir"
+
+#: ../clutter/clutter-text.c:3440
+msgid "The text to render"
+msgstr "O texto que renderizar"
+
+#: ../clutter/clutter-text.c:3454
+msgid "Font Color"
+msgstr "Color d'a fuent"
+
+#: ../clutter/clutter-text.c:3455
+msgid "Color of the font used by the text"
+msgstr "Color d'a fuent que fa servir o texto"
+
+#: ../clutter/clutter-text.c:3470
+msgid "Editable"
+msgstr "Editable"
+
+#: ../clutter/clutter-text.c:3471
+msgid "Whether the text is editable"
+msgstr "Indica si o texto ye editable"
+
+#: ../clutter/clutter-text.c:3486
+msgid "Selectable"
+msgstr "Seleccionable"
+
+#: ../clutter/clutter-text.c:3487
+msgid "Whether the text is selectable"
+msgstr "Indica si o texto ye seleccionable"
+
+#: ../clutter/clutter-text.c:3501
+msgid "Activatable"
+msgstr "Activable"
+
+#: ../clutter/clutter-text.c:3502
+msgid "Whether pressing return causes the activate signal to be emitted"
+msgstr "Indica si en pretar «Intro» fa que s'emita o sinyal d'activación"
+
+#: ../clutter/clutter-text.c:3519
+msgid "Whether the input cursor is visible"
+msgstr "Indica si o cursor de dentrada ye visible"
+
+#: ../clutter/clutter-text.c:3533 ../clutter/clutter-text.c:3534
+msgid "Cursor Color"
+msgstr "Color d'o cursor"
+
+#: ../clutter/clutter-text.c:3549
+msgid "Cursor Color Set"
+msgstr "Conchunto de colors d'o cursor"
+
+#: ../clutter/clutter-text.c:3550
+msgid "Whether the cursor color has been set"
+msgstr "Indica si s'ha establiu a color d'o cursor"
+
+#: ../clutter/clutter-text.c:3565
+msgid "Cursor Size"
+msgstr "Grandaria d'o cursor"
+
+#: ../clutter/clutter-text.c:3566
+msgid "The width of the cursor, in pixels"
+msgstr "L'amplaria d'o cursor, en pixels"
+
+#: ../clutter/clutter-text.c:3582 ../clutter/clutter-text.c:3600
+msgid "Cursor Position"
+msgstr "Posición d'o cursor"
+
+#: ../clutter/clutter-text.c:3583 ../clutter/clutter-text.c:3601
+msgid "The cursor position"
+msgstr "A posición d'o cursor"
+
+#: ../clutter/clutter-text.c:3616
+msgid "Selection-bound"
+msgstr "Destín d'a selección"
+
+#: ../clutter/clutter-text.c:3617
+msgid "The cursor position of the other end of the selection"
+msgstr "A posición d'o cursor de l'atro final d'a selección"
+
+#: ../clutter/clutter-text.c:3632 ../clutter/clutter-text.c:3633
+msgid "Selection Color"
+msgstr "Selección de color"
+
+#: ../clutter/clutter-text.c:3648
+msgid "Selection Color Set"
+msgstr "Conchunto de selección de colors"
+
+#: ../clutter/clutter-text.c:3649
+msgid "Whether the selection color has been set"
+msgstr "Indica si s'ha establiu a color d'a selección"
+
+#: ../clutter/clutter-text.c:3664
+msgid "Attributes"
+msgstr "Atributos"
+
+#: ../clutter/clutter-text.c:3665
+msgid "A list of style attributes to apply to the contents of the actor"
+msgstr "Una lista d'atributos d'estilo que aplicar a os contenius de l'actor"
+
+#: ../clutter/clutter-text.c:3687
+msgid "Use markup"
+msgstr "Fer servir omarcau"
+
+#: ../clutter/clutter-text.c:3688
+msgid "Whether or not the text includes Pango markup"
+msgstr "Indica si o texto incluye u no pas o marcau de Pango"
+
+#: ../clutter/clutter-text.c:3704
+msgid "Line wrap"
+msgstr "Achuste de linia"
+
+#: ../clutter/clutter-text.c:3705
+msgid "If set, wrap the lines if the text becomes too wide"
+msgstr "Si ye definiu, achusta las linias si o texto se torna masiau amplo"
+
+#: ../clutter/clutter-text.c:3720
+msgid "Line wrap mode"
+msgstr "Modo d'achuste de linia"
+
+#: ../clutter/clutter-text.c:3721
+msgid "Control how line-wrapping is done"
+msgstr "Controlar cómo se fa l'achuste de linia"
+
+#: ../clutter/clutter-text.c:3736
+msgid "Ellipsize"
+msgstr "Creyar una elipse"
+
+#: ../clutter/clutter-text.c:3737
+msgid "The preferred place to ellipsize the string"
+msgstr "O puesto preferiu ta creyar a cadena eliptica"
+
+#: ../clutter/clutter-text.c:3753
+msgid "Line Alignment"
+msgstr "Aliniación de linia"
+
+#: ../clutter/clutter-text.c:3754
+msgid "The preferred alignment for the string, for multi-line text"
+msgstr "L'aliniación preferida ta la cadena, ta texto multilinia"
+
+#: ../clutter/clutter-text.c:3770
+msgid "Justify"
+msgstr "Chustificar"
+
+#: ../clutter/clutter-text.c:3771
+msgid "Whether the text should be justified"
+msgstr "Indica si cal  chustificar o texto"
+
+#: ../clutter/clutter-text.c:3786
+msgid "Password Character"
+msgstr "Caracter d'a clau"
+
+#: ../clutter/clutter-text.c:3787
+msgid "If non-zero, use this character to display the actor's contents"
+msgstr ""
+"Si no ye zero, fer servir iste caracter ta amostrar o conteniu de l'actor"
+
+#: ../clutter/clutter-text.c:3801
+msgid "Max Length"
+msgstr "Longaria maxima"
+
+#: ../clutter/clutter-text.c:3802
+msgid "Maximum length of the text inside the actor"
+msgstr "Longaria maxima d'o texto adintro de l'actor"
+
+#: ../clutter/clutter-text.c:3825
+msgid "Single Line Mode"
+msgstr "Modo de linia única"
+
+#: ../clutter/clutter-text.c:3826
+msgid "Whether the text should be a single line"
+msgstr "Indica si o texto debe estar en una sola linia"
+
+#: ../clutter/clutter-text.c:3840 ../clutter/clutter-text.c:3841
+msgid "Selected Text Color"
+msgstr "Color d'o texto seleccionau"
+
+#: ../clutter/clutter-text.c:3856
+msgid "Selected Text Color Set"
+msgstr "Conchunto de colors d'o texto seleccionau"
+
+#: ../clutter/clutter-text.c:3857
+msgid "Whether the selected text color has been set"
+msgstr "Indica si s'ha establiu a color d'o texto seleccionau"
+
+#: ../clutter/clutter-timeline.c:593
+#: ../clutter/deprecated/clutter-animation.c:557
+msgid "Loop"
+msgstr "Bucle"
+
+#: ../clutter/clutter-timeline.c:594
+msgid "Should the timeline automatically restart"
+msgstr "Indica si cal reiniciar automaticament a linia de tiempo "
+
+#: ../clutter/clutter-timeline.c:608
+msgid "Delay"
+msgstr "Retardo"
+
+#: ../clutter/clutter-timeline.c:609
+msgid "Delay before start"
+msgstr "Retardo antis d'empecipiar"
+
+#: ../clutter/clutter-timeline.c:624
+#: ../clutter/deprecated/clutter-animation.c:541
+#: ../clutter/deprecated/clutter-animator.c:1801
+#: ../clutter/deprecated/clutter-media.c:224
+#: ../clutter/deprecated/clutter-state.c:1517
+msgid "Duration"
+msgstr "Durada"
+
+#: ../clutter/clutter-timeline.c:625
+msgid "Duration of the timeline in milliseconds"
+msgstr "Durada d'a linia de tiempo, en milisegundos"
+
+#: ../clutter/clutter-timeline.c:640
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:521
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:330
+msgid "Direction"
+msgstr "Adreza"
+
+#: ../clutter/clutter-timeline.c:641
+msgid "Direction of the timeline"
+msgstr "Adreza d'a linia de tiempo"
+
+#: ../clutter/clutter-timeline.c:656
+msgid "Auto Reverse"
+msgstr "Invertir automaticament"
+
+#: ../clutter/clutter-timeline.c:657
+msgid "Whether the direction should be reversed when reaching the end"
+msgstr "Indica si cal invertir a endrecera a lo plegar ta la fin"
+
+#: ../clutter/clutter-timeline.c:675
+msgid "Repeat Count"
+msgstr "Repetir a cuenta"
+
+#: ../clutter/clutter-timeline.c:676
+msgid "How many times the timeline should repeat"
+msgstr "Quántas vegadas cal repetir a linia de tiempo"
+
+#: ../clutter/clutter-timeline.c:690
+msgid "Progress Mode"
+msgstr "Modo de progreso"
+
+#: ../clutter/clutter-timeline.c:691
+msgid "How the timeline should compute the progress"
+msgstr "Cómo habría de calcular o progreso a linia de tiempo"
+
+#: ../clutter/clutter-transition.c:244
+msgid "Interval"
+msgstr "Intervalo"
+
+#: ../clutter/clutter-transition.c:245
+msgid "The interval of values to transition"
+msgstr "L'intervalo de valors ta la transición"
+
+#: ../clutter/clutter-transition.c:259
+msgid "Animatable"
+msgstr "Animable"
+
+#: ../clutter/clutter-transition.c:260
+msgid "The animatable object"
+msgstr "L'obchecto animable"
+
+#: ../clutter/clutter-transition.c:281
+msgid "Remove on Complete"
+msgstr "Sacar en completar"
+
+#: ../clutter/clutter-transition.c:282
+msgid "Detach the transition when completed"
+msgstr "Sacar a transición en que se complete"
+
+#: ../clutter/clutter-zoom-action.c:355
+msgid "Zoom Axis"
+msgstr "Enamplar l'eixe"
+
+#: ../clutter/clutter-zoom-action.c:356
+msgid "Constraints the zoom to an axis"
+msgstr "Restrinche l'ampliación a un eixe"
+
+#: ../clutter/deprecated/clutter-alpha.c:354
+#: ../clutter/deprecated/clutter-animation.c:572
+#: ../clutter/deprecated/clutter-animator.c:1818
+msgid "Timeline"
+msgstr "Linia de tiempo"
+
+#: ../clutter/deprecated/clutter-alpha.c:355
+msgid "Timeline used by the alpha"
+msgstr "Linia de tiempo emplegada por l'alfa"
+
+#: ../clutter/deprecated/clutter-alpha.c:371
+msgid "Alpha value"
+msgstr "Valor alfa"
+
+#: ../clutter/deprecated/clutter-alpha.c:372
+msgid "Alpha value as computed by the alpha"
+msgstr "Valor alfa calculau por l'alfa"
+
+#: ../clutter/deprecated/clutter-alpha.c:393
+#: ../clutter/deprecated/clutter-animation.c:525
+msgid "Mode"
+msgstr "Modo"
+
+#: ../clutter/deprecated/clutter-alpha.c:394
+msgid "Progress mode"
+msgstr "Modo de progreso"
+
+#: ../clutter/deprecated/clutter-animation.c:508
+msgid "Object"
+msgstr "Obchecto"
+
+#: ../clutter/deprecated/clutter-animation.c:509
+msgid "Object to which the animation applies"
+msgstr "Obchecto a lo que s'aplica l'animación"
+
+#: ../clutter/deprecated/clutter-animation.c:526
+msgid "The mode of the animation"
+msgstr "O modo de l'animación"
+
+#: ../clutter/deprecated/clutter-animation.c:542
+msgid "Duration of the animation, in milliseconds"
+msgstr "Durada de l'animación, en milisegundos"
+
+#: ../clutter/deprecated/clutter-animation.c:558
+msgid "Whether the animation should loop"
+msgstr "Indica si l'animación habría d'estar un bucle"
+
+#: ../clutter/deprecated/clutter-animation.c:573
+msgid "The timeline used by the animation"
+msgstr "A linia de tiempo emplegada por l'animación"
+
+#: ../clutter/deprecated/clutter-animation.c:589
+#: ../clutter/deprecated/clutter-behaviour.c:237
+msgid "Alpha"
+msgstr "Alfa"
+
+#: ../clutter/deprecated/clutter-animation.c:590
+msgid "The alpha used by the animation"
+msgstr "L'alfa usau por l'animación"
+
+#: ../clutter/deprecated/clutter-animator.c:1802
+msgid "The duration of the animation"
+msgstr "A durada de l'animación"
+
+#: ../clutter/deprecated/clutter-animator.c:1819
+msgid "The timeline of the animation"
+msgstr "A linia de tiempo de l'animación"
+
+#: ../clutter/deprecated/clutter-behaviour.c:238
+msgid "Alpha Object to drive the behaviour"
+msgstr "Obchecto alfa ta endrezar o comportamiento"
+
+#: ../clutter/deprecated/clutter-behaviour-depth.c:180
+msgid "Start Depth"
+msgstr "Profundidat inicial"
+
+#: ../clutter/deprecated/clutter-behaviour-depth.c:181
+msgid "Initial depth to apply"
+msgstr "Profundidat inicial que aplicar"
+
+#: ../clutter/deprecated/clutter-behaviour-depth.c:196
+msgid "End Depth"
+msgstr "Profundidat final"
+
+#: ../clutter/deprecated/clutter-behaviour-depth.c:197
+msgid "Final depth to apply"
+msgstr "Profundidat final que aplicar"
+
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:394
+msgid "Start Angle"
+msgstr "Anglo inicial"
+
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:395
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:277
+msgid "Initial angle"
+msgstr "Anglo inicial"
+
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:410
+msgid "End Angle"
+msgstr "Anglo final"
+
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:411
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:295
+msgid "Final angle"
+msgstr "Anglo final"
+
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:426
+msgid "Angle x tilt"
+msgstr "Inclinación X de l'anglo"
+
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:427
+msgid "Tilt of the ellipse around x axis"
+msgstr "Inclinación d'a elipse sobre l'eixe X"
+
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:442
+msgid "Angle y tilt"
+msgstr "Inclinación Y de l'anglo"
+
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:443
+msgid "Tilt of the ellipse around y axis"
+msgstr "Inclinación d'a elipse sobre l'eixe Y"
+
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:458
+msgid "Angle z tilt"
+msgstr "Inclinación Z de l'anglo"
+
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:459
+msgid "Tilt of the ellipse around z axis"
+msgstr "Inclinación d'a elipse sobre l'eixe Z"
+
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:475
+msgid "Width of the ellipse"
+msgstr "Amplaria d'a elipse"
+
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:491
+msgid "Height of ellipse"
+msgstr "Altaria d'a elipse"
+
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:506
+msgid "Center"
+msgstr "Centro"
+
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:507
+msgid "Center of ellipse"
+msgstr "Centro d'a elipse"
+
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:522
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:331
+msgid "Direction of rotation"
+msgstr "Adreza d'a rotación"
+
+#: ../clutter/deprecated/clutter-behaviour-opacity.c:177
+msgid "Opacity Start"
+msgstr "Opacidat inicial"
+
+#: ../clutter/deprecated/clutter-behaviour-opacity.c:178
+msgid "Initial opacity level"
+msgstr "Ran inicial d'opacidat"
+
+#: ../clutter/deprecated/clutter-behaviour-opacity.c:195
+msgid "Opacity End"
+msgstr "Opacidat final"
+
+#: ../clutter/deprecated/clutter-behaviour-opacity.c:196
+msgid "Final opacity level"
+msgstr "Ran final d'opacidat"
+
+#: ../clutter/deprecated/clutter-behaviour-path.c:222
+msgid "The ClutterPath object representing the path to animate along"
+msgstr "L'obchecto «ClutterPath» que represienta a rota sobre a que puixar"
+
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:276
+msgid "Angle Begin"
+msgstr "Anglo inicial"
+
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:294
+msgid "Angle End"
+msgstr "Anglo final"
+
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:312
+msgid "Axis"
+msgstr "Eixe"
+
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:313
+msgid "Axis of rotation"
+msgstr "Eixe de rotación"
+
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:348
+msgid "Center X"
+msgstr "Centro X"
+
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:349
+msgid "X coordinate of the center of rotation"
+msgstr "Coordenada X d'o centro de rotación"
+
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:366
+msgid "Center Y"
+msgstr "Centro Y"
+
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:367
+msgid "Y coordinate of the center of rotation"
+msgstr "Coordenada Y d'o centro de rotación"
+
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:384
+msgid "Center Z"
+msgstr "Centro Z"
+
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:385
+msgid "Z coordinate of the center of rotation"
+msgstr "Coordenada Z d'o centro de rotación"
+
+#: ../clutter/deprecated/clutter-behaviour-scale.c:222
+msgid "X Start Scale"
+msgstr "Escala X inicial"
+
+#: ../clutter/deprecated/clutter-behaviour-scale.c:223
+msgid "Initial scale on the X axis"
+msgstr "Escala inicial en l'eixe X"
+
+#: ../clutter/deprecated/clutter-behaviour-scale.c:241
+msgid "X End Scale"
+msgstr "Escala X final"
+
+#: ../clutter/deprecated/clutter-behaviour-scale.c:242
+msgid "Final scale on the X axis"
+msgstr "Escala final en l'eixe X"
+
+#: ../clutter/deprecated/clutter-behaviour-scale.c:260
+msgid "Y Start Scale"
+msgstr "Escala Y inicial"
+
+#: ../clutter/deprecated/clutter-behaviour-scale.c:261
+msgid "Initial scale on the Y axis"
+msgstr "Escala inicial en l'eixe Y"
+
+#: ../clutter/deprecated/clutter-behaviour-scale.c:279
+msgid "Y End Scale"
+msgstr "Escala Y final"
+
+#: ../clutter/deprecated/clutter-behaviour-scale.c:280
+msgid "Final scale on the Y axis"
+msgstr "Escala final en l'eixe Y"
+
+#: ../clutter/deprecated/clutter-box.c:257
+msgid "The background color of the box"
+msgstr "A color de fondo d'a caixa"
+
+#: ../clutter/deprecated/clutter-box.c:270
+msgid "Color Set"
+msgstr "Conchunto de colors"
+
+#: ../clutter/deprecated/clutter-cairo-texture.c:593
+msgid "Surface Width"
+msgstr "Amplaria d'a superficie"
+
+#: ../clutter/deprecated/clutter-cairo-texture.c:594
+msgid "The width of the Cairo surface"
+msgstr "L'amplaria d'a superficie Cairo"
+
+#: ../clutter/deprecated/clutter-cairo-texture.c:611
+msgid "Surface Height"
+msgstr "Altaria d'a superficie"
+
+#: ../clutter/deprecated/clutter-cairo-texture.c:612
+msgid "The height of the Cairo surface"
+msgstr "L'altura d'a superficie Cairo"
+
+#: ../clutter/deprecated/clutter-cairo-texture.c:632
+msgid "Auto Resize"
+msgstr "Redimensionar automaticament"
+
+#: ../clutter/deprecated/clutter-cairo-texture.c:633
+msgid "Whether the surface should match the allocation"
+msgstr "Indica si a superficie debe coincidir con l'asignación"
+
+#: ../clutter/deprecated/clutter-media.c:83
+msgid "URI"
+msgstr "URI"
+
+#: ../clutter/deprecated/clutter-media.c:84
+msgid "URI of a media file"
+msgstr "URI d'un fichero multimedia"
+
+#: ../clutter/deprecated/clutter-media.c:100
+msgid "Playing"
+msgstr "Reproducindo"
+
+#: ../clutter/deprecated/clutter-media.c:101
+msgid "Whether the actor is playing"
+msgstr "Indica si l'actor se ye reproducindo"
+
+#: ../clutter/deprecated/clutter-media.c:118
+msgid "Progress"
+msgstr "Progreso"
+
+#: ../clutter/deprecated/clutter-media.c:119
+msgid "Current progress of the playback"
+msgstr "Progreso actual d'a reproducción"
+
+#: ../clutter/deprecated/clutter-media.c:135
+msgid "Subtitle URI"
+msgstr "URI d'o subtitol"
+
+#: ../clutter/deprecated/clutter-media.c:136
+msgid "URI of a subtitle file"
+msgstr "URI d'un fichero de subtitols"
+
+#: ../clutter/deprecated/clutter-media.c:154
+msgid "Subtitle Font Name"
+msgstr "Nombre d'a fuent d'os subtitols"
+
+#: ../clutter/deprecated/clutter-media.c:155
+msgid "The font used to display subtitles"
+msgstr "A fuent usada ta amostrar os subtitols"
+
+#: ../clutter/deprecated/clutter-media.c:172
+msgid "Audio Volume"
+msgstr "Volumen d'o son"
+
+#: ../clutter/deprecated/clutter-media.c:173
+msgid "The volume of the audio"
+msgstr "O volumen d'o son"
+
+#: ../clutter/deprecated/clutter-media.c:189
+msgid "Can Seek"
+msgstr "Puetz mirar"
+
+#: ../clutter/deprecated/clutter-media.c:190
+msgid "Whether the current stream is seekable"
+msgstr "Indica si o fluxo actual se puetz mirar"
+
+#: ../clutter/deprecated/clutter-media.c:207
+msgid "Buffer Fill"
+msgstr "Empliu d'o búfer"
+
+#: ../clutter/deprecated/clutter-media.c:208
+msgid "The fill level of the buffer"
+msgstr "O ran d'empliu d'o búfer"
+
+#: ../clutter/deprecated/clutter-media.c:225
+msgid "The duration of the stream, in seconds"
+msgstr "A durada d'o fluxo, en segundos"
+
+#: ../clutter/deprecated/clutter-rectangle.c:271
+msgid "The color of the rectangle"
+msgstr "A color d'o rectanglo"
+
+#: ../clutter/deprecated/clutter-rectangle.c:284
+msgid "Border Color"
+msgstr "Color d'o canto"
+
+#: ../clutter/deprecated/clutter-rectangle.c:285
+msgid "The color of the border of the rectangle"
+msgstr "A color d'o canto d'o rectanglo"
+
+#: ../clutter/deprecated/clutter-rectangle.c:300
+msgid "Border Width"
+msgstr "Amplaria d'o canto"
+
+#: ../clutter/deprecated/clutter-rectangle.c:301
+msgid "The width of the border of the rectangle"
+msgstr "L'amplaria d'o canto d'o rectanglo"
+
+#: ../clutter/deprecated/clutter-rectangle.c:315
+msgid "Has Border"
+msgstr "Tien canto"
+
+#: ../clutter/deprecated/clutter-rectangle.c:316
+msgid "Whether the rectangle should have a border"
+msgstr "Indica si o rectanglo debe tener canto"
+
+#: ../clutter/deprecated/clutter-shader.c:257
+msgid "Vertex Source"
+msgstr "Orichen d'o vertiz"
+
+#: ../clutter/deprecated/clutter-shader.c:258
+msgid "Source of vertex shader"
+msgstr "Orichen d'o uembrau d'o vertiz"
+
+#: ../clutter/deprecated/clutter-shader.c:274
+msgid "Fragment Source"
+msgstr "Orichen d'a fleca"
+
+#: ../clutter/deprecated/clutter-shader.c:275
+msgid "Source of fragment shader"
+msgstr "Orichen d'o uembrau d'a fleca"
+
+#: ../clutter/deprecated/clutter-shader.c:292
+msgid "Compiled"
+msgstr "Compilau"
+
+#: ../clutter/deprecated/clutter-shader.c:293
+msgid "Whether the shader is compiled and linked"
+msgstr "Indica si o uembrau ye compilau y enlazau"
+
+#: ../clutter/deprecated/clutter-shader.c:310
+msgid "Whether the shader is enabled"
+msgstr "Indica si o uembrau ye activau"
+
+#: ../clutter/deprecated/clutter-shader.c:521
+#, c-format
+msgid "%s compilation failed: %s"
+msgstr "ha fallau a compilación de %s: %s"
+
+#: ../clutter/deprecated/clutter-shader.c:522
+msgid "Vertex shader"
+msgstr "Uembrau d'o vertiz"
+
+#: ../clutter/deprecated/clutter-shader.c:523
+msgid "Fragment shader"
+msgstr "Uembrau d'a fleca"
+
+#: ../clutter/deprecated/clutter-state.c:1499
+msgid "State"
+msgstr "Estau"
+
+#: ../clutter/deprecated/clutter-state.c:1500
+msgid "Currently set state, (transition to this state might not be complete)"
+msgstr ""
+"Estau establiu actualment, (a transición ta iste estau puet no estar "
+"completa)"
+
+#: ../clutter/deprecated/clutter-state.c:1518
+msgid "Default transition duration"
+msgstr "Durada d'a transición predeterminada"
+
+#: ../clutter/deprecated/clutter-table-layout.c:543
+msgid "Column Number"
+msgstr "Numero de columna"
+
+#: ../clutter/deprecated/clutter-table-layout.c:544
+msgid "The column the widget resides in"
+msgstr "A columna en a quala ye o widget"
+
+#: ../clutter/deprecated/clutter-table-layout.c:551
+msgid "Row Number"
+msgstr "Numero de ringlera"
+
+#: ../clutter/deprecated/clutter-table-layout.c:552
+msgid "The row the widget resides in"
+msgstr "A ringlera en a quala ye o widget"
+
+#: ../clutter/deprecated/clutter-table-layout.c:559
+msgid "Column Span"
+msgstr "Espaciau entre columnas"
+
+#: ../clutter/deprecated/clutter-table-layout.c:560
+msgid "The number of columns the widget should span"
+msgstr "O numero de columnas que o widget debe expandir-se"
+
+#: ../clutter/deprecated/clutter-table-layout.c:567
+msgid "Row Span"
+msgstr "Espaciau entre ringleras"
+
+#: ../clutter/deprecated/clutter-table-layout.c:568
+msgid "The number of rows the widget should span"
+msgstr "O numero de ringleras que o widget debe expandir-se"
+
+#: ../clutter/deprecated/clutter-table-layout.c:575
+msgid "Horizontal Expand"
+msgstr "Expansión horizontal"
+
+#: ../clutter/deprecated/clutter-table-layout.c:576
+msgid "Allocate extra space for the child in horizontal axis"
+msgstr "Asignar espacio adicional ta lo fillo en l'eixe horizontal"
+
+#: ../clutter/deprecated/clutter-table-layout.c:582
+msgid "Vertical Expand"
+msgstr "Expansión vertical"
+
+#: ../clutter/deprecated/clutter-table-layout.c:583
+msgid "Allocate extra space for the child in vertical axis"
+msgstr "Asignar espacio adicional ta lo fillo en l'eixe vertical"
+
+#: ../clutter/deprecated/clutter-table-layout.c:1638
+msgid "Spacing between columns"
+msgstr "Espaciau entre columnas"
+
+#: ../clutter/deprecated/clutter-table-layout.c:1654
+msgid "Spacing between rows"
+msgstr "Espaciau entre ringleras"
+
+#: ../clutter/deprecated/clutter-texture.c:992
+msgid "Sync size of actor"
+msgstr "Sincronizar a grandaria de l'actor"
+
+#: ../clutter/deprecated/clutter-texture.c:993
+msgid "Auto sync size of actor to underlying pixbuf dimensions"
+msgstr ""
+"Sincronizar automaticament a grandaria de l'actor a las dimensions de "
+"«pixbuf» subchacent"
+
+#: ../clutter/deprecated/clutter-texture.c:1000
+msgid "Disable Slicing"
+msgstr "Desactivar o troceyau"
+
+#: ../clutter/deprecated/clutter-texture.c:1001
+msgid ""
+"Forces the underlying texture to be singular and not made of smaller space "
+"saving individual textures"
+msgstr ""
+"Afuerza a la textura subchacent a estar singular y a que no siga feita d'un "
+"espacio menor alzando texturas individuals"
+
+#: ../clutter/deprecated/clutter-texture.c:1010
+msgid "Tile Waste"
+msgstr "Quadrau sobrant"
+
+#: ../clutter/deprecated/clutter-texture.c:1011
+msgid "Maximum waste area of a sliced texture"
+msgstr "Aria maxima sobrant d'una textura troceyada"
+
+#: ../clutter/deprecated/clutter-texture.c:1019
+msgid "Horizontal repeat"
+msgstr "Segundiada horizontal"
+
+#: ../clutter/deprecated/clutter-texture.c:1020
+msgid "Repeat the contents rather than scaling them horizontally"
+msgstr "Segundia lo conteniu en cuenta d'escalar-lo horizontalment"
+
+#: ../clutter/deprecated/clutter-texture.c:1027
+msgid "Vertical repeat"
+msgstr "Segundiada vertical"
+
+#: ../clutter/deprecated/clutter-texture.c:1028
+msgid "Repeat the contents rather than scaling them vertically"
+msgstr "Segundia lo conteniu en cuenta d'escalar-lo verticalment"
+
+#: ../clutter/deprecated/clutter-texture.c:1035
+msgid "Filter Quality"
+msgstr "Calidat d'o filtro"
+
+#: ../clutter/deprecated/clutter-texture.c:1036
+msgid "Rendering quality used when drawing the texture"
+msgstr "Calidat de renderizau usada en dibuixar a textura"
+
+#: ../clutter/deprecated/clutter-texture.c:1044
+msgid "Pixel Format"
+msgstr "Formato d'o pixel"
+
+#: ../clutter/deprecated/clutter-texture.c:1045
+msgid "The Cogl pixel format to use"
+msgstr "O formato de pixel Cogl que usar"
+
+#: ../clutter/deprecated/clutter-texture.c:1053
+#: ../clutter/wayland/clutter-wayland-surface.c:445
+msgid "Cogl Texture"
+msgstr "Textura de Cogl"
+
+#: ../clutter/deprecated/clutter-texture.c:1054
+#: ../clutter/wayland/clutter-wayland-surface.c:446
+msgid "The underlying Cogl texture handle used to draw this actor"
+msgstr "A textura Cogl subchacent usada ta dibuixar iste actor"
+
+#: ../clutter/deprecated/clutter-texture.c:1061
+msgid "Cogl Material"
+msgstr "Material de Cogl"
+
+#: ../clutter/deprecated/clutter-texture.c:1062
+msgid "The underlying Cogl material handle used to draw this actor"
+msgstr "O material de Cogl subchacent usau ta dibuixar iste actor"
+
+#: ../clutter/deprecated/clutter-texture.c:1081
+msgid "The path of the file containing the image data"
+msgstr "A rota d'o fichero que contién os datos d'a imachen"
+
+#: ../clutter/deprecated/clutter-texture.c:1088
+msgid "Keep Aspect Ratio"
+msgstr "Mantener a proporción d'aspecto"
+
+#: ../clutter/deprecated/clutter-texture.c:1089
+msgid ""
+"Keep the aspect ratio of the texture when requesting the preferred width or "
+"height"
+msgstr ""
+"Mantener a relación d'aspecto d'a textura en solicitar l'amplaria u "
+"l'altaria preferidas"
+
+#: ../clutter/deprecated/clutter-texture.c:1117
+msgid "Load asynchronously"
+msgstr "Cargar de traza asincrona"
+
+#: ../clutter/deprecated/clutter-texture.c:1118
+msgid ""
+"Load files inside a thread to avoid blocking when loading images from disk"
+msgstr ""
+"Cargar os fichers en un filo ta privar bloqueyos en cargar imachens dende o "
+"disco"
+
+#: ../clutter/deprecated/clutter-texture.c:1136
+msgid "Load data asynchronously"
+msgstr "Cargar os datos de forma asincrona"
+
+#: ../clutter/deprecated/clutter-texture.c:1137
+msgid ""
+"Decode image data files inside a thread to reduce blocking when loading "
+"images from disk"
+msgstr ""
+"Decodificar os fichers de datos d'imachens en un filo ta reducir os "
+"bloqueyos en cargar imachens dende o disco"
+
+#: ../clutter/deprecated/clutter-texture.c:1163
+msgid "Pick With Alpha"
+msgstr "Seleccionar con alfa"
+
+#: ../clutter/deprecated/clutter-texture.c:1164
+msgid "Shape actor with alpha channel when picking"
+msgstr "Dar forma a l'actor con canal alfa en seleccionar-lo"
+
+#: ../clutter/deprecated/clutter-texture.c:1597
+#: ../clutter/deprecated/clutter-texture.c:1992
+#: ../clutter/deprecated/clutter-texture.c:2088
+#: ../clutter/deprecated/clutter-texture.c:2386
+#, c-format
+msgid "Failed to load the image data"
+msgstr "S'ha produciu una error en cargar os datos d'a imachen"
+
+#: ../clutter/deprecated/clutter-texture.c:1756
+#, c-format
+msgid "YUV textures are not supported"
+msgstr "As texturas YUV no son suportadas"
+
+#: ../clutter/deprecated/clutter-texture.c:1765
+#, c-format
+msgid "YUV2 textues are not supported"
+msgstr "As texturas YUV2 no son suportadas"
+
+#: ../clutter/evdev/clutter-input-device-evdev.c:154
+msgid "sysfs Path"
+msgstr "Rota de sysfs"
+
+#: ../clutter/evdev/clutter-input-device-evdev.c:155
+msgid "Path of the device in sysfs"
+msgstr "Rota d'o dispositivo en sysfs"
+
+#: ../clutter/evdev/clutter-input-device-evdev.c:170
+msgid "Device Path"
+msgstr "Rota d'o dispositivo"
+
+#: ../clutter/evdev/clutter-input-device-evdev.c:171
+msgid "Path of the device node"
+msgstr "Rota a lo nodo d'o dispositivo"
+
+#: ../clutter/gdk/clutter-backend-gdk.c:289
+#, c-format
+msgid "Could not find a suitable CoglWinsys for a GdkDisplay of type %s"
+msgstr ""
+"No s'ha puesto trobar un CoglWinsys adequau ta un GdkDisplay de mena %s"
+
+#: ../clutter/wayland/clutter-wayland-surface.c:419
+msgid "Surface"
+msgstr " Superficie"
+
+#: ../clutter/wayland/clutter-wayland-surface.c:420
+msgid "The underlying wayland surface"
+msgstr "A superficie Wayland subchacent"
+
+#: ../clutter/wayland/clutter-wayland-surface.c:427
+msgid "Surface width"
+msgstr "Amplaria d'a superficie"
+
+#: ../clutter/wayland/clutter-wayland-surface.c:428
+msgid "The width of the underlying wayland surface"
+msgstr "L'amplaria d'a superficie Wayland subchacent"
+
+#: ../clutter/wayland/clutter-wayland-surface.c:436
+msgid "Surface height"
+msgstr "Altaria d'a superficie"
+
+#: ../clutter/wayland/clutter-wayland-surface.c:437
+msgid "The height of the underlying wayland surface"
+msgstr "L'altaria d'a superficie Wayland subchacent"
+
+#: ../clutter/x11/clutter-backend-x11.c:488
+msgid "X display to use"
+msgstr "Pantalla X que usar"
+
+#: ../clutter/x11/clutter-backend-x11.c:494
+msgid "X screen to use"
+msgstr "Pantalla  X ta fer servir"
+
+#: ../clutter/x11/clutter-backend-x11.c:499
+msgid "Make X calls synchronous"
+msgstr "Fer clamadas a X síncronas"
+
+#: ../clutter/x11/clutter-backend-x11.c:506
+msgid "Disable XInput support"
+msgstr "Desactivar o suporte de XInput"
+
+#: ../clutter/x11/clutter-keymap-x11.c:322
+msgid "The Clutter backend"
+msgstr "O backend de Clutter"
+
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:534
+msgid "Pixmap"
+msgstr "Mapa de pixels"
+
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:535
+msgid "The X11 Pixmap to be bound"
+msgstr "O mapa de pixels X11 ta asociar"
+
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:543
+msgid "Pixmap width"
+msgstr "Amplaria d'o mapa de pixels"
+
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:544
+msgid "The width of the pixmap bound to this texture"
+msgstr "L'amplaria d'o mapa de pixels asociau a ista textura"
+
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:552
+msgid "Pixmap height"
+msgstr "Altaria d'o mapa de pixels"
+
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:553
+msgid "The height of the pixmap bound to this texture"
+msgstr "L'altaria d'o mapa de pixels asociau a ista textura"
+
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:561
+msgid "Pixmap Depth"
+msgstr "Profundidat d'o mapa de pixels"
+
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:562
+msgid "The depth (in number of bits) of the pixmap bound to this texture"
+msgstr ""
+"A profundidat (en numero de bits) d'o mapa de pixels asociau a ista textura"
+
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:570
+msgid "Automatic Updates"
+msgstr "Actualizacions automáticas"
+
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:571
+msgid "If the texture should be kept in sync with any pixmap changes."
+msgstr ""
+"Indica si cal sincronizar a textura con qualsiquier cambeo en o mapa de "
+"pixels."
+
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:579
+msgid "Window"
+msgstr "Finestra"
+
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:580
+msgid "The X11 Window to be bound"
+msgstr "A finestra X11 ta asociar"
+
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:588
+msgid "Window Redirect Automatic"
+msgstr "Rendreza automatica d'a finestra"
+
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:589
+msgid "If composite window redirects are set to Automatic (or Manual if false)"
+msgstr ""
+"Indica si a rendreza d'a finestra composada ye establida a «Automatica» (u "
+"«Manual» si ye falso)"
+
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:599
+msgid "Window Mapped"
+msgstr "Finestra mapeyada"
+
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:600
+msgid "If window is mapped"
+msgstr "Indica si a finestra ye mapeyada"
+
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:609
+msgid "Destroyed"
+msgstr "Destruida"
+
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:610
+msgid "If window has been destroyed"
+msgstr "Indica si s'ha destruiu a finestra"
+
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:618
+msgid "Window X"
+msgstr "Finestra X"
+
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:619
+msgid "X position of window on screen according to X11"
+msgstr "Posición X d'a finestra en a pantalla, d'alcuerdo con X11"
+
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:627
+msgid "Window Y"
+msgstr "Finestra Y"
+
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:628
+msgid "Y position of window on screen according to X11"
+msgstr "Posición Y d'a finestra en a pantalla, d'alcuerdo con X11"
+
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:635
+msgid "Window Override Redirect"
+msgstr "Omitir a rendreza d'a finestra"
+
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:636
+msgid "If this is an override-redirect window"
+msgstr "Indica si ista ye una finestra que omite a rendreza"
diff --git a/po/as.po b/po/as.po
index e217354c9..fa6b944fa 100644
--- a/po/as.po
+++ b/po/as.po
@@ -3,707 +3,707 @@
 # This file is distributed under the same license as the clutter package.
 #
 # ngoswami <ngoswami@redhat.com>, 2011.
-# Nilamdyuti Goswami <ngoswami@redhat.com>, 2011, 2012.
+# Nilamdyuti Goswami <ngoswami@redhat.com>, 2011, 2012, 2013, 2014.
 msgid ""
 msgstr ""
 "Project-Id-Version: clutter master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug."
-"cgi?product=clutter&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2012-08-28 13:46+0000\n"
-"PO-Revision-Date: 2012-09-11 16:58+0530\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+"product=clutter&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2014-08-18 15:05+0000\n"
+"PO-Revision-Date: 2014-08-18 21:07+0530\n"
 "Last-Translator: Nilamdyuti Goswami <ngoswami@redhat.com>\n"
-"Language-Team: as_IN <kde-i18n-doc@kde.org>\n"
-"Language: \n"
+"Language-Team: American English <kde-i18n-doc@kde.org>\n"
+"Language: en_US\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 1.0\n"
+"X-Generator: Lokalize 1.5\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: ../clutter/clutter-actor.c:6121
+#: ../clutter/clutter-actor.c:6224
 msgid "X coordinate"
 msgstr "X অক্ষ"
 
-#: ../clutter/clutter-actor.c:6122
+#: ../clutter/clutter-actor.c:6225
 msgid "X coordinate of the actor"
 msgstr "অভিনেতাৰ X অক্ষ"
 
-#: ../clutter/clutter-actor.c:6140
+#: ../clutter/clutter-actor.c:6243
 msgid "Y coordinate"
 msgstr "Y অক্ষ"
 
-#: ../clutter/clutter-actor.c:6141
+#: ../clutter/clutter-actor.c:6244
 msgid "Y coordinate of the actor"
 msgstr "অভিনেতাৰ Y অক্ষ"
 
-#: ../clutter/clutter-actor.c:6163
+#: ../clutter/clutter-actor.c:6266
 msgid "Position"
 msgstr "অৱস্থান"
 
-#: ../clutter/clutter-actor.c:6164
+#: ../clutter/clutter-actor.c:6267
 msgid "The position of the origin of the actor"
 msgstr "অভিনেতাৰ উৎসৰ অৱস্থান"
 
-#: ../clutter/clutter-actor.c:6181 ../clutter/clutter-canvas.c:215
-#: ../clutter/clutter-grid-layout.c:1238
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:481
+#: ../clutter/clutter-actor.c:6284 ../clutter/clutter-canvas.c:247
+#: ../clutter/clutter-grid-layout.c:1239
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:474
 msgid "Width"
 msgstr "প্ৰস্থ"
 
-#: ../clutter/clutter-actor.c:6182
+#: ../clutter/clutter-actor.c:6285
 msgid "Width of the actor"
 msgstr "অভিনেতাৰ প্ৰস্থ"
 
-#: ../clutter/clutter-actor.c:6200 ../clutter/clutter-canvas.c:231
-#: ../clutter/clutter-grid-layout.c:1245
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:497
+#: ../clutter/clutter-actor.c:6303 ../clutter/clutter-canvas.c:263
+#: ../clutter/clutter-grid-layout.c:1246
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:490
 msgid "Height"
 msgstr "উচ্চতা"
 
-#: ../clutter/clutter-actor.c:6201
+#: ../clutter/clutter-actor.c:6304
 msgid "Height of the actor"
 msgstr "অভিনেতাৰ উচ্চতা"
 
-#: ../clutter/clutter-actor.c:6222
+#: ../clutter/clutter-actor.c:6325
 msgid "Size"
 msgstr "আকাৰ"
 
-#: ../clutter/clutter-actor.c:6223
+#: ../clutter/clutter-actor.c:6326
 msgid "The size of the actor"
 msgstr "অভিনেতাৰ আকাৰ"
 
-#: ../clutter/clutter-actor.c:6241
+#: ../clutter/clutter-actor.c:6344
 msgid "Fixed X"
 msgstr "নিৰ্দিষ্ট X"
 
-#: ../clutter/clutter-actor.c:6242
+#: ../clutter/clutter-actor.c:6345
 msgid "Forced X position of the actor"
 msgstr "অভিনেতাৰ বলৱৎ X অৱস্থান"
 
-#: ../clutter/clutter-actor.c:6259
+#: ../clutter/clutter-actor.c:6362
 msgid "Fixed Y"
 msgstr "নিৰ্দিষ্ট Y"
 
-#: ../clutter/clutter-actor.c:6260
+#: ../clutter/clutter-actor.c:6363
 msgid "Forced Y position of the actor"
 msgstr "অভিনেতাৰ বলৱৎ Y অৱস্থান"
 
-#: ../clutter/clutter-actor.c:6275
+#: ../clutter/clutter-actor.c:6378
 msgid "Fixed position set"
 msgstr "নিৰ্দিষ্ট অৱস্থান সংহতি"
 
-#: ../clutter/clutter-actor.c:6276
+#: ../clutter/clutter-actor.c:6379
 msgid "Whether to use fixed positioning for the actor"
 msgstr "অভওিনায়কৰ বাবে  নিৰ্দিষ্ট অৱস্থান ব্যৱহাৰ কৰা হব নে"
 
-#: ../clutter/clutter-actor.c:6294
+#: ../clutter/clutter-actor.c:6397
 msgid "Min Width"
 msgstr "নূন্যতম প্ৰস্থ"
 
-#: ../clutter/clutter-actor.c:6295
+#: ../clutter/clutter-actor.c:6398
 msgid "Forced minimum width request for the actor"
 msgstr "অভিনেতাৰ বাবে বলৱৎ নূন্যতম প্ৰস্থ অনুৰোধ"
 
-#: ../clutter/clutter-actor.c:6313
+#: ../clutter/clutter-actor.c:6416
 msgid "Min Height"
 msgstr "নূন্যতম উচ্চতা"
 
-#: ../clutter/clutter-actor.c:6314
+#: ../clutter/clutter-actor.c:6417
 msgid "Forced minimum height request for the actor"
 msgstr "অভিনেতাৰ বাবে বলৱৎ নূন্যতম উচ্চতা অনুৰোধ"
 
-#: ../clutter/clutter-actor.c:6332
+#: ../clutter/clutter-actor.c:6435
 msgid "Natural Width"
 msgstr "স্বাভাৱিক প্ৰস্থ"
 
-#: ../clutter/clutter-actor.c:6333
+#: ../clutter/clutter-actor.c:6436
 msgid "Forced natural width request for the actor"
 msgstr "অভিনেতাৰ বাবে বলৱৎ স্বাভাৱিক প্ৰস্থ অনুৰোধ"
 
-#: ../clutter/clutter-actor.c:6351
+#: ../clutter/clutter-actor.c:6454
 msgid "Natural Height"
 msgstr "স্বাভাৱিক উচ্চতা"
 
-#: ../clutter/clutter-actor.c:6352
+#: ../clutter/clutter-actor.c:6455
 msgid "Forced natural height request for the actor"
 msgstr "অভিনেতাৰ বাবে বলৱৎ স্বাভাৱিক উচ্চতা অনুৰোধ"
 
-#: ../clutter/clutter-actor.c:6367
+#: ../clutter/clutter-actor.c:6470
 msgid "Minimum width set"
 msgstr "নূন্যতম প্ৰস্থ সংহতি"
 
-#: ../clutter/clutter-actor.c:6368
+#: ../clutter/clutter-actor.c:6471
 msgid "Whether to use the min-width property"
 msgstr "নূন্যতম-প্ৰস্থ বৈশিষ্ট ব্যৱহাৰ কৰা হব নে"
 
-#: ../clutter/clutter-actor.c:6382
+#: ../clutter/clutter-actor.c:6485
 msgid "Minimum height set"
 msgstr "নূন্যতম উচ্চতা সংহতি"
 
-#: ../clutter/clutter-actor.c:6383
+#: ../clutter/clutter-actor.c:6486
 msgid "Whether to use the min-height property"
 msgstr "নূন্যতম-উচ্চতা বৈশিষ্ট ব্যৱহাৰ কৰা হব নে"
 
-#: ../clutter/clutter-actor.c:6397
+#: ../clutter/clutter-actor.c:6500
 msgid "Natural width set"
 msgstr "স্বাভাৱিক প্ৰস্থ সংহতি"
 
-#: ../clutter/clutter-actor.c:6398
+#: ../clutter/clutter-actor.c:6501
 msgid "Whether to use the natural-width property"
 msgstr "স্বাভাৱিক-প্ৰস্থ বৈশিষ্ট ব্যৱহাৰ কৰা হব নে"
 
-#: ../clutter/clutter-actor.c:6412
+#: ../clutter/clutter-actor.c:6515
 msgid "Natural height set"
 msgstr "স্বাভাৱিক উচ্চতা সংহতি"
 
-#: ../clutter/clutter-actor.c:6413
+#: ../clutter/clutter-actor.c:6516
 msgid "Whether to use the natural-height property"
 msgstr "স্বাভাৱিক-উচ্চতা বৈশিষ্ট ব্যৱহাৰ কৰা হব নে"
 
-#: ../clutter/clutter-actor.c:6429
+#: ../clutter/clutter-actor.c:6532
 msgid "Allocation"
 msgstr "আবন্টন"
 
-#: ../clutter/clutter-actor.c:6430
+#: ../clutter/clutter-actor.c:6533
 msgid "The actor's allocation"
 msgstr "অভিনেতাৰ আবন্টন"
 
-#: ../clutter/clutter-actor.c:6487
+#: ../clutter/clutter-actor.c:6590
 msgid "Request Mode"
 msgstr "অনুৰোধ অৱস্থা"
 
-#: ../clutter/clutter-actor.c:6488
+#: ../clutter/clutter-actor.c:6591
 msgid "The actor's request mode"
 msgstr "অভিনেতাৰ অনুৰোধ অৱস্থা"
 
-#: ../clutter/clutter-actor.c:6512
+#: ../clutter/clutter-actor.c:6615
 msgid "Depth"
 msgstr "গভীৰতা"
 
-#: ../clutter/clutter-actor.c:6513
+#: ../clutter/clutter-actor.c:6616
 msgid "Position on the Z axis"
 msgstr "Z অক্ষত অৱস্থান"
 
-#: ../clutter/clutter-actor.c:6540
+#: ../clutter/clutter-actor.c:6643
 msgid "Z Position"
 msgstr "Z অৱস্থান"
 
-#: ../clutter/clutter-actor.c:6541
+#: ../clutter/clutter-actor.c:6644
 msgid "The actor's position on the Z axis"
 msgstr "Z অক্ষত অভিনেতাৰ অৱস্থান"
 
-#: ../clutter/clutter-actor.c:6558
+#: ../clutter/clutter-actor.c:6661
 msgid "Opacity"
 msgstr "অস্বচ্ছতা"
 
-#: ../clutter/clutter-actor.c:6559
+#: ../clutter/clutter-actor.c:6662
 msgid "Opacity of an actor"
 msgstr "এজন অভিনেতাৰ অস্বচ্ছতা"
 
-#: ../clutter/clutter-actor.c:6579
+#: ../clutter/clutter-actor.c:6682
 msgid "Offscreen redirect"
 msgstr "অফস্ক্ৰিন পুনৰনিৰ্দেশ"
 
-#: ../clutter/clutter-actor.c:6580
+#: ../clutter/clutter-actor.c:6683
 msgid "Flags controlling when to flatten the actor into a single image"
 msgstr "অভিনেতাক কেতিয়া এটা ছবিত চেপেটা কৰা হব সেয়া নিয়ন্ত্ৰণ কৰা ফ্লেগসমূহ"
 
-#: ../clutter/clutter-actor.c:6594
+#: ../clutter/clutter-actor.c:6697
 msgid "Visible"
 msgstr "দৃশ্যমান"
 
-#: ../clutter/clutter-actor.c:6595
+#: ../clutter/clutter-actor.c:6698
 msgid "Whether the actor is visible or not"
 msgstr "অভিনেতা দৃশ্যমান হয় নে নহয়"
 
-#: ../clutter/clutter-actor.c:6609
+#: ../clutter/clutter-actor.c:6712
 msgid "Mapped"
 msgstr "মেপ্পড্"
 
-#: ../clutter/clutter-actor.c:6610
+#: ../clutter/clutter-actor.c:6713
 msgid "Whether the actor will be painted"
 msgstr "অভিনেতাকক ৰঙ কৰা হব নে"
 
-#: ../clutter/clutter-actor.c:6623
+#: ../clutter/clutter-actor.c:6726
 msgid "Realized"
 msgstr "উপলব্ধিত"
 
-#: ../clutter/clutter-actor.c:6624
+#: ../clutter/clutter-actor.c:6727
 msgid "Whether the actor has been realized"
 msgstr "অভিনেতাক উপলব্ধি কৰা হৈছে নে"
 
-#: ../clutter/clutter-actor.c:6639
+#: ../clutter/clutter-actor.c:6742
 msgid "Reactive"
 msgstr "প্ৰতিক্ৰিয়া"
 
-#: ../clutter/clutter-actor.c:6640
+#: ../clutter/clutter-actor.c:6743
 msgid "Whether the actor is reactive to events"
 msgstr "অভিনেতাজন ঘটনাসমূহলে প্ৰতিক্ৰিয়া কৰে নে"
 
-#: ../clutter/clutter-actor.c:6651
+#: ../clutter/clutter-actor.c:6754
 msgid "Has Clip"
 msgstr "ক্লিপ আছে নে"
 
-#: ../clutter/clutter-actor.c:6652
+#: ../clutter/clutter-actor.c:6755
 msgid "Whether the actor has a clip set"
 msgstr "অভিনেতাৰ এটা ক্লিপ সংহতি আছে নে"
 
-#: ../clutter/clutter-actor.c:6665
+#: ../clutter/clutter-actor.c:6768
 msgid "Clip"
 msgstr "ক্লিপ"
 
-#: ../clutter/clutter-actor.c:6666
+#: ../clutter/clutter-actor.c:6769
 msgid "The clip region for the actor"
 msgstr "অভিনেতাৰ বাবে ক্লিপ অঞ্চল"
 
-#: ../clutter/clutter-actor.c:6685
+#: ../clutter/clutter-actor.c:6788
 msgid "Clip Rectangle"
 msgstr "ক্লিপ আয়ত"
 
-#: ../clutter/clutter-actor.c:6686
+#: ../clutter/clutter-actor.c:6789
 msgid "The visible region of the actor"
 msgstr "অভিনেতাৰ দৃশ্যমান অঞ্চল"
 
-#: ../clutter/clutter-actor.c:6700 ../clutter/clutter-actor-meta.c:207
-#: ../clutter/clutter-binding-pool.c:319 ../clutter/clutter-input-device.c:258
+#: ../clutter/clutter-actor.c:6803 ../clutter/clutter-actor-meta.c:205
+#: ../clutter/clutter-binding-pool.c:318 ../clutter/clutter-input-device.c:247
 msgid "Name"
 msgstr "নাম"
 
-#: ../clutter/clutter-actor.c:6701
+#: ../clutter/clutter-actor.c:6804
 msgid "Name of the actor"
 msgstr "অভিনেতাৰ নাম"
 
-#: ../clutter/clutter-actor.c:6722
+#: ../clutter/clutter-actor.c:6825
 msgid "Pivot Point"
 msgstr "পিভট বিন্দু"
 
-#: ../clutter/clutter-actor.c:6723
+#: ../clutter/clutter-actor.c:6826
 msgid "The point around which the scaling and rotation occur"
 msgstr "বিন্দু যাক কেন্দ্ৰ কৰি স্কেইলিং আৰু ঘূৰ্ণন হয়"
 
-#: ../clutter/clutter-actor.c:6741
+#: ../clutter/clutter-actor.c:6844
 msgid "Pivot Point Z"
 msgstr "পিভট বিন্দু Z"
 
-#: ../clutter/clutter-actor.c:6742
+#: ../clutter/clutter-actor.c:6845
 msgid "Z component of the pivot point"
 msgstr "পিভট বিন্দুৰ Z উপাদান"
 
-#: ../clutter/clutter-actor.c:6760
+#: ../clutter/clutter-actor.c:6863
 msgid "Scale X"
 msgstr "স্কেইল X"
 
-#: ../clutter/clutter-actor.c:6761
+#: ../clutter/clutter-actor.c:6864
 msgid "Scale factor on the X axis"
 msgstr "X অক্ষত স্কেইল কাৰক"
 
-#: ../clutter/clutter-actor.c:6779
+#: ../clutter/clutter-actor.c:6882
 msgid "Scale Y"
 msgstr "অক্ষ Y"
 
-#: ../clutter/clutter-actor.c:6780
+#: ../clutter/clutter-actor.c:6883
 msgid "Scale factor on the Y axis"
 msgstr "Y অক্ষত স্কেইল কাৰক"
 
-#: ../clutter/clutter-actor.c:6798
+#: ../clutter/clutter-actor.c:6901
 msgid "Scale Z"
 msgstr "স্কেইল Z"
 
-#: ../clutter/clutter-actor.c:6799
+#: ../clutter/clutter-actor.c:6902
 msgid "Scale factor on the Z axis"
 msgstr "Z অক্ষত স্কেইল কাৰক"
 
-#: ../clutter/clutter-actor.c:6817
+#: ../clutter/clutter-actor.c:6920
 msgid "Scale Center X"
 msgstr "স্কেইল কেন্দ্ৰ X"
 
-#: ../clutter/clutter-actor.c:6818
+#: ../clutter/clutter-actor.c:6921
 msgid "Horizontal scale center"
 msgstr "আনুভূমিক স্কেইল কেন্দ্ৰ"
 
-#: ../clutter/clutter-actor.c:6836
+#: ../clutter/clutter-actor.c:6939
 msgid "Scale Center Y"
 msgstr "স্কেইল কেন্দ্ৰ Y"
 
-#: ../clutter/clutter-actor.c:6837
+#: ../clutter/clutter-actor.c:6940
 msgid "Vertical scale center"
 msgstr "উলম্ব স্কেইল কেন্দ্ৰ"
 
-#: ../clutter/clutter-actor.c:6855
+#: ../clutter/clutter-actor.c:6958
 msgid "Scale Gravity"
 msgstr "স্কেইল মাধ্যাকৰ্ষণ"
 
-#: ../clutter/clutter-actor.c:6856
+#: ../clutter/clutter-actor.c:6959
 msgid "The center of scaling"
 msgstr "স্কেইলিংৰ কেন্দ্ৰ"
 
-#: ../clutter/clutter-actor.c:6874
+#: ../clutter/clutter-actor.c:6977
 msgid "Rotation Angle X"
 msgstr "ঘূৰ্ণন কোণ X"
 
-#: ../clutter/clutter-actor.c:6875
+#: ../clutter/clutter-actor.c:6978
 msgid "The rotation angle on the X axis"
 msgstr "X অক্ষত ঘূৰ্ণন কোণ"
 
-#: ../clutter/clutter-actor.c:6893
+#: ../clutter/clutter-actor.c:6996
 msgid "Rotation Angle Y"
 msgstr "ঘূৰ্ণন কোণ Y"
 
-#: ../clutter/clutter-actor.c:6894
+#: ../clutter/clutter-actor.c:6997
 msgid "The rotation angle on the Y axis"
 msgstr "Y অক্ষত ঘূৰ্ণন কোণ"
 
-#: ../clutter/clutter-actor.c:6912
+#: ../clutter/clutter-actor.c:7015
 msgid "Rotation Angle Z"
 msgstr "ঘূৰ্ণন কোণ Z"
 
-#: ../clutter/clutter-actor.c:6913
+#: ../clutter/clutter-actor.c:7016
 msgid "The rotation angle on the Z axis"
 msgstr "Z অক্ষত ঘূৰ্ণন কোণ"
 
-#: ../clutter/clutter-actor.c:6931
+#: ../clutter/clutter-actor.c:7034
 msgid "Rotation Center X"
 msgstr "ঘূৰ্ণন কেন্দ্ৰ X"
 
-#: ../clutter/clutter-actor.c:6932
+#: ../clutter/clutter-actor.c:7035
 msgid "The rotation center on the X axis"
 msgstr "X অক্ষত ঘূৰ্ণন কেন্দ্ৰ"
 
-#: ../clutter/clutter-actor.c:6949
+#: ../clutter/clutter-actor.c:7052
 msgid "Rotation Center Y"
 msgstr "ঘূৰ্ণন কেন্দ্ৰ Y"
 
-#: ../clutter/clutter-actor.c:6950
+#: ../clutter/clutter-actor.c:7053
 msgid "The rotation center on the Y axis"
 msgstr "Y অক্ষত ঘূৰ্ণন কেন্দ্ৰ"
 
-#: ../clutter/clutter-actor.c:6967
+#: ../clutter/clutter-actor.c:7070
 msgid "Rotation Center Z"
 msgstr "ঘূৰ্ণন কেন্দ্ৰ Z"
 
-#: ../clutter/clutter-actor.c:6968
+#: ../clutter/clutter-actor.c:7071
 msgid "The rotation center on the Z axis"
 msgstr "Z অক্ষত ঘূৰ্ণন কেন্দ্ৰ"
 
-#: ../clutter/clutter-actor.c:6985
+#: ../clutter/clutter-actor.c:7088
 msgid "Rotation Center Z Gravity"
 msgstr "ঘূৰ্ণন কেন্দ্ৰ Z মাধ্যাকৰ্ষণ"
 
-#: ../clutter/clutter-actor.c:6986
+#: ../clutter/clutter-actor.c:7089
 msgid "Center point for rotation around the Z axis"
 msgstr "Z অক্ষৰ চাৰিওফালে ঘূৰিবলে কেন্দ্ৰবিন্দু"
 
-#: ../clutter/clutter-actor.c:7014
+#: ../clutter/clutter-actor.c:7117
 msgid "Anchor X"
 msgstr "সুত্ৰধাৰ X"
 
-#: ../clutter/clutter-actor.c:7015
+#: ../clutter/clutter-actor.c:7118
 msgid "X coordinate of the anchor point"
 msgstr "সুত্ৰধাৰ বিন্দুৰ X অক্ষ"
 
-#: ../clutter/clutter-actor.c:7043
+#: ../clutter/clutter-actor.c:7146
 msgid "Anchor Y"
 msgstr "সুত্ৰধাৰ Y"
 
-#: ../clutter/clutter-actor.c:7044
+#: ../clutter/clutter-actor.c:7147
 msgid "Y coordinate of the anchor point"
 msgstr "সুত্ৰধাৰ বিন্দুৰ Y অক্ষ"
 
-#: ../clutter/clutter-actor.c:7071
+#: ../clutter/clutter-actor.c:7174
 msgid "Anchor Gravity"
 msgstr "সুত্ৰধাৰ মাধ্যাকৰ্ষণ"
 
-#: ../clutter/clutter-actor.c:7072
+#: ../clutter/clutter-actor.c:7175
 msgid "The anchor point as a ClutterGravity"
 msgstr "ClutterGravity হিচাপে সুত্ৰধাৰ বিন্দু"
 
-#: ../clutter/clutter-actor.c:7091
+#: ../clutter/clutter-actor.c:7194
 msgid "Translation X"
 msgstr "অনুবাদ X"
 
-#: ../clutter/clutter-actor.c:7092
+#: ../clutter/clutter-actor.c:7195
 msgid "Translation along the X axis"
 msgstr "X অক্ষত অনুবাদ"
 
-#: ../clutter/clutter-actor.c:7111
+#: ../clutter/clutter-actor.c:7214
 msgid "Translation Y"
 msgstr "অনুবাদ Y"
 
-#: ../clutter/clutter-actor.c:7112
+#: ../clutter/clutter-actor.c:7215
 msgid "Translation along the Y axis"
 msgstr "Y অক্ষত অনুবাদ"
 
-#: ../clutter/clutter-actor.c:7131
+#: ../clutter/clutter-actor.c:7234
 msgid "Translation Z"
 msgstr "অনুবাদ Z"
 
-#: ../clutter/clutter-actor.c:7132
+#: ../clutter/clutter-actor.c:7235
 msgid "Translation along the Z axis"
 msgstr "Z অক্ষত অনুবাদ"
 
-#: ../clutter/clutter-actor.c:7160
+#: ../clutter/clutter-actor.c:7265
 msgid "Transform"
 msgstr "পৰিবৰ্তন"
 
-#: ../clutter/clutter-actor.c:7161
+#: ../clutter/clutter-actor.c:7266
 msgid "Transformation matrix"
 msgstr "ৰুপান্তৰ মেট্ৰিক্স"
 
-#: ../clutter/clutter-actor.c:7175
+#: ../clutter/clutter-actor.c:7281
 msgid "Transform Set"
 msgstr "ৰুপান্তৰ সংহতি"
 
-#: ../clutter/clutter-actor.c:7176
+#: ../clutter/clutter-actor.c:7282
 msgid "Whether the transform property is set"
 msgstr "ৰুপান্তৰ বৈশিষ্ট সংহতি কৰা হৈছে নে"
 
-#: ../clutter/clutter-actor.c:7195
+#: ../clutter/clutter-actor.c:7303
 msgid "Child Transform"
 msgstr "সন্তান পৰিবৰ্তন"
 
-#: ../clutter/clutter-actor.c:7196
+#: ../clutter/clutter-actor.c:7304
 msgid "Children transformation matrix"
 msgstr "সন্তান ৰুপান্তৰ মেট্ৰিক্স"
 
-#: ../clutter/clutter-actor.c:7210
+#: ../clutter/clutter-actor.c:7319
 msgid "Child Transform Set"
 msgstr "সন্তান ৰুপান্তৰ সংহতি"
 
-#: ../clutter/clutter-actor.c:7211
+#: ../clutter/clutter-actor.c:7320
 msgid "Whether the child-transform property is set"
 msgstr "সন্তান-ৰুপান্তৰ বৈশিষ্ট সংহতি কৰা হৈছে নে"
 
-#: ../clutter/clutter-actor.c:7228
+#: ../clutter/clutter-actor.c:7337
 msgid "Show on set parent"
 msgstr "সংহতি উপধায়কত দেখুৱাওক"
 
-#: ../clutter/clutter-actor.c:7229
+#: ../clutter/clutter-actor.c:7338
 msgid "Whether the actor is shown when parented"
 msgstr "উপধায়ক কৰোতে অভিনেতাক দেখুৱা হয় নে"
 
-#: ../clutter/clutter-actor.c:7246
+#: ../clutter/clutter-actor.c:7355
 msgid "Clip to Allocation"
 msgstr "আবন্টনলে ক্লিপ"
 
-#: ../clutter/clutter-actor.c:7247
+#: ../clutter/clutter-actor.c:7356
 msgid "Sets the clip region to track the actor's allocation"
 msgstr "অভিনেতাৰ আবন্টন অনুকৰন কৰিবলে ক্লিপ অঞ্চল সংহতি কৰক"
 
-#: ../clutter/clutter-actor.c:7260
+#: ../clutter/clutter-actor.c:7369
 msgid "Text Direction"
-msgstr "লিখনী দিশ"
+msgstr "লিখনি দিশ"
 
-#: ../clutter/clutter-actor.c:7261
+#: ../clutter/clutter-actor.c:7370
 msgid "Direction of the text"
-msgstr "লিখনীৰ দিশ"
+msgstr "লিখনিৰ দিশ"
 
-#: ../clutter/clutter-actor.c:7276
+#: ../clutter/clutter-actor.c:7385
 msgid "Has Pointer"
 msgstr "পোইন্টাৰ আছে"
 
-#: ../clutter/clutter-actor.c:7277
+#: ../clutter/clutter-actor.c:7386
 msgid "Whether the actor contains the pointer of an input device"
 msgstr "অভিনায়কে এটা ইনপুট ডিভাইচৰ পোইন্টাৰ অন্তৰ্ভুক্ত কৰে নে"
 
-#: ../clutter/clutter-actor.c:7290
+#: ../clutter/clutter-actor.c:7399
 msgid "Actions"
 msgstr "কাৰ্য্যসমূহ"
 
-#: ../clutter/clutter-actor.c:7291
+#: ../clutter/clutter-actor.c:7400
 msgid "Adds an action to the actor"
 msgstr "অভিনেতালে এটা কাৰ্য্য যোগ কৰে"
 
-#: ../clutter/clutter-actor.c:7304
+#: ../clutter/clutter-actor.c:7413
 msgid "Constraints"
 msgstr "বাধাসমূহ"
 
-#: ../clutter/clutter-actor.c:7305
+#: ../clutter/clutter-actor.c:7414
 msgid "Adds a constraint to the actor"
 msgstr "অভিনেতালে এটা বাধা যোগ কৰে"
 
-#: ../clutter/clutter-actor.c:7318
+#: ../clutter/clutter-actor.c:7427
 msgid "Effect"
 msgstr "পৰিণতি"
 
-#: ../clutter/clutter-actor.c:7319
+#: ../clutter/clutter-actor.c:7428
 msgid "Add an effect to be applied on the actor"
 msgstr "অভিনেতালে প্ৰয়োগ কৰিবলে এটা প্ৰভাৱ যোগ কৰে"
 
-#: ../clutter/clutter-actor.c:7333
+#: ../clutter/clutter-actor.c:7442
 msgid "Layout Manager"
 msgstr "বিন্যাস ব্যৱস্থাপক"
 
-#: ../clutter/clutter-actor.c:7334
+#: ../clutter/clutter-actor.c:7443
 msgid "The object controlling the layout of an actor's children"
 msgstr "এজন অভিনেতাৰ সন্তানৰ বিন্যাস নিয়ন্ত্ৰণ কৰা অবজেক্ট"
 
-#: ../clutter/clutter-actor.c:7348
+#: ../clutter/clutter-actor.c:7457
 msgid "X Expand"
 msgstr "X প্ৰসাৰিত"
 
-#: ../clutter/clutter-actor.c:7349
+#: ../clutter/clutter-actor.c:7458
 msgid "Whether extra horizontal space should be assigned to the actor"
 msgstr "অতিৰিক্ত আনুভূমিক স্থান অভিনেতালে ধাৰ্য্য কৰা হব নে"
 
-#: ../clutter/clutter-actor.c:7364
+#: ../clutter/clutter-actor.c:7473
 msgid "Y Expand"
 msgstr "Y প্ৰসাৰিত"
 
-#: ../clutter/clutter-actor.c:7365
+#: ../clutter/clutter-actor.c:7474
 msgid "Whether extra vertical space should be assigned to the actor"
 msgstr "অতিৰিক্ত উলম্ব স্থান অভিনেতালে ধাৰ্য্য কৰা হব নে"
 
-#: ../clutter/clutter-actor.c:7381
+#: ../clutter/clutter-actor.c:7490
 msgid "X Alignment"
 msgstr "X সংৰেখন"
 
-#: ../clutter/clutter-actor.c:7382
+#: ../clutter/clutter-actor.c:7491
 msgid "The alignment of the actor on the X axis within its allocation"
 msgstr "X অক্ষত তাৰ আবন্টনৰ মাজত অভিনেতাৰ সংৰেখন"
 
-#: ../clutter/clutter-actor.c:7397
+#: ../clutter/clutter-actor.c:7506
 msgid "Y Alignment"
 msgstr "Y সংৰেখন"
 
-#: ../clutter/clutter-actor.c:7398
+#: ../clutter/clutter-actor.c:7507
 msgid "The alignment of the actor on the Y axis within its allocation"
 msgstr "Y অক্ষত তাৰ আবন্টনৰ ভিতৰত অভিনেতাৰ সংৰেখন"
 
-#: ../clutter/clutter-actor.c:7417
+#: ../clutter/clutter-actor.c:7526
 msgid "Margin Top"
 msgstr "সীমাৰ উপৰ"
 
-#: ../clutter/clutter-actor.c:7418
+#: ../clutter/clutter-actor.c:7527
 msgid "Extra space at the top"
 msgstr "উপৰত অতিৰিক্ত ঠাই"
 
-#: ../clutter/clutter-actor.c:7439
+#: ../clutter/clutter-actor.c:7548
 msgid "Margin Bottom"
 msgstr "সীমাৰ তল"
 
-#: ../clutter/clutter-actor.c:7440
+#: ../clutter/clutter-actor.c:7549
 msgid "Extra space at the bottom"
 msgstr "তলত অতিৰিক্ত ঠাই"
 
-#: ../clutter/clutter-actor.c:7461
+#: ../clutter/clutter-actor.c:7570
 msgid "Margin Left"
 msgstr "সীমাৰ বাওঁ"
 
-#: ../clutter/clutter-actor.c:7462
+#: ../clutter/clutter-actor.c:7571
 msgid "Extra space at the left"
 msgstr "বাঁওফালে অতিৰিক্ত ঠাই"
 
-#: ../clutter/clutter-actor.c:7483
+#: ../clutter/clutter-actor.c:7592
 msgid "Margin Right"
 msgstr "সীমাৰ সোঁ"
 
-#: ../clutter/clutter-actor.c:7484
+#: ../clutter/clutter-actor.c:7593
 msgid "Extra space at the right"
 msgstr "সোঁফালে অতিৰিক্ত ঠাই"
 
-#: ../clutter/clutter-actor.c:7500
+#: ../clutter/clutter-actor.c:7609
 msgid "Background Color Set"
 msgstr "পটভূমীৰ ৰঙৰ সংহতি"
 
-#: ../clutter/clutter-actor.c:7501 ../clutter/deprecated/clutter-box.c:275
+#: ../clutter/clutter-actor.c:7610 ../clutter/deprecated/clutter-box.c:269
 msgid "Whether the background color is set"
 msgstr "পটভূমী ৰঙ সংহতি কৰা হৈছে নে"
 
-#: ../clutter/clutter-actor.c:7517
+#: ../clutter/clutter-actor.c:7626
 msgid "Background color"
 msgstr "পটভূমীৰ ৰঙ"
 
-#: ../clutter/clutter-actor.c:7518
+#: ../clutter/clutter-actor.c:7627
 msgid "The actor's background color"
 msgstr "অভিনেতাৰ পটভূমীৰ ৰঙ"
 
-#: ../clutter/clutter-actor.c:7533
+#: ../clutter/clutter-actor.c:7642
 msgid "First Child"
 msgstr "প্ৰথম সন্তান"
 
-#: ../clutter/clutter-actor.c:7534
+#: ../clutter/clutter-actor.c:7643
 msgid "The actor's first child"
 msgstr "অভিনেতাৰ প্ৰথম সন্তান"
 
-#: ../clutter/clutter-actor.c:7547
+#: ../clutter/clutter-actor.c:7656
 msgid "Last Child"
 msgstr "শেষ সন্তান"
 
-#: ../clutter/clutter-actor.c:7548
+#: ../clutter/clutter-actor.c:7657
 msgid "The actor's last child"
 msgstr "অভিনেতাৰ শেষ সন্তান"
 
-#: ../clutter/clutter-actor.c:7562
+#: ../clutter/clutter-actor.c:7671
 msgid "Content"
 msgstr "সমল"
 
-#: ../clutter/clutter-actor.c:7563
+#: ../clutter/clutter-actor.c:7672
 msgid "Delegate object for painting the actor's content"
 msgstr "অভিনেতাৰ সমল ৰূপাঙ্কণৰ বাবে অবজেক্ট প্ৰতিনিধি কৰক"
 
-#: ../clutter/clutter-actor.c:7588
+#: ../clutter/clutter-actor.c:7697
 msgid "Content Gravity"
 msgstr "সমল ভৰ"
 
-#: ../clutter/clutter-actor.c:7589
+#: ../clutter/clutter-actor.c:7698
 msgid "Alignment of the actor's content"
 msgstr "অভিনেতাৰ সমলৰ সংৰেখন"
 
-#: ../clutter/clutter-actor.c:7609
+#: ../clutter/clutter-actor.c:7718
 msgid "Content Box"
 msgstr "সমল বাকচ"
 
-#: ../clutter/clutter-actor.c:7610
+#: ../clutter/clutter-actor.c:7719
 msgid "The bounding box of the actor's content"
 msgstr "অভিনেতাৰ সমলৰ বান্ধনী বাকচ"
 
-#: ../clutter/clutter-actor.c:7618
+#: ../clutter/clutter-actor.c:7727
 msgid "Minification Filter"
 msgstr "সৰু কৰা পৰিস্ৰাৱক"
 
-#: ../clutter/clutter-actor.c:7619
+#: ../clutter/clutter-actor.c:7728
 msgid "The filter used when reducing the size of the content"
 msgstr "সমলৰ আকাৰ সৰু কৰোতে ব্যৱহৃত পৰিস্ৰাৱক"
 
-#: ../clutter/clutter-actor.c:7626
+#: ../clutter/clutter-actor.c:7735
 msgid "Magnification Filter"
 msgstr "ডাঙৰ কৰা পৰিস্ৰাৱক"
 
-#: ../clutter/clutter-actor.c:7627
+#: ../clutter/clutter-actor.c:7736
 msgid "The filter used when increasing the size of the content"
 msgstr "সমলৰ আকাৰ বৃদ্ধি কৰোতে ব্যৱহৃত পৰিস্ৰাৱক"
 
-#: ../clutter/clutter-actor.c:7641
+#: ../clutter/clutter-actor.c:7750
 msgid "Content Repeat"
 msgstr "সমল পুনৰাবৃত্তি"
 
-#: ../clutter/clutter-actor.c:7642
+#: ../clutter/clutter-actor.c:7751
 msgid "The repeat policy for the actor's content"
 msgstr "অভিনেতাৰ সমলৰ বাবে পুনৰাবৃত্তি নীতি"
 
-#: ../clutter/clutter-actor-meta.c:193 ../clutter/clutter-child-meta.c:142
+#: ../clutter/clutter-actor-meta.c:191 ../clutter/clutter-child-meta.c:142
 msgid "Actor"
 msgstr "অভিনেতা"
 
-#: ../clutter/clutter-actor-meta.c:194
+#: ../clutter/clutter-actor-meta.c:192
 msgid "The actor attached to the meta"
 msgstr "মেটালে সংযুক্ত অভিনেতাজন"
 
-#: ../clutter/clutter-actor-meta.c:208
+#: ../clutter/clutter-actor-meta.c:206
 msgid "The name of the meta"
 msgstr "মেটাৰ নাম"
 
-#: ../clutter/clutter-actor-meta.c:221 ../clutter/clutter-input-device.c:337
-#: ../clutter/deprecated/clutter-shader.c:313
+#: ../clutter/clutter-actor-meta.c:219 ../clutter/clutter-input-device.c:326
+#: ../clutter/deprecated/clutter-shader.c:309
 msgid "Enabled"
 msgstr "সামৰ্থবান কৰা আছে"
 
-#: ../clutter/clutter-actor-meta.c:222
+#: ../clutter/clutter-actor-meta.c:220
 msgid "Whether the meta is enabled"
 msgstr "মেটা সামৰ্থবান কৰা আছে নে"
 
 #: ../clutter/clutter-align-constraint.c:279
-#: ../clutter/clutter-bind-constraint.c:358 ../clutter/clutter-clone.c:345
+#: ../clutter/clutter-bind-constraint.c:343 ../clutter/clutter-clone.c:341
 #: ../clutter/clutter-snap-constraint.c:321
 msgid "Source"
 msgstr "উৎস"
@@ -729,195 +729,233 @@ msgstr "কাৰক"
 msgid "The alignment factor, between 0.0 and 1.0"
 msgstr "সংস্থাপন কাৰক, 0.0 আৰু 1.0 -ৰ মাজত"
 
-#: ../clutter/clutter-backend.c:379
+#: ../clutter/clutter-backend.c:380
 msgid "Unable to initialize the Clutter backend"
 msgstr "Clutter বেকএন্ড আৰম্ভ কৰিবলে অক্ষম"
 
-#: ../clutter/clutter-backend.c:453
+#: ../clutter/clutter-backend.c:454
 #, c-format
 msgid "The backend of type '%s' does not support creating multiple stages"
 msgstr "'%s' ধৰণৰ বেকএণ্ড কেইবাটাও স্তৰ সৃষ্টি কৰা সমৰ্থন নকৰে"
 
-#: ../clutter/clutter-bind-constraint.c:359
+#: ../clutter/clutter-bind-constraint.c:344
 msgid "The source of the binding"
 msgstr "বান্ধণীৰ উৎস"
 
-#: ../clutter/clutter-bind-constraint.c:372
+#: ../clutter/clutter-bind-constraint.c:357
 msgid "Coordinate"
 msgstr "অক্ষ"
 
-#: ../clutter/clutter-bind-constraint.c:373
+#: ../clutter/clutter-bind-constraint.c:358
 msgid "The coordinate to bind"
 msgstr "বান্ধিবলে অক্ষ"
 
-#: ../clutter/clutter-bind-constraint.c:387
+#: ../clutter/clutter-bind-constraint.c:372
 #: ../clutter/clutter-path-constraint.c:226
 #: ../clutter/clutter-snap-constraint.c:366
 msgid "Offset"
 msgstr "অফছেট"
 
-#: ../clutter/clutter-bind-constraint.c:388
+#: ../clutter/clutter-bind-constraint.c:373
 msgid "The offset in pixels to apply to the binding"
 msgstr "বান্ধনীলে প্ৰয়োগ হবলে পিক্সেলসমূহত অফছেট"
 
-#: ../clutter/clutter-binding-pool.c:320
+#: ../clutter/clutter-binding-pool.c:319
 msgid "The unique name of the binding pool"
 msgstr "বান্ধণী পুলৰ অবিকল্পিত নাম"
 
-#: ../clutter/clutter-bin-layout.c:240 ../clutter/clutter-bin-layout.c:649
-#: ../clutter/clutter-box-layout.c:390 ../clutter/clutter-table-layout.c:610
+#: ../clutter/clutter-bin-layout.c:220 ../clutter/clutter-bin-layout.c:633
+#: ../clutter/clutter-box-layout.c:374
+#: ../clutter/deprecated/clutter-table-layout.c:602
 msgid "Horizontal Alignment"
 msgstr "আনুভূমিক সংস্থাপন"
 
-#: ../clutter/clutter-bin-layout.c:241
+#: ../clutter/clutter-bin-layout.c:221
 msgid "Horizontal alignment for the actor inside the layout manager"
 msgstr "বিন্যাস ব্যৱস্থাপকৰ ভিতৰৰ অভিনেতাৰ বাবে আনুভূমিক সংস্থাপন"
 
-#: ../clutter/clutter-bin-layout.c:249 ../clutter/clutter-bin-layout.c:669
-#: ../clutter/clutter-box-layout.c:399 ../clutter/clutter-table-layout.c:625
+#: ../clutter/clutter-bin-layout.c:229 ../clutter/clutter-bin-layout.c:653
+#: ../clutter/clutter-box-layout.c:383
+#: ../clutter/deprecated/clutter-table-layout.c:617
 msgid "Vertical Alignment"
 msgstr "উলম্ব সংস্থাপন"
 
-#: ../clutter/clutter-bin-layout.c:250
+#: ../clutter/clutter-bin-layout.c:230
 msgid "Vertical alignment for the actor inside the layout manager"
 msgstr "বিন্যাস ব্যৱস্থাপকৰ ভিতৰৰ অভিনেতাৰ বাবে উলম্ব সংস্থাপন"
 
-#: ../clutter/clutter-bin-layout.c:650
+#: ../clutter/clutter-bin-layout.c:634
 msgid "Default horizontal alignment for the actors inside the layout manager"
-msgstr "বিন্যাস ব্যৱস্থাপকৰ ভিতৰৰ অভিনেতাসমূহৰ বাবে অবিকল্পিত আনুভূমিক সংস্থাপন"
+msgstr ""
+"বিন্যাস ব্যৱস্থাপকৰ ভিতৰৰ অভিনেতাসমূহৰ বাবে অবিকল্পিত আনুভূমিক সংস্থাপন"
 
-#: ../clutter/clutter-bin-layout.c:670
+#: ../clutter/clutter-bin-layout.c:654
 msgid "Default vertical alignment for the actors inside the layout manager"
 msgstr "বিন্যাস ব্যৱস্থাপকৰ ভিতৰৰ অভিনেতাসমূহৰ বাবে অবিকল্পিত উলম্ব সংস্থাপন"
 
-#: ../clutter/clutter-box-layout.c:365
+#: ../clutter/clutter-box-layout.c:349
 msgid "Expand"
 msgstr "প্ৰসাৰিত"
 
-#: ../clutter/clutter-box-layout.c:366
+#: ../clutter/clutter-box-layout.c:350
 msgid "Allocate extra space for the child"
 msgstr "ছাইল্ডৰ বাবে অতিৰিক্ত স্থান আবন্টন কৰক"
 
-#: ../clutter/clutter-box-layout.c:372 ../clutter/clutter-table-layout.c:589
+#: ../clutter/clutter-box-layout.c:356
+#: ../clutter/deprecated/clutter-table-layout.c:581
 msgid "Horizontal Fill"
 msgstr "আনুভূমিক পূৰ্ণ"
 
-#: ../clutter/clutter-box-layout.c:373 ../clutter/clutter-table-layout.c:590
+#: ../clutter/clutter-box-layout.c:357
+#: ../clutter/deprecated/clutter-table-layout.c:582
 msgid ""
 "Whether the child should receive priority when the container is allocating "
 "spare space on the horizontal axis"
 msgstr ""
-"বৈয়ামে আনুভূমিক অক্ষত ৰিক্ত স্থান আবন্টন কৰি থাকোতে ছাইল্ডে প্ৰাথমিকতা গ্ৰহণ কৰিব নে"
+"বৈয়ামে আনুভূমিক অক্ষত ৰিক্ত স্থান আবন্টন কৰি থাকোতে ছাইল্ডে প্ৰাথমিকতা গ্ৰহণ "
+"কৰিব নে"
 
-#: ../clutter/clutter-box-layout.c:381 ../clutter/clutter-table-layout.c:596
+#: ../clutter/clutter-box-layout.c:365
+#: ../clutter/deprecated/clutter-table-layout.c:588
 msgid "Vertical Fill"
 msgstr "উলম্ব পূৰ্ণ"
 
-#: ../clutter/clutter-box-layout.c:382 ../clutter/clutter-table-layout.c:597
+#: ../clutter/clutter-box-layout.c:366
+#: ../clutter/deprecated/clutter-table-layout.c:589
 msgid ""
 "Whether the child should receive priority when the container is allocating "
 "spare space on the vertical axis"
 msgstr ""
-"বৈয়ামে উলম্ব অক্ষত ৰিক্ত স্থান আবন্টন কৰি থাকোতে ছাইল্ডে প্ৰাথমিকতা গ্ৰহণ কৰিব নে"
+"বৈয়ামে উলম্ব অক্ষত ৰিক্ত স্থান আবন্টন কৰি থাকোতে ছাইল্ডে প্ৰাথমিকতা গ্ৰহণ "
+"কৰিব নে"
 
-#: ../clutter/clutter-box-layout.c:391 ../clutter/clutter-table-layout.c:611
+#: ../clutter/clutter-box-layout.c:375
+#: ../clutter/deprecated/clutter-table-layout.c:603
 msgid "Horizontal alignment of the actor within the cell"
 msgstr "কোষৰ ভিতৰত অভিনেতাৰ আনুভূমিক সংস্থাপন"
 
-#: ../clutter/clutter-box-layout.c:400 ../clutter/clutter-table-layout.c:626
+#: ../clutter/clutter-box-layout.c:384
+#: ../clutter/deprecated/clutter-table-layout.c:618
 msgid "Vertical alignment of the actor within the cell"
 msgstr "কোষৰ ভিতৰত অভিনেতাৰ উলম্ব সংস্থাপন"
 
-#: ../clutter/clutter-box-layout.c:1365
+#: ../clutter/clutter-box-layout.c:1345
 msgid "Vertical"
 msgstr "উলম্ব"
 
-#: ../clutter/clutter-box-layout.c:1366
+#: ../clutter/clutter-box-layout.c:1346
 msgid "Whether the layout should be vertical, rather than horizontal"
 msgstr "বিন্যাস আনুভূমিক নহৈ, উলম্ব হব লাগে নে"
 
-#: ../clutter/clutter-box-layout.c:1383 ../clutter/clutter-flow-layout.c:890
-#: ../clutter/clutter-grid-layout.c:1547
+#: ../clutter/clutter-box-layout.c:1363 ../clutter/clutter-flow-layout.c:927
+#: ../clutter/clutter-grid-layout.c:1549
 msgid "Orientation"
 msgstr "দিশনিৰ্ণয়"
 
-#: ../clutter/clutter-box-layout.c:1384 ../clutter/clutter-flow-layout.c:891
-#: ../clutter/clutter-grid-layout.c:1548
+#: ../clutter/clutter-box-layout.c:1364 ../clutter/clutter-flow-layout.c:928
+#: ../clutter/clutter-grid-layout.c:1550
 msgid "The orientation of the layout"
 msgstr "বিন্যাসৰ দিশ"
 
-#: ../clutter/clutter-box-layout.c:1400 ../clutter/clutter-flow-layout.c:906
+#: ../clutter/clutter-box-layout.c:1380 ../clutter/clutter-flow-layout.c:943
 msgid "Homogeneous"
 msgstr "সমমাত্ৰিক"
 
-#: ../clutter/clutter-box-layout.c:1401
-msgid "Whether the layout should be homogeneous, i.e. all childs get the same size"
+#: ../clutter/clutter-box-layout.c:1381
+msgid ""
+"Whether the layout should be homogeneous, i.e. all childs get the same size"
 msgstr "বিন্যাস সমমাত্ৰিক হব লাগে নে, যাতে সকলো ছাইল্ডে একে আকাৰ প্ৰাপ্ত কৰে"
 
-#: ../clutter/clutter-box-layout.c:1416
+#: ../clutter/clutter-box-layout.c:1396
 msgid "Pack Start"
 msgstr "পেক আৰম্ভণি"
 
-#: ../clutter/clutter-box-layout.c:1417
+#: ../clutter/clutter-box-layout.c:1397
 msgid "Whether to pack items at the start of the box"
 msgstr "বাকচৰ আৰম্ভণিত বস্তুসমূহ পেক কৰিব লাগে নে"
 
-#: ../clutter/clutter-box-layout.c:1430
+#: ../clutter/clutter-box-layout.c:1410
 msgid "Spacing"
 msgstr "স্পেইচিং"
 
-#: ../clutter/clutter-box-layout.c:1431
+#: ../clutter/clutter-box-layout.c:1411
 msgid "Spacing between children"
 msgstr "ছাইল্ডৰ মাজত স্পেইচিং"
 
-#: ../clutter/clutter-box-layout.c:1448 ../clutter/clutter-table-layout.c:1675
+#: ../clutter/clutter-box-layout.c:1428
+#: ../clutter/deprecated/clutter-table-layout.c:1669
 msgid "Use Animations"
 msgstr "জীৱন্তকৰণসমূহ ব্যৱহাৰ কৰক"
 
-#: ../clutter/clutter-box-layout.c:1449 ../clutter/clutter-table-layout.c:1676
+#: ../clutter/clutter-box-layout.c:1429
+#: ../clutter/deprecated/clutter-table-layout.c:1670
 msgid "Whether layout changes should be animated"
 msgstr "বিন্যাস পৰিবৰ্তনসমূহ জীৱন্ত কৰিব লাগে নে"
 
-#: ../clutter/clutter-box-layout.c:1473 ../clutter/clutter-table-layout.c:1700
+#: ../clutter/clutter-box-layout.c:1453
+#: ../clutter/deprecated/clutter-table-layout.c:1694
 msgid "Easing Mode"
 msgstr "সহজ অৱস্থা"
 
-#: ../clutter/clutter-box-layout.c:1474 ../clutter/clutter-table-layout.c:1701
+#: ../clutter/clutter-box-layout.c:1454
+#: ../clutter/deprecated/clutter-table-layout.c:1695
 msgid "The easing mode of the animations"
 msgstr "জীৱন্তকৰণসমূহৰ সহজ অৱস্থা"
 
-#: ../clutter/clutter-box-layout.c:1494 ../clutter/clutter-table-layout.c:1721
+#: ../clutter/clutter-box-layout.c:1474
+#: ../clutter/deprecated/clutter-table-layout.c:1715
 msgid "Easing Duration"
 msgstr "সহজ অবধি"
 
-#: ../clutter/clutter-box-layout.c:1495 ../clutter/clutter-table-layout.c:1722
+#: ../clutter/clutter-box-layout.c:1475
+#: ../clutter/deprecated/clutter-table-layout.c:1716
 msgid "The duration of the animations"
 msgstr "জীৱন্তকৰণসমূহৰ অবধি"
 
-#: ../clutter/clutter-brightness-contrast-effect.c:307
+#: ../clutter/clutter-brightness-contrast-effect.c:321
 msgid "Brightness"
 msgstr "উজ্জ্বলতা"
 
-#: ../clutter/clutter-brightness-contrast-effect.c:308
+#: ../clutter/clutter-brightness-contrast-effect.c:322
 msgid "The brightness change to apply"
 msgstr "প্ৰয়োগ কৰিব লগিয়া উজ্জ্বলতা পৰিবৰ্তন"
 
-#: ../clutter/clutter-brightness-contrast-effect.c:327
+#: ../clutter/clutter-brightness-contrast-effect.c:341
 msgid "Contrast"
 msgstr "প্ৰভেদ"
 
-#: ../clutter/clutter-brightness-contrast-effect.c:328
+#: ../clutter/clutter-brightness-contrast-effect.c:342
 msgid "The contrast change to apply"
 msgstr "প্ৰয়োগ কৰিব লগিয়া প্ৰভেদ পৰিবৰ্তন"
 
-#: ../clutter/clutter-canvas.c:216
+#: ../clutter/clutter-canvas.c:248
 msgid "The width of the canvas"
 msgstr "কেনভাচৰ প্ৰস্থ"
 
-#: ../clutter/clutter-canvas.c:232
+#: ../clutter/clutter-canvas.c:264
 msgid "The height of the canvas"
 msgstr "কেনভাচৰ উচ্চতা"
 
+#: ../clutter/clutter-canvas.c:283
+#| msgid "Selection Color Set"
+msgid "Scale Factor Set"
+msgstr "স্কেইল কাৰক সংহতি"
+
+#: ../clutter/clutter-canvas.c:284
+#| msgid "Whether the transform property is set"
+msgid "Whether the scale-factor property is set"
+msgstr "স্কেইল-কাৰক বৈশিষ্ট সংহতি কৰা হৈছে নে"
+
+#: ../clutter/clutter-canvas.c:305
+#| msgid "Factor"
+msgid "Scale Factor"
+msgstr "স্কেইল কাৰক"
+
+#: ../clutter/clutter-canvas.c:306
+#| msgid "The height of the Cairo surface"
+msgid "The scaling factor for the surface"
+msgstr "পৃষ্ঠৰ স্কেইলিং কাৰক"
+
 #: ../clutter/clutter-child-meta.c:127
 msgid "Container"
 msgstr "বৈয়াম"
@@ -930,39 +968,39 @@ msgstr "এই তথ্য সৃষ্টি কৰা বৈয়াম"
 msgid "The actor wrapped by this data"
 msgstr "এই তথ্যৰে মেৰিওৱা অভিনেতা"
 
-#: ../clutter/clutter-click-action.c:546
+#: ../clutter/clutter-click-action.c:586
 msgid "Pressed"
 msgstr "দবাই থোৱা"
 
-#: ../clutter/clutter-click-action.c:547
+#: ../clutter/clutter-click-action.c:587
 msgid "Whether the clickable should be in pressed state"
 msgstr "ক্লিক কৰিব পৰাটো দবোৱা অৱস্থাত থাকিব লাগে নে"
 
-#: ../clutter/clutter-click-action.c:560
+#: ../clutter/clutter-click-action.c:600
 msgid "Held"
 msgstr "ধৰি ৰাখক"
 
-#: ../clutter/clutter-click-action.c:561
+#: ../clutter/clutter-click-action.c:601
 msgid "Whether the clickable has a grab"
 msgstr "ক্লিক কৰিব পৰাটোৰ এটা তাপ আছে নে"
 
-#: ../clutter/clutter-click-action.c:578 ../clutter/clutter-settings.c:599
+#: ../clutter/clutter-click-action.c:618 ../clutter/clutter-settings.c:651
 msgid "Long Press Duration"
 msgstr "দীঘল দবোৱা অবধি"
 
-#: ../clutter/clutter-click-action.c:579
+#: ../clutter/clutter-click-action.c:619
 msgid "The minimum duration of a long press to recognize the gesture"
 msgstr "ভংগিক চিনাক্ত কৰিবলে এটা দীঘল দবোৱাৰ নূন্যতম অবধি"
 
-#: ../clutter/clutter-click-action.c:597
+#: ../clutter/clutter-click-action.c:637
 msgid "Long Press Threshold"
 msgstr "দীঘল দবোৱাৰ ডেউৰী"
 
-#: ../clutter/clutter-click-action.c:598
+#: ../clutter/clutter-click-action.c:638
 msgid "The maximum threshold before a long press is cancelled"
 msgstr "এটা দীঘল দবোৱা বাতিল কৰাৰ আগত সৰ্বাধিক ডেউৰী"
 
-#: ../clutter/clutter-clone.c:346
+#: ../clutter/clutter-clone.c:342
 msgid "Specifies the actor to be cloned"
 msgstr "ক্লৌন কৰিব লগিয়া অভিনেতাক ধাৰ্য্য কৰে"
 
@@ -974,27 +1012,27 @@ msgstr "টিন্ট"
 msgid "The tint to apply"
 msgstr "প্ৰয়োগ কৰিব লগিয়া টিন্ট"
 
-#: ../clutter/clutter-deform-effect.c:588
+#: ../clutter/clutter-deform-effect.c:591
 msgid "Horizontal Tiles"
 msgstr "আনুভূমিক টাইলসমূহ"
 
-#: ../clutter/clutter-deform-effect.c:589
+#: ../clutter/clutter-deform-effect.c:592
 msgid "The number of horizontal tiles"
 msgstr "আনুভূমিক টাইলসমূহৰ সংখ্যা"
 
-#: ../clutter/clutter-deform-effect.c:604
+#: ../clutter/clutter-deform-effect.c:607
 msgid "Vertical Tiles"
 msgstr "উলম্ব টাইলসমূহ"
 
-#: ../clutter/clutter-deform-effect.c:605
+#: ../clutter/clutter-deform-effect.c:608
 msgid "The number of vertical tiles"
 msgstr "উলম্ব টাইলসমূহৰ সংখ্যা"
 
-#: ../clutter/clutter-deform-effect.c:622
+#: ../clutter/clutter-deform-effect.c:625
 msgid "Back Material"
 msgstr "পিছফালৰ সামগ্ৰী"
 
-#: ../clutter/clutter-deform-effect.c:623
+#: ../clutter/clutter-deform-effect.c:626
 msgid "The material to be used when painting the back of the actor"
 msgstr "অভিনেতাৰ পিছফাল ৰঙ কৰোতে ব্যৱহাৰ কৰিব লগিয়া সামগ্ৰী"
 
@@ -1002,258 +1040,299 @@ msgstr "অভিনেতাৰ পিছফাল ৰঙ কৰোতে ব
 msgid "The desaturation factor"
 msgstr "অসংপৃক্তকৰণ কাৰক"
 
-#: ../clutter/clutter-device-manager.c:131
-#: ../clutter/clutter-input-device.c:366
-#: ../clutter/x11/clutter-keymap-x11.c:316
+#: ../clutter/clutter-device-manager.c:127
+#: ../clutter/clutter-input-device.c:355
+#: ../clutter/x11/clutter-keymap-x11.c:457
 msgid "Backend"
 msgstr "বেকএন্ড"
 
-#: ../clutter/clutter-device-manager.c:132
+#: ../clutter/clutter-device-manager.c:128
 msgid "The ClutterBackend of the device manager"
 msgstr "ডিভাইচ মেনেজাৰৰ ClutterBackend"
 
-#: ../clutter/clutter-drag-action.c:709
+#: ../clutter/clutter-drag-action.c:733
 msgid "Horizontal Drag Threshold"
 msgstr "আনুভূমিক টান ডেউৰী"
 
-#: ../clutter/clutter-drag-action.c:710
+#: ../clutter/clutter-drag-action.c:734
 msgid "The horizontal amount of pixels required to start dragging"
 msgstr "টান আৰম্ভ কৰিবলে প্ৰয়োজনীয় পিক্সেলসমূহৰ আনুভূমিক পৰিমাণ"
 
-#: ../clutter/clutter-drag-action.c:737
+#: ../clutter/clutter-drag-action.c:761
 msgid "Vertical Drag Threshold"
 msgstr "উলম্ব টান ডেউৰী"
 
-#: ../clutter/clutter-drag-action.c:738
+#: ../clutter/clutter-drag-action.c:762
 msgid "The vertical amount of pixels required to start dragging"
 msgstr "টান আৰম্ভ কৰিবলে প্ৰয়োজনীয় পিক্সেলসমূহৰ উলম্ব পৰিমাণ"
 
-#: ../clutter/clutter-drag-action.c:759
+#: ../clutter/clutter-drag-action.c:783
 msgid "Drag Handle"
 msgstr "টান হাতল"
 
-#: ../clutter/clutter-drag-action.c:760
+#: ../clutter/clutter-drag-action.c:784
 msgid "The actor that is being dragged"
 msgstr "অভিনেতা যাক টনা হৈ আছে"
 
-#: ../clutter/clutter-drag-action.c:773
+#: ../clutter/clutter-drag-action.c:797
 msgid "Drag Axis"
 msgstr "টান অক্ষ"
 
-#: ../clutter/clutter-drag-action.c:774
+#: ../clutter/clutter-drag-action.c:798
 msgid "Constraints the dragging to an axis"
 msgstr "টনাক এটা অক্ষত সীমিত ৰাখে"
 
-#: ../clutter/clutter-drag-action.c:790
+#: ../clutter/clutter-drag-action.c:814
 msgid "Drag Area"
 msgstr "টানৰ স্থান"
 
-#: ../clutter/clutter-drag-action.c:791
+#: ../clutter/clutter-drag-action.c:815
 msgid "Constrains the dragging to a rectangle"
 msgstr "টানক এটা আয়তলে সীমিত ৰাখে"
 
-#: ../clutter/clutter-drag-action.c:804
+#: ../clutter/clutter-drag-action.c:828
 msgid "Drag Area Set"
 msgstr "টানৰ স্থান সংহতি"
 
-#: ../clutter/clutter-drag-action.c:805
+#: ../clutter/clutter-drag-action.c:829
 msgid "Whether the drag area is set"
 msgstr "টানৰ স্থান সংহতি কৰা হৈছে নে"
 
-#: ../clutter/clutter-flow-layout.c:907
+#: ../clutter/clutter-flow-layout.c:944
 msgid "Whether each item should receive the same allocation"
 msgstr "প্ৰতিটো বস্তুয়ে একেটা আবন্টন গ্ৰহন কৰিব লাগে নে"
 
-#: ../clutter/clutter-flow-layout.c:922 ../clutter/clutter-table-layout.c:1637
+#: ../clutter/clutter-flow-layout.c:959
+#: ../clutter/deprecated/clutter-table-layout.c:1629
 msgid "Column Spacing"
 msgstr "স্তম্ভ স্থান"
 
-#: ../clutter/clutter-flow-layout.c:923
+#: ../clutter/clutter-flow-layout.c:960
 msgid "The spacing between columns"
 msgstr "স্তম্ভসমূহৰ মাজৰ স্থান"
 
-#: ../clutter/clutter-flow-layout.c:939 ../clutter/clutter-table-layout.c:1651
+#: ../clutter/clutter-flow-layout.c:976
+#: ../clutter/deprecated/clutter-table-layout.c:1645
 msgid "Row Spacing"
 msgstr "শাৰী স্থান"
 
-#: ../clutter/clutter-flow-layout.c:940
+#: ../clutter/clutter-flow-layout.c:977
 msgid "The spacing between rows"
 msgstr "শাৰীসমূহৰ মাজৰ স্থান"
 
-#: ../clutter/clutter-flow-layout.c:954
+#: ../clutter/clutter-flow-layout.c:991
 msgid "Minimum Column Width"
 msgstr "নূন্যতম স্তম্ভ প্ৰস্থ"
 
-#: ../clutter/clutter-flow-layout.c:955
+#: ../clutter/clutter-flow-layout.c:992
 msgid "Minimum width for each column"
 msgstr "প্ৰতিটো স্তম্ভৰ বাবে নূন্যতম প্ৰস্থ"
 
-#: ../clutter/clutter-flow-layout.c:970
+#: ../clutter/clutter-flow-layout.c:1007
 msgid "Maximum Column Width"
 msgstr "সৰ্বাধিক স্তম্ভ প্ৰস্থ"
 
-#: ../clutter/clutter-flow-layout.c:971
+#: ../clutter/clutter-flow-layout.c:1008
 msgid "Maximum width for each column"
 msgstr "প্ৰতিটো স্তম্ভৰ বাবে সৰ্বাধিক প্ৰস্থ"
 
-#: ../clutter/clutter-flow-layout.c:985
+#: ../clutter/clutter-flow-layout.c:1022
 msgid "Minimum Row Height"
 msgstr "নূন্যতম শাৰী উচ্চতা"
 
-#: ../clutter/clutter-flow-layout.c:986
+#: ../clutter/clutter-flow-layout.c:1023
 msgid "Minimum height for each row"
 msgstr "প্ৰতিটো শাৰীৰ বাবে নূন্যতম উচ্চতা"
 
-#: ../clutter/clutter-flow-layout.c:1001
+#: ../clutter/clutter-flow-layout.c:1038
 msgid "Maximum Row Height"
 msgstr "সৰ্বাধিক শাৰী উচ্চতা"
 
-#: ../clutter/clutter-flow-layout.c:1002
+#: ../clutter/clutter-flow-layout.c:1039
 msgid "Maximum height for each row"
 msgstr "প্ৰতিটো শাৰীৰ বাবে সৰ্বাধিক উচ্চতা"
 
-#: ../clutter/clutter-grid-layout.c:1222
+#: ../clutter/clutter-flow-layout.c:1054 ../clutter/clutter-flow-layout.c:1055
+msgid "Snap to grid"
+msgstr "গ্ৰিডলৈ স্নেপ কৰক"
+
+#: ../clutter/clutter-gesture-action.c:680
+msgid "Number touch points"
+msgstr "সংখ্যা স্পৰ্শ বিন্দুসমূহ"
+
+#: ../clutter/clutter-gesture-action.c:681
+msgid "Number of touch points"
+msgstr "সংখ্যাৰ স্পৰ্শ বিন্দুসমূহ"
+
+#: ../clutter/clutter-gesture-action.c:696
+msgid "Threshold Trigger Edge"
+msgstr "ডেউৰী ট্ৰিগাৰ প্ৰান্ত"
+
+#: ../clutter/clutter-gesture-action.c:697
+#| msgid "The timeline used by the animation"
+msgid "The trigger edge used by the action"
+msgstr "কাৰ্য্য দ্বাৰা ব্যৱহাৰ কৰা ট্ৰিগাৰ প্ৰান্ত"
+
+#: ../clutter/clutter-gesture-action.c:716
+msgid "Threshold Trigger Horizontal Distance"
+msgstr "ডেউৰী ট্ৰিগাৰ আনুভূমিক দূৰত্ব"
+
+#: ../clutter/clutter-gesture-action.c:717
+#| msgid "The timeline used by the animation"
+msgid "The horizontal trigger distance used by the action"
+msgstr "কাৰ্য্য দ্বাৰা ব্যৱহৃত আনুভূমিক ট্ৰিগাৰ দূৰত্ব"
+
+#: ../clutter/clutter-gesture-action.c:735
+msgid "Threshold Trigger Vertical Distance"
+msgstr "ডেউৰী ট্ৰিগাৰ উলম্ভ দূৰত্ব"
+
+#: ../clutter/clutter-gesture-action.c:736
+#| msgid "The timeline used by the animation"
+msgid "The vertical trigger distance used by the action"
+msgstr "কাৰ্য্য দ্বাৰা ব্যৱহৃত উলম্ব ট্ৰিগাৰ দূৰত্ব"
+
+#: ../clutter/clutter-grid-layout.c:1223
 msgid "Left attachment"
 msgstr "বাঁওফালৰ এটাচমেন্ট"
 
-#: ../clutter/clutter-grid-layout.c:1223
+#: ../clutter/clutter-grid-layout.c:1224
 msgid "The column number to attach the left side of the child to"
 msgstr "সন্তানৰ বাঁওফাল সংলগ্ন কৰিবলে স্তম্ভ সংখ্যা"
 
-#: ../clutter/clutter-grid-layout.c:1230
+#: ../clutter/clutter-grid-layout.c:1231
 msgid "Top attachment"
 msgstr "ওপৰৰ এটাচমেন্ট"
 
-#: ../clutter/clutter-grid-layout.c:1231
+#: ../clutter/clutter-grid-layout.c:1232
 msgid "The row number to attach the top side of a child widget to"
 msgstr "এটা সন্তান উইজেটৰ ওপৰফাল সংলগ্ন কৰিবলে শাৰী সংখ্যা"
 
-#: ../clutter/clutter-grid-layout.c:1239
+#: ../clutter/clutter-grid-layout.c:1240
 msgid "The number of columns that a child spans"
 msgstr "এটা সন্তান বিস্তাৰ কৰা স্তম্ভসমূহৰ সংখ্যা"
 
-#: ../clutter/clutter-grid-layout.c:1246
+#: ../clutter/clutter-grid-layout.c:1247
 msgid "The number of rows that a child spans"
 msgstr "এটা সন্তানে বিস্তাৰ কৰা শাৰীসমূহৰ সংখ্যা"
 
-#: ../clutter/clutter-grid-layout.c:1562
+#: ../clutter/clutter-grid-layout.c:1564
 msgid "Row spacing"
 msgstr "শাৰী স্থান"
 
-#: ../clutter/clutter-grid-layout.c:1563
+#: ../clutter/clutter-grid-layout.c:1565
 msgid "The amount of space between two consecutive rows"
 msgstr "দুটা সংখ্যানুক্ৰমিক শাৰীৰ মাজৰ স্থান"
 
-#: ../clutter/clutter-grid-layout.c:1576
+#: ../clutter/clutter-grid-layout.c:1578
 msgid "Column spacing"
 msgstr "স্তম্ভ স্থান"
 
-#: ../clutter/clutter-grid-layout.c:1577
+#: ../clutter/clutter-grid-layout.c:1579
 msgid "The amount of space between two consecutive columns"
 msgstr "দুটা সংখ্যানুক্ৰমিক স্তম্ভৰ মাজৰ স্থান"
 
-#: ../clutter/clutter-grid-layout.c:1591
+#: ../clutter/clutter-grid-layout.c:1593
 msgid "Row Homogeneous"
 msgstr "সমমাত্ৰিক শাৰী"
 
-#: ../clutter/clutter-grid-layout.c:1592
+#: ../clutter/clutter-grid-layout.c:1594
 msgid "If TRUE, the rows are all the same height"
 msgstr "যদি TRUE, শাৰীসমূহ সকলো একেটা উচ্চতাৰ হব"
 
-#: ../clutter/clutter-grid-layout.c:1605
+#: ../clutter/clutter-grid-layout.c:1607
 msgid "Column Homogeneous"
 msgstr "সমমাত্ৰিক স্তম্ভসমূহ"
 
-#: ../clutter/clutter-grid-layout.c:1606
+#: ../clutter/clutter-grid-layout.c:1608
 msgid "If TRUE, the columns are all the same width"
 msgstr "যদি TRUE, স্তম্ভসমূহ একেটা প্ৰস্থৰ হব"
 
-#: ../clutter/clutter-image.c:248 ../clutter/clutter-image.c:311
-#: ../clutter/clutter-image.c:399
+#: ../clutter/clutter-image.c:268 ../clutter/clutter-image.c:331
+#: ../clutter/clutter-image.c:419
 msgid "Unable to load image data"
 msgstr "ছবি তথ্য ল'ড কৰিবলে অক্ষম"
 
-#: ../clutter/clutter-input-device.c:242
+#: ../clutter/clutter-input-device.c:231
 msgid "Id"
 msgstr "আই-ডি"
 
-#: ../clutter/clutter-input-device.c:243
+#: ../clutter/clutter-input-device.c:232
 msgid "Unique identifier of the device"
 msgstr "ডিভাইচৰ বাবে অবিকল্প পৰিচয়ক"
 
-#: ../clutter/clutter-input-device.c:259
+#: ../clutter/clutter-input-device.c:248
 msgid "The name of the device"
 msgstr "ডিভাইচৰ নাম"
 
-#: ../clutter/clutter-input-device.c:273
+#: ../clutter/clutter-input-device.c:262
 msgid "Device Type"
 msgstr "ডিভাইচৰ ধৰণ"
 
-#: ../clutter/clutter-input-device.c:274
+#: ../clutter/clutter-input-device.c:263
 msgid "The type of the device"
 msgstr "ডিভাইচৰ ধৰণ"
 
-#: ../clutter/clutter-input-device.c:289
+#: ../clutter/clutter-input-device.c:278
 msgid "Device Manager"
 msgstr "ডিভাইচ ব্যৱস্থাপক"
 
-#: ../clutter/clutter-input-device.c:290
+#: ../clutter/clutter-input-device.c:279
 msgid "The device manager instance"
 msgstr "ডিভাইচ ব্যৱস্থাপক উদাহৰণ"
 
-#: ../clutter/clutter-input-device.c:303
+#: ../clutter/clutter-input-device.c:292
 msgid "Device Mode"
 msgstr "ডিভাইচ অৱস্থা"
 
-#: ../clutter/clutter-input-device.c:304
+#: ../clutter/clutter-input-device.c:293
 msgid "The mode of the device"
 msgstr "ডিভাইচৰ অৱস্থা"
 
-#: ../clutter/clutter-input-device.c:318
+#: ../clutter/clutter-input-device.c:307
 msgid "Has Cursor"
 msgstr "কাৰ্চাৰ আছে"
 
-#: ../clutter/clutter-input-device.c:319
+#: ../clutter/clutter-input-device.c:308
 msgid "Whether the device has a cursor"
 msgstr "ডিভাইচৰ এটা কাৰ্চাৰ আছে নে"
 
-#: ../clutter/clutter-input-device.c:338
+#: ../clutter/clutter-input-device.c:327
 msgid "Whether the device is enabled"
 msgstr "ডিভাইচ সামৰ্থবান হয় নে"
 
-#: ../clutter/clutter-input-device.c:351
+#: ../clutter/clutter-input-device.c:340
 msgid "Number of Axes"
 msgstr "অক্ষসমূহৰ সংখ্যা"
 
-#: ../clutter/clutter-input-device.c:352
+#: ../clutter/clutter-input-device.c:341
 msgid "The number of axes on the device"
 msgstr "ডিভাইচত অক্ষসমূহৰ সংখ্যা"
 
-#: ../clutter/clutter-input-device.c:367
+#: ../clutter/clutter-input-device.c:356
 msgid "The backend instance"
 msgstr "বেকএন্ডৰ উদাহৰণ"
 
-#: ../clutter/clutter-interval.c:506
+#: ../clutter/clutter-interval.c:557
 msgid "Value Type"
 msgstr "মানৰ ধৰণ"
 
-#: ../clutter/clutter-interval.c:507
+#: ../clutter/clutter-interval.c:558
 msgid "The type of the values in the interval"
 msgstr "অন্তৰালত মানসমূহৰ ধৰণ"
 
-#: ../clutter/clutter-interval.c:522
+#: ../clutter/clutter-interval.c:573
 msgid "Initial Value"
 msgstr "আৰম্ভণিৰ মান"
 
-#: ../clutter/clutter-interval.c:523
+#: ../clutter/clutter-interval.c:574
 msgid "Initial value of the interval"
 msgstr "অন্তৰালৰ আৰম্ভণি মান"
 
-#: ../clutter/clutter-interval.c:537
+#: ../clutter/clutter-interval.c:588
 msgid "Final Value"
 msgstr "অন্তিম মান"
 
-#: ../clutter/clutter-interval.c:538
+#: ../clutter/clutter-interval.c:589
 msgid "Final value of the interval"
 msgstr "অন্তৰালৰ অন্তিম মান"
 
@@ -1272,102 +1351,96 @@ msgstr "এই তথ্য যিজন ব্যৱস্থাপকে স
 #. * Do NOT translate it to non-English e.g. "predefinito:LTR"! If
 #. * it isn't default:LTR or default:RTL it will not work.
 #.
-#: ../clutter/clutter-main.c:762
+#: ../clutter/clutter-main.c:751
 msgid "default:LTR"
 msgstr "default:LTR"
 
-#: ../clutter/clutter-main.c:1633
+#: ../clutter/clutter-main.c:1577
 msgid "Show frames per second"
 msgstr "ফ্ৰেইম প্ৰতি ছেকেণ্ডসমূহত দেখাওক"
 
-#: ../clutter/clutter-main.c:1635
+#: ../clutter/clutter-main.c:1579
 msgid "Default frame rate"
 msgstr "অবিকল্পিত ফ্ৰেইম হাৰ"
 
-#: ../clutter/clutter-main.c:1637
+#: ../clutter/clutter-main.c:1581
 msgid "Make all warnings fatal"
 msgstr "সকলো সতৰ্কবাৰ্তা মাৰাত্মক কৰক"
 
-#: ../clutter/clutter-main.c:1640
+#: ../clutter/clutter-main.c:1584
 msgid "Direction for the text"
-msgstr "লিখনীৰ দিশ"
+msgstr "লিখনিৰ দিশ"
 
-#: ../clutter/clutter-main.c:1643
+#: ../clutter/clutter-main.c:1587
 msgid "Disable mipmapping on text"
-msgstr "লিখনীত মিপমেপিং অসামৰ্থবান কৰক"
+msgstr "লিখনিত মিপমেপিং অসামৰ্থবান কৰক"
 
-#: ../clutter/clutter-main.c:1646
+#: ../clutter/clutter-main.c:1590
 msgid "Use 'fuzzy' picking"
 msgstr "'fuzzy' বুটলা ব্যৱহাৰ কৰক"
 
-#: ../clutter/clutter-main.c:1649
+#: ../clutter/clutter-main.c:1593
 msgid "Clutter debugging flags to set"
 msgstr "সংহতি কৰিবলে Clutter ডিবাগিং ফ্লেগসমূহ"
 
-#: ../clutter/clutter-main.c:1651
+#: ../clutter/clutter-main.c:1595
 msgid "Clutter debugging flags to unset"
 msgstr "অসংহতি কৰিবলে Clutter ডিবাগিং ফ্লেগসমূহ"
 
-#: ../clutter/clutter-main.c:1655
+#: ../clutter/clutter-main.c:1599
 msgid "Clutter profiling flags to set"
 msgstr "সংহতি কৰিবলে Clutter আলেখ্যণ ফ্লেগসমূহ"
 
-#: ../clutter/clutter-main.c:1657
+#: ../clutter/clutter-main.c:1601
 msgid "Clutter profiling flags to unset"
 msgstr "অসংহতি কৰিবলে Clutter আলেখ্য ফ্লেগসমূহ"
 
-#: ../clutter/clutter-main.c:1660
+#: ../clutter/clutter-main.c:1604
 msgid "Enable accessibility"
 msgstr "অভিগম সামৰ্থবান কৰক"
 
-#: ../clutter/clutter-main.c:1852
+#: ../clutter/clutter-main.c:1796
 msgid "Clutter Options"
 msgstr "Clutter বিকল্পসমূহ"
 
-#: ../clutter/clutter-main.c:1853
+#: ../clutter/clutter-main.c:1797
 msgid "Show Clutter Options"
 msgstr "Clutter বিকল্পসমূহ দেখুৱাওক"
 
-#: ../clutter/clutter-pan-action.c:440
-#| msgid "Drag Axis"
+#: ../clutter/clutter-pan-action.c:455
 msgid "Pan Axis"
 msgstr "পেন অক্ষ"
 
-#: ../clutter/clutter-pan-action.c:441
-#| msgid "Constraints the dragging to an axis"
+#: ../clutter/clutter-pan-action.c:456
 msgid "Constraints the panning to an axis"
 msgstr "পেনিংক এটা অক্ষত সীমিত ৰাখে"
 
-#: ../clutter/clutter-pan-action.c:455
-#| msgid "Interval"
+#: ../clutter/clutter-pan-action.c:470
 msgid "Interpolate"
 msgstr "সন্নিবিষ্ট কৰক"
 
-#: ../clutter/clutter-pan-action.c:456
-#| msgid "Whether the device is enabled"
+#: ../clutter/clutter-pan-action.c:471
 msgid "Whether interpolated events emission is enabled."
 msgstr "সন্নিবিষ্ট কৰা ঘটনাসমূহ সামৰ্থবান কৰা আছে নে।"
 
-#: ../clutter/clutter-pan-action.c:472
-#| msgid "Duration"
+#: ../clutter/clutter-pan-action.c:487
 msgid "Deceleration"
 msgstr "মন্থৰণ"
 
-#: ../clutter/clutter-pan-action.c:473
+#: ../clutter/clutter-pan-action.c:488
 msgid "Rate at which the interpolated panning will decelerate in"
 msgstr "যি হাৰত সন্নিবিষ্ট কৰা পেনিংৰ মন্থৰণ হব"
 
-#: ../clutter/clutter-pan-action.c:490
-#| msgid "The desaturation factor"
+#: ../clutter/clutter-pan-action.c:505
 msgid "Initial acceleration factor"
 msgstr "আৰম্ভণি ত্বৰণ কাৰক"
 
-#: ../clutter/clutter-pan-action.c:491
+#: ../clutter/clutter-pan-action.c:506
 msgid "Factor applied to the momentum when starting the interpolated phase"
 msgstr "সন্নিবিষ্ট কৰা স্তৰ আৰম্ভ কৰোতে ভৰবেগলে প্ৰয়োগ কৰা কাৰক"
 
 #: ../clutter/clutter-path-constraint.c:212
-#: ../clutter/deprecated/clutter-behaviour-path.c:225
+#: ../clutter/deprecated/clutter-behaviour-path.c:221
 msgid "Path"
 msgstr "পথ"
 
@@ -1379,150 +1452,163 @@ msgstr "এজন অভিনেতাক বাধা দিবলে ব্
 msgid "The offset along the path, between -1.0 and 2.0"
 msgstr "পথত অফছেট, -1.0 আৰু 2.0 -ৰ মাজত"
 
-#: ../clutter/clutter-property-transition.c:271
+#: ../clutter/clutter-property-transition.c:269
 msgid "Property Name"
 msgstr "বৈশিষ্ট নাম"
 
-#: ../clutter/clutter-property-transition.c:272
+#: ../clutter/clutter-property-transition.c:270
 msgid "The name of the property to animate"
 msgstr "জীৱন্ত কৰিব লগিয়া বৈশিষ্টৰ নাম"
 
-#: ../clutter/clutter-script.c:466
+#: ../clutter/clutter-script.c:464
 msgid "Filename Set"
 msgstr "ফাইলনাম সংহতি"
 
-#: ../clutter/clutter-script.c:467
+#: ../clutter/clutter-script.c:465
 msgid "Whether the :filename property is set"
 msgstr ":filename বৈশিষ্ট সংহতি কৰা হৈছে নে"
 
-#: ../clutter/clutter-script.c:481
-#: ../clutter/deprecated/clutter-texture.c:1082
+#: ../clutter/clutter-script.c:479
+#: ../clutter/deprecated/clutter-texture.c:1080
 msgid "Filename"
 msgstr "ফাইলনাম"
 
-#: ../clutter/clutter-script.c:482
+#: ../clutter/clutter-script.c:480
 msgid "The path of the currently parsed file"
 msgstr "বৰ্তমানে বিশ্লেষণ কৰা ফাইলৰ পথ"
 
-#: ../clutter/clutter-script.c:499
+#: ../clutter/clutter-script.c:497
 msgid "Translation Domain"
 msgstr "অনুবাদ ডমেইন"
 
-#: ../clutter/clutter-script.c:500
+#: ../clutter/clutter-script.c:498
 msgid "The translation domain used to localize string"
 msgstr "স্ট্ৰিং স্থানীয়কৰণ কৰিবলে ব্যৱহৃত অনুবাদ ডমেইন"
 
-#: ../clutter/clutter-scroll-actor.c:263
+#: ../clutter/clutter-scroll-actor.c:184
 msgid "Scroll Mode"
 msgstr "স্ক্ৰল অৱস্থা"
 
-#: ../clutter/clutter-scroll-actor.c:264
+#: ../clutter/clutter-scroll-actor.c:185
 msgid "The scrolling direction"
 msgstr "স্ক্ৰলিংৰ দিশ"
 
-#: ../clutter/clutter-settings.c:440
+#: ../clutter/clutter-settings.c:486
 msgid "Double Click Time"
 msgstr "দ্বিগুণ ক্লিক সময়"
 
-#: ../clutter/clutter-settings.c:441
+#: ../clutter/clutter-settings.c:487
 msgid "The time between clicks necessary to detect a multiple click"
 msgstr "এটা বহু ক্লিক চিনাক্ত কৰিবলে প্ৰয়োজনীয় ক্লিকসমূহৰ মাজৰ সময়"
 
-#: ../clutter/clutter-settings.c:456
+#: ../clutter/clutter-settings.c:502
 msgid "Double Click Distance"
 msgstr "দ্বিগুণ ক্লিক দুৰত্ব"
 
-#: ../clutter/clutter-settings.c:457
+#: ../clutter/clutter-settings.c:503
 msgid "The distance between clicks necessary to detect a multiple click"
 msgstr "এটা বহু ক্লিক চিনাক্ত কৰিবলে প্ৰয়োজনীয় ক্লিকসমূহৰ মাজৰ দুৰত্ব"
 
-#: ../clutter/clutter-settings.c:472
+#: ../clutter/clutter-settings.c:518
 msgid "Drag Threshold"
 msgstr "টান্ ডেউৰী"
 
-#: ../clutter/clutter-settings.c:473
+#: ../clutter/clutter-settings.c:519
 msgid "The distance the cursor should travel before starting to drag"
 msgstr "টনা আৰম্ভ কৰাৰ আগত কাৰ্চাৰে ভ্ৰমণ কৰিব লগিয়া দুৰত্ব"
 
-#: ../clutter/clutter-settings.c:488 ../clutter/clutter-text.c:3368
+#: ../clutter/clutter-settings.c:534 ../clutter/clutter-text.c:3437
 msgid "Font Name"
 msgstr "ফন্টৰ নাম"
 
-#: ../clutter/clutter-settings.c:489
-msgid "The description of the default font, as one that could be parsed by Pango"
+#: ../clutter/clutter-settings.c:535
+msgid ""
+"The description of the default font, as one that could be parsed by Pango"
 msgstr "অবিকল্পিত ফন্টৰ বিৱৰণ, এনে এটা যি Pango দ্বাৰা বিশ্লেষণ কৰিব পাৰি"
 
-#: ../clutter/clutter-settings.c:504
+#: ../clutter/clutter-settings.c:550
 msgid "Font Antialias"
 msgstr "ফন্ট এন্টিএলিয়াচসমূহ"
 
-#: ../clutter/clutter-settings.c:505
+#: ../clutter/clutter-settings.c:551
 msgid ""
 "Whether to use antialiasing (1 to enable, 0 to disable, and -1 to use the "
 "default)"
 msgstr ""
-"এন্টিএলিয়াচিং ব্যৱহাৰ কৰা হব নে (1 সামৰ্থবান কৰিবলে, 0 অসামৰ্থবান কৰিবলে, আৰু -1 "
+"এন্টিএলিয়াচিং ব্যৱহাৰ কৰা হব নে (1 সামৰ্থবান কৰিবলে, 0 অসামৰ্থবান কৰিবলে, আৰু "
+"-1 "
 "অবিকল্পিতক ব্যৱহাৰ কৰিবলে)"
 
-#: ../clutter/clutter-settings.c:521
+#: ../clutter/clutter-settings.c:567 ../clutter/clutter-settings.c:575
 msgid "Font DPI"
 msgstr "ফন্ট DPI"
 
-#: ../clutter/clutter-settings.c:522
-msgid "The resolution of the font, in 1024 * dots/inch, or -1 to use the default"
+#: ../clutter/clutter-settings.c:568 ../clutter/clutter-settings.c:576
+msgid ""
+"The resolution of the font, in 1024 * dots/inch, or -1 to use the default"
 msgstr "ফন্টৰ বিভেদন, 1024 * dots/inch -ত, অথবা অবিকল্পিত ব্যৱহাৰ কৰিবলে -1"
 
-#: ../clutter/clutter-settings.c:538
+#: ../clutter/clutter-settings.c:592
 msgid "Font Hinting"
 msgstr "ফন্ট ইংগিত"
 
-#: ../clutter/clutter-settings.c:539
-msgid "Whether to use hinting (1 to enable, 0 to disable and -1 to use the default)"
+#: ../clutter/clutter-settings.c:593
+msgid ""
+"Whether to use hinting (1 to enable, 0 to disable and -1 to use the default)"
 msgstr ""
 "ইংগিত ব্যৱহাৰ কৰা হব নে (1 সামৰ্থবান কৰিবলে, 0 অসামৰ্থবান কৰিবলে আৰু -1 "
 "অবিকল্পিতক ব্যৱহাৰ কৰিবলে)"
 
-#: ../clutter/clutter-settings.c:560
+#: ../clutter/clutter-settings.c:613
 msgid "Font Hint Style"
 msgstr "ফন্ট ইংগিত শৈলী"
 
-#: ../clutter/clutter-settings.c:561
+#: ../clutter/clutter-settings.c:614
 msgid "The style of hinting (hintnone, hintslight, hintmedium, hintfull)"
 msgstr "ইংগিতৰ শৈলী (ইংগিতনাই, ইংগিতপাতল, ইংগিতমধ্যম, ইংগিতসম্পূৰ্ণ)"
 
-#: ../clutter/clutter-settings.c:582
+#: ../clutter/clutter-settings.c:634
 msgid "Font Subpixel Order"
 msgstr "ফন্ট উপপিক্সেল ক্ৰম"
 
-#: ../clutter/clutter-settings.c:583
+#: ../clutter/clutter-settings.c:635
 msgid "The type of subpixel antialiasing (none, rgb, bgr, vrgb, vbgr)"
 msgstr "উপপিক্সেল এন্টিএলিয়াচিংৰ ধৰণ (কোনো নহয়, rgb, bgr, vrgb, vbgr)"
 
-#: ../clutter/clutter-settings.c:600
+#: ../clutter/clutter-settings.c:652
 msgid "The minimum duration for a long press gesture to be recognized"
 msgstr "এটা দীঘল দবোৱা ভংগি চিনাক্ত কৰিবলে নূন্যতম অবধি"
 
-#: ../clutter/clutter-settings.c:607
+#: ../clutter/clutter-settings.c:659
+msgid "Window Scaling Factor"
+msgstr "উইন্ডো স্কেইলিং কাৰক"
+
+#: ../clutter/clutter-settings.c:660
+#| msgid "Add an effect to be applied on the actor"
+msgid "The scaling factor to be applied to windows"
+msgstr "উইন্ডোসমূহলৈ প্ৰয়োগ কৰিবলে স্কেইলিং কাৰক"
+
+#: ../clutter/clutter-settings.c:667
 msgid "Fontconfig configuration timestamp"
 msgstr "ফন্টসংৰূপ সংৰূপ সময়মোহৰ"
 
-#: ../clutter/clutter-settings.c:608
+#: ../clutter/clutter-settings.c:668
 msgid "Timestamp of the current fontconfig configuration"
 msgstr "বৰ্তমান ফন্টসংৰূপ সংৰূপৰ সময়মোহৰ"
 
-#: ../clutter/clutter-settings.c:625
+#: ../clutter/clutter-settings.c:685
 msgid "Password Hint Time"
-msgstr "পাছৱাৰ্ড ইংগিত সময়"
+msgstr "পাছৱৰ্ড ইংগিত সময়"
 
-#: ../clutter/clutter-settings.c:626
+#: ../clutter/clutter-settings.c:686
 msgid "How long to show the last input character in hidden entries"
 msgstr "লুকুৱা প্ৰবিষ্টিসমূহত সৰ্বশেষ ইনপুট আখৰ কিমান দেৰি দেখুৱা হব"
 
-#: ../clutter/clutter-shader-effect.c:486
+#: ../clutter/clutter-shader-effect.c:487
 msgid "Shader Type"
 msgstr "শেডাৰৰ ধৰণ"
 
-#: ../clutter/clutter-shader-effect.c:487
+#: ../clutter/clutter-shader-effect.c:488
 msgid "The type of shader used"
 msgstr "ব্যৱহাৰ কৰা শেডাৰৰ ধৰণ"
 
@@ -1550,758 +1636,702 @@ msgstr "স্নেপ কৰিব লগিয়া উৎসৰ প্ৰা
 msgid "The offset in pixels to apply to the constraint"
 msgstr "বাধালে প্ৰয়োগ কৰিবলে পিক্সেলসমূহত অফছেট"
 
-#: ../clutter/clutter-stage.c:1899
+#: ../clutter/clutter-stage.c:1917
 msgid "Fullscreen Set"
 msgstr "সম্পূৰ্ণপৰ্দা সংহতি"
 
-#: ../clutter/clutter-stage.c:1900
+#: ../clutter/clutter-stage.c:1918
 msgid "Whether the main stage is fullscreen"
 msgstr "মূখ্য মঞ্চ সম্পূৰ্ণপৰ্দা হয় নে"
 
-#: ../clutter/clutter-stage.c:1914
+#: ../clutter/clutter-stage.c:1932
 msgid "Offscreen"
 msgstr "অফস্ক্ৰিন"
 
-#: ../clutter/clutter-stage.c:1915
+#: ../clutter/clutter-stage.c:1933
 msgid "Whether the main stage should be rendered offscreen"
 msgstr "মূখ্য মঞ্চক অফস্ক্ৰিন ৰেন্ডাৰ কৰা হব নে"
 
-#: ../clutter/clutter-stage.c:1927 ../clutter/clutter-text.c:3482
+#: ../clutter/clutter-stage.c:1945 ../clutter/clutter-text.c:3551
 msgid "Cursor Visible"
 msgstr "কাৰ্চাৰ দৃশ্যমান"
 
-#: ../clutter/clutter-stage.c:1928
+#: ../clutter/clutter-stage.c:1946
 msgid "Whether the mouse pointer is visible on the main stage"
 msgstr "মূখ্য মঞ্চত মাউছ পোইন্টাৰ দৃশ্যমান হয় নে"
 
-#: ../clutter/clutter-stage.c:1942
+#: ../clutter/clutter-stage.c:1960
 msgid "User Resizable"
 msgstr "ব্যৱহাৰকাৰী দ্বাৰা পুনৰআকাৰ কৰিব পৰা"
 
-#: ../clutter/clutter-stage.c:1943
+#: ../clutter/clutter-stage.c:1961
 msgid "Whether the stage is able to be resized via user interaction"
 msgstr "মঞ্চক ব্যৱহাৰকাৰী ভাৱ-বিনিময়ৰে পুনৰ আকাৰ দিয়া সম্ভব হয় নে"
 
-#: ../clutter/clutter-stage.c:1958 ../clutter/deprecated/clutter-box.c:260
-#: ../clutter/deprecated/clutter-rectangle.c:273
+#: ../clutter/clutter-stage.c:1976 ../clutter/deprecated/clutter-box.c:254
+#: ../clutter/deprecated/clutter-rectangle.c:270
 msgid "Color"
 msgstr "ৰঙ"
 
-#: ../clutter/clutter-stage.c:1959
+#: ../clutter/clutter-stage.c:1977
 msgid "The color of the stage"
 msgstr "মঞ্চৰ ৰঙ"
 
-#: ../clutter/clutter-stage.c:1974
+#: ../clutter/clutter-stage.c:1992
 msgid "Perspective"
 msgstr "পৰিপ্ৰেক্ষিত"
 
-#: ../clutter/clutter-stage.c:1975
+#: ../clutter/clutter-stage.c:1993
 msgid "Perspective projection parameters"
 msgstr "পৰিপ্ৰেক্ষিত প্ৰক্ষেপন প্ৰাচলসমূহ"
 
-#: ../clutter/clutter-stage.c:1990
+#: ../clutter/clutter-stage.c:2008
 msgid "Title"
 msgstr "শীৰ্ষক"
 
-#: ../clutter/clutter-stage.c:1991
+#: ../clutter/clutter-stage.c:2009
 msgid "Stage Title"
 msgstr "মঞ্চ শীৰ্ষক"
 
-#: ../clutter/clutter-stage.c:2008
+#: ../clutter/clutter-stage.c:2026
 msgid "Use Fog"
 msgstr "ফগ ব্যৱহাৰ কৰক"
 
-#: ../clutter/clutter-stage.c:2009
+#: ../clutter/clutter-stage.c:2027
 msgid "Whether to enable depth cueing"
 msgstr "গভীৰতা এনকিউং সামৰ্থবান কৰা হব নে"
 
-#: ../clutter/clutter-stage.c:2025
+#: ../clutter/clutter-stage.c:2043
 msgid "Fog"
 msgstr "ফগ"
 
-#: ../clutter/clutter-stage.c:2026
+#: ../clutter/clutter-stage.c:2044
 msgid "Settings for the depth cueing"
 msgstr "গভীৰতা এনকিউংৰ বাবে সংহতিসমূহ"
 
-#: ../clutter/clutter-stage.c:2042
+#: ../clutter/clutter-stage.c:2060
 msgid "Use Alpha"
 msgstr "আলফা ব্যৱহাৰ কৰক"
 
-#: ../clutter/clutter-stage.c:2043
+#: ../clutter/clutter-stage.c:2061
 msgid "Whether to honour the alpha component of the stage color"
 msgstr "মঞ্চ ৰঙৰ আলফা উপাদানক শ্ৰদ্ধা কৰা হব নে"
 
-#: ../clutter/clutter-stage.c:2059
+#: ../clutter/clutter-stage.c:2077
 msgid "Key Focus"
 msgstr "চাবি মনোনিবেষ"
 
-#: ../clutter/clutter-stage.c:2060
+#: ../clutter/clutter-stage.c:2078
 msgid "The currently key focused actor"
 msgstr "বৰ্তমান চাবি মনোনিবেষিত অভিনেতা"
 
-#: ../clutter/clutter-stage.c:2076
+#: ../clutter/clutter-stage.c:2094
 msgid "No Clear Hint"
 msgstr "কোনো পৰিষ্কাৰ ইংগিত নাই"
 
-#: ../clutter/clutter-stage.c:2077
+#: ../clutter/clutter-stage.c:2095
 msgid "Whether the stage should clear its contents"
 msgstr "মঞ্চয় তাৰ সমলসমূহ পৰিষ্কাৰ কৰিব লাগে নে"
 
-#: ../clutter/clutter-stage.c:2090
+#: ../clutter/clutter-stage.c:2108
 msgid "Accept Focus"
 msgstr "মনোনিবেষ গ্ৰহণ কৰক"
 
-#: ../clutter/clutter-stage.c:2091
+#: ../clutter/clutter-stage.c:2109
 msgid "Whether the stage should accept focus on show"
 msgstr "মঞ্চয় প্ৰদৰ্শনত মনোনিবেষ গ্ৰহণ কৰিব লাগে নে"
 
-#: ../clutter/clutter-table-layout.c:543
-msgid "Column Number"
-msgstr "স্তম্ভ নম্বৰ"
-
-#: ../clutter/clutter-table-layout.c:544
-msgid "The column the widget resides in"
-msgstr "উইজেট অৱস্থিত স্তম্ভ"
-
-#: ../clutter/clutter-table-layout.c:551
-msgid "Row Number"
-msgstr "শাৰী নম্বৰ"
-
-#: ../clutter/clutter-table-layout.c:552
-msgid "The row the widget resides in"
-msgstr "উইজেট অৱস্থিত শাৰী"
-
-#: ../clutter/clutter-table-layout.c:559
-msgid "Column Span"
-msgstr "স্তম্ভ বিস্তাৰ"
-
-#: ../clutter/clutter-table-layout.c:560
-msgid "The number of columns the widget should span"
-msgstr "উইজেট বিস্তাৰ কৰিবলে স্তম্ভসমূহৰ সংখ্যা"
-
-#: ../clutter/clutter-table-layout.c:567
-msgid "Row Span"
-msgstr "শাৰী বিস্তাৰ"
-
-#: ../clutter/clutter-table-layout.c:568
-msgid "The number of rows the widget should span"
-msgstr "উইজেটে বিস্তাৰ কৰিবলে শাৰীসমূহৰ সংখ্যা"
-
-#: ../clutter/clutter-table-layout.c:575
-msgid "Horizontal Expand"
-msgstr "আনুভূমিক প্ৰসাৰন"
-
-#: ../clutter/clutter-table-layout.c:576
-msgid "Allocate extra space for the child in horizontal axis"
-msgstr "আনুভূমিক অক্ষত ছাইল্ডৰ বাবে অতিৰিক্ত স্থান আবন্টন কৰক"
-
-#: ../clutter/clutter-table-layout.c:582
-msgid "Vertical Expand"
-msgstr "উলম্ব প্ৰসাৰন"
-
-#: ../clutter/clutter-table-layout.c:583
-msgid "Allocate extra space for the child in vertical axis"
-msgstr "উলম্ব অক্ষত ছাইল্ডৰ বাবে অতিৰিক্ত স্থান আবন্টন কৰক"
-
-#: ../clutter/clutter-table-layout.c:1638
-msgid "Spacing between columns"
-msgstr "স্তম্ভসমূহৰ মাজৰ স্থান"
-
-#: ../clutter/clutter-table-layout.c:1652
-msgid "Spacing between rows"
-msgstr "শাৰীসমূহৰ মাজৰ স্থান"
-
-#: ../clutter/clutter-text-buffer.c:351 ../clutter/clutter-text.c:3403
+#: ../clutter/clutter-text-buffer.c:347 ../clutter/clutter-text.c:3472
 msgid "Text"
-msgstr "লিখনী"
+msgstr "লিখনি"
 
-#: ../clutter/clutter-text-buffer.c:352
+#: ../clutter/clutter-text-buffer.c:348
 msgid "The contents of the buffer"
 msgstr "বাফাৰৰ সমল"
 
-#: ../clutter/clutter-text-buffer.c:365
+#: ../clutter/clutter-text-buffer.c:361
 msgid "Text length"
-msgstr "লিখনী দৈৰ্ঘ্য"
+msgstr "লিখনি দৈৰ্ঘ্য"
 
-#: ../clutter/clutter-text-buffer.c:366
+#: ../clutter/clutter-text-buffer.c:362
 msgid "Length of the text currently in the buffer"
-msgstr "বাফাৰত বৰ্তমানে থকা লিখনীৰ দৈৰ্ঘ্য"
+msgstr "বাফাৰত বৰ্তমানে থকা লিখনিৰ দৈৰ্ঘ্য"
 
-#: ../clutter/clutter-text-buffer.c:379
+#: ../clutter/clutter-text-buffer.c:375
 msgid "Maximum length"
 msgstr "সৰ্বাধিক দৈৰ্ঘ্য"
 
-#: ../clutter/clutter-text-buffer.c:380
+#: ../clutter/clutter-text-buffer.c:376
 msgid "Maximum number of characters for this entry. Zero if no maximum"
 msgstr "এই প্ৰবিষ্টিৰ বাবে আখৰসমূহৰ সমৰ্বাধিক সংখ্যা। শূন্য যদি সৰ্বাধিক নহয়"
 
-#: ../clutter/clutter-text.c:3350
+#: ../clutter/clutter-text.c:3419
 msgid "Buffer"
 msgstr "বাফাৰ"
 
-#: ../clutter/clutter-text.c:3351
+#: ../clutter/clutter-text.c:3420
 msgid "The buffer for the text"
-msgstr "লিখনীৰ বাবে বাফাৰ"
+msgstr "লিখনিৰ বাবে বাফাৰ"
 
-#: ../clutter/clutter-text.c:3369
+#: ../clutter/clutter-text.c:3438
 msgid "The font to be used by the text"
-msgstr "লিখনী দ্বাৰা ব্যৱহৃত ফন্ট"
+msgstr "লিখনি দ্বাৰা ব্যৱহৃত ফন্ট"
 
-#: ../clutter/clutter-text.c:3386
+#: ../clutter/clutter-text.c:3455
 msgid "Font Description"
 msgstr "ফন্ট বিৱৰণ"
 
-#: ../clutter/clutter-text.c:3387
+#: ../clutter/clutter-text.c:3456
 msgid "The font description to be used"
 msgstr "ব্যৱহাৰ কৰিব লগিয়া ফন্ট বিৱৰণ"
 
-#: ../clutter/clutter-text.c:3404
+#: ../clutter/clutter-text.c:3473
 msgid "The text to render"
-msgstr "ৰেন্ডাৰ কৰিবলে লিখনী"
+msgstr "ৰেন্ডাৰ কৰিবলে লিখনি"
 
-#: ../clutter/clutter-text.c:3418
+#: ../clutter/clutter-text.c:3487
 msgid "Font Color"
 msgstr "ফন্টৰ ৰঙ"
 
-#: ../clutter/clutter-text.c:3419
+#: ../clutter/clutter-text.c:3488
 msgid "Color of the font used by the text"
-msgstr "লিখনী দ্বাৰা ব্যৱহৃত ফন্টৰ ৰঙ"
+msgstr "লিখনি দ্বাৰা ব্যৱহৃত ফন্টৰ ৰঙ"
 
-#: ../clutter/clutter-text.c:3434
+#: ../clutter/clutter-text.c:3503
 msgid "Editable"
 msgstr "সম্পাদন কৰিব পাৰি"
 
-#: ../clutter/clutter-text.c:3435
+#: ../clutter/clutter-text.c:3504
 msgid "Whether the text is editable"
-msgstr "লিখনী সম্পাদন কৰিব পাৰি নে"
+msgstr "লিখনি সম্পাদন কৰিব পাৰি নে"
 
-#: ../clutter/clutter-text.c:3450
+#: ../clutter/clutter-text.c:3519
 msgid "Selectable"
 msgstr "নিৰ্বাচন কৰিব পাৰি"
 
-#: ../clutter/clutter-text.c:3451
+#: ../clutter/clutter-text.c:3520
 msgid "Whether the text is selectable"
-msgstr "লিখনী নিৰ্বাচন কৰিব পাৰি নে"
+msgstr "লিখনি নিৰ্বাচন কৰিব পাৰি নে"
 
-#: ../clutter/clutter-text.c:3465
+#: ../clutter/clutter-text.c:3534
 msgid "Activatable"
 msgstr "সক্ৰিয় কৰিব পাৰি"
 
-#: ../clutter/clutter-text.c:3466
+#: ../clutter/clutter-text.c:3535
 msgid "Whether pressing return causes the activate signal to be emitted"
 msgstr "return দবালে সক্ৰিয় সংকেত নিৰ্গত হয় নে"
 
-#: ../clutter/clutter-text.c:3483
+#: ../clutter/clutter-text.c:3552
 msgid "Whether the input cursor is visible"
 msgstr "ইনপুট কাৰ্চাৰ দৃশ্যমান হয় নে"
 
-#: ../clutter/clutter-text.c:3497 ../clutter/clutter-text.c:3498
+#: ../clutter/clutter-text.c:3566 ../clutter/clutter-text.c:3567
 msgid "Cursor Color"
 msgstr "কাৰ্চাৰৰ ৰঙ"
 
-#: ../clutter/clutter-text.c:3513
+#: ../clutter/clutter-text.c:3582
 msgid "Cursor Color Set"
 msgstr "কাৰ্চাৰৰ ৰঙৰ সংহতি"
 
-#: ../clutter/clutter-text.c:3514
+#: ../clutter/clutter-text.c:3583
 msgid "Whether the cursor color has been set"
 msgstr "কাৰ্চাৰৰ ৰঙ সংহতি কৰা হৈছে নে"
 
-#: ../clutter/clutter-text.c:3529
+#: ../clutter/clutter-text.c:3598
 msgid "Cursor Size"
 msgstr "কাৰ্চাৰৰ আকাৰ"
 
-#: ../clutter/clutter-text.c:3530
+#: ../clutter/clutter-text.c:3599
 msgid "The width of the cursor, in pixels"
 msgstr "কাৰ্চাৰৰ প্ৰস্থ, পিক্সেলসমূহত"
 
-#: ../clutter/clutter-text.c:3546 ../clutter/clutter-text.c:3564
+#: ../clutter/clutter-text.c:3615 ../clutter/clutter-text.c:3633
 msgid "Cursor Position"
 msgstr "কাৰ্চাৰৰ অৱস্থান"
 
-#: ../clutter/clutter-text.c:3547 ../clutter/clutter-text.c:3565
+#: ../clutter/clutter-text.c:3616 ../clutter/clutter-text.c:3634
 msgid "The cursor position"
 msgstr "কাৰ্চাৰৰ অৱস্থান"
 
-#: ../clutter/clutter-text.c:3580
+#: ../clutter/clutter-text.c:3649
 msgid "Selection-bound"
 msgstr "নিৰ্বাচন-বান্ধীত"
 
-#: ../clutter/clutter-text.c:3581
+#: ../clutter/clutter-text.c:3650
 msgid "The cursor position of the other end of the selection"
 msgstr "নিৰ্বাচনৰ অন্য প্ৰান্তৰ কাৰ্চাৰ অৱস্থান"
 
-#: ../clutter/clutter-text.c:3596 ../clutter/clutter-text.c:3597
+#: ../clutter/clutter-text.c:3665 ../clutter/clutter-text.c:3666
 msgid "Selection Color"
 msgstr "নিৰ্বাচনৰ ৰঙ"
 
-#: ../clutter/clutter-text.c:3612
+#: ../clutter/clutter-text.c:3681
 msgid "Selection Color Set"
 msgstr "নিৰ্বাচনৰ ৰঙ সংহতি"
 
-#: ../clutter/clutter-text.c:3613
+#: ../clutter/clutter-text.c:3682
 msgid "Whether the selection color has been set"
 msgstr "নিৰ্বাচন ৰঙ সংহতি কৰা হৈছে নে"
 
-#: ../clutter/clutter-text.c:3628
+#: ../clutter/clutter-text.c:3697
 msgid "Attributes"
 msgstr "বৈশিষ্টসমূহ"
 
-#: ../clutter/clutter-text.c:3629
+#: ../clutter/clutter-text.c:3698
 msgid "A list of style attributes to apply to the contents of the actor"
 msgstr "অভিনেতাৰ সমলসমূহলে প্ৰয়োগ কৰিবলে শৈলী বৈশিষ্টসমূহৰ এটা তালিকা"
 
-#: ../clutter/clutter-text.c:3651
+#: ../clutter/clutter-text.c:3720
 msgid "Use markup"
 msgstr "মাৰ্কআপ ব্যৱহাৰ কৰক"
 
-#: ../clutter/clutter-text.c:3652
+#: ../clutter/clutter-text.c:3721
 msgid "Whether or not the text includes Pango markup"
-msgstr "লিখনীয়ে Pango মাৰ্কআপ অন্তৰ্ভুক্ত কৰে নে"
+msgstr "লিখনিয়ে Pango মাৰ্কআপ অন্তৰ্ভুক্ত কৰে নে"
 
-#: ../clutter/clutter-text.c:3668
+#: ../clutter/clutter-text.c:3737
 msgid "Line wrap"
 msgstr "শাৰী মেৰিওৱা"
 
-#: ../clutter/clutter-text.c:3669
+#: ../clutter/clutter-text.c:3738
 msgid "If set, wrap the lines if the text becomes too wide"
-msgstr "যদি সংহতি কৰা থাকে, লিখনী অতি বহল হৈ গলে শাৰীসমূহ মেৰিৱাওক"
+msgstr "যদি সংহতি কৰা থাকে, লিখনি অতি বহল হৈ গলে শাৰীসমূহ মেৰিৱাওক"
 
-#: ../clutter/clutter-text.c:3684
+#: ../clutter/clutter-text.c:3753
 msgid "Line wrap mode"
 msgstr "শাৰী মেৰিওৱা অৱস্থা"
 
-#: ../clutter/clutter-text.c:3685
+#: ../clutter/clutter-text.c:3754
 msgid "Control how line-wrapping is done"
 msgstr "শাৰী-মেৰিওৱা কিধৰণে কৰা হয় নিয়ন্ত্ৰণ কৰক"
 
-#: ../clutter/clutter-text.c:3700
+#: ../clutter/clutter-text.c:3769
 msgid "Ellipsize"
 msgstr "উপবৃত্ত কৰক"
 
-#: ../clutter/clutter-text.c:3701
+#: ../clutter/clutter-text.c:3770
 msgid "The preferred place to ellipsize the string"
 msgstr "স্ট্ৰিং উপবৃত্ত কৰিবলে পছন্দৰ স্থান"
 
-#: ../clutter/clutter-text.c:3717
+#: ../clutter/clutter-text.c:3786
 msgid "Line Alignment"
 msgstr "শাৰী সংস্থাপন"
 
-#: ../clutter/clutter-text.c:3718
+#: ../clutter/clutter-text.c:3787
 msgid "The preferred alignment for the string, for multi-line text"
-msgstr "স্ট্ৰিং, বহু-শাৰী লিখনীৰ বাবে পছন্দৰ সংস্থাপন"
+msgstr "স্ট্ৰিং, বহু-শাৰী লিখনিৰ বাবে পছন্দৰ সংস্থাপন"
 
-#: ../clutter/clutter-text.c:3734
+#: ../clutter/clutter-text.c:3803
 msgid "Justify"
 msgstr "শুদ্ধ প্ৰমাণিত কৰক"
 
-#: ../clutter/clutter-text.c:3735
+#: ../clutter/clutter-text.c:3804
 msgid "Whether the text should be justified"
-msgstr "লিখনীক শুদ্ধ প্ৰমাণীত কৰা হব নে"
+msgstr "লিখনিক শুদ্ধ প্ৰমাণীত কৰা হব নে"
 
-#: ../clutter/clutter-text.c:3750
+#: ../clutter/clutter-text.c:3819
 msgid "Password Character"
-msgstr "পাছৱাৰ্ড আখৰ"
+msgstr "পাছৱৰ্ড আখৰ"
 
-#: ../clutter/clutter-text.c:3751
+#: ../clutter/clutter-text.c:3820
 msgid "If non-zero, use this character to display the actor's contents"
 msgstr "যদি শূন্য নহয়, অভিনেতাৰ সমলসমূহ প্ৰদৰ্শন কৰিবলে এই আখৰ ব্যৱহাৰ কৰক"
 
-#: ../clutter/clutter-text.c:3765
+#: ../clutter/clutter-text.c:3834
 msgid "Max Length"
 msgstr "সৰ্বাধিক দৈৰ্ঘ্য"
 
-#: ../clutter/clutter-text.c:3766
+#: ../clutter/clutter-text.c:3835
 msgid "Maximum length of the text inside the actor"
-msgstr "অভিনেতাৰ ভিতৰত লিখনীৰ সৰ্বাধিক দৈৰ্ঘ্য"
+msgstr "অভিনেতাৰ ভিতৰত লিখনিৰ সৰ্বাধিক দৈৰ্ঘ্য"
 
-#: ../clutter/clutter-text.c:3789
+#: ../clutter/clutter-text.c:3858
 msgid "Single Line Mode"
 msgstr "এটা শাৰী অৱস্থা"
 
-#: ../clutter/clutter-text.c:3790
+#: ../clutter/clutter-text.c:3859
 msgid "Whether the text should be a single line"
-msgstr "লিখনী এটা শাৰী হব লাগিব নে"
+msgstr "লিখনি এটা শাৰী হব লাগিব নে"
 
-#: ../clutter/clutter-text.c:3804 ../clutter/clutter-text.c:3805
+#: ../clutter/clutter-text.c:3873 ../clutter/clutter-text.c:3874
 msgid "Selected Text Color"
-msgstr "নিৰ্বাচিত লিখনী ৰঙ"
+msgstr "নিৰ্বাচিত লিখনি ৰঙ"
 
-#: ../clutter/clutter-text.c:3820
+#: ../clutter/clutter-text.c:3889
 msgid "Selected Text Color Set"
-msgstr "নিৰ্বাচিত লিখনী ৰঙ সংহতি"
+msgstr "নিৰ্বাচিত লিখনি ৰঙ সংহতি"
 
-#: ../clutter/clutter-text.c:3821
+#: ../clutter/clutter-text.c:3890
 msgid "Whether the selected text color has been set"
-msgstr "নিৰ্বাচিত লিখনী ৰঙ সংহতি কৰা হৈছে নে"
+msgstr "নিৰ্বাচিত লিখনি ৰঙ সংহতি কৰা হৈছে নে"
 
-#: ../clutter/clutter-timeline.c:561
-#: ../clutter/deprecated/clutter-animation.c:560
+#: ../clutter/clutter-timeline.c:591
+#: ../clutter/deprecated/clutter-animation.c:512
 msgid "Loop"
 msgstr "পুনৰাবৃত্তি"
 
-#: ../clutter/clutter-timeline.c:562
+#: ../clutter/clutter-timeline.c:592
 msgid "Should the timeline automatically restart"
 msgstr "সময়ৰেখা স্বচালিতভাৱে আৰম্ভ হব লাগে নে"
 
-#: ../clutter/clutter-timeline.c:576
+#: ../clutter/clutter-timeline.c:606
 msgid "Delay"
 msgstr "বিলম্ব"
 
-#: ../clutter/clutter-timeline.c:577
+#: ../clutter/clutter-timeline.c:607
 msgid "Delay before start"
 msgstr "আৰম্ভৰ আগত বিলম্ব"
 
-#: ../clutter/clutter-timeline.c:592
-#: ../clutter/deprecated/clutter-animation.c:544
-#: ../clutter/deprecated/clutter-animator.c:1803
+#: ../clutter/clutter-timeline.c:622
+#: ../clutter/deprecated/clutter-animation.c:496
+#: ../clutter/deprecated/clutter-animator.c:1792
 #: ../clutter/deprecated/clutter-media.c:224
-#: ../clutter/deprecated/clutter-state.c:1522
+#: ../clutter/deprecated/clutter-state.c:1515
 msgid "Duration"
 msgstr "অবধি"
 
-#: ../clutter/clutter-timeline.c:593
+#: ../clutter/clutter-timeline.c:623
 msgid "Duration of the timeline in milliseconds"
 msgstr "মিলিছেকেণ্ডসমূহত সময়ৰেখাৰ অবধি"
 
-#: ../clutter/clutter-timeline.c:608
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:528
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:337
+#: ../clutter/clutter-timeline.c:638
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:521
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:330
 msgid "Direction"
 msgstr "দিশ"
 
-#: ../clutter/clutter-timeline.c:609
+#: ../clutter/clutter-timeline.c:639
 msgid "Direction of the timeline"
 msgstr "সময়ৰেখাৰ দিশ"
 
-#: ../clutter/clutter-timeline.c:624
+#: ../clutter/clutter-timeline.c:654
 msgid "Auto Reverse"
 msgstr "স্বচালিত উভতা"
 
-#: ../clutter/clutter-timeline.c:625
+#: ../clutter/clutter-timeline.c:655
 msgid "Whether the direction should be reversed when reaching the end"
 msgstr "অন্ত পাওতে দিশ উভতোৱা হব নে"
 
-#: ../clutter/clutter-timeline.c:643
+#: ../clutter/clutter-timeline.c:673
 msgid "Repeat Count"
 msgstr "গণনা পুনৰাবৃত্তি কৰক"
 
-#: ../clutter/clutter-timeline.c:644
+#: ../clutter/clutter-timeline.c:674
 msgid "How many times the timeline should repeat"
 msgstr "সময়ৰেখা কিমান দেৰি পুনৰাবৃত্তি হব লাগে"
 
-#: ../clutter/clutter-timeline.c:658
+#: ../clutter/clutter-timeline.c:688
 msgid "Progress Mode"
 msgstr "প্ৰগতি অৱস্থা"
 
-#: ../clutter/clutter-timeline.c:659
+#: ../clutter/clutter-timeline.c:689
 msgid "How the timeline should compute the progress"
 msgstr "সময়ৰেখায় কিদৰে প্ৰগতি গণনা কৰিব"
 
-#: ../clutter/clutter-transition.c:246
+#: ../clutter/clutter-transition.c:244
 msgid "Interval"
 msgstr "অন্তৰাল"
 
-#: ../clutter/clutter-transition.c:247
+#: ../clutter/clutter-transition.c:245
 msgid "The interval of values to transition"
 msgstr "স্থানান্তৰলে মানসমূহৰ অন্তৰাল"
 
-#: ../clutter/clutter-transition.c:261
+#: ../clutter/clutter-transition.c:259
 msgid "Animatable"
 msgstr "জীৱন্ত কৰিব পাৰি"
 
-#: ../clutter/clutter-transition.c:262
+#: ../clutter/clutter-transition.c:260
 msgid "The animatable object"
 msgstr "জীৱন্ত কৰিব পৰা অবজেক্ট"
 
-#: ../clutter/clutter-transition.c:283
+#: ../clutter/clutter-transition.c:281
 msgid "Remove on Complete"
 msgstr "সম্পূৰ্ণত আতৰাব"
 
-#: ../clutter/clutter-transition.c:284
+#: ../clutter/clutter-transition.c:282
 msgid "Detach the transition when completed"
 msgstr "সম্পূৰ্ণ হলে স্থানান্তৰ বিচ্ছিন্ন কৰক"
 
-#: ../clutter/clutter-zoom-action.c:353
+#: ../clutter/clutter-zoom-action.c:365
 msgid "Zoom Axis"
 msgstr "জুম অক্ষ"
 
-#: ../clutter/clutter-zoom-action.c:354
+#: ../clutter/clutter-zoom-action.c:366
 msgid "Constraints the zoom to an axis"
 msgstr "জুমক এটা অক্ষত সীমিত ৰাখে"
 
-#: ../clutter/deprecated/clutter-alpha.c:355
-#: ../clutter/deprecated/clutter-animation.c:575
-#: ../clutter/deprecated/clutter-animator.c:1820
+#: ../clutter/deprecated/clutter-alpha.c:347
+#: ../clutter/deprecated/clutter-animation.c:527
+#: ../clutter/deprecated/clutter-animator.c:1809
 msgid "Timeline"
 msgstr "সময়ৰেখা"
 
-#: ../clutter/deprecated/clutter-alpha.c:356
+#: ../clutter/deprecated/clutter-alpha.c:348
 msgid "Timeline used by the alpha"
 msgstr "আলফাৰ দ্বাৰা ব্যৱহৃত সময়ৰেখা"
 
-#: ../clutter/deprecated/clutter-alpha.c:372
+#: ../clutter/deprecated/clutter-alpha.c:364
 msgid "Alpha value"
 msgstr "আলফা মান"
 
-#: ../clutter/deprecated/clutter-alpha.c:373
+#: ../clutter/deprecated/clutter-alpha.c:365
 msgid "Alpha value as computed by the alpha"
 msgstr "আলফাৰ দ্বাৰা গণনা কৰা আলফা মান"
 
-#: ../clutter/deprecated/clutter-alpha.c:394
-#: ../clutter/deprecated/clutter-animation.c:528
+#: ../clutter/deprecated/clutter-alpha.c:386
+#: ../clutter/deprecated/clutter-animation.c:480
 msgid "Mode"
 msgstr "অৱস্থা"
 
-#: ../clutter/deprecated/clutter-alpha.c:395
+#: ../clutter/deprecated/clutter-alpha.c:387
 msgid "Progress mode"
 msgstr "প্ৰগতি অৱস্থা"
 
-#: ../clutter/deprecated/clutter-animation.c:511
+#: ../clutter/deprecated/clutter-animation.c:463
 msgid "Object"
 msgstr "অবজেক্ট"
 
-#: ../clutter/deprecated/clutter-animation.c:512
+#: ../clutter/deprecated/clutter-animation.c:464
 msgid "Object to which the animation applies"
 msgstr "অবজেক্ট যলৈ জীৱন্তকৰণ প্ৰয়োগ হয়"
 
-#: ../clutter/deprecated/clutter-animation.c:529
+#: ../clutter/deprecated/clutter-animation.c:481
 msgid "The mode of the animation"
 msgstr "জীৱন্তকৰণৰ অৱস্থা"
 
-#: ../clutter/deprecated/clutter-animation.c:545
+#: ../clutter/deprecated/clutter-animation.c:497
 msgid "Duration of the animation, in milliseconds"
 msgstr "জীৱন্তকৰণড় অবধি, মিলিছেকেণ্ডসমূহত"
 
-#: ../clutter/deprecated/clutter-animation.c:561
+#: ../clutter/deprecated/clutter-animation.c:513
 msgid "Whether the animation should loop"
 msgstr "জীৱন্তৰকৰণৰ পুনৰাবৃত্তি হব নে"
 
-#: ../clutter/deprecated/clutter-animation.c:576
+#: ../clutter/deprecated/clutter-animation.c:528
 msgid "The timeline used by the animation"
 msgstr "জীৱন্তকৰণ দ্বাৰা ব্যৱহৃত সময়ৰেখা"
 
-#: ../clutter/deprecated/clutter-animation.c:592
-#: ../clutter/deprecated/clutter-behaviour.c:241
+#: ../clutter/deprecated/clutter-animation.c:544
+#: ../clutter/deprecated/clutter-behaviour.c:237
 msgid "Alpha"
 msgstr "আলফা"
 
-#: ../clutter/deprecated/clutter-animation.c:593
+#: ../clutter/deprecated/clutter-animation.c:545
 msgid "The alpha used by the animation"
 msgstr "জীৱন্তকৰণ দ্বাৰা ব্যৱহৃত আলফা"
 
-#: ../clutter/deprecated/clutter-animator.c:1804
+#: ../clutter/deprecated/clutter-animator.c:1793
 msgid "The duration of the animation"
 msgstr "জীৱন্তকৰণৰ অবধি"
 
-#: ../clutter/deprecated/clutter-animator.c:1821
+#: ../clutter/deprecated/clutter-animator.c:1810
 msgid "The timeline of the animation"
 msgstr "জীৱন্তকৰণৰ সময়ৰেখা"
 
-#: ../clutter/deprecated/clutter-behaviour.c:242
+#: ../clutter/deprecated/clutter-behaviour.c:238
 msgid "Alpha Object to drive the behaviour"
 msgstr "ব্যৱহাৰ চলাবলে আলফা অবজেক্ট"
 
-#: ../clutter/deprecated/clutter-behaviour-depth.c:182
+#: ../clutter/deprecated/clutter-behaviour-depth.c:180
 msgid "Start Depth"
 msgstr "গভিৰতা আৰম্ভ কৰক"
 
-#: ../clutter/deprecated/clutter-behaviour-depth.c:183
+#: ../clutter/deprecated/clutter-behaviour-depth.c:181
 msgid "Initial depth to apply"
 msgstr "প্ৰয়োগ কৰিবলে আৰম্ভণি গভীৰতা"
 
-#: ../clutter/deprecated/clutter-behaviour-depth.c:198
+#: ../clutter/deprecated/clutter-behaviour-depth.c:196
 msgid "End Depth"
 msgstr "অন্ত গভীৰতা"
 
-#: ../clutter/deprecated/clutter-behaviour-depth.c:199
+#: ../clutter/deprecated/clutter-behaviour-depth.c:197
 msgid "Final depth to apply"
 msgstr "প্ৰয়োগ কৰিবলে অন্তিম গভীৰতা"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:401
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:394
 msgid "Start Angle"
 msgstr "আৰম্ভণি কোণ"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:402
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:284
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:395
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:277
 msgid "Initial angle"
 msgstr "আৰম্ভণি কোণ"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:417
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:410
 msgid "End Angle"
 msgstr "অন্তিম কোণ"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:418
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:302
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:411
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:295
 msgid "Final angle"
 msgstr "অন্তিম কোণ"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:433
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:426
 msgid "Angle x tilt"
 msgstr "কোণ x হালি অহা"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:434
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:427
 msgid "Tilt of the ellipse around x axis"
 msgstr "x অক্ষৰ চাৰিওফালে উপবৃত্তৰ হাল"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:449
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:442
 msgid "Angle y tilt"
 msgstr "কোণ y হাল"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:450
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:443
 msgid "Tilt of the ellipse around y axis"
 msgstr "y অক্ষৰ চাৰিওফালে উপবৃত্তৰ হাল"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:465
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:458
 msgid "Angle z tilt"
 msgstr "কোণ z হাল"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:466
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:459
 msgid "Tilt of the ellipse around z axis"
 msgstr "z অক্ষৰ চাৰিওফালে উপবৃত্তৰ হাল"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:482
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:475
 msgid "Width of the ellipse"
 msgstr "উপবৃত্তৰ প্ৰস্থ"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:498
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:491
 msgid "Height of ellipse"
 msgstr "উপবৃত্তৰ উচ্চতা"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:513
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:506
 msgid "Center"
 msgstr "কেন্দ্ৰ"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:514
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:507
 msgid "Center of ellipse"
 msgstr "উপবৃত্তৰ কেন্দ্ৰ"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:529
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:338
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:522
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:331
 msgid "Direction of rotation"
 msgstr "ঘূৰ্ণনৰ দিশ"
 
-#: ../clutter/deprecated/clutter-behaviour-opacity.c:184
+#: ../clutter/deprecated/clutter-behaviour-opacity.c:177
 msgid "Opacity Start"
 msgstr "অস্বচ্ছতাৰ আৰম্ভণি"
 
-#: ../clutter/deprecated/clutter-behaviour-opacity.c:185
+#: ../clutter/deprecated/clutter-behaviour-opacity.c:178
 msgid "Initial opacity level"
 msgstr "আৰম্ভণি অস্বচ্ছতাৰ স্তৰ"
 
-#: ../clutter/deprecated/clutter-behaviour-opacity.c:202
+#: ../clutter/deprecated/clutter-behaviour-opacity.c:195
 msgid "Opacity End"
 msgstr "অস্বচ্ছতাৰ অন্ত"
 
-#: ../clutter/deprecated/clutter-behaviour-opacity.c:203
+#: ../clutter/deprecated/clutter-behaviour-opacity.c:196
 msgid "Final opacity level"
 msgstr "অন্তিম অস্বচ্ছ স্তৰ"
 
-#: ../clutter/deprecated/clutter-behaviour-path.c:226
+#: ../clutter/deprecated/clutter-behaviour-path.c:222
 msgid "The ClutterPath object representing the path to animate along"
 msgstr "জীৱন্ত কৰিবলে পথ প্ৰতিবেদন কৰা ClutterPath অবজেক্ট"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:283
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:276
 msgid "Angle Begin"
 msgstr "কোণৰ আৰম্ভণি"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:301
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:294
 msgid "Angle End"
 msgstr "কোণৰ অন্ত"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:319
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:312
 msgid "Axis"
 msgstr "অক্ষ"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:320
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:313
 msgid "Axis of rotation"
 msgstr "ঘূৰ্ণনৰ অক্ষ"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:355
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:348
 msgid "Center X"
 msgstr "কেন্দ্ৰ X"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:356
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:349
 msgid "X coordinate of the center of rotation"
 msgstr "ঘূৰ্ণনৰ কেন্দ্ৰৰ X অক্ষ"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:373
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:366
 msgid "Center Y"
 msgstr "কেন্দ্ৰ Y"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:374
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:367
 msgid "Y coordinate of the center of rotation"
 msgstr "ঘূৰ্ণনৰ কেন্দ্ৰৰ Y অক্ষ"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:391
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:384
 msgid "Center Z"
 msgstr "কেন্দ্ৰ Z"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:392
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:385
 msgid "Z coordinate of the center of rotation"
 msgstr "ঘূৰ্ণনৰ কেন্দ্ৰৰ Z অক্ষ"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:226
+#: ../clutter/deprecated/clutter-behaviour-scale.c:222
 msgid "X Start Scale"
 msgstr "X আৰম্ভ স্কেইল"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:227
+#: ../clutter/deprecated/clutter-behaviour-scale.c:223
 msgid "Initial scale on the X axis"
 msgstr "X অক্ষত আৰম্ভণি স্কেইল"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:245
+#: ../clutter/deprecated/clutter-behaviour-scale.c:241
 msgid "X End Scale"
 msgstr "X অন্ত স্কেইল"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:246
+#: ../clutter/deprecated/clutter-behaviour-scale.c:242
 msgid "Final scale on the X axis"
 msgstr "X অক্ষত অন্তিম স্কেইল"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:264
+#: ../clutter/deprecated/clutter-behaviour-scale.c:260
 msgid "Y Start Scale"
 msgstr "Y আৰম্ভণি স্কেইল"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:265
+#: ../clutter/deprecated/clutter-behaviour-scale.c:261
 msgid "Initial scale on the Y axis"
 msgstr "Y অক্ষত আৰম্ভণি স্কেইল"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:283
+#: ../clutter/deprecated/clutter-behaviour-scale.c:279
 msgid "Y End Scale"
 msgstr "Y অন্ত স্কেইল"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:284
+#: ../clutter/deprecated/clutter-behaviour-scale.c:280
 msgid "Final scale on the Y axis"
 msgstr "Y অক্ষত অন্তিম স্কেইল"
 
-#: ../clutter/deprecated/clutter-box.c:261
+#: ../clutter/deprecated/clutter-box.c:255
 msgid "The background color of the box"
 msgstr "বাকচৰ পটভূমী ৰঙ"
 
-#: ../clutter/deprecated/clutter-box.c:274
+#: ../clutter/deprecated/clutter-box.c:268
 msgid "Color Set"
 msgstr "ৰঙ সংহতি"
 
-#: ../clutter/deprecated/clutter-cairo-texture.c:597
+#: ../clutter/deprecated/clutter-cairo-texture.c:585
 msgid "Surface Width"
 msgstr "পৃষ্ঠ প্ৰস্থ"
 
-#: ../clutter/deprecated/clutter-cairo-texture.c:598
+#: ../clutter/deprecated/clutter-cairo-texture.c:586
 msgid "The width of the Cairo surface"
 msgstr "Cairo পৃষ্ঠৰ প্ৰস্থ"
 
-#: ../clutter/deprecated/clutter-cairo-texture.c:615
+#: ../clutter/deprecated/clutter-cairo-texture.c:603
 msgid "Surface Height"
 msgstr "পৃষ্ঠ উচ্চতা"
 
-#: ../clutter/deprecated/clutter-cairo-texture.c:616
+#: ../clutter/deprecated/clutter-cairo-texture.c:604
 msgid "The height of the Cairo surface"
 msgstr "Cairo পৃষ্ঠৰ উচ্চতা"
 
-#: ../clutter/deprecated/clutter-cairo-texture.c:636
+#: ../clutter/deprecated/clutter-cairo-texture.c:624
 msgid "Auto Resize"
 msgstr "স্বচালিত পুনৰ আকাৰ"
 
-#: ../clutter/deprecated/clutter-cairo-texture.c:637
+#: ../clutter/deprecated/clutter-cairo-texture.c:625
 msgid "Whether the surface should match the allocation"
 msgstr "পৃষ্ঠ আবন্টনৰ সৈতে মিল খাব লাগে নে"
 
@@ -2373,193 +2403,252 @@ msgstr "বাফাৰৰ পূৰ্ণ স্তৰ"
 msgid "The duration of the stream, in seconds"
 msgstr "স্ট্ৰিমৰ অবধি, ছেকেণ্ডসমূহত"
 
-#: ../clutter/deprecated/clutter-rectangle.c:274
+#: ../clutter/deprecated/clutter-rectangle.c:271
 msgid "The color of the rectangle"
 msgstr "আয়তৰ ৰঙ"
 
-#: ../clutter/deprecated/clutter-rectangle.c:287
+#: ../clutter/deprecated/clutter-rectangle.c:284
 msgid "Border Color"
 msgstr "সীমাৰ ৰঙ"
 
-#: ../clutter/deprecated/clutter-rectangle.c:288
+#: ../clutter/deprecated/clutter-rectangle.c:285
 msgid "The color of the border of the rectangle"
 msgstr "আয়তৰ সীমাৰ ৰঙ"
 
-#: ../clutter/deprecated/clutter-rectangle.c:303
+#: ../clutter/deprecated/clutter-rectangle.c:300
 msgid "Border Width"
 msgstr "সীমাৰ প্ৰস্থ"
 
-#: ../clutter/deprecated/clutter-rectangle.c:304
+#: ../clutter/deprecated/clutter-rectangle.c:301
 msgid "The width of the border of the rectangle"
 msgstr "আয়তৰ সীমাৰ প্ৰস্থ"
 
-#: ../clutter/deprecated/clutter-rectangle.c:318
+#: ../clutter/deprecated/clutter-rectangle.c:315
 msgid "Has Border"
 msgstr "সীমা আছে"
 
-#: ../clutter/deprecated/clutter-rectangle.c:319
+#: ../clutter/deprecated/clutter-rectangle.c:316
 msgid "Whether the rectangle should have a border"
 msgstr "আয়তৰ এটা সীমা থাকিব লাগে নে"
 
-#: ../clutter/deprecated/clutter-shader.c:261
+#: ../clutter/deprecated/clutter-shader.c:257
 msgid "Vertex Source"
 msgstr "শীৰ্ষবিন্দু উৎস"
 
-#: ../clutter/deprecated/clutter-shader.c:262
+#: ../clutter/deprecated/clutter-shader.c:258
 msgid "Source of vertex shader"
 msgstr "শীৰ্ষবিন্দু শেডাৰৰ উৎস"
 
-#: ../clutter/deprecated/clutter-shader.c:278
+#: ../clutter/deprecated/clutter-shader.c:274
 msgid "Fragment Source"
 msgstr "ফ্ৰেগমেন্টৰ উৎস"
 
-#: ../clutter/deprecated/clutter-shader.c:279
+#: ../clutter/deprecated/clutter-shader.c:275
 msgid "Source of fragment shader"
 msgstr "ফ্ৰেগমেন্ট শেডাৰৰ উৎস"
 
-#: ../clutter/deprecated/clutter-shader.c:296
+#: ../clutter/deprecated/clutter-shader.c:292
 msgid "Compiled"
 msgstr "কমপাইল কৰা হৈছে"
 
-#: ../clutter/deprecated/clutter-shader.c:297
+#: ../clutter/deprecated/clutter-shader.c:293
 msgid "Whether the shader is compiled and linked"
 msgstr "শেডাৰ কমপাইল আৰু লিঙ্ক কৰা আছে"
 
-#: ../clutter/deprecated/clutter-shader.c:314
+#: ../clutter/deprecated/clutter-shader.c:310
 msgid "Whether the shader is enabled"
 msgstr "শেডাৰ সামৰ্থবান কৰা আছে নে"
 
-#: ../clutter/deprecated/clutter-shader.c:525
+#: ../clutter/deprecated/clutter-shader.c:521
 #, c-format
 msgid "%s compilation failed: %s"
 msgstr "%s কমপাইল ব্যৰ্থ হল: %s"
 
-#: ../clutter/deprecated/clutter-shader.c:526
+#: ../clutter/deprecated/clutter-shader.c:522
 msgid "Vertex shader"
 msgstr "শীৰ্ষবিন্দু শেডাৰ"
 
-#: ../clutter/deprecated/clutter-shader.c:527
+#: ../clutter/deprecated/clutter-shader.c:523
 msgid "Fragment shader"
 msgstr "ফ্ৰেগমেন্ট শেডাৰ"
 
-#: ../clutter/deprecated/clutter-state.c:1504
+#: ../clutter/deprecated/clutter-state.c:1497
 msgid "State"
 msgstr "অৱস্থা"
 
-#: ../clutter/deprecated/clutter-state.c:1505
+#: ../clutter/deprecated/clutter-state.c:1498
 msgid "Currently set state, (transition to this state might not be complete)"
 msgstr "বৰ্তমানে সংহতি কৰা অৱস্থা, (এই অৱস্থালে স্থানান্তৰ সম্পূৰ্ণ নহবও পাৰে)"
 
-#: ../clutter/deprecated/clutter-state.c:1523
+#: ../clutter/deprecated/clutter-state.c:1516
 msgid "Default transition duration"
 msgstr "অবিকল্পিত স্থানান্তৰ অবধি"
 
-#: ../clutter/deprecated/clutter-texture.c:994
+#: ../clutter/deprecated/clutter-table-layout.c:535
+msgid "Column Number"
+msgstr "স্তম্ভ নম্বৰ"
+
+#: ../clutter/deprecated/clutter-table-layout.c:536
+msgid "The column the widget resides in"
+msgstr "উইজেট অৱস্থিত স্তম্ভ"
+
+#: ../clutter/deprecated/clutter-table-layout.c:543
+msgid "Row Number"
+msgstr "শাৰী নম্বৰ"
+
+#: ../clutter/deprecated/clutter-table-layout.c:544
+msgid "The row the widget resides in"
+msgstr "উইজেট অৱস্থিত শাৰী"
+
+#: ../clutter/deprecated/clutter-table-layout.c:551
+msgid "Column Span"
+msgstr "স্তম্ভ বিস্তাৰ"
+
+#: ../clutter/deprecated/clutter-table-layout.c:552
+msgid "The number of columns the widget should span"
+msgstr "উইজেট বিস্তাৰ কৰিবলে স্তম্ভসমূহৰ সংখ্যা"
+
+#: ../clutter/deprecated/clutter-table-layout.c:559
+msgid "Row Span"
+msgstr "শাৰী বিস্তাৰ"
+
+#: ../clutter/deprecated/clutter-table-layout.c:560
+msgid "The number of rows the widget should span"
+msgstr "উইজেটে বিস্তাৰ কৰিবলে শাৰীসমূহৰ সংখ্যা"
+
+#: ../clutter/deprecated/clutter-table-layout.c:567
+msgid "Horizontal Expand"
+msgstr "আনুভূমিক প্ৰসাৰন"
+
+#: ../clutter/deprecated/clutter-table-layout.c:568
+msgid "Allocate extra space for the child in horizontal axis"
+msgstr "আনুভূমিক অক্ষত ছাইল্ডৰ বাবে অতিৰিক্ত স্থান আবন্টন কৰক"
+
+#: ../clutter/deprecated/clutter-table-layout.c:574
+msgid "Vertical Expand"
+msgstr "উলম্ব প্ৰসাৰন"
+
+#: ../clutter/deprecated/clutter-table-layout.c:575
+msgid "Allocate extra space for the child in vertical axis"
+msgstr "উলম্ব অক্ষত ছাইল্ডৰ বাবে অতিৰিক্ত স্থান আবন্টন কৰক"
+
+#: ../clutter/deprecated/clutter-table-layout.c:1630
+msgid "Spacing between columns"
+msgstr "স্তম্ভসমূহৰ মাজৰ স্থান"
+
+#: ../clutter/deprecated/clutter-table-layout.c:1646
+msgid "Spacing between rows"
+msgstr "শাৰীসমূহৰ মাজৰ স্থান"
+
+#: ../clutter/deprecated/clutter-texture.c:992
 msgid "Sync size of actor"
 msgstr "অভিনেতাৰ সংমিহলি আকাৰ"
 
-#: ../clutter/deprecated/clutter-texture.c:995
+#: ../clutter/deprecated/clutter-texture.c:993
 msgid "Auto sync size of actor to underlying pixbuf dimensions"
 msgstr "নিম্নলিখিত pixbuf পৰিসৰসমূহলে অভিনেতাৰ স্বচালিত সংমহিলি আকাৰ"
 
-#: ../clutter/deprecated/clutter-texture.c:1002
+#: ../clutter/deprecated/clutter-texture.c:1000
 msgid "Disable Slicing"
 msgstr "স্লাইচিং অসামৰ্থবান কৰক"
 
-#: ../clutter/deprecated/clutter-texture.c:1003
+#: ../clutter/deprecated/clutter-texture.c:1001
 msgid ""
 "Forces the underlying texture to be singular and not made of smaller space "
 "saving individual textures"
 msgstr ""
-"নিম্নলিখিত গাঁথনিক একক আৰু সৰু স্থান সঞ্চয়ী সূকীয়া গাঁথনিসমূহৰে নিৰ্মিত নহবলে বাধ্য কৰে"
+"নিম্নলিখিত গাঁথনিক একক আৰু সৰু স্থান সঞ্চয়ী সূকীয়া গাঁথনিসমূহৰে নিৰ্মিত নহবলে "
+"বাধ্য কৰে"
 
-#: ../clutter/deprecated/clutter-texture.c:1012
+#: ../clutter/deprecated/clutter-texture.c:1010
 msgid "Tile Waste"
 msgstr "টাইল আবৰ্জনা"
 
-#: ../clutter/deprecated/clutter-texture.c:1013
+#: ../clutter/deprecated/clutter-texture.c:1011
 msgid "Maximum waste area of a sliced texture"
 msgstr "এটা স্লাইচ কৰা গাঁথনিৰ সৰ্বাধিক আবৰ্জনা স্থান"
 
-#: ../clutter/deprecated/clutter-texture.c:1021
+#: ../clutter/deprecated/clutter-texture.c:1019
 msgid "Horizontal repeat"
 msgstr "আনুভূমিক পুনৰাবৃত্তি"
 
-#: ../clutter/deprecated/clutter-texture.c:1022
+#: ../clutter/deprecated/clutter-texture.c:1020
 msgid "Repeat the contents rather than scaling them horizontally"
 msgstr "সমলসমূহক আনুভূমিকভাৱে স্কেইল কৰাতকে পুনৰাবৃত্তি কৰক"
 
-#: ../clutter/deprecated/clutter-texture.c:1029
+#: ../clutter/deprecated/clutter-texture.c:1027
 msgid "Vertical repeat"
 msgstr "উলম্ব পুনৰাবৃত্তি"
 
-#: ../clutter/deprecated/clutter-texture.c:1030
+#: ../clutter/deprecated/clutter-texture.c:1028
 msgid "Repeat the contents rather than scaling them vertically"
 msgstr "সমলসমূহক উলম্বভাৱে স্কেইল কৰাৰ পৰিৱৰ্তে পুনৰাবৃত্তি কৰক"
 
-#: ../clutter/deprecated/clutter-texture.c:1037
+#: ../clutter/deprecated/clutter-texture.c:1035
 msgid "Filter Quality"
 msgstr "পৰিস্ৰাৱন গুণ"
 
-#: ../clutter/deprecated/clutter-texture.c:1038
+#: ../clutter/deprecated/clutter-texture.c:1036
 msgid "Rendering quality used when drawing the texture"
 msgstr "গাঁথনি আকোতে ব্যৱহৃত ৰেন্ডাৰিং গুণ"
 
-#: ../clutter/deprecated/clutter-texture.c:1046
+#: ../clutter/deprecated/clutter-texture.c:1044
 msgid "Pixel Format"
 msgstr "পিক্সেল বিন্যাস"
 
-#: ../clutter/deprecated/clutter-texture.c:1047
+#: ../clutter/deprecated/clutter-texture.c:1045
 msgid "The Cogl pixel format to use"
 msgstr "ব্যৱহাৰ কৰিব লগিয়া Cogl পিক্সেল বিন্যাস"
 
-#: ../clutter/deprecated/clutter-texture.c:1055
-#: ../clutter/wayland/clutter-wayland-surface.c:449
+#: ../clutter/deprecated/clutter-texture.c:1053
+#: ../clutter/wayland/clutter-wayland-surface.c:445
 msgid "Cogl Texture"
 msgstr "Cogl গাঁথনি"
 
-#: ../clutter/deprecated/clutter-texture.c:1056
-#: ../clutter/wayland/clutter-wayland-surface.c:450
+#: ../clutter/deprecated/clutter-texture.c:1054
+#: ../clutter/wayland/clutter-wayland-surface.c:446
 msgid "The underlying Cogl texture handle used to draw this actor"
 msgstr "এই অভিনেতাক আকিবলে ব্যৱহৃত নিম্নলিখিত Cogl গাঁথনি হাতল"
 
-#: ../clutter/deprecated/clutter-texture.c:1063
+#: ../clutter/deprecated/clutter-texture.c:1061
 msgid "Cogl Material"
 msgstr "Cogl সামগ্ৰী"
 
-#: ../clutter/deprecated/clutter-texture.c:1064
+#: ../clutter/deprecated/clutter-texture.c:1062
 msgid "The underlying Cogl material handle used to draw this actor"
 msgstr "এই অভিনেতাক আকিবলে ব্যৱহৃত নিম্নলিখিত Cogl সামগ্ৰী"
 
-#: ../clutter/deprecated/clutter-texture.c:1083
+#: ../clutter/deprecated/clutter-texture.c:1081
 msgid "The path of the file containing the image data"
 msgstr "ছবি তথ্য অন্তৰ্ভুক্ত কৰা ফাইলৰ পথ"
 
-#: ../clutter/deprecated/clutter-texture.c:1090
+#: ../clutter/deprecated/clutter-texture.c:1088
 msgid "Keep Aspect Ratio"
 msgstr "দিশৰ অনুপাত ৰাখক"
 
-#: ../clutter/deprecated/clutter-texture.c:1091
+#: ../clutter/deprecated/clutter-texture.c:1089
 msgid ""
 "Keep the aspect ratio of the texture when requesting the preferred width or "
 "height"
 msgstr "পছন্দৰ প্ৰস্থ অথবা উচ্চতা অনুৰোধ কৰোতে গাঁথনিৰ দিশ অনুপাত ৰাখক"
 
-#: ../clutter/deprecated/clutter-texture.c:1119
+#: ../clutter/deprecated/clutter-texture.c:1117
 msgid "Load asynchronously"
 msgstr "অসমকালীভাৱে ল'ড কৰক"
 
-#: ../clutter/deprecated/clutter-texture.c:1120
-msgid "Load files inside a thread to avoid blocking when loading images from disk"
+#: ../clutter/deprecated/clutter-texture.c:1118
+msgid ""
+"Load files inside a thread to avoid blocking when loading images from disk"
 msgstr ""
-"ডিস্কৰ পৰা ছবিসমূহ ল'ড কৰি থাকোতে প্ৰতিৰোধ বাধা দিবলে ফাইলসমূহক এটা থ্ৰেডৰ ভিতৰত "
+"ডিস্কৰ পৰা ছবিসমূহ ল'ড কৰি থাকোতে প্ৰতিৰোধ বাধা দিবলে ফাইলসমূহক এটা থ্ৰেডৰ "
+"ভিতৰত "
 "ল'ড কৰক"
 
-#: ../clutter/deprecated/clutter-texture.c:1138
+#: ../clutter/deprecated/clutter-texture.c:1136
 msgid "Load data asynchronously"
 msgstr "তথ্যক অসমকালীভাৱে ল'ড কৰক"
 
-#: ../clutter/deprecated/clutter-texture.c:1139
+#: ../clutter/deprecated/clutter-texture.c:1137
 msgid ""
 "Decode image data files inside a thread to reduce blocking when loading "
 "images from disk"
@@ -2567,192 +2656,189 @@ msgstr ""
 "ডিস্কৰ পৰা ছবিসমূহ ল'ড কৰি থাকোতে প্ৰতিৰোধ বাধা দিবলে ছবি তথ্য ফাইলসমূহক এটা "
 "থ্ৰেডৰ ভিতৰত ডিকোড কৰক"
 
-#: ../clutter/deprecated/clutter-texture.c:1165
+#: ../clutter/deprecated/clutter-texture.c:1163
 msgid "Pick With Alpha"
 msgstr "আলফাৰ সৈতে বুটলক"
 
-#: ../clutter/deprecated/clutter-texture.c:1166
+#: ../clutter/deprecated/clutter-texture.c:1164
 msgid "Shape actor with alpha channel when picking"
 msgstr "বুটলাৰ সময়ত অভিনেতাক আলফা চেনেলৰ সৈতে আকাৰ দিয়ক"
 
-#: ../clutter/deprecated/clutter-texture.c:1599
-#: ../clutter/deprecated/clutter-texture.c:1994
-#: ../clutter/deprecated/clutter-texture.c:2090
-#: ../clutter/deprecated/clutter-texture.c:2388
+#: ../clutter/deprecated/clutter-texture.c:1597
+#: ../clutter/deprecated/clutter-texture.c:1992
+#: ../clutter/deprecated/clutter-texture.c:2088
+#: ../clutter/deprecated/clutter-texture.c:2386
 #, c-format
 msgid "Failed to load the image data"
 msgstr "ছবি তথ্য ল'ড কৰিবলে ব্যৰ্থ"
 
-#: ../clutter/deprecated/clutter-texture.c:1758
+#: ../clutter/deprecated/clutter-texture.c:1756
 #, c-format
 msgid "YUV textures are not supported"
 msgstr "YUV গাঁথনিসমূহ সমৰ্থিত নহয়"
 
-#: ../clutter/deprecated/clutter-texture.c:1767
+#: ../clutter/deprecated/clutter-texture.c:1765
 #, c-format
 msgid "YUV2 textues are not supported"
 msgstr "YUV2 গাঁথনিসমূহ সমৰ্থিত নহয়"
 
-#: ../clutter/evdev/clutter-input-device-evdev.c:159
-msgid "sysfs Path"
-msgstr "sysfs পথ"
-
-#: ../clutter/evdev/clutter-input-device-evdev.c:160
-msgid "Path of the device in sysfs"
-msgstr "sysfs -ত থকা ডিভাইচৰ পথ"
-
-#: ../clutter/evdev/clutter-input-device-evdev.c:175
-msgid "Device Path"
-msgstr "ডিভাইচৰ পথ"
-
-#: ../clutter/evdev/clutter-input-device-evdev.c:176
-msgid "Path of the device node"
-msgstr "ডিভাইচ নোডৰ পথ"
-
-#: ../clutter/gdk/clutter-backend-gdk.c:296
+#: ../clutter/gdk/clutter-backend-gdk.c:289
 #, c-format
 msgid "Could not find a suitable CoglWinsys for a GdkDisplay of type %s"
 msgstr "ধৰণ %s এটা GdkDisplay ৰ বাবে এটা যথাযথ CoglWinsys পোৱা নগল"
 
-#: ../clutter/wayland/clutter-wayland-surface.c:423
+#: ../clutter/wayland/clutter-wayland-surface.c:419
 msgid "Surface"
 msgstr "পৃষ্ঠ"
 
-#: ../clutter/wayland/clutter-wayland-surface.c:424
+#: ../clutter/wayland/clutter-wayland-surface.c:420
 msgid "The underlying wayland surface"
 msgstr "নিম্নৰেখিত wayland পৃষ্ঠ"
 
-#: ../clutter/wayland/clutter-wayland-surface.c:431
+#: ../clutter/wayland/clutter-wayland-surface.c:427
 msgid "Surface width"
 msgstr "পৃষ্ঠ প্ৰস্থ"
 
-#: ../clutter/wayland/clutter-wayland-surface.c:432
+#: ../clutter/wayland/clutter-wayland-surface.c:428
 msgid "The width of the underlying wayland surface"
 msgstr "নিম্নৰেখিত wayland পৃষ্ঠৰ প্ৰস্থ"
 
-#: ../clutter/wayland/clutter-wayland-surface.c:440
+#: ../clutter/wayland/clutter-wayland-surface.c:436
 msgid "Surface height"
 msgstr "পৃষ্ঠ উচ্চতা"
 
-#: ../clutter/wayland/clutter-wayland-surface.c:441
+#: ../clutter/wayland/clutter-wayland-surface.c:437
 msgid "The height of the underlying wayland surface"
 msgstr "নিম্নৰেখিত wayland পৃষ্ঠৰ উচ্চতা"
 
-#: ../clutter/x11/clutter-backend-x11.c:516
+#: ../clutter/x11/clutter-backend-x11.c:488
 msgid "X display to use"
 msgstr "ব্যৱহাৰ কৰিব লগিয়া X প্ৰদৰ্শন"
 
-#: ../clutter/x11/clutter-backend-x11.c:522
+#: ../clutter/x11/clutter-backend-x11.c:494
 msgid "X screen to use"
 msgstr "ব্যৱহাৰ কৰিব লগিয়া X পৰ্দা"
 
-#: ../clutter/x11/clutter-backend-x11.c:527
+#: ../clutter/x11/clutter-backend-x11.c:499
 msgid "Make X calls synchronous"
 msgstr "X কলসমূহক সংমিহলি কৰক"
 
-#: ../clutter/x11/clutter-backend-x11.c:534
-msgid "Enable XInput support"
-msgstr "XInput সমৰ্থন সামৰ্থবান কৰক"
+#: ../clutter/x11/clutter-backend-x11.c:506
+msgid "Disable XInput support"
+msgstr "XInput সমৰ্থন অসামৰ্থবান কৰক"
 
-#: ../clutter/x11/clutter-keymap-x11.c:317
+#: ../clutter/x11/clutter-keymap-x11.c:458
 msgid "The Clutter backend"
 msgstr "Clutter বেকএন্ড"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:539
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:534
 msgid "Pixmap"
 msgstr "পিক্সমেপ"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:540
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:535
 msgid "The X11 Pixmap to be bound"
 msgstr "বান্ধিবলে X11 পিক্সমেপ"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:548
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:543
 msgid "Pixmap width"
 msgstr "পিক্সমেপ প্ৰস্থ"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:549
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:544
 msgid "The width of the pixmap bound to this texture"
 msgstr "এই গাঁথনিলে বান্ধীত পিক্সমেপৰ প্ৰস্থ"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:557
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:552
 msgid "Pixmap height"
 msgstr "পিক্সমেপৰ উচ্চতা"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:558
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:553
 msgid "The height of the pixmap bound to this texture"
 msgstr "এই গাঁথনিলে বান্ধীত পিক্সমেপৰ উচ্চতা"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:566
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:561
 msgid "Pixmap Depth"
 msgstr "পিক্সমেপ গভীৰতা"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:567
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:562
 msgid "The depth (in number of bits) of the pixmap bound to this texture"
 msgstr "এই গাঁথনিলে বান্ধীত পিক্সমেপৰ গভীৰতা (বিটসমূহৰ সংখ্যাত)"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:575
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:570
 msgid "Automatic Updates"
 msgstr "স্বচালিত আপডেইটসমূহ"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:576
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:571
 msgid "If the texture should be kept in sync with any pixmap changes."
 msgstr "গাঁথনিক কোনো পিক্সমেপ পৰিবৰ্তনৰ সৈতে সংমিহলি কৰা হব নে।"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:584
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:579
 msgid "Window"
 msgstr "উইন্ডো"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:585
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:580
 msgid "The X11 Window to be bound"
 msgstr "বান্ধীবলে X11 উইন্ডো"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:593
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:588
 msgid "Window Redirect Automatic"
 msgstr "উইন্ডো পুনৰদিশ স্বচালিতভাৱে"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:594
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:589
 msgid "If composite window redirects are set to Automatic (or Manual if false)"
-msgstr "বহু উইন্ডো পুনৰদিশসমূহ স্বচালিতলে সংহতি কৰা হয় নে (অথবা হস্তচালিতলে যদি মিচা)"
+msgstr ""
+"বহু উইন্ডো পুনৰদিশসমূহ স্বচালিতলে সংহতি কৰা হয় নে (অথবা হস্তচালিতলে যদি মিচা)"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:604
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:599
 msgid "Window Mapped"
 msgstr "উইন্ডো মেপ কৰা হল"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:605
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:600
 msgid "If window is mapped"
 msgstr "উইন্ডো মেপ কৰা আছে নে"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:614
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:609
 msgid "Destroyed"
 msgstr "ধ্বংস কৰা হল"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:615
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:610
 msgid "If window has been destroyed"
 msgstr "উইন্ডো ধ্বংস কৰা হৈছে নে"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:623
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:618
 msgid "Window X"
 msgstr "উইন্ডো X"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:624
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:619
 msgid "X position of window on screen according to X11"
 msgstr "X11 -ৰ মতে পৰ্দাত উইন্ডোৰ X অৱস্থান"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:632
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:627
 msgid "Window Y"
 msgstr "উইন্ডো Y"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:633
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:628
 msgid "Y position of window on screen according to X11"
 msgstr "X11 -ৰ মতে পৰ্দাত উইন্ডোৰ Y অৱস্থান"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:640
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:635
 msgid "Window Override Redirect"
 msgstr "উইন্ডো অভাৰৰাইড পুনৰদিশ"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:641
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:636
 msgid "If this is an override-redirect window"
 msgstr "যদি ই এটা অভাৰৰাইড-পুনৰদিশ উইন্ডো হয়"
 
+#~ msgid "sysfs Path"
+#~ msgstr "sysfs পথ"
+
+#~ msgid "Path of the device in sysfs"
+#~ msgstr "sysfs -ত থকা ডিভাইচৰ পথ"
+
+#~ msgid "Device Path"
+#~ msgstr "ডিভাইচৰ পথ"
+
+#~ msgid "Path of the device node"
+#~ msgstr "ডিভাইচ নোডৰ পথ"
+
 #~ msgid "The layout manager used by the box"
 #~ msgstr "বাকচৰ দ্বাৰা ব্যৱহাৰ কৰা বিন্যাস ব্যৱস্থাপক"
diff --git a/po/be.po b/po/be.po
index 082e28698..32dda9bd3 100644
--- a/po/be.po
+++ b/po/be.po
@@ -1,12 +1,13 @@
 # Kasia Bondarava <kasia.bondarava@gmail.com>, 2012.
+# Ihar Hrachyshka <ihar.hrachyshka@gmail.com>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: clutter master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=clutter&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2012-08-28 13:46+0000\n"
+"POT-Creation-Date: 2013-08-28 19:59+0000\n"
 "PO-Revision-Date: 2012-09-09 15:29+0300\n"
-"Last-Translator: Kasia Bondarava <kasia.bondarava@gmail.com>\n"
+"Last-Translator: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>\n"
 "Language-Team: Belarusian <i18n-bel-gnome@googlegroups.com>\n"
 "Language: be\n"
 "MIME-Version: 1.0\n"
@@ -17,690 +18,690 @@ msgstr ""
 "X-Generator: Virtaal 0.7.0\n"
 "X-Project-Style: gnome\n"
 
-#: ../clutter/clutter-actor.c:6121
+#: ../clutter/clutter-actor.c:6205
 msgid "X coordinate"
 msgstr "X-каардыната"
 
-#: ../clutter/clutter-actor.c:6122
+#: ../clutter/clutter-actor.c:6206
 msgid "X coordinate of the actor"
 msgstr "X-каардыната актара"
 
-#: ../clutter/clutter-actor.c:6140
+#: ../clutter/clutter-actor.c:6224
 msgid "Y coordinate"
 msgstr "Y-каардыната"
 
-#: ../clutter/clutter-actor.c:6141
+#: ../clutter/clutter-actor.c:6225
 msgid "Y coordinate of the actor"
 msgstr "Y-каардыната актара"
 
-#: ../clutter/clutter-actor.c:6163
+#: ../clutter/clutter-actor.c:6247
 msgid "Position"
 msgstr "Пазіцыя"
 
-#: ../clutter/clutter-actor.c:6164
+#: ../clutter/clutter-actor.c:6248
 msgid "The position of the origin of the actor"
 msgstr "Пазіцыя пачатку актара"
 
-#: ../clutter/clutter-actor.c:6181 ../clutter/clutter-canvas.c:215
-#: ../clutter/clutter-grid-layout.c:1238
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:481
+#: ../clutter/clutter-actor.c:6265 ../clutter/clutter-canvas.c:224
+#: ../clutter/clutter-grid-layout.c:1239
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:474
 msgid "Width"
 msgstr "Шырыня"
 
-#: ../clutter/clutter-actor.c:6182
+#: ../clutter/clutter-actor.c:6266
 msgid "Width of the actor"
 msgstr "Шырыня актара"
 
-#: ../clutter/clutter-actor.c:6200 ../clutter/clutter-canvas.c:231
-#: ../clutter/clutter-grid-layout.c:1245
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:497
+#: ../clutter/clutter-actor.c:6284 ../clutter/clutter-canvas.c:240
+#: ../clutter/clutter-grid-layout.c:1246
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:490
 msgid "Height"
 msgstr "Вышыня"
 
-#: ../clutter/clutter-actor.c:6201
+#: ../clutter/clutter-actor.c:6285
 msgid "Height of the actor"
 msgstr "Вышыня актара"
 
-#: ../clutter/clutter-actor.c:6222
+#: ../clutter/clutter-actor.c:6306
 msgid "Size"
 msgstr "Памер"
 
-#: ../clutter/clutter-actor.c:6223
+#: ../clutter/clutter-actor.c:6307
 msgid "The size of the actor"
 msgstr "Памер актара"
 
-#: ../clutter/clutter-actor.c:6241
+#: ../clutter/clutter-actor.c:6325
 msgid "Fixed X"
 msgstr "Сталая X"
 
-#: ../clutter/clutter-actor.c:6242
+#: ../clutter/clutter-actor.c:6326
 msgid "Forced X position of the actor"
 msgstr "Сталая X-пазіцыя актара"
 
-#: ../clutter/clutter-actor.c:6259
+#: ../clutter/clutter-actor.c:6343
 msgid "Fixed Y"
 msgstr "Сталая Y"
 
-#: ../clutter/clutter-actor.c:6260
+#: ../clutter/clutter-actor.c:6344
 msgid "Forced Y position of the actor"
 msgstr "Сталая Y-пазіцыя актара"
 
-#: ../clutter/clutter-actor.c:6275
+#: ../clutter/clutter-actor.c:6359
 msgid "Fixed position set"
 msgstr "Выбрана сталая пазіцыя"
 
-#: ../clutter/clutter-actor.c:6276
+#: ../clutter/clutter-actor.c:6360
 msgid "Whether to use fixed positioning for the actor"
 msgstr "Ці ўжываць сталую пазіцыю для гэтага актара"
 
-#: ../clutter/clutter-actor.c:6294
+#: ../clutter/clutter-actor.c:6378
 msgid "Min Width"
 msgstr "Мінімальная шырыня"
 
-#: ../clutter/clutter-actor.c:6295
+#: ../clutter/clutter-actor.c:6379
 msgid "Forced minimum width request for the actor"
 msgstr "Сталая мінімальная шырыня актара"
 
-#: ../clutter/clutter-actor.c:6313
+#: ../clutter/clutter-actor.c:6397
 msgid "Min Height"
 msgstr "Мінімальная вышыня"
 
-#: ../clutter/clutter-actor.c:6314
+#: ../clutter/clutter-actor.c:6398
 msgid "Forced minimum height request for the actor"
 msgstr "Сталая мінімальная вышыня актара"
 
-#: ../clutter/clutter-actor.c:6332
+#: ../clutter/clutter-actor.c:6416
 msgid "Natural Width"
 msgstr "Натуральная шырыня"
 
-#: ../clutter/clutter-actor.c:6333
+#: ../clutter/clutter-actor.c:6417
 msgid "Forced natural width request for the actor"
 msgstr "Сталая натуральная шырыня актара"
 
-#: ../clutter/clutter-actor.c:6351
+#: ../clutter/clutter-actor.c:6435
 msgid "Natural Height"
 msgstr "Натуральная вышыня"
 
-#: ../clutter/clutter-actor.c:6352
+#: ../clutter/clutter-actor.c:6436
 msgid "Forced natural height request for the actor"
 msgstr "Сталая натуральная вышыня актара"
 
-#: ../clutter/clutter-actor.c:6367
+#: ../clutter/clutter-actor.c:6451
 msgid "Minimum width set"
 msgstr "Выбрана мінімальная шырыня"
 
-#: ../clutter/clutter-actor.c:6368
+#: ../clutter/clutter-actor.c:6452
 msgid "Whether to use the min-width property"
 msgstr "Ці ўжываць уласцівасць мінімальнай шырыні"
 
-#: ../clutter/clutter-actor.c:6382
+#: ../clutter/clutter-actor.c:6466
 msgid "Minimum height set"
 msgstr "Выбрана мінімальная вышыня"
 
-#: ../clutter/clutter-actor.c:6383
+#: ../clutter/clutter-actor.c:6467
 msgid "Whether to use the min-height property"
 msgstr "Ці ўжываць уласцівасць мінімальнай вышыні"
 
-#: ../clutter/clutter-actor.c:6397
+#: ../clutter/clutter-actor.c:6481
 msgid "Natural width set"
 msgstr "Выбрана натуральная шырыня"
 
-#: ../clutter/clutter-actor.c:6398
+#: ../clutter/clutter-actor.c:6482
 msgid "Whether to use the natural-width property"
 msgstr "Ці ўжываць уласцівасць натуральнай шырыні"
 
-#: ../clutter/clutter-actor.c:6412
+#: ../clutter/clutter-actor.c:6496
 msgid "Natural height set"
 msgstr "Выбрана натуральная вышыня"
 
-#: ../clutter/clutter-actor.c:6413
+#: ../clutter/clutter-actor.c:6497
 msgid "Whether to use the natural-height property"
 msgstr "Ці ўжываць уласцівасць натуральнай вышыні"
 
-#: ../clutter/clutter-actor.c:6429
+#: ../clutter/clutter-actor.c:6513
 msgid "Allocation"
 msgstr "Размеркаванне"
 
-#: ../clutter/clutter-actor.c:6430
+#: ../clutter/clutter-actor.c:6514
 msgid "The actor's allocation"
 msgstr "Размеркаванне актара"
 
-#: ../clutter/clutter-actor.c:6487
+#: ../clutter/clutter-actor.c:6571
 msgid "Request Mode"
 msgstr "Рэжым запыту"
 
-#: ../clutter/clutter-actor.c:6488
+#: ../clutter/clutter-actor.c:6572
 msgid "The actor's request mode"
 msgstr "Рэжым запыту актара"
 
-#: ../clutter/clutter-actor.c:6512
+#: ../clutter/clutter-actor.c:6596
 msgid "Depth"
 msgstr "Глыбіня"
 
-#: ../clutter/clutter-actor.c:6513
+#: ../clutter/clutter-actor.c:6597
 msgid "Position on the Z axis"
 msgstr "Пазіцыя на Z-восі"
 
-#: ../clutter/clutter-actor.c:6540
+#: ../clutter/clutter-actor.c:6624
 msgid "Z Position"
 msgstr "Z-пазіцыя"
 
-#: ../clutter/clutter-actor.c:6541
+#: ../clutter/clutter-actor.c:6625
 msgid "The actor's position on the Z axis"
 msgstr "Пазіцыя актара на Z-восі"
 
-#: ../clutter/clutter-actor.c:6558
+#: ../clutter/clutter-actor.c:6642
 msgid "Opacity"
 msgstr "Непразрыстасць"
 
-#: ../clutter/clutter-actor.c:6559
+#: ../clutter/clutter-actor.c:6643
 msgid "Opacity of an actor"
 msgstr "Непразрыстасць актара"
 
-#: ../clutter/clutter-actor.c:6579
+#: ../clutter/clutter-actor.c:6663
 msgid "Offscreen redirect"
 msgstr "Перанакіраванне па-за экранам"
 
-#: ../clutter/clutter-actor.c:6580
+#: ../clutter/clutter-actor.c:6664
 msgid "Flags controlling when to flatten the actor into a single image"
 msgstr "Сцяжкі, якія кантралююць перавод актара ў адзіночную выяву"
 
-#: ../clutter/clutter-actor.c:6594
+#: ../clutter/clutter-actor.c:6678
 msgid "Visible"
 msgstr "Бачны"
 
-#: ../clutter/clutter-actor.c:6595
+#: ../clutter/clutter-actor.c:6679
 msgid "Whether the actor is visible or not"
 msgstr "Ці бачны актар"
 
-#: ../clutter/clutter-actor.c:6609
+#: ../clutter/clutter-actor.c:6693
 msgid "Mapped"
 msgstr "Адлюстраваны"
 
-#: ../clutter/clutter-actor.c:6610
+#: ../clutter/clutter-actor.c:6694
 msgid "Whether the actor will be painted"
 msgstr "Ці актар будзе пафарбаваны"
 
-#: ../clutter/clutter-actor.c:6623
+#: ../clutter/clutter-actor.c:6707
 msgid "Realized"
 msgstr "Рэалізаваны"
 
-#: ../clutter/clutter-actor.c:6624
+#: ../clutter/clutter-actor.c:6708
 msgid "Whether the actor has been realized"
 msgstr "Ці актар быў рэалізаваны"
 
-#: ../clutter/clutter-actor.c:6639
+#: ../clutter/clutter-actor.c:6723
 msgid "Reactive"
 msgstr "Ці рэагуе"
 
-#: ../clutter/clutter-actor.c:6640
+#: ../clutter/clutter-actor.c:6724
 msgid "Whether the actor is reactive to events"
 msgstr "Ці рэагуе актар на падзеі"
 
-#: ../clutter/clutter-actor.c:6651
+#: ../clutter/clutter-actor.c:6735
 msgid "Has Clip"
 msgstr "Мае заціск"
 
-#: ../clutter/clutter-actor.c:6652
+#: ../clutter/clutter-actor.c:6736
 msgid "Whether the actor has a clip set"
 msgstr "Ці настаўлены заціск актара"
 
-#: ../clutter/clutter-actor.c:6665
+#: ../clutter/clutter-actor.c:6749
 msgid "Clip"
 msgstr "Заціск"
 
-#: ../clutter/clutter-actor.c:6666
+#: ../clutter/clutter-actor.c:6750
 msgid "The clip region for the actor"
 msgstr "Абшар заціску актара"
 
-#: ../clutter/clutter-actor.c:6685
+#: ../clutter/clutter-actor.c:6769
 msgid "Clip Rectangle"
 msgstr "Прамавугольнік заціску"
 
-#: ../clutter/clutter-actor.c:6686
+#: ../clutter/clutter-actor.c:6770
 msgid "The visible region of the actor"
 msgstr "Бачны абшар актара"
 
-#: ../clutter/clutter-actor.c:6700 ../clutter/clutter-actor-meta.c:207
+#: ../clutter/clutter-actor.c:6784 ../clutter/clutter-actor-meta.c:205
 #: ../clutter/clutter-binding-pool.c:319 ../clutter/clutter-input-device.c:258
 msgid "Name"
 msgstr "Назва"
 
-#: ../clutter/clutter-actor.c:6701
+#: ../clutter/clutter-actor.c:6785
 msgid "Name of the actor"
 msgstr "Назва актара"
 
-#: ../clutter/clutter-actor.c:6722
+#: ../clutter/clutter-actor.c:6806
 msgid "Pivot Point"
 msgstr "Апорны пункт"
 
-#: ../clutter/clutter-actor.c:6723
+#: ../clutter/clutter-actor.c:6807
 msgid "The point around which the scaling and rotation occur"
 msgstr "Пункт, адносна якога ажыццяўляецца маштабаванне і кручэнне"
 
-#: ../clutter/clutter-actor.c:6741
+#: ../clutter/clutter-actor.c:6825
 msgid "Pivot Point Z"
 msgstr "Апорны Z-пункт"
 
-#: ../clutter/clutter-actor.c:6742
+#: ../clutter/clutter-actor.c:6826
 msgid "Z component of the pivot point"
 msgstr "Z-складнік апорнага пункта"
 
-#: ../clutter/clutter-actor.c:6760
+#: ../clutter/clutter-actor.c:6844
 msgid "Scale X"
 msgstr "Маштаб па X-восі"
 
-#: ../clutter/clutter-actor.c:6761
+#: ../clutter/clutter-actor.c:6845
 msgid "Scale factor on the X axis"
 msgstr "Маштабны каэфіцыент па X-восі"
 
-#: ../clutter/clutter-actor.c:6779
+#: ../clutter/clutter-actor.c:6863
 msgid "Scale Y"
 msgstr "Маштаб па Y-восі"
 
-#: ../clutter/clutter-actor.c:6780
+#: ../clutter/clutter-actor.c:6864
 msgid "Scale factor on the Y axis"
 msgstr "Маштабны каэфіцыент па Y-восі"
 
-#: ../clutter/clutter-actor.c:6798
+#: ../clutter/clutter-actor.c:6882
 msgid "Scale Z"
 msgstr "Маштаб па Z-восі"
 
-#: ../clutter/clutter-actor.c:6799
+#: ../clutter/clutter-actor.c:6883
 msgid "Scale factor on the Z axis"
 msgstr "Маштабны каэфіцыент па Z-восі"
 
-#: ../clutter/clutter-actor.c:6817
+#: ../clutter/clutter-actor.c:6901
 msgid "Scale Center X"
 msgstr "Цэнтр маштабавання па X-восі"
 
-#: ../clutter/clutter-actor.c:6818
+#: ../clutter/clutter-actor.c:6902
 msgid "Horizontal scale center"
 msgstr "Цэнтр маштабавання па гарызанталі"
 
-#: ../clutter/clutter-actor.c:6836
+#: ../clutter/clutter-actor.c:6920
 msgid "Scale Center Y"
 msgstr "Цэнтр маштабавання па Y-восі"
 
-#: ../clutter/clutter-actor.c:6837
+#: ../clutter/clutter-actor.c:6921
 msgid "Vertical scale center"
 msgstr "Цэнтр маштабавання па вертыкалі"
 
-#: ../clutter/clutter-actor.c:6855
+#: ../clutter/clutter-actor.c:6939
 msgid "Scale Gravity"
 msgstr "Прыцягненне маштабавання"
 
-#: ../clutter/clutter-actor.c:6856
+#: ../clutter/clutter-actor.c:6940
 msgid "The center of scaling"
 msgstr "Цэнтр маштабавання"
 
-#: ../clutter/clutter-actor.c:6874
+#: ../clutter/clutter-actor.c:6958
 msgid "Rotation Angle X"
 msgstr "Вугал X-кручэння"
 
-#: ../clutter/clutter-actor.c:6875
+#: ../clutter/clutter-actor.c:6959
 msgid "The rotation angle on the X axis"
 msgstr "Вугал кручэння па X-восі"
 
-#: ../clutter/clutter-actor.c:6893
+#: ../clutter/clutter-actor.c:6977
 msgid "Rotation Angle Y"
 msgstr "Вугал Y-кручэння"
 
-#: ../clutter/clutter-actor.c:6894
+#: ../clutter/clutter-actor.c:6978
 msgid "The rotation angle on the Y axis"
 msgstr "Вугал кручэння па Y-восі"
 
-#: ../clutter/clutter-actor.c:6912
+#: ../clutter/clutter-actor.c:6996
 msgid "Rotation Angle Z"
 msgstr "Вугал Z-кручэння"
 
-#: ../clutter/clutter-actor.c:6913
+#: ../clutter/clutter-actor.c:6997
 msgid "The rotation angle on the Z axis"
 msgstr "Вугал кручэння па Z-восі"
 
-#: ../clutter/clutter-actor.c:6931
+#: ../clutter/clutter-actor.c:7015
 msgid "Rotation Center X"
 msgstr "Цэнтр X-кручэння"
 
-#: ../clutter/clutter-actor.c:6932
+#: ../clutter/clutter-actor.c:7016
 msgid "The rotation center on the X axis"
 msgstr "Цэнтр кручэння па X-восі"
 
-#: ../clutter/clutter-actor.c:6949
+#: ../clutter/clutter-actor.c:7033
 msgid "Rotation Center Y"
 msgstr "Цэнтр Y-кручэння"
 
-#: ../clutter/clutter-actor.c:6950
+#: ../clutter/clutter-actor.c:7034
 msgid "The rotation center on the Y axis"
 msgstr "Цэнтр кручэння па Y-восі"
 
-#: ../clutter/clutter-actor.c:6967
+#: ../clutter/clutter-actor.c:7051
 msgid "Rotation Center Z"
 msgstr "Цэнтр Z-кручэння"
 
-#: ../clutter/clutter-actor.c:6968
+#: ../clutter/clutter-actor.c:7052
 msgid "The rotation center on the Z axis"
 msgstr "Цэнтр кручэння па Z-восі"
 
-#: ../clutter/clutter-actor.c:6985
+#: ../clutter/clutter-actor.c:7069
 msgid "Rotation Center Z Gravity"
 msgstr "Прыцягненне цэнтра Z-кручэння"
 
-#: ../clutter/clutter-actor.c:6986
+#: ../clutter/clutter-actor.c:7070
 msgid "Center point for rotation around the Z axis"
 msgstr "Цэнтральны пункт кручэння вакол Z-восі"
 
-#: ../clutter/clutter-actor.c:7014
+#: ../clutter/clutter-actor.c:7098
 msgid "Anchor X"
 msgstr "X-якар"
 
-#: ../clutter/clutter-actor.c:7015
+#: ../clutter/clutter-actor.c:7099
 msgid "X coordinate of the anchor point"
 msgstr "X-каардыната пункта якара"
 
-#: ../clutter/clutter-actor.c:7043
+#: ../clutter/clutter-actor.c:7127
 msgid "Anchor Y"
 msgstr "Y-якар"
 
-#: ../clutter/clutter-actor.c:7044
+#: ../clutter/clutter-actor.c:7128
 msgid "Y coordinate of the anchor point"
 msgstr "Y-каардыната пункта якара"
 
-#: ../clutter/clutter-actor.c:7071
+#: ../clutter/clutter-actor.c:7155
 msgid "Anchor Gravity"
 msgstr "Прыцягненне якара"
 
-#: ../clutter/clutter-actor.c:7072
+#: ../clutter/clutter-actor.c:7156
 msgid "The anchor point as a ClutterGravity"
 msgstr "Пункт якара як ClutterGravity"
 
-#: ../clutter/clutter-actor.c:7091
+#: ../clutter/clutter-actor.c:7175
 msgid "Translation X"
 msgstr "X-пераўтварэнне"
 
-#: ../clutter/clutter-actor.c:7092
+#: ../clutter/clutter-actor.c:7176
 msgid "Translation along the X axis"
 msgstr "Пераўтварэнне паўз X-вось"
 
-#: ../clutter/clutter-actor.c:7111
+#: ../clutter/clutter-actor.c:7195
 msgid "Translation Y"
 msgstr "Y-пераўтварэнне"
 
-#: ../clutter/clutter-actor.c:7112
+#: ../clutter/clutter-actor.c:7196
 msgid "Translation along the Y axis"
 msgstr "Пераўтварэнне паўз Y-вось"
 
-#: ../clutter/clutter-actor.c:7131
+#: ../clutter/clutter-actor.c:7215
 msgid "Translation Z"
 msgstr "Z-пераўтварэнне"
 
-#: ../clutter/clutter-actor.c:7132
+#: ../clutter/clutter-actor.c:7216
 msgid "Translation along the Z axis"
 msgstr "Пераўтварэнне паўз Z-вось"
 
-#: ../clutter/clutter-actor.c:7160
+#: ../clutter/clutter-actor.c:7246
 msgid "Transform"
 msgstr "Трансфармацыя"
 
-#: ../clutter/clutter-actor.c:7161
+#: ../clutter/clutter-actor.c:7247
 msgid "Transformation matrix"
 msgstr "Матрыца трансфармацыі"
 
-#: ../clutter/clutter-actor.c:7175
+#: ../clutter/clutter-actor.c:7262
 msgid "Transform Set"
 msgstr "Набор транфармацый"
 
-#: ../clutter/clutter-actor.c:7176
+#: ../clutter/clutter-actor.c:7263
 msgid "Whether the transform property is set"
 msgstr "Ці настаўлена ўласцівасць transform"
 
-#: ../clutter/clutter-actor.c:7195
+#: ../clutter/clutter-actor.c:7284
 msgid "Child Transform"
 msgstr "Трансфармацыя нашчадкаў"
 
-#: ../clutter/clutter-actor.c:7196
+#: ../clutter/clutter-actor.c:7285
 msgid "Children transformation matrix"
 msgstr "Матрыца трансфармацыі нашчадкаў"
 
-#: ../clutter/clutter-actor.c:7210
+#: ../clutter/clutter-actor.c:7300
 msgid "Child Transform Set"
 msgstr "Набор транфармацый нашчадкаў"
 
-#: ../clutter/clutter-actor.c:7211
+#: ../clutter/clutter-actor.c:7301
 msgid "Whether the child-transform property is set"
 msgstr "Ці настаўлена ўласцівасць child-transform"
 
-#: ../clutter/clutter-actor.c:7228
+#: ../clutter/clutter-actor.c:7318
 msgid "Show on set parent"
 msgstr "Паказаць на настаўленым бацьку"
 
-#: ../clutter/clutter-actor.c:7229
+#: ../clutter/clutter-actor.c:7319
 msgid "Whether the actor is shown when parented"
 msgstr "Ці актар бачны, калі ў яго ёсць бацька"
 
-#: ../clutter/clutter-actor.c:7246
+#: ../clutter/clutter-actor.c:7336
 msgid "Clip to Allocation"
 msgstr "Заціск для размеркавання"
 
-#: ../clutter/clutter-actor.c:7247
+#: ../clutter/clutter-actor.c:7337
 msgid "Sets the clip region to track the actor's allocation"
 msgstr "Настаўляе абшар заціску для адсочвання размеркавання актара"
 
-#: ../clutter/clutter-actor.c:7260
+#: ../clutter/clutter-actor.c:7350
 msgid "Text Direction"
 msgstr "Кірунак тэксту"
 
-#: ../clutter/clutter-actor.c:7261
+#: ../clutter/clutter-actor.c:7351
 msgid "Direction of the text"
 msgstr "Кірунак тэксту"
 
-#: ../clutter/clutter-actor.c:7276
+#: ../clutter/clutter-actor.c:7366
 msgid "Has Pointer"
 msgstr "Мае паказальнік"
 
-#: ../clutter/clutter-actor.c:7277
+#: ../clutter/clutter-actor.c:7367
 msgid "Whether the actor contains the pointer of an input device"
 msgstr "Ці актар утрымлівае паказальнік уводнага прыстасавання"
 
-#: ../clutter/clutter-actor.c:7290
+#: ../clutter/clutter-actor.c:7380
 msgid "Actions"
 msgstr "Дзеянні"
 
-#: ../clutter/clutter-actor.c:7291
+#: ../clutter/clutter-actor.c:7381
 msgid "Adds an action to the actor"
 msgstr "Дадае дзеянне для актара"
 
-#: ../clutter/clutter-actor.c:7304
+#: ../clutter/clutter-actor.c:7394
 msgid "Constraints"
 msgstr "Абмежаванні"
 
-#: ../clutter/clutter-actor.c:7305
+#: ../clutter/clutter-actor.c:7395
 msgid "Adds a constraint to the actor"
 msgstr "Дадае абмежаванне для актара"
 
-#: ../clutter/clutter-actor.c:7318
+#: ../clutter/clutter-actor.c:7408
 msgid "Effect"
 msgstr "Эфект"
 
-#: ../clutter/clutter-actor.c:7319
+#: ../clutter/clutter-actor.c:7409
 msgid "Add an effect to be applied on the actor"
 msgstr "Дадае эфект для актара"
 
-#: ../clutter/clutter-actor.c:7333
+#: ../clutter/clutter-actor.c:7423
 msgid "Layout Manager"
 msgstr "Кіраўнік размяшчэння"
 
-#: ../clutter/clutter-actor.c:7334
+#: ../clutter/clutter-actor.c:7424
 msgid "The object controlling the layout of an actor's children"
 msgstr "Аб'ект, які кіруе размяшчэннем нашчадкаў актара"
 
-#: ../clutter/clutter-actor.c:7348
+#: ../clutter/clutter-actor.c:7438
 msgid "X Expand"
 msgstr "Разгарнуць па X-восі"
 
-#: ../clutter/clutter-actor.c:7349
+#: ../clutter/clutter-actor.c:7439
 msgid "Whether extra horizontal space should be assigned to the actor"
 msgstr "Ці трэба прызначыць актару дадатковы абшар па гарызанталі"
 
-#: ../clutter/clutter-actor.c:7364
+#: ../clutter/clutter-actor.c:7454
 msgid "Y Expand"
 msgstr "Разгарнуць па Y-восі"
 
-#: ../clutter/clutter-actor.c:7365
+#: ../clutter/clutter-actor.c:7455
 msgid "Whether extra vertical space should be assigned to the actor"
 msgstr "Ці трэба прызначыць актару дадатковы абшар па вертыкалі"
 
-#: ../clutter/clutter-actor.c:7381
+#: ../clutter/clutter-actor.c:7471
 msgid "X Alignment"
 msgstr "X-раўнаванне"
 
-#: ../clutter/clutter-actor.c:7382
+#: ../clutter/clutter-actor.c:7472
 msgid "The alignment of the actor on the X axis within its allocation"
 msgstr "Раўнаванне актара па X-восі ўнутры яго размеркавання"
 
-#: ../clutter/clutter-actor.c:7397
+#: ../clutter/clutter-actor.c:7487
 msgid "Y Alignment"
 msgstr "Y-раўнаванне"
 
-#: ../clutter/clutter-actor.c:7398
+#: ../clutter/clutter-actor.c:7488
 msgid "The alignment of the actor on the Y axis within its allocation"
 msgstr "Раўнаванне актара па Y-восі ўнутры яго размеркавання"
 
-#: ../clutter/clutter-actor.c:7417
+#: ../clutter/clutter-actor.c:7507
 msgid "Margin Top"
 msgstr "Верхняе поле"
 
-#: ../clutter/clutter-actor.c:7418
+#: ../clutter/clutter-actor.c:7508
 msgid "Extra space at the top"
 msgstr "Дадатковая прастора ўверсе"
 
-#: ../clutter/clutter-actor.c:7439
+#: ../clutter/clutter-actor.c:7529
 msgid "Margin Bottom"
 msgstr "Ніжняе поле"
 
-#: ../clutter/clutter-actor.c:7440
+#: ../clutter/clutter-actor.c:7530
 msgid "Extra space at the bottom"
 msgstr "Дадатковая прастора ўнізе"
 
-#: ../clutter/clutter-actor.c:7461
+#: ../clutter/clutter-actor.c:7551
 msgid "Margin Left"
 msgstr "Левае поле"
 
-#: ../clutter/clutter-actor.c:7462
+#: ../clutter/clutter-actor.c:7552
 msgid "Extra space at the left"
 msgstr "Дадатковая прастора злева"
 
-#: ../clutter/clutter-actor.c:7483
+#: ../clutter/clutter-actor.c:7573
 msgid "Margin Right"
 msgstr "Правае поле"
 
-#: ../clutter/clutter-actor.c:7484
+#: ../clutter/clutter-actor.c:7574
 msgid "Extra space at the right"
 msgstr "Дадатковая прастора справа"
 
-#: ../clutter/clutter-actor.c:7500
+#: ../clutter/clutter-actor.c:7590
 msgid "Background Color Set"
 msgstr "Фонавы колер"
 
-#: ../clutter/clutter-actor.c:7501 ../clutter/deprecated/clutter-box.c:275
+#: ../clutter/clutter-actor.c:7591 ../clutter/deprecated/clutter-box.c:271
 msgid "Whether the background color is set"
 msgstr "Ці настаўлены фонавы колер"
 
-#: ../clutter/clutter-actor.c:7517
+#: ../clutter/clutter-actor.c:7607
 msgid "Background color"
 msgstr "Фонавы колер"
 
-#: ../clutter/clutter-actor.c:7518
+#: ../clutter/clutter-actor.c:7608
 msgid "The actor's background color"
 msgstr "Фонавы колер актара"
 
-#: ../clutter/clutter-actor.c:7533
+#: ../clutter/clutter-actor.c:7623
 msgid "First Child"
 msgstr "Першы нашчадак"
 
-#: ../clutter/clutter-actor.c:7534
+#: ../clutter/clutter-actor.c:7624
 msgid "The actor's first child"
 msgstr "Першы нашчадак актара"
 
-#: ../clutter/clutter-actor.c:7547
+#: ../clutter/clutter-actor.c:7637
 msgid "Last Child"
 msgstr "Апошні нашчадак"
 
-#: ../clutter/clutter-actor.c:7548
+#: ../clutter/clutter-actor.c:7638
 msgid "The actor's last child"
 msgstr "Апошні нашчадак актара"
 
-#: ../clutter/clutter-actor.c:7562
+#: ../clutter/clutter-actor.c:7652
 msgid "Content"
 msgstr "Змесціва"
 
-#: ../clutter/clutter-actor.c:7563
+#: ../clutter/clutter-actor.c:7653
 msgid "Delegate object for painting the actor's content"
 msgstr "Аб'ект-дэлегат для малявання змесціва актара"
 
-#: ../clutter/clutter-actor.c:7588
+#: ../clutter/clutter-actor.c:7678
 msgid "Content Gravity"
 msgstr "Прыцягненне змесціва"
 
-#: ../clutter/clutter-actor.c:7589
+#: ../clutter/clutter-actor.c:7679
 msgid "Alignment of the actor's content"
 msgstr "Раўнаванне змесціва актара"
 
-#: ../clutter/clutter-actor.c:7609
+#: ../clutter/clutter-actor.c:7699
 msgid "Content Box"
 msgstr "Рамка са змесцівам"
 
-#: ../clutter/clutter-actor.c:7610
+#: ../clutter/clutter-actor.c:7700
 msgid "The bounding box of the actor's content"
 msgstr "Рамка, у якой знаходзіцца змесціва актара"
 
-#: ../clutter/clutter-actor.c:7618
+#: ../clutter/clutter-actor.c:7708
 msgid "Minification Filter"
 msgstr "Памяншальны фільтр"
 
-#: ../clutter/clutter-actor.c:7619
+#: ../clutter/clutter-actor.c:7709
 msgid "The filter used when reducing the size of the content"
 msgstr "Фільтр для памяншэння памеру змесціва"
 
-#: ../clutter/clutter-actor.c:7626
+#: ../clutter/clutter-actor.c:7716
 msgid "Magnification Filter"
 msgstr "Павелічальны фільтр"
 
-#: ../clutter/clutter-actor.c:7627
+#: ../clutter/clutter-actor.c:7717
 msgid "The filter used when increasing the size of the content"
 msgstr "Фільтр для павелічэння памеру змесціва"
 
-#: ../clutter/clutter-actor.c:7641
+#: ../clutter/clutter-actor.c:7731
 msgid "Content Repeat"
 msgstr "Паўтор змесціва"
 
-#: ../clutter/clutter-actor.c:7642
+#: ../clutter/clutter-actor.c:7732
 msgid "The repeat policy for the actor's content"
 msgstr "Правілы паўтору змесціва актара"
 
-#: ../clutter/clutter-actor-meta.c:193 ../clutter/clutter-child-meta.c:142
+#: ../clutter/clutter-actor-meta.c:191 ../clutter/clutter-child-meta.c:142
 msgid "Actor"
 msgstr "Актар"
 
-#: ../clutter/clutter-actor-meta.c:194
+#: ../clutter/clutter-actor-meta.c:192
 msgid "The actor attached to the meta"
 msgstr "Актар, прычэплены да метааб'екта"
 
-#: ../clutter/clutter-actor-meta.c:208
+#: ../clutter/clutter-actor-meta.c:206
 msgid "The name of the meta"
 msgstr "Назва метааб'екта"
 
-#: ../clutter/clutter-actor-meta.c:221 ../clutter/clutter-input-device.c:337
-#: ../clutter/deprecated/clutter-shader.c:313
+#: ../clutter/clutter-actor-meta.c:219 ../clutter/clutter-input-device.c:337
+#: ../clutter/deprecated/clutter-shader.c:309
 msgid "Enabled"
 msgstr "Уключаны"
 
-#: ../clutter/clutter-actor-meta.c:222
+#: ../clutter/clutter-actor-meta.c:220
 msgid "Whether the meta is enabled"
 msgstr "Ці метааб'ект уключаны"
 
 #: ../clutter/clutter-align-constraint.c:279
-#: ../clutter/clutter-bind-constraint.c:358 ../clutter/clutter-clone.c:345
+#: ../clutter/clutter-bind-constraint.c:358 ../clutter/clutter-clone.c:341
 #: ../clutter/clutter-snap-constraint.c:321
 msgid "Source"
 msgstr "Крыніца"
@@ -726,11 +727,11 @@ msgstr "Множнік"
 msgid "The alignment factor, between 0.0 and 1.0"
 msgstr "Множнік раўнавання, ад 0.0 да 1.0"
 
-#: ../clutter/clutter-backend.c:379
+#: ../clutter/clutter-backend.c:376
 msgid "Unable to initialize the Clutter backend"
 msgstr "Не ўдалося ініцыяваць праграмны драйвер Clutter"
 
-#: ../clutter/clutter-backend.c:453
+#: ../clutter/clutter-backend.c:450
 #, c-format
 msgid "The backend of type '%s' does not support creating multiple stages"
 msgstr "Праграмны драйвер тыпу \"%s\" не падтрымлівае стварэнне некалькіх сцэн"
@@ -761,49 +762,49 @@ msgstr "Зрух у пікселах для прывязкі"
 msgid "The unique name of the binding pool"
 msgstr "Унікальная назва збору прывязак"
 
-#: ../clutter/clutter-bin-layout.c:240 ../clutter/clutter-bin-layout.c:649
-#: ../clutter/clutter-box-layout.c:390 ../clutter/clutter-table-layout.c:610
+#: ../clutter/clutter-bin-layout.c:238 ../clutter/clutter-bin-layout.c:651
+#: ../clutter/clutter-box-layout.c:388 ../clutter/clutter-table-layout.c:604
 msgid "Horizontal Alignment"
 msgstr "Гарызантальнае раўнаванне"
 
-#: ../clutter/clutter-bin-layout.c:241
+#: ../clutter/clutter-bin-layout.c:239
 msgid "Horizontal alignment for the actor inside the layout manager"
 msgstr "Гарызантальнае раўнаванне для актара ўнутры кіраўніка размяшчэння"
 
-#: ../clutter/clutter-bin-layout.c:249 ../clutter/clutter-bin-layout.c:669
-#: ../clutter/clutter-box-layout.c:399 ../clutter/clutter-table-layout.c:625
+#: ../clutter/clutter-bin-layout.c:247 ../clutter/clutter-bin-layout.c:671
+#: ../clutter/clutter-box-layout.c:397 ../clutter/clutter-table-layout.c:619
 msgid "Vertical Alignment"
 msgstr "Вертыкальнае раўнаванне"
 
-#: ../clutter/clutter-bin-layout.c:250
+#: ../clutter/clutter-bin-layout.c:248
 msgid "Vertical alignment for the actor inside the layout manager"
 msgstr "Вертыкальнае раўнаванне для актара ўнутры кіраўніка размяшчэння"
 
-#: ../clutter/clutter-bin-layout.c:650
+#: ../clutter/clutter-bin-layout.c:652
 msgid "Default horizontal alignment for the actors inside the layout manager"
 msgstr ""
 "Прадвызначанае гарызантальнае раўнаванне для актараў унутры кіраўніка "
 "размяшчэння"
 
-#: ../clutter/clutter-bin-layout.c:670
+#: ../clutter/clutter-bin-layout.c:672
 msgid "Default vertical alignment for the actors inside the layout manager"
 msgstr ""
 "Прадвызначанае вертыкальнае раўнаванне для актараў унутры кіраўніка "
 "размяшчэння"
 
-#: ../clutter/clutter-box-layout.c:365
+#: ../clutter/clutter-box-layout.c:363
 msgid "Expand"
 msgstr "Разгарнуць"
 
-#: ../clutter/clutter-box-layout.c:366
+#: ../clutter/clutter-box-layout.c:364
 msgid "Allocate extra space for the child"
 msgstr "Выдзеліць дадатковую прастору для нашчадка"
 
-#: ../clutter/clutter-box-layout.c:372 ../clutter/clutter-table-layout.c:589
+#: ../clutter/clutter-box-layout.c:370 ../clutter/clutter-table-layout.c:583
 msgid "Horizontal Fill"
 msgstr "Гарызантальнае запаўненне"
 
-#: ../clutter/clutter-box-layout.c:373 ../clutter/clutter-table-layout.c:590
+#: ../clutter/clutter-box-layout.c:371 ../clutter/clutter-table-layout.c:584
 msgid ""
 "Whether the child should receive priority when the container is allocating "
 "spare space on the horizontal axis"
@@ -811,11 +812,11 @@ msgstr ""
 "Ці нашчадак мусіць атрымаць прыярытэт, калі кантэйнер змяшчаецца ў пустой "
 "прасторы па гарызанталі"
 
-#: ../clutter/clutter-box-layout.c:381 ../clutter/clutter-table-layout.c:596
+#: ../clutter/clutter-box-layout.c:379 ../clutter/clutter-table-layout.c:590
 msgid "Vertical Fill"
 msgstr "Вертыкальнае запаўненне"
 
-#: ../clutter/clutter-box-layout.c:382 ../clutter/clutter-table-layout.c:597
+#: ../clutter/clutter-box-layout.c:380 ../clutter/clutter-table-layout.c:591
 msgid ""
 "Whether the child should receive priority when the container is allocating "
 "spare space on the vertical axis"
@@ -823,104 +824,104 @@ msgstr ""
 "Ці нашчадак мусіць атрымаць прыярытэт, калі кантэйнер змяшчаецца ў пустой "
 "прасторы па вертыкалі"
 
-#: ../clutter/clutter-box-layout.c:391 ../clutter/clutter-table-layout.c:611
+#: ../clutter/clutter-box-layout.c:389 ../clutter/clutter-table-layout.c:605
 msgid "Horizontal alignment of the actor within the cell"
 msgstr "Гарызантальнае раўнаванне актара ўнутры клеткі"
 
-#: ../clutter/clutter-box-layout.c:400 ../clutter/clutter-table-layout.c:626
+#: ../clutter/clutter-box-layout.c:398 ../clutter/clutter-table-layout.c:620
 msgid "Vertical alignment of the actor within the cell"
 msgstr "Вертыкальнае раўнаванне актара ўнутры клеткі"
 
-#: ../clutter/clutter-box-layout.c:1365
+#: ../clutter/clutter-box-layout.c:1359
 msgid "Vertical"
 msgstr "Вертыкальна"
 
-#: ../clutter/clutter-box-layout.c:1366
+#: ../clutter/clutter-box-layout.c:1360
 msgid "Whether the layout should be vertical, rather than horizontal"
 msgstr "Ці размяшчэнне мусіць быць вертыкальным замест гарызантальнага"
 
-#: ../clutter/clutter-box-layout.c:1383 ../clutter/clutter-flow-layout.c:890
-#: ../clutter/clutter-grid-layout.c:1547
+#: ../clutter/clutter-box-layout.c:1377 ../clutter/clutter-flow-layout.c:942
+#: ../clutter/clutter-grid-layout.c:1549
 msgid "Orientation"
 msgstr "Арыентацыя"
 
-#: ../clutter/clutter-box-layout.c:1384 ../clutter/clutter-flow-layout.c:891
-#: ../clutter/clutter-grid-layout.c:1548
+#: ../clutter/clutter-box-layout.c:1378 ../clutter/clutter-flow-layout.c:943
+#: ../clutter/clutter-grid-layout.c:1550
 msgid "The orientation of the layout"
 msgstr "Арыентацыя размяшчэння"
 
-#: ../clutter/clutter-box-layout.c:1400 ../clutter/clutter-flow-layout.c:906
+#: ../clutter/clutter-box-layout.c:1394 ../clutter/clutter-flow-layout.c:958
 msgid "Homogeneous"
 msgstr "Аднастайна"
 
-#: ../clutter/clutter-box-layout.c:1401
+#: ../clutter/clutter-box-layout.c:1395
 msgid ""
 "Whether the layout should be homogeneous, i.e. all childs get the same size"
 msgstr ""
 "Ці размяшчэнне мусіць быць аднастайным, г.зн. усе нашчадкі маюць аднолькавыя "
 "памеры"
 
-#: ../clutter/clutter-box-layout.c:1416
+#: ../clutter/clutter-box-layout.c:1410
 msgid "Pack Start"
 msgstr "Пачатак пакавання"
 
-#: ../clutter/clutter-box-layout.c:1417
+#: ../clutter/clutter-box-layout.c:1411
 msgid "Whether to pack items at the start of the box"
 msgstr "Ці пакаваць элементы ў пачатку рамкі"
 
-#: ../clutter/clutter-box-layout.c:1430
+#: ../clutter/clutter-box-layout.c:1424
 msgid "Spacing"
 msgstr "Прагал"
 
-#: ../clutter/clutter-box-layout.c:1431
+#: ../clutter/clutter-box-layout.c:1425
 msgid "Spacing between children"
 msgstr "Прагал паміж нашчадкамі"
 
-#: ../clutter/clutter-box-layout.c:1448 ../clutter/clutter-table-layout.c:1675
+#: ../clutter/clutter-box-layout.c:1442 ../clutter/clutter-table-layout.c:1667
 msgid "Use Animations"
 msgstr "Ужыць анімацыю"
 
-#: ../clutter/clutter-box-layout.c:1449 ../clutter/clutter-table-layout.c:1676
+#: ../clutter/clutter-box-layout.c:1443 ../clutter/clutter-table-layout.c:1668
 msgid "Whether layout changes should be animated"
 msgstr "Ці трэба анімаваць змяненне размяшчэння"
 
-#: ../clutter/clutter-box-layout.c:1473 ../clutter/clutter-table-layout.c:1700
+#: ../clutter/clutter-box-layout.c:1467 ../clutter/clutter-table-layout.c:1692
 msgid "Easing Mode"
 msgstr "Рэжым змянення кіроўнай функцыі"
 
-#: ../clutter/clutter-box-layout.c:1474 ../clutter/clutter-table-layout.c:1701
+#: ../clutter/clutter-box-layout.c:1468 ../clutter/clutter-table-layout.c:1693
 msgid "The easing mode of the animations"
 msgstr "Рэжым змянення кіроўнай функцыі анімацыі"
 
-#: ../clutter/clutter-box-layout.c:1494 ../clutter/clutter-table-layout.c:1721
+#: ../clutter/clutter-box-layout.c:1488 ../clutter/clutter-table-layout.c:1713
 msgid "Easing Duration"
 msgstr "Працягласць змянення кіроўнай функцыі"
 
-#: ../clutter/clutter-box-layout.c:1495 ../clutter/clutter-table-layout.c:1722
+#: ../clutter/clutter-box-layout.c:1489 ../clutter/clutter-table-layout.c:1714
 msgid "The duration of the animations"
 msgstr "Працягласць анімацыі"
 
-#: ../clutter/clutter-brightness-contrast-effect.c:307
+#: ../clutter/clutter-brightness-contrast-effect.c:321
 msgid "Brightness"
 msgstr "Яркасць"
 
-#: ../clutter/clutter-brightness-contrast-effect.c:308
+#: ../clutter/clutter-brightness-contrast-effect.c:322
 msgid "The brightness change to apply"
 msgstr "Велічыня змены яркасці"
 
-#: ../clutter/clutter-brightness-contrast-effect.c:327
+#: ../clutter/clutter-brightness-contrast-effect.c:341
 msgid "Contrast"
 msgstr "Кантраснасць"
 
-#: ../clutter/clutter-brightness-contrast-effect.c:328
+#: ../clutter/clutter-brightness-contrast-effect.c:342
 msgid "The contrast change to apply"
 msgstr "Велічыня змены кантраснасці"
 
-#: ../clutter/clutter-canvas.c:216
+#: ../clutter/clutter-canvas.c:225
 msgid "The width of the canvas"
 msgstr "Шырыня палатна"
 
-#: ../clutter/clutter-canvas.c:232
+#: ../clutter/clutter-canvas.c:241
 msgid "The height of the canvas"
 msgstr "Вышыня палатна"
 
@@ -936,39 +937,39 @@ msgstr "Кантэйнер, які стварыў гэтыя даныя"
 msgid "The actor wrapped by this data"
 msgstr "Актар, запакаваны гэтымі данымі"
 
-#: ../clutter/clutter-click-action.c:546
+#: ../clutter/clutter-click-action.c:557
 msgid "Pressed"
 msgstr "Націснуты"
 
-#: ../clutter/clutter-click-action.c:547
+#: ../clutter/clutter-click-action.c:558
 msgid "Whether the clickable should be in pressed state"
 msgstr "Ці аб'ект, які рэагуе на пстрычкі, мусіць быць націснуты"
 
-#: ../clutter/clutter-click-action.c:560
+#: ../clutter/clutter-click-action.c:571
 msgid "Held"
 msgstr "Утрыманне"
 
-#: ../clutter/clutter-click-action.c:561
+#: ../clutter/clutter-click-action.c:572
 msgid "Whether the clickable has a grab"
 msgstr "Ці мусіць аб'ект, які рэагуе на пстрычкі, утрымліваць курсор"
 
-#: ../clutter/clutter-click-action.c:578 ../clutter/clutter-settings.c:599
+#: ../clutter/clutter-click-action.c:589 ../clutter/clutter-settings.c:607
 msgid "Long Press Duration"
 msgstr "Працягласць доўгага націскання"
 
-#: ../clutter/clutter-click-action.c:579
+#: ../clutter/clutter-click-action.c:590
 msgid "The minimum duration of a long press to recognize the gesture"
 msgstr "Мінімальная працягласць доўгага націскання, каб пазнаць жэст"
 
-#: ../clutter/clutter-click-action.c:597
+#: ../clutter/clutter-click-action.c:608
 msgid "Long Press Threshold"
 msgstr "Парог доўгага націскання"
 
-#: ../clutter/clutter-click-action.c:598
+#: ../clutter/clutter-click-action.c:609
 msgid "The maximum threshold before a long press is cancelled"
 msgstr "Максімальны парог перад ануляваннем доўгага націскання"
 
-#: ../clutter/clutter-clone.c:346
+#: ../clutter/clutter-clone.c:342
 msgid "Specifies the actor to be cloned"
 msgstr "Вызначае актара для кланіравання"
 
@@ -980,27 +981,27 @@ msgstr "Афарбоўка"
 msgid "The tint to apply"
 msgstr "Ужыць афарбоўку"
 
-#: ../clutter/clutter-deform-effect.c:588
+#: ../clutter/clutter-deform-effect.c:592
 msgid "Horizontal Tiles"
 msgstr "Гарызантальная кафля"
 
-#: ../clutter/clutter-deform-effect.c:589
+#: ../clutter/clutter-deform-effect.c:593
 msgid "The number of horizontal tiles"
 msgstr "Колькасць гарызантальных кафляў"
 
-#: ../clutter/clutter-deform-effect.c:604
+#: ../clutter/clutter-deform-effect.c:608
 msgid "Vertical Tiles"
 msgstr "Вертыкальная кафля"
 
-#: ../clutter/clutter-deform-effect.c:605
+#: ../clutter/clutter-deform-effect.c:609
 msgid "The number of vertical tiles"
 msgstr "Колькасць вертыкальных кафляў"
 
-#: ../clutter/clutter-deform-effect.c:622
+#: ../clutter/clutter-deform-effect.c:626
 msgid "Back Material"
 msgstr "Матэрыял задняга плана"
 
-#: ../clutter/clutter-deform-effect.c:623
+#: ../clutter/clutter-deform-effect.c:627
 msgid "The material to be used when painting the back of the actor"
 msgstr "Матэрыял, які выкарыстоўваецца падчас малявання задняга плана актара"
 
@@ -1008,174 +1009,186 @@ msgstr "Матэрыял, які выкарыстоўваецца падчас 
 msgid "The desaturation factor"
 msgstr "Каэфіцыент разбаўлення"
 
-#: ../clutter/clutter-device-manager.c:131
+#: ../clutter/clutter-device-manager.c:127
 #: ../clutter/clutter-input-device.c:366
-#: ../clutter/x11/clutter-keymap-x11.c:316
+#: ../clutter/x11/clutter-keymap-x11.c:321
 msgid "Backend"
 msgstr "Праграмны драйвер"
 
-#: ../clutter/clutter-device-manager.c:132
+#: ../clutter/clutter-device-manager.c:128
 msgid "The ClutterBackend of the device manager"
 msgstr "ClutterBackend кіраўніка прыстасаванняў"
 
-#: ../clutter/clutter-drag-action.c:709
+#: ../clutter/clutter-drag-action.c:740
 msgid "Horizontal Drag Threshold"
 msgstr "Парог гарызантальнага перацягвання"
 
-#: ../clutter/clutter-drag-action.c:710
+#: ../clutter/clutter-drag-action.c:741
 msgid "The horizontal amount of pixels required to start dragging"
 msgstr "Колькасць пікселаў па гарызанталі, патрэбных для пачатку перацягвання"
 
-#: ../clutter/clutter-drag-action.c:737
+#: ../clutter/clutter-drag-action.c:768
 msgid "Vertical Drag Threshold"
 msgstr "Парог вертыкальнага перацягвання"
 
-#: ../clutter/clutter-drag-action.c:738
+#: ../clutter/clutter-drag-action.c:769
 msgid "The vertical amount of pixels required to start dragging"
 msgstr "Колькасць пікселаў па вертыкалі, патрэбных для пачатку перацягвання"
 
-#: ../clutter/clutter-drag-action.c:759
+#: ../clutter/clutter-drag-action.c:790
 msgid "Drag Handle"
 msgstr "Дзяржак перацягвання"
 
-#: ../clutter/clutter-drag-action.c:760
+#: ../clutter/clutter-drag-action.c:791
 msgid "The actor that is being dragged"
 msgstr "Актар, які перацягваецца"
 
-#: ../clutter/clutter-drag-action.c:773
+#: ../clutter/clutter-drag-action.c:804
 msgid "Drag Axis"
 msgstr "Вось перацягвання"
 
-#: ../clutter/clutter-drag-action.c:774
+#: ../clutter/clutter-drag-action.c:805
 msgid "Constraints the dragging to an axis"
 msgstr "Абмяжоўвае перацягванне пэўнай воссю"
 
-#: ../clutter/clutter-drag-action.c:790
+#: ../clutter/clutter-drag-action.c:821
 msgid "Drag Area"
 msgstr "Абшар перацягвання"
 
-#: ../clutter/clutter-drag-action.c:791
+#: ../clutter/clutter-drag-action.c:822
 msgid "Constrains the dragging to a rectangle"
 msgstr "Абмяжоўвае перацягванне пэўным прамавугольнікам"
 
-#: ../clutter/clutter-drag-action.c:804
+#: ../clutter/clutter-drag-action.c:835
 msgid "Drag Area Set"
 msgstr "Набор абшараў перацягвання"
 
-#: ../clutter/clutter-drag-action.c:805
+#: ../clutter/clutter-drag-action.c:836
 msgid "Whether the drag area is set"
 msgstr "Ці настаўлены абшар перацягвання"
 
-#: ../clutter/clutter-flow-layout.c:907
+#: ../clutter/clutter-flow-layout.c:959
 msgid "Whether each item should receive the same allocation"
 msgstr "Ці кожны элемент мусіць атрымаць аднолькавае размеркаванне"
 
-#: ../clutter/clutter-flow-layout.c:922 ../clutter/clutter-table-layout.c:1637
+#: ../clutter/clutter-flow-layout.c:974 ../clutter/clutter-table-layout.c:1629
 msgid "Column Spacing"
 msgstr "Прагал паміж слупкамі"
 
-#: ../clutter/clutter-flow-layout.c:923
+#: ../clutter/clutter-flow-layout.c:975
 msgid "The spacing between columns"
 msgstr "Прагал паміж слупкамі"
 
-#: ../clutter/clutter-flow-layout.c:939 ../clutter/clutter-table-layout.c:1651
+#: ../clutter/clutter-flow-layout.c:991 ../clutter/clutter-table-layout.c:1643
 msgid "Row Spacing"
 msgstr "Прагал паміж радкамі"
 
-#: ../clutter/clutter-flow-layout.c:940
+#: ../clutter/clutter-flow-layout.c:992
 msgid "The spacing between rows"
 msgstr "Прагал паміж радкамі"
 
-#: ../clutter/clutter-flow-layout.c:954
+#: ../clutter/clutter-flow-layout.c:1006
 msgid "Minimum Column Width"
 msgstr "Мінімальная шырыня слупка"
 
-#: ../clutter/clutter-flow-layout.c:955
+#: ../clutter/clutter-flow-layout.c:1007
 msgid "Minimum width for each column"
 msgstr "Мінімальная шырыня для кожнага слупка"
 
-#: ../clutter/clutter-flow-layout.c:970
+#: ../clutter/clutter-flow-layout.c:1022
 msgid "Maximum Column Width"
 msgstr "Максімальная шырыня слупка"
 
-#: ../clutter/clutter-flow-layout.c:971
+#: ../clutter/clutter-flow-layout.c:1023
 msgid "Maximum width for each column"
 msgstr "Максімальная шырыня для кожнага слупка"
 
-#: ../clutter/clutter-flow-layout.c:985
+#: ../clutter/clutter-flow-layout.c:1037
 msgid "Minimum Row Height"
 msgstr "Мінімальная вышыня радка"
 
-#: ../clutter/clutter-flow-layout.c:986
+#: ../clutter/clutter-flow-layout.c:1038
 msgid "Minimum height for each row"
 msgstr "Мінімальная вышыня для кожнага радка"
 
-#: ../clutter/clutter-flow-layout.c:1001
+#: ../clutter/clutter-flow-layout.c:1053
 msgid "Maximum Row Height"
 msgstr "Максімальная вышыня радка"
 
-#: ../clutter/clutter-flow-layout.c:1002
+#: ../clutter/clutter-flow-layout.c:1054
 msgid "Maximum height for each row"
 msgstr "Максімальная вышыня для кожнага радка"
 
-#: ../clutter/clutter-grid-layout.c:1222
+#: ../clutter/clutter-flow-layout.c:1069 ../clutter/clutter-flow-layout.c:1070
+msgid "Snap to grid"
+msgstr "Змесціць у сетку"
+
+#: ../clutter/clutter-gesture-action.c:646
+msgid "Number touch points"
+msgstr "Колькасць пунктаў судакранання"
+
+#: ../clutter/clutter-gesture-action.c:647
+msgid "Number of touch points"
+msgstr "Колькасць пунктаў судакранання"
+
+#: ../clutter/clutter-grid-layout.c:1223
 msgid "Left attachment"
 msgstr "Левая прычэпка"
 
-#: ../clutter/clutter-grid-layout.c:1223
+#: ../clutter/clutter-grid-layout.c:1224
 msgid "The column number to attach the left side of the child to"
 msgstr "Нумар слупка, да якога трэба прычапіць левы край нашчадка"
 
-#: ../clutter/clutter-grid-layout.c:1230
+#: ../clutter/clutter-grid-layout.c:1231
 msgid "Top attachment"
 msgstr "Верхняя прычэпка"
 
-#: ../clutter/clutter-grid-layout.c:1231
+#: ../clutter/clutter-grid-layout.c:1232
 msgid "The row number to attach the top side of a child widget to"
 msgstr "Нумар радка, да якога трэба прычапіць верхні край нашчадка"
 
-#: ../clutter/clutter-grid-layout.c:1239
+#: ../clutter/clutter-grid-layout.c:1240
 msgid "The number of columns that a child spans"
 msgstr "Колькасць слупкоў, якія займае нашчадак"
 
-#: ../clutter/clutter-grid-layout.c:1246
+#: ../clutter/clutter-grid-layout.c:1247
 msgid "The number of rows that a child spans"
 msgstr "Колькасць радкоў, якія займае нашчадак"
 
-#: ../clutter/clutter-grid-layout.c:1562
+#: ../clutter/clutter-grid-layout.c:1564
 msgid "Row spacing"
 msgstr "Прагал паміж радкамі"
 
-#: ../clutter/clutter-grid-layout.c:1563
+#: ../clutter/clutter-grid-layout.c:1565
 msgid "The amount of space between two consecutive rows"
 msgstr "Абшар паміж двума паслядоўнымі радкамі"
 
-#: ../clutter/clutter-grid-layout.c:1576
+#: ../clutter/clutter-grid-layout.c:1578
 msgid "Column spacing"
 msgstr "Прагал паміж слупкамі"
 
-#: ../clutter/clutter-grid-layout.c:1577
+#: ../clutter/clutter-grid-layout.c:1579
 msgid "The amount of space between two consecutive columns"
 msgstr "Абшар паміж двума паслядоўнымі слупкамі"
 
-#: ../clutter/clutter-grid-layout.c:1591
+#: ../clutter/clutter-grid-layout.c:1593
 msgid "Row Homogeneous"
 msgstr "Аднастайныя радкі"
 
-#: ../clutter/clutter-grid-layout.c:1592
+#: ../clutter/clutter-grid-layout.c:1594
 msgid "If TRUE, the rows are all the same height"
 msgstr "Калі ўключана, усе радкі будуць мець адну вышыню"
 
-#: ../clutter/clutter-grid-layout.c:1605
+#: ../clutter/clutter-grid-layout.c:1607
 msgid "Column Homogeneous"
 msgstr "Аднастайныя слупкі"
 
-#: ../clutter/clutter-grid-layout.c:1606
+#: ../clutter/clutter-grid-layout.c:1608
 msgid "If TRUE, the columns are all the same width"
 msgstr "Калі ўключана, усе слупкі будуць мець адну шырыню"
 
-#: ../clutter/clutter-image.c:248 ../clutter/clutter-image.c:311
-#: ../clutter/clutter-image.c:399
+#: ../clutter/clutter-image.c:246 ../clutter/clutter-image.c:309
+#: ../clutter/clutter-image.c:397
 msgid "Unable to load image data"
 msgstr "Не ўдалося загрузіць даныя выявы"
 
@@ -1239,27 +1252,27 @@ msgstr "Колькасць восяў на прыстасаванні"
 msgid "The backend instance"
 msgstr "Экзэмпляр праграмнага драйвера"
 
-#: ../clutter/clutter-interval.c:506
+#: ../clutter/clutter-interval.c:503
 msgid "Value Type"
 msgstr "Тып значэння"
 
-#: ../clutter/clutter-interval.c:507
+#: ../clutter/clutter-interval.c:504
 msgid "The type of the values in the interval"
 msgstr "Тып значэнняў у дыяпазоне"
 
-#: ../clutter/clutter-interval.c:522
+#: ../clutter/clutter-interval.c:519
 msgid "Initial Value"
 msgstr "Пачатковае значэнне"
 
-#: ../clutter/clutter-interval.c:523
+#: ../clutter/clutter-interval.c:520
 msgid "Initial value of the interval"
 msgstr "Пачатковае значэнне дыяпазона"
 
-#: ../clutter/clutter-interval.c:537
+#: ../clutter/clutter-interval.c:534
 msgid "Final Value"
 msgstr "Канчатковае значэнне"
 
-#: ../clutter/clutter-interval.c:538
+#: ../clutter/clutter-interval.c:535
 msgid "Final value of the interval"
 msgstr "Канчатковае значэнне дыяпазона"
 
@@ -1278,96 +1291,96 @@ msgstr "Кіраўнік, які стварыў гэтыя даныя"
 #. * Do NOT translate it to non-English e.g. "predefinito:LTR"! If
 #. * it isn't default:LTR or default:RTL it will not work.
 #.
-#: ../clutter/clutter-main.c:762
+#: ../clutter/clutter-main.c:795
 msgid "default:LTR"
 msgstr "default:LTR"
 
-#: ../clutter/clutter-main.c:1633
+#: ../clutter/clutter-main.c:1669
 msgid "Show frames per second"
 msgstr "Паказваць колькасць кадраў на секунду"
 
-#: ../clutter/clutter-main.c:1635
+#: ../clutter/clutter-main.c:1671
 msgid "Default frame rate"
 msgstr "Прадвызначаная частата кадраў"
 
-#: ../clutter/clutter-main.c:1637
+#: ../clutter/clutter-main.c:1673
 msgid "Make all warnings fatal"
 msgstr "Лічыць усе перасцярогі непапраўнымі"
 
-#: ../clutter/clutter-main.c:1640
+#: ../clutter/clutter-main.c:1676
 msgid "Direction for the text"
 msgstr "Кірунак тэксту"
 
-#: ../clutter/clutter-main.c:1643
+#: ../clutter/clutter-main.c:1679
 msgid "Disable mipmapping on text"
 msgstr "Выключыць mip-адлюстраванне тэксту"
 
-#: ../clutter/clutter-main.c:1646
+#: ../clutter/clutter-main.c:1682
 msgid "Use 'fuzzy' picking"
 msgstr "Ужыць \"няпэўны\" выбар"
 
-#: ../clutter/clutter-main.c:1649
+#: ../clutter/clutter-main.c:1685
 msgid "Clutter debugging flags to set"
 msgstr "Патрэбныя адладачныя сцяжкі Clutter"
 
-#: ../clutter/clutter-main.c:1651
+#: ../clutter/clutter-main.c:1687
 msgid "Clutter debugging flags to unset"
 msgstr "Непатрэбныя адладачныя сцяжкі Clutter"
 
-#: ../clutter/clutter-main.c:1655
+#: ../clutter/clutter-main.c:1691
 msgid "Clutter profiling flags to set"
 msgstr "Патрэбныя прафілявальныя сцяжкі Clutter"
 
-#: ../clutter/clutter-main.c:1657
+#: ../clutter/clutter-main.c:1693
 msgid "Clutter profiling flags to unset"
 msgstr "Непатрэбныя прафілявальныя сцяжкі Clutter"
 
-#: ../clutter/clutter-main.c:1660
+#: ../clutter/clutter-main.c:1696
 msgid "Enable accessibility"
 msgstr "Уключыць функцыі даступнасці"
 
-#: ../clutter/clutter-main.c:1852
+#: ../clutter/clutter-main.c:1888
 msgid "Clutter Options"
 msgstr "Параметры Clutter"
 
-#: ../clutter/clutter-main.c:1853
+#: ../clutter/clutter-main.c:1889
 msgid "Show Clutter Options"
 msgstr "Паказаць параметры Clutter"
 
-#: ../clutter/clutter-pan-action.c:440
+#: ../clutter/clutter-pan-action.c:445
 msgid "Pan Axis"
 msgstr "Вось панарамнага руху камеры"
 
-#: ../clutter/clutter-pan-action.c:441
+#: ../clutter/clutter-pan-action.c:446
 msgid "Constraints the panning to an axis"
 msgstr "Абмяжоўвае панарамны рух камеры пэўнай воссю"
 
-#: ../clutter/clutter-pan-action.c:455
+#: ../clutter/clutter-pan-action.c:460
 msgid "Interpolate"
 msgstr "Інтэрпаляцыя"
 
-#: ../clutter/clutter-pan-action.c:456
+#: ../clutter/clutter-pan-action.c:461
 msgid "Whether interpolated events emission is enabled."
 msgstr "Ці ўключана генерацыя інтэрпаляваных падзей."
 
-#: ../clutter/clutter-pan-action.c:472
+#: ../clutter/clutter-pan-action.c:477
 msgid "Deceleration"
 msgstr "Запавольванне"
 
-#: ../clutter/clutter-pan-action.c:473
+#: ../clutter/clutter-pan-action.c:478
 msgid "Rate at which the interpolated panning will decelerate in"
 msgstr "Частата запавольвання інтэрпаляванага панарамнага руху камеры"
 
-#: ../clutter/clutter-pan-action.c:490
+#: ../clutter/clutter-pan-action.c:495
 msgid "Initial acceleration factor"
 msgstr "Пачатковы каэфіцыент паскарэння"
 
-#: ../clutter/clutter-pan-action.c:491
+#: ../clutter/clutter-pan-action.c:496
 msgid "Factor applied to the momentum when starting the interpolated phase"
 msgstr "Каэфіцыент да імпульсу ў пачатку інтэрпаляванай фазы"
 
 #: ../clutter/clutter-path-constraint.c:212
-#: ../clutter/deprecated/clutter-behaviour-path.c:225
+#: ../clutter/deprecated/clutter-behaviour-path.c:221
 msgid "Path"
 msgstr "Сцежка"
 
@@ -1379,157 +1392,157 @@ msgstr "Сцежка для абмежавання актара"
 msgid "The offset along the path, between -1.0 and 2.0"
 msgstr "Зрух па сцежцы, ад -1.0 да 2.0"
 
-#: ../clutter/clutter-property-transition.c:271
+#: ../clutter/clutter-property-transition.c:269
 msgid "Property Name"
 msgstr "Назва ўласцівасці"
 
-#: ../clutter/clutter-property-transition.c:272
+#: ../clutter/clutter-property-transition.c:270
 msgid "The name of the property to animate"
 msgstr "Назва ўласцівасці, якую трэба анімаваць"
 
-#: ../clutter/clutter-script.c:466
+#: ../clutter/clutter-script.c:464
 msgid "Filename Set"
 msgstr "Выбрана назва файла"
 
-#: ../clutter/clutter-script.c:467
+#: ../clutter/clutter-script.c:465
 msgid "Whether the :filename property is set"
 msgstr "Ці настаўлена ўласцівасць :filename"
 
-#: ../clutter/clutter-script.c:481
-#: ../clutter/deprecated/clutter-texture.c:1082
+#: ../clutter/clutter-script.c:479
+#: ../clutter/deprecated/clutter-texture.c:1080
 msgid "Filename"
 msgstr "Назва файла"
 
-#: ../clutter/clutter-script.c:482
+#: ../clutter/clutter-script.c:480
 msgid "The path of the currently parsed file"
 msgstr "Сцежка да бягучага файла разбору"
 
-#: ../clutter/clutter-script.c:499
+#: ../clutter/clutter-script.c:497
 msgid "Translation Domain"
 msgstr "Дамен перакладу"
 
-#: ../clutter/clutter-script.c:500
+#: ../clutter/clutter-script.c:498
 msgid "The translation domain used to localize string"
 msgstr "Дамен перакладу для лакалізацыі радка"
 
-#: ../clutter/clutter-scroll-actor.c:263
+#: ../clutter/clutter-scroll-actor.c:189
 msgid "Scroll Mode"
 msgstr "Рэжым пракруткі"
 
-#: ../clutter/clutter-scroll-actor.c:264
+#: ../clutter/clutter-scroll-actor.c:190
 msgid "The scrolling direction"
 msgstr "Кірунак пракруткі"
 
-#: ../clutter/clutter-settings.c:440
+#: ../clutter/clutter-settings.c:448
 msgid "Double Click Time"
 msgstr "Час падвойнай пстрычкі"
 
-#: ../clutter/clutter-settings.c:441
+#: ../clutter/clutter-settings.c:449
 msgid "The time between clicks necessary to detect a multiple click"
 msgstr "Час паміж пстрычкамі, неабходны, каб апазнаць шматразовую пстрычку"
 
-#: ../clutter/clutter-settings.c:456
+#: ../clutter/clutter-settings.c:464
 msgid "Double Click Distance"
 msgstr "Адлегласць падвойнай пстрычкі"
 
-#: ../clutter/clutter-settings.c:457
+#: ../clutter/clutter-settings.c:465
 msgid "The distance between clicks necessary to detect a multiple click"
 msgstr ""
 "Адлегласць паміж пстрычкамі, неабходная, каб апазнаць шматразовую пстрычку"
 
-#: ../clutter/clutter-settings.c:472
+#: ../clutter/clutter-settings.c:480
 msgid "Drag Threshold"
 msgstr "Парог адчувальнасці пры перацягванні"
 
-#: ../clutter/clutter-settings.c:473
+#: ../clutter/clutter-settings.c:481
 msgid "The distance the cursor should travel before starting to drag"
 msgstr "Адлегласць, на якую трэба зрушыць паказальнік, каб пачаць перацягванне"
 
-#: ../clutter/clutter-settings.c:488 ../clutter/clutter-text.c:3368
+#: ../clutter/clutter-settings.c:496 ../clutter/clutter-text.c:3393
 msgid "Font Name"
 msgstr "Назва шрыфту"
 
-#: ../clutter/clutter-settings.c:489
+#: ../clutter/clutter-settings.c:497
 msgid ""
 "The description of the default font, as one that could be parsed by Pango"
 msgstr ""
 "Апісанне прадвызначанага шрыфту як адзінага, які можа быць разабраны Pango"
 
-#: ../clutter/clutter-settings.c:504
+#: ../clutter/clutter-settings.c:512
 msgid "Font Antialias"
 msgstr "Згладжванне шрыфту"
 
-#: ../clutter/clutter-settings.c:505
+#: ../clutter/clutter-settings.c:513
 msgid ""
 "Whether to use antialiasing (1 to enable, 0 to disable, and -1 to use the "
 "default)"
 msgstr ""
 "Ці ўжываць згладжванне (1 - так, 0 - не і -1 - ужыць прадвызначанае значэнне)"
 
-#: ../clutter/clutter-settings.c:521
+#: ../clutter/clutter-settings.c:529
 msgid "Font DPI"
 msgstr "DPI шрыфту"
 
-#: ../clutter/clutter-settings.c:522
+#: ../clutter/clutter-settings.c:530
 msgid ""
 "The resolution of the font, in 1024 * dots/inch, or -1 to use the default"
 msgstr ""
 "Распазнавальнасць шрыфту (1024 * кропак/цалю), ці -1, каб ужыць "
 "прадвызначанае значэнне"
 
-#: ../clutter/clutter-settings.c:538
+#: ../clutter/clutter-settings.c:546
 msgid "Font Hinting"
 msgstr "Хінтынг шрыфту"
 
-#: ../clutter/clutter-settings.c:539
+#: ../clutter/clutter-settings.c:547
 msgid ""
 "Whether to use hinting (1 to enable, 0 to disable and -1 to use the default)"
 msgstr ""
 "Ці ўжываць хінтынг (1 - так, 0 - не і -1 - ужыць прадвызначанае значэнне)"
 
-#: ../clutter/clutter-settings.c:560
+#: ../clutter/clutter-settings.c:568
 msgid "Font Hint Style"
 msgstr "Стыль хінтынгу шрыфту"
 
-#: ../clutter/clutter-settings.c:561
+#: ../clutter/clutter-settings.c:569
 msgid "The style of hinting (hintnone, hintslight, hintmedium, hintfull)"
 msgstr ""
 "Стыль хінтынгу (hintnone (нічога), hintslight (лёгкі), hintmedium (сярэдні), "
 "hintfull (поўны))"
 
-#: ../clutter/clutter-settings.c:582
+#: ../clutter/clutter-settings.c:590
 msgid "Font Subpixel Order"
 msgstr "Субпіксельны парадак шрыфту"
 
-#: ../clutter/clutter-settings.c:583
+#: ../clutter/clutter-settings.c:591
 msgid "The type of subpixel antialiasing (none, rgb, bgr, vrgb, vbgr)"
 msgstr "Тып згладжвання субпікселаў (none, rgb, bgr, vrgb, vbgr)"
 
-#: ../clutter/clutter-settings.c:600
+#: ../clutter/clutter-settings.c:608
 msgid "The minimum duration for a long press gesture to be recognized"
 msgstr "Мінімальная працягласць, неабходная, каб апазнаць доўгі націск"
 
-#: ../clutter/clutter-settings.c:607
+#: ../clutter/clutter-settings.c:615
 msgid "Fontconfig configuration timestamp"
 msgstr "Часавы адбітак канфігурацыі fontconfig"
 
-#: ../clutter/clutter-settings.c:608
+#: ../clutter/clutter-settings.c:616
 msgid "Timestamp of the current fontconfig configuration"
 msgstr "Часавы адбітак бягучай канфігурацыі fontconfig"
 
-#: ../clutter/clutter-settings.c:625
+#: ../clutter/clutter-settings.c:633
 msgid "Password Hint Time"
 msgstr "Час падказкі пароля"
 
-#: ../clutter/clutter-settings.c:626
+#: ../clutter/clutter-settings.c:634
 msgid "How long to show the last input character in hidden entries"
 msgstr "Як доўга паказваць апошні ўведзены знак у схаваных запісах"
 
-#: ../clutter/clutter-shader-effect.c:486
+#: ../clutter/clutter-shader-effect.c:485
 msgid "Shader Type"
 msgstr "Тып шэйдара"
 
-#: ../clutter/clutter-shader-effect.c:487
+#: ../clutter/clutter-shader-effect.c:486
 msgid "The type of shader used"
 msgstr "Ужыты тып шэйдара"
 
@@ -1557,759 +1570,759 @@ msgstr "Край крыніцы, які трэба замацаваць"
 msgid "The offset in pixels to apply to the constraint"
 msgstr "Зрух у пікселах для абмежавання"
 
-#: ../clutter/clutter-stage.c:1899
+#: ../clutter/clutter-stage.c:1947
 msgid "Fullscreen Set"
 msgstr "Выбраны рэжым на ўвесь экран"
 
-#: ../clutter/clutter-stage.c:1900
+#: ../clutter/clutter-stage.c:1948
 msgid "Whether the main stage is fullscreen"
 msgstr "Ці галоўная сцэна паказваецца на ўвесь экран"
 
-#: ../clutter/clutter-stage.c:1914
+#: ../clutter/clutter-stage.c:1962
 msgid "Offscreen"
 msgstr "Па-за экранам"
 
-#: ../clutter/clutter-stage.c:1915
+#: ../clutter/clutter-stage.c:1963
 msgid "Whether the main stage should be rendered offscreen"
 msgstr "Ці галоўная сцэна мусіць паказвацца па-за экранам"
 
-#: ../clutter/clutter-stage.c:1927 ../clutter/clutter-text.c:3482
+#: ../clutter/clutter-stage.c:1975 ../clutter/clutter-text.c:3507
 msgid "Cursor Visible"
 msgstr "Бачны паказальнік"
 
-#: ../clutter/clutter-stage.c:1928
+#: ../clutter/clutter-stage.c:1976
 msgid "Whether the mouse pointer is visible on the main stage"
 msgstr "Ці паказальнік мышы бачны на галоўнай сцэне"
 
-#: ../clutter/clutter-stage.c:1942
+#: ../clutter/clutter-stage.c:1990
 msgid "User Resizable"
 msgstr "Карыстальнік можа змяняць памер"
 
-#: ../clutter/clutter-stage.c:1943
+#: ../clutter/clutter-stage.c:1991
 msgid "Whether the stage is able to be resized via user interaction"
 msgstr "Ці можа сцэна змяняць памер у залежнасці ад дзеянняў карыстальніка"
 
-#: ../clutter/clutter-stage.c:1958 ../clutter/deprecated/clutter-box.c:260
-#: ../clutter/deprecated/clutter-rectangle.c:273
+#: ../clutter/clutter-stage.c:2006 ../clutter/deprecated/clutter-box.c:256
+#: ../clutter/deprecated/clutter-rectangle.c:270
 msgid "Color"
 msgstr "Колер"
 
-#: ../clutter/clutter-stage.c:1959
+#: ../clutter/clutter-stage.c:2007
 msgid "The color of the stage"
 msgstr "Колер сцэны"
 
-#: ../clutter/clutter-stage.c:1974
+#: ../clutter/clutter-stage.c:2022
 msgid "Perspective"
 msgstr "Перспектыва"
 
-#: ../clutter/clutter-stage.c:1975
+#: ../clutter/clutter-stage.c:2023
 msgid "Perspective projection parameters"
 msgstr "Параметры праекцыі перспектывы"
 
-#: ../clutter/clutter-stage.c:1990
+#: ../clutter/clutter-stage.c:2038
 msgid "Title"
 msgstr "Назва"
 
-#: ../clutter/clutter-stage.c:1991
+#: ../clutter/clutter-stage.c:2039
 msgid "Stage Title"
 msgstr "Назва сцэны"
 
-#: ../clutter/clutter-stage.c:2008
+#: ../clutter/clutter-stage.c:2056
 msgid "Use Fog"
 msgstr "Ужыць туман"
 
-#: ../clutter/clutter-stage.c:2009
+#: ../clutter/clutter-stage.c:2057
 msgid "Whether to enable depth cueing"
 msgstr "Ці трэба ўключыць пазнакі глыбіні"
 
-#: ../clutter/clutter-stage.c:2025
+#: ../clutter/clutter-stage.c:2073
 msgid "Fog"
 msgstr "Туман"
 
-#: ../clutter/clutter-stage.c:2026
+#: ../clutter/clutter-stage.c:2074
 msgid "Settings for the depth cueing"
 msgstr "Настройкі пазнак глыбіні"
 
-#: ../clutter/clutter-stage.c:2042
+#: ../clutter/clutter-stage.c:2090
 msgid "Use Alpha"
 msgstr "Ужыць альфу"
 
-#: ../clutter/clutter-stage.c:2043
+#: ../clutter/clutter-stage.c:2091
 msgid "Whether to honour the alpha component of the stage color"
 msgstr "Ці ўлічваць альфа-складнік колеру сцэны"
 
-#: ../clutter/clutter-stage.c:2059
+#: ../clutter/clutter-stage.c:2107
 msgid "Key Focus"
 msgstr "Фокус клавіш"
 
-#: ../clutter/clutter-stage.c:2060
+#: ../clutter/clutter-stage.c:2108
 msgid "The currently key focused actor"
 msgstr "Актар, які цяпер мае клавішы ў фокусе"
 
-#: ../clutter/clutter-stage.c:2076
+#: ../clutter/clutter-stage.c:2124
 msgid "No Clear Hint"
 msgstr "Няма падказкі ачысткі"
 
-#: ../clutter/clutter-stage.c:2077
+#: ../clutter/clutter-stage.c:2125
 msgid "Whether the stage should clear its contents"
 msgstr "Ці павінна сцэна ачышчаць сваё змесціва"
 
-#: ../clutter/clutter-stage.c:2090
+#: ../clutter/clutter-stage.c:2138
 msgid "Accept Focus"
 msgstr "Прымае фокус"
 
-#: ../clutter/clutter-stage.c:2091
+#: ../clutter/clutter-stage.c:2139
 msgid "Whether the stage should accept focus on show"
 msgstr "Ці павінна сцэна прымаць фокус падчас паказу"
 
-#: ../clutter/clutter-table-layout.c:543
+#: ../clutter/clutter-table-layout.c:537
 msgid "Column Number"
 msgstr "Нумар слупка"
 
-#: ../clutter/clutter-table-layout.c:544
+#: ../clutter/clutter-table-layout.c:538
 msgid "The column the widget resides in"
 msgstr "Слупок, у якім знаходзіцца віджэт"
 
-#: ../clutter/clutter-table-layout.c:551
+#: ../clutter/clutter-table-layout.c:545
 msgid "Row Number"
 msgstr "Нумар радка"
 
-#: ../clutter/clutter-table-layout.c:552
+#: ../clutter/clutter-table-layout.c:546
 msgid "The row the widget resides in"
 msgstr "Радок, у якім знаходзіцца віджэт"
 
-#: ../clutter/clutter-table-layout.c:559
+#: ../clutter/clutter-table-layout.c:553
 msgid "Column Span"
 msgstr "Дыяпазон слупкоў"
 
-#: ../clutter/clutter-table-layout.c:560
+#: ../clutter/clutter-table-layout.c:554
 msgid "The number of columns the widget should span"
 msgstr "Колькасць слупкоў, якія займае віджэт"
 
-#: ../clutter/clutter-table-layout.c:567
+#: ../clutter/clutter-table-layout.c:561
 msgid "Row Span"
 msgstr "Дыяпазон радкоў"
 
-#: ../clutter/clutter-table-layout.c:568
+#: ../clutter/clutter-table-layout.c:562
 msgid "The number of rows the widget should span"
 msgstr "Колькасць радкоў, якія займае віджэт"
 
-#: ../clutter/clutter-table-layout.c:575
+#: ../clutter/clutter-table-layout.c:569
 msgid "Horizontal Expand"
 msgstr "Гарызантальнае разгортванне"
 
-#: ../clutter/clutter-table-layout.c:576
+#: ../clutter/clutter-table-layout.c:570
 msgid "Allocate extra space for the child in horizontal axis"
 msgstr "Выдзеліць дадатковую прастору для нашчадка па гарызанталі"
 
-#: ../clutter/clutter-table-layout.c:582
+#: ../clutter/clutter-table-layout.c:576
 msgid "Vertical Expand"
 msgstr "Вертыкальнае разгортванне"
 
-#: ../clutter/clutter-table-layout.c:583
+#: ../clutter/clutter-table-layout.c:577
 msgid "Allocate extra space for the child in vertical axis"
 msgstr "Выдзеліць дадатковую прастору для нашчадка па вертыкалі"
 
-#: ../clutter/clutter-table-layout.c:1638
+#: ../clutter/clutter-table-layout.c:1630
 msgid "Spacing between columns"
 msgstr "Прагал паміж слупкамі"
 
-#: ../clutter/clutter-table-layout.c:1652
+#: ../clutter/clutter-table-layout.c:1644
 msgid "Spacing between rows"
 msgstr "Прагал паміж радкамі"
 
-#: ../clutter/clutter-text-buffer.c:351 ../clutter/clutter-text.c:3403
+#: ../clutter/clutter-text-buffer.c:347 ../clutter/clutter-text.c:3428
 msgid "Text"
 msgstr "Тэкст"
 
-#: ../clutter/clutter-text-buffer.c:352
+#: ../clutter/clutter-text-buffer.c:348
 msgid "The contents of the buffer"
 msgstr "Змесціва буфера"
 
-#: ../clutter/clutter-text-buffer.c:365
+#: ../clutter/clutter-text-buffer.c:361
 msgid "Text length"
 msgstr "Даўжыня тэксту"
 
-#: ../clutter/clutter-text-buffer.c:366
+#: ../clutter/clutter-text-buffer.c:362
 msgid "Length of the text currently in the buffer"
 msgstr "Даўжыня тэксту, які цяпер знаходзіцца ў буферы"
 
-#: ../clutter/clutter-text-buffer.c:379
+#: ../clutter/clutter-text-buffer.c:375
 msgid "Maximum length"
 msgstr "Максімальная даўжыня"
 
-#: ../clutter/clutter-text-buffer.c:380
+#: ../clutter/clutter-text-buffer.c:376
 msgid "Maximum number of characters for this entry. Zero if no maximum"
 msgstr ""
 "Максімальная колькасць знакаў для гэтага запісу. Нуль, калі няма абмежавання"
 
-#: ../clutter/clutter-text.c:3350
+#: ../clutter/clutter-text.c:3375
 msgid "Buffer"
 msgstr "Буфер"
 
-#: ../clutter/clutter-text.c:3351
+#: ../clutter/clutter-text.c:3376
 msgid "The buffer for the text"
 msgstr "Буфер для тэксту"
 
-#: ../clutter/clutter-text.c:3369
+#: ../clutter/clutter-text.c:3394
 msgid "The font to be used by the text"
 msgstr "Шрыфт для тэксту"
 
-#: ../clutter/clutter-text.c:3386
+#: ../clutter/clutter-text.c:3411
 msgid "Font Description"
 msgstr "Апісанне шрыфту"
 
-#: ../clutter/clutter-text.c:3387
+#: ../clutter/clutter-text.c:3412
 msgid "The font description to be used"
 msgstr "Апісанне ўжытага шрыфту"
 
-#: ../clutter/clutter-text.c:3404
+#: ../clutter/clutter-text.c:3429
 msgid "The text to render"
 msgstr "Тэкст для выяўлення"
 
-#: ../clutter/clutter-text.c:3418
+#: ../clutter/clutter-text.c:3443
 msgid "Font Color"
 msgstr "Колер шрыфту"
 
-#: ../clutter/clutter-text.c:3419
+#: ../clutter/clutter-text.c:3444
 msgid "Color of the font used by the text"
 msgstr "Колер шрыфту для тэксту"
 
-#: ../clutter/clutter-text.c:3434
+#: ../clutter/clutter-text.c:3459
 msgid "Editable"
 msgstr "Папраўны"
 
-#: ../clutter/clutter-text.c:3435
+#: ../clutter/clutter-text.c:3460
 msgid "Whether the text is editable"
 msgstr "Ці тэкст можна рэдагаваць"
 
-#: ../clutter/clutter-text.c:3450
+#: ../clutter/clutter-text.c:3475
 msgid "Selectable"
 msgstr "Вылучальны"
 
-#: ../clutter/clutter-text.c:3451
+#: ../clutter/clutter-text.c:3476
 msgid "Whether the text is selectable"
 msgstr "Ці тэкст можна вылучаць"
 
-#: ../clutter/clutter-text.c:3465
+#: ../clutter/clutter-text.c:3490
 msgid "Activatable"
 msgstr "Актывізавальны"
 
-#: ../clutter/clutter-text.c:3466
+#: ../clutter/clutter-text.c:3491
 msgid "Whether pressing return causes the activate signal to be emitted"
 msgstr "Ці выклікае націсканне клавішы Return пасылку сігналу актывацыі"
 
-#: ../clutter/clutter-text.c:3483
+#: ../clutter/clutter-text.c:3508
 msgid "Whether the input cursor is visible"
 msgstr "Ці бачны курсор уводу"
 
-#: ../clutter/clutter-text.c:3497 ../clutter/clutter-text.c:3498
+#: ../clutter/clutter-text.c:3522 ../clutter/clutter-text.c:3523
 msgid "Cursor Color"
 msgstr "Колер курсора"
 
-#: ../clutter/clutter-text.c:3513
+#: ../clutter/clutter-text.c:3538
 msgid "Cursor Color Set"
 msgstr "Выбраны колер курсора"
 
-#: ../clutter/clutter-text.c:3514
+#: ../clutter/clutter-text.c:3539
 msgid "Whether the cursor color has been set"
 msgstr "Ці выбраны колер курсора"
 
-#: ../clutter/clutter-text.c:3529
+#: ../clutter/clutter-text.c:3554
 msgid "Cursor Size"
 msgstr "Памер курсора"
 
-#: ../clutter/clutter-text.c:3530
+#: ../clutter/clutter-text.c:3555
 msgid "The width of the cursor, in pixels"
 msgstr "Шырыня курсора, у пікселах"
 
-#: ../clutter/clutter-text.c:3546 ../clutter/clutter-text.c:3564
+#: ../clutter/clutter-text.c:3571 ../clutter/clutter-text.c:3589
 msgid "Cursor Position"
 msgstr "Пазіцыя курсора"
 
-#: ../clutter/clutter-text.c:3547 ../clutter/clutter-text.c:3565
+#: ../clutter/clutter-text.c:3572 ../clutter/clutter-text.c:3590
 msgid "The cursor position"
 msgstr "Пазіцыя курсора"
 
-#: ../clutter/clutter-text.c:3580
+#: ../clutter/clutter-text.c:3605
 msgid "Selection-bound"
 msgstr "Мяжа вылучэння"
 
-#: ../clutter/clutter-text.c:3581
+#: ../clutter/clutter-text.c:3606
 msgid "The cursor position of the other end of the selection"
 msgstr "Пазіцыя курсора на іншым канцы выдзялення"
 
-#: ../clutter/clutter-text.c:3596 ../clutter/clutter-text.c:3597
+#: ../clutter/clutter-text.c:3621 ../clutter/clutter-text.c:3622
 msgid "Selection Color"
 msgstr "Колер вылучэння"
 
-#: ../clutter/clutter-text.c:3612
+#: ../clutter/clutter-text.c:3637
 msgid "Selection Color Set"
 msgstr "Выбраны колер вылучэння"
 
-#: ../clutter/clutter-text.c:3613
+#: ../clutter/clutter-text.c:3638
 msgid "Whether the selection color has been set"
 msgstr "Ці выбраны колер вылучэння"
 
-#: ../clutter/clutter-text.c:3628
+#: ../clutter/clutter-text.c:3653
 msgid "Attributes"
 msgstr "Атрыбуты"
 
-#: ../clutter/clutter-text.c:3629
+#: ../clutter/clutter-text.c:3654
 msgid "A list of style attributes to apply to the contents of the actor"
 msgstr "Спіс атрыбутаў тэксту, якія ўжываюцца для змесціва актара"
 
-#: ../clutter/clutter-text.c:3651
+#: ../clutter/clutter-text.c:3676
 msgid "Use markup"
 msgstr "Ужыць разметку"
 
-#: ../clutter/clutter-text.c:3652
+#: ../clutter/clutter-text.c:3677
 msgid "Whether or not the text includes Pango markup"
 msgstr "Ці змяшчае тэкст разметку Pango"
 
-#: ../clutter/clutter-text.c:3668
+#: ../clutter/clutter-text.c:3693
 msgid "Line wrap"
 msgstr "Перанос радкоў"
 
-#: ../clutter/clutter-text.c:3669
+#: ../clutter/clutter-text.c:3694
 msgid "If set, wrap the lines if the text becomes too wide"
 msgstr "Калі ўключана, пераносіць радкі ў надта доўгім тэксце"
 
-#: ../clutter/clutter-text.c:3684
+#: ../clutter/clutter-text.c:3709
 msgid "Line wrap mode"
 msgstr "Рэжым пераносу радкоў"
 
-#: ../clutter/clutter-text.c:3685
+#: ../clutter/clutter-text.c:3710
 msgid "Control how line-wrapping is done"
 msgstr "Кіраванне пераносам радкоў"
 
-#: ../clutter/clutter-text.c:3700
+#: ../clutter/clutter-text.c:3725
 msgid "Ellipsize"
 msgstr "Абрэз"
 
-#: ../clutter/clutter-text.c:3701
+#: ../clutter/clutter-text.c:3726
 msgid "The preferred place to ellipsize the string"
 msgstr "Пажаданае месца абразання тэкставага ланцужка"
 
-#: ../clutter/clutter-text.c:3717
+#: ../clutter/clutter-text.c:3742
 msgid "Line Alignment"
 msgstr "Раўнаванне радкоў"
 
-#: ../clutter/clutter-text.c:3718
+#: ../clutter/clutter-text.c:3743
 msgid "The preferred alignment for the string, for multi-line text"
 msgstr "Пажаданае раўнаванне ланцужка шматрадковага тэксту"
 
-#: ../clutter/clutter-text.c:3734
+#: ../clutter/clutter-text.c:3759
 msgid "Justify"
 msgstr "Выраўнаваць"
 
-#: ../clutter/clutter-text.c:3735
+#: ../clutter/clutter-text.c:3760
 msgid "Whether the text should be justified"
 msgstr "Ці павінны радкі тэксту быць выраўнаванымі"
 
-#: ../clutter/clutter-text.c:3750
+#: ../clutter/clutter-text.c:3775
 msgid "Password Character"
 msgstr "Знак пароля"
 
-#: ../clutter/clutter-text.c:3751
+#: ../clutter/clutter-text.c:3776
 msgid "If non-zero, use this character to display the actor's contents"
 msgstr "Ужыць гэты знак для паказу змесціва актара, калі знак не роўны нулю"
 
-#: ../clutter/clutter-text.c:3765
+#: ../clutter/clutter-text.c:3790
 msgid "Max Length"
 msgstr "Максімальная даўжыня"
 
-#: ../clutter/clutter-text.c:3766
+#: ../clutter/clutter-text.c:3791
 msgid "Maximum length of the text inside the actor"
 msgstr "Максімальная даўжыня тэксту ўнутры актара"
 
-#: ../clutter/clutter-text.c:3789
+#: ../clutter/clutter-text.c:3814
 msgid "Single Line Mode"
 msgstr "Аднарадковы рэжым"
 
-#: ../clutter/clutter-text.c:3790
+#: ../clutter/clutter-text.c:3815
 msgid "Whether the text should be a single line"
 msgstr "Ці тэкст мусіць быць адным радком"
 
-#: ../clutter/clutter-text.c:3804 ../clutter/clutter-text.c:3805
+#: ../clutter/clutter-text.c:3829 ../clutter/clutter-text.c:3830
 msgid "Selected Text Color"
 msgstr "Колер вылучанага тэксту"
 
-#: ../clutter/clutter-text.c:3820
+#: ../clutter/clutter-text.c:3845
 msgid "Selected Text Color Set"
 msgstr "Выбраны колер вылучанага тэксту"
 
-#: ../clutter/clutter-text.c:3821
+#: ../clutter/clutter-text.c:3846
 msgid "Whether the selected text color has been set"
 msgstr "Ці выбраны колер вылучанага тэксту"
 
-#: ../clutter/clutter-timeline.c:561
-#: ../clutter/deprecated/clutter-animation.c:560
+#: ../clutter/clutter-timeline.c:593
+#: ../clutter/deprecated/clutter-animation.c:557
 msgid "Loop"
 msgstr "Паўтараць у цыкле"
 
-#: ../clutter/clutter-timeline.c:562
+#: ../clutter/clutter-timeline.c:594
 msgid "Should the timeline automatically restart"
 msgstr "Ці трэба аўтаматычна перазапускаць часавую шкалу"
 
-#: ../clutter/clutter-timeline.c:576
+#: ../clutter/clutter-timeline.c:608
 msgid "Delay"
 msgstr "Затрымка"
 
-#: ../clutter/clutter-timeline.c:577
+#: ../clutter/clutter-timeline.c:609
 msgid "Delay before start"
 msgstr "Затрымка перад запускам"
 
-#: ../clutter/clutter-timeline.c:592
-#: ../clutter/deprecated/clutter-animation.c:544
-#: ../clutter/deprecated/clutter-animator.c:1803
+#: ../clutter/clutter-timeline.c:624
+#: ../clutter/deprecated/clutter-animation.c:541
+#: ../clutter/deprecated/clutter-animator.c:1801
 #: ../clutter/deprecated/clutter-media.c:224
-#: ../clutter/deprecated/clutter-state.c:1522
+#: ../clutter/deprecated/clutter-state.c:1517
 msgid "Duration"
 msgstr "Працягласць"
 
-#: ../clutter/clutter-timeline.c:593
+#: ../clutter/clutter-timeline.c:625
 msgid "Duration of the timeline in milliseconds"
 msgstr "Працягласць часавай шкалы ў мілісекундах"
 
-#: ../clutter/clutter-timeline.c:608
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:528
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:337
+#: ../clutter/clutter-timeline.c:640
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:521
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:330
 msgid "Direction"
 msgstr "Кірунак"
 
-#: ../clutter/clutter-timeline.c:609
+#: ../clutter/clutter-timeline.c:641
 msgid "Direction of the timeline"
 msgstr "Кірунак часавай шкалы"
 
-#: ../clutter/clutter-timeline.c:624
+#: ../clutter/clutter-timeline.c:656
 msgid "Auto Reverse"
 msgstr "Аўтаматычны рэверс"
 
-#: ../clutter/clutter-timeline.c:625
+#: ../clutter/clutter-timeline.c:657
 msgid "Whether the direction should be reversed when reaching the end"
 msgstr "Ці трэба ўключаць адваротны кірунак пры дасягненні канца"
 
-#: ../clutter/clutter-timeline.c:643
+#: ../clutter/clutter-timeline.c:675
 msgid "Repeat Count"
 msgstr "Колькасць паўтораў"
 
-#: ../clutter/clutter-timeline.c:644
+#: ../clutter/clutter-timeline.c:676
 msgid "How many times the timeline should repeat"
 msgstr "Колькі разоў трэба паўтараць часавую шкалу"
 
-#: ../clutter/clutter-timeline.c:658
+#: ../clutter/clutter-timeline.c:690
 msgid "Progress Mode"
 msgstr "Рэжым прагрэсу"
 
-#: ../clutter/clutter-timeline.c:659
+#: ../clutter/clutter-timeline.c:691
 msgid "How the timeline should compute the progress"
 msgstr "Як часавая шкала разлічвае прагрэс"
 
-#: ../clutter/clutter-transition.c:246
+#: ../clutter/clutter-transition.c:244
 msgid "Interval"
 msgstr "Інтэрвал"
 
-#: ../clutter/clutter-transition.c:247
+#: ../clutter/clutter-transition.c:245
 msgid "The interval of values to transition"
 msgstr "Інтэрвал значэнняў пераходу"
 
-#: ../clutter/clutter-transition.c:261
+#: ../clutter/clutter-transition.c:259
 msgid "Animatable"
 msgstr "Магчыма анімацыя"
 
-#: ../clutter/clutter-transition.c:262
+#: ../clutter/clutter-transition.c:260
 msgid "The animatable object"
 msgstr "Аб'ект з магчымасцю анімацыі"
 
-#: ../clutter/clutter-transition.c:283
+#: ../clutter/clutter-transition.c:281
 msgid "Remove on Complete"
 msgstr "Выдаліць па заканчэнні"
 
-#: ../clutter/clutter-transition.c:284
+#: ../clutter/clutter-transition.c:282
 msgid "Detach the transition when completed"
 msgstr "Адлучыць пераход па заканчэнні"
 
-#: ../clutter/clutter-zoom-action.c:353
+#: ../clutter/clutter-zoom-action.c:354
 msgid "Zoom Axis"
 msgstr "Вось маштабавання"
 
-#: ../clutter/clutter-zoom-action.c:354
+#: ../clutter/clutter-zoom-action.c:355
 msgid "Constraints the zoom to an axis"
 msgstr "Абмяжоўвае маштабаванне пэўнай воссю"
 
-#: ../clutter/deprecated/clutter-alpha.c:355
-#: ../clutter/deprecated/clutter-animation.c:575
-#: ../clutter/deprecated/clutter-animator.c:1820
+#: ../clutter/deprecated/clutter-alpha.c:354
+#: ../clutter/deprecated/clutter-animation.c:572
+#: ../clutter/deprecated/clutter-animator.c:1818
 msgid "Timeline"
 msgstr "Часавая шкала"
 
-#: ../clutter/deprecated/clutter-alpha.c:356
+#: ../clutter/deprecated/clutter-alpha.c:355
 msgid "Timeline used by the alpha"
 msgstr "Часавая шкала для альфы"
 
-#: ../clutter/deprecated/clutter-alpha.c:372
+#: ../clutter/deprecated/clutter-alpha.c:371
 msgid "Alpha value"
 msgstr "Значэнне альфы"
 
-#: ../clutter/deprecated/clutter-alpha.c:373
+#: ../clutter/deprecated/clutter-alpha.c:372
 msgid "Alpha value as computed by the alpha"
 msgstr "Значэнне альфы як злічанае з дапамогай альфы"
 
-#: ../clutter/deprecated/clutter-alpha.c:394
-#: ../clutter/deprecated/clutter-animation.c:528
+#: ../clutter/deprecated/clutter-alpha.c:393
+#: ../clutter/deprecated/clutter-animation.c:525
 msgid "Mode"
 msgstr "Рэжым"
 
-#: ../clutter/deprecated/clutter-alpha.c:395
+#: ../clutter/deprecated/clutter-alpha.c:394
 msgid "Progress mode"
 msgstr "Рэжым прагрэсу"
 
-#: ../clutter/deprecated/clutter-animation.c:511
+#: ../clutter/deprecated/clutter-animation.c:508
 msgid "Object"
 msgstr "Аб'ект"
 
-#: ../clutter/deprecated/clutter-animation.c:512
+#: ../clutter/deprecated/clutter-animation.c:509
 msgid "Object to which the animation applies"
 msgstr "Аб'ект, да якога ўжыта анімацыя"
 
-#: ../clutter/deprecated/clutter-animation.c:529
+#: ../clutter/deprecated/clutter-animation.c:526
 msgid "The mode of the animation"
 msgstr "Рэжым анімацыі"
 
-#: ../clutter/deprecated/clutter-animation.c:545
+#: ../clutter/deprecated/clutter-animation.c:542
 msgid "Duration of the animation, in milliseconds"
 msgstr "Працягласць анімацыі, у мілісекундах"
 
-#: ../clutter/deprecated/clutter-animation.c:561
+#: ../clutter/deprecated/clutter-animation.c:558
 msgid "Whether the animation should loop"
 msgstr "Ці паўтараць анімацыю ў цыкле"
 
-#: ../clutter/deprecated/clutter-animation.c:576
+#: ../clutter/deprecated/clutter-animation.c:573
 msgid "The timeline used by the animation"
 msgstr "Часавая шкала для анімацыі"
 
-#: ../clutter/deprecated/clutter-animation.c:592
-#: ../clutter/deprecated/clutter-behaviour.c:241
+#: ../clutter/deprecated/clutter-animation.c:589
+#: ../clutter/deprecated/clutter-behaviour.c:237
 msgid "Alpha"
 msgstr "Альфа"
 
-#: ../clutter/deprecated/clutter-animation.c:593
+#: ../clutter/deprecated/clutter-animation.c:590
 msgid "The alpha used by the animation"
 msgstr "Альфа для анімацыі"
 
-#: ../clutter/deprecated/clutter-animator.c:1804
+#: ../clutter/deprecated/clutter-animator.c:1802
 msgid "The duration of the animation"
 msgstr "Працягласць анімацыі"
 
-#: ../clutter/deprecated/clutter-animator.c:1821
+#: ../clutter/deprecated/clutter-animator.c:1819
 msgid "The timeline of the animation"
 msgstr "Часавая шкала анімацыі"
 
-#: ../clutter/deprecated/clutter-behaviour.c:242
+#: ../clutter/deprecated/clutter-behaviour.c:238
 msgid "Alpha Object to drive the behaviour"
 msgstr "Альфа-аб'ект для кіравання паводзінамі"
 
-#: ../clutter/deprecated/clutter-behaviour-depth.c:182
+#: ../clutter/deprecated/clutter-behaviour-depth.c:180
 msgid "Start Depth"
 msgstr "Пачатковая глыбіня"
 
-#: ../clutter/deprecated/clutter-behaviour-depth.c:183
+#: ../clutter/deprecated/clutter-behaviour-depth.c:181
 msgid "Initial depth to apply"
 msgstr "Пачатковая глыбіня"
 
-#: ../clutter/deprecated/clutter-behaviour-depth.c:198
+#: ../clutter/deprecated/clutter-behaviour-depth.c:196
 msgid "End Depth"
 msgstr "Канчатковая глыбіня"
 
-#: ../clutter/deprecated/clutter-behaviour-depth.c:199
+#: ../clutter/deprecated/clutter-behaviour-depth.c:197
 msgid "Final depth to apply"
 msgstr "Канчатковая глыбіня"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:401
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:394
 msgid "Start Angle"
 msgstr "Пачатковы вугал"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:402
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:284
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:395
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:277
 msgid "Initial angle"
 msgstr "Пачатковы вугал"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:417
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:410
 msgid "End Angle"
 msgstr "Канчатковы вугал"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:418
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:302
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:411
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:295
 msgid "Final angle"
 msgstr "Канчатковы вугал"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:433
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:426
 msgid "Angle x tilt"
 msgstr "Вугал X-нахілу"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:434
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:427
 msgid "Tilt of the ellipse around x axis"
 msgstr "Нахіл эліпса па X-восі"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:449
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:442
 msgid "Angle y tilt"
 msgstr "Вугал Y-нахілу"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:450
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:443
 msgid "Tilt of the ellipse around y axis"
 msgstr "Нахіл эліпса па Y-восі"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:465
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:458
 msgid "Angle z tilt"
 msgstr "Вугал Z-нахілу"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:466
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:459
 msgid "Tilt of the ellipse around z axis"
 msgstr "Нахіл эліпса па Z-восі"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:482
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:475
 msgid "Width of the ellipse"
 msgstr "Шырыня эліпса"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:498
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:491
 msgid "Height of ellipse"
 msgstr "Вышыня эліпса"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:513
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:506
 msgid "Center"
 msgstr "Цэнтр"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:514
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:507
 msgid "Center of ellipse"
 msgstr "Цэнтр эліпса"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:529
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:338
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:522
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:331
 msgid "Direction of rotation"
 msgstr "Кірунак кручэння"
 
-#: ../clutter/deprecated/clutter-behaviour-opacity.c:184
+#: ../clutter/deprecated/clutter-behaviour-opacity.c:177
 msgid "Opacity Start"
 msgstr "Пачатковая непразрыстасць"
 
-#: ../clutter/deprecated/clutter-behaviour-opacity.c:185
+#: ../clutter/deprecated/clutter-behaviour-opacity.c:178
 msgid "Initial opacity level"
 msgstr "Пачатковы ўзровень непразрыстасці"
 
-#: ../clutter/deprecated/clutter-behaviour-opacity.c:202
+#: ../clutter/deprecated/clutter-behaviour-opacity.c:195
 msgid "Opacity End"
 msgstr "Канчатковая непразрыстасць"
 
-#: ../clutter/deprecated/clutter-behaviour-opacity.c:203
+#: ../clutter/deprecated/clutter-behaviour-opacity.c:196
 msgid "Final opacity level"
 msgstr "Канчатковы ўзровень непразрыстасці"
 
-#: ../clutter/deprecated/clutter-behaviour-path.c:226
+#: ../clutter/deprecated/clutter-behaviour-path.c:222
 msgid "The ClutterPath object representing the path to animate along"
 msgstr "Аб'ект ClutterPath, які прадстаўляе сцежку для анімацыі"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:283
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:276
 msgid "Angle Begin"
 msgstr "Пачатковы вугал"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:301
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:294
 msgid "Angle End"
 msgstr "Канчатковы вугал"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:319
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:312
 msgid "Axis"
 msgstr "Вось"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:320
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:313
 msgid "Axis of rotation"
 msgstr "Вось кручэння"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:355
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:348
 msgid "Center X"
 msgstr "Цэнтр X-восі"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:356
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:349
 msgid "X coordinate of the center of rotation"
 msgstr "X-каардыната цэнтра кручэння"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:373
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:366
 msgid "Center Y"
 msgstr "Цэнтр Y-восі"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:374
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:367
 msgid "Y coordinate of the center of rotation"
 msgstr "Y-каардыната цэнтра кручэння"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:391
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:384
 msgid "Center Z"
 msgstr "Цэнтр Z-восі"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:392
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:385
 msgid "Z coordinate of the center of rotation"
 msgstr "Z-каардыната цэнтра кручэння"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:226
+#: ../clutter/deprecated/clutter-behaviour-scale.c:222
 msgid "X Start Scale"
 msgstr "Пачатковы X-маштаб"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:227
+#: ../clutter/deprecated/clutter-behaviour-scale.c:223
 msgid "Initial scale on the X axis"
 msgstr "Пачатковы маштаб па X-восі"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:245
+#: ../clutter/deprecated/clutter-behaviour-scale.c:241
 msgid "X End Scale"
 msgstr "Канчатковы X-маштаб"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:246
+#: ../clutter/deprecated/clutter-behaviour-scale.c:242
 msgid "Final scale on the X axis"
 msgstr "Канчатковы маштаб па X-восі"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:264
+#: ../clutter/deprecated/clutter-behaviour-scale.c:260
 msgid "Y Start Scale"
 msgstr "Пачатковы Y-маштаб"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:265
+#: ../clutter/deprecated/clutter-behaviour-scale.c:261
 msgid "Initial scale on the Y axis"
 msgstr "Пачатковы маштаб па Y-восі"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:283
+#: ../clutter/deprecated/clutter-behaviour-scale.c:279
 msgid "Y End Scale"
 msgstr "Канчатковы Y-маштаб"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:284
+#: ../clutter/deprecated/clutter-behaviour-scale.c:280
 msgid "Final scale on the Y axis"
 msgstr "Канчатковы маштаб па Y-восі"
 
-#: ../clutter/deprecated/clutter-box.c:261
+#: ../clutter/deprecated/clutter-box.c:257
 msgid "The background color of the box"
 msgstr "Фонавы колер рамкі"
 
-#: ../clutter/deprecated/clutter-box.c:274
+#: ../clutter/deprecated/clutter-box.c:270
 msgid "Color Set"
 msgstr "Выбраны колер"
 
-#: ../clutter/deprecated/clutter-cairo-texture.c:597
+#: ../clutter/deprecated/clutter-cairo-texture.c:593
 msgid "Surface Width"
 msgstr "Шырыня паверхні"
 
-#: ../clutter/deprecated/clutter-cairo-texture.c:598
+#: ../clutter/deprecated/clutter-cairo-texture.c:594
 msgid "The width of the Cairo surface"
 msgstr "Шырыня паверхні Cairo"
 
-#: ../clutter/deprecated/clutter-cairo-texture.c:615
+#: ../clutter/deprecated/clutter-cairo-texture.c:611
 msgid "Surface Height"
 msgstr "Вышыня паверхні"
 
-#: ../clutter/deprecated/clutter-cairo-texture.c:616
+#: ../clutter/deprecated/clutter-cairo-texture.c:612
 msgid "The height of the Cairo surface"
 msgstr "Вышыня паверхні Cairo"
 
-#: ../clutter/deprecated/clutter-cairo-texture.c:636
+#: ../clutter/deprecated/clutter-cairo-texture.c:632
 msgid "Auto Resize"
 msgstr "Аўтаматычнае змяненне памераў"
 
-#: ../clutter/deprecated/clutter-cairo-texture.c:637
+#: ../clutter/deprecated/clutter-cairo-texture.c:633
 msgid "Whether the surface should match the allocation"
 msgstr "Ці павінна паверхня адпавядаць размеркаванню"
 
@@ -2381,101 +2394,101 @@ msgstr "Узровень запаўнення буфера"
 msgid "The duration of the stream, in seconds"
 msgstr "Працягласць струменя, у секундах"
 
-#: ../clutter/deprecated/clutter-rectangle.c:274
+#: ../clutter/deprecated/clutter-rectangle.c:271
 msgid "The color of the rectangle"
 msgstr "Колер прамавугольніка"
 
-#: ../clutter/deprecated/clutter-rectangle.c:287
+#: ../clutter/deprecated/clutter-rectangle.c:284
 msgid "Border Color"
 msgstr "Колер аблямоўкі"
 
-#: ../clutter/deprecated/clutter-rectangle.c:288
+#: ../clutter/deprecated/clutter-rectangle.c:285
 msgid "The color of the border of the rectangle"
 msgstr "Колер аблямоўкі прамавугольніка"
 
-#: ../clutter/deprecated/clutter-rectangle.c:303
+#: ../clutter/deprecated/clutter-rectangle.c:300
 msgid "Border Width"
 msgstr "Шырыня аблямоўкі"
 
-#: ../clutter/deprecated/clutter-rectangle.c:304
+#: ../clutter/deprecated/clutter-rectangle.c:301
 msgid "The width of the border of the rectangle"
 msgstr "Шырыня аблямоўкі прамавугольніка"
 
-#: ../clutter/deprecated/clutter-rectangle.c:318
+#: ../clutter/deprecated/clutter-rectangle.c:315
 msgid "Has Border"
 msgstr "Мае аблямоўку"
 
-#: ../clutter/deprecated/clutter-rectangle.c:319
+#: ../clutter/deprecated/clutter-rectangle.c:316
 msgid "Whether the rectangle should have a border"
 msgstr "Ці прамавугольнік мусіць мець аблямоўку"
 
-#: ../clutter/deprecated/clutter-shader.c:261
+#: ../clutter/deprecated/clutter-shader.c:257
 msgid "Vertex Source"
 msgstr "Крыніца вяршыні"
 
-#: ../clutter/deprecated/clutter-shader.c:262
+#: ../clutter/deprecated/clutter-shader.c:258
 msgid "Source of vertex shader"
 msgstr "Крыніца вяршыннага шэйдара"
 
-#: ../clutter/deprecated/clutter-shader.c:278
+#: ../clutter/deprecated/clutter-shader.c:274
 msgid "Fragment Source"
 msgstr "Крыніца фрагмента"
 
-#: ../clutter/deprecated/clutter-shader.c:279
+#: ../clutter/deprecated/clutter-shader.c:275
 msgid "Source of fragment shader"
 msgstr "Крыніца фрагментавага шэйдара"
 
-#: ../clutter/deprecated/clutter-shader.c:296
+#: ../clutter/deprecated/clutter-shader.c:292
 msgid "Compiled"
 msgstr "Скампіляваны"
 
-#: ../clutter/deprecated/clutter-shader.c:297
+#: ../clutter/deprecated/clutter-shader.c:293
 msgid "Whether the shader is compiled and linked"
 msgstr "Ці шэйдар скампіляваны і злінкаваны"
 
-#: ../clutter/deprecated/clutter-shader.c:314
+#: ../clutter/deprecated/clutter-shader.c:310
 msgid "Whether the shader is enabled"
 msgstr "Ці шэйдар уключаны"
 
-#: ../clutter/deprecated/clutter-shader.c:525
+#: ../clutter/deprecated/clutter-shader.c:521
 #, c-format
 msgid "%s compilation failed: %s"
 msgstr "Кампіляцыя %s была няўдалай: %s"
 
-#: ../clutter/deprecated/clutter-shader.c:526
+#: ../clutter/deprecated/clutter-shader.c:522
 msgid "Vertex shader"
 msgstr "Вяршынны шэйдар"
 
-#: ../clutter/deprecated/clutter-shader.c:527
+#: ../clutter/deprecated/clutter-shader.c:523
 msgid "Fragment shader"
 msgstr "Фрагментавы шэйдар"
 
-#: ../clutter/deprecated/clutter-state.c:1504
+#: ../clutter/deprecated/clutter-state.c:1499
 msgid "State"
 msgstr "Стан"
 
-#: ../clutter/deprecated/clutter-state.c:1505
+#: ../clutter/deprecated/clutter-state.c:1500
 msgid "Currently set state, (transition to this state might not be complete)"
 msgstr "Бягучы стан (пераход да гэтага стану можа быць няпоўным)"
 
-#: ../clutter/deprecated/clutter-state.c:1523
+#: ../clutter/deprecated/clutter-state.c:1518
 msgid "Default transition duration"
 msgstr "Прадвызначаная працягласць пераходу"
 
-#: ../clutter/deprecated/clutter-texture.c:994
+#: ../clutter/deprecated/clutter-texture.c:992
 msgid "Sync size of actor"
 msgstr "Сінхранізаваць памер актара"
 
-#: ../clutter/deprecated/clutter-texture.c:995
+#: ../clutter/deprecated/clutter-texture.c:993
 msgid "Auto sync size of actor to underlying pixbuf dimensions"
 msgstr ""
 "Аўтаматычная сінхранізацыя памеру актара з адпаведным растравым буферам"
 
-#: ../clutter/deprecated/clutter-texture.c:1002
+#: ../clutter/deprecated/clutter-texture.c:1000
 msgid "Disable Slicing"
 msgstr "Выключыць нарэзку"
 
-#: ../clutter/deprecated/clutter-texture.c:1003
+#: ../clutter/deprecated/clutter-texture.c:1001
 msgid ""
 "Forces the underlying texture to be singular and not made of smaller space "
 "saving individual textures"
@@ -2483,95 +2496,95 @@ msgstr ""
 "Забараняе раскладанне адпаведнай структуры на меншыя асобныя тэкстуры, "
 "эфектыўныя ў плане выкарыстання памяці"
 
-#: ../clutter/deprecated/clutter-texture.c:1012
+#: ../clutter/deprecated/clutter-texture.c:1010
 msgid "Tile Waste"
 msgstr "Рэшта кафлі"
 
-#: ../clutter/deprecated/clutter-texture.c:1013
+#: ../clutter/deprecated/clutter-texture.c:1011
 msgid "Maximum waste area of a sliced texture"
 msgstr "Максімальная лішняя плошча раскладзенай тэкстуры"
 
-#: ../clutter/deprecated/clutter-texture.c:1021
+#: ../clutter/deprecated/clutter-texture.c:1019
 msgid "Horizontal repeat"
 msgstr "Гарызантальны паўтор"
 
-#: ../clutter/deprecated/clutter-texture.c:1022
+#: ../clutter/deprecated/clutter-texture.c:1020
 msgid "Repeat the contents rather than scaling them horizontally"
 msgstr "Паўтараць змесціва замест яго гарызантальнага маштабавання"
 
-#: ../clutter/deprecated/clutter-texture.c:1029
+#: ../clutter/deprecated/clutter-texture.c:1027
 msgid "Vertical repeat"
 msgstr "Вертыкальны паўтор"
 
-#: ../clutter/deprecated/clutter-texture.c:1030
+#: ../clutter/deprecated/clutter-texture.c:1028
 msgid "Repeat the contents rather than scaling them vertically"
 msgstr "Паўтараць змесціва замест яго вертыкальнага маштабавання"
 
-#: ../clutter/deprecated/clutter-texture.c:1037
+#: ../clutter/deprecated/clutter-texture.c:1035
 msgid "Filter Quality"
 msgstr "Якасць фільтра"
 
-#: ../clutter/deprecated/clutter-texture.c:1038
+#: ../clutter/deprecated/clutter-texture.c:1036
 msgid "Rendering quality used when drawing the texture"
 msgstr "Якасць выяўлення пры маляванні тэкстуры"
 
-#: ../clutter/deprecated/clutter-texture.c:1046
+#: ../clutter/deprecated/clutter-texture.c:1044
 msgid "Pixel Format"
 msgstr "Фармат пікселаў"
 
-#: ../clutter/deprecated/clutter-texture.c:1047
+#: ../clutter/deprecated/clutter-texture.c:1045
 msgid "The Cogl pixel format to use"
 msgstr "Фармат пікселаў Cogl"
 
-#: ../clutter/deprecated/clutter-texture.c:1055
-#: ../clutter/wayland/clutter-wayland-surface.c:449
+#: ../clutter/deprecated/clutter-texture.c:1053
+#: ../clutter/wayland/clutter-wayland-surface.c:445
 msgid "Cogl Texture"
 msgstr "Тэкстура Cogl"
 
-#: ../clutter/deprecated/clutter-texture.c:1056
-#: ../clutter/wayland/clutter-wayland-surface.c:450
+#: ../clutter/deprecated/clutter-texture.c:1054
+#: ../clutter/wayland/clutter-wayland-surface.c:446
 msgid "The underlying Cogl texture handle used to draw this actor"
 msgstr "Дзяржак адпаведнай тэкстуры Cogl, ужытай для малявання гэтага актара"
 
-#: ../clutter/deprecated/clutter-texture.c:1063
+#: ../clutter/deprecated/clutter-texture.c:1061
 msgid "Cogl Material"
 msgstr "Матэрыял Cogl"
 
-#: ../clutter/deprecated/clutter-texture.c:1064
+#: ../clutter/deprecated/clutter-texture.c:1062
 msgid "The underlying Cogl material handle used to draw this actor"
 msgstr ""
 "Дзяржак адпаведнага матэрыялу Cogl, ужытага для малявання гэтага актара"
 
-#: ../clutter/deprecated/clutter-texture.c:1083
+#: ../clutter/deprecated/clutter-texture.c:1081
 msgid "The path of the file containing the image data"
 msgstr "Сцежка да файла, які змяшчае даныя выявы"
 
-#: ../clutter/deprecated/clutter-texture.c:1090
+#: ../clutter/deprecated/clutter-texture.c:1088
 msgid "Keep Aspect Ratio"
 msgstr "Захоўваць прапорцыі"
 
-#: ../clutter/deprecated/clutter-texture.c:1091
+#: ../clutter/deprecated/clutter-texture.c:1089
 msgid ""
 "Keep the aspect ratio of the texture when requesting the preferred width or "
 "height"
 msgstr "Захоўваць прапорцыі тэкстуры пры запыце пажаданай шырыні ці вышыні"
 
-#: ../clutter/deprecated/clutter-texture.c:1119
+#: ../clutter/deprecated/clutter-texture.c:1117
 msgid "Load asynchronously"
 msgstr "Асінхронная загрузка"
 
-#: ../clutter/deprecated/clutter-texture.c:1120
+#: ../clutter/deprecated/clutter-texture.c:1118
 msgid ""
 "Load files inside a thread to avoid blocking when loading images from disk"
 msgstr ""
 "Загружаць файлы ў асобнай ніці, каб пазбегнуць блакіравання пры загрузцы "
 "выяў з дыска"
 
-#: ../clutter/deprecated/clutter-texture.c:1138
+#: ../clutter/deprecated/clutter-texture.c:1136
 msgid "Load data asynchronously"
 msgstr "Асінхронная загрузка даных"
 
-#: ../clutter/deprecated/clutter-texture.c:1139
+#: ../clutter/deprecated/clutter-texture.c:1137
 msgid ""
 "Decode image data files inside a thread to reduce blocking when loading "
 "images from disk"
@@ -2579,193 +2592,193 @@ msgstr ""
 "Дэкадаваць файлы ў асобнай ніці, каб скараціць блакіраванне пры загрузцы "
 "выяў з дыска"
 
-#: ../clutter/deprecated/clutter-texture.c:1165
+#: ../clutter/deprecated/clutter-texture.c:1163
 msgid "Pick With Alpha"
 msgstr "Выбіраць разам з альфай"
 
-#: ../clutter/deprecated/clutter-texture.c:1166
+#: ../clutter/deprecated/clutter-texture.c:1164
 msgid "Shape actor with alpha channel when picking"
 msgstr "Пры выбары фармаваць актара разам з альфа-каналам"
 
-#: ../clutter/deprecated/clutter-texture.c:1599
-#: ../clutter/deprecated/clutter-texture.c:1994
-#: ../clutter/deprecated/clutter-texture.c:2090
-#: ../clutter/deprecated/clutter-texture.c:2388
+#: ../clutter/deprecated/clutter-texture.c:1597
+#: ../clutter/deprecated/clutter-texture.c:1992
+#: ../clutter/deprecated/clutter-texture.c:2088
+#: ../clutter/deprecated/clutter-texture.c:2386
 #, c-format
 msgid "Failed to load the image data"
 msgstr "Не ўдалося загрузіць даныя выявы"
 
-#: ../clutter/deprecated/clutter-texture.c:1758
+#: ../clutter/deprecated/clutter-texture.c:1756
 #, c-format
 msgid "YUV textures are not supported"
 msgstr "YUV-тэкстуры не падтрымліваюцца"
 
-#: ../clutter/deprecated/clutter-texture.c:1767
+#: ../clutter/deprecated/clutter-texture.c:1765
 #, c-format
 msgid "YUV2 textues are not supported"
 msgstr "YUV2-тэкстуры не падтрымліваюцца"
 
-#: ../clutter/evdev/clutter-input-device-evdev.c:159
+#: ../clutter/evdev/clutter-input-device-evdev.c:154
 msgid "sysfs Path"
 msgstr "Сцежка sysfs"
 
-#: ../clutter/evdev/clutter-input-device-evdev.c:160
+#: ../clutter/evdev/clutter-input-device-evdev.c:155
 msgid "Path of the device in sysfs"
 msgstr "Сцежка прыстасавання ў sysfs"
 
-#: ../clutter/evdev/clutter-input-device-evdev.c:175
+#: ../clutter/evdev/clutter-input-device-evdev.c:170
 msgid "Device Path"
 msgstr "Сцежка прыстасавання"
 
-#: ../clutter/evdev/clutter-input-device-evdev.c:176
+#: ../clutter/evdev/clutter-input-device-evdev.c:171
 msgid "Path of the device node"
 msgstr "Сцежка вузла прыстасавання"
 
-#: ../clutter/gdk/clutter-backend-gdk.c:296
+#: ../clutter/gdk/clutter-backend-gdk.c:289
 #, c-format
 msgid "Could not find a suitable CoglWinsys for a GdkDisplay of type %s"
 msgstr "Не ўдалося знайсці адпаведны CoglWinsys для GdkDisplay тыпу %s"
 
-#: ../clutter/wayland/clutter-wayland-surface.c:423
+#: ../clutter/wayland/clutter-wayland-surface.c:419
 msgid "Surface"
 msgstr "Паверхня"
 
-#: ../clutter/wayland/clutter-wayland-surface.c:424
+#: ../clutter/wayland/clutter-wayland-surface.c:420
 msgid "The underlying wayland surface"
 msgstr "Адпаведная паверхня Wayland"
 
-#: ../clutter/wayland/clutter-wayland-surface.c:431
+#: ../clutter/wayland/clutter-wayland-surface.c:427
 msgid "Surface width"
 msgstr "Шырыня паверхні"
 
-#: ../clutter/wayland/clutter-wayland-surface.c:432
+#: ../clutter/wayland/clutter-wayland-surface.c:428
 msgid "The width of the underlying wayland surface"
 msgstr "Шырыня адпаведнай паверхні Wayland"
 
-#: ../clutter/wayland/clutter-wayland-surface.c:440
+#: ../clutter/wayland/clutter-wayland-surface.c:436
 msgid "Surface height"
 msgstr "Вышыня паверхні"
 
-#: ../clutter/wayland/clutter-wayland-surface.c:441
+#: ../clutter/wayland/clutter-wayland-surface.c:437
 msgid "The height of the underlying wayland surface"
 msgstr "Вышыня адпаведнай паверхні Wayland"
 
-#: ../clutter/x11/clutter-backend-x11.c:516
+#: ../clutter/x11/clutter-backend-x11.c:488
 msgid "X display to use"
 msgstr "Патрэбны X-дысплей"
 
-#: ../clutter/x11/clutter-backend-x11.c:522
+#: ../clutter/x11/clutter-backend-x11.c:494
 msgid "X screen to use"
 msgstr "Патрэбны X-экран"
 
-#: ../clutter/x11/clutter-backend-x11.c:527
+#: ../clutter/x11/clutter-backend-x11.c:499
 msgid "Make X calls synchronous"
 msgstr "Рабіць X-выклікі сінхронна"
 
-#: ../clutter/x11/clutter-backend-x11.c:534
-msgid "Enable XInput support"
-msgstr "Уключыць падтрымку XInput"
+#: ../clutter/x11/clutter-backend-x11.c:506
+msgid "Disable XInput support"
+msgstr "Выключыць падтрымку XInput"
 
-#: ../clutter/x11/clutter-keymap-x11.c:317
+#: ../clutter/x11/clutter-keymap-x11.c:322
 msgid "The Clutter backend"
 msgstr "Праграмны драйвер Clutter"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:539
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:534
 msgid "Pixmap"
 msgstr "Растравая выява"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:540
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:535
 msgid "The X11 Pixmap to be bound"
 msgstr "Растравая выява X11 для прывязкі"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:548
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:543
 msgid "Pixmap width"
 msgstr "Шырыня растравай выявы"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:549
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:544
 msgid "The width of the pixmap bound to this texture"
 msgstr "Шырыня растравай выявы, звязанай з гэтай тэкстурай"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:557
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:552
 msgid "Pixmap height"
 msgstr "Вышыня растравай выявы"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:558
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:553
 msgid "The height of the pixmap bound to this texture"
 msgstr "Вышыня растравай выявы, звязанай з гэтай тэкстурай"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:566
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:561
 msgid "Pixmap Depth"
 msgstr "Глыбіня растравай выявы"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:567
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:562
 msgid "The depth (in number of bits) of the pixmap bound to this texture"
 msgstr "Глыбіня растравай выявы, звязанай з гэтай тэкстурай, у бітах"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:575
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:570
 msgid "Automatic Updates"
 msgstr "Аўтаматычныя абнаўленні"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:576
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:571
 msgid "If the texture should be kept in sync with any pixmap changes."
 msgstr ""
 "Ці павінна падтрымлівацца сінхранізацыя тэкстуры з любымі зменамі растравай "
 "выявы."
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:584
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:579
 msgid "Window"
 msgstr "Акно"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:585
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:580
 msgid "The X11 Window to be bound"
 msgstr "X11-акно для прывязкі"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:593
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:588
 msgid "Window Redirect Automatic"
 msgstr "Аўтаматычнае перанакіраванне акна"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:594
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:589
 msgid "If composite window redirects are set to Automatic (or Manual if false)"
 msgstr ""
 "Ці кампазітныя перанакіраванні вокнаў настаўленыя ў аўтаматычны рэжым (ці ў "
 "ручны, калі выключана)"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:604
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:599
 msgid "Window Mapped"
 msgstr "Адлюстраванае акно"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:605
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:600
 msgid "If window is mapped"
 msgstr "Ці акно адлюстравана"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:614
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:609
 msgid "Destroyed"
 msgstr "Знішчана"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:615
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:610
 msgid "If window has been destroyed"
 msgstr "Ці акно было знішчана"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:623
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:618
 msgid "Window X"
 msgstr "X-каардыната акна"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:624
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:619
 msgid "X position of window on screen according to X11"
 msgstr "X-пазіцыя акна на экране згодна з X11"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:632
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:627
 msgid "Window Y"
 msgstr "Y-каардыната акна"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:633
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:628
 msgid "Y position of window on screen according to X11"
 msgstr "Y-пазіцыя акна на экране згодна з X11"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:640
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:635
 msgid "Window Override Redirect"
 msgstr "Акно засланяе перанакіраванні"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:641
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:636
 msgid "If this is an override-redirect window"
 msgstr "Ці гэта акно засланяе перанакіраванні (override-redirect window)"
diff --git a/po/ca.po b/po/ca.po
index 03d54c5a3..dd478dc18 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -9,702 +9,702 @@ msgstr ""
 "Project-Id-Version: clutter master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=clutter&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2013-02-21 00:39+0000\n"
-"PO-Revision-Date: 2012-09-21 21:34+0200\n"
-"Last-Translator: Gil Forcada <gilforcada@guifi.net>\n"
+"POT-Creation-Date: 2014-05-01 15:08+0000\n"
+"PO-Revision-Date: 2014-03-21 05:55+0100\n"
+"Last-Translator: Pau Iranzo <paugnu@gmail.com>\n"
 "Language-Team: Catalan <tradgnome@softcatala.org>\n"
 "Language: ca\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bits\n"
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: ../clutter/clutter-actor.c:6144
+#: ../clutter/clutter-actor.c:6224
 msgid "X coordinate"
 msgstr "Coordenada X"
 
-#: ../clutter/clutter-actor.c:6145
+#: ../clutter/clutter-actor.c:6225
 msgid "X coordinate of the actor"
 msgstr "Coordenada X de l'actor"
 
-#: ../clutter/clutter-actor.c:6163
+#: ../clutter/clutter-actor.c:6243
 msgid "Y coordinate"
 msgstr "Coordenada Y"
 
-#: ../clutter/clutter-actor.c:6164
+#: ../clutter/clutter-actor.c:6244
 msgid "Y coordinate of the actor"
 msgstr "Coordenada Y de l'actor"
 
-#: ../clutter/clutter-actor.c:6186
+#: ../clutter/clutter-actor.c:6266
 msgid "Position"
 msgstr "Posició"
 
-#: ../clutter/clutter-actor.c:6187
+#: ../clutter/clutter-actor.c:6267
 msgid "The position of the origin of the actor"
 msgstr "La posició de l'origen de l'actor"
 
-#: ../clutter/clutter-actor.c:6204 ../clutter/clutter-canvas.c:215
-#: ../clutter/clutter-grid-layout.c:1238
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:481
+#: ../clutter/clutter-actor.c:6284 ../clutter/clutter-canvas.c:247
+#: ../clutter/clutter-grid-layout.c:1239
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:474
 msgid "Width"
 msgstr "Amplada"
 
-#: ../clutter/clutter-actor.c:6205
+#: ../clutter/clutter-actor.c:6285
 msgid "Width of the actor"
 msgstr "Amplada de l'actor"
 
-#: ../clutter/clutter-actor.c:6223 ../clutter/clutter-canvas.c:231
-#: ../clutter/clutter-grid-layout.c:1245
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:497
+#: ../clutter/clutter-actor.c:6303 ../clutter/clutter-canvas.c:263
+#: ../clutter/clutter-grid-layout.c:1246
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:490
 msgid "Height"
 msgstr "Alçada"
 
-#: ../clutter/clutter-actor.c:6224
+#: ../clutter/clutter-actor.c:6304
 msgid "Height of the actor"
 msgstr "Alçada de l'actor"
 
-#: ../clutter/clutter-actor.c:6245
+#: ../clutter/clutter-actor.c:6325
 msgid "Size"
 msgstr "Mida"
 
-#: ../clutter/clutter-actor.c:6246
+#: ../clutter/clutter-actor.c:6326
 msgid "The size of the actor"
 msgstr "La mida de l'actor"
 
-#: ../clutter/clutter-actor.c:6264
+#: ../clutter/clutter-actor.c:6344
 msgid "Fixed X"
 msgstr "X fixada"
 
-#: ../clutter/clutter-actor.c:6265
+#: ../clutter/clutter-actor.c:6345
 msgid "Forced X position of the actor"
 msgstr "Posició X forçada de l'actor"
 
-#: ../clutter/clutter-actor.c:6282
+#: ../clutter/clutter-actor.c:6362
 msgid "Fixed Y"
 msgstr "Y fixada"
 
-#: ../clutter/clutter-actor.c:6283
+#: ../clutter/clutter-actor.c:6363
 msgid "Forced Y position of the actor"
 msgstr "Posició Y forçada de l'actor"
 
-#: ../clutter/clutter-actor.c:6298
+#: ../clutter/clutter-actor.c:6378
 msgid "Fixed position set"
 msgstr "Ús de la posició fixa"
 
-#: ../clutter/clutter-actor.c:6299
+#: ../clutter/clutter-actor.c:6379
 msgid "Whether to use fixed positioning for the actor"
 msgstr "Si s'ha d'utilitzar el posicionament fixat per a l'actor"
 
-#: ../clutter/clutter-actor.c:6317
+#: ../clutter/clutter-actor.c:6397
 msgid "Min Width"
 msgstr "Amplada mínima"
 
-#: ../clutter/clutter-actor.c:6318
+#: ../clutter/clutter-actor.c:6398
 msgid "Forced minimum width request for the actor"
-msgstr "Amplada mínima forçada soŀlicitada per l'actor"
+msgstr "Amplada mínima forçada sol·licitada per l'actor"
 
-#: ../clutter/clutter-actor.c:6336
+#: ../clutter/clutter-actor.c:6416
 msgid "Min Height"
 msgstr "Alçada mínima"
 
-#: ../clutter/clutter-actor.c:6337
+#: ../clutter/clutter-actor.c:6417
 msgid "Forced minimum height request for the actor"
-msgstr "Alçada mínima forçada soŀlicitada per l'actor"
+msgstr "Alçada mínima forçada sol·licitada per l'actor"
 
-#: ../clutter/clutter-actor.c:6355
+#: ../clutter/clutter-actor.c:6435
 msgid "Natural Width"
 msgstr "Amplada natural"
 
-#: ../clutter/clutter-actor.c:6356
+#: ../clutter/clutter-actor.c:6436
 msgid "Forced natural width request for the actor"
-msgstr "Amplada natural forçada soŀlicitada per l'actor"
+msgstr "Amplada natural forçada sol·licitada per l'actor"
 
-#: ../clutter/clutter-actor.c:6374
+#: ../clutter/clutter-actor.c:6454
 msgid "Natural Height"
 msgstr "Alçada natural"
 
-#: ../clutter/clutter-actor.c:6375
+#: ../clutter/clutter-actor.c:6455
 msgid "Forced natural height request for the actor"
-msgstr "Alçada natural forçada soŀlicitada per l'actor"
+msgstr "Alçada natural forçada sol·licitada per l'actor"
 
-#: ../clutter/clutter-actor.c:6390
+#: ../clutter/clutter-actor.c:6470
 msgid "Minimum width set"
 msgstr "Ús de l'amplada mínima"
 
-#: ../clutter/clutter-actor.c:6391
+#: ../clutter/clutter-actor.c:6471
 msgid "Whether to use the min-width property"
 msgstr "Si s'ha d'utilitzar la propietat «amplada mínima»"
 
-#: ../clutter/clutter-actor.c:6405
+#: ../clutter/clutter-actor.c:6485
 msgid "Minimum height set"
 msgstr "Ús de l'alçada mínima"
 
-#: ../clutter/clutter-actor.c:6406
+#: ../clutter/clutter-actor.c:6486
 msgid "Whether to use the min-height property"
 msgstr "Si s'ha d'utilitzar la propietat «alçada mínima»"
 
-#: ../clutter/clutter-actor.c:6420
+#: ../clutter/clutter-actor.c:6500
 msgid "Natural width set"
 msgstr "Ús de l'amplada natural"
 
-#: ../clutter/clutter-actor.c:6421
+#: ../clutter/clutter-actor.c:6501
 msgid "Whether to use the natural-width property"
 msgstr "Si s'ha d'utilitzar la propietat «amplada natural»"
 
-#: ../clutter/clutter-actor.c:6435
+#: ../clutter/clutter-actor.c:6515
 msgid "Natural height set"
 msgstr "Ús de l'alçada natural"
 
-#: ../clutter/clutter-actor.c:6436
+#: ../clutter/clutter-actor.c:6516
 msgid "Whether to use the natural-height property"
 msgstr "Si s'ha d'utilitzar la propietat «alçada natural»"
 
-#: ../clutter/clutter-actor.c:6452
+#: ../clutter/clutter-actor.c:6532
 msgid "Allocation"
 msgstr "Ubicació"
 
-#: ../clutter/clutter-actor.c:6453
+#: ../clutter/clutter-actor.c:6533
 msgid "The actor's allocation"
 msgstr "La ubicació de l'actor"
 
-#: ../clutter/clutter-actor.c:6510
+#: ../clutter/clutter-actor.c:6590
 msgid "Request Mode"
-msgstr "Mode soŀlicitat"
+msgstr "Mode sol·licitat"
 
-#: ../clutter/clutter-actor.c:6511
+#: ../clutter/clutter-actor.c:6591
 msgid "The actor's request mode"
-msgstr "El mode soŀlicitat per l'actor"
+msgstr "El mode sol·licitat per l'actor"
 
-#: ../clutter/clutter-actor.c:6535
+#: ../clutter/clutter-actor.c:6615
 msgid "Depth"
 msgstr "Profunditat"
 
-#: ../clutter/clutter-actor.c:6536
+#: ../clutter/clutter-actor.c:6616
 msgid "Position on the Z axis"
 msgstr "Posició en l'eix de la Z"
 
-#: ../clutter/clutter-actor.c:6563
+#: ../clutter/clutter-actor.c:6643
 msgid "Z Position"
 msgstr "Posició Z"
 
-#: ../clutter/clutter-actor.c:6564
+#: ../clutter/clutter-actor.c:6644
 msgid "The actor's position on the Z axis"
 msgstr "La posició de l'actor en l'eix de la Z"
 
-#: ../clutter/clutter-actor.c:6581
+#: ../clutter/clutter-actor.c:6661
 msgid "Opacity"
 msgstr "Opacitat"
 
-#: ../clutter/clutter-actor.c:6582
+#: ../clutter/clutter-actor.c:6662
 msgid "Opacity of an actor"
 msgstr "Opacitat d'un actor"
 
-#: ../clutter/clutter-actor.c:6602
+#: ../clutter/clutter-actor.c:6682
 msgid "Offscreen redirect"
 msgstr "Redireccionament fora de pantalla"
 
-#: ../clutter/clutter-actor.c:6603
+#: ../clutter/clutter-actor.c:6683
 msgid "Flags controlling when to flatten the actor into a single image"
 msgstr ""
 "Senyaladors que controlen quan s'ha d'aplanar l'actor a una sola imatge"
 
-#: ../clutter/clutter-actor.c:6617
+#: ../clutter/clutter-actor.c:6697
 msgid "Visible"
 msgstr "Visible"
 
-#: ../clutter/clutter-actor.c:6618
+#: ../clutter/clutter-actor.c:6698
 msgid "Whether the actor is visible or not"
 msgstr "Si l'actor és visible"
 
-#: ../clutter/clutter-actor.c:6632
+#: ../clutter/clutter-actor.c:6712
 msgid "Mapped"
 msgstr "Mapat"
 
-#: ../clutter/clutter-actor.c:6633
+#: ../clutter/clutter-actor.c:6713
 msgid "Whether the actor will be painted"
 msgstr "Si l'actor es pintarà"
 
-#: ../clutter/clutter-actor.c:6646
+#: ../clutter/clutter-actor.c:6726
 msgid "Realized"
 msgstr "Realitzat"
 
-#: ../clutter/clutter-actor.c:6647
+#: ../clutter/clutter-actor.c:6727
 msgid "Whether the actor has been realized"
 msgstr "Si l'actor s'ha realitzat"
 
-#: ../clutter/clutter-actor.c:6662
+#: ../clutter/clutter-actor.c:6742
 msgid "Reactive"
 msgstr "Reactiu"
 
-#: ../clutter/clutter-actor.c:6663
+#: ../clutter/clutter-actor.c:6743
 msgid "Whether the actor is reactive to events"
 msgstr "Si l'actor reacciona a esdeveniments"
 
-#: ../clutter/clutter-actor.c:6674
+#: ../clutter/clutter-actor.c:6754
 msgid "Has Clip"
 msgstr "Té un retallat"
 
-#: ../clutter/clutter-actor.c:6675
+#: ../clutter/clutter-actor.c:6755
 msgid "Whether the actor has a clip set"
 msgstr "Si l'actor té un retallat establert"
 
-#: ../clutter/clutter-actor.c:6688
+#: ../clutter/clutter-actor.c:6768
 msgid "Clip"
 msgstr "Retallat"
 
-#: ../clutter/clutter-actor.c:6689
+#: ../clutter/clutter-actor.c:6769
 msgid "The clip region for the actor"
 msgstr "La regió de retallat de l'actor"
 
-#: ../clutter/clutter-actor.c:6708
+#: ../clutter/clutter-actor.c:6788
 msgid "Clip Rectangle"
 msgstr "Rectangle retallat"
 
-#: ../clutter/clutter-actor.c:6709
+#: ../clutter/clutter-actor.c:6789
 msgid "The visible region of the actor"
 msgstr "La regió visible de l'actor"
 
-#: ../clutter/clutter-actor.c:6723 ../clutter/clutter-actor-meta.c:207
-#: ../clutter/clutter-binding-pool.c:319 ../clutter/clutter-input-device.c:258
+#: ../clutter/clutter-actor.c:6803 ../clutter/clutter-actor-meta.c:205
+#: ../clutter/clutter-binding-pool.c:318 ../clutter/clutter-input-device.c:247
 msgid "Name"
 msgstr "Nom"
 
-#: ../clutter/clutter-actor.c:6724
+#: ../clutter/clutter-actor.c:6804
 msgid "Name of the actor"
 msgstr "El nom de l'actor"
 
-#: ../clutter/clutter-actor.c:6745
+#: ../clutter/clutter-actor.c:6825
 msgid "Pivot Point"
 msgstr "Punt de pivotació"
 
-#: ../clutter/clutter-actor.c:6746
+#: ../clutter/clutter-actor.c:6826
 msgid "The point around which the scaling and rotation occur"
 msgstr "El punt sobre el qual es fa l'escalat i la rotació"
 
-#: ../clutter/clutter-actor.c:6764
+#: ../clutter/clutter-actor.c:6844
 msgid "Pivot Point Z"
 msgstr "El punt de pivotació sobre la Z"
 
-#: ../clutter/clutter-actor.c:6765
+#: ../clutter/clutter-actor.c:6845
 msgid "Z component of the pivot point"
 msgstr "Component Z del punt de pivotació"
 
-#: ../clutter/clutter-actor.c:6783
+#: ../clutter/clutter-actor.c:6863
 msgid "Scale X"
 msgstr "Escala X"
 
-#: ../clutter/clutter-actor.c:6784
+#: ../clutter/clutter-actor.c:6864
 msgid "Scale factor on the X axis"
 msgstr "El factor d'escala en l'eix de les X"
 
-#: ../clutter/clutter-actor.c:6802
+#: ../clutter/clutter-actor.c:6882
 msgid "Scale Y"
 msgstr "Escala Y"
 
-#: ../clutter/clutter-actor.c:6803
+#: ../clutter/clutter-actor.c:6883
 msgid "Scale factor on the Y axis"
 msgstr "El factor d'escala en l'eix de les Y"
 
-#: ../clutter/clutter-actor.c:6821
+#: ../clutter/clutter-actor.c:6901
 msgid "Scale Z"
 msgstr "Escala Z"
 
-#: ../clutter/clutter-actor.c:6822
+#: ../clutter/clutter-actor.c:6902
 msgid "Scale factor on the Z axis"
 msgstr "El factor d'escala en l'eix de les Z"
 
-#: ../clutter/clutter-actor.c:6840
+#: ../clutter/clutter-actor.c:6920
 msgid "Scale Center X"
 msgstr "Centre de l'escala X"
 
-#: ../clutter/clutter-actor.c:6841
+#: ../clutter/clutter-actor.c:6921
 msgid "Horizontal scale center"
 msgstr "Centre horitzontal de l'escala"
 
-#: ../clutter/clutter-actor.c:6859
+#: ../clutter/clutter-actor.c:6939
 msgid "Scale Center Y"
 msgstr "Centre de l'escala Y"
 
-#: ../clutter/clutter-actor.c:6860
+#: ../clutter/clutter-actor.c:6940
 msgid "Vertical scale center"
 msgstr "Centre vertical de l'escala"
 
-#: ../clutter/clutter-actor.c:6878
+#: ../clutter/clutter-actor.c:6958
 msgid "Scale Gravity"
 msgstr "Gravetat de l'escala"
 
-#: ../clutter/clutter-actor.c:6879
+#: ../clutter/clutter-actor.c:6959
 msgid "The center of scaling"
 msgstr "El centre de l'escalat"
 
-#: ../clutter/clutter-actor.c:6897
+#: ../clutter/clutter-actor.c:6977
 msgid "Rotation Angle X"
 msgstr "Angle de rotació X"
 
-#: ../clutter/clutter-actor.c:6898
+#: ../clutter/clutter-actor.c:6978
 msgid "The rotation angle on the X axis"
 msgstr "L'angle de rotació en l'eix de les X"
 
-#: ../clutter/clutter-actor.c:6916
+#: ../clutter/clutter-actor.c:6996
 msgid "Rotation Angle Y"
 msgstr "Angle de rotació Y"
 
-#: ../clutter/clutter-actor.c:6917
+#: ../clutter/clutter-actor.c:6997
 msgid "The rotation angle on the Y axis"
 msgstr "L'angle de rotació en l'eix de les Y"
 
-#: ../clutter/clutter-actor.c:6935
+#: ../clutter/clutter-actor.c:7015
 msgid "Rotation Angle Z"
 msgstr "Angle de rotació Z"
 
-#: ../clutter/clutter-actor.c:6936
+#: ../clutter/clutter-actor.c:7016
 msgid "The rotation angle on the Z axis"
 msgstr "L'angle de rotació en l'eix de les Z"
 
-#: ../clutter/clutter-actor.c:6954
+#: ../clutter/clutter-actor.c:7034
 msgid "Rotation Center X"
 msgstr "Centre de rotació X"
 
-#: ../clutter/clutter-actor.c:6955
+#: ../clutter/clutter-actor.c:7035
 msgid "The rotation center on the X axis"
 msgstr "El centre de rotació en l'eix de les X"
 
-#: ../clutter/clutter-actor.c:6972
+#: ../clutter/clutter-actor.c:7052
 msgid "Rotation Center Y"
 msgstr "Centre de rotació Y"
 
-#: ../clutter/clutter-actor.c:6973
+#: ../clutter/clutter-actor.c:7053
 msgid "The rotation center on the Y axis"
 msgstr "El centre de rotació en l'eix de les Y"
 
-#: ../clutter/clutter-actor.c:6990
+#: ../clutter/clutter-actor.c:7070
 msgid "Rotation Center Z"
 msgstr "Centre de rotació Z"
 
-#: ../clutter/clutter-actor.c:6991
+#: ../clutter/clutter-actor.c:7071
 msgid "The rotation center on the Z axis"
 msgstr "El centre de rotació en l'eix de les Z"
 
-#: ../clutter/clutter-actor.c:7008
+#: ../clutter/clutter-actor.c:7088
 msgid "Rotation Center Z Gravity"
 msgstr "Gravetat del centre de rotació Z"
 
-#: ../clutter/clutter-actor.c:7009
+#: ../clutter/clutter-actor.c:7089
 msgid "Center point for rotation around the Z axis"
 msgstr "Punt del centre de rotació al voltant de l'eix de les Z"
 
-#: ../clutter/clutter-actor.c:7037
+#: ../clutter/clutter-actor.c:7117
 msgid "Anchor X"
 msgstr "Àncora X"
 
-#: ../clutter/clutter-actor.c:7038
+#: ../clutter/clutter-actor.c:7118
 msgid "X coordinate of the anchor point"
 msgstr "Coordenada X del punt de l'àncora"
 
-#: ../clutter/clutter-actor.c:7066
+#: ../clutter/clutter-actor.c:7146
 msgid "Anchor Y"
 msgstr "Àncora Y"
 
-#: ../clutter/clutter-actor.c:7067
+#: ../clutter/clutter-actor.c:7147
 msgid "Y coordinate of the anchor point"
 msgstr "Coordenada Y del punt de l'àncora"
 
-#: ../clutter/clutter-actor.c:7094
+#: ../clutter/clutter-actor.c:7174
 msgid "Anchor Gravity"
 msgstr "Gravetat de l'àncora"
 
-#: ../clutter/clutter-actor.c:7095
+#: ../clutter/clutter-actor.c:7175
 msgid "The anchor point as a ClutterGravity"
 msgstr "El punt d'àncora com a «ClutterGravity»"
 
-#: ../clutter/clutter-actor.c:7114
+#: ../clutter/clutter-actor.c:7194
 msgid "Translation X"
 msgstr "Translació X"
 
-#: ../clutter/clutter-actor.c:7115
+#: ../clutter/clutter-actor.c:7195
 msgid "Translation along the X axis"
 msgstr "La translació en l'eix de les X"
 
-#: ../clutter/clutter-actor.c:7134
+#: ../clutter/clutter-actor.c:7214
 msgid "Translation Y"
 msgstr "Translació Y"
 
-#: ../clutter/clutter-actor.c:7135
+#: ../clutter/clutter-actor.c:7215
 msgid "Translation along the Y axis"
 msgstr "La translació en l'eix de les Y"
 
-#: ../clutter/clutter-actor.c:7154
+#: ../clutter/clutter-actor.c:7234
 msgid "Translation Z"
 msgstr "Translació Z"
 
-#: ../clutter/clutter-actor.c:7155
+#: ../clutter/clutter-actor.c:7235
 msgid "Translation along the Z axis"
 msgstr "La translació en l'eix de les Z"
 
-#: ../clutter/clutter-actor.c:7185
+#: ../clutter/clutter-actor.c:7265
 msgid "Transform"
 msgstr "Transformació"
 
-#: ../clutter/clutter-actor.c:7186
+#: ../clutter/clutter-actor.c:7266
 msgid "Transformation matrix"
 msgstr "Matriu de transformació"
 
-#: ../clutter/clutter-actor.c:7201
+#: ../clutter/clutter-actor.c:7281
 msgid "Transform Set"
 msgstr "Establiment de la transformació"
 
-#: ../clutter/clutter-actor.c:7202
+#: ../clutter/clutter-actor.c:7282
 msgid "Whether the transform property is set"
 msgstr "Si la propietat de transformació té un valor"
 
-#: ../clutter/clutter-actor.c:7223
+#: ../clutter/clutter-actor.c:7303
 msgid "Child Transform"
 msgstr "Transformació filla"
 
-#: ../clutter/clutter-actor.c:7224
+#: ../clutter/clutter-actor.c:7304
 msgid "Children transformation matrix"
 msgstr "Matriu de la transformació filla"
 
-#: ../clutter/clutter-actor.c:7239
+#: ../clutter/clutter-actor.c:7319
 msgid "Child Transform Set"
 msgstr "Establiment de la transformació filla"
 
-#: ../clutter/clutter-actor.c:7240
+#: ../clutter/clutter-actor.c:7320
 msgid "Whether the child-transform property is set"
 msgstr "Si la propietat de transformació filla té un valor"
 
-#: ../clutter/clutter-actor.c:7257
+#: ../clutter/clutter-actor.c:7337
 msgid "Show on set parent"
 msgstr "Mostra si és pare"
 
-#: ../clutter/clutter-actor.c:7258
+#: ../clutter/clutter-actor.c:7338
 msgid "Whether the actor is shown when parented"
 msgstr "Si s'ha de mostrar l'actor si se'l fa pare d'un element"
 
-#: ../clutter/clutter-actor.c:7275
+#: ../clutter/clutter-actor.c:7355
 msgid "Clip to Allocation"
 msgstr "Retalla a la ubicació"
 
-#: ../clutter/clutter-actor.c:7276
+#: ../clutter/clutter-actor.c:7356
 msgid "Sets the clip region to track the actor's allocation"
 msgstr ""
 "Estableix la regió de retallat per fer un seguiment de la ubicació de l'actor"
 
-#: ../clutter/clutter-actor.c:7289
+#: ../clutter/clutter-actor.c:7369
 msgid "Text Direction"
 msgstr "Direcció del text"
 
-#: ../clutter/clutter-actor.c:7290
+#: ../clutter/clutter-actor.c:7370
 msgid "Direction of the text"
 msgstr "La direcció del text"
 
-#: ../clutter/clutter-actor.c:7305
+#: ../clutter/clutter-actor.c:7385
 msgid "Has Pointer"
 msgstr "Té un punter"
 
-#: ../clutter/clutter-actor.c:7306
+#: ../clutter/clutter-actor.c:7386
 msgid "Whether the actor contains the pointer of an input device"
 msgstr "Si l'actor conté el punter d'un dispositiu d'entrada"
 
-#: ../clutter/clutter-actor.c:7319
+#: ../clutter/clutter-actor.c:7399
 msgid "Actions"
 msgstr "Accions"
 
-#: ../clutter/clutter-actor.c:7320
+#: ../clutter/clutter-actor.c:7400
 msgid "Adds an action to the actor"
 msgstr "Afegeix una acció a l'actor"
 
-#: ../clutter/clutter-actor.c:7333
+#: ../clutter/clutter-actor.c:7413
 msgid "Constraints"
 msgstr "Restriccions"
 
-#: ../clutter/clutter-actor.c:7334
+#: ../clutter/clutter-actor.c:7414
 msgid "Adds a constraint to the actor"
 msgstr "Afegeix una restricció a l'actor"
 
-#: ../clutter/clutter-actor.c:7347
+#: ../clutter/clutter-actor.c:7427
 msgid "Effect"
 msgstr "Efecte"
 
-#: ../clutter/clutter-actor.c:7348
+#: ../clutter/clutter-actor.c:7428
 msgid "Add an effect to be applied on the actor"
 msgstr "Afegeix un efecte que s'aplicarà a l'actor"
 
-#: ../clutter/clutter-actor.c:7362
+#: ../clutter/clutter-actor.c:7442
 msgid "Layout Manager"
 msgstr "Gestor de disposició"
 
-#: ../clutter/clutter-actor.c:7363
+#: ../clutter/clutter-actor.c:7443
 msgid "The object controlling the layout of an actor's children"
 msgstr "L'objecte que controla la disposició dels fills de l'actor"
 
-#: ../clutter/clutter-actor.c:7377
+#: ../clutter/clutter-actor.c:7457
 msgid "X Expand"
 msgstr "Expansió X"
 
-#: ../clutter/clutter-actor.c:7378
+#: ../clutter/clutter-actor.c:7458
 msgid "Whether extra horizontal space should be assigned to the actor"
 msgstr "Si l'actor hauria de tenir assignat un espai horitzontal extra"
 
-#: ../clutter/clutter-actor.c:7393
+#: ../clutter/clutter-actor.c:7473
 msgid "Y Expand"
 msgstr "Expansió Y"
 
-#: ../clutter/clutter-actor.c:7394
+#: ../clutter/clutter-actor.c:7474
 msgid "Whether extra vertical space should be assigned to the actor"
 msgstr "Si l'actor hauria de tenir assignat un espai vertical extra"
 
-#: ../clutter/clutter-actor.c:7410
+#: ../clutter/clutter-actor.c:7490
 msgid "X Alignment"
 msgstr "Alineació X"
 
-#: ../clutter/clutter-actor.c:7411
+#: ../clutter/clutter-actor.c:7491
 msgid "The alignment of the actor on the X axis within its allocation"
 msgstr "L'alineació de l'actor en l'eix de les X dins la seva ubicació"
 
-#: ../clutter/clutter-actor.c:7426
+#: ../clutter/clutter-actor.c:7506
 msgid "Y Alignment"
 msgstr "Alineació Y"
 
-#: ../clutter/clutter-actor.c:7427
+#: ../clutter/clutter-actor.c:7507
 msgid "The alignment of the actor on the Y axis within its allocation"
 msgstr "L'alineació de l'actor en l'eix de les Y dins la seva ubicació"
 
-#: ../clutter/clutter-actor.c:7446
+#: ../clutter/clutter-actor.c:7526
 msgid "Margin Top"
 msgstr "Marge superior"
 
-#: ../clutter/clutter-actor.c:7447
+#: ../clutter/clutter-actor.c:7527
 msgid "Extra space at the top"
 msgstr "Espai extra a la part superior"
 
-#: ../clutter/clutter-actor.c:7468
+#: ../clutter/clutter-actor.c:7548
 msgid "Margin Bottom"
 msgstr "Marge inferior"
 
-#: ../clutter/clutter-actor.c:7469
+#: ../clutter/clutter-actor.c:7549
 msgid "Extra space at the bottom"
 msgstr "Espai extra a la part inferior"
 
-#: ../clutter/clutter-actor.c:7490
+#: ../clutter/clutter-actor.c:7570
 msgid "Margin Left"
 msgstr "Marge esquerra"
 
-#: ../clutter/clutter-actor.c:7491
+#: ../clutter/clutter-actor.c:7571
 msgid "Extra space at the left"
 msgstr "Espai extra a l'esquerra"
 
-#: ../clutter/clutter-actor.c:7512
+#: ../clutter/clutter-actor.c:7592
 msgid "Margin Right"
 msgstr "Marge dret"
 
-#: ../clutter/clutter-actor.c:7513
+#: ../clutter/clutter-actor.c:7593
 msgid "Extra space at the right"
 msgstr "Espai extra a la dreta"
 
-#: ../clutter/clutter-actor.c:7529
+#: ../clutter/clutter-actor.c:7609
 msgid "Background Color Set"
 msgstr "Establiment del color de fons"
 
-#: ../clutter/clutter-actor.c:7530 ../clutter/deprecated/clutter-box.c:275
+#: ../clutter/clutter-actor.c:7610 ../clutter/deprecated/clutter-box.c:269
 msgid "Whether the background color is set"
 msgstr "Si hi ha cap color de fons"
 
-#: ../clutter/clutter-actor.c:7546
+#: ../clutter/clutter-actor.c:7626
 msgid "Background color"
 msgstr "Color de fons"
 
-#: ../clutter/clutter-actor.c:7547
+#: ../clutter/clutter-actor.c:7627
 msgid "The actor's background color"
 msgstr "El color de fons de l'actor"
 
-#: ../clutter/clutter-actor.c:7562
+#: ../clutter/clutter-actor.c:7642
 msgid "First Child"
 msgstr "Primer fill"
 
-#: ../clutter/clutter-actor.c:7563
+#: ../clutter/clutter-actor.c:7643
 msgid "The actor's first child"
 msgstr "El primer fill de l'actor"
 
-#: ../clutter/clutter-actor.c:7576
+#: ../clutter/clutter-actor.c:7656
 msgid "Last Child"
 msgstr "Últim fill"
 
-#: ../clutter/clutter-actor.c:7577
+#: ../clutter/clutter-actor.c:7657
 msgid "The actor's last child"
 msgstr "L'últim fill de l'actor"
 
-#: ../clutter/clutter-actor.c:7591
+#: ../clutter/clutter-actor.c:7671
 msgid "Content"
 msgstr "Contingut"
 
-#: ../clutter/clutter-actor.c:7592
+#: ../clutter/clutter-actor.c:7672
 msgid "Delegate object for painting the actor's content"
 msgstr "L'objecte al que es delega el pintat del contingut de l'actor"
 
-#: ../clutter/clutter-actor.c:7617
+#: ../clutter/clutter-actor.c:7697
 msgid "Content Gravity"
 msgstr "Gravetat del contingut"
 
-#: ../clutter/clutter-actor.c:7618
+#: ../clutter/clutter-actor.c:7698
 msgid "Alignment of the actor's content"
 msgstr "L'alineació del contingut de l'actor"
 
-#: ../clutter/clutter-actor.c:7638
+#: ../clutter/clutter-actor.c:7718
 msgid "Content Box"
 msgstr "Caixa del contingut"
 
-#: ../clutter/clutter-actor.c:7639
+#: ../clutter/clutter-actor.c:7719
 msgid "The bounding box of the actor's content"
 msgstr "La caixa de limitació que conté el contingut de l'actor"
 
-#: ../clutter/clutter-actor.c:7647
+#: ../clutter/clutter-actor.c:7727
 msgid "Minification Filter"
 msgstr "Filtre de minimització"
 
-#: ../clutter/clutter-actor.c:7648
+#: ../clutter/clutter-actor.c:7728
 msgid "The filter used when reducing the size of the content"
 msgstr "El filtre que s'utilitzarà per reduir la mida del contingut"
 
-#: ../clutter/clutter-actor.c:7655
+#: ../clutter/clutter-actor.c:7735
 msgid "Magnification Filter"
 msgstr "Filtre d'ampliació"
 
-#: ../clutter/clutter-actor.c:7656
+#: ../clutter/clutter-actor.c:7736
 msgid "The filter used when increasing the size of the content"
 msgstr "El filtre que s'utilitzarà per ampliar la mida del contingut"
 
-#: ../clutter/clutter-actor.c:7670
+#: ../clutter/clutter-actor.c:7750
 msgid "Content Repeat"
 msgstr "Repetició del contingut"
 
-#: ../clutter/clutter-actor.c:7671
+#: ../clutter/clutter-actor.c:7751
 msgid "The repeat policy for the actor's content"
 msgstr "La política de repetició del contingut de l'actor"
 
-#: ../clutter/clutter-actor-meta.c:193 ../clutter/clutter-child-meta.c:142
+#: ../clutter/clutter-actor-meta.c:191 ../clutter/clutter-child-meta.c:142
 msgid "Actor"
 msgstr "Actor"
 
-#: ../clutter/clutter-actor-meta.c:194
+#: ../clutter/clutter-actor-meta.c:192
 msgid "The actor attached to the meta"
 msgstr "L'actor acoblat a un meta"
 
-#: ../clutter/clutter-actor-meta.c:208
+#: ../clutter/clutter-actor-meta.c:206
 msgid "The name of the meta"
 msgstr "El nom del meta"
 
-#: ../clutter/clutter-actor-meta.c:221 ../clutter/clutter-input-device.c:337
-#: ../clutter/deprecated/clutter-shader.c:313
+#: ../clutter/clutter-actor-meta.c:219 ../clutter/clutter-input-device.c:326
+#: ../clutter/deprecated/clutter-shader.c:309
 msgid "Enabled"
 msgstr "Habilitat"
 
-#: ../clutter/clutter-actor-meta.c:222
+#: ../clutter/clutter-actor-meta.c:220
 msgid "Whether the meta is enabled"
 msgstr "Si el meta és habilitat"
 
 #: ../clutter/clutter-align-constraint.c:279
-#: ../clutter/clutter-bind-constraint.c:358 ../clutter/clutter-clone.c:345
+#: ../clutter/clutter-bind-constraint.c:343 ../clutter/clutter-clone.c:341
 #: ../clutter/clutter-snap-constraint.c:321
 msgid "Source"
 msgstr "Font"
@@ -730,82 +730,86 @@ msgstr "Factor"
 msgid "The alignment factor, between 0.0 and 1.0"
 msgstr "El factor d'alineació, entre 0.0 i 1.0"
 
-#: ../clutter/clutter-backend.c:379
+#: ../clutter/clutter-backend.c:380
 msgid "Unable to initialize the Clutter backend"
 msgstr "No s'ha pogut inicialitzar el rerefons de la Clutter"
 
-#: ../clutter/clutter-backend.c:453
+#: ../clutter/clutter-backend.c:454
 #, c-format
 msgid "The backend of type '%s' does not support creating multiple stages"
 msgstr "El rerefons, de tipus «%s», no permet crear múltiples escenaris"
 
-#: ../clutter/clutter-bind-constraint.c:359
+#: ../clutter/clutter-bind-constraint.c:344
 msgid "The source of the binding"
 msgstr "La font de la vinculació"
 
-#: ../clutter/clutter-bind-constraint.c:372
+#: ../clutter/clutter-bind-constraint.c:357
 msgid "Coordinate"
 msgstr "Coordenada"
 
-#: ../clutter/clutter-bind-constraint.c:373
+#: ../clutter/clutter-bind-constraint.c:358
 msgid "The coordinate to bind"
 msgstr "La coordenada a vincular"
 
-#: ../clutter/clutter-bind-constraint.c:387
+#: ../clutter/clutter-bind-constraint.c:372
 #: ../clutter/clutter-path-constraint.c:226
 #: ../clutter/clutter-snap-constraint.c:366
 msgid "Offset"
 msgstr "Desplaçament"
 
-#: ../clutter/clutter-bind-constraint.c:388
+#: ../clutter/clutter-bind-constraint.c:373
 msgid "The offset in pixels to apply to the binding"
 msgstr "El desplaçament, en píxels, que s'ha d'aplicar a la vinculació"
 
-#: ../clutter/clutter-binding-pool.c:320
+#: ../clutter/clutter-binding-pool.c:319
 msgid "The unique name of the binding pool"
 msgstr "El nom únic del conjunt de vinculacions"
 
-#: ../clutter/clutter-bin-layout.c:240 ../clutter/clutter-bin-layout.c:655
-#: ../clutter/clutter-box-layout.c:390 ../clutter/clutter-table-layout.c:610
+#: ../clutter/clutter-bin-layout.c:220 ../clutter/clutter-bin-layout.c:633
+#: ../clutter/clutter-box-layout.c:374
+#: ../clutter/deprecated/clutter-table-layout.c:602
 msgid "Horizontal Alignment"
 msgstr "Alineació horitzontal"
 
-#: ../clutter/clutter-bin-layout.c:241
+#: ../clutter/clutter-bin-layout.c:221
 msgid "Horizontal alignment for the actor inside the layout manager"
 msgstr "L'alineació horitzontal de l'actor dins del gestor de disposició"
 
-#: ../clutter/clutter-bin-layout.c:249 ../clutter/clutter-bin-layout.c:675
-#: ../clutter/clutter-box-layout.c:399 ../clutter/clutter-table-layout.c:625
+#: ../clutter/clutter-bin-layout.c:229 ../clutter/clutter-bin-layout.c:653
+#: ../clutter/clutter-box-layout.c:383
+#: ../clutter/deprecated/clutter-table-layout.c:617
 msgid "Vertical Alignment"
 msgstr "Alineació vertical"
 
-#: ../clutter/clutter-bin-layout.c:250
+#: ../clutter/clutter-bin-layout.c:230
 msgid "Vertical alignment for the actor inside the layout manager"
 msgstr "L'alineació vertical de l'actor dins del gestor de disposició"
 
-#: ../clutter/clutter-bin-layout.c:656
+#: ../clutter/clutter-bin-layout.c:634
 msgid "Default horizontal alignment for the actors inside the layout manager"
 msgstr ""
 "L'alineació horitzontal per defecte dels actors dins del gestor de disposició"
 
-#: ../clutter/clutter-bin-layout.c:676
+#: ../clutter/clutter-bin-layout.c:654
 msgid "Default vertical alignment for the actors inside the layout manager"
 msgstr ""
 "L'alineació vertical per defecte dels actors dins del gestor de disposició"
 
-#: ../clutter/clutter-box-layout.c:365
+#: ../clutter/clutter-box-layout.c:349
 msgid "Expand"
 msgstr "Expandeix"
 
-#: ../clutter/clutter-box-layout.c:366
+#: ../clutter/clutter-box-layout.c:350
 msgid "Allocate extra space for the child"
 msgstr "Ubica espai extra per al fill"
 
-#: ../clutter/clutter-box-layout.c:372 ../clutter/clutter-table-layout.c:589
+#: ../clutter/clutter-box-layout.c:356
+#: ../clutter/deprecated/clutter-table-layout.c:581
 msgid "Horizontal Fill"
 msgstr "Emplena horitzontalment"
 
-#: ../clutter/clutter-box-layout.c:373 ../clutter/clutter-table-layout.c:590
+#: ../clutter/clutter-box-layout.c:357
+#: ../clutter/deprecated/clutter-table-layout.c:582
 msgid ""
 "Whether the child should receive priority when the container is allocating "
 "spare space on the horizontal axis"
@@ -813,11 +817,13 @@ msgstr ""
 "Si el fill hauria de tenir prioritat quan el contenidor ubiqui espai extra "
 "en l'eix horitzontal"
 
-#: ../clutter/clutter-box-layout.c:381 ../clutter/clutter-table-layout.c:596
+#: ../clutter/clutter-box-layout.c:365
+#: ../clutter/deprecated/clutter-table-layout.c:588
 msgid "Vertical Fill"
 msgstr "Emplena verticalment"
 
-#: ../clutter/clutter-box-layout.c:382 ../clutter/clutter-table-layout.c:597
+#: ../clutter/clutter-box-layout.c:366
+#: ../clutter/deprecated/clutter-table-layout.c:589
 msgid ""
 "Whether the child should receive priority when the container is allocating "
 "spare space on the vertical axis"
@@ -825,80 +831,88 @@ msgstr ""
 "Si el fill hauria de tenir prioritat quan el contenidor ubiqui espai extra "
 "en l'eix vertical"
 
-#: ../clutter/clutter-box-layout.c:391 ../clutter/clutter-table-layout.c:611
+#: ../clutter/clutter-box-layout.c:375
+#: ../clutter/deprecated/clutter-table-layout.c:603
 msgid "Horizontal alignment of the actor within the cell"
-msgstr "L'alineació horitzontal de l'actor dins la ceŀla"
+msgstr "L'alineació horitzontal de l'actor dins la cel·la"
 
-#: ../clutter/clutter-box-layout.c:400 ../clutter/clutter-table-layout.c:626
+#: ../clutter/clutter-box-layout.c:384
+#: ../clutter/deprecated/clutter-table-layout.c:618
 msgid "Vertical alignment of the actor within the cell"
-msgstr "L'alineació vertical de l'actor dins la ceŀla"
+msgstr "L'alineació vertical de l'actor dins la cel·la"
 
-#: ../clutter/clutter-box-layout.c:1365
+#: ../clutter/clutter-box-layout.c:1345
 msgid "Vertical"
 msgstr "Vertical"
 
-#: ../clutter/clutter-box-layout.c:1366
+#: ../clutter/clutter-box-layout.c:1346
 msgid "Whether the layout should be vertical, rather than horizontal"
 msgstr "Si la disposició hauria de ser vertical en comptes d'horitzontal"
 
-#: ../clutter/clutter-box-layout.c:1383 ../clutter/clutter-flow-layout.c:890
-#: ../clutter/clutter-grid-layout.c:1550
+#: ../clutter/clutter-box-layout.c:1363 ../clutter/clutter-flow-layout.c:927
+#: ../clutter/clutter-grid-layout.c:1549
 msgid "Orientation"
 msgstr "Orientació"
 
-#: ../clutter/clutter-box-layout.c:1384 ../clutter/clutter-flow-layout.c:891
-#: ../clutter/clutter-grid-layout.c:1551
+#: ../clutter/clutter-box-layout.c:1364 ../clutter/clutter-flow-layout.c:928
+#: ../clutter/clutter-grid-layout.c:1550
 msgid "The orientation of the layout"
 msgstr "L'orientació de la disposició"
 
-#: ../clutter/clutter-box-layout.c:1400 ../clutter/clutter-flow-layout.c:906
+#: ../clutter/clutter-box-layout.c:1380 ../clutter/clutter-flow-layout.c:943
 msgid "Homogeneous"
 msgstr "Homogeni"
 
-#: ../clutter/clutter-box-layout.c:1401
+#: ../clutter/clutter-box-layout.c:1381
 msgid ""
 "Whether the layout should be homogeneous, i.e. all childs get the same size"
 msgstr ""
 "Si la disposició hauria de ser homogènia, és a dir, que tots els fills "
 "tinguin la mateixa mida"
 
-#: ../clutter/clutter-box-layout.c:1416
+#: ../clutter/clutter-box-layout.c:1396
 msgid "Pack Start"
 msgstr "Ajunta al principi"
 
-#: ../clutter/clutter-box-layout.c:1417
+#: ../clutter/clutter-box-layout.c:1397
 msgid "Whether to pack items at the start of the box"
 msgstr "Si s'ha d'ajuntar els elements a l'inici de la caixa"
 
-#: ../clutter/clutter-box-layout.c:1430
+#: ../clutter/clutter-box-layout.c:1410
 msgid "Spacing"
 msgstr "Espaiat"
 
-#: ../clutter/clutter-box-layout.c:1431
+#: ../clutter/clutter-box-layout.c:1411
 msgid "Spacing between children"
 msgstr "Espaiat entre fills"
 
-#: ../clutter/clutter-box-layout.c:1448 ../clutter/clutter-table-layout.c:1675
+#: ../clutter/clutter-box-layout.c:1428
+#: ../clutter/deprecated/clutter-table-layout.c:1669
 msgid "Use Animations"
 msgstr "Utilitza animacions"
 
-#: ../clutter/clutter-box-layout.c:1449 ../clutter/clutter-table-layout.c:1676
+#: ../clutter/clutter-box-layout.c:1429
+#: ../clutter/deprecated/clutter-table-layout.c:1670
 msgid "Whether layout changes should be animated"
 msgstr "Si s'han d'animar els canvis de disposició"
 
-#: ../clutter/clutter-box-layout.c:1473 ../clutter/clutter-table-layout.c:1700
+#: ../clutter/clutter-box-layout.c:1453
+#: ../clutter/deprecated/clutter-table-layout.c:1694
 msgid "Easing Mode"
 msgstr "Mode del camí"
 
-#: ../clutter/clutter-box-layout.c:1474 ../clutter/clutter-table-layout.c:1701
+#: ../clutter/clutter-box-layout.c:1454
+#: ../clutter/deprecated/clutter-table-layout.c:1695
 msgid "The easing mode of the animations"
 msgstr "El mode del camí de les animacions"
 
-#: ../clutter/clutter-box-layout.c:1494 ../clutter/clutter-table-layout.c:1721
+#: ../clutter/clutter-box-layout.c:1474
+#: ../clutter/deprecated/clutter-table-layout.c:1715
 msgid "Easing Duration"
 msgstr "Durada del camí"
 
-#: ../clutter/clutter-box-layout.c:1495 ../clutter/clutter-table-layout.c:1722
+#: ../clutter/clutter-box-layout.c:1475
+#: ../clutter/deprecated/clutter-table-layout.c:1716
 msgid "The duration of the animations"
 msgstr "La durada de les animacions"
 
@@ -918,14 +932,30 @@ msgstr "Contrast"
 msgid "The contrast change to apply"
 msgstr "El canvi de contrast a aplicar"
 
-#: ../clutter/clutter-canvas.c:216
+#: ../clutter/clutter-canvas.c:248
 msgid "The width of the canvas"
 msgstr "L'amplada del llenç"
 
-#: ../clutter/clutter-canvas.c:232
+#: ../clutter/clutter-canvas.c:264
 msgid "The height of the canvas"
 msgstr "L'alçada del llenç"
 
+#: ../clutter/clutter-canvas.c:283
+msgid "Scale Factor Set"
+msgstr "Establert el factor d'escalat"
+
+#: ../clutter/clutter-canvas.c:284
+msgid "Whether the scale-factor property is set"
+msgstr "Si la propietat de factor d'escalat té un valor"
+
+#: ../clutter/clutter-canvas.c:305
+msgid "Scale Factor"
+msgstr "Factor d'escalat"
+
+#: ../clutter/clutter-canvas.c:306
+msgid "The scaling factor for the surface"
+msgstr "El factor d'escalat de la superfície"
+
 #: ../clutter/clutter-child-meta.c:127
 msgid "Container"
 msgstr "Contenidor"
@@ -938,39 +968,39 @@ msgstr "El contenidor que ha creat aquesta dada"
 msgid "The actor wrapped by this data"
 msgstr "L'actor envoltat per aquesta dada"
 
-#: ../clutter/clutter-click-action.c:559
+#: ../clutter/clutter-click-action.c:586
 msgid "Pressed"
 msgstr "Premut"
 
-#: ../clutter/clutter-click-action.c:560
+#: ../clutter/clutter-click-action.c:587
 msgid "Whether the clickable should be in pressed state"
 msgstr "Si l'element que s'hi pot fer clic hauria d'estar en l'estat de premut"
 
-#: ../clutter/clutter-click-action.c:573
+#: ../clutter/clutter-click-action.c:600
 msgid "Held"
 msgstr "Manté"
 
-#: ../clutter/clutter-click-action.c:574
+#: ../clutter/clutter-click-action.c:601
 msgid "Whether the clickable has a grab"
 msgstr "Si l'element que s'hi pot fer clic té un mantenidor"
 
-#: ../clutter/clutter-click-action.c:591 ../clutter/clutter-settings.c:607
+#: ../clutter/clutter-click-action.c:618 ../clutter/clutter-settings.c:651
 msgid "Long Press Duration"
 msgstr "Durada de la premuda llarga"
 
-#: ../clutter/clutter-click-action.c:592
+#: ../clutter/clutter-click-action.c:619
 msgid "The minimum duration of a long press to recognize the gesture"
 msgstr "La durada mínima perquè es reconegui el gest d'una premuda llarga"
 
-#: ../clutter/clutter-click-action.c:610
+#: ../clutter/clutter-click-action.c:637
 msgid "Long Press Threshold"
 msgstr "Llindar de la premuda llarga"
 
-#: ../clutter/clutter-click-action.c:611
+#: ../clutter/clutter-click-action.c:638
 msgid "The maximum threshold before a long press is cancelled"
-msgstr "El llindar màxim abans de canceŀlar una premuda llarga"
+msgstr "El llindar màxim abans de cancel·lar una premuda llarga"
 
-#: ../clutter/clutter-clone.c:346
+#: ../clutter/clutter-clone.c:342
 msgid "Specifies the actor to be cloned"
 msgstr "Especifica l'actor a ser clonat"
 
@@ -982,27 +1012,27 @@ msgstr "Matís"
 msgid "The tint to apply"
 msgstr "El matís a aplicar"
 
-#: ../clutter/clutter-deform-effect.c:588
+#: ../clutter/clutter-deform-effect.c:591
 msgid "Horizontal Tiles"
 msgstr "Quadres horitzontals"
 
-#: ../clutter/clutter-deform-effect.c:589
+#: ../clutter/clutter-deform-effect.c:592
 msgid "The number of horizontal tiles"
 msgstr "El nombre de quadres horitzontals"
 
-#: ../clutter/clutter-deform-effect.c:604
+#: ../clutter/clutter-deform-effect.c:607
 msgid "Vertical Tiles"
 msgstr "Quadres verticals"
 
-#: ../clutter/clutter-deform-effect.c:605
+#: ../clutter/clutter-deform-effect.c:608
 msgid "The number of vertical tiles"
 msgstr "El nombre de quadres verticals"
 
-#: ../clutter/clutter-deform-effect.c:622
+#: ../clutter/clutter-deform-effect.c:625
 msgid "Back Material"
 msgstr "Material de fons"
 
-#: ../clutter/clutter-deform-effect.c:623
+#: ../clutter/clutter-deform-effect.c:626
 msgid "The material to be used when painting the back of the actor"
 msgstr "El material que s'utilitzarà quan es pinti el fons de l'actor"
 
@@ -1010,259 +1040,297 @@ msgstr "El material que s'utilitzarà quan es pinti el fons de l'actor"
 msgid "The desaturation factor"
 msgstr "El factor de dessaturació"
 
-#: ../clutter/clutter-device-manager.c:131
-#: ../clutter/clutter-input-device.c:366
-#: ../clutter/x11/clutter-keymap-x11.c:321
+#: ../clutter/clutter-device-manager.c:127
+#: ../clutter/clutter-input-device.c:355
+#: ../clutter/x11/clutter-keymap-x11.c:457
 msgid "Backend"
 msgstr "Rerefons"
 
-#: ../clutter/clutter-device-manager.c:132
+#: ../clutter/clutter-device-manager.c:128
 msgid "The ClutterBackend of the device manager"
 msgstr "El «ClutterBackend» del gestor del dispositiu"
 
-#: ../clutter/clutter-drag-action.c:742
+#: ../clutter/clutter-drag-action.c:733
 msgid "Horizontal Drag Threshold"
 msgstr "Llindar d'arrossegament horitzontal"
 
-#: ../clutter/clutter-drag-action.c:743
+#: ../clutter/clutter-drag-action.c:734
 msgid "The horizontal amount of pixels required to start dragging"
 msgstr ""
 "El nombre de píxels horitzontals necessaris per iniciar un arrossegament"
 
-#: ../clutter/clutter-drag-action.c:770
+#: ../clutter/clutter-drag-action.c:761
 msgid "Vertical Drag Threshold"
 msgstr "Llindar d'arrossegament vertical"
 
-#: ../clutter/clutter-drag-action.c:771
+#: ../clutter/clutter-drag-action.c:762
 msgid "The vertical amount of pixels required to start dragging"
 msgstr "El nombre de píxels verticals necessaris per iniciar un arrossegament"
 
-#: ../clutter/clutter-drag-action.c:792
+#: ../clutter/clutter-drag-action.c:783
 msgid "Drag Handle"
 msgstr "Nansa d'arrossegament"
 
-#: ../clutter/clutter-drag-action.c:793
+#: ../clutter/clutter-drag-action.c:784
 msgid "The actor that is being dragged"
 msgstr "L'actor que s'està arrossegant"
 
-#: ../clutter/clutter-drag-action.c:806
+#: ../clutter/clutter-drag-action.c:797
 msgid "Drag Axis"
 msgstr "Eix d'arrossegament"
 
-#: ../clutter/clutter-drag-action.c:807
+#: ../clutter/clutter-drag-action.c:798
 msgid "Constraints the dragging to an axis"
 msgstr "Restringeix l'arrossegament a un eix"
 
-#: ../clutter/clutter-drag-action.c:823
+#: ../clutter/clutter-drag-action.c:814
 msgid "Drag Area"
 msgstr "Àrea d'arrossegament"
 
-#: ../clutter/clutter-drag-action.c:824
+#: ../clutter/clutter-drag-action.c:815
 msgid "Constrains the dragging to a rectangle"
 msgstr "Restringeix l'arrossegament a un rectangle"
 
-#: ../clutter/clutter-drag-action.c:837
+#: ../clutter/clutter-drag-action.c:828
 msgid "Drag Area Set"
 msgstr "Establiment de l'àrea d'arrossegament"
 
-#: ../clutter/clutter-drag-action.c:838
+#: ../clutter/clutter-drag-action.c:829
 msgid "Whether the drag area is set"
 msgstr "Si la propietat d'àrea d'arrossegament té un valor"
 
-#: ../clutter/clutter-flow-layout.c:907
+#: ../clutter/clutter-flow-layout.c:944
 msgid "Whether each item should receive the same allocation"
 msgstr "Si cada element hauria de rebre la mateixa ubicació"
 
-#: ../clutter/clutter-flow-layout.c:922 ../clutter/clutter-table-layout.c:1637
+#: ../clutter/clutter-flow-layout.c:959
+#: ../clutter/deprecated/clutter-table-layout.c:1629
 msgid "Column Spacing"
 msgstr "Espaiat de columna"
 
-#: ../clutter/clutter-flow-layout.c:923
+#: ../clutter/clutter-flow-layout.c:960
 msgid "The spacing between columns"
 msgstr "L'espaiat entre columnes"
 
-#: ../clutter/clutter-flow-layout.c:939 ../clutter/clutter-table-layout.c:1651
+#: ../clutter/clutter-flow-layout.c:976
+#: ../clutter/deprecated/clutter-table-layout.c:1645
 msgid "Row Spacing"
 msgstr "Espaiat de fila"
 
-#: ../clutter/clutter-flow-layout.c:940
+#: ../clutter/clutter-flow-layout.c:977
 msgid "The spacing between rows"
 msgstr "L'espaiat entre files"
 
-#: ../clutter/clutter-flow-layout.c:954
+#: ../clutter/clutter-flow-layout.c:991
 msgid "Minimum Column Width"
 msgstr "Amplada mínima de columna"
 
-#: ../clutter/clutter-flow-layout.c:955
+#: ../clutter/clutter-flow-layout.c:992
 msgid "Minimum width for each column"
 msgstr "L'amplada mínima per a cada columna"
 
-#: ../clutter/clutter-flow-layout.c:970
+#: ../clutter/clutter-flow-layout.c:1007
 msgid "Maximum Column Width"
 msgstr "Amplada màxima de columna"
 
-#: ../clutter/clutter-flow-layout.c:971
+#: ../clutter/clutter-flow-layout.c:1008
 msgid "Maximum width for each column"
 msgstr "L'amplada màxima per a cada columna"
 
-#: ../clutter/clutter-flow-layout.c:985
+#: ../clutter/clutter-flow-layout.c:1022
 msgid "Minimum Row Height"
 msgstr "Alçada mínima de columna"
 
-#: ../clutter/clutter-flow-layout.c:986
+#: ../clutter/clutter-flow-layout.c:1023
 msgid "Minimum height for each row"
 msgstr "L'alçada mínima per a cada columna"
 
-#: ../clutter/clutter-flow-layout.c:1001
+#: ../clutter/clutter-flow-layout.c:1038
 msgid "Maximum Row Height"
 msgstr "Alçada màxima de columna"
 
-#: ../clutter/clutter-flow-layout.c:1002
+#: ../clutter/clutter-flow-layout.c:1039
 msgid "Maximum height for each row"
 msgstr "L'alçada màxima per a cada columna"
 
-#: ../clutter/clutter-grid-layout.c:1222
+#: ../clutter/clutter-flow-layout.c:1054 ../clutter/clutter-flow-layout.c:1055
+msgid "Snap to grid"
+msgstr "Ajusta a la graella"
+
+#: ../clutter/clutter-gesture-action.c:668
+msgid "Number touch points"
+msgstr "Nombre de punts tàctils"
+
+#: ../clutter/clutter-gesture-action.c:669
+msgid "Number of touch points"
+msgstr "El nombre de punts tàctils"
+
+#: ../clutter/clutter-gesture-action.c:684
+msgid "Threshold Trigger Edge"
+msgstr "Vora del llindar d'activació"
+
+#: ../clutter/clutter-gesture-action.c:685
+msgid "The trigger edge used by the action"
+msgstr "La vora d'activació que utilitza l'acció"
+
+#: ../clutter/clutter-gesture-action.c:704
+msgid "Threshold Trigger Horizontal Distance"
+msgstr "Llindar d'activació de distància horitzontal"
+
+#: ../clutter/clutter-gesture-action.c:705
+msgid "The horizontal trigger distance used by the action"
+msgstr "La distància d'activació horitzontal que utilitza l'acció"
+
+#: ../clutter/clutter-gesture-action.c:723
+msgid "Threshold Trigger Vertical Distance"
+msgstr "Llindar d'activació de distància vertical"
+
+#: ../clutter/clutter-gesture-action.c:724
+msgid "The vertical trigger distance used by the action"
+msgstr "La distància d'activació vertical que utilitza l'acció"
+
+#: ../clutter/clutter-grid-layout.c:1223
 msgid "Left attachment"
 msgstr "Adjunció esquerra"
 
-#: ../clutter/clutter-grid-layout.c:1223
+#: ../clutter/clutter-grid-layout.c:1224
 msgid "The column number to attach the left side of the child to"
 msgstr "El número de columna al que adjuntar-hi la part esquerra del fill"
 
-#: ../clutter/clutter-grid-layout.c:1230
+#: ../clutter/clutter-grid-layout.c:1231
 msgid "Top attachment"
 msgstr "Adjunció superior"
 
-#: ../clutter/clutter-grid-layout.c:1231
+#: ../clutter/clutter-grid-layout.c:1232
 msgid "The row number to attach the top side of a child widget to"
 msgstr "El número de columna al que adjuntar-hi la part superior del giny fill"
 
-#: ../clutter/clutter-grid-layout.c:1239
+#: ../clutter/clutter-grid-layout.c:1240
 msgid "The number of columns that a child spans"
 msgstr "El nombre de columnes que hauria d'abastir el fill"
 
-#: ../clutter/clutter-grid-layout.c:1246
+#: ../clutter/clutter-grid-layout.c:1247
 msgid "The number of rows that a child spans"
 msgstr "El nombre de files que hauria d'abastir el fill"
 
-#: ../clutter/clutter-grid-layout.c:1565
+#: ../clutter/clutter-grid-layout.c:1564
 msgid "Row spacing"
 msgstr "Espaiat de files"
 
-#: ../clutter/clutter-grid-layout.c:1566
+#: ../clutter/clutter-grid-layout.c:1565
 msgid "The amount of space between two consecutive rows"
 msgstr "La quantitat d'espai entre dues files consecutives"
 
-#: ../clutter/clutter-grid-layout.c:1579
+#: ../clutter/clutter-grid-layout.c:1578
 msgid "Column spacing"
 msgstr "Espaiat de columnes"
 
-#: ../clutter/clutter-grid-layout.c:1580
+#: ../clutter/clutter-grid-layout.c:1579
 msgid "The amount of space between two consecutive columns"
 msgstr "La quantitat d'espai entre dues columnes consecutives"
 
-#: ../clutter/clutter-grid-layout.c:1594
+#: ../clutter/clutter-grid-layout.c:1593
 msgid "Row Homogeneous"
 msgstr "Files homogènies"
 
-#: ../clutter/clutter-grid-layout.c:1595
+#: ../clutter/clutter-grid-layout.c:1594
 msgid "If TRUE, the rows are all the same height"
 msgstr "Si és «TRUE» (cert), totes les files tenen la mateixa alçada"
 
-#: ../clutter/clutter-grid-layout.c:1608
+#: ../clutter/clutter-grid-layout.c:1607
 msgid "Column Homogeneous"
 msgstr "Columnes homogènies"
 
-#: ../clutter/clutter-grid-layout.c:1609
+#: ../clutter/clutter-grid-layout.c:1608
 msgid "If TRUE, the columns are all the same width"
 msgstr "Si és «TRUE» (cert), totes les columnes tenen la mateixa amplada"
 
-#: ../clutter/clutter-image.c:248 ../clutter/clutter-image.c:311
-#: ../clutter/clutter-image.c:399
+#: ../clutter/clutter-image.c:268 ../clutter/clutter-image.c:331
+#: ../clutter/clutter-image.c:419
 msgid "Unable to load image data"
 msgstr "No s'han pogut carregar les dades de la imatge"
 
-#: ../clutter/clutter-input-device.c:242
+#: ../clutter/clutter-input-device.c:231
 msgid "Id"
 msgstr "Identificador"
 
-#: ../clutter/clutter-input-device.c:243
+#: ../clutter/clutter-input-device.c:232
 msgid "Unique identifier of the device"
 msgstr "L'identificador únic del dispositiu"
 
-#: ../clutter/clutter-input-device.c:259
+#: ../clutter/clutter-input-device.c:248
 msgid "The name of the device"
 msgstr "El nom del dispositiu"
 
-#: ../clutter/clutter-input-device.c:273
+#: ../clutter/clutter-input-device.c:262
 msgid "Device Type"
 msgstr "Tipus de dispositiu"
 
-#: ../clutter/clutter-input-device.c:274
+#: ../clutter/clutter-input-device.c:263
 msgid "The type of the device"
 msgstr "El tipus de dispositiu"
 
-#: ../clutter/clutter-input-device.c:289
+#: ../clutter/clutter-input-device.c:278
 msgid "Device Manager"
 msgstr "Gestor de dispositiu"
 
-#: ../clutter/clutter-input-device.c:290
+#: ../clutter/clutter-input-device.c:279
 msgid "The device manager instance"
 msgstr "La instància del gestor de dispositiu"
 
-#: ../clutter/clutter-input-device.c:303
+#: ../clutter/clutter-input-device.c:292
 msgid "Device Mode"
 msgstr "Mode del dispositiu"
 
-#: ../clutter/clutter-input-device.c:304
+#: ../clutter/clutter-input-device.c:293
 msgid "The mode of the device"
 msgstr "El mode del dispositiu"
 
-#: ../clutter/clutter-input-device.c:318
+#: ../clutter/clutter-input-device.c:307
 msgid "Has Cursor"
 msgstr "Té un cursor"
 
-#: ../clutter/clutter-input-device.c:319
+#: ../clutter/clutter-input-device.c:308
 msgid "Whether the device has a cursor"
 msgstr "Si el dispositiu té un cursor"
 
-#: ../clutter/clutter-input-device.c:338
+#: ../clutter/clutter-input-device.c:327
 msgid "Whether the device is enabled"
 msgstr "Si el dispositiu és habilitat"
 
-#: ../clutter/clutter-input-device.c:351
+#: ../clutter/clutter-input-device.c:340
 msgid "Number of Axes"
 msgstr "Nombre d'eixos"
 
-#: ../clutter/clutter-input-device.c:352
+#: ../clutter/clutter-input-device.c:341
 msgid "The number of axes on the device"
 msgstr "El nombre d'eixos en el dispositiu"
 
-#: ../clutter/clutter-input-device.c:367
+#: ../clutter/clutter-input-device.c:356
 msgid "The backend instance"
 msgstr "La instància del rerefons"
 
-#: ../clutter/clutter-interval.c:506
+#: ../clutter/clutter-interval.c:557
 msgid "Value Type"
 msgstr "Tipus de valor"
 
-#: ../clutter/clutter-interval.c:507
+#: ../clutter/clutter-interval.c:558
 msgid "The type of the values in the interval"
 msgstr "El tipus dels valors en l'interval"
 
-#: ../clutter/clutter-interval.c:522
+#: ../clutter/clutter-interval.c:573
 msgid "Initial Value"
 msgstr "Valor inicial"
 
-#: ../clutter/clutter-interval.c:523
+#: ../clutter/clutter-interval.c:574
 msgid "Initial value of the interval"
 msgstr "El valor inicial de l'interval"
 
-#: ../clutter/clutter-interval.c:537
+#: ../clutter/clutter-interval.c:588
 msgid "Final Value"
 msgstr "Valor final"
 
-#: ../clutter/clutter-interval.c:538
+#: ../clutter/clutter-interval.c:589
 msgid "Final value of the interval"
 msgstr "El valor final de l'interval"
 
@@ -1281,96 +1349,96 @@ msgstr "El gestor que ha creat aquesta dada"
 #. * Do NOT translate it to non-English e.g. "predefinito:LTR"! If
 #. * it isn't default:LTR or default:RTL it will not work.
 #.
-#: ../clutter/clutter-main.c:772
+#: ../clutter/clutter-main.c:751
 msgid "default:LTR"
 msgstr "default:LTR"
 
-#: ../clutter/clutter-main.c:1646
+#: ../clutter/clutter-main.c:1577
 msgid "Show frames per second"
 msgstr "Mostra els fotogrames per segon"
 
-#: ../clutter/clutter-main.c:1648
+#: ../clutter/clutter-main.c:1579
 msgid "Default frame rate"
 msgstr "Fotogrames per segon per defecte"
 
-#: ../clutter/clutter-main.c:1650
+#: ../clutter/clutter-main.c:1581
 msgid "Make all warnings fatal"
 msgstr "Fes que tots els avisos siguin fatals"
 
-#: ../clutter/clutter-main.c:1653
+#: ../clutter/clutter-main.c:1584
 msgid "Direction for the text"
 msgstr "Direcció del text"
 
-#: ../clutter/clutter-main.c:1656
+#: ../clutter/clutter-main.c:1587
 msgid "Disable mipmapping on text"
 msgstr "Inhabilita el mapat MIP en el text"
 
-#: ../clutter/clutter-main.c:1659
+#: ../clutter/clutter-main.c:1590
 msgid "Use 'fuzzy' picking"
 msgstr "Utilitza una selecció «difusa»"
 
-#: ../clutter/clutter-main.c:1662
+#: ../clutter/clutter-main.c:1593
 msgid "Clutter debugging flags to set"
 msgstr "Senyaladors de depuració de la Clutter a establir"
 
-#: ../clutter/clutter-main.c:1664
+#: ../clutter/clutter-main.c:1595
 msgid "Clutter debugging flags to unset"
 msgstr "Senyaladors de depuració de la Clutter a inhabilitar"
 
-#: ../clutter/clutter-main.c:1668
+#: ../clutter/clutter-main.c:1599
 msgid "Clutter profiling flags to set"
 msgstr "Senyaladors de perfilació de la Clutter a establir"
 
-#: ../clutter/clutter-main.c:1670
+#: ../clutter/clutter-main.c:1601
 msgid "Clutter profiling flags to unset"
 msgstr "Senyaladors de perfilació de la Clutter a inhabilitar"
 
-#: ../clutter/clutter-main.c:1673
+#: ../clutter/clutter-main.c:1604
 msgid "Enable accessibility"
 msgstr "Habilita l'accessibilitat"
 
-#: ../clutter/clutter-main.c:1865
+#: ../clutter/clutter-main.c:1796
 msgid "Clutter Options"
 msgstr "Opcions de la Clutter"
 
-#: ../clutter/clutter-main.c:1866
+#: ../clutter/clutter-main.c:1797
 msgid "Show Clutter Options"
 msgstr "Mostra les opcions de la Clutter"
 
-#: ../clutter/clutter-pan-action.c:448
+#: ../clutter/clutter-pan-action.c:455
 msgid "Pan Axis"
 msgstr "Eix de panorama"
 
-#: ../clutter/clutter-pan-action.c:449
+#: ../clutter/clutter-pan-action.c:456
 msgid "Constraints the panning to an axis"
 msgstr "Restringeix el panorama a un eix"
 
-#: ../clutter/clutter-pan-action.c:463
+#: ../clutter/clutter-pan-action.c:470
 msgid "Interpolate"
 msgstr "Interpolació"
 
-#: ../clutter/clutter-pan-action.c:464
+#: ../clutter/clutter-pan-action.c:471
 msgid "Whether interpolated events emission is enabled."
 msgstr "Si l'emissió d'esdeveniments interpolats és habilitat."
 
-#: ../clutter/clutter-pan-action.c:480
+#: ../clutter/clutter-pan-action.c:487
 msgid "Deceleration"
 msgstr "Desacceleració"
 
-#: ../clutter/clutter-pan-action.c:481
+#: ../clutter/clutter-pan-action.c:488
 msgid "Rate at which the interpolated panning will decelerate in"
 msgstr "La ràtio en la que la interpolació del panorama desaccelerarà"
 
-#: ../clutter/clutter-pan-action.c:498
+#: ../clutter/clutter-pan-action.c:505
 msgid "Initial acceleration factor"
 msgstr "Factor d'acceleració inicial"
 
-#: ../clutter/clutter-pan-action.c:499
+#: ../clutter/clutter-pan-action.c:506
 msgid "Factor applied to the momentum when starting the interpolated phase"
 msgstr "El factor aplicat al moment quan s'iniciï la fase d'interpolació"
 
 #: ../clutter/clutter-path-constraint.c:212
-#: ../clutter/deprecated/clutter-behaviour-path.c:225
+#: ../clutter/deprecated/clutter-behaviour-path.c:221
 msgid "Path"
 msgstr "Camí"
 
@@ -1382,89 +1450,89 @@ msgstr "El camí utilitzat per restringir un actor"
 msgid "The offset along the path, between -1.0 and 2.0"
 msgstr "El desplaçament al llarg del camí, entre -1.0 i 2.0"
 
-#: ../clutter/clutter-property-transition.c:271
+#: ../clutter/clutter-property-transition.c:269
 msgid "Property Name"
 msgstr "Nom de la propietat"
 
-#: ../clutter/clutter-property-transition.c:272
+#: ../clutter/clutter-property-transition.c:270
 msgid "The name of the property to animate"
 msgstr "El nom de la propietat que s'animarà"
 
-#: ../clutter/clutter-script.c:466
+#: ../clutter/clutter-script.c:464
 msgid "Filename Set"
 msgstr "Té nom de fitxer"
 
-#: ../clutter/clutter-script.c:467
+#: ../clutter/clutter-script.c:465
 msgid "Whether the :filename property is set"
 msgstr "Si la propietat «:filename» té un valor"
 
-#: ../clutter/clutter-script.c:481
-#: ../clutter/deprecated/clutter-texture.c:1082
+#: ../clutter/clutter-script.c:479
+#: ../clutter/deprecated/clutter-texture.c:1080
 msgid "Filename"
 msgstr "Nom de fitxer"
 
-#: ../clutter/clutter-script.c:482
+#: ../clutter/clutter-script.c:480
 msgid "The path of the currently parsed file"
 msgstr "El camí al fitxer analitzat actualment"
 
-#: ../clutter/clutter-script.c:499
+#: ../clutter/clutter-script.c:497
 msgid "Translation Domain"
 msgstr "Domini de la traducció"
 
-#: ../clutter/clutter-script.c:500
+#: ../clutter/clutter-script.c:498
 msgid "The translation domain used to localize string"
 msgstr "El domini de traducció utilitzat per ubicar una cadena"
 
-#: ../clutter/clutter-scroll-actor.c:190
+#: ../clutter/clutter-scroll-actor.c:184
 msgid "Scroll Mode"
 msgstr "Mode de desplaçament"
 
-#: ../clutter/clutter-scroll-actor.c:191
+#: ../clutter/clutter-scroll-actor.c:185
 msgid "The scrolling direction"
 msgstr "La direcció del desplaçament"
 
-#: ../clutter/clutter-settings.c:448
+#: ../clutter/clutter-settings.c:486
 msgid "Double Click Time"
 msgstr "Temps del doble clic"
 
-#: ../clutter/clutter-settings.c:449
+#: ../clutter/clutter-settings.c:487
 msgid "The time between clicks necessary to detect a multiple click"
 msgstr "El temps entre clics necessari per detectar un clic múltiple"
 
-#: ../clutter/clutter-settings.c:464
+#: ../clutter/clutter-settings.c:502
 msgid "Double Click Distance"
 msgstr "Distància de doble clic"
 
-#: ../clutter/clutter-settings.c:465
+#: ../clutter/clutter-settings.c:503
 msgid "The distance between clicks necessary to detect a multiple click"
 msgstr "La distància entre clics necessària per detectar un clic múltiple"
 
-#: ../clutter/clutter-settings.c:480
+#: ../clutter/clutter-settings.c:518
 msgid "Drag Threshold"
 msgstr "Llindar d'arrossegament"
 
-#: ../clutter/clutter-settings.c:481
+#: ../clutter/clutter-settings.c:519
 msgid "The distance the cursor should travel before starting to drag"
 msgstr ""
 "La distància que ha de desplaçar-se el cursor abans de començar un "
 "arrossegament"
 
-#: ../clutter/clutter-settings.c:496 ../clutter/clutter-text.c:3367
+#: ../clutter/clutter-settings.c:534 ../clutter/clutter-text.c:3437
 msgid "Font Name"
 msgstr "Nom del tipus de lletra"
 
-#: ../clutter/clutter-settings.c:497
+#: ../clutter/clutter-settings.c:535
 msgid ""
 "The description of the default font, as one that could be parsed by Pango"
 msgstr ""
 "La descripció del tipus de lletra per defecte, tal com l'hauria d'analitzar "
 "la Pango"
 
-#: ../clutter/clutter-settings.c:512
+#: ../clutter/clutter-settings.c:550
 msgid "Font Antialias"
 msgstr "Antialiàsing del tipus de lletra"
 
-#: ../clutter/clutter-settings.c:513
+#: ../clutter/clutter-settings.c:551
 msgid ""
 "Whether to use antialiasing (1 to enable, 0 to disable, and -1 to use the "
 "default)"
@@ -1472,73 +1540,81 @@ msgstr ""
 "Si s'ha d'utilitzar l'antialiàsing (1 l'habilita, 0 l'inhabilita i -1 "
 "utilitza el per defecte)"
 
-#: ../clutter/clutter-settings.c:529
+#: ../clutter/clutter-settings.c:567 ../clutter/clutter-settings.c:575
 msgid "Font DPI"
 msgstr "PPP del tipus de lletra"
 
-#: ../clutter/clutter-settings.c:530
+#: ../clutter/clutter-settings.c:568 ../clutter/clutter-settings.c:576
 msgid ""
 "The resolution of the font, in 1024 * dots/inch, or -1 to use the default"
 msgstr ""
 "La resolució del tipus de lletra, en 1024 * punts/polzada, o -1 utilitza la "
 "per defecte"
 
-#: ../clutter/clutter-settings.c:546
+#: ../clutter/clutter-settings.c:592
 msgid "Font Hinting"
 msgstr "Contorn del tipus de lletra"
 
-#: ../clutter/clutter-settings.c:547
+#: ../clutter/clutter-settings.c:593
 msgid ""
 "Whether to use hinting (1 to enable, 0 to disable and -1 to use the default)"
 msgstr ""
 "Si s'ha d'utilitzar el contorn (1 l'habilita, 0 l'inhabilita i -1 per "
 "utilitzar el per defecte)"
 
-#: ../clutter/clutter-settings.c:568
+#: ../clutter/clutter-settings.c:613
 msgid "Font Hint Style"
 msgstr "Estil del contorn del tipus de lletra"
 
-#: ../clutter/clutter-settings.c:569
+#: ../clutter/clutter-settings.c:614
 msgid "The style of hinting (hintnone, hintslight, hintmedium, hintfull)"
 msgstr ""
 "L'estil del contorn (sense contorn, contorn lleuger, contorn mitjà, contorn "
 "complet)"
 
-#: ../clutter/clutter-settings.c:590
+#: ../clutter/clutter-settings.c:634
 msgid "Font Subpixel Order"
 msgstr "Ordre de subpíxels del tipus de lletra"
 
-#: ../clutter/clutter-settings.c:591
+#: ../clutter/clutter-settings.c:635
 msgid "The type of subpixel antialiasing (none, rgb, bgr, vrgb, vbgr)"
 msgstr "El tipus d'antialiàsing de subpíxel (cap, rgb, bgr, vrgb, vbgr)"
 
-#: ../clutter/clutter-settings.c:608
+#: ../clutter/clutter-settings.c:652
 msgid "The minimum duration for a long press gesture to be recognized"
 msgstr "La durada mínima d'una premuda llarga perquè es reconegui"
 
-#: ../clutter/clutter-settings.c:615
+#: ../clutter/clutter-settings.c:659
+msgid "Window Scaling Factor"
+msgstr "El factor d'escalat de la finestra"
+
+#: ../clutter/clutter-settings.c:660
+msgid "The scaling factor to be applied to windows"
+msgstr "El factor d'escalat que s'ha d'aplicar a les finestres"
+
+#: ../clutter/clutter-settings.c:667
 msgid "Fontconfig configuration timestamp"
 msgstr "Marca horària de la configuració de la Fontconfig"
 
-#: ../clutter/clutter-settings.c:616
+#: ../clutter/clutter-settings.c:668
 msgid "Timestamp of the current fontconfig configuration"
 msgstr "Marca horària de la configuració actual de la Fontconfig"
 
-#: ../clutter/clutter-settings.c:633
+#: ../clutter/clutter-settings.c:685
 msgid "Password Hint Time"
 msgstr "Temps de pista de la contrasenya"
 
-#: ../clutter/clutter-settings.c:634
+#: ../clutter/clutter-settings.c:686
 msgid "How long to show the last input character in hidden entries"
 msgstr ""
 "Temps de durada de visualització de l'últim caràcter introduït en les "
 "entrades de ocultes"
 
-#: ../clutter/clutter-shader-effect.c:486
+#: ../clutter/clutter-shader-effect.c:487
 msgid "Shader Type"
 msgstr "Tipus de shader"
 
-#: ../clutter/clutter-shader-effect.c:487
+#: ../clutter/clutter-shader-effect.c:488
 msgid "The type of shader used"
 msgstr "El tipus de shader que s'utilitza"
 
@@ -1566,760 +1642,704 @@ msgstr "La vora de la font que s'hauria de trencar"
 msgid "The offset in pixels to apply to the constraint"
 msgstr "El desplaçament, en píxels, a aplicar a la restricció"
 
-#: ../clutter/clutter-stage.c:1929
+#: ../clutter/clutter-stage.c:1918
 msgid "Fullscreen Set"
 msgstr "A pantalla completa"
 
-#: ../clutter/clutter-stage.c:1930
+#: ../clutter/clutter-stage.c:1919
 msgid "Whether the main stage is fullscreen"
 msgstr "Si l'escenari principal és a pantalla completa"
 
-#: ../clutter/clutter-stage.c:1944
+#: ../clutter/clutter-stage.c:1933
 msgid "Offscreen"
 msgstr "Fora de pantalla"
 
-#: ../clutter/clutter-stage.c:1945
+#: ../clutter/clutter-stage.c:1934
 msgid "Whether the main stage should be rendered offscreen"
 msgstr "Si l'escenari principal hauria de renderitzar-se fora de pantalla"
 
-#: ../clutter/clutter-stage.c:1957 ../clutter/clutter-text.c:3481
+#: ../clutter/clutter-stage.c:1946 ../clutter/clutter-text.c:3551
 msgid "Cursor Visible"
 msgstr "Visibilitat del cursor"
 
-#: ../clutter/clutter-stage.c:1958
+#: ../clutter/clutter-stage.c:1947
 msgid "Whether the mouse pointer is visible on the main stage"
 msgstr "Si el punter del ratolí és visible a l'escenari principal"
 
-#: ../clutter/clutter-stage.c:1972
+#: ../clutter/clutter-stage.c:1961
 msgid "User Resizable"
 msgstr "Redimensionable per l'usuari"
 
-#: ../clutter/clutter-stage.c:1973
+#: ../clutter/clutter-stage.c:1962
 msgid "Whether the stage is able to be resized via user interaction"
 msgstr "Si l'usuari pot redimensionar l'escenari"
 
-#: ../clutter/clutter-stage.c:1988 ../clutter/deprecated/clutter-box.c:260
-#: ../clutter/deprecated/clutter-rectangle.c:273
+#: ../clutter/clutter-stage.c:1977 ../clutter/deprecated/clutter-box.c:254
+#: ../clutter/deprecated/clutter-rectangle.c:270
 msgid "Color"
 msgstr "Color"
 
-#: ../clutter/clutter-stage.c:1989
+#: ../clutter/clutter-stage.c:1978
 msgid "The color of the stage"
 msgstr "El color de l'escenari"
 
-#: ../clutter/clutter-stage.c:2004
+#: ../clutter/clutter-stage.c:1993
 msgid "Perspective"
 msgstr "Perspectiva"
 
-#: ../clutter/clutter-stage.c:2005
+#: ../clutter/clutter-stage.c:1994
 msgid "Perspective projection parameters"
 msgstr "Els paràmetres de projecció de la perspectiva"
 
-#: ../clutter/clutter-stage.c:2020
+#: ../clutter/clutter-stage.c:2009
 msgid "Title"
 msgstr "Títol"
 
-#: ../clutter/clutter-stage.c:2021
+#: ../clutter/clutter-stage.c:2010
 msgid "Stage Title"
 msgstr "Títol de l'escenari"
 
-#: ../clutter/clutter-stage.c:2038
+#: ../clutter/clutter-stage.c:2027
 msgid "Use Fog"
 msgstr "Utilitza la boira"
 
-#: ../clutter/clutter-stage.c:2039
+#: ../clutter/clutter-stage.c:2028
 msgid "Whether to enable depth cueing"
 msgstr "Si s'habilita la percepció de profunditat"
 
-#: ../clutter/clutter-stage.c:2055
+#: ../clutter/clutter-stage.c:2044
 msgid "Fog"
 msgstr "Boira"
 
-#: ../clutter/clutter-stage.c:2056
+#: ../clutter/clutter-stage.c:2045
 msgid "Settings for the depth cueing"
 msgstr "Paràmetres de la percepció de profunditat"
 
-#: ../clutter/clutter-stage.c:2072
+#: ../clutter/clutter-stage.c:2061
 msgid "Use Alpha"
 msgstr "Utilitza l'alfa"
 
-#: ../clutter/clutter-stage.c:2073
+#: ../clutter/clutter-stage.c:2062
 msgid "Whether to honour the alpha component of the stage color"
 msgstr "Si s'ha de respectar el component alfa del color de l'escenari"
 
-#: ../clutter/clutter-stage.c:2089
+#: ../clutter/clutter-stage.c:2078
 msgid "Key Focus"
 msgstr "Focus clau"
 
-#: ../clutter/clutter-stage.c:2090
+#: ../clutter/clutter-stage.c:2079
 msgid "The currently key focused actor"
 msgstr "L'actor clau que té el focus"
 
-#: ../clutter/clutter-stage.c:2106
+#: ../clutter/clutter-stage.c:2095
 msgid "No Clear Hint"
 msgstr "Sense indicació de neteja"
 
-#: ../clutter/clutter-stage.c:2107
+#: ../clutter/clutter-stage.c:2096
 msgid "Whether the stage should clear its contents"
 msgstr "Si l'escenari hauria de netejar els seus continguts"
 
-#: ../clutter/clutter-stage.c:2120
+#: ../clutter/clutter-stage.c:2109
 msgid "Accept Focus"
 msgstr "Accepta el focus"
 
-#: ../clutter/clutter-stage.c:2121
+#: ../clutter/clutter-stage.c:2110
 msgid "Whether the stage should accept focus on show"
 msgstr "Si l'escenari hauria d'acceptar el focus en mostrar-se"
 
-#: ../clutter/clutter-table-layout.c:543
-msgid "Column Number"
-msgstr "Número de columna"
-
-#: ../clutter/clutter-table-layout.c:544
-msgid "The column the widget resides in"
-msgstr "La columna en la que està el giny"
-
-#: ../clutter/clutter-table-layout.c:551
-msgid "Row Number"
-msgstr "Número de fila"
-
-#: ../clutter/clutter-table-layout.c:552
-msgid "The row the widget resides in"
-msgstr "La fila en la que està el giny"
-
-#: ../clutter/clutter-table-layout.c:559
-msgid "Column Span"
-msgstr "Abast en columnes"
-
-#: ../clutter/clutter-table-layout.c:560
-msgid "The number of columns the widget should span"
-msgstr "El nombre de columnes que hauria d'abastir el giny"
-
-#: ../clutter/clutter-table-layout.c:567
-msgid "Row Span"
-msgstr "Abast en files"
-
-#: ../clutter/clutter-table-layout.c:568
-msgid "The number of rows the widget should span"
-msgstr "El nombre de files que hauria d'abastir el giny"
-
-#: ../clutter/clutter-table-layout.c:575
-msgid "Horizontal Expand"
-msgstr "Expansió horitzontal"
-
-#: ../clutter/clutter-table-layout.c:576
-msgid "Allocate extra space for the child in horizontal axis"
-msgstr "Ubica espai extra per al fill en l'eix horitzontal"
-
-#: ../clutter/clutter-table-layout.c:582
-msgid "Vertical Expand"
-msgstr "Expansió vertical"
-
-#: ../clutter/clutter-table-layout.c:583
-msgid "Allocate extra space for the child in vertical axis"
-msgstr "Ubica espai extra per al fill en l'eix vertical"
-
-#: ../clutter/clutter-table-layout.c:1638
-msgid "Spacing between columns"
-msgstr "Espaiat entre columnes"
-
-#: ../clutter/clutter-table-layout.c:1652
-msgid "Spacing between rows"
-msgstr "Espaiat entre files"
-
-#: ../clutter/clutter-text-buffer.c:351 ../clutter/clutter-text.c:3402
+#: ../clutter/clutter-text-buffer.c:347 ../clutter/clutter-text.c:3472
 msgid "Text"
 msgstr "Text"
 
-#: ../clutter/clutter-text-buffer.c:352
+#: ../clutter/clutter-text-buffer.c:348
 msgid "The contents of the buffer"
 msgstr "El contingut de la memòria intermèdia"
 
-#: ../clutter/clutter-text-buffer.c:365
+#: ../clutter/clutter-text-buffer.c:361
 msgid "Text length"
 msgstr "Llargada del text"
 
-#: ../clutter/clutter-text-buffer.c:366
+#: ../clutter/clutter-text-buffer.c:362
 msgid "Length of the text currently in the buffer"
 msgstr "La llargada del text que hi ha actualment a la memòria intermèdia"
 
-#: ../clutter/clutter-text-buffer.c:379
+#: ../clutter/clutter-text-buffer.c:375
 msgid "Maximum length"
 msgstr "Llargada màxima"
 
-#: ../clutter/clutter-text-buffer.c:380
+#: ../clutter/clutter-text-buffer.c:376
 msgid "Maximum number of characters for this entry. Zero if no maximum"
 msgstr "Nombre màxim de caràcters per aquesta entrada. Zero si no té màxim"
 
-#: ../clutter/clutter-text.c:3349
+#: ../clutter/clutter-text.c:3419
 msgid "Buffer"
 msgstr "Memòria intermèdia"
 
-#: ../clutter/clutter-text.c:3350
+#: ../clutter/clutter-text.c:3420
 msgid "The buffer for the text"
 msgstr "La memòria intermèdia del text"
 
-#: ../clutter/clutter-text.c:3368
+#: ../clutter/clutter-text.c:3438
 msgid "The font to be used by the text"
 msgstr "El tipus de lletra per al text"
 
-#: ../clutter/clutter-text.c:3385
+#: ../clutter/clutter-text.c:3455
 msgid "Font Description"
 msgstr "Descripció del tipus de lletra"
 
-#: ../clutter/clutter-text.c:3386
+#: ../clutter/clutter-text.c:3456
 msgid "The font description to be used"
 msgstr "La descripció del tipus de lletra que s'utilitzarà"
 
-#: ../clutter/clutter-text.c:3403
+#: ../clutter/clutter-text.c:3473
 msgid "The text to render"
 msgstr "El text a renderitzar"
 
-#: ../clutter/clutter-text.c:3417
+#: ../clutter/clutter-text.c:3487
 msgid "Font Color"
 msgstr "Color del tipus de lletra"
 
-#: ../clutter/clutter-text.c:3418
+#: ../clutter/clutter-text.c:3488
 msgid "Color of the font used by the text"
 msgstr "El color del tipus de lletra que utilitzarà el text"
 
-#: ../clutter/clutter-text.c:3433
+#: ../clutter/clutter-text.c:3503
 msgid "Editable"
 msgstr "Editable"
 
-#: ../clutter/clutter-text.c:3434
+#: ../clutter/clutter-text.c:3504
 msgid "Whether the text is editable"
 msgstr "Si el text es pot editar"
 
-#: ../clutter/clutter-text.c:3449
+#: ../clutter/clutter-text.c:3519
 msgid "Selectable"
 msgstr "Seleccionable"
 
-#: ../clutter/clutter-text.c:3450
+#: ../clutter/clutter-text.c:3520
 msgid "Whether the text is selectable"
 msgstr "Si el text es pot seleccionar"
 
-#: ../clutter/clutter-text.c:3464
+#: ../clutter/clutter-text.c:3534
 msgid "Activatable"
 msgstr "Activable"
 
-#: ../clutter/clutter-text.c:3465
+#: ../clutter/clutter-text.c:3535
 msgid "Whether pressing return causes the activate signal to be emitted"
 msgstr "Si s'emet el senyal d'activació en prémer la tecla de retorn"
 
-#: ../clutter/clutter-text.c:3482
+#: ../clutter/clutter-text.c:3552
 msgid "Whether the input cursor is visible"
 msgstr "Si és visible el cursor d'entrada"
 
-#: ../clutter/clutter-text.c:3496 ../clutter/clutter-text.c:3497
+#: ../clutter/clutter-text.c:3566 ../clutter/clutter-text.c:3567
 msgid "Cursor Color"
 msgstr "Color del cursor"
 
-#: ../clutter/clutter-text.c:3512
+#: ../clutter/clutter-text.c:3582
 msgid "Cursor Color Set"
 msgstr "Establert el color del cursor"
 
-#: ../clutter/clutter-text.c:3513
+#: ../clutter/clutter-text.c:3583
 msgid "Whether the cursor color has been set"
 msgstr "Si s'ha establert el color del cursor"
 
-#: ../clutter/clutter-text.c:3528
+#: ../clutter/clutter-text.c:3598
 msgid "Cursor Size"
 msgstr "Mida del cursor"
 
-#: ../clutter/clutter-text.c:3529
+#: ../clutter/clutter-text.c:3599
 msgid "The width of the cursor, in pixels"
 msgstr "L'amplada del cursor, en píxels"
 
-#: ../clutter/clutter-text.c:3545 ../clutter/clutter-text.c:3563
+#: ../clutter/clutter-text.c:3615 ../clutter/clutter-text.c:3633
 msgid "Cursor Position"
 msgstr "Posició del cursor"
 
-#: ../clutter/clutter-text.c:3546 ../clutter/clutter-text.c:3564
+#: ../clutter/clutter-text.c:3616 ../clutter/clutter-text.c:3634
 msgid "The cursor position"
 msgstr "La posició del cursor"
 
-#: ../clutter/clutter-text.c:3579
+#: ../clutter/clutter-text.c:3649
 msgid "Selection-bound"
 msgstr "Extrem de selecció"
 
-#: ../clutter/clutter-text.c:3580
+#: ../clutter/clutter-text.c:3650
 msgid "The cursor position of the other end of the selection"
 msgstr "La posició del cursor a l'altre extrem de la selecció"
 
-#: ../clutter/clutter-text.c:3595 ../clutter/clutter-text.c:3596
+#: ../clutter/clutter-text.c:3665 ../clutter/clutter-text.c:3666
 msgid "Selection Color"
 msgstr "Color de la selecció"
 
-#: ../clutter/clutter-text.c:3611
+#: ../clutter/clutter-text.c:3681
 msgid "Selection Color Set"
 msgstr "Establert el color de selecció"
 
-#: ../clutter/clutter-text.c:3612
+#: ../clutter/clutter-text.c:3682
 msgid "Whether the selection color has been set"
 msgstr "Si s'ha establert el color de selecció"
 
-#: ../clutter/clutter-text.c:3627
+#: ../clutter/clutter-text.c:3697
 msgid "Attributes"
 msgstr "Atributs"
 
-#: ../clutter/clutter-text.c:3628
+#: ../clutter/clutter-text.c:3698
 msgid "A list of style attributes to apply to the contents of the actor"
 msgstr "Una llista d'atributs d'estil per aplicar als continguts de l'actor"
 
-#: ../clutter/clutter-text.c:3650
+#: ../clutter/clutter-text.c:3720
 msgid "Use markup"
 msgstr "Utilitza l'etiquetatge"
 
-#: ../clutter/clutter-text.c:3651
+#: ../clutter/clutter-text.c:3721
 msgid "Whether or not the text includes Pango markup"
 msgstr "Si el text inclou etiquetatge de la Pango"
 
-#: ../clutter/clutter-text.c:3667
+#: ../clutter/clutter-text.c:3737
 msgid "Line wrap"
 msgstr "Ajustament de línia"
 
-#: ../clutter/clutter-text.c:3668
+#: ../clutter/clutter-text.c:3738
 msgid "If set, wrap the lines if the text becomes too wide"
 msgstr "Si s'estableix, ajusta les línies si el text és massa ample"
 
-#: ../clutter/clutter-text.c:3683
+#: ../clutter/clutter-text.c:3753
 msgid "Line wrap mode"
 msgstr "Mode d'ajust de línia"
 
-#: ../clutter/clutter-text.c:3684
+#: ../clutter/clutter-text.c:3754
 msgid "Control how line-wrapping is done"
 msgstr "Controla com s'ajusten les línies"
 
-#: ../clutter/clutter-text.c:3699
+#: ../clutter/clutter-text.c:3769
 msgid "Ellipsize"
 msgstr "Punts suspensius"
 
-#: ../clutter/clutter-text.c:3700
+#: ../clutter/clutter-text.c:3770
 msgid "The preferred place to ellipsize the string"
 msgstr "El lloc preferit on posar punts suspensius al segment"
 
-#: ../clutter/clutter-text.c:3716
+#: ../clutter/clutter-text.c:3786
 msgid "Line Alignment"
 msgstr "Alineació de la línia"
 
-#: ../clutter/clutter-text.c:3717
+#: ../clutter/clutter-text.c:3787
 msgid "The preferred alignment for the string, for multi-line text"
 msgstr ""
 "L'alineació preferida per al segment quan és un text de més d'una línia"
 
-#: ../clutter/clutter-text.c:3733
+#: ../clutter/clutter-text.c:3803
 msgid "Justify"
 msgstr "Justifica"
 
-#: ../clutter/clutter-text.c:3734
+#: ../clutter/clutter-text.c:3804
 msgid "Whether the text should be justified"
 msgstr "Si el text s'hauria de justificar"
 
-#: ../clutter/clutter-text.c:3749
+#: ../clutter/clutter-text.c:3819
 msgid "Password Character"
 msgstr "Caràcter de contrasenya"
 
-#: ../clutter/clutter-text.c:3750
+#: ../clutter/clutter-text.c:3820
 msgid "If non-zero, use this character to display the actor's contents"
 msgstr ""
 "Si no és zero, utilitza aquest caràcter per mostrar els continguts de l'actor"
 
-#: ../clutter/clutter-text.c:3764
+#: ../clutter/clutter-text.c:3834
 msgid "Max Length"
 msgstr "Llargada màxima"
 
-#: ../clutter/clutter-text.c:3765
+#: ../clutter/clutter-text.c:3835
 msgid "Maximum length of the text inside the actor"
 msgstr "Llargada màxima del text dins de l'actor"
 
-#: ../clutter/clutter-text.c:3788
+#: ../clutter/clutter-text.c:3858
 msgid "Single Line Mode"
 msgstr "Mode d'una línia sola"
 
-#: ../clutter/clutter-text.c:3789
+#: ../clutter/clutter-text.c:3859
 msgid "Whether the text should be a single line"
 msgstr "Si el text hauria de ser una sola línia"
 
-#: ../clutter/clutter-text.c:3803 ../clutter/clutter-text.c:3804
+#: ../clutter/clutter-text.c:3873 ../clutter/clutter-text.c:3874
 msgid "Selected Text Color"
 msgstr "Color del text seleccionat"
 
-#: ../clutter/clutter-text.c:3819
+#: ../clutter/clutter-text.c:3889
 msgid "Selected Text Color Set"
 msgstr "Establert el color del text seleccionat"
 
-#: ../clutter/clutter-text.c:3820
+#: ../clutter/clutter-text.c:3890
 msgid "Whether the selected text color has been set"
 msgstr "Si s'ha establert el color del text seleccionat"
 
-#: ../clutter/clutter-timeline.c:594
-#: ../clutter/deprecated/clutter-animation.c:560
+#: ../clutter/clutter-timeline.c:591
+#: ../clutter/deprecated/clutter-animation.c:506
 msgid "Loop"
 msgstr "Repetició"
 
-#: ../clutter/clutter-timeline.c:595
+#: ../clutter/clutter-timeline.c:592
 msgid "Should the timeline automatically restart"
 msgstr "Si s'hauria de reiniciar automàticament la línia del temps"
 
-#: ../clutter/clutter-timeline.c:609
+#: ../clutter/clutter-timeline.c:606
 msgid "Delay"
 msgstr "Retard"
 
-#: ../clutter/clutter-timeline.c:610
+#: ../clutter/clutter-timeline.c:607
 msgid "Delay before start"
 msgstr "El retard abans d'iniciar"
 
-#: ../clutter/clutter-timeline.c:625
-#: ../clutter/deprecated/clutter-animation.c:544
-#: ../clutter/deprecated/clutter-animator.c:1804
+#: ../clutter/clutter-timeline.c:622
+#: ../clutter/deprecated/clutter-animation.c:490
+#: ../clutter/deprecated/clutter-animator.c:1792
 #: ../clutter/deprecated/clutter-media.c:224
-#: ../clutter/deprecated/clutter-state.c:1523
+#: ../clutter/deprecated/clutter-state.c:1515
 msgid "Duration"
 msgstr "Durada"
 
-#: ../clutter/clutter-timeline.c:626
+#: ../clutter/clutter-timeline.c:623
 msgid "Duration of the timeline in milliseconds"
-msgstr "La durada de la línia del temps en miŀlisegons"
+msgstr "La durada de la línia del temps en mil·lisegons"
 
-#: ../clutter/clutter-timeline.c:641
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:528
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:337
+#: ../clutter/clutter-timeline.c:638
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:521
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:330
 msgid "Direction"
 msgstr "Direcció"
 
-#: ../clutter/clutter-timeline.c:642
+#: ../clutter/clutter-timeline.c:639
 msgid "Direction of the timeline"
 msgstr "La direcció de la línia del temps"
 
-#: ../clutter/clutter-timeline.c:657
+#: ../clutter/clutter-timeline.c:654
 msgid "Auto Reverse"
 msgstr "Capgira automàticament"
 
-#: ../clutter/clutter-timeline.c:658
+#: ../clutter/clutter-timeline.c:655
 msgid "Whether the direction should be reversed when reaching the end"
 msgstr "Si la direcció s'hauria de capgirar quan s'arribi al final"
 
-#: ../clutter/clutter-timeline.c:676
+#: ../clutter/clutter-timeline.c:673
 msgid "Repeat Count"
 msgstr "Comptador de repeticions"
 
-#: ../clutter/clutter-timeline.c:677
+#: ../clutter/clutter-timeline.c:674
 msgid "How many times the timeline should repeat"
 msgstr "Nombre de vegades que s'hauria de repetir la línia de temps"
 
-#: ../clutter/clutter-timeline.c:691
+#: ../clutter/clutter-timeline.c:688
 msgid "Progress Mode"
 msgstr "Mode de progrés"
 
-#: ../clutter/clutter-timeline.c:692
+#: ../clutter/clutter-timeline.c:689
 msgid "How the timeline should compute the progress"
 msgstr "Com s'ha de calcular el progrés de la línia del temps"
 
-#: ../clutter/clutter-transition.c:246
+#: ../clutter/clutter-transition.c:244
 msgid "Interval"
 msgstr "Interval"
 
-#: ../clutter/clutter-transition.c:247
+#: ../clutter/clutter-transition.c:245
 msgid "The interval of values to transition"
 msgstr "L'interval de valors en que es farà la transició"
 
-#: ../clutter/clutter-transition.c:261
+#: ../clutter/clutter-transition.c:259
 msgid "Animatable"
 msgstr "Es pot animar"
 
-#: ../clutter/clutter-transition.c:262
+#: ../clutter/clutter-transition.c:260
 msgid "The animatable object"
 msgstr "L'objecte que es pot animar"
 
-#: ../clutter/clutter-transition.c:283
+#: ../clutter/clutter-transition.c:281
 msgid "Remove on Complete"
 msgstr "Suprimeix en completar"
 
-#: ../clutter/clutter-transition.c:284
+#: ../clutter/clutter-transition.c:282
 msgid "Detach the transition when completed"
 msgstr "Desacobla la transició quan es completi"
 
-#: ../clutter/clutter-zoom-action.c:354
+#: ../clutter/clutter-zoom-action.c:365
 msgid "Zoom Axis"
 msgstr "Eix d'ampliació"
 
-#: ../clutter/clutter-zoom-action.c:355
+#: ../clutter/clutter-zoom-action.c:366
 msgid "Constraints the zoom to an axis"
 msgstr "Restringeix l'ampliació a un eix"
 
-#: ../clutter/deprecated/clutter-alpha.c:355
-#: ../clutter/deprecated/clutter-animation.c:575
-#: ../clutter/deprecated/clutter-animator.c:1821
+#: ../clutter/deprecated/clutter-alpha.c:347
+#: ../clutter/deprecated/clutter-animation.c:521
+#: ../clutter/deprecated/clutter-animator.c:1809
 msgid "Timeline"
 msgstr "Línia del temps"
 
-#: ../clutter/deprecated/clutter-alpha.c:356
+#: ../clutter/deprecated/clutter-alpha.c:348
 msgid "Timeline used by the alpha"
 msgstr "La línia del temps que utilitzarà l'alfa"
 
-#: ../clutter/deprecated/clutter-alpha.c:372
+#: ../clutter/deprecated/clutter-alpha.c:364
 msgid "Alpha value"
 msgstr "Valor alfa"
 
-#: ../clutter/deprecated/clutter-alpha.c:373
+#: ../clutter/deprecated/clutter-alpha.c:365
 msgid "Alpha value as computed by the alpha"
 msgstr "El valor alfa calculat per l'alfa"
 
-#: ../clutter/deprecated/clutter-alpha.c:394
-#: ../clutter/deprecated/clutter-animation.c:528
+#: ../clutter/deprecated/clutter-alpha.c:386
+#: ../clutter/deprecated/clutter-animation.c:474
 msgid "Mode"
 msgstr "Mode"
 
-#: ../clutter/deprecated/clutter-alpha.c:395
+#: ../clutter/deprecated/clutter-alpha.c:387
 msgid "Progress mode"
 msgstr "Mode de progrés"
 
-#: ../clutter/deprecated/clutter-animation.c:511
+#: ../clutter/deprecated/clutter-animation.c:457
 msgid "Object"
 msgstr "Objecte"
 
-#: ../clutter/deprecated/clutter-animation.c:512
+#: ../clutter/deprecated/clutter-animation.c:458
 msgid "Object to which the animation applies"
 msgstr "L'objecte al que s'aplica l'animació"
 
-#: ../clutter/deprecated/clutter-animation.c:529
+#: ../clutter/deprecated/clutter-animation.c:475
 msgid "The mode of the animation"
 msgstr "El mode de l'animació"
 
-#: ../clutter/deprecated/clutter-animation.c:545
+#: ../clutter/deprecated/clutter-animation.c:491
 msgid "Duration of the animation, in milliseconds"
-msgstr "Durada de l'animació, en miŀlisegons"
+msgstr "Durada de l'animació, en mil·lisegons"
 
-#: ../clutter/deprecated/clutter-animation.c:561
+#: ../clutter/deprecated/clutter-animation.c:507
 msgid "Whether the animation should loop"
 msgstr "Si l'animació s'hauria de repetir"
 
-#: ../clutter/deprecated/clutter-animation.c:576
+#: ../clutter/deprecated/clutter-animation.c:522
 msgid "The timeline used by the animation"
 msgstr "La línia del temps que utilitzarà l'animació"
 
-#: ../clutter/deprecated/clutter-animation.c:592
-#: ../clutter/deprecated/clutter-behaviour.c:241
+#: ../clutter/deprecated/clutter-animation.c:538
+#: ../clutter/deprecated/clutter-behaviour.c:237
 msgid "Alpha"
 msgstr "Alfa"
 
-#: ../clutter/deprecated/clutter-animation.c:593
+#: ../clutter/deprecated/clutter-animation.c:539
 msgid "The alpha used by the animation"
 msgstr "L'alfa que utilitzarà l'animació"
 
-#: ../clutter/deprecated/clutter-animator.c:1805
+#: ../clutter/deprecated/clutter-animator.c:1793
 msgid "The duration of the animation"
 msgstr "La durada de l'animació"
 
-#: ../clutter/deprecated/clutter-animator.c:1822
+#: ../clutter/deprecated/clutter-animator.c:1810
 msgid "The timeline of the animation"
 msgstr "La línia del temps de l'animació"
 
-#: ../clutter/deprecated/clutter-behaviour.c:242
+#: ../clutter/deprecated/clutter-behaviour.c:238
 msgid "Alpha Object to drive the behaviour"
 msgstr "L'objecte alfa que estableix el comportament"
 
-#: ../clutter/deprecated/clutter-behaviour-depth.c:182
+#: ../clutter/deprecated/clutter-behaviour-depth.c:180
 msgid "Start Depth"
 msgstr "Profunditat inicial"
 
-#: ../clutter/deprecated/clutter-behaviour-depth.c:183
+#: ../clutter/deprecated/clutter-behaviour-depth.c:181
 msgid "Initial depth to apply"
 msgstr "La profunditat inicial a aplicar"
 
-#: ../clutter/deprecated/clutter-behaviour-depth.c:198
+#: ../clutter/deprecated/clutter-behaviour-depth.c:196
 msgid "End Depth"
 msgstr "Profunditat final"
 
-#: ../clutter/deprecated/clutter-behaviour-depth.c:199
+#: ../clutter/deprecated/clutter-behaviour-depth.c:197
 msgid "Final depth to apply"
 msgstr "La profunditat final a aplicar"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:401
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:394
 msgid "Start Angle"
 msgstr "Angle d'inici"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:402
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:284
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:395
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:277
 msgid "Initial angle"
 msgstr "Angle inicial"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:417
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:410
 msgid "End Angle"
 msgstr "Angle de fi"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:418
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:302
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:411
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:295
 msgid "Final angle"
 msgstr "Angle final"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:433
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:426
 msgid "Angle x tilt"
 msgstr "Angle d'inclinació X"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:434
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:427
 msgid "Tilt of the ellipse around x axis"
-msgstr "La inclinació de l'eŀlipse al voltant de l'eix de les X"
+msgstr "La inclinació de l'el·lipse al voltant de l'eix de les X"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:449
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:442
 msgid "Angle y tilt"
 msgstr "Angle d'inclinació Y"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:450
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:443
 msgid "Tilt of the ellipse around y axis"
-msgstr "La inclinació de l'eŀlipse al voltant de l'eix de les Y"
+msgstr "La inclinació de l'el·lipse al voltant de l'eix de les Y"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:465
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:458
 msgid "Angle z tilt"
 msgstr "Angle d'inclinació Z"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:466
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:459
 msgid "Tilt of the ellipse around z axis"
-msgstr "La inclinació de l'eŀlipse al voltant de l'eix de les Z"
+msgstr "La inclinació de l'el·lipse al voltant de l'eix de les Z"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:482
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:475
 msgid "Width of the ellipse"
-msgstr "Amplada de l'eŀlipse"
+msgstr "Amplada de l'el·lipse"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:498
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:491
 msgid "Height of ellipse"
-msgstr "Alçada de l'eŀlipse"
+msgstr "Alçada de l'el·lipse"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:513
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:506
 msgid "Center"
 msgstr "Centre"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:514
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:507
 msgid "Center of ellipse"
-msgstr "El centre de l'eŀlipse"
+msgstr "El centre de l'el·lipse"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:529
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:338
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:522
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:331
 msgid "Direction of rotation"
 msgstr "Direcció de la rotació"
 
-#: ../clutter/deprecated/clutter-behaviour-opacity.c:184
+#: ../clutter/deprecated/clutter-behaviour-opacity.c:177
 msgid "Opacity Start"
 msgstr "Opacitat inicial"
 
-#: ../clutter/deprecated/clutter-behaviour-opacity.c:185
+#: ../clutter/deprecated/clutter-behaviour-opacity.c:178
 msgid "Initial opacity level"
 msgstr "El nivell d'opacitat inicial"
 
-#: ../clutter/deprecated/clutter-behaviour-opacity.c:202
+#: ../clutter/deprecated/clutter-behaviour-opacity.c:195
 msgid "Opacity End"
 msgstr "Opacitat final"
 
-#: ../clutter/deprecated/clutter-behaviour-opacity.c:203
+#: ../clutter/deprecated/clutter-behaviour-opacity.c:196
 msgid "Final opacity level"
 msgstr "El nivell d'opacitat final"
 
-#: ../clutter/deprecated/clutter-behaviour-path.c:226
+#: ../clutter/deprecated/clutter-behaviour-path.c:222
 msgid "The ClutterPath object representing the path to animate along"
 msgstr "L'objecte «ClutterPath» que representa el camí en el que s'anima"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:283
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:276
 msgid "Angle Begin"
 msgstr "Angle inicial"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:301
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:294
 msgid "Angle End"
 msgstr "Angle final"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:319
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:312
 msgid "Axis"
 msgstr "Eix"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:320
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:313
 msgid "Axis of rotation"
 msgstr "L'eix de rotació"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:355
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:348
 msgid "Center X"
 msgstr "Centre X"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:356
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:349
 msgid "X coordinate of the center of rotation"
 msgstr "La coordenada X del centre de rotació"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:373
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:366
 msgid "Center Y"
 msgstr "Centre Y"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:374
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:367
 msgid "Y coordinate of the center of rotation"
 msgstr "La coordenada Y del centre de rotació"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:391
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:384
 msgid "Center Z"
 msgstr "Centre Z"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:392
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:385
 msgid "Z coordinate of the center of rotation"
 msgstr "La coordenada Z del centre de rotació"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:226
+#: ../clutter/deprecated/clutter-behaviour-scale.c:222
 msgid "X Start Scale"
 msgstr "Escala inicial X"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:227
+#: ../clutter/deprecated/clutter-behaviour-scale.c:223
 msgid "Initial scale on the X axis"
 msgstr "L'escala inicial en l'eix de les X"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:245
+#: ../clutter/deprecated/clutter-behaviour-scale.c:241
 msgid "X End Scale"
 msgstr "Escala final X"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:246
+#: ../clutter/deprecated/clutter-behaviour-scale.c:242
 msgid "Final scale on the X axis"
 msgstr "L'escala final en l'eix de les X"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:264
+#: ../clutter/deprecated/clutter-behaviour-scale.c:260
 msgid "Y Start Scale"
 msgstr "Escala inicial Y"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:265
+#: ../clutter/deprecated/clutter-behaviour-scale.c:261
 msgid "Initial scale on the Y axis"
 msgstr "L'escala inicial en l'eix de les Y"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:283
+#: ../clutter/deprecated/clutter-behaviour-scale.c:279
 msgid "Y End Scale"
 msgstr "Escala final Y"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:284
+#: ../clutter/deprecated/clutter-behaviour-scale.c:280
 msgid "Final scale on the Y axis"
 msgstr "L'escala final en l'eix de les Y"
 
-#: ../clutter/deprecated/clutter-box.c:261
+#: ../clutter/deprecated/clutter-box.c:255
 msgid "The background color of the box"
 msgstr "El color de fons de la caixa"
 
-#: ../clutter/deprecated/clutter-box.c:274
+#: ../clutter/deprecated/clutter-box.c:268
 msgid "Color Set"
 msgstr "Té color"
 
-#: ../clutter/deprecated/clutter-cairo-texture.c:597
+#: ../clutter/deprecated/clutter-cairo-texture.c:585
 msgid "Surface Width"
 msgstr "Amplada de la superfície"
 
-#: ../clutter/deprecated/clutter-cairo-texture.c:598
+#: ../clutter/deprecated/clutter-cairo-texture.c:586
 msgid "The width of the Cairo surface"
 msgstr "L'amplada de la superfície Cairo"
 
-#: ../clutter/deprecated/clutter-cairo-texture.c:615
+#: ../clutter/deprecated/clutter-cairo-texture.c:603
 msgid "Surface Height"
 msgstr "Alçada de la superfície"
 
-#: ../clutter/deprecated/clutter-cairo-texture.c:616
+#: ../clutter/deprecated/clutter-cairo-texture.c:604
 msgid "The height of the Cairo surface"
 msgstr "L'alçada de la superfície Cairo"
 
-#: ../clutter/deprecated/clutter-cairo-texture.c:636
+#: ../clutter/deprecated/clutter-cairo-texture.c:624
 msgid "Auto Resize"
 msgstr "Redimensiona automàticament"
 
-#: ../clutter/deprecated/clutter-cairo-texture.c:637
+#: ../clutter/deprecated/clutter-cairo-texture.c:625
 msgid "Whether the surface should match the allocation"
 msgstr "Si la superfície hauria de coincidir amb la ubicació"
 
@@ -2391,104 +2411,160 @@ msgstr "El nivell d'emplenament de la memòria intermèdia"
 msgid "The duration of the stream, in seconds"
 msgstr "La durada del flux, en segons"
 
-#: ../clutter/deprecated/clutter-rectangle.c:274
+#: ../clutter/deprecated/clutter-rectangle.c:271
 msgid "The color of the rectangle"
 msgstr "El color del rectangle"
 
-#: ../clutter/deprecated/clutter-rectangle.c:287
+#: ../clutter/deprecated/clutter-rectangle.c:284
 msgid "Border Color"
 msgstr "Color de la vora"
 
-#: ../clutter/deprecated/clutter-rectangle.c:288
+#: ../clutter/deprecated/clutter-rectangle.c:285
 msgid "The color of the border of the rectangle"
 msgstr "El color de la vora del rectangle"
 
-#: ../clutter/deprecated/clutter-rectangle.c:303
+#: ../clutter/deprecated/clutter-rectangle.c:300
 msgid "Border Width"
 msgstr "Amplada de la vora"
 
-#: ../clutter/deprecated/clutter-rectangle.c:304
+#: ../clutter/deprecated/clutter-rectangle.c:301
 msgid "The width of the border of the rectangle"
 msgstr "L'amplada de la vora del rectangle"
 
-#: ../clutter/deprecated/clutter-rectangle.c:318
+#: ../clutter/deprecated/clutter-rectangle.c:315
 msgid "Has Border"
 msgstr "Té vora"
 
-#: ../clutter/deprecated/clutter-rectangle.c:319
+#: ../clutter/deprecated/clutter-rectangle.c:316
 msgid "Whether the rectangle should have a border"
 msgstr "Si el rectangle hauria de tenir vora"
 
-#: ../clutter/deprecated/clutter-shader.c:261
+#: ../clutter/deprecated/clutter-shader.c:257
 msgid "Vertex Source"
 msgstr "Font del vèrtex"
 
-#: ../clutter/deprecated/clutter-shader.c:262
+#: ../clutter/deprecated/clutter-shader.c:258
 msgid "Source of vertex shader"
 msgstr "Font del shader del vèrtex"
 
-#: ../clutter/deprecated/clutter-shader.c:278
+#: ../clutter/deprecated/clutter-shader.c:274
 msgid "Fragment Source"
 msgstr "Font del fragment"
 
-#: ../clutter/deprecated/clutter-shader.c:279
+#: ../clutter/deprecated/clutter-shader.c:275
 msgid "Source of fragment shader"
 msgstr "Font del shader del fragment"
 
-#: ../clutter/deprecated/clutter-shader.c:296
+#: ../clutter/deprecated/clutter-shader.c:292
 msgid "Compiled"
 msgstr "Compilat"
 
-#: ../clutter/deprecated/clutter-shader.c:297
+#: ../clutter/deprecated/clutter-shader.c:293
 msgid "Whether the shader is compiled and linked"
 msgstr "Si el shader és compilat i enllaçat"
 
-#: ../clutter/deprecated/clutter-shader.c:314
+#: ../clutter/deprecated/clutter-shader.c:310
 msgid "Whether the shader is enabled"
 msgstr "Si el shader és habilitat"
 
-#: ../clutter/deprecated/clutter-shader.c:525
+#: ../clutter/deprecated/clutter-shader.c:521
 #, c-format
 msgid "%s compilation failed: %s"
 msgstr "Ha fallat la compilació del %s: %s"
 
-#: ../clutter/deprecated/clutter-shader.c:526
+#: ../clutter/deprecated/clutter-shader.c:522
 msgid "Vertex shader"
 msgstr "Shader de vèrtex"
 
-#: ../clutter/deprecated/clutter-shader.c:527
+#: ../clutter/deprecated/clutter-shader.c:523
 msgid "Fragment shader"
 msgstr "Shader del fragment"
 
-#: ../clutter/deprecated/clutter-state.c:1505
+#: ../clutter/deprecated/clutter-state.c:1497
 msgid "State"
 msgstr "Estat"
 
-#: ../clutter/deprecated/clutter-state.c:1506
+#: ../clutter/deprecated/clutter-state.c:1498
 msgid "Currently set state, (transition to this state might not be complete)"
 msgstr ""
 "L'estat establert actualment (potser encara no s'ha completat la transició a "
 "aquest estat)"
 
-#: ../clutter/deprecated/clutter-state.c:1524
+#: ../clutter/deprecated/clutter-state.c:1516
 msgid "Default transition duration"
 msgstr "La durada per defecte de la transició"
 
-#: ../clutter/deprecated/clutter-texture.c:994
+#: ../clutter/deprecated/clutter-table-layout.c:535
+msgid "Column Number"
+msgstr "Número de columna"
+
+#: ../clutter/deprecated/clutter-table-layout.c:536
+msgid "The column the widget resides in"
+msgstr "La columna en la que està el giny"
+
+#: ../clutter/deprecated/clutter-table-layout.c:543
+msgid "Row Number"
+msgstr "Número de fila"
+
+#: ../clutter/deprecated/clutter-table-layout.c:544
+msgid "The row the widget resides in"
+msgstr "La fila en la que està el giny"
+
+#: ../clutter/deprecated/clutter-table-layout.c:551
+msgid "Column Span"
+msgstr "Abast en columnes"
+
+#: ../clutter/deprecated/clutter-table-layout.c:552
+msgid "The number of columns the widget should span"
+msgstr "El nombre de columnes que hauria d'abastir el giny"
+
+#: ../clutter/deprecated/clutter-table-layout.c:559
+msgid "Row Span"
+msgstr "Abast en files"
+
+#: ../clutter/deprecated/clutter-table-layout.c:560
+msgid "The number of rows the widget should span"
+msgstr "El nombre de files que hauria d'abastir el giny"
+
+#: ../clutter/deprecated/clutter-table-layout.c:567
+msgid "Horizontal Expand"
+msgstr "Expansió horitzontal"
+
+#: ../clutter/deprecated/clutter-table-layout.c:568
+msgid "Allocate extra space for the child in horizontal axis"
+msgstr "Ubica espai extra per al fill en l'eix horitzontal"
+
+#: ../clutter/deprecated/clutter-table-layout.c:574
+msgid "Vertical Expand"
+msgstr "Expansió vertical"
+
+#: ../clutter/deprecated/clutter-table-layout.c:575
+msgid "Allocate extra space for the child in vertical axis"
+msgstr "Ubica espai extra per al fill en l'eix vertical"
+
+#: ../clutter/deprecated/clutter-table-layout.c:1630
+msgid "Spacing between columns"
+msgstr "Espaiat entre columnes"
+
+#: ../clutter/deprecated/clutter-table-layout.c:1646
+msgid "Spacing between rows"
+msgstr "Espaiat entre files"
+
+#: ../clutter/deprecated/clutter-texture.c:992
 msgid "Sync size of actor"
 msgstr "Sincronitza la mida de l'actor"
 
-#: ../clutter/deprecated/clutter-texture.c:995
+#: ../clutter/deprecated/clutter-texture.c:993
 msgid "Auto sync size of actor to underlying pixbuf dimensions"
 msgstr ""
 "Sincronitza automàticament la mida de l'actor amb les mides de la memòria de "
 "píxels de rerefons"
 
-#: ../clutter/deprecated/clutter-texture.c:1002
+#: ../clutter/deprecated/clutter-texture.c:1000
 msgid "Disable Slicing"
 msgstr "Inhabilita el tallat"
 
-#: ../clutter/deprecated/clutter-texture.c:1003
+#: ../clutter/deprecated/clutter-texture.c:1001
 msgid ""
 "Forces the underlying texture to be singular and not made of smaller space "
 "saving individual textures"
@@ -2496,100 +2572,100 @@ msgstr ""
 "Força la textura de rerefons a ser una de sola i no estar formada per "
 "diverses de més petites"
 
-#: ../clutter/deprecated/clutter-texture.c:1012
+#: ../clutter/deprecated/clutter-texture.c:1010
 msgid "Tile Waste"
 msgstr "Desaprofitament de quadre"
 
-#: ../clutter/deprecated/clutter-texture.c:1013
+#: ../clutter/deprecated/clutter-texture.c:1011
 msgid "Maximum waste area of a sliced texture"
 msgstr "Àrea màxima de desaprofitament d'una textura tallada"
 
-#: ../clutter/deprecated/clutter-texture.c:1021
+#: ../clutter/deprecated/clutter-texture.c:1019
 msgid "Horizontal repeat"
 msgstr "Repetició horitzontal"
 
-#: ../clutter/deprecated/clutter-texture.c:1022
+#: ../clutter/deprecated/clutter-texture.c:1020
 msgid "Repeat the contents rather than scaling them horizontally"
 msgstr "Repeteix els continguts en comptes d'escalar-los horitzontalment"
 
-#: ../clutter/deprecated/clutter-texture.c:1029
+#: ../clutter/deprecated/clutter-texture.c:1027
 msgid "Vertical repeat"
 msgstr "Repetició vertical"
 
-#: ../clutter/deprecated/clutter-texture.c:1030
+#: ../clutter/deprecated/clutter-texture.c:1028
 msgid "Repeat the contents rather than scaling them vertically"
 msgstr "Repeteix els continguts en comptes d'escalar-los verticalment"
 
-#: ../clutter/deprecated/clutter-texture.c:1037
+#: ../clutter/deprecated/clutter-texture.c:1035
 msgid "Filter Quality"
 msgstr "Qualitat del filtre"
 
-#: ../clutter/deprecated/clutter-texture.c:1038
+#: ../clutter/deprecated/clutter-texture.c:1036
 msgid "Rendering quality used when drawing the texture"
 msgstr "La qualitat de la renderització quan es dibuixi una textura"
 
-#: ../clutter/deprecated/clutter-texture.c:1046
+#: ../clutter/deprecated/clutter-texture.c:1044
 msgid "Pixel Format"
 msgstr "Format del píxel"
 
-#: ../clutter/deprecated/clutter-texture.c:1047
+#: ../clutter/deprecated/clutter-texture.c:1045
 msgid "The Cogl pixel format to use"
 msgstr "El format de píxel de Cogl a utilitzar"
 
-#: ../clutter/deprecated/clutter-texture.c:1055
-#: ../clutter/wayland/clutter-wayland-surface.c:449
+#: ../clutter/deprecated/clutter-texture.c:1053
+#: ../clutter/wayland/clutter-wayland-surface.c:445
 msgid "Cogl Texture"
 msgstr "Textura de Cogl"
 
-#: ../clutter/deprecated/clutter-texture.c:1056
-#: ../clutter/wayland/clutter-wayland-surface.c:450
+#: ../clutter/deprecated/clutter-texture.c:1054
+#: ../clutter/wayland/clutter-wayland-surface.c:446
 msgid "The underlying Cogl texture handle used to draw this actor"
 msgstr ""
 "El gestor de la textura de Cogl de rerefons que s'utilitza per dibuixar "
 "aquest actor"
 
-#: ../clutter/deprecated/clutter-texture.c:1063
+#: ../clutter/deprecated/clutter-texture.c:1061
 msgid "Cogl Material"
 msgstr "Material de Cogl"
 
-#: ../clutter/deprecated/clutter-texture.c:1064
+#: ../clutter/deprecated/clutter-texture.c:1062
 msgid "The underlying Cogl material handle used to draw this actor"
 msgstr ""
 "El gestor del material de Cogl de rerefons que s'utilitza per dibuixar "
 "aquest actor"
 
-#: ../clutter/deprecated/clutter-texture.c:1083
+#: ../clutter/deprecated/clutter-texture.c:1081
 msgid "The path of the file containing the image data"
 msgstr "El camí al fitxer que conté les dades de la imatge"
 
-#: ../clutter/deprecated/clutter-texture.c:1090
+#: ../clutter/deprecated/clutter-texture.c:1088
 msgid "Keep Aspect Ratio"
 msgstr "Manté la relació d'aspecte"
 
-#: ../clutter/deprecated/clutter-texture.c:1091
+#: ../clutter/deprecated/clutter-texture.c:1089
 msgid ""
 "Keep the aspect ratio of the texture when requesting the preferred width or "
 "height"
 msgstr ""
-"Manté la relació d'aspecte de la textura quan es soŀliciti una amplada o "
+"Manté la relació d'aspecte de la textura quan es sol·liciti una amplada o "
 "alçada preferida"
 
-#: ../clutter/deprecated/clutter-texture.c:1119
+#: ../clutter/deprecated/clutter-texture.c:1117
 msgid "Load asynchronously"
 msgstr "Carrega asíncronament"
 
-#: ../clutter/deprecated/clutter-texture.c:1120
+#: ../clutter/deprecated/clutter-texture.c:1118
 msgid ""
 "Load files inside a thread to avoid blocking when loading images from disk"
 msgstr ""
 "Carrega els fitxers en un altre fil d'execució per evitar el blocatge quan "
 "es carreguin imatges del disc"
 
-#: ../clutter/deprecated/clutter-texture.c:1138
+#: ../clutter/deprecated/clutter-texture.c:1136
 msgid "Load data asynchronously"
 msgstr "Carrega les dades asíncronament"
 
-#: ../clutter/deprecated/clutter-texture.c:1139
+#: ../clutter/deprecated/clutter-texture.c:1137
 msgid ""
 "Decode image data files inside a thread to reduce blocking when loading "
 "images from disk"
@@ -2597,198 +2673,179 @@ msgstr ""
 "Descodifica els fitxers de dades d'imatge en un altre fil d'execució per "
 "reduir el blocatge quan es carreguin imatges del disc"
 
-#: ../clutter/deprecated/clutter-texture.c:1165
+#: ../clutter/deprecated/clutter-texture.c:1163
 msgid "Pick With Alpha"
 msgstr "Selecció amb transparència"
 
-#: ../clutter/deprecated/clutter-texture.c:1166
+#: ../clutter/deprecated/clutter-texture.c:1164
 msgid "Shape actor with alpha channel when picking"
 msgstr "Modela l'actor amb un canal de transparència quan es seleccioni"
 
-#: ../clutter/deprecated/clutter-texture.c:1599
-#: ../clutter/deprecated/clutter-texture.c:1994
-#: ../clutter/deprecated/clutter-texture.c:2090
-#: ../clutter/deprecated/clutter-texture.c:2388
+#: ../clutter/deprecated/clutter-texture.c:1597
+#: ../clutter/deprecated/clutter-texture.c:1992
+#: ../clutter/deprecated/clutter-texture.c:2088
+#: ../clutter/deprecated/clutter-texture.c:2386
 #, c-format
 msgid "Failed to load the image data"
 msgstr "No s'han pogut carregar les dades de la imatge"
 
-#: ../clutter/deprecated/clutter-texture.c:1758
+#: ../clutter/deprecated/clutter-texture.c:1756
 #, c-format
 msgid "YUV textures are not supported"
 msgstr "No es poden utilitzar textures YUV"
 
-#: ../clutter/deprecated/clutter-texture.c:1767
+#: ../clutter/deprecated/clutter-texture.c:1765
 #, c-format
 msgid "YUV2 textues are not supported"
 msgstr "No es poden utilitzar textures YUV2"
 
-#: ../clutter/evdev/clutter-input-device-evdev.c:159
-msgid "sysfs Path"
-msgstr "Camí al sysfs"
-
-#: ../clutter/evdev/clutter-input-device-evdev.c:160
-msgid "Path of the device in sysfs"
-msgstr "Camí al dispositiu a sysfs"
-
-#: ../clutter/evdev/clutter-input-device-evdev.c:175
-msgid "Device Path"
-msgstr "Camí al dispositiu"
-
-#: ../clutter/evdev/clutter-input-device-evdev.c:176
-msgid "Path of the device node"
-msgstr "Camí al node del dispositiu"
-
-#: ../clutter/gdk/clutter-backend-gdk.c:287
+#: ../clutter/gdk/clutter-backend-gdk.c:289
 #, c-format
 msgid "Could not find a suitable CoglWinsys for a GdkDisplay of type %s"
 msgstr "No s'ha pogut trobar cap CoglWinsys per a una GdkDisplay del tipus %s"
 
-#: ../clutter/wayland/clutter-wayland-surface.c:423
+#: ../clutter/wayland/clutter-wayland-surface.c:419
 msgid "Surface"
 msgstr "Superfície"
 
-#: ../clutter/wayland/clutter-wayland-surface.c:424
+#: ../clutter/wayland/clutter-wayland-surface.c:420
 msgid "The underlying wayland surface"
 msgstr "La superfície de Wayland de rerefons"
 
-#: ../clutter/wayland/clutter-wayland-surface.c:431
+#: ../clutter/wayland/clutter-wayland-surface.c:427
 msgid "Surface width"
 msgstr "Amplada de la superfície"
 
-#: ../clutter/wayland/clutter-wayland-surface.c:432
+#: ../clutter/wayland/clutter-wayland-surface.c:428
 msgid "The width of the underlying wayland surface"
 msgstr "L'amplada de la superfície Wayland subjacent"
 
-#: ../clutter/wayland/clutter-wayland-surface.c:440
+#: ../clutter/wayland/clutter-wayland-surface.c:436
 msgid "Surface height"
 msgstr "Alçada de la superfície"
 
-#: ../clutter/wayland/clutter-wayland-surface.c:441
+#: ../clutter/wayland/clutter-wayland-surface.c:437
 msgid "The height of the underlying wayland surface"
 msgstr "L'alçada de la superfície Wayland subjacent"
 
-#: ../clutter/x11/clutter-backend-x11.c:507
+#: ../clutter/x11/clutter-backend-x11.c:488
 msgid "X display to use"
 msgstr "El monitor d'X a utilitzar"
 
-#: ../clutter/x11/clutter-backend-x11.c:513
+#: ../clutter/x11/clutter-backend-x11.c:494
 msgid "X screen to use"
 msgstr "La pantalla d'X a utilitzar"
 
-#: ../clutter/x11/clutter-backend-x11.c:518
+#: ../clutter/x11/clutter-backend-x11.c:499
 msgid "Make X calls synchronous"
 msgstr "Fes les crides síncrones a l'X"
 
-#: ../clutter/x11/clutter-backend-x11.c:525
+#: ../clutter/x11/clutter-backend-x11.c:506
 msgid "Disable XInput support"
 msgstr "Inhabilita l'XInput"
 
-#: ../clutter/x11/clutter-keymap-x11.c:322
+#: ../clutter/x11/clutter-keymap-x11.c:458
 msgid "The Clutter backend"
 msgstr "El rerefons de la Clutter"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:539
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:534
 msgid "Pixmap"
 msgstr "Mapa de píxels"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:540
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:535
 msgid "The X11 Pixmap to be bound"
 msgstr "El mapa de píxels X11 que es vincularà"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:548
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:543
 msgid "Pixmap width"
 msgstr "Amplada del mapa de píxels"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:549
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:544
 msgid "The width of the pixmap bound to this texture"
 msgstr "L'amplada del mapa de píxels vinculat a aquesta textura"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:557
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:552
 msgid "Pixmap height"
 msgstr "Alçada del mapa de píxels"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:558
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:553
 msgid "The height of the pixmap bound to this texture"
 msgstr "L'alçada del mapa de píxels vinculat a aquesta textura"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:566
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:561
 msgid "Pixmap Depth"
 msgstr "Profunditat del mapa de píxels"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:567
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:562
 msgid "The depth (in number of bits) of the pixmap bound to this texture"
 msgstr ""
 "La profunditat (en nombre de bits) del mapa de píxels vinculat a aquesta "
 "textura"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:575
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:570
 msgid "Automatic Updates"
 msgstr "Actualitzacions automàtiques"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:576
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:571
 msgid "If the texture should be kept in sync with any pixmap changes."
 msgstr ""
 "Si la textura s'hauria de mantenir sincronitzada amb els canvis al mapa de "
 "píxels."
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:584
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:579
 msgid "Window"
 msgstr "Finestra"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:585
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:580
 msgid "The X11 Window to be bound"
 msgstr "La finestra X11 que es vincularà"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:593
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:588
 msgid "Window Redirect Automatic"
 msgstr "Redireccions automàtiques de finestres"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:594
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:589
 msgid "If composite window redirects are set to Automatic (or Manual if false)"
 msgstr ""
 "Si les redireccions de les finestres compostes són automàtiques (o manuals "
 "si «false» (fals))"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:604
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:599
 msgid "Window Mapped"
 msgstr "Finestra mapada"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:605
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:600
 msgid "If window is mapped"
 msgstr "Si la finestra és mapada"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:614
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:609
 msgid "Destroyed"
 msgstr "Destruïda"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:615
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:610
 msgid "If window has been destroyed"
 msgstr "Si s'ha destruït la finestra"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:623
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:618
 msgid "Window X"
 msgstr "X de la finestra"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:624
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:619
 msgid "X position of window on screen according to X11"
 msgstr "La posició X de la finestra a la pantalla segons l'X11"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:632
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:627
 msgid "Window Y"
 msgstr "Y de la finestra"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:633
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:628
 msgid "Y position of window on screen according to X11"
 msgstr "La posició Y de la finestra a la pantalla segons l'X11"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:640
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:635
 msgid "Window Override Redirect"
 msgstr "Redirecció de la sobreescriptura de la finestra"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:641
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:636
 msgid "If this is an override-redirect window"
 msgstr "Si és una finestra de redirecció de la sobreescriptura"
-
-#~ msgid "The layout manager used by the box"
-#~ msgstr "El gestor de disposició utilitzat per la caixa"
diff --git a/po/ca@valencia.po b/po/ca@valencia.po
index 118795363..19510b3b1 100644
--- a/po/ca@valencia.po
+++ b/po/ca@valencia.po
@@ -1,7 +1,7 @@
 # Catalan translation for clutter.
 # Copyright (C) 2011 clutter's COPYRIGHT HOLDER
 # This file is distributed under the same license as the clutter package.
-# Gil Forcada <gilforcada@guifi.net>, 2011, 2012.
+# Gil Forcada <gilforcada@guifi.net>, 2011, 2012, 2013.
 # Jordi Serratosa <jordis@softcatala.cat>, 2012.
 #
 msgid ""
@@ -9,702 +9,702 @@ msgstr ""
 "Project-Id-Version: clutter master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=clutter\n"
-"POT-Creation-Date: 2012-09-21 21:37+0200\n"
-"PO-Revision-Date: 2012-09-21 21:34+0200\n"
-"Last-Translator: Gil Forcada <gilforcada@guifi.net>\n"
+"POT-Creation-Date: 2014-05-12 23:45+0200\n"
+"PO-Revision-Date: 2014-03-21 05:55+0100\n"
+"Last-Translator: Pau Iranzo <paugnu@gmail.com>\n"
 "Language-Team: Catalan <tradgnome@softcatala.org>\n"
 "Language: ca-XV\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bits\n"
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: ../clutter/clutter-actor.c:6125
+#: ../clutter/clutter-actor.c:6224
 msgid "X coordinate"
 msgstr "Coordenada X"
 
-#: ../clutter/clutter-actor.c:6126
+#: ../clutter/clutter-actor.c:6225
 msgid "X coordinate of the actor"
 msgstr "Coordenada X de l'actor"
 
-#: ../clutter/clutter-actor.c:6144
+#: ../clutter/clutter-actor.c:6243
 msgid "Y coordinate"
 msgstr "Coordenada Y"
 
-#: ../clutter/clutter-actor.c:6145
+#: ../clutter/clutter-actor.c:6244
 msgid "Y coordinate of the actor"
 msgstr "Coordenada Y de l'actor"
 
-#: ../clutter/clutter-actor.c:6167
+#: ../clutter/clutter-actor.c:6266
 msgid "Position"
 msgstr "Posició"
 
-#: ../clutter/clutter-actor.c:6168
+#: ../clutter/clutter-actor.c:6267
 msgid "The position of the origin of the actor"
 msgstr "La posició de l'origen de l'actor"
 
-#: ../clutter/clutter-actor.c:6185 ../clutter/clutter-canvas.c:215
-#: ../clutter/clutter-grid-layout.c:1238
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:481
+#: ../clutter/clutter-actor.c:6284 ../clutter/clutter-canvas.c:247
+#: ../clutter/clutter-grid-layout.c:1239
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:474
 msgid "Width"
 msgstr "Amplada"
 
-#: ../clutter/clutter-actor.c:6186
+#: ../clutter/clutter-actor.c:6285
 msgid "Width of the actor"
 msgstr "Amplada de l'actor"
 
-#: ../clutter/clutter-actor.c:6204 ../clutter/clutter-canvas.c:231
-#: ../clutter/clutter-grid-layout.c:1245
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:497
+#: ../clutter/clutter-actor.c:6303 ../clutter/clutter-canvas.c:263
+#: ../clutter/clutter-grid-layout.c:1246
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:490
 msgid "Height"
 msgstr "Alçada"
 
-#: ../clutter/clutter-actor.c:6205
+#: ../clutter/clutter-actor.c:6304
 msgid "Height of the actor"
 msgstr "Alçada de l'actor"
 
-#: ../clutter/clutter-actor.c:6226
+#: ../clutter/clutter-actor.c:6325
 msgid "Size"
 msgstr "Mida"
 
-#: ../clutter/clutter-actor.c:6227
+#: ../clutter/clutter-actor.c:6326
 msgid "The size of the actor"
 msgstr "La mida de l'actor"
 
-#: ../clutter/clutter-actor.c:6245
+#: ../clutter/clutter-actor.c:6344
 msgid "Fixed X"
 msgstr "X fixada"
 
-#: ../clutter/clutter-actor.c:6246
+#: ../clutter/clutter-actor.c:6345
 msgid "Forced X position of the actor"
 msgstr "Posició X forçada de l'actor"
 
-#: ../clutter/clutter-actor.c:6263
+#: ../clutter/clutter-actor.c:6362
 msgid "Fixed Y"
 msgstr "Y fixada"
 
-#: ../clutter/clutter-actor.c:6264
+#: ../clutter/clutter-actor.c:6363
 msgid "Forced Y position of the actor"
 msgstr "Posició Y forçada de l'actor"
 
-#: ../clutter/clutter-actor.c:6279
+#: ../clutter/clutter-actor.c:6378
 msgid "Fixed position set"
 msgstr "Ús de la posició fixa"
 
-#: ../clutter/clutter-actor.c:6280
+#: ../clutter/clutter-actor.c:6379
 msgid "Whether to use fixed positioning for the actor"
 msgstr "Si s'ha d'utilitzar el posicionament fixat per a l'actor"
 
-#: ../clutter/clutter-actor.c:6298
+#: ../clutter/clutter-actor.c:6397
 msgid "Min Width"
 msgstr "Amplada mínima"
 
-#: ../clutter/clutter-actor.c:6299
+#: ../clutter/clutter-actor.c:6398
 msgid "Forced minimum width request for the actor"
-msgstr "Amplada mínima forçada soŀlicitada per l'actor"
+msgstr "Amplada mínima forçada sol·licitada per l'actor"
 
-#: ../clutter/clutter-actor.c:6317
+#: ../clutter/clutter-actor.c:6416
 msgid "Min Height"
 msgstr "Alçada mínima"
 
-#: ../clutter/clutter-actor.c:6318
+#: ../clutter/clutter-actor.c:6417
 msgid "Forced minimum height request for the actor"
-msgstr "Alçada mínima forçada soŀlicitada per l'actor"
+msgstr "Alçada mínima forçada sol·licitada per l'actor"
 
-#: ../clutter/clutter-actor.c:6336
+#: ../clutter/clutter-actor.c:6435
 msgid "Natural Width"
 msgstr "Amplada natural"
 
-#: ../clutter/clutter-actor.c:6337
+#: ../clutter/clutter-actor.c:6436
 msgid "Forced natural width request for the actor"
-msgstr "Amplada natural forçada soŀlicitada per l'actor"
+msgstr "Amplada natural forçada sol·licitada per l'actor"
 
-#: ../clutter/clutter-actor.c:6355
+#: ../clutter/clutter-actor.c:6454
 msgid "Natural Height"
 msgstr "Alçada natural"
 
-#: ../clutter/clutter-actor.c:6356
+#: ../clutter/clutter-actor.c:6455
 msgid "Forced natural height request for the actor"
-msgstr "Alçada natural forçada soŀlicitada per l'actor"
+msgstr "Alçada natural forçada sol·licitada per l'actor"
 
-#: ../clutter/clutter-actor.c:6371
+#: ../clutter/clutter-actor.c:6470
 msgid "Minimum width set"
 msgstr "Ús de l'amplada mínima"
 
-#: ../clutter/clutter-actor.c:6372
+#: ../clutter/clutter-actor.c:6471
 msgid "Whether to use the min-width property"
 msgstr "Si s'ha d'utilitzar la propietat «amplada mínima»"
 
-#: ../clutter/clutter-actor.c:6386
+#: ../clutter/clutter-actor.c:6485
 msgid "Minimum height set"
 msgstr "Ús de l'alçada mínima"
 
-#: ../clutter/clutter-actor.c:6387
+#: ../clutter/clutter-actor.c:6486
 msgid "Whether to use the min-height property"
 msgstr "Si s'ha d'utilitzar la propietat «alçada mínima»"
 
-#: ../clutter/clutter-actor.c:6401
+#: ../clutter/clutter-actor.c:6500
 msgid "Natural width set"
 msgstr "Ús de l'amplada natural"
 
-#: ../clutter/clutter-actor.c:6402
+#: ../clutter/clutter-actor.c:6501
 msgid "Whether to use the natural-width property"
 msgstr "Si s'ha d'utilitzar la propietat «amplada natural»"
 
-#: ../clutter/clutter-actor.c:6416
+#: ../clutter/clutter-actor.c:6515
 msgid "Natural height set"
 msgstr "Ús de l'alçada natural"
 
-#: ../clutter/clutter-actor.c:6417
+#: ../clutter/clutter-actor.c:6516
 msgid "Whether to use the natural-height property"
 msgstr "Si s'ha d'utilitzar la propietat «alçada natural»"
 
-#: ../clutter/clutter-actor.c:6433
+#: ../clutter/clutter-actor.c:6532
 msgid "Allocation"
 msgstr "Ubicació"
 
-#: ../clutter/clutter-actor.c:6434
+#: ../clutter/clutter-actor.c:6533
 msgid "The actor's allocation"
 msgstr "La ubicació de l'actor"
 
-#: ../clutter/clutter-actor.c:6491
+#: ../clutter/clutter-actor.c:6590
 msgid "Request Mode"
-msgstr "Mode soŀlicitat"
+msgstr "Mode sol·licitat"
 
-#: ../clutter/clutter-actor.c:6492
+#: ../clutter/clutter-actor.c:6591
 msgid "The actor's request mode"
-msgstr "El mode soŀlicitat per l'actor"
+msgstr "El mode sol·licitat per l'actor"
 
-#: ../clutter/clutter-actor.c:6516
+#: ../clutter/clutter-actor.c:6615
 msgid "Depth"
 msgstr "Profunditat"
 
-#: ../clutter/clutter-actor.c:6517
+#: ../clutter/clutter-actor.c:6616
 msgid "Position on the Z axis"
 msgstr "Posició en l'eix de la Z"
 
-#: ../clutter/clutter-actor.c:6544
+#: ../clutter/clutter-actor.c:6643
 msgid "Z Position"
 msgstr "Posició Z"
 
-#: ../clutter/clutter-actor.c:6545
+#: ../clutter/clutter-actor.c:6644
 msgid "The actor's position on the Z axis"
 msgstr "La posició de l'actor en l'eix de la Z"
 
-#: ../clutter/clutter-actor.c:6562
+#: ../clutter/clutter-actor.c:6661
 msgid "Opacity"
 msgstr "Opacitat"
 
-#: ../clutter/clutter-actor.c:6563
+#: ../clutter/clutter-actor.c:6662
 msgid "Opacity of an actor"
 msgstr "Opacitat d'un actor"
 
-#: ../clutter/clutter-actor.c:6583
+#: ../clutter/clutter-actor.c:6682
 msgid "Offscreen redirect"
 msgstr "Redireccionament fora de pantalla"
 
-#: ../clutter/clutter-actor.c:6584
+#: ../clutter/clutter-actor.c:6683
 msgid "Flags controlling when to flatten the actor into a single image"
 msgstr ""
 "Senyaladors que controlen quan s'ha d'aplanar l'actor a una sola imatge"
 
-#: ../clutter/clutter-actor.c:6598
+#: ../clutter/clutter-actor.c:6697
 msgid "Visible"
 msgstr "Visible"
 
-#: ../clutter/clutter-actor.c:6599
+#: ../clutter/clutter-actor.c:6698
 msgid "Whether the actor is visible or not"
 msgstr "Si l'actor és visible"
 
-#: ../clutter/clutter-actor.c:6613
+#: ../clutter/clutter-actor.c:6712
 msgid "Mapped"
 msgstr "Mapat"
 
-#: ../clutter/clutter-actor.c:6614
+#: ../clutter/clutter-actor.c:6713
 msgid "Whether the actor will be painted"
 msgstr "Si l'actor es pintarà"
 
-#: ../clutter/clutter-actor.c:6627
+#: ../clutter/clutter-actor.c:6726
 msgid "Realized"
 msgstr "Realitzat"
 
-#: ../clutter/clutter-actor.c:6628
+#: ../clutter/clutter-actor.c:6727
 msgid "Whether the actor has been realized"
 msgstr "Si l'actor s'ha realitzat"
 
-#: ../clutter/clutter-actor.c:6643
+#: ../clutter/clutter-actor.c:6742
 msgid "Reactive"
 msgstr "Reactiu"
 
-#: ../clutter/clutter-actor.c:6644
+#: ../clutter/clutter-actor.c:6743
 msgid "Whether the actor is reactive to events"
 msgstr "Si l'actor reacciona a esdeveniments"
 
-#: ../clutter/clutter-actor.c:6655
+#: ../clutter/clutter-actor.c:6754
 msgid "Has Clip"
 msgstr "Té un retallat"
 
-#: ../clutter/clutter-actor.c:6656
+#: ../clutter/clutter-actor.c:6755
 msgid "Whether the actor has a clip set"
 msgstr "Si l'actor té un retallat establit"
 
-#: ../clutter/clutter-actor.c:6669
+#: ../clutter/clutter-actor.c:6768
 msgid "Clip"
 msgstr "Retallat"
 
-#: ../clutter/clutter-actor.c:6670
+#: ../clutter/clutter-actor.c:6769
 msgid "The clip region for the actor"
 msgstr "La regió de retallat de l'actor"
 
-#: ../clutter/clutter-actor.c:6689
+#: ../clutter/clutter-actor.c:6788
 msgid "Clip Rectangle"
 msgstr "Rectangle retallat"
 
-#: ../clutter/clutter-actor.c:6690
+#: ../clutter/clutter-actor.c:6789
 msgid "The visible region of the actor"
 msgstr "La regió visible de l'actor"
 
-#: ../clutter/clutter-actor.c:6704 ../clutter/clutter-actor-meta.c:207
-#: ../clutter/clutter-binding-pool.c:319 ../clutter/clutter-input-device.c:258
+#: ../clutter/clutter-actor.c:6803 ../clutter/clutter-actor-meta.c:205
+#: ../clutter/clutter-binding-pool.c:318 ../clutter/clutter-input-device.c:247
 msgid "Name"
 msgstr "Nom"
 
-#: ../clutter/clutter-actor.c:6705
+#: ../clutter/clutter-actor.c:6804
 msgid "Name of the actor"
 msgstr "El nom de l'actor"
 
-#: ../clutter/clutter-actor.c:6726
+#: ../clutter/clutter-actor.c:6825
 msgid "Pivot Point"
 msgstr "Punt de pivotació"
 
-#: ../clutter/clutter-actor.c:6727
+#: ../clutter/clutter-actor.c:6826
 msgid "The point around which the scaling and rotation occur"
 msgstr "El punt sobre el qual es fa l'escalat i la rotació"
 
-#: ../clutter/clutter-actor.c:6745
+#: ../clutter/clutter-actor.c:6844
 msgid "Pivot Point Z"
 msgstr "El punt de pivotació sobre la Z"
 
-#: ../clutter/clutter-actor.c:6746
+#: ../clutter/clutter-actor.c:6845
 msgid "Z component of the pivot point"
 msgstr "Component Z del punt de pivotació"
 
-#: ../clutter/clutter-actor.c:6764
+#: ../clutter/clutter-actor.c:6863
 msgid "Scale X"
 msgstr "Escala X"
 
-#: ../clutter/clutter-actor.c:6765
+#: ../clutter/clutter-actor.c:6864
 msgid "Scale factor on the X axis"
 msgstr "El factor d'escala en l'eix de les X"
 
-#: ../clutter/clutter-actor.c:6783
+#: ../clutter/clutter-actor.c:6882
 msgid "Scale Y"
 msgstr "Escala Y"
 
-#: ../clutter/clutter-actor.c:6784
+#: ../clutter/clutter-actor.c:6883
 msgid "Scale factor on the Y axis"
 msgstr "El factor d'escala en l'eix de les Y"
 
-#: ../clutter/clutter-actor.c:6802
+#: ../clutter/clutter-actor.c:6901
 msgid "Scale Z"
 msgstr "Escala Z"
 
-#: ../clutter/clutter-actor.c:6803
+#: ../clutter/clutter-actor.c:6902
 msgid "Scale factor on the Z axis"
 msgstr "El factor d'escala en l'eix de les Z"
 
-#: ../clutter/clutter-actor.c:6821
+#: ../clutter/clutter-actor.c:6920
 msgid "Scale Center X"
 msgstr "Centre de l'escala X"
 
-#: ../clutter/clutter-actor.c:6822
+#: ../clutter/clutter-actor.c:6921
 msgid "Horizontal scale center"
 msgstr "Centre horitzontal de l'escala"
 
-#: ../clutter/clutter-actor.c:6840
+#: ../clutter/clutter-actor.c:6939
 msgid "Scale Center Y"
 msgstr "Centre de l'escala Y"
 
-#: ../clutter/clutter-actor.c:6841
+#: ../clutter/clutter-actor.c:6940
 msgid "Vertical scale center"
 msgstr "Centre vertical de l'escala"
 
-#: ../clutter/clutter-actor.c:6859
+#: ../clutter/clutter-actor.c:6958
 msgid "Scale Gravity"
 msgstr "Gravetat de l'escala"
 
-#: ../clutter/clutter-actor.c:6860
+#: ../clutter/clutter-actor.c:6959
 msgid "The center of scaling"
 msgstr "El centre de l'escalat"
 
-#: ../clutter/clutter-actor.c:6878
+#: ../clutter/clutter-actor.c:6977
 msgid "Rotation Angle X"
 msgstr "Angle de rotació X"
 
-#: ../clutter/clutter-actor.c:6879
+#: ../clutter/clutter-actor.c:6978
 msgid "The rotation angle on the X axis"
 msgstr "L'angle de rotació en l'eix de les X"
 
-#: ../clutter/clutter-actor.c:6897
+#: ../clutter/clutter-actor.c:6996
 msgid "Rotation Angle Y"
 msgstr "Angle de rotació Y"
 
-#: ../clutter/clutter-actor.c:6898
+#: ../clutter/clutter-actor.c:6997
 msgid "The rotation angle on the Y axis"
 msgstr "L'angle de rotació en l'eix de les Y"
 
-#: ../clutter/clutter-actor.c:6916
+#: ../clutter/clutter-actor.c:7015
 msgid "Rotation Angle Z"
 msgstr "Angle de rotació Z"
 
-#: ../clutter/clutter-actor.c:6917
+#: ../clutter/clutter-actor.c:7016
 msgid "The rotation angle on the Z axis"
 msgstr "L'angle de rotació en l'eix de les Z"
 
-#: ../clutter/clutter-actor.c:6935
+#: ../clutter/clutter-actor.c:7034
 msgid "Rotation Center X"
 msgstr "Centre de rotació X"
 
-#: ../clutter/clutter-actor.c:6936
+#: ../clutter/clutter-actor.c:7035
 msgid "The rotation center on the X axis"
 msgstr "El centre de rotació en l'eix de les X"
 
-#: ../clutter/clutter-actor.c:6953
+#: ../clutter/clutter-actor.c:7052
 msgid "Rotation Center Y"
 msgstr "Centre de rotació Y"
 
-#: ../clutter/clutter-actor.c:6954
+#: ../clutter/clutter-actor.c:7053
 msgid "The rotation center on the Y axis"
 msgstr "El centre de rotació en l'eix de les Y"
 
-#: ../clutter/clutter-actor.c:6971
+#: ../clutter/clutter-actor.c:7070
 msgid "Rotation Center Z"
 msgstr "Centre de rotació Z"
 
-#: ../clutter/clutter-actor.c:6972
+#: ../clutter/clutter-actor.c:7071
 msgid "The rotation center on the Z axis"
 msgstr "El centre de rotació en l'eix de les Z"
 
-#: ../clutter/clutter-actor.c:6989
+#: ../clutter/clutter-actor.c:7088
 msgid "Rotation Center Z Gravity"
 msgstr "Gravetat del centre de rotació Z"
 
-#: ../clutter/clutter-actor.c:6990
+#: ../clutter/clutter-actor.c:7089
 msgid "Center point for rotation around the Z axis"
 msgstr "Punt del centre de rotació al voltant de l'eix de les Z"
 
-#: ../clutter/clutter-actor.c:7018
+#: ../clutter/clutter-actor.c:7117
 msgid "Anchor X"
 msgstr "Àncora X"
 
-#: ../clutter/clutter-actor.c:7019
+#: ../clutter/clutter-actor.c:7118
 msgid "X coordinate of the anchor point"
 msgstr "Coordenada X del punt de l'àncora"
 
-#: ../clutter/clutter-actor.c:7047
+#: ../clutter/clutter-actor.c:7146
 msgid "Anchor Y"
 msgstr "Àncora Y"
 
-#: ../clutter/clutter-actor.c:7048
+#: ../clutter/clutter-actor.c:7147
 msgid "Y coordinate of the anchor point"
 msgstr "Coordenada Y del punt de l'àncora"
 
-#: ../clutter/clutter-actor.c:7075
+#: ../clutter/clutter-actor.c:7174
 msgid "Anchor Gravity"
 msgstr "Gravetat de l'àncora"
 
-#: ../clutter/clutter-actor.c:7076
+#: ../clutter/clutter-actor.c:7175
 msgid "The anchor point as a ClutterGravity"
 msgstr "El punt d'àncora com a «ClutterGravity»"
 
-#: ../clutter/clutter-actor.c:7095
+#: ../clutter/clutter-actor.c:7194
 msgid "Translation X"
 msgstr "Translació X"
 
-#: ../clutter/clutter-actor.c:7096
+#: ../clutter/clutter-actor.c:7195
 msgid "Translation along the X axis"
 msgstr "La translació en l'eix de les X"
 
-#: ../clutter/clutter-actor.c:7115
+#: ../clutter/clutter-actor.c:7214
 msgid "Translation Y"
 msgstr "Translació Y"
 
-#: ../clutter/clutter-actor.c:7116
+#: ../clutter/clutter-actor.c:7215
 msgid "Translation along the Y axis"
 msgstr "La translació en l'eix de les Y"
 
-#: ../clutter/clutter-actor.c:7135
+#: ../clutter/clutter-actor.c:7234
 msgid "Translation Z"
 msgstr "Translació Z"
 
-#: ../clutter/clutter-actor.c:7136
+#: ../clutter/clutter-actor.c:7235
 msgid "Translation along the Z axis"
 msgstr "La translació en l'eix de les Z"
 
-#: ../clutter/clutter-actor.c:7166
+#: ../clutter/clutter-actor.c:7265
 msgid "Transform"
 msgstr "Transformació"
 
-#: ../clutter/clutter-actor.c:7167
+#: ../clutter/clutter-actor.c:7266
 msgid "Transformation matrix"
 msgstr "Matriu de transformació"
 
-#: ../clutter/clutter-actor.c:7182
+#: ../clutter/clutter-actor.c:7281
 msgid "Transform Set"
 msgstr "Establiment de la transformació"
 
-#: ../clutter/clutter-actor.c:7183
+#: ../clutter/clutter-actor.c:7282
 msgid "Whether the transform property is set"
 msgstr "Si la propietat de transformació té un valor"
 
-#: ../clutter/clutter-actor.c:7204
+#: ../clutter/clutter-actor.c:7303
 msgid "Child Transform"
 msgstr "Transformació filla"
 
-#: ../clutter/clutter-actor.c:7205
+#: ../clutter/clutter-actor.c:7304
 msgid "Children transformation matrix"
 msgstr "Matriu de la transformació filla"
 
-#: ../clutter/clutter-actor.c:7220
+#: ../clutter/clutter-actor.c:7319
 msgid "Child Transform Set"
 msgstr "Establiment de la transformació filla"
 
-#: ../clutter/clutter-actor.c:7221
+#: ../clutter/clutter-actor.c:7320
 msgid "Whether the child-transform property is set"
 msgstr "Si la propietat de transformació filla té un valor"
 
-#: ../clutter/clutter-actor.c:7238
+#: ../clutter/clutter-actor.c:7337
 msgid "Show on set parent"
 msgstr "Mostra si és pare"
 
-#: ../clutter/clutter-actor.c:7239
+#: ../clutter/clutter-actor.c:7338
 msgid "Whether the actor is shown when parented"
 msgstr "Si s'ha de mostrar l'actor si se'l fa pare d'un element"
 
-#: ../clutter/clutter-actor.c:7256
+#: ../clutter/clutter-actor.c:7355
 msgid "Clip to Allocation"
 msgstr "Retalla a la ubicació"
 
-#: ../clutter/clutter-actor.c:7257
+#: ../clutter/clutter-actor.c:7356
 msgid "Sets the clip region to track the actor's allocation"
 msgstr ""
 "Estableix la regió de retallat per fer un seguiment de la ubicació de l'actor"
 
-#: ../clutter/clutter-actor.c:7270
+#: ../clutter/clutter-actor.c:7369
 msgid "Text Direction"
 msgstr "Direcció del text"
 
-#: ../clutter/clutter-actor.c:7271
+#: ../clutter/clutter-actor.c:7370
 msgid "Direction of the text"
 msgstr "La direcció del text"
 
-#: ../clutter/clutter-actor.c:7286
+#: ../clutter/clutter-actor.c:7385
 msgid "Has Pointer"
 msgstr "Té un punter"
 
-#: ../clutter/clutter-actor.c:7287
+#: ../clutter/clutter-actor.c:7386
 msgid "Whether the actor contains the pointer of an input device"
 msgstr "Si l'actor conté el punter d'un dispositiu d'entrada"
 
-#: ../clutter/clutter-actor.c:7300
+#: ../clutter/clutter-actor.c:7399
 msgid "Actions"
 msgstr "Accions"
 
-#: ../clutter/clutter-actor.c:7301
+#: ../clutter/clutter-actor.c:7400
 msgid "Adds an action to the actor"
 msgstr "Afig una acció a l'actor"
 
-#: ../clutter/clutter-actor.c:7314
+#: ../clutter/clutter-actor.c:7413
 msgid "Constraints"
 msgstr "Restriccions"
 
-#: ../clutter/clutter-actor.c:7315
+#: ../clutter/clutter-actor.c:7414
 msgid "Adds a constraint to the actor"
 msgstr "Afig una restricció a l'actor"
 
-#: ../clutter/clutter-actor.c:7328
+#: ../clutter/clutter-actor.c:7427
 msgid "Effect"
 msgstr "Efecte"
 
-#: ../clutter/clutter-actor.c:7329
+#: ../clutter/clutter-actor.c:7428
 msgid "Add an effect to be applied on the actor"
 msgstr "Afig un efecte que s'aplicarà a l'actor"
 
-#: ../clutter/clutter-actor.c:7343
+#: ../clutter/clutter-actor.c:7442
 msgid "Layout Manager"
 msgstr "Gestor de disposició"
 
-#: ../clutter/clutter-actor.c:7344
+#: ../clutter/clutter-actor.c:7443
 msgid "The object controlling the layout of an actor's children"
 msgstr "L'objecte que controla la disposició dels fills de l'actor"
 
-#: ../clutter/clutter-actor.c:7358
+#: ../clutter/clutter-actor.c:7457
 msgid "X Expand"
 msgstr "Expansió X"
 
-#: ../clutter/clutter-actor.c:7359
+#: ../clutter/clutter-actor.c:7458
 msgid "Whether extra horizontal space should be assigned to the actor"
 msgstr "Si l'actor hauria de tindre assignat un espai horitzontal extra"
 
-#: ../clutter/clutter-actor.c:7374
+#: ../clutter/clutter-actor.c:7473
 msgid "Y Expand"
 msgstr "Expansió Y"
 
-#: ../clutter/clutter-actor.c:7375
+#: ../clutter/clutter-actor.c:7474
 msgid "Whether extra vertical space should be assigned to the actor"
 msgstr "Si l'actor hauria de tindre assignat un espai vertical extra"
 
-#: ../clutter/clutter-actor.c:7391
+#: ../clutter/clutter-actor.c:7490
 msgid "X Alignment"
 msgstr "Alineació X"
 
-#: ../clutter/clutter-actor.c:7392
+#: ../clutter/clutter-actor.c:7491
 msgid "The alignment of the actor on the X axis within its allocation"
 msgstr "L'alineació de l'actor en l'eix de les X dins la seua ubicació"
 
-#: ../clutter/clutter-actor.c:7407
+#: ../clutter/clutter-actor.c:7506
 msgid "Y Alignment"
 msgstr "Alineació Y"
 
-#: ../clutter/clutter-actor.c:7408
+#: ../clutter/clutter-actor.c:7507
 msgid "The alignment of the actor on the Y axis within its allocation"
 msgstr "L'alineació de l'actor en l'eix de les Y dins la seua ubicació"
 
-#: ../clutter/clutter-actor.c:7427
+#: ../clutter/clutter-actor.c:7526
 msgid "Margin Top"
 msgstr "Marge superior"
 
-#: ../clutter/clutter-actor.c:7428
+#: ../clutter/clutter-actor.c:7527
 msgid "Extra space at the top"
 msgstr "Espai extra a la part superior"
 
-#: ../clutter/clutter-actor.c:7449
+#: ../clutter/clutter-actor.c:7548
 msgid "Margin Bottom"
 msgstr "Marge inferior"
 
-#: ../clutter/clutter-actor.c:7450
+#: ../clutter/clutter-actor.c:7549
 msgid "Extra space at the bottom"
 msgstr "Espai extra a la part inferior"
 
-#: ../clutter/clutter-actor.c:7471
+#: ../clutter/clutter-actor.c:7570
 msgid "Margin Left"
 msgstr "Marge esquerra"
 
-#: ../clutter/clutter-actor.c:7472
+#: ../clutter/clutter-actor.c:7571
 msgid "Extra space at the left"
 msgstr "Espai extra a l'esquerra"
 
-#: ../clutter/clutter-actor.c:7493
+#: ../clutter/clutter-actor.c:7592
 msgid "Margin Right"
 msgstr "Marge dret"
 
-#: ../clutter/clutter-actor.c:7494
+#: ../clutter/clutter-actor.c:7593
 msgid "Extra space at the right"
 msgstr "Espai extra a la dreta"
 
-#: ../clutter/clutter-actor.c:7510
+#: ../clutter/clutter-actor.c:7609
 msgid "Background Color Set"
 msgstr "Establiment del color de fons"
 
-#: ../clutter/clutter-actor.c:7511 ../clutter/deprecated/clutter-box.c:275
+#: ../clutter/clutter-actor.c:7610 ../clutter/deprecated/clutter-box.c:269
 msgid "Whether the background color is set"
 msgstr "Si hi ha cap color de fons"
 
-#: ../clutter/clutter-actor.c:7527
+#: ../clutter/clutter-actor.c:7626
 msgid "Background color"
 msgstr "Color de fons"
 
-#: ../clutter/clutter-actor.c:7528
+#: ../clutter/clutter-actor.c:7627
 msgid "The actor's background color"
 msgstr "El color de fons de l'actor"
 
-#: ../clutter/clutter-actor.c:7543
+#: ../clutter/clutter-actor.c:7642
 msgid "First Child"
 msgstr "Primer fill"
 
-#: ../clutter/clutter-actor.c:7544
+#: ../clutter/clutter-actor.c:7643
 msgid "The actor's first child"
 msgstr "El primer fill de l'actor"
 
-#: ../clutter/clutter-actor.c:7557
+#: ../clutter/clutter-actor.c:7656
 msgid "Last Child"
 msgstr "Últim fill"
 
-#: ../clutter/clutter-actor.c:7558
+#: ../clutter/clutter-actor.c:7657
 msgid "The actor's last child"
 msgstr "L'últim fill de l'actor"
 
-#: ../clutter/clutter-actor.c:7572
+#: ../clutter/clutter-actor.c:7671
 msgid "Content"
 msgstr "Contingut"
 
-#: ../clutter/clutter-actor.c:7573
+#: ../clutter/clutter-actor.c:7672
 msgid "Delegate object for painting the actor's content"
 msgstr "L'objecte al que es delega el pintat del contingut de l'actor"
 
-#: ../clutter/clutter-actor.c:7598
+#: ../clutter/clutter-actor.c:7697
 msgid "Content Gravity"
 msgstr "Gravetat del contingut"
 
-#: ../clutter/clutter-actor.c:7599
+#: ../clutter/clutter-actor.c:7698
 msgid "Alignment of the actor's content"
 msgstr "L'alineació del contingut de l'actor"
 
-#: ../clutter/clutter-actor.c:7619
+#: ../clutter/clutter-actor.c:7718
 msgid "Content Box"
 msgstr "Caixa del contingut"
 
-#: ../clutter/clutter-actor.c:7620
+#: ../clutter/clutter-actor.c:7719
 msgid "The bounding box of the actor's content"
 msgstr "La caixa de limitació que conté el contingut de l'actor"
 
-#: ../clutter/clutter-actor.c:7628
+#: ../clutter/clutter-actor.c:7727
 msgid "Minification Filter"
 msgstr "Filtre de minimització"
 
-#: ../clutter/clutter-actor.c:7629
+#: ../clutter/clutter-actor.c:7728
 msgid "The filter used when reducing the size of the content"
 msgstr "El filtre que s'utilitzarà per reduir la mida del contingut"
 
-#: ../clutter/clutter-actor.c:7636
+#: ../clutter/clutter-actor.c:7735
 msgid "Magnification Filter"
 msgstr "Filtre d'ampliació"
 
-#: ../clutter/clutter-actor.c:7637
+#: ../clutter/clutter-actor.c:7736
 msgid "The filter used when increasing the size of the content"
 msgstr "El filtre que s'utilitzarà per ampliar la mida del contingut"
 
-#: ../clutter/clutter-actor.c:7651
+#: ../clutter/clutter-actor.c:7750
 msgid "Content Repeat"
 msgstr "Repetició del contingut"
 
-#: ../clutter/clutter-actor.c:7652
+#: ../clutter/clutter-actor.c:7751
 msgid "The repeat policy for the actor's content"
 msgstr "La política de repetició del contingut de l'actor"
 
-#: ../clutter/clutter-actor-meta.c:193 ../clutter/clutter-child-meta.c:142
+#: ../clutter/clutter-actor-meta.c:191 ../clutter/clutter-child-meta.c:142
 msgid "Actor"
 msgstr "Actor"
 
-#: ../clutter/clutter-actor-meta.c:194
+#: ../clutter/clutter-actor-meta.c:192
 msgid "The actor attached to the meta"
 msgstr "L'actor acoblat a un meta"
 
-#: ../clutter/clutter-actor-meta.c:208
+#: ../clutter/clutter-actor-meta.c:206
 msgid "The name of the meta"
 msgstr "El nom del meta"
 
-#: ../clutter/clutter-actor-meta.c:221 ../clutter/clutter-input-device.c:337
-#: ../clutter/deprecated/clutter-shader.c:313
+#: ../clutter/clutter-actor-meta.c:219 ../clutter/clutter-input-device.c:326
+#: ../clutter/deprecated/clutter-shader.c:309
 msgid "Enabled"
 msgstr "Habilitat"
 
-#: ../clutter/clutter-actor-meta.c:222
+#: ../clutter/clutter-actor-meta.c:220
 msgid "Whether the meta is enabled"
 msgstr "Si el meta és habilitat"
 
 #: ../clutter/clutter-align-constraint.c:279
-#: ../clutter/clutter-bind-constraint.c:358 ../clutter/clutter-clone.c:345
+#: ../clutter/clutter-bind-constraint.c:343 ../clutter/clutter-clone.c:341
 #: ../clutter/clutter-snap-constraint.c:321
 msgid "Source"
 msgstr "Font"
@@ -730,82 +730,86 @@ msgstr "Factor"
 msgid "The alignment factor, between 0.0 and 1.0"
 msgstr "El factor d'alineació, entre 0.0 i 1.0"
 
-#: ../clutter/clutter-backend.c:379
+#: ../clutter/clutter-backend.c:380
 msgid "Unable to initialize the Clutter backend"
 msgstr "No s'ha pogut inicialitzar el rerefons de la Clutter"
 
-#: ../clutter/clutter-backend.c:453
+#: ../clutter/clutter-backend.c:454
 #, c-format
 msgid "The backend of type '%s' does not support creating multiple stages"
 msgstr "El rerefons, de tipus «%s», no permet crear múltiples escenaris"
 
-#: ../clutter/clutter-bind-constraint.c:359
+#: ../clutter/clutter-bind-constraint.c:344
 msgid "The source of the binding"
 msgstr "La font de la vinculació"
 
-#: ../clutter/clutter-bind-constraint.c:372
+#: ../clutter/clutter-bind-constraint.c:357
 msgid "Coordinate"
 msgstr "Coordenada"
 
-#: ../clutter/clutter-bind-constraint.c:373
+#: ../clutter/clutter-bind-constraint.c:358
 msgid "The coordinate to bind"
 msgstr "La coordenada a vincular"
 
-#: ../clutter/clutter-bind-constraint.c:387
+#: ../clutter/clutter-bind-constraint.c:372
 #: ../clutter/clutter-path-constraint.c:226
 #: ../clutter/clutter-snap-constraint.c:366
 msgid "Offset"
 msgstr "Desplaçament"
 
-#: ../clutter/clutter-bind-constraint.c:388
+#: ../clutter/clutter-bind-constraint.c:373
 msgid "The offset in pixels to apply to the binding"
 msgstr "El desplaçament, en píxels, que s'ha d'aplicar a la vinculació"
 
-#: ../clutter/clutter-binding-pool.c:320
+#: ../clutter/clutter-binding-pool.c:319
 msgid "The unique name of the binding pool"
 msgstr "El nom únic del conjunt de vinculacions"
 
-#: ../clutter/clutter-bin-layout.c:240 ../clutter/clutter-bin-layout.c:649
-#: ../clutter/clutter-box-layout.c:390 ../clutter/clutter-table-layout.c:610
+#: ../clutter/clutter-bin-layout.c:220 ../clutter/clutter-bin-layout.c:633
+#: ../clutter/clutter-box-layout.c:374
+#: ../clutter/deprecated/clutter-table-layout.c:602
 msgid "Horizontal Alignment"
 msgstr "Alineació horitzontal"
 
-#: ../clutter/clutter-bin-layout.c:241
+#: ../clutter/clutter-bin-layout.c:221
 msgid "Horizontal alignment for the actor inside the layout manager"
 msgstr "L'alineació horitzontal de l'actor dins del gestor de disposició"
 
-#: ../clutter/clutter-bin-layout.c:249 ../clutter/clutter-bin-layout.c:669
-#: ../clutter/clutter-box-layout.c:399 ../clutter/clutter-table-layout.c:625
+#: ../clutter/clutter-bin-layout.c:229 ../clutter/clutter-bin-layout.c:653
+#: ../clutter/clutter-box-layout.c:383
+#: ../clutter/deprecated/clutter-table-layout.c:617
 msgid "Vertical Alignment"
 msgstr "Alineació vertical"
 
-#: ../clutter/clutter-bin-layout.c:250
+#: ../clutter/clutter-bin-layout.c:230
 msgid "Vertical alignment for the actor inside the layout manager"
 msgstr "L'alineació vertical de l'actor dins del gestor de disposició"
 
-#: ../clutter/clutter-bin-layout.c:650
+#: ../clutter/clutter-bin-layout.c:634
 msgid "Default horizontal alignment for the actors inside the layout manager"
 msgstr ""
 "L'alineació horitzontal per defecte dels actors dins del gestor de disposició"
 
-#: ../clutter/clutter-bin-layout.c:670
+#: ../clutter/clutter-bin-layout.c:654
 msgid "Default vertical alignment for the actors inside the layout manager"
 msgstr ""
 "L'alineació vertical per defecte dels actors dins del gestor de disposició"
 
-#: ../clutter/clutter-box-layout.c:365
+#: ../clutter/clutter-box-layout.c:349
 msgid "Expand"
 msgstr "Expandeix"
 
-#: ../clutter/clutter-box-layout.c:366
+#: ../clutter/clutter-box-layout.c:350
 msgid "Allocate extra space for the child"
 msgstr "Ubica espai extra per al fill"
 
-#: ../clutter/clutter-box-layout.c:372 ../clutter/clutter-table-layout.c:589
+#: ../clutter/clutter-box-layout.c:356
+#: ../clutter/deprecated/clutter-table-layout.c:581
 msgid "Horizontal Fill"
 msgstr "Emplena horitzontalment"
 
-#: ../clutter/clutter-box-layout.c:373 ../clutter/clutter-table-layout.c:590
+#: ../clutter/clutter-box-layout.c:357
+#: ../clutter/deprecated/clutter-table-layout.c:582
 msgid ""
 "Whether the child should receive priority when the container is allocating "
 "spare space on the horizontal axis"
@@ -813,11 +817,13 @@ msgstr ""
 "Si el fill hauria de tindre prioritat quan el contenidor ubiqui espai extra "
 "en l'eix horitzontal"
 
-#: ../clutter/clutter-box-layout.c:381 ../clutter/clutter-table-layout.c:596
+#: ../clutter/clutter-box-layout.c:365
+#: ../clutter/deprecated/clutter-table-layout.c:588
 msgid "Vertical Fill"
 msgstr "Emplena verticalment"
 
-#: ../clutter/clutter-box-layout.c:382 ../clutter/clutter-table-layout.c:597
+#: ../clutter/clutter-box-layout.c:366
+#: ../clutter/deprecated/clutter-table-layout.c:589
 msgid ""
 "Whether the child should receive priority when the container is allocating "
 "spare space on the vertical axis"
@@ -825,80 +831,88 @@ msgstr ""
 "Si el fill hauria de tindre prioritat quan el contenidor ubiqui espai extra "
 "en l'eix vertical"
 
-#: ../clutter/clutter-box-layout.c:391 ../clutter/clutter-table-layout.c:611
+#: ../clutter/clutter-box-layout.c:375
+#: ../clutter/deprecated/clutter-table-layout.c:603
 msgid "Horizontal alignment of the actor within the cell"
-msgstr "L'alineació horitzontal de l'actor dins la ceŀla"
+msgstr "L'alineació horitzontal de l'actor dins la cel·la"
 
-#: ../clutter/clutter-box-layout.c:400 ../clutter/clutter-table-layout.c:626
+#: ../clutter/clutter-box-layout.c:384
+#: ../clutter/deprecated/clutter-table-layout.c:618
 msgid "Vertical alignment of the actor within the cell"
-msgstr "L'alineació vertical de l'actor dins la ceŀla"
+msgstr "L'alineació vertical de l'actor dins la cel·la"
 
-#: ../clutter/clutter-box-layout.c:1365
+#: ../clutter/clutter-box-layout.c:1345
 msgid "Vertical"
 msgstr "Vertical"
 
-#: ../clutter/clutter-box-layout.c:1366
+#: ../clutter/clutter-box-layout.c:1346
 msgid "Whether the layout should be vertical, rather than horizontal"
 msgstr "Si la disposició hauria de ser vertical en comptes d'horitzontal"
 
-#: ../clutter/clutter-box-layout.c:1383 ../clutter/clutter-flow-layout.c:890
-#: ../clutter/clutter-grid-layout.c:1547
+#: ../clutter/clutter-box-layout.c:1363 ../clutter/clutter-flow-layout.c:927
+#: ../clutter/clutter-grid-layout.c:1549
 msgid "Orientation"
 msgstr "Orientació"
 
-#: ../clutter/clutter-box-layout.c:1384 ../clutter/clutter-flow-layout.c:891
-#: ../clutter/clutter-grid-layout.c:1548
+#: ../clutter/clutter-box-layout.c:1364 ../clutter/clutter-flow-layout.c:928
+#: ../clutter/clutter-grid-layout.c:1550
 msgid "The orientation of the layout"
 msgstr "L'orientació de la disposició"
 
-#: ../clutter/clutter-box-layout.c:1400 ../clutter/clutter-flow-layout.c:906
+#: ../clutter/clutter-box-layout.c:1380 ../clutter/clutter-flow-layout.c:943
 msgid "Homogeneous"
 msgstr "Homogeni"
 
-#: ../clutter/clutter-box-layout.c:1401
+#: ../clutter/clutter-box-layout.c:1381
 msgid ""
 "Whether the layout should be homogeneous, i.e. all childs get the same size"
 msgstr ""
 "Si la disposició hauria de ser homogènia, és a dir, que tots els fills "
 "tinguen la mateixa mida"
 
-#: ../clutter/clutter-box-layout.c:1416
+#: ../clutter/clutter-box-layout.c:1396
 msgid "Pack Start"
 msgstr "Ajunta al principi"
 
-#: ../clutter/clutter-box-layout.c:1417
+#: ../clutter/clutter-box-layout.c:1397
 msgid "Whether to pack items at the start of the box"
 msgstr "Si s'ha d'ajuntar els elements a l'inici de la caixa"
 
-#: ../clutter/clutter-box-layout.c:1430
+#: ../clutter/clutter-box-layout.c:1410
 msgid "Spacing"
 msgstr "Espaiat"
 
-#: ../clutter/clutter-box-layout.c:1431
+#: ../clutter/clutter-box-layout.c:1411
 msgid "Spacing between children"
 msgstr "Espaiat entre fills"
 
-#: ../clutter/clutter-box-layout.c:1448 ../clutter/clutter-table-layout.c:1675
+#: ../clutter/clutter-box-layout.c:1428
+#: ../clutter/deprecated/clutter-table-layout.c:1669
 msgid "Use Animations"
 msgstr "Utilitza animacions"
 
-#: ../clutter/clutter-box-layout.c:1449 ../clutter/clutter-table-layout.c:1676
+#: ../clutter/clutter-box-layout.c:1429
+#: ../clutter/deprecated/clutter-table-layout.c:1670
 msgid "Whether layout changes should be animated"
 msgstr "Si s'han d'animar els canvis de disposició"
 
-#: ../clutter/clutter-box-layout.c:1473 ../clutter/clutter-table-layout.c:1700
+#: ../clutter/clutter-box-layout.c:1453
+#: ../clutter/deprecated/clutter-table-layout.c:1694
 msgid "Easing Mode"
 msgstr "Mode del camí"
 
-#: ../clutter/clutter-box-layout.c:1474 ../clutter/clutter-table-layout.c:1701
+#: ../clutter/clutter-box-layout.c:1454
+#: ../clutter/deprecated/clutter-table-layout.c:1695
 msgid "The easing mode of the animations"
 msgstr "El mode del camí de les animacions"
 
-#: ../clutter/clutter-box-layout.c:1494 ../clutter/clutter-table-layout.c:1721
+#: ../clutter/clutter-box-layout.c:1474
+#: ../clutter/deprecated/clutter-table-layout.c:1715
 msgid "Easing Duration"
 msgstr "Durada del camí"
 
-#: ../clutter/clutter-box-layout.c:1495 ../clutter/clutter-table-layout.c:1722
+#: ../clutter/clutter-box-layout.c:1475
+#: ../clutter/deprecated/clutter-table-layout.c:1716
 msgid "The duration of the animations"
 msgstr "La durada de les animacions"
 
@@ -918,14 +932,30 @@ msgstr "Contrast"
 msgid "The contrast change to apply"
 msgstr "El canvi de contrast a aplicar"
 
-#: ../clutter/clutter-canvas.c:216
+#: ../clutter/clutter-canvas.c:248
 msgid "The width of the canvas"
 msgstr "L'amplada del llenç"
 
-#: ../clutter/clutter-canvas.c:232
+#: ../clutter/clutter-canvas.c:264
 msgid "The height of the canvas"
 msgstr "L'alçada del llenç"
 
+#: ../clutter/clutter-canvas.c:283
+msgid "Scale Factor Set"
+msgstr "Establit el factor d'escalat"
+
+#: ../clutter/clutter-canvas.c:284
+msgid "Whether the scale-factor property is set"
+msgstr "Si la propietat de factor d'escalat té un valor"
+
+#: ../clutter/clutter-canvas.c:305
+msgid "Scale Factor"
+msgstr "Factor d'escalat"
+
+#: ../clutter/clutter-canvas.c:306
+msgid "The scaling factor for the surface"
+msgstr "El factor d'escalat de la superfície"
+
 #: ../clutter/clutter-child-meta.c:127
 msgid "Container"
 msgstr "Contenidor"
@@ -938,39 +968,39 @@ msgstr "El contenidor que ha creat esta dada"
 msgid "The actor wrapped by this data"
 msgstr "L'actor envoltat per esta dada"
 
-#: ../clutter/clutter-click-action.c:559
+#: ../clutter/clutter-click-action.c:586
 msgid "Pressed"
 msgstr "Premut"
 
-#: ../clutter/clutter-click-action.c:560
+#: ../clutter/clutter-click-action.c:587
 msgid "Whether the clickable should be in pressed state"
 msgstr "Si l'element que s'hi pot fer clic hauria d'estar en l'estat de premut"
 
-#: ../clutter/clutter-click-action.c:573
+#: ../clutter/clutter-click-action.c:600
 msgid "Held"
 msgstr "Manté"
 
-#: ../clutter/clutter-click-action.c:574
+#: ../clutter/clutter-click-action.c:601
 msgid "Whether the clickable has a grab"
 msgstr "Si l'element que s'hi pot fer clic té un mantenidor"
 
-#: ../clutter/clutter-click-action.c:591 ../clutter/clutter-settings.c:599
+#: ../clutter/clutter-click-action.c:618 ../clutter/clutter-settings.c:651
 msgid "Long Press Duration"
 msgstr "Durada de la premuda llarga"
 
-#: ../clutter/clutter-click-action.c:592
+#: ../clutter/clutter-click-action.c:619
 msgid "The minimum duration of a long press to recognize the gesture"
 msgstr "La durada mínima perquè es reconegui el gest d'una premuda llarga"
 
-#: ../clutter/clutter-click-action.c:610
+#: ../clutter/clutter-click-action.c:637
 msgid "Long Press Threshold"
 msgstr "Llindar de la premuda llarga"
 
-#: ../clutter/clutter-click-action.c:611
+#: ../clutter/clutter-click-action.c:638
 msgid "The maximum threshold before a long press is cancelled"
-msgstr "El llindar màxim abans de canceŀlar una premuda llarga"
+msgstr "El llindar màxim abans de cancel·lar una premuda llarga"
 
-#: ../clutter/clutter-clone.c:346
+#: ../clutter/clutter-clone.c:342
 msgid "Specifies the actor to be cloned"
 msgstr "Especifica l'actor a ser clonat"
 
@@ -982,27 +1012,27 @@ msgstr "Matís"
 msgid "The tint to apply"
 msgstr "El matís a aplicar"
 
-#: ../clutter/clutter-deform-effect.c:588
+#: ../clutter/clutter-deform-effect.c:591
 msgid "Horizontal Tiles"
 msgstr "Quadres horitzontals"
 
-#: ../clutter/clutter-deform-effect.c:589
+#: ../clutter/clutter-deform-effect.c:592
 msgid "The number of horizontal tiles"
 msgstr "El nombre de quadres horitzontals"
 
-#: ../clutter/clutter-deform-effect.c:604
+#: ../clutter/clutter-deform-effect.c:607
 msgid "Vertical Tiles"
 msgstr "Quadres verticals"
 
-#: ../clutter/clutter-deform-effect.c:605
+#: ../clutter/clutter-deform-effect.c:608
 msgid "The number of vertical tiles"
 msgstr "El nombre de quadres verticals"
 
-#: ../clutter/clutter-deform-effect.c:622
+#: ../clutter/clutter-deform-effect.c:625
 msgid "Back Material"
 msgstr "Material de fons"
 
-#: ../clutter/clutter-deform-effect.c:623
+#: ../clutter/clutter-deform-effect.c:626
 msgid "The material to be used when painting the back of the actor"
 msgstr "El material que s'utilitzarà quan es pinti el fons de l'actor"
 
@@ -1010,259 +1040,297 @@ msgstr "El material que s'utilitzarà quan es pinti el fons de l'actor"
 msgid "The desaturation factor"
 msgstr "El factor de dessaturació"
 
-#: ../clutter/clutter-device-manager.c:131
-#: ../clutter/clutter-input-device.c:366
-#: ../clutter/x11/clutter-keymap-x11.c:316
+#: ../clutter/clutter-device-manager.c:127
+#: ../clutter/clutter-input-device.c:355
+#: ../clutter/x11/clutter-keymap-x11.c:457
 msgid "Backend"
 msgstr "Rerefons"
 
-#: ../clutter/clutter-device-manager.c:132
+#: ../clutter/clutter-device-manager.c:128
 msgid "The ClutterBackend of the device manager"
 msgstr "El «ClutterBackend» del gestor del dispositiu"
 
-#: ../clutter/clutter-drag-action.c:742
+#: ../clutter/clutter-drag-action.c:733
 msgid "Horizontal Drag Threshold"
 msgstr "Llindar d'arrossegament horitzontal"
 
-#: ../clutter/clutter-drag-action.c:743
+#: ../clutter/clutter-drag-action.c:734
 msgid "The horizontal amount of pixels required to start dragging"
 msgstr ""
 "El nombre de píxels horitzontals necessaris per iniciar un arrossegament"
 
-#: ../clutter/clutter-drag-action.c:770
+#: ../clutter/clutter-drag-action.c:761
 msgid "Vertical Drag Threshold"
 msgstr "Llindar d'arrossegament vertical"
 
-#: ../clutter/clutter-drag-action.c:771
+#: ../clutter/clutter-drag-action.c:762
 msgid "The vertical amount of pixels required to start dragging"
 msgstr "El nombre de píxels verticals necessaris per iniciar un arrossegament"
 
-#: ../clutter/clutter-drag-action.c:792
+#: ../clutter/clutter-drag-action.c:783
 msgid "Drag Handle"
 msgstr "Nansa d'arrossegament"
 
-#: ../clutter/clutter-drag-action.c:793
+#: ../clutter/clutter-drag-action.c:784
 msgid "The actor that is being dragged"
 msgstr "L'actor que s'està arrossegant"
 
-#: ../clutter/clutter-drag-action.c:806
+#: ../clutter/clutter-drag-action.c:797
 msgid "Drag Axis"
 msgstr "Eix d'arrossegament"
 
-#: ../clutter/clutter-drag-action.c:807
+#: ../clutter/clutter-drag-action.c:798
 msgid "Constraints the dragging to an axis"
 msgstr "Restringeix l'arrossegament a un eix"
 
-#: ../clutter/clutter-drag-action.c:823
+#: ../clutter/clutter-drag-action.c:814
 msgid "Drag Area"
 msgstr "Àrea d'arrossegament"
 
-#: ../clutter/clutter-drag-action.c:824
+#: ../clutter/clutter-drag-action.c:815
 msgid "Constrains the dragging to a rectangle"
 msgstr "Restringeix l'arrossegament a un rectangle"
 
-#: ../clutter/clutter-drag-action.c:837
+#: ../clutter/clutter-drag-action.c:828
 msgid "Drag Area Set"
 msgstr "Establiment de l'àrea d'arrossegament"
 
-#: ../clutter/clutter-drag-action.c:838
+#: ../clutter/clutter-drag-action.c:829
 msgid "Whether the drag area is set"
 msgstr "Si la propietat d'àrea d'arrossegament té un valor"
 
-#: ../clutter/clutter-flow-layout.c:907
+#: ../clutter/clutter-flow-layout.c:944
 msgid "Whether each item should receive the same allocation"
 msgstr "Si cada element hauria de rebre la mateixa ubicació"
 
-#: ../clutter/clutter-flow-layout.c:922 ../clutter/clutter-table-layout.c:1637
+#: ../clutter/clutter-flow-layout.c:959
+#: ../clutter/deprecated/clutter-table-layout.c:1629
 msgid "Column Spacing"
 msgstr "Espaiat de columna"
 
-#: ../clutter/clutter-flow-layout.c:923
+#: ../clutter/clutter-flow-layout.c:960
 msgid "The spacing between columns"
 msgstr "L'espaiat entre columnes"
 
-#: ../clutter/clutter-flow-layout.c:939 ../clutter/clutter-table-layout.c:1651
+#: ../clutter/clutter-flow-layout.c:976
+#: ../clutter/deprecated/clutter-table-layout.c:1645
 msgid "Row Spacing"
 msgstr "Espaiat de fila"
 
-#: ../clutter/clutter-flow-layout.c:940
+#: ../clutter/clutter-flow-layout.c:977
 msgid "The spacing between rows"
 msgstr "L'espaiat entre files"
 
-#: ../clutter/clutter-flow-layout.c:954
+#: ../clutter/clutter-flow-layout.c:991
 msgid "Minimum Column Width"
 msgstr "Amplada mínima de columna"
 
-#: ../clutter/clutter-flow-layout.c:955
+#: ../clutter/clutter-flow-layout.c:992
 msgid "Minimum width for each column"
 msgstr "L'amplada mínima per a cada columna"
 
-#: ../clutter/clutter-flow-layout.c:970
+#: ../clutter/clutter-flow-layout.c:1007
 msgid "Maximum Column Width"
 msgstr "Amplada màxima de columna"
 
-#: ../clutter/clutter-flow-layout.c:971
+#: ../clutter/clutter-flow-layout.c:1008
 msgid "Maximum width for each column"
 msgstr "L'amplada màxima per a cada columna"
 
-#: ../clutter/clutter-flow-layout.c:985
+#: ../clutter/clutter-flow-layout.c:1022
 msgid "Minimum Row Height"
 msgstr "Alçada mínima de columna"
 
-#: ../clutter/clutter-flow-layout.c:986
+#: ../clutter/clutter-flow-layout.c:1023
 msgid "Minimum height for each row"
 msgstr "L'alçada mínima per a cada columna"
 
-#: ../clutter/clutter-flow-layout.c:1001
+#: ../clutter/clutter-flow-layout.c:1038
 msgid "Maximum Row Height"
 msgstr "Alçada màxima de columna"
 
-#: ../clutter/clutter-flow-layout.c:1002
+#: ../clutter/clutter-flow-layout.c:1039
 msgid "Maximum height for each row"
 msgstr "L'alçada màxima per a cada columna"
 
-#: ../clutter/clutter-grid-layout.c:1222
+#: ../clutter/clutter-flow-layout.c:1054 ../clutter/clutter-flow-layout.c:1055
+msgid "Snap to grid"
+msgstr "Ajusta a la graella"
+
+#: ../clutter/clutter-gesture-action.c:668
+msgid "Number touch points"
+msgstr "Nombre de punts tàctils"
+
+#: ../clutter/clutter-gesture-action.c:669
+msgid "Number of touch points"
+msgstr "El nombre de punts tàctils"
+
+#: ../clutter/clutter-gesture-action.c:684
+msgid "Threshold Trigger Edge"
+msgstr "Vora del llindar d'activació"
+
+#: ../clutter/clutter-gesture-action.c:685
+msgid "The trigger edge used by the action"
+msgstr "La vora d'activació que utilitza l'acció"
+
+#: ../clutter/clutter-gesture-action.c:704
+msgid "Threshold Trigger Horizontal Distance"
+msgstr "Llindar d'activació de distància horitzontal"
+
+#: ../clutter/clutter-gesture-action.c:705
+msgid "The horizontal trigger distance used by the action"
+msgstr "La distància d'activació horitzontal que utilitza l'acció"
+
+#: ../clutter/clutter-gesture-action.c:723
+msgid "Threshold Trigger Vertical Distance"
+msgstr "Llindar d'activació de distància vertical"
+
+#: ../clutter/clutter-gesture-action.c:724
+msgid "The vertical trigger distance used by the action"
+msgstr "La distància d'activació vertical que utilitza l'acció"
+
+#: ../clutter/clutter-grid-layout.c:1223
 msgid "Left attachment"
 msgstr "Adjunció esquerra"
 
-#: ../clutter/clutter-grid-layout.c:1223
+#: ../clutter/clutter-grid-layout.c:1224
 msgid "The column number to attach the left side of the child to"
 msgstr "El número de columna al que adjuntar-hi la part esquerra del fill"
 
-#: ../clutter/clutter-grid-layout.c:1230
+#: ../clutter/clutter-grid-layout.c:1231
 msgid "Top attachment"
 msgstr "Adjunció superior"
 
-#: ../clutter/clutter-grid-layout.c:1231
+#: ../clutter/clutter-grid-layout.c:1232
 msgid "The row number to attach the top side of a child widget to"
 msgstr "El número de columna al que adjuntar-hi la part superior del giny fill"
 
-#: ../clutter/clutter-grid-layout.c:1239
+#: ../clutter/clutter-grid-layout.c:1240
 msgid "The number of columns that a child spans"
 msgstr "El nombre de columnes que hauria d'abastir el fill"
 
-#: ../clutter/clutter-grid-layout.c:1246
+#: ../clutter/clutter-grid-layout.c:1247
 msgid "The number of rows that a child spans"
 msgstr "El nombre de files que hauria d'abastir el fill"
 
-#: ../clutter/clutter-grid-layout.c:1562
+#: ../clutter/clutter-grid-layout.c:1564
 msgid "Row spacing"
 msgstr "Espaiat de files"
 
-#: ../clutter/clutter-grid-layout.c:1563
+#: ../clutter/clutter-grid-layout.c:1565
 msgid "The amount of space between two consecutive rows"
 msgstr "La quantitat d'espai entre dues files consecutives"
 
-#: ../clutter/clutter-grid-layout.c:1576
+#: ../clutter/clutter-grid-layout.c:1578
 msgid "Column spacing"
 msgstr "Espaiat de columnes"
 
-#: ../clutter/clutter-grid-layout.c:1577
+#: ../clutter/clutter-grid-layout.c:1579
 msgid "The amount of space between two consecutive columns"
 msgstr "La quantitat d'espai entre dues columnes consecutives"
 
-#: ../clutter/clutter-grid-layout.c:1591
+#: ../clutter/clutter-grid-layout.c:1593
 msgid "Row Homogeneous"
 msgstr "Files homogènies"
 
-#: ../clutter/clutter-grid-layout.c:1592
+#: ../clutter/clutter-grid-layout.c:1594
 msgid "If TRUE, the rows are all the same height"
 msgstr "Si és «TRUE» (cert), totes les files tenen la mateixa alçada"
 
-#: ../clutter/clutter-grid-layout.c:1605
+#: ../clutter/clutter-grid-layout.c:1607
 msgid "Column Homogeneous"
 msgstr "Columnes homogènies"
 
-#: ../clutter/clutter-grid-layout.c:1606
+#: ../clutter/clutter-grid-layout.c:1608
 msgid "If TRUE, the columns are all the same width"
 msgstr "Si és «TRUE» (cert), totes les columnes tenen la mateixa amplada"
 
-#: ../clutter/clutter-image.c:248 ../clutter/clutter-image.c:311
-#: ../clutter/clutter-image.c:399
+#: ../clutter/clutter-image.c:268 ../clutter/clutter-image.c:331
+#: ../clutter/clutter-image.c:419
 msgid "Unable to load image data"
 msgstr "No s'han pogut carregar les dades de la imatge"
 
-#: ../clutter/clutter-input-device.c:242
+#: ../clutter/clutter-input-device.c:231
 msgid "Id"
 msgstr "Identificador"
 
-#: ../clutter/clutter-input-device.c:243
+#: ../clutter/clutter-input-device.c:232
 msgid "Unique identifier of the device"
 msgstr "L'identificador únic del dispositiu"
 
-#: ../clutter/clutter-input-device.c:259
+#: ../clutter/clutter-input-device.c:248
 msgid "The name of the device"
 msgstr "El nom del dispositiu"
 
-#: ../clutter/clutter-input-device.c:273
+#: ../clutter/clutter-input-device.c:262
 msgid "Device Type"
 msgstr "Tipus de dispositiu"
 
-#: ../clutter/clutter-input-device.c:274
+#: ../clutter/clutter-input-device.c:263
 msgid "The type of the device"
 msgstr "El tipus de dispositiu"
 
-#: ../clutter/clutter-input-device.c:289
+#: ../clutter/clutter-input-device.c:278
 msgid "Device Manager"
 msgstr "Gestor de dispositiu"
 
-#: ../clutter/clutter-input-device.c:290
+#: ../clutter/clutter-input-device.c:279
 msgid "The device manager instance"
 msgstr "La instància del gestor de dispositiu"
 
-#: ../clutter/clutter-input-device.c:303
+#: ../clutter/clutter-input-device.c:292
 msgid "Device Mode"
 msgstr "Mode del dispositiu"
 
-#: ../clutter/clutter-input-device.c:304
+#: ../clutter/clutter-input-device.c:293
 msgid "The mode of the device"
 msgstr "El mode del dispositiu"
 
-#: ../clutter/clutter-input-device.c:318
+#: ../clutter/clutter-input-device.c:307
 msgid "Has Cursor"
 msgstr "Té un cursor"
 
-#: ../clutter/clutter-input-device.c:319
+#: ../clutter/clutter-input-device.c:308
 msgid "Whether the device has a cursor"
 msgstr "Si el dispositiu té un cursor"
 
-#: ../clutter/clutter-input-device.c:338
+#: ../clutter/clutter-input-device.c:327
 msgid "Whether the device is enabled"
 msgstr "Si el dispositiu és habilitat"
 
-#: ../clutter/clutter-input-device.c:351
+#: ../clutter/clutter-input-device.c:340
 msgid "Number of Axes"
 msgstr "Nombre d'eixos"
 
-#: ../clutter/clutter-input-device.c:352
+#: ../clutter/clutter-input-device.c:341
 msgid "The number of axes on the device"
 msgstr "El nombre d'eixos en el dispositiu"
 
-#: ../clutter/clutter-input-device.c:367
+#: ../clutter/clutter-input-device.c:356
 msgid "The backend instance"
 msgstr "La instància del rerefons"
 
-#: ../clutter/clutter-interval.c:506
+#: ../clutter/clutter-interval.c:557
 msgid "Value Type"
 msgstr "Tipus de valor"
 
-#: ../clutter/clutter-interval.c:507
+#: ../clutter/clutter-interval.c:558
 msgid "The type of the values in the interval"
 msgstr "El tipus dels valors en l'interval"
 
-#: ../clutter/clutter-interval.c:522
+#: ../clutter/clutter-interval.c:573
 msgid "Initial Value"
 msgstr "Valor inicial"
 
-#: ../clutter/clutter-interval.c:523
+#: ../clutter/clutter-interval.c:574
 msgid "Initial value of the interval"
 msgstr "El valor inicial de l'interval"
 
-#: ../clutter/clutter-interval.c:537
+#: ../clutter/clutter-interval.c:588
 msgid "Final Value"
 msgstr "Valor final"
 
-#: ../clutter/clutter-interval.c:538
+#: ../clutter/clutter-interval.c:589
 msgid "Final value of the interval"
 msgstr "El valor final de l'interval"
 
@@ -1281,96 +1349,96 @@ msgstr "El gestor que ha creat esta dada"
 #. * Do NOT translate it to non-English e.g. "predefinito:LTR"! If
 #. * it isn't default:LTR or default:RTL it will not work.
 #.
-#: ../clutter/clutter-main.c:762
+#: ../clutter/clutter-main.c:751
 msgid "default:LTR"
 msgstr "default:LTR"
 
-#: ../clutter/clutter-main.c:1633
+#: ../clutter/clutter-main.c:1577
 msgid "Show frames per second"
 msgstr "Mostra els fotogrames per segon"
 
-#: ../clutter/clutter-main.c:1635
+#: ../clutter/clutter-main.c:1579
 msgid "Default frame rate"
 msgstr "Fotogrames per segon per defecte"
 
-#: ../clutter/clutter-main.c:1637
+#: ../clutter/clutter-main.c:1581
 msgid "Make all warnings fatal"
 msgstr "Fes que tots els avisos siguen fatals"
 
-#: ../clutter/clutter-main.c:1640
+#: ../clutter/clutter-main.c:1584
 msgid "Direction for the text"
 msgstr "Direcció del text"
 
-#: ../clutter/clutter-main.c:1643
+#: ../clutter/clutter-main.c:1587
 msgid "Disable mipmapping on text"
 msgstr "Inhabilita el mapat MIP en el text"
 
-#: ../clutter/clutter-main.c:1646
+#: ../clutter/clutter-main.c:1590
 msgid "Use 'fuzzy' picking"
 msgstr "Utilitza una selecció «difusa»"
 
-#: ../clutter/clutter-main.c:1649
+#: ../clutter/clutter-main.c:1593
 msgid "Clutter debugging flags to set"
 msgstr "Senyaladors de depuració de la Clutter a establir"
 
-#: ../clutter/clutter-main.c:1651
+#: ../clutter/clutter-main.c:1595
 msgid "Clutter debugging flags to unset"
 msgstr "Senyaladors de depuració de la Clutter a inhabilitar"
 
-#: ../clutter/clutter-main.c:1655
+#: ../clutter/clutter-main.c:1599
 msgid "Clutter profiling flags to set"
 msgstr "Senyaladors de perfilació de la Clutter a establir"
 
-#: ../clutter/clutter-main.c:1657
+#: ../clutter/clutter-main.c:1601
 msgid "Clutter profiling flags to unset"
 msgstr "Senyaladors de perfilació de la Clutter a inhabilitar"
 
-#: ../clutter/clutter-main.c:1660
+#: ../clutter/clutter-main.c:1604
 msgid "Enable accessibility"
 msgstr "Habilita l'accessibilitat"
 
-#: ../clutter/clutter-main.c:1852
+#: ../clutter/clutter-main.c:1796
 msgid "Clutter Options"
 msgstr "Opcions de la Clutter"
 
-#: ../clutter/clutter-main.c:1853
+#: ../clutter/clutter-main.c:1797
 msgid "Show Clutter Options"
 msgstr "Mostra les opcions de la Clutter"
 
-#: ../clutter/clutter-pan-action.c:451
+#: ../clutter/clutter-pan-action.c:455
 msgid "Pan Axis"
 msgstr "Eix de panorama"
 
-#: ../clutter/clutter-pan-action.c:452
+#: ../clutter/clutter-pan-action.c:456
 msgid "Constraints the panning to an axis"
 msgstr "Restringeix el panorama a un eix"
 
-#: ../clutter/clutter-pan-action.c:466
+#: ../clutter/clutter-pan-action.c:470
 msgid "Interpolate"
 msgstr "Interpolació"
 
-#: ../clutter/clutter-pan-action.c:467
+#: ../clutter/clutter-pan-action.c:471
 msgid "Whether interpolated events emission is enabled."
 msgstr "Si l'emissió d'esdeveniments interpolats és habilitat."
 
-#: ../clutter/clutter-pan-action.c:483
+#: ../clutter/clutter-pan-action.c:487
 msgid "Deceleration"
 msgstr "Desacceleració"
 
-#: ../clutter/clutter-pan-action.c:484
+#: ../clutter/clutter-pan-action.c:488
 msgid "Rate at which the interpolated panning will decelerate in"
 msgstr "La ràtio en la que la interpolació del panorama desaccelerarà"
 
-#: ../clutter/clutter-pan-action.c:501
+#: ../clutter/clutter-pan-action.c:505
 msgid "Initial acceleration factor"
 msgstr "Factor d'acceleració inicial"
 
-#: ../clutter/clutter-pan-action.c:502
+#: ../clutter/clutter-pan-action.c:506
 msgid "Factor applied to the momentum when starting the interpolated phase"
 msgstr "El factor aplicat al moment quan s'inicie la fase d'interpolació"
 
 #: ../clutter/clutter-path-constraint.c:212
-#: ../clutter/deprecated/clutter-behaviour-path.c:225
+#: ../clutter/deprecated/clutter-behaviour-path.c:221
 msgid "Path"
 msgstr "Camí"
 
@@ -1382,89 +1450,89 @@ msgstr "El camí utilitzat per restringir un actor"
 msgid "The offset along the path, between -1.0 and 2.0"
 msgstr "El desplaçament al llarg del camí, entre -1.0 i 2.0"
 
-#: ../clutter/clutter-property-transition.c:271
+#: ../clutter/clutter-property-transition.c:269
 msgid "Property Name"
 msgstr "Nom de la propietat"
 
-#: ../clutter/clutter-property-transition.c:272
+#: ../clutter/clutter-property-transition.c:270
 msgid "The name of the property to animate"
 msgstr "El nom de la propietat que s'animarà"
 
-#: ../clutter/clutter-script.c:466
+#: ../clutter/clutter-script.c:464
 msgid "Filename Set"
 msgstr "Té nom de fitxer"
 
-#: ../clutter/clutter-script.c:467
+#: ../clutter/clutter-script.c:465
 msgid "Whether the :filename property is set"
 msgstr "Si la propietat «:filename» té un valor"
 
-#: ../clutter/clutter-script.c:481
-#: ../clutter/deprecated/clutter-texture.c:1082
+#: ../clutter/clutter-script.c:479
+#: ../clutter/deprecated/clutter-texture.c:1080
 msgid "Filename"
 msgstr "Nom de fitxer"
 
-#: ../clutter/clutter-script.c:482
+#: ../clutter/clutter-script.c:480
 msgid "The path of the currently parsed file"
 msgstr "El camí al fitxer analitzat actualment"
 
-#: ../clutter/clutter-script.c:499
+#: ../clutter/clutter-script.c:497
 msgid "Translation Domain"
 msgstr "Domini de la traducció"
 
-#: ../clutter/clutter-script.c:500
+#: ../clutter/clutter-script.c:498
 msgid "The translation domain used to localize string"
 msgstr "El domini de traducció utilitzat per ubicar una cadena"
 
-#: ../clutter/clutter-scroll-actor.c:263
+#: ../clutter/clutter-scroll-actor.c:184
 msgid "Scroll Mode"
 msgstr "Mode de desplaçament"
 
-#: ../clutter/clutter-scroll-actor.c:264
+#: ../clutter/clutter-scroll-actor.c:185
 msgid "The scrolling direction"
 msgstr "La direcció del desplaçament"
 
-#: ../clutter/clutter-settings.c:440
+#: ../clutter/clutter-settings.c:486
 msgid "Double Click Time"
 msgstr "Temps del doble clic"
 
-#: ../clutter/clutter-settings.c:441
+#: ../clutter/clutter-settings.c:487
 msgid "The time between clicks necessary to detect a multiple click"
 msgstr "El temps entre clics necessari per detectar un clic múltiple"
 
-#: ../clutter/clutter-settings.c:456
+#: ../clutter/clutter-settings.c:502
 msgid "Double Click Distance"
 msgstr "Distància de doble clic"
 
-#: ../clutter/clutter-settings.c:457
+#: ../clutter/clutter-settings.c:503
 msgid "The distance between clicks necessary to detect a multiple click"
 msgstr "La distància entre clics necessària per detectar un clic múltiple"
 
-#: ../clutter/clutter-settings.c:472
+#: ../clutter/clutter-settings.c:518
 msgid "Drag Threshold"
 msgstr "Llindar d'arrossegament"
 
-#: ../clutter/clutter-settings.c:473
+#: ../clutter/clutter-settings.c:519
 msgid "The distance the cursor should travel before starting to drag"
 msgstr ""
 "La distància que ha de desplaçar-se el cursor abans de començar un "
 "arrossegament"
 
-#: ../clutter/clutter-settings.c:488 ../clutter/clutter-text.c:3368
+#: ../clutter/clutter-settings.c:534 ../clutter/clutter-text.c:3437
 msgid "Font Name"
 msgstr "Nom del tipus de lletra"
 
-#: ../clutter/clutter-settings.c:489
+#: ../clutter/clutter-settings.c:535
 msgid ""
 "The description of the default font, as one that could be parsed by Pango"
 msgstr ""
 "La descripció del tipus de lletra per defecte, tal com l'hauria d'analitzar "
 "la Pango"
 
-#: ../clutter/clutter-settings.c:504
+#: ../clutter/clutter-settings.c:550
 msgid "Font Antialias"
 msgstr "Antialiàsing del tipus de lletra"
 
-#: ../clutter/clutter-settings.c:505
+#: ../clutter/clutter-settings.c:551
 msgid ""
 "Whether to use antialiasing (1 to enable, 0 to disable, and -1 to use the "
 "default)"
@@ -1472,73 +1540,81 @@ msgstr ""
 "Si s'ha d'utilitzar l'antialiàsing (1 l'habilita, 0 l'inhabilita i -1 "
 "utilitza el per defecte)"
 
-#: ../clutter/clutter-settings.c:521
+#: ../clutter/clutter-settings.c:567 ../clutter/clutter-settings.c:575
 msgid "Font DPI"
 msgstr "PPP del tipus de lletra"
 
-#: ../clutter/clutter-settings.c:522
+#: ../clutter/clutter-settings.c:568 ../clutter/clutter-settings.c:576
 msgid ""
 "The resolution of the font, in 1024 * dots/inch, or -1 to use the default"
 msgstr ""
 "La resolució del tipus de lletra, en 1024 * punts/polzada, o -1 utilitza la "
 "per defecte"
 
-#: ../clutter/clutter-settings.c:538
+#: ../clutter/clutter-settings.c:592
 msgid "Font Hinting"
 msgstr "Contorn del tipus de lletra"
 
-#: ../clutter/clutter-settings.c:539
+#: ../clutter/clutter-settings.c:593
 msgid ""
 "Whether to use hinting (1 to enable, 0 to disable and -1 to use the default)"
 msgstr ""
 "Si s'ha d'utilitzar el contorn (1 l'habilita, 0 l'inhabilita i -1 per "
 "utilitzar el per defecte)"
 
-#: ../clutter/clutter-settings.c:560
+#: ../clutter/clutter-settings.c:613
 msgid "Font Hint Style"
 msgstr "Estil del contorn del tipus de lletra"
 
-#: ../clutter/clutter-settings.c:561
+#: ../clutter/clutter-settings.c:614
 msgid "The style of hinting (hintnone, hintslight, hintmedium, hintfull)"
 msgstr ""
 "L'estil del contorn (sense contorn, contorn lleuger, contorn mitjà, contorn "
 "complet)"
 
-#: ../clutter/clutter-settings.c:582
+#: ../clutter/clutter-settings.c:634
 msgid "Font Subpixel Order"
 msgstr "Orde de subpíxels del tipus de lletra"
 
-#: ../clutter/clutter-settings.c:583
+#: ../clutter/clutter-settings.c:635
 msgid "The type of subpixel antialiasing (none, rgb, bgr, vrgb, vbgr)"
 msgstr "El tipus d'antialiàsing de subpíxel (cap, rgb, bgr, vrgb, vbgr)"
 
-#: ../clutter/clutter-settings.c:600
+#: ../clutter/clutter-settings.c:652
 msgid "The minimum duration for a long press gesture to be recognized"
 msgstr "La durada mínima d'una premuda llarga perquè es reconegui"
 
-#: ../clutter/clutter-settings.c:607
+#: ../clutter/clutter-settings.c:659
+msgid "Window Scaling Factor"
+msgstr "El factor d'escalat de la finestra"
+
+#: ../clutter/clutter-settings.c:660
+msgid "The scaling factor to be applied to windows"
+msgstr "El factor d'escalat que s'ha d'aplicar a les finestres"
+
+#: ../clutter/clutter-settings.c:667
 msgid "Fontconfig configuration timestamp"
 msgstr "Marca horària de la configuració de la Fontconfig"
 
-#: ../clutter/clutter-settings.c:608
+#: ../clutter/clutter-settings.c:668
 msgid "Timestamp of the current fontconfig configuration"
 msgstr "Marca horària de la configuració actual de la Fontconfig"
 
-#: ../clutter/clutter-settings.c:625
+#: ../clutter/clutter-settings.c:685
 msgid "Password Hint Time"
 msgstr "Temps de pista de la contrasenya"
 
-#: ../clutter/clutter-settings.c:626
+#: ../clutter/clutter-settings.c:686
 msgid "How long to show the last input character in hidden entries"
 msgstr ""
 "Temps de durada de visualització de l'últim caràcter introduït en les "
 "entrades d'ocultes"
 
-#: ../clutter/clutter-shader-effect.c:486
+#: ../clutter/clutter-shader-effect.c:487
 msgid "Shader Type"
 msgstr "Tipus de shader"
 
-#: ../clutter/clutter-shader-effect.c:487
+#: ../clutter/clutter-shader-effect.c:488
 msgid "The type of shader used"
 msgstr "El tipus de shader que s'utilitza"
 
@@ -1566,760 +1642,704 @@ msgstr "La vora de la font que s'hauria de trencar"
 msgid "The offset in pixels to apply to the constraint"
 msgstr "El desplaçament, en píxels, a aplicar a la restricció"
 
-#: ../clutter/clutter-stage.c:1895
+#: ../clutter/clutter-stage.c:1918
 msgid "Fullscreen Set"
 msgstr "A pantalla completa"
 
-#: ../clutter/clutter-stage.c:1896
+#: ../clutter/clutter-stage.c:1919
 msgid "Whether the main stage is fullscreen"
 msgstr "Si l'escenari principal és a pantalla completa"
 
-#: ../clutter/clutter-stage.c:1910
+#: ../clutter/clutter-stage.c:1933
 msgid "Offscreen"
 msgstr "Fora de pantalla"
 
-#: ../clutter/clutter-stage.c:1911
+#: ../clutter/clutter-stage.c:1934
 msgid "Whether the main stage should be rendered offscreen"
 msgstr "Si l'escenari principal hauria de renderitzar-se fora de pantalla"
 
-#: ../clutter/clutter-stage.c:1923 ../clutter/clutter-text.c:3482
+#: ../clutter/clutter-stage.c:1946 ../clutter/clutter-text.c:3551
 msgid "Cursor Visible"
 msgstr "Visibilitat del cursor"
 
-#: ../clutter/clutter-stage.c:1924
+#: ../clutter/clutter-stage.c:1947
 msgid "Whether the mouse pointer is visible on the main stage"
 msgstr "Si el punter del ratolí és visible a l'escenari principal"
 
-#: ../clutter/clutter-stage.c:1938
+#: ../clutter/clutter-stage.c:1961
 msgid "User Resizable"
 msgstr "Redimensionable per l'usuari"
 
-#: ../clutter/clutter-stage.c:1939
+#: ../clutter/clutter-stage.c:1962
 msgid "Whether the stage is able to be resized via user interaction"
 msgstr "Si l'usuari pot redimensionar l'escenari"
 
-#: ../clutter/clutter-stage.c:1954 ../clutter/deprecated/clutter-box.c:260
-#: ../clutter/deprecated/clutter-rectangle.c:273
+#: ../clutter/clutter-stage.c:1977 ../clutter/deprecated/clutter-box.c:254
+#: ../clutter/deprecated/clutter-rectangle.c:270
 msgid "Color"
 msgstr "Color"
 
-#: ../clutter/clutter-stage.c:1955
+#: ../clutter/clutter-stage.c:1978
 msgid "The color of the stage"
 msgstr "El color de l'escenari"
 
-#: ../clutter/clutter-stage.c:1970
+#: ../clutter/clutter-stage.c:1993
 msgid "Perspective"
 msgstr "Perspectiva"
 
-#: ../clutter/clutter-stage.c:1971
+#: ../clutter/clutter-stage.c:1994
 msgid "Perspective projection parameters"
 msgstr "Els paràmetres de projecció de la perspectiva"
 
-#: ../clutter/clutter-stage.c:1986
+#: ../clutter/clutter-stage.c:2009
 msgid "Title"
 msgstr "Títol"
 
-#: ../clutter/clutter-stage.c:1987
+#: ../clutter/clutter-stage.c:2010
 msgid "Stage Title"
 msgstr "Títol de l'escenari"
 
-#: ../clutter/clutter-stage.c:2004
+#: ../clutter/clutter-stage.c:2027
 msgid "Use Fog"
 msgstr "Utilitza la boira"
 
-#: ../clutter/clutter-stage.c:2005
+#: ../clutter/clutter-stage.c:2028
 msgid "Whether to enable depth cueing"
 msgstr "Si s'habilita la percepció de profunditat"
 
-#: ../clutter/clutter-stage.c:2021
+#: ../clutter/clutter-stage.c:2044
 msgid "Fog"
 msgstr "Boira"
 
-#: ../clutter/clutter-stage.c:2022
+#: ../clutter/clutter-stage.c:2045
 msgid "Settings for the depth cueing"
 msgstr "Paràmetres de la percepció de profunditat"
 
-#: ../clutter/clutter-stage.c:2038
+#: ../clutter/clutter-stage.c:2061
 msgid "Use Alpha"
 msgstr "Utilitza l'alfa"
 
-#: ../clutter/clutter-stage.c:2039
+#: ../clutter/clutter-stage.c:2062
 msgid "Whether to honour the alpha component of the stage color"
 msgstr "Si s'ha de respectar el component alfa del color de l'escenari"
 
-#: ../clutter/clutter-stage.c:2055
+#: ../clutter/clutter-stage.c:2078
 msgid "Key Focus"
 msgstr "Focus clau"
 
-#: ../clutter/clutter-stage.c:2056
+#: ../clutter/clutter-stage.c:2079
 msgid "The currently key focused actor"
 msgstr "L'actor clau que té el focus"
 
-#: ../clutter/clutter-stage.c:2072
+#: ../clutter/clutter-stage.c:2095
 msgid "No Clear Hint"
 msgstr "Sense indicació de neteja"
 
-#: ../clutter/clutter-stage.c:2073
+#: ../clutter/clutter-stage.c:2096
 msgid "Whether the stage should clear its contents"
 msgstr "Si l'escenari hauria de netejar els seus continguts"
 
-#: ../clutter/clutter-stage.c:2086
+#: ../clutter/clutter-stage.c:2109
 msgid "Accept Focus"
 msgstr "Accepta el focus"
 
-#: ../clutter/clutter-stage.c:2087
+#: ../clutter/clutter-stage.c:2110
 msgid "Whether the stage should accept focus on show"
 msgstr "Si l'escenari hauria d'acceptar el focus en mostrar-se"
 
-#: ../clutter/clutter-table-layout.c:543
-msgid "Column Number"
-msgstr "Número de columna"
-
-#: ../clutter/clutter-table-layout.c:544
-msgid "The column the widget resides in"
-msgstr "La columna en la que està el giny"
-
-#: ../clutter/clutter-table-layout.c:551
-msgid "Row Number"
-msgstr "Número de fila"
-
-#: ../clutter/clutter-table-layout.c:552
-msgid "The row the widget resides in"
-msgstr "La fila en la que està el giny"
-
-#: ../clutter/clutter-table-layout.c:559
-msgid "Column Span"
-msgstr "Abast en columnes"
-
-#: ../clutter/clutter-table-layout.c:560
-msgid "The number of columns the widget should span"
-msgstr "El nombre de columnes que hauria d'abastir el giny"
-
-#: ../clutter/clutter-table-layout.c:567
-msgid "Row Span"
-msgstr "Abast en files"
-
-#: ../clutter/clutter-table-layout.c:568
-msgid "The number of rows the widget should span"
-msgstr "El nombre de files que hauria d'abastir el giny"
-
-#: ../clutter/clutter-table-layout.c:575
-msgid "Horizontal Expand"
-msgstr "Expansió horitzontal"
-
-#: ../clutter/clutter-table-layout.c:576
-msgid "Allocate extra space for the child in horizontal axis"
-msgstr "Ubica espai extra per al fill en l'eix horitzontal"
-
-#: ../clutter/clutter-table-layout.c:582
-msgid "Vertical Expand"
-msgstr "Expansió vertical"
-
-#: ../clutter/clutter-table-layout.c:583
-msgid "Allocate extra space for the child in vertical axis"
-msgstr "Ubica espai extra per al fill en l'eix vertical"
-
-#: ../clutter/clutter-table-layout.c:1638
-msgid "Spacing between columns"
-msgstr "Espaiat entre columnes"
-
-#: ../clutter/clutter-table-layout.c:1652
-msgid "Spacing between rows"
-msgstr "Espaiat entre files"
-
-#: ../clutter/clutter-text-buffer.c:351 ../clutter/clutter-text.c:3403
+#: ../clutter/clutter-text-buffer.c:347 ../clutter/clutter-text.c:3472
 msgid "Text"
 msgstr "Text"
 
-#: ../clutter/clutter-text-buffer.c:352
+#: ../clutter/clutter-text-buffer.c:348
 msgid "The contents of the buffer"
 msgstr "El contingut de la memòria intermèdia"
 
-#: ../clutter/clutter-text-buffer.c:365
+#: ../clutter/clutter-text-buffer.c:361
 msgid "Text length"
 msgstr "Llargada del text"
 
-#: ../clutter/clutter-text-buffer.c:366
+#: ../clutter/clutter-text-buffer.c:362
 msgid "Length of the text currently in the buffer"
 msgstr "La llargada del text que hi ha actualment a la memòria intermèdia"
 
-#: ../clutter/clutter-text-buffer.c:379
+#: ../clutter/clutter-text-buffer.c:375
 msgid "Maximum length"
 msgstr "Llargada màxima"
 
-#: ../clutter/clutter-text-buffer.c:380
+#: ../clutter/clutter-text-buffer.c:376
 msgid "Maximum number of characters for this entry. Zero if no maximum"
 msgstr "Nombre màxim de caràcters per esta entrada. Zero si no té màxim"
 
-#: ../clutter/clutter-text.c:3350
+#: ../clutter/clutter-text.c:3419
 msgid "Buffer"
 msgstr "Memòria intermèdia"
 
-#: ../clutter/clutter-text.c:3351
+#: ../clutter/clutter-text.c:3420
 msgid "The buffer for the text"
 msgstr "La memòria intermèdia del text"
 
-#: ../clutter/clutter-text.c:3369
+#: ../clutter/clutter-text.c:3438
 msgid "The font to be used by the text"
 msgstr "El tipus de lletra per al text"
 
-#: ../clutter/clutter-text.c:3386
+#: ../clutter/clutter-text.c:3455
 msgid "Font Description"
 msgstr "Descripció del tipus de lletra"
 
-#: ../clutter/clutter-text.c:3387
+#: ../clutter/clutter-text.c:3456
 msgid "The font description to be used"
 msgstr "La descripció del tipus de lletra que s'utilitzarà"
 
-#: ../clutter/clutter-text.c:3404
+#: ../clutter/clutter-text.c:3473
 msgid "The text to render"
 msgstr "El text a renderitzar"
 
-#: ../clutter/clutter-text.c:3418
+#: ../clutter/clutter-text.c:3487
 msgid "Font Color"
 msgstr "Color del tipus de lletra"
 
-#: ../clutter/clutter-text.c:3419
+#: ../clutter/clutter-text.c:3488
 msgid "Color of the font used by the text"
 msgstr "El color del tipus de lletra que utilitzarà el text"
 
-#: ../clutter/clutter-text.c:3434
+#: ../clutter/clutter-text.c:3503
 msgid "Editable"
 msgstr "Editable"
 
-#: ../clutter/clutter-text.c:3435
+#: ../clutter/clutter-text.c:3504
 msgid "Whether the text is editable"
 msgstr "Si el text es pot editar"
 
-#: ../clutter/clutter-text.c:3450
+#: ../clutter/clutter-text.c:3519
 msgid "Selectable"
 msgstr "Seleccionable"
 
-#: ../clutter/clutter-text.c:3451
+#: ../clutter/clutter-text.c:3520
 msgid "Whether the text is selectable"
 msgstr "Si el text es pot seleccionar"
 
-#: ../clutter/clutter-text.c:3465
+#: ../clutter/clutter-text.c:3534
 msgid "Activatable"
 msgstr "Activable"
 
-#: ../clutter/clutter-text.c:3466
+#: ../clutter/clutter-text.c:3535
 msgid "Whether pressing return causes the activate signal to be emitted"
 msgstr "Si s'emet el senyal d'activació en prémer la tecla de retorn"
 
-#: ../clutter/clutter-text.c:3483
+#: ../clutter/clutter-text.c:3552
 msgid "Whether the input cursor is visible"
 msgstr "Si és visible el cursor d'entrada"
 
-#: ../clutter/clutter-text.c:3497 ../clutter/clutter-text.c:3498
+#: ../clutter/clutter-text.c:3566 ../clutter/clutter-text.c:3567
 msgid "Cursor Color"
 msgstr "Color del cursor"
 
-#: ../clutter/clutter-text.c:3513
+#: ../clutter/clutter-text.c:3582
 msgid "Cursor Color Set"
 msgstr "Establit el color del cursor"
 
-#: ../clutter/clutter-text.c:3514
+#: ../clutter/clutter-text.c:3583
 msgid "Whether the cursor color has been set"
 msgstr "Si s'ha establit el color del cursor"
 
-#: ../clutter/clutter-text.c:3529
+#: ../clutter/clutter-text.c:3598
 msgid "Cursor Size"
 msgstr "Mida del cursor"
 
-#: ../clutter/clutter-text.c:3530
+#: ../clutter/clutter-text.c:3599
 msgid "The width of the cursor, in pixels"
 msgstr "L'amplada del cursor, en píxels"
 
-#: ../clutter/clutter-text.c:3546 ../clutter/clutter-text.c:3564
+#: ../clutter/clutter-text.c:3615 ../clutter/clutter-text.c:3633
 msgid "Cursor Position"
 msgstr "Posició del cursor"
 
-#: ../clutter/clutter-text.c:3547 ../clutter/clutter-text.c:3565
+#: ../clutter/clutter-text.c:3616 ../clutter/clutter-text.c:3634
 msgid "The cursor position"
 msgstr "La posició del cursor"
 
-#: ../clutter/clutter-text.c:3580
+#: ../clutter/clutter-text.c:3649
 msgid "Selection-bound"
 msgstr "Extrem de selecció"
 
-#: ../clutter/clutter-text.c:3581
+#: ../clutter/clutter-text.c:3650
 msgid "The cursor position of the other end of the selection"
 msgstr "La posició del cursor a l'altre extrem de la selecció"
 
-#: ../clutter/clutter-text.c:3596 ../clutter/clutter-text.c:3597
+#: ../clutter/clutter-text.c:3665 ../clutter/clutter-text.c:3666
 msgid "Selection Color"
 msgstr "Color de la selecció"
 
-#: ../clutter/clutter-text.c:3612
+#: ../clutter/clutter-text.c:3681
 msgid "Selection Color Set"
 msgstr "Establit el color de selecció"
 
-#: ../clutter/clutter-text.c:3613
+#: ../clutter/clutter-text.c:3682
 msgid "Whether the selection color has been set"
 msgstr "Si s'ha establit el color de selecció"
 
-#: ../clutter/clutter-text.c:3628
+#: ../clutter/clutter-text.c:3697
 msgid "Attributes"
 msgstr "Atributs"
 
-#: ../clutter/clutter-text.c:3629
+#: ../clutter/clutter-text.c:3698
 msgid "A list of style attributes to apply to the contents of the actor"
 msgstr "Una llista d'atributs d'estil per aplicar als continguts de l'actor"
 
-#: ../clutter/clutter-text.c:3651
+#: ../clutter/clutter-text.c:3720
 msgid "Use markup"
 msgstr "Utilitza l'etiquetatge"
 
-#: ../clutter/clutter-text.c:3652
+#: ../clutter/clutter-text.c:3721
 msgid "Whether or not the text includes Pango markup"
 msgstr "Si el text inclou etiquetatge de la Pango"
 
-#: ../clutter/clutter-text.c:3668
+#: ../clutter/clutter-text.c:3737
 msgid "Line wrap"
 msgstr "Ajustament de línia"
 
-#: ../clutter/clutter-text.c:3669
+#: ../clutter/clutter-text.c:3738
 msgid "If set, wrap the lines if the text becomes too wide"
 msgstr "Si s'estableix, ajusta les línies si el text és massa ample"
 
-#: ../clutter/clutter-text.c:3684
+#: ../clutter/clutter-text.c:3753
 msgid "Line wrap mode"
 msgstr "Mode d'ajust de línia"
 
-#: ../clutter/clutter-text.c:3685
+#: ../clutter/clutter-text.c:3754
 msgid "Control how line-wrapping is done"
 msgstr "Controla com s'ajusten les línies"
 
-#: ../clutter/clutter-text.c:3700
+#: ../clutter/clutter-text.c:3769
 msgid "Ellipsize"
 msgstr "Punts suspensius"
 
-#: ../clutter/clutter-text.c:3701
+#: ../clutter/clutter-text.c:3770
 msgid "The preferred place to ellipsize the string"
 msgstr "El lloc preferit on posar punts suspensius al segment"
 
-#: ../clutter/clutter-text.c:3717
+#: ../clutter/clutter-text.c:3786
 msgid "Line Alignment"
 msgstr "Alineació de la línia"
 
-#: ../clutter/clutter-text.c:3718
+#: ../clutter/clutter-text.c:3787
 msgid "The preferred alignment for the string, for multi-line text"
 msgstr ""
 "L'alineació preferida per al segment quan és un text de més d'una línia"
 
-#: ../clutter/clutter-text.c:3734
+#: ../clutter/clutter-text.c:3803
 msgid "Justify"
 msgstr "Justifica"
 
-#: ../clutter/clutter-text.c:3735
+#: ../clutter/clutter-text.c:3804
 msgid "Whether the text should be justified"
 msgstr "Si el text s'hauria de justificar"
 
-#: ../clutter/clutter-text.c:3750
+#: ../clutter/clutter-text.c:3819
 msgid "Password Character"
 msgstr "Caràcter de contrasenya"
 
-#: ../clutter/clutter-text.c:3751
+#: ../clutter/clutter-text.c:3820
 msgid "If non-zero, use this character to display the actor's contents"
 msgstr ""
 "Si no és zero, utilitza este caràcter per mostrar els continguts de l'actor"
 
-#: ../clutter/clutter-text.c:3765
+#: ../clutter/clutter-text.c:3834
 msgid "Max Length"
 msgstr "Llargada màxima"
 
-#: ../clutter/clutter-text.c:3766
+#: ../clutter/clutter-text.c:3835
 msgid "Maximum length of the text inside the actor"
 msgstr "Llargada màxima del text dins de l'actor"
 
-#: ../clutter/clutter-text.c:3789
+#: ../clutter/clutter-text.c:3858
 msgid "Single Line Mode"
 msgstr "Mode d'una línia sola"
 
-#: ../clutter/clutter-text.c:3790
+#: ../clutter/clutter-text.c:3859
 msgid "Whether the text should be a single line"
 msgstr "Si el text hauria de ser una sola línia"
 
-#: ../clutter/clutter-text.c:3804 ../clutter/clutter-text.c:3805
+#: ../clutter/clutter-text.c:3873 ../clutter/clutter-text.c:3874
 msgid "Selected Text Color"
 msgstr "Color del text seleccionat"
 
-#: ../clutter/clutter-text.c:3820
+#: ../clutter/clutter-text.c:3889
 msgid "Selected Text Color Set"
 msgstr "Establit el color del text seleccionat"
 
-#: ../clutter/clutter-text.c:3821
+#: ../clutter/clutter-text.c:3890
 msgid "Whether the selected text color has been set"
 msgstr "Si s'ha establit el color del text seleccionat"
 
-#: ../clutter/clutter-timeline.c:561
-#: ../clutter/deprecated/clutter-animation.c:560
+#: ../clutter/clutter-timeline.c:591
+#: ../clutter/deprecated/clutter-animation.c:506
 msgid "Loop"
 msgstr "Repetició"
 
-#: ../clutter/clutter-timeline.c:562
+#: ../clutter/clutter-timeline.c:592
 msgid "Should the timeline automatically restart"
 msgstr "Si s'hauria de reiniciar automàticament la línia del temps"
 
-#: ../clutter/clutter-timeline.c:576
+#: ../clutter/clutter-timeline.c:606
 msgid "Delay"
 msgstr "Retard"
 
-#: ../clutter/clutter-timeline.c:577
+#: ../clutter/clutter-timeline.c:607
 msgid "Delay before start"
 msgstr "El retard abans d'iniciar"
 
-#: ../clutter/clutter-timeline.c:592
-#: ../clutter/deprecated/clutter-animation.c:544
-#: ../clutter/deprecated/clutter-animator.c:1803
+#: ../clutter/clutter-timeline.c:622
+#: ../clutter/deprecated/clutter-animation.c:490
+#: ../clutter/deprecated/clutter-animator.c:1792
 #: ../clutter/deprecated/clutter-media.c:224
-#: ../clutter/deprecated/clutter-state.c:1522
+#: ../clutter/deprecated/clutter-state.c:1515
 msgid "Duration"
 msgstr "Durada"
 
-#: ../clutter/clutter-timeline.c:593
+#: ../clutter/clutter-timeline.c:623
 msgid "Duration of the timeline in milliseconds"
-msgstr "La durada de la línia del temps en miŀlisegons"
+msgstr "La durada de la línia del temps en mil·lisegons"
 
-#: ../clutter/clutter-timeline.c:608
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:528
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:337
+#: ../clutter/clutter-timeline.c:638
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:521
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:330
 msgid "Direction"
 msgstr "Direcció"
 
-#: ../clutter/clutter-timeline.c:609
+#: ../clutter/clutter-timeline.c:639
 msgid "Direction of the timeline"
 msgstr "La direcció de la línia del temps"
 
-#: ../clutter/clutter-timeline.c:624
+#: ../clutter/clutter-timeline.c:654
 msgid "Auto Reverse"
 msgstr "Capgira automàticament"
 
-#: ../clutter/clutter-timeline.c:625
+#: ../clutter/clutter-timeline.c:655
 msgid "Whether the direction should be reversed when reaching the end"
 msgstr "Si la direcció s'hauria de capgirar quan s'arribe al final"
 
-#: ../clutter/clutter-timeline.c:643
+#: ../clutter/clutter-timeline.c:673
 msgid "Repeat Count"
 msgstr "Comptador de repeticions"
 
-#: ../clutter/clutter-timeline.c:644
+#: ../clutter/clutter-timeline.c:674
 msgid "How many times the timeline should repeat"
 msgstr "Nombre de vegades que s'hauria de repetir la línia de temps"
 
-#: ../clutter/clutter-timeline.c:658
+#: ../clutter/clutter-timeline.c:688
 msgid "Progress Mode"
 msgstr "Mode de progrés"
 
-#: ../clutter/clutter-timeline.c:659
+#: ../clutter/clutter-timeline.c:689
 msgid "How the timeline should compute the progress"
 msgstr "Com s'ha de calcular el progrés de la línia del temps"
 
-#: ../clutter/clutter-transition.c:246
+#: ../clutter/clutter-transition.c:244
 msgid "Interval"
 msgstr "Interval"
 
-#: ../clutter/clutter-transition.c:247
+#: ../clutter/clutter-transition.c:245
 msgid "The interval of values to transition"
 msgstr "L'interval de valors en que es farà la transició"
 
-#: ../clutter/clutter-transition.c:261
+#: ../clutter/clutter-transition.c:259
 msgid "Animatable"
 msgstr "Es pot animar"
 
-#: ../clutter/clutter-transition.c:262
+#: ../clutter/clutter-transition.c:260
 msgid "The animatable object"
 msgstr "L'objecte que es pot animar"
 
-#: ../clutter/clutter-transition.c:283
+#: ../clutter/clutter-transition.c:281
 msgid "Remove on Complete"
 msgstr "Suprimeix en completar"
 
-#: ../clutter/clutter-transition.c:284
+#: ../clutter/clutter-transition.c:282
 msgid "Detach the transition when completed"
 msgstr "Desacobla la transició quan es completi"
 
-#: ../clutter/clutter-zoom-action.c:353
+#: ../clutter/clutter-zoom-action.c:365
 msgid "Zoom Axis"
 msgstr "Eix d'ampliació"
 
-#: ../clutter/clutter-zoom-action.c:354
+#: ../clutter/clutter-zoom-action.c:366
 msgid "Constraints the zoom to an axis"
 msgstr "Restringeix l'ampliació a un eix"
 
-#: ../clutter/deprecated/clutter-alpha.c:355
-#: ../clutter/deprecated/clutter-animation.c:575
-#: ../clutter/deprecated/clutter-animator.c:1820
+#: ../clutter/deprecated/clutter-alpha.c:347
+#: ../clutter/deprecated/clutter-animation.c:521
+#: ../clutter/deprecated/clutter-animator.c:1809
 msgid "Timeline"
 msgstr "Línia del temps"
 
-#: ../clutter/deprecated/clutter-alpha.c:356
+#: ../clutter/deprecated/clutter-alpha.c:348
 msgid "Timeline used by the alpha"
 msgstr "La línia del temps que utilitzarà l'alfa"
 
-#: ../clutter/deprecated/clutter-alpha.c:372
+#: ../clutter/deprecated/clutter-alpha.c:364
 msgid "Alpha value"
 msgstr "Valor alfa"
 
-#: ../clutter/deprecated/clutter-alpha.c:373
+#: ../clutter/deprecated/clutter-alpha.c:365
 msgid "Alpha value as computed by the alpha"
 msgstr "El valor alfa calculat per l'alfa"
 
-#: ../clutter/deprecated/clutter-alpha.c:394
-#: ../clutter/deprecated/clutter-animation.c:528
+#: ../clutter/deprecated/clutter-alpha.c:386
+#: ../clutter/deprecated/clutter-animation.c:474
 msgid "Mode"
 msgstr "Mode"
 
-#: ../clutter/deprecated/clutter-alpha.c:395
+#: ../clutter/deprecated/clutter-alpha.c:387
 msgid "Progress mode"
 msgstr "Mode de progrés"
 
-#: ../clutter/deprecated/clutter-animation.c:511
+#: ../clutter/deprecated/clutter-animation.c:457
 msgid "Object"
 msgstr "Objecte"
 
-#: ../clutter/deprecated/clutter-animation.c:512
+#: ../clutter/deprecated/clutter-animation.c:458
 msgid "Object to which the animation applies"
 msgstr "L'objecte al que s'aplica l'animació"
 
-#: ../clutter/deprecated/clutter-animation.c:529
+#: ../clutter/deprecated/clutter-animation.c:475
 msgid "The mode of the animation"
 msgstr "El mode de l'animació"
 
-#: ../clutter/deprecated/clutter-animation.c:545
+#: ../clutter/deprecated/clutter-animation.c:491
 msgid "Duration of the animation, in milliseconds"
-msgstr "Durada de l'animació, en miŀlisegons"
+msgstr "Durada de l'animació, en mil·lisegons"
 
-#: ../clutter/deprecated/clutter-animation.c:561
+#: ../clutter/deprecated/clutter-animation.c:507
 msgid "Whether the animation should loop"
 msgstr "Si l'animació s'hauria de repetir"
 
-#: ../clutter/deprecated/clutter-animation.c:576
+#: ../clutter/deprecated/clutter-animation.c:522
 msgid "The timeline used by the animation"
 msgstr "La línia del temps que utilitzarà l'animació"
 
-#: ../clutter/deprecated/clutter-animation.c:592
-#: ../clutter/deprecated/clutter-behaviour.c:241
+#: ../clutter/deprecated/clutter-animation.c:538
+#: ../clutter/deprecated/clutter-behaviour.c:237
 msgid "Alpha"
 msgstr "Alfa"
 
-#: ../clutter/deprecated/clutter-animation.c:593
+#: ../clutter/deprecated/clutter-animation.c:539
 msgid "The alpha used by the animation"
 msgstr "L'alfa que utilitzarà l'animació"
 
-#: ../clutter/deprecated/clutter-animator.c:1804
+#: ../clutter/deprecated/clutter-animator.c:1793
 msgid "The duration of the animation"
 msgstr "La durada de l'animació"
 
-#: ../clutter/deprecated/clutter-animator.c:1821
+#: ../clutter/deprecated/clutter-animator.c:1810
 msgid "The timeline of the animation"
 msgstr "La línia del temps de l'animació"
 
-#: ../clutter/deprecated/clutter-behaviour.c:242
+#: ../clutter/deprecated/clutter-behaviour.c:238
 msgid "Alpha Object to drive the behaviour"
 msgstr "L'objecte alfa que estableix el comportament"
 
-#: ../clutter/deprecated/clutter-behaviour-depth.c:182
+#: ../clutter/deprecated/clutter-behaviour-depth.c:180
 msgid "Start Depth"
 msgstr "Profunditat inicial"
 
-#: ../clutter/deprecated/clutter-behaviour-depth.c:183
+#: ../clutter/deprecated/clutter-behaviour-depth.c:181
 msgid "Initial depth to apply"
 msgstr "La profunditat inicial a aplicar"
 
-#: ../clutter/deprecated/clutter-behaviour-depth.c:198
+#: ../clutter/deprecated/clutter-behaviour-depth.c:196
 msgid "End Depth"
 msgstr "Profunditat final"
 
-#: ../clutter/deprecated/clutter-behaviour-depth.c:199
+#: ../clutter/deprecated/clutter-behaviour-depth.c:197
 msgid "Final depth to apply"
 msgstr "La profunditat final a aplicar"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:401
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:394
 msgid "Start Angle"
 msgstr "Angle d'inici"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:402
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:284
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:395
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:277
 msgid "Initial angle"
 msgstr "Angle inicial"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:417
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:410
 msgid "End Angle"
 msgstr "Angle de fi"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:418
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:302
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:411
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:295
 msgid "Final angle"
 msgstr "Angle final"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:433
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:426
 msgid "Angle x tilt"
 msgstr "Angle d'inclinació X"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:434
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:427
 msgid "Tilt of the ellipse around x axis"
-msgstr "La inclinació de l'eŀlipse al voltant de l'eix de les X"
+msgstr "La inclinació de l'el·lipse al voltant de l'eix de les X"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:449
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:442
 msgid "Angle y tilt"
 msgstr "Angle d'inclinació Y"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:450
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:443
 msgid "Tilt of the ellipse around y axis"
-msgstr "La inclinació de l'eŀlipse al voltant de l'eix de les Y"
+msgstr "La inclinació de l'el·lipse al voltant de l'eix de les Y"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:465
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:458
 msgid "Angle z tilt"
 msgstr "Angle d'inclinació Z"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:466
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:459
 msgid "Tilt of the ellipse around z axis"
-msgstr "La inclinació de l'eŀlipse al voltant de l'eix de les Z"
+msgstr "La inclinació de l'el·lipse al voltant de l'eix de les Z"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:482
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:475
 msgid "Width of the ellipse"
-msgstr "Amplada de l'eŀlipse"
+msgstr "Amplada de l'el·lipse"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:498
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:491
 msgid "Height of ellipse"
-msgstr "Alçada de l'eŀlipse"
+msgstr "Alçada de l'el·lipse"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:513
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:506
 msgid "Center"
 msgstr "Centre"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:514
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:507
 msgid "Center of ellipse"
-msgstr "El centre de l'eŀlipse"
+msgstr "El centre de l'el·lipse"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:529
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:338
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:522
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:331
 msgid "Direction of rotation"
 msgstr "Direcció de la rotació"
 
-#: ../clutter/deprecated/clutter-behaviour-opacity.c:184
+#: ../clutter/deprecated/clutter-behaviour-opacity.c:177
 msgid "Opacity Start"
 msgstr "Opacitat inicial"
 
-#: ../clutter/deprecated/clutter-behaviour-opacity.c:185
+#: ../clutter/deprecated/clutter-behaviour-opacity.c:178
 msgid "Initial opacity level"
 msgstr "El nivell d'opacitat inicial"
 
-#: ../clutter/deprecated/clutter-behaviour-opacity.c:202
+#: ../clutter/deprecated/clutter-behaviour-opacity.c:195
 msgid "Opacity End"
 msgstr "Opacitat final"
 
-#: ../clutter/deprecated/clutter-behaviour-opacity.c:203
+#: ../clutter/deprecated/clutter-behaviour-opacity.c:196
 msgid "Final opacity level"
 msgstr "El nivell d'opacitat final"
 
-#: ../clutter/deprecated/clutter-behaviour-path.c:226
+#: ../clutter/deprecated/clutter-behaviour-path.c:222
 msgid "The ClutterPath object representing the path to animate along"
 msgstr "L'objecte «ClutterPath» que representa el camí en el que s'anima"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:283
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:276
 msgid "Angle Begin"
 msgstr "Angle inicial"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:301
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:294
 msgid "Angle End"
 msgstr "Angle final"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:319
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:312
 msgid "Axis"
 msgstr "Eix"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:320
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:313
 msgid "Axis of rotation"
 msgstr "L'eix de rotació"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:355
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:348
 msgid "Center X"
 msgstr "Centre X"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:356
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:349
 msgid "X coordinate of the center of rotation"
 msgstr "La coordenada X del centre de rotació"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:373
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:366
 msgid "Center Y"
 msgstr "Centre Y"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:374
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:367
 msgid "Y coordinate of the center of rotation"
 msgstr "La coordenada Y del centre de rotació"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:391
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:384
 msgid "Center Z"
 msgstr "Centre Z"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:392
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:385
 msgid "Z coordinate of the center of rotation"
 msgstr "La coordenada Z del centre de rotació"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:226
+#: ../clutter/deprecated/clutter-behaviour-scale.c:222
 msgid "X Start Scale"
 msgstr "Escala inicial X"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:227
+#: ../clutter/deprecated/clutter-behaviour-scale.c:223
 msgid "Initial scale on the X axis"
 msgstr "L'escala inicial en l'eix de les X"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:245
+#: ../clutter/deprecated/clutter-behaviour-scale.c:241
 msgid "X End Scale"
 msgstr "Escala final X"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:246
+#: ../clutter/deprecated/clutter-behaviour-scale.c:242
 msgid "Final scale on the X axis"
 msgstr "L'escala final en l'eix de les X"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:264
+#: ../clutter/deprecated/clutter-behaviour-scale.c:260
 msgid "Y Start Scale"
 msgstr "Escala inicial Y"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:265
+#: ../clutter/deprecated/clutter-behaviour-scale.c:261
 msgid "Initial scale on the Y axis"
 msgstr "L'escala inicial en l'eix de les Y"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:283
+#: ../clutter/deprecated/clutter-behaviour-scale.c:279
 msgid "Y End Scale"
 msgstr "Escala final Y"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:284
+#: ../clutter/deprecated/clutter-behaviour-scale.c:280
 msgid "Final scale on the Y axis"
 msgstr "L'escala final en l'eix de les Y"
 
-#: ../clutter/deprecated/clutter-box.c:261
+#: ../clutter/deprecated/clutter-box.c:255
 msgid "The background color of the box"
 msgstr "El color de fons de la caixa"
 
-#: ../clutter/deprecated/clutter-box.c:274
+#: ../clutter/deprecated/clutter-box.c:268
 msgid "Color Set"
 msgstr "Té color"
 
-#: ../clutter/deprecated/clutter-cairo-texture.c:597
+#: ../clutter/deprecated/clutter-cairo-texture.c:585
 msgid "Surface Width"
 msgstr "Amplada de la superfície"
 
-#: ../clutter/deprecated/clutter-cairo-texture.c:598
+#: ../clutter/deprecated/clutter-cairo-texture.c:586
 msgid "The width of the Cairo surface"
 msgstr "L'amplada de la superfície Cairo"
 
-#: ../clutter/deprecated/clutter-cairo-texture.c:615
+#: ../clutter/deprecated/clutter-cairo-texture.c:603
 msgid "Surface Height"
 msgstr "Alçada de la superfície"
 
-#: ../clutter/deprecated/clutter-cairo-texture.c:616
+#: ../clutter/deprecated/clutter-cairo-texture.c:604
 msgid "The height of the Cairo surface"
 msgstr "L'alçada de la superfície Cairo"
 
-#: ../clutter/deprecated/clutter-cairo-texture.c:636
+#: ../clutter/deprecated/clutter-cairo-texture.c:624
 msgid "Auto Resize"
 msgstr "Redimensiona automàticament"
 
-#: ../clutter/deprecated/clutter-cairo-texture.c:637
+#: ../clutter/deprecated/clutter-cairo-texture.c:625
 msgid "Whether the surface should match the allocation"
 msgstr "Si la superfície hauria de coincidir amb la ubicació"
 
@@ -2391,104 +2411,160 @@ msgstr "El nivell d'emplenament de la memòria intermèdia"
 msgid "The duration of the stream, in seconds"
 msgstr "La durada del flux, en segons"
 
-#: ../clutter/deprecated/clutter-rectangle.c:274
+#: ../clutter/deprecated/clutter-rectangle.c:271
 msgid "The color of the rectangle"
 msgstr "El color del rectangle"
 
-#: ../clutter/deprecated/clutter-rectangle.c:287
+#: ../clutter/deprecated/clutter-rectangle.c:284
 msgid "Border Color"
 msgstr "Color de la vora"
 
-#: ../clutter/deprecated/clutter-rectangle.c:288
+#: ../clutter/deprecated/clutter-rectangle.c:285
 msgid "The color of the border of the rectangle"
 msgstr "El color de la vora del rectangle"
 
-#: ../clutter/deprecated/clutter-rectangle.c:303
+#: ../clutter/deprecated/clutter-rectangle.c:300
 msgid "Border Width"
 msgstr "Amplada de la vora"
 
-#: ../clutter/deprecated/clutter-rectangle.c:304
+#: ../clutter/deprecated/clutter-rectangle.c:301
 msgid "The width of the border of the rectangle"
 msgstr "L'amplada de la vora del rectangle"
 
-#: ../clutter/deprecated/clutter-rectangle.c:318
+#: ../clutter/deprecated/clutter-rectangle.c:315
 msgid "Has Border"
 msgstr "Té vora"
 
-#: ../clutter/deprecated/clutter-rectangle.c:319
+#: ../clutter/deprecated/clutter-rectangle.c:316
 msgid "Whether the rectangle should have a border"
 msgstr "Si el rectangle hauria de tindre vora"
 
-#: ../clutter/deprecated/clutter-shader.c:261
+#: ../clutter/deprecated/clutter-shader.c:257
 msgid "Vertex Source"
 msgstr "Font del vèrtex"
 
-#: ../clutter/deprecated/clutter-shader.c:262
+#: ../clutter/deprecated/clutter-shader.c:258
 msgid "Source of vertex shader"
 msgstr "Font del shader del vèrtex"
 
-#: ../clutter/deprecated/clutter-shader.c:278
+#: ../clutter/deprecated/clutter-shader.c:274
 msgid "Fragment Source"
 msgstr "Font del fragment"
 
-#: ../clutter/deprecated/clutter-shader.c:279
+#: ../clutter/deprecated/clutter-shader.c:275
 msgid "Source of fragment shader"
 msgstr "Font del shader del fragment"
 
-#: ../clutter/deprecated/clutter-shader.c:296
+#: ../clutter/deprecated/clutter-shader.c:292
 msgid "Compiled"
 msgstr "Compilat"
 
-#: ../clutter/deprecated/clutter-shader.c:297
+#: ../clutter/deprecated/clutter-shader.c:293
 msgid "Whether the shader is compiled and linked"
 msgstr "Si el shader és compilat i enllaçat"
 
-#: ../clutter/deprecated/clutter-shader.c:314
+#: ../clutter/deprecated/clutter-shader.c:310
 msgid "Whether the shader is enabled"
 msgstr "Si el shader és habilitat"
 
-#: ../clutter/deprecated/clutter-shader.c:525
+#: ../clutter/deprecated/clutter-shader.c:521
 #, c-format
 msgid "%s compilation failed: %s"
 msgstr "Ha fallat la compilació del %s: %s"
 
-#: ../clutter/deprecated/clutter-shader.c:526
+#: ../clutter/deprecated/clutter-shader.c:522
 msgid "Vertex shader"
 msgstr "Shader de vèrtex"
 
-#: ../clutter/deprecated/clutter-shader.c:527
+#: ../clutter/deprecated/clutter-shader.c:523
 msgid "Fragment shader"
 msgstr "Shader del fragment"
 
-#: ../clutter/deprecated/clutter-state.c:1504
+#: ../clutter/deprecated/clutter-state.c:1497
 msgid "State"
 msgstr "Estat"
 
-#: ../clutter/deprecated/clutter-state.c:1505
+#: ../clutter/deprecated/clutter-state.c:1498
 msgid "Currently set state, (transition to this state might not be complete)"
 msgstr ""
 "L'estat establit actualment (potser encara no s'ha completat la transició a "
 "este estat)"
 
-#: ../clutter/deprecated/clutter-state.c:1523
+#: ../clutter/deprecated/clutter-state.c:1516
 msgid "Default transition duration"
 msgstr "La durada per defecte de la transició"
 
-#: ../clutter/deprecated/clutter-texture.c:994
+#: ../clutter/deprecated/clutter-table-layout.c:535
+msgid "Column Number"
+msgstr "Número de columna"
+
+#: ../clutter/deprecated/clutter-table-layout.c:536
+msgid "The column the widget resides in"
+msgstr "La columna en la que està el giny"
+
+#: ../clutter/deprecated/clutter-table-layout.c:543
+msgid "Row Number"
+msgstr "Número de fila"
+
+#: ../clutter/deprecated/clutter-table-layout.c:544
+msgid "The row the widget resides in"
+msgstr "La fila en la que està el giny"
+
+#: ../clutter/deprecated/clutter-table-layout.c:551
+msgid "Column Span"
+msgstr "Abast en columnes"
+
+#: ../clutter/deprecated/clutter-table-layout.c:552
+msgid "The number of columns the widget should span"
+msgstr "El nombre de columnes que hauria d'abastir el giny"
+
+#: ../clutter/deprecated/clutter-table-layout.c:559
+msgid "Row Span"
+msgstr "Abast en files"
+
+#: ../clutter/deprecated/clutter-table-layout.c:560
+msgid "The number of rows the widget should span"
+msgstr "El nombre de files que hauria d'abastir el giny"
+
+#: ../clutter/deprecated/clutter-table-layout.c:567
+msgid "Horizontal Expand"
+msgstr "Expansió horitzontal"
+
+#: ../clutter/deprecated/clutter-table-layout.c:568
+msgid "Allocate extra space for the child in horizontal axis"
+msgstr "Ubica espai extra per al fill en l'eix horitzontal"
+
+#: ../clutter/deprecated/clutter-table-layout.c:574
+msgid "Vertical Expand"
+msgstr "Expansió vertical"
+
+#: ../clutter/deprecated/clutter-table-layout.c:575
+msgid "Allocate extra space for the child in vertical axis"
+msgstr "Ubica espai extra per al fill en l'eix vertical"
+
+#: ../clutter/deprecated/clutter-table-layout.c:1630
+msgid "Spacing between columns"
+msgstr "Espaiat entre columnes"
+
+#: ../clutter/deprecated/clutter-table-layout.c:1646
+msgid "Spacing between rows"
+msgstr "Espaiat entre files"
+
+#: ../clutter/deprecated/clutter-texture.c:992
 msgid "Sync size of actor"
 msgstr "Sincronitza la mida de l'actor"
 
-#: ../clutter/deprecated/clutter-texture.c:995
+#: ../clutter/deprecated/clutter-texture.c:993
 msgid "Auto sync size of actor to underlying pixbuf dimensions"
 msgstr ""
 "Sincronitza automàticament la mida de l'actor amb les mides de la memòria de "
 "píxels de rerefons"
 
-#: ../clutter/deprecated/clutter-texture.c:1002
+#: ../clutter/deprecated/clutter-texture.c:1000
 msgid "Disable Slicing"
 msgstr "Inhabilita el tallat"
 
-#: ../clutter/deprecated/clutter-texture.c:1003
+#: ../clutter/deprecated/clutter-texture.c:1001
 msgid ""
 "Forces the underlying texture to be singular and not made of smaller space "
 "saving individual textures"
@@ -2496,100 +2572,100 @@ msgstr ""
 "Força la textura de rerefons a ser una de sola i no estar formada per "
 "diverses de més petites"
 
-#: ../clutter/deprecated/clutter-texture.c:1012
+#: ../clutter/deprecated/clutter-texture.c:1010
 msgid "Tile Waste"
 msgstr "Desaprofitament de quadre"
 
-#: ../clutter/deprecated/clutter-texture.c:1013
+#: ../clutter/deprecated/clutter-texture.c:1011
 msgid "Maximum waste area of a sliced texture"
 msgstr "Àrea màxima de desaprofitament d'una textura tallada"
 
-#: ../clutter/deprecated/clutter-texture.c:1021
+#: ../clutter/deprecated/clutter-texture.c:1019
 msgid "Horizontal repeat"
 msgstr "Repetició horitzontal"
 
-#: ../clutter/deprecated/clutter-texture.c:1022
+#: ../clutter/deprecated/clutter-texture.c:1020
 msgid "Repeat the contents rather than scaling them horizontally"
 msgstr "Repeteix els continguts en comptes d'escalar-los horitzontalment"
 
-#: ../clutter/deprecated/clutter-texture.c:1029
+#: ../clutter/deprecated/clutter-texture.c:1027
 msgid "Vertical repeat"
 msgstr "Repetició vertical"
 
-#: ../clutter/deprecated/clutter-texture.c:1030
+#: ../clutter/deprecated/clutter-texture.c:1028
 msgid "Repeat the contents rather than scaling them vertically"
 msgstr "Repeteix els continguts en comptes d'escalar-los verticalment"
 
-#: ../clutter/deprecated/clutter-texture.c:1037
+#: ../clutter/deprecated/clutter-texture.c:1035
 msgid "Filter Quality"
 msgstr "Qualitat del filtre"
 
-#: ../clutter/deprecated/clutter-texture.c:1038
+#: ../clutter/deprecated/clutter-texture.c:1036
 msgid "Rendering quality used when drawing the texture"
 msgstr "La qualitat de la renderització quan es dibuixi una textura"
 
-#: ../clutter/deprecated/clutter-texture.c:1046
+#: ../clutter/deprecated/clutter-texture.c:1044
 msgid "Pixel Format"
 msgstr "Format del píxel"
 
-#: ../clutter/deprecated/clutter-texture.c:1047
+#: ../clutter/deprecated/clutter-texture.c:1045
 msgid "The Cogl pixel format to use"
 msgstr "El format de píxel de Cogl a utilitzar"
 
-#: ../clutter/deprecated/clutter-texture.c:1055
-#: ../clutter/wayland/clutter-wayland-surface.c:449
+#: ../clutter/deprecated/clutter-texture.c:1053
+#: ../clutter/wayland/clutter-wayland-surface.c:445
 msgid "Cogl Texture"
 msgstr "Textura de Cogl"
 
-#: ../clutter/deprecated/clutter-texture.c:1056
-#: ../clutter/wayland/clutter-wayland-surface.c:450
+#: ../clutter/deprecated/clutter-texture.c:1054
+#: ../clutter/wayland/clutter-wayland-surface.c:446
 msgid "The underlying Cogl texture handle used to draw this actor"
 msgstr ""
 "El gestor de la textura de Cogl de rerefons que s'utilitza per dibuixar este "
 "actor"
 
-#: ../clutter/deprecated/clutter-texture.c:1063
+#: ../clutter/deprecated/clutter-texture.c:1061
 msgid "Cogl Material"
 msgstr "Material de Cogl"
 
-#: ../clutter/deprecated/clutter-texture.c:1064
+#: ../clutter/deprecated/clutter-texture.c:1062
 msgid "The underlying Cogl material handle used to draw this actor"
 msgstr ""
 "El gestor del material de Cogl de rerefons que s'utilitza per dibuixar este "
 "actor"
 
-#: ../clutter/deprecated/clutter-texture.c:1083
+#: ../clutter/deprecated/clutter-texture.c:1081
 msgid "The path of the file containing the image data"
 msgstr "El camí al fitxer que conté les dades de la imatge"
 
-#: ../clutter/deprecated/clutter-texture.c:1090
+#: ../clutter/deprecated/clutter-texture.c:1088
 msgid "Keep Aspect Ratio"
 msgstr "Manté la relació d'aspecte"
 
-#: ../clutter/deprecated/clutter-texture.c:1091
+#: ../clutter/deprecated/clutter-texture.c:1089
 msgid ""
 "Keep the aspect ratio of the texture when requesting the preferred width or "
 "height"
 msgstr ""
-"Manté la relació d'aspecte de la textura quan es soŀliciti una amplada o "
+"Manté la relació d'aspecte de la textura quan es sol·liciti una amplada o "
 "alçada preferida"
 
-#: ../clutter/deprecated/clutter-texture.c:1119
+#: ../clutter/deprecated/clutter-texture.c:1117
 msgid "Load asynchronously"
 msgstr "Carrega asíncronament"
 
-#: ../clutter/deprecated/clutter-texture.c:1120
+#: ../clutter/deprecated/clutter-texture.c:1118
 msgid ""
 "Load files inside a thread to avoid blocking when loading images from disk"
 msgstr ""
 "Carrega els fitxers en un altre fil d'execució per evitar el blocatge quan "
 "es carreguin imatges del disc"
 
-#: ../clutter/deprecated/clutter-texture.c:1138
+#: ../clutter/deprecated/clutter-texture.c:1136
 msgid "Load data asynchronously"
 msgstr "Carrega les dades asíncronament"
 
-#: ../clutter/deprecated/clutter-texture.c:1139
+#: ../clutter/deprecated/clutter-texture.c:1137
 msgid ""
 "Decode image data files inside a thread to reduce blocking when loading "
 "images from disk"
@@ -2597,197 +2673,178 @@ msgstr ""
 "Descodifica els fitxers de dades d'imatge en un altre fil d'execució per "
 "reduir el blocatge quan es carreguin imatges del disc"
 
-#: ../clutter/deprecated/clutter-texture.c:1165
+#: ../clutter/deprecated/clutter-texture.c:1163
 msgid "Pick With Alpha"
 msgstr "Selecció amb transparència"
 
-#: ../clutter/deprecated/clutter-texture.c:1166
+#: ../clutter/deprecated/clutter-texture.c:1164
 msgid "Shape actor with alpha channel when picking"
 msgstr "Modela l'actor amb un canal de transparència quan es seleccioni"
 
-#: ../clutter/deprecated/clutter-texture.c:1599
-#: ../clutter/deprecated/clutter-texture.c:1994
-#: ../clutter/deprecated/clutter-texture.c:2090
-#: ../clutter/deprecated/clutter-texture.c:2388
+#: ../clutter/deprecated/clutter-texture.c:1597
+#: ../clutter/deprecated/clutter-texture.c:1992
+#: ../clutter/deprecated/clutter-texture.c:2088
+#: ../clutter/deprecated/clutter-texture.c:2386
 #, c-format
 msgid "Failed to load the image data"
 msgstr "No s'han pogut carregar les dades de la imatge"
 
-#: ../clutter/deprecated/clutter-texture.c:1758
+#: ../clutter/deprecated/clutter-texture.c:1756
 #, c-format
 msgid "YUV textures are not supported"
 msgstr "No es poden utilitzar textures YUV"
 
-#: ../clutter/deprecated/clutter-texture.c:1767
+#: ../clutter/deprecated/clutter-texture.c:1765
 #, c-format
 msgid "YUV2 textues are not supported"
 msgstr "No es poden utilitzar textures YUV2"
 
-#: ../clutter/evdev/clutter-input-device-evdev.c:159
-msgid "sysfs Path"
-msgstr "Camí al sysfs"
-
-#: ../clutter/evdev/clutter-input-device-evdev.c:160
-msgid "Path of the device in sysfs"
-msgstr "Camí al dispositiu a sysfs"
-
-#: ../clutter/evdev/clutter-input-device-evdev.c:175
-msgid "Device Path"
-msgstr "Camí al dispositiu"
-
-#: ../clutter/evdev/clutter-input-device-evdev.c:176
-msgid "Path of the device node"
-msgstr "Camí al node del dispositiu"
-
-#: ../clutter/gdk/clutter-backend-gdk.c:296
+#: ../clutter/gdk/clutter-backend-gdk.c:289
 #, c-format
 msgid "Could not find a suitable CoglWinsys for a GdkDisplay of type %s"
 msgstr "No s'ha pogut trobar cap CoglWinsys per a una GdkDisplay del tipus %s"
 
-#: ../clutter/wayland/clutter-wayland-surface.c:423
+#: ../clutter/wayland/clutter-wayland-surface.c:419
 msgid "Surface"
 msgstr "Superfície"
 
-#: ../clutter/wayland/clutter-wayland-surface.c:424
+#: ../clutter/wayland/clutter-wayland-surface.c:420
 msgid "The underlying wayland surface"
 msgstr "La superfície de Wayland de rerefons"
 
-#: ../clutter/wayland/clutter-wayland-surface.c:431
+#: ../clutter/wayland/clutter-wayland-surface.c:427
 msgid "Surface width"
 msgstr "Amplada de la superfície"
 
-#: ../clutter/wayland/clutter-wayland-surface.c:432
+#: ../clutter/wayland/clutter-wayland-surface.c:428
 msgid "The width of the underlying wayland surface"
 msgstr "L'amplada de la superfície Wayland subjacent"
 
-#: ../clutter/wayland/clutter-wayland-surface.c:440
+#: ../clutter/wayland/clutter-wayland-surface.c:436
 msgid "Surface height"
 msgstr "Alçada de la superfície"
 
-#: ../clutter/wayland/clutter-wayland-surface.c:441
+#: ../clutter/wayland/clutter-wayland-surface.c:437
 msgid "The height of the underlying wayland surface"
 msgstr "L'alçada de la superfície Wayland subjacent"
 
-#: ../clutter/x11/clutter-backend-x11.c:516
+#: ../clutter/x11/clutter-backend-x11.c:488
 msgid "X display to use"
 msgstr "El monitor d'X a utilitzar"
 
-#: ../clutter/x11/clutter-backend-x11.c:522
+#: ../clutter/x11/clutter-backend-x11.c:494
 msgid "X screen to use"
 msgstr "La pantalla d'X a utilitzar"
 
-#: ../clutter/x11/clutter-backend-x11.c:527
+#: ../clutter/x11/clutter-backend-x11.c:499
 msgid "Make X calls synchronous"
 msgstr "Fes les crides síncrones a l'X"
 
-#: ../clutter/x11/clutter-backend-x11.c:534
-msgid "Enable XInput support"
-msgstr "Habilita l'XInput"
+#: ../clutter/x11/clutter-backend-x11.c:506
+msgid "Disable XInput support"
+msgstr "Inhabilita l'XInput"
 
-#: ../clutter/x11/clutter-keymap-x11.c:317
+#: ../clutter/x11/clutter-keymap-x11.c:458
 msgid "The Clutter backend"
 msgstr "El rerefons de la Clutter"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:539
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:534
 msgid "Pixmap"
 msgstr "Mapa de píxels"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:540
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:535
 msgid "The X11 Pixmap to be bound"
 msgstr "El mapa de píxels X11 que es vincularà"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:548
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:543
 msgid "Pixmap width"
 msgstr "Amplada del mapa de píxels"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:549
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:544
 msgid "The width of the pixmap bound to this texture"
 msgstr "L'amplada del mapa de píxels vinculat a esta textura"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:557
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:552
 msgid "Pixmap height"
 msgstr "Alçada del mapa de píxels"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:558
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:553
 msgid "The height of the pixmap bound to this texture"
 msgstr "L'alçada del mapa de píxels vinculat a esta textura"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:566
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:561
 msgid "Pixmap Depth"
 msgstr "Profunditat del mapa de píxels"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:567
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:562
 msgid "The depth (in number of bits) of the pixmap bound to this texture"
 msgstr ""
 "La profunditat (en nombre de bits) del mapa de píxels vinculat a esta textura"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:575
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:570
 msgid "Automatic Updates"
 msgstr "Actualitzacions automàtiques"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:576
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:571
 msgid "If the texture should be kept in sync with any pixmap changes."
 msgstr ""
 "Si la textura s'hauria de mantindre sincronitzada amb els canvis al mapa de "
 "píxels."
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:584
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:579
 msgid "Window"
 msgstr "Finestra"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:585
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:580
 msgid "The X11 Window to be bound"
 msgstr "La finestra X11 que es vincularà"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:593
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:588
 msgid "Window Redirect Automatic"
 msgstr "Redireccions automàtiques de finestres"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:594
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:589
 msgid "If composite window redirects are set to Automatic (or Manual if false)"
 msgstr ""
 "Si les redireccions de les finestres compostes són automàtiques (o manuals "
 "si «false» (fals))"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:604
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:599
 msgid "Window Mapped"
 msgstr "Finestra mapada"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:605
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:600
 msgid "If window is mapped"
 msgstr "Si la finestra és mapada"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:614
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:609
 msgid "Destroyed"
 msgstr "Destruïda"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:615
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:610
 msgid "If window has been destroyed"
 msgstr "Si s'ha destruït la finestra"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:623
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:618
 msgid "Window X"
 msgstr "X de la finestra"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:624
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:619
 msgid "X position of window on screen according to X11"
 msgstr "La posició X de la finestra a la pantalla segons l'X11"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:632
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:627
 msgid "Window Y"
 msgstr "Y de la finestra"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:633
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:628
 msgid "Y position of window on screen according to X11"
 msgstr "La posició Y de la finestra a la pantalla segons l'X11"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:640
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:635
 msgid "Window Override Redirect"
 msgstr "Redirecció de la sobreescriptura de la finestra"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:641
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:636
 msgid "If this is an override-redirect window"
 msgstr "Si és una finestra de redirecció de la sobreescriptura"
-
-#~ msgid "The layout manager used by the box"
-#~ msgstr "El gestor de disposició utilitzat per la caixa"
diff --git a/po/cs.po b/po/cs.po
index 5931d8c83..af61854e6 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -3,15 +3,15 @@
 # This file is distributed under the same license as the clutter package.
 #
 # Adam Matoušek <adydas95@gmail.com>, 2012.
-# Marek Černocký <marek@manet.cz>, 2011, 2012, 2013.
+# Marek Černocký <marek@manet.cz>, 2011, 2012, 2013, 2014.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: clutter master\n"
+"Project-Id-Version: clutter 1.16\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=clutter&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2013-02-06 17:22+0000\n"
-"PO-Revision-Date: 2013-02-22 20:52+0100\n"
+"POT-Creation-Date: 2014-02-22 04:08+0000\n"
+"PO-Revision-Date: 2014-02-22 13:13+0100\n"
 "Last-Translator: Marek Černocký <marek@manet.cz>\n"
 "Language-Team: Czech <gnome-cs-list@gnome.org>\n"
 "Language: cs\n"
@@ -19,694 +19,695 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+"X-Generator: Gtranslator 2.91.6\n"
 
-#: ../clutter/clutter-actor.c:6144
+#: ../clutter/clutter-actor.c:6214
 msgid "X coordinate"
 msgstr "Souřadnice X"
 
-#: ../clutter/clutter-actor.c:6145
+#: ../clutter/clutter-actor.c:6215
 msgid "X coordinate of the actor"
 msgstr "Souřadnice X účastníka"
 
-#: ../clutter/clutter-actor.c:6163
+#: ../clutter/clutter-actor.c:6233
 msgid "Y coordinate"
 msgstr "Souřadnice Y"
 
-#: ../clutter/clutter-actor.c:6164
+#: ../clutter/clutter-actor.c:6234
 msgid "Y coordinate of the actor"
 msgstr "Souřadnice Y účastníka"
 
-#: ../clutter/clutter-actor.c:6186
+#: ../clutter/clutter-actor.c:6256
 msgid "Position"
 msgstr "Poloha"
 
-#: ../clutter/clutter-actor.c:6187
+#: ../clutter/clutter-actor.c:6257
 msgid "The position of the origin of the actor"
 msgstr "Poloha počátku účastníka"
 
-#: ../clutter/clutter-actor.c:6204 ../clutter/clutter-canvas.c:215
-#: ../clutter/clutter-grid-layout.c:1238
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:481
+#: ../clutter/clutter-actor.c:6274 ../clutter/clutter-canvas.c:247
+#: ../clutter/clutter-grid-layout.c:1239
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:474
 msgid "Width"
 msgstr "Šířka"
 
-#: ../clutter/clutter-actor.c:6205
+#: ../clutter/clutter-actor.c:6275
 msgid "Width of the actor"
 msgstr "Šířka účastníka"
 
-#: ../clutter/clutter-actor.c:6223 ../clutter/clutter-canvas.c:231
-#: ../clutter/clutter-grid-layout.c:1245
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:497
+#: ../clutter/clutter-actor.c:6293 ../clutter/clutter-canvas.c:263
+#: ../clutter/clutter-grid-layout.c:1246
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:490
 msgid "Height"
 msgstr "Výška"
 
-#: ../clutter/clutter-actor.c:6224
+#: ../clutter/clutter-actor.c:6294
 msgid "Height of the actor"
 msgstr "Výška účastníka"
 
-#: ../clutter/clutter-actor.c:6245
+#: ../clutter/clutter-actor.c:6315
 msgid "Size"
 msgstr "Velikost"
 
-#: ../clutter/clutter-actor.c:6246
+#: ../clutter/clutter-actor.c:6316
 msgid "The size of the actor"
 msgstr "Velikost účastníka"
 
-#: ../clutter/clutter-actor.c:6264
+#: ../clutter/clutter-actor.c:6334
 msgid "Fixed X"
 msgstr "Pevná X"
 
-#: ../clutter/clutter-actor.c:6265
+#: ../clutter/clutter-actor.c:6335
 msgid "Forced X position of the actor"
 msgstr "Přikázaná poloha X účastníka"
 
-#: ../clutter/clutter-actor.c:6282
+#: ../clutter/clutter-actor.c:6352
 msgid "Fixed Y"
 msgstr "Pevná Y"
 
-#: ../clutter/clutter-actor.c:6283
+#: ../clutter/clutter-actor.c:6353
 msgid "Forced Y position of the actor"
 msgstr "Přikázaná poloha Y účastníka"
 
-#: ../clutter/clutter-actor.c:6298
+#: ../clutter/clutter-actor.c:6368
 msgid "Fixed position set"
 msgstr "Nastavena pevná poloha"
 
-#: ../clutter/clutter-actor.c:6299
+#: ../clutter/clutter-actor.c:6369
 msgid "Whether to use fixed positioning for the actor"
 msgstr "Zda je použita pevná poloha pro účastníka"
 
-#: ../clutter/clutter-actor.c:6317
+#: ../clutter/clutter-actor.c:6387
 msgid "Min Width"
 msgstr "Min. šířka"
 
-#: ../clutter/clutter-actor.c:6318
+#: ../clutter/clutter-actor.c:6388
 msgid "Forced minimum width request for the actor"
 msgstr "Požadavek na nutnou minimální šířku účastníka"
 
-#: ../clutter/clutter-actor.c:6336
+#: ../clutter/clutter-actor.c:6406
 msgid "Min Height"
 msgstr "Min. výška"
 
-#: ../clutter/clutter-actor.c:6337
+#: ../clutter/clutter-actor.c:6407
 msgid "Forced minimum height request for the actor"
 msgstr "Požadavek na nutnou minimální výšku účastníka"
 
-#: ../clutter/clutter-actor.c:6355
+#: ../clutter/clutter-actor.c:6425
 msgid "Natural Width"
 msgstr "Přirozená šířka"
 
-#: ../clutter/clutter-actor.c:6356
+#: ../clutter/clutter-actor.c:6426
 msgid "Forced natural width request for the actor"
 msgstr "Požadavek na nutnou přirozenou šířku účastníka"
 
-#: ../clutter/clutter-actor.c:6374
+#: ../clutter/clutter-actor.c:6444
 msgid "Natural Height"
 msgstr "Přirozená výška"
 
-#: ../clutter/clutter-actor.c:6375
+#: ../clutter/clutter-actor.c:6445
 msgid "Forced natural height request for the actor"
 msgstr "Požadavek na nutnou přirozenou výšku účastníka"
 
-#: ../clutter/clutter-actor.c:6390
+#: ../clutter/clutter-actor.c:6460
 msgid "Minimum width set"
 msgstr "Nastavena min. šířka"
 
-#: ../clutter/clutter-actor.c:6391
+#: ../clutter/clutter-actor.c:6461
 msgid "Whether to use the min-width property"
 msgstr "Zda se má použit vlastnost min-width"
 
-#: ../clutter/clutter-actor.c:6405
+#: ../clutter/clutter-actor.c:6475
 msgid "Minimum height set"
 msgstr "Nastavena min. výška"
 
-#: ../clutter/clutter-actor.c:6406
+#: ../clutter/clutter-actor.c:6476
 msgid "Whether to use the min-height property"
 msgstr "Zda se má použit vlastnost min-height"
 
-#: ../clutter/clutter-actor.c:6420
+#: ../clutter/clutter-actor.c:6490
 msgid "Natural width set"
 msgstr "Nastavena přirozená šířka"
 
-#: ../clutter/clutter-actor.c:6421
+#: ../clutter/clutter-actor.c:6491
 msgid "Whether to use the natural-width property"
 msgstr "Zda se má použit vlastnost natural-width"
 
-#: ../clutter/clutter-actor.c:6435
+#: ../clutter/clutter-actor.c:6505
 msgid "Natural height set"
 msgstr "Nastavena přirozená výška"
 
-#: ../clutter/clutter-actor.c:6436
+#: ../clutter/clutter-actor.c:6506
 msgid "Whether to use the natural-height property"
 msgstr "Zda se má použit vlastnost natural-height"
 
-#: ../clutter/clutter-actor.c:6452
+#: ../clutter/clutter-actor.c:6522
 msgid "Allocation"
 msgstr "Místo"
 
-#: ../clutter/clutter-actor.c:6453
+#: ../clutter/clutter-actor.c:6523
 msgid "The actor's allocation"
 msgstr "Místo zabrané účastníkem"
 
-#: ../clutter/clutter-actor.c:6510
+#: ../clutter/clutter-actor.c:6580
 msgid "Request Mode"
 msgstr "Režim požadavku"
 
-#: ../clutter/clutter-actor.c:6511
+#: ../clutter/clutter-actor.c:6581
 msgid "The actor's request mode"
 msgstr "Režim požadavku účastníka"
 
-#: ../clutter/clutter-actor.c:6535
+#: ../clutter/clutter-actor.c:6605
 msgid "Depth"
 msgstr "Hloubka"
 
-#: ../clutter/clutter-actor.c:6536
+#: ../clutter/clutter-actor.c:6606
 msgid "Position on the Z axis"
 msgstr "Poloha na ose Z"
 
-#: ../clutter/clutter-actor.c:6563
+#: ../clutter/clutter-actor.c:6633
 msgid "Z Position"
 msgstr "Poloha Z"
 
-#: ../clutter/clutter-actor.c:6564
+#: ../clutter/clutter-actor.c:6634
 msgid "The actor's position on the Z axis"
 msgstr "Poloha účastníka na ose Z"
 
-#: ../clutter/clutter-actor.c:6581
+#: ../clutter/clutter-actor.c:6651
 msgid "Opacity"
 msgstr "Krytí"
 
-#: ../clutter/clutter-actor.c:6582
+#: ../clutter/clutter-actor.c:6652
 msgid "Opacity of an actor"
 msgstr "Úroveň krytí barev účastníka"
 
-#: ../clutter/clutter-actor.c:6602
+#: ../clutter/clutter-actor.c:6672
 msgid "Offscreen redirect"
 msgstr "Přesměrování vykreslení v paměti"
 
-#: ../clutter/clutter-actor.c:6603
+#: ../clutter/clutter-actor.c:6673
 msgid "Flags controlling when to flatten the actor into a single image"
 msgstr "Příznak řídící, zda se má účastník shrnout do jednoho obrázku"
 
-#: ../clutter/clutter-actor.c:6617
+#: ../clutter/clutter-actor.c:6687
 msgid "Visible"
 msgstr "Viditelnost"
 
-#: ../clutter/clutter-actor.c:6618
+#: ../clutter/clutter-actor.c:6688
 msgid "Whether the actor is visible or not"
 msgstr "Zda je účastník viditelný či ne"
 
-#: ../clutter/clutter-actor.c:6632
+#: ../clutter/clutter-actor.c:6702
 msgid "Mapped"
 msgstr "Namapován"
 
-#: ../clutter/clutter-actor.c:6633
+#: ../clutter/clutter-actor.c:6703
 msgid "Whether the actor will be painted"
 msgstr "Zda bude účastník kreslen"
 
-#: ../clutter/clutter-actor.c:6646
+#: ../clutter/clutter-actor.c:6716
 msgid "Realized"
 msgstr "Realizován"
 
-#: ../clutter/clutter-actor.c:6647
+#: ../clutter/clutter-actor.c:6717
 msgid "Whether the actor has been realized"
 msgstr "Zda byl účastník realizován"
 
-#: ../clutter/clutter-actor.c:6662
+#: ../clutter/clutter-actor.c:6732
 msgid "Reactive"
 msgstr "Reagující"
 
-#: ../clutter/clutter-actor.c:6663
+#: ../clutter/clutter-actor.c:6733
 msgid "Whether the actor is reactive to events"
 msgstr "Zda účastník reaguje na události"
 
-#: ../clutter/clutter-actor.c:6674
+#: ../clutter/clutter-actor.c:6744
 msgid "Has Clip"
 msgstr "Má ořez"
 
-#: ../clutter/clutter-actor.c:6675
+#: ../clutter/clutter-actor.c:6745
 msgid "Whether the actor has a clip set"
 msgstr "Zda má účastník nastavené ořezání"
 
-#: ../clutter/clutter-actor.c:6688
+#: ../clutter/clutter-actor.c:6758
 msgid "Clip"
 msgstr "Ořez"
 
-#: ../clutter/clutter-actor.c:6689
+#: ../clutter/clutter-actor.c:6759
 msgid "The clip region for the actor"
 msgstr "Oblast ořezání účastníka"
 
-#: ../clutter/clutter-actor.c:6708
+#: ../clutter/clutter-actor.c:6778
 msgid "Clip Rectangle"
 msgstr "Ořezový obdélník"
 
-#: ../clutter/clutter-actor.c:6709
+#: ../clutter/clutter-actor.c:6779
 msgid "The visible region of the actor"
 msgstr "Viditelná oblast účastníka"
 
-#: ../clutter/clutter-actor.c:6723 ../clutter/clutter-actor-meta.c:207
-#: ../clutter/clutter-binding-pool.c:319 ../clutter/clutter-input-device.c:258
+#: ../clutter/clutter-actor.c:6793 ../clutter/clutter-actor-meta.c:205
+#: ../clutter/clutter-binding-pool.c:319 ../clutter/clutter-input-device.c:247
 msgid "Name"
 msgstr "Název"
 
-#: ../clutter/clutter-actor.c:6724
+#: ../clutter/clutter-actor.c:6794
 msgid "Name of the actor"
 msgstr "Název účastníka"
 
-#: ../clutter/clutter-actor.c:6745
+#: ../clutter/clutter-actor.c:6815
 msgid "Pivot Point"
 msgstr "Středový bod"
 
-#: ../clutter/clutter-actor.c:6746
+#: ../clutter/clutter-actor.c:6816
 msgid "The point around which the scaling and rotation occur"
 msgstr "Bod, ke kterému se vztahuje škálování a otáčení"
 
-#: ../clutter/clutter-actor.c:6764
+#: ../clutter/clutter-actor.c:6834
 msgid "Pivot Point Z"
 msgstr "Středový bod v Z"
 
-#: ../clutter/clutter-actor.c:6765
+#: ../clutter/clutter-actor.c:6835
 msgid "Z component of the pivot point"
 msgstr "Souřadnice Z středového bodu"
 
-#: ../clutter/clutter-actor.c:6783
+#: ../clutter/clutter-actor.c:6853
 msgid "Scale X"
 msgstr "Měřítko v X"
 
-#: ../clutter/clutter-actor.c:6784
+#: ../clutter/clutter-actor.c:6854
 msgid "Scale factor on the X axis"
 msgstr "Škálovací měřítko v ose X"
 
-#: ../clutter/clutter-actor.c:6802
+#: ../clutter/clutter-actor.c:6872
 msgid "Scale Y"
 msgstr "Měřítko v Y"
 
-#: ../clutter/clutter-actor.c:6803
+#: ../clutter/clutter-actor.c:6873
 msgid "Scale factor on the Y axis"
 msgstr "Škálovací měřítko v ose Y"
 
-#: ../clutter/clutter-actor.c:6821
+#: ../clutter/clutter-actor.c:6891
 msgid "Scale Z"
 msgstr "Měřítko v Z"
 
-#: ../clutter/clutter-actor.c:6822
+#: ../clutter/clutter-actor.c:6892
 msgid "Scale factor on the Z axis"
 msgstr "Škálovací měřítko v ose Z"
 
-#: ../clutter/clutter-actor.c:6840
+#: ../clutter/clutter-actor.c:6910
 msgid "Scale Center X"
 msgstr "Střed škálování v X"
 
-#: ../clutter/clutter-actor.c:6841
+#: ../clutter/clutter-actor.c:6911
 msgid "Horizontal scale center"
 msgstr "Střed škálování ve vodorovném směru"
 
-#: ../clutter/clutter-actor.c:6859
+#: ../clutter/clutter-actor.c:6929
 msgid "Scale Center Y"
 msgstr "Střed škálování v Y"
 
-#: ../clutter/clutter-actor.c:6860
+#: ../clutter/clutter-actor.c:6930
 msgid "Vertical scale center"
 msgstr "Střed škálování ve svislém směru"
 
-#: ../clutter/clutter-actor.c:6878
+#: ../clutter/clutter-actor.c:6948
 msgid "Scale Gravity"
 msgstr "Středobod škálování"
 
-#: ../clutter/clutter-actor.c:6879
+#: ../clutter/clutter-actor.c:6949
 msgid "The center of scaling"
 msgstr "Střed škálování"
 
-#: ../clutter/clutter-actor.c:6897
+#: ../clutter/clutter-actor.c:6967
 msgid "Rotation Angle X"
 msgstr "Úhel natočení v X"
 
-#: ../clutter/clutter-actor.c:6898
+#: ../clutter/clutter-actor.c:6968
 msgid "The rotation angle on the X axis"
 msgstr "Úhel natočení v ose X"
 
-#: ../clutter/clutter-actor.c:6916
+#: ../clutter/clutter-actor.c:6986
 msgid "Rotation Angle Y"
 msgstr "Úhel natočení v Y"
 
-#: ../clutter/clutter-actor.c:6917
+#: ../clutter/clutter-actor.c:6987
 msgid "The rotation angle on the Y axis"
 msgstr "Úhel natočení v ose Y"
 
-#: ../clutter/clutter-actor.c:6935
+#: ../clutter/clutter-actor.c:7005
 msgid "Rotation Angle Z"
 msgstr "Úhel natočení v Z"
 
-#: ../clutter/clutter-actor.c:6936
+#: ../clutter/clutter-actor.c:7006
 msgid "The rotation angle on the Z axis"
 msgstr "Úhel natočení v ose Z"
 
-#: ../clutter/clutter-actor.c:6954
+#: ../clutter/clutter-actor.c:7024
 msgid "Rotation Center X"
 msgstr "Střed natočení v X"
 
-#: ../clutter/clutter-actor.c:6955
+#: ../clutter/clutter-actor.c:7025
 msgid "The rotation center on the X axis"
 msgstr "Souřadnice na ose X středu natočení"
 
-#: ../clutter/clutter-actor.c:6972
+#: ../clutter/clutter-actor.c:7042
 msgid "Rotation Center Y"
 msgstr "Střed natočení v Y"
 
-#: ../clutter/clutter-actor.c:6973
+#: ../clutter/clutter-actor.c:7043
 msgid "The rotation center on the Y axis"
 msgstr "Souřadnice na ose Y středu natočení"
 
-#: ../clutter/clutter-actor.c:6990
+#: ../clutter/clutter-actor.c:7060
 msgid "Rotation Center Z"
 msgstr "Střed natočení v Z"
 
-#: ../clutter/clutter-actor.c:6991
+#: ../clutter/clutter-actor.c:7061
 msgid "The rotation center on the Z axis"
 msgstr "Souřadnice na ose Z středu natočení"
 
-#: ../clutter/clutter-actor.c:7008
+#: ../clutter/clutter-actor.c:7078
 msgid "Rotation Center Z Gravity"
 msgstr "Středobod natočení v ose Z"
 
-#: ../clutter/clutter-actor.c:7009
+#: ../clutter/clutter-actor.c:7079
 msgid "Center point for rotation around the Z axis"
 msgstr "Středový bod pro natočení okolo osy Z"
 
-#: ../clutter/clutter-actor.c:7037
+#: ../clutter/clutter-actor.c:7107
 msgid "Anchor X"
 msgstr "Kotva v X"
 
-#: ../clutter/clutter-actor.c:7038
+#: ../clutter/clutter-actor.c:7108
 msgid "X coordinate of the anchor point"
 msgstr "Souřadnice X kotevního bodu"
 
-#: ../clutter/clutter-actor.c:7066
+#: ../clutter/clutter-actor.c:7136
 msgid "Anchor Y"
 msgstr "Kotva v Y"
 
-#: ../clutter/clutter-actor.c:7067
+#: ../clutter/clutter-actor.c:7137
 msgid "Y coordinate of the anchor point"
 msgstr "Souřadnice Y kotevního bodu"
 
-#: ../clutter/clutter-actor.c:7094
+#: ../clutter/clutter-actor.c:7164
 msgid "Anchor Gravity"
 msgstr "Středobod kotvy"
 
-#: ../clutter/clutter-actor.c:7095
+#: ../clutter/clutter-actor.c:7165
 msgid "The anchor point as a ClutterGravity"
 msgstr "Kotevní bod ve formě ClutterGravity"
 
-#: ../clutter/clutter-actor.c:7114
+#: ../clutter/clutter-actor.c:7184
 msgid "Translation X"
 msgstr "Translace v X"
 
-#: ../clutter/clutter-actor.c:7115
+#: ../clutter/clutter-actor.c:7185
 msgid "Translation along the X axis"
 msgstr "Translace souřadnic ve směru osy X"
 
-#: ../clutter/clutter-actor.c:7134
+#: ../clutter/clutter-actor.c:7204
 msgid "Translation Y"
 msgstr "Translace v Y"
 
-#: ../clutter/clutter-actor.c:7135
+#: ../clutter/clutter-actor.c:7205
 msgid "Translation along the Y axis"
 msgstr "Translace souřadnic ve směru osy Y"
 
-#: ../clutter/clutter-actor.c:7154
+#: ../clutter/clutter-actor.c:7224
 msgid "Translation Z"
 msgstr "Translace v Z"
 
-#: ../clutter/clutter-actor.c:7155
+#: ../clutter/clutter-actor.c:7225
 msgid "Translation along the Z axis"
 msgstr "Translace souřadnic ve směru osy Z"
 
-#: ../clutter/clutter-actor.c:7185
+#: ../clutter/clutter-actor.c:7255
 msgid "Transform"
 msgstr "Transformace"
 
-#: ../clutter/clutter-actor.c:7186
+#: ../clutter/clutter-actor.c:7256
 msgid "Transformation matrix"
 msgstr "Transformační matice"
 
-#: ../clutter/clutter-actor.c:7201
+#: ../clutter/clutter-actor.c:7271
 msgid "Transform Set"
 msgstr "Transformace nastavena"
 
-#: ../clutter/clutter-actor.c:7202
+#: ../clutter/clutter-actor.c:7272
 msgid "Whether the transform property is set"
 msgstr "Zda je nastavena vlastnost transform"
 
-#: ../clutter/clutter-actor.c:7223
+#: ../clutter/clutter-actor.c:7293
 msgid "Child Transform"
 msgstr "Transformace potomka"
 
-#: ../clutter/clutter-actor.c:7224
+#: ../clutter/clutter-actor.c:7294
 msgid "Children transformation matrix"
 msgstr "Transformační matice potomka"
 
-#: ../clutter/clutter-actor.c:7239
+#: ../clutter/clutter-actor.c:7309
 msgid "Child Transform Set"
 msgstr "Transformace potomka nastavena"
 
-#: ../clutter/clutter-actor.c:7240
+#: ../clutter/clutter-actor.c:7310
 msgid "Whether the child-transform property is set"
 msgstr "Zda je nastavena vlastnost child-transform"
 
-#: ../clutter/clutter-actor.c:7257
+#: ../clutter/clutter-actor.c:7327
 msgid "Show on set parent"
 msgstr "Zobrazit podle nastavení rodiče"
 
-#: ../clutter/clutter-actor.c:7258
+#: ../clutter/clutter-actor.c:7328
 msgid "Whether the actor is shown when parented"
 msgstr "Zda je účastník zobrazen, když je zobrazen rodič"
 
-#: ../clutter/clutter-actor.c:7275
+#: ../clutter/clutter-actor.c:7345
 msgid "Clip to Allocation"
 msgstr "Ořez podle místa"
 
-#: ../clutter/clutter-actor.c:7276
+#: ../clutter/clutter-actor.c:7346
 msgid "Sets the clip region to track the actor's allocation"
 msgstr "Mění oblast ořezu průběžně podle místa, na kterém je účastník"
 
-#: ../clutter/clutter-actor.c:7289
+#: ../clutter/clutter-actor.c:7359
 msgid "Text Direction"
 msgstr "Směr textu"
 
-#: ../clutter/clutter-actor.c:7290
+#: ../clutter/clutter-actor.c:7360
 msgid "Direction of the text"
 msgstr "Směr textu"
 
-#: ../clutter/clutter-actor.c:7305
+#: ../clutter/clutter-actor.c:7375
 msgid "Has Pointer"
 msgstr "Má ukazatel"
 
-#: ../clutter/clutter-actor.c:7306
+#: ../clutter/clutter-actor.c:7376
 msgid "Whether the actor contains the pointer of an input device"
 msgstr "Zda účastník obsahuje ukazatel některého ze vstupních zařízení"
 
-#: ../clutter/clutter-actor.c:7319
+#: ../clutter/clutter-actor.c:7389
 msgid "Actions"
 msgstr "Akce"
 
-#: ../clutter/clutter-actor.c:7320
+#: ../clutter/clutter-actor.c:7390
 msgid "Adds an action to the actor"
 msgstr "Přidává do účastníka akci"
 
-#: ../clutter/clutter-actor.c:7333
+#: ../clutter/clutter-actor.c:7403
 msgid "Constraints"
 msgstr "Omezení"
 
-#: ../clutter/clutter-actor.c:7334
+#: ../clutter/clutter-actor.c:7404
 msgid "Adds a constraint to the actor"
 msgstr "Přidává do účastníka omezení"
 
-#: ../clutter/clutter-actor.c:7347
+#: ../clutter/clutter-actor.c:7417
 msgid "Effect"
 msgstr "Efekt"
 
-#: ../clutter/clutter-actor.c:7348
+#: ../clutter/clutter-actor.c:7418
 msgid "Add an effect to be applied on the actor"
 msgstr "Přidává efekt aplikovaný na účastníka"
 
-#: ../clutter/clutter-actor.c:7362
+#: ../clutter/clutter-actor.c:7432
 msgid "Layout Manager"
 msgstr "Správce rozvržení"
 
-#: ../clutter/clutter-actor.c:7363
+#: ../clutter/clutter-actor.c:7433
 msgid "The object controlling the layout of an actor's children"
 msgstr "Objekt ovládající rozvržení potomků účastníka"
 
-#: ../clutter/clutter-actor.c:7377
+#: ../clutter/clutter-actor.c:7447
 msgid "X Expand"
 msgstr "Roztažení v X"
 
-#: ../clutter/clutter-actor.c:7378
+#: ../clutter/clutter-actor.c:7448
 msgid "Whether extra horizontal space should be assigned to the actor"
 msgstr ""
 "Zda by k účastníkovi mělo být ve vodorovném směru přidáno dodatečné volné "
 "místo"
 
-#: ../clutter/clutter-actor.c:7393
+#: ../clutter/clutter-actor.c:7463
 msgid "Y Expand"
 msgstr "Roztažení v Y"
 
-#: ../clutter/clutter-actor.c:7394
+#: ../clutter/clutter-actor.c:7464
 msgid "Whether extra vertical space should be assigned to the actor"
 msgstr ""
 "Zda by k účastníkovi mělo být ve svislém směru přidáno dodatečné volné místo"
 
-#: ../clutter/clutter-actor.c:7410
+#: ../clutter/clutter-actor.c:7480
 msgid "X Alignment"
 msgstr "Zarovnání v X"
 
-#: ../clutter/clutter-actor.c:7411
+#: ../clutter/clutter-actor.c:7481
 msgid "The alignment of the actor on the X axis within its allocation"
 msgstr "Vodorovné zarovnání účastníka v rámci jeho prostoru"
 
-#: ../clutter/clutter-actor.c:7426
+#: ../clutter/clutter-actor.c:7496
 msgid "Y Alignment"
 msgstr "Zarovnání v Y"
 
-#: ../clutter/clutter-actor.c:7427
+#: ../clutter/clutter-actor.c:7497
 msgid "The alignment of the actor on the Y axis within its allocation"
 msgstr "Svislé zarovnání účastníka v rámci jeho prostoru"
 
-#: ../clutter/clutter-actor.c:7446
+#: ../clutter/clutter-actor.c:7516
 msgid "Margin Top"
 msgstr "Okraj nahoře"
 
-#: ../clutter/clutter-actor.c:7447
+#: ../clutter/clutter-actor.c:7517
 msgid "Extra space at the top"
 msgstr "Místo navíc na horní straně"
 
-#: ../clutter/clutter-actor.c:7468
+#: ../clutter/clutter-actor.c:7538
 msgid "Margin Bottom"
 msgstr "Okraj dole"
 
-#: ../clutter/clutter-actor.c:7469
+#: ../clutter/clutter-actor.c:7539
 msgid "Extra space at the bottom"
 msgstr "Místo navíc na spodní straně"
 
-#: ../clutter/clutter-actor.c:7490
+#: ../clutter/clutter-actor.c:7560
 msgid "Margin Left"
 msgstr "Okraj vlevo"
 
-#: ../clutter/clutter-actor.c:7491
+#: ../clutter/clutter-actor.c:7561
 msgid "Extra space at the left"
 msgstr "Místo navíc na levé straně"
 
-#: ../clutter/clutter-actor.c:7512
+#: ../clutter/clutter-actor.c:7582
 msgid "Margin Right"
 msgstr "Okraj vpravo"
 
-#: ../clutter/clutter-actor.c:7513
+#: ../clutter/clutter-actor.c:7583
 msgid "Extra space at the right"
 msgstr "Místo navíc na pravé straně"
 
-#: ../clutter/clutter-actor.c:7529
+#: ../clutter/clutter-actor.c:7599
 msgid "Background Color Set"
 msgstr "Barva pozadí nastavena"
 
-#: ../clutter/clutter-actor.c:7530 ../clutter/deprecated/clutter-box.c:275
+#: ../clutter/clutter-actor.c:7600 ../clutter/deprecated/clutter-box.c:271
 msgid "Whether the background color is set"
 msgstr "Zda je barva pozadí nastavena"
 
-#: ../clutter/clutter-actor.c:7546
+#: ../clutter/clutter-actor.c:7616
 msgid "Background color"
 msgstr "Barva pozadí"
 
-#: ../clutter/clutter-actor.c:7547
+#: ../clutter/clutter-actor.c:7617
 msgid "The actor's background color"
 msgstr "Barva pozadí účastníka"
 
-#: ../clutter/clutter-actor.c:7562
+#: ../clutter/clutter-actor.c:7632
 msgid "First Child"
 msgstr "První potomek"
 
-#: ../clutter/clutter-actor.c:7563
+#: ../clutter/clutter-actor.c:7633
 msgid "The actor's first child"
 msgstr "Účastníkův první potomek"
 
-#: ../clutter/clutter-actor.c:7576
+#: ../clutter/clutter-actor.c:7646
 msgid "Last Child"
 msgstr "Poslední potomek"
 
-#: ../clutter/clutter-actor.c:7577
+#: ../clutter/clutter-actor.c:7647
 msgid "The actor's last child"
 msgstr "Účastníkův poslední potomek"
 
-#: ../clutter/clutter-actor.c:7591
+#: ../clutter/clutter-actor.c:7661
 msgid "Content"
 msgstr "Obsah"
 
-#: ../clutter/clutter-actor.c:7592
+#: ../clutter/clutter-actor.c:7662
 msgid "Delegate object for painting the actor's content"
 msgstr "Delegace objektu pro kreslení obsahu účastníka"
 
-#: ../clutter/clutter-actor.c:7617
+#: ../clutter/clutter-actor.c:7687
 msgid "Content Gravity"
 msgstr "Středobod obsahu"
 
-#: ../clutter/clutter-actor.c:7618
+#: ../clutter/clutter-actor.c:7688
 msgid "Alignment of the actor's content"
 msgstr "Zarovnání obsahu účastníka"
 
-#: ../clutter/clutter-actor.c:7638
+#: ../clutter/clutter-actor.c:7708
 msgid "Content Box"
 msgstr "Hranice obsahu"
 
-#: ../clutter/clutter-actor.c:7639
+#: ../clutter/clutter-actor.c:7709
 msgid "The bounding box of the actor's content"
 msgstr "Oblast ohraničující obsah účastníka"
 
-#: ../clutter/clutter-actor.c:7647
+#: ../clutter/clutter-actor.c:7717
 msgid "Minification Filter"
 msgstr "Zmenšovací filtr"
 
-#: ../clutter/clutter-actor.c:7648
+#: ../clutter/clutter-actor.c:7718
 msgid "The filter used when reducing the size of the content"
 msgstr "Filtr používaný při zmenšení velikosti obsahu"
 
-#: ../clutter/clutter-actor.c:7655
+#: ../clutter/clutter-actor.c:7725
 msgid "Magnification Filter"
 msgstr "Zvětšovací filtr"
 
-#: ../clutter/clutter-actor.c:7656
+#: ../clutter/clutter-actor.c:7726
 msgid "The filter used when increasing the size of the content"
 msgstr "Filtr používaný při zvětšení velikosti obsahu"
 
-#: ../clutter/clutter-actor.c:7670
+#: ../clutter/clutter-actor.c:7740
 msgid "Content Repeat"
 msgstr "Opakování obsahu"
 
-#: ../clutter/clutter-actor.c:7671
+#: ../clutter/clutter-actor.c:7741
 msgid "The repeat policy for the actor's content"
 msgstr "Strategie opakování obsahu účastníka"
 
-#: ../clutter/clutter-actor-meta.c:193 ../clutter/clutter-child-meta.c:142
+#: ../clutter/clutter-actor-meta.c:191 ../clutter/clutter-child-meta.c:142
 msgid "Actor"
 msgstr "Účastník"
 
-#: ../clutter/clutter-actor-meta.c:194
+#: ../clutter/clutter-actor-meta.c:192
 msgid "The actor attached to the meta"
 msgstr "Účastník vložený do struktury"
 
-#: ../clutter/clutter-actor-meta.c:208
+#: ../clutter/clutter-actor-meta.c:206
 msgid "The name of the meta"
 msgstr "Název struktury"
 
-#: ../clutter/clutter-actor-meta.c:221 ../clutter/clutter-input-device.c:337
-#: ../clutter/deprecated/clutter-shader.c:313
+#: ../clutter/clutter-actor-meta.c:219 ../clutter/clutter-input-device.c:326
+#: ../clutter/deprecated/clutter-shader.c:309
 msgid "Enabled"
 msgstr "Povolena"
 
-#: ../clutter/clutter-actor-meta.c:222
+#: ../clutter/clutter-actor-meta.c:220
 msgid "Whether the meta is enabled"
 msgstr "Zda je struktura povolena"
 
 #: ../clutter/clutter-align-constraint.c:279
-#: ../clutter/clutter-bind-constraint.c:358 ../clutter/clutter-clone.c:345
+#: ../clutter/clutter-bind-constraint.c:358 ../clutter/clutter-clone.c:341
 #: ../clutter/clutter-snap-constraint.c:321
 msgid "Source"
 msgstr "Zdroj"
@@ -732,11 +733,11 @@ msgstr "Faktor"
 msgid "The alignment factor, between 0.0 and 1.0"
 msgstr "Faktor zarovnání, v rozmezí 0,0 a 1,0"
 
-#: ../clutter/clutter-backend.c:379
+#: ../clutter/clutter-backend.c:380
 msgid "Unable to initialize the Clutter backend"
 msgstr "Nelze inicializovat výkonné jádro Clutter"
 
-#: ../clutter/clutter-backend.c:453
+#: ../clutter/clutter-backend.c:454
 #, c-format
 msgid "The backend of type '%s' does not support creating multiple stages"
 msgstr "Výkonné jádro typu „%s“ nepodporuje tvorbu více scén"
@@ -767,45 +768,49 @@ msgstr "Posun v pixelech, který se má použít k omezení"
 msgid "The unique name of the binding pool"
 msgstr "Jedinečný název skupiny klávesových zkratek"
 
-#: ../clutter/clutter-bin-layout.c:240 ../clutter/clutter-bin-layout.c:655
-#: ../clutter/clutter-box-layout.c:390 ../clutter/clutter-table-layout.c:610
+#: ../clutter/clutter-bin-layout.c:238 ../clutter/clutter-bin-layout.c:651
+#: ../clutter/clutter-box-layout.c:388
+#: ../clutter/deprecated/clutter-table-layout.c:610
 msgid "Horizontal Alignment"
 msgstr "Vodorovné zarovnání"
 
-#: ../clutter/clutter-bin-layout.c:241
+#: ../clutter/clutter-bin-layout.c:239
 msgid "Horizontal alignment for the actor inside the layout manager"
 msgstr "Vodorovné zarovnání pro účastníka uvnitř správce rozvržení"
 
-#: ../clutter/clutter-bin-layout.c:249 ../clutter/clutter-bin-layout.c:675
-#: ../clutter/clutter-box-layout.c:399 ../clutter/clutter-table-layout.c:625
+#: ../clutter/clutter-bin-layout.c:247 ../clutter/clutter-bin-layout.c:671
+#: ../clutter/clutter-box-layout.c:397
+#: ../clutter/deprecated/clutter-table-layout.c:625
 msgid "Vertical Alignment"
 msgstr "Svislé zarovnání"
 
-#: ../clutter/clutter-bin-layout.c:250
+#: ../clutter/clutter-bin-layout.c:248
 msgid "Vertical alignment for the actor inside the layout manager"
 msgstr "Svislé zarovnání pro účastníka uvnitř správce rozvržení"
 
-#: ../clutter/clutter-bin-layout.c:656
+#: ../clutter/clutter-bin-layout.c:652
 msgid "Default horizontal alignment for the actors inside the layout manager"
 msgstr "Výchozí vodorovné zarovnání pro účastníka uvnitř správce rozvržení"
 
-#: ../clutter/clutter-bin-layout.c:676
+#: ../clutter/clutter-bin-layout.c:672
 msgid "Default vertical alignment for the actors inside the layout manager"
 msgstr "Výchozí svislé zarovnání pro účastníka uvnitř správce rozvržení"
 
-#: ../clutter/clutter-box-layout.c:365
+#: ../clutter/clutter-box-layout.c:363
 msgid "Expand"
 msgstr "Roztáhnout"
 
-#: ../clutter/clutter-box-layout.c:366
+#: ../clutter/clutter-box-layout.c:364
 msgid "Allocate extra space for the child"
 msgstr "Vymezit místo navíc pro potomky"
 
-#: ../clutter/clutter-box-layout.c:372 ../clutter/clutter-table-layout.c:589
+#: ../clutter/clutter-box-layout.c:370
+#: ../clutter/deprecated/clutter-table-layout.c:589
 msgid "Horizontal Fill"
 msgstr "Vodorovné vyplnění"
 
-#: ../clutter/clutter-box-layout.c:373 ../clutter/clutter-table-layout.c:590
+#: ../clutter/clutter-box-layout.c:371
+#: ../clutter/deprecated/clutter-table-layout.c:590
 msgid ""
 "Whether the child should receive priority when the container is allocating "
 "spare space on the horizontal axis"
@@ -813,11 +818,13 @@ msgstr ""
 "Zda by měl být potomek upřednostněn, když kontejner vymezuje nadbytečné "
 "místo ve směru vodorovné osy"
 
-#: ../clutter/clutter-box-layout.c:381 ../clutter/clutter-table-layout.c:596
+#: ../clutter/clutter-box-layout.c:379
+#: ../clutter/deprecated/clutter-table-layout.c:596
 msgid "Vertical Fill"
 msgstr "Svislé vyplnění"
 
-#: ../clutter/clutter-box-layout.c:382 ../clutter/clutter-table-layout.c:597
+#: ../clutter/clutter-box-layout.c:380
+#: ../clutter/deprecated/clutter-table-layout.c:597
 msgid ""
 "Whether the child should receive priority when the container is allocating "
 "spare space on the vertical axis"
@@ -825,80 +832,88 @@ msgstr ""
 "Zda by měl být potomek upřednostněn, když kontejner vymezuje nadbytečné "
 "místo ve směru svislé osy"
 
-#: ../clutter/clutter-box-layout.c:391 ../clutter/clutter-table-layout.c:611
+#: ../clutter/clutter-box-layout.c:389
+#: ../clutter/deprecated/clutter-table-layout.c:611
 msgid "Horizontal alignment of the actor within the cell"
 msgstr "Vodorovné zarovnání účastníka v rámci buňky"
 
-#: ../clutter/clutter-box-layout.c:400 ../clutter/clutter-table-layout.c:626
+#: ../clutter/clutter-box-layout.c:398
+#: ../clutter/deprecated/clutter-table-layout.c:626
 msgid "Vertical alignment of the actor within the cell"
 msgstr "Svislé zarovnání účastníka v rámci buňky"
 
-#: ../clutter/clutter-box-layout.c:1365
+#: ../clutter/clutter-box-layout.c:1359
 msgid "Vertical"
 msgstr "Svisle"
 
-#: ../clutter/clutter-box-layout.c:1366
+#: ../clutter/clutter-box-layout.c:1360
 msgid "Whether the layout should be vertical, rather than horizontal"
 msgstr "Zda by rozvržení mělo být raději svisle než vodorovně"
 
-#: ../clutter/clutter-box-layout.c:1383 ../clutter/clutter-flow-layout.c:890
-#: ../clutter/clutter-grid-layout.c:1550
+#: ../clutter/clutter-box-layout.c:1377 ../clutter/clutter-flow-layout.c:942
+#: ../clutter/clutter-grid-layout.c:1549
 msgid "Orientation"
 msgstr "Natočení"
 
-#: ../clutter/clutter-box-layout.c:1384 ../clutter/clutter-flow-layout.c:891
-#: ../clutter/clutter-grid-layout.c:1551
+#: ../clutter/clutter-box-layout.c:1378 ../clutter/clutter-flow-layout.c:943
+#: ../clutter/clutter-grid-layout.c:1550
 msgid "The orientation of the layout"
 msgstr "Natočení rozvržení"
 
-#: ../clutter/clutter-box-layout.c:1400 ../clutter/clutter-flow-layout.c:906
+#: ../clutter/clutter-box-layout.c:1394 ../clutter/clutter-flow-layout.c:958
 msgid "Homogeneous"
 msgstr "Homogenní"
 
-#: ../clutter/clutter-box-layout.c:1401
+#: ../clutter/clutter-box-layout.c:1395
 msgid ""
 "Whether the layout should be homogeneous, i.e. all childs get the same size"
 msgstr ""
 "Zda by rozvržení mělo být homogenní, tj. aby všichni potomci měli stejnou "
 "velikost"
 
-#: ../clutter/clutter-box-layout.c:1416
+#: ../clutter/clutter-box-layout.c:1410
 msgid "Pack Start"
 msgstr "Začátek balení"
 
-#: ../clutter/clutter-box-layout.c:1417
+#: ../clutter/clutter-box-layout.c:1411
 msgid "Whether to pack items at the start of the box"
 msgstr "Zda balit položky při spuštění boxu"
 
-#: ../clutter/clutter-box-layout.c:1430
+#: ../clutter/clutter-box-layout.c:1424
 msgid "Spacing"
 msgstr "Rozestupy"
 
-#: ../clutter/clutter-box-layout.c:1431
+#: ../clutter/clutter-box-layout.c:1425
 msgid "Spacing between children"
 msgstr "Rozestupy mezi potomky"
 
-#: ../clutter/clutter-box-layout.c:1448 ../clutter/clutter-table-layout.c:1675
+#: ../clutter/clutter-box-layout.c:1442
+#: ../clutter/deprecated/clutter-table-layout.c:1677
 msgid "Use Animations"
 msgstr "Použít animace"
 
-#: ../clutter/clutter-box-layout.c:1449 ../clutter/clutter-table-layout.c:1676
+#: ../clutter/clutter-box-layout.c:1443
+#: ../clutter/deprecated/clutter-table-layout.c:1678
 msgid "Whether layout changes should be animated"
 msgstr "Zda mají být změny rozložení animovány"
 
-#: ../clutter/clutter-box-layout.c:1473 ../clutter/clutter-table-layout.c:1700
+#: ../clutter/clutter-box-layout.c:1467
+#: ../clutter/deprecated/clutter-table-layout.c:1702
 msgid "Easing Mode"
 msgstr "Zjednodušující režim"
 
-#: ../clutter/clutter-box-layout.c:1474 ../clutter/clutter-table-layout.c:1701
+#: ../clutter/clutter-box-layout.c:1468
+#: ../clutter/deprecated/clutter-table-layout.c:1703
 msgid "The easing mode of the animations"
 msgstr "Zjednodušující režim animace"
 
-#: ../clutter/clutter-box-layout.c:1494 ../clutter/clutter-table-layout.c:1721
+#: ../clutter/clutter-box-layout.c:1488
+#: ../clutter/deprecated/clutter-table-layout.c:1723
 msgid "Easing Duration"
 msgstr "Doba trvání zjednodušené"
 
-#: ../clutter/clutter-box-layout.c:1495 ../clutter/clutter-table-layout.c:1722
+#: ../clutter/clutter-box-layout.c:1489
+#: ../clutter/deprecated/clutter-table-layout.c:1724
 msgid "The duration of the animations"
 msgstr "Doba trvání animace"
 
@@ -918,14 +933,30 @@ msgstr "Kontrast"
 msgid "The contrast change to apply"
 msgstr "Změna kontrastu, která se má použít"
 
-#: ../clutter/clutter-canvas.c:216
+#: ../clutter/clutter-canvas.c:248
 msgid "The width of the canvas"
 msgstr "Šířka plátna"
 
-#: ../clutter/clutter-canvas.c:232
+#: ../clutter/clutter-canvas.c:264
 msgid "The height of the canvas"
 msgstr "Výška plátna"
 
+#: ../clutter/clutter-canvas.c:283
+msgid "Scale Factor Set"
+msgstr "Faktor škálování nastaven"
+
+#: ../clutter/clutter-canvas.c:284
+msgid "Whether the scale-factor property is set"
+msgstr "Zda je nastavena vlastnost scale-factor"
+
+#: ../clutter/clutter-canvas.c:305
+msgid "Scale Factor"
+msgstr "Faktor škálování"
+
+#: ../clutter/clutter-canvas.c:306
+msgid "The scaling factor for the surface"
+msgstr "Faktor škálování pro plochu"
+
 #: ../clutter/clutter-child-meta.c:127
 msgid "Container"
 msgstr "Kontejner"
@@ -938,39 +969,39 @@ msgstr "Kontejner, který vytvořil tato data"
 msgid "The actor wrapped by this data"
 msgstr "Účastník zabalený do těchto dat"
 
-#: ../clutter/clutter-click-action.c:559
+#: ../clutter/clutter-click-action.c:586
 msgid "Pressed"
 msgstr "Zmáčknuto"
 
-#: ../clutter/clutter-click-action.c:560
+#: ../clutter/clutter-click-action.c:587
 msgid "Whether the clickable should be in pressed state"
 msgstr "Zda má být klikatelný objekt ve zmáčknutém stavu"
 
-#: ../clutter/clutter-click-action.c:573
+#: ../clutter/clutter-click-action.c:600
 msgid "Held"
 msgstr "Držení"
 
-#: ../clutter/clutter-click-action.c:574
+#: ../clutter/clutter-click-action.c:601
 msgid "Whether the clickable has a grab"
 msgstr "Zda má klikatelný objekt místu k uchopení"
 
-#: ../clutter/clutter-click-action.c:591 ../clutter/clutter-settings.c:599
+#: ../clutter/clutter-click-action.c:618 ../clutter/clutter-settings.c:653
 msgid "Long Press Duration"
 msgstr "Doba dlouhého zmáčknutí"
 
-#: ../clutter/clutter-click-action.c:592
+#: ../clutter/clutter-click-action.c:619
 msgid "The minimum duration of a long press to recognize the gesture"
 msgstr "Minimální doba trvání dlouhého zmáčknutí, aby bylo rozpoznáno gesto"
 
-#: ../clutter/clutter-click-action.c:610
+#: ../clutter/clutter-click-action.c:637
 msgid "Long Press Threshold"
 msgstr "Práh dlouhého zmáčknutí"
 
-#: ../clutter/clutter-click-action.c:611
+#: ../clutter/clutter-click-action.c:638
 msgid "The maximum threshold before a long press is cancelled"
 msgstr "Maximální práh před tím, než je dlouhé zmáčknutí zrušeno"
 
-#: ../clutter/clutter-clone.c:346
+#: ../clutter/clutter-clone.c:342
 msgid "Specifies the actor to be cloned"
 msgstr "Určuje účastníka, který má být naklonován"
 
@@ -982,27 +1013,27 @@ msgstr "Odstín"
 msgid "The tint to apply"
 msgstr "Barevný odstín, který se má použít"
 
-#: ../clutter/clutter-deform-effect.c:588
+#: ../clutter/clutter-deform-effect.c:592
 msgid "Horizontal Tiles"
 msgstr "Dlaždic vodorovně"
 
-#: ../clutter/clutter-deform-effect.c:589
+#: ../clutter/clutter-deform-effect.c:593
 msgid "The number of horizontal tiles"
 msgstr "Počet dlaždic ve vodorovném směru"
 
-#: ../clutter/clutter-deform-effect.c:604
+#: ../clutter/clutter-deform-effect.c:608
 msgid "Vertical Tiles"
 msgstr "Dlaždic svisle"
 
-#: ../clutter/clutter-deform-effect.c:605
+#: ../clutter/clutter-deform-effect.c:609
 msgid "The number of vertical tiles"
 msgstr "Počet dlaždic ve svislém směru"
 
-#: ../clutter/clutter-deform-effect.c:622
+#: ../clutter/clutter-deform-effect.c:626
 msgid "Back Material"
 msgstr "Materiál pozadí"
 
-#: ../clutter/clutter-deform-effect.c:623
+#: ../clutter/clutter-deform-effect.c:627
 msgid "The material to be used when painting the back of the actor"
 msgstr "Materiál, který se má použít při vykreslování pozadí účastníka"
 
@@ -1010,260 +1041,298 @@ msgstr "Materiál, který se má použít při vykreslování pozadí účastní
 msgid "The desaturation factor"
 msgstr "Faktor snížení sytosti"
 
-#: ../clutter/clutter-device-manager.c:131
-#: ../clutter/clutter-input-device.c:366
+#: ../clutter/clutter-device-manager.c:127
+#: ../clutter/clutter-input-device.c:355
 #: ../clutter/x11/clutter-keymap-x11.c:321
 msgid "Backend"
 msgstr "Výkonné jádro"
 
-#: ../clutter/clutter-device-manager.c:132
+#: ../clutter/clutter-device-manager.c:128
 msgid "The ClutterBackend of the device manager"
 msgstr "Jádro ClutterBackend správce zařízení"
 
-#: ../clutter/clutter-drag-action.c:742
+#: ../clutter/clutter-drag-action.c:741
 msgid "Horizontal Drag Threshold"
 msgstr "Vodorovný práh tažení"
 
-#: ../clutter/clutter-drag-action.c:743
+#: ../clutter/clutter-drag-action.c:742
 msgid "The horizontal amount of pixels required to start dragging"
 msgstr ""
 "Počet pixelů ve vodorovném směru, nutný k tomu, aby započala funkce tažení"
 
-#: ../clutter/clutter-drag-action.c:770
+#: ../clutter/clutter-drag-action.c:769
 msgid "Vertical Drag Threshold"
 msgstr "Svislý práh tažení"
 
-#: ../clutter/clutter-drag-action.c:771
+#: ../clutter/clutter-drag-action.c:770
 msgid "The vertical amount of pixels required to start dragging"
 msgstr ""
 "Počet pixelů ve svislém směru, nutný k tomu, aby započala funkce tažení"
 
-#: ../clutter/clutter-drag-action.c:792
+#: ../clutter/clutter-drag-action.c:791
 msgid "Drag Handle"
 msgstr "Tažen"
 
-#: ../clutter/clutter-drag-action.c:793
+#: ../clutter/clutter-drag-action.c:792
 msgid "The actor that is being dragged"
 msgstr "Účastník, který je tažen"
 
-#: ../clutter/clutter-drag-action.c:806
+#: ../clutter/clutter-drag-action.c:805
 msgid "Drag Axis"
 msgstr "Osa tažení"
 
-#: ../clutter/clutter-drag-action.c:807
+#: ../clutter/clutter-drag-action.c:806
 msgid "Constraints the dragging to an axis"
 msgstr "Omezení tažení na některou z os"
 
-#: ../clutter/clutter-drag-action.c:823
+#: ../clutter/clutter-drag-action.c:822
 msgid "Drag Area"
 msgstr "Oblast tažení"
 
-#: ../clutter/clutter-drag-action.c:824
+#: ../clutter/clutter-drag-action.c:823
 msgid "Constrains the dragging to a rectangle"
 msgstr "Omezení tažení na obdélníkovou oblast"
 
-#: ../clutter/clutter-drag-action.c:837
+#: ../clutter/clutter-drag-action.c:836
 msgid "Drag Area Set"
 msgstr "Oblast tažení nastavena"
 
-#: ../clutter/clutter-drag-action.c:838
+#: ../clutter/clutter-drag-action.c:837
 msgid "Whether the drag area is set"
 msgstr "Zda je oblast tažení nastavena"
 
-#: ../clutter/clutter-flow-layout.c:907
+#: ../clutter/clutter-flow-layout.c:959
 msgid "Whether each item should receive the same allocation"
 msgstr "Zda by každá položka měla zabírat stejné místo"
 
-#: ../clutter/clutter-flow-layout.c:922 ../clutter/clutter-table-layout.c:1637
+#: ../clutter/clutter-flow-layout.c:974
+#: ../clutter/deprecated/clutter-table-layout.c:1637
 msgid "Column Spacing"
 msgstr "Rozestupy sloupců"
 
-#: ../clutter/clutter-flow-layout.c:923
+#: ../clutter/clutter-flow-layout.c:975
 msgid "The spacing between columns"
 msgstr "Rozestupy mezi sloupci"
 
-#: ../clutter/clutter-flow-layout.c:939 ../clutter/clutter-table-layout.c:1651
+#: ../clutter/clutter-flow-layout.c:991
+#: ../clutter/deprecated/clutter-table-layout.c:1653
 msgid "Row Spacing"
 msgstr "Rozestupy řádků"
 
-#: ../clutter/clutter-flow-layout.c:940
+#: ../clutter/clutter-flow-layout.c:992
 msgid "The spacing between rows"
 msgstr "Rozestupy mezi řádky"
 
-#: ../clutter/clutter-flow-layout.c:954
+#: ../clutter/clutter-flow-layout.c:1006
 msgid "Minimum Column Width"
 msgstr "Minimální šířka sloupce"
 
-#: ../clutter/clutter-flow-layout.c:955
+#: ../clutter/clutter-flow-layout.c:1007
 msgid "Minimum width for each column"
 msgstr "Minimální šířka každého ze sloupců"
 
-#: ../clutter/clutter-flow-layout.c:970
+#: ../clutter/clutter-flow-layout.c:1022
 msgid "Maximum Column Width"
 msgstr "Maximální šířka sloupce"
 
-#: ../clutter/clutter-flow-layout.c:971
+#: ../clutter/clutter-flow-layout.c:1023
 msgid "Maximum width for each column"
 msgstr "Maximální šířka každého ze sloupců"
 
-#: ../clutter/clutter-flow-layout.c:985
+#: ../clutter/clutter-flow-layout.c:1037
 msgid "Minimum Row Height"
 msgstr "Minimální výška řádku"
 
-#: ../clutter/clutter-flow-layout.c:986
+#: ../clutter/clutter-flow-layout.c:1038
 msgid "Minimum height for each row"
 msgstr "Minimální výška každého z řádků"
 
-#: ../clutter/clutter-flow-layout.c:1001
+#: ../clutter/clutter-flow-layout.c:1053
 msgid "Maximum Row Height"
 msgstr "Maximální výška řádku"
 
-#: ../clutter/clutter-flow-layout.c:1002
+#: ../clutter/clutter-flow-layout.c:1054
 msgid "Maximum height for each row"
 msgstr "Maximální výška každého z řádků"
 
-#: ../clutter/clutter-grid-layout.c:1222
+#: ../clutter/clutter-flow-layout.c:1069 ../clutter/clutter-flow-layout.c:1070
+msgid "Snap to grid"
+msgstr "Přichytávat k mřížce"
+
+#: ../clutter/clutter-gesture-action.c:668
+msgid "Number touch points"
+msgstr "Počet dotykových bodů"
+
+#: ../clutter/clutter-gesture-action.c:669
+msgid "Number of touch points"
+msgstr "Počet dotykových bodů"
+
+#: ../clutter/clutter-gesture-action.c:684
+msgid "Threshold Trigger Edge"
+msgstr "Práh hranice spouštěče"
+
+#: ../clutter/clutter-gesture-action.c:685
+msgid "The trigger edge used by the action"
+msgstr "Hranice spouštěče použitého touto akcí"
+
+#: ../clutter/clutter-gesture-action.c:704
+msgid "Threshold Trigger Horizontal Distance"
+msgstr "Vodorovná vzdálenost prahu spouštěče"
+
+#: ../clutter/clutter-gesture-action.c:705
+msgid "The horizontal trigger distance used by the action"
+msgstr "Vodorovná vzdálenost prahu spouštěče použitého touto akcí"
+
+#: ../clutter/clutter-gesture-action.c:723
+msgid "Threshold Trigger Vertical Distance"
+msgstr "Svislá vzdálenost prahu spouštěče"
+
+#: ../clutter/clutter-gesture-action.c:724
+msgid "The vertical trigger distance used by the action"
+msgstr "Svislá vzdálenost prahu spouštěče použitého touto akcí"
+
+#: ../clutter/clutter-grid-layout.c:1223
 msgid "Left attachment"
 msgstr "Připojeno zleva"
 
-#: ../clutter/clutter-grid-layout.c:1223
+#: ../clutter/clutter-grid-layout.c:1224
 msgid "The column number to attach the left side of the child to"
 msgstr "Počet sloupců, které se připojí k potomku z levé strany"
 
-#: ../clutter/clutter-grid-layout.c:1230
+#: ../clutter/clutter-grid-layout.c:1231
 msgid "Top attachment"
 msgstr "Připojeno zhora"
 
-#: ../clutter/clutter-grid-layout.c:1231
+#: ../clutter/clutter-grid-layout.c:1232
 msgid "The row number to attach the top side of a child widget to"
 msgstr "Počet řádků, které se připojí k potomku z horní strany"
 
-#: ../clutter/clutter-grid-layout.c:1239
+#: ../clutter/clutter-grid-layout.c:1240
 msgid "The number of columns that a child spans"
 msgstr "Počet sloupců, které potomek překlenuje"
 
-#: ../clutter/clutter-grid-layout.c:1246
+#: ../clutter/clutter-grid-layout.c:1247
 msgid "The number of rows that a child spans"
 msgstr "Počet řádků, které potomek překlenuje"
 
-#: ../clutter/clutter-grid-layout.c:1565
+#: ../clutter/clutter-grid-layout.c:1564
 msgid "Row spacing"
 msgstr "Rozestupy řádků"
 
-#: ../clutter/clutter-grid-layout.c:1566
+#: ../clutter/clutter-grid-layout.c:1565
 msgid "The amount of space between two consecutive rows"
 msgstr "Rozestup mezi dvěma řádky nad sebou"
 
-#: ../clutter/clutter-grid-layout.c:1579
+#: ../clutter/clutter-grid-layout.c:1578
 msgid "Column spacing"
 msgstr "Rozestupy sloupců"
 
-#: ../clutter/clutter-grid-layout.c:1580
+#: ../clutter/clutter-grid-layout.c:1579
 msgid "The amount of space between two consecutive columns"
 msgstr "Rozestup mezi dvěma sloupci vedle sebe"
 
-#: ../clutter/clutter-grid-layout.c:1594
+#: ../clutter/clutter-grid-layout.c:1593
 msgid "Row Homogeneous"
 msgstr "Homogenní řádky"
 
-#: ../clutter/clutter-grid-layout.c:1595
+#: ../clutter/clutter-grid-layout.c:1594
 msgid "If TRUE, the rows are all the same height"
 msgstr "Když je PRAVDA, řádky mají stejnou výšku"
 
-#: ../clutter/clutter-grid-layout.c:1608
+#: ../clutter/clutter-grid-layout.c:1607
 msgid "Column Homogeneous"
 msgstr "Homogenní sloupce"
 
-#: ../clutter/clutter-grid-layout.c:1609
+#: ../clutter/clutter-grid-layout.c:1608
 msgid "If TRUE, the columns are all the same width"
 msgstr "Když je PRAVDA, slupce mají stejnou šířku"
 
-#: ../clutter/clutter-image.c:248 ../clutter/clutter-image.c:311
-#: ../clutter/clutter-image.c:399
+#: ../clutter/clutter-image.c:249 ../clutter/clutter-image.c:312
+#: ../clutter/clutter-image.c:400
 msgid "Unable to load image data"
 msgstr "Nelze načíst data obrázku"
 
-#: ../clutter/clutter-input-device.c:242
+#: ../clutter/clutter-input-device.c:231
 msgid "Id"
 msgstr "Id"
 
-#: ../clutter/clutter-input-device.c:243
+#: ../clutter/clutter-input-device.c:232
 msgid "Unique identifier of the device"
 msgstr "Jedinečný identifikátor zařízení"
 
-#: ../clutter/clutter-input-device.c:259
+#: ../clutter/clutter-input-device.c:248
 msgid "The name of the device"
 msgstr "Název zařízení"
 
-#: ../clutter/clutter-input-device.c:273
+#: ../clutter/clutter-input-device.c:262
 msgid "Device Type"
 msgstr "Typ zařízení"
 
-#: ../clutter/clutter-input-device.c:274
+#: ../clutter/clutter-input-device.c:263
 msgid "The type of the device"
 msgstr "Typ zařízení"
 
-#: ../clutter/clutter-input-device.c:289
+#: ../clutter/clutter-input-device.c:278
 msgid "Device Manager"
 msgstr "Správce zařízení"
 
-#: ../clutter/clutter-input-device.c:290
+#: ../clutter/clutter-input-device.c:279
 msgid "The device manager instance"
 msgstr "Instance správce zařízení"
 
-#: ../clutter/clutter-input-device.c:303
+#: ../clutter/clutter-input-device.c:292
 msgid "Device Mode"
 msgstr "Režim zařízení"
 
-#: ../clutter/clutter-input-device.c:304
+#: ../clutter/clutter-input-device.c:293
 msgid "The mode of the device"
 msgstr "Režim zařízení"
 
-#: ../clutter/clutter-input-device.c:318
+#: ../clutter/clutter-input-device.c:307
 msgid "Has Cursor"
 msgstr "Má kurzor"
 
-#: ../clutter/clutter-input-device.c:319
+#: ../clutter/clutter-input-device.c:308
 msgid "Whether the device has a cursor"
 msgstr "Zda má zařízení kurzor"
 
-#: ../clutter/clutter-input-device.c:338
+#: ../clutter/clutter-input-device.c:327
 msgid "Whether the device is enabled"
 msgstr "Zda je zařízení povolené"
 
-#: ../clutter/clutter-input-device.c:351
+#: ../clutter/clutter-input-device.c:340
 msgid "Number of Axes"
 msgstr "Počet os"
 
-#: ../clutter/clutter-input-device.c:352
+#: ../clutter/clutter-input-device.c:341
 msgid "The number of axes on the device"
 msgstr "Počet os v zařízení"
 
-#: ../clutter/clutter-input-device.c:367
+#: ../clutter/clutter-input-device.c:356
 msgid "The backend instance"
 msgstr "Instance výkonného jádra"
 
-#: ../clutter/clutter-interval.c:506
+#: ../clutter/clutter-interval.c:553
 msgid "Value Type"
 msgstr "Typ hodnoty"
 
-#: ../clutter/clutter-interval.c:507
+#: ../clutter/clutter-interval.c:554
 msgid "The type of the values in the interval"
 msgstr "Typ hodnoty v intervalu"
 
-#: ../clutter/clutter-interval.c:522
+#: ../clutter/clutter-interval.c:569
 msgid "Initial Value"
 msgstr "Počáteční hodnota"
 
-#: ../clutter/clutter-interval.c:523
+#: ../clutter/clutter-interval.c:570
 msgid "Initial value of the interval"
 msgstr "Počáteční hodnota intervalu"
 
-#: ../clutter/clutter-interval.c:537
+#: ../clutter/clutter-interval.c:584
 msgid "Final Value"
 msgstr "Koncová hodnota"
 
-#: ../clutter/clutter-interval.c:538
+#: ../clutter/clutter-interval.c:585
 msgid "Final value of the interval"
 msgstr "Koncová hodnota intervalu"
 
@@ -1282,96 +1351,96 @@ msgstr "Správce, který vytvořil tato data"
 #. * Do NOT translate it to non-English e.g. "predefinito:LTR"! If
 #. * it isn't default:LTR or default:RTL it will not work.
 #.
-#: ../clutter/clutter-main.c:772
+#: ../clutter/clutter-main.c:795
 msgid "default:LTR"
 msgstr "default:LTR"
 
-#: ../clutter/clutter-main.c:1646
+#: ../clutter/clutter-main.c:1622
 msgid "Show frames per second"
 msgstr "Zobrazit počet snímků za sekundu"
 
-#: ../clutter/clutter-main.c:1648
+#: ../clutter/clutter-main.c:1624
 msgid "Default frame rate"
 msgstr "Výchozí snímková rychlost"
 
-#: ../clutter/clutter-main.c:1650
+#: ../clutter/clutter-main.c:1626
 msgid "Make all warnings fatal"
 msgstr "Učinit všechna varování jako kritická"
 
-#: ../clutter/clutter-main.c:1653
+#: ../clutter/clutter-main.c:1629
 msgid "Direction for the text"
 msgstr "Směr textu"
 
-#: ../clutter/clutter-main.c:1656
+#: ../clutter/clutter-main.c:1632
 msgid "Disable mipmapping on text"
 msgstr "Vypnout mipmapping u textů"
 
-#: ../clutter/clutter-main.c:1659
+#: ../clutter/clutter-main.c:1635
 msgid "Use 'fuzzy' picking"
 msgstr "Použít přibližné („fuzzy“) vybírání"
 
-#: ../clutter/clutter-main.c:1662
+#: ../clutter/clutter-main.c:1638
 msgid "Clutter debugging flags to set"
 msgstr "Příznaky ladění pro Clutter, které se mají zapnout"
 
-#: ../clutter/clutter-main.c:1664
+#: ../clutter/clutter-main.c:1640
 msgid "Clutter debugging flags to unset"
 msgstr "Příznaky ladění pro Clutter, které se mají vypnout"
 
-#: ../clutter/clutter-main.c:1668
+#: ../clutter/clutter-main.c:1644
 msgid "Clutter profiling flags to set"
 msgstr "Příznaky profilování pro Clutter, které se mají zapnout"
 
-#: ../clutter/clutter-main.c:1670
+#: ../clutter/clutter-main.c:1646
 msgid "Clutter profiling flags to unset"
 msgstr "Příznaky profilování pro Clutter, které se mají vypnout"
 
-#: ../clutter/clutter-main.c:1673
+#: ../clutter/clutter-main.c:1649
 msgid "Enable accessibility"
 msgstr "Zapnout zpřístupnění"
 
-#: ../clutter/clutter-main.c:1865
+#: ../clutter/clutter-main.c:1841
 msgid "Clutter Options"
 msgstr "Volby Clutter"
 
-#: ../clutter/clutter-main.c:1866
+#: ../clutter/clutter-main.c:1842
 msgid "Show Clutter Options"
 msgstr "Zobrazit volby Clutter"
 
-#: ../clutter/clutter-pan-action.c:448
+#: ../clutter/clutter-pan-action.c:455
 msgid "Pan Axis"
 msgstr "Osa tažení"
 
-#: ../clutter/clutter-pan-action.c:449
+#: ../clutter/clutter-pan-action.c:456
 msgid "Constraints the panning to an axis"
 msgstr "Omezení tažení na některou z os"
 
-#: ../clutter/clutter-pan-action.c:463
+#: ../clutter/clutter-pan-action.c:470
 msgid "Interpolate"
 msgstr "Interpolovat"
 
-#: ../clutter/clutter-pan-action.c:464
+#: ../clutter/clutter-pan-action.c:471
 msgid "Whether interpolated events emission is enabled."
 msgstr "Zda je povoleno šíření událostí interpolace"
 
-#: ../clutter/clutter-pan-action.c:480
+#: ../clutter/clutter-pan-action.c:487
 msgid "Deceleration"
 msgstr "Zpomalení"
 
-#: ../clutter/clutter-pan-action.c:481
+#: ../clutter/clutter-pan-action.c:488
 msgid "Rate at which the interpolated panning will decelerate in"
 msgstr "Rychlost, při které interpolovaný posun začne zpomalovat"
 
-#: ../clutter/clutter-pan-action.c:498
+#: ../clutter/clutter-pan-action.c:505
 msgid "Initial acceleration factor"
 msgstr "Počáteční faktor zvýšení rychlosti"
 
-#: ../clutter/clutter-pan-action.c:499
+#: ../clutter/clutter-pan-action.c:506
 msgid "Factor applied to the momentum when starting the interpolated phase"
 msgstr "Faktor použitý na rychlost ve chvíli, kdy začne fáze interpolace"
 
 #: ../clutter/clutter-path-constraint.c:212
-#: ../clutter/deprecated/clutter-behaviour-path.c:225
+#: ../clutter/deprecated/clutter-behaviour-path.c:221
 msgid "Path"
 msgstr "Cesta"
 
@@ -1383,86 +1452,86 @@ msgstr "Cesta použitá k omezení účastníka"
 msgid "The offset along the path, between -1.0 and 2.0"
 msgstr "Posunutí v rámci cesty, v rozmezí -1,0 a 2,0"
 
-#: ../clutter/clutter-property-transition.c:271
+#: ../clutter/clutter-property-transition.c:269
 msgid "Property Name"
 msgstr "Název vlastnosti"
 
-#: ../clutter/clutter-property-transition.c:272
+#: ../clutter/clutter-property-transition.c:270
 msgid "The name of the property to animate"
 msgstr "Název vlastnosti, která se má animovat"
 
-#: ../clutter/clutter-script.c:466
+#: ../clutter/clutter-script.c:464
 msgid "Filename Set"
 msgstr "Název souboru nastaven"
 
-#: ../clutter/clutter-script.c:467
+#: ../clutter/clutter-script.c:465
 msgid "Whether the :filename property is set"
 msgstr "Zda je nastavena vlastnost :filename"
 
-#: ../clutter/clutter-script.c:481
-#: ../clutter/deprecated/clutter-texture.c:1082
+#: ../clutter/clutter-script.c:479
+#: ../clutter/deprecated/clutter-texture.c:1080
 msgid "Filename"
 msgstr "Název souboru"
 
-#: ../clutter/clutter-script.c:482
+#: ../clutter/clutter-script.c:480
 msgid "The path of the currently parsed file"
 msgstr "Cesta k právě zpracovávanému souboru"
 
-#: ../clutter/clutter-script.c:499
+#: ../clutter/clutter-script.c:497
 msgid "Translation Domain"
 msgstr "Doména překladu"
 
-#: ../clutter/clutter-script.c:500
+#: ../clutter/clutter-script.c:498
 msgid "The translation domain used to localize string"
 msgstr "Doména překladu, která se má použít k lokalizaci textů"
 
-#: ../clutter/clutter-scroll-actor.c:263
+#: ../clutter/clutter-scroll-actor.c:189
 msgid "Scroll Mode"
 msgstr "Režim posouvání"
 
-#: ../clutter/clutter-scroll-actor.c:264
+#: ../clutter/clutter-scroll-actor.c:190
 msgid "The scrolling direction"
 msgstr "Směr posouvání"
 
-#: ../clutter/clutter-settings.c:440
+#: ../clutter/clutter-settings.c:486
 msgid "Double Click Time"
 msgstr "Čas dvojitého kliknutí"
 
-#: ../clutter/clutter-settings.c:441
+#: ../clutter/clutter-settings.c:487
 msgid "The time between clicks necessary to detect a multiple click"
 msgstr "Čas mezi dvěma kliknutími nutný k rozpoznání vícenásobného kliknutí"
 
-#: ../clutter/clutter-settings.c:456
+#: ../clutter/clutter-settings.c:502
 msgid "Double Click Distance"
 msgstr "Vzdálenost dvojitého kliknutí"
 
-#: ../clutter/clutter-settings.c:457
+#: ../clutter/clutter-settings.c:503
 msgid "The distance between clicks necessary to detect a multiple click"
 msgstr ""
 "Vzdálenost mezi dvěma kliknutími nutná k rozpoznání vícenásobného kliknutí"
 
-#: ../clutter/clutter-settings.c:472
+#: ../clutter/clutter-settings.c:518
 msgid "Drag Threshold"
 msgstr "Práh tažení"
 
-#: ../clutter/clutter-settings.c:473
+#: ../clutter/clutter-settings.c:519
 msgid "The distance the cursor should travel before starting to drag"
 msgstr "Vzdálenost, kterou musí kurzor urazit, než je započata funkce tažení"
 
-#: ../clutter/clutter-settings.c:488 ../clutter/clutter-text.c:3367
+#: ../clutter/clutter-settings.c:534 ../clutter/clutter-text.c:3404
 msgid "Font Name"
 msgstr "Název písma"
 
-#: ../clutter/clutter-settings.c:489
+#: ../clutter/clutter-settings.c:535
 msgid ""
 "The description of the default font, as one that could be parsed by Pango"
 msgstr "Popis výchozího písma, které by mohlo být zpracováno systémem Pango"
 
-#: ../clutter/clutter-settings.c:504
+#: ../clutter/clutter-settings.c:550
 msgid "Font Antialias"
 msgstr "Vyhlazování písma"
 
-#: ../clutter/clutter-settings.c:505
+#: ../clutter/clutter-settings.c:551
 msgid ""
 "Whether to use antialiasing (1 to enable, 0 to disable, and -1 to use the "
 "default)"
@@ -1470,75 +1539,83 @@ msgstr ""
 "Zda používat vyhlazování (1 pro zapnutí, 0 pro vypnutí a -1 pro použití "
 "výchozího nastavení)"
 
-#: ../clutter/clutter-settings.c:521
+#: ../clutter/clutter-settings.c:567 ../clutter/clutter-settings.c:575
 msgid "Font DPI"
 msgstr "DPI písma"
 
-#: ../clutter/clutter-settings.c:522
+#: ../clutter/clutter-settings.c:568 ../clutter/clutter-settings.c:576
 msgid ""
 "The resolution of the font, in 1024 * dots/inch, or -1 to use the default"
 msgstr ""
 "Rozlišení písma v 1024násobcích bodů na palec nebo -1 pro použití výchozího "
 "nastavení"
 
-#: ../clutter/clutter-settings.c:538
+#: ../clutter/clutter-settings.c:592
 msgid "Font Hinting"
 msgstr "Hinting písma"
 
-#: ../clutter/clutter-settings.c:539
+#: ../clutter/clutter-settings.c:593
 msgid ""
 "Whether to use hinting (1 to enable, 0 to disable and -1 to use the default)"
 msgstr ""
 "Zda se má použít hinting (1 zapnut, 0 vypnut a -1 pro použití výchozího "
 "nastavení)"
 
-#: ../clutter/clutter-settings.c:560
+#: ../clutter/clutter-settings.c:614
 msgid "Font Hint Style"
 msgstr "Styl hintingu písma"
 
-#: ../clutter/clutter-settings.c:561
+#: ../clutter/clutter-settings.c:615
 msgid "The style of hinting (hintnone, hintslight, hintmedium, hintfull)"
 msgstr ""
 "Styl hintingu (hintnone – žádný, hintslight – lehký, hintmedium – střední, "
 "hintfull – plný)"
 
-#: ../clutter/clutter-settings.c:582
+#: ../clutter/clutter-settings.c:636
 msgid "Font Subpixel Order"
 msgstr "Pořadí subpixelů písma"
 
-#: ../clutter/clutter-settings.c:583
+#: ../clutter/clutter-settings.c:637
 msgid "The type of subpixel antialiasing (none, rgb, bgr, vrgb, vbgr)"
 msgstr ""
 "Typ vyhlazování subpixelů (none – žádný, rgb – červená vlevo, bgr – modrá "
 "vlevo, vrgb – červená nahoře, vbgr – modrá nahoře)"
 
-#: ../clutter/clutter-settings.c:600
+#: ../clutter/clutter-settings.c:654
 msgid "The minimum duration for a long press gesture to be recognized"
 msgstr ""
 "Minimální doba trvání pro gesto dlouhého zmáčknutí, aby bylo rozpoznáno"
 
-#: ../clutter/clutter-settings.c:607
+#: ../clutter/clutter-settings.c:661
+msgid "Window Scaling Factor"
+msgstr "Faktor škálování oken"
+
+#: ../clutter/clutter-settings.c:662
+msgid "The scaling factor to be applied to windows"
+msgstr "Faktor škálování, který se má použít u oken"
+
+#: ../clutter/clutter-settings.c:669
 msgid "Fontconfig configuration timestamp"
 msgstr "Časové razítko nastavení fontconfig"
 
-#: ../clutter/clutter-settings.c:608
+#: ../clutter/clutter-settings.c:670
 msgid "Timestamp of the current fontconfig configuration"
 msgstr "Časové razítko aktuálního nastavení fontconfig"
 
-#: ../clutter/clutter-settings.c:625
+#: ../clutter/clutter-settings.c:687
 msgid "Password Hint Time"
 msgstr "Prodleva skrytí hesla"
 
-#: ../clutter/clutter-settings.c:626
+#: ../clutter/clutter-settings.c:688
 msgid "How long to show the last input character in hidden entries"
 msgstr ""
 "Jak dlouho zobrazovat poslední vložený znak ve skrývaných vstupních polích"
 
-#: ../clutter/clutter-shader-effect.c:486
+#: ../clutter/clutter-shader-effect.c:485
 msgid "Shader Type"
 msgstr "Typ shaderu"
 
-#: ../clutter/clutter-shader-effect.c:487
+#: ../clutter/clutter-shader-effect.c:486
 msgid "The type of shader used"
 msgstr "Typ použitého shaderu"
 
@@ -1566,759 +1643,703 @@ msgstr "Hrana účastníka, která by se měla přichytávat"
 msgid "The offset in pixels to apply to the constraint"
 msgstr "Posun v pixelech, při kterém se má použít omezení"
 
-#: ../clutter/clutter-stage.c:1921
+#: ../clutter/clutter-stage.c:1899
 msgid "Fullscreen Set"
 msgstr "Nastavena celá obrazovka"
 
-#: ../clutter/clutter-stage.c:1922
+#: ../clutter/clutter-stage.c:1900
 msgid "Whether the main stage is fullscreen"
 msgstr "Zda je hlavní scéna v režimu celé obrazovky"
 
-#: ../clutter/clutter-stage.c:1936
+#: ../clutter/clutter-stage.c:1914
 msgid "Offscreen"
 msgstr "V paměti"
 
-#: ../clutter/clutter-stage.c:1937
+#: ../clutter/clutter-stage.c:1915
 msgid "Whether the main stage should be rendered offscreen"
 msgstr "Zda by měla být hlavní scéna vykreslována v paměti bez zobrazení"
 
-#: ../clutter/clutter-stage.c:1949 ../clutter/clutter-text.c:3481
+#: ../clutter/clutter-stage.c:1927 ../clutter/clutter-text.c:3518
 msgid "Cursor Visible"
 msgstr "Kurzor viditelný"
 
-#: ../clutter/clutter-stage.c:1950
+#: ../clutter/clutter-stage.c:1928
 msgid "Whether the mouse pointer is visible on the main stage"
 msgstr "Zda je ukazatel myši viditelný na hlavní scéně"
 
-#: ../clutter/clutter-stage.c:1964
+#: ../clutter/clutter-stage.c:1942
 msgid "User Resizable"
 msgstr "Uživatelsky měnitelná velikost"
 
-#: ../clutter/clutter-stage.c:1965
+#: ../clutter/clutter-stage.c:1943
 msgid "Whether the stage is able to be resized via user interaction"
 msgstr "Zda uživatel může interaktivně měnit velikost scény"
 
-#: ../clutter/clutter-stage.c:1980 ../clutter/deprecated/clutter-box.c:260
-#: ../clutter/deprecated/clutter-rectangle.c:273
+#: ../clutter/clutter-stage.c:1958 ../clutter/deprecated/clutter-box.c:256
+#: ../clutter/deprecated/clutter-rectangle.c:270
 msgid "Color"
 msgstr "Barva"
 
-#: ../clutter/clutter-stage.c:1981
+#: ../clutter/clutter-stage.c:1959
 msgid "The color of the stage"
 msgstr "Barva scény"
 
-#: ../clutter/clutter-stage.c:1996
+#: ../clutter/clutter-stage.c:1974
 msgid "Perspective"
 msgstr "Perspektiva"
 
-#: ../clutter/clutter-stage.c:1997
+#: ../clutter/clutter-stage.c:1975
 msgid "Perspective projection parameters"
 msgstr "Parametry perspektivní projekce"
 
-#: ../clutter/clutter-stage.c:2012
+#: ../clutter/clutter-stage.c:1990
 msgid "Title"
 msgstr "Název"
 
-#: ../clutter/clutter-stage.c:2013
+#: ../clutter/clutter-stage.c:1991
 msgid "Stage Title"
 msgstr "Název scény"
 
-#: ../clutter/clutter-stage.c:2030
+#: ../clutter/clutter-stage.c:2008
 msgid "Use Fog"
 msgstr "Použít zamlžení"
 
-#: ../clutter/clutter-stage.c:2031
+#: ../clutter/clutter-stage.c:2009
 msgid "Whether to enable depth cueing"
 msgstr "Zda zapnout zvýraznění hloubky"
 
-#: ../clutter/clutter-stage.c:2047
+#: ../clutter/clutter-stage.c:2025
 msgid "Fog"
 msgstr "Zamlžení"
 
-#: ../clutter/clutter-stage.c:2048
+#: ../clutter/clutter-stage.c:2026
 msgid "Settings for the depth cueing"
 msgstr "Nastavení pro zvýraznění hloubky"
 
-#: ../clutter/clutter-stage.c:2064
+#: ../clutter/clutter-stage.c:2042
 msgid "Use Alpha"
 msgstr "Použít alfu"
 
-#: ../clutter/clutter-stage.c:2065
+#: ../clutter/clutter-stage.c:2043
 msgid "Whether to honour the alpha component of the stage color"
 msgstr "Zda se řídit komponentou alfa z barvy scény"
 
-#: ../clutter/clutter-stage.c:2081
+#: ../clutter/clutter-stage.c:2059
 msgid "Key Focus"
 msgstr "Hlavní zaměření"
 
-#: ../clutter/clutter-stage.c:2082
+#: ../clutter/clutter-stage.c:2060
 msgid "The currently key focused actor"
 msgstr "Aktuálně hlavní zaměřený účastník"
 
-#: ../clutter/clutter-stage.c:2098
+#: ../clutter/clutter-stage.c:2076
 msgid "No Clear Hint"
 msgstr "Nemazat bez pokynu"
 
-#: ../clutter/clutter-stage.c:2099
+#: ../clutter/clutter-stage.c:2077
 msgid "Whether the stage should clear its contents"
 msgstr "Zda by scéna měla vymazat svůj obsah"
 
-#: ../clutter/clutter-stage.c:2112
+#: ../clutter/clutter-stage.c:2090
 msgid "Accept Focus"
 msgstr "Přijímat zaměření"
 
-#: ../clutter/clutter-stage.c:2113
+#: ../clutter/clutter-stage.c:2091
 msgid "Whether the stage should accept focus on show"
 msgstr "Zda by měla scéna při zobrazení přijímat zaměření"
 
-#: ../clutter/clutter-table-layout.c:543
-msgid "Column Number"
-msgstr "Číslo sloupce"
-
-#: ../clutter/clutter-table-layout.c:544
-msgid "The column the widget resides in"
-msgstr "Sloupec, ve kterém je widget umístěn"
-
-#: ../clutter/clutter-table-layout.c:551
-msgid "Row Number"
-msgstr "Číslo řádku"
-
-#: ../clutter/clutter-table-layout.c:552
-msgid "The row the widget resides in"
-msgstr "Řádek, ve kterém je widget umístěn"
-
-#: ../clutter/clutter-table-layout.c:559
-msgid "Column Span"
-msgstr "Překlenutí sloupců"
-
-#: ../clutter/clutter-table-layout.c:560
-msgid "The number of columns the widget should span"
-msgstr "Počet sloupců, které widget překlenuje"
-
-#: ../clutter/clutter-table-layout.c:567
-msgid "Row Span"
-msgstr "Překlenutí řádků"
-
-#: ../clutter/clutter-table-layout.c:568
-msgid "The number of rows the widget should span"
-msgstr "Počet řádků, které widget překlenuje"
-
-#: ../clutter/clutter-table-layout.c:575
-msgid "Horizontal Expand"
-msgstr "Vodorovné roztažení"
-
-#: ../clutter/clutter-table-layout.c:576
-msgid "Allocate extra space for the child in horizontal axis"
-msgstr "Vymezit místo navíc pro potomky ve vodorovné ose"
-
-#: ../clutter/clutter-table-layout.c:582
-msgid "Vertical Expand"
-msgstr "Svislé roztažení"
-
-#: ../clutter/clutter-table-layout.c:583
-msgid "Allocate extra space for the child in vertical axis"
-msgstr "Vymezit místo navíc pro potomky ve svislé ose"
-
-#: ../clutter/clutter-table-layout.c:1638
-msgid "Spacing between columns"
-msgstr "Mezery mezi sloupci"
-
-#: ../clutter/clutter-table-layout.c:1652
-msgid "Spacing between rows"
-msgstr "Mezery mezi řádky"
-
-#: ../clutter/clutter-text-buffer.c:351 ../clutter/clutter-text.c:3402
+#: ../clutter/clutter-text-buffer.c:347 ../clutter/clutter-text.c:3439
 msgid "Text"
 msgstr "Text"
 
-#: ../clutter/clutter-text-buffer.c:352
+#: ../clutter/clutter-text-buffer.c:348
 msgid "The contents of the buffer"
 msgstr "Obsah vyrovnávací paměti"
 
-#: ../clutter/clutter-text-buffer.c:365
+#: ../clutter/clutter-text-buffer.c:361
 msgid "Text length"
 msgstr "Délka textu"
 
-#: ../clutter/clutter-text-buffer.c:366
+#: ../clutter/clutter-text-buffer.c:362
 msgid "Length of the text currently in the buffer"
 msgstr "Délka textu, který je právě ve vyrovnávací paměti"
 
-#: ../clutter/clutter-text-buffer.c:379
+#: ../clutter/clutter-text-buffer.c:375
 msgid "Maximum length"
 msgstr "Maximální délka"
 
-#: ../clutter/clutter-text-buffer.c:380
+#: ../clutter/clutter-text-buffer.c:376
 msgid "Maximum number of characters for this entry. Zero if no maximum"
 msgstr ""
 "Nejvyšší dovolený počet znaků v tomto vstupním poli. Nula znamená neomezeno"
 
-#: ../clutter/clutter-text.c:3349
+#: ../clutter/clutter-text.c:3386
 msgid "Buffer"
 msgstr "Vyrovnávací paměť"
 
-#: ../clutter/clutter-text.c:3350
+#: ../clutter/clutter-text.c:3387
 msgid "The buffer for the text"
 msgstr "Vyrovnávací paměť pro text"
 
-#: ../clutter/clutter-text.c:3368
+#: ../clutter/clutter-text.c:3405
 msgid "The font to be used by the text"
 msgstr "Písmo použité textem"
 
-#: ../clutter/clutter-text.c:3385
+#: ../clutter/clutter-text.c:3422
 msgid "Font Description"
 msgstr "Popis písma"
 
-#: ../clutter/clutter-text.c:3386
+#: ../clutter/clutter-text.c:3423
 msgid "The font description to be used"
 msgstr "Popis písma, které se má použít"
 
-#: ../clutter/clutter-text.c:3403
+#: ../clutter/clutter-text.c:3440
 msgid "The text to render"
 msgstr "Text, který se má vykreslit"
 
-#: ../clutter/clutter-text.c:3417
+#: ../clutter/clutter-text.c:3454
 msgid "Font Color"
 msgstr "Barva písma"
 
-#: ../clutter/clutter-text.c:3418
+#: ../clutter/clutter-text.c:3455
 msgid "Color of the font used by the text"
 msgstr "Barva písma použitá textem"
 
-#: ../clutter/clutter-text.c:3433
+#: ../clutter/clutter-text.c:3470
 msgid "Editable"
 msgstr "Upravitelný"
 
-#: ../clutter/clutter-text.c:3434
+#: ../clutter/clutter-text.c:3471
 msgid "Whether the text is editable"
 msgstr "Zda je text možné upravovat"
 
-#: ../clutter/clutter-text.c:3449
+#: ../clutter/clutter-text.c:3486
 msgid "Selectable"
 msgstr "Vybratelný"
 
-#: ../clutter/clutter-text.c:3450
+#: ../clutter/clutter-text.c:3487
 msgid "Whether the text is selectable"
 msgstr "Zda je text možné vybírat"
 
-#: ../clutter/clutter-text.c:3464
+#: ../clutter/clutter-text.c:3501
 msgid "Activatable"
 msgstr "Aktivovatelný"
 
-#: ../clutter/clutter-text.c:3465
+#: ../clutter/clutter-text.c:3502
 msgid "Whether pressing return causes the activate signal to be emitted"
 msgstr "Zda zmáčknutí klávesy Enter způsobí vyslání signálu o aktivaci"
 
-#: ../clutter/clutter-text.c:3482
+#: ../clutter/clutter-text.c:3519
 msgid "Whether the input cursor is visible"
 msgstr "Zda je viditelný kurzor vstupu"
 
-#: ../clutter/clutter-text.c:3496 ../clutter/clutter-text.c:3497
+#: ../clutter/clutter-text.c:3533 ../clutter/clutter-text.c:3534
 msgid "Cursor Color"
 msgstr "Barva kurzoru"
 
-#: ../clutter/clutter-text.c:3512
+#: ../clutter/clutter-text.c:3549
 msgid "Cursor Color Set"
 msgstr "Barva kurzoru nastavena"
 
-#: ../clutter/clutter-text.c:3513
+#: ../clutter/clutter-text.c:3550
 msgid "Whether the cursor color has been set"
 msgstr "Zda byla nastavena barva kurzoru"
 
-#: ../clutter/clutter-text.c:3528
+#: ../clutter/clutter-text.c:3565
 msgid "Cursor Size"
 msgstr "Velikost kurzoru"
 
-#: ../clutter/clutter-text.c:3529
+#: ../clutter/clutter-text.c:3566
 msgid "The width of the cursor, in pixels"
 msgstr "Šířka kurzoru v pixelech"
 
-#: ../clutter/clutter-text.c:3545 ../clutter/clutter-text.c:3563
+#: ../clutter/clutter-text.c:3582 ../clutter/clutter-text.c:3600
 msgid "Cursor Position"
 msgstr "Poloha kurzoru"
 
-#: ../clutter/clutter-text.c:3546 ../clutter/clutter-text.c:3564
+#: ../clutter/clutter-text.c:3583 ../clutter/clutter-text.c:3601
 msgid "The cursor position"
 msgstr "Poloha kurzoru"
 
-#: ../clutter/clutter-text.c:3579
+#: ../clutter/clutter-text.c:3616
 msgid "Selection-bound"
 msgstr "Hranice výběru"
 
-#: ../clutter/clutter-text.c:3580
+#: ../clutter/clutter-text.c:3617
 msgid "The cursor position of the other end of the selection"
 msgstr "Poloha kurzoru druhého konce výběru"
 
-#: ../clutter/clutter-text.c:3595 ../clutter/clutter-text.c:3596
+#: ../clutter/clutter-text.c:3632 ../clutter/clutter-text.c:3633
 msgid "Selection Color"
 msgstr "Barva výběru"
 
-#: ../clutter/clutter-text.c:3611
+#: ../clutter/clutter-text.c:3648
 msgid "Selection Color Set"
 msgstr "Barva výběru nastavena"
 
-#: ../clutter/clutter-text.c:3612
+#: ../clutter/clutter-text.c:3649
 msgid "Whether the selection color has been set"
 msgstr "Zda byla nastavena barva výběru"
 
-#: ../clutter/clutter-text.c:3627
+#: ../clutter/clutter-text.c:3664
 msgid "Attributes"
 msgstr "Atributy"
 
-#: ../clutter/clutter-text.c:3628
+#: ../clutter/clutter-text.c:3665
 msgid "A list of style attributes to apply to the contents of the actor"
 msgstr "Seznam atributů stylu, které se použijí na obsah účastníka"
 
-#: ../clutter/clutter-text.c:3650
+#: ../clutter/clutter-text.c:3687
 msgid "Use markup"
 msgstr "Použít značku"
 
-#: ../clutter/clutter-text.c:3651
+#: ../clutter/clutter-text.c:3688
 msgid "Whether or not the text includes Pango markup"
 msgstr "Zda text zahrnuje či nezahrnuje značku Pango"
 
-#: ../clutter/clutter-text.c:3667
+#: ../clutter/clutter-text.c:3704
 msgid "Line wrap"
 msgstr "Zalamování řádků"
 
-#: ../clutter/clutter-text.c:3668
+#: ../clutter/clutter-text.c:3705
 msgid "If set, wrap the lines if the text becomes too wide"
 msgstr "Když je nastaveno, bude se příliš dlouhý text zalamovat"
 
-#: ../clutter/clutter-text.c:3683
+#: ../clutter/clutter-text.c:3720
 msgid "Line wrap mode"
 msgstr "Režim zalamování řádků"
 
-#: ../clutter/clutter-text.c:3684
+#: ../clutter/clutter-text.c:3721
 msgid "Control how line-wrapping is done"
 msgstr "Ovládá, jak je prováděno zalamování řádků"
 
-#: ../clutter/clutter-text.c:3699
+#: ../clutter/clutter-text.c:3736
 msgid "Ellipsize"
 msgstr "Zkrácení"
 
-#: ../clutter/clutter-text.c:3700
+#: ../clutter/clutter-text.c:3737
 msgid "The preferred place to ellipsize the string"
 msgstr "Upřednostňované místo pro zkrácení řetězce"
 
-#: ../clutter/clutter-text.c:3716
+#: ../clutter/clutter-text.c:3753
 msgid "Line Alignment"
 msgstr "Zarovnání řádku"
 
-#: ../clutter/clutter-text.c:3717
+#: ../clutter/clutter-text.c:3754
 msgid "The preferred alignment for the string, for multi-line text"
 msgstr "Upřednostňované zarovnání pro text a víceřádkový text"
 
-#: ../clutter/clutter-text.c:3733
+#: ../clutter/clutter-text.c:3770
 msgid "Justify"
 msgstr "Zarovnat do bloku"
 
-#: ../clutter/clutter-text.c:3734
+#: ../clutter/clutter-text.c:3771
 msgid "Whether the text should be justified"
 msgstr "Zda by měl být text zarovnán do bloku"
 
-#: ../clutter/clutter-text.c:3749
+#: ../clutter/clutter-text.c:3786
 msgid "Password Character"
 msgstr "Znak hesla"
 
-#: ../clutter/clutter-text.c:3750
+#: ../clutter/clutter-text.c:3787
 msgid "If non-zero, use this character to display the actor's contents"
 msgstr "Pokud je nenulový, použije se tento znak k zobrazení obsahu účastníka"
 
-#: ../clutter/clutter-text.c:3764
+#: ../clutter/clutter-text.c:3801
 msgid "Max Length"
 msgstr "Max. délka"
 
-#: ../clutter/clutter-text.c:3765
+#: ../clutter/clutter-text.c:3802
 msgid "Maximum length of the text inside the actor"
 msgstr "Maximální délka textu uvnitř účastníka"
 
-#: ../clutter/clutter-text.c:3788
+#: ../clutter/clutter-text.c:3825
 msgid "Single Line Mode"
 msgstr "Jednořádkový režim"
 
-#: ../clutter/clutter-text.c:3789
+#: ../clutter/clutter-text.c:3826
 msgid "Whether the text should be a single line"
 msgstr "Zda by měl být text jednořádkový"
 
-#: ../clutter/clutter-text.c:3803 ../clutter/clutter-text.c:3804
+#: ../clutter/clutter-text.c:3840 ../clutter/clutter-text.c:3841
 msgid "Selected Text Color"
 msgstr "Barva vybraného textu"
 
-#: ../clutter/clutter-text.c:3819
+#: ../clutter/clutter-text.c:3856
 msgid "Selected Text Color Set"
 msgstr "Barva vybraného textu nastavena"
 
-#: ../clutter/clutter-text.c:3820
+#: ../clutter/clutter-text.c:3857
 msgid "Whether the selected text color has been set"
 msgstr "Zda byla nastavena barva vybraného textu"
 
-#: ../clutter/clutter-timeline.c:561
-#: ../clutter/deprecated/clutter-animation.c:560
+#: ../clutter/clutter-timeline.c:593
+#: ../clutter/deprecated/clutter-animation.c:557
 msgid "Loop"
 msgstr "Smyčka"
 
-#: ../clutter/clutter-timeline.c:562
+#: ../clutter/clutter-timeline.c:594
 msgid "Should the timeline automatically restart"
 msgstr "Zda by se měla časová osa automaticky spouštět znovu"
 
-#: ../clutter/clutter-timeline.c:576
+#: ../clutter/clutter-timeline.c:608
 msgid "Delay"
 msgstr "Prodleva"
 
-#: ../clutter/clutter-timeline.c:577
+#: ../clutter/clutter-timeline.c:609
 msgid "Delay before start"
 msgstr "Prodleva před startem"
 
-#: ../clutter/clutter-timeline.c:592
-#: ../clutter/deprecated/clutter-animation.c:544
-#: ../clutter/deprecated/clutter-animator.c:1804
+#: ../clutter/clutter-timeline.c:624
+#: ../clutter/deprecated/clutter-animation.c:541
+#: ../clutter/deprecated/clutter-animator.c:1801
 #: ../clutter/deprecated/clutter-media.c:224
-#: ../clutter/deprecated/clutter-state.c:1523
+#: ../clutter/deprecated/clutter-state.c:1517
 msgid "Duration"
 msgstr "Doba"
 
-#: ../clutter/clutter-timeline.c:593
+#: ../clutter/clutter-timeline.c:625
 msgid "Duration of the timeline in milliseconds"
 msgstr "Délka časové osy v milisekundách"
 
-#: ../clutter/clutter-timeline.c:608
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:528
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:337
+#: ../clutter/clutter-timeline.c:640
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:521
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:330
 msgid "Direction"
 msgstr "Směr"
 
-#: ../clutter/clutter-timeline.c:609
+#: ../clutter/clutter-timeline.c:641
 msgid "Direction of the timeline"
 msgstr "Směr časové osy"
 
-#: ../clutter/clutter-timeline.c:624
+#: ../clutter/clutter-timeline.c:656
 msgid "Auto Reverse"
 msgstr "Automaticky obrátit"
 
-#: ../clutter/clutter-timeline.c:625
+#: ../clutter/clutter-timeline.c:657
 msgid "Whether the direction should be reversed when reaching the end"
 msgstr "Zda by se měl automaticky obrátit směr po dosažení konce"
 
-#: ../clutter/clutter-timeline.c:643
+#: ../clutter/clutter-timeline.c:675
 msgid "Repeat Count"
 msgstr "Počet opakování"
 
-#: ../clutter/clutter-timeline.c:644
+#: ../clutter/clutter-timeline.c:676
 msgid "How many times the timeline should repeat"
 msgstr "Kolikrát by se měla časová osa zopakovat"
 
-#: ../clutter/clutter-timeline.c:658
+#: ../clutter/clutter-timeline.c:690
 msgid "Progress Mode"
 msgstr "Režim průběhu"
 
-#: ../clutter/clutter-timeline.c:659
+#: ../clutter/clutter-timeline.c:691
 msgid "How the timeline should compute the progress"
 msgstr "Jak by měla časová osa počítat průběh"
 
-#: ../clutter/clutter-transition.c:246
+#: ../clutter/clutter-transition.c:244
 msgid "Interval"
 msgstr "Interval"
 
-#: ../clutter/clutter-transition.c:247
+#: ../clutter/clutter-transition.c:245
 msgid "The interval of values to transition"
 msgstr "Rozsah hodnot pro přechod"
 
-#: ../clutter/clutter-transition.c:261
+#: ../clutter/clutter-transition.c:259
 msgid "Animatable"
 msgstr "Animovatelný"
 
-#: ../clutter/clutter-transition.c:262
+#: ../clutter/clutter-transition.c:260
 msgid "The animatable object"
 msgstr "Animovatelný objekt"
 
-#: ../clutter/clutter-transition.c:283
+#: ../clutter/clutter-transition.c:281
 msgid "Remove on Complete"
 msgstr "Odebrat po dokončení"
 
-#: ../clutter/clutter-transition.c:284
+#: ../clutter/clutter-transition.c:282
 msgid "Detach the transition when completed"
 msgstr "Po dokončení přechod odpojit"
 
-#: ../clutter/clutter-zoom-action.c:354
+#: ../clutter/clutter-zoom-action.c:365
 msgid "Zoom Axis"
 msgstr "Přiblížení v osách"
 
-#: ../clutter/clutter-zoom-action.c:355
+#: ../clutter/clutter-zoom-action.c:366
 msgid "Constraints the zoom to an axis"
 msgstr "Omezení přiblížení na některou z os"
 
-#: ../clutter/deprecated/clutter-alpha.c:355
-#: ../clutter/deprecated/clutter-animation.c:575
-#: ../clutter/deprecated/clutter-animator.c:1821
+#: ../clutter/deprecated/clutter-alpha.c:354
+#: ../clutter/deprecated/clutter-animation.c:572
+#: ../clutter/deprecated/clutter-animator.c:1818
 msgid "Timeline"
 msgstr "Časová osa"
 
-#: ../clutter/deprecated/clutter-alpha.c:356
+#: ../clutter/deprecated/clutter-alpha.c:355
 msgid "Timeline used by the alpha"
 msgstr "Časová osa použitá alfou"
 
-#: ../clutter/deprecated/clutter-alpha.c:372
+#: ../clutter/deprecated/clutter-alpha.c:371
 msgid "Alpha value"
 msgstr "Hodnota alfa"
 
-#: ../clutter/deprecated/clutter-alpha.c:373
+#: ../clutter/deprecated/clutter-alpha.c:372
 msgid "Alpha value as computed by the alpha"
 msgstr "Hodnota alfa je počítána podle alfa"
 
-#: ../clutter/deprecated/clutter-alpha.c:394
-#: ../clutter/deprecated/clutter-animation.c:528
+#: ../clutter/deprecated/clutter-alpha.c:393
+#: ../clutter/deprecated/clutter-animation.c:525
 msgid "Mode"
 msgstr "Režim"
 
-#: ../clutter/deprecated/clutter-alpha.c:395
+#: ../clutter/deprecated/clutter-alpha.c:394
 msgid "Progress mode"
 msgstr "Režim průběhu"
 
-#: ../clutter/deprecated/clutter-animation.c:511
+#: ../clutter/deprecated/clutter-animation.c:508
 msgid "Object"
 msgstr "Objekt"
 
-#: ../clutter/deprecated/clutter-animation.c:512
+#: ../clutter/deprecated/clutter-animation.c:509
 msgid "Object to which the animation applies"
 msgstr "Objekt, na který je animace použita"
 
-#: ../clutter/deprecated/clutter-animation.c:529
+#: ../clutter/deprecated/clutter-animation.c:526
 msgid "The mode of the animation"
 msgstr "Režim animace"
 
-#: ../clutter/deprecated/clutter-animation.c:545
+#: ../clutter/deprecated/clutter-animation.c:542
 msgid "Duration of the animation, in milliseconds"
 msgstr "Doba trvání animace v milisekundách"
 
-#: ../clutter/deprecated/clutter-animation.c:561
+#: ../clutter/deprecated/clutter-animation.c:558
 msgid "Whether the animation should loop"
 msgstr "Zda by měla animace běžet ve smyčce"
 
-#: ../clutter/deprecated/clutter-animation.c:576
+#: ../clutter/deprecated/clutter-animation.c:573
 msgid "The timeline used by the animation"
 msgstr "Časová osa použitá animací"
 
-#: ../clutter/deprecated/clutter-animation.c:592
-#: ../clutter/deprecated/clutter-behaviour.c:241
+#: ../clutter/deprecated/clutter-animation.c:589
+#: ../clutter/deprecated/clutter-behaviour.c:237
 msgid "Alpha"
 msgstr "Alpha"
 
-#: ../clutter/deprecated/clutter-animation.c:593
+#: ../clutter/deprecated/clutter-animation.c:590
 msgid "The alpha used by the animation"
 msgstr "Objekt Alpha použitý animací"
 
-#: ../clutter/deprecated/clutter-animator.c:1805
+#: ../clutter/deprecated/clutter-animator.c:1802
 msgid "The duration of the animation"
 msgstr "Doba animace"
 
-#: ../clutter/deprecated/clutter-animator.c:1822
+#: ../clutter/deprecated/clutter-animator.c:1819
 msgid "The timeline of the animation"
 msgstr "Časová osa animace"
 
-#: ../clutter/deprecated/clutter-behaviour.c:242
+#: ../clutter/deprecated/clutter-behaviour.c:238
 msgid "Alpha Object to drive the behaviour"
 msgstr "Objekt Alfa řídící chování"
 
-#: ../clutter/deprecated/clutter-behaviour-depth.c:182
+#: ../clutter/deprecated/clutter-behaviour-depth.c:180
 msgid "Start Depth"
 msgstr "Počáteční hloubka"
 
-#: ../clutter/deprecated/clutter-behaviour-depth.c:183
+#: ../clutter/deprecated/clutter-behaviour-depth.c:181
 msgid "Initial depth to apply"
 msgstr "Hloubka, která se má použít na začátku"
 
-#: ../clutter/deprecated/clutter-behaviour-depth.c:198
+#: ../clutter/deprecated/clutter-behaviour-depth.c:196
 msgid "End Depth"
 msgstr "Konečná hloubka"
 
-#: ../clutter/deprecated/clutter-behaviour-depth.c:199
+#: ../clutter/deprecated/clutter-behaviour-depth.c:197
 msgid "Final depth to apply"
 msgstr "Hloubka, která se má použít na konci"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:401
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:394
 msgid "Start Angle"
 msgstr "Počáteční úhel"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:402
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:284
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:395
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:277
 msgid "Initial angle"
 msgstr "Úhle na začátku"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:417
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:410
 msgid "End Angle"
 msgstr "Konečný úhel"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:418
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:302
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:411
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:295
 msgid "Final angle"
 msgstr "Úhel na konci"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:433
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:426
 msgid "Angle x tilt"
 msgstr "Úhel náklonu X"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:434
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:427
 msgid "Tilt of the ellipse around x axis"
 msgstr "Náklon elipsy okolo osy X"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:449
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:442
 msgid "Angle y tilt"
 msgstr "Úhel náklonu Y"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:450
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:443
 msgid "Tilt of the ellipse around y axis"
 msgstr "Náklon elipsy okolo osy Y"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:465
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:458
 msgid "Angle z tilt"
 msgstr "Úhel náklonu Z"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:466
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:459
 msgid "Tilt of the ellipse around z axis"
 msgstr "Náklon elipsy okolo osy Z"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:482
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:475
 msgid "Width of the ellipse"
 msgstr "Šířka elipsy"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:498
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:491
 msgid "Height of ellipse"
 msgstr "Výška elipsy"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:513
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:506
 msgid "Center"
 msgstr "Střed"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:514
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:507
 msgid "Center of ellipse"
 msgstr "Střed elipsy"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:529
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:338
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:522
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:331
 msgid "Direction of rotation"
 msgstr "Směr otáčení"
 
-#: ../clutter/deprecated/clutter-behaviour-opacity.c:184
+#: ../clutter/deprecated/clutter-behaviour-opacity.c:177
 msgid "Opacity Start"
 msgstr "Počáteční krytí"
 
-#: ../clutter/deprecated/clutter-behaviour-opacity.c:185
+#: ../clutter/deprecated/clutter-behaviour-opacity.c:178
 msgid "Initial opacity level"
 msgstr "Úroveň krytí barev na začátku"
 
-#: ../clutter/deprecated/clutter-behaviour-opacity.c:202
+#: ../clutter/deprecated/clutter-behaviour-opacity.c:195
 msgid "Opacity End"
 msgstr "Konečné krytí"
 
-#: ../clutter/deprecated/clutter-behaviour-opacity.c:203
+#: ../clutter/deprecated/clutter-behaviour-opacity.c:196
 msgid "Final opacity level"
 msgstr "Úroveň krytí barev na konci"
 
-#: ../clutter/deprecated/clutter-behaviour-path.c:226
+#: ../clutter/deprecated/clutter-behaviour-path.c:222
 msgid "The ClutterPath object representing the path to animate along"
 msgstr "Objekt ClutterPath představující cestu, po které probíhá animace"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:283
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:276
 msgid "Angle Begin"
 msgstr "Úhel začátku"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:301
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:294
 msgid "Angle End"
 msgstr "Úhel konce"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:319
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:312
 msgid "Axis"
 msgstr "Osa"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:320
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:313
 msgid "Axis of rotation"
 msgstr "Osa otočení"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:355
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:348
 msgid "Center X"
 msgstr "Střed X"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:356
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:349
 msgid "X coordinate of the center of rotation"
 msgstr "Souřadnice X středu otočení"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:373
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:366
 msgid "Center Y"
 msgstr "Střed Y"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:374
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:367
 msgid "Y coordinate of the center of rotation"
 msgstr "Souřadnice Y středu otočení"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:391
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:384
 msgid "Center Z"
 msgstr "Střed Z"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:392
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:385
 msgid "Z coordinate of the center of rotation"
 msgstr "Souřadnice Z středu otočení"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:226
+#: ../clutter/deprecated/clutter-behaviour-scale.c:222
 msgid "X Start Scale"
 msgstr "Počáteční škálování X"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:227
+#: ../clutter/deprecated/clutter-behaviour-scale.c:223
 msgid "Initial scale on the X axis"
 msgstr "Škálování na ose X na počátku"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:245
+#: ../clutter/deprecated/clutter-behaviour-scale.c:241
 msgid "X End Scale"
 msgstr "Konečné škálování X"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:246
+#: ../clutter/deprecated/clutter-behaviour-scale.c:242
 msgid "Final scale on the X axis"
 msgstr "Škálování na ose X na konci"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:264
+#: ../clutter/deprecated/clutter-behaviour-scale.c:260
 msgid "Y Start Scale"
 msgstr "Počáteční škálování Y"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:265
+#: ../clutter/deprecated/clutter-behaviour-scale.c:261
 msgid "Initial scale on the Y axis"
 msgstr "Škálování na ose Y na počátku"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:283
+#: ../clutter/deprecated/clutter-behaviour-scale.c:279
 msgid "Y End Scale"
 msgstr "Konečné škálování Y"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:284
+#: ../clutter/deprecated/clutter-behaviour-scale.c:280
 msgid "Final scale on the Y axis"
 msgstr "Škálování na ose Y na konci"
 
-#: ../clutter/deprecated/clutter-box.c:261
+#: ../clutter/deprecated/clutter-box.c:257
 msgid "The background color of the box"
 msgstr "Barva pozadí boxu"
 
-#: ../clutter/deprecated/clutter-box.c:274
+#: ../clutter/deprecated/clutter-box.c:270
 msgid "Color Set"
 msgstr "Barva nastavena"
 
-#: ../clutter/deprecated/clutter-cairo-texture.c:597
+#: ../clutter/deprecated/clutter-cairo-texture.c:593
 msgid "Surface Width"
 msgstr "Šířka plochy"
 
-#: ../clutter/deprecated/clutter-cairo-texture.c:598
+#: ../clutter/deprecated/clutter-cairo-texture.c:594
 msgid "The width of the Cairo surface"
 msgstr "Šířka plochy Cairo"
 
-#: ../clutter/deprecated/clutter-cairo-texture.c:615
+#: ../clutter/deprecated/clutter-cairo-texture.c:611
 msgid "Surface Height"
 msgstr "Výška plochy"
 
-#: ../clutter/deprecated/clutter-cairo-texture.c:616
+#: ../clutter/deprecated/clutter-cairo-texture.c:612
 msgid "The height of the Cairo surface"
 msgstr "Výška plochy Cairo"
 
-#: ../clutter/deprecated/clutter-cairo-texture.c:636
+#: ../clutter/deprecated/clutter-cairo-texture.c:632
 msgid "Auto Resize"
 msgstr "Automaticky měnit velikost"
 
-#: ../clutter/deprecated/clutter-cairo-texture.c:637
+#: ../clutter/deprecated/clutter-cairo-texture.c:633
 msgid "Whether the surface should match the allocation"
 msgstr "Zda by se měla plocha přizpůsobit přidělenému místu"
 
@@ -2390,102 +2411,158 @@ msgstr "Úroveň zaplnění vyrovnávací paměti"
 msgid "The duration of the stream, in seconds"
 msgstr "Délka trvání proudu v sekundách"
 
-#: ../clutter/deprecated/clutter-rectangle.c:274
+#: ../clutter/deprecated/clutter-rectangle.c:271
 msgid "The color of the rectangle"
 msgstr "Barva obdélníku"
 
-#: ../clutter/deprecated/clutter-rectangle.c:287
+#: ../clutter/deprecated/clutter-rectangle.c:284
 msgid "Border Color"
 msgstr "Barva ohraničení"
 
-#: ../clutter/deprecated/clutter-rectangle.c:288
+#: ../clutter/deprecated/clutter-rectangle.c:285
 msgid "The color of the border of the rectangle"
 msgstr "Barva obrysu obdélníku"
 
-#: ../clutter/deprecated/clutter-rectangle.c:303
+#: ../clutter/deprecated/clutter-rectangle.c:300
 msgid "Border Width"
 msgstr "Šířka obrysu"
 
-#: ../clutter/deprecated/clutter-rectangle.c:304
+#: ../clutter/deprecated/clutter-rectangle.c:301
 msgid "The width of the border of the rectangle"
 msgstr "Šířka obrysu obdélníku"
 
-#: ../clutter/deprecated/clutter-rectangle.c:318
+#: ../clutter/deprecated/clutter-rectangle.c:315
 msgid "Has Border"
 msgstr "Má obrys"
 
-#: ../clutter/deprecated/clutter-rectangle.c:319
+#: ../clutter/deprecated/clutter-rectangle.c:316
 msgid "Whether the rectangle should have a border"
 msgstr "Zda by měl mít obdélník obrys"
 
-#: ../clutter/deprecated/clutter-shader.c:261
+#: ../clutter/deprecated/clutter-shader.c:257
 msgid "Vertex Source"
 msgstr "Vertexový zdroj"
 
-#: ../clutter/deprecated/clutter-shader.c:262
+#: ../clutter/deprecated/clutter-shader.c:258
 msgid "Source of vertex shader"
 msgstr "Zdroj shaderu typu vertex"
 
-#: ../clutter/deprecated/clutter-shader.c:278
+#: ../clutter/deprecated/clutter-shader.c:274
 msgid "Fragment Source"
 msgstr "Fragmentový zdroj"
 
-#: ../clutter/deprecated/clutter-shader.c:279
+#: ../clutter/deprecated/clutter-shader.c:275
 msgid "Source of fragment shader"
 msgstr "Zdroj shaderu typu fragment"
 
-#: ../clutter/deprecated/clutter-shader.c:296
+#: ../clutter/deprecated/clutter-shader.c:292
 msgid "Compiled"
 msgstr "Přeložen"
 
-#: ../clutter/deprecated/clutter-shader.c:297
+#: ../clutter/deprecated/clutter-shader.c:293
 msgid "Whether the shader is compiled and linked"
 msgstr "Zda je shader přeložen a slinkován"
 
-#: ../clutter/deprecated/clutter-shader.c:314
+#: ../clutter/deprecated/clutter-shader.c:310
 msgid "Whether the shader is enabled"
 msgstr "Zda je shader povolen"
 
-#: ../clutter/deprecated/clutter-shader.c:525
+#: ../clutter/deprecated/clutter-shader.c:521
 #, c-format
 msgid "%s compilation failed: %s"
 msgstr "Kompilace %s selhala: %s"
 
-#: ../clutter/deprecated/clutter-shader.c:526
+#: ../clutter/deprecated/clutter-shader.c:522
 msgid "Vertex shader"
 msgstr "Shader typu vertex"
 
-#: ../clutter/deprecated/clutter-shader.c:527
+#: ../clutter/deprecated/clutter-shader.c:523
 msgid "Fragment shader"
 msgstr "Shader typu fragment"
 
-#: ../clutter/deprecated/clutter-state.c:1505
+#: ../clutter/deprecated/clutter-state.c:1499
 msgid "State"
 msgstr "Stav"
 
-#: ../clutter/deprecated/clutter-state.c:1506
+#: ../clutter/deprecated/clutter-state.c:1500
 msgid "Currently set state, (transition to this state might not be complete)"
 msgstr "Aktuálně nastavený stav (přechod do tohoto stavu nemusí být dokončen)"
 
-#: ../clutter/deprecated/clutter-state.c:1524
+#: ../clutter/deprecated/clutter-state.c:1518
 msgid "Default transition duration"
 msgstr "Výchozí doba přechodu"
 
-#: ../clutter/deprecated/clutter-texture.c:994
+#: ../clutter/deprecated/clutter-table-layout.c:543
+msgid "Column Number"
+msgstr "Číslo sloupce"
+
+#: ../clutter/deprecated/clutter-table-layout.c:544
+msgid "The column the widget resides in"
+msgstr "Sloupec, ve kterém je widget umístěn"
+
+#: ../clutter/deprecated/clutter-table-layout.c:551
+msgid "Row Number"
+msgstr "Číslo řádku"
+
+#: ../clutter/deprecated/clutter-table-layout.c:552
+msgid "The row the widget resides in"
+msgstr "Řádek, ve kterém je widget umístěn"
+
+#: ../clutter/deprecated/clutter-table-layout.c:559
+msgid "Column Span"
+msgstr "Překlenutí sloupců"
+
+#: ../clutter/deprecated/clutter-table-layout.c:560
+msgid "The number of columns the widget should span"
+msgstr "Počet sloupců, které widget překlenuje"
+
+#: ../clutter/deprecated/clutter-table-layout.c:567
+msgid "Row Span"
+msgstr "Překlenutí řádků"
+
+#: ../clutter/deprecated/clutter-table-layout.c:568
+msgid "The number of rows the widget should span"
+msgstr "Počet řádků, které widget překlenuje"
+
+#: ../clutter/deprecated/clutter-table-layout.c:575
+msgid "Horizontal Expand"
+msgstr "Vodorovné roztažení"
+
+#: ../clutter/deprecated/clutter-table-layout.c:576
+msgid "Allocate extra space for the child in horizontal axis"
+msgstr "Vymezit místo navíc pro potomky ve vodorovné ose"
+
+#: ../clutter/deprecated/clutter-table-layout.c:582
+msgid "Vertical Expand"
+msgstr "Svislé roztažení"
+
+#: ../clutter/deprecated/clutter-table-layout.c:583
+msgid "Allocate extra space for the child in vertical axis"
+msgstr "Vymezit místo navíc pro potomky ve svislé ose"
+
+#: ../clutter/deprecated/clutter-table-layout.c:1638
+msgid "Spacing between columns"
+msgstr "Mezery mezi sloupci"
+
+#: ../clutter/deprecated/clutter-table-layout.c:1654
+msgid "Spacing between rows"
+msgstr "Mezery mezi řádky"
+
+#: ../clutter/deprecated/clutter-texture.c:992
 msgid "Sync size of actor"
 msgstr "Synchronizovat velikost účastníka"
 
-#: ../clutter/deprecated/clutter-texture.c:995
+#: ../clutter/deprecated/clutter-texture.c:993
 msgid "Auto sync size of actor to underlying pixbuf dimensions"
 msgstr ""
 "Automaticky synchronizovat velikost účastníka k rozměrům podkladové pixelové "
 "paměti"
 
-#: ../clutter/deprecated/clutter-texture.c:1002
+#: ../clutter/deprecated/clutter-texture.c:1000
 msgid "Disable Slicing"
 msgstr "Zakázat dělení"
 
-#: ../clutter/deprecated/clutter-texture.c:1003
+#: ../clutter/deprecated/clutter-texture.c:1001
 msgid ""
 "Forces the underlying texture to be singular and not made of smaller space "
 "saving individual textures"
@@ -2493,73 +2570,73 @@ msgstr ""
 "Způsobuje, že podkladová textura je v jediném celku a není tvořena z malých "
 "částí s jednotlivými texturami"
 
-#: ../clutter/deprecated/clutter-texture.c:1012
+#: ../clutter/deprecated/clutter-texture.c:1010
 msgid "Tile Waste"
 msgstr "Nevyužitá část dlaždice"
 
-#: ../clutter/deprecated/clutter-texture.c:1013
+#: ../clutter/deprecated/clutter-texture.c:1011
 msgid "Maximum waste area of a sliced texture"
 msgstr "Maximální nevyužitá oblast rozdělené textury"
 
-#: ../clutter/deprecated/clutter-texture.c:1021
+#: ../clutter/deprecated/clutter-texture.c:1019
 msgid "Horizontal repeat"
 msgstr "Opakování vodorovně"
 
-#: ../clutter/deprecated/clutter-texture.c:1022
+#: ../clutter/deprecated/clutter-texture.c:1020
 msgid "Repeat the contents rather than scaling them horizontally"
 msgstr "Obsah vodorovně raději opakovat než roztáhnout"
 
-#: ../clutter/deprecated/clutter-texture.c:1029
+#: ../clutter/deprecated/clutter-texture.c:1027
 msgid "Vertical repeat"
 msgstr "Opakování svisle"
 
-#: ../clutter/deprecated/clutter-texture.c:1030
+#: ../clutter/deprecated/clutter-texture.c:1028
 msgid "Repeat the contents rather than scaling them vertically"
 msgstr "Obsah svisle raději opakovat než roztáhnout"
 
-#: ../clutter/deprecated/clutter-texture.c:1037
+#: ../clutter/deprecated/clutter-texture.c:1035
 msgid "Filter Quality"
 msgstr "Kvalita filtru"
 
-#: ../clutter/deprecated/clutter-texture.c:1038
+#: ../clutter/deprecated/clutter-texture.c:1036
 msgid "Rendering quality used when drawing the texture"
 msgstr "Kvalita vykreslování použitá při kreslení textury"
 
-#: ../clutter/deprecated/clutter-texture.c:1046
+#: ../clutter/deprecated/clutter-texture.c:1044
 msgid "Pixel Format"
 msgstr "Formát obrázku"
 
-#: ../clutter/deprecated/clutter-texture.c:1047
+#: ../clutter/deprecated/clutter-texture.c:1045
 msgid "The Cogl pixel format to use"
 msgstr "Formát obrázku Cogl, který se má použít"
 
-#: ../clutter/deprecated/clutter-texture.c:1055
-#: ../clutter/wayland/clutter-wayland-surface.c:449
+#: ../clutter/deprecated/clutter-texture.c:1053
+#: ../clutter/wayland/clutter-wayland-surface.c:445
 msgid "Cogl Texture"
 msgstr "Textura Cogl"
 
-#: ../clutter/deprecated/clutter-texture.c:1056
-#: ../clutter/wayland/clutter-wayland-surface.c:450
+#: ../clutter/deprecated/clutter-texture.c:1054
+#: ../clutter/wayland/clutter-wayland-surface.c:446
 msgid "The underlying Cogl texture handle used to draw this actor"
 msgstr "Podkladová textura Cogl použitá k vykreslení účastníka"
 
-#: ../clutter/deprecated/clutter-texture.c:1063
+#: ../clutter/deprecated/clutter-texture.c:1061
 msgid "Cogl Material"
 msgstr "Materiál Cogl"
 
-#: ../clutter/deprecated/clutter-texture.c:1064
+#: ../clutter/deprecated/clutter-texture.c:1062
 msgid "The underlying Cogl material handle used to draw this actor"
 msgstr "Podkladový materiál Cogl použitý k vykreslení účastníka"
 
-#: ../clutter/deprecated/clutter-texture.c:1083
+#: ../clutter/deprecated/clutter-texture.c:1081
 msgid "The path of the file containing the image data"
 msgstr "Cesta k souboru obsahujícímu data obrázku"
 
-#: ../clutter/deprecated/clutter-texture.c:1090
+#: ../clutter/deprecated/clutter-texture.c:1088
 msgid "Keep Aspect Ratio"
 msgstr "Zachovat poměr stran"
 
-#: ../clutter/deprecated/clutter-texture.c:1091
+#: ../clutter/deprecated/clutter-texture.c:1089
 msgid ""
 "Keep the aspect ratio of the texture when requesting the preferred width or "
 "height"
@@ -2567,113 +2644,113 @@ msgstr ""
 "Zachovat poměr stran textury, když je požadována přednastavená šířka nebo "
 "výška"
 
-#: ../clutter/deprecated/clutter-texture.c:1119
+#: ../clutter/deprecated/clutter-texture.c:1117
 msgid "Load asynchronously"
 msgstr "Načítat asynchronně"
 
-#: ../clutter/deprecated/clutter-texture.c:1120
+#: ../clutter/deprecated/clutter-texture.c:1118
 msgid ""
 "Load files inside a thread to avoid blocking when loading images from disk"
 msgstr ""
 "Načítat soubory ve zvláštním vlákně, aby se předešlo blokování při načítání "
 "obrázků z disku"
 
-#: ../clutter/deprecated/clutter-texture.c:1138
+#: ../clutter/deprecated/clutter-texture.c:1136
 msgid "Load data asynchronously"
 msgstr "Načítat data asynchronně"
 
-#: ../clutter/deprecated/clutter-texture.c:1139
+#: ../clutter/deprecated/clutter-texture.c:1137
 msgid ""
 "Decode image data files inside a thread to reduce blocking when loading "
 "images from disk"
 msgstr ""
-"Dekódovat soubory s daty obrázků ve zvláštním vlákně, aby se omezilo "
+"Dekódovat soubory s obrazovými daty ve zvláštním vlákně, aby se omezilo "
 "blokování při načítání obrázků z disku"
 
-#: ../clutter/deprecated/clutter-texture.c:1165
+#: ../clutter/deprecated/clutter-texture.c:1163
 msgid "Pick With Alpha"
 msgstr "Výběr s alfou"
 
-#: ../clutter/deprecated/clutter-texture.c:1166
+#: ../clutter/deprecated/clutter-texture.c:1164
 msgid "Shape actor with alpha channel when picking"
 msgstr "Tvar účastníka s alfakanálem při výběru"
 
-#: ../clutter/deprecated/clutter-texture.c:1599
-#: ../clutter/deprecated/clutter-texture.c:1994
-#: ../clutter/deprecated/clutter-texture.c:2090
-#: ../clutter/deprecated/clutter-texture.c:2388
+#: ../clutter/deprecated/clutter-texture.c:1597
+#: ../clutter/deprecated/clutter-texture.c:1992
+#: ../clutter/deprecated/clutter-texture.c:2088
+#: ../clutter/deprecated/clutter-texture.c:2386
 #, c-format
 msgid "Failed to load the image data"
 msgstr "Selhalo načtení dat obrázku"
 
-#: ../clutter/deprecated/clutter-texture.c:1758
+#: ../clutter/deprecated/clutter-texture.c:1756
 #, c-format
 msgid "YUV textures are not supported"
 msgstr "Textury YUV nejsou podporovány"
 
-#: ../clutter/deprecated/clutter-texture.c:1767
+#: ../clutter/deprecated/clutter-texture.c:1765
 #, c-format
 msgid "YUV2 textues are not supported"
 msgstr "Textury YUV2 nejsou podporovány"
 
-#: ../clutter/evdev/clutter-input-device-evdev.c:159
+#: ../clutter/evdev/clutter-input-device-evdev.c:154
 msgid "sysfs Path"
 msgstr "Cesta sysfs"
 
-#: ../clutter/evdev/clutter-input-device-evdev.c:160
+#: ../clutter/evdev/clutter-input-device-evdev.c:155
 msgid "Path of the device in sysfs"
 msgstr "Cesta zařízení v sysfs"
 
-#: ../clutter/evdev/clutter-input-device-evdev.c:175
+#: ../clutter/evdev/clutter-input-device-evdev.c:170
 msgid "Device Path"
 msgstr "Cesta zařízení"
 
-#: ../clutter/evdev/clutter-input-device-evdev.c:176
+#: ../clutter/evdev/clutter-input-device-evdev.c:171
 msgid "Path of the device node"
 msgstr "Cesta uzlu zařízení"
 
-#: ../clutter/gdk/clutter-backend-gdk.c:296
+#: ../clutter/gdk/clutter-backend-gdk.c:289
 #, c-format
 msgid "Could not find a suitable CoglWinsys for a GdkDisplay of type %s"
 msgstr "Nelze najít vyhovující CoglWinsys pro GdkDisplay typu „%s“"
 
-#: ../clutter/wayland/clutter-wayland-surface.c:423
+#: ../clutter/wayland/clutter-wayland-surface.c:419
 msgid "Surface"
 msgstr "Plocha"
 
-#: ../clutter/wayland/clutter-wayland-surface.c:424
+#: ../clutter/wayland/clutter-wayland-surface.c:420
 msgid "The underlying wayland surface"
 msgstr "Podkladová plocha Wayland"
 
-#: ../clutter/wayland/clutter-wayland-surface.c:431
+#: ../clutter/wayland/clutter-wayland-surface.c:427
 msgid "Surface width"
 msgstr "Šířka plochy"
 
-#: ../clutter/wayland/clutter-wayland-surface.c:432
+#: ../clutter/wayland/clutter-wayland-surface.c:428
 msgid "The width of the underlying wayland surface"
 msgstr "Šířka podkladové plochy Wayland"
 
-#: ../clutter/wayland/clutter-wayland-surface.c:440
+#: ../clutter/wayland/clutter-wayland-surface.c:436
 msgid "Surface height"
 msgstr "Výška plochy"
 
-#: ../clutter/wayland/clutter-wayland-surface.c:441
+#: ../clutter/wayland/clutter-wayland-surface.c:437
 msgid "The height of the underlying wayland surface"
 msgstr "Výška podkladové plochy Wayland"
 
-#: ../clutter/x11/clutter-backend-x11.c:516
+#: ../clutter/x11/clutter-backend-x11.c:488
 msgid "X display to use"
 msgstr "Displej X, který se má použít"
 
-#: ../clutter/x11/clutter-backend-x11.c:522
+#: ../clutter/x11/clutter-backend-x11.c:494
 msgid "X screen to use"
 msgstr "Obrazovka X, která se má použít"
 
-#: ../clutter/x11/clutter-backend-x11.c:527
+#: ../clutter/x11/clutter-backend-x11.c:499
 msgid "Make X calls synchronous"
 msgstr "Nastavit volání X jako synchronní"
 
-#: ../clutter/x11/clutter-backend-x11.c:534
+#: ../clutter/x11/clutter-backend-x11.c:506
 msgid "Disable XInput support"
 msgstr "Vypnout podporu XInput"
 
@@ -2681,101 +2758,101 @@ msgstr "Vypnout podporu XInput"
 msgid "The Clutter backend"
 msgstr "Výkonné jádro knihovny Clutter"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:539
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:534
 msgid "Pixmap"
 msgstr "Pixelová mapa"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:540
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:535
 msgid "The X11 Pixmap to be bound"
 msgstr "Pixelová mapa X11, která se má navázat"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:548
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:543
 msgid "Pixmap width"
 msgstr "Šířka pixelové mapy"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:549
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:544
 msgid "The width of the pixmap bound to this texture"
 msgstr "Šířka pixelové mapy svázané s touto texturou"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:557
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:552
 msgid "Pixmap height"
 msgstr "Výška pixelové mapy"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:558
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:553
 msgid "The height of the pixmap bound to this texture"
 msgstr "Výška pixelové mapy svázané s touto texturou"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:566
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:561
 msgid "Pixmap Depth"
 msgstr "Barevná hloubka pixelové mapy"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:567
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:562
 msgid "The depth (in number of bits) of the pixmap bound to this texture"
 msgstr "Barevná hloubka (v počtu bitů) pixelové mapy svázané s touto texturou"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:575
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:570
 msgid "Automatic Updates"
 msgstr "Automaticky aktualizovat"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:576
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:571
 msgid "If the texture should be kept in sync with any pixmap changes."
 msgstr ""
 "Jestli by měla být textura udržována ve shodě se změnami v pixelové mapě"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:584
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:579
 msgid "Window"
 msgstr "Okno"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:585
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:580
 msgid "The X11 Window to be bound"
 msgstr "Okno X11, které má být navázáno"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:593
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:588
 msgid "Window Redirect Automatic"
 msgstr "Automatické přesměrování okna"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:594
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:589
 msgid "If composite window redirects are set to Automatic (or Manual if false)"
 msgstr ""
 "Zda jsou přesměrování kompozitního okna nastavena na Automaticky (nebo na "
 "Ručně při nezapnutí)"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:604
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:599
 msgid "Window Mapped"
 msgstr "Okno mapováno"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:605
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:600
 msgid "If window is mapped"
 msgstr "Zda je okno mapováno"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:614
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:609
 msgid "Destroyed"
 msgstr "Zlikvidováno"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:615
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:610
 msgid "If window has been destroyed"
 msgstr "Zda bylo okno zlikvidováno"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:623
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:618
 msgid "Window X"
 msgstr "Okno X"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:624
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:619
 msgid "X position of window on screen according to X11"
 msgstr "Poloha okna v ose X na obrazovce podle X11"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:632
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:627
 msgid "Window Y"
 msgstr "Okno Y"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:633
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:628
 msgid "Y position of window on screen according to X11"
 msgstr "Poloha okna v ose Y na obrazovce podle X11"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:640
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:635
 msgid "Window Override Redirect"
 msgstr "Potlačit přesměrování u okna"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:641
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:636
 msgid "If this is an override-redirect window"
 msgstr "Zda má okno nastaven příznak override-redirect"
diff --git a/po/da.po b/po/da.po
index 416c3cc20..fa6b35274 100644
--- a/po/da.po
+++ b/po/da.po
@@ -1,10 +1,10 @@
 # Danish translation for clutter-1.0
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# Copyright (c) 2010, 2014 Rosetta Contributors and Canonical Ltd 2010, GNOME developers
 # This file is distributed under the same license as the clutter-1.0 package.
 #
 # Jonas Skovsgaard Christensen
 # Kenneth Nielsen <k.nielsen81@gmail.com>, 2012
-# Ask Hjorth Larsen <asklarsen@gmail.com>, 2011, 12
+# Ask Hjorth Larsen <asklarsen@gmail.com>, 2011, 12, 2014
 #
 # uafklaret:
 # vertex -> vertex
@@ -15,10 +15,10 @@ msgstr ""
 "Project-Id-Version: clutter-1.0\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=clutter\n"
-"POT-Creation-Date: 2013-03-17 14:58+0100\n"
-"PO-Revision-Date: 2013-03-16 17:45+0100\n"
-"Last-Translator: Kenneth Nielsen <k.nielsen81@gmail.com>\n"
-"Language-Team: Danish <da@li.org>\n"
+"POT-Creation-Date: 2014-03-19 22:36+0100\n"
+"PO-Revision-Date: 2014-03-15 14:12+0100\n"
+"Last-Translator: Ask Hjorth Larsen <asklarsen@gmail.com>\n"
+"Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
 "Language: da\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -26,695 +26,695 @@ msgstr ""
 "X-Launchpad-Export-Date: 2011-09-09 09:57+0000\n"
 "X-Generator: Launchpad (build 13900)\n"
 
-#: ../clutter/clutter-actor.c:6175
+#: ../clutter/clutter-actor.c:6224
 msgid "X coordinate"
 msgstr "X-koordinat"
 
-#: ../clutter/clutter-actor.c:6176
+#: ../clutter/clutter-actor.c:6225
 msgid "X coordinate of the actor"
 msgstr "Aktørens X-koordinat"
 
-#: ../clutter/clutter-actor.c:6194
+#: ../clutter/clutter-actor.c:6243
 msgid "Y coordinate"
 msgstr "Y-koordinat"
 
-#: ../clutter/clutter-actor.c:6195
+#: ../clutter/clutter-actor.c:6244
 msgid "Y coordinate of the actor"
 msgstr "Aktørens Y-koordinat"
 
-#: ../clutter/clutter-actor.c:6217
+#: ../clutter/clutter-actor.c:6266
 msgid "Position"
 msgstr "Position"
 
-#: ../clutter/clutter-actor.c:6218
+#: ../clutter/clutter-actor.c:6267
 msgid "The position of the origin of the actor"
 msgstr "Positionen for aktørens ankerpunkt"
 
-#: ../clutter/clutter-actor.c:6235 ../clutter/clutter-canvas.c:215
-#: ../clutter/clutter-grid-layout.c:1238
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:481
+#: ../clutter/clutter-actor.c:6284 ../clutter/clutter-canvas.c:242
+#: ../clutter/clutter-grid-layout.c:1239
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:474
 msgid "Width"
 msgstr "Bredde"
 
-#: ../clutter/clutter-actor.c:6236
+#: ../clutter/clutter-actor.c:6285
 msgid "Width of the actor"
 msgstr "Aktørens bredde"
 
-#: ../clutter/clutter-actor.c:6254 ../clutter/clutter-canvas.c:231
-#: ../clutter/clutter-grid-layout.c:1245
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:497
+#: ../clutter/clutter-actor.c:6303 ../clutter/clutter-canvas.c:258
+#: ../clutter/clutter-grid-layout.c:1246
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:490
 msgid "Height"
 msgstr "Højde"
 
-#: ../clutter/clutter-actor.c:6255
+#: ../clutter/clutter-actor.c:6304
 msgid "Height of the actor"
 msgstr "Aktørens højde"
 
-#: ../clutter/clutter-actor.c:6276
+#: ../clutter/clutter-actor.c:6325
 msgid "Size"
 msgstr "Størrelse"
 
-#: ../clutter/clutter-actor.c:6277
+#: ../clutter/clutter-actor.c:6326
 msgid "The size of the actor"
 msgstr "Aktørens størrelse"
 
-#: ../clutter/clutter-actor.c:6295
+#: ../clutter/clutter-actor.c:6344
 msgid "Fixed X"
 msgstr "Låst X"
 
-#: ../clutter/clutter-actor.c:6296
+#: ../clutter/clutter-actor.c:6345
 msgid "Forced X position of the actor"
 msgstr "Tvungen X-postion for aktøren"
 
-#: ../clutter/clutter-actor.c:6313
+#: ../clutter/clutter-actor.c:6362
 msgid "Fixed Y"
 msgstr "Låst Y"
 
-#: ../clutter/clutter-actor.c:6314
+#: ../clutter/clutter-actor.c:6363
 msgid "Forced Y position of the actor"
 msgstr "Låst Y-position for aktøren"
 
-#: ../clutter/clutter-actor.c:6329
+#: ../clutter/clutter-actor.c:6378
 msgid "Fixed position set"
 msgstr "Position fastlåst"
 
-#: ../clutter/clutter-actor.c:6330
+#: ../clutter/clutter-actor.c:6379
 msgid "Whether to use fixed positioning for the actor"
 msgstr "Hvorvidt låst aktørposition bruges"
 
-#: ../clutter/clutter-actor.c:6348
+#: ../clutter/clutter-actor.c:6397
 msgid "Min Width"
 msgstr "Min. bredde"
 
-#: ../clutter/clutter-actor.c:6349
+#: ../clutter/clutter-actor.c:6398
 msgid "Forced minimum width request for the actor"
 msgstr "Forespørgsel om tvungen minimumsbredde  for aktøren"
 
-#: ../clutter/clutter-actor.c:6367
+#: ../clutter/clutter-actor.c:6416
 msgid "Min Height"
 msgstr "Min. højde"
 
-#: ../clutter/clutter-actor.c:6368
+#: ../clutter/clutter-actor.c:6417
 msgid "Forced minimum height request for the actor"
 msgstr "Forespørgsel om tvungen minimumshøjde for aktøren"
 
-#: ../clutter/clutter-actor.c:6386
+#: ../clutter/clutter-actor.c:6435
 msgid "Natural Width"
 msgstr "Naturlig bredde"
 
-#: ../clutter/clutter-actor.c:6387
+#: ../clutter/clutter-actor.c:6436
 msgid "Forced natural width request for the actor"
 msgstr "Forespørgsel om tvungen naturlig bredde for aktøren"
 
-#: ../clutter/clutter-actor.c:6405
+#: ../clutter/clutter-actor.c:6454
 msgid "Natural Height"
 msgstr "Naturlig højde"
 
-#: ../clutter/clutter-actor.c:6406
+#: ../clutter/clutter-actor.c:6455
 msgid "Forced natural height request for the actor"
 msgstr "Forespørgsel om tvungen naturlig højde for aktøren"
 
-#: ../clutter/clutter-actor.c:6421
+#: ../clutter/clutter-actor.c:6470
 msgid "Minimum width set"
 msgstr "Minimumsbredde sat"
 
-#: ../clutter/clutter-actor.c:6422
+#: ../clutter/clutter-actor.c:6471
 msgid "Whether to use the min-width property"
 msgstr "Om værdien for minimumsbredde bruges"
 
-#: ../clutter/clutter-actor.c:6436
+#: ../clutter/clutter-actor.c:6485
 msgid "Minimum height set"
 msgstr "Minimumshøjde sat"
 
-#: ../clutter/clutter-actor.c:6437
+#: ../clutter/clutter-actor.c:6486
 msgid "Whether to use the min-height property"
 msgstr "Om værdien for minimumshøjde bruges"
 
-#: ../clutter/clutter-actor.c:6451
+#: ../clutter/clutter-actor.c:6500
 msgid "Natural width set"
 msgstr "Naturlig bredde sat"
 
-#: ../clutter/clutter-actor.c:6452
+#: ../clutter/clutter-actor.c:6501
 msgid "Whether to use the natural-width property"
 msgstr "Om værdien for naturlig bredde bruges"
 
-#: ../clutter/clutter-actor.c:6466
+#: ../clutter/clutter-actor.c:6515
 msgid "Natural height set"
 msgstr "Naturlig højde sat"
 
-#: ../clutter/clutter-actor.c:6467
+#: ../clutter/clutter-actor.c:6516
 msgid "Whether to use the natural-height property"
 msgstr "Om værdien for naturlig højde bruges"
 
-#: ../clutter/clutter-actor.c:6483
+#: ../clutter/clutter-actor.c:6532
 msgid "Allocation"
 msgstr "Allokering"
 
-#: ../clutter/clutter-actor.c:6484
+#: ../clutter/clutter-actor.c:6533
 msgid "The actor's allocation"
 msgstr "Aktørens allokering"
 
-#: ../clutter/clutter-actor.c:6541
+#: ../clutter/clutter-actor.c:6590
 msgid "Request Mode"
 msgstr "Forespørgselstilstand"
 
-#: ../clutter/clutter-actor.c:6542
+#: ../clutter/clutter-actor.c:6591
 msgid "The actor's request mode"
 msgstr "Aktørens forespørgselstilstand"
 
-#: ../clutter/clutter-actor.c:6566
+#: ../clutter/clutter-actor.c:6615
 msgid "Depth"
 msgstr "Dybde"
 
-#: ../clutter/clutter-actor.c:6567
+#: ../clutter/clutter-actor.c:6616
 msgid "Position on the Z axis"
 msgstr "Position på Z-aksen"
 
-#: ../clutter/clutter-actor.c:6594
+#: ../clutter/clutter-actor.c:6643
 msgid "Z Position"
 msgstr "Z-position"
 
-#: ../clutter/clutter-actor.c:6595
+#: ../clutter/clutter-actor.c:6644
 msgid "The actor's position on the Z axis"
 msgstr "Aktørens position på Z-aksen"
 
-#: ../clutter/clutter-actor.c:6612
+#: ../clutter/clutter-actor.c:6661
 msgid "Opacity"
 msgstr "Ugennemsigtighed"
 
-#: ../clutter/clutter-actor.c:6613
+#: ../clutter/clutter-actor.c:6662
 msgid "Opacity of an actor"
 msgstr "En aktørs ugennemsigtighed"
 
 # ?
-#: ../clutter/clutter-actor.c:6633
+#: ../clutter/clutter-actor.c:6682
 msgid "Offscreen redirect"
 msgstr "Omstilling uden for skærmen"
 
-#: ../clutter/clutter-actor.c:6634
+#: ../clutter/clutter-actor.c:6683
 msgid "Flags controlling when to flatten the actor into a single image"
 msgstr "Flag der styrer hvornår aktøren fladgøres til et enkelt billede"
 
-#: ../clutter/clutter-actor.c:6648
+#: ../clutter/clutter-actor.c:6697
 msgid "Visible"
 msgstr "Synlig"
 
-#: ../clutter/clutter-actor.c:6649
+#: ../clutter/clutter-actor.c:6698
 msgid "Whether the actor is visible or not"
 msgstr "Aktør synlig eller ej"
 
-#: ../clutter/clutter-actor.c:6663
+#: ../clutter/clutter-actor.c:6712
 msgid "Mapped"
 msgstr "Afbildet"
 
-#: ../clutter/clutter-actor.c:6664
+#: ../clutter/clutter-actor.c:6713
 msgid "Whether the actor will be painted"
 msgstr "Hvorvidt aktøren farvelægges"
 
-#: ../clutter/clutter-actor.c:6677
+#: ../clutter/clutter-actor.c:6726
 msgid "Realized"
 msgstr "Realiseret"
 
-#: ../clutter/clutter-actor.c:6678
+#: ../clutter/clutter-actor.c:6727
 msgid "Whether the actor has been realized"
 msgstr "Hvorvidt aktøren er blevet realiseret"
 
-#: ../clutter/clutter-actor.c:6693
+#: ../clutter/clutter-actor.c:6742
 msgid "Reactive"
 msgstr "Reaktiv"
 
-#: ../clutter/clutter-actor.c:6694
+#: ../clutter/clutter-actor.c:6743
 msgid "Whether the actor is reactive to events"
 msgstr "Hvorvidt aktøren er reaktiv"
 
-#: ../clutter/clutter-actor.c:6705
+#: ../clutter/clutter-actor.c:6754
 msgid "Has Clip"
 msgstr "Har klip"
 
-#: ../clutter/clutter-actor.c:6706
+#: ../clutter/clutter-actor.c:6755
 msgid "Whether the actor has a clip set"
 msgstr "Om aktøren har klip angivet"
 
-#: ../clutter/clutter-actor.c:6719
+#: ../clutter/clutter-actor.c:6768
 msgid "Clip"
 msgstr "Klip"
 
-#: ../clutter/clutter-actor.c:6720
+#: ../clutter/clutter-actor.c:6769
 msgid "The clip region for the actor"
 msgstr "Udklipsregionen for aktøren"
 
-#: ../clutter/clutter-actor.c:6739
+#: ../clutter/clutter-actor.c:6788
 msgid "Clip Rectangle"
 msgstr "Beskær rektangel"
 
-#: ../clutter/clutter-actor.c:6740
+#: ../clutter/clutter-actor.c:6789
 msgid "The visible region of the actor"
 msgstr "Den synlige region for aktøren"
 
-#: ../clutter/clutter-actor.c:6754 ../clutter/clutter-actor-meta.c:207
-#: ../clutter/clutter-binding-pool.c:319 ../clutter/clutter-input-device.c:258
+#: ../clutter/clutter-actor.c:6803 ../clutter/clutter-actor-meta.c:205
+#: ../clutter/clutter-binding-pool.c:318 ../clutter/clutter-input-device.c:247
 msgid "Name"
 msgstr "Navn"
 
-#: ../clutter/clutter-actor.c:6755
+#: ../clutter/clutter-actor.c:6804
 msgid "Name of the actor"
 msgstr "Aktørens navn"
 
-#: ../clutter/clutter-actor.c:6776
+#: ../clutter/clutter-actor.c:6825
 msgid "Pivot Point"
 msgstr "Omdrejningspunkt"
 
-#: ../clutter/clutter-actor.c:6777
+#: ../clutter/clutter-actor.c:6826
 msgid "The point around which the scaling and rotation occur"
 msgstr "Punktet omkring hvilket der foretages skalering og rotation"
 
-#: ../clutter/clutter-actor.c:6795
+#: ../clutter/clutter-actor.c:6844
 msgid "Pivot Point Z"
 msgstr "Z-værdi for omdrejningspunkt"
 
-#: ../clutter/clutter-actor.c:6796
+#: ../clutter/clutter-actor.c:6845
 msgid "Z component of the pivot point"
 msgstr "Z-koordinat for omdrejningspunkt"
 
-#: ../clutter/clutter-actor.c:6814
+#: ../clutter/clutter-actor.c:6863
 msgid "Scale X"
 msgstr "X-skalering"
 
-#: ../clutter/clutter-actor.c:6815
+#: ../clutter/clutter-actor.c:6864
 msgid "Scale factor on the X axis"
 msgstr "X-aksens skaleringsfaktor"
 
-#: ../clutter/clutter-actor.c:6833
+#: ../clutter/clutter-actor.c:6882
 msgid "Scale Y"
 msgstr "Y-skalering"
 
-#: ../clutter/clutter-actor.c:6834
+#: ../clutter/clutter-actor.c:6883
 msgid "Scale factor on the Y axis"
 msgstr "Y-aksens skaleringsfaktor"
 
-#: ../clutter/clutter-actor.c:6852
+#: ../clutter/clutter-actor.c:6901
 msgid "Scale Z"
 msgstr "Skalér Z"
 
-#: ../clutter/clutter-actor.c:6853
+#: ../clutter/clutter-actor.c:6902
 msgid "Scale factor on the Z axis"
 msgstr "Skaleringsfaktoren på Z-aksen"
 
-#: ../clutter/clutter-actor.c:6871
+#: ../clutter/clutter-actor.c:6920
 msgid "Scale Center X"
 msgstr "Skaleringscenter X"
 
-#: ../clutter/clutter-actor.c:6872
+#: ../clutter/clutter-actor.c:6921
 msgid "Horizontal scale center"
 msgstr "Horisontalt skaleringscenter"
 
-#: ../clutter/clutter-actor.c:6890
+#: ../clutter/clutter-actor.c:6939
 msgid "Scale Center Y"
 msgstr "Skaleringscenter Y"
 
-#: ../clutter/clutter-actor.c:6891
+#: ../clutter/clutter-actor.c:6940
 msgid "Vertical scale center"
 msgstr "Vertikalt skaleringscenter"
 
-#: ../clutter/clutter-actor.c:6909
+#: ../clutter/clutter-actor.c:6958
 msgid "Scale Gravity"
 msgstr "Skalér tyngdekraft"
 
-#: ../clutter/clutter-actor.c:6910
+#: ../clutter/clutter-actor.c:6959
 msgid "The center of scaling"
 msgstr "Skaleringens centrum"
 
-#: ../clutter/clutter-actor.c:6928
+#: ../clutter/clutter-actor.c:6977
 msgid "Rotation Angle X"
 msgstr "Rotationsvinkel X"
 
-#: ../clutter/clutter-actor.c:6929
+#: ../clutter/clutter-actor.c:6978
 msgid "The rotation angle on the X axis"
 msgstr "X-aksens rotationsvinkel"
 
-#: ../clutter/clutter-actor.c:6947
+#: ../clutter/clutter-actor.c:6996
 msgid "Rotation Angle Y"
 msgstr "Rotationsvinkel Y"
 
-#: ../clutter/clutter-actor.c:6948
+#: ../clutter/clutter-actor.c:6997
 msgid "The rotation angle on the Y axis"
 msgstr "Y-aksens rotationsvinkel"
 
-#: ../clutter/clutter-actor.c:6966
+#: ../clutter/clutter-actor.c:7015
 msgid "Rotation Angle Z"
 msgstr "Rotationsvinkel Z"
 
-#: ../clutter/clutter-actor.c:6967
+#: ../clutter/clutter-actor.c:7016
 msgid "The rotation angle on the Z axis"
 msgstr "Z-aksens rotationsvinkel"
 
-#: ../clutter/clutter-actor.c:6985
+#: ../clutter/clutter-actor.c:7034
 msgid "Rotation Center X"
 msgstr "Rotationscentrum X"
 
-#: ../clutter/clutter-actor.c:6986
+#: ../clutter/clutter-actor.c:7035
 msgid "The rotation center on the X axis"
 msgstr "X-aksens rotationscentrum"
 
-#: ../clutter/clutter-actor.c:7003
+#: ../clutter/clutter-actor.c:7052
 msgid "Rotation Center Y"
 msgstr "Rotationscentrum Y"
 
-#: ../clutter/clutter-actor.c:7004
+#: ../clutter/clutter-actor.c:7053
 msgid "The rotation center on the Y axis"
 msgstr "Y-aksens rotationscentrum"
 
-#: ../clutter/clutter-actor.c:7021
+#: ../clutter/clutter-actor.c:7070
 msgid "Rotation Center Z"
 msgstr "Rotationscentrum Z"
 
-#: ../clutter/clutter-actor.c:7022
+#: ../clutter/clutter-actor.c:7071
 msgid "The rotation center on the Z axis"
 msgstr "Z-aksens rotationscentrum"
 
-#: ../clutter/clutter-actor.c:7039
+#: ../clutter/clutter-actor.c:7088
 msgid "Rotation Center Z Gravity"
 msgstr "Rotationscentrum Z-tyngde"
 
-#: ../clutter/clutter-actor.c:7040
+#: ../clutter/clutter-actor.c:7089
 msgid "Center point for rotation around the Z axis"
 msgstr "Centrumpunkt for rotation omkring Z-aksen"
 
-#: ../clutter/clutter-actor.c:7068
+#: ../clutter/clutter-actor.c:7117
 msgid "Anchor X"
 msgstr "Forankring X"
 
-#: ../clutter/clutter-actor.c:7069
+#: ../clutter/clutter-actor.c:7118
 msgid "X coordinate of the anchor point"
 msgstr "X-koordinat for forankring"
 
-#: ../clutter/clutter-actor.c:7097
+#: ../clutter/clutter-actor.c:7146
 msgid "Anchor Y"
 msgstr "Forankring Y"
 
-#: ../clutter/clutter-actor.c:7098
+#: ../clutter/clutter-actor.c:7147
 msgid "Y coordinate of the anchor point"
 msgstr "Y-koordinat for forankring"
 
-#: ../clutter/clutter-actor.c:7125
+#: ../clutter/clutter-actor.c:7174
 msgid "Anchor Gravity"
 msgstr "Forankrings tyngde"
 
-#: ../clutter/clutter-actor.c:7126
+#: ../clutter/clutter-actor.c:7175
 msgid "The anchor point as a ClutterGravity"
 msgstr "Forankring som ClutterGravity"
 
-#: ../clutter/clutter-actor.c:7145
+#: ../clutter/clutter-actor.c:7194
 msgid "Translation X"
 msgstr "Forskydning X"
 
-#: ../clutter/clutter-actor.c:7146
+#: ../clutter/clutter-actor.c:7195
 msgid "Translation along the X axis"
 msgstr "Forskydning langs X-aksen"
 
-#: ../clutter/clutter-actor.c:7165
+#: ../clutter/clutter-actor.c:7214
 msgid "Translation Y"
 msgstr "Forskydning Y"
 
-#: ../clutter/clutter-actor.c:7166
+#: ../clutter/clutter-actor.c:7215
 msgid "Translation along the Y axis"
 msgstr "Forskydning langs Y-aksen"
 
-#: ../clutter/clutter-actor.c:7185
+#: ../clutter/clutter-actor.c:7234
 msgid "Translation Z"
 msgstr "Forskydning Z"
 
-#: ../clutter/clutter-actor.c:7186
+#: ../clutter/clutter-actor.c:7235
 msgid "Translation along the Z axis"
 msgstr "Forskydning langs Z-aksen"
 
-#: ../clutter/clutter-actor.c:7216
+#: ../clutter/clutter-actor.c:7265
 msgid "Transform"
 msgstr "Transformér"
 
-#: ../clutter/clutter-actor.c:7217
+#: ../clutter/clutter-actor.c:7266
 msgid "Transformation matrix"
 msgstr "Transformationsmatrix"
 
-#: ../clutter/clutter-actor.c:7232
+#: ../clutter/clutter-actor.c:7281
 msgid "Transform Set"
 msgstr "Transformation angivet"
 
-#: ../clutter/clutter-actor.c:7233
+#: ../clutter/clutter-actor.c:7282
 msgid "Whether the transform property is set"
 msgstr "Om transformeringsegenskaben (transform) er angivet"
 
-#: ../clutter/clutter-actor.c:7254
+#: ../clutter/clutter-actor.c:7303
 msgid "Child Transform"
 msgstr "Undertransformation"
 
-#: ../clutter/clutter-actor.c:7255
+#: ../clutter/clutter-actor.c:7304
 msgid "Children transformation matrix"
 msgstr "Transformationsmatrix for undertransformationer"
 
-#: ../clutter/clutter-actor.c:7270
+#: ../clutter/clutter-actor.c:7319
 msgid "Child Transform Set"
 msgstr "Undertransformation angivet"
 
-#: ../clutter/clutter-actor.c:7271
+#: ../clutter/clutter-actor.c:7320
 msgid "Whether the child-transform property is set"
 msgstr "Om undertransformationsegenskaben (child-transform) er angivet"
 
-#: ../clutter/clutter-actor.c:7288
+#: ../clutter/clutter-actor.c:7337
 msgid "Show on set parent"
 msgstr "Vis på angivet ophavselement"
 
-#: ../clutter/clutter-actor.c:7289
+#: ../clutter/clutter-actor.c:7338
 msgid "Whether the actor is shown when parented"
 msgstr "Om aktøren vises når den har et ophavselement"
 
-#: ../clutter/clutter-actor.c:7306
+#: ../clutter/clutter-actor.c:7355
 msgid "Clip to Allocation"
 msgstr "Klip til allokation"
 
-#: ../clutter/clutter-actor.c:7307
+#: ../clutter/clutter-actor.c:7356
 msgid "Sets the clip region to track the actor's allocation"
 msgstr "Sætter udklipsregionen til at overvåge aktørens allokering"
 
-#: ../clutter/clutter-actor.c:7320
+#: ../clutter/clutter-actor.c:7369
 msgid "Text Direction"
 msgstr "Tekstretning"
 
-#: ../clutter/clutter-actor.c:7321
+#: ../clutter/clutter-actor.c:7370
 msgid "Direction of the text"
 msgstr "Tekstens retning"
 
 # ?
-#: ../clutter/clutter-actor.c:7336
+#: ../clutter/clutter-actor.c:7385
 msgid "Has Pointer"
 msgstr "Har pointer"
 
 # ?
-#: ../clutter/clutter-actor.c:7337
+#: ../clutter/clutter-actor.c:7386
 msgid "Whether the actor contains the pointer of an input device"
 msgstr "Om aktøren indeholder pointeren til en inputenhed"
 
-#: ../clutter/clutter-actor.c:7350
+#: ../clutter/clutter-actor.c:7399
 msgid "Actions"
 msgstr "Handlinger"
 
-#: ../clutter/clutter-actor.c:7351
+#: ../clutter/clutter-actor.c:7400
 msgid "Adds an action to the actor"
 msgstr "Tilføjer en handling til aktøren"
 
-#: ../clutter/clutter-actor.c:7364
+#: ../clutter/clutter-actor.c:7413
 msgid "Constraints"
 msgstr "Begrænsninger"
 
-#: ../clutter/clutter-actor.c:7365
+#: ../clutter/clutter-actor.c:7414
 msgid "Adds a constraint to the actor"
 msgstr "Tilføjer en begrænsning til aktøren"
 
-#: ../clutter/clutter-actor.c:7378
+#: ../clutter/clutter-actor.c:7427
 msgid "Effect"
 msgstr "Effekt"
 
-#: ../clutter/clutter-actor.c:7379
+#: ../clutter/clutter-actor.c:7428
 msgid "Add an effect to be applied on the actor"
 msgstr "Tilføj en effekt som skal anvendes på aktøren"
 
-#: ../clutter/clutter-actor.c:7393
+#: ../clutter/clutter-actor.c:7442
 msgid "Layout Manager"
 msgstr "Layout-manager"
 
-#: ../clutter/clutter-actor.c:7394
+#: ../clutter/clutter-actor.c:7443
 msgid "The object controlling the layout of an actor's children"
 msgstr "Objektet som kontrollerer layoutet af en aktørs underelementer"
 
-#: ../clutter/clutter-actor.c:7408
+#: ../clutter/clutter-actor.c:7457
 msgid "X Expand"
 msgstr "Udvid i X"
 
-#: ../clutter/clutter-actor.c:7409
+#: ../clutter/clutter-actor.c:7458
 msgid "Whether extra horizontal space should be assigned to the actor"
 msgstr "Om der skal tildeles ekstra vandret plads til aktøren"
 
-#: ../clutter/clutter-actor.c:7424
+#: ../clutter/clutter-actor.c:7473
 msgid "Y Expand"
 msgstr "Udvid Y"
 
-#: ../clutter/clutter-actor.c:7425
+#: ../clutter/clutter-actor.c:7474
 msgid "Whether extra vertical space should be assigned to the actor"
 msgstr "Om der skal tildeles ekstra lodret plads til aktøren"
 
-#: ../clutter/clutter-actor.c:7441
+#: ../clutter/clutter-actor.c:7490
 msgid "X Alignment"
 msgstr "X-justering"
 
-#: ../clutter/clutter-actor.c:7442
+#: ../clutter/clutter-actor.c:7491
 msgid "The alignment of the actor on the X axis within its allocation"
 msgstr "Justeringen af aktøren på X-aksen inden for dens allokering"
 
-#: ../clutter/clutter-actor.c:7457
+#: ../clutter/clutter-actor.c:7506
 msgid "Y Alignment"
 msgstr "Y-justering"
 
-#: ../clutter/clutter-actor.c:7458
+#: ../clutter/clutter-actor.c:7507
 msgid "The alignment of the actor on the Y axis within its allocation"
 msgstr "Justeringen af aktøren på Y-aksen inden for dens allokering"
 
-#: ../clutter/clutter-actor.c:7477
+#: ../clutter/clutter-actor.c:7526
 msgid "Margin Top"
 msgstr "Topmargin"
 
-#: ../clutter/clutter-actor.c:7478
+#: ../clutter/clutter-actor.c:7527
 msgid "Extra space at the top"
 msgstr "Ekstra plads i toppen"
 
-#: ../clutter/clutter-actor.c:7499
+#: ../clutter/clutter-actor.c:7548
 msgid "Margin Bottom"
 msgstr "Bundmargin"
 
-#: ../clutter/clutter-actor.c:7500
+#: ../clutter/clutter-actor.c:7549
 msgid "Extra space at the bottom"
 msgstr "Ekstra plads ved bunden"
 
-#: ../clutter/clutter-actor.c:7521
+#: ../clutter/clutter-actor.c:7570
 msgid "Margin Left"
 msgstr "Venstremargin"
 
-#: ../clutter/clutter-actor.c:7522
+#: ../clutter/clutter-actor.c:7571
 msgid "Extra space at the left"
 msgstr "Ekstra plads til venstre"
 
-#: ../clutter/clutter-actor.c:7543
+#: ../clutter/clutter-actor.c:7592
 msgid "Margin Right"
 msgstr "Højremargin"
 
-#: ../clutter/clutter-actor.c:7544
+#: ../clutter/clutter-actor.c:7593
 msgid "Extra space at the right"
 msgstr "Ekstra plads til højre"
 
 # Fra koden:
 # Whether the #ClutterActor:background-color property has been set.
-#: ../clutter/clutter-actor.c:7560
+#: ../clutter/clutter-actor.c:7609
 msgid "Background Color Set"
 msgstr "Baggrundsfarve indstillet"
 
-#: ../clutter/clutter-actor.c:7561 ../clutter/deprecated/clutter-box.c:275
+#: ../clutter/clutter-actor.c:7610 ../clutter/deprecated/clutter-box.c:269
 msgid "Whether the background color is set"
 msgstr "Om baggrundsfarven er angivet"
 
-#: ../clutter/clutter-actor.c:7577
+#: ../clutter/clutter-actor.c:7626
 msgid "Background color"
 msgstr "Baggrundsfarve"
 
-#: ../clutter/clutter-actor.c:7578
+#: ../clutter/clutter-actor.c:7627
 msgid "The actor's background color"
 msgstr "Aktørens baggrundsfarve"
 
-#: ../clutter/clutter-actor.c:7593
+#: ../clutter/clutter-actor.c:7642
 msgid "First Child"
 msgstr "Første underelement"
 
-#: ../clutter/clutter-actor.c:7594
+#: ../clutter/clutter-actor.c:7643
 msgid "The actor's first child"
 msgstr "Aktørens første underelement"
 
-#: ../clutter/clutter-actor.c:7607
+#: ../clutter/clutter-actor.c:7656
 msgid "Last Child"
 msgstr "Sidste underelement"
 
-#: ../clutter/clutter-actor.c:7608
+#: ../clutter/clutter-actor.c:7657
 msgid "The actor's last child"
 msgstr "Aktørens sidste underelement"
 
-#: ../clutter/clutter-actor.c:7622
+#: ../clutter/clutter-actor.c:7671
 msgid "Content"
 msgstr "Indhold"
 
-#: ../clutter/clutter-actor.c:7623
+#: ../clutter/clutter-actor.c:7672
 msgid "Delegate object for painting the actor's content"
 msgstr "Delegeringsobjekt til optegning af aktørens indhold"
 
-#: ../clutter/clutter-actor.c:7648
+#: ../clutter/clutter-actor.c:7697
 msgid "Content Gravity"
 msgstr "Indholdstyngdekraft"
 
-#: ../clutter/clutter-actor.c:7649
+#: ../clutter/clutter-actor.c:7698
 msgid "Alignment of the actor's content"
 msgstr "Justering af aktørens indhold"
 
-#: ../clutter/clutter-actor.c:7669
+#: ../clutter/clutter-actor.c:7718
 msgid "Content Box"
 msgstr "Indholdsboks"
 
-#: ../clutter/clutter-actor.c:7670
+#: ../clutter/clutter-actor.c:7719
 msgid "The bounding box of the actor's content"
 msgstr "Afgrænsningsboksen for aktørens indhold"
 
-#: ../clutter/clutter-actor.c:7678
+#: ../clutter/clutter-actor.c:7727
 msgid "Minification Filter"
 msgstr "Minimeringsfilter"
 
-#: ../clutter/clutter-actor.c:7679
+#: ../clutter/clutter-actor.c:7728
 msgid "The filter used when reducing the size of the content"
 msgstr "Det filter der bruges til at reducere indholdets størrelse"
 
-#: ../clutter/clutter-actor.c:7686
+#: ../clutter/clutter-actor.c:7735
 msgid "Magnification Filter"
 msgstr "Forstørrelsesfilter"
 
-#: ../clutter/clutter-actor.c:7687
+#: ../clutter/clutter-actor.c:7736
 msgid "The filter used when increasing the size of the content"
 msgstr "Det filter der bruges til at forøge indholdets størrelse"
 
-#: ../clutter/clutter-actor.c:7701
+#: ../clutter/clutter-actor.c:7750
 msgid "Content Repeat"
 msgstr "Indhold gentages"
 
-#: ../clutter/clutter-actor.c:7702
+#: ../clutter/clutter-actor.c:7751
 msgid "The repeat policy for the actor's content"
 msgstr "Gentagelsespolitikken for aktørens indhold"
 
-#: ../clutter/clutter-actor-meta.c:193 ../clutter/clutter-child-meta.c:142
+#: ../clutter/clutter-actor-meta.c:191 ../clutter/clutter-child-meta.c:142
 msgid "Actor"
 msgstr "Aktør"
 
-#: ../clutter/clutter-actor-meta.c:194
+#: ../clutter/clutter-actor-meta.c:192
 msgid "The actor attached to the meta"
 msgstr "Aktør tilføjet til meta"
 
-#: ../clutter/clutter-actor-meta.c:208
+#: ../clutter/clutter-actor-meta.c:206
 msgid "The name of the meta"
 msgstr "Metas navn"
 
-#: ../clutter/clutter-actor-meta.c:221 ../clutter/clutter-input-device.c:337
-#: ../clutter/deprecated/clutter-shader.c:313
+#: ../clutter/clutter-actor-meta.c:219 ../clutter/clutter-input-device.c:326
+#: ../clutter/deprecated/clutter-shader.c:309
 msgid "Enabled"
 msgstr "Slået til"
 
-#: ../clutter/clutter-actor-meta.c:222
+#: ../clutter/clutter-actor-meta.c:220
 msgid "Whether the meta is enabled"
 msgstr "Hvorvidt meta er slået til"
 
 #: ../clutter/clutter-align-constraint.c:279
-#: ../clutter/clutter-bind-constraint.c:358 ../clutter/clutter-clone.c:345
+#: ../clutter/clutter-bind-constraint.c:343 ../clutter/clutter-clone.c:341
 #: ../clutter/clutter-snap-constraint.c:321
 msgid "Source"
 msgstr "Kilde"
@@ -740,83 +740,87 @@ msgstr "Faktor"
 msgid "The alignment factor, between 0.0 and 1.0"
 msgstr "Justeringsfaktoren, mellem 0,0 og 1,0"
 
-#: ../clutter/clutter-backend.c:379
+#: ../clutter/clutter-backend.c:380
 msgid "Unable to initialize the Clutter backend"
 msgstr "Ude af stand til at initialisere det underliggende Clutter-program"
 
-#: ../clutter/clutter-backend.c:453
+#: ../clutter/clutter-backend.c:454
 #, c-format
 msgid "The backend of type '%s' does not support creating multiple stages"
 msgstr ""
 "Det underliggende program af typen \"%s\" understøtter ikke flere scener"
 
-#: ../clutter/clutter-bind-constraint.c:359
+#: ../clutter/clutter-bind-constraint.c:344
 msgid "The source of the binding"
 msgstr "Bindingens kilde"
 
-#: ../clutter/clutter-bind-constraint.c:372
+#: ../clutter/clutter-bind-constraint.c:357
 msgid "Coordinate"
 msgstr "Koordinat"
 
-#: ../clutter/clutter-bind-constraint.c:373
+#: ../clutter/clutter-bind-constraint.c:358
 msgid "The coordinate to bind"
 msgstr "Koordinat der skal bindes"
 
-#: ../clutter/clutter-bind-constraint.c:387
+#: ../clutter/clutter-bind-constraint.c:372
 #: ../clutter/clutter-path-constraint.c:226
 #: ../clutter/clutter-snap-constraint.c:366
 msgid "Offset"
 msgstr "Forskydning"
 
-#: ../clutter/clutter-bind-constraint.c:388
+#: ../clutter/clutter-bind-constraint.c:373
 msgid "The offset in pixels to apply to the binding"
 msgstr "Forskydningen i pixel der skal tilføjes bindingen"
 
-#: ../clutter/clutter-binding-pool.c:320
+#: ../clutter/clutter-binding-pool.c:319
 msgid "The unique name of the binding pool"
 msgstr "Det unikke navn for bindingspuljen"
 
-#: ../clutter/clutter-bin-layout.c:240 ../clutter/clutter-bin-layout.c:655
-#: ../clutter/clutter-box-layout.c:390 ../clutter/clutter-table-layout.c:610
+#: ../clutter/clutter-bin-layout.c:220 ../clutter/clutter-bin-layout.c:633
+#: ../clutter/clutter-box-layout.c:374
+#: ../clutter/deprecated/clutter-table-layout.c:602
 msgid "Horizontal Alignment"
 msgstr "Horisontal justering"
 
-#: ../clutter/clutter-bin-layout.c:241
+#: ../clutter/clutter-bin-layout.c:221
 msgid "Horizontal alignment for the actor inside the layout manager"
 msgstr "Horisontal justering for aktøren inden i layout-manager"
 
-#: ../clutter/clutter-bin-layout.c:249 ../clutter/clutter-bin-layout.c:675
-#: ../clutter/clutter-box-layout.c:399 ../clutter/clutter-table-layout.c:625
+#: ../clutter/clutter-bin-layout.c:229 ../clutter/clutter-bin-layout.c:653
+#: ../clutter/clutter-box-layout.c:383
+#: ../clutter/deprecated/clutter-table-layout.c:617
 msgid "Vertical Alignment"
 msgstr "Vertikal justering"
 
-#: ../clutter/clutter-bin-layout.c:250
+#: ../clutter/clutter-bin-layout.c:230
 msgid "Vertical alignment for the actor inside the layout manager"
 msgstr "Vertikal justering for aktøren inden i layout-manager"
 
-#: ../clutter/clutter-bin-layout.c:656
+#: ../clutter/clutter-bin-layout.c:634
 msgid "Default horizontal alignment for the actors inside the layout manager"
 msgstr ""
 "Standardværdi for vandret justering af aktører inden i layouthåndteringen"
 
-#: ../clutter/clutter-bin-layout.c:676
+#: ../clutter/clutter-bin-layout.c:654
 msgid "Default vertical alignment for the actors inside the layout manager"
 msgstr ""
 "Standardværdi for lodret justering af aktører inden i layouthåndteringen"
 
-#: ../clutter/clutter-box-layout.c:365
+#: ../clutter/clutter-box-layout.c:349
 msgid "Expand"
 msgstr "Udvid"
 
-#: ../clutter/clutter-box-layout.c:366
+#: ../clutter/clutter-box-layout.c:350
 msgid "Allocate extra space for the child"
 msgstr "Tildel ekstra plads til underelementet"
 
-#: ../clutter/clutter-box-layout.c:372 ../clutter/clutter-table-layout.c:589
+#: ../clutter/clutter-box-layout.c:356
+#: ../clutter/deprecated/clutter-table-layout.c:581
 msgid "Horizontal Fill"
 msgstr "Horisontal udfyldning"
 
-#: ../clutter/clutter-box-layout.c:373 ../clutter/clutter-table-layout.c:590
+#: ../clutter/clutter-box-layout.c:357
+#: ../clutter/deprecated/clutter-table-layout.c:582
 msgid ""
 "Whether the child should receive priority when the container is allocating "
 "spare space on the horizontal axis"
@@ -824,11 +828,13 @@ msgstr ""
 "Om underelementet skal tildeles prioritet når beholderen allokerer fri plads "
 "på den vandrette akse"
 
-#: ../clutter/clutter-box-layout.c:381 ../clutter/clutter-table-layout.c:596
+#: ../clutter/clutter-box-layout.c:365
+#: ../clutter/deprecated/clutter-table-layout.c:588
 msgid "Vertical Fill"
 msgstr "Vertikal udfyldning"
 
-#: ../clutter/clutter-box-layout.c:382 ../clutter/clutter-table-layout.c:597
+#: ../clutter/clutter-box-layout.c:366
+#: ../clutter/deprecated/clutter-table-layout.c:589
 msgid ""
 "Whether the child should receive priority when the container is allocating "
 "spare space on the vertical axis"
@@ -836,81 +842,89 @@ msgstr ""
 "Om underelementet skal tildeles prioritet når beholderen tildeler fri plads "
 "på den lodrette akse"
 
-#: ../clutter/clutter-box-layout.c:391 ../clutter/clutter-table-layout.c:611
+#: ../clutter/clutter-box-layout.c:375
+#: ../clutter/deprecated/clutter-table-layout.c:603
 msgid "Horizontal alignment of the actor within the cell"
 msgstr "Horisontal justering af aktøren inden i cellen"
 
-#: ../clutter/clutter-box-layout.c:400 ../clutter/clutter-table-layout.c:626
+#: ../clutter/clutter-box-layout.c:384
+#: ../clutter/deprecated/clutter-table-layout.c:618
 msgid "Vertical alignment of the actor within the cell"
 msgstr "Vertikal justering af aktøren inden i cellen"
 
-#: ../clutter/clutter-box-layout.c:1365
+#: ../clutter/clutter-box-layout.c:1345
 msgid "Vertical"
 msgstr "Vertikal"
 
-#: ../clutter/clutter-box-layout.c:1366
+#: ../clutter/clutter-box-layout.c:1346
 msgid "Whether the layout should be vertical, rather than horizontal"
 msgstr "Hvorvidt layoutet skal forblive vertikalt frem for horisontalt"
 
-#: ../clutter/clutter-box-layout.c:1383 ../clutter/clutter-flow-layout.c:890
-#: ../clutter/clutter-grid-layout.c:1550
+#: ../clutter/clutter-box-layout.c:1363 ../clutter/clutter-flow-layout.c:927
+#: ../clutter/clutter-grid-layout.c:1549
 msgid "Orientation"
 msgstr "Orientering"
 
-#: ../clutter/clutter-box-layout.c:1384 ../clutter/clutter-flow-layout.c:891
-#: ../clutter/clutter-grid-layout.c:1551
+#: ../clutter/clutter-box-layout.c:1364 ../clutter/clutter-flow-layout.c:928
+#: ../clutter/clutter-grid-layout.c:1550
 msgid "The orientation of the layout"
 msgstr "Orienteringen af layoutet"
 
-#: ../clutter/clutter-box-layout.c:1400 ../clutter/clutter-flow-layout.c:906
+#: ../clutter/clutter-box-layout.c:1380 ../clutter/clutter-flow-layout.c:943
 msgid "Homogeneous"
 msgstr "Homogent"
 
-#: ../clutter/clutter-box-layout.c:1401
+#: ../clutter/clutter-box-layout.c:1381
 msgid ""
 "Whether the layout should be homogeneous, i.e. all childs get the same size"
 msgstr ""
 "Om layoutet skal være homogent, dvs. om alle underelementer får samme "
 "størrelse"
 
-#: ../clutter/clutter-box-layout.c:1416
+#: ../clutter/clutter-box-layout.c:1396
 msgid "Pack Start"
 msgstr "Pak ved start"
 
-#: ../clutter/clutter-box-layout.c:1417
+#: ../clutter/clutter-box-layout.c:1397
 msgid "Whether to pack items at the start of the box"
 msgstr "Om elementer pakkes fra boksens start"
 
-#: ../clutter/clutter-box-layout.c:1430
+#: ../clutter/clutter-box-layout.c:1410
 msgid "Spacing"
 msgstr "Afstand"
 
-#: ../clutter/clutter-box-layout.c:1431
+#: ../clutter/clutter-box-layout.c:1411
 msgid "Spacing between children"
 msgstr "Mellemrum mellem underelementer"
 
-#: ../clutter/clutter-box-layout.c:1448 ../clutter/clutter-table-layout.c:1675
+#: ../clutter/clutter-box-layout.c:1428
+#: ../clutter/deprecated/clutter-table-layout.c:1669
 msgid "Use Animations"
 msgstr "Brug animationer"
 
-#: ../clutter/clutter-box-layout.c:1449 ../clutter/clutter-table-layout.c:1676
+#: ../clutter/clutter-box-layout.c:1429
+#: ../clutter/deprecated/clutter-table-layout.c:1670
 msgid "Whether layout changes should be animated"
 msgstr "Hvorvidt layout-ændringer skal animeres"
 
 # http://docs.clutter-project.org/docs/clutter-cookbook/1.0/animations.html
-#: ../clutter/clutter-box-layout.c:1473 ../clutter/clutter-table-layout.c:1700
+#: ../clutter/clutter-box-layout.c:1453
+#: ../clutter/deprecated/clutter-table-layout.c:1694
 msgid "Easing Mode"
 msgstr "Blødgørelsestilstand"
 
-#: ../clutter/clutter-box-layout.c:1474 ../clutter/clutter-table-layout.c:1701
+#: ../clutter/clutter-box-layout.c:1454
+#: ../clutter/deprecated/clutter-table-layout.c:1695
 msgid "The easing mode of the animations"
 msgstr "Blødgørelsestilstanden (easing mode) for animationerne"
 
-#: ../clutter/clutter-box-layout.c:1494 ../clutter/clutter-table-layout.c:1721
+#: ../clutter/clutter-box-layout.c:1474
+#: ../clutter/deprecated/clutter-table-layout.c:1715
 msgid "Easing Duration"
 msgstr "Varighed for blødgørelse"
 
-#: ../clutter/clutter-box-layout.c:1495 ../clutter/clutter-table-layout.c:1722
+#: ../clutter/clutter-box-layout.c:1475
+#: ../clutter/deprecated/clutter-table-layout.c:1716
 msgid "The duration of the animations"
 msgstr "Animationernes varighed"
 
@@ -930,14 +944,30 @@ msgstr "Kontrast"
 msgid "The contrast change to apply"
 msgstr "Kontrastændringen der skal anvendes"
 
-#: ../clutter/clutter-canvas.c:216
+#: ../clutter/clutter-canvas.c:243
 msgid "The width of the canvas"
 msgstr "Bredden af lærredet"
 
-#: ../clutter/clutter-canvas.c:232
+#: ../clutter/clutter-canvas.c:259
 msgid "The height of the canvas"
 msgstr "Højden af lærredet"
 
+#: ../clutter/clutter-canvas.c:278
+msgid "Scale Factor Set"
+msgstr "Skaleringsfaktor sat"
+
+#: ../clutter/clutter-canvas.c:279
+msgid "Whether the scale-factor property is set"
+msgstr "Om egenskaben skaleringsfaktor (scale-factor) er sat"
+
+#: ../clutter/clutter-canvas.c:300
+msgid "Scale Factor"
+msgstr "Skaleringsfaktor"
+
+#: ../clutter/clutter-canvas.c:301
+msgid "The scaling factor for the surface"
+msgstr "Skaleringsfaktoren for overfladen"
+
 #: ../clutter/clutter-child-meta.c:127
 msgid "Container"
 msgstr "Beholder"
@@ -950,40 +980,40 @@ msgstr "Beholderen som oprettede disse data"
 msgid "The actor wrapped by this data"
 msgstr "Aktøren som indpakkes af disse data"
 
-#: ../clutter/clutter-click-action.c:559
+#: ../clutter/clutter-click-action.c:586
 msgid "Pressed"
 msgstr "Trykket"
 
-#: ../clutter/clutter-click-action.c:560
+#: ../clutter/clutter-click-action.c:587
 msgid "Whether the clickable should be in pressed state"
 msgstr "Om det klikbare objekt skal være i trykket tilstand"
 
-#: ../clutter/clutter-click-action.c:573
+#: ../clutter/clutter-click-action.c:600
 msgid "Held"
 msgstr "Holdt nede"
 
-#: ../clutter/clutter-click-action.c:574
+#: ../clutter/clutter-click-action.c:601
 msgid "Whether the clickable has a grab"
 msgstr "Om det klikbare objekt har et greb"
 
-#: ../clutter/clutter-click-action.c:591 ../clutter/clutter-settings.c:607
+#: ../clutter/clutter-click-action.c:618 ../clutter/clutter-settings.c:651
 msgid "Long Press Duration"
 msgstr "Lang trykvarighed"
 
-#: ../clutter/clutter-click-action.c:592
+#: ../clutter/clutter-click-action.c:619
 msgid "The minimum duration of a long press to recognize the gesture"
 msgstr ""
 "Den mindste varighed af et langvarigt tryk til brug ved gestusgenkendelse"
 
-#: ../clutter/clutter-click-action.c:610
+#: ../clutter/clutter-click-action.c:637
 msgid "Long Press Threshold"
 msgstr "Tærskel for langvarigt tryk"
 
-#: ../clutter/clutter-click-action.c:611
+#: ../clutter/clutter-click-action.c:638
 msgid "The maximum threshold before a long press is cancelled"
 msgstr "Maksimal tærskel før et langvarigt tryk annulleres"
 
-#: ../clutter/clutter-clone.c:346
+#: ../clutter/clutter-clone.c:342
 msgid "Specifies the actor to be cloned"
 msgstr "Angiver aktøren der skal klones"
 
@@ -995,27 +1025,27 @@ msgstr "Nuance"
 msgid "The tint to apply"
 msgstr "Den nuance der skal anvendes"
 
-#: ../clutter/clutter-deform-effect.c:594
+#: ../clutter/clutter-deform-effect.c:591
 msgid "Horizontal Tiles"
 msgstr "Vandrette fliser"
 
-#: ../clutter/clutter-deform-effect.c:595
+#: ../clutter/clutter-deform-effect.c:592
 msgid "The number of horizontal tiles"
 msgstr "Antallet af vandrette fliser"
 
-#: ../clutter/clutter-deform-effect.c:610
+#: ../clutter/clutter-deform-effect.c:607
 msgid "Vertical Tiles"
 msgstr "Lodrette fliser"
 
-#: ../clutter/clutter-deform-effect.c:611
+#: ../clutter/clutter-deform-effect.c:608
 msgid "The number of vertical tiles"
 msgstr "Antallet af lodrette fliser"
 
-#: ../clutter/clutter-deform-effect.c:628
+#: ../clutter/clutter-deform-effect.c:625
 msgid "Back Material"
 msgstr "Bagsidemateriale"
 
-#: ../clutter/clutter-deform-effect.c:629
+#: ../clutter/clutter-deform-effect.c:626
 msgid "The material to be used when painting the back of the actor"
 msgstr "Materialet der skal bruges når aktørens bagside tegnes"
 
@@ -1023,258 +1053,296 @@ msgstr "Materialet der skal bruges når aktørens bagside tegnes"
 msgid "The desaturation factor"
 msgstr "Afmætningsfaktoren"
 
-#: ../clutter/clutter-device-manager.c:131
-#: ../clutter/clutter-input-device.c:366
-#: ../clutter/x11/clutter-keymap-x11.c:321
+#: ../clutter/clutter-device-manager.c:127
+#: ../clutter/clutter-input-device.c:355
+#: ../clutter/x11/clutter-keymap-x11.c:457
 msgid "Backend"
 msgstr "Motor"
 
-#: ../clutter/clutter-device-manager.c:132
+#: ../clutter/clutter-device-manager.c:128
 msgid "The ClutterBackend of the device manager"
 msgstr "ClutterBackend for enhedshåndteringen"
 
-#: ../clutter/clutter-drag-action.c:742
+#: ../clutter/clutter-drag-action.c:733
 msgid "Horizontal Drag Threshold"
 msgstr "Tærskel for vandret træk"
 
-#: ../clutter/clutter-drag-action.c:743
+#: ../clutter/clutter-drag-action.c:734
 msgid "The horizontal amount of pixels required to start dragging"
 msgstr "Antallet af pixler der starter trækkeoperation vandret"
 
-#: ../clutter/clutter-drag-action.c:770
+#: ../clutter/clutter-drag-action.c:761
 msgid "Vertical Drag Threshold"
 msgstr "Tærskel for vandret træk"
 
-#: ../clutter/clutter-drag-action.c:771
+#: ../clutter/clutter-drag-action.c:762
 msgid "The vertical amount of pixels required to start dragging"
 msgstr "Antallet af pixler der starter trækkeoperation lodret"
 
-#: ../clutter/clutter-drag-action.c:792
+#: ../clutter/clutter-drag-action.c:783
 msgid "Drag Handle"
 msgstr "Trækkehåndtag"
 
-#: ../clutter/clutter-drag-action.c:793
+#: ../clutter/clutter-drag-action.c:784
 msgid "The actor that is being dragged"
 msgstr "Aktøren der trækkes"
 
-#: ../clutter/clutter-drag-action.c:806
+#: ../clutter/clutter-drag-action.c:797
 msgid "Drag Axis"
 msgstr "Trækkeakse"
 
-#: ../clutter/clutter-drag-action.c:807
+#: ../clutter/clutter-drag-action.c:798
 msgid "Constraints the dragging to an axis"
 msgstr "Begrænser træk til en akse"
 
-#: ../clutter/clutter-drag-action.c:823
+#: ../clutter/clutter-drag-action.c:814
 msgid "Drag Area"
 msgstr "Trækkeområde"
 
-#: ../clutter/clutter-drag-action.c:824
+#: ../clutter/clutter-drag-action.c:815
 msgid "Constrains the dragging to a rectangle"
 msgstr "Begrænser træk til et rektangel"
 
-#: ../clutter/clutter-drag-action.c:837
+#: ../clutter/clutter-drag-action.c:828
 msgid "Drag Area Set"
 msgstr "Trækkeområde angivet"
 
-#: ../clutter/clutter-drag-action.c:838
+#: ../clutter/clutter-drag-action.c:829
 msgid "Whether the drag area is set"
 msgstr "Om trækkeområdet er angivet"
 
-#: ../clutter/clutter-flow-layout.c:907
+#: ../clutter/clutter-flow-layout.c:944
 msgid "Whether each item should receive the same allocation"
 msgstr "Om hvert element skal tildeles samme plads"
 
-#: ../clutter/clutter-flow-layout.c:922 ../clutter/clutter-table-layout.c:1637
+#: ../clutter/clutter-flow-layout.c:959
+#: ../clutter/deprecated/clutter-table-layout.c:1629
 msgid "Column Spacing"
 msgstr "Kolonnemellemrum"
 
-#: ../clutter/clutter-flow-layout.c:923
+#: ../clutter/clutter-flow-layout.c:960
 msgid "The spacing between columns"
 msgstr "Mellemrum mellem kolonner"
 
-#: ../clutter/clutter-flow-layout.c:939 ../clutter/clutter-table-layout.c:1651
+#: ../clutter/clutter-flow-layout.c:976
+#: ../clutter/deprecated/clutter-table-layout.c:1645
 msgid "Row Spacing"
 msgstr "Rækkemellemrum"
 
-#: ../clutter/clutter-flow-layout.c:940
+#: ../clutter/clutter-flow-layout.c:977
 msgid "The spacing between rows"
 msgstr "Mellemrum mellem rækker"
 
-#: ../clutter/clutter-flow-layout.c:954
+#: ../clutter/clutter-flow-layout.c:991
 msgid "Minimum Column Width"
 msgstr "Mindste kolonnnebredde"
 
-#: ../clutter/clutter-flow-layout.c:955
+#: ../clutter/clutter-flow-layout.c:992
 msgid "Minimum width for each column"
 msgstr "Mindste bredde af hver kolonne"
 
-#: ../clutter/clutter-flow-layout.c:970
+#: ../clutter/clutter-flow-layout.c:1007
 msgid "Maximum Column Width"
 msgstr "Største kolonnebredde"
 
-#: ../clutter/clutter-flow-layout.c:971
+#: ../clutter/clutter-flow-layout.c:1008
 msgid "Maximum width for each column"
 msgstr "Største bredde af hver kolonne"
 
-#: ../clutter/clutter-flow-layout.c:985
+#: ../clutter/clutter-flow-layout.c:1022
 msgid "Minimum Row Height"
 msgstr "Minimum for rækkehøjde"
 
-#: ../clutter/clutter-flow-layout.c:986
+#: ../clutter/clutter-flow-layout.c:1023
 msgid "Minimum height for each row"
 msgstr "Minimumshøjde for hver række"
 
-#: ../clutter/clutter-flow-layout.c:1001
+#: ../clutter/clutter-flow-layout.c:1038
 msgid "Maximum Row Height"
 msgstr "Maksimum for rækkehøjde"
 
-#: ../clutter/clutter-flow-layout.c:1002
+#: ../clutter/clutter-flow-layout.c:1039
 msgid "Maximum height for each row"
 msgstr "Maksimum højde for hver række"
 
-#: ../clutter/clutter-grid-layout.c:1222
+#: ../clutter/clutter-flow-layout.c:1054 ../clutter/clutter-flow-layout.c:1055
+msgid "Snap to grid"
+msgstr "Klæb til gitter"
+
+#: ../clutter/clutter-gesture-action.c:668
+msgid "Number touch points"
+msgstr "Antal berøringspunkter"
+
+#: ../clutter/clutter-gesture-action.c:669
+msgid "Number of touch points"
+msgstr "Antal af berøringspunkter"
+
+#: ../clutter/clutter-gesture-action.c:684
+msgid "Threshold Trigger Edge"
+msgstr "Kantudløsertærskel"
+
+#: ../clutter/clutter-gesture-action.c:685
+msgid "The trigger edge used by the action"
+msgstr "Udløsningskanten, som handlingen bruger"
+
+#: ../clutter/clutter-gesture-action.c:704
+msgid "Threshold Trigger Horizontal Distance"
+msgstr "Vandret afstand for udløsertærskel"
+
+#: ../clutter/clutter-gesture-action.c:705
+msgid "The horizontal trigger distance used by the action"
+msgstr "Den vandrette udløsertærksel, som handlingen bruger"
+
+#: ../clutter/clutter-gesture-action.c:723
+msgid "Threshold Trigger Vertical Distance"
+msgstr "Lodret afstand for udløsertærskel"
+
+#: ../clutter/clutter-gesture-action.c:724
+msgid "The vertical trigger distance used by the action"
+msgstr "Den lodrette udløsertærksel, som handlingen bruger"
+
+#: ../clutter/clutter-grid-layout.c:1223
 msgid "Left attachment"
 msgstr "Venstre vedhæftning"
 
-#: ../clutter/clutter-grid-layout.c:1223
+#: ../clutter/clutter-grid-layout.c:1224
 msgid "The column number to attach the left side of the child to"
 msgstr "Kolonnetallet hvor venstre side af underelementet vedhæftes"
 
-#: ../clutter/clutter-grid-layout.c:1230
+#: ../clutter/clutter-grid-layout.c:1231
 msgid "Top attachment"
 msgstr "Topvedhæftning"
 
-#: ../clutter/clutter-grid-layout.c:1231
+#: ../clutter/clutter-grid-layout.c:1232
 msgid "The row number to attach the top side of a child widget to"
 msgstr "Rækkenummert hvor oversiden af underkontrollen vedhæftes"
 
-#: ../clutter/clutter-grid-layout.c:1239
+#: ../clutter/clutter-grid-layout.c:1240
 msgid "The number of columns that a child spans"
 msgstr "Antallet af kolonner som et underelement spænder over"
 
-#: ../clutter/clutter-grid-layout.c:1246
+#: ../clutter/clutter-grid-layout.c:1247
 msgid "The number of rows that a child spans"
 msgstr "Antallet af rækker som et underelement spænder over"
 
-#: ../clutter/clutter-grid-layout.c:1565
+#: ../clutter/clutter-grid-layout.c:1564
 msgid "Row spacing"
 msgstr "Rækkemellemrum"
 
-#: ../clutter/clutter-grid-layout.c:1566
+#: ../clutter/clutter-grid-layout.c:1565
 msgid "The amount of space between two consecutive rows"
 msgstr "Mængden af plads mellem to på hinanden følgende rækker"
 
-#: ../clutter/clutter-grid-layout.c:1579
+#: ../clutter/clutter-grid-layout.c:1578
 msgid "Column spacing"
 msgstr "Kolonnemellemrum"
 
-#: ../clutter/clutter-grid-layout.c:1580
+#: ../clutter/clutter-grid-layout.c:1579
 msgid "The amount of space between two consecutive columns"
 msgstr "Mængden af plads mellem to på hinanden følgende kolonner"
 
-#: ../clutter/clutter-grid-layout.c:1594
+#: ../clutter/clutter-grid-layout.c:1593
 msgid "Row Homogeneous"
 msgstr "Række homogen"
 
-#: ../clutter/clutter-grid-layout.c:1595
+#: ../clutter/clutter-grid-layout.c:1594
 msgid "If TRUE, the rows are all the same height"
 msgstr "Hvis sand (TRUE), vil rækkerne alle have samme højde"
 
-#: ../clutter/clutter-grid-layout.c:1608
+#: ../clutter/clutter-grid-layout.c:1607
 msgid "Column Homogeneous"
 msgstr "Kolonne homogen"
 
-#: ../clutter/clutter-grid-layout.c:1609
+#: ../clutter/clutter-grid-layout.c:1608
 msgid "If TRUE, the columns are all the same width"
 msgstr "Hvis sand (TRUE), vil kolonnerne alle have samme bredde"
 
-#: ../clutter/clutter-image.c:248 ../clutter/clutter-image.c:311
-#: ../clutter/clutter-image.c:399
+#: ../clutter/clutter-image.c:246 ../clutter/clutter-image.c:309
+#: ../clutter/clutter-image.c:397
 msgid "Unable to load image data"
 msgstr "Kunne ikke indlæse billeddata"
 
-#: ../clutter/clutter-input-device.c:242
+#: ../clutter/clutter-input-device.c:231
 msgid "Id"
 msgstr "Id"
 
-#: ../clutter/clutter-input-device.c:243
+#: ../clutter/clutter-input-device.c:232
 msgid "Unique identifier of the device"
 msgstr "Unik identificering af enheden"
 
-#: ../clutter/clutter-input-device.c:259
+#: ../clutter/clutter-input-device.c:248
 msgid "The name of the device"
 msgstr "Enhedens navn"
 
-#: ../clutter/clutter-input-device.c:273
+#: ../clutter/clutter-input-device.c:262
 msgid "Device Type"
 msgstr "Enhedstype"
 
-#: ../clutter/clutter-input-device.c:274
+#: ../clutter/clutter-input-device.c:263
 msgid "The type of the device"
 msgstr "Enhedens type"
 
-#: ../clutter/clutter-input-device.c:289
+#: ../clutter/clutter-input-device.c:278
 msgid "Device Manager"
 msgstr "Enhedshåndtering"
 
-#: ../clutter/clutter-input-device.c:290
+#: ../clutter/clutter-input-device.c:279
 msgid "The device manager instance"
 msgstr "Instansen af enhedshåndtering"
 
-#: ../clutter/clutter-input-device.c:303
+#: ../clutter/clutter-input-device.c:292
 msgid "Device Mode"
 msgstr "Enhedstilstand"
 
-#: ../clutter/clutter-input-device.c:304
+#: ../clutter/clutter-input-device.c:293
 msgid "The mode of the device"
 msgstr "Enhedens tilstand"
 
-#: ../clutter/clutter-input-device.c:318
+#: ../clutter/clutter-input-device.c:307
 msgid "Has Cursor"
 msgstr "Har markør"
 
-#: ../clutter/clutter-input-device.c:319
+#: ../clutter/clutter-input-device.c:308
 msgid "Whether the device has a cursor"
 msgstr "Om enheden har en markør"
 
-#: ../clutter/clutter-input-device.c:338
+#: ../clutter/clutter-input-device.c:327
 msgid "Whether the device is enabled"
 msgstr "Hvorvidt enheden er aktiveret"
 
-#: ../clutter/clutter-input-device.c:351
+#: ../clutter/clutter-input-device.c:340
 msgid "Number of Axes"
 msgstr "Antal akser"
 
-#: ../clutter/clutter-input-device.c:352
+#: ../clutter/clutter-input-device.c:341
 msgid "The number of axes on the device"
 msgstr "Antallet af akser på enheden"
 
-#: ../clutter/clutter-input-device.c:367
+#: ../clutter/clutter-input-device.c:356
 msgid "The backend instance"
 msgstr "Motorinstansen"
 
-#: ../clutter/clutter-interval.c:506
+#: ../clutter/clutter-interval.c:557
 msgid "Value Type"
 msgstr "Værditype"
 
-#: ../clutter/clutter-interval.c:507
+#: ../clutter/clutter-interval.c:558
 msgid "The type of the values in the interval"
 msgstr "Typer af værdier i intervallet"
 
-#: ../clutter/clutter-interval.c:522
+#: ../clutter/clutter-interval.c:573
 msgid "Initial Value"
 msgstr "Begyndelsesværdi"
 
-#: ../clutter/clutter-interval.c:523
+#: ../clutter/clutter-interval.c:574
 msgid "Initial value of the interval"
 msgstr "Begyndelsesværdi på intervallet"
 
-#: ../clutter/clutter-interval.c:537
+#: ../clutter/clutter-interval.c:588
 msgid "Final Value"
 msgstr "Slutværdi"
 
-#: ../clutter/clutter-interval.c:538
+#: ../clutter/clutter-interval.c:589
 msgid "Final value of the interval"
 msgstr "Slutværdi på intervallet"
 
@@ -1293,96 +1361,96 @@ msgstr "Håndteringen som oprettede disse data"
 #. * Do NOT translate it to non-English e.g. "predefinito:LTR"! If
 #. * it isn't default:LTR or default:RTL it will not work.
 #.
-#: ../clutter/clutter-main.c:795
+#: ../clutter/clutter-main.c:751
 msgid "default:LTR"
 msgstr "default:LTR"
 
-#: ../clutter/clutter-main.c:1669
+#: ../clutter/clutter-main.c:1578
 msgid "Show frames per second"
 msgstr "Vis antal billeder pr. sekund"
 
-#: ../clutter/clutter-main.c:1671
+#: ../clutter/clutter-main.c:1580
 msgid "Default frame rate"
 msgstr "Standardbilledfrekvens"
 
-#: ../clutter/clutter-main.c:1673
+#: ../clutter/clutter-main.c:1582
 msgid "Make all warnings fatal"
 msgstr "Gør alle advarsler fatale"
 
-#: ../clutter/clutter-main.c:1676
+#: ../clutter/clutter-main.c:1585
 msgid "Direction for the text"
 msgstr "Retning for teksten"
 
-#: ../clutter/clutter-main.c:1679
+#: ../clutter/clutter-main.c:1588
 msgid "Disable mipmapping on text"
 msgstr "Slå mipmapping fra i tekst"
 
-#: ../clutter/clutter-main.c:1682
+#: ../clutter/clutter-main.c:1591
 msgid "Use 'fuzzy' picking"
 msgstr "Brug \"blød\" udvælgelse"
 
-#: ../clutter/clutter-main.c:1685
+#: ../clutter/clutter-main.c:1594
 msgid "Clutter debugging flags to set"
 msgstr "Clutter-fejlsøgningsflag der skal sættes"
 
-#: ../clutter/clutter-main.c:1687
+#: ../clutter/clutter-main.c:1596
 msgid "Clutter debugging flags to unset"
 msgstr "Clutter-fejlsøgningsflag der skal fjernes"
 
-#: ../clutter/clutter-main.c:1691
+#: ../clutter/clutter-main.c:1600
 msgid "Clutter profiling flags to set"
 msgstr "Clutter-profileringsflag der skal sættes"
 
-#: ../clutter/clutter-main.c:1693
+#: ../clutter/clutter-main.c:1602
 msgid "Clutter profiling flags to unset"
 msgstr "Clutter-profileringsflag der skal fjernes"
 
-#: ../clutter/clutter-main.c:1696
+#: ../clutter/clutter-main.c:1605
 msgid "Enable accessibility"
 msgstr "Aktivér tilgængelighed"
 
-#: ../clutter/clutter-main.c:1888
+#: ../clutter/clutter-main.c:1797
 msgid "Clutter Options"
 msgstr "Clutter-valgmuligheder"
 
-#: ../clutter/clutter-main.c:1889
+#: ../clutter/clutter-main.c:1798
 msgid "Show Clutter Options"
 msgstr "Vis Clutter-valgmuligheder"
 
-#: ../clutter/clutter-pan-action.c:448
+#: ../clutter/clutter-pan-action.c:455
 msgid "Pan Axis"
 msgstr "Panoreringsakse"
 
-#: ../clutter/clutter-pan-action.c:449
+#: ../clutter/clutter-pan-action.c:456
 msgid "Constraints the panning to an axis"
 msgstr "Begrænser panorering til en akse"
 
-#: ../clutter/clutter-pan-action.c:463
+#: ../clutter/clutter-pan-action.c:470
 msgid "Interpolate"
 msgstr "Interpolér"
 
-#: ../clutter/clutter-pan-action.c:464
+#: ../clutter/clutter-pan-action.c:471
 msgid "Whether interpolated events emission is enabled."
 msgstr "Om interpoleret udsendelse af begivenheder er aktiveret."
 
-#: ../clutter/clutter-pan-action.c:480
+#: ../clutter/clutter-pan-action.c:487
 msgid "Deceleration"
 msgstr "Deceleration"
 
-#: ../clutter/clutter-pan-action.c:481
+#: ../clutter/clutter-pan-action.c:488
 msgid "Rate at which the interpolated panning will decelerate in"
 msgstr "Hastighed hvormed den interpolerede panorering vil decelerere"
 
-#: ../clutter/clutter-pan-action.c:498
+#: ../clutter/clutter-pan-action.c:505
 msgid "Initial acceleration factor"
 msgstr "Begyndelsesaccelerationsfaktor"
 
-#: ../clutter/clutter-pan-action.c:499
+#: ../clutter/clutter-pan-action.c:506
 msgid "Factor applied to the momentum when starting the interpolated phase"
 msgstr "Faktor, som anvendes på impulsen når der startes en interpoleret fase"
 
 #: ../clutter/clutter-path-constraint.c:212
-#: ../clutter/deprecated/clutter-behaviour-path.c:225
+#: ../clutter/deprecated/clutter-behaviour-path.c:221
 msgid "Path"
 msgstr "Sti"
 
@@ -1394,88 +1462,88 @@ msgstr "Stien der bruges til at begrænse en aktør"
 msgid "The offset along the path, between -1.0 and 2.0"
 msgstr "Forskydningen langs stien mellem -1,0 og 2,0"
 
-#: ../clutter/clutter-property-transition.c:271
+#: ../clutter/clutter-property-transition.c:269
 msgid "Property Name"
 msgstr "Egenskabsnavn"
 
-#: ../clutter/clutter-property-transition.c:272
+#: ../clutter/clutter-property-transition.c:270
 msgid "The name of the property to animate"
 msgstr "Navnet på den egenskab som skal animeres"
 
-#: ../clutter/clutter-script.c:466
+#: ../clutter/clutter-script.c:464
 msgid "Filename Set"
 msgstr "Filnavn angivet"
 
-#: ../clutter/clutter-script.c:467
+#: ../clutter/clutter-script.c:465
 msgid "Whether the :filename property is set"
 msgstr "Om egenskaben :filename er angivet"
 
-#: ../clutter/clutter-script.c:481
-#: ../clutter/deprecated/clutter-texture.c:1082
+#: ../clutter/clutter-script.c:479
+#: ../clutter/deprecated/clutter-texture.c:1080
 msgid "Filename"
 msgstr "Filnavn"
 
-#: ../clutter/clutter-script.c:482
+#: ../clutter/clutter-script.c:480
 msgid "The path of the currently parsed file"
 msgstr "Stien af den nu fortolkede fil"
 
-#: ../clutter/clutter-script.c:499
+#: ../clutter/clutter-script.c:497
 msgid "Translation Domain"
 msgstr "Oversættelsesdomæne"
 
-#: ../clutter/clutter-script.c:500
+#: ../clutter/clutter-script.c:498
 msgid "The translation domain used to localize string"
 msgstr "Oversættelsesdomænet som bruges til at lokalisere strengen"
 
-#: ../clutter/clutter-scroll-actor.c:190
+#: ../clutter/clutter-scroll-actor.c:184
 msgid "Scroll Mode"
 msgstr "Rulletilstand"
 
-#: ../clutter/clutter-scroll-actor.c:191
+#: ../clutter/clutter-scroll-actor.c:185
 msgid "The scrolling direction"
 msgstr "Rulleretningen"
 
-#: ../clutter/clutter-settings.c:448
+#: ../clutter/clutter-settings.c:486
 msgid "Double Click Time"
 msgstr "Dobbeltkliktid"
 
-#: ../clutter/clutter-settings.c:449
+#: ../clutter/clutter-settings.c:487
 msgid "The time between clicks necessary to detect a multiple click"
 msgstr ""
 "Tidsrummet mellem klik, som er nødvendigt for registrering af flerdobbelte "
 "klik"
 
-#: ../clutter/clutter-settings.c:464
+#: ../clutter/clutter-settings.c:502
 msgid "Double Click Distance"
 msgstr "Dobbeltklikafstand"
 
-#: ../clutter/clutter-settings.c:465
+#: ../clutter/clutter-settings.c:503
 msgid "The distance between clicks necessary to detect a multiple click"
 msgstr ""
 "Afstanden mellem klik som er nødvendig for registrering af flerdobbelte klik"
 
-#: ../clutter/clutter-settings.c:480
+#: ../clutter/clutter-settings.c:518
 msgid "Drag Threshold"
 msgstr "Trækketærskel"
 
-#: ../clutter/clutter-settings.c:481
+#: ../clutter/clutter-settings.c:519
 msgid "The distance the cursor should travel before starting to drag"
 msgstr "Afstanden som markøren skal flyttes før der startes en trækkeoperation"
 
-#: ../clutter/clutter-settings.c:496 ../clutter/clutter-text.c:3367
+#: ../clutter/clutter-settings.c:534 ../clutter/clutter-text.c:3437
 msgid "Font Name"
 msgstr "Skrifttypenavn"
 
-#: ../clutter/clutter-settings.c:497
+#: ../clutter/clutter-settings.c:535
 msgid ""
 "The description of the default font, as one that could be parsed by Pango"
 msgstr "Beskrivelsen af standardskrifttypen til fortolkning af Pango"
 
-#: ../clutter/clutter-settings.c:512
+#: ../clutter/clutter-settings.c:550
 msgid "Font Antialias"
 msgstr "Skrifttypeudjævning"
 
-#: ../clutter/clutter-settings.c:513
+#: ../clutter/clutter-settings.c:551
 msgid ""
 "Whether to use antialiasing (1 to enable, 0 to disable, and -1 to use the "
 "default)"
@@ -1483,70 +1551,78 @@ msgstr ""
 "Om der skal bruges udjævning/antialiasing (1 for at slå til, 0 for at slå "
 "fra, og -1 for at bruge standardværdien)"
 
-#: ../clutter/clutter-settings.c:529
+#: ../clutter/clutter-settings.c:567 ../clutter/clutter-settings.c:575
 msgid "Font DPI"
 msgstr "Skrifttype-DPI"
 
-#: ../clutter/clutter-settings.c:530
+#: ../clutter/clutter-settings.c:568 ../clutter/clutter-settings.c:576
 msgid ""
 "The resolution of the font, in 1024 * dots/inch, or -1 to use the default"
 msgstr ""
 "Opløsning for skrifttypen angivet i 1024 * punkter/tomme eller -1 for at "
 "bruge standardværdien"
 
-#: ../clutter/clutter-settings.c:546
+#: ../clutter/clutter-settings.c:592
 msgid "Font Hinting"
 msgstr "Skrifttype-hinting"
 
-#: ../clutter/clutter-settings.c:547
+#: ../clutter/clutter-settings.c:593
 msgid ""
 "Whether to use hinting (1 to enable, 0 to disable and -1 to use the default)"
 msgstr ""
 "Om der skal bruges \"hinting\" (1 for at slå til, 0 for at slå fra og -1 for "
 "at bruge standardværdien)"
 
-#: ../clutter/clutter-settings.c:568
+#: ../clutter/clutter-settings.c:613
 msgid "Font Hint Style"
 msgstr "Stil for skrifttype-hint"
 
-#: ../clutter/clutter-settings.c:569
+#: ../clutter/clutter-settings.c:614
 msgid "The style of hinting (hintnone, hintslight, hintmedium, hintfull)"
 msgstr "Stilen til hinting (hintnone, hintslight, hintmedium, hintfull)"
 
 # ?
-#: ../clutter/clutter-settings.c:590
+#: ../clutter/clutter-settings.c:634
 msgid "Font Subpixel Order"
 msgstr "Underpixelrækkefølge for skrifttype"
 
-#: ../clutter/clutter-settings.c:591
+#: ../clutter/clutter-settings.c:635
 msgid "The type of subpixel antialiasing (none, rgb, bgr, vrgb, vbgr)"
 msgstr "Typen af underpixeludjævning (none, rbg, bgr, vrgb, vbgr)"
 
-#: ../clutter/clutter-settings.c:608
+#: ../clutter/clutter-settings.c:652
 msgid "The minimum duration for a long press gesture to be recognized"
 msgstr "Mindste varighed før en langvarig trykkegestus genkendes"
 
-#: ../clutter/clutter-settings.c:615
+#: ../clutter/clutter-settings.c:659
+msgid "Window Scaling Factor"
+msgstr "Vinduesskaleringsfaktor"
+
+#: ../clutter/clutter-settings.c:660
+msgid "The scaling factor to be applied to windows"
+msgstr "Skaleringsfaktoren, som skal anvendes på vinduer"
+
+#: ../clutter/clutter-settings.c:667
 msgid "Fontconfig configuration timestamp"
 msgstr "Konfigurationstidsstempel til fontconfig"
 
-#: ../clutter/clutter-settings.c:616
+#: ../clutter/clutter-settings.c:668
 msgid "Timestamp of the current fontconfig configuration"
 msgstr "Tidsstempel for nuværende fontconfig-konfiguration"
 
-#: ../clutter/clutter-settings.c:633
+#: ../clutter/clutter-settings.c:685
 msgid "Password Hint Time"
 msgstr "Tid for adgangskodefif"
 
-#: ../clutter/clutter-settings.c:634
+#: ../clutter/clutter-settings.c:686
 msgid "How long to show the last input character in hidden entries"
 msgstr "Hvor lang tid det sidst indtastede tegn i skjulte indtastninger vises"
 
-#: ../clutter/clutter-shader-effect.c:486
+#: ../clutter/clutter-shader-effect.c:487
 msgid "Shader Type"
 msgstr "Skyggelæggertype"
 
-#: ../clutter/clutter-shader-effect.c:487
+#: ../clutter/clutter-shader-effect.c:488
 msgid "The type of shader used"
 msgstr "Typen af skyggelægger der bruges"
 
@@ -1574,770 +1650,714 @@ msgstr "Kanten af kilden der skal fastgøres"
 msgid "The offset in pixels to apply to the constraint"
 msgstr "Forskydningen i pixler der anvendes på begrænsningen"
 
-#: ../clutter/clutter-stage.c:1929
+#: ../clutter/clutter-stage.c:1902
 msgid "Fullscreen Set"
 msgstr "Fuldskærm angivet"
 
 # "stage" skal forstås som "scene", jf. "actor"
-#: ../clutter/clutter-stage.c:1930
+#: ../clutter/clutter-stage.c:1903
 msgid "Whether the main stage is fullscreen"
 msgstr "Om hovedscenen er i fuldskærmstilstand"
 
-#: ../clutter/clutter-stage.c:1944
+#: ../clutter/clutter-stage.c:1917
 msgid "Offscreen"
 msgstr "Uden for skærmen"
 
-#: ../clutter/clutter-stage.c:1945
+#: ../clutter/clutter-stage.c:1918
 msgid "Whether the main stage should be rendered offscreen"
 msgstr "Om hovedscenen skal optegnes uden for skærmen"
 
-#: ../clutter/clutter-stage.c:1957 ../clutter/clutter-text.c:3481
+#: ../clutter/clutter-stage.c:1930 ../clutter/clutter-text.c:3551
 msgid "Cursor Visible"
 msgstr "Markør synlig"
 
-#: ../clutter/clutter-stage.c:1958
+#: ../clutter/clutter-stage.c:1931
 msgid "Whether the mouse pointer is visible on the main stage"
 msgstr "Om musemarkøren er synlig på hovedscenen"
 
-#: ../clutter/clutter-stage.c:1972
+#: ../clutter/clutter-stage.c:1945
 msgid "User Resizable"
 msgstr "Bruger kan ændre størrelse"
 
-#: ../clutter/clutter-stage.c:1973
+#: ../clutter/clutter-stage.c:1946
 msgid "Whether the stage is able to be resized via user interaction"
 msgstr "Om brugeren kan indstille scenens størrelse"
 
-#: ../clutter/clutter-stage.c:1988 ../clutter/deprecated/clutter-box.c:260
-#: ../clutter/deprecated/clutter-rectangle.c:273
+#: ../clutter/clutter-stage.c:1961 ../clutter/deprecated/clutter-box.c:254
+#: ../clutter/deprecated/clutter-rectangle.c:270
 msgid "Color"
 msgstr "Farve"
 
-#: ../clutter/clutter-stage.c:1989
+#: ../clutter/clutter-stage.c:1962
 msgid "The color of the stage"
 msgstr "Farven på scenen"
 
-#: ../clutter/clutter-stage.c:2004
+#: ../clutter/clutter-stage.c:1977
 msgid "Perspective"
 msgstr "Perspektiv"
 
-#: ../clutter/clutter-stage.c:2005
+#: ../clutter/clutter-stage.c:1978
 msgid "Perspective projection parameters"
 msgstr "Parametre for perspektivprojektion"
 
-#: ../clutter/clutter-stage.c:2020
+#: ../clutter/clutter-stage.c:1993
 msgid "Title"
 msgstr "Titel"
 
-#: ../clutter/clutter-stage.c:2021
+#: ../clutter/clutter-stage.c:1994
 msgid "Stage Title"
 msgstr "Scenetitel"
 
-#: ../clutter/clutter-stage.c:2038
+#: ../clutter/clutter-stage.c:2011
 msgid "Use Fog"
 msgstr "Brug tåge"
 
-#: ../clutter/clutter-stage.c:2039
+#: ../clutter/clutter-stage.c:2012
 msgid "Whether to enable depth cueing"
 msgstr "Om der skal bruges dybdeperspektiv"
 
-#: ../clutter/clutter-stage.c:2055
+#: ../clutter/clutter-stage.c:2028
 msgid "Fog"
 msgstr "Tåge"
 
-#: ../clutter/clutter-stage.c:2056
+#: ../clutter/clutter-stage.c:2029
 msgid "Settings for the depth cueing"
 msgstr "Indstillinger for dybdeperspektiv"
 
-#: ../clutter/clutter-stage.c:2072
+#: ../clutter/clutter-stage.c:2045
 msgid "Use Alpha"
 msgstr "Brug alfa"
 
-#: ../clutter/clutter-stage.c:2073
+#: ../clutter/clutter-stage.c:2046
 msgid "Whether to honour the alpha component of the stage color"
 msgstr "Om alfakomponenten af scenefarven skal respekteres"
 
 # ?
-#: ../clutter/clutter-stage.c:2089
+#: ../clutter/clutter-stage.c:2062
 msgid "Key Focus"
 msgstr "Primær fokus"
 
 # ?
-#: ../clutter/clutter-stage.c:2090
+#: ../clutter/clutter-stage.c:2063
 msgid "The currently key focused actor"
 msgstr "Nuværende aktør med primær fokus"
 
 # ?
-#: ../clutter/clutter-stage.c:2106
+#: ../clutter/clutter-stage.c:2079
 msgid "No Clear Hint"
 msgstr "Intet klart hint"
 
-#: ../clutter/clutter-stage.c:2107
+#: ../clutter/clutter-stage.c:2080
 msgid "Whether the stage should clear its contents"
 msgstr "Om scenen skal rydde dens indhold"
 
-#: ../clutter/clutter-stage.c:2120
+#: ../clutter/clutter-stage.c:2093
 msgid "Accept Focus"
 msgstr "Acceptér fokus"
 
-#: ../clutter/clutter-stage.c:2121
+#: ../clutter/clutter-stage.c:2094
 msgid "Whether the stage should accept focus on show"
 msgstr "Om scenen skal acceptere fokus ved visning"
 
-#: ../clutter/clutter-table-layout.c:543
-msgid "Column Number"
-msgstr "Kolonnenummer"
-
-#: ../clutter/clutter-table-layout.c:544
-msgid "The column the widget resides in"
-msgstr "Kolonnen som kontrollen bor i"
-
-#: ../clutter/clutter-table-layout.c:551
-msgid "Row Number"
-msgstr "Rækkenummer"
-
-#: ../clutter/clutter-table-layout.c:552
-msgid "The row the widget resides in"
-msgstr "Rækken som kontrollen bor i"
-
-#: ../clutter/clutter-table-layout.c:559
-msgid "Column Span"
-msgstr "Kolonnespænd"
-
-#: ../clutter/clutter-table-layout.c:560
-msgid "The number of columns the widget should span"
-msgstr "Antallet af kolonner som kontrollen skal omfatte"
-
-#: ../clutter/clutter-table-layout.c:567
-msgid "Row Span"
-msgstr "Rækkespænd"
-
-#: ../clutter/clutter-table-layout.c:568
-msgid "The number of rows the widget should span"
-msgstr "Antallet af rækker som kontrollen skal omfatte"
-
-#: ../clutter/clutter-table-layout.c:575
-msgid "Horizontal Expand"
-msgstr "Udvid vandret"
-
-#: ../clutter/clutter-table-layout.c:576
-msgid "Allocate extra space for the child in horizontal axis"
-msgstr "Tildel ekstra plads til underelementet langs vandret akse"
-
-#: ../clutter/clutter-table-layout.c:582
-msgid "Vertical Expand"
-msgstr "Udvid lodret"
-
-#: ../clutter/clutter-table-layout.c:583
-msgid "Allocate extra space for the child in vertical axis"
-msgstr "Tildel ekstra plads til underelementet langs lodret akse"
-
-#: ../clutter/clutter-table-layout.c:1638
-msgid "Spacing between columns"
-msgstr "Mellemrum mellem kolonner"
-
-#: ../clutter/clutter-table-layout.c:1652
-msgid "Spacing between rows"
-msgstr "Mellemrum mellem rækker"
-
-#: ../clutter/clutter-text-buffer.c:351 ../clutter/clutter-text.c:3402
+#: ../clutter/clutter-text-buffer.c:347 ../clutter/clutter-text.c:3472
 msgid "Text"
 msgstr "Tekst"
 
-#: ../clutter/clutter-text-buffer.c:352
+#: ../clutter/clutter-text-buffer.c:348
 msgid "The contents of the buffer"
 msgstr "Indholdet af bufferen"
 
-#: ../clutter/clutter-text-buffer.c:365
+#: ../clutter/clutter-text-buffer.c:361
 msgid "Text length"
 msgstr "Tekstlængde"
 
-#: ../clutter/clutter-text-buffer.c:366
+#: ../clutter/clutter-text-buffer.c:362
 msgid "Length of the text currently in the buffer"
 msgstr "Længden af nuværende tekst i bufferen"
 
-#: ../clutter/clutter-text-buffer.c:379
+#: ../clutter/clutter-text-buffer.c:375
 msgid "Maximum length"
 msgstr "Maksimal længde"
 
-#: ../clutter/clutter-text-buffer.c:380
+#: ../clutter/clutter-text-buffer.c:376
 msgid "Maximum number of characters for this entry. Zero if no maximum"
 msgstr "Maksimalt antal af tegn i denne indtastning. Nul hvis intet maksimum"
 
-#: ../clutter/clutter-text.c:3349
+#: ../clutter/clutter-text.c:3419
 msgid "Buffer"
 msgstr "Buffer"
 
-#: ../clutter/clutter-text.c:3350
+#: ../clutter/clutter-text.c:3420
 msgid "The buffer for the text"
 msgstr "Bufferen for teksten"
 
-#: ../clutter/clutter-text.c:3368
+#: ../clutter/clutter-text.c:3438
 msgid "The font to be used by the text"
 msgstr "Skrifttypen der bruges af teksten"
 
-#: ../clutter/clutter-text.c:3385
+#: ../clutter/clutter-text.c:3455
 msgid "Font Description"
 msgstr "Beskrivelse af skrifttype"
 
-#: ../clutter/clutter-text.c:3386
+#: ../clutter/clutter-text.c:3456
 msgid "The font description to be used"
 msgstr "Skrifttypebeskrivelsen der skal bruges"
 
-#: ../clutter/clutter-text.c:3403
+#: ../clutter/clutter-text.c:3473
 msgid "The text to render"
 msgstr "Tekst der skal vises"
 
-#: ../clutter/clutter-text.c:3417
+#: ../clutter/clutter-text.c:3487
 msgid "Font Color"
 msgstr "Skriftfarve"
 
 # hvad mener de mon med at en skrifttype kan have en farve.  En forfærdelig sætning!
-#: ../clutter/clutter-text.c:3418
+#: ../clutter/clutter-text.c:3488
 msgid "Color of the font used by the text"
 msgstr "Farven af skriften der bruges til teksten"
 
-#: ../clutter/clutter-text.c:3433
+#: ../clutter/clutter-text.c:3503
 msgid "Editable"
 msgstr "Kan redigeres"
 
-#: ../clutter/clutter-text.c:3434
+#: ../clutter/clutter-text.c:3504
 msgid "Whether the text is editable"
 msgstr "Om teksten kan redigeres"
 
-#: ../clutter/clutter-text.c:3449
+#: ../clutter/clutter-text.c:3519
 msgid "Selectable"
 msgstr "Kan vælges"
 
-#: ../clutter/clutter-text.c:3450
+#: ../clutter/clutter-text.c:3520
 msgid "Whether the text is selectable"
 msgstr "Om teksten kan vælges"
 
-#: ../clutter/clutter-text.c:3464
+#: ../clutter/clutter-text.c:3534
 msgid "Activatable"
 msgstr "Kan aktiveres"
 
-#: ../clutter/clutter-text.c:3465
+#: ../clutter/clutter-text.c:3535
 msgid "Whether pressing return causes the activate signal to be emitted"
 msgstr "Om tryk på retur bevirker udsendelse af aktiveringssignalet"
 
-#: ../clutter/clutter-text.c:3482
+#: ../clutter/clutter-text.c:3552
 msgid "Whether the input cursor is visible"
 msgstr "Om inputmarkøren er synlig"
 
-#: ../clutter/clutter-text.c:3496 ../clutter/clutter-text.c:3497
+#: ../clutter/clutter-text.c:3566 ../clutter/clutter-text.c:3567
 msgid "Cursor Color"
 msgstr "Markørfarve"
 
-#: ../clutter/clutter-text.c:3512
+#: ../clutter/clutter-text.c:3582
 msgid "Cursor Color Set"
 msgstr "Markørfave angivet"
 
-#: ../clutter/clutter-text.c:3513
+#: ../clutter/clutter-text.c:3583
 msgid "Whether the cursor color has been set"
 msgstr "Om markørfarven er blevet angivet"
 
-#: ../clutter/clutter-text.c:3528
+#: ../clutter/clutter-text.c:3598
 msgid "Cursor Size"
 msgstr "Markørstørrelse"
 
-#: ../clutter/clutter-text.c:3529
+#: ../clutter/clutter-text.c:3599
 msgid "The width of the cursor, in pixels"
 msgstr "Bredden af markøren i pixler"
 
-#: ../clutter/clutter-text.c:3545 ../clutter/clutter-text.c:3563
+#: ../clutter/clutter-text.c:3615 ../clutter/clutter-text.c:3633
 msgid "Cursor Position"
 msgstr "Markørposition"
 
-#: ../clutter/clutter-text.c:3546 ../clutter/clutter-text.c:3564
+#: ../clutter/clutter-text.c:3616 ../clutter/clutter-text.c:3634
 msgid "The cursor position"
 msgstr "Markørens position"
 
-#: ../clutter/clutter-text.c:3579
+#: ../clutter/clutter-text.c:3649
 msgid "Selection-bound"
 msgstr "Markeringsgrænse"
 
-#: ../clutter/clutter-text.c:3580
+#: ../clutter/clutter-text.c:3650
 msgid "The cursor position of the other end of the selection"
 msgstr "Markørpositionen i den anden ende af markering"
 
-#: ../clutter/clutter-text.c:3595 ../clutter/clutter-text.c:3596
+#: ../clutter/clutter-text.c:3665 ../clutter/clutter-text.c:3666
 msgid "Selection Color"
 msgstr "Markeringsfarve"
 
-#: ../clutter/clutter-text.c:3611
+#: ../clutter/clutter-text.c:3681
 msgid "Selection Color Set"
 msgstr "Markeringsfarve angivet"
 
-#: ../clutter/clutter-text.c:3612
+#: ../clutter/clutter-text.c:3682
 msgid "Whether the selection color has been set"
 msgstr "Om markeringsfarven er blevet angivet"
 
-#: ../clutter/clutter-text.c:3627
+#: ../clutter/clutter-text.c:3697
 msgid "Attributes"
 msgstr "Egenskaber"
 
-#: ../clutter/clutter-text.c:3628
+#: ../clutter/clutter-text.c:3698
 msgid "A list of style attributes to apply to the contents of the actor"
 msgstr "En liste af stilegenskaber som anvendes på aktørens indhold"
 
-#: ../clutter/clutter-text.c:3650
+#: ../clutter/clutter-text.c:3720
 msgid "Use markup"
 msgstr "Brug opmærkning"
 
-#: ../clutter/clutter-text.c:3651
+#: ../clutter/clutter-text.c:3721
 msgid "Whether or not the text includes Pango markup"
 msgstr "Om teksten inkluderer Pango-opmærkning"
 
-#: ../clutter/clutter-text.c:3667
+#: ../clutter/clutter-text.c:3737
 msgid "Line wrap"
 msgstr "Linjeombrydning"
 
-#: ../clutter/clutter-text.c:3668
+#: ../clutter/clutter-text.c:3738
 msgid "If set, wrap the lines if the text becomes too wide"
 msgstr "Hvis angivet, vil tekstlinjer ombrydes når de bliver for lange"
 
-#: ../clutter/clutter-text.c:3683
+#: ../clutter/clutter-text.c:3753
 msgid "Line wrap mode"
 msgstr "Linjeombrydningstilstand"
 
-#: ../clutter/clutter-text.c:3684
+#: ../clutter/clutter-text.c:3754
 msgid "Control how line-wrapping is done"
 msgstr "Styrer hvordan linjer ombrydes"
 
 # se nedenfor
-#: ../clutter/clutter-text.c:3699
+#: ../clutter/clutter-text.c:3769
 msgid "Ellipsize"
 msgstr "Ellipsegrænse"
 
 # ellipsegørelse ~ forkortelse af tekst med tre prikker
-#: ../clutter/clutter-text.c:3700
+#: ../clutter/clutter-text.c:3770
 msgid "The preferred place to ellipsize the string"
 msgstr "Det foretrukne sted at ellipsegøre strengen"
 
-#: ../clutter/clutter-text.c:3716
+#: ../clutter/clutter-text.c:3786
 msgid "Line Alignment"
 msgstr "Linjejustering"
 
-#: ../clutter/clutter-text.c:3717
+#: ../clutter/clutter-text.c:3787
 msgid "The preferred alignment for the string, for multi-line text"
 msgstr "Den foretrukne justering af strengen til flerlinjetekst"
 
 # "Retrieves whether the label should justify the text on both margins."
 # http://www.gnu.org/software/guile-gnome/docs/clutter/html/ClutterLabel.html
-#: ../clutter/clutter-text.c:3733
+#: ../clutter/clutter-text.c:3803
 msgid "Justify"
 msgstr "Lige margener"
 
-#: ../clutter/clutter-text.c:3734
+#: ../clutter/clutter-text.c:3804
 msgid "Whether the text should be justified"
 msgstr "Om teksten skal strækkes til begge margener"
 
-#: ../clutter/clutter-text.c:3749
+#: ../clutter/clutter-text.c:3819
 msgid "Password Character"
 msgstr "Adgangskodetegn"
 
-#: ../clutter/clutter-text.c:3750
+#: ../clutter/clutter-text.c:3820
 msgid "If non-zero, use this character to display the actor's contents"
 msgstr ""
 "Hvis forskelligt fra nul, bruges dette tegn til at vise aktørens tekstindhold"
 
-#: ../clutter/clutter-text.c:3764
+#: ../clutter/clutter-text.c:3834
 msgid "Max Length"
 msgstr "Maksimal længde"
 
-#: ../clutter/clutter-text.c:3765
+#: ../clutter/clutter-text.c:3835
 msgid "Maximum length of the text inside the actor"
 msgstr "Maksimal længde af teksten i aktøren"
 
-#: ../clutter/clutter-text.c:3788
+#: ../clutter/clutter-text.c:3858
 msgid "Single Line Mode"
 msgstr "Enlinjetilstand"
 
-#: ../clutter/clutter-text.c:3789
+#: ../clutter/clutter-text.c:3859
 msgid "Whether the text should be a single line"
 msgstr "Om teksten skal vises i en enkelt linje"
 
-#: ../clutter/clutter-text.c:3803 ../clutter/clutter-text.c:3804
+#: ../clutter/clutter-text.c:3873 ../clutter/clutter-text.c:3874
 msgid "Selected Text Color"
 msgstr "Farve på markeret tekst"
 
-#: ../clutter/clutter-text.c:3819
+#: ../clutter/clutter-text.c:3889
 msgid "Selected Text Color Set"
 msgstr "Farve på markeret tekst angivet"
 
-#: ../clutter/clutter-text.c:3820
+#: ../clutter/clutter-text.c:3890
 msgid "Whether the selected text color has been set"
 msgstr "Om farven på markeret tekst er blevet angivet"
 
-#: ../clutter/clutter-timeline.c:594
-#: ../clutter/deprecated/clutter-animation.c:560
+#: ../clutter/clutter-timeline.c:591
+#: ../clutter/deprecated/clutter-animation.c:506
 msgid "Loop"
 msgstr "Gentagelse"
 
 # afviger fra originalstreng med vilje
-#: ../clutter/clutter-timeline.c:595
+#: ../clutter/clutter-timeline.c:592
 msgid "Should the timeline automatically restart"
 msgstr "Om tidslinjen automatisk genstartes"
 
-#: ../clutter/clutter-timeline.c:609
+#: ../clutter/clutter-timeline.c:606
 msgid "Delay"
 msgstr "Ventetid"
 
-#: ../clutter/clutter-timeline.c:610
+#: ../clutter/clutter-timeline.c:607
 msgid "Delay before start"
 msgstr "Ventetid før start"
 
-#: ../clutter/clutter-timeline.c:625
-#: ../clutter/deprecated/clutter-animation.c:544
-#: ../clutter/deprecated/clutter-animator.c:1804
+#: ../clutter/clutter-timeline.c:622
+#: ../clutter/deprecated/clutter-animation.c:490
+#: ../clutter/deprecated/clutter-animator.c:1792
 #: ../clutter/deprecated/clutter-media.c:224
-#: ../clutter/deprecated/clutter-state.c:1523
+#: ../clutter/deprecated/clutter-state.c:1515
 msgid "Duration"
 msgstr "Varighed"
 
-#: ../clutter/clutter-timeline.c:626
+#: ../clutter/clutter-timeline.c:623
 msgid "Duration of the timeline in milliseconds"
 msgstr "Varighed af tidslinje i millisekunder"
 
-#: ../clutter/clutter-timeline.c:641
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:528
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:337
+#: ../clutter/clutter-timeline.c:638
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:521
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:330
 msgid "Direction"
 msgstr "Retning"
 
-#: ../clutter/clutter-timeline.c:642
+#: ../clutter/clutter-timeline.c:639
 msgid "Direction of the timeline"
 msgstr "Retning på tidslinjen"
 
-#: ../clutter/clutter-timeline.c:657
+#: ../clutter/clutter-timeline.c:654
 msgid "Auto Reverse"
 msgstr "Autoomvending"
 
-#: ../clutter/clutter-timeline.c:658
+#: ../clutter/clutter-timeline.c:655
 msgid "Whether the direction should be reversed when reaching the end"
 msgstr "Om retningen skal vendes når slutningen nås"
 
-#: ../clutter/clutter-timeline.c:676
+#: ../clutter/clutter-timeline.c:673
 msgid "Repeat Count"
 msgstr "Gentagelsesantal"
 
-#: ../clutter/clutter-timeline.c:677
+#: ../clutter/clutter-timeline.c:674
 msgid "How many times the timeline should repeat"
 msgstr "Hvor mange gange tidslinjen skal gentages"
 
-#: ../clutter/clutter-timeline.c:691
+#: ../clutter/clutter-timeline.c:688
 msgid "Progress Mode"
 msgstr "Fremskridtstilstand"
 
-#: ../clutter/clutter-timeline.c:692
+#: ../clutter/clutter-timeline.c:689
 msgid "How the timeline should compute the progress"
 msgstr "Hvordan tidslinjen skal udregne fremskridtet"
 
-#: ../clutter/clutter-transition.c:246
+#: ../clutter/clutter-transition.c:244
 msgid "Interval"
 msgstr "Interval"
 
-#: ../clutter/clutter-transition.c:247
+#: ../clutter/clutter-transition.c:245
 msgid "The interval of values to transition"
 msgstr "Intervallet af værdier til overgang"
 
-#: ../clutter/clutter-transition.c:261
+#: ../clutter/clutter-transition.c:259
 msgid "Animatable"
 msgstr "Animerbar"
 
-#: ../clutter/clutter-transition.c:262
+#: ../clutter/clutter-transition.c:260
 msgid "The animatable object"
 msgstr "Det animerbare objekt"
 
-#: ../clutter/clutter-transition.c:283
+#: ../clutter/clutter-transition.c:281
 msgid "Remove on Complete"
 msgstr "Fjern ved færdiggørelse"
 
-#: ../clutter/clutter-transition.c:284
+#: ../clutter/clutter-transition.c:282
 msgid "Detach the transition when completed"
 msgstr "Frigør overgangen ved færdiggørelse"
 
-#: ../clutter/clutter-zoom-action.c:354
+#: ../clutter/clutter-zoom-action.c:365
 msgid "Zoom Axis"
 msgstr "Zoom-akse"
 
-#: ../clutter/clutter-zoom-action.c:355
+#: ../clutter/clutter-zoom-action.c:366
 msgid "Constraints the zoom to an axis"
 msgstr "Begrænser zoom til en akse"
 
-#: ../clutter/deprecated/clutter-alpha.c:355
-#: ../clutter/deprecated/clutter-animation.c:575
-#: ../clutter/deprecated/clutter-animator.c:1821
+#: ../clutter/deprecated/clutter-alpha.c:347
+#: ../clutter/deprecated/clutter-animation.c:521
+#: ../clutter/deprecated/clutter-animator.c:1809
 msgid "Timeline"
 msgstr "Tidslinje"
 
-#: ../clutter/deprecated/clutter-alpha.c:356
+#: ../clutter/deprecated/clutter-alpha.c:348
 msgid "Timeline used by the alpha"
 msgstr "Tidslinje brugt af alfa"
 
-#: ../clutter/deprecated/clutter-alpha.c:372
+#: ../clutter/deprecated/clutter-alpha.c:364
 msgid "Alpha value"
 msgstr "Alfaværdi"
 
-#: ../clutter/deprecated/clutter-alpha.c:373
+#: ../clutter/deprecated/clutter-alpha.c:365
 msgid "Alpha value as computed by the alpha"
 msgstr "Alfaværdi som udregnet af alfa"
 
-#: ../clutter/deprecated/clutter-alpha.c:394
-#: ../clutter/deprecated/clutter-animation.c:528
+#: ../clutter/deprecated/clutter-alpha.c:386
+#: ../clutter/deprecated/clutter-animation.c:474
 msgid "Mode"
 msgstr "Tilstand"
 
-#: ../clutter/deprecated/clutter-alpha.c:395
+#: ../clutter/deprecated/clutter-alpha.c:387
 msgid "Progress mode"
 msgstr "Fremskridtstilstand"
 
-#: ../clutter/deprecated/clutter-animation.c:511
+#: ../clutter/deprecated/clutter-animation.c:457
 msgid "Object"
 msgstr "Objekt"
 
-#: ../clutter/deprecated/clutter-animation.c:512
+#: ../clutter/deprecated/clutter-animation.c:458
 msgid "Object to which the animation applies"
 msgstr "Objekt for hvilket animationen gælder"
 
-#: ../clutter/deprecated/clutter-animation.c:529
+#: ../clutter/deprecated/clutter-animation.c:475
 msgid "The mode of the animation"
 msgstr "Animationens tilstand"
 
-#: ../clutter/deprecated/clutter-animation.c:545
+#: ../clutter/deprecated/clutter-animation.c:491
 msgid "Duration of the animation, in milliseconds"
 msgstr "Animationens varighed i millisekunder"
 
-#: ../clutter/deprecated/clutter-animation.c:561
+#: ../clutter/deprecated/clutter-animation.c:507
 msgid "Whether the animation should loop"
 msgstr "Hvorvidt animationen skal gentages"
 
-#: ../clutter/deprecated/clutter-animation.c:576
+#: ../clutter/deprecated/clutter-animation.c:522
 msgid "The timeline used by the animation"
 msgstr "Den tidslinje animationen benytter"
 
-#: ../clutter/deprecated/clutter-animation.c:592
-#: ../clutter/deprecated/clutter-behaviour.c:241
+#: ../clutter/deprecated/clutter-animation.c:538
+#: ../clutter/deprecated/clutter-behaviour.c:237
 msgid "Alpha"
 msgstr "Alfa"
 
-#: ../clutter/deprecated/clutter-animation.c:593
+#: ../clutter/deprecated/clutter-animation.c:539
 msgid "The alpha used by the animation"
 msgstr "Alfa brugt af animation"
 
-#: ../clutter/deprecated/clutter-animator.c:1805
+#: ../clutter/deprecated/clutter-animator.c:1793
 msgid "The duration of the animation"
 msgstr "Animationens varighed"
 
-#: ../clutter/deprecated/clutter-animator.c:1822
+#: ../clutter/deprecated/clutter-animator.c:1810
 msgid "The timeline of the animation"
 msgstr "Animationens tidslinje"
 
-#: ../clutter/deprecated/clutter-behaviour.c:242
+#: ../clutter/deprecated/clutter-behaviour.c:238
 msgid "Alpha Object to drive the behaviour"
 msgstr "Alfa-objekt som styrer opførslen"
 
-#: ../clutter/deprecated/clutter-behaviour-depth.c:182
+#: ../clutter/deprecated/clutter-behaviour-depth.c:180
 msgid "Start Depth"
 msgstr "Startdybde"
 
-#: ../clutter/deprecated/clutter-behaviour-depth.c:183
+#: ../clutter/deprecated/clutter-behaviour-depth.c:181
 msgid "Initial depth to apply"
 msgstr "Indledende anvendt dybde"
 
-#: ../clutter/deprecated/clutter-behaviour-depth.c:198
+#: ../clutter/deprecated/clutter-behaviour-depth.c:196
 msgid "End Depth"
 msgstr "Afsluttende dybde"
 
-#: ../clutter/deprecated/clutter-behaviour-depth.c:199
+#: ../clutter/deprecated/clutter-behaviour-depth.c:197
 msgid "Final depth to apply"
 msgstr "Afsluttende anvendt dybde"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:401
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:394
 msgid "Start Angle"
 msgstr "Startvinkel"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:402
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:284
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:395
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:277
 msgid "Initial angle"
 msgstr "Indledende vinkel"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:417
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:410
 msgid "End Angle"
 msgstr "Afsluttende vinkel"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:418
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:302
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:411
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:295
 msgid "Final angle"
 msgstr "Slutvinkel"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:433
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:426
 msgid "Angle x tilt"
 msgstr "x-drejningsvinkel"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:434
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:427
 msgid "Tilt of the ellipse around x axis"
 msgstr "Drejningsvinkel for ellipsen omkring x-aksen"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:449
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:442
 msgid "Angle y tilt"
 msgstr "y-drejningsvinkel"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:450
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:443
 msgid "Tilt of the ellipse around y axis"
 msgstr "Drejningsvinkel for ellipsen omkring y-aksen"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:465
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:458
 msgid "Angle z tilt"
 msgstr "z-drejningsvinkel"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:466
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:459
 msgid "Tilt of the ellipse around z axis"
 msgstr "Drejningsvinkel for ellipsen omkring z-aksen"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:482
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:475
 msgid "Width of the ellipse"
 msgstr "Ellipsens bredde"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:498
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:491
 msgid "Height of ellipse"
 msgstr "Ellipsens højde"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:513
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:506
 msgid "Center"
 msgstr "Centrum"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:514
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:507
 msgid "Center of ellipse"
 msgstr "Ellipsens centrum"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:529
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:338
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:522
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:331
 msgid "Direction of rotation"
 msgstr "Rotationsretning"
 
-#: ../clutter/deprecated/clutter-behaviour-opacity.c:184
+#: ../clutter/deprecated/clutter-behaviour-opacity.c:177
 msgid "Opacity Start"
 msgstr "Startpunkt for uigennemsigtighed"
 
-#: ../clutter/deprecated/clutter-behaviour-opacity.c:185
+#: ../clutter/deprecated/clutter-behaviour-opacity.c:178
 msgid "Initial opacity level"
 msgstr "Indledende uigennemsigtighedsniveau"
 
-#: ../clutter/deprecated/clutter-behaviour-opacity.c:202
+#: ../clutter/deprecated/clutter-behaviour-opacity.c:195
 msgid "Opacity End"
 msgstr "Slutpunkt for uigennemsigtighed"
 
-#: ../clutter/deprecated/clutter-behaviour-opacity.c:203
+#: ../clutter/deprecated/clutter-behaviour-opacity.c:196
 msgid "Final opacity level"
 msgstr "Afsluttende uigennemsigtighedsniveau"
 
-#: ../clutter/deprecated/clutter-behaviour-path.c:226
+#: ../clutter/deprecated/clutter-behaviour-path.c:222
 msgid "The ClutterPath object representing the path to animate along"
 msgstr ""
 "ClutterPath-objektet der repræsenterer stien, langs hvilken der animeres"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:283
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:276
 msgid "Angle Begin"
 msgstr "Vinkels begyndelse"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:301
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:294
 msgid "Angle End"
 msgstr "Vinkels slutning"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:319
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:312
 msgid "Axis"
 msgstr "Akse"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:320
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:313
 msgid "Axis of rotation"
 msgstr "Akses rotation"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:355
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:348
 msgid "Center X"
 msgstr "Centrum X"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:356
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:349
 msgid "X coordinate of the center of rotation"
 msgstr "Rotationscentrums X-koordinat"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:373
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:366
 msgid "Center Y"
 msgstr "Centrum Y"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:374
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:367
 msgid "Y coordinate of the center of rotation"
 msgstr "Rotationscentrums Y-koordinat"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:391
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:384
 msgid "Center Z"
 msgstr "Center Z"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:392
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:385
 msgid "Z coordinate of the center of rotation"
 msgstr "Rotationscentrums Z-koordinat"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:226
+#: ../clutter/deprecated/clutter-behaviour-scale.c:222
 msgid "X Start Scale"
 msgstr "X-startskala"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:227
+#: ../clutter/deprecated/clutter-behaviour-scale.c:223
 msgid "Initial scale on the X axis"
 msgstr "Indledende skala på X-aksen"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:245
+#: ../clutter/deprecated/clutter-behaviour-scale.c:241
 msgid "X End Scale"
 msgstr "X-slutskala"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:246
+#: ../clutter/deprecated/clutter-behaviour-scale.c:242
 msgid "Final scale on the X axis"
 msgstr "Afsluttende skala på X-aksen"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:264
+#: ../clutter/deprecated/clutter-behaviour-scale.c:260
 msgid "Y Start Scale"
 msgstr "Y-startskala"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:265
+#: ../clutter/deprecated/clutter-behaviour-scale.c:261
 msgid "Initial scale on the Y axis"
 msgstr "Indledende skala på Y-aksen"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:283
+#: ../clutter/deprecated/clutter-behaviour-scale.c:279
 msgid "Y End Scale"
 msgstr "Y-slutskala"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:284
+#: ../clutter/deprecated/clutter-behaviour-scale.c:280
 msgid "Final scale on the Y axis"
 msgstr "Afsluttende skala på Y-aksen"
 
-#: ../clutter/deprecated/clutter-box.c:261
+#: ../clutter/deprecated/clutter-box.c:255
 msgid "The background color of the box"
 msgstr "Baggrundsfarve på boksen"
 
-#: ../clutter/deprecated/clutter-box.c:274
+#: ../clutter/deprecated/clutter-box.c:268
 msgid "Color Set"
 msgstr "Farve angivet"
 
-#: ../clutter/deprecated/clutter-cairo-texture.c:597
+#: ../clutter/deprecated/clutter-cairo-texture.c:585
 msgid "Surface Width"
 msgstr "Overfladebredde"
 
-#: ../clutter/deprecated/clutter-cairo-texture.c:598
+#: ../clutter/deprecated/clutter-cairo-texture.c:586
 msgid "The width of the Cairo surface"
 msgstr "Cairo-overfladens bredde"
 
-#: ../clutter/deprecated/clutter-cairo-texture.c:615
+#: ../clutter/deprecated/clutter-cairo-texture.c:603
 msgid "Surface Height"
 msgstr "Overfladehøjde"
 
-#: ../clutter/deprecated/clutter-cairo-texture.c:616
+#: ../clutter/deprecated/clutter-cairo-texture.c:604
 msgid "The height of the Cairo surface"
 msgstr "Cairo-overfladens højde"
 
-#: ../clutter/deprecated/clutter-cairo-texture.c:636
+#: ../clutter/deprecated/clutter-cairo-texture.c:624
 msgid "Auto Resize"
 msgstr "Automatisk størrelse"
 
-#: ../clutter/deprecated/clutter-cairo-texture.c:637
+#: ../clutter/deprecated/clutter-cairo-texture.c:625
 msgid "Whether the surface should match the allocation"
 msgstr "Om overfladen skal tilpasses pladstildelingen"
 
@@ -2409,108 +2429,164 @@ msgstr "Udfyldningsniveauet for bufferen"
 msgid "The duration of the stream, in seconds"
 msgstr "Varigheden af strømmen i sekunder"
 
-#: ../clutter/deprecated/clutter-rectangle.c:274
+#: ../clutter/deprecated/clutter-rectangle.c:271
 msgid "The color of the rectangle"
 msgstr "Rektanglets farve"
 
-#: ../clutter/deprecated/clutter-rectangle.c:287
+#: ../clutter/deprecated/clutter-rectangle.c:284
 msgid "Border Color"
 msgstr "Kantfarve"
 
-#: ../clutter/deprecated/clutter-rectangle.c:288
+#: ../clutter/deprecated/clutter-rectangle.c:285
 msgid "The color of the border of the rectangle"
 msgstr "Farven på rektanglets kant"
 
-#: ../clutter/deprecated/clutter-rectangle.c:303
+#: ../clutter/deprecated/clutter-rectangle.c:300
 msgid "Border Width"
 msgstr "Kantbredde"
 
-#: ../clutter/deprecated/clutter-rectangle.c:304
+#: ../clutter/deprecated/clutter-rectangle.c:301
 msgid "The width of the border of the rectangle"
 msgstr "Bredden af rektanglets kant"
 
-#: ../clutter/deprecated/clutter-rectangle.c:318
+#: ../clutter/deprecated/clutter-rectangle.c:315
 msgid "Has Border"
 msgstr "Har kant"
 
-#: ../clutter/deprecated/clutter-rectangle.c:319
+#: ../clutter/deprecated/clutter-rectangle.c:316
 msgid "Whether the rectangle should have a border"
 msgstr "Om rektanglet skal have en kant"
 
 # ?
-#: ../clutter/deprecated/clutter-shader.c:261
+#: ../clutter/deprecated/clutter-shader.c:257
 msgid "Vertex Source"
 msgstr "Vertex-kilde"
 
 # ?
-#: ../clutter/deprecated/clutter-shader.c:262
+#: ../clutter/deprecated/clutter-shader.c:258
 msgid "Source of vertex shader"
 msgstr "Kilde for vertex-skyggelægger"
 
-#: ../clutter/deprecated/clutter-shader.c:278
+#: ../clutter/deprecated/clutter-shader.c:274
 msgid "Fragment Source"
 msgstr "Fragmentkilde"
 
 # ?
-#: ../clutter/deprecated/clutter-shader.c:279
+#: ../clutter/deprecated/clutter-shader.c:275
 msgid "Source of fragment shader"
 msgstr "Kilde for fragment-skyggelægger"
 
-#: ../clutter/deprecated/clutter-shader.c:296
+#: ../clutter/deprecated/clutter-shader.c:292
 msgid "Compiled"
 msgstr "Kompileret"
 
 # ?
-#: ../clutter/deprecated/clutter-shader.c:297
+#: ../clutter/deprecated/clutter-shader.c:293
 msgid "Whether the shader is compiled and linked"
 msgstr "Om skyggelæggeren er kompileret og lænket"
 
 # ?
-#: ../clutter/deprecated/clutter-shader.c:314
+#: ../clutter/deprecated/clutter-shader.c:310
 msgid "Whether the shader is enabled"
 msgstr "Om skyggelæggeren er aktiveret"
 
-#: ../clutter/deprecated/clutter-shader.c:525
+#: ../clutter/deprecated/clutter-shader.c:521
 #, c-format
 msgid "%s compilation failed: %s"
 msgstr "%s-kompilering fejlet: %s"
 
-#: ../clutter/deprecated/clutter-shader.c:526
+#: ../clutter/deprecated/clutter-shader.c:522
 msgid "Vertex shader"
 msgstr "Vertex-skyggelægger"
 
-#: ../clutter/deprecated/clutter-shader.c:527
+#: ../clutter/deprecated/clutter-shader.c:523
 msgid "Fragment shader"
 msgstr "Fragment-skyggelægger"
 
-#: ../clutter/deprecated/clutter-state.c:1505
+#: ../clutter/deprecated/clutter-state.c:1497
 msgid "State"
 msgstr "Tilstand"
 
-#: ../clutter/deprecated/clutter-state.c:1506
+#: ../clutter/deprecated/clutter-state.c:1498
 msgid "Currently set state, (transition to this state might not be complete)"
 msgstr ""
 "Nuværende tilstand (overgangen til denne tilstand er måske ikke fuldendt)"
 
-#: ../clutter/deprecated/clutter-state.c:1524
+#: ../clutter/deprecated/clutter-state.c:1516
 msgid "Default transition duration"
 msgstr "Standardvarighed af overgang"
 
-#: ../clutter/deprecated/clutter-texture.c:994
+#: ../clutter/deprecated/clutter-table-layout.c:535
+msgid "Column Number"
+msgstr "Kolonnenummer"
+
+#: ../clutter/deprecated/clutter-table-layout.c:536
+msgid "The column the widget resides in"
+msgstr "Kolonnen som kontrollen bor i"
+
+#: ../clutter/deprecated/clutter-table-layout.c:543
+msgid "Row Number"
+msgstr "Rækkenummer"
+
+#: ../clutter/deprecated/clutter-table-layout.c:544
+msgid "The row the widget resides in"
+msgstr "Rækken som kontrollen bor i"
+
+#: ../clutter/deprecated/clutter-table-layout.c:551
+msgid "Column Span"
+msgstr "Kolonnespænd"
+
+#: ../clutter/deprecated/clutter-table-layout.c:552
+msgid "The number of columns the widget should span"
+msgstr "Antallet af kolonner som kontrollen skal omfatte"
+
+#: ../clutter/deprecated/clutter-table-layout.c:559
+msgid "Row Span"
+msgstr "Rækkespænd"
+
+#: ../clutter/deprecated/clutter-table-layout.c:560
+msgid "The number of rows the widget should span"
+msgstr "Antallet af rækker som kontrollen skal omfatte"
+
+#: ../clutter/deprecated/clutter-table-layout.c:567
+msgid "Horizontal Expand"
+msgstr "Udvid vandret"
+
+#: ../clutter/deprecated/clutter-table-layout.c:568
+msgid "Allocate extra space for the child in horizontal axis"
+msgstr "Tildel ekstra plads til underelementet langs vandret akse"
+
+#: ../clutter/deprecated/clutter-table-layout.c:574
+msgid "Vertical Expand"
+msgstr "Udvid lodret"
+
+#: ../clutter/deprecated/clutter-table-layout.c:575
+msgid "Allocate extra space for the child in vertical axis"
+msgstr "Tildel ekstra plads til underelementet langs lodret akse"
+
+#: ../clutter/deprecated/clutter-table-layout.c:1630
+msgid "Spacing between columns"
+msgstr "Mellemrum mellem kolonner"
+
+#: ../clutter/deprecated/clutter-table-layout.c:1646
+msgid "Spacing between rows"
+msgstr "Mellemrum mellem rækker"
+
+#: ../clutter/deprecated/clutter-texture.c:992
 msgid "Sync size of actor"
 msgstr "Synkronisér aktørstørrelse"
 
-#: ../clutter/deprecated/clutter-texture.c:995
+#: ../clutter/deprecated/clutter-texture.c:993
 msgid "Auto sync size of actor to underlying pixbuf dimensions"
 msgstr ""
 "Synkronisér størrelsen af aktøren automatisk med størrelsen af den "
 "underliggende pixbuf"
 
-#: ../clutter/deprecated/clutter-texture.c:1002
+#: ../clutter/deprecated/clutter-texture.c:1000
 msgid "Disable Slicing"
 msgstr "Deaktivér skæring"
 
-#: ../clutter/deprecated/clutter-texture.c:1003
+#: ../clutter/deprecated/clutter-texture.c:1001
 msgid ""
 "Forces the underlying texture to be singular and not made of smaller space "
 "saving individual textures"
@@ -2518,75 +2594,75 @@ msgstr ""
 "Tvinger den underliggende tekstur til at være uopdelt, frem for at være "
 "sammensat af flere mindre teksturer for at spare plads"
 
-#: ../clutter/deprecated/clutter-texture.c:1012
+#: ../clutter/deprecated/clutter-texture.c:1010
 msgid "Tile Waste"
 msgstr "Spild ved fliselægning"
 
-#: ../clutter/deprecated/clutter-texture.c:1013
+#: ../clutter/deprecated/clutter-texture.c:1011
 msgid "Maximum waste area of a sliced texture"
 msgstr "Maksimalt spildområde af en skåret tekstur"
 
-#: ../clutter/deprecated/clutter-texture.c:1021
+#: ../clutter/deprecated/clutter-texture.c:1019
 msgid "Horizontal repeat"
 msgstr "Gentag vandret"
 
-#: ../clutter/deprecated/clutter-texture.c:1022
+#: ../clutter/deprecated/clutter-texture.c:1020
 msgid "Repeat the contents rather than scaling them horizontally"
 msgstr "Gentag indholdet frem for at skalere det vandret"
 
-#: ../clutter/deprecated/clutter-texture.c:1029
+#: ../clutter/deprecated/clutter-texture.c:1027
 msgid "Vertical repeat"
 msgstr "Gentag lodret"
 
-#: ../clutter/deprecated/clutter-texture.c:1030
+#: ../clutter/deprecated/clutter-texture.c:1028
 msgid "Repeat the contents rather than scaling them vertically"
 msgstr "Gentag indholdet frem for at skalere det lodret"
 
-#: ../clutter/deprecated/clutter-texture.c:1037
+#: ../clutter/deprecated/clutter-texture.c:1035
 msgid "Filter Quality"
 msgstr "Filterkvalitet"
 
-#: ../clutter/deprecated/clutter-texture.c:1038
+#: ../clutter/deprecated/clutter-texture.c:1036
 msgid "Rendering quality used when drawing the texture"
 msgstr "Kvalitet til tegning af teksturen"
 
-#: ../clutter/deprecated/clutter-texture.c:1046
+#: ../clutter/deprecated/clutter-texture.c:1044
 msgid "Pixel Format"
 msgstr "Pixelformat"
 
-#: ../clutter/deprecated/clutter-texture.c:1047
+#: ../clutter/deprecated/clutter-texture.c:1045
 msgid "The Cogl pixel format to use"
 msgstr "Cogl-pixelformatet der skal bruges"
 
-#: ../clutter/deprecated/clutter-texture.c:1055
-#: ../clutter/wayland/clutter-wayland-surface.c:449
+#: ../clutter/deprecated/clutter-texture.c:1053
+#: ../clutter/wayland/clutter-wayland-surface.c:445
 msgid "Cogl Texture"
 msgstr "Cogl-tekstur"
 
-#: ../clutter/deprecated/clutter-texture.c:1056
-#: ../clutter/wayland/clutter-wayland-surface.c:450
+#: ../clutter/deprecated/clutter-texture.c:1054
+#: ../clutter/wayland/clutter-wayland-surface.c:446
 msgid "The underlying Cogl texture handle used to draw this actor"
 msgstr ""
 "Det underliggende Cogl-teksturhåndtag der bruges til at tegne denne aktør"
 
-#: ../clutter/deprecated/clutter-texture.c:1063
+#: ../clutter/deprecated/clutter-texture.c:1061
 msgid "Cogl Material"
 msgstr "Cogl-materiale"
 
-#: ../clutter/deprecated/clutter-texture.c:1064
+#: ../clutter/deprecated/clutter-texture.c:1062
 msgid "The underlying Cogl material handle used to draw this actor"
 msgstr ""
 "Det underliggende Cogl-materialehåndtag der bruges til at tegne denne aktør"
 
-#: ../clutter/deprecated/clutter-texture.c:1083
+#: ../clutter/deprecated/clutter-texture.c:1081
 msgid "The path of the file containing the image data"
 msgstr "Stien til filen der indeholder billeddataene"
 
-#: ../clutter/deprecated/clutter-texture.c:1090
+#: ../clutter/deprecated/clutter-texture.c:1088
 msgid "Keep Aspect Ratio"
 msgstr "Bevar højde-/breddeforhold"
 
-#: ../clutter/deprecated/clutter-texture.c:1091
+#: ../clutter/deprecated/clutter-texture.c:1089
 msgid ""
 "Keep the aspect ratio of the texture when requesting the preferred width or "
 "height"
@@ -2594,20 +2670,20 @@ msgstr ""
 "Behold forholdet mellem højde og bredde af teksturen ved forespørgsel om "
 "foretrukken bredde eller højde"
 
-#: ../clutter/deprecated/clutter-texture.c:1119
+#: ../clutter/deprecated/clutter-texture.c:1117
 msgid "Load asynchronously"
 msgstr "Indlæs asynkront"
 
-#: ../clutter/deprecated/clutter-texture.c:1120
+#: ../clutter/deprecated/clutter-texture.c:1118
 msgid ""
 "Load files inside a thread to avoid blocking when loading images from disk"
 msgstr "Indlæs filer inden i en tråd for at undgå blokering"
 
-#: ../clutter/deprecated/clutter-texture.c:1138
+#: ../clutter/deprecated/clutter-texture.c:1136
 msgid "Load data asynchronously"
 msgstr "Indlæs data asynkront"
 
-#: ../clutter/deprecated/clutter-texture.c:1139
+#: ../clutter/deprecated/clutter-texture.c:1137
 msgid ""
 "Decode image data files inside a thread to reduce blocking when loading "
 "images from disk"
@@ -2616,195 +2692,191 @@ msgstr ""
 "indlæsning fra disken"
 
 # ? tror picking er noget med at den bestemmer formen af en aktør
-#: ../clutter/deprecated/clutter-texture.c:1165
+#: ../clutter/deprecated/clutter-texture.c:1163
 msgid "Pick With Alpha"
 msgstr "Udvælg ved hjælp af alfa"
 
-#: ../clutter/deprecated/clutter-texture.c:1166
+#: ../clutter/deprecated/clutter-texture.c:1164
 msgid "Shape actor with alpha channel when picking"
 msgstr "Giv form til aktør ved hjælp af alfakanal når der udvælges"
 
-#: ../clutter/deprecated/clutter-texture.c:1599
-#: ../clutter/deprecated/clutter-texture.c:1994
-#: ../clutter/deprecated/clutter-texture.c:2090
-#: ../clutter/deprecated/clutter-texture.c:2388
+#: ../clutter/deprecated/clutter-texture.c:1597
+#: ../clutter/deprecated/clutter-texture.c:1992
+#: ../clutter/deprecated/clutter-texture.c:2088
+#: ../clutter/deprecated/clutter-texture.c:2386
 #, c-format
 msgid "Failed to load the image data"
 msgstr "Kunne ikke indlæse billeddata"
 
-#: ../clutter/deprecated/clutter-texture.c:1758
+#: ../clutter/deprecated/clutter-texture.c:1756
 #, c-format
 msgid "YUV textures are not supported"
 msgstr "YUV-teksturer understøttes ikke"
 
-#: ../clutter/deprecated/clutter-texture.c:1767
+#: ../clutter/deprecated/clutter-texture.c:1765
 #, c-format
 msgid "YUV2 textues are not supported"
 msgstr "YUV2-teksturer understøttes ikke"
 
-#: ../clutter/evdev/clutter-input-device-evdev.c:159
-msgid "sysfs Path"
-msgstr "Sti til sysfs"
-
-#: ../clutter/evdev/clutter-input-device-evdev.c:160
-msgid "Path of the device in sysfs"
-msgstr "Sti til enheden i sysfs"
-
-#: ../clutter/evdev/clutter-input-device-evdev.c:175
-msgid "Device Path"
-msgstr "Enhedssti"
-
-#: ../clutter/evdev/clutter-input-device-evdev.c:176
-msgid "Path of the device node"
-msgstr "Sti for enhedsknuden"
-
-#: ../clutter/gdk/clutter-backend-gdk.c:287
+#: ../clutter/gdk/clutter-backend-gdk.c:289
 #, c-format
 msgid "Could not find a suitable CoglWinsys for a GdkDisplay of type %s"
 msgstr "Kunne ikke finde en passende CoglWinsys for en GdkDisplay af typen %s"
 
-#: ../clutter/wayland/clutter-wayland-surface.c:423
+#: ../clutter/wayland/clutter-wayland-surface.c:419
 msgid "Surface"
 msgstr "Overflade"
 
-#: ../clutter/wayland/clutter-wayland-surface.c:424
+#: ../clutter/wayland/clutter-wayland-surface.c:420
 msgid "The underlying wayland surface"
 msgstr "Den underliggende wayland-overflade"
 
-#: ../clutter/wayland/clutter-wayland-surface.c:431
+#: ../clutter/wayland/clutter-wayland-surface.c:427
 msgid "Surface width"
 msgstr "Overfladebredde"
 
-#: ../clutter/wayland/clutter-wayland-surface.c:432
+#: ../clutter/wayland/clutter-wayland-surface.c:428
 msgid "The width of the underlying wayland surface"
 msgstr "Bredden af den underliggende wayland-overflade"
 
-#: ../clutter/wayland/clutter-wayland-surface.c:440
+#: ../clutter/wayland/clutter-wayland-surface.c:436
 msgid "Surface height"
 msgstr "Overfladehøjde"
 
-#: ../clutter/wayland/clutter-wayland-surface.c:441
+#: ../clutter/wayland/clutter-wayland-surface.c:437
 msgid "The height of the underlying wayland surface"
 msgstr "Højden af den underliggende wayland-overflade"
 
-#: ../clutter/x11/clutter-backend-x11.c:507
+#: ../clutter/x11/clutter-backend-x11.c:488
 msgid "X display to use"
 msgstr "X-visning der skal bruges"
 
-#: ../clutter/x11/clutter-backend-x11.c:513
+#: ../clutter/x11/clutter-backend-x11.c:494
 msgid "X screen to use"
 msgstr "X-skærm der skal bruges"
 
-#: ../clutter/x11/clutter-backend-x11.c:518
+#: ../clutter/x11/clutter-backend-x11.c:499
 msgid "Make X calls synchronous"
 msgstr "Gør X-kald synkrone"
 
-#: ../clutter/x11/clutter-backend-x11.c:525
+#: ../clutter/x11/clutter-backend-x11.c:506
 msgid "Disable XInput support"
 msgstr "Deaktivér understøttelse af XInput"
 
-#: ../clutter/x11/clutter-keymap-x11.c:322
+#: ../clutter/x11/clutter-keymap-x11.c:458
 msgid "The Clutter backend"
 msgstr "Clutter-motoren"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:539
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:534
 msgid "Pixmap"
 msgstr "Pixmap"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:540
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:535
 msgid "The X11 Pixmap to be bound"
 msgstr "X11-Pixmappen der skal bindes"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:548
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:543
 msgid "Pixmap width"
 msgstr "Pixmapbredde"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:549
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:544
 msgid "The width of the pixmap bound to this texture"
 msgstr "Bredden af pixmappen bundet til denne tekstur"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:557
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:552
 msgid "Pixmap height"
 msgstr "Pixmaphøjde"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:558
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:553
 msgid "The height of the pixmap bound to this texture"
 msgstr "Højden af pixmappen bundet til denne tekstur"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:566
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:561
 msgid "Pixmap Depth"
 msgstr "Pixmapdybde"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:567
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:562
 msgid "The depth (in number of bits) of the pixmap bound to this texture"
 msgstr "Dybden (i antal bit) af pixmappen bundet til denne tekstur"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:575
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:570
 msgid "Automatic Updates"
 msgstr "Automatiske opdateringer"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:576
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:571
 msgid "If the texture should be kept in sync with any pixmap changes."
 msgstr "Om teksturen skal holdes synkroniseret med nogen pixmapændringer."
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:584
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:579
 msgid "Window"
 msgstr "Vindue"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:585
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:580
 msgid "The X11 Window to be bound"
 msgstr "X11-vinduet der skal bindes"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:593
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:588
 msgid "Window Redirect Automatic"
 msgstr "Automatisk vinduesomdirigering"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:594
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:589
 msgid "If composite window redirects are set to Automatic (or Manual if false)"
 msgstr ""
 "Om sammensatte vinduesomdirigeringer er sat til automatisk (eller Manuel "
 "hvis falsk)"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:604
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:599
 msgid "Window Mapped"
 msgstr "Vindue afbildet"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:605
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:600
 msgid "If window is mapped"
 msgstr "Om vindue er afbildet"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:614
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:609
 msgid "Destroyed"
 msgstr "Destrueret"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:615
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:610
 msgid "If window has been destroyed"
 msgstr "Om vinduet er blevet destrueret"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:623
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:618
 msgid "Window X"
 msgstr "Vindue X"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:624
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:619
 msgid "X position of window on screen according to X11"
 msgstr "X-position af vinduet på skærmen ifølge X11"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:632
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:627
 msgid "Window Y"
 msgstr "Vindue Y"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:633
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:628
 msgid "Y position of window on screen according to X11"
 msgstr "Y-position af vinduet på skærmen ifølge X11"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:640
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:635
 msgid "Window Override Redirect"
 msgstr "Vindue tilsidesætter omdirigering"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:641
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:636
 msgid "If this is an override-redirect window"
 msgstr "Om dette er et vindue som tilsidesætter omdirigering"
 
+#~ msgid "sysfs Path"
+#~ msgstr "Sti til sysfs"
+
+#~ msgid "Path of the device in sysfs"
+#~ msgstr "Sti til enheden i sysfs"
+
+#~ msgid "Device Path"
+#~ msgstr "Enhedssti"
+
+#~ msgid "Path of the device node"
+#~ msgstr "Sti for enhedsknuden"
+
 #~ msgid "The layout manager used by the box"
 #~ msgstr "Layouthåndteringen der bruges af boksen"
 
diff --git a/po/de.po b/po/de.po
index 96c24c534..1b9b177ee 100644
--- a/po/de.po
+++ b/po/de.po
@@ -4,7 +4,7 @@
 # Chris Leick <c.leick@vollbio.de>
 # Mario Blättermann <mario.blaettermann@gmail.com>, 2011-2013.
 # Christian Kirbach <Christian.Kirbach@gmail.com>, 2011, 2012.
-# Wolfgang Stöggl <c72578@yahoo.de> 2011-2012.
+# Wolfgang Stöggl <c72578@yahoo.de> 2011-2012, 2014.
 # Tobias Endrigkeit <tobiasendrigkeit@googlemail.com>, 2012.
 #
 msgid ""
@@ -12,708 +12,707 @@ msgstr ""
 "Project-Id-Version: clutter master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=clutter&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2013-02-06 19:31+0000\n"
-"PO-Revision-Date: 2013-03-03 21:18+0100\n"
-"Last-Translator: Mario Blättermann <mario.blaettermann@gmail.com>\n"
+"POT-Creation-Date: 2014-08-18 03:05+0000\n"
+"PO-Revision-Date: 2014-08-18 07:35+0100\n"
+"Last-Translator: Wolfgang Stoeggl <c72578@yahoo.de>\n"
 "Language-Team: Deutsch <gnome-de@gnome.org>\n"
 "Language: de\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"
-"X-Poedit-Language: German\n"
-"X-Poedit-Country: GERMANY\n"
-"X-Generator: Gtranslator 2.91.5\n"
+"X-Generator: Poedit 1.6.7\n"
 
-#: ../clutter/clutter-actor.c:6144
+#: ../clutter/clutter-actor.c:6224
 msgid "X coordinate"
 msgstr "X-Koordinate"
 
-#: ../clutter/clutter-actor.c:6145
+#: ../clutter/clutter-actor.c:6225
 msgid "X coordinate of the actor"
 msgstr "X-Koordinate des Akteurs"
 
-#: ../clutter/clutter-actor.c:6163
+#: ../clutter/clutter-actor.c:6243
 msgid "Y coordinate"
 msgstr "Y-Koordinate"
 
-#: ../clutter/clutter-actor.c:6164
+#: ../clutter/clutter-actor.c:6244
 msgid "Y coordinate of the actor"
 msgstr "Y-Koordinate des Akteurs"
 
-#: ../clutter/clutter-actor.c:6186
+#: ../clutter/clutter-actor.c:6266
 msgid "Position"
 msgstr "Position"
 
-#: ../clutter/clutter-actor.c:6187
+#: ../clutter/clutter-actor.c:6267
 msgid "The position of the origin of the actor"
 msgstr "Die Ursprungsposition des Akteurs"
 
-#: ../clutter/clutter-actor.c:6204 ../clutter/clutter-canvas.c:215
-#: ../clutter/clutter-grid-layout.c:1238
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:481
+#: ../clutter/clutter-actor.c:6284 ../clutter/clutter-canvas.c:247
+#: ../clutter/clutter-grid-layout.c:1239
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:474
 msgid "Width"
 msgstr "Breite"
 
-#: ../clutter/clutter-actor.c:6205
+#: ../clutter/clutter-actor.c:6285
 msgid "Width of the actor"
 msgstr "Breite des Akteurs"
 
-#: ../clutter/clutter-actor.c:6223 ../clutter/clutter-canvas.c:231
-#: ../clutter/clutter-grid-layout.c:1245
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:497
+#: ../clutter/clutter-actor.c:6303 ../clutter/clutter-canvas.c:263
+#: ../clutter/clutter-grid-layout.c:1246
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:490
 msgid "Height"
 msgstr "Höhe"
 
-#: ../clutter/clutter-actor.c:6224
+#: ../clutter/clutter-actor.c:6304
 msgid "Height of the actor"
 msgstr "Höhe des Akteurs"
 
-#: ../clutter/clutter-actor.c:6245
+#: ../clutter/clutter-actor.c:6325
 msgid "Size"
 msgstr "Größe"
 
-#: ../clutter/clutter-actor.c:6246
+#: ../clutter/clutter-actor.c:6326
 msgid "The size of the actor"
 msgstr "Die Größe des Akteurs"
 
-#: ../clutter/clutter-actor.c:6264
+#: ../clutter/clutter-actor.c:6344
 msgid "Fixed X"
 msgstr "Fixiertes X"
 
-#: ../clutter/clutter-actor.c:6265
+#: ../clutter/clutter-actor.c:6345
 msgid "Forced X position of the actor"
 msgstr "Erzwungene X-Position des Akteurs"
 
-#: ../clutter/clutter-actor.c:6282
+#: ../clutter/clutter-actor.c:6362
 msgid "Fixed Y"
 msgstr "Fixiertes Y"
 
-#: ../clutter/clutter-actor.c:6283
+#: ../clutter/clutter-actor.c:6363
 msgid "Forced Y position of the actor"
 msgstr "Erzwungene Y-Position des Akteurs"
 
-#: ../clutter/clutter-actor.c:6298
+#: ../clutter/clutter-actor.c:6378
 msgid "Fixed position set"
 msgstr "Fixierte Position gesetzt"
 
-#: ../clutter/clutter-actor.c:6299
+#: ../clutter/clutter-actor.c:6379
 msgid "Whether to use fixed positioning for the actor"
 msgstr "Legt fest, ob eine fixierte Position für den Akteur verwendet wird"
 
-#: ../clutter/clutter-actor.c:6317
+#: ../clutter/clutter-actor.c:6397
 msgid "Min Width"
 msgstr "Minimale Breite"
 
-#: ../clutter/clutter-actor.c:6318
+#: ../clutter/clutter-actor.c:6398
 msgid "Forced minimum width request for the actor"
 msgstr "Anfrage nach erzwungener minimale Breite des Akteurs"
 
-#: ../clutter/clutter-actor.c:6336
+#: ../clutter/clutter-actor.c:6416
 msgid "Min Height"
 msgstr "Minimale Höhe"
 
-#: ../clutter/clutter-actor.c:6337
+#: ../clutter/clutter-actor.c:6417
 msgid "Forced minimum height request for the actor"
 msgstr "Anfrage nach erzwungener minimale Höhe des Akteurs"
 
-#: ../clutter/clutter-actor.c:6355
+#: ../clutter/clutter-actor.c:6435
 msgid "Natural Width"
 msgstr "Natürliche Breite"
 
-#: ../clutter/clutter-actor.c:6356
+#: ../clutter/clutter-actor.c:6436
 msgid "Forced natural width request for the actor"
 msgstr "Anfrage nach natürlicher Breite des Akteurs"
 
-#: ../clutter/clutter-actor.c:6374
+#: ../clutter/clutter-actor.c:6454
 msgid "Natural Height"
 msgstr "Natürliche Höhe"
 
-#: ../clutter/clutter-actor.c:6375
+#: ../clutter/clutter-actor.c:6455
 msgid "Forced natural height request for the actor"
 msgstr "Anfrage nach natürlicher Höhe des Akteurs"
 
-#: ../clutter/clutter-actor.c:6390
+#: ../clutter/clutter-actor.c:6470
 msgid "Minimum width set"
 msgstr "Minimale Breite gesetzt"
 
-#: ../clutter/clutter-actor.c:6391
+#: ../clutter/clutter-actor.c:6471
 msgid "Whether to use the min-width property"
 msgstr "Legt fest, ob die Eigenschaft »min-width« verwendet werden soll"
 
-#: ../clutter/clutter-actor.c:6405
+#: ../clutter/clutter-actor.c:6485
 msgid "Minimum height set"
 msgstr "Minimale Höhe gesetzt"
 
-#: ../clutter/clutter-actor.c:6406
+#: ../clutter/clutter-actor.c:6486
 msgid "Whether to use the min-height property"
 msgstr "Legt fest, ob die Eigenschaft »min-height« verwendet werden soll"
 
-#: ../clutter/clutter-actor.c:6420
+#: ../clutter/clutter-actor.c:6500
 msgid "Natural width set"
 msgstr "Natürliche Breite gesetzt"
 
-#: ../clutter/clutter-actor.c:6421
+#: ../clutter/clutter-actor.c:6501
 msgid "Whether to use the natural-width property"
 msgstr "Legt fest, ob die Eigenschaft »natural-width« verwendet werden soll"
 
-#: ../clutter/clutter-actor.c:6435
+#: ../clutter/clutter-actor.c:6515
 msgid "Natural height set"
 msgstr "Natürliche Höhe gesetzt"
 
-#: ../clutter/clutter-actor.c:6436
+#: ../clutter/clutter-actor.c:6516
 msgid "Whether to use the natural-height property"
 msgstr "Legt fest, ob die Eigenschaft »natural-height« verwendet werden soll"
 
-#: ../clutter/clutter-actor.c:6452
+#: ../clutter/clutter-actor.c:6532
 msgid "Allocation"
 msgstr "Zuordnung"
 
-#: ../clutter/clutter-actor.c:6453
+#: ../clutter/clutter-actor.c:6533
 msgid "The actor's allocation"
 msgstr "Die Anforderung des Akteurs"
 
-#: ../clutter/clutter-actor.c:6510
+#: ../clutter/clutter-actor.c:6590
 msgid "Request Mode"
 msgstr "Anforderungsmodus"
 
-#: ../clutter/clutter-actor.c:6511
+#: ../clutter/clutter-actor.c:6591
 msgid "The actor's request mode"
 msgstr "Der Anforderungsmodus des Akteurs"
 
-#: ../clutter/clutter-actor.c:6535
+#: ../clutter/clutter-actor.c:6615
 msgid "Depth"
 msgstr "Tiefe"
 
-#: ../clutter/clutter-actor.c:6536
+#: ../clutter/clutter-actor.c:6616
 msgid "Position on the Z axis"
 msgstr "Position auf der Z-Achse"
 
-#: ../clutter/clutter-actor.c:6563
+#: ../clutter/clutter-actor.c:6643
 msgid "Z Position"
 msgstr "Z-Position"
 
-#: ../clutter/clutter-actor.c:6564
+#: ../clutter/clutter-actor.c:6644
 msgid "The actor's position on the Z axis"
 msgstr "Die Position des Akteurs auf der Z-Achse"
 
-#: ../clutter/clutter-actor.c:6581
+#: ../clutter/clutter-actor.c:6661
 msgid "Opacity"
 msgstr "Deckkraft"
 
-#: ../clutter/clutter-actor.c:6582
+#: ../clutter/clutter-actor.c:6662
 msgid "Opacity of an actor"
 msgstr "Deckkraft des Akteurs"
 
-#: ../clutter/clutter-actor.c:6602
+#: ../clutter/clutter-actor.c:6682
 msgid "Offscreen redirect"
 msgstr "Umleitung auf abseits des Bildschirms"
 
-#: ../clutter/clutter-actor.c:6603
+#: ../clutter/clutter-actor.c:6683
 msgid "Flags controlling when to flatten the actor into a single image"
 msgstr "Legt fest, wann der Akteur in ein einziges Bild abgeflacht werden soll"
 
-#: ../clutter/clutter-actor.c:6617
+#: ../clutter/clutter-actor.c:6697
 msgid "Visible"
 msgstr "Sichtbar"
 
-#: ../clutter/clutter-actor.c:6618
+#: ../clutter/clutter-actor.c:6698
 msgid "Whether the actor is visible or not"
 msgstr "Legt fest, ob der Akteur sichtbar ist oder nicht"
 
-#: ../clutter/clutter-actor.c:6632
+#: ../clutter/clutter-actor.c:6712
 msgid "Mapped"
 msgstr "Abgebildet"
 
-#: ../clutter/clutter-actor.c:6633
+#: ../clutter/clutter-actor.c:6713
 msgid "Whether the actor will be painted"
 msgstr "Legt fest, ob der Akteur dargestellt wird"
 
-#: ../clutter/clutter-actor.c:6646
+#: ../clutter/clutter-actor.c:6726
 msgid "Realized"
 msgstr "Realisiert"
 
-#: ../clutter/clutter-actor.c:6647
+#: ../clutter/clutter-actor.c:6727
 msgid "Whether the actor has been realized"
 msgstr "Gibt an, ob der Akteur realisiert wird"
 
-#: ../clutter/clutter-actor.c:6662
+#: ../clutter/clutter-actor.c:6742
 msgid "Reactive"
 msgstr "Reagierend"
 
-#: ../clutter/clutter-actor.c:6663
+#: ../clutter/clutter-actor.c:6743
 msgid "Whether the actor is reactive to events"
 msgstr "Legt fest, ob der Akteur auf Ereignisse reagiert"
 
-#: ../clutter/clutter-actor.c:6674
+#: ../clutter/clutter-actor.c:6754
 msgid "Has Clip"
 msgstr "Clip vorhanden"
 
-#: ../clutter/clutter-actor.c:6675
+#: ../clutter/clutter-actor.c:6755
 msgid "Whether the actor has a clip set"
 msgstr "Gibt an, ob für den Akteur ein Clip gesetzt ist"
 
-#: ../clutter/clutter-actor.c:6688
+#: ../clutter/clutter-actor.c:6768
 msgid "Clip"
 msgstr "Clip"
 
-#: ../clutter/clutter-actor.c:6689
+#: ../clutter/clutter-actor.c:6769
 msgid "The clip region for the actor"
 msgstr "Der Clip-Bereich dieses Akteurs"
 
-#: ../clutter/clutter-actor.c:6708
+#: ../clutter/clutter-actor.c:6788
 msgid "Clip Rectangle"
 msgstr "Clip-Rechteck"
 
-#: ../clutter/clutter-actor.c:6709
+#: ../clutter/clutter-actor.c:6789
 msgid "The visible region of the actor"
 msgstr "Der sichtbare Bereich dieses Akteurs"
 
-#: ../clutter/clutter-actor.c:6723 ../clutter/clutter-actor-meta.c:207
-#: ../clutter/clutter-binding-pool.c:319 ../clutter/clutter-input-device.c:258
+#: ../clutter/clutter-actor.c:6803 ../clutter/clutter-actor-meta.c:205
+#: ../clutter/clutter-binding-pool.c:318 ../clutter/clutter-input-device.c:247
 msgid "Name"
 msgstr "Name"
 
-#: ../clutter/clutter-actor.c:6724
+#: ../clutter/clutter-actor.c:6804
 msgid "Name of the actor"
 msgstr "Name des Akteurs"
 
-#: ../clutter/clutter-actor.c:6745
+#: ../clutter/clutter-actor.c:6825
 msgid "Pivot Point"
 msgstr "Drehpunkt"
 
-#: ../clutter/clutter-actor.c:6746
+#: ../clutter/clutter-actor.c:6826
 msgid "The point around which the scaling and rotation occur"
 msgstr "Der Punkt, um den die Skalierung und die Rotation stattfindet"
 
-#: ../clutter/clutter-actor.c:6764
+#: ../clutter/clutter-actor.c:6844
 msgid "Pivot Point Z"
 msgstr "Z-Drehpunkt"
 
-#: ../clutter/clutter-actor.c:6765
+#: ../clutter/clutter-actor.c:6845
 msgid "Z component of the pivot point"
 msgstr "Z-Komponente des Drehpunktes"
 
-#: ../clutter/clutter-actor.c:6783
+#: ../clutter/clutter-actor.c:6863
 msgid "Scale X"
 msgstr "X-Skalierung"
 
-#: ../clutter/clutter-actor.c:6784
+#: ../clutter/clutter-actor.c:6864
 msgid "Scale factor on the X axis"
 msgstr "Skalierungsfaktor für die X-Achse"
 
-#: ../clutter/clutter-actor.c:6802
+#: ../clutter/clutter-actor.c:6882
 msgid "Scale Y"
 msgstr "Y-Skalierung"
 
-#: ../clutter/clutter-actor.c:6803
+#: ../clutter/clutter-actor.c:6883
 msgid "Scale factor on the Y axis"
 msgstr "Skalierungsfaktor für die Y-Achse"
 
-#: ../clutter/clutter-actor.c:6821
+#: ../clutter/clutter-actor.c:6901
 msgid "Scale Z"
 msgstr "Z-Skalierung"
 
-#: ../clutter/clutter-actor.c:6822
+#: ../clutter/clutter-actor.c:6902
 msgid "Scale factor on the Z axis"
 msgstr "Skalierungsfaktor für die Z-Achse"
 
-#: ../clutter/clutter-actor.c:6840
+#: ../clutter/clutter-actor.c:6920
 msgid "Scale Center X"
 msgstr "Skalierungszentrum X"
 
-#: ../clutter/clutter-actor.c:6841
+#: ../clutter/clutter-actor.c:6921
 msgid "Horizontal scale center"
 msgstr "Horizontales Skalierungszentrum"
 
-#: ../clutter/clutter-actor.c:6859
+#: ../clutter/clutter-actor.c:6939
 msgid "Scale Center Y"
 msgstr "Skalierungszentrum Y"
 
-#: ../clutter/clutter-actor.c:6860
+#: ../clutter/clutter-actor.c:6940
 msgid "Vertical scale center"
 msgstr "Vertikales Skalierungszentrum"
 
-#: ../clutter/clutter-actor.c:6878
+#: ../clutter/clutter-actor.c:6958
 msgid "Scale Gravity"
 msgstr "Skalierungsanziehungskraft"
 
-#: ../clutter/clutter-actor.c:6879
+#: ../clutter/clutter-actor.c:6959
 msgid "The center of scaling"
 msgstr "Skalierungszentrum"
 
-#: ../clutter/clutter-actor.c:6897
+#: ../clutter/clutter-actor.c:6977
 msgid "Rotation Angle X"
 msgstr "Rotationswinkel X"
 
-#: ../clutter/clutter-actor.c:6898
+#: ../clutter/clutter-actor.c:6978
 msgid "The rotation angle on the X axis"
 msgstr "Der Rotationswinkel auf der X-Achse"
 
-#: ../clutter/clutter-actor.c:6916
+#: ../clutter/clutter-actor.c:6996
 msgid "Rotation Angle Y"
 msgstr "Rotationswinkel Y"
 
-#: ../clutter/clutter-actor.c:6917
+#: ../clutter/clutter-actor.c:6997
 msgid "The rotation angle on the Y axis"
 msgstr "Der Rotationswinkel auf der Y-Achse"
 
-#: ../clutter/clutter-actor.c:6935
+#: ../clutter/clutter-actor.c:7015
 msgid "Rotation Angle Z"
 msgstr "Rotationswinkel Z"
 
-#: ../clutter/clutter-actor.c:6936
+#: ../clutter/clutter-actor.c:7016
 msgid "The rotation angle on the Z axis"
 msgstr "Der Rotationswinkel auf der Z-Achse"
 
-#: ../clutter/clutter-actor.c:6954
+#: ../clutter/clutter-actor.c:7034
 msgid "Rotation Center X"
 msgstr "Rotationszentrum X"
 
-#: ../clutter/clutter-actor.c:6955
+#: ../clutter/clutter-actor.c:7035
 msgid "The rotation center on the X axis"
 msgstr "Das Rotationszentrum auf der X-Achse"
 
-#: ../clutter/clutter-actor.c:6972
+#: ../clutter/clutter-actor.c:7052
 msgid "Rotation Center Y"
 msgstr "Rotationszentrum Y"
 
-#: ../clutter/clutter-actor.c:6973
+#: ../clutter/clutter-actor.c:7053
 msgid "The rotation center on the Y axis"
 msgstr "Das Rotationszentrum auf der Y-Achse"
 
-#: ../clutter/clutter-actor.c:6990
+#: ../clutter/clutter-actor.c:7070
 msgid "Rotation Center Z"
 msgstr "Rotationszentrum Z"
 
-#: ../clutter/clutter-actor.c:6991
+#: ../clutter/clutter-actor.c:7071
 msgid "The rotation center on the Z axis"
 msgstr "Das Rotationszentrum auf der Z-Achse"
 
-#: ../clutter/clutter-actor.c:7008
+#: ../clutter/clutter-actor.c:7088
 msgid "Rotation Center Z Gravity"
 msgstr "Anziehungskraft des Rotationszentrums Z"
 
-#: ../clutter/clutter-actor.c:7009
+#: ../clutter/clutter-actor.c:7089
 msgid "Center point for rotation around the Z axis"
 msgstr "Rotationsmittelpunkt um die Z-Achse"
 
-#: ../clutter/clutter-actor.c:7037
+#: ../clutter/clutter-actor.c:7117
 msgid "Anchor X"
 msgstr "Anker X"
 
-#: ../clutter/clutter-actor.c:7038
+#: ../clutter/clutter-actor.c:7118
 msgid "X coordinate of the anchor point"
 msgstr "X-Koordinate des Ankerpunktes"
 
-#: ../clutter/clutter-actor.c:7066
+#: ../clutter/clutter-actor.c:7146
 msgid "Anchor Y"
 msgstr "Anker Y"
 
-#: ../clutter/clutter-actor.c:7067
+#: ../clutter/clutter-actor.c:7147
 msgid "Y coordinate of the anchor point"
 msgstr "Y-Koordinate des Ankerpunktes"
 
-#: ../clutter/clutter-actor.c:7094
+#: ../clutter/clutter-actor.c:7174
 msgid "Anchor Gravity"
 msgstr "Anker-Anziehungskraft"
 
-#: ../clutter/clutter-actor.c:7095
+#: ../clutter/clutter-actor.c:7175
 msgid "The anchor point as a ClutterGravity"
 msgstr "Der Ankerpunkt als ClutterGravity"
 
-#: ../clutter/clutter-actor.c:7114
+#: ../clutter/clutter-actor.c:7194
 msgid "Translation X"
 msgstr "X-Translation"
 
-#: ../clutter/clutter-actor.c:7115
+#: ../clutter/clutter-actor.c:7195
 msgid "Translation along the X axis"
 msgstr "Die Translation entlang der X-Achse"
 
-#: ../clutter/clutter-actor.c:7134
+#: ../clutter/clutter-actor.c:7214
 msgid "Translation Y"
 msgstr "Y-Translation"
 
-#: ../clutter/clutter-actor.c:7135
+#: ../clutter/clutter-actor.c:7215
 msgid "Translation along the Y axis"
 msgstr "Die Translation entlang der Y-Achse"
 
-#: ../clutter/clutter-actor.c:7154
+#: ../clutter/clutter-actor.c:7234
 msgid "Translation Z"
 msgstr "Z-Translation"
 
-#: ../clutter/clutter-actor.c:7155
+#: ../clutter/clutter-actor.c:7235
 msgid "Translation along the Z axis"
 msgstr "Die Translation entlang der Z-Achse"
 
-#: ../clutter/clutter-actor.c:7185
+#: ../clutter/clutter-actor.c:7265
 msgid "Transform"
 msgstr "Transformieren"
 
-#: ../clutter/clutter-actor.c:7186
+#: ../clutter/clutter-actor.c:7266
 msgid "Transformation matrix"
 msgstr "Transformierungsmatrix"
 
-#: ../clutter/clutter-actor.c:7201
+#: ../clutter/clutter-actor.c:7281
 msgid "Transform Set"
 msgstr "Transformation gesetzt"
 
-#: ../clutter/clutter-actor.c:7202
+#: ../clutter/clutter-actor.c:7282
 msgid "Whether the transform property is set"
 msgstr "Gibt an, ob die transform-Eigenschaft gesetzt ist"
 
-#: ../clutter/clutter-actor.c:7223
+#: ../clutter/clutter-actor.c:7303
 msgid "Child Transform"
 msgstr "Unterelement-Transformation"
 
-#: ../clutter/clutter-actor.c:7224
+#: ../clutter/clutter-actor.c:7304
 msgid "Children transformation matrix"
 msgstr "Unterelement-Transformationsmatrix"
 
-#: ../clutter/clutter-actor.c:7239
+#: ../clutter/clutter-actor.c:7319
 msgid "Child Transform Set"
 msgstr "Unterelement-Transformation gesetzt"
 
-#: ../clutter/clutter-actor.c:7240
+#: ../clutter/clutter-actor.c:7320
 msgid "Whether the child-transform property is set"
 msgstr "Gibt an, ob die child-transform-Eigenschaft gesetzt ist"
 
 # If %TRUE, the actor is automatically shown when parented.
-#: ../clutter/clutter-actor.c:7257
+#: ../clutter/clutter-actor.c:7337
 msgid "Show on set parent"
 msgstr "Anzeige bei Überordnung"
 
-#: ../clutter/clutter-actor.c:7258
+#: ../clutter/clutter-actor.c:7338
 msgid "Whether the actor is shown when parented"
 msgstr "Legt fest, ob der Akteur bei Überordnung angezeigt wird"
 
-#: ../clutter/clutter-actor.c:7275
+#: ../clutter/clutter-actor.c:7355
 msgid "Clip to Allocation"
 msgstr "Auf Zuteilung beschneiden"
 
-#: ../clutter/clutter-actor.c:7276
+#: ../clutter/clutter-actor.c:7356
 msgid "Sets the clip region to track the actor's allocation"
 msgstr "Der Zuschneidebereich folgt der Belegung des Akteurs"
 
-#: ../clutter/clutter-actor.c:7289
+#: ../clutter/clutter-actor.c:7369
 msgid "Text Direction"
 msgstr "Textrichtung"
 
-#: ../clutter/clutter-actor.c:7290
+#: ../clutter/clutter-actor.c:7370
 msgid "Direction of the text"
 msgstr "Richtung des Textes"
 
-#: ../clutter/clutter-actor.c:7305
+#: ../clutter/clutter-actor.c:7385
 msgid "Has Pointer"
 msgstr "Besitzt Zeiger"
 
-#: ../clutter/clutter-actor.c:7306
+#: ../clutter/clutter-actor.c:7386
 msgid "Whether the actor contains the pointer of an input device"
 msgstr "Legt fest, ob der Akteur den Zeiger eines Eingabegeräts enthält"
 
-#: ../clutter/clutter-actor.c:7319
+#: ../clutter/clutter-actor.c:7399
 msgid "Actions"
 msgstr "Aktionen"
 
-#: ../clutter/clutter-actor.c:7320
+#: ../clutter/clutter-actor.c:7400
 msgid "Adds an action to the actor"
 msgstr "Fügt dem Akteur eine Aktion hinzu"
 
-#: ../clutter/clutter-actor.c:7333
+#: ../clutter/clutter-actor.c:7413
 msgid "Constraints"
 msgstr "Einschränkungen"
 
-#: ../clutter/clutter-actor.c:7334
+#: ../clutter/clutter-actor.c:7414
 msgid "Adds a constraint to the actor"
 msgstr "Fügt dem Akteur eine Beschränkung hinzu"
 
-#: ../clutter/clutter-actor.c:7347
+#: ../clutter/clutter-actor.c:7427
 msgid "Effect"
 msgstr "Effekt"
 
-#: ../clutter/clutter-actor.c:7348
+#: ../clutter/clutter-actor.c:7428
 msgid "Add an effect to be applied on the actor"
 msgstr "Einen Effekt hinzufügen, der auf den Akteur angewendet werden soll"
 
-#: ../clutter/clutter-actor.c:7362
+#: ../clutter/clutter-actor.c:7442
 msgid "Layout Manager"
 msgstr "Layout-Manager"
 
-#: ../clutter/clutter-actor.c:7363
+#: ../clutter/clutter-actor.c:7443
 msgid "The object controlling the layout of an actor's children"
 msgstr "Das Objekt, welches das Layout des Akteur-Unterelements kontrolliert"
 
-#: ../clutter/clutter-actor.c:7377
+#: ../clutter/clutter-actor.c:7457
 msgid "X Expand"
 msgstr "X-Ausdehnung"
 
 # Controls whether the #ClutterCairoTexture should automatically resize the Cairo surface whenever the actor's allocation changes.
-#: ../clutter/clutter-actor.c:7378
+#: ../clutter/clutter-actor.c:7458
 msgid "Whether extra horizontal space should be assigned to the actor"
 msgstr ""
-"Legt fest, ob zusätzlicher horizontaler Raum dem Akteur zugeordnet werden soll"
+"Legt fest, ob zusätzlicher horizontaler Raum dem Akteur zugeordnet werden "
+"soll"
 
-#: ../clutter/clutter-actor.c:7393
+#: ../clutter/clutter-actor.c:7473
 msgid "Y Expand"
 msgstr "Y-Ausdehnung"
 
 # Controls whether the #ClutterCairoTexture should automatically resize the Cairo surface whenever the actor's allocation changes.
-#: ../clutter/clutter-actor.c:7394
+#: ../clutter/clutter-actor.c:7474
 msgid "Whether extra vertical space should be assigned to the actor"
 msgstr ""
 "Legt fest, ob zusätzlicher vertikaler Raum dem Akteur zugeordnet werden soll"
 
-#: ../clutter/clutter-actor.c:7410
+#: ../clutter/clutter-actor.c:7490
 msgid "X Alignment"
 msgstr "X-Ausrichtung"
 
-#: ../clutter/clutter-actor.c:7411
+#: ../clutter/clutter-actor.c:7491
 msgid "The alignment of the actor on the X axis within its allocation"
 msgstr "Ausrichtung des Akteurs auf der X-Achse innerhalb dessen Zuordnung"
 
-#: ../clutter/clutter-actor.c:7426
+#: ../clutter/clutter-actor.c:7506
 msgid "Y Alignment"
 msgstr "Y-Ausrichtung"
 
-#: ../clutter/clutter-actor.c:7427
+#: ../clutter/clutter-actor.c:7507
 msgid "The alignment of the actor on the Y axis within its allocation"
 msgstr "Ausrichtung des Akteurs auf der Y-Achse innerhalb dessen Zuordnung"
 
-#: ../clutter/clutter-actor.c:7446
+#: ../clutter/clutter-actor.c:7526
 msgid "Margin Top"
 msgstr "Abstand Oben"
 
-#: ../clutter/clutter-actor.c:7447
+#: ../clutter/clutter-actor.c:7527
 msgid "Extra space at the top"
 msgstr "Zusätzlicher Abstand oben"
 
-#: ../clutter/clutter-actor.c:7468
+#: ../clutter/clutter-actor.c:7548
 msgid "Margin Bottom"
 msgstr "Abstand Unten"
 
-#: ../clutter/clutter-actor.c:7469
+#: ../clutter/clutter-actor.c:7549
 msgid "Extra space at the bottom"
 msgstr "Zusätzlicher Abstand unten"
 
-#: ../clutter/clutter-actor.c:7490
+#: ../clutter/clutter-actor.c:7570
 msgid "Margin Left"
 msgstr "Abstand Links"
 
-#: ../clutter/clutter-actor.c:7491
+#: ../clutter/clutter-actor.c:7571
 msgid "Extra space at the left"
 msgstr "Zusätzlicher Abstand links"
 
-#: ../clutter/clutter-actor.c:7512
+#: ../clutter/clutter-actor.c:7592
 msgid "Margin Right"
 msgstr "Abstand Rechts"
 
-#: ../clutter/clutter-actor.c:7513
+#: ../clutter/clutter-actor.c:7593
 msgid "Extra space at the right"
 msgstr "Zusätzlicher Abstand rechts"
 
-#: ../clutter/clutter-actor.c:7529
+#: ../clutter/clutter-actor.c:7609
 msgid "Background Color Set"
 msgstr "Hintergrund-Farbpalette"
 
-#: ../clutter/clutter-actor.c:7530 ../clutter/deprecated/clutter-box.c:275
+#: ../clutter/clutter-actor.c:7610 ../clutter/deprecated/clutter-box.c:269
 msgid "Whether the background color is set"
 msgstr "Legt fest, ob die Hintergrundfarbe gesetzt ist"
 
-#: ../clutter/clutter-actor.c:7546
+#: ../clutter/clutter-actor.c:7626
 msgid "Background color"
 msgstr "Hintergrundfarbe"
 
-#: ../clutter/clutter-actor.c:7547
+#: ../clutter/clutter-actor.c:7627
 msgid "The actor's background color"
 msgstr "Die Hintergrundfarbe des Akteurs"
 
-#: ../clutter/clutter-actor.c:7562
+#: ../clutter/clutter-actor.c:7642
 msgid "First Child"
 msgstr "Erstes Unterobjekt"
 
-#: ../clutter/clutter-actor.c:7563
+#: ../clutter/clutter-actor.c:7643
 msgid "The actor's first child"
 msgstr "Das erste Unterelement des Akteurs"
 
-#: ../clutter/clutter-actor.c:7576
+#: ../clutter/clutter-actor.c:7656
 msgid "Last Child"
 msgstr "Letztes Unterobjekt"
 
-#: ../clutter/clutter-actor.c:7577
+#: ../clutter/clutter-actor.c:7657
 msgid "The actor's last child"
 msgstr "Die letzte Unterebene des Akteurs"
 
-#: ../clutter/clutter-actor.c:7591
+#: ../clutter/clutter-actor.c:7671
 msgid "Content"
 msgstr "Inhalt"
 
-#: ../clutter/clutter-actor.c:7592
+#: ../clutter/clutter-actor.c:7672
 msgid "Delegate object for painting the actor's content"
 msgstr "Das Vertreter-Objekt zum Darstellen des Inhalts des Akteurs"
 
-#: ../clutter/clutter-actor.c:7617
+#: ../clutter/clutter-actor.c:7697
 msgid "Content Gravity"
 msgstr "Schwerkraft des Inhalts"
 
-#: ../clutter/clutter-actor.c:7618
+#: ../clutter/clutter-actor.c:7698
 msgid "Alignment of the actor's content"
 msgstr "Ausrichtung des Inhalts der Akteurs"
 
-#: ../clutter/clutter-actor.c:7638
+#: ../clutter/clutter-actor.c:7718
 msgid "Content Box"
 msgstr "Inhalts-Box"
 
-#: ../clutter/clutter-actor.c:7639
+#: ../clutter/clutter-actor.c:7719
 msgid "The bounding box of the actor's content"
 msgstr "Die Begrenzung des Inhalts des Akteurs"
 
-#: ../clutter/clutter-actor.c:7647
+#: ../clutter/clutter-actor.c:7727
 msgid "Minification Filter"
 msgstr "Verkleinerungsfilter"
 
-#: ../clutter/clutter-actor.c:7648
+#: ../clutter/clutter-actor.c:7728
 msgid "The filter used when reducing the size of the content"
 msgstr "Das für das Verringern der Inhaltsgröße zu verwendende Filter"
 
-#: ../clutter/clutter-actor.c:7655
+#: ../clutter/clutter-actor.c:7735
 msgid "Magnification Filter"
 msgstr "Vergrößerungsfilter"
 
-#: ../clutter/clutter-actor.c:7656
+#: ../clutter/clutter-actor.c:7736
 msgid "The filter used when increasing the size of the content"
 msgstr "Das für das Vergrößern der Inhaltsgröße zu verwendende Filter"
 
-#: ../clutter/clutter-actor.c:7670
+#: ../clutter/clutter-actor.c:7750
 msgid "Content Repeat"
 msgstr "Inhaltswiederholung"
 
-#: ../clutter/clutter-actor.c:7671
+#: ../clutter/clutter-actor.c:7751
 msgid "The repeat policy for the actor's content"
 msgstr "Die Wiederholungsregeln für den Inhalt des Akteurs"
 
-#: ../clutter/clutter-actor-meta.c:193 ../clutter/clutter-child-meta.c:142
+#: ../clutter/clutter-actor-meta.c:191 ../clutter/clutter-child-meta.c:142
 msgid "Actor"
 msgstr "Akteur"
 
-#: ../clutter/clutter-actor-meta.c:194
+#: ../clutter/clutter-actor-meta.c:192
 msgid "The actor attached to the meta"
 msgstr "Der an den Meta angehängte Akteur"
 
-#: ../clutter/clutter-actor-meta.c:208
+#: ../clutter/clutter-actor-meta.c:206
 msgid "The name of the meta"
 msgstr "Der Name des Meta"
 
-#: ../clutter/clutter-actor-meta.c:221 ../clutter/clutter-input-device.c:337
-#: ../clutter/deprecated/clutter-shader.c:313
+#: ../clutter/clutter-actor-meta.c:219 ../clutter/clutter-input-device.c:326
+#: ../clutter/deprecated/clutter-shader.c:309
 msgid "Enabled"
 msgstr "Aktiviert"
 
-#: ../clutter/clutter-actor-meta.c:222
+#: ../clutter/clutter-actor-meta.c:220
 msgid "Whether the meta is enabled"
 msgstr "Legt fest, ob der Meta aktiviert wird"
 
 #: ../clutter/clutter-align-constraint.c:279
-#: ../clutter/clutter-bind-constraint.c:358 ../clutter/clutter-clone.c:345
+#: ../clutter/clutter-bind-constraint.c:343 ../clutter/clutter-clone.c:341
 #: ../clutter/clutter-snap-constraint.c:321
 msgid "Source"
 msgstr "Quelle"
@@ -739,87 +738,91 @@ msgstr "Faktor"
 msgid "The alignment factor, between 0.0 and 1.0"
 msgstr "Der Ausrichtungsfaktor (zwischen 0.0 und 1.0)"
 
-#: ../clutter/clutter-backend.c:379
+#: ../clutter/clutter-backend.c:380
 msgid "Unable to initialize the Clutter backend"
 msgstr "Initialisierung des Clutter-Backends nicht möglich"
 
-#: ../clutter/clutter-backend.c:453
+#: ../clutter/clutter-backend.c:454
 #, c-format
 msgid "The backend of type '%s' does not support creating multiple stages"
 msgstr ""
 "Das Backend vom Typ »%s« unterstützt nicht das Erstellen von mehreren "
 "Hauptszenen"
 
-#: ../clutter/clutter-bind-constraint.c:359
+#: ../clutter/clutter-bind-constraint.c:344
 msgid "The source of the binding"
 msgstr "Die Quelle der Bindung"
 
-#: ../clutter/clutter-bind-constraint.c:372
+#: ../clutter/clutter-bind-constraint.c:357
 msgid "Coordinate"
 msgstr "Koordinate"
 
-#: ../clutter/clutter-bind-constraint.c:373
+#: ../clutter/clutter-bind-constraint.c:358
 msgid "The coordinate to bind"
 msgstr "Die zu bindende Koordinate"
 
-#: ../clutter/clutter-bind-constraint.c:387
+#: ../clutter/clutter-bind-constraint.c:372
 #: ../clutter/clutter-path-constraint.c:226
 #: ../clutter/clutter-snap-constraint.c:366
 msgid "Offset"
 msgstr "Versatz"
 
-#: ../clutter/clutter-bind-constraint.c:388
+#: ../clutter/clutter-bind-constraint.c:373
 msgid "The offset in pixels to apply to the binding"
 msgstr "Der Versatz in Pixeln, der auf die Bindung angewendet werden soll"
 
-#: ../clutter/clutter-binding-pool.c:320
+#: ../clutter/clutter-binding-pool.c:319
 msgid "The unique name of the binding pool"
 msgstr "Der eindeutige Name des Bindungs-Pools"
 
-#: ../clutter/clutter-bin-layout.c:240 ../clutter/clutter-bin-layout.c:655
-#: ../clutter/clutter-box-layout.c:390 ../clutter/clutter-table-layout.c:610
+#: ../clutter/clutter-bin-layout.c:220 ../clutter/clutter-bin-layout.c:633
+#: ../clutter/clutter-box-layout.c:374
+#: ../clutter/deprecated/clutter-table-layout.c:602
 msgid "Horizontal Alignment"
 msgstr "Horizontale Ausrichtung"
 
-#: ../clutter/clutter-bin-layout.c:241
+#: ../clutter/clutter-bin-layout.c:221
 msgid "Horizontal alignment for the actor inside the layout manager"
 msgstr "Horizontal Ausrichtung des Akteurs innerhalb des Layout-Managers"
 
-#: ../clutter/clutter-bin-layout.c:249 ../clutter/clutter-bin-layout.c:675
-#: ../clutter/clutter-box-layout.c:399 ../clutter/clutter-table-layout.c:625
+#: ../clutter/clutter-bin-layout.c:229 ../clutter/clutter-bin-layout.c:653
+#: ../clutter/clutter-box-layout.c:383
+#: ../clutter/deprecated/clutter-table-layout.c:617
 msgid "Vertical Alignment"
 msgstr "Vertikale Ausrichtung"
 
-#: ../clutter/clutter-bin-layout.c:250
+#: ../clutter/clutter-bin-layout.c:230
 msgid "Vertical alignment for the actor inside the layout manager"
 msgstr "Vertikale Ausrichtung des Akteurs innerhalb des Layout-Managers"
 
-#: ../clutter/clutter-bin-layout.c:656
+#: ../clutter/clutter-bin-layout.c:634
 msgid "Default horizontal alignment for the actors inside the layout manager"
 msgstr ""
 "Voreingestellte horizontale Ausrichtung des Akteurs innerhalb des Layout-"
 "Managers"
 
-#: ../clutter/clutter-bin-layout.c:676
+#: ../clutter/clutter-bin-layout.c:654
 msgid "Default vertical alignment for the actors inside the layout manager"
 msgstr ""
 "Voreingestellte vertikale Ausrichtung des Akteurs innerhalb des Layout-"
 "Managers"
 
-#: ../clutter/clutter-box-layout.c:365
+#: ../clutter/clutter-box-layout.c:349
 msgid "Expand"
 msgstr "Ausdehnen"
 
 # Nur ein Vorschlag, aber »Kind« finde ich in dem Zusammenhang scheußlich
-#: ../clutter/clutter-box-layout.c:366
+#: ../clutter/clutter-box-layout.c:350
 msgid "Allocate extra space for the child"
 msgstr "Zusätzlichen Platz für das Unterelement anfordern"
 
-#: ../clutter/clutter-box-layout.c:372 ../clutter/clutter-table-layout.c:589
+#: ../clutter/clutter-box-layout.c:356
+#: ../clutter/deprecated/clutter-table-layout.c:581
 msgid "Horizontal Fill"
 msgstr "Horizontale Füllung"
 
-#: ../clutter/clutter-box-layout.c:373 ../clutter/clutter-table-layout.c:590
+#: ../clutter/clutter-box-layout.c:357
+#: ../clutter/deprecated/clutter-table-layout.c:582
 msgid ""
 "Whether the child should receive priority when the container is allocating "
 "spare space on the horizontal axis"
@@ -827,11 +830,13 @@ msgstr ""
 "Legt fest, ob das Unterelement bevorzugt behandelt werden soll, wenn der "
 "Container freien Platz auf der horizontalen Achse zuweist"
 
-#: ../clutter/clutter-box-layout.c:381 ../clutter/clutter-table-layout.c:596
+#: ../clutter/clutter-box-layout.c:365
+#: ../clutter/deprecated/clutter-table-layout.c:588
 msgid "Vertical Fill"
 msgstr "Vertikale Füllung"
 
-#: ../clutter/clutter-box-layout.c:382 ../clutter/clutter-table-layout.c:597
+#: ../clutter/clutter-box-layout.c:366
+#: ../clutter/deprecated/clutter-table-layout.c:589
 msgid ""
 "Whether the child should receive priority when the container is allocating "
 "spare space on the vertical axis"
@@ -839,80 +844,88 @@ msgstr ""
 "Legt fest, ob das Unterelement bevorzugt behandelt werden soll, wenn der "
 "Container freien Platz auf der vertikalen Achse zuweist"
 
-#: ../clutter/clutter-box-layout.c:391 ../clutter/clutter-table-layout.c:611
+#: ../clutter/clutter-box-layout.c:375
+#: ../clutter/deprecated/clutter-table-layout.c:603
 msgid "Horizontal alignment of the actor within the cell"
 msgstr "Horizontal Ausrichtung des Akteurs innerhalb der Zelle"
 
-#: ../clutter/clutter-box-layout.c:400 ../clutter/clutter-table-layout.c:626
+#: ../clutter/clutter-box-layout.c:384
+#: ../clutter/deprecated/clutter-table-layout.c:618
 msgid "Vertical alignment of the actor within the cell"
 msgstr "Vertikale Ausrichtung des Akteurs innerhalb der Zelle"
 
-#: ../clutter/clutter-box-layout.c:1365
+#: ../clutter/clutter-box-layout.c:1345
 msgid "Vertical"
 msgstr "Vertikal"
 
-#: ../clutter/clutter-box-layout.c:1366
+#: ../clutter/clutter-box-layout.c:1346
 msgid "Whether the layout should be vertical, rather than horizontal"
 msgstr "Legt fest, ob das Layout vertikal statt horizontal sein soll"
 
-#: ../clutter/clutter-box-layout.c:1383 ../clutter/clutter-flow-layout.c:890
-#: ../clutter/clutter-grid-layout.c:1550
+#: ../clutter/clutter-box-layout.c:1363 ../clutter/clutter-flow-layout.c:927
+#: ../clutter/clutter-grid-layout.c:1549
 msgid "Orientation"
 msgstr "Ausrichtung"
 
-#: ../clutter/clutter-box-layout.c:1384 ../clutter/clutter-flow-layout.c:891
-#: ../clutter/clutter-grid-layout.c:1551
+#: ../clutter/clutter-box-layout.c:1364 ../clutter/clutter-flow-layout.c:928
+#: ../clutter/clutter-grid-layout.c:1550
 msgid "The orientation of the layout"
 msgstr "Die Ausrichtung des Layouts"
 
-#: ../clutter/clutter-box-layout.c:1400 ../clutter/clutter-flow-layout.c:906
+#: ../clutter/clutter-box-layout.c:1380 ../clutter/clutter-flow-layout.c:943
 msgid "Homogeneous"
 msgstr "Gleichmäßig"
 
-#: ../clutter/clutter-box-layout.c:1401
+#: ../clutter/clutter-box-layout.c:1381
 msgid ""
 "Whether the layout should be homogeneous, i.e. all childs get the same size"
 msgstr ""
-"Legt fest, ob das Layout gleichmäßig sein soll, d.h. alle Unterelemente haben "
-"die gleiche Größe"
+"Legt fest, ob das Layout gleichmäßig sein soll, d.h. alle Unterelemente "
+"haben die gleiche Größe"
 
-#: ../clutter/clutter-box-layout.c:1416
+#: ../clutter/clutter-box-layout.c:1396
 msgid "Pack Start"
 msgstr "Packen am Beginn"
 
-#: ../clutter/clutter-box-layout.c:1417
+#: ../clutter/clutter-box-layout.c:1397
 msgid "Whether to pack items at the start of the box"
 msgstr "Gibt an, ob Objekte am Beginn der Box gepackt werden sollen"
 
-#: ../clutter/clutter-box-layout.c:1430
+#: ../clutter/clutter-box-layout.c:1410
 msgid "Spacing"
 msgstr "Abstand"
 
-#: ../clutter/clutter-box-layout.c:1431
+#: ../clutter/clutter-box-layout.c:1411
 msgid "Spacing between children"
 msgstr "Abstand zwischen Unterelementen"
 
-#: ../clutter/clutter-box-layout.c:1448 ../clutter/clutter-table-layout.c:1675
+#: ../clutter/clutter-box-layout.c:1428
+#: ../clutter/deprecated/clutter-table-layout.c:1669
 msgid "Use Animations"
 msgstr "Animationen verwenden"
 
-#: ../clutter/clutter-box-layout.c:1449 ../clutter/clutter-table-layout.c:1676
+#: ../clutter/clutter-box-layout.c:1429
+#: ../clutter/deprecated/clutter-table-layout.c:1670
 msgid "Whether layout changes should be animated"
 msgstr "Legt fest, ob Layout-Änderungen animiert werden sollen"
 
-#: ../clutter/clutter-box-layout.c:1473 ../clutter/clutter-table-layout.c:1700
+#: ../clutter/clutter-box-layout.c:1453
+#: ../clutter/deprecated/clutter-table-layout.c:1694
 msgid "Easing Mode"
 msgstr "Easing-Modus"
 
-#: ../clutter/clutter-box-layout.c:1474 ../clutter/clutter-table-layout.c:1701
+#: ../clutter/clutter-box-layout.c:1454
+#: ../clutter/deprecated/clutter-table-layout.c:1695
 msgid "The easing mode of the animations"
 msgstr "Der Easing-Modus der Animationen"
 
-#: ../clutter/clutter-box-layout.c:1494 ../clutter/clutter-table-layout.c:1721
+#: ../clutter/clutter-box-layout.c:1474
+#: ../clutter/deprecated/clutter-table-layout.c:1715
 msgid "Easing Duration"
 msgstr "Easing-Dauer"
 
-#: ../clutter/clutter-box-layout.c:1495 ../clutter/clutter-table-layout.c:1722
+#: ../clutter/clutter-box-layout.c:1475
+#: ../clutter/deprecated/clutter-table-layout.c:1716
 msgid "The duration of the animations"
 msgstr "Die Dauer der Animationen"
 
@@ -932,14 +945,30 @@ msgstr "Kontrast"
 msgid "The contrast change to apply"
 msgstr "Die anzuwendende Kontraständerung"
 
-#: ../clutter/clutter-canvas.c:216
+#: ../clutter/clutter-canvas.c:248
 msgid "The width of the canvas"
 msgstr "Die Breite der Zeichenfläche"
 
-#: ../clutter/clutter-canvas.c:232
+#: ../clutter/clutter-canvas.c:264
 msgid "The height of the canvas"
 msgstr "Die Höhe der Zeichenfläche"
 
+#: ../clutter/clutter-canvas.c:283
+msgid "Scale Factor Set"
+msgstr "Skalierungsfaktor festgelegt"
+
+#: ../clutter/clutter-canvas.c:284
+msgid "Whether the scale-factor property is set"
+msgstr "Gibt an, ob die Eigenschaft scale-factor gesetzt ist"
+
+#: ../clutter/clutter-canvas.c:305
+msgid "Scale Factor"
+msgstr "Skalierungsfaktor"
+
+#: ../clutter/clutter-canvas.c:306
+msgid "The scaling factor for the surface"
+msgstr "Der Skalierungsfaktor für die Zeichenfläche"
+
 #: ../clutter/clutter-child-meta.c:127
 msgid "Container"
 msgstr "Container"
@@ -952,40 +981,40 @@ msgstr "Der Container, der diese Daten erzeugt hat"
 msgid "The actor wrapped by this data"
 msgstr "Der durch diese Daten eingefasste Akteur"
 
-#: ../clutter/clutter-click-action.c:559
+#: ../clutter/clutter-click-action.c:586
 msgid "Pressed"
 msgstr "Gedrückt"
 
-#: ../clutter/clutter-click-action.c:560
+#: ../clutter/clutter-click-action.c:587
 msgid "Whether the clickable should be in pressed state"
 msgstr "Legt fest, ob das klickbare Objekt in gedrücktem Zustand sein soll"
 
 # Whether the clickable has a grab
-#: ../clutter/clutter-click-action.c:573
+#: ../clutter/clutter-click-action.c:600
 msgid "Held"
 msgstr "Anfasspunkt"
 
-#: ../clutter/clutter-click-action.c:574
+#: ../clutter/clutter-click-action.c:601
 msgid "Whether the clickable has a grab"
 msgstr "Legt fest, ob das klickbare Objekt einen Anfasser haben soll"
 
-#: ../clutter/clutter-click-action.c:591 ../clutter/clutter-settings.c:599
+#: ../clutter/clutter-click-action.c:618 ../clutter/clutter-settings.c:651
 msgid "Long Press Duration"
 msgstr "Dauer des langen Drucks"
 
-#: ../clutter/clutter-click-action.c:592
+#: ../clutter/clutter-click-action.c:619
 msgid "The minimum duration of a long press to recognize the gesture"
 msgstr "Die minimale Dauer eines langen Drucks zur Erkennung der Geste"
 
-#: ../clutter/clutter-click-action.c:610
+#: ../clutter/clutter-click-action.c:637
 msgid "Long Press Threshold"
 msgstr "Schwellwert für langen Druck"
 
-#: ../clutter/clutter-click-action.c:611
+#: ../clutter/clutter-click-action.c:638
 msgid "The maximum threshold before a long press is cancelled"
 msgstr "Der maximale Schwellwert, bevor ein langer Druck abgebrochen wird"
 
-#: ../clutter/clutter-clone.c:346
+#: ../clutter/clutter-clone.c:342
 msgid "Specifies the actor to be cloned"
 msgstr "Legt den Akteur fest, der geklont werden soll"
 
@@ -997,290 +1026,329 @@ msgstr "Färbung"
 msgid "The tint to apply"
 msgstr "Die anzuwendende Färbung"
 
-#: ../clutter/clutter-deform-effect.c:588
+#: ../clutter/clutter-deform-effect.c:591
 msgid "Horizontal Tiles"
 msgstr "Horizontale Kacheln"
 
-#: ../clutter/clutter-deform-effect.c:589
+#: ../clutter/clutter-deform-effect.c:592
 msgid "The number of horizontal tiles"
 msgstr "Die Anzahl horizontaler Kacheln"
 
-#: ../clutter/clutter-deform-effect.c:604
+#: ../clutter/clutter-deform-effect.c:607
 msgid "Vertical Tiles"
 msgstr "Vertikale Kacheln"
 
-#: ../clutter/clutter-deform-effect.c:605
+#: ../clutter/clutter-deform-effect.c:608
 msgid "The number of vertical tiles"
 msgstr "Die Anzahl vertikaler Kacheln"
 
-#: ../clutter/clutter-deform-effect.c:622
+#: ../clutter/clutter-deform-effect.c:625
 msgid "Back Material"
 msgstr "Hintergrundmaterial"
 
-#: ../clutter/clutter-deform-effect.c:623
+#: ../clutter/clutter-deform-effect.c:626
 msgid "The material to be used when painting the back of the actor"
-msgstr "Das für das Darstellen des Akteur-Hintergrundes zu verwendende Material"
+msgstr ""
+"Das für das Darstellen des Akteur-Hintergrundes zu verwendende Material"
 
 #: ../clutter/clutter-desaturate-effect.c:271
 msgid "The desaturation factor"
 msgstr "Der Entsättigungsfaktor"
 
-#: ../clutter/clutter-device-manager.c:131
-#: ../clutter/clutter-input-device.c:366
-#: ../clutter/x11/clutter-keymap-x11.c:321
+#: ../clutter/clutter-device-manager.c:127
+#: ../clutter/clutter-input-device.c:355
+#: ../clutter/x11/clutter-keymap-x11.c:457
 msgid "Backend"
 msgstr "Backend"
 
-#: ../clutter/clutter-device-manager.c:132
+#: ../clutter/clutter-device-manager.c:128
 msgid "The ClutterBackend of the device manager"
 msgstr "Das ClutterBackend der Geräteverwaltung"
 
-#: ../clutter/clutter-drag-action.c:742
+#: ../clutter/clutter-drag-action.c:733
 msgid "Horizontal Drag Threshold"
 msgstr "Schwelle für horizontales Ziehen"
 
-#: ../clutter/clutter-drag-action.c:743
+#: ../clutter/clutter-drag-action.c:734
 msgid "The horizontal amount of pixels required to start dragging"
 msgstr ""
 "Die Anzahl horizontaler Pixel, die für einen Ziehvorgang benötigt werden"
 
-#: ../clutter/clutter-drag-action.c:770
+#: ../clutter/clutter-drag-action.c:761
 msgid "Vertical Drag Threshold"
 msgstr "Schwelle für vertikales Ziehen"
 
-#: ../clutter/clutter-drag-action.c:771
+#: ../clutter/clutter-drag-action.c:762
 msgid "The vertical amount of pixels required to start dragging"
 msgstr "Die Anzahl vertikaler Pixel, die für einen Ziehvorgang benötigt werden"
 
-#: ../clutter/clutter-drag-action.c:792
+#: ../clutter/clutter-drag-action.c:783
 msgid "Drag Handle"
 msgstr "Grifffeld"
 
-#: ../clutter/clutter-drag-action.c:793
+#: ../clutter/clutter-drag-action.c:784
 msgid "The actor that is being dragged"
 msgstr "Der Akteur, der gezogen werden soll"
 
-#: ../clutter/clutter-drag-action.c:806
+#: ../clutter/clutter-drag-action.c:797
 msgid "Drag Axis"
 msgstr "Ziehachse"
 
-#: ../clutter/clutter-drag-action.c:807
+#: ../clutter/clutter-drag-action.c:798
 msgid "Constraints the dragging to an axis"
 msgstr "Beschränkt den Ziehvorgang auf eine Achse"
 
-#: ../clutter/clutter-drag-action.c:823
+#: ../clutter/clutter-drag-action.c:814
 msgid "Drag Area"
 msgstr "Ziehbereich"
 
-#: ../clutter/clutter-drag-action.c:824
+#: ../clutter/clutter-drag-action.c:815
 msgid "Constrains the dragging to a rectangle"
 msgstr "Beschränkt den Ziehvorgang auf eine Ebene"
 
-#: ../clutter/clutter-drag-action.c:837
+#: ../clutter/clutter-drag-action.c:828
 msgid "Drag Area Set"
 msgstr "Ziehbereich festgelegt"
 
-#: ../clutter/clutter-drag-action.c:838
+#: ../clutter/clutter-drag-action.c:829
 msgid "Whether the drag area is set"
 msgstr "Gibt an, ob der Ziehbereich festgelegt worden ist"
 
-#: ../clutter/clutter-flow-layout.c:907
+#: ../clutter/clutter-flow-layout.c:944
 msgid "Whether each item should receive the same allocation"
 msgstr "Legt fest, ob jedes Objekt die gleiche Zuweisung erhalten soll"
 
-#: ../clutter/clutter-flow-layout.c:922 ../clutter/clutter-table-layout.c:1637
+#: ../clutter/clutter-flow-layout.c:959
+#: ../clutter/deprecated/clutter-table-layout.c:1629
 msgid "Column Spacing"
 msgstr "Spaltenabstand"
 
-#: ../clutter/clutter-flow-layout.c:923
+#: ../clutter/clutter-flow-layout.c:960
 msgid "The spacing between columns"
 msgstr "Der Leerraum zwischen Spalten"
 
-#: ../clutter/clutter-flow-layout.c:939 ../clutter/clutter-table-layout.c:1651
+#: ../clutter/clutter-flow-layout.c:976
+#: ../clutter/deprecated/clutter-table-layout.c:1645
 msgid "Row Spacing"
 msgstr "Zeilenabstand"
 
-#: ../clutter/clutter-flow-layout.c:940
+#: ../clutter/clutter-flow-layout.c:977
 msgid "The spacing between rows"
 msgstr "Der Leerraum zwischen Zeilen"
 
-#: ../clutter/clutter-flow-layout.c:954
+#: ../clutter/clutter-flow-layout.c:991
 msgid "Minimum Column Width"
 msgstr "Minimale Breite der Spalte"
 
-#: ../clutter/clutter-flow-layout.c:955
+#: ../clutter/clutter-flow-layout.c:992
 msgid "Minimum width for each column"
 msgstr "Die minimale Breite jeder Spalte"
 
-#: ../clutter/clutter-flow-layout.c:970
+#: ../clutter/clutter-flow-layout.c:1007
 msgid "Maximum Column Width"
 msgstr "Maximale Breite der Spalte"
 
-#: ../clutter/clutter-flow-layout.c:971
+#: ../clutter/clutter-flow-layout.c:1008
 msgid "Maximum width for each column"
 msgstr "Die maximale Breite jeder Spalte"
 
-#: ../clutter/clutter-flow-layout.c:985
+#: ../clutter/clutter-flow-layout.c:1022
 msgid "Minimum Row Height"
 msgstr "Minimale Zeilenhöhe"
 
-#: ../clutter/clutter-flow-layout.c:986
+#: ../clutter/clutter-flow-layout.c:1023
 msgid "Minimum height for each row"
 msgstr "Minimale Zeilenhöhe jeder Reihe"
 
-#: ../clutter/clutter-flow-layout.c:1001
+#: ../clutter/clutter-flow-layout.c:1038
 msgid "Maximum Row Height"
 msgstr "Maximale Zeilenhöhe"
 
-#: ../clutter/clutter-flow-layout.c:1002
+#: ../clutter/clutter-flow-layout.c:1039
 msgid "Maximum height for each row"
 msgstr "Maximale Zeilenhöhe jeder Reihe"
 
-#: ../clutter/clutter-grid-layout.c:1222
+#: ../clutter/clutter-flow-layout.c:1054 ../clutter/clutter-flow-layout.c:1055
+msgid "Snap to grid"
+msgstr "Am Gitter ausrichten"
+
+#: ../clutter/clutter-gesture-action.c:685
+msgid "Number touch points"
+msgstr "Anzahl der Berührungspunkte"
+
+#: ../clutter/clutter-gesture-action.c:686
+msgid "Number of touch points"
+msgstr "Anzahl der Berührungspunkte"
+
+#: ../clutter/clutter-gesture-action.c:701
+msgid "Threshold Trigger Edge"
+msgstr "Kante des Schwellwert-Auslösers"
+
+#: ../clutter/clutter-gesture-action.c:702
+msgid "The trigger edge used by the action"
+msgstr "Die von der Aktion verwendete Kante des Auslösers"
+
+#: ../clutter/clutter-gesture-action.c:721
+msgid "Threshold Trigger Horizontal Distance"
+msgstr "Horizontaler Abstand des Schwellwert-Auslösers"
+
+#: ../clutter/clutter-gesture-action.c:722
+msgid "The horizontal trigger distance used by the action"
+msgstr "Der von der Aktion verwendete horizontale Abstand des Auslösers"
+
+#: ../clutter/clutter-gesture-action.c:740
+msgid "Threshold Trigger Vertical Distance"
+msgstr "Vertikaler Abstand des Schwellwert-Auslösers"
+
+#: ../clutter/clutter-gesture-action.c:741
+msgid "The vertical trigger distance used by the action"
+msgstr "Der von der Aktion verwendete vertikale Abstand des Auslösers"
+
+#: ../clutter/clutter-grid-layout.c:1223
 msgid "Left attachment"
 msgstr "Linker Anhang"
 
-#: ../clutter/clutter-grid-layout.c:1223
+#: ../clutter/clutter-grid-layout.c:1224
 msgid "The column number to attach the left side of the child to"
 msgstr ""
 "Die Spaltennummer, an welche die linke Seite des Unterelements angehängt wird"
 
-#: ../clutter/clutter-grid-layout.c:1230
+#: ../clutter/clutter-grid-layout.c:1231
 msgid "Top attachment"
 msgstr "Oberer Anhang"
 
-#: ../clutter/clutter-grid-layout.c:1231
+#: ../clutter/clutter-grid-layout.c:1232
 msgid "The row number to attach the top side of a child widget to"
 msgstr ""
 "Die Zeilennummer, an welche die obere Seite eines Unterelement-Widgets "
 "angehängt wird"
 
-#: ../clutter/clutter-grid-layout.c:1239
+#: ../clutter/clutter-grid-layout.c:1240
 msgid "The number of columns that a child spans"
 msgstr "Die Anzahl der Spalten, über die sich das Unterelement erstrecken soll"
 
-#: ../clutter/clutter-grid-layout.c:1246
+#: ../clutter/clutter-grid-layout.c:1247
 msgid "The number of rows that a child spans"
 msgstr "Die Anzahl der Zeilen, über die sich das Unterelement erstrecken soll"
 
-#: ../clutter/clutter-grid-layout.c:1565
+#: ../clutter/clutter-grid-layout.c:1564
 msgid "Row spacing"
 msgstr "Reihenabstand"
 
-#: ../clutter/clutter-grid-layout.c:1566
+#: ../clutter/clutter-grid-layout.c:1565
 msgid "The amount of space between two consecutive rows"
 msgstr "Die Größe des Platzes zwischen zwei aufeinanderfolgenden Reihen"
 
-#: ../clutter/clutter-grid-layout.c:1579
+#: ../clutter/clutter-grid-layout.c:1578
 msgid "Column spacing"
 msgstr "Spaltenabstand"
 
-#: ../clutter/clutter-grid-layout.c:1580
+#: ../clutter/clutter-grid-layout.c:1579
 msgid "The amount of space between two consecutive columns"
 msgstr "Die Größe des Platzes zwischen zwei aufeinanderfolgenden Spalten"
 
-#: ../clutter/clutter-grid-layout.c:1594
+#: ../clutter/clutter-grid-layout.c:1593
 msgid "Row Homogeneous"
 msgstr "Gleichmäßige Zeile"
 
-#: ../clutter/clutter-grid-layout.c:1595
+#: ../clutter/clutter-grid-layout.c:1594
 msgid "If TRUE, the rows are all the same height"
 msgstr "Falls dies WAHR ist, haben die Reihen alle die selbe Höhe"
 
-#: ../clutter/clutter-grid-layout.c:1608
+#: ../clutter/clutter-grid-layout.c:1607
 msgid "Column Homogeneous"
 msgstr "Gleichmäßige Spalte"
 
-#: ../clutter/clutter-grid-layout.c:1609
+#: ../clutter/clutter-grid-layout.c:1608
 msgid "If TRUE, the columns are all the same width"
 msgstr "Falls dies WAHR ist, haben alle Spalten die selbe Höhe"
 
-#: ../clutter/clutter-image.c:248 ../clutter/clutter-image.c:311
-#: ../clutter/clutter-image.c:399
+#: ../clutter/clutter-image.c:268 ../clutter/clutter-image.c:331
+#: ../clutter/clutter-image.c:419
 msgid "Unable to load image data"
 msgstr "Bilddaten können nicht geladen werden"
 
-#: ../clutter/clutter-input-device.c:242
+#: ../clutter/clutter-input-device.c:231
 msgid "Id"
 msgstr "Kennung"
 
-#: ../clutter/clutter-input-device.c:243
+#: ../clutter/clutter-input-device.c:232
 msgid "Unique identifier of the device"
 msgstr "Eindeutiger Bezeichner des Geräts"
 
-#: ../clutter/clutter-input-device.c:259
+#: ../clutter/clutter-input-device.c:248
 msgid "The name of the device"
 msgstr "Der Name des Geräts"
 
-#: ../clutter/clutter-input-device.c:273
+#: ../clutter/clutter-input-device.c:262
 msgid "Device Type"
 msgstr "Gerätetyp"
 
-#: ../clutter/clutter-input-device.c:274
+#: ../clutter/clutter-input-device.c:263
 msgid "The type of the device"
 msgstr "Der Gerätetyp"
 
-#: ../clutter/clutter-input-device.c:289
+#: ../clutter/clutter-input-device.c:278
 msgid "Device Manager"
 msgstr "Geräte-Verwaltung"
 
-#: ../clutter/clutter-input-device.c:290
+#: ../clutter/clutter-input-device.c:279
 msgid "The device manager instance"
 msgstr "Die Instanz des Gerätemanagers"
 
-#: ../clutter/clutter-input-device.c:303
+#: ../clutter/clutter-input-device.c:292
 msgid "Device Mode"
 msgstr "Gerätemodus"
 
-#: ../clutter/clutter-input-device.c:304
+#: ../clutter/clutter-input-device.c:293
 msgid "The mode of the device"
 msgstr "Der Modus des Geräts"
 
-#: ../clutter/clutter-input-device.c:318
+#: ../clutter/clutter-input-device.c:307
 msgid "Has Cursor"
 msgstr "Hat Zeiger"
 
-#: ../clutter/clutter-input-device.c:319
+#: ../clutter/clutter-input-device.c:308
 msgid "Whether the device has a cursor"
 msgstr "Gibt an, ob das Gerät über einen Zeiger verfügt"
 
-#: ../clutter/clutter-input-device.c:338
+#: ../clutter/clutter-input-device.c:327
 msgid "Whether the device is enabled"
 msgstr "Legt fest, ob das Gerät aktiviert ist"
 
-#: ../clutter/clutter-input-device.c:351
+#: ../clutter/clutter-input-device.c:340
 msgid "Number of Axes"
 msgstr "Anzahl der Achsen"
 
-#: ../clutter/clutter-input-device.c:352
+#: ../clutter/clutter-input-device.c:341
 msgid "The number of axes on the device"
 msgstr "Die Anzahl der Achsen des Geräts"
 
-#: ../clutter/clutter-input-device.c:367
+#: ../clutter/clutter-input-device.c:356
 msgid "The backend instance"
 msgstr "Die Backend-Instanz"
 
-#: ../clutter/clutter-interval.c:506
+#: ../clutter/clutter-interval.c:557
 msgid "Value Type"
 msgstr "Wertetyp"
 
-#: ../clutter/clutter-interval.c:507
+#: ../clutter/clutter-interval.c:558
 msgid "The type of the values in the interval"
 msgstr "Der Typ der Werte im Intervall"
 
-#: ../clutter/clutter-interval.c:522
+#: ../clutter/clutter-interval.c:573
 msgid "Initial Value"
 msgstr "Initialer Wert"
 
-#: ../clutter/clutter-interval.c:523
+#: ../clutter/clutter-interval.c:574
 msgid "Initial value of the interval"
 msgstr "Initialer Wert des Intervalls"
 
-#: ../clutter/clutter-interval.c:537
+#: ../clutter/clutter-interval.c:588
 msgid "Final Value"
 msgstr "Finaler Wert"
 
-#: ../clutter/clutter-interval.c:538
+#: ../clutter/clutter-interval.c:589
 msgid "Final value of the interval"
 msgstr "Finaler Wert des Intervalls"
 
@@ -1299,97 +1367,98 @@ msgstr "Der Manager, der diese Daten erzeugt hat"
 #. * Do NOT translate it to non-English e.g. "predefinito:LTR"! If
 #. * it isn't default:LTR or default:RTL it will not work.
 #.
-#: ../clutter/clutter-main.c:772
+#: ../clutter/clutter-main.c:751
 msgid "default:LTR"
 msgstr "default:LTR"
 
-#: ../clutter/clutter-main.c:1646
+#: ../clutter/clutter-main.c:1577
 msgid "Show frames per second"
 msgstr "Bilder pro Sekunde anzeigen"
 
-#: ../clutter/clutter-main.c:1648
+#: ../clutter/clutter-main.c:1579
 msgid "Default frame rate"
 msgstr "Vorgabebildfrequenz"
 
-#: ../clutter/clutter-main.c:1650
+#: ../clutter/clutter-main.c:1581
 msgid "Make all warnings fatal"
 msgstr "Alle Warnungen fatal machen"
 
-#: ../clutter/clutter-main.c:1653
+#: ../clutter/clutter-main.c:1584
 msgid "Direction for the text"
 msgstr "Richtung des Textes"
 
-#: ../clutter/clutter-main.c:1656
+#: ../clutter/clutter-main.c:1587
 msgid "Disable mipmapping on text"
 msgstr "Mip-Mapping für Text ausschalten"
 
-#: ../clutter/clutter-main.c:1659
+#: ../clutter/clutter-main.c:1590
 msgid "Use 'fuzzy' picking"
 msgstr "»Unscharfes« Herausgreifen benutzen"
 
-#: ../clutter/clutter-main.c:1662
+#: ../clutter/clutter-main.c:1593
 msgid "Clutter debugging flags to set"
 msgstr "Zu setzende Clutter-Fehlersuchmerkmale"
 
-#: ../clutter/clutter-main.c:1664
+#: ../clutter/clutter-main.c:1595
 msgid "Clutter debugging flags to unset"
 msgstr "Zu entfernende Clutter-Fehlersuchmerkmale"
 
-#: ../clutter/clutter-main.c:1668
+#: ../clutter/clutter-main.c:1599
 msgid "Clutter profiling flags to set"
 msgstr "Zu setzende Clutter-Fehlersuchmerkmale"
 
-#: ../clutter/clutter-main.c:1670
+#: ../clutter/clutter-main.c:1601
 msgid "Clutter profiling flags to unset"
 msgstr "Zu entfernende Clutter-Fehlersuchmerkmale"
 
-#: ../clutter/clutter-main.c:1673
+#: ../clutter/clutter-main.c:1604
 msgid "Enable accessibility"
 msgstr "Barrierefreiheit aktivieren"
 
-#: ../clutter/clutter-main.c:1865
+#: ../clutter/clutter-main.c:1796
 msgid "Clutter Options"
 msgstr "Clutter-Optionen"
 
-#: ../clutter/clutter-main.c:1866
+#: ../clutter/clutter-main.c:1797
 msgid "Show Clutter Options"
 msgstr "Clutter-Optionen anzeigen"
 
-#: ../clutter/clutter-pan-action.c:448
+#: ../clutter/clutter-pan-action.c:455
 msgid "Pan Axis"
 msgstr "Ziehachse"
 
-#: ../clutter/clutter-pan-action.c:449
+#: ../clutter/clutter-pan-action.c:456
 msgid "Constraints the panning to an axis"
 msgstr "Beschränkt den Ziehvorgang auf eine Achse"
 
-#: ../clutter/clutter-pan-action.c:463
+#: ../clutter/clutter-pan-action.c:470
 msgid "Interpolate"
 msgstr "Interpolieren"
 
-#: ../clutter/clutter-pan-action.c:464
+#: ../clutter/clutter-pan-action.c:471
 msgid "Whether interpolated events emission is enabled."
 msgstr "Legt fest, ob die Ausgabe interpolierter Ereignisse aktiviert ist"
 
-#: ../clutter/clutter-pan-action.c:480
+#: ../clutter/clutter-pan-action.c:487
 msgid "Deceleration"
 msgstr "Abbremsung"
 
-#: ../clutter/clutter-pan-action.c:481
+#: ../clutter/clutter-pan-action.c:488
 msgid "Rate at which the interpolated panning will decelerate in"
 msgstr "Das Maß, um welches die interpolierte Verschiebung abgebremst wird"
 
-#: ../clutter/clutter-pan-action.c:498
+#: ../clutter/clutter-pan-action.c:505
 msgid "Initial acceleration factor"
 msgstr "Anfänglicher Beschleunigungsfaktor"
 
-#: ../clutter/clutter-pan-action.c:499
+#: ../clutter/clutter-pan-action.c:506
 msgid "Factor applied to the momentum when starting the interpolated phase"
 msgstr ""
-"Faktor, der beim Start der interpolierten Phase auf den Impuls angewendet wird"
+"Faktor, der beim Start der interpolierten Phase auf den Impuls angewendet "
+"wird"
 
 #: ../clutter/clutter-path-constraint.c:212
-#: ../clutter/deprecated/clutter-behaviour-path.c:225
+#: ../clutter/deprecated/clutter-behaviour-path.c:221
 msgid "Path"
 msgstr "Pfad"
 
@@ -1401,88 +1470,90 @@ msgstr "Der Pfad zur Beschränkung eines Akteurs"
 msgid "The offset along the path, between -1.0 and 2.0"
 msgstr "Der Versatz entlang des Pfades, zwischen -1.0 und 2.0"
 
-#: ../clutter/clutter-property-transition.c:271
+#: ../clutter/clutter-property-transition.c:269
 msgid "Property Name"
 msgstr "Name der Eigenschaft"
 
-#: ../clutter/clutter-property-transition.c:272
+#: ../clutter/clutter-property-transition.c:270
 msgid "The name of the property to animate"
 msgstr "Der Name der Eigenschaft der Animation"
 
-#: ../clutter/clutter-script.c:466
+#: ../clutter/clutter-script.c:464
 msgid "Filename Set"
 msgstr "Dateiname gesetzt"
 
-#: ../clutter/clutter-script.c:467
+#: ../clutter/clutter-script.c:465
 msgid "Whether the :filename property is set"
 msgstr "Gibt an, ob die :filename-Eigenschaft gesetzt ist"
 
-#: ../clutter/clutter-script.c:481 ../clutter/deprecated/clutter-texture.c:1082
+#: ../clutter/clutter-script.c:479
+#: ../clutter/deprecated/clutter-texture.c:1080
 msgid "Filename"
 msgstr "Dateiname"
 
-#: ../clutter/clutter-script.c:482
+#: ../clutter/clutter-script.c:480
 msgid "The path of the currently parsed file"
 msgstr "Der Pfad zur aktuell eingelesenen Datei"
 
-#: ../clutter/clutter-script.c:499
+#: ../clutter/clutter-script.c:497
 msgid "Translation Domain"
 msgstr "Übersetzung"
 
-#: ../clutter/clutter-script.c:500
+#: ../clutter/clutter-script.c:498
 msgid "The translation domain used to localize string"
 msgstr "Die zur Übersetzung verwendete Domäne"
 
-#: ../clutter/clutter-scroll-actor.c:263
+#: ../clutter/clutter-scroll-actor.c:184
 msgid "Scroll Mode"
 msgstr "Bildlaufmodus"
 
-#: ../clutter/clutter-scroll-actor.c:264
+#: ../clutter/clutter-scroll-actor.c:185
 msgid "The scrolling direction"
 msgstr "Die Bildlaufrichtung"
 
-#: ../clutter/clutter-settings.c:440
+#: ../clutter/clutter-settings.c:486
 msgid "Double Click Time"
 msgstr "Doppelklick-Zeit"
 
-#: ../clutter/clutter-settings.c:441
+#: ../clutter/clutter-settings.c:487
 msgid "The time between clicks necessary to detect a multiple click"
-msgstr "Die zur Erkennung eines Mehrfachklicks nötige Zeit zwischen zwei Klicks"
+msgstr ""
+"Die zur Erkennung eines Mehrfachklicks nötige Zeit zwischen zwei Klicks"
 
-#: ../clutter/clutter-settings.c:456
+#: ../clutter/clutter-settings.c:502
 msgid "Double Click Distance"
 msgstr "Doppelklick-Intervall"
 
-#: ../clutter/clutter-settings.c:457
+#: ../clutter/clutter-settings.c:503
 msgid "The distance between clicks necessary to detect a multiple click"
 msgstr ""
 "Die zur Erkennung eines Mehrfachklicks nötige Entfernung zwischen zwei Klicks"
 
-#: ../clutter/clutter-settings.c:472
+#: ../clutter/clutter-settings.c:518
 msgid "Drag Threshold"
 msgstr "Ziehschwellwert"
 
-#: ../clutter/clutter-settings.c:473
+#: ../clutter/clutter-settings.c:519
 msgid "The distance the cursor should travel before starting to drag"
 msgstr ""
 "Die vom Zeiger zurückzulegende Entfernung, um einen Ziehvorgang zu beginnen"
 
-#: ../clutter/clutter-settings.c:488 ../clutter/clutter-text.c:3367
+#: ../clutter/clutter-settings.c:534 ../clutter/clutter-text.c:3437
 msgid "Font Name"
 msgstr "Schriftname"
 
-#: ../clutter/clutter-settings.c:489
+#: ../clutter/clutter-settings.c:535
 msgid ""
 "The description of the default font, as one that could be parsed by Pango"
 msgstr ""
 "Die Beschreibung der Vorgabeschrift, so wie sie durch Pango verarbeitet "
 "werden kann"
 
-#: ../clutter/clutter-settings.c:504
+#: ../clutter/clutter-settings.c:550
 msgid "Font Antialias"
 msgstr "Schriftglättung"
 
-#: ../clutter/clutter-settings.c:505
+#: ../clutter/clutter-settings.c:551
 msgid ""
 "Whether to use antialiasing (1 to enable, 0 to disable, and -1 to use the "
 "default)"
@@ -1490,69 +1561,78 @@ msgstr ""
 "Gibt an, ob Antialiasing verwendet werden soll (1 aktiviert, 0 deaktiviert "
 "und -1 verwendet die Vorgabe)"
 
-#: ../clutter/clutter-settings.c:521
+#: ../clutter/clutter-settings.c:567 ../clutter/clutter-settings.c:575
 msgid "Font DPI"
 msgstr "Schriftauflösung"
 
-#: ../clutter/clutter-settings.c:522
+#: ../clutter/clutter-settings.c:568 ../clutter/clutter-settings.c:576
 msgid ""
 "The resolution of the font, in 1024 * dots/inch, or -1 to use the default"
-msgstr "Die Schriftauflösung in 1024 * Punkte/Zoll, oder -1 für den Vorgabewert"
+msgstr ""
+"Die Schriftauflösung in 1024 * Punkte/Zoll, oder -1 für den Vorgabewert"
 
-#: ../clutter/clutter-settings.c:538
+#: ../clutter/clutter-settings.c:592
 msgid "Font Hinting"
 msgstr "Schrift-Hinting"
 
-#: ../clutter/clutter-settings.c:539
+#: ../clutter/clutter-settings.c:593
 msgid ""
 "Whether to use hinting (1 to enable, 0 to disable and -1 to use the default)"
 msgstr ""
 "Gibt an, ob Hinting verwendet werden soll (1 aktiviert, 0 deaktiviert und -1 "
 "verwendet die Vorgabe)"
 
-#: ../clutter/clutter-settings.c:560
+#: ../clutter/clutter-settings.c:613
 msgid "Font Hint Style"
 msgstr "Hinting-Stil der Schrift"
 
-#: ../clutter/clutter-settings.c:561
+#: ../clutter/clutter-settings.c:614
 msgid "The style of hinting (hintnone, hintslight, hintmedium, hintfull)"
 msgstr "Der Stil des Hintings (hintnone, hintslight, hintmedium, hintfull)"
 
-#: ../clutter/clutter-settings.c:582
+#: ../clutter/clutter-settings.c:634
 msgid "Font Subpixel Order"
 msgstr "Subpixel-Anordnung der Schrift"
 
-#: ../clutter/clutter-settings.c:583
+#: ../clutter/clutter-settings.c:635
 msgid "The type of subpixel antialiasing (none, rgb, bgr, vrgb, vbgr)"
 msgstr "Typ der Subpixel-Kantenglättung (none (keine), rgb, bgr, vrgb, vbgr)"
 
-#: ../clutter/clutter-settings.c:600
+#: ../clutter/clutter-settings.c:652
 msgid "The minimum duration for a long press gesture to be recognized"
 msgstr "Die minimale Dauer zur Erkennung eines langen Drucks für eine Geste"
 
-#: ../clutter/clutter-settings.c:607
+#: ../clutter/clutter-settings.c:659
+msgid "Window Scaling Factor"
+msgstr "Skalierungsfaktor des Fensters"
+
+#: ../clutter/clutter-settings.c:660
+msgid "The scaling factor to be applied to windows"
+msgstr "Der Skalierungsfaktor, der auf das Fenster angewendet werden soll"
+
+#: ../clutter/clutter-settings.c:667
 msgid "Fontconfig configuration timestamp"
 msgstr "Fontconfig-Zeitstempel"
 
-#: ../clutter/clutter-settings.c:608
+#: ../clutter/clutter-settings.c:668
 msgid "Timestamp of the current fontconfig configuration"
 msgstr "Zeitstempel der aktuellen Fontconfig-Konfiguration"
 
-#: ../clutter/clutter-settings.c:625
+#: ../clutter/clutter-settings.c:685
 msgid "Password Hint Time"
 msgstr "Passwort-Hinweis-Zeit"
 
-#: ../clutter/clutter-settings.c:626
+#: ../clutter/clutter-settings.c:686
 msgid "How long to show the last input character in hidden entries"
 msgstr ""
 "So lange soll das letzte eingegebene Zeichen in versteckten Einträgen "
 "angezeigt werden"
 
-#: ../clutter/clutter-shader-effect.c:486
+#: ../clutter/clutter-shader-effect.c:487
 msgid "Shader Type"
 msgstr "Shader-Typ"
 
-#: ../clutter/clutter-shader-effect.c:487
+#: ../clutter/clutter-shader-effect.c:488
 msgid "The type of shader used"
 msgstr "Der verwendete Shader-Typ"
 
@@ -1580,775 +1660,717 @@ msgstr "Die Kante der Quelle, an der eingerastet werden soll"
 msgid "The offset in pixels to apply to the constraint"
 msgstr "Der Versatz in Pixel, auf den die Einschränkung angewendet werden soll"
 
-#: ../clutter/clutter-stage.c:1895
+#: ../clutter/clutter-stage.c:1918
 msgid "Fullscreen Set"
 msgstr "Vollbild gesetzt"
 
-#: ../clutter/clutter-stage.c:1896
+#: ../clutter/clutter-stage.c:1919
 msgid "Whether the main stage is fullscreen"
 msgstr "Legt fest, ob die Hauptszene ein Vollbild ist"
 
-#: ../clutter/clutter-stage.c:1910
+#: ../clutter/clutter-stage.c:1933
 msgid "Offscreen"
 msgstr "Abseits des Bildschirms"
 
-#: ../clutter/clutter-stage.c:1911
+#: ../clutter/clutter-stage.c:1934
 msgid "Whether the main stage should be rendered offscreen"
 msgstr ""
 "Legt fest, ob die Hauptszene abseits des Bildschirms erstellt werden soll"
 
-#: ../clutter/clutter-stage.c:1923 ../clutter/clutter-text.c:3481
+#: ../clutter/clutter-stage.c:1946 ../clutter/clutter-text.c:3551
 msgid "Cursor Visible"
 msgstr "Zeiger sichtbar"
 
-#: ../clutter/clutter-stage.c:1924
+#: ../clutter/clutter-stage.c:1947
 msgid "Whether the mouse pointer is visible on the main stage"
 msgstr "Legt fest, ob der Mauszeiger in der Hauptszene sichtbar sein soll"
 
-#: ../clutter/clutter-stage.c:1938
+#: ../clutter/clutter-stage.c:1961
 msgid "User Resizable"
 msgstr "Größenänderung durch Benutzer"
 
-#: ../clutter/clutter-stage.c:1939
+#: ../clutter/clutter-stage.c:1962
 msgid "Whether the stage is able to be resized via user interaction"
 msgstr ""
 "Legt fest, ob eine Größenänderung der Szene durch den Benutzer möglich ist"
 
-#: ../clutter/clutter-stage.c:1954 ../clutter/deprecated/clutter-box.c:260
-#: ../clutter/deprecated/clutter-rectangle.c:273
+#: ../clutter/clutter-stage.c:1977 ../clutter/deprecated/clutter-box.c:254
+#: ../clutter/deprecated/clutter-rectangle.c:270
 msgid "Color"
 msgstr "Farbe"
 
-#: ../clutter/clutter-stage.c:1955
+#: ../clutter/clutter-stage.c:1978
 msgid "The color of the stage"
 msgstr "Die Farbe der Szene"
 
-#: ../clutter/clutter-stage.c:1970
+#: ../clutter/clutter-stage.c:1993
 msgid "Perspective"
 msgstr "Perspektive"
 
-#: ../clutter/clutter-stage.c:1971
+#: ../clutter/clutter-stage.c:1994
 msgid "Perspective projection parameters"
 msgstr "Projektionsparameter der Perspektive"
 
-#: ../clutter/clutter-stage.c:1986
+#: ../clutter/clutter-stage.c:2009
 msgid "Title"
 msgstr "Titel"
 
-#: ../clutter/clutter-stage.c:1987
+#: ../clutter/clutter-stage.c:2010
 msgid "Stage Title"
 msgstr "Szenentitel"
 
-#: ../clutter/clutter-stage.c:2004
+#: ../clutter/clutter-stage.c:2027
 msgid "Use Fog"
 msgstr "Nebel verwenden"
 
-#: ../clutter/clutter-stage.c:2005
+#: ../clutter/clutter-stage.c:2028
 msgid "Whether to enable depth cueing"
 msgstr "Legt fest, ob Tiefenanordnung aktiviert werden soll"
 
-#: ../clutter/clutter-stage.c:2021
+#: ../clutter/clutter-stage.c:2044
 msgid "Fog"
 msgstr "Nebel"
 
-#: ../clutter/clutter-stage.c:2022
+#: ../clutter/clutter-stage.c:2045
 msgid "Settings for the depth cueing"
 msgstr "Einstellungen für die Tiefenanordnung"
 
-#: ../clutter/clutter-stage.c:2038
+#: ../clutter/clutter-stage.c:2061
 msgid "Use Alpha"
 msgstr "Alpha verwenden"
 
-#: ../clutter/clutter-stage.c:2039
+#: ../clutter/clutter-stage.c:2062
 msgid "Whether to honour the alpha component of the stage color"
 msgstr ""
 "Gibt an, ob die Alpha-Komponente für die Szenenfarbe berücksichtigt werden "
 "soll"
 
-#: ../clutter/clutter-stage.c:2055
+#: ../clutter/clutter-stage.c:2078
 msgid "Key Focus"
 msgstr "Tastaturfokus"
 
-#: ../clutter/clutter-stage.c:2056
+#: ../clutter/clutter-stage.c:2079
 msgid "The currently key focused actor"
 msgstr "Der aktuelle Akteur im Tastaturfokus"
 
-#: ../clutter/clutter-stage.c:2072
+#: ../clutter/clutter-stage.c:2095
 msgid "No Clear Hint"
 msgstr "Keine Leeren-Anweisung"
 
-#: ../clutter/clutter-stage.c:2073
+#: ../clutter/clutter-stage.c:2096
 msgid "Whether the stage should clear its contents"
 msgstr "Gibt an, ob die Szene ihren Inhalt leeren soll"
 
-#: ../clutter/clutter-stage.c:2086
+#: ../clutter/clutter-stage.c:2109
 msgid "Accept Focus"
 msgstr "Fokus annehmen"
 
-#: ../clutter/clutter-stage.c:2087
+#: ../clutter/clutter-stage.c:2110
 msgid "Whether the stage should accept focus on show"
 msgstr "Legt fest, ob die Szene bei Anzeige Fokus annehmen soll"
 
-#: ../clutter/clutter-table-layout.c:543
-msgid "Column Number"
-msgstr "Spaltennummer"
-
-#: ../clutter/clutter-table-layout.c:544
-msgid "The column the widget resides in"
-msgstr "Die Spalte, in dem sich das Widget befindet"
-
-#: ../clutter/clutter-table-layout.c:551
-msgid "Row Number"
-msgstr "Zeilennummer"
-
-#: ../clutter/clutter-table-layout.c:552
-msgid "The row the widget resides in"
-msgstr "Die Zeile, in dem sich das Widget befindet"
-
-#: ../clutter/clutter-table-layout.c:559
-msgid "Column Span"
-msgstr "Spaltenbelegung"
-
-#: ../clutter/clutter-table-layout.c:560
-msgid "The number of columns the widget should span"
-msgstr "Die Anzahl der Spalten, die das Widget belegen soll"
-
-#: ../clutter/clutter-table-layout.c:567
-msgid "Row Span"
-msgstr "Zeilenbelegung"
-
-#: ../clutter/clutter-table-layout.c:568
-msgid "The number of rows the widget should span"
-msgstr "Die Anzahl der Zeilen, über die sich das Widget erstrecken soll"
-
-#: ../clutter/clutter-table-layout.c:575
-msgid "Horizontal Expand"
-msgstr "Horizontal ausdehnen"
-
-#: ../clutter/clutter-table-layout.c:576
-msgid "Allocate extra space for the child in horizontal axis"
-msgstr ""
-"Zusätzlichen Platz in der horizontalen Achse für das Unterelement zuweisen"
-
-#: ../clutter/clutter-table-layout.c:582
-msgid "Vertical Expand"
-msgstr "Vertikal ausdehnen"
-
-#: ../clutter/clutter-table-layout.c:583
-msgid "Allocate extra space for the child in vertical axis"
-msgstr ""
-"Zusätzlichen Platz in der vertikalen Achse für das Unterelement zuweisen"
-
-#: ../clutter/clutter-table-layout.c:1638
-msgid "Spacing between columns"
-msgstr "Abstand zwischen Spalten"
-
-#: ../clutter/clutter-table-layout.c:1652
-msgid "Spacing between rows"
-msgstr "Abstand zwischen Zeilen"
-
-#: ../clutter/clutter-text-buffer.c:351 ../clutter/clutter-text.c:3402
+#: ../clutter/clutter-text-buffer.c:347 ../clutter/clutter-text.c:3472
 msgid "Text"
 msgstr "Text"
 
-#: ../clutter/clutter-text-buffer.c:352
+#: ../clutter/clutter-text-buffer.c:348
 msgid "The contents of the buffer"
 msgstr "Der Inhalt des Puffers"
 
-#: ../clutter/clutter-text-buffer.c:365
+#: ../clutter/clutter-text-buffer.c:361
 msgid "Text length"
 msgstr "Textlänge"
 
-#: ../clutter/clutter-text-buffer.c:366
+#: ../clutter/clutter-text-buffer.c:362
 msgid "Length of the text currently in the buffer"
 msgstr "Aktuelle Länge des Textes im Puffer"
 
-#: ../clutter/clutter-text-buffer.c:379
+#: ../clutter/clutter-text-buffer.c:375
 msgid "Maximum length"
 msgstr "Maximale Länge"
 
-#: ../clutter/clutter-text-buffer.c:380
+#: ../clutter/clutter-text-buffer.c:376
 msgid "Maximum number of characters for this entry. Zero if no maximum"
 msgstr ""
 "Maximale Zeichen-Anzahl für diesen Eintrag. Null, wenn es kein Maximum gibt. "
 
-#: ../clutter/clutter-text.c:3349
+#: ../clutter/clutter-text.c:3419
 msgid "Buffer"
 msgstr "Puffer"
 
-#: ../clutter/clutter-text.c:3350
+#: ../clutter/clutter-text.c:3420
 msgid "The buffer for the text"
 msgstr "Der Text-Puffer"
 
-#: ../clutter/clutter-text.c:3368
+#: ../clutter/clutter-text.c:3438
 msgid "The font to be used by the text"
 msgstr "Die Schriftart des Texts"
 
-#: ../clutter/clutter-text.c:3385
+#: ../clutter/clutter-text.c:3455
 msgid "Font Description"
 msgstr "Schriftartenbeschreibung"
 
-#: ../clutter/clutter-text.c:3386
+#: ../clutter/clutter-text.c:3456
 msgid "The font description to be used"
 msgstr "Die zu verwendende Schriftartenbeschreibung"
 
-#: ../clutter/clutter-text.c:3403
+#: ../clutter/clutter-text.c:3473
 msgid "The text to render"
 msgstr "Der darzustellende Text"
 
-#: ../clutter/clutter-text.c:3417
+#: ../clutter/clutter-text.c:3487
 msgid "Font Color"
 msgstr "Textfarbe"
 
-#: ../clutter/clutter-text.c:3418
+#: ../clutter/clutter-text.c:3488
 msgid "Color of the font used by the text"
 msgstr "Die Farbe des Texts"
 
-#: ../clutter/clutter-text.c:3433
+#: ../clutter/clutter-text.c:3503
 msgid "Editable"
 msgstr "Bearbeitbar"
 
-#: ../clutter/clutter-text.c:3434
+#: ../clutter/clutter-text.c:3504
 msgid "Whether the text is editable"
 msgstr "Legt fest, ob der Text bearbeitet werden kann"
 
-#: ../clutter/clutter-text.c:3449
+#: ../clutter/clutter-text.c:3519
 msgid "Selectable"
 msgstr "Markierbar"
 
-#: ../clutter/clutter-text.c:3450
+#: ../clutter/clutter-text.c:3520
 msgid "Whether the text is selectable"
 msgstr "Legt fest, ob der Text markierbar ist"
 
-#: ../clutter/clutter-text.c:3464
+#: ../clutter/clutter-text.c:3534
 msgid "Activatable"
 msgstr "Aktivierbar"
 
-#: ../clutter/clutter-text.c:3465
+#: ../clutter/clutter-text.c:3535
 msgid "Whether pressing return causes the activate signal to be emitted"
 msgstr "Legt fest, ob die Eingabetaste ein Senden des aktiven Signals auslöst"
 
-#: ../clutter/clutter-text.c:3482
+#: ../clutter/clutter-text.c:3552
 msgid "Whether the input cursor is visible"
 msgstr "Gibt an, ob der Eingabezeiger sichtbar ist"
 
-#: ../clutter/clutter-text.c:3496 ../clutter/clutter-text.c:3497
+#: ../clutter/clutter-text.c:3566 ../clutter/clutter-text.c:3567
 msgid "Cursor Color"
 msgstr "Zeigerfarbe"
 
-#: ../clutter/clutter-text.c:3512
+#: ../clutter/clutter-text.c:3582
 msgid "Cursor Color Set"
 msgstr "Zeigerfarbe gesetzt"
 
-#: ../clutter/clutter-text.c:3513
+#: ../clutter/clutter-text.c:3583
 msgid "Whether the cursor color has been set"
 msgstr "Legt fest, ob die Zeigerfarbe festgelegt ist"
 
-#: ../clutter/clutter-text.c:3528
+#: ../clutter/clutter-text.c:3598
 msgid "Cursor Size"
 msgstr "Zeigergröße"
 
-#: ../clutter/clutter-text.c:3529
+#: ../clutter/clutter-text.c:3599
 msgid "The width of the cursor, in pixels"
 msgstr "Die Breite des Zeigers in Pixel"
 
-#: ../clutter/clutter-text.c:3545 ../clutter/clutter-text.c:3563
+#: ../clutter/clutter-text.c:3615 ../clutter/clutter-text.c:3633
 msgid "Cursor Position"
 msgstr "Zeigerposition"
 
-#: ../clutter/clutter-text.c:3546 ../clutter/clutter-text.c:3564
+#: ../clutter/clutter-text.c:3616 ../clutter/clutter-text.c:3634
 msgid "The cursor position"
 msgstr "Die Zeigerposition"
 
-#: ../clutter/clutter-text.c:3579
+#: ../clutter/clutter-text.c:3649
 msgid "Selection-bound"
 msgstr "Auswahlgrenze"
 
-#: ../clutter/clutter-text.c:3580
+#: ../clutter/clutter-text.c:3650
 msgid "The cursor position of the other end of the selection"
 msgstr "Die Zeigerposition am anderen Ende der Auswahl"
 
-#: ../clutter/clutter-text.c:3595 ../clutter/clutter-text.c:3596
+#: ../clutter/clutter-text.c:3665 ../clutter/clutter-text.c:3666
 msgid "Selection Color"
 msgstr "Auswahlfarbe"
 
-#: ../clutter/clutter-text.c:3611
+#: ../clutter/clutter-text.c:3681
 msgid "Selection Color Set"
 msgstr "Auswahlfarbe festgelegt"
 
-#: ../clutter/clutter-text.c:3612
+#: ../clutter/clutter-text.c:3682
 msgid "Whether the selection color has been set"
 msgstr "Legt fest, ob die Auswahlfarbe festgelegt ist"
 
-#: ../clutter/clutter-text.c:3627
+#: ../clutter/clutter-text.c:3697
 msgid "Attributes"
 msgstr "Attribute"
 
-#: ../clutter/clutter-text.c:3628
+#: ../clutter/clutter-text.c:3698
 msgid "A list of style attributes to apply to the contents of the actor"
 msgstr ""
 "Eine Liste der Stilattribute, die auf den Inhalt des Akteurs angewendet "
 "werden sollen"
 
-#: ../clutter/clutter-text.c:3650
+#: ../clutter/clutter-text.c:3720
 msgid "Use markup"
 msgstr "Syntax-Hervorhebung verwenden"
 
-#: ../clutter/clutter-text.c:3651
+#: ../clutter/clutter-text.c:3721
 msgid "Whether or not the text includes Pango markup"
 msgstr "Legt fest, ob der Text Pango-Markup enthält"
 
-#: ../clutter/clutter-text.c:3667
+#: ../clutter/clutter-text.c:3737
 msgid "Line wrap"
 msgstr "Zeilenumbruch"
 
 # Die booleschen Werte sollten wir auf echte GConf- und dconf-Schlüssel beschränken.
-#: ../clutter/clutter-text.c:3668
+#: ../clutter/clutter-text.c:3738
 msgid "If set, wrap the lines if the text becomes too wide"
 msgstr "Falls gesetzt, Zeilen umbrechen, wenn der Text zu lang wird"
 
-#: ../clutter/clutter-text.c:3683
+#: ../clutter/clutter-text.c:3753
 msgid "Line wrap mode"
 msgstr "Zeilenumbruchmodus"
 
-#: ../clutter/clutter-text.c:3684
+#: ../clutter/clutter-text.c:3754
 msgid "Control how line-wrapping is done"
 msgstr "Legt fest, wie Zeilen umgebrochen werden"
 
-#: ../clutter/clutter-text.c:3699
+#: ../clutter/clutter-text.c:3769
 msgid "Ellipsize"
 msgstr "Auslassungen"
 
-#: ../clutter/clutter-text.c:3700
+#: ../clutter/clutter-text.c:3770
 msgid "The preferred place to ellipsize the string"
 msgstr "Der bevorzugte Ort für Auslassungspunkte in der Zeichenkette"
 
-#: ../clutter/clutter-text.c:3716
+#: ../clutter/clutter-text.c:3786
 msgid "Line Alignment"
 msgstr "Zeilenausrichtung"
 
-#: ../clutter/clutter-text.c:3717
+#: ../clutter/clutter-text.c:3787
 msgid "The preferred alignment for the string, for multi-line text"
 msgstr "Die bevorzugte Zeilenausrichtung für den Text, bei mehrzeiligem Text"
 
-#: ../clutter/clutter-text.c:3733
+#: ../clutter/clutter-text.c:3803
 msgid "Justify"
 msgstr "Ausrichten"
 
-#: ../clutter/clutter-text.c:3734
+#: ../clutter/clutter-text.c:3804
 msgid "Whether the text should be justified"
 msgstr "Gibt an, ob der Text ausgerichtet werden soll"
 
-#: ../clutter/clutter-text.c:3749
+#: ../clutter/clutter-text.c:3819
 msgid "Password Character"
 msgstr "Password-Zeichen"
 
-#: ../clutter/clutter-text.c:3750
+#: ../clutter/clutter-text.c:3820
 msgid "If non-zero, use this character to display the actor's contents"
 msgstr ""
 "Falls nicht Null, so wird dieses Zeichen zum Anzeigen des Akteurinhalts "
 "verwendet"
 
-#: ../clutter/clutter-text.c:3764
+#: ../clutter/clutter-text.c:3834
 msgid "Max Length"
 msgstr "Maximale Länge"
 
-#: ../clutter/clutter-text.c:3765
+#: ../clutter/clutter-text.c:3835
 msgid "Maximum length of the text inside the actor"
 msgstr "Maximale Textlänge innerhalb des Akteurs"
 
-#: ../clutter/clutter-text.c:3788
+#: ../clutter/clutter-text.c:3858
 msgid "Single Line Mode"
 msgstr "Einzeilen-Modus"
 
-#: ../clutter/clutter-text.c:3789
+#: ../clutter/clutter-text.c:3859
 msgid "Whether the text should be a single line"
 msgstr "Legt fest, ob der Text in einer Zeile dargestellt werden soll"
 
-#: ../clutter/clutter-text.c:3803 ../clutter/clutter-text.c:3804
+#: ../clutter/clutter-text.c:3873 ../clutter/clutter-text.c:3874
 msgid "Selected Text Color"
 msgstr "Auswahltextfarbe"
 
-#: ../clutter/clutter-text.c:3819
+#: ../clutter/clutter-text.c:3889
 msgid "Selected Text Color Set"
 msgstr "Auswahltextfarbe festgelegt"
 
-#: ../clutter/clutter-text.c:3820
+#: ../clutter/clutter-text.c:3890
 msgid "Whether the selected text color has been set"
 msgstr "Legt fest, ob die Auswahltextfarbe festgelegt ist"
 
-#: ../clutter/clutter-timeline.c:561
-#: ../clutter/deprecated/clutter-animation.c:560
+#: ../clutter/clutter-timeline.c:591
+#: ../clutter/deprecated/clutter-animation.c:512
 msgid "Loop"
 msgstr "Endlosschleife"
 
-#: ../clutter/clutter-timeline.c:562
+#: ../clutter/clutter-timeline.c:592
 msgid "Should the timeline automatically restart"
 msgstr "Automatischer Neustart der Zeitlinie"
 
-#: ../clutter/clutter-timeline.c:576
+#: ../clutter/clutter-timeline.c:606
 msgid "Delay"
 msgstr "Verzögerung"
 
-#: ../clutter/clutter-timeline.c:577
+#: ../clutter/clutter-timeline.c:607
 msgid "Delay before start"
 msgstr "Verzögerung vor dem Start"
 
-#: ../clutter/clutter-timeline.c:592
-#: ../clutter/deprecated/clutter-animation.c:544
-#: ../clutter/deprecated/clutter-animator.c:1804
+#: ../clutter/clutter-timeline.c:622
+#: ../clutter/deprecated/clutter-animation.c:496
+#: ../clutter/deprecated/clutter-animator.c:1792
 #: ../clutter/deprecated/clutter-media.c:224
-#: ../clutter/deprecated/clutter-state.c:1523
+#: ../clutter/deprecated/clutter-state.c:1515
 msgid "Duration"
 msgstr "Dauer"
 
-#: ../clutter/clutter-timeline.c:593
+#: ../clutter/clutter-timeline.c:623
 msgid "Duration of the timeline in milliseconds"
 msgstr "Dauer der Zeitlinie in Millisekunden"
 
-#: ../clutter/clutter-timeline.c:608
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:528
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:337
+#: ../clutter/clutter-timeline.c:638
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:521
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:330
 msgid "Direction"
 msgstr "Richtung"
 
-#: ../clutter/clutter-timeline.c:609
+#: ../clutter/clutter-timeline.c:639
 msgid "Direction of the timeline"
 msgstr "Richtung der Zeitlinie"
 
-#: ../clutter/clutter-timeline.c:624
+#: ../clutter/clutter-timeline.c:654
 msgid "Auto Reverse"
 msgstr "Automatische Umkehrung"
 
-#: ../clutter/clutter-timeline.c:625
+#: ../clutter/clutter-timeline.c:655
 msgid "Whether the direction should be reversed when reaching the end"
 msgstr ""
 "Legt fest, ob die Richtung beim Erreichen des Endes automatisch umgekehrt "
 "werden soll"
 
-#: ../clutter/clutter-timeline.c:643
+#: ../clutter/clutter-timeline.c:673
 msgid "Repeat Count"
 msgstr "Anzahl der Wiederholungen"
 
-#: ../clutter/clutter-timeline.c:644
+#: ../clutter/clutter-timeline.c:674
 msgid "How many times the timeline should repeat"
 msgstr "So oft soll sich die Zeitachse wiederholen"
 
-#: ../clutter/clutter-timeline.c:658
+#: ../clutter/clutter-timeline.c:688
 msgid "Progress Mode"
 msgstr "Fortschrittsmodus"
 
-#: ../clutter/clutter-timeline.c:659
+#: ../clutter/clutter-timeline.c:689
 msgid "How the timeline should compute the progress"
 msgstr "Legt fest, wie die Zeitlinie den Fortschritt berechnen soll"
 
-#: ../clutter/clutter-transition.c:246
+#: ../clutter/clutter-transition.c:244
 msgid "Interval"
 msgstr "Intervall"
 
-#: ../clutter/clutter-transition.c:247
+#: ../clutter/clutter-transition.c:245
 msgid "The interval of values to transition"
 msgstr "Das Zeitintervall der Werte zum Animieren"
 
-#: ../clutter/clutter-transition.c:261
+#: ../clutter/clutter-transition.c:259
 msgid "Animatable"
 msgstr "Animierbar"
 
-#: ../clutter/clutter-transition.c:262
+#: ../clutter/clutter-transition.c:260
 msgid "The animatable object"
 msgstr "Das animierbare Objekt"
 
-#: ../clutter/clutter-transition.c:283
+#: ../clutter/clutter-transition.c:281
 msgid "Remove on Complete"
 msgstr "Bei Abschluss entfernen"
 
-#: ../clutter/clutter-transition.c:284
+#: ../clutter/clutter-transition.c:282
 msgid "Detach the transition when completed"
 msgstr "Die Überblendung bei Abschluss abkoppeln"
 
-#: ../clutter/clutter-zoom-action.c:354
+#: ../clutter/clutter-zoom-action.c:365
 msgid "Zoom Axis"
 msgstr "Zoom-Achse"
 
-#: ../clutter/clutter-zoom-action.c:355
+#: ../clutter/clutter-zoom-action.c:366
 msgid "Constraints the zoom to an axis"
 msgstr "Beschränkt den Zoom in Richtung einer Achse"
 
-#: ../clutter/deprecated/clutter-alpha.c:355
-#: ../clutter/deprecated/clutter-animation.c:575
-#: ../clutter/deprecated/clutter-animator.c:1821
+#: ../clutter/deprecated/clutter-alpha.c:347
+#: ../clutter/deprecated/clutter-animation.c:527
+#: ../clutter/deprecated/clutter-animator.c:1809
 msgid "Timeline"
 msgstr "Zeitleiste"
 
-#: ../clutter/deprecated/clutter-alpha.c:356
+#: ../clutter/deprecated/clutter-alpha.c:348
 msgid "Timeline used by the alpha"
 msgstr "Von Alpha verwendete Zeitlinie"
 
-#: ../clutter/deprecated/clutter-alpha.c:372
+#: ../clutter/deprecated/clutter-alpha.c:364
 msgid "Alpha value"
 msgstr "Alpha-Wert"
 
-#: ../clutter/deprecated/clutter-alpha.c:373
+#: ../clutter/deprecated/clutter-alpha.c:365
 msgid "Alpha value as computed by the alpha"
 msgstr "Alpha-Wert, wie vom Alpha berechnet"
 
-#: ../clutter/deprecated/clutter-alpha.c:394
-#: ../clutter/deprecated/clutter-animation.c:528
+#: ../clutter/deprecated/clutter-alpha.c:386
+#: ../clutter/deprecated/clutter-animation.c:480
 msgid "Mode"
 msgstr "Modus"
 
-#: ../clutter/deprecated/clutter-alpha.c:395
+#: ../clutter/deprecated/clutter-alpha.c:387
 msgid "Progress mode"
 msgstr "Fortschrittsmodus"
 
-#: ../clutter/deprecated/clutter-animation.c:511
+#: ../clutter/deprecated/clutter-animation.c:463
 msgid "Object"
 msgstr "Objekt"
 
-#: ../clutter/deprecated/clutter-animation.c:512
+#: ../clutter/deprecated/clutter-animation.c:464
 msgid "Object to which the animation applies"
 msgstr "Objekt, für welches die Animation gilt"
 
-#: ../clutter/deprecated/clutter-animation.c:529
+#: ../clutter/deprecated/clutter-animation.c:481
 msgid "The mode of the animation"
 msgstr "Animationsmodus"
 
-#: ../clutter/deprecated/clutter-animation.c:545
+#: ../clutter/deprecated/clutter-animation.c:497
 msgid "Duration of the animation, in milliseconds"
 msgstr "Dauer der Animation in Millisekunden"
 
-#: ../clutter/deprecated/clutter-animation.c:561
+#: ../clutter/deprecated/clutter-animation.c:513
 msgid "Whether the animation should loop"
 msgstr "Legt fest, ob die Animation endlos wiederholt wird"
 
-#: ../clutter/deprecated/clutter-animation.c:576
+#: ../clutter/deprecated/clutter-animation.c:528
 msgid "The timeline used by the animation"
 msgstr "Die von der Animation benutzte Zeitleiste"
 
-#: ../clutter/deprecated/clutter-animation.c:592
-#: ../clutter/deprecated/clutter-behaviour.c:241
+#: ../clutter/deprecated/clutter-animation.c:544
+#: ../clutter/deprecated/clutter-behaviour.c:237
 msgid "Alpha"
 msgstr "Alpha"
 
-#: ../clutter/deprecated/clutter-animation.c:593
+#: ../clutter/deprecated/clutter-animation.c:545
 msgid "The alpha used by the animation"
 msgstr "Der von der Animation verwendete Alpha-Wert"
 
-#: ../clutter/deprecated/clutter-animator.c:1805
+#: ../clutter/deprecated/clutter-animator.c:1793
 msgid "The duration of the animation"
 msgstr "Die Dauer der Animation"
 
-#: ../clutter/deprecated/clutter-animator.c:1822
+#: ../clutter/deprecated/clutter-animator.c:1810
 msgid "The timeline of the animation"
 msgstr "Die Zeitleiste der Animation"
 
-#: ../clutter/deprecated/clutter-behaviour.c:242
+#: ../clutter/deprecated/clutter-behaviour.c:238
 msgid "Alpha Object to drive the behaviour"
 msgstr "Alpha-Objekt zum Umsetzen des Verhaltens"
 
-#: ../clutter/deprecated/clutter-behaviour-depth.c:182
+#: ../clutter/deprecated/clutter-behaviour-depth.c:180
 msgid "Start Depth"
 msgstr "Starttiefe"
 
-#: ../clutter/deprecated/clutter-behaviour-depth.c:183
+#: ../clutter/deprecated/clutter-behaviour-depth.c:181
 msgid "Initial depth to apply"
 msgstr "Anzuwendende initiale Tiefe"
 
-#: ../clutter/deprecated/clutter-behaviour-depth.c:198
+#: ../clutter/deprecated/clutter-behaviour-depth.c:196
 msgid "End Depth"
 msgstr "Endtiefe"
 
-#: ../clutter/deprecated/clutter-behaviour-depth.c:199
+#: ../clutter/deprecated/clutter-behaviour-depth.c:197
 msgid "Final depth to apply"
 msgstr "Anzuwendende finale Tiefe"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:401
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:394
 msgid "Start Angle"
 msgstr "Startwinkel"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:402
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:284
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:395
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:277
 msgid "Initial angle"
 msgstr "Initialer Winkel"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:417
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:410
 msgid "End Angle"
 msgstr "Endwinkel"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:418
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:302
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:411
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:295
 msgid "Final angle"
 msgstr "Finaler Winkel"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:433
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:426
 msgid "Angle x tilt"
 msgstr "Neigungswinkel der x-Achse"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:434
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:427
 msgid "Tilt of the ellipse around x axis"
 msgstr "Neigung der Ellipse an der x-Achse"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:449
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:442
 msgid "Angle y tilt"
 msgstr "Neigungswinkel der y-Achse"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:450
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:443
 msgid "Tilt of the ellipse around y axis"
 msgstr "Neigung der Ellipse an der y-Achse"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:465
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:458
 msgid "Angle z tilt"
 msgstr "Neigungswinkel der z-Achse"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:466
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:459
 msgid "Tilt of the ellipse around z axis"
 msgstr "Neigung der Ellipse an der z-Achse"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:482
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:475
 msgid "Width of the ellipse"
 msgstr "Breite der Ellipse"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:498
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:491
 msgid "Height of ellipse"
 msgstr "Höhe der Ellipse"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:513
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:506
 msgid "Center"
 msgstr "Mittelpunkt"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:514
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:507
 msgid "Center of ellipse"
 msgstr "Mittelpunkt der Ellipse"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:529
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:338
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:522
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:331
 msgid "Direction of rotation"
 msgstr "Rotationsrichtung"
 
-#: ../clutter/deprecated/clutter-behaviour-opacity.c:184
+#: ../clutter/deprecated/clutter-behaviour-opacity.c:177
 msgid "Opacity Start"
 msgstr "Start-Deckungskraft"
 
-#: ../clutter/deprecated/clutter-behaviour-opacity.c:185
+#: ../clutter/deprecated/clutter-behaviour-opacity.c:178
 msgid "Initial opacity level"
 msgstr "Initialer Deckungskraftgrad"
 
-#: ../clutter/deprecated/clutter-behaviour-opacity.c:202
+#: ../clutter/deprecated/clutter-behaviour-opacity.c:195
 msgid "Opacity End"
 msgstr "End-Deckungskraft"
 
-#: ../clutter/deprecated/clutter-behaviour-opacity.c:203
+#: ../clutter/deprecated/clutter-behaviour-opacity.c:196
 msgid "Final opacity level"
 msgstr "Finaler Deckungskraftgrad"
 
-#: ../clutter/deprecated/clutter-behaviour-path.c:226
+#: ../clutter/deprecated/clutter-behaviour-path.c:222
 msgid "The ClutterPath object representing the path to animate along"
 msgstr ""
 "Das ClutterPath-Objekt, das den Pfad darstellt, entlang dessen animiert "
 "werden soll"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:283
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:276
 msgid "Angle Begin"
 msgstr "Anfangswinkel"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:301
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:294
 msgid "Angle End"
 msgstr "Endwinkel"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:319
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:312
 msgid "Axis"
 msgstr "Achse"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:320
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:313
 msgid "Axis of rotation"
 msgstr "Rotationsachse"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:355
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:348
 msgid "Center X"
 msgstr "Mittelpunkt-X"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:356
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:349
 msgid "X coordinate of the center of rotation"
 msgstr "X-Koordinate des Rotationszentrums"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:373
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:366
 msgid "Center Y"
 msgstr "Mittelpunkt-Y"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:374
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:367
 msgid "Y coordinate of the center of rotation"
 msgstr "Y-Koordinate des Rotationszentrums"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:391
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:384
 msgid "Center Z"
 msgstr "Mittelpunkt-Y"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:392
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:385
 msgid "Z coordinate of the center of rotation"
 msgstr "Z-Koordinate des Rotationszentrums"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:226
+#: ../clutter/deprecated/clutter-behaviour-scale.c:222
 msgid "X Start Scale"
 msgstr "Startskalierung in X-Richtung"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:227
+#: ../clutter/deprecated/clutter-behaviour-scale.c:223
 msgid "Initial scale on the X axis"
 msgstr "Initiale Skalierung auf der X-Achse"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:245
+#: ../clutter/deprecated/clutter-behaviour-scale.c:241
 msgid "X End Scale"
 msgstr "Endskalierung in X-Richtung"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:246
+#: ../clutter/deprecated/clutter-behaviour-scale.c:242
 msgid "Final scale on the X axis"
 msgstr "Finale Skalierung auf der X-Achse"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:264
+#: ../clutter/deprecated/clutter-behaviour-scale.c:260
 msgid "Y Start Scale"
 msgstr "Startskalierung in Y-Richtung"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:265
+#: ../clutter/deprecated/clutter-behaviour-scale.c:261
 msgid "Initial scale on the Y axis"
 msgstr "Initiale Skalierung auf der Y-Achse"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:283
+#: ../clutter/deprecated/clutter-behaviour-scale.c:279
 msgid "Y End Scale"
 msgstr "Endskalierung in Y-Richtung"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:284
+#: ../clutter/deprecated/clutter-behaviour-scale.c:280
 msgid "Final scale on the Y axis"
 msgstr "Finale Skalierung auf der Y-Achse"
 
-#: ../clutter/deprecated/clutter-box.c:261
+#: ../clutter/deprecated/clutter-box.c:255
 msgid "The background color of the box"
 msgstr "Die Hintergrundfarbe der Box"
 
-#: ../clutter/deprecated/clutter-box.c:274
+#: ../clutter/deprecated/clutter-box.c:268
 msgid "Color Set"
 msgstr "Farbe gesetzt"
 
-#: ../clutter/deprecated/clutter-cairo-texture.c:597
+#: ../clutter/deprecated/clutter-cairo-texture.c:585
 msgid "Surface Width"
 msgstr "Zeichenflächenbreite"
 
-#: ../clutter/deprecated/clutter-cairo-texture.c:598
+#: ../clutter/deprecated/clutter-cairo-texture.c:586
 msgid "The width of the Cairo surface"
 msgstr "Die Breite der Cairo-Zeichenfläche"
 
-#: ../clutter/deprecated/clutter-cairo-texture.c:615
+#: ../clutter/deprecated/clutter-cairo-texture.c:603
 msgid "Surface Height"
 msgstr "Zeichenflächenhöhe"
 
-#: ../clutter/deprecated/clutter-cairo-texture.c:616
+#: ../clutter/deprecated/clutter-cairo-texture.c:604
 msgid "The height of the Cairo surface"
 msgstr "Die Höhe der Cairo-Zeichenfläche"
 
-#: ../clutter/deprecated/clutter-cairo-texture.c:636
+#: ../clutter/deprecated/clutter-cairo-texture.c:624
 msgid "Auto Resize"
 msgstr "Größe automatisch anpassen"
 
 # Controls whether the #ClutterCairoTexture should automatically resize the Cairo surface whenever the actor's allocation changes.
-#: ../clutter/deprecated/clutter-cairo-texture.c:637
+#: ../clutter/deprecated/clutter-cairo-texture.c:625
 msgid "Whether the surface should match the allocation"
 msgstr "Legt fest, ob die Zeichenfläche mit der Zuordnung übereinstimmen soll"
 
@@ -2420,104 +2442,162 @@ msgstr "Der Füllstand des Puffers"
 msgid "The duration of the stream, in seconds"
 msgstr "Die Dauer des Datenstroms in Sekunden"
 
-#: ../clutter/deprecated/clutter-rectangle.c:274
+#: ../clutter/deprecated/clutter-rectangle.c:271
 msgid "The color of the rectangle"
 msgstr "Die Farbe des Rechtecks"
 
-#: ../clutter/deprecated/clutter-rectangle.c:287
+#: ../clutter/deprecated/clutter-rectangle.c:284
 msgid "Border Color"
 msgstr "Rahmenfarbe"
 
-#: ../clutter/deprecated/clutter-rectangle.c:288
+#: ../clutter/deprecated/clutter-rectangle.c:285
 msgid "The color of the border of the rectangle"
 msgstr "Die Randfarbe des Rechtecks"
 
-#: ../clutter/deprecated/clutter-rectangle.c:303
+#: ../clutter/deprecated/clutter-rectangle.c:300
 msgid "Border Width"
 msgstr "Rahmenbreite"
 
-#: ../clutter/deprecated/clutter-rectangle.c:304
+#: ../clutter/deprecated/clutter-rectangle.c:301
 msgid "The width of the border of the rectangle"
 msgstr "Die Randbreite des Rechtecks"
 
-#: ../clutter/deprecated/clutter-rectangle.c:318
+#: ../clutter/deprecated/clutter-rectangle.c:315
 msgid "Has Border"
 msgstr "Hat Rand"
 
-#: ../clutter/deprecated/clutter-rectangle.c:319
+#: ../clutter/deprecated/clutter-rectangle.c:316
 msgid "Whether the rectangle should have a border"
 msgstr "Gibt an, ob das Rechteck einen Rand haben soll"
 
-#: ../clutter/deprecated/clutter-shader.c:261
+#: ../clutter/deprecated/clutter-shader.c:257
 msgid "Vertex Source"
 msgstr "Vertex-Quelle"
 
-#: ../clutter/deprecated/clutter-shader.c:262
+#: ../clutter/deprecated/clutter-shader.c:258
 msgid "Source of vertex shader"
 msgstr "Quelle des Vertex-Shaders"
 
-#: ../clutter/deprecated/clutter-shader.c:278
+#: ../clutter/deprecated/clutter-shader.c:274
 msgid "Fragment Source"
 msgstr "Fragment-Quelle"
 
-#: ../clutter/deprecated/clutter-shader.c:279
+#: ../clutter/deprecated/clutter-shader.c:275
 msgid "Source of fragment shader"
 msgstr "Quelle des Fragment-Shaders"
 
-#: ../clutter/deprecated/clutter-shader.c:296
+#: ../clutter/deprecated/clutter-shader.c:292
 msgid "Compiled"
 msgstr "Compiliert"
 
-#: ../clutter/deprecated/clutter-shader.c:297
+#: ../clutter/deprecated/clutter-shader.c:293
 msgid "Whether the shader is compiled and linked"
 msgstr "Legt fest, ob der Shader compiliert und gelinkt ist"
 
-#: ../clutter/deprecated/clutter-shader.c:314
+#: ../clutter/deprecated/clutter-shader.c:310
 msgid "Whether the shader is enabled"
 msgstr "Legt fest, ob der Shader aktiviert ist"
 
-#: ../clutter/deprecated/clutter-shader.c:525
+#: ../clutter/deprecated/clutter-shader.c:521
 #, c-format
 msgid "%s compilation failed: %s"
 msgstr "%s-Kompilierung fehlgeschlagen: %s"
 
-#: ../clutter/deprecated/clutter-shader.c:526
+#: ../clutter/deprecated/clutter-shader.c:522
 msgid "Vertex shader"
 msgstr "Vertex-Shader"
 
-#: ../clutter/deprecated/clutter-shader.c:527
+#: ../clutter/deprecated/clutter-shader.c:523
 msgid "Fragment shader"
 msgstr "Fragment-Shader"
 
-#: ../clutter/deprecated/clutter-state.c:1505
+#: ../clutter/deprecated/clutter-state.c:1497
 msgid "State"
 msgstr "Status"
 
-#: ../clutter/deprecated/clutter-state.c:1506
+#: ../clutter/deprecated/clutter-state.c:1498
 msgid "Currently set state, (transition to this state might not be complete)"
 msgstr ""
 "Gegenwärtig gesetzter Status (Überblendung in diesen Status könnte noch "
 "unvollständig sein)"
 
-#: ../clutter/deprecated/clutter-state.c:1524
+#: ../clutter/deprecated/clutter-state.c:1516
 msgid "Default transition duration"
 msgstr "Voreingestellte Überblenddauer"
 
-#: ../clutter/deprecated/clutter-texture.c:994
+#: ../clutter/deprecated/clutter-table-layout.c:535
+msgid "Column Number"
+msgstr "Spaltennummer"
+
+#: ../clutter/deprecated/clutter-table-layout.c:536
+msgid "The column the widget resides in"
+msgstr "Die Spalte, in dem sich das Widget befindet"
+
+#: ../clutter/deprecated/clutter-table-layout.c:543
+msgid "Row Number"
+msgstr "Zeilennummer"
+
+#: ../clutter/deprecated/clutter-table-layout.c:544
+msgid "The row the widget resides in"
+msgstr "Die Zeile, in dem sich das Widget befindet"
+
+#: ../clutter/deprecated/clutter-table-layout.c:551
+msgid "Column Span"
+msgstr "Spaltenbelegung"
+
+#: ../clutter/deprecated/clutter-table-layout.c:552
+msgid "The number of columns the widget should span"
+msgstr "Die Anzahl der Spalten, die das Widget belegen soll"
+
+#: ../clutter/deprecated/clutter-table-layout.c:559
+msgid "Row Span"
+msgstr "Zeilenbelegung"
+
+#: ../clutter/deprecated/clutter-table-layout.c:560
+msgid "The number of rows the widget should span"
+msgstr "Die Anzahl der Zeilen, über die sich das Widget erstrecken soll"
+
+#: ../clutter/deprecated/clutter-table-layout.c:567
+msgid "Horizontal Expand"
+msgstr "Horizontal ausdehnen"
+
+#: ../clutter/deprecated/clutter-table-layout.c:568
+msgid "Allocate extra space for the child in horizontal axis"
+msgstr ""
+"Zusätzlichen Platz in der horizontalen Achse für das Unterelement zuweisen"
+
+#: ../clutter/deprecated/clutter-table-layout.c:574
+msgid "Vertical Expand"
+msgstr "Vertikal ausdehnen"
+
+#: ../clutter/deprecated/clutter-table-layout.c:575
+msgid "Allocate extra space for the child in vertical axis"
+msgstr ""
+"Zusätzlichen Platz in der vertikalen Achse für das Unterelement zuweisen"
+
+#: ../clutter/deprecated/clutter-table-layout.c:1630
+msgid "Spacing between columns"
+msgstr "Abstand zwischen Spalten"
+
+#: ../clutter/deprecated/clutter-table-layout.c:1646
+msgid "Spacing between rows"
+msgstr "Abstand zwischen Zeilen"
+
+#: ../clutter/deprecated/clutter-texture.c:992
 msgid "Sync size of actor"
 msgstr "Größe des Akteurs abgleichen"
 
-#: ../clutter/deprecated/clutter-texture.c:995
+#: ../clutter/deprecated/clutter-texture.c:993
 msgid "Auto sync size of actor to underlying pixbuf dimensions"
 msgstr ""
 "Die Größe des Akteurs automatisch auf die Abmessungen des zugrunde liegenden "
 "Pixbufs abgleichen"
 
-#: ../clutter/deprecated/clutter-texture.c:1002
+#: ../clutter/deprecated/clutter-texture.c:1000
 msgid "Disable Slicing"
 msgstr "Kacheln deaktivieren"
 
-#: ../clutter/deprecated/clutter-texture.c:1003
+#: ../clutter/deprecated/clutter-texture.c:1001
 msgid ""
 "Forces the underlying texture to be singular and not made of smaller space "
 "saving individual textures"
@@ -2525,100 +2605,100 @@ msgstr ""
 "Erzwingt die Singularität der zugrunde liegenden Textur und verhindert die "
 "Erzeugung kleinerer, Platz sparender individueller Texturen"
 
-#: ../clutter/deprecated/clutter-texture.c:1012
+#: ../clutter/deprecated/clutter-texture.c:1010
 msgid "Tile Waste"
 msgstr "Kachelverschnitt"
 
-#: ../clutter/deprecated/clutter-texture.c:1013
+#: ../clutter/deprecated/clutter-texture.c:1011
 msgid "Maximum waste area of a sliced texture"
 msgstr "Maximaler Verschnitt einer gekachelten Struktur"
 
-#: ../clutter/deprecated/clutter-texture.c:1021
+#: ../clutter/deprecated/clutter-texture.c:1019
 msgid "Horizontal repeat"
 msgstr "Horizontal wiederholen"
 
-#: ../clutter/deprecated/clutter-texture.c:1022
+#: ../clutter/deprecated/clutter-texture.c:1020
 msgid "Repeat the contents rather than scaling them horizontally"
 msgstr "Inhalt wird horizontal wiederholt, anstatt zu skalieren"
 
-#: ../clutter/deprecated/clutter-texture.c:1029
+#: ../clutter/deprecated/clutter-texture.c:1027
 msgid "Vertical repeat"
 msgstr "Vertikal wiederholen"
 
-#: ../clutter/deprecated/clutter-texture.c:1030
+#: ../clutter/deprecated/clutter-texture.c:1028
 msgid "Repeat the contents rather than scaling them vertically"
 msgstr "Inhalt wird vertikal wiederholt, anstatt zu skalieren"
 
-#: ../clutter/deprecated/clutter-texture.c:1037
+#: ../clutter/deprecated/clutter-texture.c:1035
 msgid "Filter Quality"
 msgstr "Filterqualität"
 
-#: ../clutter/deprecated/clutter-texture.c:1038
+#: ../clutter/deprecated/clutter-texture.c:1036
 msgid "Rendering quality used when drawing the texture"
 msgstr "Darstellungsqualität beim Zeichnen der Textur"
 
-#: ../clutter/deprecated/clutter-texture.c:1046
+#: ../clutter/deprecated/clutter-texture.c:1044
 msgid "Pixel Format"
 msgstr "Pixelformat"
 
-#: ../clutter/deprecated/clutter-texture.c:1047
+#: ../clutter/deprecated/clutter-texture.c:1045
 msgid "The Cogl pixel format to use"
 msgstr "Das zu verwendende Cogl-Pixelformat"
 
-#: ../clutter/deprecated/clutter-texture.c:1055
-#: ../clutter/wayland/clutter-wayland-surface.c:449
+#: ../clutter/deprecated/clutter-texture.c:1053
+#: ../clutter/wayland/clutter-wayland-surface.c:445
 msgid "Cogl Texture"
 msgstr "Cogl-Textur"
 
-#: ../clutter/deprecated/clutter-texture.c:1056
-#: ../clutter/wayland/clutter-wayland-surface.c:450
+#: ../clutter/deprecated/clutter-texture.c:1054
+#: ../clutter/wayland/clutter-wayland-surface.c:446
 msgid "The underlying Cogl texture handle used to draw this actor"
 msgstr ""
 "Das unterliegende Handle der Cogl-Textur, das zum Zeichnen dieses Akteurs "
 "verwendet wird"
 
-#: ../clutter/deprecated/clutter-texture.c:1063
+#: ../clutter/deprecated/clutter-texture.c:1061
 msgid "Cogl Material"
 msgstr "Cogl-Material"
 
-#: ../clutter/deprecated/clutter-texture.c:1064
+#: ../clutter/deprecated/clutter-texture.c:1062
 msgid "The underlying Cogl material handle used to draw this actor"
 msgstr ""
 "Das unterliegende Handle des Cogl-Materials, das zum Zeichnen dieses Akteurs "
 "verwendet wird"
 
-#: ../clutter/deprecated/clutter-texture.c:1083
+#: ../clutter/deprecated/clutter-texture.c:1081
 msgid "The path of the file containing the image data"
 msgstr "Der Pfad zur Datei, welche die Bilddaten enthält"
 
-#: ../clutter/deprecated/clutter-texture.c:1090
+#: ../clutter/deprecated/clutter-texture.c:1088
 msgid "Keep Aspect Ratio"
 msgstr "Seitenverhältnis beibehalten"
 
-#: ../clutter/deprecated/clutter-texture.c:1091
+#: ../clutter/deprecated/clutter-texture.c:1089
 msgid ""
 "Keep the aspect ratio of the texture when requesting the preferred width or "
 "height"
 msgstr ""
-"Das Seitenverhältnis der Textur beibehalten, wenn eine gewünschte Breite oder "
-"Höhe angefordert wird"
+"Das Seitenverhältnis der Textur beibehalten, wenn eine gewünschte Breite "
+"oder Höhe angefordert wird"
 
-#: ../clutter/deprecated/clutter-texture.c:1119
+#: ../clutter/deprecated/clutter-texture.c:1117
 msgid "Load asynchronously"
 msgstr "Asynchron laden"
 
-#: ../clutter/deprecated/clutter-texture.c:1120
+#: ../clutter/deprecated/clutter-texture.c:1118
 msgid ""
 "Load files inside a thread to avoid blocking when loading images from disk"
 msgstr ""
 "Dateien in einem separaten Thread laden, um ein Blockieren beim Laden von "
 "einem Datenträger zu vermeiden"
 
-#: ../clutter/deprecated/clutter-texture.c:1138
+#: ../clutter/deprecated/clutter-texture.c:1136
 msgid "Load data asynchronously"
 msgstr "Daten asynchron laden"
 
-#: ../clutter/deprecated/clutter-texture.c:1139
+#: ../clutter/deprecated/clutter-texture.c:1137
 msgid ""
 "Decode image data files inside a thread to reduce blocking when loading "
 "images from disk"
@@ -2626,200 +2706,195 @@ msgstr ""
 "Bilddaten in einem separaten Thread dekodieren, um Blockieren beim Laden von "
 "einem Datenträger zu verringern"
 
-#: ../clutter/deprecated/clutter-texture.c:1165
+#: ../clutter/deprecated/clutter-texture.c:1163
 msgid "Pick With Alpha"
 msgstr "Mit Alpha wählen"
 
-#: ../clutter/deprecated/clutter-texture.c:1166
+#: ../clutter/deprecated/clutter-texture.c:1164
 msgid "Shape actor with alpha channel when picking"
 msgstr "Akteur mit Alphakanal bei der Auswahl formen"
 
-#: ../clutter/deprecated/clutter-texture.c:1599
-#: ../clutter/deprecated/clutter-texture.c:1994
-#: ../clutter/deprecated/clutter-texture.c:2090
-#: ../clutter/deprecated/clutter-texture.c:2388
+#: ../clutter/deprecated/clutter-texture.c:1597
+#: ../clutter/deprecated/clutter-texture.c:1992
+#: ../clutter/deprecated/clutter-texture.c:2088
+#: ../clutter/deprecated/clutter-texture.c:2386
 #, c-format
 msgid "Failed to load the image data"
 msgstr "Bilddaten konnten nicht geladen werden"
 
-#: ../clutter/deprecated/clutter-texture.c:1758
+#: ../clutter/deprecated/clutter-texture.c:1756
 #, c-format
 msgid "YUV textures are not supported"
 msgstr "YUV-Texturen werden nicht unterstützt"
 
-#: ../clutter/deprecated/clutter-texture.c:1767
+#: ../clutter/deprecated/clutter-texture.c:1765
 #, c-format
 msgid "YUV2 textues are not supported"
 msgstr "YUV2-Texturen werden nicht unterstützt"
 
-#: ../clutter/evdev/clutter-input-device-evdev.c:159
-msgid "sysfs Path"
-msgstr "sysfs-Pfad"
-
-#: ../clutter/evdev/clutter-input-device-evdev.c:160
-msgid "Path of the device in sysfs"
-msgstr "Pfad des Geräts in sysfs"
-
-#: ../clutter/evdev/clutter-input-device-evdev.c:175
-msgid "Device Path"
-msgstr "Gerätepfad"
-
-#: ../clutter/evdev/clutter-input-device-evdev.c:176
-msgid "Path of the device node"
-msgstr "Pfad des Geräteknotens"
-
-#: ../clutter/gdk/clutter-backend-gdk.c:296
+#: ../clutter/gdk/clutter-backend-gdk.c:289
 #, c-format
 msgid "Could not find a suitable CoglWinsys for a GdkDisplay of type %s"
 msgstr ""
 "Es konnte kein passendes CoglWinsys für ein GdkDisplay des Typs %s gefunden "
 "werden"
 
-#: ../clutter/wayland/clutter-wayland-surface.c:423
+#: ../clutter/wayland/clutter-wayland-surface.c:419
 msgid "Surface"
 msgstr "Oberfläche"
 
-#: ../clutter/wayland/clutter-wayland-surface.c:424
+#: ../clutter/wayland/clutter-wayland-surface.c:420
 msgid "The underlying wayland surface"
 msgstr "Die zugrunde liegende Wayland-Fläche"
 
-#: ../clutter/wayland/clutter-wayland-surface.c:431
+#: ../clutter/wayland/clutter-wayland-surface.c:427
 msgid "Surface width"
 msgstr "Oberflächenbreite"
 
-#: ../clutter/wayland/clutter-wayland-surface.c:432
+#: ../clutter/wayland/clutter-wayland-surface.c:428
 msgid "The width of the underlying wayland surface"
 msgstr "Die Weite der zugrunde liegenden Wayland-Fläche"
 
-#: ../clutter/wayland/clutter-wayland-surface.c:440
+#: ../clutter/wayland/clutter-wayland-surface.c:436
 msgid "Surface height"
 msgstr "Oberflächenhöhe"
 
-#: ../clutter/wayland/clutter-wayland-surface.c:441
+#: ../clutter/wayland/clutter-wayland-surface.c:437
 msgid "The height of the underlying wayland surface"
 msgstr "Die Höhe der zugrunde liegenden Wayland-Fläche"
 
-#: ../clutter/x11/clutter-backend-x11.c:511
+#: ../clutter/x11/clutter-backend-x11.c:488
 msgid "X display to use"
 msgstr "Zu benutzende X-Anzeige"
 
-#: ../clutter/x11/clutter-backend-x11.c:517
+#: ../clutter/x11/clutter-backend-x11.c:494
 msgid "X screen to use"
 msgstr "Zu benutzender X-Bildschirm"
 
-#: ../clutter/x11/clutter-backend-x11.c:522
+#: ../clutter/x11/clutter-backend-x11.c:499
 msgid "Make X calls synchronous"
 msgstr "X-Aufrufe synchronisieren"
 
-#: ../clutter/x11/clutter-backend-x11.c:529
-#| msgid "Enable XInput support"
+#: ../clutter/x11/clutter-backend-x11.c:506
 msgid "Disable XInput support"
 msgstr "XInput-Unterstützung ausschalten"
 
-#: ../clutter/x11/clutter-keymap-x11.c:322
+#: ../clutter/x11/clutter-keymap-x11.c:458
 msgid "The Clutter backend"
 msgstr "Das Clutter-Backend"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:539
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:534
 msgid "Pixmap"
 msgstr "Pixmap"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:540
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:535
 msgid "The X11 Pixmap to be bound"
 msgstr "Zu bindendes X11-Pixmap"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:548
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:543
 msgid "Pixmap width"
 msgstr "Breite der Pixmap"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:549
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:544
 msgid "The width of the pixmap bound to this texture"
 msgstr "Die Breite der an diese Textur gebundenen Pixmap"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:557
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:552
 msgid "Pixmap height"
 msgstr "Höhe der Pixmap"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:558
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:553
 msgid "The height of the pixmap bound to this texture"
 msgstr "Die Höhe der an diese Textur gebundenen Pixmap"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:566
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:561
 msgid "Pixmap Depth"
 msgstr "Tiefe der Pixmap"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:567
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:562
 msgid "The depth (in number of bits) of the pixmap bound to this texture"
 msgstr "Die Tiefe (in Bit) der an diese Textur gebundenen Pixmap"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:575
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:570
 msgid "Automatic Updates"
 msgstr "Automatische Aktualisierungen"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:576
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:571
 msgid "If the texture should be kept in sync with any pixmap changes."
 msgstr ""
 "Legt fest, ob die Textur stets mit Änderungen der Pixmap abgeglichen werden "
 "soll."
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:584
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:579
 msgid "Window"
 msgstr "Fenster"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:585
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:580
 msgid "The X11 Window to be bound"
 msgstr "Das X11-Fenster zur Bindung"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:593
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:588
 msgid "Window Redirect Automatic"
 msgstr "Automatische Fensterumleitung"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:594
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:589
 msgid "If composite window redirects are set to Automatic (or Manual if false)"
 msgstr ""
 "Legt fest, ob die Composite-Fensterumleitung automatisch erfolgt (oder "
 "manuell, wenn falsch)"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:604
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:599
 msgid "Window Mapped"
 msgstr "Fenster abgebildet"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:605
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:600
 msgid "If window is mapped"
-msgstr "Left fest, ob das Fenster abgebildet wird"
+msgstr "Legt fest, ob das Fenster abgebildet wird"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:614
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:609
 msgid "Destroyed"
 msgstr "Zerstört"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:615
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:610
 msgid "If window has been destroyed"
 msgstr "Gibt an, ob das Fenster zerstört worden ist"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:623
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:618
 msgid "Window X"
 msgstr "X des Fensters"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:624
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:619
 msgid "X position of window on screen according to X11"
 msgstr "X-Position des Fensters auf dem Bildschirm laut X11"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:632
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:627
 msgid "Window Y"
 msgstr "Y des Fensters"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:633
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:628
 msgid "Y position of window on screen according to X11"
 msgstr "Y-Position des Fensters auf dem Bildschirm laut X11"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:640
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:635
 msgid "Window Override Redirect"
 msgstr "»Override-Redirect« von Fenster"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:641
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:636
 msgid "If this is an override-redirect window"
 msgstr "Legt fest, ob es sich um ein »Override-Redirect«-Fenster handelt"
 
+#~ msgid "sysfs Path"
+#~ msgstr "sysfs-Pfad"
+
+#~ msgid "Path of the device in sysfs"
+#~ msgstr "Pfad des Geräts in sysfs"
+
+#~ msgid "Device Path"
+#~ msgstr "Gerätepfad"
+
+#~ msgid "Path of the device node"
+#~ msgstr "Pfad des Geräteknotens"
+
 #~ msgid "The layout manager used by the box"
 #~ msgstr "Der von der Box verwendete Layout-Manager"
 
diff --git a/po/el.po b/po/el.po
index a4c2471f3..17b6e25b4 100644
--- a/po/el.po
+++ b/po/el.po
@@ -1,709 +1,711 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# Dimitris Spingos (Δημήτρης Σπίγγος) <dmtrs32@gmail.com>, 2012.
+# Dimitris Spingos (Δημήτρης Σπίγγος) <dmtrs32@gmail.com>, 2012, 2013, 2014.
 msgid ""
 msgstr ""
 "Project-Id-Version: clutter\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=clutte"
-"r&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2012-12-18 02:00+0000\n"
-"PO-Revision-Date: 2012-12-23 18:52+0300\n"
-"Last-Translator: Dimitris Spingos (Δημήτρης Σπίγγος) <dmtrs32@gmail.com>\n"
-"Language-Team: team@gnome.gr\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+"product=clutter&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2014-08-03 15:05+0000\n"
+"PO-Revision-Date: 2014-08-09 21:55+0200\n"
+"Last-Translator: Maria Mavridou <mavridou@gmail.com>\n"
+"Language-Team: team@lists.gnome.gr\n"
 "Language: el\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"
-"X-Generator: Virtaal 0.7.1\n"
+"X-Generator: Poedit 1.6.4\n"
 "X-Project-Style: gnome\n"
 
-#: ../clutter/clutter-actor.c:6144
+#: ../clutter/clutter-actor.c:6224
 msgid "X coordinate"
 msgstr "συντεταγμένη Χ"
 
-#: ../clutter/clutter-actor.c:6145
+#: ../clutter/clutter-actor.c:6225
 msgid "X coordinate of the actor"
 msgstr "συντεταγμένη Χ του δράστη"
 
-#: ../clutter/clutter-actor.c:6163
+#: ../clutter/clutter-actor.c:6243
 msgid "Y coordinate"
 msgstr "συντεταγμένη Υ"
 
-#: ../clutter/clutter-actor.c:6164
+#: ../clutter/clutter-actor.c:6244
 msgid "Y coordinate of the actor"
 msgstr "συντεταγμένη Υ του δράστη"
 
-#: ../clutter/clutter-actor.c:6186
+#: ../clutter/clutter-actor.c:6266
 msgid "Position"
 msgstr "Θέση"
 
-#: ../clutter/clutter-actor.c:6187
+#: ../clutter/clutter-actor.c:6267
 msgid "The position of the origin of the actor"
 msgstr "Η θέση προέλευσης του δράστη"
 
-#: ../clutter/clutter-actor.c:6204 ../clutter/clutter-canvas.c:215
-#: ../clutter/clutter-grid-layout.c:1238
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:481
+#: ../clutter/clutter-actor.c:6284 ../clutter/clutter-canvas.c:247
+#: ../clutter/clutter-grid-layout.c:1239
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:474
 msgid "Width"
 msgstr "Πλάτος"
 
-#: ../clutter/clutter-actor.c:6205
+#: ../clutter/clutter-actor.c:6285
 msgid "Width of the actor"
 msgstr "Πλάτος του δράστη"
 
-#: ../clutter/clutter-actor.c:6223 ../clutter/clutter-canvas.c:231
-#: ../clutter/clutter-grid-layout.c:1245
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:497
+#: ../clutter/clutter-actor.c:6303 ../clutter/clutter-canvas.c:263
+#: ../clutter/clutter-grid-layout.c:1246
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:490
 msgid "Height"
 msgstr "Ύψος"
 
-#: ../clutter/clutter-actor.c:6224
+#: ../clutter/clutter-actor.c:6304
 msgid "Height of the actor"
 msgstr "Ύψος του δράστη"
 
-#: ../clutter/clutter-actor.c:6245
+#: ../clutter/clutter-actor.c:6325
 msgid "Size"
 msgstr "Μέγεθος"
 
-#: ../clutter/clutter-actor.c:6246
+#: ../clutter/clutter-actor.c:6326
 msgid "The size of the actor"
 msgstr "Το μέγεθος του δράστη"
 
-#: ../clutter/clutter-actor.c:6264
+#: ../clutter/clutter-actor.c:6344
 msgid "Fixed X"
 msgstr "Σταθερό Χ"
 
-#: ../clutter/clutter-actor.c:6265
+#: ../clutter/clutter-actor.c:6345
 msgid "Forced X position of the actor"
 msgstr "Εξαναγκασμένη θέση Χ του δράστη"
 
-#: ../clutter/clutter-actor.c:6282
+#: ../clutter/clutter-actor.c:6362
 msgid "Fixed Y"
 msgstr "Σταθερό Υ"
 
-#: ../clutter/clutter-actor.c:6283
+#: ../clutter/clutter-actor.c:6363
 msgid "Forced Y position of the actor"
 msgstr "Εξαναγκασμένη θέση Υ του δράστη"
 
-#: ../clutter/clutter-actor.c:6298
+#: ../clutter/clutter-actor.c:6378
 msgid "Fixed position set"
 msgstr "Ορισμός σταθερής θέσης"
 
-#: ../clutter/clutter-actor.c:6299
+#: ../clutter/clutter-actor.c:6379
 msgid "Whether to use fixed positioning for the actor"
 msgstr "Εάν θα χρησιμοποιηθεί σταθερή θέση για τον δράστη"
 
-#: ../clutter/clutter-actor.c:6317
+#: ../clutter/clutter-actor.c:6397
 msgid "Min Width"
 msgstr "Ελάχιστο πλάτος"
 
-#: ../clutter/clutter-actor.c:6318
+#: ../clutter/clutter-actor.c:6398
 msgid "Forced minimum width request for the actor"
 msgstr "Εξαναγκασμένο αίτημα ελάχιστου πλάτους για το δράστη"
 
-#: ../clutter/clutter-actor.c:6336
+#: ../clutter/clutter-actor.c:6416
 msgid "Min Height"
 msgstr "Ελάχιστο ύψος"
 
-#: ../clutter/clutter-actor.c:6337
+#: ../clutter/clutter-actor.c:6417
 msgid "Forced minimum height request for the actor"
 msgstr "Εξαναγκασμένο αίτημα ελάχιστου ύψους για το δράστη"
 
-#: ../clutter/clutter-actor.c:6355
+#: ../clutter/clutter-actor.c:6435
 msgid "Natural Width"
 msgstr "Φυσικό πλάτος"
 
-#: ../clutter/clutter-actor.c:6356
+#: ../clutter/clutter-actor.c:6436
 msgid "Forced natural width request for the actor"
 msgstr "Εξαναγκασμένο αίτημα φυσικού πλάτους για το δράστη"
 
-#: ../clutter/clutter-actor.c:6374
+#: ../clutter/clutter-actor.c:6454
 msgid "Natural Height"
 msgstr "Φυσικό ύψος"
 
-#: ../clutter/clutter-actor.c:6375
+#: ../clutter/clutter-actor.c:6455
 msgid "Forced natural height request for the actor"
 msgstr "Εξαναγκασμένο αίτημα φυσικού ύψους για το δράστη"
 
-#: ../clutter/clutter-actor.c:6390
+#: ../clutter/clutter-actor.c:6470
 msgid "Minimum width set"
 msgstr "Ορισμός ελάχιστου πλάτους"
 
-#: ../clutter/clutter-actor.c:6391
+#: ../clutter/clutter-actor.c:6471
 msgid "Whether to use the min-width property"
 msgstr "Αν θα χρησιμοποιηθεί η ιδιότητα ελάχιστου πλάτους"
 
-#: ../clutter/clutter-actor.c:6405
+#: ../clutter/clutter-actor.c:6485
 msgid "Minimum height set"
 msgstr "Ορισμός ελάχιστου ύψους"
 
-#: ../clutter/clutter-actor.c:6406
+#: ../clutter/clutter-actor.c:6486
 msgid "Whether to use the min-height property"
 msgstr "Αν θα χρησιμοποιηθεί η ιδιότητα ελάχιστου ύψους"
 
-#: ../clutter/clutter-actor.c:6420
+#: ../clutter/clutter-actor.c:6500
 msgid "Natural width set"
 msgstr "Ορισμός φυσικού πλάτους"
 
-#: ../clutter/clutter-actor.c:6421
+#: ../clutter/clutter-actor.c:6501
 msgid "Whether to use the natural-width property"
 msgstr "Αν θα χρησιμοποιηθεί η ιδιότητα φυσικού πλάτους"
 
-#: ../clutter/clutter-actor.c:6435
+#: ../clutter/clutter-actor.c:6515
 msgid "Natural height set"
 msgstr "Ορισμός φυσικού ύψους"
 
-#: ../clutter/clutter-actor.c:6436
+#: ../clutter/clutter-actor.c:6516
 msgid "Whether to use the natural-height property"
 msgstr "Αν θα χρησιμοποιηθεί η ιδιότητα φυσικού ύψους"
 
-#: ../clutter/clutter-actor.c:6452
+#: ../clutter/clutter-actor.c:6532
 msgid "Allocation"
-msgstr "Μερίδιο"
+msgstr "Κατανομή"
 
-#: ../clutter/clutter-actor.c:6453
+#: ../clutter/clutter-actor.c:6533
 msgid "The actor's allocation"
-msgstr "Μερίδιο του δράστη"
+msgstr "Κατανομή του δράστη"
 
-#: ../clutter/clutter-actor.c:6510
+#: ../clutter/clutter-actor.c:6590
 msgid "Request Mode"
-msgstr "Κατάσταση αιτήματος"
+msgstr "Λειτουργία αιτήματος"
 
-#: ../clutter/clutter-actor.c:6511
+#: ../clutter/clutter-actor.c:6591
 msgid "The actor's request mode"
-msgstr "Η κατάσταση αιτήματος του δράστη"
+msgstr "Η λειτουργία αιτήματος του δράστη"
 
-#: ../clutter/clutter-actor.c:6535
+#: ../clutter/clutter-actor.c:6615
 msgid "Depth"
 msgstr "Βάθος"
 
-#: ../clutter/clutter-actor.c:6536
+#: ../clutter/clutter-actor.c:6616
 msgid "Position on the Z axis"
 msgstr "Θέση του άξονα Ζ"
 
-#: ../clutter/clutter-actor.c:6563
+#: ../clutter/clutter-actor.c:6643
 msgid "Z Position"
 msgstr "Θέση Ζ"
 
-#: ../clutter/clutter-actor.c:6564
+#: ../clutter/clutter-actor.c:6644
 msgid "The actor's position on the Z axis"
-msgstr "Το πλάτος του δράστη στον άξονα Ζ"
+msgstr "Η θέση του δράστη στον άξονα Ζ"
 
-#: ../clutter/clutter-actor.c:6581
+#: ../clutter/clutter-actor.c:6661
 msgid "Opacity"
 msgstr "Αδιαφάνεια"
 
-#: ../clutter/clutter-actor.c:6582
+#: ../clutter/clutter-actor.c:6662
 msgid "Opacity of an actor"
 msgstr "Αδιαφάνεια ενός δράστη"
 
-#: ../clutter/clutter-actor.c:6602
+#: ../clutter/clutter-actor.c:6682
 msgid "Offscreen redirect"
 msgstr "Ανακατεύθυνση εκτός οθόνης"
 
-#: ../clutter/clutter-actor.c:6603
+#: ../clutter/clutter-actor.c:6683
 msgid "Flags controlling when to flatten the actor into a single image"
 msgstr ""
 "Οι σημαίες ελέγχουν πότε να ισοπεδώσουν το δράστη σε μια μοναδική εικόνα"
 
-#: ../clutter/clutter-actor.c:6617
+#: ../clutter/clutter-actor.c:6697
 msgid "Visible"
 msgstr "Ορατή"
 
-#: ../clutter/clutter-actor.c:6618
+#: ../clutter/clutter-actor.c:6698
 msgid "Whether the actor is visible or not"
 msgstr "Εάν ο δράστης είναι ορατός ή όχι"
 
-#: ../clutter/clutter-actor.c:6632
+#: ../clutter/clutter-actor.c:6712
 msgid "Mapped"
 msgstr "Χαρτογραφημένο"
 
-#: ../clutter/clutter-actor.c:6633
+#: ../clutter/clutter-actor.c:6713
 msgid "Whether the actor will be painted"
 msgstr "Εάν ο δράστης θα βαφτεί"
 
-#: ../clutter/clutter-actor.c:6646
+#: ../clutter/clutter-actor.c:6726
 msgid "Realized"
-msgstr "Κατανοητό"
+msgstr "Πραγματοποιημένος"
 
-#: ../clutter/clutter-actor.c:6647
+#: ../clutter/clutter-actor.c:6727
 msgid "Whether the actor has been realized"
-msgstr "Εάν ο δράστης έχει γίνει κατανοητός"
+msgstr "Εάν ο δράστης έχει έχει πραγματοποιηθεί"
 
-#: ../clutter/clutter-actor.c:6662
+#: ../clutter/clutter-actor.c:6742
 msgid "Reactive"
 msgstr "Ενεργός"
 
-#: ../clutter/clutter-actor.c:6663
+#: ../clutter/clutter-actor.c:6743
 msgid "Whether the actor is reactive to events"
 msgstr "Εάν ο δράστης είναι ενεργός στα συμβάντα"
 
-#: ../clutter/clutter-actor.c:6674
+#: ../clutter/clutter-actor.c:6754
 msgid "Has Clip"
 msgstr "Ύπαρξη αποκόμματος"
 
-#: ../clutter/clutter-actor.c:6675
+#: ../clutter/clutter-actor.c:6755
 msgid "Whether the actor has a clip set"
 msgstr "Εάν ο δράστης έχει ορίσει ένα απόκομμα"
 
-#: ../clutter/clutter-actor.c:6688
+#: ../clutter/clutter-actor.c:6768
 msgid "Clip"
 msgstr "Απόκομμα"
 
-#: ../clutter/clutter-actor.c:6689
+#: ../clutter/clutter-actor.c:6769
 msgid "The clip region for the actor"
 msgstr "Η περιοχή αποκοπής για τον δράστη"
 
-#: ../clutter/clutter-actor.c:6708
+#: ../clutter/clutter-actor.c:6788
 msgid "Clip Rectangle"
 msgstr "Απόκομμα τετραγώνου"
 
-#: ../clutter/clutter-actor.c:6709
+#: ../clutter/clutter-actor.c:6789
 msgid "The visible region of the actor"
-msgstr "Η ορατή περιοχή για το δράστη"
+msgstr "Η ορατή περιοχή του δράστη"
 
-#: ../clutter/clutter-actor.c:6723 ../clutter/clutter-actor-meta.c:207
-#: ../clutter/clutter-binding-pool.c:319 ../clutter/clutter-input-device.c:258
+#: ../clutter/clutter-actor.c:6803 ../clutter/clutter-actor-meta.c:205
+#: ../clutter/clutter-binding-pool.c:318 ../clutter/clutter-input-device.c:247
 msgid "Name"
 msgstr "Όνομα"
 
-#: ../clutter/clutter-actor.c:6724
+#: ../clutter/clutter-actor.c:6804
 msgid "Name of the actor"
 msgstr "Όνομα του δράστη"
 
-#: ../clutter/clutter-actor.c:6745
+#: ../clutter/clutter-actor.c:6825
 msgid "Pivot Point"
 msgstr "Σημείο άξονα"
 
-#: ../clutter/clutter-actor.c:6746
+#: ../clutter/clutter-actor.c:6826
 msgid "The point around which the scaling and rotation occur"
 msgstr "Το σημείο στο οποίο συμβαίνει η εστίαση και η περιστροφή"
 
-#: ../clutter/clutter-actor.c:6764
+#: ../clutter/clutter-actor.c:6844
 msgid "Pivot Point Z"
 msgstr "Σημείο άξονα Ζ"
 
-#: ../clutter/clutter-actor.c:6765
+#: ../clutter/clutter-actor.c:6845
 msgid "Z component of the pivot point"
 msgstr "Ζ συνιστώσα του σημείου του άξονα"
 
-#: ../clutter/clutter-actor.c:6783
+#: ../clutter/clutter-actor.c:6863
 msgid "Scale X"
 msgstr "Κλίμακα Χ"
 
-#: ../clutter/clutter-actor.c:6784
+#: ../clutter/clutter-actor.c:6864
 msgid "Scale factor on the X axis"
 msgstr "Συντελεστής κλίμακας στον άξονα Χ"
 
-#: ../clutter/clutter-actor.c:6802
+#: ../clutter/clutter-actor.c:6882
 msgid "Scale Y"
 msgstr "Κλίμακα Υ"
 
-#: ../clutter/clutter-actor.c:6803
+#: ../clutter/clutter-actor.c:6883
 msgid "Scale factor on the Y axis"
 msgstr "Συντελεστής κλίμακας στον άξονα Υ"
 
-#: ../clutter/clutter-actor.c:6821
+#: ../clutter/clutter-actor.c:6901
 msgid "Scale Z"
 msgstr "Κλίμακα Ζ"
 
-#: ../clutter/clutter-actor.c:6822
+#: ../clutter/clutter-actor.c:6902
 msgid "Scale factor on the Z axis"
 msgstr "Κλίμακα συντελεστή στον άξονα Ζ"
 
-#: ../clutter/clutter-actor.c:6840
+#: ../clutter/clutter-actor.c:6920
 msgid "Scale Center X"
 msgstr "Κλίμακα κέντρου Χ"
 
-#: ../clutter/clutter-actor.c:6841
+#: ../clutter/clutter-actor.c:6921
 msgid "Horizontal scale center"
 msgstr "Κέντρο οριζόντιας κλίμακας"
 
-#: ../clutter/clutter-actor.c:6859
+#: ../clutter/clutter-actor.c:6939
 msgid "Scale Center Y"
 msgstr "Κέντρο κλίμακας Υ"
 
-#: ../clutter/clutter-actor.c:6860
+#: ../clutter/clutter-actor.c:6940
 msgid "Vertical scale center"
 msgstr "Κέντρο κάθετης κλίμακας"
 
-#: ../clutter/clutter-actor.c:6878
+#: ../clutter/clutter-actor.c:6958
 msgid "Scale Gravity"
 msgstr "Βαρύτητα κλίμακας"
 
-#: ../clutter/clutter-actor.c:6879
+#: ../clutter/clutter-actor.c:6959
 msgid "The center of scaling"
 msgstr "Το κέντρο της κλιμάκωσης"
 
-#: ../clutter/clutter-actor.c:6897
+#: ../clutter/clutter-actor.c:6977
 msgid "Rotation Angle X"
 msgstr "Γωνία περιστροφής Χ"
 
-#: ../clutter/clutter-actor.c:6898
+#: ../clutter/clutter-actor.c:6978
 msgid "The rotation angle on the X axis"
 msgstr "Η γωνία περιστροφής στον άξονα Χ"
 
-#: ../clutter/clutter-actor.c:6916
+#: ../clutter/clutter-actor.c:6996
 msgid "Rotation Angle Y"
 msgstr "Γωνία περιστροφής Υ"
 
-#: ../clutter/clutter-actor.c:6917
+#: ../clutter/clutter-actor.c:6997
 msgid "The rotation angle on the Y axis"
 msgstr "Η γωνία περιστροφής στον άξονα Υ"
 
-#: ../clutter/clutter-actor.c:6935
+#: ../clutter/clutter-actor.c:7015
 msgid "Rotation Angle Z"
 msgstr "Γωνία περιστροφής Ζ"
 
-#: ../clutter/clutter-actor.c:6936
+#: ../clutter/clutter-actor.c:7016
 msgid "The rotation angle on the Z axis"
 msgstr "Η γωνία περιστροφής στον άξονα Ζ"
 
-#: ../clutter/clutter-actor.c:6954
+#: ../clutter/clutter-actor.c:7034
 msgid "Rotation Center X"
 msgstr "Κέντρο περιστροφής Χ"
 
-#: ../clutter/clutter-actor.c:6955
+#: ../clutter/clutter-actor.c:7035
 msgid "The rotation center on the X axis"
 msgstr "Το κέντρο περιστροφής στον άξονα Χ"
 
-#: ../clutter/clutter-actor.c:6972
+#: ../clutter/clutter-actor.c:7052
 msgid "Rotation Center Y"
 msgstr "Κέντρο περιστροφής Υ"
 
-#: ../clutter/clutter-actor.c:6973
+#: ../clutter/clutter-actor.c:7053
 msgid "The rotation center on the Y axis"
 msgstr "Το κέντρο περιστροφής στον άξονα Υ"
 
-#: ../clutter/clutter-actor.c:6990
+#: ../clutter/clutter-actor.c:7070
 msgid "Rotation Center Z"
 msgstr "Κέντρο περιστροφής Ζ"
 
-#: ../clutter/clutter-actor.c:6991
+#: ../clutter/clutter-actor.c:7071
 msgid "The rotation center on the Z axis"
 msgstr "Το κέντρο περιστροφής στον άξονα Ζ"
 
-#: ../clutter/clutter-actor.c:7008
+#: ../clutter/clutter-actor.c:7088
 msgid "Rotation Center Z Gravity"
 msgstr "Κέντρο περιστροφής Ζ βαρύτητας"
 
-#: ../clutter/clutter-actor.c:7009
+#: ../clutter/clutter-actor.c:7089
 msgid "Center point for rotation around the Z axis"
 msgstr "Κεντρικό σημείο περιστροφής γύρω από τον άξονα Ζ"
 
-#: ../clutter/clutter-actor.c:7037
+#: ../clutter/clutter-actor.c:7117
 msgid "Anchor X"
 msgstr "Άγκυρα Χ"
 
-#: ../clutter/clutter-actor.c:7038
+#: ../clutter/clutter-actor.c:7118
 msgid "X coordinate of the anchor point"
 msgstr "Συντεταγμένη Χ του σημείου αγκύρωσης"
 
-#: ../clutter/clutter-actor.c:7066
+#: ../clutter/clutter-actor.c:7146
 msgid "Anchor Y"
 msgstr "Άγκυρα Υ"
 
-#: ../clutter/clutter-actor.c:7067
+#: ../clutter/clutter-actor.c:7147
 msgid "Y coordinate of the anchor point"
 msgstr "Συντεταγμένη Υ του σημείου αγκύρωσης"
 
-#: ../clutter/clutter-actor.c:7094
+#: ../clutter/clutter-actor.c:7174
 msgid "Anchor Gravity"
 msgstr "Άγκυρα βαρύτητας"
 
-#: ../clutter/clutter-actor.c:7095
+#: ../clutter/clutter-actor.c:7175
 msgid "The anchor point as a ClutterGravity"
 msgstr "Το σημείο αγκύρωσης ως ClutterGravity"
 
-#: ../clutter/clutter-actor.c:7114
+#: ../clutter/clutter-actor.c:7194
 msgid "Translation X"
 msgstr "Μετάφραση Χ"
 
-#: ../clutter/clutter-actor.c:7115
+#: ../clutter/clutter-actor.c:7195
 msgid "Translation along the X axis"
 msgstr "Μετάφραση κατά μήκος του άξονα Χ"
 
-#: ../clutter/clutter-actor.c:7134
+#: ../clutter/clutter-actor.c:7214
 msgid "Translation Y"
 msgstr "Μετάφραση Υ"
 
-#: ../clutter/clutter-actor.c:7135
+#: ../clutter/clutter-actor.c:7215
 msgid "Translation along the Y axis"
 msgstr "Μετάφραση κατά μήκος του άξονα Υ"
 
-#: ../clutter/clutter-actor.c:7154
+#: ../clutter/clutter-actor.c:7234
 msgid "Translation Z"
 msgstr "Μετάφραση Ζ"
 
-#: ../clutter/clutter-actor.c:7155
+#: ../clutter/clutter-actor.c:7235
 msgid "Translation along the Z axis"
 msgstr "Μετάφραση κατά μήκος του άξονα Ζ"
 
-#: ../clutter/clutter-actor.c:7185
+#: ../clutter/clutter-actor.c:7265
 msgid "Transform"
 msgstr "Μετασχηματισμός"
 
-#: ../clutter/clutter-actor.c:7186
+#: ../clutter/clutter-actor.c:7266
 msgid "Transformation matrix"
 msgstr "Πίνακας μετασχηματισμού"
 
-#: ../clutter/clutter-actor.c:7201
+#: ../clutter/clutter-actor.c:7281
 msgid "Transform Set"
 msgstr "Ορισμός μετασχηματισμού"
 
-#: ../clutter/clutter-actor.c:7202
+#: ../clutter/clutter-actor.c:7282
 msgid "Whether the transform property is set"
 msgstr "Εάν ορίστηκε η ιδιότητα του μετασχηματισμού"
 
-#: ../clutter/clutter-actor.c:7223
+#: ../clutter/clutter-actor.c:7303
 msgid "Child Transform"
-msgstr "Μετασχηματισμός παιδιού"
+msgstr "Μετασχηματισμός θυγατρικού"
 
-#: ../clutter/clutter-actor.c:7224
+#: ../clutter/clutter-actor.c:7304
 msgid "Children transformation matrix"
-msgstr "Πίνακας μετασχηματισμού παιδιών"
+msgstr "Πίνακας μετασχηματισμού θυγατρικών"
 
-#: ../clutter/clutter-actor.c:7239
+#: ../clutter/clutter-actor.c:7319
 msgid "Child Transform Set"
-msgstr "Ορισμός μετασχηματισμού παιδιού"
+msgstr "Ορισμός μετασχηματισμού θυγατρικού"
 
-#: ../clutter/clutter-actor.c:7240
+#: ../clutter/clutter-actor.c:7320
 msgid "Whether the child-transform property is set"
-msgstr "Εάν ορίστηκε η ιδιότητα μετασχηματισμού του παιδιού"
+msgstr "Εάν ορίστηκε η ιδιότητα μετασχηματισμού του θυγατρικού"
 
-#: ../clutter/clutter-actor.c:7257
+#: ../clutter/clutter-actor.c:7337
 msgid "Show on set parent"
 msgstr "Εμφάνιση του ορισμένου γονέα"
 
-#: ../clutter/clutter-actor.c:7258
+#: ../clutter/clutter-actor.c:7338
 msgid "Whether the actor is shown when parented"
 msgstr "Εάν ο δράστης προβάλλεται όταν ορίζεται γονέας"
 
-#: ../clutter/clutter-actor.c:7275
+#: ../clutter/clutter-actor.c:7355
 msgid "Clip to Allocation"
-msgstr "Κόψιμο στο μερίδιο"
+msgstr "Περικοπή στην κατανομή"
 
-#: ../clutter/clutter-actor.c:7276
+#: ../clutter/clutter-actor.c:7356
 msgid "Sets the clip region to track the actor's allocation"
-msgstr "Ορίζει την περιοχή κοπής για εντοπισμό του μεριδίου του δράστη"
+msgstr "Ορίζει την περιοχή περικοπής για εντοπισμό της κατανομής του δράστη"
 
-#: ../clutter/clutter-actor.c:7289
+#: ../clutter/clutter-actor.c:7369
 msgid "Text Direction"
 msgstr "Κατεύθυνση κειμένου"
 
-#: ../clutter/clutter-actor.c:7290
+#: ../clutter/clutter-actor.c:7370
 msgid "Direction of the text"
 msgstr "Κατεύθυνση του κειμένου"
 
-#: ../clutter/clutter-actor.c:7305
+#: ../clutter/clutter-actor.c:7385
 msgid "Has Pointer"
 msgstr "Έχει δείκτη"
 
-#: ../clutter/clutter-actor.c:7306
+#: ../clutter/clutter-actor.c:7386
 msgid "Whether the actor contains the pointer of an input device"
 msgstr "Εάν ο δράστης περιέχει τον δείκτη μιας συσκευής εισόδου"
 
-#: ../clutter/clutter-actor.c:7319
+#: ../clutter/clutter-actor.c:7399
 msgid "Actions"
 msgstr "Ενέργειες"
 
-#: ../clutter/clutter-actor.c:7320
+#: ../clutter/clutter-actor.c:7400
 msgid "Adds an action to the actor"
 msgstr "Προσθέτει μια ενέργεια στον δράστη"
 
-#: ../clutter/clutter-actor.c:7333
+#: ../clutter/clutter-actor.c:7413
 msgid "Constraints"
 msgstr "Περιορισμοί"
 
-#: ../clutter/clutter-actor.c:7334
+#: ../clutter/clutter-actor.c:7414
 msgid "Adds a constraint to the actor"
 msgstr "Προσθέτει έναν περιορισμό στο δράστη"
 
-#: ../clutter/clutter-actor.c:7347
+#: ../clutter/clutter-actor.c:7427
 msgid "Effect"
 msgstr "Εφέ"
 
-#: ../clutter/clutter-actor.c:7348
+#: ../clutter/clutter-actor.c:7428
 msgid "Add an effect to be applied on the actor"
 msgstr "Προσθήκη ενός εφέ για εφαρμογή στον δράστη"
 
-#: ../clutter/clutter-actor.c:7362
+#: ../clutter/clutter-actor.c:7442
 msgid "Layout Manager"
 msgstr "Διαχειριστής διάταξης"
 
-#: ../clutter/clutter-actor.c:7363
+#: ../clutter/clutter-actor.c:7443
 msgid "The object controlling the layout of an actor's children"
-msgstr "Το αντικείμενο που ελέγχει τη διάταξη ενός από τα παιδιά του δράστη"
+msgstr "Το αντικείμενο που ελέγχει τη διάταξη ενός θυγατρικού του δράστη"
 
-#: ../clutter/clutter-actor.c:7377
+#: ../clutter/clutter-actor.c:7457
 msgid "X Expand"
 msgstr "Επέκταση Χ"
 
-#: ../clutter/clutter-actor.c:7378
+#: ../clutter/clutter-actor.c:7458
 msgid "Whether extra horizontal space should be assigned to the actor"
 msgstr "Εάν πρέπει να ανατεθεί επιπλέον οριζόντιος χώρος στο δράστη"
 
-#: ../clutter/clutter-actor.c:7393
+#: ../clutter/clutter-actor.c:7473
 msgid "Y Expand"
 msgstr "Επέκταση Υ"
 
-#: ../clutter/clutter-actor.c:7394
+#: ../clutter/clutter-actor.c:7474
 msgid "Whether extra vertical space should be assigned to the actor"
 msgstr "Εάν πρέπει να ανατεθεί επιπλέον κάθετος χώρος στο δράστη"
 
-#: ../clutter/clutter-actor.c:7410
+#: ../clutter/clutter-actor.c:7490
 msgid "X Alignment"
 msgstr "Στοίχιση Χ"
 
-#: ../clutter/clutter-actor.c:7411
+#: ../clutter/clutter-actor.c:7491
 msgid "The alignment of the actor on the X axis within its allocation"
-msgstr "Η στοίχιση του δράστη στον άξονα Χ μέσα στο καταμερισμό του"
+msgstr "Η στοίχιση του δράστη στον άξονα Χ μέσα στην κατανομή του"
 
-#: ../clutter/clutter-actor.c:7426
+#: ../clutter/clutter-actor.c:7506
 msgid "Y Alignment"
 msgstr "Στοίχιση Υ"
 
-#: ../clutter/clutter-actor.c:7427
+#: ../clutter/clutter-actor.c:7507
 msgid "The alignment of the actor on the Y axis within its allocation"
-msgstr "Η στοίχιση του δράστη στον άξονα Υ μέσα στο καταμερισμό του"
+msgstr "Η στοίχιση του δράστη στον άξονα Υ μέσα στην κατανομή του"
 
-#: ../clutter/clutter-actor.c:7446
+#: ../clutter/clutter-actor.c:7526
 msgid "Margin Top"
 msgstr "Άνω περιθώριο"
 
-#: ../clutter/clutter-actor.c:7447
+#: ../clutter/clutter-actor.c:7527
 msgid "Extra space at the top"
 msgstr "Πρόσθετος χώρος στην κορυφή"
 
-#: ../clutter/clutter-actor.c:7468
+#: ../clutter/clutter-actor.c:7548
 msgid "Margin Bottom"
 msgstr "Κάτω περιθώριο"
 
-#: ../clutter/clutter-actor.c:7469
+#: ../clutter/clutter-actor.c:7549
 msgid "Extra space at the bottom"
 msgstr "Πρόσθετος χώρος στον πάτο"
 
-#: ../clutter/clutter-actor.c:7490
+#: ../clutter/clutter-actor.c:7570
 msgid "Margin Left"
 msgstr "Αριστερό περιθώριο"
 
-#: ../clutter/clutter-actor.c:7491
+#: ../clutter/clutter-actor.c:7571
 msgid "Extra space at the left"
 msgstr "Πρόσθετος χώρος στα αριστερά"
 
-#: ../clutter/clutter-actor.c:7512
+#: ../clutter/clutter-actor.c:7592
 msgid "Margin Right"
 msgstr "Δεξιό περιθώριο"
 
-#: ../clutter/clutter-actor.c:7513
+#: ../clutter/clutter-actor.c:7593
 msgid "Extra space at the right"
 msgstr "Πρόσθετος χώρος στα δεξιά"
 
-#: ../clutter/clutter-actor.c:7529
+#: ../clutter/clutter-actor.c:7609
 msgid "Background Color Set"
 msgstr "Ορισμός χρώματος παρασκηνίου"
 
-#: ../clutter/clutter-actor.c:7530 ../clutter/deprecated/clutter-box.c:275
+#: ../clutter/clutter-actor.c:7610 ../clutter/deprecated/clutter-box.c:269
 msgid "Whether the background color is set"
 msgstr "Αν έχει ορισθεί το χρώμα παρασκηνίου"
 
-#: ../clutter/clutter-actor.c:7546
+#: ../clutter/clutter-actor.c:7626
 msgid "Background color"
 msgstr "Χρώμα Παρασκηνίου"
 
-#: ../clutter/clutter-actor.c:7547
+#: ../clutter/clutter-actor.c:7627
 msgid "The actor's background color"
 msgstr "Το χρώμα παρασκηνίου του δράστη"
 
-#: ../clutter/clutter-actor.c:7562
+#: ../clutter/clutter-actor.c:7642
 msgid "First Child"
-msgstr "Πρώτο παιδί"
+msgstr "Πρώτο θυγατρικό"
 
-#: ../clutter/clutter-actor.c:7563
+#: ../clutter/clutter-actor.c:7643
 msgid "The actor's first child"
-msgstr "Το πρώτο παιδί του δράστη"
+msgstr "Το πρώτο θυγατρικό του δράστη"
 
-#: ../clutter/clutter-actor.c:7576
+#: ../clutter/clutter-actor.c:7656
 msgid "Last Child"
-msgstr "Τελευταίο παιδί"
+msgstr "Τελευταίο θυγατρικό"
 
-#: ../clutter/clutter-actor.c:7577
+#: ../clutter/clutter-actor.c:7657
 msgid "The actor's last child"
-msgstr "Το τελευταίο παιδί του δράστη"
+msgstr "Το τελευταίο θυγατρικό του δράστη"
 
-#: ../clutter/clutter-actor.c:7591
+#: ../clutter/clutter-actor.c:7671
 msgid "Content"
-msgstr "Περιεχόμενο "
+msgstr "Περιεχόμενο"
 
-#: ../clutter/clutter-actor.c:7592
+#: ../clutter/clutter-actor.c:7672
 msgid "Delegate object for painting the actor's content"
 msgstr "Μεταβίβαση αντικειμένου για βαφή του περιεχομένου δράστη"
 
-#: ../clutter/clutter-actor.c:7617
+#: ../clutter/clutter-actor.c:7697
 msgid "Content Gravity"
 msgstr "Βαρύτητα περιεχομένου"
 
-#: ../clutter/clutter-actor.c:7618
+#: ../clutter/clutter-actor.c:7698
 msgid "Alignment of the actor's content"
 msgstr "Στοίχιση του περιεχομένου του δράστη"
 
-#: ../clutter/clutter-actor.c:7638
+#: ../clutter/clutter-actor.c:7718
 msgid "Content Box"
 msgstr "Πλαίσιο περιεχομένου"
 
-#: ../clutter/clutter-actor.c:7639
+#: ../clutter/clutter-actor.c:7719
 msgid "The bounding box of the actor's content"
 msgstr "Το οριακό πλαίσιο του περιεχομένου δράστη"
 
-#: ../clutter/clutter-actor.c:7647
+#: ../clutter/clutter-actor.c:7727
 msgid "Minification Filter"
 msgstr "Φίλτρο σμίκρυνσης"
 
-#: ../clutter/clutter-actor.c:7648
+#: ../clutter/clutter-actor.c:7728
 msgid "The filter used when reducing the size of the content"
-msgstr "Το χρησιμοποιούμενο φίλτρο όταν μειώνεται το μέγεθος του περιεχομένου"
+msgstr ""
+"Το φίλτρο που χρησιμοποιείται όταν γίνεται μείωση μεγέθους του περιεχομένου"
 
-#: ../clutter/clutter-actor.c:7655
+#: ../clutter/clutter-actor.c:7735
 msgid "Magnification Filter"
 msgstr "Φίλτρο μεγέθυνσης"
 
-#: ../clutter/clutter-actor.c:7656
+#: ../clutter/clutter-actor.c:7736
 msgid "The filter used when increasing the size of the content"
-msgstr "Το χρησιμοποιούμενο φίλτρο όταν αυξάνεται το μέγεθος του περιεχομένου"
+msgstr ""
+"Το φίλτρο που χρησιμοποιείται όταν γίνεται αύξηση μεγέθους του περιεχομένου"
 
-#: ../clutter/clutter-actor.c:7670
+#: ../clutter/clutter-actor.c:7750
 msgid "Content Repeat"
 msgstr "Επανάληψη περιεχομένου"
 
-#: ../clutter/clutter-actor.c:7671
+#: ../clutter/clutter-actor.c:7751
 msgid "The repeat policy for the actor's content"
 msgstr "Η πολιτική επανάληψης για το περιεχομένου του δράστη"
 
-#: ../clutter/clutter-actor-meta.c:193 ../clutter/clutter-child-meta.c:142
+#: ../clutter/clutter-actor-meta.c:191 ../clutter/clutter-child-meta.c:142
 msgid "Actor"
 msgstr "Δράστης"
 
-#: ../clutter/clutter-actor-meta.c:194
+#: ../clutter/clutter-actor-meta.c:192
 msgid "The actor attached to the meta"
 msgstr "Ο προσαρτημένος δράστης στο μέτα"
 
-#: ../clutter/clutter-actor-meta.c:208
+#: ../clutter/clutter-actor-meta.c:206
 msgid "The name of the meta"
 msgstr "Το όνομα του μέτα"
 
-#: ../clutter/clutter-actor-meta.c:221 ../clutter/clutter-input-device.c:337
-#: ../clutter/deprecated/clutter-shader.c:313
+#: ../clutter/clutter-actor-meta.c:219 ../clutter/clutter-input-device.c:326
+#: ../clutter/deprecated/clutter-shader.c:309
 msgid "Enabled"
 msgstr "Ενεργό"
 
-#: ../clutter/clutter-actor-meta.c:222
+#: ../clutter/clutter-actor-meta.c:220
 msgid "Whether the meta is enabled"
 msgstr "Εάν το μέτα είναι ενεργό"
 
 #: ../clutter/clutter-align-constraint.c:279
-#: ../clutter/clutter-bind-constraint.c:358 ../clutter/clutter-clone.c:345
+#: ../clutter/clutter-bind-constraint.c:343 ../clutter/clutter-clone.c:341
 #: ../clutter/clutter-snap-constraint.c:321
 msgid "Source"
 msgstr "Πηγή"
@@ -727,180 +729,194 @@ msgstr "Συντελεστής"
 
 #: ../clutter/clutter-align-constraint.c:314
 msgid "The alignment factor, between 0.0 and 1.0"
-msgstr "Ο συντελεστής στοίχισης, μεταξύ 0,0 και 1,0"
+msgstr "Ο συντελεστής στοίχισης, μεταξύ 0.0 και 1.0"
 
-#: ../clutter/clutter-backend.c:379
+#: ../clutter/clutter-backend.c:380
 msgid "Unable to initialize the Clutter backend"
 msgstr "Αδυναμία αρχικοποίησης της οπισθοφυλακής του Clutter"
 
-#: ../clutter/clutter-backend.c:453
+#: ../clutter/clutter-backend.c:454
 #, c-format
 msgid "The backend of type '%s' does not support creating multiple stages"
 msgstr ""
 "Η οπισθοφυλακή του τύπου '%s' δεν υποστηρίζει τη δημιουργία πολλαπλών σταδίων"
 
-#: ../clutter/clutter-bind-constraint.c:359
+#: ../clutter/clutter-bind-constraint.c:344
 msgid "The source of the binding"
 msgstr "Η πηγή της σύνδεσης"
 
-#: ../clutter/clutter-bind-constraint.c:372
+#: ../clutter/clutter-bind-constraint.c:357
 msgid "Coordinate"
 msgstr "Συντεταγμένη"
 
-#: ../clutter/clutter-bind-constraint.c:373
+#: ../clutter/clutter-bind-constraint.c:358
 msgid "The coordinate to bind"
 msgstr "Η συντεταγμένη σύνδεσης"
 
-#: ../clutter/clutter-bind-constraint.c:387
+#: ../clutter/clutter-bind-constraint.c:372
 #: ../clutter/clutter-path-constraint.c:226
 #: ../clutter/clutter-snap-constraint.c:366
 msgid "Offset"
 msgstr "Αντιστάθμιση"
 
-#: ../clutter/clutter-bind-constraint.c:388
+#: ../clutter/clutter-bind-constraint.c:373
 msgid "The offset in pixels to apply to the binding"
 msgstr "Η αντιστάθμιση σε εικονοστοιχεία για εφαρμογή στη σύνδεση"
 
-#: ../clutter/clutter-binding-pool.c:320
+#: ../clutter/clutter-binding-pool.c:319
 msgid "The unique name of the binding pool"
 msgstr "Το μοναδικό όνομα του συνόλου σύνδεσης"
 
-#: ../clutter/clutter-bin-layout.c:240 ../clutter/clutter-bin-layout.c:655
-#: ../clutter/clutter-box-layout.c:390 ../clutter/clutter-table-layout.c:610
+#: ../clutter/clutter-bin-layout.c:220 ../clutter/clutter-bin-layout.c:633
+#: ../clutter/clutter-box-layout.c:374
+#: ../clutter/deprecated/clutter-table-layout.c:602
 msgid "Horizontal Alignment"
 msgstr "Οριζόντια στοίχιση"
 
-#: ../clutter/clutter-bin-layout.c:241
+#: ../clutter/clutter-bin-layout.c:221
 msgid "Horizontal alignment for the actor inside the layout manager"
 msgstr "Οριζόντια στοίχιση για τον δράστη μες τον διαχειριστή διάταξης"
 
-#: ../clutter/clutter-bin-layout.c:249 ../clutter/clutter-bin-layout.c:675
-#: ../clutter/clutter-box-layout.c:399 ../clutter/clutter-table-layout.c:625
+#: ../clutter/clutter-bin-layout.c:229 ../clutter/clutter-bin-layout.c:653
+#: ../clutter/clutter-box-layout.c:383
+#: ../clutter/deprecated/clutter-table-layout.c:617
 msgid "Vertical Alignment"
 msgstr "Κάθετη στοίχιση"
 
-#: ../clutter/clutter-bin-layout.c:250
+#: ../clutter/clutter-bin-layout.c:230
 msgid "Vertical alignment for the actor inside the layout manager"
 msgstr "Κάθετη στοίχιση για τον δράστη μες τον διαχειριστή διάταξης"
 
-#: ../clutter/clutter-bin-layout.c:656
+#: ../clutter/clutter-bin-layout.c:634
 msgid "Default horizontal alignment for the actors inside the layout manager"
 msgstr ""
 "Προεπιλεγμένη οριζόντια στοίχιση για τον δράστη μες τον διαχειριστή διάταξης"
 
-#: ../clutter/clutter-bin-layout.c:676
+#: ../clutter/clutter-bin-layout.c:654
 msgid "Default vertical alignment for the actors inside the layout manager"
 msgstr ""
 "Προεπιλεγμένη κάθετη στοίχιση για τον δράστη μες τον διαχειριστή διάταξης"
 
-#: ../clutter/clutter-box-layout.c:365
+#: ../clutter/clutter-box-layout.c:349
 msgid "Expand"
 msgstr "Επέκταση"
 
-#: ../clutter/clutter-box-layout.c:366
+#: ../clutter/clutter-box-layout.c:350
 msgid "Allocate extra space for the child"
-msgstr "Παραχώρηση πρόσθετου χώρου για το παιδί"
+msgstr "Εκχώρηση πρόσθετου χώρου για το θυγατρικό"
 
-#: ../clutter/clutter-box-layout.c:372 ../clutter/clutter-table-layout.c:589
+#: ../clutter/clutter-box-layout.c:356
+#: ../clutter/deprecated/clutter-table-layout.c:581
 msgid "Horizontal Fill"
 msgstr "Οριζόντιο γέμισμα"
 
-#: ../clutter/clutter-box-layout.c:373 ../clutter/clutter-table-layout.c:590
+#: ../clutter/clutter-box-layout.c:357
+#: ../clutter/deprecated/clutter-table-layout.c:582
 msgid ""
 "Whether the child should receive priority when the container is allocating "
 "spare space on the horizontal axis"
 msgstr ""
-"Εάν το παδί θα δεχθεί προτεραιότητα όταν ο περιέκτης παραχωρεί εφεδρικό χώρο "
-"στον οριζόντιο άξονα"
+"Εάν το θυγατρικό θα δεχθεί προτεραιότητα όταν ο περιέκτης εκχωρεί εφεδρικό "
+"χώρο στον οριζόντιο άξονα"
 
-#: ../clutter/clutter-box-layout.c:381 ../clutter/clutter-table-layout.c:596
+#: ../clutter/clutter-box-layout.c:365
+#: ../clutter/deprecated/clutter-table-layout.c:588
 msgid "Vertical Fill"
 msgstr "Κάθετο γέμισμα"
 
-#: ../clutter/clutter-box-layout.c:382 ../clutter/clutter-table-layout.c:597
+#: ../clutter/clutter-box-layout.c:366
+#: ../clutter/deprecated/clutter-table-layout.c:589
 msgid ""
 "Whether the child should receive priority when the container is allocating "
 "spare space on the vertical axis"
 msgstr ""
-"Εάν το παιδί θα δεχθεί προτεραιότητα όταν ο περιέκτης παραχωρεί εφεδρικό "
+"Εάν το θυγατρικό θα δεχθεί προτεραιότητα όταν ο περιέκτης εκχωρεί εφεδρικό "
 "χώρο στον κάθετο άξονα"
 
-#: ../clutter/clutter-box-layout.c:391 ../clutter/clutter-table-layout.c:611
+#: ../clutter/clutter-box-layout.c:375
+#: ../clutter/deprecated/clutter-table-layout.c:603
 msgid "Horizontal alignment of the actor within the cell"
 msgstr "Οριζόντια στοίχιση του δράστη μέσα στο κελί"
 
-#: ../clutter/clutter-box-layout.c:400 ../clutter/clutter-table-layout.c:626
+#: ../clutter/clutter-box-layout.c:384
+#: ../clutter/deprecated/clutter-table-layout.c:618
 msgid "Vertical alignment of the actor within the cell"
 msgstr "Κάθετη στοίχιση του δράστη μέσα στο κελί"
 
-#: ../clutter/clutter-box-layout.c:1365
+#: ../clutter/clutter-box-layout.c:1345
 msgid "Vertical"
 msgstr "Κάθετη"
 
-#: ../clutter/clutter-box-layout.c:1366
+#: ../clutter/clutter-box-layout.c:1346
 msgid "Whether the layout should be vertical, rather than horizontal"
 msgstr "Εάν η διάταξη θα είναι κάθετη, αντί για οριζόντια"
 
-#: ../clutter/clutter-box-layout.c:1383 ../clutter/clutter-flow-layout.c:890
-#: ../clutter/clutter-grid-layout.c:1550
+#: ../clutter/clutter-box-layout.c:1363 ../clutter/clutter-flow-layout.c:927
+#: ../clutter/clutter-grid-layout.c:1549
 msgid "Orientation"
 msgstr "Προσανατολισμός"
 
-#: ../clutter/clutter-box-layout.c:1384 ../clutter/clutter-flow-layout.c:891
-#: ../clutter/clutter-grid-layout.c:1551
+#: ../clutter/clutter-box-layout.c:1364 ../clutter/clutter-flow-layout.c:928
+#: ../clutter/clutter-grid-layout.c:1550
 msgid "The orientation of the layout"
 msgstr "Ο προσανατολισμός της διάταξης"
 
-#: ../clutter/clutter-box-layout.c:1400 ../clutter/clutter-flow-layout.c:906
+#: ../clutter/clutter-box-layout.c:1380 ../clutter/clutter-flow-layout.c:943
 msgid "Homogeneous"
 msgstr "Ομογενής"
 
-#: ../clutter/clutter-box-layout.c:1401
+#: ../clutter/clutter-box-layout.c:1381
 msgid ""
 "Whether the layout should be homogeneous, i.e. all childs get the same size"
 msgstr ""
-"Εάν η διάταξη θα είναι ομογενής, δηλαδή όλα τα παιδιά παίρνουν το ίδιο "
-"μέγεθος"
+"Εάν η διάταξη θα είναι ομοιογενής, δηλαδή, αν όλα τα θυγατρικά θα αποκτούν "
+"το ίδιο μέγεθος"
 
-#: ../clutter/clutter-box-layout.c:1416
+#: ../clutter/clutter-box-layout.c:1396
 msgid "Pack Start"
 msgstr "Πακετάρισμα στην αρχή"
 
-#: ../clutter/clutter-box-layout.c:1417
+#: ../clutter/clutter-box-layout.c:1397
 msgid "Whether to pack items at the start of the box"
-msgstr "Εάν θα πακεταριστούν τα στοιχεία στην αρχή του πλαισίου"
+msgstr "Εάν θα πακεταριστούν τα αντικείμενα στην αρχή του πλαισίου"
 
-#: ../clutter/clutter-box-layout.c:1430
+#: ../clutter/clutter-box-layout.c:1410
 msgid "Spacing"
 msgstr "Διάκενο"
 
-#: ../clutter/clutter-box-layout.c:1431
+#: ../clutter/clutter-box-layout.c:1411
 msgid "Spacing between children"
-msgstr "Διάκενο μεταξύ παιδιών"
+msgstr "Διάκενο μεταξύ θυγατρικών"
 
-#: ../clutter/clutter-box-layout.c:1448 ../clutter/clutter-table-layout.c:1675
+#: ../clutter/clutter-box-layout.c:1428
+#: ../clutter/deprecated/clutter-table-layout.c:1669
 msgid "Use Animations"
-msgstr "Χρήση κινήσεων"
+msgstr "Χρήση κινούμενων εικόνων"
 
-#: ../clutter/clutter-box-layout.c:1449 ../clutter/clutter-table-layout.c:1676
+#: ../clutter/clutter-box-layout.c:1429
+#: ../clutter/deprecated/clutter-table-layout.c:1670
 msgid "Whether layout changes should be animated"
-msgstr "Εάν οι αλλαγές διάταξης πρέπει να κινηθούν"
+msgstr "Εάν οι αλλαγές διάταξης πρέπει να παρουσιάζουν κίνηση"
 
-#: ../clutter/clutter-box-layout.c:1473 ../clutter/clutter-table-layout.c:1700
+#: ../clutter/clutter-box-layout.c:1453
+#: ../clutter/deprecated/clutter-table-layout.c:1694
 msgid "Easing Mode"
-msgstr "Κατάσταση διευκόλυνσης"
+msgstr "Λειτουργία διευκόλυνσης"
 
-#: ../clutter/clutter-box-layout.c:1474 ../clutter/clutter-table-layout.c:1701
+#: ../clutter/clutter-box-layout.c:1454
+#: ../clutter/deprecated/clutter-table-layout.c:1695
 msgid "The easing mode of the animations"
-msgstr "Η κατάσταση διευκόλυνσης των κινήσεων"
+msgstr "Η λειτουργία διευκόλυνσης των κινούμενων εικόνων"
 
-#: ../clutter/clutter-box-layout.c:1494 ../clutter/clutter-table-layout.c:1721
+#: ../clutter/clutter-box-layout.c:1474
+#: ../clutter/deprecated/clutter-table-layout.c:1715
 msgid "Easing Duration"
 msgstr "Διάρκεια διευκόλυνσης"
 
-#: ../clutter/clutter-box-layout.c:1495 ../clutter/clutter-table-layout.c:1722
+#: ../clutter/clutter-box-layout.c:1475
+#: ../clutter/deprecated/clutter-table-layout.c:1716
 msgid "The duration of the animations"
-msgstr "Η διάρκεια των κινήσεων"
+msgstr "Η διάρκεια των κινούμενων εικόνων"
 
 #: ../clutter/clutter-brightness-contrast-effect.c:321
 msgid "Brightness"
@@ -918,14 +934,30 @@ msgstr "Αντίθεση"
 msgid "The contrast change to apply"
 msgstr "Αλλαγή αντίθεσης για εφαρμογή"
 
-#: ../clutter/clutter-canvas.c:216
+#: ../clutter/clutter-canvas.c:248
 msgid "The width of the canvas"
 msgstr "Το πλάτος του καμβά"
 
-#: ../clutter/clutter-canvas.c:232
+#: ../clutter/clutter-canvas.c:264
 msgid "The height of the canvas"
 msgstr "Το ύψος του καμβά"
 
+#: ../clutter/clutter-canvas.c:283
+msgid "Scale Factor Set"
+msgstr "Σύνολο Συντελεστών Κλιμάκας"
+
+#: ../clutter/clutter-canvas.c:284
+msgid "Whether the scale-factor property is set"
+msgstr "Κατά πόσο ορίσθηκε η ιδιότητα συντελεστή-κλίμακας"
+
+#: ../clutter/clutter-canvas.c:305
+msgid "Scale Factor"
+msgstr "Συντελεστής κλίμακας"
+
+#: ../clutter/clutter-canvas.c:306
+msgid "The scaling factor for the surface"
+msgstr "Ο συντελεστής κλιμάκωσης για την επιφάνεια"
+
 #: ../clutter/clutter-child-meta.c:127
 msgid "Container"
 msgstr "Περιέκτης"
@@ -938,39 +970,39 @@ msgstr "Ο περιέκτης που δημιούργησε αυτά τα δεδ
 msgid "The actor wrapped by this data"
 msgstr "Ο δράστης που αναδίπλωσε αυτά τα δεδομένα"
 
-#: ../clutter/clutter-click-action.c:559
+#: ../clutter/clutter-click-action.c:586
 msgid "Pressed"
 msgstr "Πατημένο"
 
-#: ../clutter/clutter-click-action.c:560
+#: ../clutter/clutter-click-action.c:587
 msgid "Whether the clickable should be in pressed state"
 msgstr "Εάν η ικανότητα κλικ πρέπει να είναι σε κατάσταση πατήματος"
 
-#: ../clutter/clutter-click-action.c:573
+#: ../clutter/clutter-click-action.c:600
 msgid "Held"
 msgstr "Σε αναμονή"
 
-#: ../clutter/clutter-click-action.c:574
+#: ../clutter/clutter-click-action.c:601
 msgid "Whether the clickable has a grab"
 msgstr "Εάν η ικανότητα κλικ μπορεί να συλληφθεί"
 
-#: ../clutter/clutter-click-action.c:591 ../clutter/clutter-settings.c:599
+#: ../clutter/clutter-click-action.c:618 ../clutter/clutter-settings.c:651
 msgid "Long Press Duration"
 msgstr "Διάρκεια παρατεταμένου πατήματος"
 
-#: ../clutter/clutter-click-action.c:592
+#: ../clutter/clutter-click-action.c:619
 msgid "The minimum duration of a long press to recognize the gesture"
 msgstr "Η ελάχιστη διάρκεια παρατεταμένου πατήματος για αναγνώριση της πράξης"
 
-#: ../clutter/clutter-click-action.c:610
+#: ../clutter/clutter-click-action.c:637
 msgid "Long Press Threshold"
 msgstr "Κατώφλι παρατεταμένου πατήματος"
 
-#: ../clutter/clutter-click-action.c:611
+#: ../clutter/clutter-click-action.c:638
 msgid "The maximum threshold before a long press is cancelled"
 msgstr "Το μέγιστο κατώφλι πριν την ακύρωση παρατεταμένου πατήματος"
 
-#: ../clutter/clutter-clone.c:346
+#: ../clutter/clutter-clone.c:342
 msgid "Specifies the actor to be cloned"
 msgstr "Ορίζει τον δράστη για κλωνοποίηση"
 
@@ -982,27 +1014,27 @@ msgstr "Απόχρωση"
 msgid "The tint to apply"
 msgstr "Απόχρωση για εφαρμογή"
 
-#: ../clutter/clutter-deform-effect.c:588
+#: ../clutter/clutter-deform-effect.c:591
 msgid "Horizontal Tiles"
 msgstr "Οριζόντιες παραθέσεις"
 
-#: ../clutter/clutter-deform-effect.c:589
+#: ../clutter/clutter-deform-effect.c:592
 msgid "The number of horizontal tiles"
 msgstr "Ο αριθμός των οριζόντιων παραθέσεων"
 
-#: ../clutter/clutter-deform-effect.c:604
+#: ../clutter/clutter-deform-effect.c:607
 msgid "Vertical Tiles"
 msgstr "Κάθετες παραθέσεις"
 
-#: ../clutter/clutter-deform-effect.c:605
+#: ../clutter/clutter-deform-effect.c:608
 msgid "The number of vertical tiles"
 msgstr "Ο αριθμός των κάθετων παραθέσεων"
 
-#: ../clutter/clutter-deform-effect.c:622
+#: ../clutter/clutter-deform-effect.c:625
 msgid "Back Material"
 msgstr "Οπίσθιο υλικό"
 
-#: ../clutter/clutter-deform-effect.c:623
+#: ../clutter/clutter-deform-effect.c:626
 msgid "The material to be used when painting the back of the actor"
 msgstr "Το υλικό που θα χρησιμοποιηθεί όταν βάφεται το οπίσθιο του δράστη"
 
@@ -1010,262 +1042,300 @@ msgstr "Το υλικό που θα χρησιμοποιηθεί όταν βάφ
 msgid "The desaturation factor"
 msgstr "Ο συντελεστής αποκορεσμού"
 
-#: ../clutter/clutter-device-manager.c:131
-#: ../clutter/clutter-input-device.c:366
-#: ../clutter/x11/clutter-keymap-x11.c:316
+#: ../clutter/clutter-device-manager.c:127
+#: ../clutter/clutter-input-device.c:355
+#: ../clutter/x11/clutter-keymap-x11.c:457
 msgid "Backend"
-msgstr "Οπισθοφυλακή"
+msgstr "Σύστημα υποστήριξης"
 
-#: ../clutter/clutter-device-manager.c:132
+#: ../clutter/clutter-device-manager.c:128
 msgid "The ClutterBackend of the device manager"
-msgstr "Το ClutterBackend του διαχειριστή συσκευής"
+msgstr "Το σύστημα υποστήριξης Clutter του διαχειριστή συσκευής"
 
-#: ../clutter/clutter-drag-action.c:742
+#: ../clutter/clutter-drag-action.c:733
 msgid "Horizontal Drag Threshold"
 msgstr "Κατώφλι οριζόντιου συρσίματος"
 
-#: ../clutter/clutter-drag-action.c:743
+#: ../clutter/clutter-drag-action.c:734
 msgid "The horizontal amount of pixels required to start dragging"
 msgstr ""
 "Η οριζόντια ποσότητα των απαιτούμενων εικονοστοιχείων για έναρξη συρσίματος"
 
-#: ../clutter/clutter-drag-action.c:770
+#: ../clutter/clutter-drag-action.c:761
 msgid "Vertical Drag Threshold"
 msgstr "Κατώφλι κάθετου συρσίματος"
 
-#: ../clutter/clutter-drag-action.c:771
+#: ../clutter/clutter-drag-action.c:762
 msgid "The vertical amount of pixels required to start dragging"
 msgstr ""
 "Η κάθετη ποσότητα των απαιτούμενων εικονοστοιχείων για έναρξη συρσίματος"
 
-#: ../clutter/clutter-drag-action.c:792
+#: ../clutter/clutter-drag-action.c:783
 msgid "Drag Handle"
 msgstr "Σύρσιμο λαβής"
 
-#: ../clutter/clutter-drag-action.c:793
+#: ../clutter/clutter-drag-action.c:784
 msgid "The actor that is being dragged"
 msgstr "Ο δράστης που σύρεται"
 
-#: ../clutter/clutter-drag-action.c:806
+#: ../clutter/clutter-drag-action.c:797
 msgid "Drag Axis"
-msgstr "άξονας συρσίματος"
+msgstr "Άξονας συρσίματος"
 
-#: ../clutter/clutter-drag-action.c:807
+#: ../clutter/clutter-drag-action.c:798
 msgid "Constraints the dragging to an axis"
 msgstr "Περιορισμοί συρσίματος σε έναν άξονα"
 
-#: ../clutter/clutter-drag-action.c:823
+#: ../clutter/clutter-drag-action.c:814
 msgid "Drag Area"
-msgstr "Άξονας συρσίματος"
+msgstr "Περιοχή συρσίματος"
 
-#: ../clutter/clutter-drag-action.c:824
+#: ../clutter/clutter-drag-action.c:815
 msgid "Constrains the dragging to a rectangle"
 msgstr "Περιορισμοί συρσίματος σε ένα τετράγωνο"
 
-#: ../clutter/clutter-drag-action.c:837
+#: ../clutter/clutter-drag-action.c:828
 msgid "Drag Area Set"
 msgstr "Ορισμός περιοχής συρσίματος"
 
-#: ../clutter/clutter-drag-action.c:838
+#: ../clutter/clutter-drag-action.c:829
 msgid "Whether the drag area is set"
 msgstr "Εάν ορίστηκε η περιοχή του συρσίματος"
 
-#: ../clutter/clutter-flow-layout.c:907
+#: ../clutter/clutter-flow-layout.c:944
 msgid "Whether each item should receive the same allocation"
-msgstr "Εάν κάθε στοιχείο πρέπει να δεχθεί τον καταμερισμό"
+msgstr "Εάν κάθε αντικείμενο πρέπει να δεχθεί την ίδια κατανομή"
 
-#: ../clutter/clutter-flow-layout.c:922 ../clutter/clutter-table-layout.c:1637
+#: ../clutter/clutter-flow-layout.c:959
+#: ../clutter/deprecated/clutter-table-layout.c:1629
 msgid "Column Spacing"
 msgstr "Διάκενο στηλών"
 
-#: ../clutter/clutter-flow-layout.c:923
+#: ../clutter/clutter-flow-layout.c:960
 msgid "The spacing between columns"
 msgstr "Το διάκενο μεταξύ στηλών"
 
-#: ../clutter/clutter-flow-layout.c:939 ../clutter/clutter-table-layout.c:1651
+#: ../clutter/clutter-flow-layout.c:976
+#: ../clutter/deprecated/clutter-table-layout.c:1645
 msgid "Row Spacing"
 msgstr "Διάκενο γραμμών"
 
-#: ../clutter/clutter-flow-layout.c:940
+#: ../clutter/clutter-flow-layout.c:977
 msgid "The spacing between rows"
 msgstr "Το διάκενο μεταξύ γραμμών"
 
-#: ../clutter/clutter-flow-layout.c:954
+#: ../clutter/clutter-flow-layout.c:991
 msgid "Minimum Column Width"
 msgstr "Ελάχιστο πλάτος στήλης"
 
-#: ../clutter/clutter-flow-layout.c:955
+#: ../clutter/clutter-flow-layout.c:992
 msgid "Minimum width for each column"
 msgstr "Ελάχιστο πλάτος κάθε στήλης"
 
-#: ../clutter/clutter-flow-layout.c:970
+#: ../clutter/clutter-flow-layout.c:1007
 msgid "Maximum Column Width"
 msgstr "Μέγιστο πλάτος στήλης"
 
-#: ../clutter/clutter-flow-layout.c:971
+#: ../clutter/clutter-flow-layout.c:1008
 msgid "Maximum width for each column"
 msgstr "Μέγιστο πλάτος κάθε στήλης"
 
-#: ../clutter/clutter-flow-layout.c:985
+#: ../clutter/clutter-flow-layout.c:1022
 msgid "Minimum Row Height"
 msgstr "Ελάχιστο ύψος γραμμής"
 
-#: ../clutter/clutter-flow-layout.c:986
+#: ../clutter/clutter-flow-layout.c:1023
 msgid "Minimum height for each row"
 msgstr "Ελάχιστο ύψος κάθε γραμμής"
 
-#: ../clutter/clutter-flow-layout.c:1001
+#: ../clutter/clutter-flow-layout.c:1038
 msgid "Maximum Row Height"
 msgstr "Μέγιστο ύψος γραμμής"
 
-#: ../clutter/clutter-flow-layout.c:1002
+#: ../clutter/clutter-flow-layout.c:1039
 msgid "Maximum height for each row"
 msgstr "Μέγιστο ύψος κάθε γραμμής"
 
-#: ../clutter/clutter-grid-layout.c:1222
+#: ../clutter/clutter-flow-layout.c:1054 ../clutter/clutter-flow-layout.c:1055
+msgid "Snap to grid"
+msgstr "Προσκόλληση σε πλέγμα"
+
+#: ../clutter/clutter-gesture-action.c:680
+msgid "Number touch points"
+msgstr "Αριθμός σημείων επαφής"
+
+#: ../clutter/clutter-gesture-action.c:681
+msgid "Number of touch points"
+msgstr "Αριθμός σημείων επαφής"
+
+#: ../clutter/clutter-gesture-action.c:696
+msgid "Threshold Trigger Edge"
+msgstr "Άκρο εναύσματος κατωφλίου"
+
+#: ../clutter/clutter-gesture-action.c:697
+msgid "The trigger edge used by the action"
+msgstr "Το χρησιμοποιούμενο άκρο εναύσματος από την ενέργεια"
+
+#: ../clutter/clutter-gesture-action.c:716
+msgid "Threshold Trigger Horizontal Distance"
+msgstr "Οριζόντια απόσταση εναύσματος κατωφλίου"
+
+#: ../clutter/clutter-gesture-action.c:717
+msgid "The horizontal trigger distance used by the action"
+msgstr "Η χρησιμοποιούμενη απόσταση οριζόντιου εναύσματος από την ενέργεια"
+
+#: ../clutter/clutter-gesture-action.c:735
+msgid "Threshold Trigger Vertical Distance"
+msgstr "Κάθετη απόσταση εναύσματος κατωφλίου"
+
+#: ../clutter/clutter-gesture-action.c:736
+msgid "The vertical trigger distance used by the action"
+msgstr "Η χρησιμοποιούμενη απόσταση κάθετου εναύσματος από την ενέργεια"
+
+#: ../clutter/clutter-grid-layout.c:1223
 msgid "Left attachment"
 msgstr "Αριστερό συνημμένο"
 
-#: ../clutter/clutter-grid-layout.c:1223
+#: ../clutter/clutter-grid-layout.c:1224
 msgid "The column number to attach the left side of the child to"
-msgstr "Ο αριθμός στήλης για να συνδέσετε την αριστερή πλευρά του παιδιού"
+msgstr "Ο αριθμός στήλης για να συνδέσετε την αριστερή πλευρά του θυγατρικού"
 
-#: ../clutter/clutter-grid-layout.c:1230
+#: ../clutter/clutter-grid-layout.c:1231
 msgid "Top attachment"
 msgstr "Προς τα πάνω συνημμένο"
 
-#: ../clutter/clutter-grid-layout.c:1231
+#: ../clutter/clutter-grid-layout.c:1232
 msgid "The row number to attach the top side of a child widget to"
 msgstr ""
-"Ο αριθμός γραμμής για να συνδέσετε το πάνω μέρος ενός παιδιού γραφικού "
-"συστατικού"
+"Ο αριθμός γραμμής για να συνδέσετε το πάνω μέρος ενός θυγατρικού γραφικού "
+"στοιχείου"
 
-#: ../clutter/clutter-grid-layout.c:1239
+#: ../clutter/clutter-grid-layout.c:1240
 msgid "The number of columns that a child spans"
-msgstr "Ο αριθμός των στηλών όπου εκτείνεται ένα παιδί"
+msgstr "Ο αριθμός των στηλών όπου εκτείνεται ένα θυγατρικό"
 
-#: ../clutter/clutter-grid-layout.c:1246
+#: ../clutter/clutter-grid-layout.c:1247
 msgid "The number of rows that a child spans"
-msgstr "Ο αριθμός των γραμμών όπου εκτείνεται ένα παιδί"
+msgstr "Ο αριθμός των γραμμών όπου εκτείνεται ένα θυγατρικό"
 
-#: ../clutter/clutter-grid-layout.c:1565
+#: ../clutter/clutter-grid-layout.c:1564
 msgid "Row spacing"
 msgstr "Διάκενο γραμμών"
 
-#: ../clutter/clutter-grid-layout.c:1566
+#: ../clutter/clutter-grid-layout.c:1565
 msgid "The amount of space between two consecutive rows"
 msgstr "Το διάκενο μεταξύ δύο διαδοχικών γραμμών"
 
-#: ../clutter/clutter-grid-layout.c:1579
+#: ../clutter/clutter-grid-layout.c:1578
 msgid "Column spacing"
 msgstr "Διάκενο στηλών"
 
-#: ../clutter/clutter-grid-layout.c:1580
+#: ../clutter/clutter-grid-layout.c:1579
 msgid "The amount of space between two consecutive columns"
 msgstr "Το διάκενο μεταξύ δύο διαδοχικών στηλών"
 
-#: ../clutter/clutter-grid-layout.c:1594
+#: ../clutter/clutter-grid-layout.c:1593
 msgid "Row Homogeneous"
 msgstr "Ομογενής γραμμή"
 
-#: ../clutter/clutter-grid-layout.c:1595
+#: ../clutter/clutter-grid-layout.c:1594
 msgid "If TRUE, the rows are all the same height"
-msgstr "Αν TRUE, όλες οι γραμμές θα είναι ίδιου ύψους"
+msgstr "Αν αληθές, όλες οι γραμμές θα είναι ίδιου ύψους"
+
+#: ../clutter/clutter-grid-layout.c:1607
+msgid "Column Homogeneous"
+msgstr "Ομοιογενής στήλη"
 
 #: ../clutter/clutter-grid-layout.c:1608
-msgid "Column Homogeneous"
-msgstr "Ομογενής στήλη"
-
-#: ../clutter/clutter-grid-layout.c:1609
 msgid "If TRUE, the columns are all the same width"
-msgstr "Αν TRUE, οι στήλες θα είναι ίδιου πλάτους"
+msgstr "Αν αληθές, οι στήλες θα είναι ίδιου πλάτους"
 
-#: ../clutter/clutter-image.c:248 ../clutter/clutter-image.c:311
-#: ../clutter/clutter-image.c:399
+#: ../clutter/clutter-image.c:268 ../clutter/clutter-image.c:331
+#: ../clutter/clutter-image.c:419
 msgid "Unable to load image data"
 msgstr "Αδυναμία φόρτωσης δεδομένων εικόνας"
 
-#: ../clutter/clutter-input-device.c:242
+#: ../clutter/clutter-input-device.c:231
 msgid "Id"
-msgstr "Ταυτότητα"
+msgstr "Αναγνωριστικό"
 
-#: ../clutter/clutter-input-device.c:243
+#: ../clutter/clutter-input-device.c:232
 msgid "Unique identifier of the device"
-msgstr "Μοναδικός ταυτοποιητής της συσκευής"
+msgstr "Μοναδικό αναγνωριστικό της συσκευής"
 
-#: ../clutter/clutter-input-device.c:259
+#: ../clutter/clutter-input-device.c:248
 msgid "The name of the device"
 msgstr "Το όνομα της συσκευής"
 
-#: ../clutter/clutter-input-device.c:273
+#: ../clutter/clutter-input-device.c:262
 msgid "Device Type"
 msgstr "Τύπος συσκευής"
 
-#: ../clutter/clutter-input-device.c:274
+#: ../clutter/clutter-input-device.c:263
 msgid "The type of the device"
 msgstr "Ο τύπος της συσκευής"
 
-#: ../clutter/clutter-input-device.c:289
+#: ../clutter/clutter-input-device.c:278
 msgid "Device Manager"
 msgstr "Διαχειριστής συσκευών"
 
-#: ../clutter/clutter-input-device.c:290
+#: ../clutter/clutter-input-device.c:279
 msgid "The device manager instance"
-msgstr "Το παράδειγμα διαχειριστή συσκευής"
+msgstr "Το αντίτυπο διαχειριστή συσκευής"
 
-#: ../clutter/clutter-input-device.c:303
+#: ../clutter/clutter-input-device.c:292
 msgid "Device Mode"
-msgstr "Κατάσταση συσκευής"
+msgstr "Λειτουργία συσκευής"
 
-#: ../clutter/clutter-input-device.c:304
+#: ../clutter/clutter-input-device.c:293
 msgid "The mode of the device"
-msgstr "Η κατάσταση της συσκευής"
+msgstr "Η λειτουργία της συσκευής"
 
-#: ../clutter/clutter-input-device.c:318
+#: ../clutter/clutter-input-device.c:307
 msgid "Has Cursor"
 msgstr "Έχει δρομέα"
 
-#: ../clutter/clutter-input-device.c:319
+#: ../clutter/clutter-input-device.c:308
 msgid "Whether the device has a cursor"
 msgstr "Εάν η συσκευή έχει δρομέα"
 
-#: ../clutter/clutter-input-device.c:338
+#: ../clutter/clutter-input-device.c:327
 msgid "Whether the device is enabled"
 msgstr "Εάν η συσκευή είναι ενεργή"
 
-#: ../clutter/clutter-input-device.c:351
+#: ../clutter/clutter-input-device.c:340
 msgid "Number of Axes"
 msgstr "Αριθμός αξόνων"
 
-#: ../clutter/clutter-input-device.c:352
+#: ../clutter/clutter-input-device.c:341
 msgid "The number of axes on the device"
 msgstr "Ο αριθμός των αξόνων στη συσκευή"
 
-#: ../clutter/clutter-input-device.c:367
+#: ../clutter/clutter-input-device.c:356
 msgid "The backend instance"
-msgstr "Το παράδειγμα οπισθοφυλακής"
+msgstr "Το αντίτυπο συστήματος υποστήριξης"
 
-#: ../clutter/clutter-interval.c:506
+#: ../clutter/clutter-interval.c:557
 msgid "Value Type"
 msgstr "Τύπος τιμής"
 
-#: ../clutter/clutter-interval.c:507
+#: ../clutter/clutter-interval.c:558
 msgid "The type of the values in the interval"
 msgstr "Ο τύπος των τιμών στο μεσοδιάστημα"
 
-#: ../clutter/clutter-interval.c:522
+#: ../clutter/clutter-interval.c:573
 msgid "Initial Value"
 msgstr "Αρχική τιμή"
 
-#: ../clutter/clutter-interval.c:523
+#: ../clutter/clutter-interval.c:574
 msgid "Initial value of the interval"
 msgstr "Αρχική τιμή του μεσοδιαστήματος"
 
-#: ../clutter/clutter-interval.c:537
+#: ../clutter/clutter-interval.c:588
 msgid "Final Value"
 msgstr "Τελική τιμή"
 
-#: ../clutter/clutter-interval.c:538
+#: ../clutter/clutter-interval.c:589
 msgid "Final value of the interval"
 msgstr "Τελική τιμή του μεσοδιαστήματος"
 
@@ -1284,97 +1354,97 @@ msgstr "Ο διαχειριστής που δημιούργησε αυτά τα
 #. * Do NOT translate it to non-English e.g. "predefinito:LTR"! If
 #. * it isn't default:LTR or default:RTL it will not work.
 #.
-#: ../clutter/clutter-main.c:772
+#: ../clutter/clutter-main.c:751
 msgid "default:LTR"
 msgstr "default:LTR"
 
-#: ../clutter/clutter-main.c:1646
+#: ../clutter/clutter-main.c:1577
 msgid "Show frames per second"
 msgstr "Εμφάνιση πλαισίων ανά δευτερόλεπτο"
 
-#: ../clutter/clutter-main.c:1648
+#: ../clutter/clutter-main.c:1579
 msgid "Default frame rate"
 msgstr "Προεπιλεγμένος ρυθμός πλαισίων"
 
-#: ../clutter/clutter-main.c:1650
+#: ../clutter/clutter-main.c:1581
 msgid "Make all warnings fatal"
 msgstr "Μετατροπή όλων των προειδοποιήσεων σε κρίσιμες"
 
-#: ../clutter/clutter-main.c:1653
+#: ../clutter/clutter-main.c:1584
 msgid "Direction for the text"
 msgstr "Κατεύθυνση για το κείμενο"
 
-#: ../clutter/clutter-main.c:1656
+#: ../clutter/clutter-main.c:1587
 msgid "Disable mipmapping on text"
 msgstr "Απενεργοποίηση χαρτογράφησης mip σε κείμενο"
 
-#: ../clutter/clutter-main.c:1659
+#: ../clutter/clutter-main.c:1590
 msgid "Use 'fuzzy' picking"
 msgstr "Χρήση 'ασαφούς' επιλογής"
 
-#: ../clutter/clutter-main.c:1662
+#: ../clutter/clutter-main.c:1593
 msgid "Clutter debugging flags to set"
 msgstr "Σημαίες αποσφαλμάτωσης Clutter για ενεργοποίηση"
 
-#: ../clutter/clutter-main.c:1664
+#: ../clutter/clutter-main.c:1595
 msgid "Clutter debugging flags to unset"
 msgstr "Σημαίες αποσφαλμάτωσης Clutter για απενεργοποίηση"
 
-#: ../clutter/clutter-main.c:1668
+#: ../clutter/clutter-main.c:1599
 msgid "Clutter profiling flags to set"
 msgstr "Σημαίες κατατομής Clutter για ενεργοποίηση"
 
-#: ../clutter/clutter-main.c:1670
+#: ../clutter/clutter-main.c:1601
 msgid "Clutter profiling flags to unset"
 msgstr "Σημαίες κατατομής Clutter για απενεργοποίηση"
 
-#: ../clutter/clutter-main.c:1673
+#: ../clutter/clutter-main.c:1604
 msgid "Enable accessibility"
 msgstr "Ενεργοποίηση προσιτότητας"
 
-#: ../clutter/clutter-main.c:1865
+#: ../clutter/clutter-main.c:1796
 msgid "Clutter Options"
 msgstr "Επιλογές Clutter"
 
-#: ../clutter/clutter-main.c:1866
+#: ../clutter/clutter-main.c:1797
 msgid "Show Clutter Options"
 msgstr "Εμφάνιση επιλογών Clutter"
 
-#: ../clutter/clutter-pan-action.c:448
+#: ../clutter/clutter-pan-action.c:455
 msgid "Pan Axis"
 msgstr "Άξονας μετακίνησης"
 
-#: ../clutter/clutter-pan-action.c:449
+#: ../clutter/clutter-pan-action.c:456
 msgid "Constraints the panning to an axis"
 msgstr "Περιορισμοί μετακίνησης σε έναν άξονα"
 
-#: ../clutter/clutter-pan-action.c:463
+#: ../clutter/clutter-pan-action.c:470
 msgid "Interpolate"
 msgstr "Παρεμβολή"
 
-#: ../clutter/clutter-pan-action.c:464
+#: ../clutter/clutter-pan-action.c:471
 msgid "Whether interpolated events emission is enabled."
 msgstr "Εάν είναι ενεργοποιημένα τα παρεμβάλλοντα συμβάντα εκπομπής."
 
-#: ../clutter/clutter-pan-action.c:480
+#: ../clutter/clutter-pan-action.c:487
 msgid "Deceleration"
 msgstr "Eπιβράδυνση"
 
-#: ../clutter/clutter-pan-action.c:481
+#: ../clutter/clutter-pan-action.c:488
 msgid "Rate at which the interpolated panning will decelerate in"
 msgstr "Τιμή στην οποία θα επιβραδύνει η παρεμβάλλουσα μετακίνηση"
 
-#: ../clutter/clutter-pan-action.c:498
+#: ../clutter/clutter-pan-action.c:505
 msgid "Initial acceleration factor"
 msgstr "Αρχικός συντελεστής επιτάχυνσης"
 
-#: ../clutter/clutter-pan-action.c:499
+#: ../clutter/clutter-pan-action.c:506
 msgid "Factor applied to the momentum when starting the interpolated phase"
 msgstr ""
 "Παράγοντας που εφαρμόζεται στην ορμή κατά την εκκίνηση της φάσης παρεμβολής"
 
 #: ../clutter/clutter-path-constraint.c:212
-#: ../clutter/deprecated/clutter-behaviour-path.c:225
+#: ../clutter/deprecated/clutter-behaviour-path.c:221
 msgid "Path"
 msgstr "Διαδρομή"
 
@@ -1384,90 +1454,90 @@ msgstr "Η χρησιμοποιούμενη διαδρομή περιορισμ
 
 #: ../clutter/clutter-path-constraint.c:227
 msgid "The offset along the path, between -1.0 and 2.0"
-msgstr "Η αντιστάθμιση κατά μήκος της διαδρομής, μεταξύ -1,0 και 2,0"
+msgstr "Η αντιστάθμιση κατά μήκος της διαδρομής, μεταξύ -1.0 και 2.0"
 
-#: ../clutter/clutter-property-transition.c:271
+#: ../clutter/clutter-property-transition.c:269
 msgid "Property Name"
 msgstr "Όνομα ιδιότητας"
 
-#: ../clutter/clutter-property-transition.c:272
+#: ../clutter/clutter-property-transition.c:270
 msgid "The name of the property to animate"
 msgstr "Το όνομα της ιδιότητας για κίνηση"
 
-#: ../clutter/clutter-script.c:466
+#: ../clutter/clutter-script.c:464
 msgid "Filename Set"
 msgstr "Ορισμός ονόματος αρχείου"
 
-#: ../clutter/clutter-script.c:467
+#: ../clutter/clutter-script.c:465
 msgid "Whether the :filename property is set"
-msgstr "Εάν ορίστηκε η :ιδιότητα του ονόματος αρχείου "
+msgstr "Εάν ορίστηκε η :ιδιότητα του ονόματος αρχείου"
 
-#: ../clutter/clutter-script.c:481
-#: ../clutter/deprecated/clutter-texture.c:1082
+#: ../clutter/clutter-script.c:479
+#: ../clutter/deprecated/clutter-texture.c:1080
 msgid "Filename"
 msgstr "Όνομα αρχείου"
 
-#: ../clutter/clutter-script.c:482
+#: ../clutter/clutter-script.c:480
 msgid "The path of the currently parsed file"
 msgstr "Η διαδρομή του τρέχοντος αναλυόμενου αρχείου"
 
-#: ../clutter/clutter-script.c:499
+#: ../clutter/clutter-script.c:497
 msgid "Translation Domain"
 msgstr "Τομέας μετάφρασης"
 
-#: ../clutter/clutter-script.c:500
+#: ../clutter/clutter-script.c:498
 msgid "The translation domain used to localize string"
 msgstr "Ο χρησιμοποιούμενος τομέας μετάφρασης για τοπικοποίηση συμβολοσειράς"
 
-#: ../clutter/clutter-scroll-actor.c:263
+#: ../clutter/clutter-scroll-actor.c:184
 msgid "Scroll Mode"
 msgstr "Λειτουργία κύλισης"
 
-#: ../clutter/clutter-scroll-actor.c:264
+#: ../clutter/clutter-scroll-actor.c:185
 msgid "The scrolling direction"
 msgstr "Η κατεύθυνση της κύλισης"
 
-#: ../clutter/clutter-settings.c:440
+#: ../clutter/clutter-settings.c:486
 msgid "Double Click Time"
 msgstr "Χρόνος διπλού κλικ"
 
-#: ../clutter/clutter-settings.c:441
+#: ../clutter/clutter-settings.c:487
 msgid "The time between clicks necessary to detect a multiple click"
 msgstr "Ο απαραίτητος χρόνος μεταξύ των κλικ για ανίχνευση πολλαπλού κλικ"
 
-#: ../clutter/clutter-settings.c:456
+#: ../clutter/clutter-settings.c:502
 msgid "Double Click Distance"
 msgstr "Απόσταση διπλού κλικ"
 
-#: ../clutter/clutter-settings.c:457
+#: ../clutter/clutter-settings.c:503
 msgid "The distance between clicks necessary to detect a multiple click"
 msgstr "Ο απαραίτητος χρόνος μεταξύ των κλικ για ανίχνευση πολλαπλού κλικ"
 
-#: ../clutter/clutter-settings.c:472
+#: ../clutter/clutter-settings.c:518
 msgid "Drag Threshold"
 msgstr "Κατώφλι συρσίματος"
 
-#: ../clutter/clutter-settings.c:473
+#: ../clutter/clutter-settings.c:519
 msgid "The distance the cursor should travel before starting to drag"
 msgstr ""
 "Η απόσταση που ο δρομέας πρέπει να διασχίσει πριν την έναρξη συρσίματος"
 
-#: ../clutter/clutter-settings.c:488 ../clutter/clutter-text.c:3369
+#: ../clutter/clutter-settings.c:534 ../clutter/clutter-text.c:3437
 msgid "Font Name"
 msgstr "Όνομα γραμματοσειράς"
 
-#: ../clutter/clutter-settings.c:489
+#: ../clutter/clutter-settings.c:535
 msgid ""
 "The description of the default font, as one that could be parsed by Pango"
 msgstr ""
 "Η περιγραφή της προεπιλεγμένης γραμματοσειράς, όπως θα μπορούσε να αναλυθεί "
 "από το Pango"
 
-#: ../clutter/clutter-settings.c:504
+#: ../clutter/clutter-settings.c:550
 msgid "Font Antialias"
 msgstr "Εξομάλυνση γραμματοσειράς"
 
-#: ../clutter/clutter-settings.c:505
+#: ../clutter/clutter-settings.c:551
 msgid ""
 "Whether to use antialiasing (1 to enable, 0 to disable, and -1 to use the "
 "default)"
@@ -1475,73 +1545,81 @@ msgstr ""
 "Εάν θα χρησιμοποιηθεί εξομάλυνση (1 για ενεργοποίηση, 0 για απενεργοποίηση "
 "και -1 για χρήση της προεπιλογής)"
 
-#: ../clutter/clutter-settings.c:521
+#: ../clutter/clutter-settings.c:567 ../clutter/clutter-settings.c:575
 msgid "Font DPI"
 msgstr "DPI γραμματοσειράς"
 
-#: ../clutter/clutter-settings.c:522
+#: ../clutter/clutter-settings.c:568 ../clutter/clutter-settings.c:576
 msgid ""
 "The resolution of the font, in 1024 * dots/inch, or -1 to use the default"
 msgstr ""
 "Η ανάλυση της γραμματοσειράς, σε 1024 * κουκκίδες/ίντσα ή -1 για χρήση της "
 "προεπιλογής"
 
-#: ../clutter/clutter-settings.c:538
+#: ../clutter/clutter-settings.c:592
 msgid "Font Hinting"
 msgstr "Υπόδειξη γραμματοσειράς"
 
-#: ../clutter/clutter-settings.c:539
+#: ../clutter/clutter-settings.c:593
 msgid ""
 "Whether to use hinting (1 to enable, 0 to disable and -1 to use the default)"
 msgstr ""
 "Εάν θα χρησιμοποιηθεί υπόδειξη (1 για ενεργοποίηση, 0 για απενεργοποίηση και "
 "-1 για χρήση της προεπιλογής)"
 
-#: ../clutter/clutter-settings.c:560
+#: ../clutter/clutter-settings.c:613
 msgid "Font Hint Style"
-msgstr "Τεχνοτροπία υπόδειξης γραμματοσειράς"
+msgstr "Στυλ υπόδειξης γραμματοσειράς"
 
-#: ../clutter/clutter-settings.c:561
+#: ../clutter/clutter-settings.c:614
 msgid "The style of hinting (hintnone, hintslight, hintmedium, hintfull)"
-msgstr "Η τεχνοτροπία υπόδειξης (κανένα, ελαφρύ, μεσαίο, πλήρες)"
+msgstr "Το στυλ της υπόδειξης (κανένα, ελαφρύ, μεσαίο, πλήρες)"
 
-#: ../clutter/clutter-settings.c:582
+#: ../clutter/clutter-settings.c:634
 msgid "Font Subpixel Order"
 msgstr "Διάταξη υποεικονοστοιχείου γραμματοσειράς"
 
-#: ../clutter/clutter-settings.c:583
+#: ../clutter/clutter-settings.c:635
 msgid "The type of subpixel antialiasing (none, rgb, bgr, vrgb, vbgr)"
 msgstr "Ο τύπος εξομάλυνσης υποεικονοστοιχείου (κανένα, rgb, bgr, vrgb, vbgr)"
 
-#: ../clutter/clutter-settings.c:600
+#: ../clutter/clutter-settings.c:652
 msgid "The minimum duration for a long press gesture to be recognized"
 msgstr "Η ελάχιστη διάρκεια για αναγνώριση παρατεταμένου πατήματος"
 
-#: ../clutter/clutter-settings.c:607
+#: ../clutter/clutter-settings.c:659
+msgid "Window Scaling Factor"
+msgstr "Συντελεστής κλιμάκωσης παραθύρου"
+
+#: ../clutter/clutter-settings.c:660
+msgid "The scaling factor to be applied to windows"
+msgstr "Ο συντελεστής κλιμάκωσης που θα πρέπει να εφαρμοσθεί στα παράθυρα"
+
+#: ../clutter/clutter-settings.c:667
 msgid "Fontconfig configuration timestamp"
 msgstr "Αποτύπωμα χρόνου ρύθμισης Fontconfig"
 
-#: ../clutter/clutter-settings.c:608
+#: ../clutter/clutter-settings.c:668
 msgid "Timestamp of the current fontconfig configuration"
 msgstr "Αποτύπωμα χρόνου της τρέχουσας ρύθμισης fontconfig"
 
-#: ../clutter/clutter-settings.c:625
+#: ../clutter/clutter-settings.c:685
 msgid "Password Hint Time"
-msgstr "Χρόνος υπόδειξης κωδικού"
+msgstr "Χρόνος υπόδειξης κωδικού πρόσβασης"
 
-#: ../clutter/clutter-settings.c:626
+#: ../clutter/clutter-settings.c:686
 msgid "How long to show the last input character in hidden entries"
 msgstr ""
 "Για πόσο χρόνο θα εμφανίζεται ο τελευταίος χαρακτήρας που εισήχθηκε σε "
 "κρυφές καταχωρίσεις"
 
-#: ../clutter/clutter-shader-effect.c:486
+#: ../clutter/clutter-shader-effect.c:487
 msgid "Shader Type"
 msgstr "Τύπος σκίασης"
 
-#: ../clutter/clutter-shader-effect.c:487
+#: ../clutter/clutter-shader-effect.c:488
 msgid "The type of shader used"
-msgstr "Ο τύπος του χρησιμοποιούμενου σκιαστή "
+msgstr "Ο τύπος του χρησιμοποιούμενου σκιαστή"
 
 #: ../clutter/clutter-snap-constraint.c:322
 msgid "The source of the constraint"
@@ -1567,766 +1645,709 @@ msgstr "Η άκρη της πηγής που θα πρέπει να πιαστε
 msgid "The offset in pixels to apply to the constraint"
 msgstr "Η αντιστάθμιση σε εικονοστοιχεία για εφαρμογή στον περιορισμό"
 
-#: ../clutter/clutter-stage.c:1895
+#: ../clutter/clutter-stage.c:1917
 msgid "Fullscreen Set"
 msgstr "Ορισμός πλήρους οθόνης"
 
-#: ../clutter/clutter-stage.c:1896
+#: ../clutter/clutter-stage.c:1918
 msgid "Whether the main stage is fullscreen"
 msgstr "Αν η κύρια σκηνή είναι πλήρης οθόνη"
 
-#: ../clutter/clutter-stage.c:1910
+#: ../clutter/clutter-stage.c:1932
 msgid "Offscreen"
 msgstr "Εκτός οθόνης"
 
-#: ../clutter/clutter-stage.c:1911
+#: ../clutter/clutter-stage.c:1933
 msgid "Whether the main stage should be rendered offscreen"
 msgstr "Εάν η κύρια σκηνή θα αποδοθεί εκτός οθόνης"
 
-#: ../clutter/clutter-stage.c:1923 ../clutter/clutter-text.c:3483
+#: ../clutter/clutter-stage.c:1945 ../clutter/clutter-text.c:3551
 msgid "Cursor Visible"
 msgstr "Ορατός δρομέας"
 
-#: ../clutter/clutter-stage.c:1924
+#: ../clutter/clutter-stage.c:1946
 msgid "Whether the mouse pointer is visible on the main stage"
 msgstr "Εάν ο δείκτης ποντικιού είναι ορατός στην κύρια σκηνή"
 
-#: ../clutter/clutter-stage.c:1938
+#: ../clutter/clutter-stage.c:1960
 msgid "User Resizable"
 msgstr "Αυξομειούμενος από τον χρήστη"
 
-#: ../clutter/clutter-stage.c:1939
+#: ../clutter/clutter-stage.c:1961
 msgid "Whether the stage is able to be resized via user interaction"
 msgstr "Εάν η σκηνή μπορεί να αυξομειωθεί μέσα από την αλληλεπίδραση χρήστη"
 
-#: ../clutter/clutter-stage.c:1954 ../clutter/deprecated/clutter-box.c:260
-#: ../clutter/deprecated/clutter-rectangle.c:273
+#: ../clutter/clutter-stage.c:1976 ../clutter/deprecated/clutter-box.c:254
+#: ../clutter/deprecated/clutter-rectangle.c:270
 msgid "Color"
 msgstr "Χρώμα"
 
-#: ../clutter/clutter-stage.c:1955
+#: ../clutter/clutter-stage.c:1977
 msgid "The color of the stage"
 msgstr "Το χρώμα της σκηνής"
 
-#: ../clutter/clutter-stage.c:1970
+#: ../clutter/clutter-stage.c:1992
 msgid "Perspective"
 msgstr "Προοπτική"
 
-#: ../clutter/clutter-stage.c:1971
+#: ../clutter/clutter-stage.c:1993
 msgid "Perspective projection parameters"
 msgstr "παράμετροι προβολής προοπτικής"
 
-#: ../clutter/clutter-stage.c:1986
+#: ../clutter/clutter-stage.c:2008
 msgid "Title"
 msgstr "Τίτλος"
 
-#: ../clutter/clutter-stage.c:1987
+#: ../clutter/clutter-stage.c:2009
 msgid "Stage Title"
 msgstr "Τίτλος σκηνής"
 
-#: ../clutter/clutter-stage.c:2004
+#: ../clutter/clutter-stage.c:2026
 msgid "Use Fog"
 msgstr "Χρήση ομίχλης"
 
-#: ../clutter/clutter-stage.c:2005
+#: ../clutter/clutter-stage.c:2027
 msgid "Whether to enable depth cueing"
 msgstr "Εάν θα ενεργοποιηθεί σήμα βάθους"
 
-#: ../clutter/clutter-stage.c:2021
+#: ../clutter/clutter-stage.c:2043
 msgid "Fog"
 msgstr "Ομίχλη"
 
-#: ../clutter/clutter-stage.c:2022
+#: ../clutter/clutter-stage.c:2044
 msgid "Settings for the depth cueing"
-msgstr "ρυθμίσεις για το σήμα βάθους"
+msgstr "Ρυθμίσεις για το σήμα βάθους"
 
-#: ../clutter/clutter-stage.c:2038
+#: ../clutter/clutter-stage.c:2060
 msgid "Use Alpha"
 msgstr "Χρήση άλφα"
 
-#: ../clutter/clutter-stage.c:2039
+#: ../clutter/clutter-stage.c:2061
 msgid "Whether to honour the alpha component of the stage color"
 msgstr "Εάν θα πρέπει να σεβαστεί το συστατικό άλφα του χρώματος σκηνής"
 
-#: ../clutter/clutter-stage.c:2055
+#: ../clutter/clutter-stage.c:2077
 msgid "Key Focus"
 msgstr "Εστίαση πλήκτρου"
 
-#: ../clutter/clutter-stage.c:2056
+#: ../clutter/clutter-stage.c:2078
 msgid "The currently key focused actor"
 msgstr "Ο εστιασμένος δράστης του τρέχοντος πλήκτρου"
 
-#: ../clutter/clutter-stage.c:2072
+#: ../clutter/clutter-stage.c:2094
 msgid "No Clear Hint"
 msgstr "Χωρίς υπόδειξη καθαρισμού"
 
-#: ../clutter/clutter-stage.c:2073
+#: ../clutter/clutter-stage.c:2095
 msgid "Whether the stage should clear its contents"
 msgstr "Εάν η σκηνή θα πρέπει να καθαρίσει τα περιεχόμενα της"
 
-#: ../clutter/clutter-stage.c:2086
+#: ../clutter/clutter-stage.c:2108
 msgid "Accept Focus"
 msgstr "Αποδοχή εστίασης"
 
-#: ../clutter/clutter-stage.c:2087
+#: ../clutter/clutter-stage.c:2109
 msgid "Whether the stage should accept focus on show"
 msgstr "Εάν η σκηνή θα πρέπει να αποδεχθεί εστίαση στην εμφάνιση"
 
-#: ../clutter/clutter-table-layout.c:543
-msgid "Column Number"
-msgstr "Αριθμός στήλης"
-
-#: ../clutter/clutter-table-layout.c:544
-msgid "The column the widget resides in"
-msgstr "Η στήλη του γραφικού συστατικού βρίσκεται στο"
-
-#: ../clutter/clutter-table-layout.c:551
-msgid "Row Number"
-msgstr "Αριθμός γραμμής"
-
-#: ../clutter/clutter-table-layout.c:552
-msgid "The row the widget resides in"
-msgstr "Η γραμμή του γραφικού συστατικού βρίσκεται στο"
-
-#: ../clutter/clutter-table-layout.c:559
-msgid "Column Span"
-msgstr "Κάλυψη στήλης"
-
-#: ../clutter/clutter-table-layout.c:560
-msgid "The number of columns the widget should span"
-msgstr "Ο αριθμός των στηλών του γραφικού συστατικού που πρέπει να καλυφθεί"
-
-#: ../clutter/clutter-table-layout.c:567
-msgid "Row Span"
-msgstr "Κάλυψη γραμμής"
-
-#: ../clutter/clutter-table-layout.c:568
-msgid "The number of rows the widget should span"
-msgstr "Ο αριθμός των γραμμών του γραφικού συστατικού που πρέπει να καλυφθεί"
-
-#: ../clutter/clutter-table-layout.c:575
-msgid "Horizontal Expand"
-msgstr "Οριζόντια επέκταση"
-
-#: ../clutter/clutter-table-layout.c:576
-msgid "Allocate extra space for the child in horizontal axis"
-msgstr "Παραχώρηση πρόσθετου χώρου για το παιδί στον οριζόντιο άξονα"
-
-#: ../clutter/clutter-table-layout.c:582
-msgid "Vertical Expand"
-msgstr "Κάθετη επέκταση"
-
-#: ../clutter/clutter-table-layout.c:583
-msgid "Allocate extra space for the child in vertical axis"
-msgstr "Παραχώρηση πρόσθετου χώρου για το παιδί στον κάθετο άξονα"
-
-#: ../clutter/clutter-table-layout.c:1638
-msgid "Spacing between columns"
-msgstr "Διάκενο μεταξύ στηλών"
-
-#: ../clutter/clutter-table-layout.c:1652
-msgid "Spacing between rows"
-msgstr "Διάκενο μεταξύ γραμμών"
-
-#: ../clutter/clutter-text-buffer.c:351 ../clutter/clutter-text.c:3404
+#: ../clutter/clutter-text-buffer.c:347 ../clutter/clutter-text.c:3472
 msgid "Text"
 msgstr "Κείμενο"
 
-#: ../clutter/clutter-text-buffer.c:352
+#: ../clutter/clutter-text-buffer.c:348
 msgid "The contents of the buffer"
 msgstr "Τα περιεχόμενα της ενδιάμεσης μνήμης"
 
-#: ../clutter/clutter-text-buffer.c:365
+#: ../clutter/clutter-text-buffer.c:361
 msgid "Text length"
 msgstr "Μήκος κειμένου"
 
-#: ../clutter/clutter-text-buffer.c:366
+#: ../clutter/clutter-text-buffer.c:362
 msgid "Length of the text currently in the buffer"
 msgstr "Μήκος του κειμένου που περιέχεται στην ενδιάμεση μνήμη αυτή τη στιγμή"
 
-#: ../clutter/clutter-text-buffer.c:379
+#: ../clutter/clutter-text-buffer.c:375
 msgid "Maximum length"
 msgstr "Μέγιστο μήκος"
 
-#: ../clutter/clutter-text-buffer.c:380
+#: ../clutter/clutter-text-buffer.c:376
 msgid "Maximum number of characters for this entry. Zero if no maximum"
 msgstr ""
 "Μέγιστος αριθμός χαρακτήρων για αυτή την καταχώριση. Μηδέν αν δεν υπάρχει "
 "μέγιστος"
 
-#: ../clutter/clutter-text.c:3351
+#: ../clutter/clutter-text.c:3419
 msgid "Buffer"
 msgstr "Ενδιάμεση μνήμη"
 
-#: ../clutter/clutter-text.c:3352
+#: ../clutter/clutter-text.c:3420
 msgid "The buffer for the text"
 msgstr "Η ενδιάμεση μνήμη για το κείμενο"
 
-#: ../clutter/clutter-text.c:3370
+#: ../clutter/clutter-text.c:3438
 msgid "The font to be used by the text"
 msgstr "Η χρησιμοποιούμενη γραμματοσειρά από το κείμενο"
 
-#: ../clutter/clutter-text.c:3387
+#: ../clutter/clutter-text.c:3455
 msgid "Font Description"
 msgstr "Περιγραφή γραμματοσειράς"
 
-#: ../clutter/clutter-text.c:3388
+#: ../clutter/clutter-text.c:3456
 msgid "The font description to be used"
 msgstr "Η χρησιμοποιούμενη περιγραφή γραμματοσειράς"
 
-#: ../clutter/clutter-text.c:3405
+#: ../clutter/clutter-text.c:3473
 msgid "The text to render"
 msgstr "Κείμενο προς απόδοση"
 
-#: ../clutter/clutter-text.c:3419
+#: ../clutter/clutter-text.c:3487
 msgid "Font Color"
 msgstr "Χρώμα γραμματοσειράς"
 
-#: ../clutter/clutter-text.c:3420
+#: ../clutter/clutter-text.c:3488
 msgid "Color of the font used by the text"
 msgstr "Χρώμα της χρησιμοποιούμενης γραμματοσειράς από το κείμενο"
 
-#: ../clutter/clutter-text.c:3435
+#: ../clutter/clutter-text.c:3503
 msgid "Editable"
 msgstr "Επεξεργάσιμο"
 
-#: ../clutter/clutter-text.c:3436
+#: ../clutter/clutter-text.c:3504
 msgid "Whether the text is editable"
 msgstr "Εάν το κείμενο είναι επεξεργάσιμο"
 
-#: ../clutter/clutter-text.c:3451
+#: ../clutter/clutter-text.c:3519
 msgid "Selectable"
 msgstr "Επιλέξιμο"
 
-#: ../clutter/clutter-text.c:3452
+#: ../clutter/clutter-text.c:3520
 msgid "Whether the text is selectable"
 msgstr "Εάν το κείμενο είναι επιλέξιμο"
 
-#: ../clutter/clutter-text.c:3466
+#: ../clutter/clutter-text.c:3534
 msgid "Activatable"
 msgstr "Ενεργοποιήσιμο"
 
-#: ../clutter/clutter-text.c:3467
+#: ../clutter/clutter-text.c:3535
 msgid "Whether pressing return causes the activate signal to be emitted"
 msgstr "Εάν το πάτημα επιστροφής προκαλεί την εκπομπή σήματος ενεργοποίησης"
 
-#: ../clutter/clutter-text.c:3484
+#: ../clutter/clutter-text.c:3552
 msgid "Whether the input cursor is visible"
 msgstr "Εάν ο δρομέας εισόδου είναι ορατός"
 
-#: ../clutter/clutter-text.c:3498 ../clutter/clutter-text.c:3499
+#: ../clutter/clutter-text.c:3566 ../clutter/clutter-text.c:3567
 msgid "Cursor Color"
 msgstr "Χρώμα δρομέα"
 
-#: ../clutter/clutter-text.c:3514
+#: ../clutter/clutter-text.c:3582
 msgid "Cursor Color Set"
 msgstr "Ορισμός χρώματος δρομέα"
 
-#: ../clutter/clutter-text.c:3515
+#: ../clutter/clutter-text.c:3583
 msgid "Whether the cursor color has been set"
 msgstr "Εάν ορίστηκε το χρώμα δρομέα"
 
-#: ../clutter/clutter-text.c:3530
+#: ../clutter/clutter-text.c:3598
 msgid "Cursor Size"
 msgstr "Μέγεθος δρομέα"
 
-#: ../clutter/clutter-text.c:3531
+#: ../clutter/clutter-text.c:3599
 msgid "The width of the cursor, in pixels"
 msgstr "Το πλάτος του δρομέα, σε εικονοστοιχεία"
 
-#: ../clutter/clutter-text.c:3547 ../clutter/clutter-text.c:3565
+#: ../clutter/clutter-text.c:3615 ../clutter/clutter-text.c:3633
 msgid "Cursor Position"
 msgstr "Θέση δρομέα"
 
-#: ../clutter/clutter-text.c:3548 ../clutter/clutter-text.c:3566
+#: ../clutter/clutter-text.c:3616 ../clutter/clutter-text.c:3634
 msgid "The cursor position"
 msgstr "Η θέση δρομέα"
 
-#: ../clutter/clutter-text.c:3581
+#: ../clutter/clutter-text.c:3649
 msgid "Selection-bound"
 msgstr "Όριο επιλογής"
 
-#: ../clutter/clutter-text.c:3582
+#: ../clutter/clutter-text.c:3650
 msgid "The cursor position of the other end of the selection"
 msgstr "Η θέση δρομέα του άλλου άκρου της επιλογής"
 
-#: ../clutter/clutter-text.c:3597 ../clutter/clutter-text.c:3598
+#: ../clutter/clutter-text.c:3665 ../clutter/clutter-text.c:3666
 msgid "Selection Color"
-msgstr "Χρώμα Επιλογής"
+msgstr "Χρώμα επιλογής"
 
-#: ../clutter/clutter-text.c:3613
+#: ../clutter/clutter-text.c:3681
 msgid "Selection Color Set"
 msgstr "Ορισμός χρώματος επιλογής"
 
-#: ../clutter/clutter-text.c:3614
+#: ../clutter/clutter-text.c:3682
 msgid "Whether the selection color has been set"
 msgstr "Εάν ορίστηκε το χρώμα επιλογής"
 
-#: ../clutter/clutter-text.c:3629
+#: ../clutter/clutter-text.c:3697
 msgid "Attributes"
 msgstr "Γνωρίσματα"
 
-#: ../clutter/clutter-text.c:3630
+#: ../clutter/clutter-text.c:3698
 msgid "A list of style attributes to apply to the contents of the actor"
-msgstr ""
-"Μια λίστα γνωρισμάτων τεχνοτροπίας για εφαρμογή στα περιεχόμενα του δράστη"
+msgstr "Μια λίστα γνωρισμάτων στυλ για εφαρμογή στα περιεχόμενα του δράστη"
 
-#: ../clutter/clutter-text.c:3652
+#: ../clutter/clutter-text.c:3720
 msgid "Use markup"
 msgstr "Χρήση επισήμανσης"
 
-#: ../clutter/clutter-text.c:3653
+#: ../clutter/clutter-text.c:3721
 msgid "Whether or not the text includes Pango markup"
 msgstr "Εάν ή όχι το κείμενο περιλαμβάνει επισήμανση Pango"
 
-#: ../clutter/clutter-text.c:3669
+#: ../clutter/clutter-text.c:3737
 msgid "Line wrap"
 msgstr "Αναδίπλωση γραμμής"
 
-#: ../clutter/clutter-text.c:3670
+#: ../clutter/clutter-text.c:3738
 msgid "If set, wrap the lines if the text becomes too wide"
 msgstr "Αν οριστεί, αναδιπλώνονται οι γραμμές αν το κείμενο είναι πολύ μεγάλο"
 
-#: ../clutter/clutter-text.c:3685
+#: ../clutter/clutter-text.c:3753
 msgid "Line wrap mode"
-msgstr "Κατάσταση αναδίπλωσης γραμμής"
+msgstr "Λειτουργία αναδίπλωσης γραμμής"
 
-#: ../clutter/clutter-text.c:3686
+#: ../clutter/clutter-text.c:3754
 msgid "Control how line-wrapping is done"
 msgstr "Έλεγχος τρόπου αναδίπλωσης γραμμής"
 
-#: ../clutter/clutter-text.c:3701
+#: ../clutter/clutter-text.c:3769
 msgid "Ellipsize"
 msgstr "Αποσιωπητικά"
 
-#: ../clutter/clutter-text.c:3702
+#: ../clutter/clutter-text.c:3770
 msgid "The preferred place to ellipsize the string"
 msgstr "Η προτιμώμενη θέση για αποσιωπητικά της συμβολοσειράς"
 
-#: ../clutter/clutter-text.c:3718
+#: ../clutter/clutter-text.c:3786
 msgid "Line Alignment"
 msgstr "Στοίχιση γραμμής"
 
-#: ../clutter/clutter-text.c:3719
+#: ../clutter/clutter-text.c:3787
 msgid "The preferred alignment for the string, for multi-line text"
 msgstr ""
 "Η προτιμώμενη στοίχιση για τη συμβολοσειρά, για κείμενο πολλαπλής γραμμής"
 
-#: ../clutter/clutter-text.c:3735
+#: ../clutter/clutter-text.c:3803
 msgid "Justify"
 msgstr "Πλήρης στοίχιση"
 
-#: ../clutter/clutter-text.c:3736
+#: ../clutter/clutter-text.c:3804
 msgid "Whether the text should be justified"
 msgstr "Εάν το κείμενο πρέπει να στοιχιστεί πλήρως"
 
-#: ../clutter/clutter-text.c:3751
+#: ../clutter/clutter-text.c:3819
 msgid "Password Character"
-msgstr "Χαρακτήρας κωδικού"
+msgstr "Χαρακτήρας κωδικού πρόσβασης"
 
-#: ../clutter/clutter-text.c:3752
+#: ../clutter/clutter-text.c:3820
 msgid "If non-zero, use this character to display the actor's contents"
 msgstr ""
 "Εάν είναι μη μηδενικός, χρησιμοποιήστε αυτόν τον χαρακτήρα για εμφάνιση των "
 "περιεχομένων του δράστη"
 
-#: ../clutter/clutter-text.c:3766
+#: ../clutter/clutter-text.c:3834
 msgid "Max Length"
 msgstr "Μέγιστο μήκος"
 
-#: ../clutter/clutter-text.c:3767
+#: ../clutter/clutter-text.c:3835
 msgid "Maximum length of the text inside the actor"
 msgstr "Μέγιστο μήκος του κειμένου μέσα στον δράστη"
 
-#: ../clutter/clutter-text.c:3790
+#: ../clutter/clutter-text.c:3858
 msgid "Single Line Mode"
-msgstr "Κατάσταση μονής γραμμής"
+msgstr "Λειτουργία μονής γραμμής"
 
-#: ../clutter/clutter-text.c:3791
+#: ../clutter/clutter-text.c:3859
 msgid "Whether the text should be a single line"
 msgstr "Εάν το κείμενο πρέπει να είναι μονής γραμμής"
 
-#: ../clutter/clutter-text.c:3805 ../clutter/clutter-text.c:3806
+#: ../clutter/clutter-text.c:3873 ../clutter/clutter-text.c:3874
 msgid "Selected Text Color"
 msgstr "Επιλεγμένο χρώμα κειμένου"
 
-#: ../clutter/clutter-text.c:3821
+#: ../clutter/clutter-text.c:3889
 msgid "Selected Text Color Set"
 msgstr "Ορισμός επιλεγμένου χρώματος κειμένου"
 
-#: ../clutter/clutter-text.c:3822
+#: ../clutter/clutter-text.c:3890
 msgid "Whether the selected text color has been set"
 msgstr "Εάν ορίστηκε το χρώμα επιλεγμένου κειμένου"
 
-#: ../clutter/clutter-timeline.c:561
-#: ../clutter/deprecated/clutter-animation.c:560
+#: ../clutter/clutter-timeline.c:591
+#: ../clutter/deprecated/clutter-animation.c:512
 msgid "Loop"
 msgstr "Βρόχος"
 
-#: ../clutter/clutter-timeline.c:562
+#: ../clutter/clutter-timeline.c:592
 msgid "Should the timeline automatically restart"
 msgstr "Θα πρέπει η χρονογραμμή να ξεκινήσει αυτόματα"
 
-#: ../clutter/clutter-timeline.c:576
+#: ../clutter/clutter-timeline.c:606
 msgid "Delay"
 msgstr "Καθυστέρηση"
 
-#: ../clutter/clutter-timeline.c:577
+#: ../clutter/clutter-timeline.c:607
 msgid "Delay before start"
 msgstr "Καθυστέρηση πριν την έναρξη"
 
-#: ../clutter/clutter-timeline.c:592
-#: ../clutter/deprecated/clutter-animation.c:544
-#: ../clutter/deprecated/clutter-animator.c:1804
+#: ../clutter/clutter-timeline.c:622
+#: ../clutter/deprecated/clutter-animation.c:496
+#: ../clutter/deprecated/clutter-animator.c:1792
 #: ../clutter/deprecated/clutter-media.c:224
-#: ../clutter/deprecated/clutter-state.c:1523
+#: ../clutter/deprecated/clutter-state.c:1515
 msgid "Duration"
 msgstr "Διάρκεια"
 
-#: ../clutter/clutter-timeline.c:593
+#: ../clutter/clutter-timeline.c:623
 msgid "Duration of the timeline in milliseconds"
 msgstr "Διάρκεια της χρονογραμμής σε ms"
 
-#: ../clutter/clutter-timeline.c:608
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:528
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:337
+#: ../clutter/clutter-timeline.c:638
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:521
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:330
 msgid "Direction"
 msgstr "Κατεύθυνση"
 
-#: ../clutter/clutter-timeline.c:609
+#: ../clutter/clutter-timeline.c:639
 msgid "Direction of the timeline"
 msgstr "Κατεύθυνση της χρονογραμμής"
 
-#: ../clutter/clutter-timeline.c:624
+#: ../clutter/clutter-timeline.c:654
 msgid "Auto Reverse"
 msgstr "Αυτόματη αντιστροφή"
 
-#: ../clutter/clutter-timeline.c:625
+#: ../clutter/clutter-timeline.c:655
 msgid "Whether the direction should be reversed when reaching the end"
 msgstr "Εάν η κατεύθυνση πρέπει να αντιστραφεί όταν φτάσει το τέλος"
 
-#: ../clutter/clutter-timeline.c:643
+#: ../clutter/clutter-timeline.c:673
 msgid "Repeat Count"
 msgstr "Μέτρηση επαναλήψεων"
 
-#: ../clutter/clutter-timeline.c:644
+#: ../clutter/clutter-timeline.c:674
 msgid "How many times the timeline should repeat"
 msgstr "Αριθμός επαναλήψεων χρονογραμμής"
 
-#: ../clutter/clutter-timeline.c:658
+#: ../clutter/clutter-timeline.c:688
 msgid "Progress Mode"
-msgstr "Κατάσταση προόδου"
+msgstr "Λειτουργία προόδου"
 
-#: ../clutter/clutter-timeline.c:659
+#: ../clutter/clutter-timeline.c:689
 msgid "How the timeline should compute the progress"
 msgstr "Υπολογισμός προόδου από τη χρονογραμμή"
 
-#: ../clutter/clutter-transition.c:246
+#: ../clutter/clutter-transition.c:244
 msgid "Interval"
 msgstr "Μεσοδιάστημα"
 
-#: ../clutter/clutter-transition.c:247
+#: ../clutter/clutter-transition.c:245
 msgid "The interval of values to transition"
 msgstr "Το μεσοδιάστημα τιμών για μετάβαση"
 
-#: ../clutter/clutter-transition.c:261
+#: ../clutter/clutter-transition.c:259
 msgid "Animatable"
 msgstr "Κινήσιμο"
 
-#: ../clutter/clutter-transition.c:262
+#: ../clutter/clutter-transition.c:260
 msgid "The animatable object"
 msgstr "Το κινήσιμο αντικείμενο"
 
-#: ../clutter/clutter-transition.c:283
+#: ../clutter/clutter-transition.c:281
 msgid "Remove on Complete"
 msgstr "Αφαίρεση με την ολοκλήρωση"
 
-#: ../clutter/clutter-transition.c:284
+#: ../clutter/clutter-transition.c:282
 msgid "Detach the transition when completed"
 msgstr "Απόσπαση της μετάβασης όταν ολοκληρωθεί"
 
-#: ../clutter/clutter-zoom-action.c:354
+#: ../clutter/clutter-zoom-action.c:365
 msgid "Zoom Axis"
 msgstr "Άξονας εστίασης"
 
-#: ../clutter/clutter-zoom-action.c:355
+#: ../clutter/clutter-zoom-action.c:366
 msgid "Constraints the zoom to an axis"
 msgstr "Περιορισμοί εστίασης σε έναν άξονα"
 
-#: ../clutter/deprecated/clutter-alpha.c:355
-#: ../clutter/deprecated/clutter-animation.c:575
-#: ../clutter/deprecated/clutter-animator.c:1821
+#: ../clutter/deprecated/clutter-alpha.c:347
+#: ../clutter/deprecated/clutter-animation.c:527
+#: ../clutter/deprecated/clutter-animator.c:1809
 msgid "Timeline"
 msgstr "Χρονογραμμή"
 
-#: ../clutter/deprecated/clutter-alpha.c:356
+#: ../clutter/deprecated/clutter-alpha.c:348
 msgid "Timeline used by the alpha"
 msgstr "Η χρησιμοποιούμενη χρονογραμμή από το άλφα"
 
-#: ../clutter/deprecated/clutter-alpha.c:372
+#: ../clutter/deprecated/clutter-alpha.c:364
 msgid "Alpha value"
 msgstr "Τιμή άλφα"
 
-#: ../clutter/deprecated/clutter-alpha.c:373
+#: ../clutter/deprecated/clutter-alpha.c:365
 msgid "Alpha value as computed by the alpha"
 msgstr "Τιμή άλφα όπως υπολογίζεται από το άλφα"
 
-#: ../clutter/deprecated/clutter-alpha.c:394
-#: ../clutter/deprecated/clutter-animation.c:528
+#: ../clutter/deprecated/clutter-alpha.c:386
+#: ../clutter/deprecated/clutter-animation.c:480
 msgid "Mode"
-msgstr "Κατάσταση"
+msgstr "Λειτουργία"
 
-#: ../clutter/deprecated/clutter-alpha.c:395
+#: ../clutter/deprecated/clutter-alpha.c:387
 msgid "Progress mode"
-msgstr "Κατάσταση προόδου"
+msgstr "Λειτουργία προόδου"
 
-#: ../clutter/deprecated/clutter-animation.c:511
+#: ../clutter/deprecated/clutter-animation.c:463
 msgid "Object"
 msgstr "Αντικείμενο"
 
-#: ../clutter/deprecated/clutter-animation.c:512
+#: ../clutter/deprecated/clutter-animation.c:464
 msgid "Object to which the animation applies"
-msgstr "Αντικείμενο εφαρμογής της κίνησης"
+msgstr "Αντικείμενο εφαρμογής της κινούμενης εικόνας"
 
-#: ../clutter/deprecated/clutter-animation.c:529
+#: ../clutter/deprecated/clutter-animation.c:481
 msgid "The mode of the animation"
-msgstr "Η κατάσταση της κίνησης"
+msgstr "Η λειτουργία της κινούμενης εικόνας"
 
-#: ../clutter/deprecated/clutter-animation.c:545
+#: ../clutter/deprecated/clutter-animation.c:497
 msgid "Duration of the animation, in milliseconds"
-msgstr "Διάρκεια της κίνησης, σε ms"
+msgstr "Διάρκεια της κινούμενης εικόνας, σε ms"
 
-#: ../clutter/deprecated/clutter-animation.c:561
+#: ../clutter/deprecated/clutter-animation.c:513
 msgid "Whether the animation should loop"
-msgstr "Εάν η κίνηση θα κάνει βρόχο"
+msgstr "Εάν η κινούμενη εικόνα θα κάνει βρόχο"
 
-#: ../clutter/deprecated/clutter-animation.c:576
+#: ../clutter/deprecated/clutter-animation.c:528
 msgid "The timeline used by the animation"
-msgstr "Η χρονογραμμή που χρησιμοποιείται από την κίνηση"
+msgstr "Η χρονογραμμή που χρησιμοποιείται από την κινούμενη εικόνα"
 
-#: ../clutter/deprecated/clutter-animation.c:592
-#: ../clutter/deprecated/clutter-behaviour.c:241
+#: ../clutter/deprecated/clutter-animation.c:544
+#: ../clutter/deprecated/clutter-behaviour.c:237
 msgid "Alpha"
 msgstr "Άλφα"
 
-#: ../clutter/deprecated/clutter-animation.c:593
+#: ../clutter/deprecated/clutter-animation.c:545
 msgid "The alpha used by the animation"
-msgstr "Η άλφα που χρησιμοποιείται από την κίνηση"
+msgstr "Η άλφα που χρησιμοποιείται από την κινούμενη εικόνα"
 
-#: ../clutter/deprecated/clutter-animator.c:1805
+#: ../clutter/deprecated/clutter-animator.c:1793
 msgid "The duration of the animation"
-msgstr "Η διάρκεια της κίνησης"
+msgstr "Η διάρκεια της κινούμενης εικόνας"
 
-#: ../clutter/deprecated/clutter-animator.c:1822
+#: ../clutter/deprecated/clutter-animator.c:1810
 msgid "The timeline of the animation"
-msgstr "Η χρονογραμμή της κίνησης"
+msgstr "Η χρονογραμμή της κινούμενης εικόνας"
 
-#: ../clutter/deprecated/clutter-behaviour.c:242
+#: ../clutter/deprecated/clutter-behaviour.c:238
 msgid "Alpha Object to drive the behaviour"
 msgstr "Αντικείμενο άλφα για οδηγός συμπεριφοράς"
 
-#: ../clutter/deprecated/clutter-behaviour-depth.c:182
+#: ../clutter/deprecated/clutter-behaviour-depth.c:180
 msgid "Start Depth"
 msgstr "Βάθος έναρξης"
 
-#: ../clutter/deprecated/clutter-behaviour-depth.c:183
+#: ../clutter/deprecated/clutter-behaviour-depth.c:181
 msgid "Initial depth to apply"
 msgstr "Αρχικό βάθος εφαρμογής"
 
-#: ../clutter/deprecated/clutter-behaviour-depth.c:198
+#: ../clutter/deprecated/clutter-behaviour-depth.c:196
 msgid "End Depth"
 msgstr "Βάθος τέλους"
 
-#: ../clutter/deprecated/clutter-behaviour-depth.c:199
+#: ../clutter/deprecated/clutter-behaviour-depth.c:197
 msgid "Final depth to apply"
 msgstr "Τελικό βάθος εφαρμογής"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:401
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:394
 msgid "Start Angle"
 msgstr "Γωνία έναρξης"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:402
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:284
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:395
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:277
 msgid "Initial angle"
 msgstr "Αρχική γωνία"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:417
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:410
 msgid "End Angle"
 msgstr "Γωνία τέλους"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:418
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:302
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:411
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:295
 msgid "Final angle"
 msgstr "Τελική γωνία"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:433
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:426
 msgid "Angle x tilt"
 msgstr "Γωνία κλίσης x"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:434
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:427
 msgid "Tilt of the ellipse around x axis"
 msgstr "Κλίση της έλλειψης γύρω από τον άξονα x"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:449
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:442
 msgid "Angle y tilt"
 msgstr "Γωνία κλίσης y"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:450
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:443
 msgid "Tilt of the ellipse around y axis"
 msgstr "Κλίση της έλλειψης γύρω από τον άξονα y"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:465
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:458
 msgid "Angle z tilt"
 msgstr "Γωνία κλίσης z"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:466
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:459
 msgid "Tilt of the ellipse around z axis"
 msgstr "Κλίση της έλλειψης γύρω από τον άξονα z"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:482
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:475
 msgid "Width of the ellipse"
 msgstr "Πλάτος της έλλειψης"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:498
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:491
 msgid "Height of ellipse"
 msgstr "Ύψος της έλλειψης"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:513
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:506
 msgid "Center"
 msgstr "Κέντρο"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:514
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:507
 msgid "Center of ellipse"
 msgstr "Κέντρο της έλλειψης"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:529
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:338
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:522
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:331
 msgid "Direction of rotation"
 msgstr "Κατεύθυνση περιστροφής"
 
-#: ../clutter/deprecated/clutter-behaviour-opacity.c:184
+#: ../clutter/deprecated/clutter-behaviour-opacity.c:177
 msgid "Opacity Start"
 msgstr "Αδιαφάνεια έναρξης"
 
-#: ../clutter/deprecated/clutter-behaviour-opacity.c:185
+#: ../clutter/deprecated/clutter-behaviour-opacity.c:178
 msgid "Initial opacity level"
 msgstr "Αρχικό επίπεδο αδιαφάνειας"
 
-#: ../clutter/deprecated/clutter-behaviour-opacity.c:202
+#: ../clutter/deprecated/clutter-behaviour-opacity.c:195
 msgid "Opacity End"
 msgstr "Αδιαφάνεια τέλους"
 
-#: ../clutter/deprecated/clutter-behaviour-opacity.c:203
+#: ../clutter/deprecated/clutter-behaviour-opacity.c:196
 msgid "Final opacity level"
 msgstr "Τελικό επίπεδο αδιαφάνειας"
 
-#: ../clutter/deprecated/clutter-behaviour-path.c:226
+#: ../clutter/deprecated/clutter-behaviour-path.c:222
 msgid "The ClutterPath object representing the path to animate along"
 msgstr "Το αντικείμενο ClutterPath αναπαριστά τη διαδρομή κίνησης"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:283
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:276
 msgid "Angle Begin"
 msgstr "Γωνία εκκίνησης"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:301
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:294
 msgid "Angle End"
 msgstr "Γωνία τερματισμού"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:319
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:312
 msgid "Axis"
 msgstr "Άξονας"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:320
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:313
 msgid "Axis of rotation"
 msgstr "Άξονας περιστροφής"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:355
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:348
 msgid "Center X"
 msgstr "Κέντρο X"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:356
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:349
 msgid "X coordinate of the center of rotation"
 msgstr "Συντεταγμένη Χ του κέντρου περιστροφής"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:373
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:366
 msgid "Center Y"
 msgstr "Κέντρο Υ"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:374
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:367
 msgid "Y coordinate of the center of rotation"
 msgstr "Συντεταγμένη Υ του κέντρου περιστροφής"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:391
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:384
 msgid "Center Z"
 msgstr "Κέντρο Ζ"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:392
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:385
 msgid "Z coordinate of the center of rotation"
 msgstr "Συντεταγμένη Ζ του κέντρου περιστροφής"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:226
+#: ../clutter/deprecated/clutter-behaviour-scale.c:222
 msgid "X Start Scale"
 msgstr "Κλίμακα έναρξης Χ"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:227
+#: ../clutter/deprecated/clutter-behaviour-scale.c:223
 msgid "Initial scale on the X axis"
 msgstr "Αρχική κλίμακα στον άξονα Χ"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:245
+#: ../clutter/deprecated/clutter-behaviour-scale.c:241
 msgid "X End Scale"
 msgstr "Κλίμακα τέλους Χ"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:246
+#: ../clutter/deprecated/clutter-behaviour-scale.c:242
 msgid "Final scale on the X axis"
 msgstr "Τελική κλίμακα στον άξονα Χ"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:264
+#: ../clutter/deprecated/clutter-behaviour-scale.c:260
 msgid "Y Start Scale"
 msgstr "Κλίμακα έναρξης Υ"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:265
+#: ../clutter/deprecated/clutter-behaviour-scale.c:261
 msgid "Initial scale on the Y axis"
 msgstr "Αρχική κλίμακα στον άξονα Υ"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:283
+#: ../clutter/deprecated/clutter-behaviour-scale.c:279
 msgid "Y End Scale"
 msgstr "Κλίμακα τέλους Υ"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:284
+#: ../clutter/deprecated/clutter-behaviour-scale.c:280
 msgid "Final scale on the Y axis"
 msgstr "Τελική κλίμακα στον άξονα Υ"
 
-#: ../clutter/deprecated/clutter-box.c:261
+#: ../clutter/deprecated/clutter-box.c:255
 msgid "The background color of the box"
 msgstr "Το χρώμα παρασκηνίου του πλαισίου"
 
-#: ../clutter/deprecated/clutter-box.c:274
+#: ../clutter/deprecated/clutter-box.c:268
 msgid "Color Set"
 msgstr "Ορισμός χρώματος"
 
-#: ../clutter/deprecated/clutter-cairo-texture.c:597
+#: ../clutter/deprecated/clutter-cairo-texture.c:585
 msgid "Surface Width"
 msgstr "Πλάτος επιφάνειας"
 
-#: ../clutter/deprecated/clutter-cairo-texture.c:598
+#: ../clutter/deprecated/clutter-cairo-texture.c:586
 msgid "The width of the Cairo surface"
 msgstr "Το πλάτος της επιφάνειας Cairo"
 
-#: ../clutter/deprecated/clutter-cairo-texture.c:615
+#: ../clutter/deprecated/clutter-cairo-texture.c:603
 msgid "Surface Height"
 msgstr "Το ύψος της επιφάνειας"
 
-#: ../clutter/deprecated/clutter-cairo-texture.c:616
+#: ../clutter/deprecated/clutter-cairo-texture.c:604
 msgid "The height of the Cairo surface"
 msgstr "Το ύψος της επιφάνειας Cairo"
 
-#: ../clutter/deprecated/clutter-cairo-texture.c:636
+#: ../clutter/deprecated/clutter-cairo-texture.c:624
 msgid "Auto Resize"
 msgstr "Αυτόματη αυξομείωση"
 
-#: ../clutter/deprecated/clutter-cairo-texture.c:637
+#: ../clutter/deprecated/clutter-cairo-texture.c:625
 msgid "Whether the surface should match the allocation"
-msgstr "Εάν η επιφάνεια πρέπει να ταιριάζει με την παραχώρηση"
+msgstr "Εάν η επιφάνεια πρέπει να ταιριάζει με την κατανομή"
 
 #: ../clutter/deprecated/clutter-media.c:83
 msgid "URI"
@@ -2396,103 +2417,159 @@ msgstr "Το επίπεδο γεμίσματος της ενδιάμεσης μ
 msgid "The duration of the stream, in seconds"
 msgstr "Η διάρκεια της ροής, σε δευτερόλεπτα"
 
-#: ../clutter/deprecated/clutter-rectangle.c:274
+#: ../clutter/deprecated/clutter-rectangle.c:271
 msgid "The color of the rectangle"
 msgstr "Το χρώμα του ορθογωνίου"
 
-#: ../clutter/deprecated/clutter-rectangle.c:287
+#: ../clutter/deprecated/clutter-rectangle.c:284
 msgid "Border Color"
 msgstr "Χρώμα περιγράμματος"
 
-#: ../clutter/deprecated/clutter-rectangle.c:288
+#: ../clutter/deprecated/clutter-rectangle.c:285
 msgid "The color of the border of the rectangle"
 msgstr "Το χρώμα του περιγράμματος του ορθογωνίου"
 
-#: ../clutter/deprecated/clutter-rectangle.c:303
+#: ../clutter/deprecated/clutter-rectangle.c:300
 msgid "Border Width"
 msgstr "Πλάτος περιγράμματος"
 
-#: ../clutter/deprecated/clutter-rectangle.c:304
+#: ../clutter/deprecated/clutter-rectangle.c:301
 msgid "The width of the border of the rectangle"
 msgstr "Το πλάτος του περιγράμματος του ορθογωνίου"
 
-#: ../clutter/deprecated/clutter-rectangle.c:318
+#: ../clutter/deprecated/clutter-rectangle.c:315
 msgid "Has Border"
 msgstr "Ύπαρξη περιγράμματος"
 
-#: ../clutter/deprecated/clutter-rectangle.c:319
+#: ../clutter/deprecated/clutter-rectangle.c:316
 msgid "Whether the rectangle should have a border"
 msgstr "Εάν το ορθογώνιο πρέπει να έχει περίγραμμα"
 
-#: ../clutter/deprecated/clutter-shader.c:261
+#: ../clutter/deprecated/clutter-shader.c:257
 msgid "Vertex Source"
 msgstr "Πηγή κορυφής"
 
-#: ../clutter/deprecated/clutter-shader.c:262
+#: ../clutter/deprecated/clutter-shader.c:258
 msgid "Source of vertex shader"
 msgstr "Πηγή του σκιαστή κορυφής"
 
-#: ../clutter/deprecated/clutter-shader.c:278
+#: ../clutter/deprecated/clutter-shader.c:274
 msgid "Fragment Source"
 msgstr "Πηγή κομματιού"
 
-#: ../clutter/deprecated/clutter-shader.c:279
+#: ../clutter/deprecated/clutter-shader.c:275
 msgid "Source of fragment shader"
 msgstr "Πηγή του σκιαστή κομματιού"
 
-#: ../clutter/deprecated/clutter-shader.c:296
+#: ../clutter/deprecated/clutter-shader.c:292
 msgid "Compiled"
 msgstr "Μεταγλωττισμένο"
 
-#: ../clutter/deprecated/clutter-shader.c:297
+#: ../clutter/deprecated/clutter-shader.c:293
 msgid "Whether the shader is compiled and linked"
 msgstr "Εάν ο σκιαστής μεταγλωττίστηκε και συνδέθηκε"
 
-#: ../clutter/deprecated/clutter-shader.c:314
+#: ../clutter/deprecated/clutter-shader.c:310
 msgid "Whether the shader is enabled"
 msgstr "Εάν ο σκιαστής είναι ενεργός"
 
-#: ../clutter/deprecated/clutter-shader.c:525
+#: ../clutter/deprecated/clutter-shader.c:521
 #, c-format
 msgid "%s compilation failed: %s"
 msgstr "αποτυχία μεταγλώττισης %s: %s"
 
-#: ../clutter/deprecated/clutter-shader.c:526
+#: ../clutter/deprecated/clutter-shader.c:522
 msgid "Vertex shader"
 msgstr "Σκιαστής κορυφής"
 
-#: ../clutter/deprecated/clutter-shader.c:527
+#: ../clutter/deprecated/clutter-shader.c:523
 msgid "Fragment shader"
 msgstr "Σκιαστής κομματιού"
 
-#: ../clutter/deprecated/clutter-state.c:1505
+#: ../clutter/deprecated/clutter-state.c:1497
 msgid "State"
 msgstr "Κατάσταση"
 
-#: ../clutter/deprecated/clutter-state.c:1506
+#: ../clutter/deprecated/clutter-state.c:1498
 msgid "Currently set state, (transition to this state might not be complete)"
 msgstr ""
 "Τρέχον ορισμός κατάστασης, (η μετάβαση σε αυτήν την κατάσταση μπορεί να μην "
 "είναι πλήρης)"
 
-#: ../clutter/deprecated/clutter-state.c:1524
+#: ../clutter/deprecated/clutter-state.c:1516
 msgid "Default transition duration"
 msgstr "Προεπιλεγμένη διάρκεια μετάβασης"
 
-#: ../clutter/deprecated/clutter-texture.c:994
+#: ../clutter/deprecated/clutter-table-layout.c:535
+msgid "Column Number"
+msgstr "Αριθμός στήλης"
+
+#: ../clutter/deprecated/clutter-table-layout.c:536
+msgid "The column the widget resides in"
+msgstr "Η στήλη του γραφικού στοιχείου βρίσκεται στο"
+
+#: ../clutter/deprecated/clutter-table-layout.c:543
+msgid "Row Number"
+msgstr "Αριθμός γραμμής"
+
+#: ../clutter/deprecated/clutter-table-layout.c:544
+msgid "The row the widget resides in"
+msgstr "Η γραμμή του γραφικού στοιχείου βρίσκεται στο"
+
+#: ../clutter/deprecated/clutter-table-layout.c:551
+msgid "Column Span"
+msgstr "Κάλυψη στήλης"
+
+#: ../clutter/deprecated/clutter-table-layout.c:552
+msgid "The number of columns the widget should span"
+msgstr "Ο αριθμός των στηλών του γραφικού στοιχείου που πρέπει να καλυφθεί"
+
+#: ../clutter/deprecated/clutter-table-layout.c:559
+msgid "Row Span"
+msgstr "Κάλυψη γραμμής"
+
+#: ../clutter/deprecated/clutter-table-layout.c:560
+msgid "The number of rows the widget should span"
+msgstr "Ο αριθμός των γραμμών του γραφικού στοιχείου που πρέπει να καλυφθεί"
+
+#: ../clutter/deprecated/clutter-table-layout.c:567
+msgid "Horizontal Expand"
+msgstr "Οριζόντια επέκταση"
+
+#: ../clutter/deprecated/clutter-table-layout.c:568
+msgid "Allocate extra space for the child in horizontal axis"
+msgstr "Εκχώρηση πρόσθετου χώρου για το θυγατρικό στον οριζόντιο άξονα"
+
+#: ../clutter/deprecated/clutter-table-layout.c:574
+msgid "Vertical Expand"
+msgstr "Κάθετη επέκταση"
+
+#: ../clutter/deprecated/clutter-table-layout.c:575
+msgid "Allocate extra space for the child in vertical axis"
+msgstr "Εκχώρηση πρόσθετου χώρου για το θυγατρικό στον κάθετο άξονα"
+
+#: ../clutter/deprecated/clutter-table-layout.c:1630
+msgid "Spacing between columns"
+msgstr "Διάκενο μεταξύ στηλών"
+
+#: ../clutter/deprecated/clutter-table-layout.c:1646
+msgid "Spacing between rows"
+msgstr "Διάκενο μεταξύ γραμμών"
+
+#: ../clutter/deprecated/clutter-texture.c:992
 msgid "Sync size of actor"
 msgstr "Συγχρονισμός μεγέθους του δράστη"
 
-#: ../clutter/deprecated/clutter-texture.c:995
+#: ../clutter/deprecated/clutter-texture.c:993
 msgid "Auto sync size of actor to underlying pixbuf dimensions"
 msgstr ""
 "Αυτόματος συγχρονισμός μεγέθους του δράστη στις υποκείμενες διαστάσεις pixbuf"
 
-#: ../clutter/deprecated/clutter-texture.c:1002
+#: ../clutter/deprecated/clutter-texture.c:1000
 msgid "Disable Slicing"
 msgstr "Απενεργοποίηση τεμαχισμού"
 
-#: ../clutter/deprecated/clutter-texture.c:1003
+#: ../clutter/deprecated/clutter-texture.c:1001
 msgid ""
 "Forces the underlying texture to be singular and not made of smaller space "
 "saving individual textures"
@@ -2500,99 +2577,99 @@ msgstr ""
 "Εξαναγκάζει την υποκείμενη υφή να είναι μοναδική και να μην κατασκευάζεται "
 "από μικρότερο χώρο αποθηκεύοντας ατομικές υφές"
 
-#: ../clutter/deprecated/clutter-texture.c:1012
+#: ../clutter/deprecated/clutter-texture.c:1010
 msgid "Tile Waste"
 msgstr "Απώλεια παράθεσης"
 
-#: ../clutter/deprecated/clutter-texture.c:1013
+#: ../clutter/deprecated/clutter-texture.c:1011
 msgid "Maximum waste area of a sliced texture"
-msgstr "μέγιστη περιοχή απώλειας τεμαχισμένης υφής"
+msgstr "Μέγιστη περιοχή απώλειας τεμαχισμένης υφής"
 
-#: ../clutter/deprecated/clutter-texture.c:1021
+#: ../clutter/deprecated/clutter-texture.c:1019
 msgid "Horizontal repeat"
 msgstr "Οριζόντια επανάληψη"
 
-#: ../clutter/deprecated/clutter-texture.c:1022
+#: ../clutter/deprecated/clutter-texture.c:1020
 msgid "Repeat the contents rather than scaling them horizontally"
 msgstr "Επανάληψη των περιεχομένων αντί για κλιμάκωση τους οριζόντια"
 
-#: ../clutter/deprecated/clutter-texture.c:1029
+#: ../clutter/deprecated/clutter-texture.c:1027
 msgid "Vertical repeat"
 msgstr "Κάθετη επανάληψη"
 
-#: ../clutter/deprecated/clutter-texture.c:1030
+#: ../clutter/deprecated/clutter-texture.c:1028
 msgid "Repeat the contents rather than scaling them vertically"
 msgstr "Επανάληψη των περιεχομένων αντί για κλιμάκωση τους κάθετα"
 
-#: ../clutter/deprecated/clutter-texture.c:1037
+#: ../clutter/deprecated/clutter-texture.c:1035
 msgid "Filter Quality"
 msgstr "Ποιότητα φίλτρου"
 
-#: ../clutter/deprecated/clutter-texture.c:1038
+#: ../clutter/deprecated/clutter-texture.c:1036
 msgid "Rendering quality used when drawing the texture"
 msgstr "Απόδοση χρησιμοποιούμενης ποιότητας όταν σχεδιάζεται η υφή"
 
-#: ../clutter/deprecated/clutter-texture.c:1046
+#: ../clutter/deprecated/clutter-texture.c:1044
 msgid "Pixel Format"
 msgstr "Μορφή εικονοστοιχείου"
 
-#: ../clutter/deprecated/clutter-texture.c:1047
+#: ../clutter/deprecated/clutter-texture.c:1045
 msgid "The Cogl pixel format to use"
 msgstr "Η μορφή εικονοστοιχείου Cogl για χρήση"
 
-#: ../clutter/deprecated/clutter-texture.c:1055
-#: ../clutter/wayland/clutter-wayland-surface.c:449
+#: ../clutter/deprecated/clutter-texture.c:1053
+#: ../clutter/wayland/clutter-wayland-surface.c:445
 msgid "Cogl Texture"
 msgstr "Υφή Cogl"
 
-#: ../clutter/deprecated/clutter-texture.c:1056
-#: ../clutter/wayland/clutter-wayland-surface.c:450
+#: ../clutter/deprecated/clutter-texture.c:1054
+#: ../clutter/wayland/clutter-wayland-surface.c:446
 msgid "The underlying Cogl texture handle used to draw this actor"
 msgstr ""
 "Ο χειρισμός της υποκείμενης υφής Cogl χρησιμοποιήθηκε για σχεδιασμό αυτού "
 "του δράστη"
 
-#: ../clutter/deprecated/clutter-texture.c:1063
+#: ../clutter/deprecated/clutter-texture.c:1061
 msgid "Cogl Material"
 msgstr "Υλικό Cogl"
 
-#: ../clutter/deprecated/clutter-texture.c:1064
+#: ../clutter/deprecated/clutter-texture.c:1062
 msgid "The underlying Cogl material handle used to draw this actor"
 msgstr ""
 "Ο χειρισμός του υποκείμενου υλικού Cogl χρησιμοποιήθηκε για σχεδιασμό αυτού "
 "του δράστη"
 
-#: ../clutter/deprecated/clutter-texture.c:1083
+#: ../clutter/deprecated/clutter-texture.c:1081
 msgid "The path of the file containing the image data"
 msgstr "Η διαδρομή του αρχείου που περιέχει τα δεδομένα εικόνας"
 
-#: ../clutter/deprecated/clutter-texture.c:1090
+#: ../clutter/deprecated/clutter-texture.c:1088
 msgid "Keep Aspect Ratio"
 msgstr "Διατήρηση λόγου θέασης"
 
-#: ../clutter/deprecated/clutter-texture.c:1091
+#: ../clutter/deprecated/clutter-texture.c:1089
 msgid ""
 "Keep the aspect ratio of the texture when requesting the preferred width or "
 "height"
 msgstr ""
 "διατήρηση του λόγου θέασης της υφής όταν ζητάτε το προτιμώμενο πλάτος ή ύψος"
 
-#: ../clutter/deprecated/clutter-texture.c:1119
+#: ../clutter/deprecated/clutter-texture.c:1117
 msgid "Load asynchronously"
 msgstr "Ασύγχρονη φόρτωση"
 
-#: ../clutter/deprecated/clutter-texture.c:1120
+#: ../clutter/deprecated/clutter-texture.c:1118
 msgid ""
 "Load files inside a thread to avoid blocking when loading images from disk"
 msgstr ""
 "Φόρτωση αρχείων μέσα σε νήμα για αποφυγή φραγής όταν φορτώνονται εικόνες από "
 "δίσκο"
 
-#: ../clutter/deprecated/clutter-texture.c:1138
+#: ../clutter/deprecated/clutter-texture.c:1136
 msgid "Load data asynchronously"
 msgstr "Ασύγχρονη φόρτωση δεδομένων"
 
-#: ../clutter/deprecated/clutter-texture.c:1139
+#: ../clutter/deprecated/clutter-texture.c:1137
 msgid ""
 "Decode image data files inside a thread to reduce blocking when loading "
 "images from disk"
@@ -2600,196 +2677,191 @@ msgstr ""
 "Αποκωδικοποίηση αρχείων δεδομένων εικόνας μέσα σε νήμα για μείωση φραγής "
 "όταν φορτώνονται εικόνες από δίσκο"
 
-#: ../clutter/deprecated/clutter-texture.c:1165
+#: ../clutter/deprecated/clutter-texture.c:1163
 msgid "Pick With Alpha"
 msgstr "Επιλογή με άλφα"
 
-#: ../clutter/deprecated/clutter-texture.c:1166
+#: ../clutter/deprecated/clutter-texture.c:1164
 msgid "Shape actor with alpha channel when picking"
 msgstr "Δράστης σχήματος με κανάλι άλφα όταν επιλέγει"
 
-#: ../clutter/deprecated/clutter-texture.c:1599
-#: ../clutter/deprecated/clutter-texture.c:1994
-#: ../clutter/deprecated/clutter-texture.c:2090
-#: ../clutter/deprecated/clutter-texture.c:2388
+#: ../clutter/deprecated/clutter-texture.c:1597
+#: ../clutter/deprecated/clutter-texture.c:1992
+#: ../clutter/deprecated/clutter-texture.c:2088
+#: ../clutter/deprecated/clutter-texture.c:2386
 #, c-format
 msgid "Failed to load the image data"
 msgstr "Αδυναμία φόρτωσης δεδομένων εικόνας"
 
-#: ../clutter/deprecated/clutter-texture.c:1758
+#: ../clutter/deprecated/clutter-texture.c:1756
 #, c-format
 msgid "YUV textures are not supported"
 msgstr "Υφές YUV δεν υποστηρίζονται"
 
-#: ../clutter/deprecated/clutter-texture.c:1767
+#: ../clutter/deprecated/clutter-texture.c:1765
 #, c-format
 msgid "YUV2 textues are not supported"
 msgstr "Υφές YUV2 δεν υποστηρίζονται"
 
-#: ../clutter/evdev/clutter-input-device-evdev.c:159
-msgid "sysfs Path"
-msgstr "διαδρομή sysfs"
-
-#: ../clutter/evdev/clutter-input-device-evdev.c:160
-msgid "Path of the device in sysfs"
-msgstr "Διαδρομή της συσκευής σε sysfs"
-
-#: ../clutter/evdev/clutter-input-device-evdev.c:175
-msgid "Device Path"
-msgstr "Διαδρομή συσκευής"
-
-#: ../clutter/evdev/clutter-input-device-evdev.c:176
-msgid "Path of the device node"
-msgstr "Διαδρομή του κόμβου συσκευής"
-
-#: ../clutter/gdk/clutter-backend-gdk.c:296
+#: ../clutter/gdk/clutter-backend-gdk.c:289
 #, c-format
 msgid "Could not find a suitable CoglWinsys for a GdkDisplay of type %s"
 msgstr "Αδυναμία εύρεσης κατάλληλου CoglWinsys για ένα GdkDisplay τύπου %s"
 
-#: ../clutter/wayland/clutter-wayland-surface.c:423
+#: ../clutter/wayland/clutter-wayland-surface.c:419
 msgid "Surface"
 msgstr "Επιφάνεια"
 
-#: ../clutter/wayland/clutter-wayland-surface.c:424
+#: ../clutter/wayland/clutter-wayland-surface.c:420
 msgid "The underlying wayland surface"
 msgstr "Η υποκείμενη επιφάνεια wayland"
 
-#: ../clutter/wayland/clutter-wayland-surface.c:431
+#: ../clutter/wayland/clutter-wayland-surface.c:427
 msgid "Surface width"
 msgstr "Πλάτος επιφάνειας"
 
-#: ../clutter/wayland/clutter-wayland-surface.c:432
+#: ../clutter/wayland/clutter-wayland-surface.c:428
 msgid "The width of the underlying wayland surface"
 msgstr "Το πλάτος της υποκείμενης επιφάνειας wayland"
 
-#: ../clutter/wayland/clutter-wayland-surface.c:440
+#: ../clutter/wayland/clutter-wayland-surface.c:436
 msgid "Surface height"
 msgstr "Ύψος επιφάνειας"
 
-#: ../clutter/wayland/clutter-wayland-surface.c:441
+#: ../clutter/wayland/clutter-wayland-surface.c:437
 msgid "The height of the underlying wayland surface"
 msgstr "Το ύψος της υποκείμενης επιφάνειας wayland"
 
-#: ../clutter/x11/clutter-backend-x11.c:516
+#: ../clutter/x11/clutter-backend-x11.c:488
 msgid "X display to use"
 msgstr "Εμφάνιση Χ για χρήση"
 
-#: ../clutter/x11/clutter-backend-x11.c:522
+#: ../clutter/x11/clutter-backend-x11.c:494
 msgid "X screen to use"
 msgstr "Οθόνη Χ για χρήση"
 
-#: ../clutter/x11/clutter-backend-x11.c:527
+#: ../clutter/x11/clutter-backend-x11.c:499
 msgid "Make X calls synchronous"
 msgstr "Να γίνουν οι κλήσεις Χ σύγχρονες"
 
-#: ../clutter/x11/clutter-backend-x11.c:534
-#| msgid "Enable XInput support"
+#: ../clutter/x11/clutter-backend-x11.c:506
 msgid "Disable XInput support"
 msgstr "Απενεργοποίηση υποστήριξης XInput"
 
-#: ../clutter/x11/clutter-keymap-x11.c:317
+#: ../clutter/x11/clutter-keymap-x11.c:458
 msgid "The Clutter backend"
-msgstr "Η οπισθοφυλακή Clutter"
+msgstr "Η σύστημα υποστήριξης Clutter"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:539
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:534
 msgid "Pixmap"
 msgstr "Χάρτης εικονοστοιχείων"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:540
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:535
 msgid "The X11 Pixmap to be bound"
 msgstr "Ο χάρτης εικονοστοιχείων X11 για σύνδεση"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:548
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:543
 msgid "Pixmap width"
 msgstr "Πλάτος χάρτη εικονοστοιχείων"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:549
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:544
 msgid "The width of the pixmap bound to this texture"
 msgstr "Το πλάτος του χάρτη εικονοστοιχείων συνδεδεμένου με αυτήν την υφή"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:557
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:552
 msgid "Pixmap height"
 msgstr "Ύψος χάρτη εικονοστοιχείων"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:558
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:553
 msgid "The height of the pixmap bound to this texture"
 msgstr "Το ύψος του χάρτη εικονοστοιχείων συνδεδεμένου με αυτήν την υφή"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:566
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:561
 msgid "Pixmap Depth"
 msgstr "Βάθος χάρτη εικονοστοιχείων"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:567
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:562
 msgid "The depth (in number of bits) of the pixmap bound to this texture"
 msgstr ""
 "Το βάθος (σε αριθμό δυαδικών) του χάρτη εικονοστοιχείων συνδεδεμένων με "
 "αυτήν την υφή"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:575
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:570
 msgid "Automatic Updates"
 msgstr "Αυτόματες ενημερώσεις"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:576
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:571
 msgid "If the texture should be kept in sync with any pixmap changes."
 msgstr ""
 "Εάν η υφή πρέπει να κρατηθεί σε συγχρονισμό με οποιεσδήποτε αλλαγές χάρτη "
 "εικονοστοιχείων."
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:584
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:579
 msgid "Window"
 msgstr "Παράθυρο"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:585
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:580
 msgid "The X11 Window to be bound"
 msgstr "Το παράθυρο X11 για σύνδεση"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:593
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:588
 msgid "Window Redirect Automatic"
 msgstr "Αυτόματη ανακατεύθυνση παραθύρου"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:594
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:589
 msgid "If composite window redirects are set to Automatic (or Manual if false)"
 msgstr ""
 "Εάν οι ανακατευθύνσεις του σύνθετου παράθυρου ορίζονται σε αυτόματο (ή "
 "χειροκίνητο σε περίπτωση λάθους)"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:604
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:599
 msgid "Window Mapped"
 msgstr "Χαρτογραφημένο παράθυρο"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:605
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:600
 msgid "If window is mapped"
 msgstr "Εάν το παράθυρο χαρτογραφήθηκε"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:614
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:609
 msgid "Destroyed"
 msgstr "Κατεστραμμένο"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:615
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:610
 msgid "If window has been destroyed"
 msgstr "Εάν το παράθυρο καταστράφηκε"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:623
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:618
 msgid "Window X"
 msgstr "Παράθυρο Χ"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:624
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:619
 msgid "X position of window on screen according to X11"
 msgstr "Θέση Χ του παραθύρου στην οθόνη σύμφωνα με το X11"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:632
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:627
 msgid "Window Y"
 msgstr "Παράθυρο Υ"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:633
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:628
 msgid "Y position of window on screen according to X11"
 msgstr "Θέση Υ του παραθύρου στην οθόνη σύμφωνα με το X11"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:640
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:635
 msgid "Window Override Redirect"
 msgstr "Ανακατεύθυνση αντικατάστασης παραθύρου"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:641
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:636
 msgid "If this is an override-redirect window"
 msgstr "Εάν είναι ένα παράθυρο αντικατάστασης-ανακατεύθυνσης"
+
+#~ msgid "sysfs Path"
+#~ msgstr "διαδρομή sysfs"
+
+#~ msgid "Path of the device in sysfs"
+#~ msgstr "Διαδρομή της συσκευής σε sysfs"
+
+#~ msgid "Device Path"
+#~ msgstr "Διαδρομή συσκευής"
+
+#~ msgid "Path of the device node"
+#~ msgstr "Διαδρομή του κόμβου συσκευής"
diff --git a/po/es.po b/po/es.po
index 5b2045cd7..e395a99a5 100644
--- a/po/es.po
+++ b/po/es.po
@@ -2,15 +2,15 @@
 # Copyright (C) 2011 clutter's COPYRIGHT HOLDER
 # This file is distributed under the same license as the clutter package.
 # Jorge González <jorgegonz@svn.gnome.org>, 2011.
-# Daniel Mustieles <daniel.mustieles@gmail.com>, 2011, 2012.
+# Daniel Mustieles <daniel.mustieles@gmail.com>, 2011, 2012, 2013, 2014.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: clutter master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=clutter&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2012-12-18 02:00+0000\n"
-"PO-Revision-Date: 2012-12-19 11:02+0100\n"
+"POT-Creation-Date: 2014-02-14 04:10+0000\n"
+"PO-Revision-Date: 2014-02-14 09:56+0100\n"
 "Last-Translator: Daniel Mustieles <daniel.mustieles@gmail.com>\n"
 "Language-Team: Español <gnome-es-list@gnome.org>\n"
 "Language: \n"
@@ -20,690 +20,690 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
 "X-Generator: Gtranslator 2.91.5\n"
 
-#: ../clutter/clutter-actor.c:6144
+#: ../clutter/clutter-actor.c:6214
 msgid "X coordinate"
 msgstr "Coordenada X"
 
-#: ../clutter/clutter-actor.c:6145
+#: ../clutter/clutter-actor.c:6215
 msgid "X coordinate of the actor"
 msgstr "Coordenada X del actor"
 
-#: ../clutter/clutter-actor.c:6163
+#: ../clutter/clutter-actor.c:6233
 msgid "Y coordinate"
 msgstr "Coordenada Y"
 
-#: ../clutter/clutter-actor.c:6164
+#: ../clutter/clutter-actor.c:6234
 msgid "Y coordinate of the actor"
 msgstr "Coordenada Y del actor"
 
-#: ../clutter/clutter-actor.c:6186
+#: ../clutter/clutter-actor.c:6256
 msgid "Position"
 msgstr "Posición"
 
-#: ../clutter/clutter-actor.c:6187
+#: ../clutter/clutter-actor.c:6257
 msgid "The position of the origin of the actor"
 msgstr "La posición de origen del actor"
 
-#: ../clutter/clutter-actor.c:6204 ../clutter/clutter-canvas.c:215
-#: ../clutter/clutter-grid-layout.c:1238
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:481
+#: ../clutter/clutter-actor.c:6274 ../clutter/clutter-canvas.c:247
+#: ../clutter/clutter-grid-layout.c:1239
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:474
 msgid "Width"
 msgstr "Anchura"
 
-#: ../clutter/clutter-actor.c:6205
+#: ../clutter/clutter-actor.c:6275
 msgid "Width of the actor"
 msgstr "Anchura del actor"
 
-#: ../clutter/clutter-actor.c:6223 ../clutter/clutter-canvas.c:231
-#: ../clutter/clutter-grid-layout.c:1245
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:497
+#: ../clutter/clutter-actor.c:6293 ../clutter/clutter-canvas.c:263
+#: ../clutter/clutter-grid-layout.c:1246
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:490
 msgid "Height"
 msgstr "Altura"
 
-#: ../clutter/clutter-actor.c:6224
+#: ../clutter/clutter-actor.c:6294
 msgid "Height of the actor"
 msgstr "Altura del actor"
 
-#: ../clutter/clutter-actor.c:6245
+#: ../clutter/clutter-actor.c:6315
 msgid "Size"
 msgstr "Tamaño"
 
-#: ../clutter/clutter-actor.c:6246
+#: ../clutter/clutter-actor.c:6316
 msgid "The size of the actor"
 msgstr "El tamaño del actor"
 
-#: ../clutter/clutter-actor.c:6264
+#: ../clutter/clutter-actor.c:6334
 msgid "Fixed X"
 msgstr "X fija"
 
-#: ../clutter/clutter-actor.c:6265
+#: ../clutter/clutter-actor.c:6335
 msgid "Forced X position of the actor"
 msgstr "Posición X forzada del actor"
 
-#: ../clutter/clutter-actor.c:6282
+#: ../clutter/clutter-actor.c:6352
 msgid "Fixed Y"
 msgstr "Y fija"
 
-#: ../clutter/clutter-actor.c:6283
+#: ../clutter/clutter-actor.c:6353
 msgid "Forced Y position of the actor"
 msgstr "Posición Y forzada del actor"
 
-#: ../clutter/clutter-actor.c:6298
+#: ../clutter/clutter-actor.c:6368
 msgid "Fixed position set"
 msgstr "Posición fija establecida"
 
-#: ../clutter/clutter-actor.c:6299
+#: ../clutter/clutter-actor.c:6369
 msgid "Whether to use fixed positioning for the actor"
 msgstr "Indica si se usa una posición fija para el actor"
 
-#: ../clutter/clutter-actor.c:6317
+#: ../clutter/clutter-actor.c:6387
 msgid "Min Width"
 msgstr "Anchura mínima"
 
-#: ../clutter/clutter-actor.c:6318
+#: ../clutter/clutter-actor.c:6388
 msgid "Forced minimum width request for the actor"
 msgstr "Solicitud de anchura mínima forzada para el actor"
 
-#: ../clutter/clutter-actor.c:6336
+#: ../clutter/clutter-actor.c:6406
 msgid "Min Height"
 msgstr "Altura mínima"
 
-#: ../clutter/clutter-actor.c:6337
+#: ../clutter/clutter-actor.c:6407
 msgid "Forced minimum height request for the actor"
 msgstr "Solicitud de altura mínima forzada para el actor"
 
-#: ../clutter/clutter-actor.c:6355
+#: ../clutter/clutter-actor.c:6425
 msgid "Natural Width"
 msgstr "Anchura natural"
 
-#: ../clutter/clutter-actor.c:6356
+#: ../clutter/clutter-actor.c:6426
 msgid "Forced natural width request for the actor"
 msgstr "Solicitud de anchura natural forzada para el actor"
 
-#: ../clutter/clutter-actor.c:6374
+#: ../clutter/clutter-actor.c:6444
 msgid "Natural Height"
 msgstr "Altura natural"
 
-#: ../clutter/clutter-actor.c:6375
+#: ../clutter/clutter-actor.c:6445
 msgid "Forced natural height request for the actor"
 msgstr "Solicitud de altura natural forzada para el actor"
 
-#: ../clutter/clutter-actor.c:6390
+#: ../clutter/clutter-actor.c:6460
 msgid "Minimum width set"
 msgstr "Anchura mínima establecida"
 
-#: ../clutter/clutter-actor.c:6391
+#: ../clutter/clutter-actor.c:6461
 msgid "Whether to use the min-width property"
 msgstr "Indica si se usa la propiedad «anchura mínima»"
 
-#: ../clutter/clutter-actor.c:6405
+#: ../clutter/clutter-actor.c:6475
 msgid "Minimum height set"
 msgstr "Altura mínima establecida"
 
-#: ../clutter/clutter-actor.c:6406
+#: ../clutter/clutter-actor.c:6476
 msgid "Whether to use the min-height property"
 msgstr "Indica si se usa la propiedad «altura mínima»"
 
-#: ../clutter/clutter-actor.c:6420
+#: ../clutter/clutter-actor.c:6490
 msgid "Natural width set"
 msgstr "Anchura natural establecida"
 
-#: ../clutter/clutter-actor.c:6421
+#: ../clutter/clutter-actor.c:6491
 msgid "Whether to use the natural-width property"
 msgstr "Indica si se usa la propiedad «anchura natural»"
 
-#: ../clutter/clutter-actor.c:6435
+#: ../clutter/clutter-actor.c:6505
 msgid "Natural height set"
 msgstr "Altura natural establecida"
 
-#: ../clutter/clutter-actor.c:6436
+#: ../clutter/clutter-actor.c:6506
 msgid "Whether to use the natural-height property"
 msgstr "Indica si se usa la propiedad «altura natural»"
 
-#: ../clutter/clutter-actor.c:6452
+#: ../clutter/clutter-actor.c:6522
 msgid "Allocation"
 msgstr "Asignación"
 
-#: ../clutter/clutter-actor.c:6453
+#: ../clutter/clutter-actor.c:6523
 msgid "The actor's allocation"
 msgstr "La asignación del actor"
 
-#: ../clutter/clutter-actor.c:6510
+#: ../clutter/clutter-actor.c:6580
 msgid "Request Mode"
 msgstr "Modo de solicitud"
 
-#: ../clutter/clutter-actor.c:6511
+#: ../clutter/clutter-actor.c:6581
 msgid "The actor's request mode"
 msgstr "El modo de solicitud del actor"
 
-#: ../clutter/clutter-actor.c:6535
+#: ../clutter/clutter-actor.c:6605
 msgid "Depth"
 msgstr "Profundidad"
 
-#: ../clutter/clutter-actor.c:6536
+#: ../clutter/clutter-actor.c:6606
 msgid "Position on the Z axis"
 msgstr "Posición en el eje Z"
 
-#: ../clutter/clutter-actor.c:6563
+#: ../clutter/clutter-actor.c:6633
 msgid "Z Position"
 msgstr "Posición Z"
 
-#: ../clutter/clutter-actor.c:6564
+#: ../clutter/clutter-actor.c:6634
 msgid "The actor's position on the Z axis"
 msgstr "Posición del actor en el eje Z"
 
-#: ../clutter/clutter-actor.c:6581
+#: ../clutter/clutter-actor.c:6651
 msgid "Opacity"
 msgstr "Opacidad"
 
-#: ../clutter/clutter-actor.c:6582
+#: ../clutter/clutter-actor.c:6652
 msgid "Opacity of an actor"
 msgstr "Opacidad de un actor"
 
-#: ../clutter/clutter-actor.c:6602
+#: ../clutter/clutter-actor.c:6672
 msgid "Offscreen redirect"
 msgstr "Redirección fuera de la pantalla"
 
-#: ../clutter/clutter-actor.c:6603
+#: ../clutter/clutter-actor.c:6673
 msgid "Flags controlling when to flatten the actor into a single image"
 msgstr "Opciones que controlan si se debe aplanar el actor en una única imagen"
 
-#: ../clutter/clutter-actor.c:6617
+#: ../clutter/clutter-actor.c:6687
 msgid "Visible"
 msgstr "Visible"
 
-#: ../clutter/clutter-actor.c:6618
+#: ../clutter/clutter-actor.c:6688
 msgid "Whether the actor is visible or not"
 msgstr "Indica si el actor es visible o no"
 
-#: ../clutter/clutter-actor.c:6632
+#: ../clutter/clutter-actor.c:6702
 msgid "Mapped"
 msgstr "Mapeado"
 
-#: ../clutter/clutter-actor.c:6633
+#: ../clutter/clutter-actor.c:6703
 msgid "Whether the actor will be painted"
 msgstr "Indica si se dibujará el actor"
 
-#: ../clutter/clutter-actor.c:6646
+#: ../clutter/clutter-actor.c:6716
 msgid "Realized"
 msgstr "Realizado"
 
-#: ../clutter/clutter-actor.c:6647
+#: ../clutter/clutter-actor.c:6717
 msgid "Whether the actor has been realized"
 msgstr "Indica si el actor se ha realizado"
 
-#: ../clutter/clutter-actor.c:6662
+#: ../clutter/clutter-actor.c:6732
 msgid "Reactive"
 msgstr "Reactivo"
 
-#: ../clutter/clutter-actor.c:6663
+#: ../clutter/clutter-actor.c:6733
 msgid "Whether the actor is reactive to events"
 msgstr "Indica si el actor es reactivo a eventos"
 
-#: ../clutter/clutter-actor.c:6674
+#: ../clutter/clutter-actor.c:6744
 msgid "Has Clip"
 msgstr "Tiene recorte"
 
-#: ../clutter/clutter-actor.c:6675
+#: ../clutter/clutter-actor.c:6745
 msgid "Whether the actor has a clip set"
 msgstr "Indica si el actor tiene un conjunto de recortes"
 
-#: ../clutter/clutter-actor.c:6688
+#: ../clutter/clutter-actor.c:6758
 msgid "Clip"
 msgstr "Recortar"
 
-#: ../clutter/clutter-actor.c:6689
+#: ../clutter/clutter-actor.c:6759
 msgid "The clip region for the actor"
 msgstr "La región de recorte del actor"
 
-#: ../clutter/clutter-actor.c:6708
+#: ../clutter/clutter-actor.c:6778
 msgid "Clip Rectangle"
 msgstr "Recortar rectángulo"
 
-#: ../clutter/clutter-actor.c:6709
+#: ../clutter/clutter-actor.c:6779
 msgid "The visible region of the actor"
 msgstr "La región visible del actor"
 
-#: ../clutter/clutter-actor.c:6723 ../clutter/clutter-actor-meta.c:207
-#: ../clutter/clutter-binding-pool.c:319 ../clutter/clutter-input-device.c:258
+#: ../clutter/clutter-actor.c:6793 ../clutter/clutter-actor-meta.c:205
+#: ../clutter/clutter-binding-pool.c:319 ../clutter/clutter-input-device.c:247
 msgid "Name"
 msgstr "Nombre"
 
-#: ../clutter/clutter-actor.c:6724
+#: ../clutter/clutter-actor.c:6794
 msgid "Name of the actor"
 msgstr "Nombre del actor"
 
-#: ../clutter/clutter-actor.c:6745
+#: ../clutter/clutter-actor.c:6815
 msgid "Pivot Point"
 msgstr "Punto de pivote"
 
-#: ../clutter/clutter-actor.c:6746
+#: ../clutter/clutter-actor.c:6816
 msgid "The point around which the scaling and rotation occur"
 msgstr "El punto alrededor del cual sucede el escalado y la rotación"
 
-#: ../clutter/clutter-actor.c:6764
+#: ../clutter/clutter-actor.c:6834
 msgid "Pivot Point Z"
 msgstr "Punto de pivote Z"
 
-#: ../clutter/clutter-actor.c:6765
+#: ../clutter/clutter-actor.c:6835
 msgid "Z component of the pivot point"
 msgstr "Componente Z del punto de anclado"
 
-#: ../clutter/clutter-actor.c:6783
+#: ../clutter/clutter-actor.c:6853
 msgid "Scale X"
 msgstr "Escala en X"
 
-#: ../clutter/clutter-actor.c:6784
+#: ../clutter/clutter-actor.c:6854
 msgid "Scale factor on the X axis"
 msgstr "Factor de escala en el eje X"
 
-#: ../clutter/clutter-actor.c:6802
+#: ../clutter/clutter-actor.c:6872
 msgid "Scale Y"
 msgstr "Escala en Y"
 
-#: ../clutter/clutter-actor.c:6803
+#: ../clutter/clutter-actor.c:6873
 msgid "Scale factor on the Y axis"
 msgstr "Factor de escala en el eje Y"
 
-#: ../clutter/clutter-actor.c:6821
+#: ../clutter/clutter-actor.c:6891
 msgid "Scale Z"
 msgstr "Escala en Z"
 
-#: ../clutter/clutter-actor.c:6822
+#: ../clutter/clutter-actor.c:6892
 msgid "Scale factor on the Z axis"
 msgstr "Factor de escala en el eje Z"
 
-#: ../clutter/clutter-actor.c:6840
+#: ../clutter/clutter-actor.c:6910
 msgid "Scale Center X"
 msgstr "Centro X del escalado"
 
-#: ../clutter/clutter-actor.c:6841
+#: ../clutter/clutter-actor.c:6911
 msgid "Horizontal scale center"
 msgstr "Centro de la escala horizontal"
 
-#: ../clutter/clutter-actor.c:6859
+#: ../clutter/clutter-actor.c:6929
 msgid "Scale Center Y"
 msgstr "Centro Y del escalado"
 
-#: ../clutter/clutter-actor.c:6860
+#: ../clutter/clutter-actor.c:6930
 msgid "Vertical scale center"
 msgstr "Centro de la escala vertical"
 
-#: ../clutter/clutter-actor.c:6878
+#: ../clutter/clutter-actor.c:6948
 msgid "Scale Gravity"
 msgstr "Gravedad del escalado"
 
-#: ../clutter/clutter-actor.c:6879
+#: ../clutter/clutter-actor.c:6949
 msgid "The center of scaling"
 msgstr "El centro del escalado"
 
-#: ../clutter/clutter-actor.c:6897
+#: ../clutter/clutter-actor.c:6967
 msgid "Rotation Angle X"
 msgstr "Ángulo de rotación X"
 
-#: ../clutter/clutter-actor.c:6898
+#: ../clutter/clutter-actor.c:6968
 msgid "The rotation angle on the X axis"
 msgstr "El ángulo de rotación en el eje X"
 
-#: ../clutter/clutter-actor.c:6916
+#: ../clutter/clutter-actor.c:6986
 msgid "Rotation Angle Y"
 msgstr "Ángulo de rotación Y"
 
-#: ../clutter/clutter-actor.c:6917
+#: ../clutter/clutter-actor.c:6987
 msgid "The rotation angle on the Y axis"
 msgstr "El ángulo de rotación en el eje Y"
 
-#: ../clutter/clutter-actor.c:6935
+#: ../clutter/clutter-actor.c:7005
 msgid "Rotation Angle Z"
 msgstr "Ángulo de rotación Z"
 
-#: ../clutter/clutter-actor.c:6936
+#: ../clutter/clutter-actor.c:7006
 msgid "The rotation angle on the Z axis"
 msgstr "El ángulo de rotación en el eje Z"
 
-#: ../clutter/clutter-actor.c:6954
+#: ../clutter/clutter-actor.c:7024
 msgid "Rotation Center X"
 msgstr "Centro de rotación X"
 
-#: ../clutter/clutter-actor.c:6955
+#: ../clutter/clutter-actor.c:7025
 msgid "The rotation center on the X axis"
 msgstr "El ángulo de rotación en el eje Y"
 
-#: ../clutter/clutter-actor.c:6972
+#: ../clutter/clutter-actor.c:7042
 msgid "Rotation Center Y"
 msgstr "Centro de rotación Y"
 
-#: ../clutter/clutter-actor.c:6973
+#: ../clutter/clutter-actor.c:7043
 msgid "The rotation center on the Y axis"
 msgstr "En centro de la rotación en el eje Y"
 
-#: ../clutter/clutter-actor.c:6990
+#: ../clutter/clutter-actor.c:7060
 msgid "Rotation Center Z"
 msgstr "Centro de rotación Z"
 
-#: ../clutter/clutter-actor.c:6991
+#: ../clutter/clutter-actor.c:7061
 msgid "The rotation center on the Z axis"
 msgstr "El ángulo de rotación en el eje Z"
 
-#: ../clutter/clutter-actor.c:7008
+#: ../clutter/clutter-actor.c:7078
 msgid "Rotation Center Z Gravity"
 msgstr "Gravedad del centro de rotación Z"
 
-#: ../clutter/clutter-actor.c:7009
+#: ../clutter/clutter-actor.c:7079
 msgid "Center point for rotation around the Z axis"
 msgstr "Punto central de la rotación alrededor del eje Z"
 
-#: ../clutter/clutter-actor.c:7037
+#: ../clutter/clutter-actor.c:7107
 msgid "Anchor X"
 msgstr "Ancla X"
 
-#: ../clutter/clutter-actor.c:7038
+#: ../clutter/clutter-actor.c:7108
 msgid "X coordinate of the anchor point"
 msgstr "Coordenada X del punto de anclado"
 
-#: ../clutter/clutter-actor.c:7066
+#: ../clutter/clutter-actor.c:7136
 msgid "Anchor Y"
 msgstr "Ancla Y"
 
-#: ../clutter/clutter-actor.c:7067
+#: ../clutter/clutter-actor.c:7137
 msgid "Y coordinate of the anchor point"
 msgstr "Coordenada Y del punto de anclado"
 
-#: ../clutter/clutter-actor.c:7094
+#: ../clutter/clutter-actor.c:7164
 msgid "Anchor Gravity"
 msgstr "Gravedad del ancla"
 
-#: ../clutter/clutter-actor.c:7095
+#: ../clutter/clutter-actor.c:7165
 msgid "The anchor point as a ClutterGravity"
 msgstr "El punto de anclado como un «ClutterGravity»"
 
-#: ../clutter/clutter-actor.c:7114
+#: ../clutter/clutter-actor.c:7184
 msgid "Translation X"
 msgstr "Traslación X"
 
-#: ../clutter/clutter-actor.c:7115
+#: ../clutter/clutter-actor.c:7185
 msgid "Translation along the X axis"
 msgstr "Traslación en el eje X"
 
-#: ../clutter/clutter-actor.c:7134
+#: ../clutter/clutter-actor.c:7204
 msgid "Translation Y"
 msgstr "Traslación Y"
 
-#: ../clutter/clutter-actor.c:7135
+#: ../clutter/clutter-actor.c:7205
 msgid "Translation along the Y axis"
 msgstr "Traslación en el eje Y"
 
-#: ../clutter/clutter-actor.c:7154
+#: ../clutter/clutter-actor.c:7224
 msgid "Translation Z"
 msgstr "Traslación Z"
 
-#: ../clutter/clutter-actor.c:7155
+#: ../clutter/clutter-actor.c:7225
 msgid "Translation along the Z axis"
 msgstr "Traslación en el eje Z"
 
-#: ../clutter/clutter-actor.c:7185
+#: ../clutter/clutter-actor.c:7255
 msgid "Transform"
 msgstr "Transformar"
 
-#: ../clutter/clutter-actor.c:7186
+#: ../clutter/clutter-actor.c:7256
 msgid "Transformation matrix"
 msgstr "Matriz de transformación"
 
-#: ../clutter/clutter-actor.c:7201
+#: ../clutter/clutter-actor.c:7271
 msgid "Transform Set"
 msgstr "Transformar conjunto"
 
-#: ../clutter/clutter-actor.c:7202
+#: ../clutter/clutter-actor.c:7272
 msgid "Whether the transform property is set"
 msgstr "Indica si la propiedad de transformación está establecida"
 
-#: ../clutter/clutter-actor.c:7223
+#: ../clutter/clutter-actor.c:7293
 msgid "Child Transform"
 msgstr "Transformar hijo"
 
-#: ../clutter/clutter-actor.c:7224
+#: ../clutter/clutter-actor.c:7294
 msgid "Children transformation matrix"
 msgstr "Matriz de transformación del hijo"
 
-#: ../clutter/clutter-actor.c:7239
+#: ../clutter/clutter-actor.c:7309
 msgid "Child Transform Set"
 msgstr "Transformar hijo establecida"
 
-#: ../clutter/clutter-actor.c:7240
+#: ../clutter/clutter-actor.c:7310
 msgid "Whether the child-transform property is set"
 msgstr "Indica si la propiedad de transformación del hijo está establecida"
 
-#: ../clutter/clutter-actor.c:7257
+#: ../clutter/clutter-actor.c:7327
 msgid "Show on set parent"
 msgstr "Mostrar en el conjunto padre"
 
-#: ../clutter/clutter-actor.c:7258
+#: ../clutter/clutter-actor.c:7328
 msgid "Whether the actor is shown when parented"
 msgstr "Indica si el actor se muestra cuando tiene padre"
 
-#: ../clutter/clutter-actor.c:7275
+#: ../clutter/clutter-actor.c:7345
 msgid "Clip to Allocation"
 msgstr "Recortar a la asignación"
 
-#: ../clutter/clutter-actor.c:7276
+#: ../clutter/clutter-actor.c:7346
 msgid "Sets the clip region to track the actor's allocation"
 msgstr "Configura la región de recorte para seguir la ubicación del actor"
 
-#: ../clutter/clutter-actor.c:7289
+#: ../clutter/clutter-actor.c:7359
 msgid "Text Direction"
 msgstr "Dirección del texto"
 
-#: ../clutter/clutter-actor.c:7290
+#: ../clutter/clutter-actor.c:7360
 msgid "Direction of the text"
 msgstr "Dirección del texto"
 
-#: ../clutter/clutter-actor.c:7305
+#: ../clutter/clutter-actor.c:7375
 msgid "Has Pointer"
 msgstr "Tiene puntero"
 
-#: ../clutter/clutter-actor.c:7306
+#: ../clutter/clutter-actor.c:7376
 msgid "Whether the actor contains the pointer of an input device"
 msgstr "Indica si el actor contiene un puntero a un dispositivo de entrada"
 
-#: ../clutter/clutter-actor.c:7319
+#: ../clutter/clutter-actor.c:7389
 msgid "Actions"
 msgstr "Acciones"
 
-#: ../clutter/clutter-actor.c:7320
+#: ../clutter/clutter-actor.c:7390
 msgid "Adds an action to the actor"
 msgstr "Añade una acción al actor"
 
-#: ../clutter/clutter-actor.c:7333
+#: ../clutter/clutter-actor.c:7403
 msgid "Constraints"
 msgstr "Restricciones"
 
-#: ../clutter/clutter-actor.c:7334
+#: ../clutter/clutter-actor.c:7404
 msgid "Adds a constraint to the actor"
 msgstr "Añade una restricción al actor"
 
-#: ../clutter/clutter-actor.c:7347
+#: ../clutter/clutter-actor.c:7417
 msgid "Effect"
 msgstr "Efecto"
 
-#: ../clutter/clutter-actor.c:7348
+#: ../clutter/clutter-actor.c:7418
 msgid "Add an effect to be applied on the actor"
 msgstr "Añadir un efecto que aplicar al actor"
 
-#: ../clutter/clutter-actor.c:7362
+#: ../clutter/clutter-actor.c:7432
 msgid "Layout Manager"
 msgstr "Gestor de distribución"
 
-#: ../clutter/clutter-actor.c:7363
+#: ../clutter/clutter-actor.c:7433
 msgid "The object controlling the layout of an actor's children"
 msgstr "El objeto que controla la distribución del hijo de un actor"
 
-#: ../clutter/clutter-actor.c:7377
+#: ../clutter/clutter-actor.c:7447
 msgid "X Expand"
 msgstr "Expansión X"
 
-#: ../clutter/clutter-actor.c:7378
+#: ../clutter/clutter-actor.c:7448
 msgid "Whether extra horizontal space should be assigned to the actor"
 msgstr "Indica si se debe asignar al actor el espacio horizontal adicional"
 
-#: ../clutter/clutter-actor.c:7393
+#: ../clutter/clutter-actor.c:7463
 msgid "Y Expand"
 msgstr "Expansión Y"
 
-#: ../clutter/clutter-actor.c:7394
+#: ../clutter/clutter-actor.c:7464
 msgid "Whether extra vertical space should be assigned to the actor"
 msgstr "Indica si se debe asignar al actor el espacio vertical adicional"
 
-#: ../clutter/clutter-actor.c:7410
+#: ../clutter/clutter-actor.c:7480
 msgid "X Alignment"
 msgstr "Alineación X"
 
-#: ../clutter/clutter-actor.c:7411
+#: ../clutter/clutter-actor.c:7481
 msgid "The alignment of the actor on the X axis within its allocation"
 msgstr "La alineación del actor en el eje X en su asignación"
 
-#: ../clutter/clutter-actor.c:7426
+#: ../clutter/clutter-actor.c:7496
 msgid "Y Alignment"
 msgstr "Alineación Y"
 
-#: ../clutter/clutter-actor.c:7427
+#: ../clutter/clutter-actor.c:7497
 msgid "The alignment of the actor on the Y axis within its allocation"
 msgstr "La alineación del actor en el eje Y en su asignación"
 
-#: ../clutter/clutter-actor.c:7446
+#: ../clutter/clutter-actor.c:7516
 msgid "Margin Top"
 msgstr "Margen superior"
 
-#: ../clutter/clutter-actor.c:7447
+#: ../clutter/clutter-actor.c:7517
 msgid "Extra space at the top"
 msgstr "Espacio superior adicional"
 
-#: ../clutter/clutter-actor.c:7468
+#: ../clutter/clutter-actor.c:7538
 msgid "Margin Bottom"
 msgstr "Margen inferior"
 
-#: ../clutter/clutter-actor.c:7469
+#: ../clutter/clutter-actor.c:7539
 msgid "Extra space at the bottom"
 msgstr "Espacio inferior adicional"
 
-#: ../clutter/clutter-actor.c:7490
+#: ../clutter/clutter-actor.c:7560
 msgid "Margin Left"
 msgstr "Margen izquierdo"
 
-#: ../clutter/clutter-actor.c:7491
+#: ../clutter/clutter-actor.c:7561
 msgid "Extra space at the left"
 msgstr "Espacio adicional a la izquierda"
 
-#: ../clutter/clutter-actor.c:7512
+#: ../clutter/clutter-actor.c:7582
 msgid "Margin Right"
 msgstr "Margen derecho"
 
-#: ../clutter/clutter-actor.c:7513
+#: ../clutter/clutter-actor.c:7583
 msgid "Extra space at the right"
 msgstr "Espacio adicional a la derecha"
 
-#: ../clutter/clutter-actor.c:7529
+#: ../clutter/clutter-actor.c:7599
 msgid "Background Color Set"
 msgstr "Conjunto de colores de fondo"
 
-#: ../clutter/clutter-actor.c:7530 ../clutter/deprecated/clutter-box.c:275
+#: ../clutter/clutter-actor.c:7600 ../clutter/deprecated/clutter-box.c:271
 msgid "Whether the background color is set"
 msgstr "Indica si el color de fondo está establecido"
 
-#: ../clutter/clutter-actor.c:7546
+#: ../clutter/clutter-actor.c:7616
 msgid "Background color"
 msgstr "Color de fondo"
 
-#: ../clutter/clutter-actor.c:7547
+#: ../clutter/clutter-actor.c:7617
 msgid "The actor's background color"
 msgstr "El color de fondo del actor"
 
-#: ../clutter/clutter-actor.c:7562
+#: ../clutter/clutter-actor.c:7632
 msgid "First Child"
 msgstr "Primer hijo"
 
-#: ../clutter/clutter-actor.c:7563
+#: ../clutter/clutter-actor.c:7633
 msgid "The actor's first child"
 msgstr "El primer hijo del actor"
 
-#: ../clutter/clutter-actor.c:7576
+#: ../clutter/clutter-actor.c:7646
 msgid "Last Child"
 msgstr "Último hijo"
 
-#: ../clutter/clutter-actor.c:7577
+#: ../clutter/clutter-actor.c:7647
 msgid "The actor's last child"
 msgstr "La último hijo del actor"
 
-#: ../clutter/clutter-actor.c:7591
+#: ../clutter/clutter-actor.c:7661
 msgid "Content"
 msgstr "Contenido"
 
-#: ../clutter/clutter-actor.c:7592
+#: ../clutter/clutter-actor.c:7662
 msgid "Delegate object for painting the actor's content"
 msgstr "Delegar objeto para pintar el contenido del actor"
 
-#: ../clutter/clutter-actor.c:7617
+#: ../clutter/clutter-actor.c:7687
 msgid "Content Gravity"
 msgstr "Gravedad del contenido"
 
-#: ../clutter/clutter-actor.c:7618
+#: ../clutter/clutter-actor.c:7688
 msgid "Alignment of the actor's content"
 msgstr "Alineación del contenido del actor"
 
-#: ../clutter/clutter-actor.c:7638
+#: ../clutter/clutter-actor.c:7708
 msgid "Content Box"
 msgstr "Caja del contenido"
 
-#: ../clutter/clutter-actor.c:7639
+#: ../clutter/clutter-actor.c:7709
 msgid "The bounding box of the actor's content"
 msgstr "La caja que rodea al contenido del actor"
 
-#: ../clutter/clutter-actor.c:7647
+#: ../clutter/clutter-actor.c:7717
 msgid "Minification Filter"
 msgstr "Filtro de reducción"
 
-#: ../clutter/clutter-actor.c:7648
+#: ../clutter/clutter-actor.c:7718
 msgid "The filter used when reducing the size of the content"
 msgstr "El filtro usado al reducir el tamaño del contenido"
 
-#: ../clutter/clutter-actor.c:7655
+#: ../clutter/clutter-actor.c:7725
 msgid "Magnification Filter"
 msgstr "Filtro de ampliación"
 
-#: ../clutter/clutter-actor.c:7656
+#: ../clutter/clutter-actor.c:7726
 msgid "The filter used when increasing the size of the content"
 msgstr "El filtro usado al aumentar el tamaño del contenido"
 
-#: ../clutter/clutter-actor.c:7670
+#: ../clutter/clutter-actor.c:7740
 msgid "Content Repeat"
 msgstr "Repetir contenido"
 
-#: ../clutter/clutter-actor.c:7671
+#: ../clutter/clutter-actor.c:7741
 msgid "The repeat policy for the actor's content"
 msgstr "La política de repetición del contenido del actor"
 
-#: ../clutter/clutter-actor-meta.c:193 ../clutter/clutter-child-meta.c:142
+#: ../clutter/clutter-actor-meta.c:191 ../clutter/clutter-child-meta.c:142
 msgid "Actor"
 msgstr "Actor"
 
-#: ../clutter/clutter-actor-meta.c:194
+#: ../clutter/clutter-actor-meta.c:192
 msgid "The actor attached to the meta"
 msgstr "El actor adjunto a la meta"
 
-#: ../clutter/clutter-actor-meta.c:208
+#: ../clutter/clutter-actor-meta.c:206
 msgid "The name of the meta"
 msgstr "El nombre de la meta"
 
-#: ../clutter/clutter-actor-meta.c:221 ../clutter/clutter-input-device.c:337
-#: ../clutter/deprecated/clutter-shader.c:313
+#: ../clutter/clutter-actor-meta.c:219 ../clutter/clutter-input-device.c:326
+#: ../clutter/deprecated/clutter-shader.c:309
 msgid "Enabled"
 msgstr "Activada"
 
-#: ../clutter/clutter-actor-meta.c:222
+#: ../clutter/clutter-actor-meta.c:220
 msgid "Whether the meta is enabled"
 msgstr "Indica si la meta está activada"
 
 #: ../clutter/clutter-align-constraint.c:279
-#: ../clutter/clutter-bind-constraint.c:358 ../clutter/clutter-clone.c:345
+#: ../clutter/clutter-bind-constraint.c:358 ../clutter/clutter-clone.c:341
 #: ../clutter/clutter-snap-constraint.c:321
 msgid "Source"
 msgstr "Fuente"
@@ -729,14 +729,15 @@ msgstr "Factor"
 msgid "The alignment factor, between 0.0 and 1.0"
 msgstr "El factor de alineación, entre 0.0 y 1.0"
 
-#: ../clutter/clutter-backend.c:379
+#: ../clutter/clutter-backend.c:380
 msgid "Unable to initialize the Clutter backend"
 msgstr "No se pudo inicializar el backend de Clutter"
 
-#: ../clutter/clutter-backend.c:453
+#: ../clutter/clutter-backend.c:454
 #, c-format
 msgid "The backend of type '%s' does not support creating multiple stages"
-msgstr "El backend del tipo «%s» no soporta la creación de múltiples escenarios"
+msgstr ""
+"El backend del tipo «%s» no soporta la creación de múltiples escenarios"
 
 #: ../clutter/clutter-bind-constraint.c:359
 msgid "The source of the binding"
@@ -764,49 +765,53 @@ msgstr "El desplazamiento en píxeles que aplicar a la asociación"
 msgid "The unique name of the binding pool"
 msgstr "El nombre único de la asociación de la agrupación"
 
-#: ../clutter/clutter-bin-layout.c:240 ../clutter/clutter-bin-layout.c:655
-#: ../clutter/clutter-box-layout.c:390 ../clutter/clutter-table-layout.c:610
+#: ../clutter/clutter-bin-layout.c:238 ../clutter/clutter-bin-layout.c:651
+#: ../clutter/clutter-box-layout.c:388
+#: ../clutter/deprecated/clutter-table-layout.c:610
 msgid "Horizontal Alignment"
 msgstr "Alineación horizontal"
 
-#: ../clutter/clutter-bin-layout.c:241
+#: ../clutter/clutter-bin-layout.c:239
 msgid "Horizontal alignment for the actor inside the layout manager"
 msgstr "Alineación horizontal del actor dentro del gestor de distribución"
 
-#: ../clutter/clutter-bin-layout.c:249 ../clutter/clutter-bin-layout.c:675
-#: ../clutter/clutter-box-layout.c:399 ../clutter/clutter-table-layout.c:625
+#: ../clutter/clutter-bin-layout.c:247 ../clutter/clutter-bin-layout.c:671
+#: ../clutter/clutter-box-layout.c:397
+#: ../clutter/deprecated/clutter-table-layout.c:625
 msgid "Vertical Alignment"
 msgstr "Alineación vertical"
 
-#: ../clutter/clutter-bin-layout.c:250
+#: ../clutter/clutter-bin-layout.c:248
 msgid "Vertical alignment for the actor inside the layout manager"
 msgstr "Alineación vertical del actor dentro del gestor de distribución"
 
-#: ../clutter/clutter-bin-layout.c:656
+#: ../clutter/clutter-bin-layout.c:652
 msgid "Default horizontal alignment for the actors inside the layout manager"
 msgstr ""
 "Alineación horizontal predeterminada de los actores dentro del gestor de "
 "distribución"
 
-#: ../clutter/clutter-bin-layout.c:676
+#: ../clutter/clutter-bin-layout.c:672
 msgid "Default vertical alignment for the actors inside the layout manager"
 msgstr ""
 "Alineación vertical predeterminada de los actores dentro del gestor de "
 "distribución"
 
-#: ../clutter/clutter-box-layout.c:365
+#: ../clutter/clutter-box-layout.c:363
 msgid "Expand"
 msgstr "Expandir"
 
-#: ../clutter/clutter-box-layout.c:366
+#: ../clutter/clutter-box-layout.c:364
 msgid "Allocate extra space for the child"
 msgstr "Asignar espacio adicional para el hijo"
 
-#: ../clutter/clutter-box-layout.c:372 ../clutter/clutter-table-layout.c:589
+#: ../clutter/clutter-box-layout.c:370
+#: ../clutter/deprecated/clutter-table-layout.c:589
 msgid "Horizontal Fill"
 msgstr "Relleno horizontal"
 
-#: ../clutter/clutter-box-layout.c:373 ../clutter/clutter-table-layout.c:590
+#: ../clutter/clutter-box-layout.c:371
+#: ../clutter/deprecated/clutter-table-layout.c:590
 msgid ""
 "Whether the child should receive priority when the container is allocating "
 "spare space on the horizontal axis"
@@ -814,11 +819,13 @@ msgstr ""
 "Indica si el hijo debe tener prioridad cuando el contenedor reserve espacio "
 "libre en el eje horizontal"
 
-#: ../clutter/clutter-box-layout.c:381 ../clutter/clutter-table-layout.c:596
+#: ../clutter/clutter-box-layout.c:379
+#: ../clutter/deprecated/clutter-table-layout.c:596
 msgid "Vertical Fill"
 msgstr "Relleno vertical"
 
-#: ../clutter/clutter-box-layout.c:382 ../clutter/clutter-table-layout.c:597
+#: ../clutter/clutter-box-layout.c:380
+#: ../clutter/deprecated/clutter-table-layout.c:597
 msgid ""
 "Whether the child should receive priority when the container is allocating "
 "spare space on the vertical axis"
@@ -826,80 +833,88 @@ msgstr ""
 "Indica si el hijo debe tener prioridad cuando el contenedor reserve espacio "
 "libre en el eje vertical"
 
-#: ../clutter/clutter-box-layout.c:391 ../clutter/clutter-table-layout.c:611
+#: ../clutter/clutter-box-layout.c:389
+#: ../clutter/deprecated/clutter-table-layout.c:611
 msgid "Horizontal alignment of the actor within the cell"
 msgstr "Alineación horizontal del actor en la celda"
 
-#: ../clutter/clutter-box-layout.c:400 ../clutter/clutter-table-layout.c:626
+#: ../clutter/clutter-box-layout.c:398
+#: ../clutter/deprecated/clutter-table-layout.c:626
 msgid "Vertical alignment of the actor within the cell"
 msgstr "Alineación vertical del actor en la celda"
 
-#: ../clutter/clutter-box-layout.c:1365
+#: ../clutter/clutter-box-layout.c:1359
 msgid "Vertical"
 msgstr "Vertical"
 
-#: ../clutter/clutter-box-layout.c:1366
+#: ../clutter/clutter-box-layout.c:1360
 msgid "Whether the layout should be vertical, rather than horizontal"
 msgstr "Indica si la distribución debe ser vertical, en lugar de horizontal"
 
-#: ../clutter/clutter-box-layout.c:1383 ../clutter/clutter-flow-layout.c:890
-#: ../clutter/clutter-grid-layout.c:1550
+#: ../clutter/clutter-box-layout.c:1377 ../clutter/clutter-flow-layout.c:942
+#: ../clutter/clutter-grid-layout.c:1549
 msgid "Orientation"
 msgstr "Orientación"
 
-#: ../clutter/clutter-box-layout.c:1384 ../clutter/clutter-flow-layout.c:891
-#: ../clutter/clutter-grid-layout.c:1551
+#: ../clutter/clutter-box-layout.c:1378 ../clutter/clutter-flow-layout.c:943
+#: ../clutter/clutter-grid-layout.c:1550
 msgid "The orientation of the layout"
 msgstr "La orientación de la disposición"
 
-#: ../clutter/clutter-box-layout.c:1400 ../clutter/clutter-flow-layout.c:906
+#: ../clutter/clutter-box-layout.c:1394 ../clutter/clutter-flow-layout.c:958
 msgid "Homogeneous"
 msgstr "Homogénea"
 
-#: ../clutter/clutter-box-layout.c:1401
+#: ../clutter/clutter-box-layout.c:1395
 msgid ""
 "Whether the layout should be homogeneous, i.e. all childs get the same size"
 msgstr ""
 "Indica si la distribución debe ser homogénea, ej. todos los hijos tienen el "
 "mismo tamaño"
 
-#: ../clutter/clutter-box-layout.c:1416
+#: ../clutter/clutter-box-layout.c:1410
 msgid "Pack Start"
 msgstr "Empaquetar al principio"
 
-#: ../clutter/clutter-box-layout.c:1417
+#: ../clutter/clutter-box-layout.c:1411
 msgid "Whether to pack items at the start of the box"
 msgstr "Indica si se empaquetan los elementos al principio de la caja"
 
-#: ../clutter/clutter-box-layout.c:1430
+#: ../clutter/clutter-box-layout.c:1424
 msgid "Spacing"
 msgstr "Espaciado"
 
-#: ../clutter/clutter-box-layout.c:1431
+#: ../clutter/clutter-box-layout.c:1425
 msgid "Spacing between children"
 msgstr "Espaciado entre hijos"
 
-#: ../clutter/clutter-box-layout.c:1448 ../clutter/clutter-table-layout.c:1675
+#: ../clutter/clutter-box-layout.c:1442
+#: ../clutter/deprecated/clutter-table-layout.c:1677
 msgid "Use Animations"
 msgstr "Usar animaciones"
 
-#: ../clutter/clutter-box-layout.c:1449 ../clutter/clutter-table-layout.c:1676
+#: ../clutter/clutter-box-layout.c:1443
+#: ../clutter/deprecated/clutter-table-layout.c:1678
 msgid "Whether layout changes should be animated"
 msgstr "Indica si se deben animar lo cambios en la distribución"
 
-#: ../clutter/clutter-box-layout.c:1473 ../clutter/clutter-table-layout.c:1700
+#: ../clutter/clutter-box-layout.c:1467
+#: ../clutter/deprecated/clutter-table-layout.c:1702
 msgid "Easing Mode"
 msgstr "Modo de desaceleración"
 
-#: ../clutter/clutter-box-layout.c:1474 ../clutter/clutter-table-layout.c:1701
+#: ../clutter/clutter-box-layout.c:1468
+#: ../clutter/deprecated/clutter-table-layout.c:1703
 msgid "The easing mode of the animations"
 msgstr "El modo de desaceleración de las animaciones"
 
-#: ../clutter/clutter-box-layout.c:1494 ../clutter/clutter-table-layout.c:1721
+#: ../clutter/clutter-box-layout.c:1488
+#: ../clutter/deprecated/clutter-table-layout.c:1723
 msgid "Easing Duration"
 msgstr "Duración de la desaceleración"
 
-#: ../clutter/clutter-box-layout.c:1495 ../clutter/clutter-table-layout.c:1722
+#: ../clutter/clutter-box-layout.c:1489
+#: ../clutter/deprecated/clutter-table-layout.c:1724
 msgid "The duration of the animations"
 msgstr "La duración de las animaciones"
 
@@ -919,14 +934,30 @@ msgstr "Contraste"
 msgid "The contrast change to apply"
 msgstr "El cambio del contraste que aplicar"
 
-#: ../clutter/clutter-canvas.c:216
+#: ../clutter/clutter-canvas.c:248
 msgid "The width of the canvas"
 msgstr "La anchura del lienzo"
 
-#: ../clutter/clutter-canvas.c:232
+#: ../clutter/clutter-canvas.c:264
 msgid "The height of the canvas"
 msgstr "La altura del lienzo"
 
+#: ../clutter/clutter-canvas.c:283
+msgid "Scale Factor Set"
+msgstr "Conjunto de factor de escalado establecido"
+
+#: ../clutter/clutter-canvas.c:284
+msgid "Whether the scale-factor property is set"
+msgstr "Indica si la propiedad de factor de escalado está establecida"
+
+#: ../clutter/clutter-canvas.c:305
+msgid "Scale Factor"
+msgstr "Factor de escalado"
+
+#: ../clutter/clutter-canvas.c:306
+msgid "The scaling factor for the surface"
+msgstr "El factor de escalado para la superficie"
+
 #: ../clutter/clutter-child-meta.c:127
 msgid "Container"
 msgstr "Contenedor"
@@ -939,39 +970,39 @@ msgstr "El contenedor que creó estos datos"
 msgid "The actor wrapped by this data"
 msgstr "El actor envuelto por estos datos"
 
-#: ../clutter/clutter-click-action.c:559
+#: ../clutter/clutter-click-action.c:586
 msgid "Pressed"
 msgstr "Pulsado"
 
-#: ../clutter/clutter-click-action.c:560
+#: ../clutter/clutter-click-action.c:587
 msgid "Whether the clickable should be in pressed state"
 msgstr "Indica si el pulsable debe estar en estado «pulsado»"
 
-#: ../clutter/clutter-click-action.c:573
+#: ../clutter/clutter-click-action.c:600
 msgid "Held"
 msgstr "Retenido"
 
-#: ../clutter/clutter-click-action.c:574
+#: ../clutter/clutter-click-action.c:601
 msgid "Whether the clickable has a grab"
 msgstr "Indica si el dispositivo tiene un tirador"
 
-#: ../clutter/clutter-click-action.c:591 ../clutter/clutter-settings.c:599
+#: ../clutter/clutter-click-action.c:618 ../clutter/clutter-settings.c:653
 msgid "Long Press Duration"
 msgstr "Duración de la pulsación larga"
 
-#: ../clutter/clutter-click-action.c:592
+#: ../clutter/clutter-click-action.c:619
 msgid "The minimum duration of a long press to recognize the gesture"
 msgstr "La duración mínima de una pulsación larga para reconocer el gesto"
 
-#: ../clutter/clutter-click-action.c:610
+#: ../clutter/clutter-click-action.c:637
 msgid "Long Press Threshold"
 msgstr "Umbral de la pulsación larga"
 
-#: ../clutter/clutter-click-action.c:611
+#: ../clutter/clutter-click-action.c:638
 msgid "The maximum threshold before a long press is cancelled"
 msgstr "El umbral máximo antes de cancelar una pulsación larga"
 
-#: ../clutter/clutter-clone.c:346
+#: ../clutter/clutter-clone.c:342
 msgid "Specifies the actor to be cloned"
 msgstr "Especifica qué actor clonar"
 
@@ -983,27 +1014,27 @@ msgstr "Matiz"
 msgid "The tint to apply"
 msgstr "El matiz que aplicar"
 
-#: ../clutter/clutter-deform-effect.c:588
+#: ../clutter/clutter-deform-effect.c:592
 msgid "Horizontal Tiles"
 msgstr "Cuadros horizontales"
 
-#: ../clutter/clutter-deform-effect.c:589
+#: ../clutter/clutter-deform-effect.c:593
 msgid "The number of horizontal tiles"
 msgstr "El número de cuadros horizontales"
 
-#: ../clutter/clutter-deform-effect.c:604
+#: ../clutter/clutter-deform-effect.c:608
 msgid "Vertical Tiles"
 msgstr "Cuadros verticales"
 
-#: ../clutter/clutter-deform-effect.c:605
+#: ../clutter/clutter-deform-effect.c:609
 msgid "The number of vertical tiles"
 msgstr "El número de cuadros verticales"
 
-#: ../clutter/clutter-deform-effect.c:622
+#: ../clutter/clutter-deform-effect.c:626
 msgid "Back Material"
 msgstr "Material trasero"
 
-#: ../clutter/clutter-deform-effect.c:623
+#: ../clutter/clutter-deform-effect.c:627
 msgid "The material to be used when painting the back of the actor"
 msgstr "El material que usar para pintar la parte trasera del actor"
 
@@ -1011,259 +1042,301 @@ msgstr "El material que usar para pintar la parte trasera del actor"
 msgid "The desaturation factor"
 msgstr "El factor de desaturación"
 
-#: ../clutter/clutter-device-manager.c:131
-#: ../clutter/clutter-input-device.c:366
-#: ../clutter/x11/clutter-keymap-x11.c:316
+#: ../clutter/clutter-device-manager.c:127
+#: ../clutter/clutter-input-device.c:355
+#: ../clutter/x11/clutter-keymap-x11.c:321
 msgid "Backend"
 msgstr "Backend"
 
-#: ../clutter/clutter-device-manager.c:132
+#: ../clutter/clutter-device-manager.c:128
 msgid "The ClutterBackend of the device manager"
 msgstr "El «ClutterBackend» del gestor de dispositivos"
 
-#: ../clutter/clutter-drag-action.c:742
+#: ../clutter/clutter-drag-action.c:741
 msgid "Horizontal Drag Threshold"
 msgstr "Umbral de arrastre horizontal"
 
-#: ../clutter/clutter-drag-action.c:743
+#: ../clutter/clutter-drag-action.c:742
 msgid "The horizontal amount of pixels required to start dragging"
 msgstr ""
 "La cantidad de píxeles horizontales requeridos para empezar a arrastrar"
 
-#: ../clutter/clutter-drag-action.c:770
+#: ../clutter/clutter-drag-action.c:769
 msgid "Vertical Drag Threshold"
 msgstr "Umbral de arrastre vertical"
 
-#: ../clutter/clutter-drag-action.c:771
+#: ../clutter/clutter-drag-action.c:770
 msgid "The vertical amount of pixels required to start dragging"
 msgstr "La cantidad de píxeles verticales requeridos para empezar a arrastrar"
 
-#: ../clutter/clutter-drag-action.c:792
+#: ../clutter/clutter-drag-action.c:791
 msgid "Drag Handle"
 msgstr "Arrastrar el tirador"
 
-#: ../clutter/clutter-drag-action.c:793
+#: ../clutter/clutter-drag-action.c:792
 msgid "The actor that is being dragged"
 msgstr "El actor que se está arrastrando"
 
-#: ../clutter/clutter-drag-action.c:806
+#: ../clutter/clutter-drag-action.c:805
 msgid "Drag Axis"
 msgstr "Arrastrar ejes"
 
-#: ../clutter/clutter-drag-action.c:807
+#: ../clutter/clutter-drag-action.c:806
 msgid "Constraints the dragging to an axis"
 msgstr "Restringe el arrastrado a un eje"
 
-#: ../clutter/clutter-drag-action.c:823
+#: ../clutter/clutter-drag-action.c:822
 msgid "Drag Area"
 msgstr "Arrastrar área"
 
-#: ../clutter/clutter-drag-action.c:824
+#: ../clutter/clutter-drag-action.c:823
 msgid "Constrains the dragging to a rectangle"
 msgstr "Restringe el arrastrado a un rectángulo"
 
-#: ../clutter/clutter-drag-action.c:837
+#: ../clutter/clutter-drag-action.c:836
 msgid "Drag Area Set"
 msgstr "Arrastrar área establecida"
 
-#: ../clutter/clutter-drag-action.c:838
+#: ../clutter/clutter-drag-action.c:837
 msgid "Whether the drag area is set"
 msgstr "Indica si la propiedad de arrastrar área está establecida"
 
-#: ../clutter/clutter-flow-layout.c:907
+#: ../clutter/clutter-flow-layout.c:959
 msgid "Whether each item should receive the same allocation"
 msgstr "Indica si cada elemento debe recibir la misma asignación"
 
-#: ../clutter/clutter-flow-layout.c:922 ../clutter/clutter-table-layout.c:1637
+#: ../clutter/clutter-flow-layout.c:974
+#: ../clutter/deprecated/clutter-table-layout.c:1637
 msgid "Column Spacing"
 msgstr "Espaciado entre columnas"
 
-#: ../clutter/clutter-flow-layout.c:923
+#: ../clutter/clutter-flow-layout.c:975
 msgid "The spacing between columns"
 msgstr "El espaciado entre columnas"
 
-#: ../clutter/clutter-flow-layout.c:939 ../clutter/clutter-table-layout.c:1651
+#: ../clutter/clutter-flow-layout.c:991
+#: ../clutter/deprecated/clutter-table-layout.c:1653
 msgid "Row Spacing"
 msgstr "Espaciado entre filas"
 
-#: ../clutter/clutter-flow-layout.c:940
+#: ../clutter/clutter-flow-layout.c:992
 msgid "The spacing between rows"
 msgstr "El espaciado entre filas"
 
-#: ../clutter/clutter-flow-layout.c:954
+#: ../clutter/clutter-flow-layout.c:1006
 msgid "Minimum Column Width"
 msgstr "Anchura mínima de la columna"
 
-#: ../clutter/clutter-flow-layout.c:955
+#: ../clutter/clutter-flow-layout.c:1007
 msgid "Minimum width for each column"
 msgstr "Anchura mínima de cada columna"
 
-#: ../clutter/clutter-flow-layout.c:970
+#: ../clutter/clutter-flow-layout.c:1022
 msgid "Maximum Column Width"
 msgstr "Anchura máxima de la columna"
 
-#: ../clutter/clutter-flow-layout.c:971
+#: ../clutter/clutter-flow-layout.c:1023
 msgid "Maximum width for each column"
 msgstr "Anchura máxima de cada columna"
 
-#: ../clutter/clutter-flow-layout.c:985
+#: ../clutter/clutter-flow-layout.c:1037
 msgid "Minimum Row Height"
 msgstr "Altura mínima de la fila"
 
-#: ../clutter/clutter-flow-layout.c:986
+#: ../clutter/clutter-flow-layout.c:1038
 msgid "Minimum height for each row"
 msgstr "Altura mínima de cada fila"
 
-#: ../clutter/clutter-flow-layout.c:1001
+#: ../clutter/clutter-flow-layout.c:1053
 msgid "Maximum Row Height"
 msgstr "Altura máxima de la fila"
 
-#: ../clutter/clutter-flow-layout.c:1002
+#: ../clutter/clutter-flow-layout.c:1054
 msgid "Maximum height for each row"
 msgstr "Altura máxima de cada fila"
 
-#: ../clutter/clutter-grid-layout.c:1222
+#: ../clutter/clutter-flow-layout.c:1069 ../clutter/clutter-flow-layout.c:1070
+msgid "Snap to grid"
+msgstr "Ajustar a la cuadrícula"
+
+#: ../clutter/clutter-gesture-action.c:668
+msgid "Number touch points"
+msgstr "Numerar puntos táctiles"
+
+#: ../clutter/clutter-gesture-action.c:669
+msgid "Number of touch points"
+msgstr "Número de puntos táctiles"
+
+#: ../clutter/clutter-gesture-action.c:684
+msgid "Threshold Trigger Edge"
+msgstr "Borde del disparador del umbral"
+
+#: ../clutter/clutter-gesture-action.c:685
+msgid "The trigger edge used by the action"
+msgstr "El borde del disparador usado por la acción"
+
+#: ../clutter/clutter-gesture-action.c:704
+#| msgid "Threshold Trigger Edge"
+msgid "Threshold Trigger Horizontal Distance"
+msgstr "Distancia horizontal del disparador del umbral"
+
+#: ../clutter/clutter-gesture-action.c:705
+#| msgid "The trigger edge used by the action"
+msgid "The horizontal trigger distance used by the action"
+msgstr "La distancia horizontal del disparador usado por la acción"
+
+#: ../clutter/clutter-gesture-action.c:723
+#| msgid "Threshold Trigger Edge"
+msgid "Threshold Trigger Vertical Distance"
+msgstr "Distancia vertical del disparador del umbral"
+
+#: ../clutter/clutter-gesture-action.c:724
+#| msgid "The trigger edge used by the action"
+msgid "The vertical trigger distance used by the action"
+msgstr "La distancia vertical del disparador usado por la acción"
+
+#: ../clutter/clutter-grid-layout.c:1223
 msgid "Left attachment"
 msgstr "Acoplado izquierdo"
 
-#: ../clutter/clutter-grid-layout.c:1223
+#: ../clutter/clutter-grid-layout.c:1224
 msgid "The column number to attach the left side of the child to"
 msgstr "El número de columnas que acoplar al lado izquierdo del hijo"
 
-#: ../clutter/clutter-grid-layout.c:1230
+#: ../clutter/clutter-grid-layout.c:1231
 msgid "Top attachment"
 msgstr "Acoplado superior"
 
-#: ../clutter/clutter-grid-layout.c:1231
+#: ../clutter/clutter-grid-layout.c:1232
 msgid "The row number to attach the top side of a child widget to"
 msgstr "El número de fila que acoplar a la parte superior de un widget hijo"
 
-#: ../clutter/clutter-grid-layout.c:1239
+#: ../clutter/clutter-grid-layout.c:1240
 msgid "The number of columns that a child spans"
 msgstr "El número de columnas que un hijo se expande"
 
-#: ../clutter/clutter-grid-layout.c:1246
+#: ../clutter/clutter-grid-layout.c:1247
 msgid "The number of rows that a child spans"
 msgstr "El número de filas que un hijo se expande"
 
-#: ../clutter/clutter-grid-layout.c:1565
+#: ../clutter/clutter-grid-layout.c:1564
 msgid "Row spacing"
 msgstr "Espaciado entre filas"
 
-#: ../clutter/clutter-grid-layout.c:1566
+#: ../clutter/clutter-grid-layout.c:1565
 msgid "The amount of space between two consecutive rows"
 msgstr "La cantidad de espacio entre dos filas consecutivas"
 
-#: ../clutter/clutter-grid-layout.c:1579
+#: ../clutter/clutter-grid-layout.c:1578
 msgid "Column spacing"
 msgstr "Espaciado entre columnas"
 
-#: ../clutter/clutter-grid-layout.c:1580
+#: ../clutter/clutter-grid-layout.c:1579
 msgid "The amount of space between two consecutive columns"
 msgstr "La cantidad de espacio entre dos columnas consecutivas"
 
-#: ../clutter/clutter-grid-layout.c:1594
+#: ../clutter/clutter-grid-layout.c:1593
 msgid "Row Homogeneous"
 msgstr "Fila homogénea"
 
-#: ../clutter/clutter-grid-layout.c:1595
+#: ../clutter/clutter-grid-layout.c:1594
 msgid "If TRUE, the rows are all the same height"
 msgstr "Si es cierto, todas las filas tienen la misma altura"
 
-#: ../clutter/clutter-grid-layout.c:1608
+#: ../clutter/clutter-grid-layout.c:1607
 msgid "Column Homogeneous"
 msgstr "Columna homogénea"
 
-#: ../clutter/clutter-grid-layout.c:1609
+#: ../clutter/clutter-grid-layout.c:1608
 msgid "If TRUE, the columns are all the same width"
 msgstr "Si es cierto, todas las columnas tienen la misma altura"
 
-#: ../clutter/clutter-image.c:248 ../clutter/clutter-image.c:311
-#: ../clutter/clutter-image.c:399
+#: ../clutter/clutter-image.c:249 ../clutter/clutter-image.c:312
+#: ../clutter/clutter-image.c:400
 msgid "Unable to load image data"
 msgstr "No se pudieron cargar los datos de la imagen"
 
-#: ../clutter/clutter-input-device.c:242
+#: ../clutter/clutter-input-device.c:231
 msgid "Id"
 msgstr "ID"
 
-#: ../clutter/clutter-input-device.c:243
+#: ../clutter/clutter-input-device.c:232
 msgid "Unique identifier of the device"
 msgstr "Identificador único del dispositivo"
 
-#: ../clutter/clutter-input-device.c:259
+#: ../clutter/clutter-input-device.c:248
 msgid "The name of the device"
 msgstr "El nombre del dispositivo"
 
-#: ../clutter/clutter-input-device.c:273
+#: ../clutter/clutter-input-device.c:262
 msgid "Device Type"
 msgstr "Tipo de dispositivo"
 
-#: ../clutter/clutter-input-device.c:274
+#: ../clutter/clutter-input-device.c:263
 msgid "The type of the device"
 msgstr "El tipo del dispositivo"
 
-#: ../clutter/clutter-input-device.c:289
+#: ../clutter/clutter-input-device.c:278
 msgid "Device Manager"
 msgstr "Administrador de dispositivos"
 
-#: ../clutter/clutter-input-device.c:290
+#: ../clutter/clutter-input-device.c:279
 msgid "The device manager instance"
 msgstr "La instancia del gestor de dispositivos"
 
-#: ../clutter/clutter-input-device.c:303
+#: ../clutter/clutter-input-device.c:292
 msgid "Device Mode"
 msgstr "Modo del dispositivo"
 
-#: ../clutter/clutter-input-device.c:304
+#: ../clutter/clutter-input-device.c:293
 msgid "The mode of the device"
 msgstr "El modo del dispositivo"
 
-#: ../clutter/clutter-input-device.c:318
+#: ../clutter/clutter-input-device.c:307
 msgid "Has Cursor"
 msgstr "Tiene cursor"
 
-#: ../clutter/clutter-input-device.c:319
+#: ../clutter/clutter-input-device.c:308
 msgid "Whether the device has a cursor"
 msgstr "Indica si el dispositivo tiene un cursor"
 
-#: ../clutter/clutter-input-device.c:338
+#: ../clutter/clutter-input-device.c:327
 msgid "Whether the device is enabled"
 msgstr "indica si el dispositivo está activado"
 
-#: ../clutter/clutter-input-device.c:351
+#: ../clutter/clutter-input-device.c:340
 msgid "Number of Axes"
 msgstr "Número de ejes"
 
-#: ../clutter/clutter-input-device.c:352
+#: ../clutter/clutter-input-device.c:341
 msgid "The number of axes on the device"
 msgstr "El número de ejes en el dispositivo"
 
-#: ../clutter/clutter-input-device.c:367
+#: ../clutter/clutter-input-device.c:356
 msgid "The backend instance"
 msgstr "La instancia del backend"
 
-#: ../clutter/clutter-interval.c:506
+#: ../clutter/clutter-interval.c:553
 msgid "Value Type"
 msgstr "Tipo de valor"
 
-#: ../clutter/clutter-interval.c:507
+#: ../clutter/clutter-interval.c:554
 msgid "The type of the values in the interval"
 msgstr "El tipo de valores en el intervalo"
 
-#: ../clutter/clutter-interval.c:522
+#: ../clutter/clutter-interval.c:569
 msgid "Initial Value"
 msgstr "Valor inicial"
 
-#: ../clutter/clutter-interval.c:523
+#: ../clutter/clutter-interval.c:570
 msgid "Initial value of the interval"
 msgstr "Valor inicial del intervalo"
 
-#: ../clutter/clutter-interval.c:537
+#: ../clutter/clutter-interval.c:584
 msgid "Final Value"
 msgstr "Valor final"
 
-#: ../clutter/clutter-interval.c:538
+#: ../clutter/clutter-interval.c:585
 msgid "Final value of the interval"
 msgstr "Valor final del intervalo"
 
@@ -1282,96 +1355,96 @@ msgstr "El gestor que ha creado este dato"
 #. * Do NOT translate it to non-English e.g. "predefinito:LTR"! If
 #. * it isn't default:LTR or default:RTL it will not work.
 #.
-#: ../clutter/clutter-main.c:772
+#: ../clutter/clutter-main.c:795
 msgid "default:LTR"
 msgstr "default:LTR"
 
-#: ../clutter/clutter-main.c:1646
+#: ../clutter/clutter-main.c:1622
 msgid "Show frames per second"
 msgstr "Mostrar fotogramas por segundo"
 
-#: ../clutter/clutter-main.c:1648
+#: ../clutter/clutter-main.c:1624
 msgid "Default frame rate"
 msgstr "Velocidad de fotogramas predeterminada"
 
-#: ../clutter/clutter-main.c:1650
+#: ../clutter/clutter-main.c:1626
 msgid "Make all warnings fatal"
 msgstr "Hacer que todos los avisos actúen como errores"
 
-#: ../clutter/clutter-main.c:1653
+#: ../clutter/clutter-main.c:1629
 msgid "Direction for the text"
 msgstr "Dirección del texto"
 
-#: ../clutter/clutter-main.c:1656
+#: ../clutter/clutter-main.c:1632
 msgid "Disable mipmapping on text"
 msgstr "Desactivar «mipmapping» en el texto"
 
-#: ../clutter/clutter-main.c:1659
+#: ../clutter/clutter-main.c:1635
 msgid "Use 'fuzzy' picking"
 msgstr "Usar selección «difusa»"
 
-#: ../clutter/clutter-main.c:1662
+#: ../clutter/clutter-main.c:1638
 msgid "Clutter debugging flags to set"
 msgstr "Opciones de depuración de Clutter que establecer"
 
-#: ../clutter/clutter-main.c:1664
+#: ../clutter/clutter-main.c:1640
 msgid "Clutter debugging flags to unset"
 msgstr "Opciones de depuración de Clutter que no establecer"
 
-#: ../clutter/clutter-main.c:1668
+#: ../clutter/clutter-main.c:1644
 msgid "Clutter profiling flags to set"
 msgstr "Opciones de perfil de Clutter que establecer"
 
-#: ../clutter/clutter-main.c:1670
+#: ../clutter/clutter-main.c:1646
 msgid "Clutter profiling flags to unset"
 msgstr "Opciones de perfil de Clutter que no establecer"
 
-#: ../clutter/clutter-main.c:1673
+#: ../clutter/clutter-main.c:1649
 msgid "Enable accessibility"
 msgstr "Activar accesibilidad"
 
-#: ../clutter/clutter-main.c:1865
+#: ../clutter/clutter-main.c:1841
 msgid "Clutter Options"
 msgstr "Opciones de Clutter"
 
-#: ../clutter/clutter-main.c:1866
+#: ../clutter/clutter-main.c:1842
 msgid "Show Clutter Options"
 msgstr "Mostrar las opciones de Clutter"
 
-#: ../clutter/clutter-pan-action.c:448
+#: ../clutter/clutter-pan-action.c:455
 msgid "Pan Axis"
 msgstr "Eje de movimiento horizontal"
 
-#: ../clutter/clutter-pan-action.c:449
+#: ../clutter/clutter-pan-action.c:456
 msgid "Constraints the panning to an axis"
 msgstr "Restringe el movimiento horizontal a un eje"
 
-#: ../clutter/clutter-pan-action.c:463
+#: ../clutter/clutter-pan-action.c:470
 msgid "Interpolate"
 msgstr "Interpolar"
 
-#: ../clutter/clutter-pan-action.c:464
+#: ../clutter/clutter-pan-action.c:471
 msgid "Whether interpolated events emission is enabled."
 msgstr "Indica si la emisión de eventos interpolados está activada."
 
-#: ../clutter/clutter-pan-action.c:480
+#: ../clutter/clutter-pan-action.c:487
 msgid "Deceleration"
 msgstr "Deceleración"
 
-#: ../clutter/clutter-pan-action.c:481
+#: ../clutter/clutter-pan-action.c:488
 msgid "Rate at which the interpolated panning will decelerate in"
 msgstr "Tasa a la que el movimiento horizontal interpolado decelerará"
 
-#: ../clutter/clutter-pan-action.c:498
+#: ../clutter/clutter-pan-action.c:505
 msgid "Initial acceleration factor"
 msgstr "Factor inicial de aceleración"
 
-#: ../clutter/clutter-pan-action.c:499
+#: ../clutter/clutter-pan-action.c:506
 msgid "Factor applied to the momentum when starting the interpolated phase"
 msgstr "Factor aplicado al momento al iniciar la fase de interpolación"
 
 #: ../clutter/clutter-path-constraint.c:212
-#: ../clutter/deprecated/clutter-behaviour-path.c:225
+#: ../clutter/deprecated/clutter-behaviour-path.c:221
 msgid "Path"
 msgstr "Ruta"
 
@@ -1383,89 +1456,89 @@ msgstr "La ruta usada para restringir a un actor"
 msgid "The offset along the path, between -1.0 and 2.0"
 msgstr "El desplazamiento sobre la ruta, entre -1.0 y 2.0"
 
-#: ../clutter/clutter-property-transition.c:271
+#: ../clutter/clutter-property-transition.c:269
 msgid "Property Name"
 msgstr "Nombre de la propiedad"
 
-#: ../clutter/clutter-property-transition.c:272
+#: ../clutter/clutter-property-transition.c:270
 msgid "The name of the property to animate"
 msgstr "El nombre de la propiedad que animar"
 
-#: ../clutter/clutter-script.c:466
+#: ../clutter/clutter-script.c:464
 msgid "Filename Set"
 msgstr "Conjunto de nombres de archivo"
 
-#: ../clutter/clutter-script.c:467
+#: ../clutter/clutter-script.c:465
 msgid "Whether the :filename property is set"
 msgstr "Indica si la propiedad «:filename» está establecida"
 
-#: ../clutter/clutter-script.c:481
-#: ../clutter/deprecated/clutter-texture.c:1082
+#: ../clutter/clutter-script.c:479
+#: ../clutter/deprecated/clutter-texture.c:1080
 msgid "Filename"
 msgstr "Nombre de archivo"
 
-#: ../clutter/clutter-script.c:482
+#: ../clutter/clutter-script.c:480
 msgid "The path of the currently parsed file"
 msgstr "La ruta del archivo analizado actualmente"
 
-#: ../clutter/clutter-script.c:499
+#: ../clutter/clutter-script.c:497
 msgid "Translation Domain"
 msgstr "Dominio de traducción"
 
-#: ../clutter/clutter-script.c:500
+#: ../clutter/clutter-script.c:498
 msgid "The translation domain used to localize string"
 msgstr "El dominio de traducción usado para localizar cadenas"
 
-#: ../clutter/clutter-scroll-actor.c:263
+#: ../clutter/clutter-scroll-actor.c:189
 msgid "Scroll Mode"
 msgstr "Modo de desplazamiento"
 
-#: ../clutter/clutter-scroll-actor.c:264
+#: ../clutter/clutter-scroll-actor.c:190
 msgid "The scrolling direction"
 msgstr "La dirección del desplazamiento"
 
-#: ../clutter/clutter-settings.c:440
+#: ../clutter/clutter-settings.c:486
 msgid "Double Click Time"
 msgstr "Tiempo de la doble pulsación"
 
-#: ../clutter/clutter-settings.c:441
+#: ../clutter/clutter-settings.c:487
 msgid "The time between clicks necessary to detect a multiple click"
 msgstr ""
 "El tiempo necesario entre pulsaciones para detectar una pulsación múltiple"
 
-#: ../clutter/clutter-settings.c:456
+#: ../clutter/clutter-settings.c:502
 msgid "Double Click Distance"
 msgstr "Distancia de la doble pulsación"
 
-#: ../clutter/clutter-settings.c:457
+#: ../clutter/clutter-settings.c:503
 msgid "The distance between clicks necessary to detect a multiple click"
 msgstr ""
 "La distancia necesaria entre pulsaciones para detectar una pulsación múltiple"
 
-#: ../clutter/clutter-settings.c:472
+#: ../clutter/clutter-settings.c:518
 msgid "Drag Threshold"
 msgstr "Umbral de arrastre"
 
-#: ../clutter/clutter-settings.c:473
+#: ../clutter/clutter-settings.c:519
 msgid "The distance the cursor should travel before starting to drag"
 msgstr "La distancia que el cursor debe recorrer antes de empezar a arrastrar"
 
-#: ../clutter/clutter-settings.c:488 ../clutter/clutter-text.c:3369
+#: ../clutter/clutter-settings.c:534 ../clutter/clutter-text.c:3404
 msgid "Font Name"
 msgstr "Nombre de la tipografía"
 
-#: ../clutter/clutter-settings.c:489
+#: ../clutter/clutter-settings.c:535
 msgid ""
 "The description of the default font, as one that could be parsed by Pango"
 msgstr ""
 "La descripción de la tipografía predeterminada, como una que Pango pueda "
 "analizar"
 
-#: ../clutter/clutter-settings.c:504
+#: ../clutter/clutter-settings.c:550
 msgid "Font Antialias"
 msgstr "Alisado de la tipografía"
 
-#: ../clutter/clutter-settings.c:505
+#: ../clutter/clutter-settings.c:551
 msgid ""
 "Whether to use antialiasing (1 to enable, 0 to disable, and -1 to use the "
 "default)"
@@ -1473,70 +1546,79 @@ msgstr ""
 "Indica si se debe usar alisado (1 para activar, 0 para desactivar y -1 para "
 "usar la opción predeterminada)"
 
-#: ../clutter/clutter-settings.c:521
+#: ../clutter/clutter-settings.c:567 ../clutter/clutter-settings.c:575
 msgid "Font DPI"
 msgstr "PPP de la tipografía"
 
-#: ../clutter/clutter-settings.c:522
+#: ../clutter/clutter-settings.c:568 ../clutter/clutter-settings.c:576
 msgid ""
 "The resolution of the font, in 1024 * dots/inch, or -1 to use the default"
 msgstr ""
 "La resolución de la tipografía, en 1024 * puntos/pulgada, o -1 para usar la "
 "predeterminada"
 
-#: ../clutter/clutter-settings.c:538
+#: ../clutter/clutter-settings.c:592
 msgid "Font Hinting"
 msgstr "Contorno de la tipografía"
 
-#: ../clutter/clutter-settings.c:539
+#: ../clutter/clutter-settings.c:593
 msgid ""
 "Whether to use hinting (1 to enable, 0 to disable and -1 to use the default)"
 msgstr ""
 "Indica si se debe usar contorno (1 para activar, 0 para desactivar y -1 para "
 "usar la opción predeterminada)"
 
-#: ../clutter/clutter-settings.c:560
+#: ../clutter/clutter-settings.c:614
 msgid "Font Hint Style"
 msgstr "Estilo de contorno de la tipografía"
 
-#: ../clutter/clutter-settings.c:561
+#: ../clutter/clutter-settings.c:615
 msgid "The style of hinting (hintnone, hintslight, hintmedium, hintfull)"
 msgstr ""
 "El estilo del contorno («hintnone», «hintslight», «hintmedium», «hintfull»)"
 
-#: ../clutter/clutter-settings.c:582
+#: ../clutter/clutter-settings.c:636
 msgid "Font Subpixel Order"
 msgstr "Orden de tipografías del subpíxel"
 
-#: ../clutter/clutter-settings.c:583
+#: ../clutter/clutter-settings.c:637
 msgid "The type of subpixel antialiasing (none, rgb, bgr, vrgb, vbgr)"
-msgstr "El tipo de suavizado del subpíxel («none», «rgb», «bgr», «vrgb», «vbgr»)"
+msgstr ""
+"El tipo de suavizado del subpíxel («none», «rgb», «bgr», «vrgb», «vbgr»)"
 
-#: ../clutter/clutter-settings.c:600
+#: ../clutter/clutter-settings.c:654
 msgid "The minimum duration for a long press gesture to be recognized"
 msgstr "La duración mínima de una pulsación larga para reconocer el gesto"
 
-#: ../clutter/clutter-settings.c:607
+#: ../clutter/clutter-settings.c:661
+msgid "Window Scaling Factor"
+msgstr "Factor de escalado de la ventana"
+
+#: ../clutter/clutter-settings.c:662
+msgid "The scaling factor to be applied to windows"
+msgstr "El factor de escalado que aplicar a las ventanas"
+
+#: ../clutter/clutter-settings.c:669
 msgid "Fontconfig configuration timestamp"
 msgstr "Configuración de la marca de tiempo de fontconfig"
 
-#: ../clutter/clutter-settings.c:608
+#: ../clutter/clutter-settings.c:670
 msgid "Timestamp of the current fontconfig configuration"
 msgstr "Marca de tiempo de la configuración actual de fontconfig"
 
-#: ../clutter/clutter-settings.c:625
+#: ../clutter/clutter-settings.c:687
 msgid "Password Hint Time"
 msgstr "Tiempo de la sugerencia de la contraseña"
 
-#: ../clutter/clutter-settings.c:626
+#: ../clutter/clutter-settings.c:688
 msgid "How long to show the last input character in hidden entries"
 msgstr "Cuánto tiempo mostrar el último carácter en entradas ocultas"
 
-#: ../clutter/clutter-shader-effect.c:486
+#: ../clutter/clutter-shader-effect.c:485
 msgid "Shader Type"
 msgstr "Tipo de sombreado"
 
-#: ../clutter/clutter-shader-effect.c:487
+#: ../clutter/clutter-shader-effect.c:486
 msgid "The type of shader used"
 msgstr "El tipo de sombreado usado"
 
@@ -1564,763 +1646,707 @@ msgstr "El borde de la fuente que se debe romper"
 msgid "The offset in pixels to apply to the constraint"
 msgstr "El desplazamiento en píxeles que aplicar a la restricción"
 
-#: ../clutter/clutter-stage.c:1895
+#: ../clutter/clutter-stage.c:1899
 msgid "Fullscreen Set"
 msgstr "Conjunto a pantalla completa"
 
-#: ../clutter/clutter-stage.c:1896
+#: ../clutter/clutter-stage.c:1900
 msgid "Whether the main stage is fullscreen"
 msgstr "Indica si el escenario principal está a pantalla completa"
 
-#: ../clutter/clutter-stage.c:1910
+#: ../clutter/clutter-stage.c:1914
 msgid "Offscreen"
 msgstr "Fuera de la pantalla"
 
-#: ../clutter/clutter-stage.c:1911
+#: ../clutter/clutter-stage.c:1915
 msgid "Whether the main stage should be rendered offscreen"
 msgstr ""
 "Indica si el escenario principal se debe renderizar fuera de la pantalla"
 
-#: ../clutter/clutter-stage.c:1923 ../clutter/clutter-text.c:3483
+#: ../clutter/clutter-stage.c:1927 ../clutter/clutter-text.c:3518
 msgid "Cursor Visible"
 msgstr "Cursor visible"
 
-#: ../clutter/clutter-stage.c:1924
+#: ../clutter/clutter-stage.c:1928
 msgid "Whether the mouse pointer is visible on the main stage"
 msgstr "Indica si el puntero del ratón es visible en el escenario principal"
 
-#: ../clutter/clutter-stage.c:1938
+#: ../clutter/clutter-stage.c:1942
 msgid "User Resizable"
 msgstr "Redimensionable por el usuario"
 
-#: ../clutter/clutter-stage.c:1939
+#: ../clutter/clutter-stage.c:1943
 msgid "Whether the stage is able to be resized via user interaction"
 msgstr ""
 "Indica si el escenario se puede redimensionar mediante interacción del "
 "usuario"
 
-#: ../clutter/clutter-stage.c:1954 ../clutter/deprecated/clutter-box.c:260
-#: ../clutter/deprecated/clutter-rectangle.c:273
+#: ../clutter/clutter-stage.c:1958 ../clutter/deprecated/clutter-box.c:256
+#: ../clutter/deprecated/clutter-rectangle.c:270
 msgid "Color"
 msgstr "Color"
 
-#: ../clutter/clutter-stage.c:1955
+#: ../clutter/clutter-stage.c:1959
 msgid "The color of the stage"
 msgstr "El color del escenario"
 
-#: ../clutter/clutter-stage.c:1970
+#: ../clutter/clutter-stage.c:1974
 msgid "Perspective"
 msgstr "Perspectiva"
 
-#: ../clutter/clutter-stage.c:1971
+#: ../clutter/clutter-stage.c:1975
 msgid "Perspective projection parameters"
 msgstr "Parámetros de proyección de perspectiva"
 
-#: ../clutter/clutter-stage.c:1986
+#: ../clutter/clutter-stage.c:1990
 msgid "Title"
 msgstr "Título"
 
-#: ../clutter/clutter-stage.c:1987
+#: ../clutter/clutter-stage.c:1991
 msgid "Stage Title"
 msgstr "Título del escenario"
 
-#: ../clutter/clutter-stage.c:2004
+#: ../clutter/clutter-stage.c:2008
 msgid "Use Fog"
 msgstr "Usar niebla"
 
-#: ../clutter/clutter-stage.c:2005
+#: ../clutter/clutter-stage.c:2009
 msgid "Whether to enable depth cueing"
 msgstr "Indica si activar el indicador de profundidad"
 
-#: ../clutter/clutter-stage.c:2021
+#: ../clutter/clutter-stage.c:2025
 msgid "Fog"
 msgstr "Niebla"
 
-#: ../clutter/clutter-stage.c:2022
+#: ../clutter/clutter-stage.c:2026
 msgid "Settings for the depth cueing"
 msgstr "Configuración para el indicador de profundidad"
 
-#: ../clutter/clutter-stage.c:2038
+#: ../clutter/clutter-stage.c:2042
 msgid "Use Alpha"
 msgstr "Usar alfa"
 
-#: ../clutter/clutter-stage.c:2039
+#: ../clutter/clutter-stage.c:2043
 msgid "Whether to honour the alpha component of the stage color"
 msgstr "Indica si se usa la componente alfa del color del escenario"
 
-#: ../clutter/clutter-stage.c:2055
+#: ../clutter/clutter-stage.c:2059
 msgid "Key Focus"
 msgstr "Foco de la tecla"
 
-#: ../clutter/clutter-stage.c:2056
+#: ../clutter/clutter-stage.c:2060
 msgid "The currently key focused actor"
 msgstr "El actor que actualmente tiene el foco"
 
-#: ../clutter/clutter-stage.c:2072
+#: ../clutter/clutter-stage.c:2076
 msgid "No Clear Hint"
 msgstr "No limpiar el contorno"
 
-#: ../clutter/clutter-stage.c:2073
+#: ../clutter/clutter-stage.c:2077
 msgid "Whether the stage should clear its contents"
 msgstr "Indica si el escenario debe limpiar su contenido"
 
-#: ../clutter/clutter-stage.c:2086
+#: ../clutter/clutter-stage.c:2090
 msgid "Accept Focus"
 msgstr "Aceptar foco"
 
-#: ../clutter/clutter-stage.c:2087
+#: ../clutter/clutter-stage.c:2091
 msgid "Whether the stage should accept focus on show"
 msgstr "Indica si el escenario debe aceptar el foco al mostrarse"
 
-#: ../clutter/clutter-table-layout.c:543
-msgid "Column Number"
-msgstr "Número de columna"
-
-#: ../clutter/clutter-table-layout.c:544
-msgid "The column the widget resides in"
-msgstr "La columna en la que está en widget"
-
-#: ../clutter/clutter-table-layout.c:551
-msgid "Row Number"
-msgstr "Número de fila"
-
-#: ../clutter/clutter-table-layout.c:552
-msgid "The row the widget resides in"
-msgstr "La fila en la que está en widget"
-
-#: ../clutter/clutter-table-layout.c:559
-msgid "Column Span"
-msgstr "Espaciado entre columnas"
-
-#: ../clutter/clutter-table-layout.c:560
-msgid "The number of columns the widget should span"
-msgstr "El número de columnas que el widget debe expandirse"
-
-#: ../clutter/clutter-table-layout.c:567
-msgid "Row Span"
-msgstr "Espaciado entre filas"
-
-#: ../clutter/clutter-table-layout.c:568
-msgid "The number of rows the widget should span"
-msgstr "El número de filas que el widget debe expandirse"
-
-#: ../clutter/clutter-table-layout.c:575
-msgid "Horizontal Expand"
-msgstr "Expansión horizontal"
-
-#: ../clutter/clutter-table-layout.c:576
-msgid "Allocate extra space for the child in horizontal axis"
-msgstr "Asignar espacio adicional para el hijo en el eje horizontal"
-
-#: ../clutter/clutter-table-layout.c:582
-msgid "Vertical Expand"
-msgstr "Expansión vertical"
-
-#: ../clutter/clutter-table-layout.c:583
-msgid "Allocate extra space for the child in vertical axis"
-msgstr "Asignar espacio adicional para el hijo en el eje vertical"
-
-#: ../clutter/clutter-table-layout.c:1638
-msgid "Spacing between columns"
-msgstr "Espaciado entre columnas"
-
-#: ../clutter/clutter-table-layout.c:1652
-msgid "Spacing between rows"
-msgstr "Espaciado entre filas"
-
-#: ../clutter/clutter-text-buffer.c:351 ../clutter/clutter-text.c:3404
+#: ../clutter/clutter-text-buffer.c:347 ../clutter/clutter-text.c:3439
 msgid "Text"
 msgstr "Texto"
 
-#: ../clutter/clutter-text-buffer.c:352
+#: ../clutter/clutter-text-buffer.c:348
 msgid "The contents of the buffer"
 msgstr "El contenido del búfer"
 
-#: ../clutter/clutter-text-buffer.c:365
+#: ../clutter/clutter-text-buffer.c:361
 msgid "Text length"
 msgstr "Longitud del texto"
 
-#: ../clutter/clutter-text-buffer.c:366
+#: ../clutter/clutter-text-buffer.c:362
 msgid "Length of the text currently in the buffer"
 msgstr "Longitud del texto actualmente en el búfer"
 
-#: ../clutter/clutter-text-buffer.c:379
+#: ../clutter/clutter-text-buffer.c:375
 msgid "Maximum length"
 msgstr "Longitud máxima"
 
-#: ../clutter/clutter-text-buffer.c:380
+#: ../clutter/clutter-text-buffer.c:376
 msgid "Maximum number of characters for this entry. Zero if no maximum"
 msgstr "Número máximo de caracteres para esta entrada. Cero si no hay máximo"
 
-#: ../clutter/clutter-text.c:3351
+#: ../clutter/clutter-text.c:3386
 msgid "Buffer"
 msgstr "Búfer"
 
-#: ../clutter/clutter-text.c:3352
+#: ../clutter/clutter-text.c:3387
 msgid "The buffer for the text"
 msgstr "El búfer para el texto"
 
-#: ../clutter/clutter-text.c:3370
+#: ../clutter/clutter-text.c:3405
 msgid "The font to be used by the text"
 msgstr "La tipografía usada para el texto"
 
-#: ../clutter/clutter-text.c:3387
+#: ../clutter/clutter-text.c:3422
 msgid "Font Description"
 msgstr "Descripción de la tipografía"
 
-#: ../clutter/clutter-text.c:3388
+#: ../clutter/clutter-text.c:3423
 msgid "The font description to be used"
 msgstr "La descripción de la tipografía que usar"
 
-#: ../clutter/clutter-text.c:3405
+#: ../clutter/clutter-text.c:3440
 msgid "The text to render"
 msgstr "El texto que renderizar"
 
-#: ../clutter/clutter-text.c:3419
+#: ../clutter/clutter-text.c:3454
 msgid "Font Color"
 msgstr "Color de la tipografía"
 
-#: ../clutter/clutter-text.c:3420
+#: ../clutter/clutter-text.c:3455
 msgid "Color of the font used by the text"
 msgstr "Color de la tipografía usada por el texto"
 
-#: ../clutter/clutter-text.c:3435
+#: ../clutter/clutter-text.c:3470
 msgid "Editable"
 msgstr "Editable"
 
-#: ../clutter/clutter-text.c:3436
+#: ../clutter/clutter-text.c:3471
 msgid "Whether the text is editable"
 msgstr "Indica si el texto es editable"
 
-#: ../clutter/clutter-text.c:3451
+#: ../clutter/clutter-text.c:3486
 msgid "Selectable"
 msgstr "Seleccionable"
 
-#: ../clutter/clutter-text.c:3452
+#: ../clutter/clutter-text.c:3487
 msgid "Whether the text is selectable"
 msgstr "Indica si el texto es seleccionable"
 
-#: ../clutter/clutter-text.c:3466
+#: ../clutter/clutter-text.c:3501
 msgid "Activatable"
 msgstr "Activable"
 
-#: ../clutter/clutter-text.c:3467
+#: ../clutter/clutter-text.c:3502
 msgid "Whether pressing return causes the activate signal to be emitted"
 msgstr "Indica si al pulsar «Intro» hace que se emita la señal de activación"
 
-#: ../clutter/clutter-text.c:3484
+#: ../clutter/clutter-text.c:3519
 msgid "Whether the input cursor is visible"
 msgstr "Indica si el cursor de entrada es visible"
 
-#: ../clutter/clutter-text.c:3498 ../clutter/clutter-text.c:3499
+#: ../clutter/clutter-text.c:3533 ../clutter/clutter-text.c:3534
 msgid "Cursor Color"
 msgstr "Color del cursor"
 
-#: ../clutter/clutter-text.c:3514
+#: ../clutter/clutter-text.c:3549
 msgid "Cursor Color Set"
 msgstr "Conjunto de colores del cursor"
 
-#: ../clutter/clutter-text.c:3515
+#: ../clutter/clutter-text.c:3550
 msgid "Whether the cursor color has been set"
 msgstr "Indica si se ha establecido el color del cursor"
 
-#: ../clutter/clutter-text.c:3530
+#: ../clutter/clutter-text.c:3565
 msgid "Cursor Size"
 msgstr "Tamaño del cursor"
 
-#: ../clutter/clutter-text.c:3531
+#: ../clutter/clutter-text.c:3566
 msgid "The width of the cursor, in pixels"
 msgstr "La anchura del cursor, en píxeles"
 
-#: ../clutter/clutter-text.c:3547 ../clutter/clutter-text.c:3565
+#: ../clutter/clutter-text.c:3582 ../clutter/clutter-text.c:3600
 msgid "Cursor Position"
 msgstr "Posición del cursor"
 
-#: ../clutter/clutter-text.c:3548 ../clutter/clutter-text.c:3566
+#: ../clutter/clutter-text.c:3583 ../clutter/clutter-text.c:3601
 msgid "The cursor position"
 msgstr "La posición del cursor"
 
-#: ../clutter/clutter-text.c:3581
+#: ../clutter/clutter-text.c:3616
 msgid "Selection-bound"
 msgstr "Destino de la selección"
 
-#: ../clutter/clutter-text.c:3582
+#: ../clutter/clutter-text.c:3617
 msgid "The cursor position of the other end of the selection"
 msgstr "La posición del cursor del otro final de la selección"
 
-#: ../clutter/clutter-text.c:3597 ../clutter/clutter-text.c:3598
+#: ../clutter/clutter-text.c:3632 ../clutter/clutter-text.c:3633
 msgid "Selection Color"
 msgstr "Selección de color"
 
-#: ../clutter/clutter-text.c:3613
+#: ../clutter/clutter-text.c:3648
 msgid "Selection Color Set"
 msgstr "Conjunto de selección de colores"
 
-#: ../clutter/clutter-text.c:3614
+#: ../clutter/clutter-text.c:3649
 msgid "Whether the selection color has been set"
 msgstr "Indica si se ha establecido el color de la selección"
 
-#: ../clutter/clutter-text.c:3629
+#: ../clutter/clutter-text.c:3664
 msgid "Attributes"
 msgstr "Atributos"
 
-#: ../clutter/clutter-text.c:3630
+#: ../clutter/clutter-text.c:3665
 msgid "A list of style attributes to apply to the contents of the actor"
 msgstr ""
 "Una lista de atributos de estilo que aplicar a los contenidos del actor"
 
-#: ../clutter/clutter-text.c:3652
+#: ../clutter/clutter-text.c:3687
 msgid "Use markup"
 msgstr "Usar marcado"
 
-#: ../clutter/clutter-text.c:3653
+#: ../clutter/clutter-text.c:3688
 msgid "Whether or not the text includes Pango markup"
 msgstr "Indica si el texto incluye o no el marcado de Pango"
 
-#: ../clutter/clutter-text.c:3669
+#: ../clutter/clutter-text.c:3704
 msgid "Line wrap"
 msgstr "Ajuste de línea"
 
-#: ../clutter/clutter-text.c:3670
+#: ../clutter/clutter-text.c:3705
 msgid "If set, wrap the lines if the text becomes too wide"
 msgstr ""
 "Si está definido, ajustar las líneas si el texto se vuelve demasiado ancho"
 
-#: ../clutter/clutter-text.c:3685
+#: ../clutter/clutter-text.c:3720
 msgid "Line wrap mode"
 msgstr "Modo de ajuste de línea"
 
-#: ../clutter/clutter-text.c:3686
+#: ../clutter/clutter-text.c:3721
 msgid "Control how line-wrapping is done"
 msgstr "Controlar cómo se hace el ajuste de línea"
 
-#: ../clutter/clutter-text.c:3701
+#: ../clutter/clutter-text.c:3736
 msgid "Ellipsize"
 msgstr "Crear elipse"
 
-#: ../clutter/clutter-text.c:3702
+#: ../clutter/clutter-text.c:3737
 msgid "The preferred place to ellipsize the string"
 msgstr "El lugar preferido para crear la cadena elíptica"
 
-#: ../clutter/clutter-text.c:3718
+#: ../clutter/clutter-text.c:3753
 msgid "Line Alignment"
 msgstr "Alineación de línea"
 
-#: ../clutter/clutter-text.c:3719
+#: ../clutter/clutter-text.c:3754
 msgid "The preferred alignment for the string, for multi-line text"
 msgstr "La alineación preferida para la cadena, para texto multilínea"
 
-#: ../clutter/clutter-text.c:3735
+#: ../clutter/clutter-text.c:3770
 msgid "Justify"
 msgstr "Justificar"
 
-#: ../clutter/clutter-text.c:3736
+#: ../clutter/clutter-text.c:3771
 msgid "Whether the text should be justified"
 msgstr "Indica si el texto se debe justificar"
 
-#: ../clutter/clutter-text.c:3751
+#: ../clutter/clutter-text.c:3786
 msgid "Password Character"
 msgstr "Carácter de la contraseña"
 
-#: ../clutter/clutter-text.c:3752
+#: ../clutter/clutter-text.c:3787
 msgid "If non-zero, use this character to display the actor's contents"
 msgstr "Si no es cero, usar este carácter para mostrar el contenido del actor"
 
-#: ../clutter/clutter-text.c:3766
+#: ../clutter/clutter-text.c:3801
 msgid "Max Length"
 msgstr "Longitud máxima"
 
-#: ../clutter/clutter-text.c:3767
+#: ../clutter/clutter-text.c:3802
 msgid "Maximum length of the text inside the actor"
 msgstr "Longitud máxima del texto dentro del actor"
 
-#: ../clutter/clutter-text.c:3790
+#: ../clutter/clutter-text.c:3825
 msgid "Single Line Mode"
 msgstr "Modo de línea única"
 
-#: ../clutter/clutter-text.c:3791
+#: ../clutter/clutter-text.c:3826
 msgid "Whether the text should be a single line"
 msgstr "Indica si el texto debe estar en una única línea"
 
-#: ../clutter/clutter-text.c:3805 ../clutter/clutter-text.c:3806
+#: ../clutter/clutter-text.c:3840 ../clutter/clutter-text.c:3841
 msgid "Selected Text Color"
 msgstr "Color del texto seleccionado"
 
-#: ../clutter/clutter-text.c:3821
+#: ../clutter/clutter-text.c:3856
 msgid "Selected Text Color Set"
 msgstr "Conjunto de colores del texto seleccionado"
 
-#: ../clutter/clutter-text.c:3822
+#: ../clutter/clutter-text.c:3857
 msgid "Whether the selected text color has been set"
 msgstr "Indica si se ha establecido el color del texto seleccionado"
 
-#: ../clutter/clutter-timeline.c:561
-#: ../clutter/deprecated/clutter-animation.c:560
+#: ../clutter/clutter-timeline.c:593
+#: ../clutter/deprecated/clutter-animation.c:557
 msgid "Loop"
 msgstr "Bucle"
 
-#: ../clutter/clutter-timeline.c:562
+#: ../clutter/clutter-timeline.c:594
 msgid "Should the timeline automatically restart"
 msgstr "Indica si la línea de tiempo se debe reiniciar automáticamente"
 
-#: ../clutter/clutter-timeline.c:576
+#: ../clutter/clutter-timeline.c:608
 msgid "Delay"
 msgstr "Retardo"
 
-#: ../clutter/clutter-timeline.c:577
+#: ../clutter/clutter-timeline.c:609
 msgid "Delay before start"
 msgstr "Retardo antes de empezar"
 
-#: ../clutter/clutter-timeline.c:592
-#: ../clutter/deprecated/clutter-animation.c:544
-#: ../clutter/deprecated/clutter-animator.c:1804
+#: ../clutter/clutter-timeline.c:624
+#: ../clutter/deprecated/clutter-animation.c:541
+#: ../clutter/deprecated/clutter-animator.c:1801
 #: ../clutter/deprecated/clutter-media.c:224
-#: ../clutter/deprecated/clutter-state.c:1523
+#: ../clutter/deprecated/clutter-state.c:1517
 msgid "Duration"
 msgstr "Duración"
 
-#: ../clutter/clutter-timeline.c:593
+#: ../clutter/clutter-timeline.c:625
 msgid "Duration of the timeline in milliseconds"
 msgstr "Duración de la línea de tiempo, en milisegundos"
 
-#: ../clutter/clutter-timeline.c:608
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:528
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:337
+#: ../clutter/clutter-timeline.c:640
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:521
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:330
 msgid "Direction"
 msgstr "Dirección"
 
-#: ../clutter/clutter-timeline.c:609
+#: ../clutter/clutter-timeline.c:641
 msgid "Direction of the timeline"
 msgstr "Dirección de la línea de tiempo"
 
-#: ../clutter/clutter-timeline.c:624
+#: ../clutter/clutter-timeline.c:656
 msgid "Auto Reverse"
 msgstr "Invertir automáticamente"
 
-#: ../clutter/clutter-timeline.c:625
+#: ../clutter/clutter-timeline.c:657
 msgid "Whether the direction should be reversed when reaching the end"
 msgstr "Indica si se debe invertir la dirección al llegar al final"
 
-#: ../clutter/clutter-timeline.c:643
+#: ../clutter/clutter-timeline.c:675
 msgid "Repeat Count"
 msgstr "Repetir cuenta"
 
-#: ../clutter/clutter-timeline.c:644
+#: ../clutter/clutter-timeline.c:676
 msgid "How many times the timeline should repeat"
 msgstr "Cuántas veces se debe repetir la línea de tiempo"
 
-#: ../clutter/clutter-timeline.c:658
+#: ../clutter/clutter-timeline.c:690
 msgid "Progress Mode"
 msgstr "Modo de progreso"
 
-#: ../clutter/clutter-timeline.c:659
+#: ../clutter/clutter-timeline.c:691
 msgid "How the timeline should compute the progress"
 msgstr "Cómo debería calcula el progreso la línea de tiempo"
 
-#: ../clutter/clutter-transition.c:246
+#: ../clutter/clutter-transition.c:244
 msgid "Interval"
 msgstr "Intervalo"
 
-#: ../clutter/clutter-transition.c:247
+#: ../clutter/clutter-transition.c:245
 msgid "The interval of values to transition"
 msgstr "El intervalo de valores para la transición"
 
-#: ../clutter/clutter-transition.c:261
+#: ../clutter/clutter-transition.c:259
 msgid "Animatable"
 msgstr "Animable"
 
-#: ../clutter/clutter-transition.c:262
+#: ../clutter/clutter-transition.c:260
 msgid "The animatable object"
 msgstr "El objeto animable"
 
-#: ../clutter/clutter-transition.c:283
+#: ../clutter/clutter-transition.c:281
 msgid "Remove on Complete"
 msgstr "Quitar al completar"
 
-#: ../clutter/clutter-transition.c:284
+#: ../clutter/clutter-transition.c:282
 msgid "Detach the transition when completed"
 msgstr "Quitar la transición cuando se complete"
 
-#: ../clutter/clutter-zoom-action.c:354
+#: ../clutter/clutter-zoom-action.c:365
 msgid "Zoom Axis"
 msgstr "Ampliar eje"
 
-#: ../clutter/clutter-zoom-action.c:355
+#: ../clutter/clutter-zoom-action.c:366
 msgid "Constraints the zoom to an axis"
 msgstr "Restringe la ampliación a un eje"
 
-#: ../clutter/deprecated/clutter-alpha.c:355
-#: ../clutter/deprecated/clutter-animation.c:575
-#: ../clutter/deprecated/clutter-animator.c:1821
+#: ../clutter/deprecated/clutter-alpha.c:354
+#: ../clutter/deprecated/clutter-animation.c:572
+#: ../clutter/deprecated/clutter-animator.c:1818
 msgid "Timeline"
 msgstr "Línea de tiempo"
 
-#: ../clutter/deprecated/clutter-alpha.c:356
+#: ../clutter/deprecated/clutter-alpha.c:355
 msgid "Timeline used by the alpha"
 msgstr "Línea de tiempo usada por el alfa"
 
-#: ../clutter/deprecated/clutter-alpha.c:372
+#: ../clutter/deprecated/clutter-alpha.c:371
 msgid "Alpha value"
 msgstr "Valor alfa"
 
-#: ../clutter/deprecated/clutter-alpha.c:373
+#: ../clutter/deprecated/clutter-alpha.c:372
 msgid "Alpha value as computed by the alpha"
 msgstr "Valor alfa calculado por el alfa"
 
-#: ../clutter/deprecated/clutter-alpha.c:394
-#: ../clutter/deprecated/clutter-animation.c:528
+#: ../clutter/deprecated/clutter-alpha.c:393
+#: ../clutter/deprecated/clutter-animation.c:525
 msgid "Mode"
 msgstr "Modo"
 
-#: ../clutter/deprecated/clutter-alpha.c:395
+#: ../clutter/deprecated/clutter-alpha.c:394
 msgid "Progress mode"
 msgstr "Modo de progreso"
 
-#: ../clutter/deprecated/clutter-animation.c:511
+#: ../clutter/deprecated/clutter-animation.c:508
 msgid "Object"
 msgstr "Objeto"
 
-#: ../clutter/deprecated/clutter-animation.c:512
+#: ../clutter/deprecated/clutter-animation.c:509
 msgid "Object to which the animation applies"
 msgstr "Objeto al que se aplica la animación"
 
-#: ../clutter/deprecated/clutter-animation.c:529
+#: ../clutter/deprecated/clutter-animation.c:526
 msgid "The mode of the animation"
 msgstr "El modo de la animación"
 
-#: ../clutter/deprecated/clutter-animation.c:545
+#: ../clutter/deprecated/clutter-animation.c:542
 msgid "Duration of the animation, in milliseconds"
 msgstr "Duración de la animación, en milisegundos"
 
-#: ../clutter/deprecated/clutter-animation.c:561
+#: ../clutter/deprecated/clutter-animation.c:558
 msgid "Whether the animation should loop"
 msgstr "Indica si la animación debería ser un bucle"
 
-#: ../clutter/deprecated/clutter-animation.c:576
+#: ../clutter/deprecated/clutter-animation.c:573
 msgid "The timeline used by the animation"
 msgstr "La línea de tiempo usada por la animación"
 
-#: ../clutter/deprecated/clutter-animation.c:592
-#: ../clutter/deprecated/clutter-behaviour.c:241
+#: ../clutter/deprecated/clutter-animation.c:589
+#: ../clutter/deprecated/clutter-behaviour.c:237
 msgid "Alpha"
 msgstr "Alfa"
 
-#: ../clutter/deprecated/clutter-animation.c:593
+#: ../clutter/deprecated/clutter-animation.c:590
 msgid "The alpha used by the animation"
 msgstr "El alfa usado por la animación"
 
-#: ../clutter/deprecated/clutter-animator.c:1805
+#: ../clutter/deprecated/clutter-animator.c:1802
 msgid "The duration of the animation"
 msgstr "La duración de la animación"
 
-#: ../clutter/deprecated/clutter-animator.c:1822
+#: ../clutter/deprecated/clutter-animator.c:1819
 msgid "The timeline of the animation"
 msgstr "La línea de tiempo de la animación"
 
-#: ../clutter/deprecated/clutter-behaviour.c:242
+#: ../clutter/deprecated/clutter-behaviour.c:238
 msgid "Alpha Object to drive the behaviour"
 msgstr "Objeto alfa para dirigir el comportamiento"
 
-#: ../clutter/deprecated/clutter-behaviour-depth.c:182
+#: ../clutter/deprecated/clutter-behaviour-depth.c:180
 msgid "Start Depth"
 msgstr "Profundidad inicial"
 
-#: ../clutter/deprecated/clutter-behaviour-depth.c:183
+#: ../clutter/deprecated/clutter-behaviour-depth.c:181
 msgid "Initial depth to apply"
 msgstr "Profundidad inicial que aplicar"
 
-#: ../clutter/deprecated/clutter-behaviour-depth.c:198
+#: ../clutter/deprecated/clutter-behaviour-depth.c:196
 msgid "End Depth"
 msgstr "Profundidad final"
 
-#: ../clutter/deprecated/clutter-behaviour-depth.c:199
+#: ../clutter/deprecated/clutter-behaviour-depth.c:197
 msgid "Final depth to apply"
 msgstr "Profundidad final que aplicar"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:401
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:394
 msgid "Start Angle"
 msgstr "Ángulo inicial"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:402
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:284
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:395
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:277
 msgid "Initial angle"
 msgstr "Ángulo inicial"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:417
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:410
 msgid "End Angle"
 msgstr "Ángulo final"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:418
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:302
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:411
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:295
 msgid "Final angle"
 msgstr "Ángulo final"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:433
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:426
 msgid "Angle x tilt"
 msgstr "Inclinación X del ángulo"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:434
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:427
 msgid "Tilt of the ellipse around x axis"
 msgstr "Inclinación de la elipse sobre el eje X"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:449
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:442
 msgid "Angle y tilt"
 msgstr "Inclinación Y del ángulo"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:450
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:443
 msgid "Tilt of the ellipse around y axis"
 msgstr "Inclinación de la elipse sobre el eje Y"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:465
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:458
 msgid "Angle z tilt"
 msgstr "Inclinación Z del ángulo"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:466
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:459
 msgid "Tilt of the ellipse around z axis"
 msgstr "Inclinación de la elipse sobre el eje Z"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:482
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:475
 msgid "Width of the ellipse"
 msgstr "Anchura de la elipse"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:498
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:491
 msgid "Height of ellipse"
 msgstr "Altura de la elipse"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:513
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:506
 msgid "Center"
 msgstr "Centro"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:514
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:507
 msgid "Center of ellipse"
 msgstr "Centro de la elipse"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:529
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:338
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:522
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:331
 msgid "Direction of rotation"
 msgstr "Dirección de la rotación"
 
-#: ../clutter/deprecated/clutter-behaviour-opacity.c:184
+#: ../clutter/deprecated/clutter-behaviour-opacity.c:177
 msgid "Opacity Start"
 msgstr "Opacidad inicial"
 
-#: ../clutter/deprecated/clutter-behaviour-opacity.c:185
+#: ../clutter/deprecated/clutter-behaviour-opacity.c:178
 msgid "Initial opacity level"
 msgstr "Nivel inicial de opacidad"
 
-#: ../clutter/deprecated/clutter-behaviour-opacity.c:202
+#: ../clutter/deprecated/clutter-behaviour-opacity.c:195
 msgid "Opacity End"
 msgstr "Opacidad final"
 
-#: ../clutter/deprecated/clutter-behaviour-opacity.c:203
+#: ../clutter/deprecated/clutter-behaviour-opacity.c:196
 msgid "Final opacity level"
 msgstr "Nivel final de opacidad"
 
-#: ../clutter/deprecated/clutter-behaviour-path.c:226
+#: ../clutter/deprecated/clutter-behaviour-path.c:222
 msgid "The ClutterPath object representing the path to animate along"
 msgstr "El objeto «ClutterPath» que representa la ruta sobre la que animar"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:283
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:276
 msgid "Angle Begin"
 msgstr "Ángulo inicial"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:301
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:294
 msgid "Angle End"
 msgstr "Ángulo final"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:319
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:312
 msgid "Axis"
 msgstr "Eje"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:320
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:313
 msgid "Axis of rotation"
 msgstr "Eje de rotación"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:355
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:348
 msgid "Center X"
 msgstr "Centro X"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:356
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:349
 msgid "X coordinate of the center of rotation"
 msgstr "Coordenada X del centro de rotación"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:373
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:366
 msgid "Center Y"
 msgstr "Centro Y"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:374
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:367
 msgid "Y coordinate of the center of rotation"
 msgstr "Coordenada Y del centro de rotación"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:391
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:384
 msgid "Center Z"
 msgstr "Centro Z"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:392
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:385
 msgid "Z coordinate of the center of rotation"
 msgstr "Coordenada Z del centro de rotación"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:226
+#: ../clutter/deprecated/clutter-behaviour-scale.c:222
 msgid "X Start Scale"
 msgstr "Escala X inicial"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:227
+#: ../clutter/deprecated/clutter-behaviour-scale.c:223
 msgid "Initial scale on the X axis"
 msgstr "Escala inicial en el eje X"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:245
+#: ../clutter/deprecated/clutter-behaviour-scale.c:241
 msgid "X End Scale"
 msgstr "Escala X final"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:246
+#: ../clutter/deprecated/clutter-behaviour-scale.c:242
 msgid "Final scale on the X axis"
 msgstr "Escala final en el eje X"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:264
+#: ../clutter/deprecated/clutter-behaviour-scale.c:260
 msgid "Y Start Scale"
 msgstr "Escala Y inicial"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:265
+#: ../clutter/deprecated/clutter-behaviour-scale.c:261
 msgid "Initial scale on the Y axis"
 msgstr "Escala inicial en el eje Y"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:283
+#: ../clutter/deprecated/clutter-behaviour-scale.c:279
 msgid "Y End Scale"
 msgstr "Escala Y final"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:284
+#: ../clutter/deprecated/clutter-behaviour-scale.c:280
 msgid "Final scale on the Y axis"
 msgstr "Escala final en el eje Y"
 
-#: ../clutter/deprecated/clutter-box.c:261
+#: ../clutter/deprecated/clutter-box.c:257
 msgid "The background color of the box"
 msgstr "El color de fondo de la caja"
 
-#: ../clutter/deprecated/clutter-box.c:274
+#: ../clutter/deprecated/clutter-box.c:270
 msgid "Color Set"
 msgstr "Conjunto de colores"
 
-#: ../clutter/deprecated/clutter-cairo-texture.c:597
+#: ../clutter/deprecated/clutter-cairo-texture.c:593
 msgid "Surface Width"
 msgstr "Anchura de la superficie"
 
-#: ../clutter/deprecated/clutter-cairo-texture.c:598
+#: ../clutter/deprecated/clutter-cairo-texture.c:594
 msgid "The width of the Cairo surface"
 msgstr "La anchura de la superficie Cairo"
 
-#: ../clutter/deprecated/clutter-cairo-texture.c:615
+#: ../clutter/deprecated/clutter-cairo-texture.c:611
 msgid "Surface Height"
 msgstr "Altura de la superficie"
 
-#: ../clutter/deprecated/clutter-cairo-texture.c:616
+#: ../clutter/deprecated/clutter-cairo-texture.c:612
 msgid "The height of the Cairo surface"
 msgstr "La altura de la superficie Cairo"
 
-#: ../clutter/deprecated/clutter-cairo-texture.c:636
+#: ../clutter/deprecated/clutter-cairo-texture.c:632
 msgid "Auto Resize"
 msgstr "Redimensionar automáticamente"
 
-#: ../clutter/deprecated/clutter-cairo-texture.c:637
+#: ../clutter/deprecated/clutter-cairo-texture.c:633
 msgid "Whether the surface should match the allocation"
 msgstr "Indica si la superficie debe coincidir con la asignación"
 
@@ -2392,104 +2418,160 @@ msgstr "El nivel de llenado del búfer"
 msgid "The duration of the stream, in seconds"
 msgstr "La duración del flujo, en segundos"
 
-#: ../clutter/deprecated/clutter-rectangle.c:274
+#: ../clutter/deprecated/clutter-rectangle.c:271
 msgid "The color of the rectangle"
 msgstr "El color del rectángulo"
 
-#: ../clutter/deprecated/clutter-rectangle.c:287
+#: ../clutter/deprecated/clutter-rectangle.c:284
 msgid "Border Color"
 msgstr "Color del borde"
 
-#: ../clutter/deprecated/clutter-rectangle.c:288
+#: ../clutter/deprecated/clutter-rectangle.c:285
 msgid "The color of the border of the rectangle"
 msgstr "El color del borde del rectángulo"
 
-#: ../clutter/deprecated/clutter-rectangle.c:303
+#: ../clutter/deprecated/clutter-rectangle.c:300
 msgid "Border Width"
 msgstr "Anchura del borde"
 
-#: ../clutter/deprecated/clutter-rectangle.c:304
+#: ../clutter/deprecated/clutter-rectangle.c:301
 msgid "The width of the border of the rectangle"
 msgstr "La anchura del borde del rectángulo"
 
-#: ../clutter/deprecated/clutter-rectangle.c:318
+#: ../clutter/deprecated/clutter-rectangle.c:315
 msgid "Has Border"
 msgstr "Tiene borde"
 
-#: ../clutter/deprecated/clutter-rectangle.c:319
+#: ../clutter/deprecated/clutter-rectangle.c:316
 msgid "Whether the rectangle should have a border"
 msgstr "Indica si el rectángulo debe tener borde"
 
-#: ../clutter/deprecated/clutter-shader.c:261
+#: ../clutter/deprecated/clutter-shader.c:257
 msgid "Vertex Source"
 msgstr "Origen del vértice"
 
-#: ../clutter/deprecated/clutter-shader.c:262
+#: ../clutter/deprecated/clutter-shader.c:258
 msgid "Source of vertex shader"
 msgstr "Origen del sombreado del vértice"
 
-#: ../clutter/deprecated/clutter-shader.c:278
+#: ../clutter/deprecated/clutter-shader.c:274
 msgid "Fragment Source"
 msgstr "Origen del fragmento"
 
-#: ../clutter/deprecated/clutter-shader.c:279
+#: ../clutter/deprecated/clutter-shader.c:275
 msgid "Source of fragment shader"
 msgstr "Origen del sombreado del fragmento"
 
-#: ../clutter/deprecated/clutter-shader.c:296
+#: ../clutter/deprecated/clutter-shader.c:292
 msgid "Compiled"
 msgstr "Compilado"
 
-#: ../clutter/deprecated/clutter-shader.c:297
+#: ../clutter/deprecated/clutter-shader.c:293
 msgid "Whether the shader is compiled and linked"
 msgstr "Indica si el sombreado está compilado y enlazado"
 
-#: ../clutter/deprecated/clutter-shader.c:314
+#: ../clutter/deprecated/clutter-shader.c:310
 msgid "Whether the shader is enabled"
 msgstr "Indica si el sombreado está activado"
 
-#: ../clutter/deprecated/clutter-shader.c:525
+#: ../clutter/deprecated/clutter-shader.c:521
 #, c-format
 msgid "%s compilation failed: %s"
 msgstr "falló la compilación de %s: %s"
 
-#: ../clutter/deprecated/clutter-shader.c:526
+#: ../clutter/deprecated/clutter-shader.c:522
 msgid "Vertex shader"
 msgstr "Sombreado del vértice"
 
-#: ../clutter/deprecated/clutter-shader.c:527
+#: ../clutter/deprecated/clutter-shader.c:523
 msgid "Fragment shader"
 msgstr "Sombreado del fragmento"
 
-#: ../clutter/deprecated/clutter-state.c:1505
+#: ../clutter/deprecated/clutter-state.c:1499
 msgid "State"
 msgstr "Estado"
 
-#: ../clutter/deprecated/clutter-state.c:1506
+#: ../clutter/deprecated/clutter-state.c:1500
 msgid "Currently set state, (transition to this state might not be complete)"
 msgstr ""
 "Estado establecido actualmente, (la transición a este estado puede no estar "
 "completa)"
 
-#: ../clutter/deprecated/clutter-state.c:1524
+#: ../clutter/deprecated/clutter-state.c:1518
 msgid "Default transition duration"
 msgstr "Duración de la transición predeterminada"
 
-#: ../clutter/deprecated/clutter-texture.c:994
+#: ../clutter/deprecated/clutter-table-layout.c:543
+msgid "Column Number"
+msgstr "Número de columna"
+
+#: ../clutter/deprecated/clutter-table-layout.c:544
+msgid "The column the widget resides in"
+msgstr "La columna en la que está en widget"
+
+#: ../clutter/deprecated/clutter-table-layout.c:551
+msgid "Row Number"
+msgstr "Número de fila"
+
+#: ../clutter/deprecated/clutter-table-layout.c:552
+msgid "The row the widget resides in"
+msgstr "La fila en la que está en widget"
+
+#: ../clutter/deprecated/clutter-table-layout.c:559
+msgid "Column Span"
+msgstr "Espaciado entre columnas"
+
+#: ../clutter/deprecated/clutter-table-layout.c:560
+msgid "The number of columns the widget should span"
+msgstr "El número de columnas que el widget debe expandirse"
+
+#: ../clutter/deprecated/clutter-table-layout.c:567
+msgid "Row Span"
+msgstr "Espaciado entre filas"
+
+#: ../clutter/deprecated/clutter-table-layout.c:568
+msgid "The number of rows the widget should span"
+msgstr "El número de filas que el widget debe expandirse"
+
+#: ../clutter/deprecated/clutter-table-layout.c:575
+msgid "Horizontal Expand"
+msgstr "Expansión horizontal"
+
+#: ../clutter/deprecated/clutter-table-layout.c:576
+msgid "Allocate extra space for the child in horizontal axis"
+msgstr "Asignar espacio adicional para el hijo en el eje horizontal"
+
+#: ../clutter/deprecated/clutter-table-layout.c:582
+msgid "Vertical Expand"
+msgstr "Expansión vertical"
+
+#: ../clutter/deprecated/clutter-table-layout.c:583
+msgid "Allocate extra space for the child in vertical axis"
+msgstr "Asignar espacio adicional para el hijo en el eje vertical"
+
+#: ../clutter/deprecated/clutter-table-layout.c:1638
+msgid "Spacing between columns"
+msgstr "Espaciado entre columnas"
+
+#: ../clutter/deprecated/clutter-table-layout.c:1654
+msgid "Spacing between rows"
+msgstr "Espaciado entre filas"
+
+#: ../clutter/deprecated/clutter-texture.c:992
 msgid "Sync size of actor"
 msgstr "Sincronizar tamaño del actor"
 
-#: ../clutter/deprecated/clutter-texture.c:995
+#: ../clutter/deprecated/clutter-texture.c:993
 msgid "Auto sync size of actor to underlying pixbuf dimensions"
 msgstr ""
-"Sincronizar automáticamente el tamaño del actor a las dimensiones de «pixbuf» "
-"subyacente"
+"Sincronizar automáticamente el tamaño del actor a las dimensiones de "
+"«pixbuf» subyacente"
 
-#: ../clutter/deprecated/clutter-texture.c:1002
+#: ../clutter/deprecated/clutter-texture.c:1000
 msgid "Disable Slicing"
 msgstr "Desactivar troceado"
 
-#: ../clutter/deprecated/clutter-texture.c:1003
+#: ../clutter/deprecated/clutter-texture.c:1001
 msgid ""
 "Forces the underlying texture to be singular and not made of smaller space "
 "saving individual textures"
@@ -2497,73 +2579,73 @@ msgstr ""
 "Fuerza a la textura subyacente a ser singular y a que no esté hecha de un "
 "espacio menor guardando texturas individuales"
 
-#: ../clutter/deprecated/clutter-texture.c:1012
+#: ../clutter/deprecated/clutter-texture.c:1010
 msgid "Tile Waste"
 msgstr "Cuadrado sobrante"
 
-#: ../clutter/deprecated/clutter-texture.c:1013
+#: ../clutter/deprecated/clutter-texture.c:1011
 msgid "Maximum waste area of a sliced texture"
 msgstr "Área máxima sobrante de una textura troceada"
 
-#: ../clutter/deprecated/clutter-texture.c:1021
+#: ../clutter/deprecated/clutter-texture.c:1019
 msgid "Horizontal repeat"
 msgstr "Repetición horizontal"
 
-#: ../clutter/deprecated/clutter-texture.c:1022
+#: ../clutter/deprecated/clutter-texture.c:1020
 msgid "Repeat the contents rather than scaling them horizontally"
 msgstr "Repite el contenido en vez de escalarlo horizontalmente"
 
-#: ../clutter/deprecated/clutter-texture.c:1029
+#: ../clutter/deprecated/clutter-texture.c:1027
 msgid "Vertical repeat"
 msgstr "Repetición vertical"
 
-#: ../clutter/deprecated/clutter-texture.c:1030
+#: ../clutter/deprecated/clutter-texture.c:1028
 msgid "Repeat the contents rather than scaling them vertically"
 msgstr "Repite el contenido en vez de escalarlo verticalmente"
 
-#: ../clutter/deprecated/clutter-texture.c:1037
+#: ../clutter/deprecated/clutter-texture.c:1035
 msgid "Filter Quality"
 msgstr "Calidad del filtro"
 
-#: ../clutter/deprecated/clutter-texture.c:1038
+#: ../clutter/deprecated/clutter-texture.c:1036
 msgid "Rendering quality used when drawing the texture"
 msgstr "Calidad de renderizado usada al dibujar la textura"
 
-#: ../clutter/deprecated/clutter-texture.c:1046
+#: ../clutter/deprecated/clutter-texture.c:1044
 msgid "Pixel Format"
 msgstr "Formato del píxel"
 
-#: ../clutter/deprecated/clutter-texture.c:1047
+#: ../clutter/deprecated/clutter-texture.c:1045
 msgid "The Cogl pixel format to use"
 msgstr "El formato de píxel Cogl que usar"
 
-#: ../clutter/deprecated/clutter-texture.c:1055
-#: ../clutter/wayland/clutter-wayland-surface.c:449
+#: ../clutter/deprecated/clutter-texture.c:1053
+#: ../clutter/wayland/clutter-wayland-surface.c:445
 msgid "Cogl Texture"
 msgstr "Textura de Cogl"
 
-#: ../clutter/deprecated/clutter-texture.c:1056
-#: ../clutter/wayland/clutter-wayland-surface.c:450
+#: ../clutter/deprecated/clutter-texture.c:1054
+#: ../clutter/wayland/clutter-wayland-surface.c:446
 msgid "The underlying Cogl texture handle used to draw this actor"
 msgstr "La textura Cogl subyacente usada para dibujar este actor"
 
-#: ../clutter/deprecated/clutter-texture.c:1063
+#: ../clutter/deprecated/clutter-texture.c:1061
 msgid "Cogl Material"
 msgstr "Material de Cogl"
 
-#: ../clutter/deprecated/clutter-texture.c:1064
+#: ../clutter/deprecated/clutter-texture.c:1062
 msgid "The underlying Cogl material handle used to draw this actor"
 msgstr "El material de Cogl subyacente usado para dibujar este actor"
 
-#: ../clutter/deprecated/clutter-texture.c:1083
+#: ../clutter/deprecated/clutter-texture.c:1081
 msgid "The path of the file containing the image data"
 msgstr "La ruta del archivo que contiene los datos de la imagen"
 
-#: ../clutter/deprecated/clutter-texture.c:1090
+#: ../clutter/deprecated/clutter-texture.c:1088
 msgid "Keep Aspect Ratio"
 msgstr "Mantener proporción de aspecto"
 
-#: ../clutter/deprecated/clutter-texture.c:1091
+#: ../clutter/deprecated/clutter-texture.c:1089
 msgid ""
 "Keep the aspect ratio of the texture when requesting the preferred width or "
 "height"
@@ -2571,22 +2653,22 @@ msgstr ""
 "Mantener la relación de aspecto de la textura al solicitar la anchura o la "
 "altura preferidas"
 
-#: ../clutter/deprecated/clutter-texture.c:1119
+#: ../clutter/deprecated/clutter-texture.c:1117
 msgid "Load asynchronously"
 msgstr "Cargar de forma asíncrona"
 
-#: ../clutter/deprecated/clutter-texture.c:1120
+#: ../clutter/deprecated/clutter-texture.c:1118
 msgid ""
 "Load files inside a thread to avoid blocking when loading images from disk"
 msgstr ""
 "Cargar archivos en un hilo para evitar bloqueos al cargar imágenes desde el "
 "disco"
 
-#: ../clutter/deprecated/clutter-texture.c:1138
+#: ../clutter/deprecated/clutter-texture.c:1136
 msgid "Load data asynchronously"
 msgstr "Cargar datos de forma asíncrona"
 
-#: ../clutter/deprecated/clutter-texture.c:1139
+#: ../clutter/deprecated/clutter-texture.c:1137
 msgid ""
 "Decode image data files inside a thread to reduce blocking when loading "
 "images from disk"
@@ -2594,198 +2676,197 @@ msgstr ""
 "Decodificar los archivos de datos de imágenes en un hilo para reducir los "
 "bloqueos al cargar imágenes desde el disco"
 
-#: ../clutter/deprecated/clutter-texture.c:1165
+#: ../clutter/deprecated/clutter-texture.c:1163
 msgid "Pick With Alpha"
 msgstr "Seleccionar con alfa"
 
-#: ../clutter/deprecated/clutter-texture.c:1166
+#: ../clutter/deprecated/clutter-texture.c:1164
 msgid "Shape actor with alpha channel when picking"
 msgstr "Dar forma al actor con canal alfa al seleccionarlo"
 
-#: ../clutter/deprecated/clutter-texture.c:1599
-#: ../clutter/deprecated/clutter-texture.c:1994
-#: ../clutter/deprecated/clutter-texture.c:2090
-#: ../clutter/deprecated/clutter-texture.c:2388
+#: ../clutter/deprecated/clutter-texture.c:1597
+#: ../clutter/deprecated/clutter-texture.c:1992
+#: ../clutter/deprecated/clutter-texture.c:2088
+#: ../clutter/deprecated/clutter-texture.c:2386
 #, c-format
 msgid "Failed to load the image data"
 msgstr "Fallo al cargar los datos de la imagen"
 
-#: ../clutter/deprecated/clutter-texture.c:1758
+#: ../clutter/deprecated/clutter-texture.c:1756
 #, c-format
 msgid "YUV textures are not supported"
 msgstr "Las texturas YUV no están soportadas"
 
-#: ../clutter/deprecated/clutter-texture.c:1767
+#: ../clutter/deprecated/clutter-texture.c:1765
 #, c-format
 msgid "YUV2 textues are not supported"
 msgstr "Las texturas YUV2 no están soportadas"
 
-#: ../clutter/evdev/clutter-input-device-evdev.c:159
+#: ../clutter/evdev/clutter-input-device-evdev.c:154
 msgid "sysfs Path"
 msgstr "Ruta de sysfs"
 
-#: ../clutter/evdev/clutter-input-device-evdev.c:160
+#: ../clutter/evdev/clutter-input-device-evdev.c:155
 msgid "Path of the device in sysfs"
 msgstr "Ruta del dispositivo en sysfs"
 
-#: ../clutter/evdev/clutter-input-device-evdev.c:175
+#: ../clutter/evdev/clutter-input-device-evdev.c:170
 msgid "Device Path"
 msgstr "Ruta del dispositivo"
 
-#: ../clutter/evdev/clutter-input-device-evdev.c:176
+#: ../clutter/evdev/clutter-input-device-evdev.c:171
 msgid "Path of the device node"
 msgstr "Ruta al nodo del dispositivo"
 
-#: ../clutter/gdk/clutter-backend-gdk.c:296
+#: ../clutter/gdk/clutter-backend-gdk.c:289
 #, c-format
 msgid "Could not find a suitable CoglWinsys for a GdkDisplay of type %s"
 msgstr ""
 "No se pudo encontrar un CoglWinsys adecuado para un GdkDisplay de tipo %s"
 
-#: ../clutter/wayland/clutter-wayland-surface.c:423
+#: ../clutter/wayland/clutter-wayland-surface.c:419
 msgid "Surface"
 msgstr "Superficie"
 
-#: ../clutter/wayland/clutter-wayland-surface.c:424
+#: ../clutter/wayland/clutter-wayland-surface.c:420
 msgid "The underlying wayland surface"
 msgstr "La superficie Wayland subyacente"
 
-#: ../clutter/wayland/clutter-wayland-surface.c:431
+#: ../clutter/wayland/clutter-wayland-surface.c:427
 msgid "Surface width"
 msgstr "Anchura de la superficie"
 
-#: ../clutter/wayland/clutter-wayland-surface.c:432
+#: ../clutter/wayland/clutter-wayland-surface.c:428
 msgid "The width of the underlying wayland surface"
 msgstr "La anchura de la superficie Wayland subyacente"
 
-#: ../clutter/wayland/clutter-wayland-surface.c:440
+#: ../clutter/wayland/clutter-wayland-surface.c:436
 msgid "Surface height"
 msgstr "Altura de la superficie"
 
-#: ../clutter/wayland/clutter-wayland-surface.c:441
+#: ../clutter/wayland/clutter-wayland-surface.c:437
 msgid "The height of the underlying wayland surface"
 msgstr "La altura de la superficie Wayland subyacente"
 
-#: ../clutter/x11/clutter-backend-x11.c:516
+#: ../clutter/x11/clutter-backend-x11.c:488
 msgid "X display to use"
 msgstr "Pantalla X que usar"
 
-#: ../clutter/x11/clutter-backend-x11.c:522
+#: ../clutter/x11/clutter-backend-x11.c:494
 msgid "X screen to use"
 msgstr "Pantalla (screen) X que usar"
 
-#: ../clutter/x11/clutter-backend-x11.c:527
+#: ../clutter/x11/clutter-backend-x11.c:499
 msgid "Make X calls synchronous"
 msgstr "Hacer llamadas a X síncronas"
 
-#: ../clutter/x11/clutter-backend-x11.c:534
-#| msgid "Enable XInput support"
+#: ../clutter/x11/clutter-backend-x11.c:506
 msgid "Disable XInput support"
 msgstr "Desactivar el soporte de XInput"
 
-#: ../clutter/x11/clutter-keymap-x11.c:317
+#: ../clutter/x11/clutter-keymap-x11.c:322
 msgid "The Clutter backend"
 msgstr "El backend de Clutter"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:539
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:534
 msgid "Pixmap"
 msgstr "Mapa de píxeles"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:540
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:535
 msgid "The X11 Pixmap to be bound"
 msgstr "EL mapa de píxeles X11 que asociar"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:548
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:543
 msgid "Pixmap width"
 msgstr "Anchura del mapa de píxeles"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:549
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:544
 msgid "The width of the pixmap bound to this texture"
 msgstr "La anchura del mapa de píxeles asociado a esta textura"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:557
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:552
 msgid "Pixmap height"
 msgstr "Altura del mapa de píxeles"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:558
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:553
 msgid "The height of the pixmap bound to this texture"
 msgstr "La altura del mapa de píxeles asociado a esta textura"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:566
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:561
 msgid "Pixmap Depth"
 msgstr "Profundidad del mapa de píxeles"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:567
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:562
 msgid "The depth (in number of bits) of the pixmap bound to this texture"
 msgstr ""
 "La profundidad (en número de bits) del mapa de píxeles asociado a esta "
 "textura"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:575
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:570
 msgid "Automatic Updates"
 msgstr "Actualizaciones automáticas"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:576
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:571
 msgid "If the texture should be kept in sync with any pixmap changes."
 msgstr ""
 "Indica si la textura se debe sincronizar con cualquier cambio en el mapa de "
 "píxeles."
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:584
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:579
 msgid "Window"
 msgstr "Ventana"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:585
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:580
 msgid "The X11 Window to be bound"
 msgstr "La ventana X11 que asociar"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:593
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:588
 msgid "Window Redirect Automatic"
 msgstr "Redirección automática de la ventana"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:594
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:589
 msgid "If composite window redirects are set to Automatic (or Manual if false)"
 msgstr ""
 "Indica si la redirección de la ventana compuesta está establecida a "
 "«Automática» (o «Manual» si es falso)"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:604
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:599
 msgid "Window Mapped"
 msgstr "Ventana mapeada"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:605
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:600
 msgid "If window is mapped"
 msgstr "Indica si la ventana está mapeada"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:614
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:609
 msgid "Destroyed"
 msgstr "Destruida"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:615
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:610
 msgid "If window has been destroyed"
 msgstr "Indica si se ha destruido la ventana"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:623
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:618
 msgid "Window X"
 msgstr "Ventana X"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:624
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:619
 msgid "X position of window on screen according to X11"
 msgstr "Posición X de la ventana en la pantalla, de acuerdo con X11"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:632
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:627
 msgid "Window Y"
 msgstr "Ventana Y"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:633
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:628
 msgid "Y position of window on screen according to X11"
 msgstr "Posición Y de la ventana en la pantalla, de acuerdo con X11"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:640
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:635
 msgid "Window Override Redirect"
 msgstr "Omitir redirección de la ventana"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:641
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:636
 msgid "If this is an override-redirect window"
 msgstr "Indica si esta es una ventana que omite la redirección"
 
diff --git a/po/eu.po b/po/eu.po
new file mode 100644
index 000000000..ddf097f55
--- /dev/null
+++ b/po/eu.po
@@ -0,0 +1,2852 @@
+# Basque translation of clutter.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Iñaki Larrañaga Murgoitio <dooteo@zundan.com>, 2014.
+msgid ""
+msgstr ""
+"Project-Id-Version:  clutter clutter-1.18\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+"product=clutter\n"
+"POT-Creation-Date: 2014-04-16 17:11+0200\n"
+"PO-Revision-Date: 2014-04-16 17:08+0200\n"
+"Last-Translator: Iñaki Larrañaga Murgoitio <dooteo@zundan.com>\n"
+"Language-Team: Basque <librezale@librezale.org>\n"
+"Language: eu\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"
+"X-Generator: Lokalize 1.4\n"
+
+#: ../clutter/clutter-actor.c:6224
+msgid "X coordinate"
+msgstr "X koordenatua"
+
+#: ../clutter/clutter-actor.c:6225
+msgid "X coordinate of the actor"
+msgstr "Aktorearen X koordenatua"
+
+#: ../clutter/clutter-actor.c:6243
+msgid "Y coordinate"
+msgstr "Y koordenatua"
+
+#: ../clutter/clutter-actor.c:6244
+msgid "Y coordinate of the actor"
+msgstr "Aktorearen Y koordenatua"
+
+#: ../clutter/clutter-actor.c:6266
+msgid "Position"
+msgstr "Posizioa"
+
+#: ../clutter/clutter-actor.c:6267
+msgid "The position of the origin of the actor"
+msgstr "Aktorearen jatorrizko posizioa"
+
+#: ../clutter/clutter-actor.c:6284 ../clutter/clutter-canvas.c:242
+#: ../clutter/clutter-grid-layout.c:1239
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:474
+msgid "Width"
+msgstr "Zabalera"
+
+#: ../clutter/clutter-actor.c:6285
+msgid "Width of the actor"
+msgstr "Aktorearen zabalera"
+
+#: ../clutter/clutter-actor.c:6303 ../clutter/clutter-canvas.c:258
+#: ../clutter/clutter-grid-layout.c:1246
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:490
+msgid "Height"
+msgstr "Altuera"
+
+#: ../clutter/clutter-actor.c:6304
+msgid "Height of the actor"
+msgstr "Aktorearen altuera"
+
+#: ../clutter/clutter-actor.c:6325
+msgid "Size"
+msgstr "Tamaina"
+
+#: ../clutter/clutter-actor.c:6326
+msgid "The size of the actor"
+msgstr "Aktorearen tamaina"
+
+#: ../clutter/clutter-actor.c:6344
+msgid "Fixed X"
+msgstr "X finkatua"
+
+#: ../clutter/clutter-actor.c:6345
+msgid "Forced X position of the actor"
+msgstr "Aktorearen derrigortutako X posizioa"
+
+#: ../clutter/clutter-actor.c:6362
+msgid "Fixed Y"
+msgstr "Y finkatua"
+
+#: ../clutter/clutter-actor.c:6363
+msgid "Forced Y position of the actor"
+msgstr "Aktorearen derrigortutako Y posizioa"
+
+#: ../clutter/clutter-actor.c:6378
+msgid "Fixed position set"
+msgstr "Posizio finkatua ezarrita"
+
+#: ../clutter/clutter-actor.c:6379
+msgid "Whether to use fixed positioning for the actor"
+msgstr "Aktorearen posizioa finkoa erabiltzea edo ez"
+
+#: ../clutter/clutter-actor.c:6397
+msgid "Min Width"
+msgstr "Gutxieneko zabalera"
+
+#: ../clutter/clutter-actor.c:6398
+msgid "Forced minimum width request for the actor"
+msgstr "Aktorearen derrigortutako gutxieneko zabalera"
+
+#: ../clutter/clutter-actor.c:6416
+msgid "Min Height"
+msgstr "Gutxieneko altuera"
+
+#: ../clutter/clutter-actor.c:6417
+msgid "Forced minimum height request for the actor"
+msgstr "Aktorearen derrigortutako gutxieneko altuera"
+
+#: ../clutter/clutter-actor.c:6435
+msgid "Natural Width"
+msgstr "Zabalera naturala"
+
+#: ../clutter/clutter-actor.c:6436
+msgid "Forced natural width request for the actor"
+msgstr "Aktorearen derrigortutako zabalera naturala"
+
+#: ../clutter/clutter-actor.c:6454
+msgid "Natural Height"
+msgstr "Altuera naturala"
+
+#: ../clutter/clutter-actor.c:6455
+msgid "Forced natural height request for the actor"
+msgstr "Aktorearen derrigortutako altuera naturala"
+
+#: ../clutter/clutter-actor.c:6470
+msgid "Minimum width set"
+msgstr "Gutxieneko zabalera ezarrita"
+
+#: ../clutter/clutter-actor.c:6471
+msgid "Whether to use the min-width property"
+msgstr "Gutxieneko zabaleraren propietatea erabili edo ez"
+
+#: ../clutter/clutter-actor.c:6485
+msgid "Minimum height set"
+msgstr "Gutxieneko altuera ezarrita"
+
+#: ../clutter/clutter-actor.c:6486
+msgid "Whether to use the min-height property"
+msgstr "Gutxieneko altueraren propietatea erabili edo ez"
+
+#: ../clutter/clutter-actor.c:6500
+msgid "Natural width set"
+msgstr "Zabalera naturala ezarrita"
+
+#: ../clutter/clutter-actor.c:6501
+msgid "Whether to use the natural-width property"
+msgstr "Zabalera naturalaren propietatea erabili edo ez"
+
+#: ../clutter/clutter-actor.c:6515
+msgid "Natural height set"
+msgstr "Altuera naturala ezarrita"
+
+#: ../clutter/clutter-actor.c:6516
+msgid "Whether to use the natural-height property"
+msgstr "Altuera naturalaren propietatea erabili edo ez"
+
+#: ../clutter/clutter-actor.c:6532
+msgid "Allocation"
+msgstr "Esleipena"
+
+#: ../clutter/clutter-actor.c:6533
+msgid "The actor's allocation"
+msgstr "Aktorearen esleipena"
+
+#: ../clutter/clutter-actor.c:6590
+msgid "Request Mode"
+msgstr "Eskaera modua"
+
+#: ../clutter/clutter-actor.c:6591
+msgid "The actor's request mode"
+msgstr "Aktorearen eskaera modua"
+
+#: ../clutter/clutter-actor.c:6615
+msgid "Depth"
+msgstr "Sakonera"
+
+#: ../clutter/clutter-actor.c:6616
+msgid "Position on the Z axis"
+msgstr "Posizioa Z ardatzean"
+
+#: ../clutter/clutter-actor.c:6643
+msgid "Z Position"
+msgstr "Z posizioa"
+
+#: ../clutter/clutter-actor.c:6644
+msgid "The actor's position on the Z axis"
+msgstr "Aktorearen posizioa Z ardatzean"
+
+#: ../clutter/clutter-actor.c:6661
+msgid "Opacity"
+msgstr "Opakutasuna"
+
+#: ../clutter/clutter-actor.c:6662
+msgid "Opacity of an actor"
+msgstr "Aktore baten opakutasuna"
+
+#: ../clutter/clutter-actor.c:6682
+msgid "Offscreen redirect"
+msgstr "Pantailaz kanpoko berbideraketa"
+
+#: ../clutter/clutter-actor.c:6683
+msgid "Flags controlling when to flatten the actor into a single image"
+msgstr "Banderak aktore bat irudi bakar batera noiz berdintzea kontrolatzeko"
+
+#: ../clutter/clutter-actor.c:6697
+msgid "Visible"
+msgstr "Ikusgai"
+
+#: ../clutter/clutter-actor.c:6698
+msgid "Whether the actor is visible or not"
+msgstr "Aktorea ikusgai dagoen edo ez"
+
+#: ../clutter/clutter-actor.c:6712
+msgid "Mapped"
+msgstr "Mapatuta"
+
+#: ../clutter/clutter-actor.c:6713
+msgid "Whether the actor will be painted"
+msgstr "Aktorea margotu behar den edo ez"
+
+#: ../clutter/clutter-actor.c:6726
+msgid "Realized"
+msgstr "Osatuta"
+
+#: ../clutter/clutter-actor.c:6727
+msgid "Whether the actor has been realized"
+msgstr "Aktorea osatu den edo ez"
+
+#: ../clutter/clutter-actor.c:6742
+msgid "Reactive"
+msgstr "Erreaktiboa"
+
+#: ../clutter/clutter-actor.c:6743
+msgid "Whether the actor is reactive to events"
+msgstr "Aktorea gertaeren aurrean erantzuten duen edo ez"
+
+#: ../clutter/clutter-actor.c:6754
+msgid "Has Clip"
+msgstr "Klipa du"
+
+#: ../clutter/clutter-actor.c:6755
+msgid "Whether the actor has a clip set"
+msgstr "Aktoreak klip bat ezarrita duen edo ez"
+
+#: ../clutter/clutter-actor.c:6768
+msgid "Clip"
+msgstr "Mozketa"
+
+#: ../clutter/clutter-actor.c:6769
+msgid "The clip region for the actor"
+msgstr "Aktorearen mozketaren eskualdea"
+
+#: ../clutter/clutter-actor.c:6788
+msgid "Clip Rectangle"
+msgstr "Klip laukizuzena"
+
+#: ../clutter/clutter-actor.c:6789
+msgid "The visible region of the actor"
+msgstr "Aktorearen eskualde ikusgaia"
+
+#: ../clutter/clutter-actor.c:6803 ../clutter/clutter-actor-meta.c:205
+#: ../clutter/clutter-binding-pool.c:318 ../clutter/clutter-input-device.c:247
+msgid "Name"
+msgstr "Izena"
+
+#: ../clutter/clutter-actor.c:6804
+msgid "Name of the actor"
+msgstr "Aktorearen izena"
+
+#: ../clutter/clutter-actor.c:6825
+msgid "Pivot Point"
+msgstr "Biraketa-puntua"
+
+#: ../clutter/clutter-actor.c:6826
+msgid "The point around which the scaling and rotation occur"
+msgstr "Puntua, honen inguruan eskalatzeko eta biratzeko"
+
+#: ../clutter/clutter-actor.c:6844
+msgid "Pivot Point Z"
+msgstr "Z biraketa-puntua"
+
+#: ../clutter/clutter-actor.c:6845
+msgid "Z component of the pivot point"
+msgstr "Biraketa-puntuaren Z osagaia"
+
+#: ../clutter/clutter-actor.c:6863
+msgid "Scale X"
+msgstr "X eskala"
+
+#: ../clutter/clutter-actor.c:6864
+msgid "Scale factor on the X axis"
+msgstr "X ardatzeko eskala-faktorea"
+
+#: ../clutter/clutter-actor.c:6882
+msgid "Scale Y"
+msgstr "Y eskala"
+
+#: ../clutter/clutter-actor.c:6883
+msgid "Scale factor on the Y axis"
+msgstr "Y ardatzeko eskala-faktorea"
+
+#: ../clutter/clutter-actor.c:6901
+msgid "Scale Z"
+msgstr "Z eskala"
+
+#: ../clutter/clutter-actor.c:6902
+msgid "Scale factor on the Z axis"
+msgstr "Z ardatzeko eskala-faktorea"
+
+#: ../clutter/clutter-actor.c:6920
+msgid "Scale Center X"
+msgstr "X eskala-zentroa"
+
+#: ../clutter/clutter-actor.c:6921
+msgid "Horizontal scale center"
+msgstr "Eskala horizontalaren zentroa"
+
+#: ../clutter/clutter-actor.c:6939
+msgid "Scale Center Y"
+msgstr "Y eskala-zentroa"
+
+#: ../clutter/clutter-actor.c:6940
+msgid "Vertical scale center"
+msgstr "Eskala bertikalaren zentroa"
+
+#: ../clutter/clutter-actor.c:6958
+msgid "Scale Gravity"
+msgstr "Grabitate-eskala"
+
+#: ../clutter/clutter-actor.c:6959
+msgid "The center of scaling"
+msgstr "Eskalatzearen zentroa"
+
+#: ../clutter/clutter-actor.c:6977
+msgid "Rotation Angle X"
+msgstr "X biraketa-angelua"
+
+#: ../clutter/clutter-actor.c:6978
+msgid "The rotation angle on the X axis"
+msgstr "Biraketaren angelua X ardatzean"
+
+#: ../clutter/clutter-actor.c:6996
+msgid "Rotation Angle Y"
+msgstr "Y biraketa-angelua"
+
+#: ../clutter/clutter-actor.c:6997
+msgid "The rotation angle on the Y axis"
+msgstr "Biraketaren angelua Y ardatzean"
+
+#: ../clutter/clutter-actor.c:7015
+msgid "Rotation Angle Z"
+msgstr "Z biraketa-angelua"
+
+#: ../clutter/clutter-actor.c:7016
+msgid "The rotation angle on the Z axis"
+msgstr "Biraketaren angelua Z ardatzean"
+
+#: ../clutter/clutter-actor.c:7034
+msgid "Rotation Center X"
+msgstr "X biraketa-zentroa"
+
+#: ../clutter/clutter-actor.c:7035
+msgid "The rotation center on the X axis"
+msgstr "Biraketaren zentroa X ardatzean"
+
+#: ../clutter/clutter-actor.c:7052
+msgid "Rotation Center Y"
+msgstr "Y biraketa-zentroa"
+
+#: ../clutter/clutter-actor.c:7053
+msgid "The rotation center on the Y axis"
+msgstr "Biraketaren zentroa Y ardatzean"
+
+#: ../clutter/clutter-actor.c:7070
+msgid "Rotation Center Z"
+msgstr "Z biraketa-zentroa"
+
+#: ../clutter/clutter-actor.c:7071
+msgid "The rotation center on the Z axis"
+msgstr "Biraketaren zentroa Z ardatzean"
+
+#: ../clutter/clutter-actor.c:7088
+msgid "Rotation Center Z Gravity"
+msgstr "Z biraketa-zentroaren grabitatea"
+
+#: ../clutter/clutter-actor.c:7089
+msgid "Center point for rotation around the Z axis"
+msgstr "Biraketaren puntu zentrala Z ardatzean"
+
+#: ../clutter/clutter-actor.c:7117
+msgid "Anchor X"
+msgstr "X aingura"
+
+#: ../clutter/clutter-actor.c:7118
+msgid "X coordinate of the anchor point"
+msgstr "Aingura puntuaren X koordenatua"
+
+#: ../clutter/clutter-actor.c:7146
+msgid "Anchor Y"
+msgstr "Y aingura"
+
+#: ../clutter/clutter-actor.c:7147
+msgid "Y coordinate of the anchor point"
+msgstr "Aingura puntuaren Y koordenatua"
+
+#: ../clutter/clutter-actor.c:7174
+msgid "Anchor Gravity"
+msgstr "Ainguraren grabitatea"
+
+#: ../clutter/clutter-actor.c:7175
+msgid "The anchor point as a ClutterGravity"
+msgstr "Ainguraren puntua 'ClutterGravity' gisa"
+
+#: ../clutter/clutter-actor.c:7194
+msgid "Translation X"
+msgstr "X translazioa"
+
+#: ../clutter/clutter-actor.c:7195
+msgid "Translation along the X axis"
+msgstr "Translazioa X ardatzean"
+
+#: ../clutter/clutter-actor.c:7214
+msgid "Translation Y"
+msgstr "Y translazioa"
+
+#: ../clutter/clutter-actor.c:7215
+msgid "Translation along the Y axis"
+msgstr "Translazioa Y ardatzean"
+
+#: ../clutter/clutter-actor.c:7234
+msgid "Translation Z"
+msgstr "Z translazioa"
+
+#: ../clutter/clutter-actor.c:7235
+msgid "Translation along the Z axis"
+msgstr "Translazioa Y ardatzean"
+
+#: ../clutter/clutter-actor.c:7265
+msgid "Transform"
+msgstr "Eraldaketa"
+
+#: ../clutter/clutter-actor.c:7266
+msgid "Transformation matrix"
+msgstr "Eraldaketa-matrizea"
+
+#: ../clutter/clutter-actor.c:7281
+msgid "Transform Set"
+msgstr "Eraldaketaren ezarpena"
+
+#: ../clutter/clutter-actor.c:7282
+msgid "Whether the transform property is set"
+msgstr "Eraldaketaren propietateak ezarrita dauden edo ez"
+
+#: ../clutter/clutter-actor.c:7303
+msgid "Child Transform"
+msgstr "Eraldaketa umea"
+
+#: ../clutter/clutter-actor.c:7304
+msgid "Children transformation matrix"
+msgstr "Eraldaketa-matrize umeak"
+
+#: ../clutter/clutter-actor.c:7319
+msgid "Child Transform Set"
+msgstr "Eraldaketa umearen ezarpena"
+
+#: ../clutter/clutter-actor.c:7320
+msgid "Whether the child-transform property is set"
+msgstr "Eraldaketa umearen propietateak ezarrita dauden edo ez"
+
+#: ../clutter/clutter-actor.c:7337
+msgid "Show on set parent"
+msgstr "Erakutsi gurasoa ezartzean"
+
+#: ../clutter/clutter-actor.c:7338
+msgid "Whether the actor is shown when parented"
+msgstr "Aktorea erakutsiko den gurasoa ezartzean"
+
+#: ../clutter/clutter-actor.c:7355
+msgid "Clip to Allocation"
+msgstr "Moztu esleipenera"
+
+#: ../clutter/clutter-actor.c:7356
+msgid "Sets the clip region to track the actor's allocation"
+msgstr "Aktorearen esleipena jarraitzeko mozketaren eskualdea ezartzen du"
+
+#: ../clutter/clutter-actor.c:7369
+msgid "Text Direction"
+msgstr "Testuaren norabidea"
+
+#: ../clutter/clutter-actor.c:7370
+msgid "Direction of the text"
+msgstr "Testuaren norabidea"
+
+#: ../clutter/clutter-actor.c:7385
+msgid "Has Pointer"
+msgstr "Erakuslea du"
+
+#: ../clutter/clutter-actor.c:7386
+msgid "Whether the actor contains the pointer of an input device"
+msgstr "Aktoreak sarrerako gailuaren erakuslea duen edo ez"
+
+#: ../clutter/clutter-actor.c:7399
+msgid "Actions"
+msgstr "Ekintzak"
+
+#: ../clutter/clutter-actor.c:7400
+msgid "Adds an action to the actor"
+msgstr "Ekintza bat gehitzen dio aktoreari"
+
+#: ../clutter/clutter-actor.c:7413
+msgid "Constraints"
+msgstr "Murriztapenak"
+
+#: ../clutter/clutter-actor.c:7414
+msgid "Adds a constraint to the actor"
+msgstr "Murriztapen bat gehitzen dio aktoreari"
+
+#: ../clutter/clutter-actor.c:7427
+msgid "Effect"
+msgstr "Efektua"
+
+#: ../clutter/clutter-actor.c:7428
+msgid "Add an effect to be applied on the actor"
+msgstr "Efektu bat aplikatzen dio aktoreari"
+
+#: ../clutter/clutter-actor.c:7442
+msgid "Layout Manager"
+msgstr "Diseinu-kudeatzailea"
+
+#: ../clutter/clutter-actor.c:7443
+msgid "The object controlling the layout of an actor's children"
+msgstr "Aktorearen umeen diseinua kontrolatzen duen objektua"
+
+#: ../clutter/clutter-actor.c:7457
+msgid "X Expand"
+msgstr "X hedapena"
+
+#: ../clutter/clutter-actor.c:7458
+msgid "Whether extra horizontal space should be assigned to the actor"
+msgstr "Aktoreari leku horizontal gehigarria esleituko zaion edo ez"
+
+#: ../clutter/clutter-actor.c:7473
+msgid "Y Expand"
+msgstr "Y hedapena"
+
+#: ../clutter/clutter-actor.c:7474
+msgid "Whether extra vertical space should be assigned to the actor"
+msgstr "Aktoreari leku bertikal gehigarria esleituko zaion edo ez"
+
+#: ../clutter/clutter-actor.c:7490
+msgid "X Alignment"
+msgstr "X lerrokadura"
+
+#: ../clutter/clutter-actor.c:7491
+msgid "The alignment of the actor on the X axis within its allocation"
+msgstr "Aktorearen lerrokadura X ardatzean bere esleipenean"
+
+#: ../clutter/clutter-actor.c:7506
+msgid "Y Alignment"
+msgstr "Y lerrokadura"
+
+#: ../clutter/clutter-actor.c:7507
+msgid "The alignment of the actor on the Y axis within its allocation"
+msgstr "Aktorearen lerrokadura Y ardatzean bere esleipenean"
+
+#: ../clutter/clutter-actor.c:7526
+msgid "Margin Top"
+msgstr "Goiko marjina"
+
+#: ../clutter/clutter-actor.c:7527
+msgid "Extra space at the top"
+msgstr "Leku gehigarria goian"
+
+#: ../clutter/clutter-actor.c:7548
+msgid "Margin Bottom"
+msgstr "Beheko marjina"
+
+#: ../clutter/clutter-actor.c:7549
+msgid "Extra space at the bottom"
+msgstr "Leku gehigarria behean"
+
+#: ../clutter/clutter-actor.c:7570
+msgid "Margin Left"
+msgstr "Ezkerreko marjina"
+
+#: ../clutter/clutter-actor.c:7571
+msgid "Extra space at the left"
+msgstr "Leku gehigarria ezkerrean"
+
+#: ../clutter/clutter-actor.c:7592
+msgid "Margin Right"
+msgstr "Eskuineko marjina"
+
+#: ../clutter/clutter-actor.c:7593
+msgid "Extra space at the right"
+msgstr "Leku gehigarria eskuinean"
+
+#: ../clutter/clutter-actor.c:7609
+msgid "Background Color Set"
+msgstr "Atzeko planoaren kolorea ezarrita"
+
+#: ../clutter/clutter-actor.c:7610 ../clutter/deprecated/clutter-box.c:269
+msgid "Whether the background color is set"
+msgstr "Atzeko planoaren kolorea ezarrita dagoen ala ez"
+
+#: ../clutter/clutter-actor.c:7626
+msgid "Background color"
+msgstr "Atzeko planoaren kolorea"
+
+#: ../clutter/clutter-actor.c:7627
+msgid "The actor's background color"
+msgstr "Aktorearen atzeko planoko kolorea"
+
+#: ../clutter/clutter-actor.c:7642
+msgid "First Child"
+msgstr "Aurreneko umea"
+
+#: ../clutter/clutter-actor.c:7643
+msgid "The actor's first child"
+msgstr "Aktorearen aurreneko umea"
+
+#: ../clutter/clutter-actor.c:7656
+msgid "Last Child"
+msgstr "Azken umea"
+
+#: ../clutter/clutter-actor.c:7657
+msgid "The actor's last child"
+msgstr "Aktorearen azkeneko umea"
+
+#: ../clutter/clutter-actor.c:7671
+msgid "Content"
+msgstr "Edukia"
+
+#: ../clutter/clutter-actor.c:7672
+msgid "Delegate object for painting the actor's content"
+msgstr "Eskuordetu objektua aktorearen edukia margotzeko"
+
+#: ../clutter/clutter-actor.c:7697
+msgid "Content Gravity"
+msgstr "Edukiaren grabitate-zentroa"
+
+#: ../clutter/clutter-actor.c:7698
+msgid "Alignment of the actor's content"
+msgstr "Lerrokatu aktorearen edukia"
+
+#: ../clutter/clutter-actor.c:7718
+msgid "Content Box"
+msgstr "Edukiaren kutxa"
+
+#: ../clutter/clutter-actor.c:7719
+msgid "The bounding box of the actor's content"
+msgstr "Aktorearen edukiaren konbinazio-koadroa"
+
+#: ../clutter/clutter-actor.c:7727
+msgid "Minification Filter"
+msgstr "Txikiagotzeko iragazkia"
+
+#: ../clutter/clutter-actor.c:7728
+msgid "The filter used when reducing the size of the content"
+msgstr "Iragazkia edukiaren tamaina txikiagotzean erabiltzeko"
+
+#: ../clutter/clutter-actor.c:7735
+msgid "Magnification Filter"
+msgstr "Handiagotzeko iragazkia"
+
+#: ../clutter/clutter-actor.c:7736
+msgid "The filter used when increasing the size of the content"
+msgstr "Iragazkia edukiaren tamaina handiagotzean erabiltzeko"
+
+#: ../clutter/clutter-actor.c:7750
+msgid "Content Repeat"
+msgstr "Edukiaren errepikapena"
+
+#: ../clutter/clutter-actor.c:7751
+msgid "The repeat policy for the actor's content"
+msgstr "Aktorearen edukia errepikatzeko araua"
+
+#: ../clutter/clutter-actor-meta.c:191 ../clutter/clutter-child-meta.c:142
+msgid "Actor"
+msgstr "Aktorea"
+
+#: ../clutter/clutter-actor-meta.c:192
+msgid "The actor attached to the meta"
+msgstr "Meta-ri erantsitako aktorea"
+
+#: ../clutter/clutter-actor-meta.c:206
+msgid "The name of the meta"
+msgstr "Meta-ren izena"
+
+#: ../clutter/clutter-actor-meta.c:219 ../clutter/clutter-input-device.c:326
+#: ../clutter/deprecated/clutter-shader.c:309
+msgid "Enabled"
+msgstr "Gaituta"
+
+#: ../clutter/clutter-actor-meta.c:220
+msgid "Whether the meta is enabled"
+msgstr "Meta gaituta dauden edo ez"
+
+#: ../clutter/clutter-align-constraint.c:279
+#: ../clutter/clutter-bind-constraint.c:343 ../clutter/clutter-clone.c:341
+#: ../clutter/clutter-snap-constraint.c:321
+msgid "Source"
+msgstr "Iturburua"
+
+#: ../clutter/clutter-align-constraint.c:280
+msgid "The source of the alignment"
+msgstr "Lerrokaduraren iturburua"
+
+#: ../clutter/clutter-align-constraint.c:293
+msgid "Align Axis"
+msgstr "Lerrokaduraren ardatza"
+
+#: ../clutter/clutter-align-constraint.c:294
+msgid "The axis to align the position to"
+msgstr "Posizioa lerrokatzeko ardatza"
+
+#: ../clutter/clutter-align-constraint.c:313
+#: ../clutter/clutter-desaturate-effect.c:270
+msgid "Factor"
+msgstr "Faktorea"
+
+#: ../clutter/clutter-align-constraint.c:314
+msgid "The alignment factor, between 0.0 and 1.0"
+msgstr "Lerrokaduraren faktorea, 0.0 eta 1.0 artekoa"
+
+#: ../clutter/clutter-backend.c:380
+msgid "Unable to initialize the Clutter backend"
+msgstr "Ezin da Clutter motorra hasieratu"
+
+#: ../clutter/clutter-backend.c:454
+#, c-format
+msgid "The backend of type '%s' does not support creating multiple stages"
+msgstr "'%s' motako motorrak ez du eszena anitzik sortzea onartzen"
+
+#: ../clutter/clutter-bind-constraint.c:344
+msgid "The source of the binding"
+msgstr "Loturaren iturburua"
+
+#: ../clutter/clutter-bind-constraint.c:357
+msgid "Coordinate"
+msgstr "Koordenatua"
+
+#: ../clutter/clutter-bind-constraint.c:358
+msgid "The coordinate to bind"
+msgstr "Koordenatua lotzeko"
+
+#: ../clutter/clutter-bind-constraint.c:372
+#: ../clutter/clutter-path-constraint.c:226
+#: ../clutter/clutter-snap-constraint.c:366
+msgid "Offset"
+msgstr "Desplazamendua"
+
+#: ../clutter/clutter-bind-constraint.c:373
+msgid "The offset in pixels to apply to the binding"
+msgstr "Loturari aplikatuko zaion desplazamendua (pixeletan)"
+
+#: ../clutter/clutter-binding-pool.c:319
+msgid "The unique name of the binding pool"
+msgstr "Lotura taldearen izen berezia"
+
+#: ../clutter/clutter-bin-layout.c:220 ../clutter/clutter-bin-layout.c:633
+#: ../clutter/clutter-box-layout.c:374
+#: ../clutter/deprecated/clutter-table-layout.c:602
+msgid "Horizontal Alignment"
+msgstr "Lerrokatze horizontala"
+
+#: ../clutter/clutter-bin-layout.c:221
+msgid "Horizontal alignment for the actor inside the layout manager"
+msgstr "Aktorearen lerrokatze horizontala diseinu-kudeatzailearen barnean"
+
+#: ../clutter/clutter-bin-layout.c:229 ../clutter/clutter-bin-layout.c:653
+#: ../clutter/clutter-box-layout.c:383
+#: ../clutter/deprecated/clutter-table-layout.c:617
+msgid "Vertical Alignment"
+msgstr "Lerrokatze bertikala"
+
+#: ../clutter/clutter-bin-layout.c:230
+msgid "Vertical alignment for the actor inside the layout manager"
+msgstr "Aktorearen lerrokatze bertikala diseinu-kudeatzailearen barnean"
+
+#: ../clutter/clutter-bin-layout.c:634
+msgid "Default horizontal alignment for the actors inside the layout manager"
+msgstr ""
+"Aktorearen lerrokatze horizontal lehenetsia diseinu-kudeatzailearen barnean"
+
+#: ../clutter/clutter-bin-layout.c:654
+msgid "Default vertical alignment for the actors inside the layout manager"
+msgstr ""
+"Aktorearen lerrokatze bertikal lehenetsia diseinu-kudeatzailearen barnean"
+
+#: ../clutter/clutter-box-layout.c:349
+msgid "Expand"
+msgstr "Hedatu"
+
+#: ../clutter/clutter-box-layout.c:350
+msgid "Allocate extra space for the child"
+msgstr "Esleitu leku gehigarria umearentzako"
+
+#: ../clutter/clutter-box-layout.c:356
+#: ../clutter/deprecated/clutter-table-layout.c:581
+msgid "Horizontal Fill"
+msgstr "Betegarri horizontala"
+
+#: ../clutter/clutter-box-layout.c:357
+#: ../clutter/deprecated/clutter-table-layout.c:582
+msgid ""
+"Whether the child should receive priority when the container is allocating "
+"spare space on the horizontal axis"
+msgstr ""
+"Leku gehigarria ardatz horizontalean esleitzean umeak lehentasuna jaso behar "
+"duen edo ez"
+
+#: ../clutter/clutter-box-layout.c:365
+#: ../clutter/deprecated/clutter-table-layout.c:588
+msgid "Vertical Fill"
+msgstr "Betegarri bertikala"
+
+#: ../clutter/clutter-box-layout.c:366
+#: ../clutter/deprecated/clutter-table-layout.c:589
+msgid ""
+"Whether the child should receive priority when the container is allocating "
+"spare space on the vertical axis"
+msgstr ""
+"Leku gehigarria ardatz bertikalean esleitzean umeak lehentasuna jaso behar "
+"duen edo ez"
+
+#: ../clutter/clutter-box-layout.c:375
+#: ../clutter/deprecated/clutter-table-layout.c:603
+msgid "Horizontal alignment of the actor within the cell"
+msgstr "Aktorearen lerrokatze horizontala gelaxka barruan"
+
+#: ../clutter/clutter-box-layout.c:384
+#: ../clutter/deprecated/clutter-table-layout.c:618
+msgid "Vertical alignment of the actor within the cell"
+msgstr "Aktorearen lerrokatze bertikala gelaxka barruan"
+
+#: ../clutter/clutter-box-layout.c:1345
+msgid "Vertical"
+msgstr "Bertikala"
+
+#: ../clutter/clutter-box-layout.c:1346
+msgid "Whether the layout should be vertical, rather than horizontal"
+msgstr "Diseinua bertikala izan behar den (horizontalaren ordez) edo ez"
+
+#: ../clutter/clutter-box-layout.c:1363 ../clutter/clutter-flow-layout.c:927
+#: ../clutter/clutter-grid-layout.c:1549
+msgid "Orientation"
+msgstr "Orientazioa"
+
+#: ../clutter/clutter-box-layout.c:1364 ../clutter/clutter-flow-layout.c:928
+#: ../clutter/clutter-grid-layout.c:1550
+msgid "The orientation of the layout"
+msgstr "Diseinuaren orientazioa"
+
+#: ../clutter/clutter-box-layout.c:1380 ../clutter/clutter-flow-layout.c:943
+msgid "Homogeneous"
+msgstr "Homogeneoa"
+
+#: ../clutter/clutter-box-layout.c:1381
+msgid ""
+"Whether the layout should be homogeneous, i.e. all childs get the same size"
+msgstr ""
+"Diseinua homogeneoa izan behar duen edo ez, adib. ume guztiek tamaina "
+"berdina edukiko duten edo ez"
+
+#: ../clutter/clutter-box-layout.c:1396
+msgid "Pack Start"
+msgstr "Paketatu hasieran"
+
+#: ../clutter/clutter-box-layout.c:1397
+msgid "Whether to pack items at the start of the box"
+msgstr "Elementuak kutxaren hasieran paketatuko diren edo ez"
+
+#: ../clutter/clutter-box-layout.c:1410
+msgid "Spacing"
+msgstr "Tartea"
+
+#: ../clutter/clutter-box-layout.c:1411
+msgid "Spacing between children"
+msgstr "Umeen arteko tartea"
+
+#: ../clutter/clutter-box-layout.c:1428
+#: ../clutter/deprecated/clutter-table-layout.c:1669
+msgid "Use Animations"
+msgstr "Erabili animazioak"
+
+#: ../clutter/clutter-box-layout.c:1429
+#: ../clutter/deprecated/clutter-table-layout.c:1670
+msgid "Whether layout changes should be animated"
+msgstr "Diseinuaren aldaketetan animazioa egongo den edo ez"
+
+#: ../clutter/clutter-box-layout.c:1453
+#: ../clutter/deprecated/clutter-table-layout.c:1694
+msgid "Easing Mode"
+msgstr "Azelerazioaren modua"
+
+#: ../clutter/clutter-box-layout.c:1454
+#: ../clutter/deprecated/clutter-table-layout.c:1695
+msgid "The easing mode of the animations"
+msgstr "Animazioen azelerazioaren modua"
+
+#: ../clutter/clutter-box-layout.c:1474
+#: ../clutter/deprecated/clutter-table-layout.c:1715
+msgid "Easing Duration"
+msgstr "Azelerazioaren iraupena"
+
+#: ../clutter/clutter-box-layout.c:1475
+#: ../clutter/deprecated/clutter-table-layout.c:1716
+msgid "The duration of the animations"
+msgstr "Animazioen iraupena"
+
+#: ../clutter/clutter-brightness-contrast-effect.c:321
+msgid "Brightness"
+msgstr "Distira"
+
+#: ../clutter/clutter-brightness-contrast-effect.c:322
+msgid "The brightness change to apply"
+msgstr "Distiraren aldaketa aplikatzeko"
+
+#: ../clutter/clutter-brightness-contrast-effect.c:341
+msgid "Contrast"
+msgstr "Kontrastea"
+
+#: ../clutter/clutter-brightness-contrast-effect.c:342
+msgid "The contrast change to apply"
+msgstr "Kontrastearen aldaketa aplikatzeko"
+
+#: ../clutter/clutter-canvas.c:243
+msgid "The width of the canvas"
+msgstr "Oihalaren zabalera"
+
+#: ../clutter/clutter-canvas.c:259
+msgid "The height of the canvas"
+msgstr "Oihalaren altuera"
+
+#: ../clutter/clutter-canvas.c:278
+msgid "Scale Factor Set"
+msgstr "Eskala-faktorea ezarrita"
+
+#: ../clutter/clutter-canvas.c:279
+msgid "Whether the scale-factor property is set"
+msgstr "Eskala-faktorearen propietatea ezarrita dagoen edo ez"
+
+#: ../clutter/clutter-canvas.c:300
+msgid "Scale Factor"
+msgstr "Eskala-faktorea"
+
+#: ../clutter/clutter-canvas.c:301
+msgid "The scaling factor for the surface"
+msgstr "Gainazalaren eskala-faktorea"
+
+#: ../clutter/clutter-child-meta.c:127
+msgid "Container"
+msgstr "Edukiontzia"
+
+#: ../clutter/clutter-child-meta.c:128
+msgid "The container that created this data"
+msgstr "Datu hauek sortutako edukiontzia"
+
+#: ../clutter/clutter-child-meta.c:143
+msgid "The actor wrapped by this data"
+msgstr "Datu hauei egokitutako aktorea"
+
+#: ../clutter/clutter-click-action.c:586
+msgid "Pressed"
+msgstr "Sakatuta"
+
+#: ../clutter/clutter-click-action.c:587
+msgid "Whether the clickable should be in pressed state"
+msgstr "Klikagarria sakatzeko egoeran egon behar duen edo ez"
+
+#: ../clutter/clutter-click-action.c:600
+msgid "Held"
+msgstr "Atxikituta"
+
+#: ../clutter/clutter-click-action.c:601
+msgid "Whether the clickable has a grab"
+msgstr "Objektu klikagarriak kaptura bat duen edo ez"
+
+#: ../clutter/clutter-click-action.c:618 ../clutter/clutter-settings.c:651
+msgid "Long Press Duration"
+msgstr "Sakatze luzearen iraupena"
+
+#: ../clutter/clutter-click-action.c:619
+msgid "The minimum duration of a long press to recognize the gesture"
+msgstr "Sakatze luzearen gutxieneko iraupena keinu gisa onartzeko"
+
+#: ../clutter/clutter-click-action.c:637
+msgid "Long Press Threshold"
+msgstr "Sakatze luzearen atalasea"
+
+#: ../clutter/clutter-click-action.c:638
+msgid "The maximum threshold before a long press is cancelled"
+msgstr "Gehienezko atalasea sakatze luzea bertan behera utzi aurretik"
+
+#: ../clutter/clutter-clone.c:342
+msgid "Specifies the actor to be cloned"
+msgstr "Aktorea zehazten du klonatzeko"
+
+#: ../clutter/clutter-colorize-effect.c:251
+msgid "Tint"
+msgstr "Tinda"
+
+#: ../clutter/clutter-colorize-effect.c:252
+msgid "The tint to apply"
+msgstr "Tinda aplikatzeko"
+
+#: ../clutter/clutter-deform-effect.c:591
+msgid "Horizontal Tiles"
+msgstr "Lauza horizontalak"
+
+#: ../clutter/clutter-deform-effect.c:592
+msgid "The number of horizontal tiles"
+msgstr "Lauza horizontalen kopurua"
+
+#: ../clutter/clutter-deform-effect.c:607
+msgid "Vertical Tiles"
+msgstr "Lauza bertikalak"
+
+#: ../clutter/clutter-deform-effect.c:608
+msgid "The number of vertical tiles"
+msgstr "Lauza bertikalen kopurua"
+
+#: ../clutter/clutter-deform-effect.c:625
+msgid "Back Material"
+msgstr "Atzeko materiala"
+
+#: ../clutter/clutter-deform-effect.c:626
+msgid "The material to be used when painting the back of the actor"
+msgstr "Aktorearen atzeko aldea margotzean erabiliko den materiala"
+
+#: ../clutter/clutter-desaturate-effect.c:271
+msgid "The desaturation factor"
+msgstr "Desaturazio-faktorea"
+
+#: ../clutter/clutter-device-manager.c:127
+#: ../clutter/clutter-input-device.c:355
+#: ../clutter/x11/clutter-keymap-x11.c:457
+msgid "Backend"
+msgstr "Motorra"
+
+#: ../clutter/clutter-device-manager.c:128
+msgid "The ClutterBackend of the device manager"
+msgstr "Gailu-kudeatzailearen ClutterBackend"
+
+#: ../clutter/clutter-drag-action.c:733
+msgid "Horizontal Drag Threshold"
+msgstr "Arrastatze horizontalaren atalasea"
+
+#: ../clutter/clutter-drag-action.c:734
+msgid "The horizontal amount of pixels required to start dragging"
+msgstr "Arrastatzen hasteko behar den pixel horizontalen kopurua"
+
+#: ../clutter/clutter-drag-action.c:761
+msgid "Vertical Drag Threshold"
+msgstr "Arrastatze bertikalaren atalasea"
+
+#: ../clutter/clutter-drag-action.c:762
+msgid "The vertical amount of pixels required to start dragging"
+msgstr "Arrastatzen hasteko behar den pixel bertikalen kopurua"
+
+#: ../clutter/clutter-drag-action.c:783
+msgid "Drag Handle"
+msgstr "Arrastatzeko heldulekua"
+
+#: ../clutter/clutter-drag-action.c:784
+msgid "The actor that is being dragged"
+msgstr "Arrastatzen ari den aktorea"
+
+#: ../clutter/clutter-drag-action.c:797
+msgid "Drag Axis"
+msgstr "Arrastatzearen ardatza"
+
+#: ../clutter/clutter-drag-action.c:798
+msgid "Constraints the dragging to an axis"
+msgstr "Arrastatzea ardatz batera murrizten du"
+
+#: ../clutter/clutter-drag-action.c:814
+msgid "Drag Area"
+msgstr "Arrastatzearen area"
+
+#: ../clutter/clutter-drag-action.c:815
+msgid "Constrains the dragging to a rectangle"
+msgstr "Arrastatzea laukizuzen batera murrizten du"
+
+#: ../clutter/clutter-drag-action.c:828
+msgid "Drag Area Set"
+msgstr "Arrastatzearen area ezarrita"
+
+#: ../clutter/clutter-drag-action.c:829
+msgid "Whether the drag area is set"
+msgstr "Arrastatzearen area ezarrita dagoen edo ez"
+
+#: ../clutter/clutter-flow-layout.c:944
+msgid "Whether each item should receive the same allocation"
+msgstr "Elementu bakoitzak esleipen berdina jaso beharko lukeen edo ez"
+
+#: ../clutter/clutter-flow-layout.c:959
+#: ../clutter/deprecated/clutter-table-layout.c:1629
+msgid "Column Spacing"
+msgstr "Zutabeen arteko tartea"
+
+#: ../clutter/clutter-flow-layout.c:960
+msgid "The spacing between columns"
+msgstr "Zutabeen arteko tartea"
+
+#: ../clutter/clutter-flow-layout.c:976
+#: ../clutter/deprecated/clutter-table-layout.c:1645
+msgid "Row Spacing"
+msgstr "Errenkaden arteko tartea"
+
+#: ../clutter/clutter-flow-layout.c:977
+msgid "The spacing between rows"
+msgstr "Errenkaden arteko tartea"
+
+#: ../clutter/clutter-flow-layout.c:991
+msgid "Minimum Column Width"
+msgstr "Zutabearen gutxieneko zabalera"
+
+#: ../clutter/clutter-flow-layout.c:992
+msgid "Minimum width for each column"
+msgstr "Zutabe bakoitzaren gutxieneko zabalera"
+
+#: ../clutter/clutter-flow-layout.c:1007
+msgid "Maximum Column Width"
+msgstr "Zutabearen gehienezko zabalera"
+
+#: ../clutter/clutter-flow-layout.c:1008
+msgid "Maximum width for each column"
+msgstr "Zutabe bakoitzaren gehienezko zabalera"
+
+#: ../clutter/clutter-flow-layout.c:1022
+msgid "Minimum Row Height"
+msgstr "Errenkadaren gutxieneko altuera"
+
+#: ../clutter/clutter-flow-layout.c:1023
+msgid "Minimum height for each row"
+msgstr "Errenkada bakoitzaren gutxieneko altuera"
+
+#: ../clutter/clutter-flow-layout.c:1038
+msgid "Maximum Row Height"
+msgstr "Errenkadaren gehienezko altuera"
+
+#: ../clutter/clutter-flow-layout.c:1039
+msgid "Maximum height for each row"
+msgstr "Errenkada bakoitzaren gehienezko altuera"
+
+#: ../clutter/clutter-flow-layout.c:1054 ../clutter/clutter-flow-layout.c:1055
+msgid "Snap to grid"
+msgstr "Atxiki saretari"
+
+#: ../clutter/clutter-gesture-action.c:668
+msgid "Number touch points"
+msgstr "Ukimen-puntuen kopurua"
+
+#: ../clutter/clutter-gesture-action.c:669
+msgid "Number of touch points"
+msgstr "Ukimen-puntuen kopurua"
+
+#: ../clutter/clutter-gesture-action.c:684
+msgid "Threshold Trigger Edge"
+msgstr "Ertzen aktibazioaren atalasea"
+
+#: ../clutter/clutter-gesture-action.c:685
+msgid "The trigger edge used by the action"
+msgstr "Ekintzak erabilitako ertzen aktibazioa"
+
+#: ../clutter/clutter-gesture-action.c:704
+msgid "Threshold Trigger Horizontal Distance"
+msgstr "Distantzia horizontalaren aktibazioaren atalasea"
+
+#: ../clutter/clutter-gesture-action.c:705
+msgid "The horizontal trigger distance used by the action"
+msgstr "Ekintzak erabilitako distantzia horizontalaren aktibazioa"
+
+#: ../clutter/clutter-gesture-action.c:723
+msgid "Threshold Trigger Vertical Distance"
+msgstr "Distantzia bertikalaren aktibazioaren atalasea"
+
+#: ../clutter/clutter-gesture-action.c:724
+msgid "The vertical trigger distance used by the action"
+msgstr "Ekintzak erabilitako distantzia bertikalaren aktibazioa"
+
+#: ../clutter/clutter-grid-layout.c:1223
+msgid "Left attachment"
+msgstr "Ezkerreko eranskina"
+
+#: ../clutter/clutter-grid-layout.c:1224
+msgid "The column number to attach the left side of the child to"
+msgstr "Umearen ezkerreko aldean erantsi beharreko zutabeen kopurua"
+
+#: ../clutter/clutter-grid-layout.c:1231
+msgid "Top attachment"
+msgstr "Goiko eranskina"
+
+#: ../clutter/clutter-grid-layout.c:1232
+msgid "The row number to attach the top side of a child widget to"
+msgstr "Trepeta umearen goian erantsi beharreko errenkaden kopurua"
+
+#: ../clutter/clutter-grid-layout.c:1240
+msgid "The number of columns that a child spans"
+msgstr "Ume batek hedatzen duen zutabe kopurua"
+
+#: ../clutter/clutter-grid-layout.c:1247
+msgid "The number of rows that a child spans"
+msgstr "Ume batek hedatzen duen errenkada kopurua"
+
+#: ../clutter/clutter-grid-layout.c:1564
+msgid "Row spacing"
+msgstr "Errenkaden arteko tartea"
+
+#: ../clutter/clutter-grid-layout.c:1565
+msgid "The amount of space between two consecutive rows"
+msgstr "Elkarren segidako bi errenkaden arteko lekua"
+
+#: ../clutter/clutter-grid-layout.c:1578
+msgid "Column spacing"
+msgstr "Zutabeen arteko tartea"
+
+#: ../clutter/clutter-grid-layout.c:1579
+msgid "The amount of space between two consecutive columns"
+msgstr "Elkarren segidako bi zutaberen arteko lekua"
+
+#: ../clutter/clutter-grid-layout.c:1593
+msgid "Row Homogeneous"
+msgstr "Errenkada homogeneoa"
+
+#: ../clutter/clutter-grid-layout.c:1594
+msgid "If TRUE, the rows are all the same height"
+msgstr "TRUE (egia) bada, errenkada guztiek altuera bera edukiko dute"
+
+#: ../clutter/clutter-grid-layout.c:1607
+msgid "Column Homogeneous"
+msgstr "Zutabe homogeneoa"
+
+#: ../clutter/clutter-grid-layout.c:1608
+msgid "If TRUE, the columns are all the same width"
+msgstr "TRUE (egia) bada, errenkada guztiek zabalera bera edukiko dute"
+
+#: ../clutter/clutter-image.c:246 ../clutter/clutter-image.c:309
+#: ../clutter/clutter-image.c:397
+msgid "Unable to load image data"
+msgstr "Ezin da irudiaren daturik eskuratu"
+
+#: ../clutter/clutter-input-device.c:231
+msgid "Id"
+msgstr "IDa"
+
+#: ../clutter/clutter-input-device.c:232
+msgid "Unique identifier of the device"
+msgstr "Gailuaren identifikatzaile esklusiboa"
+
+#: ../clutter/clutter-input-device.c:248
+msgid "The name of the device"
+msgstr "Gailuaren izena"
+
+#: ../clutter/clutter-input-device.c:262
+msgid "Device Type"
+msgstr "Gailu mota"
+
+#: ../clutter/clutter-input-device.c:263
+msgid "The type of the device"
+msgstr "Gailu mota"
+
+#: ../clutter/clutter-input-device.c:278
+msgid "Device Manager"
+msgstr "Gailuen kudeatzailea"
+
+#: ../clutter/clutter-input-device.c:279
+msgid "The device manager instance"
+msgstr "Gailuen kudeatzailearen instantzia"
+
+#: ../clutter/clutter-input-device.c:292
+msgid "Device Mode"
+msgstr "Gailuaren modua"
+
+#: ../clutter/clutter-input-device.c:293
+msgid "The mode of the device"
+msgstr "Gailuaren modua"
+
+#: ../clutter/clutter-input-device.c:307
+msgid "Has Cursor"
+msgstr "Kurtsorea du"
+
+#: ../clutter/clutter-input-device.c:308
+msgid "Whether the device has a cursor"
+msgstr "Gailuak kurtsorea duen edo ez"
+
+#: ../clutter/clutter-input-device.c:327
+msgid "Whether the device is enabled"
+msgstr "Gailua gaituta dagoen edo ez"
+
+#: ../clutter/clutter-input-device.c:340
+msgid "Number of Axes"
+msgstr "Ardatzen kopurua"
+
+#: ../clutter/clutter-input-device.c:341
+msgid "The number of axes on the device"
+msgstr "Gailuaren ardatzen kopurua"
+
+#: ../clutter/clutter-input-device.c:356
+msgid "The backend instance"
+msgstr "Motorraren instantzia"
+
+#: ../clutter/clutter-interval.c:557
+msgid "Value Type"
+msgstr "Balio mota"
+
+#: ../clutter/clutter-interval.c:558
+msgid "The type of the values in the interval"
+msgstr "Balioaren mota tartean"
+
+#: ../clutter/clutter-interval.c:573
+msgid "Initial Value"
+msgstr "Hasierako balioa"
+
+#: ../clutter/clutter-interval.c:574
+msgid "Initial value of the interval"
+msgstr "Tartearen hasierako balioa"
+
+#: ../clutter/clutter-interval.c:588
+msgid "Final Value"
+msgstr "Amaierako balioa"
+
+#: ../clutter/clutter-interval.c:589
+msgid "Final value of the interval"
+msgstr "Tartearen amaierako balioa"
+
+#: ../clutter/clutter-layout-meta.c:117
+msgid "Manager"
+msgstr "Kudeatzailea"
+
+#: ../clutter/clutter-layout-meta.c:118
+msgid "The manager that created this data"
+msgstr "Datu hauek sortu dituen kudeatzailea"
+
+#. Translators: Leave this UNTRANSLATED if your language is
+#. * left-to-right.  If your language is right-to-left
+#. * (e.g. Hebrew, Arabic), translate it to "default:RTL".
+#. *
+#. * Do NOT translate it to non-English e.g. "predefinito:LTR"! If
+#. * it isn't default:LTR or default:RTL it will not work.
+#.
+#: ../clutter/clutter-main.c:751
+msgid "default:LTR"
+msgstr "default:LTR"
+
+#: ../clutter/clutter-main.c:1578
+msgid "Show frames per second"
+msgstr "Erakutsi fotogramak segundoko"
+
+#: ../clutter/clutter-main.c:1580
+msgid "Default frame rate"
+msgstr "Fotograma-emari lehenetsia"
+
+#: ../clutter/clutter-main.c:1582
+msgid "Make all warnings fatal"
+msgstr "Bihurtu abisu guztiak larri"
+
+#: ../clutter/clutter-main.c:1585
+msgid "Direction for the text"
+msgstr "Testuaren norabidea"
+
+#: ../clutter/clutter-main.c:1588
+msgid "Disable mipmapping on text"
+msgstr "Desgaitu MIP mapaketa testuan"
+
+#: ../clutter/clutter-main.c:1591
+msgid "Use 'fuzzy' picking"
+msgstr "Erabili 'zirriborro' motako hautapena"
+
+#: ../clutter/clutter-main.c:1594
+msgid "Clutter debugging flags to set"
+msgstr "Clutter arazteko banderak ezartzeko"
+
+#: ../clutter/clutter-main.c:1596
+msgid "Clutter debugging flags to unset"
+msgstr "Clutter arazteko banderak kentzeko"
+
+#: ../clutter/clutter-main.c:1600
+msgid "Clutter profiling flags to set"
+msgstr "Clutter-en profilaren banderak ezartzeko"
+
+#: ../clutter/clutter-main.c:1602
+msgid "Clutter profiling flags to unset"
+msgstr "Clutter-en profilaren banderak kentzeko"
+
+#: ../clutter/clutter-main.c:1605
+msgid "Enable accessibility"
+msgstr "Gaitu erabilerraztasuna"
+
+#: ../clutter/clutter-main.c:1797
+msgid "Clutter Options"
+msgstr "Clutter-en aukerak"
+
+#: ../clutter/clutter-main.c:1798
+msgid "Show Clutter Options"
+msgstr "Erakutsi Clutter-en aukerak"
+
+#: ../clutter/clutter-pan-action.c:455
+msgid "Pan Axis"
+msgstr "Panoramikaren ardatza"
+
+#: ../clutter/clutter-pan-action.c:456
+msgid "Constraints the panning to an axis"
+msgstr "Panoramika ardatz batera murrizten du"
+
+#: ../clutter/clutter-pan-action.c:470
+msgid "Interpolate"
+msgstr "Interpolatu"
+
+#: ../clutter/clutter-pan-action.c:471
+msgid "Whether interpolated events emission is enabled."
+msgstr "Interpolatutako gertaeren igorpenak gaituta dauden edo ez."
+
+#: ../clutter/clutter-pan-action.c:487
+msgid "Deceleration"
+msgstr "Dezelerazioa"
+
+#: ../clutter/clutter-pan-action.c:488
+msgid "Rate at which the interpolated panning will decelerate in"
+msgstr "Emaria Interpolatutako panoramika dezeleratzeko"
+
+#: ../clutter/clutter-pan-action.c:505
+msgid "Initial acceleration factor"
+msgstr "Hasierako azelerazioaren faktorea"
+
+#: ../clutter/clutter-pan-action.c:506
+msgid "Factor applied to the momentum when starting the interpolated phase"
+msgstr "Momentuari aplikatutako faktorea interpolatutako fasea hastean"
+
+#: ../clutter/clutter-path-constraint.c:212
+#: ../clutter/deprecated/clutter-behaviour-path.c:221
+msgid "Path"
+msgstr "Bidea"
+
+#: ../clutter/clutter-path-constraint.c:213
+msgid "The path used to constrain an actor"
+msgstr "Aktore bat murrizteko erabiliko den bidea"
+
+#: ../clutter/clutter-path-constraint.c:227
+msgid "The offset along the path, between -1.0 and 2.0"
+msgstr ""
+"Desplazamendua bidearen zehar. Balio erabilgarriak -1.0 eta 2.0 artekoak"
+
+#: ../clutter/clutter-property-transition.c:269
+msgid "Property Name"
+msgstr "Propietatearen izena"
+
+#: ../clutter/clutter-property-transition.c:270
+msgid "The name of the property to animate"
+msgstr "Propietatearen izena animazioa aplikatzeko"
+
+#: ../clutter/clutter-script.c:464
+msgid "Filename Set"
+msgstr "Fitxategi-izena ezarrita"
+
+#: ../clutter/clutter-script.c:465
+msgid "Whether the :filename property is set"
+msgstr "':filename' (fitxategi-izena) propietatea ezarrita dagoen edo ez"
+
+#: ../clutter/clutter-script.c:479
+#: ../clutter/deprecated/clutter-texture.c:1080
+msgid "Filename"
+msgstr "Fitxategi-izena"
+
+#: ../clutter/clutter-script.c:480
+msgid "The path of the currently parsed file"
+msgstr "Unean aztertutako fitxategiaren bide-izena"
+
+#: ../clutter/clutter-script.c:497
+msgid "Translation Domain"
+msgstr "Itzulpenaren domeinua"
+
+#: ../clutter/clutter-script.c:498
+msgid "The translation domain used to localize string"
+msgstr "Kateak itzultzeko erabilitako domeinua"
+
+#: ../clutter/clutter-scroll-actor.c:184
+msgid "Scroll Mode"
+msgstr "Korritze modua"
+
+#: ../clutter/clutter-scroll-actor.c:185
+msgid "The scrolling direction"
+msgstr "Korritzearen norabidea"
+
+#: ../clutter/clutter-settings.c:486
+msgid "Double Click Time"
+msgstr "Klik bikoitzaren denbora"
+
+#: ../clutter/clutter-settings.c:487
+msgid "The time between clicks necessary to detect a multiple click"
+msgstr "Klik-e arteko denbora klik anitza dela onartzeko"
+
+#: ../clutter/clutter-settings.c:502
+msgid "Double Click Distance"
+msgstr "Klik bikoitzaren distantzia"
+
+#: ../clutter/clutter-settings.c:503
+msgid "The distance between clicks necessary to detect a multiple click"
+msgstr "Klik-en arteko distantzia klik anitza dela onartzeko"
+
+#: ../clutter/clutter-settings.c:518
+msgid "Drag Threshold"
+msgstr "Arrastatzearen atalasea"
+
+#: ../clutter/clutter-settings.c:519
+msgid "The distance the cursor should travel before starting to drag"
+msgstr "Kurtsoreak ibili beharko lukeen distantzia arrastatzen hasi aurretik"
+
+#: ../clutter/clutter-settings.c:534 ../clutter/clutter-text.c:3437
+msgid "Font Name"
+msgstr "Letra-tipoaren izena"
+
+#: ../clutter/clutter-settings.c:535
+msgid ""
+"The description of the default font, as one that could be parsed by Pango"
+msgstr ""
+"Letra-tipo lehenetsiaren azalpena, Pango-k analiza dezakeenaren bezalakoa"
+
+#: ../clutter/clutter-settings.c:550
+msgid "Font Antialias"
+msgstr "Letra-tipoaren antialias-a"
+
+#: ../clutter/clutter-settings.c:551
+msgid ""
+"Whether to use antialiasing (1 to enable, 0 to disable, and -1 to use the "
+"default)"
+msgstr ""
+"Antialiasing-a erabili edo ez (1 gaitzeko, 0 desgaitzeko eta -1 lehenetsia "
+"erabiltzeko)"
+
+#: ../clutter/clutter-settings.c:567 ../clutter/clutter-settings.c:575
+msgid "Font DPI"
+msgstr "Letra-tipoaren DPIa"
+
+#: ../clutter/clutter-settings.c:568 ../clutter/clutter-settings.c:576
+msgid ""
+"The resolution of the font, in 1024 * dots/inch, or -1 to use the default"
+msgstr ""
+"Letra-tipoaren bereizmena, 1024 * puntu/hazbeteko, edo -1 lehenetsia "
+"erabiltzeko"
+
+#: ../clutter/clutter-settings.c:592
+msgid "Font Hinting"
+msgstr "Hizkien arteko tartea"
+
+#: ../clutter/clutter-settings.c:593
+msgid ""
+"Whether to use hinting (1 to enable, 0 to disable and -1 to use the default)"
+msgstr ""
+"Hizkien arteko tartea (hinting) erabili edo ez (1 gaitzeko, 0 desgaitzeko, "
+"eta -1 lehenetsia erabiltzeko)"
+
+#: ../clutter/clutter-settings.c:613
+msgid "Font Hint Style"
+msgstr "Letren arteko tartearen estiloa"
+
+#: ../clutter/clutter-settings.c:614
+msgid "The style of hinting (hintnone, hintslight, hintmedium, hintfull)"
+msgstr ""
+"Letren arteko tartearen estiloa: 'hintnone' (bat ere ez), "
+"'hintslight' (piskat), 'hintmedium' (tartekoa), 'hintful' (erabatekoa)"
+
+#: ../clutter/clutter-settings.c:634
+msgid "Font Subpixel Order"
+msgstr "Azpipixelen ordena"
+
+#: ../clutter/clutter-settings.c:635
+msgid "The type of subpixel antialiasing (none, rgb, bgr, vrgb, vbgr)"
+msgstr ""
+"Azpipixelen antialiasing mota: 'none'  (bat ere ez), 'rgb' (gorria berdea "
+"urdina), 'bgr', 'vrgb', 'vbgr'"
+
+#: ../clutter/clutter-settings.c:652
+msgid "The minimum duration for a long press gesture to be recognized"
+msgstr "Sakatze luzearen ikurraren gutxieneko iraupena ezagutzeko"
+
+#: ../clutter/clutter-settings.c:659
+msgid "Window Scaling Factor"
+msgstr "Leihoaren eskala-faktorea"
+
+#: ../clutter/clutter-settings.c:660
+msgid "The scaling factor to be applied to windows"
+msgstr "Leihoari aplikatuko zaion eskala-faktorea"
+
+#: ../clutter/clutter-settings.c:667
+msgid "Fontconfig configuration timestamp"
+msgstr "Fontconfig konfigurazioaren denbora-zigilua"
+
+#: ../clutter/clutter-settings.c:668
+msgid "Timestamp of the current fontconfig configuration"
+msgstr "Uneko Fontconfig konfigurazioaren denbora-zigilua"
+
+#: ../clutter/clutter-settings.c:685
+msgid "Password Hint Time"
+msgstr "Password Hint Time"
+
+#: ../clutter/clutter-settings.c:686
+msgid "How long to show the last input character in hidden entries"
+msgstr ""
+"Zenbat denboran erakutsiko den idatzitako azken karakterea ezkutuko "
+"sarreretan"
+
+#: ../clutter/clutter-shader-effect.c:487
+msgid "Shader Type"
+msgstr "Itzaldura mota"
+
+#: ../clutter/clutter-shader-effect.c:488
+msgid "The type of shader used"
+msgstr "Erabiliko den itzaldura mota"
+
+#: ../clutter/clutter-snap-constraint.c:322
+msgid "The source of the constraint"
+msgstr "Murriztapenaren iturburua"
+
+#: ../clutter/clutter-snap-constraint.c:335
+msgid "From Edge"
+msgstr "Ertzetik"
+
+#: ../clutter/clutter-snap-constraint.c:336
+msgid "The edge of the actor that should be snapped"
+msgstr "Atxikitu beharko litzatekeen aktorearen ertza"
+
+#: ../clutter/clutter-snap-constraint.c:350
+msgid "To Edge"
+msgstr "Ertzera"
+
+#: ../clutter/clutter-snap-constraint.c:351
+msgid "The edge of the source that should be snapped"
+msgstr "Atxikitu beharko litzatekeen iturburuaren ertza"
+
+#: ../clutter/clutter-snap-constraint.c:367
+msgid "The offset in pixels to apply to the constraint"
+msgstr "Desplazamendua (pixeletan) murriztapenari aplikatzeko"
+
+#: ../clutter/clutter-stage.c:1918
+msgid "Fullscreen Set"
+msgstr "Pantaila osoa ezarrita"
+
+#: ../clutter/clutter-stage.c:1919
+msgid "Whether the main stage is fullscreen"
+msgstr "Eszena nagusia pantaila osoa den edo ez"
+
+#: ../clutter/clutter-stage.c:1933
+msgid "Offscreen"
+msgstr "Pantailaz kanpo"
+
+#: ../clutter/clutter-stage.c:1934
+msgid "Whether the main stage should be rendered offscreen"
+msgstr "Eszena nagusia pantailaz kanpo errendatuko den edo ez"
+
+#: ../clutter/clutter-stage.c:1946 ../clutter/clutter-text.c:3551
+msgid "Cursor Visible"
+msgstr "Kurtsorea ikusgai"
+
+#: ../clutter/clutter-stage.c:1947
+msgid "Whether the mouse pointer is visible on the main stage"
+msgstr "Eszena nagusian saguaren erakuslea ikusgai dagoen edo ez"
+
+#: ../clutter/clutter-stage.c:1961
+msgid "User Resizable"
+msgstr "Erabiltzaileak tamaina aldatzea"
+
+#: ../clutter/clutter-stage.c:1962
+msgid "Whether the stage is able to be resized via user interaction"
+msgstr ""
+"Erabiltzailearen elkarreragiketaren bidez eszena tamainaz alda dezakeen edo "
+"ez"
+
+#: ../clutter/clutter-stage.c:1977 ../clutter/deprecated/clutter-box.c:254
+#: ../clutter/deprecated/clutter-rectangle.c:270
+msgid "Color"
+msgstr "Kolorea"
+
+#: ../clutter/clutter-stage.c:1978
+msgid "The color of the stage"
+msgstr "Eszenaren kolorea"
+
+#: ../clutter/clutter-stage.c:1993
+msgid "Perspective"
+msgstr "Perspektiba"
+
+#: ../clutter/clutter-stage.c:1994
+msgid "Perspective projection parameters"
+msgstr "Perspektibaren proiekzioaren parametroak"
+
+#: ../clutter/clutter-stage.c:2009
+msgid "Title"
+msgstr "Titulua"
+
+#: ../clutter/clutter-stage.c:2010
+msgid "Stage Title"
+msgstr "Eszenaren titulua"
+
+#: ../clutter/clutter-stage.c:2027
+msgid "Use Fog"
+msgstr "Erabili behe-lainoa"
+
+#: ../clutter/clutter-stage.c:2028
+msgid "Whether to enable depth cueing"
+msgstr "Sakoneraren adierazlea gaitzea edo ez"
+
+#: ../clutter/clutter-stage.c:2044
+msgid "Fog"
+msgstr "Behe-lainoa"
+
+#: ../clutter/clutter-stage.c:2045
+msgid "Settings for the depth cueing"
+msgstr "Sakoneraren adierazlearen ezarpenak"
+
+#: ../clutter/clutter-stage.c:2061
+msgid "Use Alpha"
+msgstr "Erabili alfa"
+
+#: ../clutter/clutter-stage.c:2062
+msgid "Whether to honour the alpha component of the stage color"
+msgstr "Eszenaren kolorearen alfa osagaia erabiliko den edo ez"
+
+#: ../clutter/clutter-stage.c:2078
+msgid "Key Focus"
+msgstr "Gakoaren fokua"
+
+#: ../clutter/clutter-stage.c:2079
+msgid "The currently key focused actor"
+msgstr "Unean gakoak fokatutako aktorea"
+
+#: ../clutter/clutter-stage.c:2095
+msgid "No Clear Hint"
+msgstr "Ez garbitu argibidea"
+
+#: ../clutter/clutter-stage.c:2096
+msgid "Whether the stage should clear its contents"
+msgstr "Eszenak bere edukia garbitu beharko lukeen edo ez"
+
+#: ../clutter/clutter-stage.c:2109
+msgid "Accept Focus"
+msgstr "Onartu fokua"
+
+#: ../clutter/clutter-stage.c:2110
+msgid "Whether the stage should accept focus on show"
+msgstr "Eszenak fokua onartu behar duen edo ez erakustean"
+
+#: ../clutter/clutter-text-buffer.c:347 ../clutter/clutter-text.c:3472
+msgid "Text"
+msgstr "Testua"
+
+#: ../clutter/clutter-text-buffer.c:348
+msgid "The contents of the buffer"
+msgstr "Bufferraren edukia"
+
+#: ../clutter/clutter-text-buffer.c:361
+msgid "Text length"
+msgstr "Testuaren luzera"
+
+#: ../clutter/clutter-text-buffer.c:362
+msgid "Length of the text currently in the buffer"
+msgstr "Bufferreko uneko testuaren luzera"
+
+#: ../clutter/clutter-text-buffer.c:375
+msgid "Maximum length"
+msgstr "Gehienezko luzera"
+
+#: ../clutter/clutter-text-buffer.c:376
+msgid "Maximum number of characters for this entry. Zero if no maximum"
+msgstr ""
+"Sarrera honen gehienezko karaktere-kopurua. Gehienezkorik ez badago, zero"
+
+#: ../clutter/clutter-text.c:3419
+msgid "Buffer"
+msgstr "Bufferra"
+
+#: ../clutter/clutter-text.c:3420
+msgid "The buffer for the text"
+msgstr "Testuaren bufferra"
+
+#: ../clutter/clutter-text.c:3438
+msgid "The font to be used by the text"
+msgstr "Letra-tipoa testuan erabiltzeko"
+
+#: ../clutter/clutter-text.c:3455
+msgid "Font Description"
+msgstr "Letra-tipoaren azalpena"
+
+#: ../clutter/clutter-text.c:3456
+msgid "The font description to be used"
+msgstr "Erabiliko den letra-tipoaren azalpena"
+
+#: ../clutter/clutter-text.c:3473
+msgid "The text to render"
+msgstr "Testua errendatzeko"
+
+#: ../clutter/clutter-text.c:3487
+msgid "Font Color"
+msgstr "Letra-tipoaren kolorea"
+
+#: ../clutter/clutter-text.c:3488
+msgid "Color of the font used by the text"
+msgstr "Letra-tipoaren kolorea testuan erabiltzeko"
+
+#: ../clutter/clutter-text.c:3503
+msgid "Editable"
+msgstr "Editagarria"
+
+#: ../clutter/clutter-text.c:3504
+msgid "Whether the text is editable"
+msgstr "Testua edita daitekeen edo ez"
+
+#: ../clutter/clutter-text.c:3519
+msgid "Selectable"
+msgstr "Hautagarria"
+
+#: ../clutter/clutter-text.c:3520
+msgid "Whether the text is selectable"
+msgstr "Testua hauta daitekeen edo ez"
+
+#: ../clutter/clutter-text.c:3534
+msgid "Activatable"
+msgstr "Aktibagarria"
+
+#: ../clutter/clutter-text.c:3535
+msgid "Whether pressing return causes the activate signal to be emitted"
+msgstr "Sartu tekla sakatzean 'aktibatu' seinalea igorriko duen edo ez"
+
+#: ../clutter/clutter-text.c:3552
+msgid "Whether the input cursor is visible"
+msgstr "Sarreraren erakuslea ikusgai dagoen edo ez"
+
+#: ../clutter/clutter-text.c:3566 ../clutter/clutter-text.c:3567
+msgid "Cursor Color"
+msgstr "Kurtsorearen kolorea"
+
+#: ../clutter/clutter-text.c:3582
+msgid "Cursor Color Set"
+msgstr "Kurtsorearen kolorea ezarrita"
+
+#: ../clutter/clutter-text.c:3583
+msgid "Whether the cursor color has been set"
+msgstr "Kurtsorearen kolorea ezarrita dagoen edo ez"
+
+#: ../clutter/clutter-text.c:3598
+msgid "Cursor Size"
+msgstr "Kurtsorearen tamaina"
+
+#: ../clutter/clutter-text.c:3599
+msgid "The width of the cursor, in pixels"
+msgstr "Kurtsorearen zabalera (pixeletan)"
+
+#: ../clutter/clutter-text.c:3615 ../clutter/clutter-text.c:3633
+msgid "Cursor Position"
+msgstr "Kurtsorearen posizioa"
+
+#: ../clutter/clutter-text.c:3616 ../clutter/clutter-text.c:3634
+msgid "The cursor position"
+msgstr "Kurtsorearen posizioa"
+
+#: ../clutter/clutter-text.c:3649
+msgid "Selection-bound"
+msgstr "Hautapen-muga"
+
+#: ../clutter/clutter-text.c:3650
+msgid "The cursor position of the other end of the selection"
+msgstr "Kurtsorearen posizioa hautapenaren bestaldeko amaieran"
+
+#: ../clutter/clutter-text.c:3665 ../clutter/clutter-text.c:3666
+msgid "Selection Color"
+msgstr "Hautapen-kolorea"
+
+#: ../clutter/clutter-text.c:3681
+msgid "Selection Color Set"
+msgstr "Hautapen-kolorea ezarrita"
+
+#: ../clutter/clutter-text.c:3682
+msgid "Whether the selection color has been set"
+msgstr "Hautapenaren kolorea ezarrita dagoen edo ez"
+
+#: ../clutter/clutter-text.c:3697
+msgid "Attributes"
+msgstr "Atributuak"
+
+#: ../clutter/clutter-text.c:3698
+msgid "A list of style attributes to apply to the contents of the actor"
+msgstr "Estiloen atributuen zerrenda aktorearen edukiari aplikatzeko"
+
+#: ../clutter/clutter-text.c:3720
+msgid "Use markup"
+msgstr "Erabili markaketa"
+
+#: ../clutter/clutter-text.c:3721
+msgid "Whether or not the text includes Pango markup"
+msgstr "Testuak Pango-ren markaketa edukiko duen edo ez"
+
+#: ../clutter/clutter-text.c:3737
+msgid "Line wrap"
+msgstr "Lerro-itzulbira"
+
+#: ../clutter/clutter-text.c:3738
+msgid "If set, wrap the lines if the text becomes too wide"
+msgstr "Ezarrita badago, testua zabalegia bada lerroak itzulbiratu egingo dira"
+
+#: ../clutter/clutter-text.c:3753
+msgid "Line wrap mode"
+msgstr "Lerro-itzulbira modua"
+
+#: ../clutter/clutter-text.c:3754
+msgid "Control how line-wrapping is done"
+msgstr "Kontrolatu lerroen itzulbira nola egingo den"
+
+#: ../clutter/clutter-text.c:3769
+msgid "Ellipsize"
+msgstr "Elipsi gisa"
+
+#: ../clutter/clutter-text.c:3770
+msgid "The preferred place to ellipsize the string"
+msgstr "Katea elipsi gisa jartzeko leku hobetsia"
+
+#: ../clutter/clutter-text.c:3786
+msgid "Line Alignment"
+msgstr "Lerroaren lerrokadura"
+
+#: ../clutter/clutter-text.c:3787
+msgid "The preferred alignment for the string, for multi-line text"
+msgstr "Katearen lerrokadura hobetsia, lerro anitzeko testuentzako"
+
+#: ../clutter/clutter-text.c:3803
+msgid "Justify"
+msgstr "Justifikatu"
+
+#: ../clutter/clutter-text.c:3804
+msgid "Whether the text should be justified"
+msgstr "Testua justifikatuta egongo den edo ez"
+
+#: ../clutter/clutter-text.c:3819
+msgid "Password Character"
+msgstr "Pasahitzaren karakterea"
+
+#: ../clutter/clutter-text.c:3820
+msgid "If non-zero, use this character to display the actor's contents"
+msgstr "Ez bada zero, erabili karaktere hori aktorearen edukia bistaratzeko"
+
+#: ../clutter/clutter-text.c:3834
+msgid "Max Length"
+msgstr "Gehienezko luzera"
+
+#: ../clutter/clutter-text.c:3835
+msgid "Maximum length of the text inside the actor"
+msgstr "Testuaren gehienezko luzera aktorearen barruan"
+
+#: ../clutter/clutter-text.c:3858
+msgid "Single Line Mode"
+msgstr "Lerro bakarreko modua"
+
+#: ../clutter/clutter-text.c:3859
+msgid "Whether the text should be a single line"
+msgstr "Testuak lerro bakarrekoa izango den edo ez"
+
+#: ../clutter/clutter-text.c:3873 ../clutter/clutter-text.c:3874
+msgid "Selected Text Color"
+msgstr "Hautatutako testu-kolorea"
+
+#: ../clutter/clutter-text.c:3889
+msgid "Selected Text Color Set"
+msgstr "Hautatutako testu-kolorea ezarrita"
+
+#: ../clutter/clutter-text.c:3890
+msgid "Whether the selected text color has been set"
+msgstr "hautatutako testu-kolorea ezarrita dagoen edo ez"
+
+#: ../clutter/clutter-timeline.c:591
+#: ../clutter/deprecated/clutter-animation.c:506
+msgid "Loop"
+msgstr "Begizta"
+
+#: ../clutter/clutter-timeline.c:592
+msgid "Should the timeline automatically restart"
+msgstr "Denbora-lerroa automatikoki berrabiaraziko den edo ez"
+
+#: ../clutter/clutter-timeline.c:606
+msgid "Delay"
+msgstr "Atzerapena"
+
+#: ../clutter/clutter-timeline.c:607
+msgid "Delay before start"
+msgstr "Atzerapena hasiera aurretik"
+
+#: ../clutter/clutter-timeline.c:622
+#: ../clutter/deprecated/clutter-animation.c:490
+#: ../clutter/deprecated/clutter-animator.c:1792
+#: ../clutter/deprecated/clutter-media.c:224
+#: ../clutter/deprecated/clutter-state.c:1515
+msgid "Duration"
+msgstr "Iraupena"
+
+#: ../clutter/clutter-timeline.c:623
+msgid "Duration of the timeline in milliseconds"
+msgstr "Denbora-lerroaren iraupena (milisegundotan)"
+
+#: ../clutter/clutter-timeline.c:638
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:521
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:330
+msgid "Direction"
+msgstr "Norabidea"
+
+#: ../clutter/clutter-timeline.c:639
+msgid "Direction of the timeline"
+msgstr "Denbora-lerroaren norabidea"
+
+#: ../clutter/clutter-timeline.c:654
+msgid "Auto Reverse"
+msgstr "Auto-alderantzikatu"
+
+#: ../clutter/clutter-timeline.c:655
+msgid "Whether the direction should be reversed when reaching the end"
+msgstr "Amaierara iristean norabidea alderantzikatuko den edo ez"
+
+#: ../clutter/clutter-timeline.c:673
+msgid "Repeat Count"
+msgstr "Errepikatze kopurua"
+
+#: ../clutter/clutter-timeline.c:674
+msgid "How many times the timeline should repeat"
+msgstr "Zenbat aldiz denbora-lerroa errepikatuko den"
+
+#: ../clutter/clutter-timeline.c:688
+msgid "Progress Mode"
+msgstr "Aurrerapenaren modua"
+
+#: ../clutter/clutter-timeline.c:689
+msgid "How the timeline should compute the progress"
+msgstr "Denbora-lerroak nola kalkulatu behar duen aurrerapena"
+
+#: ../clutter/clutter-transition.c:244
+msgid "Interval"
+msgstr "Barrutia"
+
+#: ../clutter/clutter-transition.c:245
+msgid "The interval of values to transition"
+msgstr "Balioen barrutia trantsiziorako"
+
+#: ../clutter/clutter-transition.c:259
+msgid "Animatable"
+msgstr "Anima daiteke"
+
+#: ../clutter/clutter-transition.c:260
+msgid "The animatable object"
+msgstr "Animazioa eduki dezakeen objektua"
+
+#: ../clutter/clutter-transition.c:281
+msgid "Remove on Complete"
+msgstr "Kendu osatzean"
+
+#: ../clutter/clutter-transition.c:282
+msgid "Detach the transition when completed"
+msgstr "Askatu trantsizioa osatzean"
+
+#: ../clutter/clutter-zoom-action.c:365
+msgid "Zoom Axis"
+msgstr "Zoomaren ardatza"
+
+#: ../clutter/clutter-zoom-action.c:366
+msgid "Constraints the zoom to an axis"
+msgstr "Zooma ardatz batera murrizten du"
+
+#: ../clutter/deprecated/clutter-alpha.c:347
+#: ../clutter/deprecated/clutter-animation.c:521
+#: ../clutter/deprecated/clutter-animator.c:1809
+msgid "Timeline"
+msgstr "Denbora-lerroa"
+
+#: ../clutter/deprecated/clutter-alpha.c:348
+msgid "Timeline used by the alpha"
+msgstr "Alfak erabiltzen duen denbora-lerroa"
+
+#: ../clutter/deprecated/clutter-alpha.c:364
+msgid "Alpha value"
+msgstr "Alfaren balioa"
+
+#: ../clutter/deprecated/clutter-alpha.c:365
+msgid "Alpha value as computed by the alpha"
+msgstr "Alfaren balioa alfaren arabera kalkulatutakoa"
+
+#: ../clutter/deprecated/clutter-alpha.c:386
+#: ../clutter/deprecated/clutter-animation.c:474
+msgid "Mode"
+msgstr "Modua"
+
+#: ../clutter/deprecated/clutter-alpha.c:387
+msgid "Progress mode"
+msgstr "Aurrerapenaren modua"
+
+#: ../clutter/deprecated/clutter-animation.c:457
+msgid "Object"
+msgstr "Objektua"
+
+#: ../clutter/deprecated/clutter-animation.c:458
+msgid "Object to which the animation applies"
+msgstr "Animazioa aplikatuko zaion objektua"
+
+#: ../clutter/deprecated/clutter-animation.c:475
+msgid "The mode of the animation"
+msgstr "Animazioaren modua"
+
+#: ../clutter/deprecated/clutter-animation.c:491
+msgid "Duration of the animation, in milliseconds"
+msgstr "Animazioaren iraupena (milisegundotan)"
+
+#: ../clutter/deprecated/clutter-animation.c:507
+msgid "Whether the animation should loop"
+msgstr "Animazioa begiztan egon behar duen edo ez"
+
+#: ../clutter/deprecated/clutter-animation.c:522
+msgid "The timeline used by the animation"
+msgstr "Animazioak erabilitako denbora-lerroa"
+
+#: ../clutter/deprecated/clutter-animation.c:538
+#: ../clutter/deprecated/clutter-behaviour.c:237
+msgid "Alpha"
+msgstr "Alfa"
+
+#: ../clutter/deprecated/clutter-animation.c:539
+msgid "The alpha used by the animation"
+msgstr "Animazioak erabilitako alfa"
+
+#: ../clutter/deprecated/clutter-animator.c:1793
+msgid "The duration of the animation"
+msgstr "Animazioaren iraupena"
+
+#: ../clutter/deprecated/clutter-animator.c:1810
+msgid "The timeline of the animation"
+msgstr "Animazioaren denbora-lerroa"
+
+#: ../clutter/deprecated/clutter-behaviour.c:238
+msgid "Alpha Object to drive the behaviour"
+msgstr "Alfa objektua portaera kudeatzeko"
+
+#: ../clutter/deprecated/clutter-behaviour-depth.c:180
+msgid "Start Depth"
+msgstr "Hasierako sakonera"
+
+#: ../clutter/deprecated/clutter-behaviour-depth.c:181
+msgid "Initial depth to apply"
+msgstr "Hasierako sakonera aplikatzeko"
+
+#: ../clutter/deprecated/clutter-behaviour-depth.c:196
+msgid "End Depth"
+msgstr "Amaierako sakonera"
+
+#: ../clutter/deprecated/clutter-behaviour-depth.c:197
+msgid "Final depth to apply"
+msgstr "Amaierako aplikazioa aplikatzeko"
+
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:394
+msgid "Start Angle"
+msgstr "Abioko angelua"
+
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:395
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:277
+msgid "Initial angle"
+msgstr "Hasierako angelua"
+
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:410
+msgid "End Angle"
+msgstr "Amaierako angelua"
+
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:411
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:295
+msgid "Final angle"
+msgstr "Amaierako angelua"
+
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:426
+msgid "Angle x tilt"
+msgstr "Angeluaren X malda"
+
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:427
+msgid "Tilt of the ellipse around x axis"
+msgstr "Elipsearen malda X ardatzean"
+
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:442
+msgid "Angle y tilt"
+msgstr "Angeluaren Y malda"
+
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:443
+msgid "Tilt of the ellipse around y axis"
+msgstr "Elipsearen malda Y ardatzean"
+
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:458
+msgid "Angle z tilt"
+msgstr "Angeluaren Z malda"
+
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:459
+msgid "Tilt of the ellipse around z axis"
+msgstr "Elipsearen malda Z ardatzean"
+
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:475
+msgid "Width of the ellipse"
+msgstr "Elipsearen zabalera"
+
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:491
+msgid "Height of ellipse"
+msgstr "Elipsearen altuera"
+
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:506
+msgid "Center"
+msgstr "Zentroa"
+
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:507
+msgid "Center of ellipse"
+msgstr "Elipsearen zentroa"
+
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:522
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:331
+msgid "Direction of rotation"
+msgstr "Biraketaren norabidea"
+
+#: ../clutter/deprecated/clutter-behaviour-opacity.c:177
+msgid "Opacity Start"
+msgstr "Hasierako opakutasuna"
+
+#: ../clutter/deprecated/clutter-behaviour-opacity.c:178
+msgid "Initial opacity level"
+msgstr "Opakutasunaren hasierako balioa"
+
+#: ../clutter/deprecated/clutter-behaviour-opacity.c:195
+msgid "Opacity End"
+msgstr "Amaierako opakutasuna"
+
+#: ../clutter/deprecated/clutter-behaviour-opacity.c:196
+msgid "Final opacity level"
+msgstr "Opakutasunaren amaierako balioa"
+
+#: ../clutter/deprecated/clutter-behaviour-path.c:222
+msgid "The ClutterPath object representing the path to animate along"
+msgstr "ClutterPath objektua animazioak ibiliko duen bidea adierazteko"
+
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:276
+msgid "Angle Begin"
+msgstr "Angeluaren hasiera"
+
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:294
+msgid "Angle End"
+msgstr "Angeluaren amaiera"
+
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:312
+msgid "Axis"
+msgstr "Ardatza"
+
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:313
+msgid "Axis of rotation"
+msgstr "Biraketaren ardatza"
+
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:348
+msgid "Center X"
+msgstr "X zentroa"
+
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:349
+msgid "X coordinate of the center of rotation"
+msgstr "Biraketa-zentroaren X koordenatua"
+
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:366
+msgid "Center Y"
+msgstr "Y zentroa"
+
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:367
+msgid "Y coordinate of the center of rotation"
+msgstr "Biraketa-zentroaren Y koordenatua"
+
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:384
+msgid "Center Z"
+msgstr "Z zentroa"
+
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:385
+msgid "Z coordinate of the center of rotation"
+msgstr "Biraketa-zentroaren Z koordenatua"
+
+#: ../clutter/deprecated/clutter-behaviour-scale.c:222
+msgid "X Start Scale"
+msgstr "Hasierako eskala Xen"
+
+#: ../clutter/deprecated/clutter-behaviour-scale.c:223
+msgid "Initial scale on the X axis"
+msgstr "Hasierako eskala X ardatzean"
+
+#: ../clutter/deprecated/clutter-behaviour-scale.c:241
+msgid "X End Scale"
+msgstr "Amaierako eskala Xen"
+
+#: ../clutter/deprecated/clutter-behaviour-scale.c:242
+msgid "Final scale on the X axis"
+msgstr "Amaierako eskala X ardatzean"
+
+#: ../clutter/deprecated/clutter-behaviour-scale.c:260
+msgid "Y Start Scale"
+msgstr "Hasierako eskala Yn"
+
+#: ../clutter/deprecated/clutter-behaviour-scale.c:261
+msgid "Initial scale on the Y axis"
+msgstr "Hasierako eskala Y ardatzean"
+
+#: ../clutter/deprecated/clutter-behaviour-scale.c:279
+msgid "Y End Scale"
+msgstr "Amaierako eskala Yn"
+
+#: ../clutter/deprecated/clutter-behaviour-scale.c:280
+msgid "Final scale on the Y axis"
+msgstr "Amaierako eskala Y ardatzean"
+
+#: ../clutter/deprecated/clutter-box.c:255
+msgid "The background color of the box"
+msgstr "Koadroaren atzeko planoko kolorea"
+
+#: ../clutter/deprecated/clutter-box.c:268
+msgid "Color Set"
+msgstr "Kolorea ezarrita"
+
+#: ../clutter/deprecated/clutter-cairo-texture.c:585
+msgid "Surface Width"
+msgstr "Gainazalaren zabalera"
+
+#: ../clutter/deprecated/clutter-cairo-texture.c:586
+msgid "The width of the Cairo surface"
+msgstr "'Cairo' gainazalaren zabalera"
+
+#: ../clutter/deprecated/clutter-cairo-texture.c:603
+msgid "Surface Height"
+msgstr "Gainazalaren altuera"
+
+#: ../clutter/deprecated/clutter-cairo-texture.c:604
+msgid "The height of the Cairo surface"
+msgstr "'Cairo' gainazalaren altuera"
+
+#: ../clutter/deprecated/clutter-cairo-texture.c:624
+msgid "Auto Resize"
+msgstr "Aldatu tamaina automatikoki"
+
+#: ../clutter/deprecated/clutter-cairo-texture.c:625
+msgid "Whether the surface should match the allocation"
+msgstr "Gainazalak esleipenarekin bat etorri behar duen edo ez"
+
+#: ../clutter/deprecated/clutter-media.c:83
+msgid "URI"
+msgstr "URIa"
+
+#: ../clutter/deprecated/clutter-media.c:84
+msgid "URI of a media file"
+msgstr "Multimedia fitxategiaren URIa"
+
+#: ../clutter/deprecated/clutter-media.c:100
+msgid "Playing"
+msgstr "Erreproduzitzen"
+
+#: ../clutter/deprecated/clutter-media.c:101
+msgid "Whether the actor is playing"
+msgstr "Aktorea erreproduzitzen ari den edo ez"
+
+#: ../clutter/deprecated/clutter-media.c:118
+msgid "Progress"
+msgstr "Aurrerapena"
+
+#: ../clutter/deprecated/clutter-media.c:119
+msgid "Current progress of the playback"
+msgstr "Erreprodukzioaren uneko aurrerapena"
+
+#: ../clutter/deprecated/clutter-media.c:135
+msgid "Subtitle URI"
+msgstr "Azpitituluaren URIa"
+
+#: ../clutter/deprecated/clutter-media.c:136
+msgid "URI of a subtitle file"
+msgstr "Azpititulua fitxategiaren URIa"
+
+#: ../clutter/deprecated/clutter-media.c:154
+msgid "Subtitle Font Name"
+msgstr "Azpitituluaren letra-tipoa"
+
+#: ../clutter/deprecated/clutter-media.c:155
+msgid "The font used to display subtitles"
+msgstr "Azpitituluak bistaratzean erabiliko den letra-tipoa"
+
+#: ../clutter/deprecated/clutter-media.c:172
+msgid "Audio Volume"
+msgstr "Audioaren bolumena"
+
+#: ../clutter/deprecated/clutter-media.c:173
+msgid "The volume of the audio"
+msgstr "Audioaren bolumena"
+
+#: ../clutter/deprecated/clutter-media.c:189
+msgid "Can Seek"
+msgstr "Koka daiteke"
+
+#: ../clutter/deprecated/clutter-media.c:190
+msgid "Whether the current stream is seekable"
+msgstr "Uneko korrontean koka daitekeen edo ez"
+
+#: ../clutter/deprecated/clutter-media.c:207
+msgid "Buffer Fill"
+msgstr "Bufferraren maila"
+
+#: ../clutter/deprecated/clutter-media.c:208
+msgid "The fill level of the buffer"
+msgstr "Bufferraren betetze-maila"
+
+#: ../clutter/deprecated/clutter-media.c:225
+msgid "The duration of the stream, in seconds"
+msgstr "Korrontearen iraupena (segundotan)"
+
+#: ../clutter/deprecated/clutter-rectangle.c:271
+msgid "The color of the rectangle"
+msgstr "Laukizuzenaren kolorea"
+
+#: ../clutter/deprecated/clutter-rectangle.c:284
+msgid "Border Color"
+msgstr "Ertzaren kolorea"
+
+#: ../clutter/deprecated/clutter-rectangle.c:285
+msgid "The color of the border of the rectangle"
+msgstr "Laukizuzenaren ertzaren kolorea"
+
+#: ../clutter/deprecated/clutter-rectangle.c:300
+msgid "Border Width"
+msgstr "Ertzaren zabalera"
+
+#: ../clutter/deprecated/clutter-rectangle.c:301
+msgid "The width of the border of the rectangle"
+msgstr "Laukizuzenaren ertzaren zabalera"
+
+#: ../clutter/deprecated/clutter-rectangle.c:315
+msgid "Has Border"
+msgstr "Ertza du"
+
+#: ../clutter/deprecated/clutter-rectangle.c:316
+msgid "Whether the rectangle should have a border"
+msgstr "Laukizuzenak ertzik duen edo ez"
+
+#: ../clutter/deprecated/clutter-shader.c:257
+msgid "Vertex Source"
+msgstr "Erpinaren iturburua"
+
+#: ../clutter/deprecated/clutter-shader.c:258
+msgid "Source of vertex shader"
+msgstr "Erpinaren itzalduraren iturburua"
+
+#: ../clutter/deprecated/clutter-shader.c:274
+msgid "Fragment Source"
+msgstr "Zatiaren iturburua"
+
+#: ../clutter/deprecated/clutter-shader.c:275
+msgid "Source of fragment shader"
+msgstr "Zatiaren itzalduraren iturburua"
+
+#: ../clutter/deprecated/clutter-shader.c:292
+msgid "Compiled"
+msgstr "Konpilatuta"
+
+#: ../clutter/deprecated/clutter-shader.c:293
+msgid "Whether the shader is compiled and linked"
+msgstr "Itzaldura konpilatuta eta estekatuta dagoen edo ez"
+
+#: ../clutter/deprecated/clutter-shader.c:310
+msgid "Whether the shader is enabled"
+msgstr "Itzaldura gaituta dagoen edo ez"
+
+#: ../clutter/deprecated/clutter-shader.c:521
+#, c-format
+msgid "%s compilation failed: %s"
+msgstr "Huts egin du '%s' konpilazioak: %s"
+
+#: ../clutter/deprecated/clutter-shader.c:522
+msgid "Vertex shader"
+msgstr "Erpinaren itzaldura"
+
+#: ../clutter/deprecated/clutter-shader.c:523
+msgid "Fragment shader"
+msgstr "Zatiaren itzaldura"
+
+#: ../clutter/deprecated/clutter-state.c:1497
+msgid "State"
+msgstr "Egoera"
+
+#: ../clutter/deprecated/clutter-state.c:1498
+msgid "Currently set state, (transition to this state might not be complete)"
+msgstr ""
+"Unean ezarritako egoera, (egoera honetarako trantsizioa osatu gabe egon "
+"daiteke)"
+
+#: ../clutter/deprecated/clutter-state.c:1516
+msgid "Default transition duration"
+msgstr "Trantsizio lehenetsiaren iraupena"
+
+#: ../clutter/deprecated/clutter-table-layout.c:535
+msgid "Column Number"
+msgstr "Zutabe zenbakia"
+
+#: ../clutter/deprecated/clutter-table-layout.c:536
+msgid "The column the widget resides in"
+msgstr "Trepeta kokatuta dagoen zutabea"
+
+#: ../clutter/deprecated/clutter-table-layout.c:543
+msgid "Row Number"
+msgstr "Errenkada zenbakia"
+
+#: ../clutter/deprecated/clutter-table-layout.c:544
+msgid "The row the widget resides in"
+msgstr "Trepeta kokatuta dagoen errenkada"
+
+#: ../clutter/deprecated/clutter-table-layout.c:551
+msgid "Column Span"
+msgstr "Zutabeen hedadura"
+
+#: ../clutter/deprecated/clutter-table-layout.c:552
+msgid "The number of columns the widget should span"
+msgstr "Trepetak hedatu beharko litzatekeen zutabe kopurua"
+
+#: ../clutter/deprecated/clutter-table-layout.c:559
+msgid "Row Span"
+msgstr "Errenkaden hedadura"
+
+#: ../clutter/deprecated/clutter-table-layout.c:560
+msgid "The number of rows the widget should span"
+msgstr "Trepetak hedatu beharko litzatekeen errenkada kopurua"
+
+#: ../clutter/deprecated/clutter-table-layout.c:567
+msgid "Horizontal Expand"
+msgstr "Betegarri horizontala"
+
+#: ../clutter/deprecated/clutter-table-layout.c:568
+msgid "Allocate extra space for the child in horizontal axis"
+msgstr "Esleitu leku gehigarria umearentzako ardatz horizontalean"
+
+#: ../clutter/deprecated/clutter-table-layout.c:574
+msgid "Vertical Expand"
+msgstr "Betegarri bertikala"
+
+#: ../clutter/deprecated/clutter-table-layout.c:575
+msgid "Allocate extra space for the child in vertical axis"
+msgstr "Esleitu leku gehigarria umearentzako ardatz bertikalean"
+
+#: ../clutter/deprecated/clutter-table-layout.c:1630
+msgid "Spacing between columns"
+msgstr "Zutabeen arteko tartea"
+
+#: ../clutter/deprecated/clutter-table-layout.c:1646
+msgid "Spacing between rows"
+msgstr "Errenkaden arteko tartea"
+
+#: ../clutter/deprecated/clutter-texture.c:992
+msgid "Sync size of actor"
+msgstr "Sinkronizatu aktorearen tamaina"
+
+#: ../clutter/deprecated/clutter-texture.c:993
+msgid "Auto sync size of actor to underlying pixbuf dimensions"
+msgstr ""
+"Sinkronizatu automatikoki aktorearen tamaina azpiko pixbuf dimentsioetara"
+
+#: ../clutter/deprecated/clutter-texture.c:1000
+msgid "Disable Slicing"
+msgstr "Desgaitu zatitzea"
+
+#: ../clutter/deprecated/clutter-texture.c:1001
+msgid ""
+"Forces the underlying texture to be singular and not made of smaller space "
+"saving individual textures"
+msgstr ""
+"Azpiko testura bakuna izatera eta leku txikiagoa ez edukitzera eta bakarkako "
+"testurak gordetzera derrigortzen du"
+
+#: ../clutter/deprecated/clutter-texture.c:1010
+msgid "Tile Waste"
+msgstr "Soberako lauza"
+
+#: ../clutter/deprecated/clutter-texture.c:1011
+msgid "Maximum waste area of a sliced texture"
+msgstr "Zatitutako testura baten soberan dagoen gehienezko area "
+
+#: ../clutter/deprecated/clutter-texture.c:1019
+msgid "Horizontal repeat"
+msgstr "Errepikatze horizontala"
+
+#: ../clutter/deprecated/clutter-texture.c:1020
+msgid "Repeat the contents rather than scaling them horizontally"
+msgstr "Errepikatu edukia haiek horizontalki eskalatu ordez"
+
+#: ../clutter/deprecated/clutter-texture.c:1027
+msgid "Vertical repeat"
+msgstr "Errepikatze bertikala"
+
+#: ../clutter/deprecated/clutter-texture.c:1028
+msgid "Repeat the contents rather than scaling them vertically"
+msgstr "Errepikatu edukia haiek bertikalki eskalatu ordez"
+
+#: ../clutter/deprecated/clutter-texture.c:1035
+msgid "Filter Quality"
+msgstr "Iragazkiaren kalitatea"
+
+#: ../clutter/deprecated/clutter-texture.c:1036
+msgid "Rendering quality used when drawing the texture"
+msgstr "Testura errendatzean erabiliko den errendatzearen kalitatea"
+
+#: ../clutter/deprecated/clutter-texture.c:1044
+msgid "Pixel Format"
+msgstr "Pixelen formatua"
+
+#: ../clutter/deprecated/clutter-texture.c:1045
+msgid "The Cogl pixel format to use"
+msgstr "Cogl pixelen formatua erabiltzeko"
+
+#: ../clutter/deprecated/clutter-texture.c:1053
+#: ../clutter/wayland/clutter-wayland-surface.c:445
+msgid "Cogl Texture"
+msgstr "Cogl testura"
+
+#: ../clutter/deprecated/clutter-texture.c:1054
+#: ../clutter/wayland/clutter-wayland-surface.c:446
+msgid "The underlying Cogl texture handle used to draw this actor"
+msgstr "Aktore hau marrazteko erabili den azpiko Cogl testuraren kudeatzailea"
+
+#: ../clutter/deprecated/clutter-texture.c:1061
+msgid "Cogl Material"
+msgstr "Cogl materiala"
+
+#: ../clutter/deprecated/clutter-texture.c:1062
+msgid "The underlying Cogl material handle used to draw this actor"
+msgstr ""
+"Aktore hau marrazteko erabili den azpiko Cogl materialaren kudeatzailea"
+
+#: ../clutter/deprecated/clutter-texture.c:1081
+msgid "The path of the file containing the image data"
+msgstr "Irudiaren datuak dituen fitxategiaren bide-izena"
+
+#: ../clutter/deprecated/clutter-texture.c:1088
+msgid "Keep Aspect Ratio"
+msgstr "Mantendu aspektu-erlazioa"
+
+#: ../clutter/deprecated/clutter-texture.c:1089
+msgid ""
+"Keep the aspect ratio of the texture when requesting the preferred width or "
+"height"
+msgstr ""
+"Mantendu testuraren aspektu-erlazioa zabalera edo altuera hobetsia eskatzean"
+
+#: ../clutter/deprecated/clutter-texture.c:1117
+msgid "Load asynchronously"
+msgstr "Kargatu asinkronoki "
+
+#: ../clutter/deprecated/clutter-texture.c:1118
+msgid ""
+"Load files inside a thread to avoid blocking when loading images from disk"
+msgstr ""
+"Kargatu fitxategiak hari batean irudiak diskotik kargatzean blokeatzea "
+"saihesteko"
+
+#: ../clutter/deprecated/clutter-texture.c:1136
+msgid "Load data asynchronously"
+msgstr "Kargatu datuak asinkronoki"
+
+#: ../clutter/deprecated/clutter-texture.c:1137
+msgid ""
+"Decode image data files inside a thread to reduce blocking when loading "
+"images from disk"
+msgstr ""
+"Deskodetu irudien datuen fitxategiak hari batean irudiak diskotik kargatzean "
+"blokeatzea murrizteko"
+
+#: ../clutter/deprecated/clutter-texture.c:1163
+msgid "Pick With Alpha"
+msgstr "hautatu alfarekin"
+
+#: ../clutter/deprecated/clutter-texture.c:1164
+msgid "Shape actor with alpha channel when picking"
+msgstr "Eman forma aktoreari alfarekin hautatzean"
+
+#: ../clutter/deprecated/clutter-texture.c:1597
+#: ../clutter/deprecated/clutter-texture.c:1992
+#: ../clutter/deprecated/clutter-texture.c:2088
+#: ../clutter/deprecated/clutter-texture.c:2386
+#, c-format
+msgid "Failed to load the image data"
+msgstr "Huts egin du irudiaren datuak kargatzean"
+
+#: ../clutter/deprecated/clutter-texture.c:1756
+#, c-format
+msgid "YUV textures are not supported"
+msgstr "YUV testurak ez daude onartuta"
+
+#: ../clutter/deprecated/clutter-texture.c:1765
+#, c-format
+msgid "YUV2 textues are not supported"
+msgstr "YUV2 testurak ez daude onartuta"
+
+#: ../clutter/gdk/clutter-backend-gdk.c:289
+#, c-format
+msgid "Could not find a suitable CoglWinsys for a GdkDisplay of type %s"
+msgstr "Ezin izan da CoglWinsys egokitu '%s' motaren GdkDisplay-rentzako"
+
+#: ../clutter/wayland/clutter-wayland-surface.c:419
+msgid "Surface"
+msgstr "Gainazala"
+
+#: ../clutter/wayland/clutter-wayland-surface.c:420
+msgid "The underlying wayland surface"
+msgstr "Azpian dagoen 'wayland' gainazala"
+
+#: ../clutter/wayland/clutter-wayland-surface.c:427
+msgid "Surface width"
+msgstr "Gainazalaren zabalera"
+
+#: ../clutter/wayland/clutter-wayland-surface.c:428
+msgid "The width of the underlying wayland surface"
+msgstr "Azpiko 'wayland' gainazalaren zabalera"
+
+#: ../clutter/wayland/clutter-wayland-surface.c:436
+msgid "Surface height"
+msgstr "Gainazalaren altuera"
+
+#: ../clutter/wayland/clutter-wayland-surface.c:437
+msgid "The height of the underlying wayland surface"
+msgstr "Azpiko 'wayland' gainazalaren altuera"
+
+#: ../clutter/x11/clutter-backend-x11.c:488
+msgid "X display to use"
+msgstr "Erabili beharreko X bistaratzea"
+
+#: ../clutter/x11/clutter-backend-x11.c:494
+msgid "X screen to use"
+msgstr "Erabili beharreko X pantaila"
+
+#: ../clutter/x11/clutter-backend-x11.c:499
+msgid "Make X calls synchronous"
+msgstr "Bihurtu X dei sinkroniko"
+
+#: ../clutter/x11/clutter-backend-x11.c:506
+msgid "Disable XInput support"
+msgstr "Desgaitu XInput euskarria"
+
+#: ../clutter/x11/clutter-keymap-x11.c:458
+msgid "The Clutter backend"
+msgstr "Clutter-en motorra"
+
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:534
+msgid "Pixmap"
+msgstr "Pixmap-a"
+
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:535
+msgid "The X11 Pixmap to be bound"
+msgstr "X11 pixmap-a lotzeko"
+
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:543
+msgid "Pixmap width"
+msgstr "Pixmap-aren zabalera"
+
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:544
+msgid "The width of the pixmap bound to this texture"
+msgstr "Testura honi lotutako pixmap-aren zabalera"
+
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:552
+msgid "Pixmap height"
+msgstr "Pixmap-aren altuera"
+
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:553
+msgid "The height of the pixmap bound to this texture"
+msgstr "Testura honi lotutako pixmap-aren altuera"
+
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:561
+msgid "Pixmap Depth"
+msgstr "Pixmap-aren sakonera"
+
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:562
+msgid "The depth (in number of bits) of the pixmap bound to this texture"
+msgstr "Testura honi lotutako pixmap-aren sakonera (bit kopuruetan)"
+
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:570
+msgid "Automatic Updates"
+msgstr "Eguneraketa automatikoak"
+
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:571
+msgid "If the texture should be kept in sync with any pixmap changes."
+msgstr "Testura edozer pixmap-en aldaketekin sinkronizatuta eduki behar da."
+
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:579
+msgid "Window"
+msgstr "Leihoa"
+
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:580
+msgid "The X11 Window to be bound"
+msgstr "X11 leihoa lotzeko"
+
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:588
+msgid "Window Redirect Automatic"
+msgstr "Leihoen berbideratze automatikoa"
+
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:589
+msgid "If composite window redirects are set to Automatic (or Manual if false)"
+msgstr ""
+"Konposatutako leihoen berbideraketa Automatikoa bezala ezarrita dagoen, edo "
+"ez (Eskuzkoa)"
+
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:599
+msgid "Window Mapped"
+msgstr "Mapatutako leihoa"
+
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:600
+msgid "If window is mapped"
+msgstr "Leihoa mapatuta dagoen edo ez"
+
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:609
+msgid "Destroyed"
+msgstr "Deuseztatuta"
+
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:610
+msgid "If window has been destroyed"
+msgstr "Leihoa deuseztatu egin den edo ez"
+
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:618
+msgid "Window X"
+msgstr "Leihoaren X"
+
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:619
+msgid "X position of window on screen according to X11"
+msgstr "Leihoaren X posizioa pantailan X11-en arabera"
+
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:627
+msgid "Window Y"
+msgstr "Leihoaren Y"
+
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:628
+msgid "Y position of window on screen according to X11"
+msgstr "Leihoaren Y posizioa pantailan X11-en arabera"
+
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:635
+msgid "Window Override Redirect"
+msgstr "Leihoak berbideraketa gainidatzita"
+
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:636
+msgid "If this is an override-redirect window"
+msgstr "Berbideraketa gainidatzia duen leiho bat den edo ez"
+
+#~ msgid "sysfs Path"
+#~ msgstr "bide-izena fitxategi-sisteman"
+
+#~ msgid "Path of the device in sysfs"
+#~ msgstr "Gailuaren bide-izena fitxategi-sisteman"
+
+#~ msgid "Device Path"
+#~ msgstr "Gailuaren bide-izena"
+
+#~ msgid "Path of the device node"
+#~ msgstr "Gailuaren nodoaren bide-izena"
diff --git a/po/fr.po b/po/fr.po
index 9a0b36d5d..f8bc06449 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -10,702 +10,709 @@ msgid ""
 msgstr ""
 "Project-Id-Version: clutter 1.3.14\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
-"product=clutter&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2013-02-16 20:16+0000\n"
-"PO-Revision-Date: 2013-02-20 21:23+0100\n"
-"Last-Translator: Alain Lojewski <Allomervan@gmail.com>\n"
+"product=clutter\n"
+"POT-Creation-Date: 2014-03-16 17:53+0100\n"
+"PO-Revision-Date: 2013-08-22 14:22+0200\n"
+"Last-Translator: Christophe Fergeau <teuf@gnome.org>\n"
 "Language-Team: GNOME French Team <gnomefr@traduc.org>\n"
-"Language: \n"
+"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../clutter/clutter-actor.c:6144
+#: ../clutter/clutter-actor.c:6214
 msgid "X coordinate"
 msgstr "Coordonnée X"
 
-#: ../clutter/clutter-actor.c:6145
+#: ../clutter/clutter-actor.c:6215
 msgid "X coordinate of the actor"
 msgstr "Coordonnée X de l'acteur"
 
-#: ../clutter/clutter-actor.c:6163
+#: ../clutter/clutter-actor.c:6233
 msgid "Y coordinate"
 msgstr "Coordonnée Y"
 
-#: ../clutter/clutter-actor.c:6164
+#: ../clutter/clutter-actor.c:6234
 msgid "Y coordinate of the actor"
 msgstr "Coordonnée Y de l'acteur"
 
-#: ../clutter/clutter-actor.c:6186
+#: ../clutter/clutter-actor.c:6256
 msgid "Position"
 msgstr "Position"
 
-#: ../clutter/clutter-actor.c:6187
+#: ../clutter/clutter-actor.c:6257
 msgid "The position of the origin of the actor"
 msgstr "La position de l'origine de l'acteur"
 
-#: ../clutter/clutter-actor.c:6204 ../clutter/clutter-canvas.c:215
-#: ../clutter/clutter-grid-layout.c:1238
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:481
+#: ../clutter/clutter-actor.c:6274 ../clutter/clutter-canvas.c:247
+#: ../clutter/clutter-grid-layout.c:1239
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:474
 msgid "Width"
 msgstr "Largeur"
 
-#: ../clutter/clutter-actor.c:6205
+#: ../clutter/clutter-actor.c:6275
 msgid "Width of the actor"
 msgstr "Largeur de l'acteur"
 
-#: ../clutter/clutter-actor.c:6223 ../clutter/clutter-canvas.c:231
-#: ../clutter/clutter-grid-layout.c:1245
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:497
+#: ../clutter/clutter-actor.c:6293 ../clutter/clutter-canvas.c:263
+#: ../clutter/clutter-grid-layout.c:1246
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:490
 msgid "Height"
 msgstr "Hauteur"
 
-#: ../clutter/clutter-actor.c:6224
+#: ../clutter/clutter-actor.c:6294
 msgid "Height of the actor"
 msgstr "Hauteur de l'acteur"
 
-#: ../clutter/clutter-actor.c:6245
+#: ../clutter/clutter-actor.c:6315
 msgid "Size"
 msgstr "Taille"
 
-#: ../clutter/clutter-actor.c:6246
+#: ../clutter/clutter-actor.c:6316
 msgid "The size of the actor"
 msgstr "La taille de l'acteur"
 
-#: ../clutter/clutter-actor.c:6264
+#: ../clutter/clutter-actor.c:6334
 msgid "Fixed X"
 msgstr "X fixé"
 
-#: ../clutter/clutter-actor.c:6265
+#: ../clutter/clutter-actor.c:6335
 msgid "Forced X position of the actor"
 msgstr "Position fixe de l'acteur sur l'axe X"
 
-#: ../clutter/clutter-actor.c:6282
+#: ../clutter/clutter-actor.c:6352
 msgid "Fixed Y"
 msgstr "Y fixé"
 
-#: ../clutter/clutter-actor.c:6283
+#: ../clutter/clutter-actor.c:6353
 msgid "Forced Y position of the actor"
 msgstr "Position fixe de l'acteur sur l'axe Y"
 
-#: ../clutter/clutter-actor.c:6298
+#: ../clutter/clutter-actor.c:6368
 msgid "Fixed position set"
 msgstr "Position fixe définie"
 
-#: ../clutter/clutter-actor.c:6299
+#: ../clutter/clutter-actor.c:6369
 msgid "Whether to use fixed positioning for the actor"
 msgstr "Indique si l'acteur utilise un positionnement fixe"
 
-#: ../clutter/clutter-actor.c:6317
+#: ../clutter/clutter-actor.c:6387
 msgid "Min Width"
 msgstr "Largeur minimale"
 
-#: ../clutter/clutter-actor.c:6318
+#: ../clutter/clutter-actor.c:6388
 msgid "Forced minimum width request for the actor"
 msgstr "Requête de largeur minimale forcée pour l'acteur"
 
-#: ../clutter/clutter-actor.c:6336
+#: ../clutter/clutter-actor.c:6406
 msgid "Min Height"
 msgstr "Hauteur minimale"
 
-#: ../clutter/clutter-actor.c:6337
+#: ../clutter/clutter-actor.c:6407
 msgid "Forced minimum height request for the actor"
 msgstr "Requête de hauteur minimale forcée pour l'acteur"
 
-#: ../clutter/clutter-actor.c:6355
+#: ../clutter/clutter-actor.c:6425
 msgid "Natural Width"
 msgstr "Largeur naturelle"
 
-#: ../clutter/clutter-actor.c:6356
+#: ../clutter/clutter-actor.c:6426
 msgid "Forced natural width request for the actor"
 msgstr "Requête de largeur naturelle forcée pour l'acteur"
 
-#: ../clutter/clutter-actor.c:6374
+#: ../clutter/clutter-actor.c:6444
 msgid "Natural Height"
 msgstr "Hauteur Naturelle"
 
-#: ../clutter/clutter-actor.c:6375
+#: ../clutter/clutter-actor.c:6445
 msgid "Forced natural height request for the actor"
 msgstr "Requête de hauteur naturelle forcée pour l'acteur"
 
-#: ../clutter/clutter-actor.c:6390
+#: ../clutter/clutter-actor.c:6460
 msgid "Minimum width set"
 msgstr "Largeur minimale définie"
 
-#: ../clutter/clutter-actor.c:6391
+#: ../clutter/clutter-actor.c:6461
 msgid "Whether to use the min-width property"
-msgstr "Indique s'il faut utiliser la propriété largeur minimale"
+msgstr ""
+"Indique s'il faut utiliser la propriété « min-width » (largeur minimale)"
 
-#: ../clutter/clutter-actor.c:6405
+#: ../clutter/clutter-actor.c:6475
 msgid "Minimum height set"
 msgstr "Hauteur minimale définie"
 
-#: ../clutter/clutter-actor.c:6406
+#: ../clutter/clutter-actor.c:6476
 msgid "Whether to use the min-height property"
-msgstr "Indique s'il faut utiliser la propriété hauteur minimale"
+msgstr ""
+"Indique s'il faut utiliser la propriété « min-height » (hauteur minimale)"
 
-#: ../clutter/clutter-actor.c:6420
+#: ../clutter/clutter-actor.c:6490
 msgid "Natural width set"
 msgstr "Largeur naturelle définie"
 
-#: ../clutter/clutter-actor.c:6421
+#: ../clutter/clutter-actor.c:6491
 msgid "Whether to use the natural-width property"
-msgstr "Indique s'il faut utiliser la propriété largeur naturelle"
+msgstr ""
+"Indique s'il faut utiliser la propriété « natural-width » (largeur naturelle)"
 
-#: ../clutter/clutter-actor.c:6435
+#: ../clutter/clutter-actor.c:6505
 msgid "Natural height set"
 msgstr "Hauteur naturelle définie"
 
-#: ../clutter/clutter-actor.c:6436
+#: ../clutter/clutter-actor.c:6506
 msgid "Whether to use the natural-height property"
-msgstr "Indique s'il faut utiliser la propriété hauteur naturelle"
+msgstr ""
+"Indique s'il faut utiliser la propriété « natural-height » (hauteur "
+"naturelle)"
 
-#: ../clutter/clutter-actor.c:6452
+#: ../clutter/clutter-actor.c:6522
 msgid "Allocation"
 msgstr "Allocation"
 
-#: ../clutter/clutter-actor.c:6453
+#: ../clutter/clutter-actor.c:6523
 msgid "The actor's allocation"
 msgstr "L'allocation de l'acteur"
 
-#: ../clutter/clutter-actor.c:6510
+#: ../clutter/clutter-actor.c:6580
 msgid "Request Mode"
 msgstr "Mode de requête"
 
-#: ../clutter/clutter-actor.c:6511
+#: ../clutter/clutter-actor.c:6581
 msgid "The actor's request mode"
 msgstr "Le mode de requête de l'acteur"
 
-#: ../clutter/clutter-actor.c:6535
+#: ../clutter/clutter-actor.c:6605
 msgid "Depth"
 msgstr "Profondeur"
 
-#: ../clutter/clutter-actor.c:6536
+#: ../clutter/clutter-actor.c:6606
 msgid "Position on the Z axis"
 msgstr "Position sur l'axe Z"
 
-#: ../clutter/clutter-actor.c:6563
+#: ../clutter/clutter-actor.c:6633
 msgid "Z Position"
 msgstr "Position Z"
 
-#: ../clutter/clutter-actor.c:6564
+#: ../clutter/clutter-actor.c:6634
 msgid "The actor's position on the Z axis"
 msgstr "Position de l'acteur sur l'axe Z"
 
-#: ../clutter/clutter-actor.c:6581
+#: ../clutter/clutter-actor.c:6651
 msgid "Opacity"
 msgstr "Opacité"
 
-#: ../clutter/clutter-actor.c:6582
+#: ../clutter/clutter-actor.c:6652
 msgid "Opacity of an actor"
 msgstr "Opacité d'un acteur"
 
-#: ../clutter/clutter-actor.c:6602
+#: ../clutter/clutter-actor.c:6672
 msgid "Offscreen redirect"
 msgstr "Redirection hors écran"
 
-#: ../clutter/clutter-actor.c:6603
+#: ../clutter/clutter-actor.c:6673
 msgid "Flags controlling when to flatten the actor into a single image"
 msgstr "Drapeaux contrôlant la mise à plat de l'acteur sur une seule image"
 
-#: ../clutter/clutter-actor.c:6617
+#: ../clutter/clutter-actor.c:6687
 msgid "Visible"
 msgstr "Visible"
 
-#: ../clutter/clutter-actor.c:6618
+#: ../clutter/clutter-actor.c:6688
 msgid "Whether the actor is visible or not"
 msgstr "Indique si un acteur est visible ou non"
 
-#: ../clutter/clutter-actor.c:6632
+#: ../clutter/clutter-actor.c:6702
 msgid "Mapped"
 msgstr "Tracé"
 
-#: ../clutter/clutter-actor.c:6633
+#: ../clutter/clutter-actor.c:6703
 msgid "Whether the actor will be painted"
 msgstr "Indique si l'acteur sera peint"
 
-#: ../clutter/clutter-actor.c:6646
+#: ../clutter/clutter-actor.c:6716
 msgid "Realized"
 msgstr "Réalisé"
 
-#: ../clutter/clutter-actor.c:6647
+#: ../clutter/clutter-actor.c:6717
 msgid "Whether the actor has been realized"
 msgstr "Indique si l'acteur a été réalisé"
 
-#: ../clutter/clutter-actor.c:6662
+#: ../clutter/clutter-actor.c:6732
 msgid "Reactive"
 msgstr "Réactif"
 
-#: ../clutter/clutter-actor.c:6663
+#: ../clutter/clutter-actor.c:6733
 msgid "Whether the actor is reactive to events"
 msgstr "Indique si l'acteur est réactif aux événements"
 
-#: ../clutter/clutter-actor.c:6674
+#: ../clutter/clutter-actor.c:6744
 msgid "Has Clip"
 msgstr "Possède une zone de rognage"
 
-#: ../clutter/clutter-actor.c:6675
+#: ../clutter/clutter-actor.c:6745
 msgid "Whether the actor has a clip set"
 msgstr "Indique si l'acteur possède une zone de rognage définie"
 
-#: ../clutter/clutter-actor.c:6688
+#: ../clutter/clutter-actor.c:6758
 msgid "Clip"
 msgstr "Rognage"
 
-#: ../clutter/clutter-actor.c:6689
+#: ../clutter/clutter-actor.c:6759
 msgid "The clip region for the actor"
 msgstr "La zone de rognage de l'acteur"
 
-#: ../clutter/clutter-actor.c:6708
+#: ../clutter/clutter-actor.c:6778
 msgid "Clip Rectangle"
 msgstr "Rectangle de rognage"
 
-#: ../clutter/clutter-actor.c:6709
+#: ../clutter/clutter-actor.c:6779
 msgid "The visible region of the actor"
 msgstr "La zone visible de l'acteur"
 
-#: ../clutter/clutter-actor.c:6723 ../clutter/clutter-actor-meta.c:207
-#: ../clutter/clutter-binding-pool.c:319 ../clutter/clutter-input-device.c:258
+#: ../clutter/clutter-actor.c:6793 ../clutter/clutter-actor-meta.c:205
+#: ../clutter/clutter-binding-pool.c:319 ../clutter/clutter-input-device.c:247
 msgid "Name"
 msgstr "Nom"
 
-#: ../clutter/clutter-actor.c:6724
+#: ../clutter/clutter-actor.c:6794
 msgid "Name of the actor"
 msgstr "Nom de l'acteur"
 
-#: ../clutter/clutter-actor.c:6745
+#: ../clutter/clutter-actor.c:6815
 msgid "Pivot Point"
 msgstr "Point pivot"
 
-#: ../clutter/clutter-actor.c:6746
+#: ../clutter/clutter-actor.c:6816
 msgid "The point around which the scaling and rotation occur"
 msgstr "Le point pivot autour duquel s'organisent l'homothétie et la rotation"
 
-#: ../clutter/clutter-actor.c:6764
+#: ../clutter/clutter-actor.c:6834
 msgid "Pivot Point Z"
 msgstr "Point pivot Z"
 
-#: ../clutter/clutter-actor.c:6765
+#: ../clutter/clutter-actor.c:6835
 msgid "Z component of the pivot point"
 msgstr "Composant Z du point pivot"
 
-#: ../clutter/clutter-actor.c:6783
+#: ../clutter/clutter-actor.c:6853
 msgid "Scale X"
 msgstr "Homothétie (X)"
 
-#: ../clutter/clutter-actor.c:6784
+#: ../clutter/clutter-actor.c:6854
 msgid "Scale factor on the X axis"
 msgstr "Facteur d'homothétie sur l'axe X"
 
-#: ../clutter/clutter-actor.c:6802
+#: ../clutter/clutter-actor.c:6872
 msgid "Scale Y"
 msgstr "Homothétie (Y)"
 
-#: ../clutter/clutter-actor.c:6803
+#: ../clutter/clutter-actor.c:6873
 msgid "Scale factor on the Y axis"
 msgstr "Facteur d'homothétie sur l'axe Y"
 
-#: ../clutter/clutter-actor.c:6821
+#: ../clutter/clutter-actor.c:6891
 msgid "Scale Z"
 msgstr "Homothétie (Z)"
 
-#: ../clutter/clutter-actor.c:6822
+#: ../clutter/clutter-actor.c:6892
 msgid "Scale factor on the Z axis"
 msgstr "Facteur d'homothétie sur l'axe Z"
 
-#: ../clutter/clutter-actor.c:6840
+#: ../clutter/clutter-actor.c:6910
 msgid "Scale Center X"
 msgstr "Centre d'homothétie (X)"
 
-#: ../clutter/clutter-actor.c:6841
+#: ../clutter/clutter-actor.c:6911
 msgid "Horizontal scale center"
 msgstr "Centre d'homothétie horizontale"
 
-#: ../clutter/clutter-actor.c:6859
+#: ../clutter/clutter-actor.c:6929
 msgid "Scale Center Y"
 msgstr "Centre d'homothétie (Y)"
 
-#: ../clutter/clutter-actor.c:6860
+#: ../clutter/clutter-actor.c:6930
 msgid "Vertical scale center"
 msgstr "Centre d'homothétie verticale"
 
-#: ../clutter/clutter-actor.c:6878
+#: ../clutter/clutter-actor.c:6948
 msgid "Scale Gravity"
 msgstr "Homothétie par rapport au centre de gravité"
 
-#: ../clutter/clutter-actor.c:6879
+#: ../clutter/clutter-actor.c:6949
 msgid "The center of scaling"
 msgstr "Le centre d'homothétie"
 
-#: ../clutter/clutter-actor.c:6897
+#: ../clutter/clutter-actor.c:6967
 msgid "Rotation Angle X"
 msgstr "Angle de rotation (X)"
 
-#: ../clutter/clutter-actor.c:6898
+#: ../clutter/clutter-actor.c:6968
 msgid "The rotation angle on the X axis"
 msgstr "L'angle de rotation autour de l'axe X"
 
-#: ../clutter/clutter-actor.c:6916
+#: ../clutter/clutter-actor.c:6986
 msgid "Rotation Angle Y"
 msgstr "Angle de rotation (Y)"
 
-#: ../clutter/clutter-actor.c:6917
+#: ../clutter/clutter-actor.c:6987
 msgid "The rotation angle on the Y axis"
 msgstr "L'angle de rotation autour de l'axe Y"
 
-#: ../clutter/clutter-actor.c:6935
+#: ../clutter/clutter-actor.c:7005
 msgid "Rotation Angle Z"
 msgstr "Angle de rotation (Z)"
 
-#: ../clutter/clutter-actor.c:6936
+#: ../clutter/clutter-actor.c:7006
 msgid "The rotation angle on the Z axis"
 msgstr "L'angle de rotation autour de l'axe Z"
 
-#: ../clutter/clutter-actor.c:6954
+#: ../clutter/clutter-actor.c:7024
 msgid "Rotation Center X"
 msgstr "Centre de rotation (X)"
 
-#: ../clutter/clutter-actor.c:6955
+#: ../clutter/clutter-actor.c:7025
 msgid "The rotation center on the X axis"
 msgstr "Le centre de rotation sur l'axe X"
 
-#: ../clutter/clutter-actor.c:6972
+#: ../clutter/clutter-actor.c:7042
 msgid "Rotation Center Y"
 msgstr "Centre de rotation (Y)"
 
-#: ../clutter/clutter-actor.c:6973
+#: ../clutter/clutter-actor.c:7043
 msgid "The rotation center on the Y axis"
 msgstr "Le centre de rotation sur l'axe Y"
 
-#: ../clutter/clutter-actor.c:6990
+#: ../clutter/clutter-actor.c:7060
 msgid "Rotation Center Z"
 msgstr "Centre de rotation (Z)"
 
-#: ../clutter/clutter-actor.c:6991
+#: ../clutter/clutter-actor.c:7061
 msgid "The rotation center on the Z axis"
 msgstr "Le centre de rotation sur l'axe Z"
 
-#: ../clutter/clutter-actor.c:7008
+#: ../clutter/clutter-actor.c:7078
 msgid "Rotation Center Z Gravity"
 msgstr "Rotation autour du centre de gravité suivant Z"
 
-#: ../clutter/clutter-actor.c:7009
+#: ../clutter/clutter-actor.c:7079
 msgid "Center point for rotation around the Z axis"
 msgstr "Point central pour la rotation autour de l'axe Z"
 
-#: ../clutter/clutter-actor.c:7037
+#: ../clutter/clutter-actor.c:7107
 msgid "Anchor X"
 msgstr "Ancre (X)"
 
-#: ../clutter/clutter-actor.c:7038
+#: ../clutter/clutter-actor.c:7108
 msgid "X coordinate of the anchor point"
 msgstr "Coordonnée X du point d'ancrage"
 
-#: ../clutter/clutter-actor.c:7066
+#: ../clutter/clutter-actor.c:7136
 msgid "Anchor Y"
 msgstr "Ancre (Y)"
 
-#: ../clutter/clutter-actor.c:7067
+#: ../clutter/clutter-actor.c:7137
 msgid "Y coordinate of the anchor point"
 msgstr "Coordonnée Y du point d'ancrage"
 
-#: ../clutter/clutter-actor.c:7094
+#: ../clutter/clutter-actor.c:7164
 msgid "Anchor Gravity"
 msgstr "Centre de gravité de l'ancre"
 
-#: ../clutter/clutter-actor.c:7095
+#: ../clutter/clutter-actor.c:7165
 msgid "The anchor point as a ClutterGravity"
 msgstr "Le point d'ancrage comme un « ClutterGravity »"
 
-#: ../clutter/clutter-actor.c:7114
+#: ../clutter/clutter-actor.c:7184
 msgid "Translation X"
 msgstr "Translation X"
 
-#: ../clutter/clutter-actor.c:7115
+#: ../clutter/clutter-actor.c:7185
 msgid "Translation along the X axis"
 msgstr "Translation le long de l'axe X"
 
-#: ../clutter/clutter-actor.c:7134
+#: ../clutter/clutter-actor.c:7204
 msgid "Translation Y"
 msgstr "Translation Y"
 
-#: ../clutter/clutter-actor.c:7135
+#: ../clutter/clutter-actor.c:7205
 msgid "Translation along the Y axis"
 msgstr "Translation le long de l'axe Y"
 
-#: ../clutter/clutter-actor.c:7154
+#: ../clutter/clutter-actor.c:7224
 msgid "Translation Z"
 msgstr "Translation Z"
 
-#: ../clutter/clutter-actor.c:7155
+#: ../clutter/clutter-actor.c:7225
 msgid "Translation along the Z axis"
 msgstr "Translation le long de l'axe Z"
 
-#: ../clutter/clutter-actor.c:7185
+#: ../clutter/clutter-actor.c:7255
 msgid "Transform"
 msgstr "Transformation"
 
-#: ../clutter/clutter-actor.c:7186
+#: ../clutter/clutter-actor.c:7256
 msgid "Transformation matrix"
 msgstr "Matrice de transformation"
 
-#: ../clutter/clutter-actor.c:7201
+#: ../clutter/clutter-actor.c:7271
 msgid "Transform Set"
 msgstr "Définition de la transformation"
 
-#: ../clutter/clutter-actor.c:7202
+#: ../clutter/clutter-actor.c:7272
 msgid "Whether the transform property is set"
-msgstr "Indique si la propriété transformation est définie"
+msgstr "Indique si la propriété « transform » (transformation) est définie"
 
-#: ../clutter/clutter-actor.c:7223
+#: ../clutter/clutter-actor.c:7293
 msgid "Child Transform"
 msgstr "Transformation de l'enfant"
 
-#: ../clutter/clutter-actor.c:7224
+#: ../clutter/clutter-actor.c:7294
 msgid "Children transformation matrix"
 msgstr "Matrice de transformation de l'enfant"
 
-#: ../clutter/clutter-actor.c:7239
+#: ../clutter/clutter-actor.c:7309
 msgid "Child Transform Set"
 msgstr "Définition de la transformation de l'enfant"
 
-#: ../clutter/clutter-actor.c:7240
+#: ../clutter/clutter-actor.c:7310
 msgid "Whether the child-transform property is set"
-msgstr "Indique si la propriété transformer-enfant est définie"
+msgstr ""
+"Indique si la propriété « child-transform » (transformation de l'enfant) est "
+"définie"
 
-#: ../clutter/clutter-actor.c:7257
+#: ../clutter/clutter-actor.c:7327
 msgid "Show on set parent"
 msgstr "Afficher le parent défini"
 
-#: ../clutter/clutter-actor.c:7258
+#: ../clutter/clutter-actor.c:7328
 msgid "Whether the actor is shown when parented"
 msgstr "Indique si l'acteur s'affiche quand son parent est défini"
 
-#: ../clutter/clutter-actor.c:7275
+#: ../clutter/clutter-actor.c:7345
 msgid "Clip to Allocation"
 msgstr "Coupure d'allocation"
 
-#: ../clutter/clutter-actor.c:7276
+#: ../clutter/clutter-actor.c:7346
 msgid "Sets the clip region to track the actor's allocation"
 msgstr "Définit la région de la coupure pour détecter l'allocation de l'acteur"
 
-#: ../clutter/clutter-actor.c:7289
+#: ../clutter/clutter-actor.c:7359
 msgid "Text Direction"
 msgstr "Direction du texte"
 
-#: ../clutter/clutter-actor.c:7290
+#: ../clutter/clutter-actor.c:7360
 msgid "Direction of the text"
 msgstr "La direction du texte"
 
-#: ../clutter/clutter-actor.c:7305
+#: ../clutter/clutter-actor.c:7375
 msgid "Has Pointer"
 msgstr "Contient le pointeur"
 
-#: ../clutter/clutter-actor.c:7306
+#: ../clutter/clutter-actor.c:7376
 msgid "Whether the actor contains the pointer of an input device"
 msgstr "Indique si l'acteur contient le pointer d'un périphérique d'entrée"
 
-#: ../clutter/clutter-actor.c:7319
+#: ../clutter/clutter-actor.c:7389
 msgid "Actions"
 msgstr "Actions"
 
-#: ../clutter/clutter-actor.c:7320
+#: ../clutter/clutter-actor.c:7390
 msgid "Adds an action to the actor"
 msgstr "Ajoute une action à l'acteur"
 
-#: ../clutter/clutter-actor.c:7333
+#: ../clutter/clutter-actor.c:7403
 msgid "Constraints"
 msgstr "Contraintes"
 
-#: ../clutter/clutter-actor.c:7334
+#: ../clutter/clutter-actor.c:7404
 msgid "Adds a constraint to the actor"
 msgstr "Ajoute une contrainte à l'acteur"
 
-#: ../clutter/clutter-actor.c:7347
+#: ../clutter/clutter-actor.c:7417
 msgid "Effect"
 msgstr "Effet"
 
-#: ../clutter/clutter-actor.c:7348
+#: ../clutter/clutter-actor.c:7418
 msgid "Add an effect to be applied on the actor"
 msgstr "Ajoute un effet à appliquer à l'acteur"
 
-#: ../clutter/clutter-actor.c:7362
+#: ../clutter/clutter-actor.c:7432
 msgid "Layout Manager"
 msgstr "Gestionnaire de disposition"
 
-#: ../clutter/clutter-actor.c:7363
+#: ../clutter/clutter-actor.c:7433
 msgid "The object controlling the layout of an actor's children"
 msgstr "L'objet contrôlant la disposition des enfants d'un acteur"
 
-#: ../clutter/clutter-actor.c:7377
+#: ../clutter/clutter-actor.c:7447
 msgid "X Expand"
 msgstr "Étendre suivant X"
 
-#: ../clutter/clutter-actor.c:7378
+#: ../clutter/clutter-actor.c:7448
 msgid "Whether extra horizontal space should be assigned to the actor"
 msgstr ""
 "Indique si l'espace horizontal supplémentaire doit être attribué à l'acteur"
 
-#: ../clutter/clutter-actor.c:7393
+#: ../clutter/clutter-actor.c:7463
 msgid "Y Expand"
 msgstr "Étendre suivant Y"
 
-#: ../clutter/clutter-actor.c:7394
+#: ../clutter/clutter-actor.c:7464
 msgid "Whether extra vertical space should be assigned to the actor"
 msgstr ""
 "Indique si l'espace vertical supplémentaire doit être attribué à l'acteur"
 
-#: ../clutter/clutter-actor.c:7410
+#: ../clutter/clutter-actor.c:7480
 msgid "X Alignment"
 msgstr "Alignement X"
 
-#: ../clutter/clutter-actor.c:7411
+#: ../clutter/clutter-actor.c:7481
 msgid "The alignment of the actor on the X axis within its allocation"
 msgstr "L'alignement de l'acteur sur l'axe X dans l'espace alloué"
 
-#: ../clutter/clutter-actor.c:7426
+#: ../clutter/clutter-actor.c:7496
 msgid "Y Alignment"
 msgstr "Alignement Y"
 
-#: ../clutter/clutter-actor.c:7427
+#: ../clutter/clutter-actor.c:7497
 msgid "The alignment of the actor on the Y axis within its allocation"
 msgstr "L'alignement de l'acteur sur l'axe Y dans l'espace alloué"
 
-#: ../clutter/clutter-actor.c:7446
+#: ../clutter/clutter-actor.c:7516
 msgid "Margin Top"
 msgstr "Marge supérieure"
 
-#: ../clutter/clutter-actor.c:7447
+#: ../clutter/clutter-actor.c:7517
 msgid "Extra space at the top"
 msgstr "Espace supplémentaire en haut"
 
-#: ../clutter/clutter-actor.c:7468
+#: ../clutter/clutter-actor.c:7538
 msgid "Margin Bottom"
 msgstr "Marge inférieure"
 
-#: ../clutter/clutter-actor.c:7469
+#: ../clutter/clutter-actor.c:7539
 msgid "Extra space at the bottom"
 msgstr "Espace supplémentaire en bas"
 
-#: ../clutter/clutter-actor.c:7490
+#: ../clutter/clutter-actor.c:7560
 msgid "Margin Left"
 msgstr "Marge de gauche"
 
-#: ../clutter/clutter-actor.c:7491
+#: ../clutter/clutter-actor.c:7561
 msgid "Extra space at the left"
 msgstr "Espace supplémentaire à gauche"
 
-#: ../clutter/clutter-actor.c:7512
+#: ../clutter/clutter-actor.c:7582
 msgid "Margin Right"
 msgstr "Marge de droite"
 
-#: ../clutter/clutter-actor.c:7513
+#: ../clutter/clutter-actor.c:7583
 msgid "Extra space at the right"
 msgstr "Espace supplémentaire à droite"
 
-#: ../clutter/clutter-actor.c:7529
+#: ../clutter/clutter-actor.c:7599
 msgid "Background Color Set"
 msgstr "Couleur de fond définie"
 
-#: ../clutter/clutter-actor.c:7530 ../clutter/deprecated/clutter-box.c:275
+#: ../clutter/clutter-actor.c:7600 ../clutter/deprecated/clutter-box.c:271
 msgid "Whether the background color is set"
 msgstr "Indique si la couleur de fond a été définie"
 
-#: ../clutter/clutter-actor.c:7546
+#: ../clutter/clutter-actor.c:7616
 msgid "Background color"
 msgstr "Couleur de fond"
 
-#: ../clutter/clutter-actor.c:7547
+#: ../clutter/clutter-actor.c:7617
 msgid "The actor's background color"
 msgstr "La couleur de fond de l'acteur"
 
-#: ../clutter/clutter-actor.c:7562
+#: ../clutter/clutter-actor.c:7632
 msgid "First Child"
 msgstr "Premier enfant"
 
-#: ../clutter/clutter-actor.c:7563
+#: ../clutter/clutter-actor.c:7633
 msgid "The actor's first child"
 msgstr "Le premier enfant de l'acteur"
 
-#: ../clutter/clutter-actor.c:7576
+#: ../clutter/clutter-actor.c:7646
 msgid "Last Child"
 msgstr "Dernier enfant"
 
-#: ../clutter/clutter-actor.c:7577
+#: ../clutter/clutter-actor.c:7647
 msgid "The actor's last child"
 msgstr "Le dernier enfant de l'acteur"
 
-#: ../clutter/clutter-actor.c:7591
+#: ../clutter/clutter-actor.c:7661
 msgid "Content"
 msgstr "Contenu"
 
-#: ../clutter/clutter-actor.c:7592
+#: ../clutter/clutter-actor.c:7662
 msgid "Delegate object for painting the actor's content"
 msgstr "Délègue l'objet au dessin du contenu de l'acteur"
 
-#: ../clutter/clutter-actor.c:7617
+#: ../clutter/clutter-actor.c:7687
 msgid "Content Gravity"
 msgstr "Centre de gravité du contenu"
 
-#: ../clutter/clutter-actor.c:7618
+#: ../clutter/clutter-actor.c:7688
 msgid "Alignment of the actor's content"
 msgstr "Alignement du contenu de l'acteur"
 
-#: ../clutter/clutter-actor.c:7638
+#: ../clutter/clutter-actor.c:7708
 msgid "Content Box"
 msgstr "Boîte du contenu"
 
-#: ../clutter/clutter-actor.c:7639
+#: ../clutter/clutter-actor.c:7709
 msgid "The bounding box of the actor's content"
 msgstr "La boîte délimitant le contenu de l'acteur"
 
-#: ../clutter/clutter-actor.c:7647
+#: ../clutter/clutter-actor.c:7717
 msgid "Minification Filter"
 msgstr "Filtre de réduction"
 
-#: ../clutter/clutter-actor.c:7648
+#: ../clutter/clutter-actor.c:7718
 msgid "The filter used when reducing the size of the content"
 msgstr "Le filtre utilisé pour réduire la taille du contenu"
 
-#: ../clutter/clutter-actor.c:7655
+#: ../clutter/clutter-actor.c:7725
 msgid "Magnification Filter"
 msgstr "Filtre d'agrandissement"
 
-#: ../clutter/clutter-actor.c:7656
+#: ../clutter/clutter-actor.c:7726
 msgid "The filter used when increasing the size of the content"
 msgstr "Le filtre utilisé pour augmenter la taille du contenu"
 
-#: ../clutter/clutter-actor.c:7670
+#: ../clutter/clutter-actor.c:7740
 msgid "Content Repeat"
 msgstr "Répétition du contenu"
 
-#: ../clutter/clutter-actor.c:7671
+#: ../clutter/clutter-actor.c:7741
 msgid "The repeat policy for the actor's content"
 msgstr "La règle de répétition du contenu de l'acteur"
 
-#: ../clutter/clutter-actor-meta.c:193 ../clutter/clutter-child-meta.c:142
+#: ../clutter/clutter-actor-meta.c:191 ../clutter/clutter-child-meta.c:142
 msgid "Actor"
 msgstr "Acteur"
 
-#: ../clutter/clutter-actor-meta.c:194
+#: ../clutter/clutter-actor-meta.c:192
 msgid "The actor attached to the meta"
 msgstr "L'acteur attaché au méta"
 
-#: ../clutter/clutter-actor-meta.c:208
+#: ../clutter/clutter-actor-meta.c:206
 msgid "The name of the meta"
 msgstr "Le nom du méta"
 
-#: ../clutter/clutter-actor-meta.c:221 ../clutter/clutter-input-device.c:337
-#: ../clutter/deprecated/clutter-shader.c:313
+#: ../clutter/clutter-actor-meta.c:219 ../clutter/clutter-input-device.c:326
+#: ../clutter/deprecated/clutter-shader.c:309
 msgid "Enabled"
 msgstr "Activé"
 
-#: ../clutter/clutter-actor-meta.c:222
+#: ../clutter/clutter-actor-meta.c:220
 msgid "Whether the meta is enabled"
 msgstr "Indique si le méta est activé"
 
 #: ../clutter/clutter-align-constraint.c:279
-#: ../clutter/clutter-bind-constraint.c:358 ../clutter/clutter-clone.c:345
+#: ../clutter/clutter-bind-constraint.c:358 ../clutter/clutter-clone.c:341
 #: ../clutter/clutter-snap-constraint.c:321
 msgid "Source"
 msgstr "Source"
@@ -731,11 +738,11 @@ msgstr "Facteur"
 msgid "The alignment factor, between 0.0 and 1.0"
 msgstr "Le facteur d'alignement, entre 0.0 et 1.0"
 
-#: ../clutter/clutter-backend.c:379
+#: ../clutter/clutter-backend.c:380
 msgid "Unable to initialize the Clutter backend"
 msgstr "Impossible d'initialiser le moteur Clutter"
 
-#: ../clutter/clutter-backend.c:453
+#: ../clutter/clutter-backend.c:454
 #, c-format
 msgid "The backend of type '%s' does not support creating multiple stages"
 msgstr ""
@@ -768,52 +775,56 @@ msgstr "Le décalage, en pixels, à appliquer au lien"
 msgid "The unique name of the binding pool"
 msgstr "Le nom unique de l'ensemble des liens"
 
-#: ../clutter/clutter-bin-layout.c:240 ../clutter/clutter-bin-layout.c:655
-#: ../clutter/clutter-box-layout.c:390 ../clutter/clutter-table-layout.c:610
+#: ../clutter/clutter-bin-layout.c:238 ../clutter/clutter-bin-layout.c:651
+#: ../clutter/clutter-box-layout.c:388
+#: ../clutter/deprecated/clutter-table-layout.c:610
 msgid "Horizontal Alignment"
 msgstr "Alignement horizontal"
 
-#: ../clutter/clutter-bin-layout.c:241
+#: ../clutter/clutter-bin-layout.c:239
 msgid "Horizontal alignment for the actor inside the layout manager"
 msgstr ""
 "Alignement horizontal de l'acteur à l'intérieur du gestionnaire de "
 "disposition"
 
-#: ../clutter/clutter-bin-layout.c:249 ../clutter/clutter-bin-layout.c:675
-#: ../clutter/clutter-box-layout.c:399 ../clutter/clutter-table-layout.c:625
+#: ../clutter/clutter-bin-layout.c:247 ../clutter/clutter-bin-layout.c:671
+#: ../clutter/clutter-box-layout.c:397
+#: ../clutter/deprecated/clutter-table-layout.c:625
 msgid "Vertical Alignment"
 msgstr "Alignement vertical"
 
-#: ../clutter/clutter-bin-layout.c:250
+#: ../clutter/clutter-bin-layout.c:248
 msgid "Vertical alignment for the actor inside the layout manager"
 msgstr ""
 "Alignement vertical de l'acteur à l'intérieur du gestionnaire de disposition"
 
-#: ../clutter/clutter-bin-layout.c:656
+#: ../clutter/clutter-bin-layout.c:652
 msgid "Default horizontal alignment for the actors inside the layout manager"
 msgstr ""
 "Alignement horizontal par défaut des acteurs à l'intérieur du gestionnaire "
 "de disposition"
 
-#: ../clutter/clutter-bin-layout.c:676
+#: ../clutter/clutter-bin-layout.c:672
 msgid "Default vertical alignment for the actors inside the layout manager"
 msgstr ""
 "Alignement vertical par défaut des acteurs à l'intérieur du gestionnaire de "
 "disposition"
 
-#: ../clutter/clutter-box-layout.c:365
+#: ../clutter/clutter-box-layout.c:363
 msgid "Expand"
 msgstr "Étendre"
 
-#: ../clutter/clutter-box-layout.c:366
+#: ../clutter/clutter-box-layout.c:364
 msgid "Allocate extra space for the child"
 msgstr "Alloue de l'espace supplémentaire pour l'enfant"
 
-#: ../clutter/clutter-box-layout.c:372 ../clutter/clutter-table-layout.c:589
+#: ../clutter/clutter-box-layout.c:370
+#: ../clutter/deprecated/clutter-table-layout.c:589
 msgid "Horizontal Fill"
 msgstr "Remplissage horizontal"
 
-#: ../clutter/clutter-box-layout.c:373 ../clutter/clutter-table-layout.c:590
+#: ../clutter/clutter-box-layout.c:371
+#: ../clutter/deprecated/clutter-table-layout.c:590
 msgid ""
 "Whether the child should receive priority when the container is allocating "
 "spare space on the horizontal axis"
@@ -821,11 +832,13 @@ msgstr ""
 "Indique si l'enfant doit être prioritaire lorsque le conteneur alloue de "
 "l'espace supplémentaire sur l'axe horizontal"
 
-#: ../clutter/clutter-box-layout.c:381 ../clutter/clutter-table-layout.c:596
+#: ../clutter/clutter-box-layout.c:379
+#: ../clutter/deprecated/clutter-table-layout.c:596
 msgid "Vertical Fill"
 msgstr "Remplissage vertical"
 
-#: ../clutter/clutter-box-layout.c:382 ../clutter/clutter-table-layout.c:597
+#: ../clutter/clutter-box-layout.c:380
+#: ../clutter/deprecated/clutter-table-layout.c:597
 msgid ""
 "Whether the child should receive priority when the container is allocating "
 "spare space on the vertical axis"
@@ -833,80 +846,88 @@ msgstr ""
 "Indique si l'enfant doit être prioritaire lorsque le conteneur alloue de "
 "l'espace supplémentaire sur l'axe vertical"
 
-#: ../clutter/clutter-box-layout.c:391 ../clutter/clutter-table-layout.c:611
+#: ../clutter/clutter-box-layout.c:389
+#: ../clutter/deprecated/clutter-table-layout.c:611
 msgid "Horizontal alignment of the actor within the cell"
 msgstr "Alignement horizontal de l'acteur dans la cellule"
 
-#: ../clutter/clutter-box-layout.c:400 ../clutter/clutter-table-layout.c:626
+#: ../clutter/clutter-box-layout.c:398
+#: ../clutter/deprecated/clutter-table-layout.c:626
 msgid "Vertical alignment of the actor within the cell"
 msgstr "Alignement vertical de l'acteur dans la cellule"
 
-#: ../clutter/clutter-box-layout.c:1365
+#: ../clutter/clutter-box-layout.c:1359
 msgid "Vertical"
 msgstr "Vertical"
 
-#: ../clutter/clutter-box-layout.c:1366
+#: ../clutter/clutter-box-layout.c:1360
 msgid "Whether the layout should be vertical, rather than horizontal"
 msgstr "Indique si l'agencement doit être vertical plutôt qu'horizontal"
 
-#: ../clutter/clutter-box-layout.c:1383 ../clutter/clutter-flow-layout.c:890
-#: ../clutter/clutter-grid-layout.c:1550
+#: ../clutter/clutter-box-layout.c:1377 ../clutter/clutter-flow-layout.c:942
+#: ../clutter/clutter-grid-layout.c:1549
 msgid "Orientation"
 msgstr "Orientation"
 
-#: ../clutter/clutter-box-layout.c:1384 ../clutter/clutter-flow-layout.c:891
-#: ../clutter/clutter-grid-layout.c:1551
+#: ../clutter/clutter-box-layout.c:1378 ../clutter/clutter-flow-layout.c:943
+#: ../clutter/clutter-grid-layout.c:1550
 msgid "The orientation of the layout"
 msgstr "L'orientation de la disposition"
 
-#: ../clutter/clutter-box-layout.c:1400 ../clutter/clutter-flow-layout.c:906
+#: ../clutter/clutter-box-layout.c:1394 ../clutter/clutter-flow-layout.c:958
 msgid "Homogeneous"
 msgstr "Homogène"
 
-#: ../clutter/clutter-box-layout.c:1401
+#: ../clutter/clutter-box-layout.c:1395
 msgid ""
 "Whether the layout should be homogeneous, i.e. all childs get the same size"
 msgstr ""
 "Indique si l'agencement doit être homogène, c.-à-d. si tous les enfants "
 "doivent avoir la même taille"
 
-#: ../clutter/clutter-box-layout.c:1416
+#: ../clutter/clutter-box-layout.c:1410
 msgid "Pack Start"
 msgstr "Empaqueter au début"
 
-#: ../clutter/clutter-box-layout.c:1417
+#: ../clutter/clutter-box-layout.c:1411
 msgid "Whether to pack items at the start of the box"
 msgstr "Indique s'il faut empaqueter les éléments au début de la boîte"
 
-#: ../clutter/clutter-box-layout.c:1430
+#: ../clutter/clutter-box-layout.c:1424
 msgid "Spacing"
 msgstr "Espacement"
 
-#: ../clutter/clutter-box-layout.c:1431
+#: ../clutter/clutter-box-layout.c:1425
 msgid "Spacing between children"
 msgstr "Espacement entre les enfants"
 
-#: ../clutter/clutter-box-layout.c:1448 ../clutter/clutter-table-layout.c:1675
+#: ../clutter/clutter-box-layout.c:1442
+#: ../clutter/deprecated/clutter-table-layout.c:1677
 msgid "Use Animations"
 msgstr "Utilise les animations"
 
-#: ../clutter/clutter-box-layout.c:1449 ../clutter/clutter-table-layout.c:1676
+#: ../clutter/clutter-box-layout.c:1443
+#: ../clutter/deprecated/clutter-table-layout.c:1678
 msgid "Whether layout changes should be animated"
 msgstr "Indique si les changements de position doivent être animés ou non"
 
-#: ../clutter/clutter-box-layout.c:1473 ../clutter/clutter-table-layout.c:1700
+#: ../clutter/clutter-box-layout.c:1467
+#: ../clutter/deprecated/clutter-table-layout.c:1702
 msgid "Easing Mode"
 msgstr "Mode d'animation"
 
-#: ../clutter/clutter-box-layout.c:1474 ../clutter/clutter-table-layout.c:1701
+#: ../clutter/clutter-box-layout.c:1468
+#: ../clutter/deprecated/clutter-table-layout.c:1703
 msgid "The easing mode of the animations"
 msgstr "Le mode d'animation des animations"
 
-#: ../clutter/clutter-box-layout.c:1494 ../clutter/clutter-table-layout.c:1721
+#: ../clutter/clutter-box-layout.c:1488
+#: ../clutter/deprecated/clutter-table-layout.c:1723
 msgid "Easing Duration"
 msgstr "Durée d'animation"
 
-#: ../clutter/clutter-box-layout.c:1495 ../clutter/clutter-table-layout.c:1722
+#: ../clutter/clutter-box-layout.c:1489
+#: ../clutter/deprecated/clutter-table-layout.c:1724
 msgid "The duration of the animations"
 msgstr "La durée des animations"
 
@@ -926,14 +947,31 @@ msgstr "Contraste"
 msgid "The contrast change to apply"
 msgstr "La modification de contraste à appliquer"
 
-#: ../clutter/clutter-canvas.c:216
+#: ../clutter/clutter-canvas.c:248
 msgid "The width of the canvas"
 msgstr "La largeur du canevas"
 
-#: ../clutter/clutter-canvas.c:232
+#: ../clutter/clutter-canvas.c:264
 msgid "The height of the canvas"
 msgstr "La hauteur du canevas"
 
+#: ../clutter/clutter-canvas.c:283
+msgid "Scale Factor Set"
+msgstr "Facteur d'homothétie renseigné"
+
+#: ../clutter/clutter-canvas.c:284
+msgid "Whether the scale-factor property is set"
+msgstr ""
+"Indique si la propriété « scale-factor » (facteur d'homothétie) est définie"
+
+#: ../clutter/clutter-canvas.c:305
+msgid "Scale Factor"
+msgstr "Facteur d'homothétie"
+
+#: ../clutter/clutter-canvas.c:306
+msgid "The scaling factor for the surface"
+msgstr "Le facteur d'homothétie de la surface Cairo"
+
 #: ../clutter/clutter-child-meta.c:127
 msgid "Container"
 msgstr "Conteneur"
@@ -946,39 +984,39 @@ msgstr "Le conteneur qui a créé cette donnée"
 msgid "The actor wrapped by this data"
 msgstr "L'acteur contenu dans ces données"
 
-#: ../clutter/clutter-click-action.c:559
+#: ../clutter/clutter-click-action.c:586
 msgid "Pressed"
 msgstr "Enfoncé"
 
-#: ../clutter/clutter-click-action.c:560
+#: ../clutter/clutter-click-action.c:587
 msgid "Whether the clickable should be in pressed state"
 msgstr "Indique si l'objet cliquable doit être dans l'état enfoncé"
 
-#: ../clutter/clutter-click-action.c:573
+#: ../clutter/clutter-click-action.c:600
 msgid "Held"
 msgstr "Attrapé"
 
-#: ../clutter/clutter-click-action.c:574
+#: ../clutter/clutter-click-action.c:601
 msgid "Whether the clickable has a grab"
 msgstr "Indique si l'objet cliquable peut être attrapé"
 
-#: ../clutter/clutter-click-action.c:591 ../clutter/clutter-settings.c:607
+#: ../clutter/clutter-click-action.c:618 ../clutter/clutter-settings.c:653
 msgid "Long Press Duration"
 msgstr "Durée de l'appui long"
 
-#: ../clutter/clutter-click-action.c:592
+#: ../clutter/clutter-click-action.c:619
 msgid "The minimum duration of a long press to recognize the gesture"
 msgstr "La durée minimale d'un appui long pour reconnaître le mouvement"
 
-#: ../clutter/clutter-click-action.c:610
+#: ../clutter/clutter-click-action.c:637
 msgid "Long Press Threshold"
 msgstr "Expiration de l'appui long"
 
-#: ../clutter/clutter-click-action.c:611
+#: ../clutter/clutter-click-action.c:638
 msgid "The maximum threshold before a long press is cancelled"
 msgstr "La durée maximale avant qu'un appui long soit annulé"
 
-#: ../clutter/clutter-clone.c:346
+#: ../clutter/clutter-clone.c:342
 msgid "Specifies the actor to be cloned"
 msgstr "Définit l'acteur à cloner"
 
@@ -990,27 +1028,27 @@ msgstr "Teinte"
 msgid "The tint to apply"
 msgstr "La teinte à appliquer"
 
-#: ../clutter/clutter-deform-effect.c:588
+#: ../clutter/clutter-deform-effect.c:592
 msgid "Horizontal Tiles"
 msgstr "Tuiles horizontales"
 
-#: ../clutter/clutter-deform-effect.c:589
+#: ../clutter/clutter-deform-effect.c:593
 msgid "The number of horizontal tiles"
 msgstr "Le nombre de tuiles horizontales"
 
-#: ../clutter/clutter-deform-effect.c:604
+#: ../clutter/clutter-deform-effect.c:608
 msgid "Vertical Tiles"
 msgstr "Tuiles verticales"
 
-#: ../clutter/clutter-deform-effect.c:605
+#: ../clutter/clutter-deform-effect.c:609
 msgid "The number of vertical tiles"
 msgstr "Le nombre de tuiles verticales"
 
-#: ../clutter/clutter-deform-effect.c:622
+#: ../clutter/clutter-deform-effect.c:626
 msgid "Back Material"
 msgstr "Matériau du dos"
 
-#: ../clutter/clutter-deform-effect.c:623
+#: ../clutter/clutter-deform-effect.c:627
 msgid "The material to be used when painting the back of the actor"
 msgstr "Le matériau à utiliser pour dessiner le dos de l'acteur"
 
@@ -1018,259 +1056,297 @@ msgstr "Le matériau à utiliser pour dessiner le dos de l'acteur"
 msgid "The desaturation factor"
 msgstr "Le facteur de désaturation"
 
-#: ../clutter/clutter-device-manager.c:131
-#: ../clutter/clutter-input-device.c:366
-#: ../clutter/x11/clutter-keymap-x11.c:321
+#: ../clutter/clutter-device-manager.c:127
+#: ../clutter/clutter-input-device.c:355
+#: ../clutter/x11/clutter-keymap-x11.c:457
 msgid "Backend"
 msgstr "Backend"
 
-#: ../clutter/clutter-device-manager.c:132
+#: ../clutter/clutter-device-manager.c:128
 msgid "The ClutterBackend of the device manager"
 msgstr "Le ClutterBackend du gestionnaire de périphérique"
 
-#: ../clutter/clutter-drag-action.c:742
+#: ../clutter/clutter-drag-action.c:741
 msgid "Horizontal Drag Threshold"
 msgstr "Seuil de déplacement horizontal"
 
-#: ../clutter/clutter-drag-action.c:743
+#: ../clutter/clutter-drag-action.c:742
 msgid "The horizontal amount of pixels required to start dragging"
 msgstr ""
 "Le nombre horizontal de pixels nécessaire pour déclencher un déplacement"
 
-#: ../clutter/clutter-drag-action.c:770
+#: ../clutter/clutter-drag-action.c:769
 msgid "Vertical Drag Threshold"
 msgstr "Seuil de déplacement vertical"
 
-#: ../clutter/clutter-drag-action.c:771
+#: ../clutter/clutter-drag-action.c:770
 msgid "The vertical amount of pixels required to start dragging"
 msgstr "Le nombre vertical de pixels nécessaire pour déclencher un déplacement"
 
-#: ../clutter/clutter-drag-action.c:792
+#: ../clutter/clutter-drag-action.c:791
 msgid "Drag Handle"
 msgstr "Poignée de déplacement"
 
-#: ../clutter/clutter-drag-action.c:793
+#: ../clutter/clutter-drag-action.c:792
 msgid "The actor that is being dragged"
 msgstr "L'acteur en cours de déplacement"
 
-#: ../clutter/clutter-drag-action.c:806
+#: ../clutter/clutter-drag-action.c:805
 msgid "Drag Axis"
 msgstr "Axe de déplacement"
 
-#: ../clutter/clutter-drag-action.c:807
+#: ../clutter/clutter-drag-action.c:806
 msgid "Constraints the dragging to an axis"
 msgstr "Oblige le déplacement selon un axe"
 
-#: ../clutter/clutter-drag-action.c:823
+#: ../clutter/clutter-drag-action.c:822
 msgid "Drag Area"
 msgstr "Zone de déplacement"
 
-#: ../clutter/clutter-drag-action.c:824
+#: ../clutter/clutter-drag-action.c:823
 msgid "Constrains the dragging to a rectangle"
 msgstr "Limite le déplacement dans un rectangle donné"
 
-#: ../clutter/clutter-drag-action.c:837
+#: ../clutter/clutter-drag-action.c:836
 msgid "Drag Area Set"
 msgstr "Définition d'une zone de déplacement"
 
-#: ../clutter/clutter-drag-action.c:838
+#: ../clutter/clutter-drag-action.c:837
 msgid "Whether the drag area is set"
 msgstr "Indique si la zone de déplacement est définie"
 
-#: ../clutter/clutter-flow-layout.c:907
+#: ../clutter/clutter-flow-layout.c:959
 msgid "Whether each item should receive the same allocation"
 msgstr "Indique si chaque élément doit recevoir la même allocation"
 
-#: ../clutter/clutter-flow-layout.c:922 ../clutter/clutter-table-layout.c:1637
+#: ../clutter/clutter-flow-layout.c:974
+#: ../clutter/deprecated/clutter-table-layout.c:1637
 msgid "Column Spacing"
 msgstr "Espacement des colonnes"
 
-#: ../clutter/clutter-flow-layout.c:923
+#: ../clutter/clutter-flow-layout.c:975
 msgid "The spacing between columns"
 msgstr "L'espace entre les colonnes"
 
-#: ../clutter/clutter-flow-layout.c:939 ../clutter/clutter-table-layout.c:1651
+#: ../clutter/clutter-flow-layout.c:991
+#: ../clutter/deprecated/clutter-table-layout.c:1653
 msgid "Row Spacing"
 msgstr "Espacement des lignes"
 
-#: ../clutter/clutter-flow-layout.c:940
+#: ../clutter/clutter-flow-layout.c:992
 msgid "The spacing between rows"
 msgstr "L'espace entre les lignes"
 
-#: ../clutter/clutter-flow-layout.c:954
+#: ../clutter/clutter-flow-layout.c:1006
 msgid "Minimum Column Width"
 msgstr "Largeur minimale de la colonne"
 
-#: ../clutter/clutter-flow-layout.c:955
+#: ../clutter/clutter-flow-layout.c:1007
 msgid "Minimum width for each column"
 msgstr "Largeur minimale de chaque colonne"
 
-#: ../clutter/clutter-flow-layout.c:970
+#: ../clutter/clutter-flow-layout.c:1022
 msgid "Maximum Column Width"
 msgstr "Largeur maximale de la colonne"
 
-#: ../clutter/clutter-flow-layout.c:971
+#: ../clutter/clutter-flow-layout.c:1023
 msgid "Maximum width for each column"
 msgstr "Largeur maximale de chaque colonne"
 
-#: ../clutter/clutter-flow-layout.c:985
+#: ../clutter/clutter-flow-layout.c:1037
 msgid "Minimum Row Height"
 msgstr "Hauteur minimale de la ligne"
 
-#: ../clutter/clutter-flow-layout.c:986
+#: ../clutter/clutter-flow-layout.c:1038
 msgid "Minimum height for each row"
 msgstr "Hauteur minimale de chaque ligne"
 
-#: ../clutter/clutter-flow-layout.c:1001
+#: ../clutter/clutter-flow-layout.c:1053
 msgid "Maximum Row Height"
 msgstr "Hauteur maximale de la ligne"
 
-#: ../clutter/clutter-flow-layout.c:1002
+#: ../clutter/clutter-flow-layout.c:1054
 msgid "Maximum height for each row"
 msgstr "Hauteur maximale de chaque ligne"
 
-#: ../clutter/clutter-grid-layout.c:1222
+#: ../clutter/clutter-flow-layout.c:1069 ../clutter/clutter-flow-layout.c:1070
+msgid "Snap to grid"
+msgstr "Attraper la grille"
+
+#: ../clutter/clutter-gesture-action.c:668
+msgid "Number touch points"
+msgstr "Nombre de points tactiles"
+
+#: ../clutter/clutter-gesture-action.c:669
+msgid "Number of touch points"
+msgstr "Nombre de points tactiles"
+
+#: ../clutter/clutter-gesture-action.c:684
+msgid "Threshold Trigger Edge"
+msgstr "Seuil de déclenchement sur les bords"
+
+#: ../clutter/clutter-gesture-action.c:685
+msgid "The trigger edge used by the action"
+msgstr "Le bord de déclenchement utilisé pour l'action"
+
+#: ../clutter/clutter-gesture-action.c:704
+msgid "Threshold Trigger Horizontal Distance"
+msgstr "Seuil pour la distance de déclenchement horizontale"
+
+#: ../clutter/clutter-gesture-action.c:705
+msgid "The horizontal trigger distance used by the action"
+msgstr "La distance de déclenchement horizontale utilisée par l'action"
+
+#: ../clutter/clutter-gesture-action.c:723
+msgid "Threshold Trigger Vertical Distance"
+msgstr "Seuil pour la distance de déclenchement verticale"
+
+#: ../clutter/clutter-gesture-action.c:724
+msgid "The vertical trigger distance used by the action"
+msgstr "La distance de déclenchement verticale utilisée par l'action"
+
+#: ../clutter/clutter-grid-layout.c:1223
 msgid "Left attachment"
 msgstr "Collage à gauche"
 
-#: ../clutter/clutter-grid-layout.c:1223
+#: ../clutter/clutter-grid-layout.c:1224
 msgid "The column number to attach the left side of the child to"
 msgstr "Le numéro de colonne à laquelle coller la partie gauche de l'enfant"
 
-#: ../clutter/clutter-grid-layout.c:1230
+#: ../clutter/clutter-grid-layout.c:1231
 msgid "Top attachment"
 msgstr "Collage en haut"
 
-#: ../clutter/clutter-grid-layout.c:1231
+#: ../clutter/clutter-grid-layout.c:1232
 msgid "The row number to attach the top side of a child widget to"
 msgstr "Le numéro de ligne à laquelle coller la partie supérieure de l'enfant"
 
-#: ../clutter/clutter-grid-layout.c:1239
+#: ../clutter/clutter-grid-layout.c:1240
 msgid "The number of columns that a child spans"
 msgstr "Le nombre de colonnes sur lequel s'étend l'enfant"
 
-#: ../clutter/clutter-grid-layout.c:1246
+#: ../clutter/clutter-grid-layout.c:1247
 msgid "The number of rows that a child spans"
 msgstr "Le nombre de lignes sur lequel s'étend l'enfant"
 
-#: ../clutter/clutter-grid-layout.c:1565
+#: ../clutter/clutter-grid-layout.c:1564
 msgid "Row spacing"
 msgstr "Espacement des lignes"
 
-#: ../clutter/clutter-grid-layout.c:1566
+#: ../clutter/clutter-grid-layout.c:1565
 msgid "The amount of space between two consecutive rows"
 msgstr "L'espace entre deux lignes consécutives"
 
-#: ../clutter/clutter-grid-layout.c:1579
+#: ../clutter/clutter-grid-layout.c:1578
 msgid "Column spacing"
 msgstr "Espacement des colonnes"
 
-#: ../clutter/clutter-grid-layout.c:1580
+#: ../clutter/clutter-grid-layout.c:1579
 msgid "The amount of space between two consecutive columns"
 msgstr "L'espace entre deux colonnes consécutives"
 
-#: ../clutter/clutter-grid-layout.c:1594
+#: ../clutter/clutter-grid-layout.c:1593
 msgid "Row Homogeneous"
 msgstr "Homogénéité des lignes"
 
-#: ../clutter/clutter-grid-layout.c:1595
+#: ../clutter/clutter-grid-layout.c:1594
 msgid "If TRUE, the rows are all the same height"
 msgstr "Si TRUE, toutes les lignes ont la même hauteur"
 
-#: ../clutter/clutter-grid-layout.c:1608
+#: ../clutter/clutter-grid-layout.c:1607
 msgid "Column Homogeneous"
 msgstr "Homogénéité des colonnes"
 
-#: ../clutter/clutter-grid-layout.c:1609
+#: ../clutter/clutter-grid-layout.c:1608
 msgid "If TRUE, the columns are all the same width"
 msgstr "Si TRUE, toutes les colonnes ont la même largeur"
 
-#: ../clutter/clutter-image.c:248 ../clutter/clutter-image.c:311
-#: ../clutter/clutter-image.c:399
+#: ../clutter/clutter-image.c:249 ../clutter/clutter-image.c:312
+#: ../clutter/clutter-image.c:400
 msgid "Unable to load image data"
 msgstr "Impossible de charger les données de l'image"
 
-#: ../clutter/clutter-input-device.c:242
+#: ../clutter/clutter-input-device.c:231
 msgid "Id"
 msgstr "Id"
 
-#: ../clutter/clutter-input-device.c:243
+#: ../clutter/clutter-input-device.c:232
 msgid "Unique identifier of the device"
 msgstr "L'identifiant unique du périphérique"
 
-#: ../clutter/clutter-input-device.c:259
+#: ../clutter/clutter-input-device.c:248
 msgid "The name of the device"
 msgstr "Le nom du périphérique"
 
-#: ../clutter/clutter-input-device.c:273
+#: ../clutter/clutter-input-device.c:262
 msgid "Device Type"
 msgstr "Type de périphérique"
 
-#: ../clutter/clutter-input-device.c:274
+#: ../clutter/clutter-input-device.c:263
 msgid "The type of the device"
 msgstr "Le type du périphérique"
 
-#: ../clutter/clutter-input-device.c:289
+#: ../clutter/clutter-input-device.c:278
 msgid "Device Manager"
 msgstr "Gestionnaire de périphériques"
 
-#: ../clutter/clutter-input-device.c:290
+#: ../clutter/clutter-input-device.c:279
 msgid "The device manager instance"
 msgstr "L'instance du gestionnaire de périphériques"
 
-#: ../clutter/clutter-input-device.c:303
+#: ../clutter/clutter-input-device.c:292
 msgid "Device Mode"
 msgstr "Mode du périphérique"
 
-#: ../clutter/clutter-input-device.c:304
+#: ../clutter/clutter-input-device.c:293
 msgid "The mode of the device"
 msgstr "Le mode du périphérique"
 
-#: ../clutter/clutter-input-device.c:318
+#: ../clutter/clutter-input-device.c:307
 msgid "Has Cursor"
 msgstr "Possède un curseur"
 
-#: ../clutter/clutter-input-device.c:319
+#: ../clutter/clutter-input-device.c:308
 msgid "Whether the device has a cursor"
 msgstr "Indique si le périphérique possède un curseur"
 
-#: ../clutter/clutter-input-device.c:338
+#: ../clutter/clutter-input-device.c:327
 msgid "Whether the device is enabled"
 msgstr "Indique si le périphérique est activé"
 
-#: ../clutter/clutter-input-device.c:351
+#: ../clutter/clutter-input-device.c:340
 msgid "Number of Axes"
 msgstr "Nombre d'axes"
 
-#: ../clutter/clutter-input-device.c:352
+#: ../clutter/clutter-input-device.c:341
 msgid "The number of axes on the device"
 msgstr "Le nombre d'axes du périphérique"
 
-#: ../clutter/clutter-input-device.c:367
+#: ../clutter/clutter-input-device.c:356
 msgid "The backend instance"
 msgstr "L'instance du moteur"
 
-#: ../clutter/clutter-interval.c:506
+#: ../clutter/clutter-interval.c:553
 msgid "Value Type"
 msgstr "Type de valeur"
 
-#: ../clutter/clutter-interval.c:507
+#: ../clutter/clutter-interval.c:554
 msgid "The type of the values in the interval"
 msgstr "Le type des valeurs dans l'intervalle"
 
-#: ../clutter/clutter-interval.c:522
+#: ../clutter/clutter-interval.c:569
 msgid "Initial Value"
 msgstr "Valeur initiale"
 
-#: ../clutter/clutter-interval.c:523
+#: ../clutter/clutter-interval.c:570
 msgid "Initial value of the interval"
 msgstr "Valeur initiale de l'intervalle"
 
-#: ../clutter/clutter-interval.c:537
+#: ../clutter/clutter-interval.c:584
 msgid "Final Value"
 msgstr "Valeur finale"
 
-#: ../clutter/clutter-interval.c:538
+#: ../clutter/clutter-interval.c:585
 msgid "Final value of the interval"
 msgstr "Valeur finale de l'intervalle"
 
@@ -1289,96 +1365,96 @@ msgstr "Le gestionnaire qui a créé ces données"
 #. * Do NOT translate it to non-English e.g. "predefinito:LTR"! If
 #. * it isn't default:LTR or default:RTL it will not work.
 #.
-#: ../clutter/clutter-main.c:772
+#: ../clutter/clutter-main.c:795
 msgid "default:LTR"
 msgstr "default:LTR"
 
-#: ../clutter/clutter-main.c:1646
+#: ../clutter/clutter-main.c:1622
 msgid "Show frames per second"
 msgstr "Afficher le nombre d'images par seconde"
 
-#: ../clutter/clutter-main.c:1648
+#: ../clutter/clutter-main.c:1624
 msgid "Default frame rate"
 msgstr "Nombre d'images par seconde par défaut"
 
-#: ../clutter/clutter-main.c:1650
+#: ../clutter/clutter-main.c:1626
 msgid "Make all warnings fatal"
 msgstr "Rendre tous les avertissements fatals"
 
-#: ../clutter/clutter-main.c:1653
+#: ../clutter/clutter-main.c:1629
 msgid "Direction for the text"
 msgstr "Sens du texte"
 
-#: ../clutter/clutter-main.c:1656
+#: ../clutter/clutter-main.c:1632
 msgid "Disable mipmapping on text"
 msgstr "Désactiver le MIP mapping pour le texte"
 
-#: ../clutter/clutter-main.c:1659
+#: ../clutter/clutter-main.c:1635
 msgid "Use 'fuzzy' picking"
 msgstr "Utiliser la sélection « approximative »"
 
-#: ../clutter/clutter-main.c:1662
+#: ../clutter/clutter-main.c:1638
 msgid "Clutter debugging flags to set"
 msgstr "Drapeau de débogage de Clutter à activer"
 
-#: ../clutter/clutter-main.c:1664
+#: ../clutter/clutter-main.c:1640
 msgid "Clutter debugging flags to unset"
 msgstr "Drapeau de débogage de Clutter à désactiver"
 
-#: ../clutter/clutter-main.c:1668
+#: ../clutter/clutter-main.c:1644
 msgid "Clutter profiling flags to set"
 msgstr "Drapeau de profilage de Clutter à activer"
 
-#: ../clutter/clutter-main.c:1670
+#: ../clutter/clutter-main.c:1646
 msgid "Clutter profiling flags to unset"
 msgstr "Drapeau de profilage de Clutter à désactiver"
 
-#: ../clutter/clutter-main.c:1673
+#: ../clutter/clutter-main.c:1649
 msgid "Enable accessibility"
 msgstr "Activer l'accessibilité"
 
-#: ../clutter/clutter-main.c:1865
+#: ../clutter/clutter-main.c:1841
 msgid "Clutter Options"
 msgstr "Options de Clutter"
 
-#: ../clutter/clutter-main.c:1866
+#: ../clutter/clutter-main.c:1842
 msgid "Show Clutter Options"
 msgstr "Afficher les options de Clutter"
 
-#: ../clutter/clutter-pan-action.c:448
+#: ../clutter/clutter-pan-action.c:455
 msgid "Pan Axis"
 msgstr "Axe de déplacement"
 
-#: ../clutter/clutter-pan-action.c:449
+#: ../clutter/clutter-pan-action.c:456
 msgid "Constraints the panning to an axis"
 msgstr "Oblige le déplacement selon un axe"
 
-#: ../clutter/clutter-pan-action.c:463
+#: ../clutter/clutter-pan-action.c:470
 msgid "Interpolate"
 msgstr "Interpolation"
 
-#: ../clutter/clutter-pan-action.c:464
+#: ../clutter/clutter-pan-action.c:471
 msgid "Whether interpolated events emission is enabled."
 msgstr "Indique si l'émission d'événements interpolés est activée"
 
-#: ../clutter/clutter-pan-action.c:480
+#: ../clutter/clutter-pan-action.c:487
 msgid "Deceleration"
 msgstr "Décélération"
 
-#: ../clutter/clutter-pan-action.c:481
+#: ../clutter/clutter-pan-action.c:488
 msgid "Rate at which the interpolated panning will decelerate in"
 msgstr "Taux de décélération du déplacement interpolé"
 
-#: ../clutter/clutter-pan-action.c:498
+#: ../clutter/clutter-pan-action.c:505
 msgid "Initial acceleration factor"
 msgstr "Facteur d'accélération initial"
 
-#: ../clutter/clutter-pan-action.c:499
+#: ../clutter/clutter-pan-action.c:506
 msgid "Factor applied to the momentum when starting the interpolated phase"
 msgstr "Facteur appliqué au moment au démarrage de la phase d'interpolation"
 
 #: ../clutter/clutter-path-constraint.c:212
-#: ../clutter/deprecated/clutter-behaviour-path.c:225
+#: ../clutter/deprecated/clutter-behaviour-path.c:221
 msgid "Path"
 msgstr "Chemin"
 
@@ -1390,89 +1466,89 @@ msgstr "Le chemin utilisé pour contraindre un acteur"
 msgid "The offset along the path, between -1.0 and 2.0"
 msgstr "Le décalage le long du chemin, entre -1.0 et 2.0"
 
-#: ../clutter/clutter-property-transition.c:271
+#: ../clutter/clutter-property-transition.c:269
 msgid "Property Name"
 msgstr "Nom de la propriété"
 
-#: ../clutter/clutter-property-transition.c:272
+#: ../clutter/clutter-property-transition.c:270
 msgid "The name of the property to animate"
 msgstr "Le nom de la propriété à animer"
 
-#: ../clutter/clutter-script.c:466
+#: ../clutter/clutter-script.c:464
 msgid "Filename Set"
 msgstr "« Filename » défini"
 
-#: ../clutter/clutter-script.c:467
+#: ../clutter/clutter-script.c:465
 msgid "Whether the :filename property is set"
-msgstr "Indique si la propriété :filename est définie"
+msgstr "Indique si la propriété « :filename » (nom de fichier) est définie"
 
-#: ../clutter/clutter-script.c:481
-#: ../clutter/deprecated/clutter-texture.c:1082
+#: ../clutter/clutter-script.c:479
+#: ../clutter/deprecated/clutter-texture.c:1080
 msgid "Filename"
 msgstr "Nom de fichier"
 
-#: ../clutter/clutter-script.c:482
+#: ../clutter/clutter-script.c:480
 msgid "The path of the currently parsed file"
 msgstr "Le chemin du fichier actuellement analysé"
 
-#: ../clutter/clutter-script.c:499
+#: ../clutter/clutter-script.c:497
 msgid "Translation Domain"
 msgstr "Domaine de traduction"
 
-#: ../clutter/clutter-script.c:500
+#: ../clutter/clutter-script.c:498
 msgid "The translation domain used to localize string"
 msgstr ""
 "Le domaine de traduction utilisé pour localiser la chaîne de caractères"
 
-#: ../clutter/clutter-scroll-actor.c:263
+#: ../clutter/clutter-scroll-actor.c:189
 msgid "Scroll Mode"
 msgstr "Mode de défilement"
 
-#: ../clutter/clutter-scroll-actor.c:264
+#: ../clutter/clutter-scroll-actor.c:190
 msgid "The scrolling direction"
 msgstr "Le sens du défilement"
 
-#: ../clutter/clutter-settings.c:448
+#: ../clutter/clutter-settings.c:486
 msgid "Double Click Time"
 msgstr "Délai du double-clic"
 
-#: ../clutter/clutter-settings.c:449
+#: ../clutter/clutter-settings.c:487
 msgid "The time between clicks necessary to detect a multiple click"
 msgstr "Le délai nécessaire entre les clics pour détecter un clic multiple"
 
-#: ../clutter/clutter-settings.c:464
+#: ../clutter/clutter-settings.c:502
 msgid "Double Click Distance"
 msgstr "Espacement du double-clic"
 
-#: ../clutter/clutter-settings.c:465
+#: ../clutter/clutter-settings.c:503
 msgid "The distance between clicks necessary to detect a multiple click"
 msgstr "La distance nécessaire entre les clics pour détecter un clic multiple"
 
-#: ../clutter/clutter-settings.c:480
+#: ../clutter/clutter-settings.c:518
 msgid "Drag Threshold"
 msgstr "Seuil de déplacement"
 
-#: ../clutter/clutter-settings.c:481
+#: ../clutter/clutter-settings.c:519
 msgid "The distance the cursor should travel before starting to drag"
 msgstr ""
 "La distance que doit parcourir le curseur avant le début d'un déplacement"
 
-#: ../clutter/clutter-settings.c:496 ../clutter/clutter-text.c:3367
+#: ../clutter/clutter-settings.c:534 ../clutter/clutter-text.c:3437
 msgid "Font Name"
 msgstr "Nom de la police"
 
-#: ../clutter/clutter-settings.c:497
+#: ../clutter/clutter-settings.c:535
 msgid ""
 "The description of the default font, as one that could be parsed by Pango"
 msgstr ""
 "La description de la police par défaut, sous une forme telle qu'elle "
 "pourrait être analysée par Pango"
 
-#: ../clutter/clutter-settings.c:512
+#: ../clutter/clutter-settings.c:550
 msgid "Font Antialias"
 msgstr "Lissage des polices"
 
-#: ../clutter/clutter-settings.c:513
+#: ../clutter/clutter-settings.c:551
 msgid ""
 "Whether to use antialiasing (1 to enable, 0 to disable, and -1 to use the "
 "default)"
@@ -1480,71 +1556,79 @@ msgstr ""
 "Définit s'il faut utiliser le lissage (1 pour activer, 0 pour désactiver et "
 "-1 pour utiliser la valeur par défaut)"
 
-#: ../clutter/clutter-settings.c:529
+#: ../clutter/clutter-settings.c:567 ../clutter/clutter-settings.c:575
 msgid "Font DPI"
 msgstr "PPP de la police"
 
-#: ../clutter/clutter-settings.c:530
+#: ../clutter/clutter-settings.c:568 ../clutter/clutter-settings.c:576
 msgid ""
 "The resolution of the font, in 1024 * dots/inch, or -1 to use the default"
 msgstr ""
 "La résolution de la police, en 1024 × points/pouces, ou -1 pour utiliser la "
 "valeur par défaut"
 
-#: ../clutter/clutter-settings.c:546
+#: ../clutter/clutter-settings.c:592
 msgid "Font Hinting"
 msgstr "Optimisation de la police"
 
-#: ../clutter/clutter-settings.c:547
+#: ../clutter/clutter-settings.c:593
 msgid ""
 "Whether to use hinting (1 to enable, 0 to disable and -1 to use the default)"
 msgstr ""
 "Définit s'il faut utiliser l'optimisation (1 pour activer, 0 pour désactiver "
 "et -1 pour utiliser la valeur par défaut)"
 
-#: ../clutter/clutter-settings.c:568
+#: ../clutter/clutter-settings.c:614
 msgid "Font Hint Style"
 msgstr "Style d'optimisation des polices"
 
-#: ../clutter/clutter-settings.c:569
+#: ../clutter/clutter-settings.c:615
 msgid "The style of hinting (hintnone, hintslight, hintmedium, hintfull)"
 msgstr "Le style d'optimisation (hintnone, hintslight, hintmedium, hintfull)"
 
-#: ../clutter/clutter-settings.c:590
+#: ../clutter/clutter-settings.c:636
 msgid "Font Subpixel Order"
 msgstr "Ordre sous-pixel des polices"
 
-#: ../clutter/clutter-settings.c:591
+#: ../clutter/clutter-settings.c:637
 msgid "The type of subpixel antialiasing (none, rgb, bgr, vrgb, vbgr)"
 msgstr "Le type de lissage sous-pixel (none, rgb, bgr, vrgb, vbgr)"
 
-#: ../clutter/clutter-settings.c:608
+#: ../clutter/clutter-settings.c:654
 msgid "The minimum duration for a long press gesture to be recognized"
 msgstr "La durée minimale pour qu'un appui long soit identifié"
 
-#: ../clutter/clutter-settings.c:615
+#: ../clutter/clutter-settings.c:661
+msgid "Window Scaling Factor"
+msgstr "Facteur d'homothétie pour les fenêtres"
+
+#: ../clutter/clutter-settings.c:662
+msgid "The scaling factor to be applied to windows"
+msgstr "Le facteur d'homothétie à appliquer aux fenêtres"
+
+#: ../clutter/clutter-settings.c:669
 msgid "Fontconfig configuration timestamp"
 msgstr "Horodatage de la configuration de fontconfig"
 
-#: ../clutter/clutter-settings.c:616
+#: ../clutter/clutter-settings.c:670
 msgid "Timestamp of the current fontconfig configuration"
 msgstr "Horodatage de la configuration actuelle de fontconfig"
 
-#: ../clutter/clutter-settings.c:633
+#: ../clutter/clutter-settings.c:687
 msgid "Password Hint Time"
 msgstr "Durée avant masquage du mot de passe"
 
-#: ../clutter/clutter-settings.c:634
+#: ../clutter/clutter-settings.c:688
 msgid "How long to show the last input character in hidden entries"
 msgstr ""
 "Définit le temps d'affichage du dernier caractère saisi dans les entrées "
 "masquées"
 
-#: ../clutter/clutter-shader-effect.c:486
+#: ../clutter/clutter-shader-effect.c:485
 msgid "Shader Type"
 msgstr "Type de shader"
 
-#: ../clutter/clutter-shader-effect.c:487
+#: ../clutter/clutter-shader-effect.c:486
 msgid "The type of shader used"
 msgstr "Le type de shader utilisé"
 
@@ -1572,767 +1656,711 @@ msgstr "Le bord de la source qui doit être attrapé"
 msgid "The offset in pixels to apply to the constraint"
 msgstr "Le décalage, en pixels, à appliquer à la contrainte"
 
-#: ../clutter/clutter-stage.c:1929
+#: ../clutter/clutter-stage.c:1902
 msgid "Fullscreen Set"
 msgstr "Plein écran activé"
 
-#: ../clutter/clutter-stage.c:1930
+#: ../clutter/clutter-stage.c:1903
 msgid "Whether the main stage is fullscreen"
 msgstr "Indique si la scène principale est en plein écran"
 
-#: ../clutter/clutter-stage.c:1944
+#: ../clutter/clutter-stage.c:1917
 msgid "Offscreen"
 msgstr "Hors écran"
 
-#: ../clutter/clutter-stage.c:1945
+#: ../clutter/clutter-stage.c:1918
 msgid "Whether the main stage should be rendered offscreen"
 msgstr "Indique si la scène principale doit être rendue hors écran"
 
-#: ../clutter/clutter-stage.c:1957 ../clutter/clutter-text.c:3481
+#: ../clutter/clutter-stage.c:1930 ../clutter/clutter-text.c:3551
 msgid "Cursor Visible"
 msgstr "Curseur visible"
 
-#: ../clutter/clutter-stage.c:1958
+#: ../clutter/clutter-stage.c:1931
 msgid "Whether the mouse pointer is visible on the main stage"
 msgstr ""
 "Indique si le pointeur de la souris est visible sur la scène principale"
 
-#: ../clutter/clutter-stage.c:1972
+#: ../clutter/clutter-stage.c:1945
 msgid "User Resizable"
 msgstr "Redimensionnable par l'utilisateur"
 
-#: ../clutter/clutter-stage.c:1973
+#: ../clutter/clutter-stage.c:1946
 msgid "Whether the stage is able to be resized via user interaction"
 msgstr ""
 "Indique si la scène peut être redimensionnée par des interactions de "
 "l'utilisateur"
 
-#: ../clutter/clutter-stage.c:1988 ../clutter/deprecated/clutter-box.c:260
-#: ../clutter/deprecated/clutter-rectangle.c:273
+#: ../clutter/clutter-stage.c:1961 ../clutter/deprecated/clutter-box.c:256
+#: ../clutter/deprecated/clutter-rectangle.c:270
 msgid "Color"
 msgstr "Couleur"
 
-#: ../clutter/clutter-stage.c:1989
+#: ../clutter/clutter-stage.c:1962
 msgid "The color of the stage"
 msgstr "La couleur de la scène"
 
-#: ../clutter/clutter-stage.c:2004
+#: ../clutter/clutter-stage.c:1977
 msgid "Perspective"
 msgstr "Perspective"
 
-#: ../clutter/clutter-stage.c:2005
+#: ../clutter/clutter-stage.c:1978
 msgid "Perspective projection parameters"
 msgstr "Paramètres de projection de la perspective"
 
-#: ../clutter/clutter-stage.c:2020
+#: ../clutter/clutter-stage.c:1993
 msgid "Title"
 msgstr "Titre"
 
-#: ../clutter/clutter-stage.c:2021
+#: ../clutter/clutter-stage.c:1994
 msgid "Stage Title"
 msgstr "Titre de la scène"
 
-#: ../clutter/clutter-stage.c:2038
+#: ../clutter/clutter-stage.c:2011
 msgid "Use Fog"
 msgstr "Utiliser le brouillard"
 
-#: ../clutter/clutter-stage.c:2039
+#: ../clutter/clutter-stage.c:2012
 msgid "Whether to enable depth cueing"
 msgstr "Indique s'il faut activer la troncature d'arrière-plan"
 
-#: ../clutter/clutter-stage.c:2055
+#: ../clutter/clutter-stage.c:2028
 msgid "Fog"
 msgstr "Brouillard"
 
-#: ../clutter/clutter-stage.c:2056
+#: ../clutter/clutter-stage.c:2029
 msgid "Settings for the depth cueing"
 msgstr "Paramétrages de la troncature d'arrière-plan"
 
-#: ../clutter/clutter-stage.c:2072
+#: ../clutter/clutter-stage.c:2045
 msgid "Use Alpha"
 msgstr "Utiliser l'alpha"
 
-#: ../clutter/clutter-stage.c:2073
+#: ../clutter/clutter-stage.c:2046
 msgid "Whether to honour the alpha component of the stage color"
 msgstr ""
 "Indique s'il faut respecter le composant alpha de la couleur de la scène"
 
-#: ../clutter/clutter-stage.c:2089
+#: ../clutter/clutter-stage.c:2062
 msgid "Key Focus"
 msgstr "Focus clavier"
 
-#: ../clutter/clutter-stage.c:2090
+#: ../clutter/clutter-stage.c:2063
 msgid "The currently key focused actor"
 msgstr "L'acteur possédant actuellement le focus"
 
-#: ../clutter/clutter-stage.c:2106
+#: ../clutter/clutter-stage.c:2079
 msgid "No Clear Hint"
 msgstr "Aucun indicateur d'effacement"
 
-#: ../clutter/clutter-stage.c:2107
+#: ../clutter/clutter-stage.c:2080
 msgid "Whether the stage should clear its contents"
 msgstr "Indique si la scène doit effacer son contenu"
 
-#: ../clutter/clutter-stage.c:2120
+#: ../clutter/clutter-stage.c:2093
 msgid "Accept Focus"
 msgstr "Accepte le focus"
 
-#: ../clutter/clutter-stage.c:2121
+#: ../clutter/clutter-stage.c:2094
 msgid "Whether the stage should accept focus on show"
 msgstr "Indique si la scène doit accepter le focus à l'affichage"
 
-#: ../clutter/clutter-table-layout.c:543
-msgid "Column Number"
-msgstr "Numéro de la colonne"
-
-#: ../clutter/clutter-table-layout.c:544
-msgid "The column the widget resides in"
-msgstr "La colonne dans laquelle l'élément graphique se situe"
-
-#: ../clutter/clutter-table-layout.c:551
-msgid "Row Number"
-msgstr "Numéro de la ligne"
-
-#: ../clutter/clutter-table-layout.c:552
-msgid "The row the widget resides in"
-msgstr "La ligne sur laquelle l'élément graphique se situe"
-
-#: ../clutter/clutter-table-layout.c:559
-msgid "Column Span"
-msgstr "Extension de colonne"
-
-#: ../clutter/clutter-table-layout.c:560
-msgid "The number of columns the widget should span"
-msgstr "Le nombre de colonnes sur lequel s'étend l'élément graphique"
-
-#: ../clutter/clutter-table-layout.c:567
-msgid "Row Span"
-msgstr "Extension de ligne"
-
-#: ../clutter/clutter-table-layout.c:568
-msgid "The number of rows the widget should span"
-msgstr "Le nombre de lignes sur lequel s'étend l'élément graphique"
-
-#: ../clutter/clutter-table-layout.c:575
-msgid "Horizontal Expand"
-msgstr "Extension horizontale"
-
-#: ../clutter/clutter-table-layout.c:576
-msgid "Allocate extra space for the child in horizontal axis"
-msgstr "Alloue de l'espace supplémentaire pour l'enfant sur l'axe horizontal"
-
-#: ../clutter/clutter-table-layout.c:582
-msgid "Vertical Expand"
-msgstr "Extension verticale"
-
-#: ../clutter/clutter-table-layout.c:583
-msgid "Allocate extra space for the child in vertical axis"
-msgstr "Alloue de l'espace supplémentaire pour l'enfant sur l'axe vertical"
-
-#: ../clutter/clutter-table-layout.c:1638
-msgid "Spacing between columns"
-msgstr "Espacement entre les colonnes"
-
-#: ../clutter/clutter-table-layout.c:1652
-msgid "Spacing between rows"
-msgstr "Espacement entre les lignes"
-
-#: ../clutter/clutter-text-buffer.c:351 ../clutter/clutter-text.c:3402
+#: ../clutter/clutter-text-buffer.c:347 ../clutter/clutter-text.c:3472
 msgid "Text"
 msgstr "Texte"
 
-#: ../clutter/clutter-text-buffer.c:352
+#: ../clutter/clutter-text-buffer.c:348
 msgid "The contents of the buffer"
 msgstr "Le contenu du buffer"
 
-#: ../clutter/clutter-text-buffer.c:365
+#: ../clutter/clutter-text-buffer.c:361
 msgid "Text length"
 msgstr "Longueur du texte"
 
-#: ../clutter/clutter-text-buffer.c:366
+#: ../clutter/clutter-text-buffer.c:362
 msgid "Length of the text currently in the buffer"
 msgstr "La longueur du texte actuellement dans le buffer"
 
-#: ../clutter/clutter-text-buffer.c:379
+#: ../clutter/clutter-text-buffer.c:375
 msgid "Maximum length"
 msgstr "Longueur maximale"
 
-#: ../clutter/clutter-text-buffer.c:380
+#: ../clutter/clutter-text-buffer.c:376
 msgid "Maximum number of characters for this entry. Zero if no maximum"
 msgstr "Nombre maximum de caractères pour cette entrée. Zéro si pas de maximum"
 
-#: ../clutter/clutter-text.c:3349
+#: ../clutter/clutter-text.c:3419
 msgid "Buffer"
 msgstr "Buffer"
 
-#: ../clutter/clutter-text.c:3350
+#: ../clutter/clutter-text.c:3420
 msgid "The buffer for the text"
 msgstr "Le buffer pour le texte"
 
-#: ../clutter/clutter-text.c:3368
+#: ../clutter/clutter-text.c:3438
 msgid "The font to be used by the text"
 msgstr "La police à utiliser par le texte"
 
-#: ../clutter/clutter-text.c:3385
+#: ../clutter/clutter-text.c:3455
 msgid "Font Description"
 msgstr "Description de la police"
 
-#: ../clutter/clutter-text.c:3386
+#: ../clutter/clutter-text.c:3456
 msgid "The font description to be used"
 msgstr "La description de la police à utiliser"
 
-#: ../clutter/clutter-text.c:3403
+#: ../clutter/clutter-text.c:3473
 msgid "The text to render"
 msgstr "Le texte à afficher"
 
-#: ../clutter/clutter-text.c:3417
+#: ../clutter/clutter-text.c:3487
 msgid "Font Color"
 msgstr "Couleur de la police"
 
-#: ../clutter/clutter-text.c:3418
+#: ../clutter/clutter-text.c:3488
 msgid "Color of the font used by the text"
 msgstr "La couleur de la police utilisée par le texte"
 
-#: ../clutter/clutter-text.c:3433
+#: ../clutter/clutter-text.c:3503
 msgid "Editable"
 msgstr "Modifiable"
 
-#: ../clutter/clutter-text.c:3434
+#: ../clutter/clutter-text.c:3504
 msgid "Whether the text is editable"
 msgstr "Indique si le texte est modifiable"
 
-#: ../clutter/clutter-text.c:3449
+#: ../clutter/clutter-text.c:3519
 msgid "Selectable"
 msgstr "Sélectionnable"
 
-#: ../clutter/clutter-text.c:3450
+#: ../clutter/clutter-text.c:3520
 msgid "Whether the text is selectable"
 msgstr "Indique si le texte est sélectionnable"
 
-#: ../clutter/clutter-text.c:3464
+#: ../clutter/clutter-text.c:3534
 msgid "Activatable"
 msgstr "Activable"
 
-#: ../clutter/clutter-text.c:3465
+#: ../clutter/clutter-text.c:3535
 msgid "Whether pressing return causes the activate signal to be emitted"
 msgstr ""
 "Indique si une pression sur la touche entrée entraîne l'émission du signal "
 "activé"
 
-#: ../clutter/clutter-text.c:3482
+#: ../clutter/clutter-text.c:3552
 msgid "Whether the input cursor is visible"
 msgstr "Indique si le curseur de saisie est visible"
 
-#: ../clutter/clutter-text.c:3496 ../clutter/clutter-text.c:3497
+#: ../clutter/clutter-text.c:3566 ../clutter/clutter-text.c:3567
 msgid "Cursor Color"
 msgstr "La couleur du curseur"
 
-#: ../clutter/clutter-text.c:3512
+#: ../clutter/clutter-text.c:3582
 msgid "Cursor Color Set"
 msgstr "Couleur du curseur renseignée"
 
-#: ../clutter/clutter-text.c:3513
+#: ../clutter/clutter-text.c:3583
 msgid "Whether the cursor color has been set"
 msgstr "Indique si la couleur du curseur a été renseignée ou non"
 
-#: ../clutter/clutter-text.c:3528
+#: ../clutter/clutter-text.c:3598
 msgid "Cursor Size"
 msgstr "Taille du curseur"
 
-#: ../clutter/clutter-text.c:3529
+#: ../clutter/clutter-text.c:3599
 msgid "The width of the cursor, in pixels"
 msgstr "La taille du curseur, en pixels"
 
-#: ../clutter/clutter-text.c:3545 ../clutter/clutter-text.c:3563
+#: ../clutter/clutter-text.c:3615 ../clutter/clutter-text.c:3633
 msgid "Cursor Position"
 msgstr "Position du curseur"
 
-#: ../clutter/clutter-text.c:3546 ../clutter/clutter-text.c:3564
+#: ../clutter/clutter-text.c:3616 ../clutter/clutter-text.c:3634
 msgid "The cursor position"
 msgstr "La position du curseur"
 
-#: ../clutter/clutter-text.c:3579
+#: ../clutter/clutter-text.c:3649
 msgid "Selection-bound"
 msgstr "Lien à la sélection"
 
-#: ../clutter/clutter-text.c:3580
+#: ../clutter/clutter-text.c:3650
 msgid "The cursor position of the other end of the selection"
 msgstr "La position de curseur de l'autre bout de la sélection"
 
-#: ../clutter/clutter-text.c:3595 ../clutter/clutter-text.c:3596
+#: ../clutter/clutter-text.c:3665 ../clutter/clutter-text.c:3666
 msgid "Selection Color"
 msgstr "Couleur de la sélection"
 
-#: ../clutter/clutter-text.c:3611
+#: ../clutter/clutter-text.c:3681
 msgid "Selection Color Set"
 msgstr "Couleur de la sélection renseignée"
 
-#: ../clutter/clutter-text.c:3612
+#: ../clutter/clutter-text.c:3682
 msgid "Whether the selection color has been set"
 msgstr "Indique si la couleur de la sélection a été renseignée"
 
-#: ../clutter/clutter-text.c:3627
+#: ../clutter/clutter-text.c:3697
 msgid "Attributes"
 msgstr "Attributs"
 
-#: ../clutter/clutter-text.c:3628
+#: ../clutter/clutter-text.c:3698
 msgid "A list of style attributes to apply to the contents of the actor"
 msgstr "Une liste d'attributs stylistiques à appliquer au contenu de l'acteur"
 
-#: ../clutter/clutter-text.c:3650
+#: ../clutter/clutter-text.c:3720
 msgid "Use markup"
 msgstr "Utiliser le balisage"
 
-#: ../clutter/clutter-text.c:3651
+#: ../clutter/clutter-text.c:3721
 msgid "Whether or not the text includes Pango markup"
 msgstr "Indique si le texte inclut ou non des balises Pango"
 
-#: ../clutter/clutter-text.c:3667
+#: ../clutter/clutter-text.c:3737
 msgid "Line wrap"
 msgstr "Coupure des lignes"
 
-#: ../clutter/clutter-text.c:3668
+#: ../clutter/clutter-text.c:3738
 msgid "If set, wrap the lines if the text becomes too wide"
 msgstr "Si défini, coupe les lignes si le texte devient trop long"
 
-#: ../clutter/clutter-text.c:3683
+#: ../clutter/clutter-text.c:3753
 msgid "Line wrap mode"
 msgstr "Mode de coupure des lignes"
 
-#: ../clutter/clutter-text.c:3684
+#: ../clutter/clutter-text.c:3754
 msgid "Control how line-wrapping is done"
 msgstr "Contrôle la façon dont les lignes sont coupées"
 
-#: ../clutter/clutter-text.c:3699
+#: ../clutter/clutter-text.c:3769
 msgid "Ellipsize"
 msgstr "Faire une ellipse"
 
-#: ../clutter/clutter-text.c:3700
+#: ../clutter/clutter-text.c:3770
 msgid "The preferred place to ellipsize the string"
 msgstr "L'emplacement préféré pour faire une ellipse dans la chaîne"
 
-#: ../clutter/clutter-text.c:3716
+#: ../clutter/clutter-text.c:3786
 msgid "Line Alignment"
 msgstr "Alignement des lignes"
 
-#: ../clutter/clutter-text.c:3717
+#: ../clutter/clutter-text.c:3787
 msgid "The preferred alignment for the string, for multi-line text"
 msgstr ""
 "L'alignement préféré de la chaîne, pour les textes sur plusieurs lignes"
 
-#: ../clutter/clutter-text.c:3733
+#: ../clutter/clutter-text.c:3803
 msgid "Justify"
 msgstr "Justifié"
 
-#: ../clutter/clutter-text.c:3734
+#: ../clutter/clutter-text.c:3804
 msgid "Whether the text should be justified"
 msgstr "Indique si le texte doit être justifié"
 
-#: ../clutter/clutter-text.c:3749
+#: ../clutter/clutter-text.c:3819
 msgid "Password Character"
 msgstr "Caractère de mot de passe"
 
-#: ../clutter/clutter-text.c:3750
+#: ../clutter/clutter-text.c:3820
 msgid "If non-zero, use this character to display the actor's contents"
 msgstr ""
 "Si différent de zéro, utilise ce caractère pour afficher le contenu de "
 "l'acteur"
 
-#: ../clutter/clutter-text.c:3764
+#: ../clutter/clutter-text.c:3834
 msgid "Max Length"
 msgstr "Longueur maximale"
 
-#: ../clutter/clutter-text.c:3765
+#: ../clutter/clutter-text.c:3835
 msgid "Maximum length of the text inside the actor"
 msgstr "Longueur maximale du texte à l'intérieur de l'acteur"
 
-#: ../clutter/clutter-text.c:3788
+#: ../clutter/clutter-text.c:3858
 msgid "Single Line Mode"
 msgstr "Mode ligne unique"
 
-#: ../clutter/clutter-text.c:3789
+#: ../clutter/clutter-text.c:3859
 msgid "Whether the text should be a single line"
 msgstr "Indique si le texte doit être affiché sur une seule ligne"
 
-#: ../clutter/clutter-text.c:3803 ../clutter/clutter-text.c:3804
+#: ../clutter/clutter-text.c:3873 ../clutter/clutter-text.c:3874
 msgid "Selected Text Color"
 msgstr "Choix de la couleur du texte"
 
-#: ../clutter/clutter-text.c:3819
+#: ../clutter/clutter-text.c:3889
 msgid "Selected Text Color Set"
 msgstr "Couleur du texte définie"
 
-#: ../clutter/clutter-text.c:3820
+#: ../clutter/clutter-text.c:3890
 msgid "Whether the selected text color has been set"
 msgstr "Indique si le choix de la couleur du texte a été définie"
 
-#: ../clutter/clutter-timeline.c:561
-#: ../clutter/deprecated/clutter-animation.c:560
+#: ../clutter/clutter-timeline.c:593
+#: ../clutter/deprecated/clutter-animation.c:557
 msgid "Loop"
 msgstr "Boucler"
 
-#: ../clutter/clutter-timeline.c:562
+#: ../clutter/clutter-timeline.c:594
 msgid "Should the timeline automatically restart"
 msgstr "Est-ce que l'axe temporel doit redémarrer automatiquement"
 
-#: ../clutter/clutter-timeline.c:576
+#: ../clutter/clutter-timeline.c:608
 msgid "Delay"
 msgstr "Délai"
 
-#: ../clutter/clutter-timeline.c:577
+#: ../clutter/clutter-timeline.c:609
 msgid "Delay before start"
 msgstr "Le délai avant de démarrer"
 
-#: ../clutter/clutter-timeline.c:592
-#: ../clutter/deprecated/clutter-animation.c:544
-#: ../clutter/deprecated/clutter-animator.c:1804
+#: ../clutter/clutter-timeline.c:624
+#: ../clutter/deprecated/clutter-animation.c:541
+#: ../clutter/deprecated/clutter-animator.c:1801
 #: ../clutter/deprecated/clutter-media.c:224
-#: ../clutter/deprecated/clutter-state.c:1523
+#: ../clutter/deprecated/clutter-state.c:1517
 msgid "Duration"
 msgstr "Durée"
 
-#: ../clutter/clutter-timeline.c:593
+#: ../clutter/clutter-timeline.c:625
 msgid "Duration of the timeline in milliseconds"
 msgstr "La durée de l'axe temporel, en millisecondes"
 
-#: ../clutter/clutter-timeline.c:608
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:528
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:337
+#: ../clutter/clutter-timeline.c:640
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:521
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:330
 msgid "Direction"
 msgstr "Direction"
 
-#: ../clutter/clutter-timeline.c:609
+#: ../clutter/clutter-timeline.c:641
 msgid "Direction of the timeline"
 msgstr "Direction de l'animation"
 
-#: ../clutter/clutter-timeline.c:624
+#: ../clutter/clutter-timeline.c:656
 msgid "Auto Reverse"
 msgstr "Retour automatique"
 
-#: ../clutter/clutter-timeline.c:625
+#: ../clutter/clutter-timeline.c:657
 msgid "Whether the direction should be reversed when reaching the end"
 msgstr "Indique si le sens doit-être inversé lorsque la fin est atteinte"
 
-#: ../clutter/clutter-timeline.c:643
+#: ../clutter/clutter-timeline.c:675
 msgid "Repeat Count"
 msgstr "Nombre de répétition"
 
-#: ../clutter/clutter-timeline.c:644
+#: ../clutter/clutter-timeline.c:676
 msgid "How many times the timeline should repeat"
 msgstr "Combien de fois l'axe temporel doit être répété"
 
-#: ../clutter/clutter-timeline.c:658
+#: ../clutter/clutter-timeline.c:690
 msgid "Progress Mode"
 msgstr "Mode de progression"
 
-#: ../clutter/clutter-timeline.c:659
+#: ../clutter/clutter-timeline.c:691
 msgid "How the timeline should compute the progress"
 msgstr "Comment l'axe temporel doit calculer la progression"
 
-#: ../clutter/clutter-transition.c:246
+#: ../clutter/clutter-transition.c:244
 msgid "Interval"
 msgstr "Intervalle"
 
-#: ../clutter/clutter-transition.c:247
+#: ../clutter/clutter-transition.c:245
 msgid "The interval of values to transition"
 msgstr "L'intervalle des valeurs pour la transition"
 
-#: ../clutter/clutter-transition.c:261
+#: ../clutter/clutter-transition.c:259
 msgid "Animatable"
 msgstr "Animable"
 
-#: ../clutter/clutter-transition.c:262
+#: ../clutter/clutter-transition.c:260
 msgid "The animatable object"
 msgstr "L'objet animable"
 
-#: ../clutter/clutter-transition.c:283
+#: ../clutter/clutter-transition.c:281
 msgid "Remove on Complete"
 msgstr "Retirer après réalisation"
 
-#: ../clutter/clutter-transition.c:284
+#: ../clutter/clutter-transition.c:282
 msgid "Detach the transition when completed"
 msgstr "Détacher la transition après sa réalisation"
 
-#: ../clutter/clutter-zoom-action.c:354
+#: ../clutter/clutter-zoom-action.c:365
 msgid "Zoom Axis"
 msgstr "Axe du zoom"
 
-#: ../clutter/clutter-zoom-action.c:355
+#: ../clutter/clutter-zoom-action.c:366
 msgid "Constraints the zoom to an axis"
 msgstr "Oblige le déplacement du zoom selon un axe"
 
-#: ../clutter/deprecated/clutter-alpha.c:355
-#: ../clutter/deprecated/clutter-animation.c:575
-#: ../clutter/deprecated/clutter-animator.c:1821
+#: ../clutter/deprecated/clutter-alpha.c:354
+#: ../clutter/deprecated/clutter-animation.c:572
+#: ../clutter/deprecated/clutter-animator.c:1818
 msgid "Timeline"
 msgstr "Axe temporel"
 
-#: ../clutter/deprecated/clutter-alpha.c:356
+#: ../clutter/deprecated/clutter-alpha.c:355
 msgid "Timeline used by the alpha"
 msgstr "L'axe temporel utilisé par l'alpha"
 
-#: ../clutter/deprecated/clutter-alpha.c:372
+#: ../clutter/deprecated/clutter-alpha.c:371
 msgid "Alpha value"
 msgstr "Valeur de l'alpha"
 
-#: ../clutter/deprecated/clutter-alpha.c:373
+#: ../clutter/deprecated/clutter-alpha.c:372
 msgid "Alpha value as computed by the alpha"
 msgstr "La valeur alpha telle que calculée par l'alpha"
 
-#: ../clutter/deprecated/clutter-alpha.c:394
-#: ../clutter/deprecated/clutter-animation.c:528
+#: ../clutter/deprecated/clutter-alpha.c:393
+#: ../clutter/deprecated/clutter-animation.c:525
 msgid "Mode"
 msgstr "Mode"
 
-#: ../clutter/deprecated/clutter-alpha.c:395
+#: ../clutter/deprecated/clutter-alpha.c:394
 msgid "Progress mode"
 msgstr "Mode de progression"
 
-#: ../clutter/deprecated/clutter-animation.c:511
+#: ../clutter/deprecated/clutter-animation.c:508
 msgid "Object"
 msgstr "Objet"
 
-#: ../clutter/deprecated/clutter-animation.c:512
+#: ../clutter/deprecated/clutter-animation.c:509
 msgid "Object to which the animation applies"
 msgstr "L'objet auquel s'applique l'animation"
 
-#: ../clutter/deprecated/clutter-animation.c:529
+#: ../clutter/deprecated/clutter-animation.c:526
 msgid "The mode of the animation"
 msgstr "Le mode d'animation"
 
-#: ../clutter/deprecated/clutter-animation.c:545
+#: ../clutter/deprecated/clutter-animation.c:542
 msgid "Duration of the animation, in milliseconds"
 msgstr "La durée de l'animation, en millisecondes"
 
-#: ../clutter/deprecated/clutter-animation.c:561
+#: ../clutter/deprecated/clutter-animation.c:558
 msgid "Whether the animation should loop"
 msgstr "Indique si l'animation doit boucler"
 
-#: ../clutter/deprecated/clutter-animation.c:576
+#: ../clutter/deprecated/clutter-animation.c:573
 msgid "The timeline used by the animation"
 msgstr "L'axe temporel utilisé par l'animation"
 
-#: ../clutter/deprecated/clutter-animation.c:592
-#: ../clutter/deprecated/clutter-behaviour.c:241
+#: ../clutter/deprecated/clutter-animation.c:589
+#: ../clutter/deprecated/clutter-behaviour.c:237
 msgid "Alpha"
 msgstr "Alpha"
 
-#: ../clutter/deprecated/clutter-animation.c:593
+#: ../clutter/deprecated/clutter-animation.c:590
 msgid "The alpha used by the animation"
 msgstr "L'alpha utilisé par l'animation"
 
-#: ../clutter/deprecated/clutter-animator.c:1805
+#: ../clutter/deprecated/clutter-animator.c:1802
 msgid "The duration of the animation"
 msgstr "La durée de l'animation"
 
-#: ../clutter/deprecated/clutter-animator.c:1822
+#: ../clutter/deprecated/clutter-animator.c:1819
 msgid "The timeline of the animation"
 msgstr "L'axe temporel de l'animation"
 
-#: ../clutter/deprecated/clutter-behaviour.c:242
+#: ../clutter/deprecated/clutter-behaviour.c:238
 msgid "Alpha Object to drive the behaviour"
 msgstr "Objet alpha a partir duquel dériver le comportement"
 
-#: ../clutter/deprecated/clutter-behaviour-depth.c:182
+#: ../clutter/deprecated/clutter-behaviour-depth.c:180
 msgid "Start Depth"
 msgstr "Profondeur de départ"
 
-#: ../clutter/deprecated/clutter-behaviour-depth.c:183
+#: ../clutter/deprecated/clutter-behaviour-depth.c:181
 msgid "Initial depth to apply"
 msgstr "Profondeur initiale à appliquer"
 
-#: ../clutter/deprecated/clutter-behaviour-depth.c:198
+#: ../clutter/deprecated/clutter-behaviour-depth.c:196
 msgid "End Depth"
 msgstr "Profondeur d'arrivée"
 
-#: ../clutter/deprecated/clutter-behaviour-depth.c:199
+#: ../clutter/deprecated/clutter-behaviour-depth.c:197
 msgid "Final depth to apply"
 msgstr "Profondeur finale à appliquer"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:401
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:394
 msgid "Start Angle"
 msgstr "Angle de départ"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:402
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:284
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:395
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:277
 msgid "Initial angle"
 msgstr "Angle initial"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:417
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:410
 msgid "End Angle"
 msgstr "Angle d'arrivée"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:418
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:302
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:411
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:295
 msgid "Final angle"
 msgstr "Angle final"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:433
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:426
 msgid "Angle x tilt"
 msgstr "Angle d'inclinaison x"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:434
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:427
 msgid "Tilt of the ellipse around x axis"
 msgstr "Inclinaison de l'ellipse autour de l'axe x"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:449
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:442
 msgid "Angle y tilt"
 msgstr "Angle d'inclinaison y"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:450
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:443
 msgid "Tilt of the ellipse around y axis"
 msgstr "Inclinaison de l'ellipse autour de l'axe y"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:465
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:458
 msgid "Angle z tilt"
 msgstr "Angle d'inclinaison z"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:466
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:459
 msgid "Tilt of the ellipse around z axis"
 msgstr "Inclinaison de l'ellipse autour de l'axe z"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:482
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:475
 msgid "Width of the ellipse"
 msgstr "Largeur de l'ellipse"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:498
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:491
 msgid "Height of ellipse"
 msgstr "Hauteur de l'ellipse"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:513
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:506
 msgid "Center"
 msgstr "Centre"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:514
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:507
 msgid "Center of ellipse"
 msgstr "Centre de l'ellipse"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:529
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:338
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:522
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:331
 msgid "Direction of rotation"
 msgstr "Direction de la rotation"
 
-#: ../clutter/deprecated/clutter-behaviour-opacity.c:184
+#: ../clutter/deprecated/clutter-behaviour-opacity.c:177
 msgid "Opacity Start"
 msgstr "Opacité de départ"
 
-#: ../clutter/deprecated/clutter-behaviour-opacity.c:185
+#: ../clutter/deprecated/clutter-behaviour-opacity.c:178
 msgid "Initial opacity level"
 msgstr "Niveau initial d'opacité"
 
-#: ../clutter/deprecated/clutter-behaviour-opacity.c:202
+#: ../clutter/deprecated/clutter-behaviour-opacity.c:195
 msgid "Opacity End"
 msgstr "Opacité d'arrivée"
 
-#: ../clutter/deprecated/clutter-behaviour-opacity.c:203
+#: ../clutter/deprecated/clutter-behaviour-opacity.c:196
 msgid "Final opacity level"
 msgstr "Niveau final d'opacité"
 
-#: ../clutter/deprecated/clutter-behaviour-path.c:226
+#: ../clutter/deprecated/clutter-behaviour-path.c:222
 msgid "The ClutterPath object representing the path to animate along"
 msgstr "L'objet ClutterPath qui représente le chemin que l'animation suit"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:283
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:276
 msgid "Angle Begin"
 msgstr "Angle de départ"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:301
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:294
 msgid "Angle End"
 msgstr "Angle d'arrivée"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:319
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:312
 msgid "Axis"
 msgstr "Axe"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:320
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:313
 msgid "Axis of rotation"
 msgstr "Axe de rotation"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:355
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:348
 msgid "Center X"
 msgstr "Centre (X)"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:356
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:349
 msgid "X coordinate of the center of rotation"
 msgstr "Coordonnée X du centre de rotation"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:373
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:366
 msgid "Center Y"
 msgstr "Centre (Y)"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:374
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:367
 msgid "Y coordinate of the center of rotation"
 msgstr "Coordonnée Y du centre de rotation"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:391
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:384
 msgid "Center Z"
 msgstr "Centre (Z)"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:392
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:385
 msgid "Z coordinate of the center of rotation"
 msgstr "Coordonnée Z du centre de rotation"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:226
+#: ../clutter/deprecated/clutter-behaviour-scale.c:222
 msgid "X Start Scale"
 msgstr "Homothétie (X) de départ"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:227
+#: ../clutter/deprecated/clutter-behaviour-scale.c:223
 msgid "Initial scale on the X axis"
 msgstr "Facteur initial d'homothétie selon l'axe X"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:245
+#: ../clutter/deprecated/clutter-behaviour-scale.c:241
 msgid "X End Scale"
 msgstr "Homothétie (X) de départ"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:246
+#: ../clutter/deprecated/clutter-behaviour-scale.c:242
 msgid "Final scale on the X axis"
 msgstr "Facteur final d'homothétie selon l'axe X"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:264
+#: ../clutter/deprecated/clutter-behaviour-scale.c:260
 msgid "Y Start Scale"
 msgstr "Homothétie (Y) de départ"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:265
+#: ../clutter/deprecated/clutter-behaviour-scale.c:261
 msgid "Initial scale on the Y axis"
 msgstr "Facteur initial d'homothétie selon l'axe Y"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:283
+#: ../clutter/deprecated/clutter-behaviour-scale.c:279
 msgid "Y End Scale"
 msgstr "Homothétie (Y) de départ"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:284
+#: ../clutter/deprecated/clutter-behaviour-scale.c:280
 msgid "Final scale on the Y axis"
 msgstr "Facteur final d'homothétie selon l'axe X"
 
-#: ../clutter/deprecated/clutter-box.c:261
+#: ../clutter/deprecated/clutter-box.c:257
 msgid "The background color of the box"
 msgstr "La couleur de fond de la boîte"
 
-#: ../clutter/deprecated/clutter-box.c:274
+#: ../clutter/deprecated/clutter-box.c:270
 msgid "Color Set"
 msgstr "Couleur définie"
 
-#: ../clutter/deprecated/clutter-cairo-texture.c:597
+#: ../clutter/deprecated/clutter-cairo-texture.c:593
 msgid "Surface Width"
 msgstr "Largeur de la surface"
 
-#: ../clutter/deprecated/clutter-cairo-texture.c:598
+#: ../clutter/deprecated/clutter-cairo-texture.c:594
 msgid "The width of the Cairo surface"
 msgstr "La largeur de la surface Cairo"
 
-#: ../clutter/deprecated/clutter-cairo-texture.c:615
+#: ../clutter/deprecated/clutter-cairo-texture.c:611
 msgid "Surface Height"
 msgstr "Hauteur de la surface"
 
-#: ../clutter/deprecated/clutter-cairo-texture.c:616
+#: ../clutter/deprecated/clutter-cairo-texture.c:612
 msgid "The height of the Cairo surface"
 msgstr "La hauteur de la surface Cairo"
 
-#: ../clutter/deprecated/clutter-cairo-texture.c:636
+#: ../clutter/deprecated/clutter-cairo-texture.c:632
 msgid "Auto Resize"
 msgstr "Redimensionnement automatique"
 
-#: ../clutter/deprecated/clutter-cairo-texture.c:637
+#: ../clutter/deprecated/clutter-cairo-texture.c:633
 msgid "Whether the surface should match the allocation"
 msgstr "Indique si la surface doit correspondre à celle allouée"
 
@@ -2404,104 +2432,160 @@ msgstr "Le niveau de remplissage du buffer"
 msgid "The duration of the stream, in seconds"
 msgstr "La durée du flux, en secondes"
 
-#: ../clutter/deprecated/clutter-rectangle.c:274
+#: ../clutter/deprecated/clutter-rectangle.c:271
 msgid "The color of the rectangle"
 msgstr "La couleur du rectangle"
 
-#: ../clutter/deprecated/clutter-rectangle.c:287
+#: ../clutter/deprecated/clutter-rectangle.c:284
 msgid "Border Color"
 msgstr "Couleur de la bordure"
 
-#: ../clutter/deprecated/clutter-rectangle.c:288
+#: ../clutter/deprecated/clutter-rectangle.c:285
 msgid "The color of the border of the rectangle"
 msgstr "La couleur de la bordure du rectangle"
 
-#: ../clutter/deprecated/clutter-rectangle.c:303
+#: ../clutter/deprecated/clutter-rectangle.c:300
 msgid "Border Width"
 msgstr "Largeur de la bordure"
 
-#: ../clutter/deprecated/clutter-rectangle.c:304
+#: ../clutter/deprecated/clutter-rectangle.c:301
 msgid "The width of the border of the rectangle"
 msgstr "La largeur de la bordure du rectangle"
 
-#: ../clutter/deprecated/clutter-rectangle.c:318
+#: ../clutter/deprecated/clutter-rectangle.c:315
 msgid "Has Border"
 msgstr "Possède une bordure"
 
-#: ../clutter/deprecated/clutter-rectangle.c:319
+#: ../clutter/deprecated/clutter-rectangle.c:316
 msgid "Whether the rectangle should have a border"
 msgstr "Indique si le rectangle doit posséder une bordure"
 
-#: ../clutter/deprecated/clutter-shader.c:261
+#: ../clutter/deprecated/clutter-shader.c:257
 msgid "Vertex Source"
 msgstr "Source de vertex"
 
-#: ../clutter/deprecated/clutter-shader.c:262
+#: ../clutter/deprecated/clutter-shader.c:258
 msgid "Source of vertex shader"
 msgstr "Source du shader vertex"
 
-#: ../clutter/deprecated/clutter-shader.c:278
+#: ../clutter/deprecated/clutter-shader.c:274
 msgid "Fragment Source"
 msgstr "Source de fragment"
 
-#: ../clutter/deprecated/clutter-shader.c:279
+#: ../clutter/deprecated/clutter-shader.c:275
 msgid "Source of fragment shader"
 msgstr "Source du shader fragment"
 
-#: ../clutter/deprecated/clutter-shader.c:296
+#: ../clutter/deprecated/clutter-shader.c:292
 msgid "Compiled"
 msgstr "Compilé"
 
-#: ../clutter/deprecated/clutter-shader.c:297
+#: ../clutter/deprecated/clutter-shader.c:293
 msgid "Whether the shader is compiled and linked"
 msgstr "Indique si le shader est compilé et lié"
 
-#: ../clutter/deprecated/clutter-shader.c:314
+#: ../clutter/deprecated/clutter-shader.c:310
 msgid "Whether the shader is enabled"
 msgstr "Indique si le shader est activé"
 
-#: ../clutter/deprecated/clutter-shader.c:525
+#: ../clutter/deprecated/clutter-shader.c:521
 #, c-format
 msgid "%s compilation failed: %s"
 msgstr "Échec de la compilation de %s : %s"
 
-#: ../clutter/deprecated/clutter-shader.c:526
+#: ../clutter/deprecated/clutter-shader.c:522
 msgid "Vertex shader"
 msgstr "Shader vertex"
 
-#: ../clutter/deprecated/clutter-shader.c:527
+#: ../clutter/deprecated/clutter-shader.c:523
 msgid "Fragment shader"
 msgstr "Shader fragment"
 
-#: ../clutter/deprecated/clutter-state.c:1505
+#: ../clutter/deprecated/clutter-state.c:1499
 msgid "State"
 msgstr "État"
 
-#: ../clutter/deprecated/clutter-state.c:1506
+#: ../clutter/deprecated/clutter-state.c:1500
 msgid "Currently set state, (transition to this state might not be complete)"
 msgstr ""
 "Indique l'état actuellement défini (il se peut que la transition vers cet "
 "état ne soit pas achevée)"
 
-#: ../clutter/deprecated/clutter-state.c:1524
+#: ../clutter/deprecated/clutter-state.c:1518
 msgid "Default transition duration"
 msgstr "Durée de la transition par défaut"
 
-#: ../clutter/deprecated/clutter-texture.c:994
+#: ../clutter/deprecated/clutter-table-layout.c:543
+msgid "Column Number"
+msgstr "Numéro de la colonne"
+
+#: ../clutter/deprecated/clutter-table-layout.c:544
+msgid "The column the widget resides in"
+msgstr "La colonne dans laquelle l'élément graphique se situe"
+
+#: ../clutter/deprecated/clutter-table-layout.c:551
+msgid "Row Number"
+msgstr "Numéro de la ligne"
+
+#: ../clutter/deprecated/clutter-table-layout.c:552
+msgid "The row the widget resides in"
+msgstr "La ligne sur laquelle l'élément graphique se situe"
+
+#: ../clutter/deprecated/clutter-table-layout.c:559
+msgid "Column Span"
+msgstr "Extension de colonne"
+
+#: ../clutter/deprecated/clutter-table-layout.c:560
+msgid "The number of columns the widget should span"
+msgstr "Le nombre de colonnes sur lequel s'étend l'élément graphique"
+
+#: ../clutter/deprecated/clutter-table-layout.c:567
+msgid "Row Span"
+msgstr "Extension de ligne"
+
+#: ../clutter/deprecated/clutter-table-layout.c:568
+msgid "The number of rows the widget should span"
+msgstr "Le nombre de lignes sur lequel s'étend l'élément graphique"
+
+#: ../clutter/deprecated/clutter-table-layout.c:575
+msgid "Horizontal Expand"
+msgstr "Extension horizontale"
+
+#: ../clutter/deprecated/clutter-table-layout.c:576
+msgid "Allocate extra space for the child in horizontal axis"
+msgstr "Alloue de l'espace supplémentaire pour l'enfant sur l'axe horizontal"
+
+#: ../clutter/deprecated/clutter-table-layout.c:582
+msgid "Vertical Expand"
+msgstr "Extension verticale"
+
+#: ../clutter/deprecated/clutter-table-layout.c:583
+msgid "Allocate extra space for the child in vertical axis"
+msgstr "Alloue de l'espace supplémentaire pour l'enfant sur l'axe vertical"
+
+#: ../clutter/deprecated/clutter-table-layout.c:1638
+msgid "Spacing between columns"
+msgstr "Espacement entre les colonnes"
+
+#: ../clutter/deprecated/clutter-table-layout.c:1654
+msgid "Spacing between rows"
+msgstr "Espacement entre les lignes"
+
+#: ../clutter/deprecated/clutter-texture.c:992
 msgid "Sync size of actor"
 msgstr "Synchronise la taille de l'acteur"
 
-#: ../clutter/deprecated/clutter-texture.c:995
+#: ../clutter/deprecated/clutter-texture.c:993
 msgid "Auto sync size of actor to underlying pixbuf dimensions"
 msgstr ""
 "Synchronise automatiquement la taille de l'acteur avec les dimensions du "
 "pixbuf sous-jacent"
 
-#: ../clutter/deprecated/clutter-texture.c:1002
+#: ../clutter/deprecated/clutter-texture.c:1000
 msgid "Disable Slicing"
 msgstr "Désactive le découpage"
 
-#: ../clutter/deprecated/clutter-texture.c:1003
+#: ../clutter/deprecated/clutter-texture.c:1001
 msgid ""
 "Forces the underlying texture to be singular and not made of smaller space "
 "saving individual textures"
@@ -2509,74 +2593,74 @@ msgstr ""
 "Force la texture sous-jacente à être singulière et non composée de plus "
 "petites sous-textures économes en espace"
 
-#: ../clutter/deprecated/clutter-texture.c:1012
+#: ../clutter/deprecated/clutter-texture.c:1010
 msgid "Tile Waste"
 msgstr "Perte de mosaïque"
 
-#: ../clutter/deprecated/clutter-texture.c:1013
+#: ../clutter/deprecated/clutter-texture.c:1011
 msgid "Maximum waste area of a sliced texture"
 msgstr "Zone maximale de perte d'une texture par morceaux"
 
-#: ../clutter/deprecated/clutter-texture.c:1021
+#: ../clutter/deprecated/clutter-texture.c:1019
 msgid "Horizontal repeat"
 msgstr "Répétition horizontale"
 
-#: ../clutter/deprecated/clutter-texture.c:1022
+#: ../clutter/deprecated/clutter-texture.c:1020
 msgid "Repeat the contents rather than scaling them horizontally"
 msgstr "Répète le contenu plutôt que de le redimensionner horizontalement"
 
-#: ../clutter/deprecated/clutter-texture.c:1029
+#: ../clutter/deprecated/clutter-texture.c:1027
 msgid "Vertical repeat"
 msgstr "Répétition verticale"
 
-#: ../clutter/deprecated/clutter-texture.c:1030
+#: ../clutter/deprecated/clutter-texture.c:1028
 msgid "Repeat the contents rather than scaling them vertically"
 msgstr "Répète le contenu plutôt que de le redimensionner verticalement"
 
-#: ../clutter/deprecated/clutter-texture.c:1037
+#: ../clutter/deprecated/clutter-texture.c:1035
 msgid "Filter Quality"
 msgstr "Qualité de filtrage"
 
-#: ../clutter/deprecated/clutter-texture.c:1038
+#: ../clutter/deprecated/clutter-texture.c:1036
 msgid "Rendering quality used when drawing the texture"
 msgstr "La qualité de rendu utilisée lors du dessin de la texture"
 
-#: ../clutter/deprecated/clutter-texture.c:1046
+#: ../clutter/deprecated/clutter-texture.c:1044
 msgid "Pixel Format"
 msgstr "Format des pixels"
 
-#: ../clutter/deprecated/clutter-texture.c:1047
+#: ../clutter/deprecated/clutter-texture.c:1045
 msgid "The Cogl pixel format to use"
 msgstr "Le format des pixels Cogl à utiliser"
 
-#: ../clutter/deprecated/clutter-texture.c:1055
-#: ../clutter/wayland/clutter-wayland-surface.c:449
+#: ../clutter/deprecated/clutter-texture.c:1053
+#: ../clutter/wayland/clutter-wayland-surface.c:445
 msgid "Cogl Texture"
 msgstr "Texture Cogl"
 
-#: ../clutter/deprecated/clutter-texture.c:1056
-#: ../clutter/wayland/clutter-wayland-surface.c:450
+#: ../clutter/deprecated/clutter-texture.c:1054
+#: ../clutter/wayland/clutter-wayland-surface.c:446
 msgid "The underlying Cogl texture handle used to draw this actor"
 msgstr "L'animateur de texture Cogl sous-jacent utilisé pour tracer cet acteur"
 
-#: ../clutter/deprecated/clutter-texture.c:1063
+#: ../clutter/deprecated/clutter-texture.c:1061
 msgid "Cogl Material"
 msgstr "Matériel Cogl"
 
-#: ../clutter/deprecated/clutter-texture.c:1064
+#: ../clutter/deprecated/clutter-texture.c:1062
 msgid "The underlying Cogl material handle used to draw this actor"
 msgstr ""
 "L'animateur de matériel Cogl sous-jacent utilisé pour tracer cet acteur"
 
-#: ../clutter/deprecated/clutter-texture.c:1083
+#: ../clutter/deprecated/clutter-texture.c:1081
 msgid "The path of the file containing the image data"
 msgstr "Le chemin du fichier contenant les données de l'image"
 
-#: ../clutter/deprecated/clutter-texture.c:1090
+#: ../clutter/deprecated/clutter-texture.c:1088
 msgid "Keep Aspect Ratio"
 msgstr "Conserver le rapport d'affichage"
 
-#: ../clutter/deprecated/clutter-texture.c:1091
+#: ../clutter/deprecated/clutter-texture.c:1089
 msgid ""
 "Keep the aspect ratio of the texture when requesting the preferred width or "
 "height"
@@ -2584,22 +2668,22 @@ msgstr ""
 "Conserve le rapport d'affichage de la texture au moment d'une requête de "
 "largeur ou hauteur préférée"
 
-#: ../clutter/deprecated/clutter-texture.c:1119
+#: ../clutter/deprecated/clutter-texture.c:1117
 msgid "Load asynchronously"
 msgstr "Chargement asynchrone"
 
-#: ../clutter/deprecated/clutter-texture.c:1120
+#: ../clutter/deprecated/clutter-texture.c:1118
 msgid ""
 "Load files inside a thread to avoid blocking when loading images from disk"
 msgstr ""
 "Charge les fichiers à l'intérieur d'un thread pour éviter un blocage lors du "
 "chargement des images à partir du disque"
 
-#: ../clutter/deprecated/clutter-texture.c:1138
+#: ../clutter/deprecated/clutter-texture.c:1136
 msgid "Load data asynchronously"
 msgstr "Charger les données de manière asynchrone"
 
-#: ../clutter/deprecated/clutter-texture.c:1139
+#: ../clutter/deprecated/clutter-texture.c:1137
 msgid ""
 "Decode image data files inside a thread to reduce blocking when loading "
 "images from disk"
@@ -2607,194 +2691,190 @@ msgstr ""
 "Décode les fichiers de données d'image à l'intérieur d'un thread pour éviter "
 "un blocage lors du chargement des images à partir du disque"
 
-#: ../clutter/deprecated/clutter-texture.c:1165
+#: ../clutter/deprecated/clutter-texture.c:1163
 msgid "Pick With Alpha"
 msgstr "Sélection avec alpha"
 
-#: ../clutter/deprecated/clutter-texture.c:1166
+#: ../clutter/deprecated/clutter-texture.c:1164
 msgid "Shape actor with alpha channel when picking"
 msgstr "Acteur de forme avec canal alpha lors d'une sélection"
 
-#: ../clutter/deprecated/clutter-texture.c:1599
-#: ../clutter/deprecated/clutter-texture.c:1994
-#: ../clutter/deprecated/clutter-texture.c:2090
-#: ../clutter/deprecated/clutter-texture.c:2388
+#: ../clutter/deprecated/clutter-texture.c:1597
+#: ../clutter/deprecated/clutter-texture.c:1992
+#: ../clutter/deprecated/clutter-texture.c:2088
+#: ../clutter/deprecated/clutter-texture.c:2386
 #, c-format
 msgid "Failed to load the image data"
 msgstr "Impossible de charger les données de l'image"
 
-#: ../clutter/deprecated/clutter-texture.c:1758
+#: ../clutter/deprecated/clutter-texture.c:1756
 #, c-format
 msgid "YUV textures are not supported"
 msgstr "Les textures YUV ne sont pas prises en charge"
 
-#: ../clutter/deprecated/clutter-texture.c:1767
+#: ../clutter/deprecated/clutter-texture.c:1765
 #, c-format
 msgid "YUV2 textues are not supported"
 msgstr "Les textures YUV2 ne sont pas prises en charge"
 
-#: ../clutter/evdev/clutter-input-device-evdev.c:159
-msgid "sysfs Path"
-msgstr "Chemin sysfs"
-
-#: ../clutter/evdev/clutter-input-device-evdev.c:160
-msgid "Path of the device in sysfs"
-msgstr "Le chemin du périphérique dans sysfs"
-
-#: ../clutter/evdev/clutter-input-device-evdev.c:175
-msgid "Device Path"
-msgstr "Chemin du périphérique"
-
-#: ../clutter/evdev/clutter-input-device-evdev.c:176
-msgid "Path of the device node"
-msgstr "Le chemin du nœud du périphérique"
-
-#: ../clutter/gdk/clutter-backend-gdk.c:296
+#: ../clutter/gdk/clutter-backend-gdk.c:289
 #, c-format
 msgid "Could not find a suitable CoglWinsys for a GdkDisplay of type %s"
 msgstr ""
 "Impossible de trouver un CoglWinsys approprié pour un GdkDisplay de type %s"
 
-#: ../clutter/wayland/clutter-wayland-surface.c:423
+#: ../clutter/wayland/clutter-wayland-surface.c:419
 msgid "Surface"
 msgstr "Surface"
 
-#: ../clutter/wayland/clutter-wayland-surface.c:424
+#: ../clutter/wayland/clutter-wayland-surface.c:420
 msgid "The underlying wayland surface"
 msgstr "La surface wayland sous-jacente"
 
-#: ../clutter/wayland/clutter-wayland-surface.c:431
+#: ../clutter/wayland/clutter-wayland-surface.c:427
 msgid "Surface width"
 msgstr "Largeur de la surface"
 
-#: ../clutter/wayland/clutter-wayland-surface.c:432
+#: ../clutter/wayland/clutter-wayland-surface.c:428
 msgid "The width of the underlying wayland surface"
 msgstr "La largeur de la surface wayland sous-jacente"
 
-#: ../clutter/wayland/clutter-wayland-surface.c:440
+#: ../clutter/wayland/clutter-wayland-surface.c:436
 msgid "Surface height"
 msgstr "Hauteur de la surface"
 
-#: ../clutter/wayland/clutter-wayland-surface.c:441
+#: ../clutter/wayland/clutter-wayland-surface.c:437
 msgid "The height of the underlying wayland surface"
 msgstr "La hauteur de la surface wayland sous-jacente"
 
-#: ../clutter/x11/clutter-backend-x11.c:516
+#: ../clutter/x11/clutter-backend-x11.c:488
 msgid "X display to use"
 msgstr "Affichage X à utiliser"
 
-#: ../clutter/x11/clutter-backend-x11.c:522
+#: ../clutter/x11/clutter-backend-x11.c:494
 msgid "X screen to use"
 msgstr "Écran X à utiliser"
 
-#: ../clutter/x11/clutter-backend-x11.c:527
+#: ../clutter/x11/clutter-backend-x11.c:499
 msgid "Make X calls synchronous"
 msgstr "Rendre les appels X synchrones"
 
-#: ../clutter/x11/clutter-backend-x11.c:534
+#: ../clutter/x11/clutter-backend-x11.c:506
 msgid "Disable XInput support"
 msgstr "Désactiver la prise en charge de XInput"
 
-#: ../clutter/x11/clutter-keymap-x11.c:322
+#: ../clutter/x11/clutter-keymap-x11.c:458
 msgid "The Clutter backend"
 msgstr "Le moteur Clutter"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:539
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:534
 msgid "Pixmap"
 msgstr "Pixmap"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:540
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:535
 msgid "The X11 Pixmap to be bound"
 msgstr "Le pixmap X11 à lier"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:548
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:543
 msgid "Pixmap width"
 msgstr "Largeur du pixmap"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:549
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:544
 msgid "The width of the pixmap bound to this texture"
 msgstr "La largeur du pixmap lié à cette texture"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:557
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:552
 msgid "Pixmap height"
 msgstr "Hauteur du pixmap"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:558
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:553
 msgid "The height of the pixmap bound to this texture"
 msgstr "La hauteur du pixmap lié à cette texture"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:566
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:561
 msgid "Pixmap Depth"
 msgstr "Profondeur du pixmap"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:567
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:562
 msgid "The depth (in number of bits) of the pixmap bound to this texture"
 msgstr "La profondeur (en nombre de bits) du pixmap lié à cette texture"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:575
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:570
 msgid "Automatic Updates"
 msgstr "Mises à jour automatiques"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:576
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:571
 msgid "If the texture should be kept in sync with any pixmap changes."
 msgstr ""
 "Indique si la texture doit rester synchronisée avec les modifications du "
 "pixmap."
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:584
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:579
 msgid "Window"
 msgstr "Fenêtre"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:585
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:580
 msgid "The X11 Window to be bound"
 msgstr "La fenêtre X11 à lier"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:593
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:588
 msgid "Window Redirect Automatic"
 msgstr "Canal de fenêtre automatique"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:594
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:589
 msgid "If composite window redirects are set to Automatic (or Manual if false)"
 msgstr ""
 "Indique si le canal de la fenêtre composite est défini à « Automatic » (ou "
 "« Manual » si faux)"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:604
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:599
 msgid "Window Mapped"
 msgstr "Fenêtre tracée"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:605
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:600
 msgid "If window is mapped"
 msgstr "Indique si la fenêtre est tracée"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:614
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:609
 msgid "Destroyed"
 msgstr "Détruite"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:615
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:610
 msgid "If window has been destroyed"
 msgstr "Indique si la fenêtre a été détruite"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:623
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:618
 msgid "Window X"
 msgstr "Fenêtre (X)"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:624
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:619
 msgid "X position of window on screen according to X11"
 msgstr "La coordonnée X de la fenêtre selon X11"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:632
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:627
 msgid "Window Y"
 msgstr "Fenêtre (Y)"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:633
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:628
 msgid "Y position of window on screen according to X11"
 msgstr "La coordonnée Y de la fenêtre selon X11"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:640
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:635
 msgid "Window Override Redirect"
 msgstr "Override Redirect de la fenêtre"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:641
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:636
 msgid "If this is an override-redirect window"
 msgstr "Indique si cette fenêtre possède l'attribut override-redirect"
+
+#~ msgid "sysfs Path"
+#~ msgstr "Chemin sysfs"
+
+#~ msgid "Path of the device in sysfs"
+#~ msgstr "Le chemin du périphérique dans sysfs"
+
+#~ msgid "Device Path"
+#~ msgstr "Chemin du périphérique"
+
+#~ msgid "Path of the device node"
+#~ msgstr "Le chemin du nœud du périphérique"
diff --git a/po/gl.po b/po/gl.po
index 9fe88e444..cfdb343aa 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -5,14 +5,14 @@
 # colaborar connosco, podes atopar máis información en http://www.trasno.net
 # Fran Diéguez <frandieguez@gnome.org>, 2011, 2012.
 # Leandro Regueiro <leandro.regueiro@gmail.com>, 2012.
-# Fran Dieguez <frandieguez@gnome.org>, 2012, 2013.
+# Fran Dieguez <frandieguez@gnome.org>, 2012, 2013, 2014.
 msgid ""
 msgstr ""
 "Project-Id-Version: clutter\n"
 "Report-Msgid-Bugs-To: "
 "http://bugzilla.gnome.org/enter_bug.cgi?product=clutter\n"
-"POT-Creation-Date: 2013-01-13 18:04+0100\n"
-"PO-Revision-Date: 2013-01-13 18:04+0200\n"
+"POT-Creation-Date: 2014-03-03 21:44+0100\n"
+"PO-Revision-Date: 2014-03-03 21:46+0200\n"
 "Last-Translator: Fran Dieguez <frandieguez@gnome.org>\n"
 "Language-Team: gnome-l10n-gl@gnome.org\n"
 "Language: gl\n"
@@ -24,690 +24,690 @@ msgstr ""
 "X-Launchpad-Export-Date: 2011-05-12 10:24+0000\n"
 "X-Project-Style: gnome\n"
 
-#: ../clutter/clutter-actor.c:6144
+#: ../clutter/clutter-actor.c:6214
 msgid "X coordinate"
 msgstr "Coordenada X"
 
-#: ../clutter/clutter-actor.c:6145
+#: ../clutter/clutter-actor.c:6215
 msgid "X coordinate of the actor"
 msgstr "Coordenada X do actor"
 
-#: ../clutter/clutter-actor.c:6163
+#: ../clutter/clutter-actor.c:6233
 msgid "Y coordinate"
 msgstr "Coordenada Y"
 
-#: ../clutter/clutter-actor.c:6164
+#: ../clutter/clutter-actor.c:6234
 msgid "Y coordinate of the actor"
 msgstr "Coordenada Y do actor"
 
-#: ../clutter/clutter-actor.c:6186
+#: ../clutter/clutter-actor.c:6256
 msgid "Position"
 msgstr "Posición"
 
-#: ../clutter/clutter-actor.c:6187
+#: ../clutter/clutter-actor.c:6257
 msgid "The position of the origin of the actor"
 msgstr "A posición da orixe do actor"
 
-#: ../clutter/clutter-actor.c:6204 ../clutter/clutter-canvas.c:215
-#: ../clutter/clutter-grid-layout.c:1238
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:481
+#: ../clutter/clutter-actor.c:6274 ../clutter/clutter-canvas.c:247
+#: ../clutter/clutter-grid-layout.c:1239
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:474
 msgid "Width"
 msgstr "Largura"
 
-#: ../clutter/clutter-actor.c:6205
+#: ../clutter/clutter-actor.c:6275
 msgid "Width of the actor"
 msgstr "Largura do actor"
 
-#: ../clutter/clutter-actor.c:6223 ../clutter/clutter-canvas.c:231
-#: ../clutter/clutter-grid-layout.c:1245
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:497
+#: ../clutter/clutter-actor.c:6293 ../clutter/clutter-canvas.c:263
+#: ../clutter/clutter-grid-layout.c:1246
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:490
 msgid "Height"
 msgstr "Altura"
 
-#: ../clutter/clutter-actor.c:6224
+#: ../clutter/clutter-actor.c:6294
 msgid "Height of the actor"
 msgstr "Altura do actor"
 
-#: ../clutter/clutter-actor.c:6245
+#: ../clutter/clutter-actor.c:6315
 msgid "Size"
 msgstr "Tamaño"
 
-#: ../clutter/clutter-actor.c:6246
+#: ../clutter/clutter-actor.c:6316
 msgid "The size of the actor"
 msgstr "O tamaño do actor"
 
-#: ../clutter/clutter-actor.c:6264
+#: ../clutter/clutter-actor.c:6334
 msgid "Fixed X"
 msgstr "X fixa"
 
-#: ../clutter/clutter-actor.c:6265
+#: ../clutter/clutter-actor.c:6335
 msgid "Forced X position of the actor"
 msgstr "Posición X forzada do actor"
 
-#: ../clutter/clutter-actor.c:6282
+#: ../clutter/clutter-actor.c:6352
 msgid "Fixed Y"
 msgstr "Y fixa"
 
-#: ../clutter/clutter-actor.c:6283
+#: ../clutter/clutter-actor.c:6353
 msgid "Forced Y position of the actor"
 msgstr "Posición Y forzada do actor"
 
-#: ../clutter/clutter-actor.c:6298
+#: ../clutter/clutter-actor.c:6368
 msgid "Fixed position set"
 msgstr "Estabelecer a posición fixa"
 
-#: ../clutter/clutter-actor.c:6299
+#: ../clutter/clutter-actor.c:6369
 msgid "Whether to use fixed positioning for the actor"
 msgstr "Cando se emprega o posicionamento fixo do actor"
 
-#: ../clutter/clutter-actor.c:6317
+#: ../clutter/clutter-actor.c:6387
 msgid "Min Width"
 msgstr "Largura mínima"
 
-#: ../clutter/clutter-actor.c:6318
+#: ../clutter/clutter-actor.c:6388
 msgid "Forced minimum width request for the actor"
 msgstr "Forzar a largura mínima requirida para o actor"
 
-#: ../clutter/clutter-actor.c:6336
+#: ../clutter/clutter-actor.c:6406
 msgid "Min Height"
 msgstr "Altura mínima"
 
-#: ../clutter/clutter-actor.c:6337
+#: ../clutter/clutter-actor.c:6407
 msgid "Forced minimum height request for the actor"
 msgstr "Forzar a altura mínima requirida para o actor"
 
-#: ../clutter/clutter-actor.c:6355
+#: ../clutter/clutter-actor.c:6425
 msgid "Natural Width"
 msgstr "Largura natural"
 
-#: ../clutter/clutter-actor.c:6356
+#: ../clutter/clutter-actor.c:6426
 msgid "Forced natural width request for the actor"
 msgstr "Forzar a largura natural requirida para o actor"
 
-#: ../clutter/clutter-actor.c:6374
+#: ../clutter/clutter-actor.c:6444
 msgid "Natural Height"
 msgstr "Altura natural"
 
-#: ../clutter/clutter-actor.c:6375
+#: ../clutter/clutter-actor.c:6445
 msgid "Forced natural height request for the actor"
 msgstr "Forzar a altura natural requirida para o actor"
 
-#: ../clutter/clutter-actor.c:6390
+#: ../clutter/clutter-actor.c:6460
 msgid "Minimum width set"
 msgstr "Estabelecer a largura mínima"
 
-#: ../clutter/clutter-actor.c:6391
+#: ../clutter/clutter-actor.c:6461
 msgid "Whether to use the min-width property"
 msgstr "Cando se emprega a propiedade de largura mínima"
 
-#: ../clutter/clutter-actor.c:6405
+#: ../clutter/clutter-actor.c:6475
 msgid "Minimum height set"
 msgstr "Estabelecer a altura mínima"
 
-#: ../clutter/clutter-actor.c:6406
+#: ../clutter/clutter-actor.c:6476
 msgid "Whether to use the min-height property"
 msgstr "Cando se emprega a propiedade de altura mínima"
 
-#: ../clutter/clutter-actor.c:6420
+#: ../clutter/clutter-actor.c:6490
 msgid "Natural width set"
 msgstr "Estabelecer a largura natural"
 
-#: ../clutter/clutter-actor.c:6421
+#: ../clutter/clutter-actor.c:6491
 msgid "Whether to use the natural-width property"
 msgstr "Cando se emprega a propiedade de largura natural"
 
-#: ../clutter/clutter-actor.c:6435
+#: ../clutter/clutter-actor.c:6505
 msgid "Natural height set"
 msgstr "Estabelecer a altura natural"
 
-#: ../clutter/clutter-actor.c:6436
+#: ../clutter/clutter-actor.c:6506
 msgid "Whether to use the natural-height property"
 msgstr "Cando se emprega a propiedade de altura natural"
 
-#: ../clutter/clutter-actor.c:6452
+#: ../clutter/clutter-actor.c:6522
 msgid "Allocation"
 msgstr "Asignación"
 
-#: ../clutter/clutter-actor.c:6453
+#: ../clutter/clutter-actor.c:6523
 msgid "The actor's allocation"
 msgstr "Asignación do actor"
 
-#: ../clutter/clutter-actor.c:6510
+#: ../clutter/clutter-actor.c:6580
 msgid "Request Mode"
 msgstr "Modo requirido"
 
-#: ../clutter/clutter-actor.c:6511
+#: ../clutter/clutter-actor.c:6581
 msgid "The actor's request mode"
 msgstr "Modo de requirimento do actor"
 
-#: ../clutter/clutter-actor.c:6535
+#: ../clutter/clutter-actor.c:6605
 msgid "Depth"
 msgstr "Profundidade"
 
-#: ../clutter/clutter-actor.c:6536
+#: ../clutter/clutter-actor.c:6606
 msgid "Position on the Z axis"
 msgstr "Posición no eixo Z"
 
-#: ../clutter/clutter-actor.c:6563
+#: ../clutter/clutter-actor.c:6633
 msgid "Z Position"
 msgstr "Posición Z"
 
-#: ../clutter/clutter-actor.c:6564
+#: ../clutter/clutter-actor.c:6634
 msgid "The actor's position on the Z axis"
 msgstr "A posición do actor no eixo Z"
 
-#: ../clutter/clutter-actor.c:6581
+#: ../clutter/clutter-actor.c:6651
 msgid "Opacity"
 msgstr "Opacidade"
 
-#: ../clutter/clutter-actor.c:6582
+#: ../clutter/clutter-actor.c:6652
 msgid "Opacity of an actor"
 msgstr "Opacidade dun actor"
 
-#: ../clutter/clutter-actor.c:6602
+#: ../clutter/clutter-actor.c:6672
 msgid "Offscreen redirect"
 msgstr "Redirección fóra da pantalal"
 
-#: ../clutter/clutter-actor.c:6603
+#: ../clutter/clutter-actor.c:6673
 msgid "Flags controlling when to flatten the actor into a single image"
 msgstr "Opcións que controlan se se debe aplanar o actor nunha única imaxe"
 
-#: ../clutter/clutter-actor.c:6617
+#: ../clutter/clutter-actor.c:6687
 msgid "Visible"
 msgstr "Visíbel"
 
-#: ../clutter/clutter-actor.c:6618
+#: ../clutter/clutter-actor.c:6688
 msgid "Whether the actor is visible or not"
 msgstr "Se o actor é visíbel ou non"
 
-#: ../clutter/clutter-actor.c:6632
+#: ../clutter/clutter-actor.c:6702
 msgid "Mapped"
 msgstr "Mapeamento"
 
-#: ../clutter/clutter-actor.c:6633
+#: ../clutter/clutter-actor.c:6703
 msgid "Whether the actor will be painted"
 msgstr "Cando o actor será pintado"
 
-#: ../clutter/clutter-actor.c:6646
+#: ../clutter/clutter-actor.c:6716
 msgid "Realized"
 msgstr "Decatado"
 
-#: ../clutter/clutter-actor.c:6647
+#: ../clutter/clutter-actor.c:6717
 msgid "Whether the actor has been realized"
 msgstr "Cando o actor se decata"
 
-#: ../clutter/clutter-actor.c:6662
+#: ../clutter/clutter-actor.c:6732
 msgid "Reactive"
 msgstr "Reactivo"
 
-#: ../clutter/clutter-actor.c:6663
+#: ../clutter/clutter-actor.c:6733
 msgid "Whether the actor is reactive to events"
 msgstr "Cando o actor reacciona a accións"
 
-#: ../clutter/clutter-actor.c:6674
+#: ../clutter/clutter-actor.c:6744
 msgid "Has Clip"
 msgstr "Ten recorte"
 
-#: ../clutter/clutter-actor.c:6675
+#: ../clutter/clutter-actor.c:6745
 msgid "Whether the actor has a clip set"
 msgstr "Cando o actor ten un conxunto de recorte"
 
-#: ../clutter/clutter-actor.c:6688
+#: ../clutter/clutter-actor.c:6758
 msgid "Clip"
 msgstr "Recorte"
 
-#: ../clutter/clutter-actor.c:6689
+#: ../clutter/clutter-actor.c:6759
 msgid "The clip region for the actor"
 msgstr "A rexión de recorte para o actor"
 
-#: ../clutter/clutter-actor.c:6708
+#: ../clutter/clutter-actor.c:6778
 msgid "Clip Rectangle"
 msgstr "Rectángulo de recorte"
 
-#: ../clutter/clutter-actor.c:6709
+#: ../clutter/clutter-actor.c:6779
 msgid "The visible region of the actor"
 msgstr "A rexión visíbel para o actor"
 
-#: ../clutter/clutter-actor.c:6723 ../clutter/clutter-actor-meta.c:207
-#: ../clutter/clutter-binding-pool.c:319 ../clutter/clutter-input-device.c:258
+#: ../clutter/clutter-actor.c:6793 ../clutter/clutter-actor-meta.c:205
+#: ../clutter/clutter-binding-pool.c:319 ../clutter/clutter-input-device.c:247
 msgid "Name"
 msgstr "Nome"
 
-#: ../clutter/clutter-actor.c:6724
+#: ../clutter/clutter-actor.c:6794
 msgid "Name of the actor"
 msgstr "Nome do actor"
 
-#: ../clutter/clutter-actor.c:6745
+#: ../clutter/clutter-actor.c:6815
 msgid "Pivot Point"
 msgstr "Punto de pivote"
 
-#: ../clutter/clutter-actor.c:6746
+#: ../clutter/clutter-actor.c:6816
 msgid "The point around which the scaling and rotation occur"
 msgstr "O punto sobre o cal se realiza o escalado e rotación"
 
-#: ../clutter/clutter-actor.c:6764
+#: ../clutter/clutter-actor.c:6834
 msgid "Pivot Point Z"
 msgstr "Punto de pivote Z"
 
-#: ../clutter/clutter-actor.c:6765
+#: ../clutter/clutter-actor.c:6835
 msgid "Z component of the pivot point"
 msgstr "Coordenada Z do punto de pivote"
 
-#: ../clutter/clutter-actor.c:6783
+#: ../clutter/clutter-actor.c:6853
 msgid "Scale X"
 msgstr "Escala X"
 
-#: ../clutter/clutter-actor.c:6784
+#: ../clutter/clutter-actor.c:6854
 msgid "Scale factor on the X axis"
 msgstr "Factor de escala para o eixo X"
 
-#: ../clutter/clutter-actor.c:6802
+#: ../clutter/clutter-actor.c:6872
 msgid "Scale Y"
 msgstr "Escala Y"
 
-#: ../clutter/clutter-actor.c:6803
+#: ../clutter/clutter-actor.c:6873
 msgid "Scale factor on the Y axis"
 msgstr "Factor de escala para o eixo Y"
 
-#: ../clutter/clutter-actor.c:6821
+#: ../clutter/clutter-actor.c:6891
 msgid "Scale Z"
 msgstr "Escala Z"
 
-#: ../clutter/clutter-actor.c:6822
+#: ../clutter/clutter-actor.c:6892
 msgid "Scale factor on the Z axis"
 msgstr "Factor de escala para o eixo Z"
 
-#: ../clutter/clutter-actor.c:6840
+#: ../clutter/clutter-actor.c:6910
 msgid "Scale Center X"
 msgstr "Centro da escala Z"
 
-#: ../clutter/clutter-actor.c:6841
+#: ../clutter/clutter-actor.c:6911
 msgid "Horizontal scale center"
 msgstr "Centro na escala horizontal"
 
-#: ../clutter/clutter-actor.c:6859
+#: ../clutter/clutter-actor.c:6929
 msgid "Scale Center Y"
 msgstr "Centro da escala Y"
 
-#: ../clutter/clutter-actor.c:6860
+#: ../clutter/clutter-actor.c:6930
 msgid "Vertical scale center"
 msgstr "Centro na escala vertical"
 
-#: ../clutter/clutter-actor.c:6878
+#: ../clutter/clutter-actor.c:6948
 msgid "Scale Gravity"
 msgstr "Escala de gravidade"
 
-#: ../clutter/clutter-actor.c:6879
+#: ../clutter/clutter-actor.c:6949
 msgid "The center of scaling"
 msgstr "O centro da escala"
 
-#: ../clutter/clutter-actor.c:6897
+#: ../clutter/clutter-actor.c:6967
 msgid "Rotation Angle X"
 msgstr "Ángulo de rotación de X"
 
-#: ../clutter/clutter-actor.c:6898
+#: ../clutter/clutter-actor.c:6968
 msgid "The rotation angle on the X axis"
 msgstr "Ángulo de rotación do eixo X"
 
-#: ../clutter/clutter-actor.c:6916
+#: ../clutter/clutter-actor.c:6986
 msgid "Rotation Angle Y"
 msgstr "Ángulo de rotación Y"
 
-#: ../clutter/clutter-actor.c:6917
+#: ../clutter/clutter-actor.c:6987
 msgid "The rotation angle on the Y axis"
 msgstr "Ángulo de rotación do eixo Y"
 
-#: ../clutter/clutter-actor.c:6935
+#: ../clutter/clutter-actor.c:7005
 msgid "Rotation Angle Z"
 msgstr "Ángulo de rotación Z"
 
-#: ../clutter/clutter-actor.c:6936
+#: ../clutter/clutter-actor.c:7006
 msgid "The rotation angle on the Z axis"
 msgstr "Ángulo de rotación do eixo Z"
 
-#: ../clutter/clutter-actor.c:6954
+#: ../clutter/clutter-actor.c:7024
 msgid "Rotation Center X"
 msgstr "Centro de rotación X"
 
-#: ../clutter/clutter-actor.c:6955
+#: ../clutter/clutter-actor.c:7025
 msgid "The rotation center on the X axis"
 msgstr "O centro de rotación do eixo X"
 
-#: ../clutter/clutter-actor.c:6972
+#: ../clutter/clutter-actor.c:7042
 msgid "Rotation Center Y"
 msgstr "Centro de rotación Y"
 
-#: ../clutter/clutter-actor.c:6973
+#: ../clutter/clutter-actor.c:7043
 msgid "The rotation center on the Y axis"
 msgstr "O centro de rotación no eixo Y"
 
-#: ../clutter/clutter-actor.c:6990
+#: ../clutter/clutter-actor.c:7060
 msgid "Rotation Center Z"
 msgstr "Centro de rotación Z"
 
-#: ../clutter/clutter-actor.c:6991
+#: ../clutter/clutter-actor.c:7061
 msgid "The rotation center on the Z axis"
 msgstr "O centro de rotación no eixo Z"
 
-#: ../clutter/clutter-actor.c:7008
+#: ../clutter/clutter-actor.c:7078
 msgid "Rotation Center Z Gravity"
 msgstr "Gravidade do centro de rotación Z"
 
-#: ../clutter/clutter-actor.c:7009
+#: ../clutter/clutter-actor.c:7079
 msgid "Center point for rotation around the Z axis"
 msgstr "Punto central de rotación arredor do eixo Z"
 
-#: ../clutter/clutter-actor.c:7037
+#: ../clutter/clutter-actor.c:7107
 msgid "Anchor X"
 msgstr "Ancoraxe X"
 
-#: ../clutter/clutter-actor.c:7038
+#: ../clutter/clutter-actor.c:7108
 msgid "X coordinate of the anchor point"
 msgstr "Coordenada X do punto de ancoraxe"
 
-#: ../clutter/clutter-actor.c:7066
+#: ../clutter/clutter-actor.c:7136
 msgid "Anchor Y"
 msgstr "Ancoraxe Y"
 
-#: ../clutter/clutter-actor.c:7067
+#: ../clutter/clutter-actor.c:7137
 msgid "Y coordinate of the anchor point"
 msgstr "Coordenada Y do punto de ancoraxe"
 
-#: ../clutter/clutter-actor.c:7094
+#: ../clutter/clutter-actor.c:7164
 msgid "Anchor Gravity"
 msgstr "Gravidade do ancoraxe"
 
-#: ../clutter/clutter-actor.c:7095
+#: ../clutter/clutter-actor.c:7165
 msgid "The anchor point as a ClutterGravity"
 msgstr "O punto de ancoraxe como ClutterGravity"
 
-#: ../clutter/clutter-actor.c:7114
+#: ../clutter/clutter-actor.c:7184
 msgid "Translation X"
 msgstr "Translación X"
 
-#: ../clutter/clutter-actor.c:7115
+#: ../clutter/clutter-actor.c:7185
 msgid "Translation along the X axis"
 msgstr "Translación no eixo X"
 
-#: ../clutter/clutter-actor.c:7134
+#: ../clutter/clutter-actor.c:7204
 msgid "Translation Y"
 msgstr "Translación Y"
 
-#: ../clutter/clutter-actor.c:7135
+#: ../clutter/clutter-actor.c:7205
 msgid "Translation along the Y axis"
 msgstr "Translación no eixo Y"
 
-#: ../clutter/clutter-actor.c:7154
+#: ../clutter/clutter-actor.c:7224
 msgid "Translation Z"
 msgstr "Translación Z"
 
-#: ../clutter/clutter-actor.c:7155
+#: ../clutter/clutter-actor.c:7225
 msgid "Translation along the Z axis"
 msgstr "Translación no eixo Z"
 
-#: ../clutter/clutter-actor.c:7185
+#: ../clutter/clutter-actor.c:7255
 msgid "Transform"
 msgstr "Transformar"
 
-#: ../clutter/clutter-actor.c:7186
+#: ../clutter/clutter-actor.c:7256
 msgid "Transformation matrix"
 msgstr "Matriz de transformación"
 
-#: ../clutter/clutter-actor.c:7201
+#: ../clutter/clutter-actor.c:7271
 msgid "Transform Set"
 msgstr "Transformar conxunto"
 
-#: ../clutter/clutter-actor.c:7202
+#: ../clutter/clutter-actor.c:7272
 msgid "Whether the transform property is set"
 msgstr "Indica se a propiedade de transformación está estabelecida"
 
-#: ../clutter/clutter-actor.c:7223
+#: ../clutter/clutter-actor.c:7293
 msgid "Child Transform"
 msgstr "Transformar fillo"
 
-#: ../clutter/clutter-actor.c:7224
+#: ../clutter/clutter-actor.c:7294
 msgid "Children transformation matrix"
 msgstr "Matriz de transformación do fillo"
 
-#: ../clutter/clutter-actor.c:7239
+#: ../clutter/clutter-actor.c:7309
 msgid "Child Transform Set"
 msgstr "Transformar fillo estabelecida"
 
-#: ../clutter/clutter-actor.c:7240
+#: ../clutter/clutter-actor.c:7310
 msgid "Whether the child-transform property is set"
 msgstr "Indica se a propiedade de transformación do fillo está estabelecida"
 
-#: ../clutter/clutter-actor.c:7257
+#: ../clutter/clutter-actor.c:7327
 msgid "Show on set parent"
 msgstr "Mostrar no pai do conxunto"
 
-#: ../clutter/clutter-actor.c:7258
+#: ../clutter/clutter-actor.c:7328
 msgid "Whether the actor is shown when parented"
 msgstr "Especifica se o actor se mostra ao seren desenvolvido polo pai"
 
-#: ../clutter/clutter-actor.c:7275
+#: ../clutter/clutter-actor.c:7345
 msgid "Clip to Allocation"
 msgstr "Fragmento de asignación"
 
-#: ../clutter/clutter-actor.c:7276
+#: ../clutter/clutter-actor.c:7346
 msgid "Sets the clip region to track the actor's allocation"
 msgstr "Define a rexión de recorte para rastrexar a asignación do actor"
 
-#: ../clutter/clutter-actor.c:7289
+#: ../clutter/clutter-actor.c:7359
 msgid "Text Direction"
 msgstr "Dirección do texto"
 
-#: ../clutter/clutter-actor.c:7290
+#: ../clutter/clutter-actor.c:7360
 msgid "Direction of the text"
 msgstr "A dirección do texto"
 
-#: ../clutter/clutter-actor.c:7305
+#: ../clutter/clutter-actor.c:7375
 msgid "Has Pointer"
 msgstr "Ten punteiro"
 
-#: ../clutter/clutter-actor.c:7306
+#: ../clutter/clutter-actor.c:7376
 msgid "Whether the actor contains the pointer of an input device"
 msgstr "Cando o actor ten un punteiro dun dispositivo de entrada"
 
-#: ../clutter/clutter-actor.c:7319
+#: ../clutter/clutter-actor.c:7389
 msgid "Actions"
 msgstr "Accións"
 
-#: ../clutter/clutter-actor.c:7320
+#: ../clutter/clutter-actor.c:7390
 msgid "Adds an action to the actor"
 msgstr "Engade unha acción ao actor"
 
-#: ../clutter/clutter-actor.c:7333
+#: ../clutter/clutter-actor.c:7403
 msgid "Constraints"
 msgstr "Restricións"
 
-#: ../clutter/clutter-actor.c:7334
+#: ../clutter/clutter-actor.c:7404
 msgid "Adds a constraint to the actor"
 msgstr "Engade unha restrición ao actor"
 
-#: ../clutter/clutter-actor.c:7347
+#: ../clutter/clutter-actor.c:7417
 msgid "Effect"
 msgstr "Efecto"
 
-#: ../clutter/clutter-actor.c:7348
+#: ../clutter/clutter-actor.c:7418
 msgid "Add an effect to be applied on the actor"
 msgstr "Engade un efecto para aplicato no actor"
 
-#: ../clutter/clutter-actor.c:7362
+#: ../clutter/clutter-actor.c:7432
 msgid "Layout Manager"
 msgstr "Xestor de deseño"
 
-#: ../clutter/clutter-actor.c:7363
+#: ../clutter/clutter-actor.c:7433
 msgid "The object controlling the layout of an actor's children"
 msgstr "O obxecto controlando a disposición dun fillo do autor"
 
-#: ../clutter/clutter-actor.c:7377
+#: ../clutter/clutter-actor.c:7447
 msgid "X Expand"
 msgstr "Expansión X"
 
-#: ../clutter/clutter-actor.c:7378
+#: ../clutter/clutter-actor.c:7448
 msgid "Whether extra horizontal space should be assigned to the actor"
 msgstr "Indica se se debe asignar ao actor o espazo horizontal adicional"
 
-#: ../clutter/clutter-actor.c:7393
+#: ../clutter/clutter-actor.c:7463
 msgid "Y Expand"
 msgstr "Expansión Y"
 
-#: ../clutter/clutter-actor.c:7394
+#: ../clutter/clutter-actor.c:7464
 msgid "Whether extra vertical space should be assigned to the actor"
 msgstr "Indica se se debe asignar ao actor o espazo vertical adicional"
 
-#: ../clutter/clutter-actor.c:7410
+#: ../clutter/clutter-actor.c:7480
 msgid "X Alignment"
 msgstr "Aliñamento X"
 
-#: ../clutter/clutter-actor.c:7411
+#: ../clutter/clutter-actor.c:7481
 msgid "The alignment of the actor on the X axis within its allocation"
 msgstr "O aliñamento do actor no eixo X na súa localización"
 
-#: ../clutter/clutter-actor.c:7426
+#: ../clutter/clutter-actor.c:7496
 msgid "Y Alignment"
 msgstr "Aliñamento Y"
 
-#: ../clutter/clutter-actor.c:7427
+#: ../clutter/clutter-actor.c:7497
 msgid "The alignment of the actor on the Y axis within its allocation"
 msgstr "O aliñamento do actor no eixo Y na súa localización"
 
-#: ../clutter/clutter-actor.c:7446
+#: ../clutter/clutter-actor.c:7516
 msgid "Margin Top"
 msgstr "Marxe superior"
 
-#: ../clutter/clutter-actor.c:7447
+#: ../clutter/clutter-actor.c:7517
 msgid "Extra space at the top"
 msgstr "Espazo superior adicionar"
 
-#: ../clutter/clutter-actor.c:7468
+#: ../clutter/clutter-actor.c:7538
 msgid "Margin Bottom"
 msgstr "Marxe inferior"
 
-#: ../clutter/clutter-actor.c:7469
+#: ../clutter/clutter-actor.c:7539
 msgid "Extra space at the bottom"
 msgstr "Espazo inferior adicional"
 
-#: ../clutter/clutter-actor.c:7490
+#: ../clutter/clutter-actor.c:7560
 msgid "Margin Left"
 msgstr "Marxe esquerdo"
 
-#: ../clutter/clutter-actor.c:7491
+#: ../clutter/clutter-actor.c:7561
 msgid "Extra space at the left"
 msgstr "Espazo adicional á esquerda"
 
-#: ../clutter/clutter-actor.c:7512
+#: ../clutter/clutter-actor.c:7582
 msgid "Margin Right"
 msgstr "Marxe dereito"
 
-#: ../clutter/clutter-actor.c:7513
+#: ../clutter/clutter-actor.c:7583
 msgid "Extra space at the right"
 msgstr "Espazo adicional á dereita"
 
-#: ../clutter/clutter-actor.c:7529
+#: ../clutter/clutter-actor.c:7599
 msgid "Background Color Set"
 msgstr "Conxunto de cor de fondo"
 
-#: ../clutter/clutter-actor.c:7530 ../clutter/deprecated/clutter-box.c:275
+#: ../clutter/clutter-actor.c:7600 ../clutter/deprecated/clutter-box.c:271
 msgid "Whether the background color is set"
 msgstr "Cando se estabelece a cor de fondo"
 
-#: ../clutter/clutter-actor.c:7546
+#: ../clutter/clutter-actor.c:7616
 msgid "Background color"
 msgstr "Cor de fondo"
 
-#: ../clutter/clutter-actor.c:7547
+#: ../clutter/clutter-actor.c:7617
 msgid "The actor's background color"
 msgstr "Cor de fondo do actor"
 
-#: ../clutter/clutter-actor.c:7562
+#: ../clutter/clutter-actor.c:7632
 msgid "First Child"
 msgstr "Primeiro fill"
 
-#: ../clutter/clutter-actor.c:7563
+#: ../clutter/clutter-actor.c:7633
 msgid "The actor's first child"
 msgstr "O primeiro fillo do actor"
 
-#: ../clutter/clutter-actor.c:7576
+#: ../clutter/clutter-actor.c:7646
 msgid "Last Child"
 msgstr "Último fillo"
 
-#: ../clutter/clutter-actor.c:7577
+#: ../clutter/clutter-actor.c:7647
 msgid "The actor's last child"
 msgstr "O último fillo do actor"
 
-#: ../clutter/clutter-actor.c:7591
+#: ../clutter/clutter-actor.c:7661
 msgid "Content"
 msgstr "Contido"
 
-#: ../clutter/clutter-actor.c:7592
+#: ../clutter/clutter-actor.c:7662
 msgid "Delegate object for painting the actor's content"
 msgstr "Delegar obxecto para pintar o contido do actor"
 
-#: ../clutter/clutter-actor.c:7617
+#: ../clutter/clutter-actor.c:7687
 msgid "Content Gravity"
 msgstr "Gravidade do contido"
 
-#: ../clutter/clutter-actor.c:7618
+#: ../clutter/clutter-actor.c:7688
 msgid "Alignment of the actor's content"
 msgstr "Aliñamento do contido do actor"
 
-#: ../clutter/clutter-actor.c:7638
+#: ../clutter/clutter-actor.c:7708
 msgid "Content Box"
 msgstr "CAixa de contido"
 
-#: ../clutter/clutter-actor.c:7639
+#: ../clutter/clutter-actor.c:7709
 msgid "The bounding box of the actor's content"
 msgstr "A caixa que rodea ao contido do autor"
 
-#: ../clutter/clutter-actor.c:7647
+#: ../clutter/clutter-actor.c:7717
 msgid "Minification Filter"
 msgstr "Filtro de redución"
 
-#: ../clutter/clutter-actor.c:7648
+#: ../clutter/clutter-actor.c:7718
 msgid "The filter used when reducing the size of the content"
 msgstr "O filtro usado ao reducir o tamaño do contido"
 
-#: ../clutter/clutter-actor.c:7655
+#: ../clutter/clutter-actor.c:7725
 msgid "Magnification Filter"
 msgstr "Filtro de ampliación"
 
-#: ../clutter/clutter-actor.c:7656
+#: ../clutter/clutter-actor.c:7726
 msgid "The filter used when increasing the size of the content"
 msgstr "O filtro usado ao aumentar o tamaño do contido"
 
-#: ../clutter/clutter-actor.c:7670
+#: ../clutter/clutter-actor.c:7740
 msgid "Content Repeat"
 msgstr "Repetición de contido"
 
-#: ../clutter/clutter-actor.c:7671
+#: ../clutter/clutter-actor.c:7741
 msgid "The repeat policy for the actor's content"
 msgstr "A normativa de repetición para o contido do actor"
 
-#: ../clutter/clutter-actor-meta.c:193 ../clutter/clutter-child-meta.c:142
+#: ../clutter/clutter-actor-meta.c:191 ../clutter/clutter-child-meta.c:142
 msgid "Actor"
 msgstr "Actor"
 
-#: ../clutter/clutter-actor-meta.c:194
+#: ../clutter/clutter-actor-meta.c:192
 msgid "The actor attached to the meta"
 msgstr "O actor axuntado ao destino"
 
-#: ../clutter/clutter-actor-meta.c:208
+#: ../clutter/clutter-actor-meta.c:206
 msgid "The name of the meta"
 msgstr "O nome do destino"
 
-#: ../clutter/clutter-actor-meta.c:221 ../clutter/clutter-input-device.c:337
-#: ../clutter/deprecated/clutter-shader.c:313
+#: ../clutter/clutter-actor-meta.c:219 ../clutter/clutter-input-device.c:326
+#: ../clutter/deprecated/clutter-shader.c:309
 msgid "Enabled"
 msgstr "Activado"
 
-#: ../clutter/clutter-actor-meta.c:222
+#: ../clutter/clutter-actor-meta.c:220
 msgid "Whether the meta is enabled"
 msgstr "Cando o destino está activado"
 
 #: ../clutter/clutter-align-constraint.c:279
-#: ../clutter/clutter-bind-constraint.c:358 ../clutter/clutter-clone.c:345
+#: ../clutter/clutter-bind-constraint.c:358 ../clutter/clutter-clone.c:341
 #: ../clutter/clutter-snap-constraint.c:321
 msgid "Source"
 msgstr "Orixe"
@@ -733,11 +733,11 @@ msgstr "Factor"
 msgid "The alignment factor, between 0.0 and 1.0"
 msgstr "Factor de aliñamento, entre 0,0 e 1,0"
 
-#: ../clutter/clutter-backend.c:379
+#: ../clutter/clutter-backend.c:380
 msgid "Unable to initialize the Clutter backend"
 msgstr "Non foi posíbel inicializar a infraestrutura de Clutter"
 
-#: ../clutter/clutter-backend.c:453
+#: ../clutter/clutter-backend.c:454
 #, c-format
 msgid "The backend of type '%s' does not support creating multiple stages"
 msgstr "A infraestrutura do tipo «%s» non permite crear múltiples escenarios"
@@ -768,46 +768,50 @@ msgstr "O desprazamento en píxeles que aplicar á ligazón"
 msgid "The unique name of the binding pool"
 msgstr "O nome único da ligazón da agrupación"
 
-#: ../clutter/clutter-bin-layout.c:240 ../clutter/clutter-bin-layout.c:655
-#: ../clutter/clutter-box-layout.c:390 ../clutter/clutter-table-layout.c:610
+#: ../clutter/clutter-bin-layout.c:238 ../clutter/clutter-bin-layout.c:651
+#: ../clutter/clutter-box-layout.c:388
+#: ../clutter/deprecated/clutter-table-layout.c:610
 msgid "Horizontal Alignment"
 msgstr "Aliñamento horizontal"
 
-#: ../clutter/clutter-bin-layout.c:241
+#: ../clutter/clutter-bin-layout.c:239
 msgid "Horizontal alignment for the actor inside the layout manager"
 msgstr "Aliñamento horizontal do actor no xestor de deseño"
 
-#: ../clutter/clutter-bin-layout.c:249 ../clutter/clutter-bin-layout.c:675
-#: ../clutter/clutter-box-layout.c:399 ../clutter/clutter-table-layout.c:625
+#: ../clutter/clutter-bin-layout.c:247 ../clutter/clutter-bin-layout.c:671
+#: ../clutter/clutter-box-layout.c:397
+#: ../clutter/deprecated/clutter-table-layout.c:625
 msgid "Vertical Alignment"
 msgstr "Aliñamento vertical"
 
-#: ../clutter/clutter-bin-layout.c:250
+#: ../clutter/clutter-bin-layout.c:248
 msgid "Vertical alignment for the actor inside the layout manager"
 msgstr "Aliñamento vertical do actor no xestor de deseño"
 
-#: ../clutter/clutter-bin-layout.c:656
+#: ../clutter/clutter-bin-layout.c:652
 msgid "Default horizontal alignment for the actors inside the layout manager"
 msgstr ""
 "Aliñamento horizontal predeterminado para os actores no xestor de deseño"
 
-#: ../clutter/clutter-bin-layout.c:676
+#: ../clutter/clutter-bin-layout.c:672
 msgid "Default vertical alignment for the actors inside the layout manager"
 msgstr "Aliñamento vertical predeterminado para os actores no xestor de deseño"
 
-#: ../clutter/clutter-box-layout.c:365
+#: ../clutter/clutter-box-layout.c:363
 msgid "Expand"
 msgstr "Expandir"
 
-#: ../clutter/clutter-box-layout.c:366
+#: ../clutter/clutter-box-layout.c:364
 msgid "Allocate extra space for the child"
 msgstr "Asignar espazo extra para o fillo"
 
-#: ../clutter/clutter-box-layout.c:372 ../clutter/clutter-table-layout.c:589
+#: ../clutter/clutter-box-layout.c:370
+#: ../clutter/deprecated/clutter-table-layout.c:589
 msgid "Horizontal Fill"
 msgstr "Recheo horizontal"
 
-#: ../clutter/clutter-box-layout.c:373 ../clutter/clutter-table-layout.c:590
+#: ../clutter/clutter-box-layout.c:371
+#: ../clutter/deprecated/clutter-table-layout.c:590
 msgid ""
 "Whether the child should receive priority when the container is allocating "
 "spare space on the horizontal axis"
@@ -815,11 +819,13 @@ msgstr ""
 "Se o fillo debe recibir prioridade cando o contedor está asignado ao espazo "
 "libre no eixo horizontal"
 
-#: ../clutter/clutter-box-layout.c:381 ../clutter/clutter-table-layout.c:596
+#: ../clutter/clutter-box-layout.c:379
+#: ../clutter/deprecated/clutter-table-layout.c:596
 msgid "Vertical Fill"
 msgstr "Recheo vertical"
 
-#: ../clutter/clutter-box-layout.c:382 ../clutter/clutter-table-layout.c:597
+#: ../clutter/clutter-box-layout.c:380
+#: ../clutter/deprecated/clutter-table-layout.c:597
 msgid ""
 "Whether the child should receive priority when the container is allocating "
 "spare space on the vertical axis"
@@ -827,80 +833,88 @@ msgstr ""
 "Se o fillo debe recibir prioridade cando o contedor está asignado ao espazo "
 "libre no eixo vertical"
 
-#: ../clutter/clutter-box-layout.c:391 ../clutter/clutter-table-layout.c:611
+#: ../clutter/clutter-box-layout.c:389
+#: ../clutter/deprecated/clutter-table-layout.c:611
 msgid "Horizontal alignment of the actor within the cell"
 msgstr "Aliñamento horizontal do actor dentro da cela"
 
-#: ../clutter/clutter-box-layout.c:400 ../clutter/clutter-table-layout.c:626
+#: ../clutter/clutter-box-layout.c:398
+#: ../clutter/deprecated/clutter-table-layout.c:626
 msgid "Vertical alignment of the actor within the cell"
 msgstr "Aliñamento vertical do actor dentro da cela"
 
-#: ../clutter/clutter-box-layout.c:1365
+#: ../clutter/clutter-box-layout.c:1359
 msgid "Vertical"
 msgstr "Vertical"
 
-#: ../clutter/clutter-box-layout.c:1366
+#: ../clutter/clutter-box-layout.c:1360
 msgid "Whether the layout should be vertical, rather than horizontal"
 msgstr "Cando o deseño debe ser vertical ou quizais horizontal"
 
-#: ../clutter/clutter-box-layout.c:1383 ../clutter/clutter-flow-layout.c:890
-#: ../clutter/clutter-grid-layout.c:1550
+#: ../clutter/clutter-box-layout.c:1377 ../clutter/clutter-flow-layout.c:942
+#: ../clutter/clutter-grid-layout.c:1549
 msgid "Orientation"
 msgstr "Orientación"
 
-#: ../clutter/clutter-box-layout.c:1384 ../clutter/clutter-flow-layout.c:891
-#: ../clutter/clutter-grid-layout.c:1551
+#: ../clutter/clutter-box-layout.c:1378 ../clutter/clutter-flow-layout.c:943
+#: ../clutter/clutter-grid-layout.c:1550
 msgid "The orientation of the layout"
 msgstr "A orientación do deseño"
 
-#: ../clutter/clutter-box-layout.c:1400 ../clutter/clutter-flow-layout.c:906
+#: ../clutter/clutter-box-layout.c:1394 ../clutter/clutter-flow-layout.c:958
 msgid "Homogeneous"
 msgstr "Homoxéneo"
 
-#: ../clutter/clutter-box-layout.c:1401
+#: ../clutter/clutter-box-layout.c:1395
 msgid ""
 "Whether the layout should be homogeneous, i.e. all childs get the same size"
 msgstr ""
 "Cando o deseño debe ser homoxéneo, p.ex. todos os fillos deben obter o mesmo "
 "tamaño"
 
-#: ../clutter/clutter-box-layout.c:1416
+#: ../clutter/clutter-box-layout.c:1410
 msgid "Pack Start"
 msgstr "Agrupamento inicial"
 
-#: ../clutter/clutter-box-layout.c:1417
+#: ../clutter/clutter-box-layout.c:1411
 msgid "Whether to pack items at the start of the box"
 msgstr "Cando se agrupan os elementos no inicio da caixa"
 
-#: ../clutter/clutter-box-layout.c:1430
+#: ../clutter/clutter-box-layout.c:1424
 msgid "Spacing"
 msgstr "Espazado"
 
-#: ../clutter/clutter-box-layout.c:1431
+#: ../clutter/clutter-box-layout.c:1425
 msgid "Spacing between children"
 msgstr "Espazamento entre os fillos"
 
-#: ../clutter/clutter-box-layout.c:1448 ../clutter/clutter-table-layout.c:1675
+#: ../clutter/clutter-box-layout.c:1442
+#: ../clutter/deprecated/clutter-table-layout.c:1677
 msgid "Use Animations"
 msgstr "Usar animacións"
 
-#: ../clutter/clutter-box-layout.c:1449 ../clutter/clutter-table-layout.c:1676
+#: ../clutter/clutter-box-layout.c:1443
+#: ../clutter/deprecated/clutter-table-layout.c:1678
 msgid "Whether layout changes should be animated"
 msgstr "Cando os cambios no deseño deben ser animados"
 
-#: ../clutter/clutter-box-layout.c:1473 ../clutter/clutter-table-layout.c:1700
+#: ../clutter/clutter-box-layout.c:1467
+#: ../clutter/deprecated/clutter-table-layout.c:1702
 msgid "Easing Mode"
 msgstr "Modo relaxado"
 
-#: ../clutter/clutter-box-layout.c:1474 ../clutter/clutter-table-layout.c:1701
+#: ../clutter/clutter-box-layout.c:1468
+#: ../clutter/deprecated/clutter-table-layout.c:1703
 msgid "The easing mode of the animations"
 msgstr "O modo relaxado nas animacións"
 
-#: ../clutter/clutter-box-layout.c:1494 ../clutter/clutter-table-layout.c:1721
+#: ../clutter/clutter-box-layout.c:1488
+#: ../clutter/deprecated/clutter-table-layout.c:1723
 msgid "Easing Duration"
 msgstr "Duración do relaxamento"
 
-#: ../clutter/clutter-box-layout.c:1495 ../clutter/clutter-table-layout.c:1722
+#: ../clutter/clutter-box-layout.c:1489
+#: ../clutter/deprecated/clutter-table-layout.c:1724
 msgid "The duration of the animations"
 msgstr "A duración das animacións"
 
@@ -920,14 +934,30 @@ msgstr "Contraste"
 msgid "The contrast change to apply"
 msgstr "O cambio de contraste que aplicar"
 
-#: ../clutter/clutter-canvas.c:216
+#: ../clutter/clutter-canvas.c:248
 msgid "The width of the canvas"
 msgstr "O ancho do lenzo"
 
-#: ../clutter/clutter-canvas.c:232
+#: ../clutter/clutter-canvas.c:264
 msgid "The height of the canvas"
 msgstr "O alto do lenzo"
 
+#: ../clutter/clutter-canvas.c:283
+msgid "Scale Factor Set"
+msgstr "Estabelecer o factor de escala"
+
+#: ../clutter/clutter-canvas.c:284
+msgid "Whether the scale-factor property is set"
+msgstr "Indica se a propiedade de scale-factor está estabelecida"
+
+#: ../clutter/clutter-canvas.c:305
+msgid "Scale Factor"
+msgstr "Factor de escala"
+
+#: ../clutter/clutter-canvas.c:306
+msgid "The scaling factor for the surface"
+msgstr "O factor de escala da superficie"
+
 #: ../clutter/clutter-child-meta.c:127
 msgid "Container"
 msgstr "Contedor"
@@ -940,39 +970,39 @@ msgstr "Contedor que creou estes datos"
 msgid "The actor wrapped by this data"
 msgstr "O actor envolvido con estes datos"
 
-#: ../clutter/clutter-click-action.c:559
+#: ../clutter/clutter-click-action.c:586
 msgid "Pressed"
 msgstr "Premido"
 
-#: ../clutter/clutter-click-action.c:560
+#: ../clutter/clutter-click-action.c:587
 msgid "Whether the clickable should be in pressed state"
 msgstr "Cando o clic debe estar premido"
 
-#: ../clutter/clutter-click-action.c:573
+#: ../clutter/clutter-click-action.c:600
 msgid "Held"
 msgstr "Retido"
 
-#: ../clutter/clutter-click-action.c:574
+#: ../clutter/clutter-click-action.c:601
 msgid "Whether the clickable has a grab"
 msgstr "Cando o clic ten un tirador"
 
-#: ../clutter/clutter-click-action.c:591 ../clutter/clutter-settings.c:599
+#: ../clutter/clutter-click-action.c:618 ../clutter/clutter-settings.c:653
 msgid "Long Press Duration"
 msgstr "Duración da pulsación longa"
 
-#: ../clutter/clutter-click-action.c:592
+#: ../clutter/clutter-click-action.c:619
 msgid "The minimum duration of a long press to recognize the gesture"
 msgstr "A duración mínima dunha pulsación longa para recoñecer o xesto"
 
-#: ../clutter/clutter-click-action.c:610
+#: ../clutter/clutter-click-action.c:637
 msgid "Long Press Threshold"
 msgstr "Límite da pulsación longa"
 
-#: ../clutter/clutter-click-action.c:611
+#: ../clutter/clutter-click-action.c:638
 msgid "The maximum threshold before a long press is cancelled"
 msgstr "O límite máximo antes de cancelar unha pulsación longa"
 
-#: ../clutter/clutter-clone.c:346
+#: ../clutter/clutter-clone.c:342
 msgid "Specifies the actor to be cloned"
 msgstr "Especifica o actor que clonar"
 
@@ -984,27 +1014,27 @@ msgstr "Matiz"
 msgid "The tint to apply"
 msgstr "O matiz que aplicar"
 
-#: ../clutter/clutter-deform-effect.c:588
+#: ../clutter/clutter-deform-effect.c:592
 msgid "Horizontal Tiles"
 msgstr "Teselas horizontais"
 
-#: ../clutter/clutter-deform-effect.c:589
+#: ../clutter/clutter-deform-effect.c:593
 msgid "The number of horizontal tiles"
 msgstr "O número de teselas en horizontal"
 
-#: ../clutter/clutter-deform-effect.c:604
+#: ../clutter/clutter-deform-effect.c:608
 msgid "Vertical Tiles"
 msgstr "Teselas verticais"
 
-#: ../clutter/clutter-deform-effect.c:605
+#: ../clutter/clutter-deform-effect.c:609
 msgid "The number of vertical tiles"
 msgstr "O número de teselas en vertical"
 
-#: ../clutter/clutter-deform-effect.c:622
+#: ../clutter/clutter-deform-effect.c:626
 msgid "Back Material"
 msgstr "Material da traseira"
 
-#: ../clutter/clutter-deform-effect.c:623
+#: ../clutter/clutter-deform-effect.c:627
 msgid "The material to be used when painting the back of the actor"
 msgstr "O material que se emprega ao pintar a parte posterior del actor"
 
@@ -1012,258 +1042,296 @@ msgstr "O material que se emprega ao pintar a parte posterior del actor"
 msgid "The desaturation factor"
 msgstr "O factor de desaturación"
 
-#: ../clutter/clutter-device-manager.c:131
-#: ../clutter/clutter-input-device.c:366
-#: ../clutter/x11/clutter-keymap-x11.c:316
+#: ../clutter/clutter-device-manager.c:127
+#: ../clutter/clutter-input-device.c:355
+#: ../clutter/x11/clutter-keymap-x11.c:321
 msgid "Backend"
 msgstr "Infraestrutura"
 
-#: ../clutter/clutter-device-manager.c:132
+#: ../clutter/clutter-device-manager.c:128
 msgid "The ClutterBackend of the device manager"
 msgstr "O ClutterBackend do xestor de dispositivos"
 
-#: ../clutter/clutter-drag-action.c:742
+#: ../clutter/clutter-drag-action.c:741
 msgid "Horizontal Drag Threshold"
 msgstr "Limiar horizontal de arrastre"
 
-#: ../clutter/clutter-drag-action.c:743
+#: ../clutter/clutter-drag-action.c:742
 msgid "The horizontal amount of pixels required to start dragging"
 msgstr "A cantidade de píxeles horizontais necesarios para comezar a arrastrar"
 
-#: ../clutter/clutter-drag-action.c:770
+#: ../clutter/clutter-drag-action.c:769
 msgid "Vertical Drag Threshold"
 msgstr "Limiar vertical de arrastre"
 
-#: ../clutter/clutter-drag-action.c:771
+#: ../clutter/clutter-drag-action.c:770
 msgid "The vertical amount of pixels required to start dragging"
 msgstr "A cantidade de píxeles verticais necesarios para comezar a arrastrar"
 
-#: ../clutter/clutter-drag-action.c:792
+#: ../clutter/clutter-drag-action.c:791
 msgid "Drag Handle"
 msgstr "Arrastrar o tirador"
 
-#: ../clutter/clutter-drag-action.c:793
+#: ../clutter/clutter-drag-action.c:792
 msgid "The actor that is being dragged"
 msgstr "O actor que se está a arrastrar"
 
-#: ../clutter/clutter-drag-action.c:806
+#: ../clutter/clutter-drag-action.c:805
 msgid "Drag Axis"
 msgstr "Eixo de arrastre"
 
-#: ../clutter/clutter-drag-action.c:807
+#: ../clutter/clutter-drag-action.c:806
 msgid "Constraints the dragging to an axis"
 msgstr "Restrinxe o arrastre a un eixe"
 
-#: ../clutter/clutter-drag-action.c:823
+#: ../clutter/clutter-drag-action.c:822
 msgid "Drag Area"
 msgstr "Área de arrastre"
 
-#: ../clutter/clutter-drag-action.c:824
+#: ../clutter/clutter-drag-action.c:823
 msgid "Constrains the dragging to a rectangle"
 msgstr "Restrinxe o arrastre a un rectángulo"
 
-#: ../clutter/clutter-drag-action.c:837
+#: ../clutter/clutter-drag-action.c:836
 msgid "Drag Area Set"
 msgstr "Área de arrastre definida"
 
-#: ../clutter/clutter-drag-action.c:838
+#: ../clutter/clutter-drag-action.c:837
 msgid "Whether the drag area is set"
 msgstr "Indica se se definiu a área de arrastre"
 
-#: ../clutter/clutter-flow-layout.c:907
+#: ../clutter/clutter-flow-layout.c:959
 msgid "Whether each item should receive the same allocation"
 msgstr "Cando cada elemento debe recibir a mesma asignación"
 
-#: ../clutter/clutter-flow-layout.c:922 ../clutter/clutter-table-layout.c:1637
+#: ../clutter/clutter-flow-layout.c:974
+#: ../clutter/deprecated/clutter-table-layout.c:1637
 msgid "Column Spacing"
 msgstr "Espazamento de columnas"
 
-#: ../clutter/clutter-flow-layout.c:923
+#: ../clutter/clutter-flow-layout.c:975
 msgid "The spacing between columns"
 msgstr "O espazo entre columnas"
 
-#: ../clutter/clutter-flow-layout.c:939 ../clutter/clutter-table-layout.c:1651
+#: ../clutter/clutter-flow-layout.c:991
+#: ../clutter/deprecated/clutter-table-layout.c:1653
 msgid "Row Spacing"
 msgstr "Espazamento de filas"
 
-#: ../clutter/clutter-flow-layout.c:940
+#: ../clutter/clutter-flow-layout.c:992
 msgid "The spacing between rows"
 msgstr "O espazo entre filas"
 
-#: ../clutter/clutter-flow-layout.c:954
+#: ../clutter/clutter-flow-layout.c:1006
 msgid "Minimum Column Width"
 msgstr "Largura mínima de columna"
 
-#: ../clutter/clutter-flow-layout.c:955
+#: ../clutter/clutter-flow-layout.c:1007
 msgid "Minimum width for each column"
 msgstr "A largura mínima para cada columna"
 
-#: ../clutter/clutter-flow-layout.c:970
+#: ../clutter/clutter-flow-layout.c:1022
 msgid "Maximum Column Width"
 msgstr "Largura máxima de columna"
 
-#: ../clutter/clutter-flow-layout.c:971
+#: ../clutter/clutter-flow-layout.c:1023
 msgid "Maximum width for each column"
 msgstr "A largura máxima para cada columna"
 
-#: ../clutter/clutter-flow-layout.c:985
+#: ../clutter/clutter-flow-layout.c:1037
 msgid "Minimum Row Height"
 msgstr "Altura mínima de fila"
 
-#: ../clutter/clutter-flow-layout.c:986
+#: ../clutter/clutter-flow-layout.c:1038
 msgid "Minimum height for each row"
 msgstr "A altura mínima de cada fila"
 
-#: ../clutter/clutter-flow-layout.c:1001
+#: ../clutter/clutter-flow-layout.c:1053
 msgid "Maximum Row Height"
 msgstr "Altura máxima de fila"
 
-#: ../clutter/clutter-flow-layout.c:1002
+#: ../clutter/clutter-flow-layout.c:1054
 msgid "Maximum height for each row"
 msgstr "A altura máxima de cada fila"
 
-#: ../clutter/clutter-grid-layout.c:1222
+#: ../clutter/clutter-flow-layout.c:1069 ../clutter/clutter-flow-layout.c:1070
+msgid "Snap to grid"
+msgstr "Axustar á grella"
+
+#: ../clutter/clutter-gesture-action.c:668
+msgid "Number touch points"
+msgstr "Número de puntos táctiles"
+
+#: ../clutter/clutter-gesture-action.c:669
+msgid "Number of touch points"
+msgstr "Número de puntos táctiles"
+
+#: ../clutter/clutter-gesture-action.c:684
+msgid "Threshold Trigger Edge"
+msgstr "Bordo do limiar de disparo"
+
+#: ../clutter/clutter-gesture-action.c:685
+msgid "The trigger edge used by the action"
+msgstr "O bordo de disparo usado pola acción"
+
+#: ../clutter/clutter-gesture-action.c:704
+msgid "Threshold Trigger Horizontal Distance"
+msgstr "Distancia do horizontal do disparador do limiar"
+
+#: ../clutter/clutter-gesture-action.c:705
+msgid "The horizontal trigger distance used by the action"
+msgstr "O bordo do disparador usado pola acción"
+
+#: ../clutter/clutter-gesture-action.c:723
+msgid "Threshold Trigger Vertical Distance"
+msgstr "Distancia horizontal do disparador do humbral"
+
+#: ../clutter/clutter-gesture-action.c:724
+msgid "The vertical trigger distance used by the action"
+msgstr "A distancia vertical do disparador usado pola acción"
+
+#: ../clutter/clutter-grid-layout.c:1223
 msgid "Left attachment"
 msgstr "Anexo á esquerda"
 
-#: ../clutter/clutter-grid-layout.c:1223
+#: ../clutter/clutter-grid-layout.c:1224
 msgid "The column number to attach the left side of the child to"
 msgstr "A cantidade de columnas para anexar ao lado esquerdo do fillo"
 
-#: ../clutter/clutter-grid-layout.c:1230
+#: ../clutter/clutter-grid-layout.c:1231
 msgid "Top attachment"
 msgstr "Anexo superior"
 
-#: ../clutter/clutter-grid-layout.c:1231
+#: ../clutter/clutter-grid-layout.c:1232
 msgid "The row number to attach the top side of a child widget to"
 msgstr "O número de filas para anexar na parte superior do widget fillo"
 
-#: ../clutter/clutter-grid-layout.c:1239
+#: ../clutter/clutter-grid-layout.c:1240
 msgid "The number of columns that a child spans"
 msgstr "O número de columnas nas que se expande un fillo"
 
-#: ../clutter/clutter-grid-layout.c:1246
+#: ../clutter/clutter-grid-layout.c:1247
 msgid "The number of rows that a child spans"
 msgstr "O número de filas nas que un fillo se expande"
 
-#: ../clutter/clutter-grid-layout.c:1565
+#: ../clutter/clutter-grid-layout.c:1564
 msgid "Row spacing"
 msgstr "Espazamento de fila"
 
-#: ../clutter/clutter-grid-layout.c:1566
+#: ../clutter/clutter-grid-layout.c:1565
 msgid "The amount of space between two consecutive rows"
 msgstr "A cantidade de espazo entre dúas filas consecutivas"
 
-#: ../clutter/clutter-grid-layout.c:1579
+#: ../clutter/clutter-grid-layout.c:1578
 msgid "Column spacing"
 msgstr "Espazamento de columna"
 
-#: ../clutter/clutter-grid-layout.c:1580
+#: ../clutter/clutter-grid-layout.c:1579
 msgid "The amount of space between two consecutive columns"
 msgstr "A cantidade de espazo entre dúas columnas consecutivas"
 
-#: ../clutter/clutter-grid-layout.c:1594
+#: ../clutter/clutter-grid-layout.c:1593
 msgid "Row Homogeneous"
 msgstr "Fila homoxénea"
 
-#: ../clutter/clutter-grid-layout.c:1595
+#: ../clutter/clutter-grid-layout.c:1594
 msgid "If TRUE, the rows are all the same height"
 msgstr "Se é TRUE, todas as filas teñen a mesma altura"
 
-#: ../clutter/clutter-grid-layout.c:1608
+#: ../clutter/clutter-grid-layout.c:1607
 msgid "Column Homogeneous"
 msgstr "Columnas homoxéneas"
 
-#: ../clutter/clutter-grid-layout.c:1609
+#: ../clutter/clutter-grid-layout.c:1608
 msgid "If TRUE, the columns are all the same width"
 msgstr "Se é TRUE, todas as columnas teñen a mesma largura"
 
-#: ../clutter/clutter-image.c:248 ../clutter/clutter-image.c:311
-#: ../clutter/clutter-image.c:399
+#: ../clutter/clutter-image.c:249 ../clutter/clutter-image.c:312
+#: ../clutter/clutter-image.c:400
 msgid "Unable to load image data"
 msgstr "Non foi posíbel cargar os datos da imaxe"
 
-#: ../clutter/clutter-input-device.c:242
+#: ../clutter/clutter-input-device.c:231
 msgid "Id"
 msgstr "ID"
 
-#: ../clutter/clutter-input-device.c:243
+#: ../clutter/clutter-input-device.c:232
 msgid "Unique identifier of the device"
 msgstr "Identificador único do dispositivo"
 
-#: ../clutter/clutter-input-device.c:259
+#: ../clutter/clutter-input-device.c:248
 msgid "The name of the device"
 msgstr "O nome do dispositivo"
 
-#: ../clutter/clutter-input-device.c:273
+#: ../clutter/clutter-input-device.c:262
 msgid "Device Type"
 msgstr "Tipo do dispositivo"
 
-#: ../clutter/clutter-input-device.c:274
+#: ../clutter/clutter-input-device.c:263
 msgid "The type of the device"
 msgstr "O tipo do dispositivo"
 
-#: ../clutter/clutter-input-device.c:289
+#: ../clutter/clutter-input-device.c:278
 msgid "Device Manager"
 msgstr "Xestor de dispositivos"
 
-#: ../clutter/clutter-input-device.c:290
+#: ../clutter/clutter-input-device.c:279
 msgid "The device manager instance"
 msgstr "A instancia do xestor de dispositivos"
 
-#: ../clutter/clutter-input-device.c:303
+#: ../clutter/clutter-input-device.c:292
 msgid "Device Mode"
 msgstr "Modo de dispositivo"
 
-#: ../clutter/clutter-input-device.c:304
+#: ../clutter/clutter-input-device.c:293
 msgid "The mode of the device"
 msgstr "O modo do dispositivo"
 
-#: ../clutter/clutter-input-device.c:318
+#: ../clutter/clutter-input-device.c:307
 msgid "Has Cursor"
 msgstr "Ten cursor"
 
-#: ../clutter/clutter-input-device.c:319
+#: ../clutter/clutter-input-device.c:308
 msgid "Whether the device has a cursor"
 msgstr "Indica se o dispositivo ten un cursor"
 
-#: ../clutter/clutter-input-device.c:338
+#: ../clutter/clutter-input-device.c:327
 msgid "Whether the device is enabled"
 msgstr "Indica se o dispositivo está activado"
 
-#: ../clutter/clutter-input-device.c:351
+#: ../clutter/clutter-input-device.c:340
 msgid "Number of Axes"
 msgstr "Número de eixos"
 
-#: ../clutter/clutter-input-device.c:352
+#: ../clutter/clutter-input-device.c:341
 msgid "The number of axes on the device"
 msgstr "O número de eixos no dispositivo"
 
-#: ../clutter/clutter-input-device.c:367
+#: ../clutter/clutter-input-device.c:356
 msgid "The backend instance"
 msgstr "A instancia da infraestrutura"
 
-#: ../clutter/clutter-interval.c:506
+#: ../clutter/clutter-interval.c:553
 msgid "Value Type"
 msgstr "Tipo de valor"
 
-#: ../clutter/clutter-interval.c:507
+#: ../clutter/clutter-interval.c:554
 msgid "The type of the values in the interval"
 msgstr "O tipo dos valores no intervalo"
 
-#: ../clutter/clutter-interval.c:522
+#: ../clutter/clutter-interval.c:569
 msgid "Initial Value"
 msgstr "Valor inicial"
 
-#: ../clutter/clutter-interval.c:523
+#: ../clutter/clutter-interval.c:570
 msgid "Initial value of the interval"
 msgstr "O valor inicial do intervalo"
 
-#: ../clutter/clutter-interval.c:537
+#: ../clutter/clutter-interval.c:584
 msgid "Final Value"
 msgstr "Valor final"
 
-#: ../clutter/clutter-interval.c:538
+#: ../clutter/clutter-interval.c:585
 msgid "Final value of the interval"
 msgstr "O valor final do intervalo"
 
@@ -1282,96 +1350,96 @@ msgstr "O xestor que creou estes datos"
 #. * Do NOT translate it to non-English e.g. "predefinito:LTR"! If
 #. * it isn't default:LTR or default:RTL it will not work.
 #.
-#: ../clutter/clutter-main.c:772
+#: ../clutter/clutter-main.c:795
 msgid "default:LTR"
 msgstr "default:LTR"
 
-#: ../clutter/clutter-main.c:1646
+#: ../clutter/clutter-main.c:1622
 msgid "Show frames per second"
 msgstr "Mostrar cadros por segundo"
 
-#: ../clutter/clutter-main.c:1648
+#: ../clutter/clutter-main.c:1624
 msgid "Default frame rate"
 msgstr "Taxa predeterminada de cadros"
 
-#: ../clutter/clutter-main.c:1650
+#: ../clutter/clutter-main.c:1626
 msgid "Make all warnings fatal"
 msgstr "Facer que todos os avisos sexan fatais"
 
-#: ../clutter/clutter-main.c:1653
+#: ../clutter/clutter-main.c:1629
 msgid "Direction for the text"
 msgstr "Dirección para o texto"
 
-#: ../clutter/clutter-main.c:1656
+#: ../clutter/clutter-main.c:1632
 msgid "Disable mipmapping on text"
 msgstr "Desactivar mipmapping no texto"
 
-#: ../clutter/clutter-main.c:1659
+#: ../clutter/clutter-main.c:1635
 msgid "Use 'fuzzy' picking"
 msgstr "Usar recolección «difusa»"
 
-#: ../clutter/clutter-main.c:1662
+#: ../clutter/clutter-main.c:1638
 msgid "Clutter debugging flags to set"
 msgstr "Bandeiras de depuración  de Clutter que seleccionar"
 
-#: ../clutter/clutter-main.c:1664
+#: ../clutter/clutter-main.c:1640
 msgid "Clutter debugging flags to unset"
 msgstr "Bandeiras de depuración de Cluter que deseleccionar"
 
-#: ../clutter/clutter-main.c:1668
+#: ../clutter/clutter-main.c:1644
 msgid "Clutter profiling flags to set"
 msgstr "Bandeiras de perfilado de Clutter que estabelecer"
 
-#: ../clutter/clutter-main.c:1670
+#: ../clutter/clutter-main.c:1646
 msgid "Clutter profiling flags to unset"
 msgstr "Bandeiras de perfilado de Clutter que desestabelecer"
 
-#: ../clutter/clutter-main.c:1673
+#: ../clutter/clutter-main.c:1649
 msgid "Enable accessibility"
 msgstr "Activar a accesibilidade"
 
-#: ../clutter/clutter-main.c:1865
+#: ../clutter/clutter-main.c:1841
 msgid "Clutter Options"
 msgstr "Opcións de Clutter"
 
-#: ../clutter/clutter-main.c:1866
+#: ../clutter/clutter-main.c:1842
 msgid "Show Clutter Options"
 msgstr "Mostrar as opcións de Clutter"
 
-#: ../clutter/clutter-pan-action.c:448
+#: ../clutter/clutter-pan-action.c:455
 msgid "Pan Axis"
 msgstr "Eixo de movemento horizontal"
 
-#: ../clutter/clutter-pan-action.c:449
+#: ../clutter/clutter-pan-action.c:456
 msgid "Constraints the panning to an axis"
 msgstr "Restrinxe o movemento horizontal a un eixo"
 
-#: ../clutter/clutter-pan-action.c:463
+#: ../clutter/clutter-pan-action.c:470
 msgid "Interpolate"
 msgstr "Interpolar"
 
-#: ../clutter/clutter-pan-action.c:464
+#: ../clutter/clutter-pan-action.c:471
 msgid "Whether interpolated events emission is enabled."
 msgstr "Indica se a emisión de eventos interpolados está activada."
 
-#: ../clutter/clutter-pan-action.c:480
+#: ../clutter/clutter-pan-action.c:487
 msgid "Deceleration"
 msgstr "Deceleración"
 
-#: ../clutter/clutter-pan-action.c:481
+#: ../clutter/clutter-pan-action.c:488
 msgid "Rate at which the interpolated panning will decelerate in"
 msgstr "Taxa á que o movemento horizontal interpolado decrecerá"
 
-#: ../clutter/clutter-pan-action.c:498
+#: ../clutter/clutter-pan-action.c:505
 msgid "Initial acceleration factor"
 msgstr "Factor inicial de aceleración"
 
-#: ../clutter/clutter-pan-action.c:499
+#: ../clutter/clutter-pan-action.c:506
 msgid "Factor applied to the momentum when starting the interpolated phase"
 msgstr "Factor aplicado ao momento ao iniciar a fase de interpolación"
 
 #: ../clutter/clutter-path-constraint.c:212
-#: ../clutter/deprecated/clutter-behaviour-path.c:225
+#: ../clutter/deprecated/clutter-behaviour-path.c:221
 msgid "Path"
 msgstr "Ruta"
 
@@ -1383,89 +1451,89 @@ msgstr "A ruta empregada para restrinxir a un actor"
 msgid "The offset along the path, between -1.0 and 2.0"
 msgstr "O desprazamento ao longo da ruta, entre -1.0 e 2.0"
 
-#: ../clutter/clutter-property-transition.c:271
+#: ../clutter/clutter-property-transition.c:269
 msgid "Property Name"
 msgstr "Nome da propiedade"
 
-#: ../clutter/clutter-property-transition.c:272
+#: ../clutter/clutter-property-transition.c:270
 msgid "The name of the property to animate"
 msgstr "O nome da propiedade a animar"
 
-#: ../clutter/clutter-script.c:466
+#: ../clutter/clutter-script.c:464
 msgid "Filename Set"
 msgstr "Estabelecer o nome de ficheiro"
 
-#: ../clutter/clutter-script.c:467
+#: ../clutter/clutter-script.c:465
 msgid "Whether the :filename property is set"
 msgstr "Cando a propiedade :filename foi estabelecida"
 
-#: ../clutter/clutter-script.c:481
-#: ../clutter/deprecated/clutter-texture.c:1082
+#: ../clutter/clutter-script.c:479
+#: ../clutter/deprecated/clutter-texture.c:1080
 msgid "Filename"
 msgstr "Nome do ficheiro"
 
-#: ../clutter/clutter-script.c:482
+#: ../clutter/clutter-script.c:480
 msgid "The path of the currently parsed file"
 msgstr "A ruta do ficheiro analizado actualmente"
 
-#: ../clutter/clutter-script.c:499
+#: ../clutter/clutter-script.c:497
 msgid "Translation Domain"
 msgstr "Dominio de tradución"
 
-#: ../clutter/clutter-script.c:500
+#: ../clutter/clutter-script.c:498
 msgid "The translation domain used to localize string"
 msgstr "O dominio de tradució usado para localizar as cadeas"
 
-#: ../clutter/clutter-scroll-actor.c:263
+#: ../clutter/clutter-scroll-actor.c:189
 msgid "Scroll Mode"
 msgstr "Modo de desprazamento"
 
-#: ../clutter/clutter-scroll-actor.c:264
+#: ../clutter/clutter-scroll-actor.c:190
 msgid "The scrolling direction"
 msgstr "A dirección de desprazamento"
 
-#: ../clutter/clutter-settings.c:440
+#: ../clutter/clutter-settings.c:486
 msgid "Double Click Time"
 msgstr "Tempo de dobre pulsación"
 
-#: ../clutter/clutter-settings.c:441
+#: ../clutter/clutter-settings.c:487
 msgid "The time between clicks necessary to detect a multiple click"
 msgstr ""
 "O tempo necesario entre pulsacións para detectar unha pulsación múltiple"
 
-#: ../clutter/clutter-settings.c:456
+#: ../clutter/clutter-settings.c:502
 msgid "Double Click Distance"
 msgstr "Distancia da dobre pulsación"
 
-#: ../clutter/clutter-settings.c:457
+#: ../clutter/clutter-settings.c:503
 msgid "The distance between clicks necessary to detect a multiple click"
 msgstr ""
 "A distancia necesaria entre pulsacións para detectar unha pulsación múltiple"
 
-#: ../clutter/clutter-settings.c:472
+#: ../clutter/clutter-settings.c:518
 msgid "Drag Threshold"
 msgstr "Limiar de arrastre"
 
-#: ../clutter/clutter-settings.c:473
+#: ../clutter/clutter-settings.c:519
 msgid "The distance the cursor should travel before starting to drag"
 msgstr "A distancia que o cursor debe recorrer antes de comezar a arrastrar"
 
-#: ../clutter/clutter-settings.c:488 ../clutter/clutter-text.c:3369
+#: ../clutter/clutter-settings.c:534 ../clutter/clutter-text.c:3404
 msgid "Font Name"
 msgstr "Nome do tipo de letra"
 
-#: ../clutter/clutter-settings.c:489
+#: ../clutter/clutter-settings.c:535
 msgid ""
 "The description of the default font, as one that could be parsed by Pango"
 msgstr ""
 "A descrición do tipo de letra predeterminado, como un que Pango poida "
 "analizar."
 
-#: ../clutter/clutter-settings.c:504
+#: ../clutter/clutter-settings.c:550
 msgid "Font Antialias"
 msgstr "Alisado do tipo de letra"
 
-#: ../clutter/clutter-settings.c:505
+#: ../clutter/clutter-settings.c:551
 msgid ""
 "Whether to use antialiasing (1 to enable, 0 to disable, and -1 to use the "
 "default)"
@@ -1473,71 +1541,79 @@ msgstr ""
 "Indica se se debe usar alisado (1 para activar, 0 para desactivar e -1 para "
 "usar a opción predeterminada)"
 
-#: ../clutter/clutter-settings.c:521
+#: ../clutter/clutter-settings.c:567 ../clutter/clutter-settings.c:575
 msgid "Font DPI"
 msgstr "PPP do tipo de letra"
 
-#: ../clutter/clutter-settings.c:522
+#: ../clutter/clutter-settings.c:568 ../clutter/clutter-settings.c:576
 msgid ""
 "The resolution of the font, in 1024 * dots/inch, or -1 to use the default"
 msgstr ""
 "A resolución do tipo de letra, en 1024 * puntos/polgada, ou -1 para usar a "
 "predeterminada"
 
-#: ../clutter/clutter-settings.c:538
+#: ../clutter/clutter-settings.c:592
 msgid "Font Hinting"
 msgstr "Contorno do tipo de letra"
 
-#: ../clutter/clutter-settings.c:539
+#: ../clutter/clutter-settings.c:593
 msgid ""
 "Whether to use hinting (1 to enable, 0 to disable and -1 to use the default)"
 msgstr ""
 "Indica se se debe usar contorno (1 para activar, 0 para desactivar e -1 para "
 "usar a opción predeterminada)"
 
-#: ../clutter/clutter-settings.c:560
+#: ../clutter/clutter-settings.c:614
 msgid "Font Hint Style"
 msgstr "Estilo do contorno do tipo de letra"
 
-#: ../clutter/clutter-settings.c:561
+#: ../clutter/clutter-settings.c:615
 msgid "The style of hinting (hintnone, hintslight, hintmedium, hintfull)"
 msgstr ""
 "O estilo do contorno («hintnone», «hintslight», «hintmedium», «hintfull»)"
 
-#: ../clutter/clutter-settings.c:582
+#: ../clutter/clutter-settings.c:636
 msgid "Font Subpixel Order"
 msgstr "Orde do tipo de letra do subpíxel"
 
-#: ../clutter/clutter-settings.c:583
+#: ../clutter/clutter-settings.c:637
 msgid "The type of subpixel antialiasing (none, rgb, bgr, vrgb, vbgr)"
 msgstr "O tipo de suavizado do subpíxel («none», «rgb», «bgr», «vrgb», «vbgr»)"
 
-#: ../clutter/clutter-settings.c:600
+#: ../clutter/clutter-settings.c:654
 msgid "The minimum duration for a long press gesture to be recognized"
 msgstr "A duración mínima dunha pulsación longa para recoñecer o xesto"
 
-#: ../clutter/clutter-settings.c:607
+#: ../clutter/clutter-settings.c:661
+msgid "Window Scaling Factor"
+msgstr "Factor de escala da xanela"
+
+#: ../clutter/clutter-settings.c:662
+msgid "The scaling factor to be applied to windows"
+msgstr "O factor de escala aplicado á xanela"
+
+#: ../clutter/clutter-settings.c:669
 msgid "Fontconfig configuration timestamp"
 msgstr "Configuración da marca de tempo de fontconfig"
 
-#: ../clutter/clutter-settings.c:608
+#: ../clutter/clutter-settings.c:670
 msgid "Timestamp of the current fontconfig configuration"
 msgstr "Marca de tempo da configuración actual de fontconfig"
 
-#: ../clutter/clutter-settings.c:625
+#: ../clutter/clutter-settings.c:687
 msgid "Password Hint Time"
 msgstr "Tempo da suxestión de contrasinal"
 
-#: ../clutter/clutter-settings.c:626
+#: ../clutter/clutter-settings.c:688
 msgid "How long to show the last input character in hidden entries"
 msgstr ""
 "Canto tempo se debe mostrar o último carácter escrito nas entradas ocultas"
 
-#: ../clutter/clutter-shader-effect.c:486
+#: ../clutter/clutter-shader-effect.c:485
 msgid "Shader Type"
 msgstr "Tipo de sombreado"
 
-#: ../clutter/clutter-shader-effect.c:487
+#: ../clutter/clutter-shader-effect.c:486
 msgid "The type of shader used"
 msgstr "O tipo de sombreado empregado"
 
@@ -1565,759 +1641,703 @@ msgstr "O bordo da orixe que debe ser encaixado"
 msgid "The offset in pixels to apply to the constraint"
 msgstr "O desprazamento en píxeles para aplicarllo á restrición"
 
-#: ../clutter/clutter-stage.c:1895
+#: ../clutter/clutter-stage.c:1899
 msgid "Fullscreen Set"
 msgstr "Estabelecer a pantalla completa"
 
-#: ../clutter/clutter-stage.c:1896
+#: ../clutter/clutter-stage.c:1900
 msgid "Whether the main stage is fullscreen"
 msgstr "Cando o escenario principal é a pantalla completa"
 
-#: ../clutter/clutter-stage.c:1910
+#: ../clutter/clutter-stage.c:1914
 msgid "Offscreen"
 msgstr "Fora de pantalla"
 
-#: ../clutter/clutter-stage.c:1911
+#: ../clutter/clutter-stage.c:1915
 msgid "Whether the main stage should be rendered offscreen"
 msgstr "Cando o escenario principal debe acontecer fora de la pantalla"
 
-#: ../clutter/clutter-stage.c:1923 ../clutter/clutter-text.c:3483
+#: ../clutter/clutter-stage.c:1927 ../clutter/clutter-text.c:3518
 msgid "Cursor Visible"
 msgstr "Cursor visíbel"
 
-#: ../clutter/clutter-stage.c:1924
+#: ../clutter/clutter-stage.c:1928
 msgid "Whether the mouse pointer is visible on the main stage"
 msgstr "Cando o punteiro do rato é visíbel no escenario principal"
 
-#: ../clutter/clutter-stage.c:1938
+#: ../clutter/clutter-stage.c:1942
 msgid "User Resizable"
 msgstr "Redimensionábel polo usuario"
 
-#: ../clutter/clutter-stage.c:1939
+#: ../clutter/clutter-stage.c:1943
 msgid "Whether the stage is able to be resized via user interaction"
 msgstr "Cando o escenario pode ser redimensionado cunha acción do usuario"
 
-#: ../clutter/clutter-stage.c:1954 ../clutter/deprecated/clutter-box.c:260
-#: ../clutter/deprecated/clutter-rectangle.c:273
+#: ../clutter/clutter-stage.c:1958 ../clutter/deprecated/clutter-box.c:256
+#: ../clutter/deprecated/clutter-rectangle.c:270
 msgid "Color"
 msgstr "Cor"
 
-#: ../clutter/clutter-stage.c:1955
+#: ../clutter/clutter-stage.c:1959
 msgid "The color of the stage"
 msgstr "A cor do escenario"
 
-#: ../clutter/clutter-stage.c:1970
+#: ../clutter/clutter-stage.c:1974
 msgid "Perspective"
 msgstr "Perspectiva"
 
-#: ../clutter/clutter-stage.c:1971
+#: ../clutter/clutter-stage.c:1975
 msgid "Perspective projection parameters"
 msgstr "Parámetros de proxección da perspectiva"
 
-#: ../clutter/clutter-stage.c:1986
+#: ../clutter/clutter-stage.c:1990
 msgid "Title"
 msgstr "Título"
 
-#: ../clutter/clutter-stage.c:1987
+#: ../clutter/clutter-stage.c:1991
 msgid "Stage Title"
 msgstr "Título do escenario"
 
-#: ../clutter/clutter-stage.c:2004
+#: ../clutter/clutter-stage.c:2008
 msgid "Use Fog"
 msgstr "Usar néboa"
 
-#: ../clutter/clutter-stage.c:2005
+#: ../clutter/clutter-stage.c:2009
 msgid "Whether to enable depth cueing"
 msgstr "Cando se activa a indicación da profundidade"
 
-#: ../clutter/clutter-stage.c:2021
+#: ../clutter/clutter-stage.c:2025
 msgid "Fog"
 msgstr "Néboa"
 
-#: ../clutter/clutter-stage.c:2022
+#: ../clutter/clutter-stage.c:2026
 msgid "Settings for the depth cueing"
 msgstr "Axustes para a indicación da profundidade"
 
-#: ../clutter/clutter-stage.c:2038
+#: ../clutter/clutter-stage.c:2042
 msgid "Use Alpha"
 msgstr "Usar alfa"
 
-#: ../clutter/clutter-stage.c:2039
+#: ../clutter/clutter-stage.c:2043
 msgid "Whether to honour the alpha component of the stage color"
 msgstr "Cando considera á compoñente alfa da cor do escenario"
 
-#: ../clutter/clutter-stage.c:2055
+#: ../clutter/clutter-stage.c:2059
 msgid "Key Focus"
 msgstr "Tecla de foco"
 
-#: ../clutter/clutter-stage.c:2056
+#: ../clutter/clutter-stage.c:2060
 msgid "The currently key focused actor"
 msgstr "A tecla actual pon ao actor en foco"
 
-#: ../clutter/clutter-stage.c:2072
+#: ../clutter/clutter-stage.c:2076
 msgid "No Clear Hint"
 msgstr "Non limpar suxestión"
 
-#: ../clutter/clutter-stage.c:2073
+#: ../clutter/clutter-stage.c:2077
 msgid "Whether the stage should clear its contents"
 msgstr "Cando o escenario debe limpar o seu contido"
 
-#: ../clutter/clutter-stage.c:2086
+#: ../clutter/clutter-stage.c:2090
 msgid "Accept Focus"
 msgstr "Aceptar foco"
 
-#: ../clutter/clutter-stage.c:2087
+#: ../clutter/clutter-stage.c:2091
 msgid "Whether the stage should accept focus on show"
 msgstr "Se o paso debe aceptar o foco ao mostralo"
 
-#: ../clutter/clutter-table-layout.c:543
-msgid "Column Number"
-msgstr "Número de columna"
-
-#: ../clutter/clutter-table-layout.c:544
-msgid "The column the widget resides in"
-msgstr "A columna na que reside o trebello"
-
-#: ../clutter/clutter-table-layout.c:551
-msgid "Row Number"
-msgstr "Número de fila"
-
-#: ../clutter/clutter-table-layout.c:552
-msgid "The row the widget resides in"
-msgstr "A liña na que reside o trebello"
-
-#: ../clutter/clutter-table-layout.c:559
-msgid "Column Span"
-msgstr "Columna por cela"
-
-#: ../clutter/clutter-table-layout.c:560
-msgid "The number of columns the widget should span"
-msgstr "O número de columnas que debe agrupar o trebello"
-
-#: ../clutter/clutter-table-layout.c:567
-msgid "Row Span"
-msgstr "Liña por cela"
-
-#: ../clutter/clutter-table-layout.c:568
-msgid "The number of rows the widget should span"
-msgstr "O número de liñas que debe agrupar o trebello"
-
-#: ../clutter/clutter-table-layout.c:575
-msgid "Horizontal Expand"
-msgstr "Expansión horizontal"
-
-#: ../clutter/clutter-table-layout.c:576
-msgid "Allocate extra space for the child in horizontal axis"
-msgstr "Asigna espazo extra para o fillo no eixo horizontal"
-
-#: ../clutter/clutter-table-layout.c:582
-msgid "Vertical Expand"
-msgstr "Expansión vertical"
-
-#: ../clutter/clutter-table-layout.c:583
-msgid "Allocate extra space for the child in vertical axis"
-msgstr "Asigna espazo extra para o fillo no eixo vertical"
-
-#: ../clutter/clutter-table-layout.c:1638
-msgid "Spacing between columns"
-msgstr "Espazamento entre columnas"
-
-#: ../clutter/clutter-table-layout.c:1652
-msgid "Spacing between rows"
-msgstr "Espazamento entre filas"
-
-#: ../clutter/clutter-text-buffer.c:351 ../clutter/clutter-text.c:3404
+#: ../clutter/clutter-text-buffer.c:347 ../clutter/clutter-text.c:3439
 msgid "Text"
 msgstr "Texto"
 
-#: ../clutter/clutter-text-buffer.c:352
+#: ../clutter/clutter-text-buffer.c:348
 msgid "The contents of the buffer"
 msgstr "Os contidos do búfer"
 
-#: ../clutter/clutter-text-buffer.c:365
+#: ../clutter/clutter-text-buffer.c:361
 msgid "Text length"
 msgstr "Lonxitude de texto"
 
-#: ../clutter/clutter-text-buffer.c:366
+#: ../clutter/clutter-text-buffer.c:362
 msgid "Length of the text currently in the buffer"
 msgstr "A lonxitude do texto que está actualmente no búfer"
 
-#: ../clutter/clutter-text-buffer.c:379
+#: ../clutter/clutter-text-buffer.c:375
 msgid "Maximum length"
 msgstr "Lonxitude máxima"
 
-#: ../clutter/clutter-text-buffer.c:380
+#: ../clutter/clutter-text-buffer.c:376
 msgid "Maximum number of characters for this entry. Zero if no maximum"
 msgstr "Número máximo de caracteres nesta entrada. É cero se non hai un máximo"
 
-#: ../clutter/clutter-text.c:3351
+#: ../clutter/clutter-text.c:3386
 msgid "Buffer"
 msgstr "Búfer"
 
-#: ../clutter/clutter-text.c:3352
+#: ../clutter/clutter-text.c:3387
 msgid "The buffer for the text"
 msgstr "O búfer para o texto"
 
-#: ../clutter/clutter-text.c:3370
+#: ../clutter/clutter-text.c:3405
 msgid "The font to be used by the text"
 msgstr "O tipo de letra que vai ser empregado no texto"
 
-#: ../clutter/clutter-text.c:3387
+#: ../clutter/clutter-text.c:3422
 msgid "Font Description"
 msgstr "Descrición do tipo de letra"
 
-#: ../clutter/clutter-text.c:3388
+#: ../clutter/clutter-text.c:3423
 msgid "The font description to be used"
 msgstr "A descrición do tipo de letra que se vai empregar"
 
-#: ../clutter/clutter-text.c:3405
+#: ../clutter/clutter-text.c:3440
 msgid "The text to render"
 msgstr "O texto a renderizar"
 
-#: ../clutter/clutter-text.c:3419
+#: ../clutter/clutter-text.c:3454
 msgid "Font Color"
 msgstr "Cor da letra"
 
-#: ../clutter/clutter-text.c:3420
+#: ../clutter/clutter-text.c:3455
 msgid "Color of the font used by the text"
 msgstr "Cor das letras empregadas no texto"
 
-#: ../clutter/clutter-text.c:3435
+#: ../clutter/clutter-text.c:3470
 msgid "Editable"
 msgstr "Editábel"
 
-#: ../clutter/clutter-text.c:3436
+#: ../clutter/clutter-text.c:3471
 msgid "Whether the text is editable"
 msgstr "Cando o texto é editábel"
 
-#: ../clutter/clutter-text.c:3451
+#: ../clutter/clutter-text.c:3486
 msgid "Selectable"
 msgstr "Seleccionábel"
 
-#: ../clutter/clutter-text.c:3452
+#: ../clutter/clutter-text.c:3487
 msgid "Whether the text is selectable"
 msgstr "Cando o texto é seleccionábel"
 
-#: ../clutter/clutter-text.c:3466
+#: ../clutter/clutter-text.c:3501
 msgid "Activatable"
 msgstr "Activábel"
 
-#: ../clutter/clutter-text.c:3467
+#: ../clutter/clutter-text.c:3502
 msgid "Whether pressing return causes the activate signal to be emitted"
 msgstr "Cando ao premer Intro fai que se active o sinal a ser emitido"
 
-#: ../clutter/clutter-text.c:3484
+#: ../clutter/clutter-text.c:3519
 msgid "Whether the input cursor is visible"
 msgstr "Cando o cursor de entrada é visíbel"
 
-#: ../clutter/clutter-text.c:3498 ../clutter/clutter-text.c:3499
+#: ../clutter/clutter-text.c:3533 ../clutter/clutter-text.c:3534
 msgid "Cursor Color"
 msgstr "Cor do cursor"
 
-#: ../clutter/clutter-text.c:3514
+#: ../clutter/clutter-text.c:3549
 msgid "Cursor Color Set"
 msgstr "Estabelecer a cor do cursor"
 
-#: ../clutter/clutter-text.c:3515
+#: ../clutter/clutter-text.c:3550
 msgid "Whether the cursor color has been set"
 msgstr "Cando a cor do cursor foi estabelecida"
 
-#: ../clutter/clutter-text.c:3530
+#: ../clutter/clutter-text.c:3565
 msgid "Cursor Size"
 msgstr "Tamaño do cursor"
 
-#: ../clutter/clutter-text.c:3531
+#: ../clutter/clutter-text.c:3566
 msgid "The width of the cursor, in pixels"
 msgstr "A largura do cursor, en píxeles"
 
-#: ../clutter/clutter-text.c:3547 ../clutter/clutter-text.c:3565
+#: ../clutter/clutter-text.c:3582 ../clutter/clutter-text.c:3600
 msgid "Cursor Position"
 msgstr "A posición do cursor"
 
-#: ../clutter/clutter-text.c:3548 ../clutter/clutter-text.c:3566
+#: ../clutter/clutter-text.c:3583 ../clutter/clutter-text.c:3601
 msgid "The cursor position"
 msgstr "A posición do cursor"
 
-#: ../clutter/clutter-text.c:3581
+#: ../clutter/clutter-text.c:3616
 msgid "Selection-bound"
 msgstr "Selección límite"
 
-#: ../clutter/clutter-text.c:3582
+#: ../clutter/clutter-text.c:3617
 msgid "The cursor position of the other end of the selection"
 msgstr "A posición do cursor do outro extremo da selección"
 
-#: ../clutter/clutter-text.c:3597 ../clutter/clutter-text.c:3598
+#: ../clutter/clutter-text.c:3632 ../clutter/clutter-text.c:3633
 msgid "Selection Color"
 msgstr "Cor da selección"
 
-#: ../clutter/clutter-text.c:3613
+#: ../clutter/clutter-text.c:3648
 msgid "Selection Color Set"
 msgstr "Estabelecer a cor da selección"
 
-#: ../clutter/clutter-text.c:3614
+#: ../clutter/clutter-text.c:3649
 msgid "Whether the selection color has been set"
 msgstr "Cando cor da selección foi estabelecida"
 
-#: ../clutter/clutter-text.c:3629
+#: ../clutter/clutter-text.c:3664
 msgid "Attributes"
 msgstr "Atributos"
 
-#: ../clutter/clutter-text.c:3630
+#: ../clutter/clutter-text.c:3665
 msgid "A list of style attributes to apply to the contents of the actor"
 msgstr "Unha lista de atributos de estilo para aplicar aos contidos do actor"
 
-#: ../clutter/clutter-text.c:3652
+#: ../clutter/clutter-text.c:3687
 msgid "Use markup"
 msgstr "Usar a marcación"
 
-#: ../clutter/clutter-text.c:3653
+#: ../clutter/clutter-text.c:3688
 msgid "Whether or not the text includes Pango markup"
 msgstr "Cando o texto inclúe ou non marcado Pango"
 
-#: ../clutter/clutter-text.c:3669
+#: ../clutter/clutter-text.c:3704
 msgid "Line wrap"
 msgstr "Axuste de liña"
 
-#: ../clutter/clutter-text.c:3670
+#: ../clutter/clutter-text.c:3705
 msgid "If set, wrap the lines if the text becomes too wide"
 msgstr "De estabelecerse, axusta as liñas se o texto é moi amplo"
 
-#: ../clutter/clutter-text.c:3685
+#: ../clutter/clutter-text.c:3720
 msgid "Line wrap mode"
 msgstr "Modo de axuste de liña"
 
-#: ../clutter/clutter-text.c:3686
+#: ../clutter/clutter-text.c:3721
 msgid "Control how line-wrapping is done"
 msgstr "Controlar se se realiza o axuste de liñas"
 
-#: ../clutter/clutter-text.c:3701
+#: ../clutter/clutter-text.c:3736
 msgid "Ellipsize"
 msgstr "Elipse en..."
 
-#: ../clutter/clutter-text.c:3702
+#: ../clutter/clutter-text.c:3737
 msgid "The preferred place to ellipsize the string"
 msgstr "O lugar preferido para elipse na cadea"
 
-#: ../clutter/clutter-text.c:3718
+#: ../clutter/clutter-text.c:3753
 msgid "Line Alignment"
 msgstr "Aliñamento de liñas"
 
-#: ../clutter/clutter-text.c:3719
+#: ../clutter/clutter-text.c:3754
 msgid "The preferred alignment for the string, for multi-line text"
 msgstr "O aliñamento preferido das cadeas, para textos multiliña"
 
-#: ../clutter/clutter-text.c:3735
+#: ../clutter/clutter-text.c:3770
 msgid "Justify"
 msgstr "Xustificar"
 
-#: ../clutter/clutter-text.c:3736
+#: ../clutter/clutter-text.c:3771
 msgid "Whether the text should be justified"
 msgstr "Cando o texto debe estar xustificado"
 
-#: ../clutter/clutter-text.c:3751
+#: ../clutter/clutter-text.c:3786
 msgid "Password Character"
 msgstr "Carácter contrasinal"
 
-#: ../clutter/clutter-text.c:3752
+#: ../clutter/clutter-text.c:3787
 msgid "If non-zero, use this character to display the actor's contents"
 msgstr ""
 "De ser distinto de cero, use este carácter para amosar os contidos do actor"
 
-#: ../clutter/clutter-text.c:3766
+#: ../clutter/clutter-text.c:3801
 msgid "Max Length"
 msgstr "Lonxitude máxima"
 
-#: ../clutter/clutter-text.c:3767
+#: ../clutter/clutter-text.c:3802
 msgid "Maximum length of the text inside the actor"
 msgstr "Lonxitude máxima do texto dentro do actor"
 
-#: ../clutter/clutter-text.c:3790
+#: ../clutter/clutter-text.c:3825
 msgid "Single Line Mode"
 msgstr "Modo de liña única"
 
-#: ../clutter/clutter-text.c:3791
+#: ../clutter/clutter-text.c:3826
 msgid "Whether the text should be a single line"
 msgstr "Cando o texto debe ser dunha soa liña"
 
-#: ../clutter/clutter-text.c:3805 ../clutter/clutter-text.c:3806
+#: ../clutter/clutter-text.c:3840 ../clutter/clutter-text.c:3841
 msgid "Selected Text Color"
 msgstr "Cor do texto seleccionado"
 
-#: ../clutter/clutter-text.c:3821
+#: ../clutter/clutter-text.c:3856
 msgid "Selected Text Color Set"
 msgstr "Conxunto de cores de texto seleccionado"
 
-#: ../clutter/clutter-text.c:3822
+#: ../clutter/clutter-text.c:3857
 msgid "Whether the selected text color has been set"
 msgstr "Indica se se estabeleceu a cor do texto seleccionado"
 
-#: ../clutter/clutter-timeline.c:561
-#: ../clutter/deprecated/clutter-animation.c:560
+#: ../clutter/clutter-timeline.c:593
+#: ../clutter/deprecated/clutter-animation.c:557
 msgid "Loop"
 msgstr "Bucle"
 
-#: ../clutter/clutter-timeline.c:562
+#: ../clutter/clutter-timeline.c:594
 msgid "Should the timeline automatically restart"
 msgstr "A liña de tempo debe reiniciarse automaticamente"
 
-#: ../clutter/clutter-timeline.c:576
+#: ../clutter/clutter-timeline.c:608
 msgid "Delay"
 msgstr "Atraso"
 
-#: ../clutter/clutter-timeline.c:577
+#: ../clutter/clutter-timeline.c:609
 msgid "Delay before start"
 msgstr "Atraso antes de comezar"
 
-#: ../clutter/clutter-timeline.c:592
-#: ../clutter/deprecated/clutter-animation.c:544
-#: ../clutter/deprecated/clutter-animator.c:1804
+#: ../clutter/clutter-timeline.c:624
+#: ../clutter/deprecated/clutter-animation.c:541
+#: ../clutter/deprecated/clutter-animator.c:1801
 #: ../clutter/deprecated/clutter-media.c:224
-#: ../clutter/deprecated/clutter-state.c:1523
+#: ../clutter/deprecated/clutter-state.c:1517
 msgid "Duration"
 msgstr "Duración"
 
-#: ../clutter/clutter-timeline.c:593
+#: ../clutter/clutter-timeline.c:625
 msgid "Duration of the timeline in milliseconds"
 msgstr "Duración da liña de tempo en milisegundos"
 
-#: ../clutter/clutter-timeline.c:608
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:528
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:337
+#: ../clutter/clutter-timeline.c:640
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:521
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:330
 msgid "Direction"
 msgstr "Dirección"
 
-#: ../clutter/clutter-timeline.c:609
+#: ../clutter/clutter-timeline.c:641
 msgid "Direction of the timeline"
 msgstr "Dirección da liña de tempo"
 
-#: ../clutter/clutter-timeline.c:624
+#: ../clutter/clutter-timeline.c:656
 msgid "Auto Reverse"
 msgstr "Inversión automática"
 
-#: ../clutter/clutter-timeline.c:625
+#: ../clutter/clutter-timeline.c:657
 msgid "Whether the direction should be reversed when reaching the end"
 msgstr "Se a dirección debe ser revertida cando chega a fin"
 
-#: ../clutter/clutter-timeline.c:643
+#: ../clutter/clutter-timeline.c:675
 msgid "Repeat Count"
 msgstr "Repetir conta"
 
-#: ../clutter/clutter-timeline.c:644
+#: ../clutter/clutter-timeline.c:676
 msgid "How many times the timeline should repeat"
 msgstr "Cantas veces se debe repetir a liña de tempo"
 
-#: ../clutter/clutter-timeline.c:658
+#: ../clutter/clutter-timeline.c:690
 msgid "Progress Mode"
 msgstr "Modo de progreso"
 
-#: ../clutter/clutter-timeline.c:659
+#: ../clutter/clutter-timeline.c:691
 msgid "How the timeline should compute the progress"
 msgstr "Como debería calcula o progreso a liña de tempo"
 
-#: ../clutter/clutter-transition.c:246
+#: ../clutter/clutter-transition.c:244
 msgid "Interval"
 msgstr "Intervalo"
 
-#: ../clutter/clutter-transition.c:247
+#: ../clutter/clutter-transition.c:245
 msgid "The interval of values to transition"
 msgstr "O intervalo de valores para a transición"
 
-#: ../clutter/clutter-transition.c:261
+#: ../clutter/clutter-transition.c:259
 msgid "Animatable"
 msgstr "Animábel"
 
-#: ../clutter/clutter-transition.c:262
+#: ../clutter/clutter-transition.c:260
 msgid "The animatable object"
 msgstr "O obxecto animábel"
 
-#: ../clutter/clutter-transition.c:283
+#: ../clutter/clutter-transition.c:281
 msgid "Remove on Complete"
 msgstr "Retirar ao completar"
 
-#: ../clutter/clutter-transition.c:284
+#: ../clutter/clutter-transition.c:282
 msgid "Detach the transition when completed"
 msgstr "Desacoplar a transición ao completala"
 
-#: ../clutter/clutter-zoom-action.c:354
+#: ../clutter/clutter-zoom-action.c:365
 msgid "Zoom Axis"
 msgstr "Ampliar eixo"
 
-#: ../clutter/clutter-zoom-action.c:355
+#: ../clutter/clutter-zoom-action.c:366
 msgid "Constraints the zoom to an axis"
 msgstr "Restrinxe o ampliación a un eixo"
 
-#: ../clutter/deprecated/clutter-alpha.c:355
-#: ../clutter/deprecated/clutter-animation.c:575
-#: ../clutter/deprecated/clutter-animator.c:1821
+#: ../clutter/deprecated/clutter-alpha.c:354
+#: ../clutter/deprecated/clutter-animation.c:572
+#: ../clutter/deprecated/clutter-animator.c:1818
 msgid "Timeline"
 msgstr "Liña de tempo"
 
-#: ../clutter/deprecated/clutter-alpha.c:356
+#: ../clutter/deprecated/clutter-alpha.c:355
 msgid "Timeline used by the alpha"
 msgstr "Liña de tempo usada pola alfa"
 
-#: ../clutter/deprecated/clutter-alpha.c:372
+#: ../clutter/deprecated/clutter-alpha.c:371
 msgid "Alpha value"
 msgstr "Valor alfa"
 
-#: ../clutter/deprecated/clutter-alpha.c:373
+#: ../clutter/deprecated/clutter-alpha.c:372
 msgid "Alpha value as computed by the alpha"
 msgstr "Valor alfa calculado para a alfa"
 
-#: ../clutter/deprecated/clutter-alpha.c:394
-#: ../clutter/deprecated/clutter-animation.c:528
+#: ../clutter/deprecated/clutter-alpha.c:393
+#: ../clutter/deprecated/clutter-animation.c:525
 msgid "Mode"
 msgstr "Modo"
 
-#: ../clutter/deprecated/clutter-alpha.c:395
+#: ../clutter/deprecated/clutter-alpha.c:394
 msgid "Progress mode"
 msgstr "Modo de progreso"
 
-#: ../clutter/deprecated/clutter-animation.c:511
+#: ../clutter/deprecated/clutter-animation.c:508
 msgid "Object"
 msgstr "Obxecto"
 
-#: ../clutter/deprecated/clutter-animation.c:512
+#: ../clutter/deprecated/clutter-animation.c:509
 msgid "Object to which the animation applies"
 msgstr "Obxecto ao que se aplica a animación"
 
-#: ../clutter/deprecated/clutter-animation.c:529
+#: ../clutter/deprecated/clutter-animation.c:526
 msgid "The mode of the animation"
 msgstr "O modo de animación"
 
-#: ../clutter/deprecated/clutter-animation.c:545
+#: ../clutter/deprecated/clutter-animation.c:542
 msgid "Duration of the animation, in milliseconds"
 msgstr "Duración da animación en milisegundos"
 
-#: ../clutter/deprecated/clutter-animation.c:561
+#: ../clutter/deprecated/clutter-animation.c:558
 msgid "Whether the animation should loop"
 msgstr "Cando a animación debe ser un bucle"
 
-#: ../clutter/deprecated/clutter-animation.c:576
+#: ../clutter/deprecated/clutter-animation.c:573
 msgid "The timeline used by the animation"
 msgstr "Liña de tempo empregada pola animación"
 
-#: ../clutter/deprecated/clutter-animation.c:592
-#: ../clutter/deprecated/clutter-behaviour.c:241
+#: ../clutter/deprecated/clutter-animation.c:589
+#: ../clutter/deprecated/clutter-behaviour.c:237
 msgid "Alpha"
 msgstr "Alfa"
 
-#: ../clutter/deprecated/clutter-animation.c:593
+#: ../clutter/deprecated/clutter-animation.c:590
 msgid "The alpha used by the animation"
 msgstr "Alfa usada pola animación"
 
-#: ../clutter/deprecated/clutter-animator.c:1805
+#: ../clutter/deprecated/clutter-animator.c:1802
 msgid "The duration of the animation"
 msgstr "A duración da animación"
 
-#: ../clutter/deprecated/clutter-animator.c:1822
+#: ../clutter/deprecated/clutter-animator.c:1819
 msgid "The timeline of the animation"
 msgstr "Liña de tempo da animación"
 
-#: ../clutter/deprecated/clutter-behaviour.c:242
+#: ../clutter/deprecated/clutter-behaviour.c:238
 msgid "Alpha Object to drive the behaviour"
 msgstr "Obxecto alfa para guiar o comportamento"
 
-#: ../clutter/deprecated/clutter-behaviour-depth.c:182
+#: ../clutter/deprecated/clutter-behaviour-depth.c:180
 msgid "Start Depth"
 msgstr "Profundidade de inicio"
 
-#: ../clutter/deprecated/clutter-behaviour-depth.c:183
+#: ../clutter/deprecated/clutter-behaviour-depth.c:181
 msgid "Initial depth to apply"
 msgstr "Profundidade inicial a aplicar"
 
-#: ../clutter/deprecated/clutter-behaviour-depth.c:198
+#: ../clutter/deprecated/clutter-behaviour-depth.c:196
 msgid "End Depth"
 msgstr "Profundidade de remate"
 
-#: ../clutter/deprecated/clutter-behaviour-depth.c:199
+#: ../clutter/deprecated/clutter-behaviour-depth.c:197
 msgid "Final depth to apply"
 msgstr "Profundidade final a aplicar"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:401
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:394
 msgid "Start Angle"
 msgstr "Ángulo de inicio"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:402
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:284
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:395
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:277
 msgid "Initial angle"
 msgstr "Ángulo inicial"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:417
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:410
 msgid "End Angle"
 msgstr "Ángulo de remate"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:418
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:302
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:411
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:295
 msgid "Final angle"
 msgstr "Ángulo final"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:433
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:426
 msgid "Angle x tilt"
 msgstr "Ángulo de inclinación X"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:434
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:427
 msgid "Tilt of the ellipse around x axis"
 msgstr "Inclinación da elipse arredor do eixo X"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:449
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:442
 msgid "Angle y tilt"
 msgstr "Ángulo de inclinación Y"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:450
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:443
 msgid "Tilt of the ellipse around y axis"
 msgstr "Inclinación da elipse arredor do eixo Y"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:465
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:458
 msgid "Angle z tilt"
 msgstr "Ángulo de inclinación Z"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:466
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:459
 msgid "Tilt of the ellipse around z axis"
 msgstr "Inclinación da elipse arredor do eixo Z"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:482
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:475
 msgid "Width of the ellipse"
 msgstr "Largo da elipse"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:498
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:491
 msgid "Height of ellipse"
 msgstr "Altura da elipse"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:513
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:506
 msgid "Center"
 msgstr "Centro"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:514
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:507
 msgid "Center of ellipse"
 msgstr "Centro da elipse"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:529
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:338
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:522
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:331
 msgid "Direction of rotation"
 msgstr "Dirección da rotación"
 
-#: ../clutter/deprecated/clutter-behaviour-opacity.c:184
+#: ../clutter/deprecated/clutter-behaviour-opacity.c:177
 msgid "Opacity Start"
 msgstr "Opacidade de inicio"
 
-#: ../clutter/deprecated/clutter-behaviour-opacity.c:185
+#: ../clutter/deprecated/clutter-behaviour-opacity.c:178
 msgid "Initial opacity level"
 msgstr "Nivel inicial de opacidade"
 
-#: ../clutter/deprecated/clutter-behaviour-opacity.c:202
+#: ../clutter/deprecated/clutter-behaviour-opacity.c:195
 msgid "Opacity End"
 msgstr "Opacidade de remate"
 
-#: ../clutter/deprecated/clutter-behaviour-opacity.c:203
+#: ../clutter/deprecated/clutter-behaviour-opacity.c:196
 msgid "Final opacity level"
 msgstr "Nivel final de opacidade"
 
-#: ../clutter/deprecated/clutter-behaviour-path.c:226
+#: ../clutter/deprecated/clutter-behaviour-path.c:222
 msgid "The ClutterPath object representing the path to animate along"
 msgstr "O obxecto ClutterPath representa a ruta ao longo da animación"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:283
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:276
 msgid "Angle Begin"
 msgstr "Ángulo inicial"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:301
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:294
 msgid "Angle End"
 msgstr "Ángulo de remate"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:319
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:312
 msgid "Axis"
 msgstr "Eixo"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:320
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:313
 msgid "Axis of rotation"
 msgstr "Eixo de rotación"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:355
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:348
 msgid "Center X"
 msgstr "Centro X"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:356
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:349
 msgid "X coordinate of the center of rotation"
 msgstr "Coordenada X do centro de rotación"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:373
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:366
 msgid "Center Y"
 msgstr "Centro Y"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:374
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:367
 msgid "Y coordinate of the center of rotation"
 msgstr "Coordenada Y do centro de rotación"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:391
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:384
 msgid "Center Z"
 msgstr "Centro Z"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:392
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:385
 msgid "Z coordinate of the center of rotation"
 msgstr "Coordenada Z do centro de rotación"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:226
+#: ../clutter/deprecated/clutter-behaviour-scale.c:222
 msgid "X Start Scale"
 msgstr "Escala X de inicio"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:227
+#: ../clutter/deprecated/clutter-behaviour-scale.c:223
 msgid "Initial scale on the X axis"
 msgstr "Escala inicial no eixo X"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:245
+#: ../clutter/deprecated/clutter-behaviour-scale.c:241
 msgid "X End Scale"
 msgstr "Escala X de remate"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:246
+#: ../clutter/deprecated/clutter-behaviour-scale.c:242
 msgid "Final scale on the X axis"
 msgstr "Escala final no eixo X"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:264
+#: ../clutter/deprecated/clutter-behaviour-scale.c:260
 msgid "Y Start Scale"
 msgstr "Escala Y de inicio"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:265
+#: ../clutter/deprecated/clutter-behaviour-scale.c:261
 msgid "Initial scale on the Y axis"
 msgstr "Escala inicial no eixo Y"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:283
+#: ../clutter/deprecated/clutter-behaviour-scale.c:279
 msgid "Y End Scale"
 msgstr "Escala Y de remate"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:284
+#: ../clutter/deprecated/clutter-behaviour-scale.c:280
 msgid "Final scale on the Y axis"
 msgstr "Escala final no eixo Y"
 
-#: ../clutter/deprecated/clutter-box.c:261
+#: ../clutter/deprecated/clutter-box.c:257
 msgid "The background color of the box"
 msgstr "Cor de fondo da caixa"
 
-#: ../clutter/deprecated/clutter-box.c:274
+#: ../clutter/deprecated/clutter-box.c:270
 msgid "Color Set"
 msgstr "Estabelecer a cor"
 
-#: ../clutter/deprecated/clutter-cairo-texture.c:597
+#: ../clutter/deprecated/clutter-cairo-texture.c:593
 msgid "Surface Width"
 msgstr "Largura da superficie"
 
-#: ../clutter/deprecated/clutter-cairo-texture.c:598
+#: ../clutter/deprecated/clutter-cairo-texture.c:594
 msgid "The width of the Cairo surface"
 msgstr "A largura da superficie de Cairo"
 
-#: ../clutter/deprecated/clutter-cairo-texture.c:615
+#: ../clutter/deprecated/clutter-cairo-texture.c:611
 msgid "Surface Height"
 msgstr "Altura da superficie"
 
-#: ../clutter/deprecated/clutter-cairo-texture.c:616
+#: ../clutter/deprecated/clutter-cairo-texture.c:612
 msgid "The height of the Cairo surface"
 msgstr "A altura da superficie de Cairo"
 
-#: ../clutter/deprecated/clutter-cairo-texture.c:636
+#: ../clutter/deprecated/clutter-cairo-texture.c:632
 msgid "Auto Resize"
 msgstr "Redimensionar automaticamente"
 
-#: ../clutter/deprecated/clutter-cairo-texture.c:637
+#: ../clutter/deprecated/clutter-cairo-texture.c:633
 msgid "Whether the surface should match the allocation"
 msgstr "Indica se a superficie debe coincidir coa asignación"
 
@@ -2389,104 +2409,160 @@ msgstr "O nivel de ateigamento do búfer"
 msgid "The duration of the stream, in seconds"
 msgstr "A duración do fluxo, en segundos"
 
-#: ../clutter/deprecated/clutter-rectangle.c:274
+#: ../clutter/deprecated/clutter-rectangle.c:271
 msgid "The color of the rectangle"
 msgstr "A cor do rectángulo"
 
-#: ../clutter/deprecated/clutter-rectangle.c:287
+#: ../clutter/deprecated/clutter-rectangle.c:284
 msgid "Border Color"
 msgstr "Cor do bordo"
 
-#: ../clutter/deprecated/clutter-rectangle.c:288
+#: ../clutter/deprecated/clutter-rectangle.c:285
 msgid "The color of the border of the rectangle"
 msgstr "A cor do bordo do rectángulo"
 
-#: ../clutter/deprecated/clutter-rectangle.c:303
+#: ../clutter/deprecated/clutter-rectangle.c:300
 msgid "Border Width"
 msgstr "Largura do bordo"
 
-#: ../clutter/deprecated/clutter-rectangle.c:304
+#: ../clutter/deprecated/clutter-rectangle.c:301
 msgid "The width of the border of the rectangle"
 msgstr "A largura do bordo do rectángulo"
 
-#: ../clutter/deprecated/clutter-rectangle.c:318
+#: ../clutter/deprecated/clutter-rectangle.c:315
 msgid "Has Border"
 msgstr "Ten bordo"
 
-#: ../clutter/deprecated/clutter-rectangle.c:319
+#: ../clutter/deprecated/clutter-rectangle.c:316
 msgid "Whether the rectangle should have a border"
 msgstr "Cando o rectángulo debe ter bordo"
 
-#: ../clutter/deprecated/clutter-shader.c:261
+#: ../clutter/deprecated/clutter-shader.c:257
 msgid "Vertex Source"
 msgstr "Orixe do vértice"
 
-#: ../clutter/deprecated/clutter-shader.c:262
+#: ../clutter/deprecated/clutter-shader.c:258
 msgid "Source of vertex shader"
 msgstr "Orixe do vértice de sombreado"
 
-#: ../clutter/deprecated/clutter-shader.c:278
+#: ../clutter/deprecated/clutter-shader.c:274
 msgid "Fragment Source"
 msgstr "Orixe do fragmento"
 
-#: ../clutter/deprecated/clutter-shader.c:279
+#: ../clutter/deprecated/clutter-shader.c:275
 msgid "Source of fragment shader"
 msgstr "Orixe do fragmento de sombreado"
 
-#: ../clutter/deprecated/clutter-shader.c:296
+#: ../clutter/deprecated/clutter-shader.c:292
 msgid "Compiled"
 msgstr "Compilado"
 
-#: ../clutter/deprecated/clutter-shader.c:297
+#: ../clutter/deprecated/clutter-shader.c:293
 msgid "Whether the shader is compiled and linked"
 msgstr "Cando o sombreado é compilado e ligado"
 
-#: ../clutter/deprecated/clutter-shader.c:314
+#: ../clutter/deprecated/clutter-shader.c:310
 msgid "Whether the shader is enabled"
 msgstr "Cando o sombreado está activado"
 
-#: ../clutter/deprecated/clutter-shader.c:525
+#: ../clutter/deprecated/clutter-shader.c:521
 #, c-format
 msgid "%s compilation failed: %s"
 msgstr "%s produciuse un fallo na compilación: %s"
 
-#: ../clutter/deprecated/clutter-shader.c:526
+#: ../clutter/deprecated/clutter-shader.c:522
 msgid "Vertex shader"
 msgstr "Vértice de sombreado"
 
-#: ../clutter/deprecated/clutter-shader.c:527
+#: ../clutter/deprecated/clutter-shader.c:523
 msgid "Fragment shader"
 msgstr "Sombreado de fragmentos"
 
-#: ../clutter/deprecated/clutter-state.c:1505
+#: ../clutter/deprecated/clutter-state.c:1499
 msgid "State"
 msgstr "Estado"
 
-#: ../clutter/deprecated/clutter-state.c:1506
+#: ../clutter/deprecated/clutter-state.c:1500
 msgid "Currently set state, (transition to this state might not be complete)"
 msgstr ""
 "Estado actual da configuración (é posíbel que a transición a este estado non "
 "fose completada)"
 
-#: ../clutter/deprecated/clutter-state.c:1524
+#: ../clutter/deprecated/clutter-state.c:1518
 msgid "Default transition duration"
 msgstr "Duración predeterminada da transición"
 
-#: ../clutter/deprecated/clutter-texture.c:994
+#: ../clutter/deprecated/clutter-table-layout.c:543
+msgid "Column Number"
+msgstr "Número de columna"
+
+#: ../clutter/deprecated/clutter-table-layout.c:544
+msgid "The column the widget resides in"
+msgstr "A columna na que reside o trebello"
+
+#: ../clutter/deprecated/clutter-table-layout.c:551
+msgid "Row Number"
+msgstr "Número de fila"
+
+#: ../clutter/deprecated/clutter-table-layout.c:552
+msgid "The row the widget resides in"
+msgstr "A liña na que reside o trebello"
+
+#: ../clutter/deprecated/clutter-table-layout.c:559
+msgid "Column Span"
+msgstr "Columna por cela"
+
+#: ../clutter/deprecated/clutter-table-layout.c:560
+msgid "The number of columns the widget should span"
+msgstr "O número de columnas que debe agrupar o trebello"
+
+#: ../clutter/deprecated/clutter-table-layout.c:567
+msgid "Row Span"
+msgstr "Liña por cela"
+
+#: ../clutter/deprecated/clutter-table-layout.c:568
+msgid "The number of rows the widget should span"
+msgstr "O número de liñas que debe agrupar o trebello"
+
+#: ../clutter/deprecated/clutter-table-layout.c:575
+msgid "Horizontal Expand"
+msgstr "Expansión horizontal"
+
+#: ../clutter/deprecated/clutter-table-layout.c:576
+msgid "Allocate extra space for the child in horizontal axis"
+msgstr "Asigna espazo extra para o fillo no eixo horizontal"
+
+#: ../clutter/deprecated/clutter-table-layout.c:582
+msgid "Vertical Expand"
+msgstr "Expansión vertical"
+
+#: ../clutter/deprecated/clutter-table-layout.c:583
+msgid "Allocate extra space for the child in vertical axis"
+msgstr "Asigna espazo extra para o fillo no eixo vertical"
+
+#: ../clutter/deprecated/clutter-table-layout.c:1638
+msgid "Spacing between columns"
+msgstr "Espazamento entre columnas"
+
+#: ../clutter/deprecated/clutter-table-layout.c:1654
+msgid "Spacing between rows"
+msgstr "Espazamento entre filas"
+
+#: ../clutter/deprecated/clutter-texture.c:992
 msgid "Sync size of actor"
 msgstr "Sincronizar o tamaño do actor"
 
-#: ../clutter/deprecated/clutter-texture.c:995
+#: ../clutter/deprecated/clutter-texture.c:993
 msgid "Auto sync size of actor to underlying pixbuf dimensions"
 msgstr ""
 "Sincronización automática do tamaño do actor ás dimensións subxacentes do "
 "«pixbuf»"
 
-#: ../clutter/deprecated/clutter-texture.c:1002
+#: ../clutter/deprecated/clutter-texture.c:1000
 msgid "Disable Slicing"
 msgstr "Desactivar segmentado"
 
-#: ../clutter/deprecated/clutter-texture.c:1003
+#: ../clutter/deprecated/clutter-texture.c:1001
 msgid ""
 "Forces the underlying texture to be singular and not made of smaller space "
 "saving individual textures"
@@ -2494,73 +2570,73 @@ msgstr ""
 "Forza que a textura subxacente sexa singular e que non sexa feita de "
 "pequenos espazos gardados de texturas individuais."
 
-#: ../clutter/deprecated/clutter-texture.c:1012
+#: ../clutter/deprecated/clutter-texture.c:1010
 msgid "Tile Waste"
 msgstr "Tesela de residuo"
 
-#: ../clutter/deprecated/clutter-texture.c:1013
+#: ../clutter/deprecated/clutter-texture.c:1011
 msgid "Maximum waste area of a sliced texture"
 msgstr "A área máxima dun residuo en segmentos de textura"
 
-#: ../clutter/deprecated/clutter-texture.c:1021
+#: ../clutter/deprecated/clutter-texture.c:1019
 msgid "Horizontal repeat"
 msgstr "Repetición horizontal"
 
-#: ../clutter/deprecated/clutter-texture.c:1022
+#: ../clutter/deprecated/clutter-texture.c:1020
 msgid "Repeat the contents rather than scaling them horizontally"
 msgstr "Repetir o contido no canto de escalalo en horizontal."
 
-#: ../clutter/deprecated/clutter-texture.c:1029
+#: ../clutter/deprecated/clutter-texture.c:1027
 msgid "Vertical repeat"
 msgstr "Repetición vertical"
 
-#: ../clutter/deprecated/clutter-texture.c:1030
+#: ../clutter/deprecated/clutter-texture.c:1028
 msgid "Repeat the contents rather than scaling them vertically"
 msgstr "Repetir o contido no canto de escalalo en vertical"
 
-#: ../clutter/deprecated/clutter-texture.c:1037
+#: ../clutter/deprecated/clutter-texture.c:1035
 msgid "Filter Quality"
 msgstr "Calidade final"
 
-#: ../clutter/deprecated/clutter-texture.c:1038
+#: ../clutter/deprecated/clutter-texture.c:1036
 msgid "Rendering quality used when drawing the texture"
 msgstr "Calidade do renderizado cando se debuxa a textura."
 
-#: ../clutter/deprecated/clutter-texture.c:1046
+#: ../clutter/deprecated/clutter-texture.c:1044
 msgid "Pixel Format"
 msgstr "Formato do píxel"
 
-#: ../clutter/deprecated/clutter-texture.c:1047
+#: ../clutter/deprecated/clutter-texture.c:1045
 msgid "The Cogl pixel format to use"
 msgstr "O formato do píxel COGL que empregar"
 
-#: ../clutter/deprecated/clutter-texture.c:1055
-#: ../clutter/wayland/clutter-wayland-surface.c:449
+#: ../clutter/deprecated/clutter-texture.c:1053
+#: ../clutter/wayland/clutter-wayland-surface.c:445
 msgid "Cogl Texture"
 msgstr "Textura COGL"
 
-#: ../clutter/deprecated/clutter-texture.c:1056
-#: ../clutter/wayland/clutter-wayland-surface.c:450
+#: ../clutter/deprecated/clutter-texture.c:1054
+#: ../clutter/wayland/clutter-wayland-surface.c:446
 msgid "The underlying Cogl texture handle used to draw this actor"
 msgstr "A textura COGL subxacente empregada para debuxar este actor"
 
-#: ../clutter/deprecated/clutter-texture.c:1063
+#: ../clutter/deprecated/clutter-texture.c:1061
 msgid "Cogl Material"
 msgstr "Material COGL"
 
-#: ../clutter/deprecated/clutter-texture.c:1064
+#: ../clutter/deprecated/clutter-texture.c:1062
 msgid "The underlying Cogl material handle used to draw this actor"
 msgstr "O material COGL subxacente empregado para debuxar este actor"
 
-#: ../clutter/deprecated/clutter-texture.c:1083
+#: ../clutter/deprecated/clutter-texture.c:1081
 msgid "The path of the file containing the image data"
 msgstr "A ruta do ficheiro que conten os datos da imaxe"
 
-#: ../clutter/deprecated/clutter-texture.c:1090
+#: ../clutter/deprecated/clutter-texture.c:1088
 msgid "Keep Aspect Ratio"
 msgstr "Manter a relación de aspecto"
 
-#: ../clutter/deprecated/clutter-texture.c:1091
+#: ../clutter/deprecated/clutter-texture.c:1089
 msgid ""
 "Keep the aspect ratio of the texture when requesting the preferred width or "
 "height"
@@ -2568,22 +2644,22 @@ msgstr ""
 "Manter a relación de aspecto da textura cando se require unha largura ou "
 "unha altura preferida"
 
-#: ../clutter/deprecated/clutter-texture.c:1119
+#: ../clutter/deprecated/clutter-texture.c:1117
 msgid "Load asynchronously"
 msgstr "Carga de forma asíncrona"
 
-#: ../clutter/deprecated/clutter-texture.c:1120
+#: ../clutter/deprecated/clutter-texture.c:1118
 msgid ""
 "Load files inside a thread to avoid blocking when loading images from disk"
 msgstr ""
 "Cargar ficheiros dentro dun fío para evitar o bloqueo ao cargar as imaxes "
 "desde o disco."
 
-#: ../clutter/deprecated/clutter-texture.c:1138
+#: ../clutter/deprecated/clutter-texture.c:1136
 msgid "Load data asynchronously"
 msgstr "Carga os datos de forma asíncrona"
 
-#: ../clutter/deprecated/clutter-texture.c:1139
+#: ../clutter/deprecated/clutter-texture.c:1137
 msgid ""
 "Decode image data files inside a thread to reduce blocking when loading "
 "images from disk"
@@ -2591,199 +2667,195 @@ msgstr ""
 "Descodificar os ficheiros de datos de imaxes dentro dun fío para reducir o "
 "bloqueo ao cargar imaxes desde o disco."
 
-#: ../clutter/deprecated/clutter-texture.c:1165
+#: ../clutter/deprecated/clutter-texture.c:1163
 msgid "Pick With Alpha"
 msgstr "Seleccione con alfa"
 
-#: ../clutter/deprecated/clutter-texture.c:1166
+#: ../clutter/deprecated/clutter-texture.c:1164
 msgid "Shape actor with alpha channel when picking"
 msgstr "Cando se selecciona a forma actor leva canle alfa"
 
-#: ../clutter/deprecated/clutter-texture.c:1599
-#: ../clutter/deprecated/clutter-texture.c:1994
-#: ../clutter/deprecated/clutter-texture.c:2090
-#: ../clutter/deprecated/clutter-texture.c:2388
+#: ../clutter/deprecated/clutter-texture.c:1597
+#: ../clutter/deprecated/clutter-texture.c:1992
+#: ../clutter/deprecated/clutter-texture.c:2088
+#: ../clutter/deprecated/clutter-texture.c:2386
 #, c-format
 msgid "Failed to load the image data"
 msgstr "Produciuse un erro ao cargar os datos da imaxe"
 
-#: ../clutter/deprecated/clutter-texture.c:1758
+#: ../clutter/deprecated/clutter-texture.c:1756
 #, c-format
 msgid "YUV textures are not supported"
 msgstr "Non se admiten as texturas YUV"
 
-#: ../clutter/deprecated/clutter-texture.c:1767
+#: ../clutter/deprecated/clutter-texture.c:1765
 #, c-format
 msgid "YUV2 textues are not supported"
 msgstr "Non se admiten as texturas YUV2"
 
-#: ../clutter/evdev/clutter-input-device-evdev.c:159
-msgid "sysfs Path"
-msgstr "Ruta a «sysfs»"
-
-#: ../clutter/evdev/clutter-input-device-evdev.c:160
-msgid "Path of the device in sysfs"
-msgstr "Ruta ao dispositivo en «sysfs»"
-
-#: ../clutter/evdev/clutter-input-device-evdev.c:175
-msgid "Device Path"
-msgstr "Ruta ao dispositivo"
-
-#: ../clutter/evdev/clutter-input-device-evdev.c:176
-msgid "Path of the device node"
-msgstr "Ruta ao nodo do dispositivo"
-
-#: ../clutter/gdk/clutter-backend-gdk.c:296
+#: ../clutter/gdk/clutter-backend-gdk.c:289
 #, c-format
 msgid "Could not find a suitable CoglWinsys for a GdkDisplay of type %s"
 msgstr ""
 "Non foi posíbel atopar un CoglWinsys axeitado para un GdkDisplay do tipo %s"
 
-#: ../clutter/wayland/clutter-wayland-surface.c:423
+#: ../clutter/wayland/clutter-wayland-surface.c:419
 msgid "Surface"
 msgstr "Superficie"
 
-#: ../clutter/wayland/clutter-wayland-surface.c:424
+#: ../clutter/wayland/clutter-wayland-surface.c:420
 msgid "The underlying wayland surface"
 msgstr "A superficie Wayland subxacente"
 
-#: ../clutter/wayland/clutter-wayland-surface.c:431
+#: ../clutter/wayland/clutter-wayland-surface.c:427
 msgid "Surface width"
 msgstr "Anchura da superficie"
 
-#: ../clutter/wayland/clutter-wayland-surface.c:432
+#: ../clutter/wayland/clutter-wayland-surface.c:428
 msgid "The width of the underlying wayland surface"
 msgstr "A anchura da superficie Wayland subxacente"
 
-#: ../clutter/wayland/clutter-wayland-surface.c:440
+#: ../clutter/wayland/clutter-wayland-surface.c:436
 msgid "Surface height"
 msgstr "Altura da superficie"
 
-#: ../clutter/wayland/clutter-wayland-surface.c:441
+#: ../clutter/wayland/clutter-wayland-surface.c:437
 msgid "The height of the underlying wayland surface"
 msgstr "A altura da superificie Wayland subxacente"
 
-#: ../clutter/x11/clutter-backend-x11.c:516
+#: ../clutter/x11/clutter-backend-x11.c:488
 msgid "X display to use"
 msgstr "Visor [display] X que usar"
 
-#: ../clutter/x11/clutter-backend-x11.c:522
+#: ../clutter/x11/clutter-backend-x11.c:494
 msgid "X screen to use"
 msgstr "Pantalla [screen] X que usar"
 
-#: ../clutter/x11/clutter-backend-x11.c:527
+#: ../clutter/x11/clutter-backend-x11.c:499
 msgid "Make X calls synchronous"
 msgstr "Facer que as chamadas a X sexan síncronas"
 
-#: ../clutter/x11/clutter-backend-x11.c:534
+#: ../clutter/x11/clutter-backend-x11.c:506
 msgid "Disable XInput support"
 msgstr "Desactivar a compatibilidade con XInput"
 
-#: ../clutter/x11/clutter-keymap-x11.c:317
+#: ../clutter/x11/clutter-keymap-x11.c:322
 msgid "The Clutter backend"
 msgstr "Infraestrutura do Clutter"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:539
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:534
 msgid "Pixmap"
 msgstr "Mapa de píxeles"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:540
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:535
 msgid "The X11 Pixmap to be bound"
 msgstr "Asociar o mapa de píxeles X11"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:548
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:543
 msgid "Pixmap width"
 msgstr "Largura do mapa de píxeles"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:549
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:544
 msgid "The width of the pixmap bound to this texture"
 msgstr "A largura do mapa de píxeles asociado a esta textura"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:557
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:552
 msgid "Pixmap height"
 msgstr "Altura do mapa de píxeles"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:558
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:553
 msgid "The height of the pixmap bound to this texture"
 msgstr "A altura do mapa de píxeles asociado a esta textura"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:566
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:561
 msgid "Pixmap Depth"
 msgstr "Profundidade do mapa de píxeles"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:567
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:562
 msgid "The depth (in number of bits) of the pixmap bound to this texture"
 msgstr ""
 "A profundidade (en número de bits) do mapa de píxeles asociado a esta textura"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:575
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:570
 msgid "Automatic Updates"
 msgstr "Actualizacións automáticas"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:576
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:571
 msgid "If the texture should be kept in sync with any pixmap changes."
 msgstr ""
 "Se a textura debe manterse sincronizada con calquera cambio do mapa de "
 "píxeles."
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:584
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:579
 msgid "Window"
 msgstr "Xanela"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:585
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:580
 msgid "The X11 Window to be bound"
 msgstr "A xanela X11 que asociar"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:593
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:588
 msgid "Window Redirect Automatic"
 msgstr "Redirixir a xanela automaticamente"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:594
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:589
 msgid "If composite window redirects are set to Automatic (or Manual if false)"
 msgstr ""
 "Se a redirección da xanela composta estabelecese en automática (ou manual de "
 "ser falso)"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:604
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:599
 msgid "Window Mapped"
 msgstr "Mapeamento da xanela"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:605
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:600
 msgid "If window is mapped"
 msgstr "Se a xanela é mapeada"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:614
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:609
 msgid "Destroyed"
 msgstr "Destruída"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:615
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:610
 msgid "If window has been destroyed"
 msgstr "Se a xanela foi destruída"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:623
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:618
 msgid "Window X"
 msgstr "Xanela X"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:624
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:619
 msgid "X position of window on screen according to X11"
 msgstr "Posición X da xanela na pantalla conforme X11"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:632
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:627
 msgid "Window Y"
 msgstr "Xanela Y"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:633
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:628
 msgid "Y position of window on screen according to X11"
 msgstr "Posición Y da xanela na pantalla conforme X11"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:640
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:635
 msgid "Window Override Redirect"
 msgstr "Redireccionar substituír a xanela"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:641
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:636
 msgid "If this is an override-redirect window"
 msgstr "De ser unha substitución-redirección da xanela"
 
+#~ msgid "sysfs Path"
+#~ msgstr "Ruta a «sysfs»"
+
+#~ msgid "Path of the device in sysfs"
+#~ msgstr "Ruta ao dispositivo en «sysfs»"
+
+#~ msgid "Device Path"
+#~ msgstr "Ruta ao dispositivo"
+
+#~ msgid "Path of the device node"
+#~ msgstr "Ruta ao nodo do dispositivo"
+
 #~ msgid "Easing Delay"
 #~ msgstr "Retardo da desaceleración"
 
diff --git a/po/he.po b/po/he.po
index 31fc31189..9870d6c84 100644
--- a/po/he.po
+++ b/po/he.po
@@ -2,17 +2,18 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # Yaron Shahrabani <sh.yaron@gmail.com>, 2011.
+# Yosef Or Boczko <yoseforb@gmail.com>, 2013, 2014.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: Clutter\n"
-"Report-Msgid-Bugs-To: http://bugzilla.clutter-project.org/enter_bug.cgi?"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=clutter\n"
-"POT-Creation-Date: 2012-03-09 16:01+0100\n"
-"PO-Revision-Date: 2011-10-22 15:48+0200\n"
-"Last-Translator: Yaron Shahrabani <sh.yaron@gmail.com>\n"
-"Language-Team: Yaron Shahrabani <sh.yaron@gmail.com>\n"
-"Language: \n"
+"POT-Creation-Date: 2014-08-28 18:08+0300\n"
+"PO-Revision-Date: 2014-08-28 18:09+0300\n"
+"Last-Translator: Yosef Or Boczko <yoseforb@gmail.com>\n"
+"Language-Team: עברית <>\n"
+"Language: he\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -20,1193 +21,1324 @@ msgstr ""
 "X-Poedit-Language: Hebrew\n"
 "X-Poedit-Country: ISRAEL\n"
 "X-Poedit-SourceCharset: UTF-8\n"
+"X-Generator: Gtranslator 2.91.6\n"
 
-#: ../clutter/clutter-actor.c:3877
+#: ../clutter/clutter-actor.c:6224
 msgid "X coordinate"
-msgstr ""
+msgstr "X coordinate"
 
-#: ../clutter/clutter-actor.c:3878
+#: ../clutter/clutter-actor.c:6225
 msgid "X coordinate of the actor"
-msgstr ""
+msgstr "X coordinate of the actor"
 
-#: ../clutter/clutter-actor.c:3893
+#: ../clutter/clutter-actor.c:6243
 msgid "Y coordinate"
-msgstr ""
+msgstr "Y coordinate"
 
-#: ../clutter/clutter-actor.c:3894
+#: ../clutter/clutter-actor.c:6244
 msgid "Y coordinate of the actor"
-msgstr ""
+msgstr "Y coordinate of the actor"
 
-#: ../clutter/clutter-actor.c:3909
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:479
+#: ../clutter/clutter-actor.c:6266
+msgid "Position"
+msgstr "Position"
+
+#: ../clutter/clutter-actor.c:6267
+msgid "The position of the origin of the actor"
+msgstr "The position of the origin of the actor"
+
+#: ../clutter/clutter-actor.c:6284 ../clutter/clutter-canvas.c:247
+#: ../clutter/clutter-grid-layout.c:1239
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:474
 msgid "Width"
-msgstr ""
+msgstr "Width"
 
-#: ../clutter/clutter-actor.c:3910
+#: ../clutter/clutter-actor.c:6285
 msgid "Width of the actor"
-msgstr ""
+msgstr "Width of the actor"
 
-#: ../clutter/clutter-actor.c:3924
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:495
+#: ../clutter/clutter-actor.c:6303 ../clutter/clutter-canvas.c:263
+#: ../clutter/clutter-grid-layout.c:1246
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:490
 msgid "Height"
-msgstr ""
+msgstr "Height"
 
-#: ../clutter/clutter-actor.c:3925
+#: ../clutter/clutter-actor.c:6304
 msgid "Height of the actor"
-msgstr ""
+msgstr "Height of the actor"
 
-#: ../clutter/clutter-actor.c:3943
+#: ../clutter/clutter-actor.c:6325
+msgid "Size"
+msgstr "Size"
+
+#: ../clutter/clutter-actor.c:6326
+msgid "The size of the actor"
+msgstr "The size of the actor"
+
+#: ../clutter/clutter-actor.c:6344
 msgid "Fixed X"
-msgstr ""
+msgstr "Fixed X"
 
-#: ../clutter/clutter-actor.c:3944
+#: ../clutter/clutter-actor.c:6345
 msgid "Forced X position of the actor"
-msgstr ""
+msgstr "Forced X position of the actor"
 
-#: ../clutter/clutter-actor.c:3962
+#: ../clutter/clutter-actor.c:6362
 msgid "Fixed Y"
-msgstr ""
+msgstr "Fixed Y"
 
-#: ../clutter/clutter-actor.c:3963
+#: ../clutter/clutter-actor.c:6363
 msgid "Forced Y position of the actor"
-msgstr ""
+msgstr "Forced Y position of the actor"
 
-#: ../clutter/clutter-actor.c:3979
+#: ../clutter/clutter-actor.c:6378
 msgid "Fixed position set"
-msgstr ""
+msgstr "Fixed position set"
 
-#: ../clutter/clutter-actor.c:3980
+#: ../clutter/clutter-actor.c:6379
 msgid "Whether to use fixed positioning for the actor"
-msgstr ""
+msgstr "Whether to use fixed positioning for the actor"
 
-#: ../clutter/clutter-actor.c:4002
+#: ../clutter/clutter-actor.c:6397
 msgid "Min Width"
-msgstr ""
+msgstr "Min Width"
 
-#: ../clutter/clutter-actor.c:4003
+#: ../clutter/clutter-actor.c:6398
 msgid "Forced minimum width request for the actor"
-msgstr ""
+msgstr "Forced minimum width request for the actor"
 
-#: ../clutter/clutter-actor.c:4022
+#: ../clutter/clutter-actor.c:6416
 msgid "Min Height"
-msgstr ""
+msgstr "Min Height"
 
-#: ../clutter/clutter-actor.c:4023
+#: ../clutter/clutter-actor.c:6417
 msgid "Forced minimum height request for the actor"
-msgstr ""
+msgstr "Forced minimum height request for the actor"
 
-#: ../clutter/clutter-actor.c:4042
+#: ../clutter/clutter-actor.c:6435
 msgid "Natural Width"
-msgstr ""
+msgstr "Natural Width"
 
-#: ../clutter/clutter-actor.c:4043
+#: ../clutter/clutter-actor.c:6436
 msgid "Forced natural width request for the actor"
-msgstr ""
+msgstr "Forced natural width request for the actor"
 
-#: ../clutter/clutter-actor.c:4062
+#: ../clutter/clutter-actor.c:6454
 msgid "Natural Height"
-msgstr ""
+msgstr "Natural Height"
 
-#: ../clutter/clutter-actor.c:4063
+#: ../clutter/clutter-actor.c:6455
 msgid "Forced natural height request for the actor"
-msgstr ""
+msgstr "Forced natural height request for the actor"
 
-#: ../clutter/clutter-actor.c:4079
+#: ../clutter/clutter-actor.c:6470
 msgid "Minimum width set"
-msgstr ""
+msgstr "Minimum width set"
 
-#: ../clutter/clutter-actor.c:4080
+#: ../clutter/clutter-actor.c:6471
 msgid "Whether to use the min-width property"
-msgstr ""
+msgstr "Whether to use the min-width property"
 
-#: ../clutter/clutter-actor.c:4095
+#: ../clutter/clutter-actor.c:6485
 msgid "Minimum height set"
-msgstr ""
+msgstr "Minimum height set"
 
-#: ../clutter/clutter-actor.c:4096
+#: ../clutter/clutter-actor.c:6486
 msgid "Whether to use the min-height property"
-msgstr ""
+msgstr "Whether to use the min-height property"
 
-#: ../clutter/clutter-actor.c:4111
+#: ../clutter/clutter-actor.c:6500
 msgid "Natural width set"
-msgstr ""
+msgstr "Natural width set"
 
-#: ../clutter/clutter-actor.c:4112
+#: ../clutter/clutter-actor.c:6501
 msgid "Whether to use the natural-width property"
-msgstr ""
+msgstr "Whether to use the natural-width property"
 
-#: ../clutter/clutter-actor.c:4129
+#: ../clutter/clutter-actor.c:6515
 msgid "Natural height set"
-msgstr ""
+msgstr "Natural height set"
 
-#: ../clutter/clutter-actor.c:4130
+#: ../clutter/clutter-actor.c:6516
 msgid "Whether to use the natural-height property"
-msgstr ""
+msgstr "Whether to use the natural-height property"
 
-#: ../clutter/clutter-actor.c:4149
+#: ../clutter/clutter-actor.c:6532
 msgid "Allocation"
-msgstr ""
+msgstr "Allocation"
 
-#: ../clutter/clutter-actor.c:4150
+#: ../clutter/clutter-actor.c:6533
 msgid "The actor's allocation"
-msgstr ""
+msgstr "The actor's allocation"
 
-#: ../clutter/clutter-actor.c:4206
+#: ../clutter/clutter-actor.c:6590
 msgid "Request Mode"
-msgstr ""
+msgstr "Request Mode"
 
-#: ../clutter/clutter-actor.c:4207
+#: ../clutter/clutter-actor.c:6591
 msgid "The actor's request mode"
-msgstr ""
+msgstr "The actor's request mode"
 
-#: ../clutter/clutter-actor.c:4222
+#: ../clutter/clutter-actor.c:6615
 msgid "Depth"
-msgstr ""
+msgstr "Depth"
 
-#: ../clutter/clutter-actor.c:4223
+#: ../clutter/clutter-actor.c:6616
 msgid "Position on the Z axis"
-msgstr ""
+msgstr "Position on the Z axis"
 
-#: ../clutter/clutter-actor.c:4237
+#: ../clutter/clutter-actor.c:6643
+msgid "Z Position"
+msgstr "Z Position"
+
+#: ../clutter/clutter-actor.c:6644
+msgid "The actor's position on the Z axis"
+msgstr "The actor's position on the Z axis"
+
+#: ../clutter/clutter-actor.c:6661
 msgid "Opacity"
-msgstr ""
+msgstr "Opacity"
 
-#: ../clutter/clutter-actor.c:4238
+#: ../clutter/clutter-actor.c:6662
 msgid "Opacity of an actor"
-msgstr ""
+msgstr "Opacity of an actor"
 
-#: ../clutter/clutter-actor.c:4257
+#: ../clutter/clutter-actor.c:6682
 msgid "Offscreen redirect"
-msgstr ""
+msgstr "Offscreen redirect"
 
-#: ../clutter/clutter-actor.c:4258
+#: ../clutter/clutter-actor.c:6683
 msgid "Flags controlling when to flatten the actor into a single image"
-msgstr ""
+msgstr "Flags controlling when to flatten the actor into a single image"
 
-#: ../clutter/clutter-actor.c:4276
+#: ../clutter/clutter-actor.c:6697
 msgid "Visible"
-msgstr ""
+msgstr "Visible"
 
-#: ../clutter/clutter-actor.c:4277
+#: ../clutter/clutter-actor.c:6698
 msgid "Whether the actor is visible or not"
-msgstr ""
+msgstr "Whether the actor is visible or not"
 
-#: ../clutter/clutter-actor.c:4292
+#: ../clutter/clutter-actor.c:6712
 msgid "Mapped"
-msgstr ""
+msgstr "Mapped"
 
-#: ../clutter/clutter-actor.c:4293
+#: ../clutter/clutter-actor.c:6713
 msgid "Whether the actor will be painted"
-msgstr ""
+msgstr "Whether the actor will be painted"
 
-#: ../clutter/clutter-actor.c:4307
+#: ../clutter/clutter-actor.c:6726
 msgid "Realized"
-msgstr ""
+msgstr "Realized"
 
-#: ../clutter/clutter-actor.c:4308
+#: ../clutter/clutter-actor.c:6727
 msgid "Whether the actor has been realized"
-msgstr ""
+msgstr "Whether the actor has been realized"
 
-#: ../clutter/clutter-actor.c:4324
+#: ../clutter/clutter-actor.c:6742
 msgid "Reactive"
-msgstr ""
+msgstr "Reactive"
 
-#: ../clutter/clutter-actor.c:4325
+#: ../clutter/clutter-actor.c:6743
 msgid "Whether the actor is reactive to events"
-msgstr ""
+msgstr "Whether the actor is reactive to events"
 
-#: ../clutter/clutter-actor.c:4337
+#: ../clutter/clutter-actor.c:6754
 msgid "Has Clip"
-msgstr ""
+msgstr "Has Clip"
 
-#: ../clutter/clutter-actor.c:4338
+#: ../clutter/clutter-actor.c:6755
 msgid "Whether the actor has a clip set"
-msgstr ""
+msgstr "Whether the actor has a clip set"
 
-#: ../clutter/clutter-actor.c:4353
+#: ../clutter/clutter-actor.c:6768
 msgid "Clip"
-msgstr ""
+msgstr "Clip"
 
-#: ../clutter/clutter-actor.c:4354
+#: ../clutter/clutter-actor.c:6769
 msgid "The clip region for the actor"
-msgstr ""
+msgstr "The clip region for the actor"
 
-#: ../clutter/clutter-actor.c:4368
-#: ../clutter/clutter-actor-meta.c:207
-#: ../clutter/clutter-binding-pool.c:319
-#: ../clutter/clutter-input-device.c:236
+#: ../clutter/clutter-actor.c:6788
+msgid "Clip Rectangle"
+msgstr "Clip Rectangle"
+
+#: ../clutter/clutter-actor.c:6789
+msgid "The visible region of the actor"
+msgstr "The visible region of the actor"
+
+#: ../clutter/clutter-actor.c:6803 ../clutter/clutter-actor-meta.c:205
+#: ../clutter/clutter-binding-pool.c:318 ../clutter/clutter-input-device.c:247
 msgid "Name"
-msgstr ""
+msgstr "Name"
 
-#: ../clutter/clutter-actor.c:4369
+#: ../clutter/clutter-actor.c:6804
 msgid "Name of the actor"
-msgstr ""
+msgstr "Name of the actor"
 
-#: ../clutter/clutter-actor.c:4383
+#: ../clutter/clutter-actor.c:6825
+msgid "Pivot Point"
+msgstr "Pivot Point"
+
+#: ../clutter/clutter-actor.c:6826
+msgid "The point around which the scaling and rotation occur"
+msgstr "The point around which the scaling and rotation occur"
+
+#: ../clutter/clutter-actor.c:6844
+msgid "Pivot Point Z"
+msgstr "Pivot Point Z"
+
+#: ../clutter/clutter-actor.c:6845
+msgid "Z component of the pivot point"
+msgstr "Z component of the pivot point"
+
+#: ../clutter/clutter-actor.c:6863
 msgid "Scale X"
-msgstr ""
+msgstr "Scale X"
 
-#: ../clutter/clutter-actor.c:4384
+#: ../clutter/clutter-actor.c:6864
 msgid "Scale factor on the X axis"
-msgstr ""
+msgstr "Scale factor on the X axis"
 
-#: ../clutter/clutter-actor.c:4399
+#: ../clutter/clutter-actor.c:6882
 msgid "Scale Y"
-msgstr ""
+msgstr "Scale Y"
 
-#: ../clutter/clutter-actor.c:4400
+#: ../clutter/clutter-actor.c:6883
 msgid "Scale factor on the Y axis"
-msgstr ""
+msgstr "Scale factor on the Y axis"
 
-#: ../clutter/clutter-actor.c:4415
+#: ../clutter/clutter-actor.c:6901
+msgid "Scale Z"
+msgstr "Scale Z"
+
+#: ../clutter/clutter-actor.c:6902
+msgid "Scale factor on the Z axis"
+msgstr "Scale factor on the Z axis"
+
+#: ../clutter/clutter-actor.c:6920
 msgid "Scale Center X"
-msgstr ""
+msgstr "Scale Center X"
 
-#: ../clutter/clutter-actor.c:4416
+#: ../clutter/clutter-actor.c:6921
 msgid "Horizontal scale center"
-msgstr ""
+msgstr "Horizontal scale center"
 
-#: ../clutter/clutter-actor.c:4431
+#: ../clutter/clutter-actor.c:6939
 msgid "Scale Center Y"
-msgstr ""
+msgstr "Scale Center Y"
 
-#: ../clutter/clutter-actor.c:4432
+#: ../clutter/clutter-actor.c:6940
 msgid "Vertical scale center"
-msgstr ""
+msgstr "Vertical scale center"
 
-#: ../clutter/clutter-actor.c:4447
+#: ../clutter/clutter-actor.c:6958
 msgid "Scale Gravity"
-msgstr ""
+msgstr "Scale Gravity"
 
-#: ../clutter/clutter-actor.c:4448
+#: ../clutter/clutter-actor.c:6959
 msgid "The center of scaling"
-msgstr ""
+msgstr "The center of scaling"
 
-#: ../clutter/clutter-actor.c:4465
+#: ../clutter/clutter-actor.c:6977
 msgid "Rotation Angle X"
-msgstr ""
+msgstr "Rotation Angle X"
 
-#: ../clutter/clutter-actor.c:4466
+#: ../clutter/clutter-actor.c:6978
 msgid "The rotation angle on the X axis"
-msgstr ""
+msgstr "The rotation angle on the X axis"
 
-#: ../clutter/clutter-actor.c:4481
+#: ../clutter/clutter-actor.c:6996
 msgid "Rotation Angle Y"
-msgstr ""
+msgstr "Rotation Angle Y"
 
-#: ../clutter/clutter-actor.c:4482
+#: ../clutter/clutter-actor.c:6997
 msgid "The rotation angle on the Y axis"
-msgstr ""
+msgstr "The rotation angle on the Y axis"
 
-#: ../clutter/clutter-actor.c:4497
+#: ../clutter/clutter-actor.c:7015
 msgid "Rotation Angle Z"
-msgstr ""
+msgstr "Rotation Angle Z"
 
-#: ../clutter/clutter-actor.c:4498
+#: ../clutter/clutter-actor.c:7016
 msgid "The rotation angle on the Z axis"
-msgstr ""
+msgstr "The rotation angle on the Z axis"
 
-#: ../clutter/clutter-actor.c:4513
+#: ../clutter/clutter-actor.c:7034
 msgid "Rotation Center X"
-msgstr ""
+msgstr "Rotation Center X"
 
-#: ../clutter/clutter-actor.c:4514
+#: ../clutter/clutter-actor.c:7035
 msgid "The rotation center on the X axis"
-msgstr ""
+msgstr "The rotation center on the X axis"
 
-#: ../clutter/clutter-actor.c:4530
+#: ../clutter/clutter-actor.c:7052
 msgid "Rotation Center Y"
-msgstr ""
+msgstr "Rotation Center Y"
 
-#: ../clutter/clutter-actor.c:4531
+#: ../clutter/clutter-actor.c:7053
 msgid "The rotation center on the Y axis"
-msgstr ""
+msgstr "The rotation center on the Y axis"
 
-#: ../clutter/clutter-actor.c:4547
+#: ../clutter/clutter-actor.c:7070
 msgid "Rotation Center Z"
-msgstr ""
+msgstr "Rotation Center Z"
 
-#: ../clutter/clutter-actor.c:4548
+#: ../clutter/clutter-actor.c:7071
 msgid "The rotation center on the Z axis"
-msgstr ""
+msgstr "The rotation center on the Z axis"
 
-#: ../clutter/clutter-actor.c:4564
+#: ../clutter/clutter-actor.c:7088
 msgid "Rotation Center Z Gravity"
-msgstr ""
+msgstr "Rotation Center Z Gravity"
 
-#: ../clutter/clutter-actor.c:4565
+#: ../clutter/clutter-actor.c:7089
 msgid "Center point for rotation around the Z axis"
-msgstr ""
+msgstr "Center point for rotation around the Z axis"
 
-#: ../clutter/clutter-actor.c:4583
+#: ../clutter/clutter-actor.c:7117
 msgid "Anchor X"
-msgstr ""
+msgstr "Anchor X"
 
-#: ../clutter/clutter-actor.c:4584
+#: ../clutter/clutter-actor.c:7118
 msgid "X coordinate of the anchor point"
-msgstr ""
+msgstr "X coordinate of the anchor point"
 
-#: ../clutter/clutter-actor.c:4600
+#: ../clutter/clutter-actor.c:7146
 msgid "Anchor Y"
-msgstr ""
+msgstr "Anchor Y"
 
-#: ../clutter/clutter-actor.c:4601
+#: ../clutter/clutter-actor.c:7147
 msgid "Y coordinate of the anchor point"
-msgstr ""
+msgstr "Y coordinate of the anchor point"
 
-#: ../clutter/clutter-actor.c:4616
+#: ../clutter/clutter-actor.c:7174
 msgid "Anchor Gravity"
-msgstr ""
+msgstr "Anchor Gravity"
 
-#: ../clutter/clutter-actor.c:4617
+#: ../clutter/clutter-actor.c:7175
 msgid "The anchor point as a ClutterGravity"
-msgstr ""
+msgstr "The anchor point as a ClutterGravity"
 
-#: ../clutter/clutter-actor.c:4636
+#: ../clutter/clutter-actor.c:7194
+msgid "Translation X"
+msgstr "Translation X"
+
+#: ../clutter/clutter-actor.c:7195
+msgid "Translation along the X axis"
+msgstr "Translation along the X axis"
+
+#: ../clutter/clutter-actor.c:7214
+msgid "Translation Y"
+msgstr "Translation Y"
+
+#: ../clutter/clutter-actor.c:7215
+msgid "Translation along the Y axis"
+msgstr "Translation along the Y axis"
+
+#: ../clutter/clutter-actor.c:7234
+msgid "Translation Z"
+msgstr "Translation Z"
+
+#: ../clutter/clutter-actor.c:7235
+msgid "Translation along the Z axis"
+msgstr "Translation along the Z axis"
+
+#: ../clutter/clutter-actor.c:7265
+msgid "Transform"
+msgstr "Transform"
+
+#: ../clutter/clutter-actor.c:7266
+msgid "Transformation matrix"
+msgstr "Transformation matrix"
+
+#: ../clutter/clutter-actor.c:7281
+msgid "Transform Set"
+msgstr "Transform Set"
+
+#: ../clutter/clutter-actor.c:7282
+msgid "Whether the transform property is set"
+msgstr "Whether the transform property is set"
+
+#: ../clutter/clutter-actor.c:7303
+msgid "Child Transform"
+msgstr "Child Transform"
+
+#: ../clutter/clutter-actor.c:7304
+msgid "Children transformation matrix"
+msgstr "Children transformation matrix"
+
+#: ../clutter/clutter-actor.c:7319
+msgid "Child Transform Set"
+msgstr "Child Transform Set"
+
+#: ../clutter/clutter-actor.c:7320
+msgid "Whether the child-transform property is set"
+msgstr "Whether the child-transform property is set"
+
+#: ../clutter/clutter-actor.c:7337
 msgid "Show on set parent"
-msgstr ""
+msgstr "Show on set parent"
 
-#: ../clutter/clutter-actor.c:4637
+#: ../clutter/clutter-actor.c:7338
 msgid "Whether the actor is shown when parented"
-msgstr ""
+msgstr "Whether the actor is shown when parented"
 
-#: ../clutter/clutter-actor.c:4657
+#: ../clutter/clutter-actor.c:7355
 msgid "Clip to Allocation"
-msgstr ""
+msgstr "Clip to Allocation"
 
-#: ../clutter/clutter-actor.c:4658
+#: ../clutter/clutter-actor.c:7356
 msgid "Sets the clip region to track the actor's allocation"
-msgstr ""
+msgstr "Sets the clip region to track the actor's allocation"
 
-#: ../clutter/clutter-actor.c:4668
+#: ../clutter/clutter-actor.c:7369
 msgid "Text Direction"
-msgstr ""
+msgstr "Text Direction"
 
-#: ../clutter/clutter-actor.c:4669
+#: ../clutter/clutter-actor.c:7370
 msgid "Direction of the text"
-msgstr ""
+msgstr "Direction of the text"
 
-#: ../clutter/clutter-actor.c:4687
+#: ../clutter/clutter-actor.c:7385
 msgid "Has Pointer"
-msgstr ""
+msgstr "Has Pointer"
 
-#: ../clutter/clutter-actor.c:4688
+#: ../clutter/clutter-actor.c:7386
 msgid "Whether the actor contains the pointer of an input device"
-msgstr ""
+msgstr "Whether the actor contains the pointer of an input device"
 
-#: ../clutter/clutter-actor.c:4705
+#: ../clutter/clutter-actor.c:7399
 msgid "Actions"
-msgstr ""
+msgstr "Actions"
 
-#: ../clutter/clutter-actor.c:4706
+#: ../clutter/clutter-actor.c:7400
 msgid "Adds an action to the actor"
-msgstr ""
+msgstr "Adds an action to the actor"
 
-#: ../clutter/clutter-actor.c:4720
+#: ../clutter/clutter-actor.c:7413
 msgid "Constraints"
-msgstr ""
+msgstr "Constraints"
 
-#: ../clutter/clutter-actor.c:4721
+#: ../clutter/clutter-actor.c:7414
 msgid "Adds a constraint to the actor"
-msgstr ""
+msgstr "Adds a constraint to the actor"
 
-#: ../clutter/clutter-actor.c:4735
+#: ../clutter/clutter-actor.c:7427
 msgid "Effect"
-msgstr ""
+msgstr "Effect"
 
-#: ../clutter/clutter-actor.c:4736
+#: ../clutter/clutter-actor.c:7428
 msgid "Add an effect to be applied on the actor"
-msgstr ""
+msgstr "Add an effect to be applied on the actor"
 
-#: ../clutter/clutter-actor-meta.c:193
-#: ../clutter/clutter-child-meta.c:142
+#: ../clutter/clutter-actor.c:7442
+msgid "Layout Manager"
+msgstr "Layout Manager"
+
+#: ../clutter/clutter-actor.c:7443
+msgid "The object controlling the layout of an actor's children"
+msgstr "The object controlling the layout of an actor's children"
+
+#: ../clutter/clutter-actor.c:7457
+msgid "X Expand"
+msgstr "X Expand"
+
+#: ../clutter/clutter-actor.c:7458
+msgid "Whether extra horizontal space should be assigned to the actor"
+msgstr "Whether extra horizontal space should be assigned to the actor"
+
+#: ../clutter/clutter-actor.c:7473
+msgid "Y Expand"
+msgstr "Y Expand"
+
+#: ../clutter/clutter-actor.c:7474
+msgid "Whether extra vertical space should be assigned to the actor"
+msgstr "Whether extra vertical space should be assigned to the actor"
+
+#: ../clutter/clutter-actor.c:7490
+msgid "X Alignment"
+msgstr "X Alignment"
+
+#: ../clutter/clutter-actor.c:7491
+msgid "The alignment of the actor on the X axis within its allocation"
+msgstr "The alignment of the actor on the X axis within its allocation"
+
+#: ../clutter/clutter-actor.c:7506
+msgid "Y Alignment"
+msgstr "Y Alignment"
+
+#: ../clutter/clutter-actor.c:7507
+msgid "The alignment of the actor on the Y axis within its allocation"
+msgstr "The alignment of the actor on the Y axis within its allocation"
+
+#: ../clutter/clutter-actor.c:7526
+msgid "Margin Top"
+msgstr "Margin Top"
+
+#: ../clutter/clutter-actor.c:7527
+msgid "Extra space at the top"
+msgstr "Extra space at the top"
+
+#: ../clutter/clutter-actor.c:7548
+msgid "Margin Bottom"
+msgstr "Margin Bottom"
+
+#: ../clutter/clutter-actor.c:7549
+msgid "Extra space at the bottom"
+msgstr "Extra space at the bottom"
+
+#: ../clutter/clutter-actor.c:7570
+msgid "Margin Left"
+msgstr "Margin Left"
+
+#: ../clutter/clutter-actor.c:7571
+msgid "Extra space at the left"
+msgstr "Extra space at the left"
+
+#: ../clutter/clutter-actor.c:7592
+msgid "Margin Right"
+msgstr "Margin Right"
+
+#: ../clutter/clutter-actor.c:7593
+msgid "Extra space at the right"
+msgstr "Extra space at the right"
+
+#: ../clutter/clutter-actor.c:7609
+msgid "Background Color Set"
+msgstr "Background Color Set"
+
+#: ../clutter/clutter-actor.c:7610 ../clutter/deprecated/clutter-box.c:269
+msgid "Whether the background color is set"
+msgstr "Whether the background color is set"
+
+#: ../clutter/clutter-actor.c:7626
+msgid "Background color"
+msgstr "Background color"
+
+#: ../clutter/clutter-actor.c:7627
+msgid "The actor's background color"
+msgstr "The actor's background color"
+
+#: ../clutter/clutter-actor.c:7642
+msgid "First Child"
+msgstr "First Child"
+
+#: ../clutter/clutter-actor.c:7643
+msgid "The actor's first child"
+msgstr "The actor's first child"
+
+#: ../clutter/clutter-actor.c:7656
+msgid "Last Child"
+msgstr "Last Child"
+
+#: ../clutter/clutter-actor.c:7657
+msgid "The actor's last child"
+msgstr "The actor's last child"
+
+#: ../clutter/clutter-actor.c:7671
+msgid "Content"
+msgstr "Content"
+
+#: ../clutter/clutter-actor.c:7672
+msgid "Delegate object for painting the actor's content"
+msgstr "Delegate object for painting the actor's content"
+
+#: ../clutter/clutter-actor.c:7697
+msgid "Content Gravity"
+msgstr "Content Gravity"
+
+#: ../clutter/clutter-actor.c:7698
+msgid "Alignment of the actor's content"
+msgstr "Alignment of the actor's content"
+
+#: ../clutter/clutter-actor.c:7718
+msgid "Content Box"
+msgstr "Content Box"
+
+#: ../clutter/clutter-actor.c:7719
+msgid "The bounding box of the actor's content"
+msgstr "The bounding box of the actor's content"
+
+#: ../clutter/clutter-actor.c:7727
+msgid "Minification Filter"
+msgstr "Minification Filter"
+
+#: ../clutter/clutter-actor.c:7728
+msgid "The filter used when reducing the size of the content"
+msgstr "The filter used when reducing the size of the content"
+
+#: ../clutter/clutter-actor.c:7735
+msgid "Magnification Filter"
+msgstr "Magnification Filter"
+
+#: ../clutter/clutter-actor.c:7736
+msgid "The filter used when increasing the size of the content"
+msgstr "The filter used when increasing the size of the content"
+
+#: ../clutter/clutter-actor.c:7750
+msgid "Content Repeat"
+msgstr "Content Repeat"
+
+#: ../clutter/clutter-actor.c:7751
+msgid "The repeat policy for the actor's content"
+msgstr "The repeat policy for the actor's content"
+
+#: ../clutter/clutter-actor-meta.c:191 ../clutter/clutter-child-meta.c:142
 msgid "Actor"
-msgstr ""
+msgstr "Actor"
 
-#: ../clutter/clutter-actor-meta.c:194
+#: ../clutter/clutter-actor-meta.c:192
 msgid "The actor attached to the meta"
-msgstr ""
+msgstr "The actor attached to the meta"
 
-#: ../clutter/clutter-actor-meta.c:208
+#: ../clutter/clutter-actor-meta.c:206
 msgid "The name of the meta"
-msgstr ""
+msgstr "The name of the meta"
 
-#: ../clutter/clutter-actor-meta.c:221
-#: ../clutter/clutter-input-device.c:315
+#: ../clutter/clutter-actor-meta.c:219 ../clutter/clutter-input-device.c:326
 #: ../clutter/deprecated/clutter-shader.c:309
 msgid "Enabled"
-msgstr ""
+msgstr "Enabled"
 
-#: ../clutter/clutter-actor-meta.c:222
+#: ../clutter/clutter-actor-meta.c:220
 msgid "Whether the meta is enabled"
-msgstr ""
+msgstr "Whether the meta is enabled"
 
-#: ../clutter/clutter-align-constraint.c:281
-#: ../clutter/clutter-bind-constraint.c:349
-#: ../clutter/clutter-clone.c:345
+#: ../clutter/clutter-align-constraint.c:279
+#: ../clutter/clutter-bind-constraint.c:343 ../clutter/clutter-clone.c:341
 #: ../clutter/clutter-snap-constraint.c:321
 msgid "Source"
-msgstr ""
+msgstr "Source"
 
-#: ../clutter/clutter-align-constraint.c:282
+#: ../clutter/clutter-align-constraint.c:280
 msgid "The source of the alignment"
-msgstr ""
+msgstr "The source of the alignment"
 
-#: ../clutter/clutter-align-constraint.c:295
+#: ../clutter/clutter-align-constraint.c:293
 msgid "Align Axis"
-msgstr ""
+msgstr "Align Axis"
 
-#: ../clutter/clutter-align-constraint.c:296
+#: ../clutter/clutter-align-constraint.c:294
 msgid "The axis to align the position to"
-msgstr ""
+msgstr "The axis to align the position to"
 
-#: ../clutter/clutter-align-constraint.c:315
-#: ../clutter/clutter-desaturate-effect.c:304
+#: ../clutter/clutter-align-constraint.c:313
+#: ../clutter/clutter-desaturate-effect.c:270
 msgid "Factor"
-msgstr ""
+msgstr "Factor"
 
-#: ../clutter/clutter-align-constraint.c:316
+#: ../clutter/clutter-align-constraint.c:314
 msgid "The alignment factor, between 0.0 and 1.0"
-msgstr ""
+msgstr "The alignment factor, between 0.0 and 1.0"
 
-#: ../clutter/clutter-alpha.c:345
-#: ../clutter/clutter-animation.c:538
-#: ../clutter/clutter-animator.c:1802
-msgid "Timeline"
-msgstr ""
+#: ../clutter/clutter-backend.c:380
+msgid "Unable to initialize the Clutter backend"
+msgstr "Unable to initialize the Clutter backend"
 
-#: ../clutter/clutter-alpha.c:346
-msgid "Timeline used by the alpha"
-msgstr ""
+#: ../clutter/clutter-backend.c:454
+#, c-format
+msgid "The backend of type '%s' does not support creating multiple stages"
+msgstr "The backend of type '%s' does not support creating multiple stages"
 
-#: ../clutter/clutter-alpha.c:361
-msgid "Alpha value"
-msgstr ""
-
-#: ../clutter/clutter-alpha.c:362
-msgid "Alpha value as computed by the alpha"
-msgstr ""
-
-#: ../clutter/clutter-alpha.c:382
-#: ../clutter/clutter-animation.c:494
-msgid "Mode"
-msgstr ""
-
-#: ../clutter/clutter-alpha.c:383
-msgid "Progress mode"
-msgstr ""
-
-#: ../clutter/clutter-animation.c:478
-msgid "Object"
-msgstr ""
-
-#: ../clutter/clutter-animation.c:479
-msgid "Object to which the animation applies"
-msgstr ""
-
-#: ../clutter/clutter-animation.c:495
-msgid "The mode of the animation"
-msgstr ""
-
-#: ../clutter/clutter-animation.c:509
-#: ../clutter/clutter-animator.c:1786
-#: ../clutter/clutter-media.c:194
-#: ../clutter/clutter-state.c:1486
-#: ../clutter/clutter-timeline.c:294
-msgid "Duration"
-msgstr ""
-
-#: ../clutter/clutter-animation.c:510
-msgid "Duration of the animation, in milliseconds"
-msgstr ""
-
-#: ../clutter/clutter-animation.c:524
-#: ../clutter/clutter-timeline.c:263
-msgid "Loop"
-msgstr ""
-
-#: ../clutter/clutter-animation.c:525
-msgid "Whether the animation should loop"
-msgstr ""
-
-#: ../clutter/clutter-animation.c:539
-msgid "The timeline used by the animation"
-msgstr ""
-
-#: ../clutter/clutter-animation.c:552
-#: ../clutter/deprecated/clutter-behaviour.c:240
-msgid "Alpha"
-msgstr ""
-
-#: ../clutter/clutter-animation.c:553
-msgid "The alpha used by the animation"
-msgstr ""
-
-#: ../clutter/clutter-animator.c:1787
-msgid "The duration of the animation"
-msgstr ""
-
-#: ../clutter/clutter-animator.c:1803
-msgid "The timeline of the animation"
-msgstr ""
-
-#: ../clutter/deprecated/clutter-behaviour.c:241
-msgid "Alpha Object to drive the behaviour"
-msgstr ""
-
-#: ../clutter/deprecated/clutter-behaviour-depth.c:180
-msgid "Start Depth"
-msgstr ""
-
-#: ../clutter/deprecated/clutter-behaviour-depth.c:181
-msgid "Initial depth to apply"
-msgstr ""
-
-#: ../clutter/deprecated/clutter-behaviour-depth.c:196
-msgid "End Depth"
-msgstr ""
-
-#: ../clutter/deprecated/clutter-behaviour-depth.c:197
-msgid "Final depth to apply"
-msgstr ""
-
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:399
-msgid "Start Angle"
-msgstr ""
-
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:400
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:282
-msgid "Initial angle"
-msgstr ""
-
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:415
-msgid "End Angle"
-msgstr ""
-
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:416
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:300
-msgid "Final angle"
-msgstr ""
-
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:431
-msgid "Angle x tilt"
-msgstr ""
-
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:432
-msgid "Tilt of the ellipse around x axis"
-msgstr ""
-
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:447
-msgid "Angle y tilt"
-msgstr ""
-
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:448
-msgid "Tilt of the ellipse around y axis"
-msgstr ""
-
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:463
-msgid "Angle z tilt"
-msgstr ""
-
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:464
-msgid "Tilt of the ellipse around z axis"
-msgstr ""
-
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:480
-msgid "Width of the ellipse"
-msgstr ""
-
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:496
-msgid "Height of ellipse"
-msgstr ""
-
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:511
-msgid "Center"
-msgstr ""
-
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:512
-msgid "Center of ellipse"
-msgstr ""
-
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:526
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:335
-#: ../clutter/clutter-timeline.c:310
-msgid "Direction"
-msgstr ""
-
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:527
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:336
-msgid "Direction of rotation"
-msgstr ""
-
-#: ../clutter/deprecated/clutter-behaviour-opacity.c:183
-msgid "Opacity Start"
-msgstr ""
-
-#: ../clutter/deprecated/clutter-behaviour-opacity.c:184
-msgid "Initial opacity level"
-msgstr ""
-
-#: ../clutter/deprecated/clutter-behaviour-opacity.c:201
-msgid "Opacity End"
-msgstr ""
-
-#: ../clutter/deprecated/clutter-behaviour-opacity.c:202
-msgid "Final opacity level"
-msgstr ""
-
-#: ../clutter/deprecated/clutter-behaviour-path.c:224
-#: ../clutter/clutter-path-constraint.c:212
-msgid "Path"
-msgstr ""
-
-#: ../clutter/deprecated/clutter-behaviour-path.c:225
-msgid "The ClutterPath object representing the path to animate along"
-msgstr ""
-
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:281
-msgid "Angle Begin"
-msgstr ""
-
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:299
-msgid "Angle End"
-msgstr ""
-
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:317
-msgid "Axis"
-msgstr ""
-
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:318
-msgid "Axis of rotation"
-msgstr ""
-
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:353
-msgid "Center X"
-msgstr ""
-
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:354
-msgid "X coordinate of the center of rotation"
-msgstr ""
-
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:371
-msgid "Center Y"
-msgstr ""
-
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:372
-msgid "Y coordinate of the center of rotation"
-msgstr ""
-
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:389
-msgid "Center Z"
-msgstr ""
-
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:390
-msgid "Z coordinate of the center of rotation"
-msgstr ""
-
-#: ../clutter/deprecated/clutter-behaviour-scale.c:224
-msgid "X Start Scale"
-msgstr ""
-
-#: ../clutter/deprecated/clutter-behaviour-scale.c:225
-msgid "Initial scale on the X axis"
-msgstr ""
-
-#: ../clutter/deprecated/clutter-behaviour-scale.c:243
-msgid "X End Scale"
-msgstr ""
-
-#: ../clutter/deprecated/clutter-behaviour-scale.c:244
-msgid "Final scale on the X axis"
-msgstr ""
-
-#: ../clutter/deprecated/clutter-behaviour-scale.c:262
-msgid "Y Start Scale"
-msgstr ""
-
-#: ../clutter/deprecated/clutter-behaviour-scale.c:263
-msgid "Initial scale on the Y axis"
-msgstr ""
-
-#: ../clutter/deprecated/clutter-behaviour-scale.c:281
-msgid "Y End Scale"
-msgstr ""
-
-#: ../clutter/deprecated/clutter-behaviour-scale.c:282
-msgid "Final scale on the Y axis"
-msgstr ""
-
-#: ../clutter/clutter-bind-constraint.c:350
+#: ../clutter/clutter-bind-constraint.c:344
 msgid "The source of the binding"
-msgstr ""
+msgstr "The source of the binding"
 
-#: ../clutter/clutter-bind-constraint.c:363
+#: ../clutter/clutter-bind-constraint.c:357
 msgid "Coordinate"
-msgstr ""
+msgstr "Coordinate"
 
-#: ../clutter/clutter-bind-constraint.c:364
+#: ../clutter/clutter-bind-constraint.c:358
 msgid "The coordinate to bind"
-msgstr ""
+msgstr "The coordinate to bind"
 
-#: ../clutter/clutter-bind-constraint.c:378
+#: ../clutter/clutter-bind-constraint.c:372
 #: ../clutter/clutter-path-constraint.c:226
 #: ../clutter/clutter-snap-constraint.c:366
 msgid "Offset"
-msgstr ""
+msgstr "Offset"
 
-#: ../clutter/clutter-bind-constraint.c:379
+#: ../clutter/clutter-bind-constraint.c:373
 msgid "The offset in pixels to apply to the binding"
-msgstr ""
+msgstr "The offset in pixels to apply to the binding"
 
-#: ../clutter/clutter-binding-pool.c:320
+#: ../clutter/clutter-binding-pool.c:319
 msgid "The unique name of the binding pool"
-msgstr ""
+msgstr "The unique name of the binding pool"
 
-#: ../clutter/clutter-bin-layout.c:261
-#: ../clutter/clutter-bin-layout.c:585
-#: ../clutter/clutter-box-layout.c:395
-#: ../clutter/clutter-table-layout.c:652
+#: ../clutter/clutter-bin-layout.c:220 ../clutter/clutter-bin-layout.c:633
+#: ../clutter/clutter-box-layout.c:374
+#: ../clutter/deprecated/clutter-table-layout.c:602
 msgid "Horizontal Alignment"
-msgstr ""
+msgstr "Horizontal Alignment"
 
-#: ../clutter/clutter-bin-layout.c:262
+#: ../clutter/clutter-bin-layout.c:221
 msgid "Horizontal alignment for the actor inside the layout manager"
-msgstr ""
+msgstr "Horizontal alignment for the actor inside the layout manager"
 
-#: ../clutter/clutter-bin-layout.c:270
-#: ../clutter/clutter-bin-layout.c:602
-#: ../clutter/clutter-box-layout.c:404
-#: ../clutter/clutter-table-layout.c:667
+#: ../clutter/clutter-bin-layout.c:229 ../clutter/clutter-bin-layout.c:653
+#: ../clutter/clutter-box-layout.c:383
+#: ../clutter/deprecated/clutter-table-layout.c:617
 msgid "Vertical Alignment"
-msgstr ""
+msgstr "Vertical Alignment"
 
-#: ../clutter/clutter-bin-layout.c:271
+#: ../clutter/clutter-bin-layout.c:230
 msgid "Vertical alignment for the actor inside the layout manager"
-msgstr ""
+msgstr "Vertical alignment for the actor inside the layout manager"
 
-#: ../clutter/clutter-bin-layout.c:586
+#: ../clutter/clutter-bin-layout.c:634
 msgid "Default horizontal alignment for the actors inside the layout manager"
-msgstr ""
+msgstr "Default horizontal alignment for the actors inside the layout manager"
 
-#: ../clutter/clutter-bin-layout.c:603
+#: ../clutter/clutter-bin-layout.c:654
 msgid "Default vertical alignment for the actors inside the layout manager"
-msgstr ""
+msgstr "Default vertical alignment for the actors inside the layout manager"
 
-#: ../clutter/clutter-box.c:544
-msgid "Layout Manager"
-msgstr ""
-
-#: ../clutter/clutter-box.c:545
-msgid "The layout manager used by the box"
-msgstr ""
-
-#: ../clutter/clutter-box.c:564
-#: ../clutter/clutter-rectangle.c:267
-#: ../clutter/clutter-stage.c:1790
-msgid "Color"
-msgstr ""
-
-#: ../clutter/clutter-box.c:565
-msgid "The background color of the box"
-msgstr ""
-
-#: ../clutter/clutter-box.c:579
-msgid "Color Set"
-msgstr ""
-
-#: ../clutter/clutter-box.c:580
-msgid "Whether the background color is set"
-msgstr ""
-
-#: ../clutter/clutter-box-layout.c:370
+#: ../clutter/clutter-box-layout.c:349
 msgid "Expand"
-msgstr ""
+msgstr "Expand"
 
-#: ../clutter/clutter-box-layout.c:371
+#: ../clutter/clutter-box-layout.c:350
 msgid "Allocate extra space for the child"
-msgstr ""
+msgstr "Allocate extra space for the child"
 
-#: ../clutter/clutter-box-layout.c:377
-#: ../clutter/clutter-table-layout.c:631
+#: ../clutter/clutter-box-layout.c:356
+#: ../clutter/deprecated/clutter-table-layout.c:581
 msgid "Horizontal Fill"
-msgstr ""
+msgstr "Horizontal Fill"
 
-#: ../clutter/clutter-box-layout.c:378
-#: ../clutter/clutter-table-layout.c:632
-msgid "Whether the child should receive priority when the container is allocating spare space on the horizontal axis"
+#: ../clutter/clutter-box-layout.c:357
+#: ../clutter/deprecated/clutter-table-layout.c:582
+msgid ""
+"Whether the child should receive priority when the container is allocating "
+"spare space on the horizontal axis"
 msgstr ""
+"Whether the child should receive priority when the container is allocating "
+"spare space on the horizontal axis"
 
-#: ../clutter/clutter-box-layout.c:386
-#: ../clutter/clutter-table-layout.c:638
+#: ../clutter/clutter-box-layout.c:365
+#: ../clutter/deprecated/clutter-table-layout.c:588
 msgid "Vertical Fill"
-msgstr ""
+msgstr "Vertical Fill"
 
-#: ../clutter/clutter-box-layout.c:387
-#: ../clutter/clutter-table-layout.c:639
-msgid "Whether the child should receive priority when the container is allocating spare space on the vertical axis"
+#: ../clutter/clutter-box-layout.c:366
+#: ../clutter/deprecated/clutter-table-layout.c:589
+msgid ""
+"Whether the child should receive priority when the container is allocating "
+"spare space on the vertical axis"
 msgstr ""
+"Whether the child should receive priority when the container is allocating "
+"spare space on the vertical axis"
 
-#: ../clutter/clutter-box-layout.c:396
-#: ../clutter/clutter-table-layout.c:653
+#: ../clutter/clutter-box-layout.c:375
+#: ../clutter/deprecated/clutter-table-layout.c:603
 msgid "Horizontal alignment of the actor within the cell"
-msgstr ""
+msgstr "Horizontal alignment of the actor within the cell"
 
-#: ../clutter/clutter-box-layout.c:405
-#: ../clutter/clutter-table-layout.c:668
+#: ../clutter/clutter-box-layout.c:384
+#: ../clutter/deprecated/clutter-table-layout.c:618
 msgid "Vertical alignment of the actor within the cell"
-msgstr ""
+msgstr "Vertical alignment of the actor within the cell"
 
-#: ../clutter/clutter-box-layout.c:1303
+#: ../clutter/clutter-box-layout.c:1345
 msgid "Vertical"
-msgstr ""
+msgstr "Vertical"
 
-#: ../clutter/clutter-box-layout.c:1304
+#: ../clutter/clutter-box-layout.c:1346
 msgid "Whether the layout should be vertical, rather than horizontal"
-msgstr ""
+msgstr "Whether the layout should be vertical, rather than horizontal"
 
-#: ../clutter/clutter-box-layout.c:1319
-#: ../clutter/clutter-flow-layout.c:901
+#: ../clutter/clutter-box-layout.c:1363 ../clutter/clutter-flow-layout.c:927
+#: ../clutter/clutter-grid-layout.c:1549
+msgid "Orientation"
+msgstr "Orientation"
+
+#: ../clutter/clutter-box-layout.c:1364 ../clutter/clutter-flow-layout.c:928
+#: ../clutter/clutter-grid-layout.c:1550
+msgid "The orientation of the layout"
+msgstr "The orientation of the layout"
+
+#: ../clutter/clutter-box-layout.c:1380 ../clutter/clutter-flow-layout.c:943
 msgid "Homogeneous"
-msgstr ""
+msgstr "Homogeneous"
 
-#: ../clutter/clutter-box-layout.c:1320
-msgid "Whether the layout should be homogeneous, i.e. all childs get the same size"
+#: ../clutter/clutter-box-layout.c:1381
+msgid ""
+"Whether the layout should be homogeneous, i.e. all childs get the same size"
 msgstr ""
+"Whether the layout should be homogeneous, i.e. all childs get the same size"
 
-#: ../clutter/clutter-box-layout.c:1335
+#: ../clutter/clutter-box-layout.c:1396
 msgid "Pack Start"
-msgstr ""
+msgstr "Pack Start"
 
-#: ../clutter/clutter-box-layout.c:1336
+#: ../clutter/clutter-box-layout.c:1397
 msgid "Whether to pack items at the start of the box"
-msgstr ""
+msgstr "Whether to pack items at the start of the box"
 
-#: ../clutter/clutter-box-layout.c:1349
+#: ../clutter/clutter-box-layout.c:1410
 msgid "Spacing"
-msgstr ""
+msgstr "Spacing"
 
-#: ../clutter/clutter-box-layout.c:1350
+#: ../clutter/clutter-box-layout.c:1411
 msgid "Spacing between children"
-msgstr ""
+msgstr "Spacing between children"
 
-#: ../clutter/clutter-box-layout.c:1364
-#: ../clutter/clutter-table-layout.c:1742
+#: ../clutter/clutter-box-layout.c:1428
+#: ../clutter/deprecated/clutter-table-layout.c:1669
 msgid "Use Animations"
-msgstr ""
+msgstr "Use Animations"
 
-#: ../clutter/clutter-box-layout.c:1365
-#: ../clutter/clutter-table-layout.c:1743
+#: ../clutter/clutter-box-layout.c:1429
+#: ../clutter/deprecated/clutter-table-layout.c:1670
 msgid "Whether layout changes should be animated"
-msgstr ""
+msgstr "Whether layout changes should be animated"
 
-#: ../clutter/clutter-box-layout.c:1386
-#: ../clutter/clutter-table-layout.c:1764
+#: ../clutter/clutter-box-layout.c:1453
+#: ../clutter/deprecated/clutter-table-layout.c:1694
 msgid "Easing Mode"
-msgstr ""
+msgstr "Easing Mode"
 
-#: ../clutter/clutter-box-layout.c:1387
-#: ../clutter/clutter-table-layout.c:1765
+#: ../clutter/clutter-box-layout.c:1454
+#: ../clutter/deprecated/clutter-table-layout.c:1695
 msgid "The easing mode of the animations"
-msgstr ""
+msgstr "The easing mode of the animations"
 
-#: ../clutter/clutter-box-layout.c:1404
-#: ../clutter/clutter-table-layout.c:1782
+#: ../clutter/clutter-box-layout.c:1474
+#: ../clutter/deprecated/clutter-table-layout.c:1715
 msgid "Easing Duration"
-msgstr ""
+msgstr "Easing Duration"
 
-#: ../clutter/clutter-box-layout.c:1405
-#: ../clutter/clutter-table-layout.c:1783
+#: ../clutter/clutter-box-layout.c:1475
+#: ../clutter/deprecated/clutter-table-layout.c:1716
 msgid "The duration of the animations"
-msgstr ""
+msgstr "The duration of the animations"
 
-#: ../clutter/clutter-cairo-texture.c:582
-msgid "Surface Width"
-msgstr ""
+#: ../clutter/clutter-brightness-contrast-effect.c:321
+msgid "Brightness"
+msgstr "Brightness"
 
-#: ../clutter/clutter-cairo-texture.c:583
-msgid "The width of the Cairo surface"
-msgstr ""
+#: ../clutter/clutter-brightness-contrast-effect.c:322
+msgid "The brightness change to apply"
+msgstr "The brightness change to apply"
 
-#: ../clutter/clutter-cairo-texture.c:597
-msgid "Surface Height"
-msgstr ""
+#: ../clutter/clutter-brightness-contrast-effect.c:341
+msgid "Contrast"
+msgstr "Contrast"
 
-#: ../clutter/clutter-cairo-texture.c:598
-msgid "The height of the Cairo surface"
-msgstr ""
+#: ../clutter/clutter-brightness-contrast-effect.c:342
+msgid "The contrast change to apply"
+msgstr "The contrast change to apply"
 
-#: ../clutter/clutter-cairo-texture.c:615
-msgid "Auto Resize"
-msgstr ""
+#: ../clutter/clutter-canvas.c:248
+msgid "The width of the canvas"
+msgstr "The width of the canvas"
 
-#: ../clutter/clutter-cairo-texture.c:616
-msgid "Whether the surface should match the allocation"
-msgstr ""
+#: ../clutter/clutter-canvas.c:264
+msgid "The height of the canvas"
+msgstr "The height of the canvas"
+
+#: ../clutter/clutter-canvas.c:283
+msgid "Scale Factor Set"
+msgstr "Scale Factor Set"
+
+#: ../clutter/clutter-canvas.c:284
+msgid "Whether the scale-factor property is set"
+msgstr "Whether the scale-factor property is set"
+
+#: ../clutter/clutter-canvas.c:305
+msgid "Scale Factor"
+msgstr "Scale Factor"
+
+#: ../clutter/clutter-canvas.c:306
+msgid "The scaling factor for the surface"
+msgstr "The scaling factor for the surface"
 
 #: ../clutter/clutter-child-meta.c:127
 msgid "Container"
-msgstr ""
+msgstr "Container"
 
 #: ../clutter/clutter-child-meta.c:128
 msgid "The container that created this data"
-msgstr ""
+msgstr "The container that created this data"
 
 #: ../clutter/clutter-child-meta.c:143
 msgid "The actor wrapped by this data"
-msgstr ""
+msgstr "The actor wrapped by this data"
 
-#: ../clutter/clutter-click-action.c:542
+#: ../clutter/clutter-click-action.c:586
 msgid "Pressed"
-msgstr ""
+msgstr "Pressed"
 
-#: ../clutter/clutter-click-action.c:543
+#: ../clutter/clutter-click-action.c:587
 msgid "Whether the clickable should be in pressed state"
-msgstr ""
+msgstr "Whether the clickable should be in pressed state"
 
-#: ../clutter/clutter-click-action.c:556
+#: ../clutter/clutter-click-action.c:600
 msgid "Held"
-msgstr ""
+msgstr "Held"
 
-#: ../clutter/clutter-click-action.c:557
+#: ../clutter/clutter-click-action.c:601
 msgid "Whether the clickable has a grab"
-msgstr ""
+msgstr "Whether the clickable has a grab"
 
-#: ../clutter/clutter-click-action.c:574
-#: ../clutter/clutter-settings.c:598
+#: ../clutter/clutter-click-action.c:618 ../clutter/clutter-settings.c:672
 msgid "Long Press Duration"
-msgstr ""
+msgstr "Long Press Duration"
 
-#: ../clutter/clutter-click-action.c:575
+#: ../clutter/clutter-click-action.c:619
 msgid "The minimum duration of a long press to recognize the gesture"
-msgstr ""
+msgstr "The minimum duration of a long press to recognize the gesture"
 
-#: ../clutter/clutter-click-action.c:593
+#: ../clutter/clutter-click-action.c:637
 msgid "Long Press Threshold"
-msgstr ""
+msgstr "Long Press Threshold"
 
-#: ../clutter/clutter-click-action.c:594
+#: ../clutter/clutter-click-action.c:638
 msgid "The maximum threshold before a long press is cancelled"
-msgstr ""
+msgstr "The maximum threshold before a long press is cancelled"
 
-#: ../clutter/clutter-clone.c:346
+#: ../clutter/clutter-clone.c:342
 msgid "Specifies the actor to be cloned"
-msgstr ""
+msgstr "Specifies the actor to be cloned"
 
-#: ../clutter/clutter-colorize-effect.c:307
+#: ../clutter/clutter-colorize-effect.c:251
 msgid "Tint"
-msgstr ""
+msgstr "Tint"
 
-#: ../clutter/clutter-colorize-effect.c:308
+#: ../clutter/clutter-colorize-effect.c:252
 msgid "The tint to apply"
-msgstr ""
+msgstr "The tint to apply"
 
-#: ../clutter/clutter-deform-effect.c:547
+#: ../clutter/clutter-deform-effect.c:591
 msgid "Horizontal Tiles"
-msgstr ""
+msgstr "Horizontal Tiles"
 
-#: ../clutter/clutter-deform-effect.c:548
+#: ../clutter/clutter-deform-effect.c:592
 msgid "The number of horizontal tiles"
-msgstr ""
+msgstr "The number of horizontal tiles"
 
-#: ../clutter/clutter-deform-effect.c:563
+#: ../clutter/clutter-deform-effect.c:607
 msgid "Vertical Tiles"
-msgstr ""
+msgstr "Vertical Tiles"
 
-#: ../clutter/clutter-deform-effect.c:564
+#: ../clutter/clutter-deform-effect.c:608
 msgid "The number of vertical tiles"
-msgstr ""
+msgstr "The number of vertical tiles"
 
-#: ../clutter/clutter-deform-effect.c:581
+#: ../clutter/clutter-deform-effect.c:625
 msgid "Back Material"
-msgstr ""
+msgstr "Back Material"
 
-#: ../clutter/clutter-deform-effect.c:582
+#: ../clutter/clutter-deform-effect.c:626
 msgid "The material to be used when painting the back of the actor"
-msgstr ""
+msgstr "The material to be used when painting the back of the actor"
 
-#: ../clutter/clutter-desaturate-effect.c:305
+#: ../clutter/clutter-desaturate-effect.c:271
 msgid "The desaturation factor"
-msgstr ""
+msgstr "The desaturation factor"
 
-#: ../clutter/clutter-device-manager.c:131
-#: ../clutter/clutter-input-device.c:344
-#: ../clutter/x11/clutter-keymap-x11.c:316
+#: ../clutter/clutter-device-manager.c:127
+#: ../clutter/clutter-input-device.c:355
+#: ../clutter/x11/clutter-keymap-x11.c:457
 msgid "Backend"
-msgstr ""
+msgstr "Backend"
 
-#: ../clutter/clutter-device-manager.c:132
+#: ../clutter/clutter-device-manager.c:128
 msgid "The ClutterBackend of the device manager"
-msgstr ""
+msgstr "The ClutterBackend of the device manager"
 
-#: ../clutter/clutter-drag-action.c:596
+#: ../clutter/clutter-drag-action.c:733
 msgid "Horizontal Drag Threshold"
-msgstr ""
+msgstr "Horizontal Drag Threshold"
 
-#: ../clutter/clutter-drag-action.c:597
+#: ../clutter/clutter-drag-action.c:734
 msgid "The horizontal amount of pixels required to start dragging"
-msgstr ""
+msgstr "The horizontal amount of pixels required to start dragging"
 
-#: ../clutter/clutter-drag-action.c:624
+#: ../clutter/clutter-drag-action.c:761
 msgid "Vertical Drag Threshold"
-msgstr ""
+msgstr "Vertical Drag Threshold"
 
-#: ../clutter/clutter-drag-action.c:625
+#: ../clutter/clutter-drag-action.c:762
 msgid "The vertical amount of pixels required to start dragging"
-msgstr ""
+msgstr "The vertical amount of pixels required to start dragging"
 
-#: ../clutter/clutter-drag-action.c:646
+#: ../clutter/clutter-drag-action.c:783
 msgid "Drag Handle"
-msgstr ""
+msgstr "Drag Handle"
 
-#: ../clutter/clutter-drag-action.c:647
+#: ../clutter/clutter-drag-action.c:784
 msgid "The actor that is being dragged"
-msgstr ""
+msgstr "The actor that is being dragged"
 
-#: ../clutter/clutter-drag-action.c:660
+#: ../clutter/clutter-drag-action.c:797
 msgid "Drag Axis"
-msgstr ""
+msgstr "Drag Axis"
 
-#: ../clutter/clutter-drag-action.c:661
+#: ../clutter/clutter-drag-action.c:798
 msgid "Constraints the dragging to an axis"
-msgstr ""
+msgstr "Constraints the dragging to an axis"
 
-#: ../clutter/clutter-flow-layout.c:885
-msgid "Orientation"
-msgstr ""
+#: ../clutter/clutter-drag-action.c:814
+msgid "Drag Area"
+msgstr "Drag Area"
 
-#: ../clutter/clutter-flow-layout.c:886
-msgid "The orientation of the layout"
-msgstr ""
+#: ../clutter/clutter-drag-action.c:815
+msgid "Constrains the dragging to a rectangle"
+msgstr "Constrains the dragging to a rectangle"
 
-#: ../clutter/clutter-flow-layout.c:902
+#: ../clutter/clutter-drag-action.c:828
+msgid "Drag Area Set"
+msgstr "Drag Area Set"
+
+#: ../clutter/clutter-drag-action.c:829
+msgid "Whether the drag area is set"
+msgstr "Whether the drag area is set"
+
+#: ../clutter/clutter-flow-layout.c:944
 msgid "Whether each item should receive the same allocation"
-msgstr ""
+msgstr "Whether each item should receive the same allocation"
 
-#: ../clutter/clutter-flow-layout.c:917
-#: ../clutter/clutter-table-layout.c:1713
+#: ../clutter/clutter-flow-layout.c:959
+#: ../clutter/deprecated/clutter-table-layout.c:1629
 msgid "Column Spacing"
-msgstr ""
+msgstr "Column Spacing"
 
-#: ../clutter/clutter-flow-layout.c:918
+#: ../clutter/clutter-flow-layout.c:960
 msgid "The spacing between columns"
-msgstr ""
+msgstr "The spacing between columns"
 
-#: ../clutter/clutter-flow-layout.c:934
-#: ../clutter/clutter-table-layout.c:1727
+#: ../clutter/clutter-flow-layout.c:976
+#: ../clutter/deprecated/clutter-table-layout.c:1645
 msgid "Row Spacing"
-msgstr ""
+msgstr "Row Spacing"
 
-#: ../clutter/clutter-flow-layout.c:935
+#: ../clutter/clutter-flow-layout.c:977
 msgid "The spacing between rows"
-msgstr ""
+msgstr "The spacing between rows"
 
-#: ../clutter/clutter-flow-layout.c:949
+#: ../clutter/clutter-flow-layout.c:991
 msgid "Minimum Column Width"
-msgstr ""
+msgstr "Minimum Column Width"
 
-#: ../clutter/clutter-flow-layout.c:950
+#: ../clutter/clutter-flow-layout.c:992
 msgid "Minimum width for each column"
-msgstr ""
+msgstr "Minimum width for each column"
 
-#: ../clutter/clutter-flow-layout.c:965
+#: ../clutter/clutter-flow-layout.c:1007
 msgid "Maximum Column Width"
-msgstr ""
+msgstr "Maximum Column Width"
 
-#: ../clutter/clutter-flow-layout.c:966
+#: ../clutter/clutter-flow-layout.c:1008
 msgid "Maximum width for each column"
-msgstr ""
+msgstr "Maximum width for each column"
 
-#: ../clutter/clutter-flow-layout.c:980
+#: ../clutter/clutter-flow-layout.c:1022
 msgid "Minimum Row Height"
-msgstr ""
+msgstr "Minimum Row Height"
 
-#: ../clutter/clutter-flow-layout.c:981
+#: ../clutter/clutter-flow-layout.c:1023
 msgid "Minimum height for each row"
-msgstr ""
+msgstr "Minimum height for each row"
 
-#: ../clutter/clutter-flow-layout.c:996
+#: ../clutter/clutter-flow-layout.c:1038
 msgid "Maximum Row Height"
-msgstr ""
+msgstr "Maximum Row Height"
 
-#: ../clutter/clutter-flow-layout.c:997
+#: ../clutter/clutter-flow-layout.c:1039
 msgid "Maximum height for each row"
-msgstr ""
+msgstr "Maximum height for each row"
 
-#: ../clutter/clutter-input-device.c:220
+#: ../clutter/clutter-flow-layout.c:1054 ../clutter/clutter-flow-layout.c:1055
+msgid "Snap to grid"
+msgstr "Snap to grid"
+
+#: ../clutter/clutter-gesture-action.c:680
+msgid "Number touch points"
+msgstr "Number touch points"
+
+#: ../clutter/clutter-gesture-action.c:681
+msgid "Number of touch points"
+msgstr "Number of touch points"
+
+#: ../clutter/clutter-gesture-action.c:696
+msgid "Threshold Trigger Edge"
+msgstr "Threshold Trigger Edge"
+
+#: ../clutter/clutter-gesture-action.c:697
+msgid "The trigger edge used by the action"
+msgstr "The trigger edge used by the action"
+
+#: ../clutter/clutter-gesture-action.c:716
+msgid "Threshold Trigger Horizontal Distance"
+msgstr "Threshold Trigger Horizontal Distance"
+
+#: ../clutter/clutter-gesture-action.c:717
+msgid "The horizontal trigger distance used by the action"
+msgstr "The horizontal trigger distance used by the action"
+
+#: ../clutter/clutter-gesture-action.c:735
+msgid "Threshold Trigger Vertical Distance"
+msgstr "Threshold Trigger Vertical Distance"
+
+#: ../clutter/clutter-gesture-action.c:736
+msgid "The vertical trigger distance used by the action"
+msgstr "The vertical trigger distance used by the action"
+
+#: ../clutter/clutter-grid-layout.c:1223
+msgid "Left attachment"
+msgstr "Left attachment"
+
+#: ../clutter/clutter-grid-layout.c:1224
+msgid "The column number to attach the left side of the child to"
+msgstr "The column number to attach the left side of the child to"
+
+#: ../clutter/clutter-grid-layout.c:1231
+msgid "Top attachment"
+msgstr "Top attachment"
+
+#: ../clutter/clutter-grid-layout.c:1232
+msgid "The row number to attach the top side of a child widget to"
+msgstr "The row number to attach the top side of a child widget to"
+
+#: ../clutter/clutter-grid-layout.c:1240
+msgid "The number of columns that a child spans"
+msgstr "The number of columns that a child spans"
+
+#: ../clutter/clutter-grid-layout.c:1247
+msgid "The number of rows that a child spans"
+msgstr "The number of rows that a child spans"
+
+#: ../clutter/clutter-grid-layout.c:1564
+msgid "Row spacing"
+msgstr "Row spacing"
+
+#: ../clutter/clutter-grid-layout.c:1565
+msgid "The amount of space between two consecutive rows"
+msgstr "The amount of space between two consecutive rows"
+
+#: ../clutter/clutter-grid-layout.c:1578
+msgid "Column spacing"
+msgstr "Column spacing"
+
+#: ../clutter/clutter-grid-layout.c:1579
+msgid "The amount of space between two consecutive columns"
+msgstr "The amount of space between two consecutive columns"
+
+#: ../clutter/clutter-grid-layout.c:1593
+msgid "Row Homogeneous"
+msgstr "Row Homogeneous"
+
+#: ../clutter/clutter-grid-layout.c:1594
+msgid "If TRUE, the rows are all the same height"
+msgstr "If TRUE, the rows are all the same height"
+
+#: ../clutter/clutter-grid-layout.c:1607
+msgid "Column Homogeneous"
+msgstr "Column Homogeneous"
+
+#: ../clutter/clutter-grid-layout.c:1608
+msgid "If TRUE, the columns are all the same width"
+msgstr "If TRUE, the columns are all the same width"
+
+#: ../clutter/clutter-image.c:268 ../clutter/clutter-image.c:331
+#: ../clutter/clutter-image.c:419
+msgid "Unable to load image data"
+msgstr "Unable to load image data"
+
+#: ../clutter/clutter-input-device.c:231
 msgid "Id"
-msgstr ""
+msgstr "Id"
 
-#: ../clutter/clutter-input-device.c:221
+#: ../clutter/clutter-input-device.c:232
 msgid "Unique identifier of the device"
-msgstr ""
+msgstr "Unique identifier of the device"
 
-#: ../clutter/clutter-input-device.c:237
+#: ../clutter/clutter-input-device.c:248
 msgid "The name of the device"
-msgstr ""
+msgstr "The name of the device"
 
-#: ../clutter/clutter-input-device.c:251
+#: ../clutter/clutter-input-device.c:262
 msgid "Device Type"
-msgstr ""
+msgstr "Device Type"
 
-#: ../clutter/clutter-input-device.c:252
+#: ../clutter/clutter-input-device.c:263
 msgid "The type of the device"
-msgstr ""
+msgstr "The type of the device"
 
-#: ../clutter/clutter-input-device.c:267
+#: ../clutter/clutter-input-device.c:278
 msgid "Device Manager"
-msgstr ""
+msgstr "Device Manager"
 
-#: ../clutter/clutter-input-device.c:268
+#: ../clutter/clutter-input-device.c:279
 msgid "The device manager instance"
-msgstr ""
+msgstr "The device manager instance"
 
-#: ../clutter/clutter-input-device.c:281
+#: ../clutter/clutter-input-device.c:292
 msgid "Device Mode"
-msgstr ""
+msgstr "Device Mode"
 
-#: ../clutter/clutter-input-device.c:282
+#: ../clutter/clutter-input-device.c:293
 msgid "The mode of the device"
-msgstr ""
+msgstr "The mode of the device"
 
-#: ../clutter/clutter-input-device.c:296
+#: ../clutter/clutter-input-device.c:307
 msgid "Has Cursor"
-msgstr ""
+msgstr "Has Cursor"
 
-#: ../clutter/clutter-input-device.c:297
+#: ../clutter/clutter-input-device.c:308
 msgid "Whether the device has a cursor"
-msgstr ""
+msgstr "Whether the device has a cursor"
 
-#: ../clutter/clutter-input-device.c:316
+#: ../clutter/clutter-input-device.c:327
 msgid "Whether the device is enabled"
-msgstr ""
+msgstr "Whether the device is enabled"
 
-#: ../clutter/clutter-input-device.c:329
+#: ../clutter/clutter-input-device.c:340
 msgid "Number of Axes"
-msgstr ""
+msgstr "Number of Axes"
 
-#: ../clutter/clutter-input-device.c:330
+#: ../clutter/clutter-input-device.c:341
 msgid "The number of axes on the device"
-msgstr ""
+msgstr "The number of axes on the device"
 
-#: ../clutter/clutter-input-device.c:345
+#: ../clutter/clutter-input-device.c:356
 msgid "The backend instance"
-msgstr ""
+msgstr "The backend instance"
 
-#: ../clutter/clutter-interval.c:397
+#: ../clutter/clutter-interval.c:557
 msgid "Value Type"
-msgstr ""
+msgstr "Value Type"
 
-#: ../clutter/clutter-interval.c:398
+#: ../clutter/clutter-interval.c:558
 msgid "The type of the values in the interval"
-msgstr ""
+msgstr "The type of the values in the interval"
+
+#: ../clutter/clutter-interval.c:573
+msgid "Initial Value"
+msgstr "Initial Value"
+
+#: ../clutter/clutter-interval.c:574
+msgid "Initial value of the interval"
+msgstr "Initial value of the interval"
+
+#: ../clutter/clutter-interval.c:588
+msgid "Final Value"
+msgstr "Final Value"
+
+#: ../clutter/clutter-interval.c:589
+msgid "Final value of the interval"
+msgstr "Final value of the interval"
 
 #: ../clutter/clutter-layout-meta.c:117
 msgid "Manager"
-msgstr ""
+msgstr "Manager"
 
 #: ../clutter/clutter-layout-meta.c:118
 msgid "The manager that created this data"
-msgstr ""
+msgstr "The manager that created this data"
 
 #. Translators: Leave this UNTRANSLATED if your language is
 #. * left-to-right.  If your language is right-to-left
@@ -1215,1001 +1347,1490 @@ msgstr ""
 #. * Do NOT translate it to non-English e.g. "predefinito:LTR"! If
 #. * it isn't default:LTR or default:RTL it will not work.
 #.
-#: ../clutter/clutter-main.c:713
-#: clutter/clutter-main.c:763
+#: ../clutter/clutter-main.c:751
 msgid "default:LTR"
 msgstr "default:RTL"
 
-#: ../clutter/clutter-main.c:1524
+#: ../clutter/clutter-main.c:1577
 msgid "Show frames per second"
-msgstr ""
+msgstr "Show frames per second"
 
-#: ../clutter/clutter-main.c:1526
+#: ../clutter/clutter-main.c:1579
 msgid "Default frame rate"
-msgstr ""
+msgstr "Default frame rate"
 
-#: ../clutter/clutter-main.c:1528
+#: ../clutter/clutter-main.c:1581
 msgid "Make all warnings fatal"
-msgstr ""
+msgstr "Make all warnings fatal"
 
-#: ../clutter/clutter-main.c:1531
+#: ../clutter/clutter-main.c:1584
 msgid "Direction for the text"
-msgstr ""
+msgstr "Direction for the text"
 
-#: ../clutter/clutter-main.c:1534
+#: ../clutter/clutter-main.c:1587
 msgid "Disable mipmapping on text"
-msgstr ""
+msgstr "Disable mipmapping on text"
 
-#: ../clutter/clutter-main.c:1537
+#: ../clutter/clutter-main.c:1590
 msgid "Use 'fuzzy' picking"
-msgstr ""
+msgstr "Use 'fuzzy' picking"
 
-#: ../clutter/clutter-main.c:1540
+#: ../clutter/clutter-main.c:1593
 msgid "Clutter debugging flags to set"
-msgstr ""
+msgstr "Clutter debugging flags to set"
 
-#: ../clutter/clutter-main.c:1542
+#: ../clutter/clutter-main.c:1595
 msgid "Clutter debugging flags to unset"
-msgstr ""
+msgstr "Clutter debugging flags to unset"
 
-#: ../clutter/clutter-main.c:1546
+#: ../clutter/clutter-main.c:1599
 msgid "Clutter profiling flags to set"
-msgstr ""
+msgstr "Clutter profiling flags to set"
 
-#: ../clutter/clutter-main.c:1548
+#: ../clutter/clutter-main.c:1601
 msgid "Clutter profiling flags to unset"
-msgstr ""
+msgstr "Clutter profiling flags to unset"
 
-#: ../clutter/clutter-main.c:1551
+#: ../clutter/clutter-main.c:1604
 msgid "Enable accessibility"
-msgstr ""
+msgstr "Enable accessibility"
 
-#: ../clutter/clutter-main.c:1739
+#: ../clutter/clutter-main.c:1796
 msgid "Clutter Options"
-msgstr ""
+msgstr "Clutter Options"
 
-#: ../clutter/clutter-main.c:1740
+#: ../clutter/clutter-main.c:1797
 msgid "Show Clutter Options"
-msgstr ""
+msgstr "Show Clutter Options"
 
-#: ../clutter/clutter-media.c:77
-msgid "URI"
-msgstr ""
+#: ../clutter/clutter-pan-action.c:455
+msgid "Pan Axis"
+msgstr "Pan Axis"
 
-#: ../clutter/clutter-media.c:78
-msgid "URI of a media file"
-msgstr ""
+#: ../clutter/clutter-pan-action.c:456
+msgid "Constraints the panning to an axis"
+msgstr "Constraints the panning to an axis"
 
-#: ../clutter/clutter-media.c:91
-msgid "Playing"
-msgstr ""
+#: ../clutter/clutter-pan-action.c:470
+msgid "Interpolate"
+msgstr "Interpolate"
 
-#: ../clutter/clutter-media.c:92
-msgid "Whether the actor is playing"
-msgstr ""
+#: ../clutter/clutter-pan-action.c:471
+msgid "Whether interpolated events emission is enabled."
+msgstr "Whether interpolated events emission is enabled."
 
-#: ../clutter/clutter-media.c:106
-msgid "Progress"
-msgstr ""
+#: ../clutter/clutter-pan-action.c:487
+msgid "Deceleration"
+msgstr "Deceleration"
 
-#: ../clutter/clutter-media.c:107
-msgid "Current progress of the playback"
-msgstr ""
+#: ../clutter/clutter-pan-action.c:488
+msgid "Rate at which the interpolated panning will decelerate in"
+msgstr "Rate at which the interpolated panning will decelerate in"
 
-#: ../clutter/clutter-media.c:120
-msgid "Subtitle URI"
-msgstr ""
+#: ../clutter/clutter-pan-action.c:505
+msgid "Initial acceleration factor"
+msgstr "Initial acceleration factor"
 
-#: ../clutter/clutter-media.c:121
-msgid "URI of a subtitle file"
-msgstr ""
+#: ../clutter/clutter-pan-action.c:506
+msgid "Factor applied to the momentum when starting the interpolated phase"
+msgstr "Factor applied to the momentum when starting the interpolated phase"
 
-#: ../clutter/clutter-media.c:136
-msgid "Subtitle Font Name"
-msgstr ""
-
-#: ../clutter/clutter-media.c:137
-msgid "The font used to display subtitles"
-msgstr ""
-
-#: ../clutter/clutter-media.c:151
-msgid "Audio Volume"
-msgstr ""
-
-#: ../clutter/clutter-media.c:152
-msgid "The volume of the audio"
-msgstr ""
-
-#: ../clutter/clutter-media.c:165
-msgid "Can Seek"
-msgstr ""
-
-#: ../clutter/clutter-media.c:166
-msgid "Whether the current stream is seekable"
-msgstr ""
-
-#: ../clutter/clutter-media.c:180
-msgid "Buffer Fill"
-msgstr ""
-
-#: ../clutter/clutter-media.c:181
-msgid "The fill level of the buffer"
-msgstr ""
-
-#: ../clutter/clutter-media.c:195
-msgid "The duration of the stream, in seconds"
-msgstr ""
+#: ../clutter/clutter-path-constraint.c:212
+#: ../clutter/deprecated/clutter-behaviour-path.c:221
+msgid "Path"
+msgstr "Path"
 
 #: ../clutter/clutter-path-constraint.c:213
 msgid "The path used to constrain an actor"
-msgstr ""
+msgstr "The path used to constrain an actor"
 
 #: ../clutter/clutter-path-constraint.c:227
 msgid "The offset along the path, between -1.0 and 2.0"
-msgstr ""
+msgstr "The offset along the path, between -1.0 and 2.0"
 
-#: ../clutter/clutter-rectangle.c:268
-msgid "The color of the rectangle"
-msgstr ""
+#: ../clutter/clutter-property-transition.c:269
+msgid "Property Name"
+msgstr "Property Name"
 
-#: ../clutter/clutter-rectangle.c:281
-msgid "Border Color"
-msgstr ""
+#: ../clutter/clutter-property-transition.c:270
+msgid "The name of the property to animate"
+msgstr "The name of the property to animate"
 
-#: ../clutter/clutter-rectangle.c:282
-msgid "The color of the border of the rectangle"
-msgstr ""
-
-#: ../clutter/clutter-rectangle.c:297
-msgid "Border Width"
-msgstr ""
-
-#: ../clutter/clutter-rectangle.c:298
-msgid "The width of the border of the rectangle"
-msgstr ""
-
-#: ../clutter/clutter-rectangle.c:312
-msgid "Has Border"
-msgstr ""
-
-#: ../clutter/clutter-rectangle.c:313
-msgid "Whether the rectangle should have a border"
-msgstr ""
-
-#: ../clutter/clutter-script.c:434
+#: ../clutter/clutter-script.c:464
 msgid "Filename Set"
-msgstr ""
+msgstr "Filename Set"
 
-#: ../clutter/clutter-script.c:435
+#: ../clutter/clutter-script.c:465
 msgid "Whether the :filename property is set"
-msgstr ""
+msgstr "Whether the :filename property is set"
 
-#: ../clutter/clutter-script.c:449
-#: ../clutter/clutter-texture.c:1071
+#: ../clutter/clutter-script.c:479
+#: ../clutter/deprecated/clutter-texture.c:1080
 msgid "Filename"
-msgstr ""
+msgstr "Filename"
 
-#: ../clutter/clutter-script.c:450
+#: ../clutter/clutter-script.c:480
 msgid "The path of the currently parsed file"
-msgstr ""
+msgstr "The path of the currently parsed file"
 
-#: ../clutter/clutter-settings.c:439
+#: ../clutter/clutter-script.c:497
+msgid "Translation Domain"
+msgstr "Translation Domain"
+
+#: ../clutter/clutter-script.c:498
+msgid "The translation domain used to localize string"
+msgstr "The translation domain used to localize string"
+
+#: ../clutter/clutter-scroll-actor.c:184
+msgid "Scroll Mode"
+msgstr "Scroll Mode"
+
+#: ../clutter/clutter-scroll-actor.c:185
+msgid "The scrolling direction"
+msgstr "The scrolling direction"
+
+#: ../clutter/clutter-settings.c:507
 msgid "Double Click Time"
-msgstr ""
+msgstr "Double Click Time"
 
-#: ../clutter/clutter-settings.c:440
+#: ../clutter/clutter-settings.c:508
 msgid "The time between clicks necessary to detect a multiple click"
-msgstr ""
+msgstr "The time between clicks necessary to detect a multiple click"
 
-#: ../clutter/clutter-settings.c:455
+#: ../clutter/clutter-settings.c:523
 msgid "Double Click Distance"
-msgstr ""
+msgstr "Double Click Distance"
 
-#: ../clutter/clutter-settings.c:456
+#: ../clutter/clutter-settings.c:524
 msgid "The distance between clicks necessary to detect a multiple click"
-msgstr ""
+msgstr "The distance between clicks necessary to detect a multiple click"
 
-#: ../clutter/clutter-settings.c:471
+#: ../clutter/clutter-settings.c:539
 msgid "Drag Threshold"
-msgstr ""
+msgstr "Drag Threshold"
 
-#: ../clutter/clutter-settings.c:472
+#: ../clutter/clutter-settings.c:540
 msgid "The distance the cursor should travel before starting to drag"
-msgstr ""
+msgstr "The distance the cursor should travel before starting to drag"
 
-#: ../clutter/clutter-settings.c:487
-#: ../clutter/clutter-text.c:2995
+#: ../clutter/clutter-settings.c:555 ../clutter/clutter-text.c:3437
 msgid "Font Name"
-msgstr ""
+msgstr "Font Name"
 
-#: ../clutter/clutter-settings.c:488
-msgid "The description of the default font, as one that could be parsed by Pango"
+#: ../clutter/clutter-settings.c:556
+msgid ""
+"The description of the default font, as one that could be parsed by Pango"
 msgstr ""
+"The description of the default font, as one that could be parsed by Pango"
 
-#: ../clutter/clutter-settings.c:503
+#: ../clutter/clutter-settings.c:571
 msgid "Font Antialias"
-msgstr ""
+msgstr "Font Antialias"
 
-#: ../clutter/clutter-settings.c:504
-msgid "Whether to use antialiasing (1 to enable, 0 to disable, and -1 to use the default)"
+#: ../clutter/clutter-settings.c:572
+msgid ""
+"Whether to use antialiasing (1 to enable, 0 to disable, and -1 to use the "
+"default)"
 msgstr ""
+"Whether to use antialiasing (1 to enable, 0 to disable, and -1 to use the "
+"default)"
 
-#: ../clutter/clutter-settings.c:520
+#: ../clutter/clutter-settings.c:588 ../clutter/clutter-settings.c:596
 msgid "Font DPI"
-msgstr ""
+msgstr "Font DPI"
 
-#: ../clutter/clutter-settings.c:521
-msgid "The resolution of the font, in 1024 * dots/inch, or -1 to use the default"
+#: ../clutter/clutter-settings.c:589 ../clutter/clutter-settings.c:597
+msgid ""
+"The resolution of the font, in 1024 * dots/inch, or -1 to use the default"
 msgstr ""
+"The resolution of the font, in 1024 * dots/inch, or -1 to use the default"
 
-#: ../clutter/clutter-settings.c:537
+#: ../clutter/clutter-settings.c:613
 msgid "Font Hinting"
-msgstr ""
+msgstr "Font Hinting"
 
-#: ../clutter/clutter-settings.c:538
-msgid "Whether to use hinting (1 to enable, 0 to disable and -1 to use the default)"
+#: ../clutter/clutter-settings.c:614
+msgid ""
+"Whether to use hinting (1 to enable, 0 to disable and -1 to use the default)"
 msgstr ""
+"Whether to use hinting (1 to enable, 0 to disable and -1 to use the default)"
 
-#: ../clutter/clutter-settings.c:559
+#: ../clutter/clutter-settings.c:634
 msgid "Font Hint Style"
-msgstr ""
+msgstr "Font Hint Style"
 
-#: ../clutter/clutter-settings.c:560
+#: ../clutter/clutter-settings.c:635
 msgid "The style of hinting (hintnone, hintslight, hintmedium, hintfull)"
-msgstr ""
+msgstr "The style of hinting (hintnone, hintslight, hintmedium, hintfull)"
 
-#: ../clutter/clutter-settings.c:581
+#: ../clutter/clutter-settings.c:655
 msgid "Font Subpixel Order"
-msgstr ""
+msgstr "Font Subpixel Order"
 
-#: ../clutter/clutter-settings.c:582
+#: ../clutter/clutter-settings.c:656
 msgid "The type of subpixel antialiasing (none, rgb, bgr, vrgb, vbgr)"
-msgstr ""
+msgstr "The type of subpixel antialiasing (none, rgb, bgr, vrgb, vbgr)"
 
-#: ../clutter/clutter-settings.c:599
+#: ../clutter/clutter-settings.c:673
 msgid "The minimum duration for a long press gesture to be recognized"
-msgstr ""
+msgstr "The minimum duration for a long press gesture to be recognized"
 
-#: ../clutter/clutter-settings.c:606
+#: ../clutter/clutter-settings.c:680
+msgid "Window Scaling Factor"
+msgstr "Window Scaling Factor"
+
+#: ../clutter/clutter-settings.c:681
+msgid "The scaling factor to be applied to windows"
+msgstr "The scaling factor to be applied to windows"
+
+#: ../clutter/clutter-settings.c:688
 msgid "Fontconfig configuration timestamp"
-msgstr ""
+msgstr "Fontconfig configuration timestamp"
 
-#: ../clutter/clutter-settings.c:607
+#: ../clutter/clutter-settings.c:689
 msgid "Timestamp of the current fontconfig configuration"
-msgstr ""
+msgstr "Timestamp of the current fontconfig configuration"
 
-#: ../clutter/clutter-settings.c:624
+#: ../clutter/clutter-settings.c:706
 msgid "Password Hint Time"
-msgstr ""
+msgstr "Password Hint Time"
 
-#: ../clutter/clutter-settings.c:625
+#: ../clutter/clutter-settings.c:707
 msgid "How long to show the last input character in hidden entries"
-msgstr ""
+msgstr "How long to show the last input character in hidden entries"
+
+#: ../clutter/clutter-shader-effect.c:487
+msgid "Shader Type"
+msgstr "Shader Type"
+
+#: ../clutter/clutter-shader-effect.c:488
+msgid "The type of shader used"
+msgstr "The type of shader used"
+
+#: ../clutter/clutter-snap-constraint.c:322
+msgid "The source of the constraint"
+msgstr "The source of the constraint"
+
+#: ../clutter/clutter-snap-constraint.c:335
+msgid "From Edge"
+msgstr "From Edge"
+
+#: ../clutter/clutter-snap-constraint.c:336
+msgid "The edge of the actor that should be snapped"
+msgstr "The edge of the actor that should be snapped"
+
+#: ../clutter/clutter-snap-constraint.c:350
+msgid "To Edge"
+msgstr "To Edge"
+
+#: ../clutter/clutter-snap-constraint.c:351
+msgid "The edge of the source that should be snapped"
+msgstr "The edge of the source that should be snapped"
+
+#: ../clutter/clutter-snap-constraint.c:367
+msgid "The offset in pixels to apply to the constraint"
+msgstr "The offset in pixels to apply to the constraint"
+
+#: ../clutter/clutter-stage.c:1917
+msgid "Fullscreen Set"
+msgstr "Fullscreen Set"
+
+#: ../clutter/clutter-stage.c:1918
+msgid "Whether the main stage is fullscreen"
+msgstr "Whether the main stage is fullscreen"
+
+#: ../clutter/clutter-stage.c:1932
+msgid "Offscreen"
+msgstr "Offscreen"
+
+#: ../clutter/clutter-stage.c:1933
+msgid "Whether the main stage should be rendered offscreen"
+msgstr "Whether the main stage should be rendered offscreen"
+
+#: ../clutter/clutter-stage.c:1945 ../clutter/clutter-text.c:3551
+msgid "Cursor Visible"
+msgstr "Cursor Visible"
+
+#: ../clutter/clutter-stage.c:1946
+msgid "Whether the mouse pointer is visible on the main stage"
+msgstr "Whether the mouse pointer is visible on the main stage"
+
+#: ../clutter/clutter-stage.c:1960
+msgid "User Resizable"
+msgstr "User Resizable"
+
+#: ../clutter/clutter-stage.c:1961
+msgid "Whether the stage is able to be resized via user interaction"
+msgstr "Whether the stage is able to be resized via user interaction"
+
+#: ../clutter/clutter-stage.c:1976 ../clutter/deprecated/clutter-box.c:254
+#: ../clutter/deprecated/clutter-rectangle.c:270
+msgid "Color"
+msgstr "Color"
+
+#: ../clutter/clutter-stage.c:1977
+msgid "The color of the stage"
+msgstr "The color of the stage"
+
+#: ../clutter/clutter-stage.c:1992
+msgid "Perspective"
+msgstr "Perspective"
+
+#: ../clutter/clutter-stage.c:1993
+msgid "Perspective projection parameters"
+msgstr "Perspective projection parameters"
+
+#: ../clutter/clutter-stage.c:2008
+msgid "Title"
+msgstr "Title"
+
+#: ../clutter/clutter-stage.c:2009
+msgid "Stage Title"
+msgstr "Stage Title"
+
+#: ../clutter/clutter-stage.c:2026
+msgid "Use Fog"
+msgstr "Use Fog"
+
+#: ../clutter/clutter-stage.c:2027
+msgid "Whether to enable depth cueing"
+msgstr "Whether to enable depth cueing"
+
+#: ../clutter/clutter-stage.c:2043
+msgid "Fog"
+msgstr "Fog"
+
+#: ../clutter/clutter-stage.c:2044
+msgid "Settings for the depth cueing"
+msgstr "Settings for the depth cueing"
+
+#: ../clutter/clutter-stage.c:2060
+msgid "Use Alpha"
+msgstr "Use Alpha"
+
+#: ../clutter/clutter-stage.c:2061
+msgid "Whether to honour the alpha component of the stage color"
+msgstr "Whether to honour the alpha component of the stage color"
+
+#: ../clutter/clutter-stage.c:2077
+msgid "Key Focus"
+msgstr "Key Focus"
+
+#: ../clutter/clutter-stage.c:2078
+msgid "The currently key focused actor"
+msgstr "The currently key focused actor"
+
+#: ../clutter/clutter-stage.c:2094
+msgid "No Clear Hint"
+msgstr "No Clear Hint"
+
+#: ../clutter/clutter-stage.c:2095
+msgid "Whether the stage should clear its contents"
+msgstr "Whether the stage should clear its contents"
+
+#: ../clutter/clutter-stage.c:2108
+msgid "Accept Focus"
+msgstr "Accept Focus"
+
+#: ../clutter/clutter-stage.c:2109
+msgid "Whether the stage should accept focus on show"
+msgstr "Whether the stage should accept focus on show"
+
+#: ../clutter/clutter-text-buffer.c:347 ../clutter/clutter-text.c:3472
+msgid "Text"
+msgstr "Text"
+
+#: ../clutter/clutter-text-buffer.c:348
+msgid "The contents of the buffer"
+msgstr "The contents of the buffer"
+
+#: ../clutter/clutter-text-buffer.c:361
+msgid "Text length"
+msgstr "Text length"
+
+#: ../clutter/clutter-text-buffer.c:362
+msgid "Length of the text currently in the buffer"
+msgstr "Length of the text currently in the buffer"
+
+#: ../clutter/clutter-text-buffer.c:375
+msgid "Maximum length"
+msgstr "Maximum length"
+
+#: ../clutter/clutter-text-buffer.c:376
+msgid "Maximum number of characters for this entry. Zero if no maximum"
+msgstr "Maximum number of characters for this entry. Zero if no maximum"
+
+#: ../clutter/clutter-text.c:3419
+msgid "Buffer"
+msgstr "Buffer"
+
+#: ../clutter/clutter-text.c:3420
+msgid "The buffer for the text"
+msgstr "The buffer for the text"
+
+#: ../clutter/clutter-text.c:3438
+msgid "The font to be used by the text"
+msgstr "The font to be used by the text"
+
+#: ../clutter/clutter-text.c:3455
+msgid "Font Description"
+msgstr "Font Description"
+
+#: ../clutter/clutter-text.c:3456
+msgid "The font description to be used"
+msgstr "The font description to be used"
+
+#: ../clutter/clutter-text.c:3473
+msgid "The text to render"
+msgstr "The text to render"
+
+#: ../clutter/clutter-text.c:3487
+msgid "Font Color"
+msgstr "Font Color"
+
+#: ../clutter/clutter-text.c:3488
+msgid "Color of the font used by the text"
+msgstr "Color of the font used by the text"
+
+#: ../clutter/clutter-text.c:3503
+msgid "Editable"
+msgstr "Editable"
+
+#: ../clutter/clutter-text.c:3504
+msgid "Whether the text is editable"
+msgstr "Whether the text is editable"
+
+#: ../clutter/clutter-text.c:3519
+msgid "Selectable"
+msgstr "Selectable"
+
+#: ../clutter/clutter-text.c:3520
+msgid "Whether the text is selectable"
+msgstr "Whether the text is selectable"
+
+#: ../clutter/clutter-text.c:3534
+msgid "Activatable"
+msgstr "Activatable"
+
+#: ../clutter/clutter-text.c:3535
+msgid "Whether pressing return causes the activate signal to be emitted"
+msgstr "Whether pressing return causes the activate signal to be emitted"
+
+#: ../clutter/clutter-text.c:3552
+msgid "Whether the input cursor is visible"
+msgstr "Whether the input cursor is visible"
+
+#: ../clutter/clutter-text.c:3566 ../clutter/clutter-text.c:3567
+msgid "Cursor Color"
+msgstr "Cursor Color"
+
+#: ../clutter/clutter-text.c:3582
+msgid "Cursor Color Set"
+msgstr "Cursor Color Set"
+
+#: ../clutter/clutter-text.c:3583
+msgid "Whether the cursor color has been set"
+msgstr "Whether the cursor color has been set"
+
+#: ../clutter/clutter-text.c:3598
+msgid "Cursor Size"
+msgstr "Cursor Size"
+
+#: ../clutter/clutter-text.c:3599
+msgid "The width of the cursor, in pixels"
+msgstr "The width of the cursor, in pixels"
+
+#: ../clutter/clutter-text.c:3615 ../clutter/clutter-text.c:3633
+msgid "Cursor Position"
+msgstr "Cursor Position"
+
+#: ../clutter/clutter-text.c:3616 ../clutter/clutter-text.c:3634
+msgid "The cursor position"
+msgstr "The cursor position"
+
+#: ../clutter/clutter-text.c:3649
+msgid "Selection-bound"
+msgstr "Selection-bound"
+
+#: ../clutter/clutter-text.c:3650
+msgid "The cursor position of the other end of the selection"
+msgstr "The cursor position of the other end of the selection"
+
+#: ../clutter/clutter-text.c:3665 ../clutter/clutter-text.c:3666
+msgid "Selection Color"
+msgstr "Selection Color"
+
+#: ../clutter/clutter-text.c:3681
+msgid "Selection Color Set"
+msgstr "Selection Color Set"
+
+#: ../clutter/clutter-text.c:3682
+msgid "Whether the selection color has been set"
+msgstr "Whether the selection color has been set"
+
+#: ../clutter/clutter-text.c:3697
+msgid "Attributes"
+msgstr "Attributes"
+
+#: ../clutter/clutter-text.c:3698
+msgid "A list of style attributes to apply to the contents of the actor"
+msgstr "A list of style attributes to apply to the contents of the actor"
+
+#: ../clutter/clutter-text.c:3720
+msgid "Use markup"
+msgstr "Use markup"
+
+#: ../clutter/clutter-text.c:3721
+msgid "Whether or not the text includes Pango markup"
+msgstr "Whether or not the text includes Pango markup"
+
+#: ../clutter/clutter-text.c:3737
+msgid "Line wrap"
+msgstr "Line wrap"
+
+#: ../clutter/clutter-text.c:3738
+msgid "If set, wrap the lines if the text becomes too wide"
+msgstr "If set, wrap the lines if the text becomes too wide"
+
+#: ../clutter/clutter-text.c:3753
+msgid "Line wrap mode"
+msgstr "Line wrap mode"
+
+#: ../clutter/clutter-text.c:3754
+msgid "Control how line-wrapping is done"
+msgstr "Control how line-wrapping is done"
+
+#: ../clutter/clutter-text.c:3769
+msgid "Ellipsize"
+msgstr "Ellipsize"
+
+#: ../clutter/clutter-text.c:3770
+msgid "The preferred place to ellipsize the string"
+msgstr "The preferred place to ellipsize the string"
+
+#: ../clutter/clutter-text.c:3786
+msgid "Line Alignment"
+msgstr "Line Alignment"
+
+#: ../clutter/clutter-text.c:3787
+msgid "The preferred alignment for the string, for multi-line text"
+msgstr "The preferred alignment for the string, for multi-line text"
+
+#: ../clutter/clutter-text.c:3803
+msgid "Justify"
+msgstr "Justify"
+
+#: ../clutter/clutter-text.c:3804
+msgid "Whether the text should be justified"
+msgstr "Whether the text should be justified"
+
+#: ../clutter/clutter-text.c:3819
+msgid "Password Character"
+msgstr "Password Character"
+
+#: ../clutter/clutter-text.c:3820
+msgid "If non-zero, use this character to display the actor's contents"
+msgstr "If non-zero, use this character to display the actor's contents"
+
+#: ../clutter/clutter-text.c:3834
+msgid "Max Length"
+msgstr "Max Length"
+
+#: ../clutter/clutter-text.c:3835
+msgid "Maximum length of the text inside the actor"
+msgstr "Maximum length of the text inside the actor"
+
+#: ../clutter/clutter-text.c:3858
+msgid "Single Line Mode"
+msgstr "Single Line Mode"
+
+#: ../clutter/clutter-text.c:3859
+msgid "Whether the text should be a single line"
+msgstr "Whether the text should be a single line"
+
+#: ../clutter/clutter-text.c:3873 ../clutter/clutter-text.c:3874
+msgid "Selected Text Color"
+msgstr "Selected Text Color"
+
+#: ../clutter/clutter-text.c:3889
+msgid "Selected Text Color Set"
+msgstr "Selected Text Color Set"
+
+#: ../clutter/clutter-text.c:3890
+msgid "Whether the selected text color has been set"
+msgstr "Whether the selected text color has been set"
+
+#: ../clutter/clutter-timeline.c:591
+#: ../clutter/deprecated/clutter-animation.c:512
+msgid "Loop"
+msgstr "Loop"
+
+#: ../clutter/clutter-timeline.c:592
+msgid "Should the timeline automatically restart"
+msgstr "Should the timeline automatically restart"
+
+#: ../clutter/clutter-timeline.c:606
+msgid "Delay"
+msgstr "Delay"
+
+#: ../clutter/clutter-timeline.c:607
+msgid "Delay before start"
+msgstr "Delay before start"
+
+#: ../clutter/clutter-timeline.c:622
+#: ../clutter/deprecated/clutter-animation.c:496
+#: ../clutter/deprecated/clutter-animator.c:1792
+#: ../clutter/deprecated/clutter-media.c:224
+#: ../clutter/deprecated/clutter-state.c:1515
+msgid "Duration"
+msgstr "Duration"
+
+#: ../clutter/clutter-timeline.c:623
+msgid "Duration of the timeline in milliseconds"
+msgstr "Duration of the timeline in milliseconds"
+
+#: ../clutter/clutter-timeline.c:638
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:521
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:330
+msgid "Direction"
+msgstr "Direction"
+
+#: ../clutter/clutter-timeline.c:639
+msgid "Direction of the timeline"
+msgstr "Direction of the timeline"
+
+#: ../clutter/clutter-timeline.c:654
+msgid "Auto Reverse"
+msgstr "Auto Reverse"
+
+#: ../clutter/clutter-timeline.c:655
+msgid "Whether the direction should be reversed when reaching the end"
+msgstr "Whether the direction should be reversed when reaching the end"
+
+#: ../clutter/clutter-timeline.c:673
+msgid "Repeat Count"
+msgstr "Repeat Count"
+
+#: ../clutter/clutter-timeline.c:674
+msgid "How many times the timeline should repeat"
+msgstr "How many times the timeline should repeat"
+
+#: ../clutter/clutter-timeline.c:688
+msgid "Progress Mode"
+msgstr "Progress Mode"
+
+#: ../clutter/clutter-timeline.c:689
+msgid "How the timeline should compute the progress"
+msgstr "How the timeline should compute the progress"
+
+#: ../clutter/clutter-transition.c:244
+msgid "Interval"
+msgstr "Interval"
+
+#: ../clutter/clutter-transition.c:245
+msgid "The interval of values to transition"
+msgstr "The interval of values to transition"
+
+#: ../clutter/clutter-transition.c:259
+msgid "Animatable"
+msgstr "Animatable"
+
+#: ../clutter/clutter-transition.c:260
+msgid "The animatable object"
+msgstr "The animatable object"
+
+#: ../clutter/clutter-transition.c:281
+msgid "Remove on Complete"
+msgstr "Remove on Complete"
+
+#: ../clutter/clutter-transition.c:282
+msgid "Detach the transition when completed"
+msgstr "Detach the transition when completed"
+
+#: ../clutter/clutter-zoom-action.c:365
+msgid "Zoom Axis"
+msgstr "Zoom Axis"
+
+#: ../clutter/clutter-zoom-action.c:366
+msgid "Constraints the zoom to an axis"
+msgstr "Constraints the zoom to an axis"
+
+#: ../clutter/deprecated/clutter-alpha.c:347
+#: ../clutter/deprecated/clutter-animation.c:527
+#: ../clutter/deprecated/clutter-animator.c:1809
+msgid "Timeline"
+msgstr "Timeline"
+
+#: ../clutter/deprecated/clutter-alpha.c:348
+msgid "Timeline used by the alpha"
+msgstr "Timeline used by the alpha"
+
+#: ../clutter/deprecated/clutter-alpha.c:364
+msgid "Alpha value"
+msgstr "Alpha value"
+
+#: ../clutter/deprecated/clutter-alpha.c:365
+msgid "Alpha value as computed by the alpha"
+msgstr "Alpha value as computed by the alpha"
+
+#: ../clutter/deprecated/clutter-alpha.c:386
+#: ../clutter/deprecated/clutter-animation.c:480
+msgid "Mode"
+msgstr "Mode"
+
+#: ../clutter/deprecated/clutter-alpha.c:387
+msgid "Progress mode"
+msgstr "Progress mode"
+
+#: ../clutter/deprecated/clutter-animation.c:463
+msgid "Object"
+msgstr "Object"
+
+#: ../clutter/deprecated/clutter-animation.c:464
+msgid "Object to which the animation applies"
+msgstr "Object to which the animation applies"
+
+#: ../clutter/deprecated/clutter-animation.c:481
+msgid "The mode of the animation"
+msgstr "The mode of the animation"
+
+#: ../clutter/deprecated/clutter-animation.c:497
+msgid "Duration of the animation, in milliseconds"
+msgstr "Duration of the animation, in milliseconds"
+
+#: ../clutter/deprecated/clutter-animation.c:513
+msgid "Whether the animation should loop"
+msgstr "Whether the animation should loop"
+
+#: ../clutter/deprecated/clutter-animation.c:528
+msgid "The timeline used by the animation"
+msgstr "The timeline used by the animation"
+
+#: ../clutter/deprecated/clutter-animation.c:544
+#: ../clutter/deprecated/clutter-behaviour.c:237
+msgid "Alpha"
+msgstr "Alpha"
+
+#: ../clutter/deprecated/clutter-animation.c:545
+msgid "The alpha used by the animation"
+msgstr "The alpha used by the animation"
+
+#: ../clutter/deprecated/clutter-animator.c:1793
+msgid "The duration of the animation"
+msgstr "The duration of the animation"
+
+#: ../clutter/deprecated/clutter-animator.c:1810
+msgid "The timeline of the animation"
+msgstr "The timeline of the animation"
+
+#: ../clutter/deprecated/clutter-behaviour.c:238
+msgid "Alpha Object to drive the behaviour"
+msgstr "Alpha Object to drive the behaviour"
+
+#: ../clutter/deprecated/clutter-behaviour-depth.c:180
+msgid "Start Depth"
+msgstr "Start Depth"
+
+#: ../clutter/deprecated/clutter-behaviour-depth.c:181
+msgid "Initial depth to apply"
+msgstr "Initial depth to apply"
+
+#: ../clutter/deprecated/clutter-behaviour-depth.c:196
+msgid "End Depth"
+msgstr "End Depth"
+
+#: ../clutter/deprecated/clutter-behaviour-depth.c:197
+msgid "Final depth to apply"
+msgstr "Final depth to apply"
+
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:394
+msgid "Start Angle"
+msgstr "Start Angle"
+
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:395
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:277
+msgid "Initial angle"
+msgstr "Initial angle"
+
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:410
+msgid "End Angle"
+msgstr "End Angle"
+
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:411
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:295
+msgid "Final angle"
+msgstr "Final angle"
+
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:426
+msgid "Angle x tilt"
+msgstr "Angle x tilt"
+
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:427
+msgid "Tilt of the ellipse around x axis"
+msgstr "Tilt of the ellipse around x axis"
+
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:442
+msgid "Angle y tilt"
+msgstr "Angle y tilt"
+
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:443
+msgid "Tilt of the ellipse around y axis"
+msgstr "Tilt of the ellipse around y axis"
+
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:458
+msgid "Angle z tilt"
+msgstr "Angle z tilt"
+
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:459
+msgid "Tilt of the ellipse around z axis"
+msgstr "Tilt of the ellipse around z axis"
+
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:475
+msgid "Width of the ellipse"
+msgstr "Width of the ellipse"
+
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:491
+msgid "Height of ellipse"
+msgstr "Height of ellipse"
+
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:506
+msgid "Center"
+msgstr "Center"
+
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:507
+msgid "Center of ellipse"
+msgstr "Center of ellipse"
+
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:522
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:331
+msgid "Direction of rotation"
+msgstr "Direction of rotation"
+
+#: ../clutter/deprecated/clutter-behaviour-opacity.c:177
+msgid "Opacity Start"
+msgstr "Opacity Start"
+
+#: ../clutter/deprecated/clutter-behaviour-opacity.c:178
+msgid "Initial opacity level"
+msgstr "Initial opacity level"
+
+#: ../clutter/deprecated/clutter-behaviour-opacity.c:195
+msgid "Opacity End"
+msgstr "Opacity End"
+
+#: ../clutter/deprecated/clutter-behaviour-opacity.c:196
+msgid "Final opacity level"
+msgstr "Final opacity level"
+
+#: ../clutter/deprecated/clutter-behaviour-path.c:222
+msgid "The ClutterPath object representing the path to animate along"
+msgstr "The ClutterPath object representing the path to animate along"
+
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:276
+msgid "Angle Begin"
+msgstr "Angle Begin"
+
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:294
+msgid "Angle End"
+msgstr "Angle End"
+
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:312
+msgid "Axis"
+msgstr "Axis"
+
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:313
+msgid "Axis of rotation"
+msgstr "Axis of rotation"
+
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:348
+msgid "Center X"
+msgstr "Center X"
+
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:349
+msgid "X coordinate of the center of rotation"
+msgstr "X coordinate of the center of rotation"
+
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:366
+msgid "Center Y"
+msgstr "Center Y"
+
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:367
+msgid "Y coordinate of the center of rotation"
+msgstr "Y coordinate of the center of rotation"
+
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:384
+msgid "Center Z"
+msgstr "Center Z"
+
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:385
+msgid "Z coordinate of the center of rotation"
+msgstr "Z coordinate of the center of rotation"
+
+#: ../clutter/deprecated/clutter-behaviour-scale.c:222
+msgid "X Start Scale"
+msgstr "X Start Scale"
+
+#: ../clutter/deprecated/clutter-behaviour-scale.c:223
+msgid "Initial scale on the X axis"
+msgstr "Initial scale on the X axis"
+
+#: ../clutter/deprecated/clutter-behaviour-scale.c:241
+msgid "X End Scale"
+msgstr "X End Scale"
+
+#: ../clutter/deprecated/clutter-behaviour-scale.c:242
+msgid "Final scale on the X axis"
+msgstr "Final scale on the X axis"
+
+#: ../clutter/deprecated/clutter-behaviour-scale.c:260
+msgid "Y Start Scale"
+msgstr "Y Start Scale"
+
+#: ../clutter/deprecated/clutter-behaviour-scale.c:261
+msgid "Initial scale on the Y axis"
+msgstr "Initial scale on the Y axis"
+
+#: ../clutter/deprecated/clutter-behaviour-scale.c:279
+msgid "Y End Scale"
+msgstr "Y End Scale"
+
+#: ../clutter/deprecated/clutter-behaviour-scale.c:280
+msgid "Final scale on the Y axis"
+msgstr "Final scale on the Y axis"
+
+#: ../clutter/deprecated/clutter-box.c:255
+msgid "The background color of the box"
+msgstr "The background color of the box"
+
+#: ../clutter/deprecated/clutter-box.c:268
+msgid "Color Set"
+msgstr "Color Set"
+
+#: ../clutter/deprecated/clutter-cairo-texture.c:585
+msgid "Surface Width"
+msgstr "Surface Width"
+
+#: ../clutter/deprecated/clutter-cairo-texture.c:586
+msgid "The width of the Cairo surface"
+msgstr "The width of the Cairo surface"
+
+#: ../clutter/deprecated/clutter-cairo-texture.c:603
+msgid "Surface Height"
+msgstr "Surface Height"
+
+#: ../clutter/deprecated/clutter-cairo-texture.c:604
+msgid "The height of the Cairo surface"
+msgstr "The height of the Cairo surface"
+
+#: ../clutter/deprecated/clutter-cairo-texture.c:624
+msgid "Auto Resize"
+msgstr "Auto Resize"
+
+#: ../clutter/deprecated/clutter-cairo-texture.c:625
+msgid "Whether the surface should match the allocation"
+msgstr "Whether the surface should match the allocation"
+
+#: ../clutter/deprecated/clutter-media.c:83
+msgid "URI"
+msgstr "URI"
+
+#: ../clutter/deprecated/clutter-media.c:84
+msgid "URI of a media file"
+msgstr "URI of a media file"
+
+#: ../clutter/deprecated/clutter-media.c:100
+msgid "Playing"
+msgstr "Playing"
+
+#: ../clutter/deprecated/clutter-media.c:101
+msgid "Whether the actor is playing"
+msgstr "Whether the actor is playing"
+
+#: ../clutter/deprecated/clutter-media.c:118
+msgid "Progress"
+msgstr "Progress"
+
+#: ../clutter/deprecated/clutter-media.c:119
+msgid "Current progress of the playback"
+msgstr "Current progress of the playback"
+
+#: ../clutter/deprecated/clutter-media.c:135
+msgid "Subtitle URI"
+msgstr "Subtitle URI"
+
+#: ../clutter/deprecated/clutter-media.c:136
+msgid "URI of a subtitle file"
+msgstr "URI of a subtitle file"
+
+#: ../clutter/deprecated/clutter-media.c:154
+msgid "Subtitle Font Name"
+msgstr "Subtitle Font Name"
+
+#: ../clutter/deprecated/clutter-media.c:155
+msgid "The font used to display subtitles"
+msgstr "The font used to display subtitles"
+
+#: ../clutter/deprecated/clutter-media.c:172
+msgid "Audio Volume"
+msgstr "Audio Volume"
+
+#: ../clutter/deprecated/clutter-media.c:173
+msgid "The volume of the audio"
+msgstr "The volume of the audio"
+
+#: ../clutter/deprecated/clutter-media.c:189
+msgid "Can Seek"
+msgstr "Can Seek"
+
+#: ../clutter/deprecated/clutter-media.c:190
+msgid "Whether the current stream is seekable"
+msgstr "Whether the current stream is seekable"
+
+#: ../clutter/deprecated/clutter-media.c:207
+msgid "Buffer Fill"
+msgstr "Buffer Fill"
+
+#: ../clutter/deprecated/clutter-media.c:208
+msgid "The fill level of the buffer"
+msgstr "The fill level of the buffer"
+
+#: ../clutter/deprecated/clutter-media.c:225
+msgid "The duration of the stream, in seconds"
+msgstr "The duration of the stream, in seconds"
+
+#: ../clutter/deprecated/clutter-rectangle.c:271
+msgid "The color of the rectangle"
+msgstr "The color of the rectangle"
+
+#: ../clutter/deprecated/clutter-rectangle.c:284
+msgid "Border Color"
+msgstr "Border Color"
+
+#: ../clutter/deprecated/clutter-rectangle.c:285
+msgid "The color of the border of the rectangle"
+msgstr "The color of the border of the rectangle"
+
+#: ../clutter/deprecated/clutter-rectangle.c:300
+msgid "Border Width"
+msgstr "Border Width"
+
+#: ../clutter/deprecated/clutter-rectangle.c:301
+msgid "The width of the border of the rectangle"
+msgstr "The width of the border of the rectangle"
+
+#: ../clutter/deprecated/clutter-rectangle.c:315
+msgid "Has Border"
+msgstr "Has Border"
+
+#: ../clutter/deprecated/clutter-rectangle.c:316
+msgid "Whether the rectangle should have a border"
+msgstr "Whether the rectangle should have a border"
 
 #: ../clutter/deprecated/clutter-shader.c:257
 msgid "Vertex Source"
-msgstr ""
+msgstr "Vertex Source"
 
 #: ../clutter/deprecated/clutter-shader.c:258
 msgid "Source of vertex shader"
-msgstr ""
+msgstr "Source of vertex shader"
 
 #: ../clutter/deprecated/clutter-shader.c:274
 msgid "Fragment Source"
-msgstr ""
+msgstr "Fragment Source"
 
 #: ../clutter/deprecated/clutter-shader.c:275
 msgid "Source of fragment shader"
-msgstr ""
+msgstr "Source of fragment shader"
 
 #: ../clutter/deprecated/clutter-shader.c:292
 msgid "Compiled"
-msgstr ""
+msgstr "Compiled"
 
 #: ../clutter/deprecated/clutter-shader.c:293
 msgid "Whether the shader is compiled and linked"
-msgstr ""
+msgstr "Whether the shader is compiled and linked"
 
 #: ../clutter/deprecated/clutter-shader.c:310
 msgid "Whether the shader is enabled"
-msgstr ""
+msgstr "Whether the shader is enabled"
 
 #: ../clutter/deprecated/clutter-shader.c:521
 #, c-format
 msgid "%s compilation failed: %s"
-msgstr ""
+msgstr "%s compilation failed: %s"
 
 #: ../clutter/deprecated/clutter-shader.c:522
 msgid "Vertex shader"
-msgstr ""
+msgstr "Vertex shader"
 
 #: ../clutter/deprecated/clutter-shader.c:523
 msgid "Fragment shader"
-msgstr ""
+msgstr "Fragment shader"
 
-#: ../clutter/clutter-shader-effect.c:482
-msgid "Shader Type"
-msgstr ""
-
-#: ../clutter/clutter-shader-effect.c:483
-msgid "The type of shader used"
-msgstr ""
-
-#: ../clutter/clutter-snap-constraint.c:322
-msgid "The source of the constraint"
-msgstr ""
-
-#: ../clutter/clutter-snap-constraint.c:335
-msgid "From Edge"
-msgstr ""
-
-#: ../clutter/clutter-snap-constraint.c:336
-msgid "The edge of the actor that should be snapped"
-msgstr ""
-
-#: ../clutter/clutter-snap-constraint.c:350
-msgid "To Edge"
-msgstr ""
-
-#: ../clutter/clutter-snap-constraint.c:351
-msgid "The edge of the source that should be snapped"
-msgstr ""
-
-#: ../clutter/clutter-snap-constraint.c:367
-msgid "The offset in pixels to apply to the constraint"
-msgstr ""
-
-#: ../clutter/clutter-stage.c:1732
-msgid "Fullscreen Set"
-msgstr ""
-
-#: ../clutter/clutter-stage.c:1733
-msgid "Whether the main stage is fullscreen"
-msgstr ""
-
-#: ../clutter/clutter-stage.c:1749
-msgid "Offscreen"
-msgstr ""
-
-#: ../clutter/clutter-stage.c:1750
-msgid "Whether the main stage should be rendered offscreen"
-msgstr ""
-
-#: ../clutter/clutter-stage.c:1762
-#: ../clutter/clutter-text.c:3108
-msgid "Cursor Visible"
-msgstr ""
-
-#: ../clutter/clutter-stage.c:1763
-msgid "Whether the mouse pointer is visible on the main stage"
-msgstr ""
-
-#: ../clutter/clutter-stage.c:1777
-msgid "User Resizable"
-msgstr ""
-
-#: ../clutter/clutter-stage.c:1778
-msgid "Whether the stage is able to be resized via user interaction"
-msgstr ""
-
-#: ../clutter/clutter-stage.c:1791
-msgid "The color of the stage"
-msgstr ""
-
-#: ../clutter/clutter-stage.c:1805
-msgid "Perspective"
-msgstr ""
-
-#: ../clutter/clutter-stage.c:1806
-msgid "Perspective projection parameters"
-msgstr ""
-
-#: ../clutter/clutter-stage.c:1821
-msgid "Title"
-msgstr ""
-
-#: ../clutter/clutter-stage.c:1822
-msgid "Stage Title"
-msgstr ""
-
-#: ../clutter/clutter-stage.c:1837
-msgid "Use Fog"
-msgstr ""
-
-#: ../clutter/clutter-stage.c:1838
-msgid "Whether to enable depth cueing"
-msgstr ""
-
-#: ../clutter/clutter-stage.c:1852
-msgid "Fog"
-msgstr ""
-
-#: ../clutter/clutter-stage.c:1853
-msgid "Settings for the depth cueing"
-msgstr ""
-
-#: ../clutter/clutter-stage.c:1869
-msgid "Use Alpha"
-msgstr ""
-
-#: ../clutter/clutter-stage.c:1870
-msgid "Whether to honour the alpha component of the stage color"
-msgstr ""
-
-#: ../clutter/clutter-stage.c:1886
-msgid "Key Focus"
-msgstr ""
-
-#: ../clutter/clutter-stage.c:1887
-msgid "The currently key focused actor"
-msgstr ""
-
-#: ../clutter/clutter-stage.c:1903
-msgid "No Clear Hint"
-msgstr ""
-
-#: ../clutter/clutter-stage.c:1904
-msgid "Whether the stage should clear its contents"
-msgstr ""
-
-#: ../clutter/clutter-stage.c:1917
-msgid "Accept Focus"
-msgstr ""
-
-#: ../clutter/clutter-stage.c:1918
-msgid "Whether the stage should accept focus on show"
-msgstr ""
-
-#: ../clutter/clutter-state.c:1472
+#: ../clutter/deprecated/clutter-state.c:1497
 msgid "State"
-msgstr ""
+msgstr "State"
 
-#: ../clutter/clutter-state.c:1473
+#: ../clutter/deprecated/clutter-state.c:1498
 msgid "Currently set state, (transition to this state might not be complete)"
-msgstr ""
+msgstr "Currently set state, (transition to this state might not be complete)"
 
-#: ../clutter/clutter-state.c:1487
+#: ../clutter/deprecated/clutter-state.c:1516
 msgid "Default transition duration"
-msgstr ""
+msgstr "Default transition duration"
 
-#: ../clutter/clutter-table-layout.c:585
+#: ../clutter/deprecated/clutter-table-layout.c:535
 msgid "Column Number"
-msgstr ""
+msgstr "Column Number"
 
-#: ../clutter/clutter-table-layout.c:586
+#: ../clutter/deprecated/clutter-table-layout.c:536
 msgid "The column the widget resides in"
-msgstr ""
+msgstr "The column the widget resides in"
 
-#: ../clutter/clutter-table-layout.c:593
+#: ../clutter/deprecated/clutter-table-layout.c:543
 msgid "Row Number"
-msgstr ""
+msgstr "Row Number"
 
-#: ../clutter/clutter-table-layout.c:594
+#: ../clutter/deprecated/clutter-table-layout.c:544
 msgid "The row the widget resides in"
-msgstr ""
+msgstr "The row the widget resides in"
 
-#: ../clutter/clutter-table-layout.c:601
+#: ../clutter/deprecated/clutter-table-layout.c:551
 msgid "Column Span"
-msgstr ""
+msgstr "Column Span"
 
-#: ../clutter/clutter-table-layout.c:602
+#: ../clutter/deprecated/clutter-table-layout.c:552
 msgid "The number of columns the widget should span"
-msgstr ""
+msgstr "The number of columns the widget should span"
 
-#: ../clutter/clutter-table-layout.c:609
+#: ../clutter/deprecated/clutter-table-layout.c:559
 msgid "Row Span"
-msgstr ""
+msgstr "Row Span"
 
-#: ../clutter/clutter-table-layout.c:610
+#: ../clutter/deprecated/clutter-table-layout.c:560
 msgid "The number of rows the widget should span"
-msgstr ""
+msgstr "The number of rows the widget should span"
 
-#: ../clutter/clutter-table-layout.c:617
+#: ../clutter/deprecated/clutter-table-layout.c:567
 msgid "Horizontal Expand"
-msgstr ""
+msgstr "Horizontal Expand"
 
-#: ../clutter/clutter-table-layout.c:618
+#: ../clutter/deprecated/clutter-table-layout.c:568
 msgid "Allocate extra space for the child in horizontal axis"
-msgstr ""
+msgstr "Allocate extra space for the child in horizontal axis"
 
-#: ../clutter/clutter-table-layout.c:624
+#: ../clutter/deprecated/clutter-table-layout.c:574
 msgid "Vertical Expand"
-msgstr ""
+msgstr "Vertical Expand"
 
-#: ../clutter/clutter-table-layout.c:625
+#: ../clutter/deprecated/clutter-table-layout.c:575
 msgid "Allocate extra space for the child in vertical axis"
-msgstr ""
+msgstr "Allocate extra space for the child in vertical axis"
 
-#: ../clutter/clutter-table-layout.c:1714
+#: ../clutter/deprecated/clutter-table-layout.c:1630
 msgid "Spacing between columns"
-msgstr ""
+msgstr "Spacing between columns"
 
-#: ../clutter/clutter-table-layout.c:1728
+#: ../clutter/deprecated/clutter-table-layout.c:1646
 msgid "Spacing between rows"
-msgstr ""
+msgstr "Spacing between rows"
 
-#: ../clutter/clutter-text.c:2996
-msgid "The font to be used by the text"
-msgstr ""
-
-#: ../clutter/clutter-text.c:3013
-msgid "Font Description"
-msgstr ""
-
-#: ../clutter/clutter-text.c:3014
-msgid "The font description to be used"
-msgstr ""
-
-#: ../clutter/clutter-text.c:3030
-msgid "Text"
-msgstr ""
-
-#: ../clutter/clutter-text.c:3031
-msgid "The text to render"
-msgstr ""
-
-#: ../clutter/clutter-text.c:3045
-msgid "Font Color"
-msgstr ""
-
-#: ../clutter/clutter-text.c:3046
-msgid "Color of the font used by the text"
-msgstr ""
-
-#: ../clutter/clutter-text.c:3060
-msgid "Editable"
-msgstr ""
-
-#: ../clutter/clutter-text.c:3061
-msgid "Whether the text is editable"
-msgstr ""
-
-#: ../clutter/clutter-text.c:3076
-msgid "Selectable"
-msgstr ""
-
-#: ../clutter/clutter-text.c:3077
-msgid "Whether the text is selectable"
-msgstr ""
-
-#: ../clutter/clutter-text.c:3091
-msgid "Activatable"
-msgstr ""
-
-#: ../clutter/clutter-text.c:3092
-msgid "Whether pressing return causes the activate signal to be emitted"
-msgstr ""
-
-#: ../clutter/clutter-text.c:3109
-msgid "Whether the input cursor is visible"
-msgstr ""
-
-#: ../clutter/clutter-text.c:3123
-#: ../clutter/clutter-text.c:3124
-msgid "Cursor Color"
-msgstr ""
-
-#: ../clutter/clutter-text.c:3138
-msgid "Cursor Color Set"
-msgstr ""
-
-#: ../clutter/clutter-text.c:3139
-msgid "Whether the cursor color has been set"
-msgstr ""
-
-#: ../clutter/clutter-text.c:3154
-msgid "Cursor Size"
-msgstr ""
-
-#: ../clutter/clutter-text.c:3155
-msgid "The width of the cursor, in pixels"
-msgstr ""
-
-#: ../clutter/clutter-text.c:3169
-msgid "Cursor Position"
-msgstr ""
-
-#: ../clutter/clutter-text.c:3170
-msgid "The cursor position"
-msgstr ""
-
-#: ../clutter/clutter-text.c:3185
-msgid "Selection-bound"
-msgstr ""
-
-#: ../clutter/clutter-text.c:3186
-msgid "The cursor position of the other end of the selection"
-msgstr ""
-
-#: ../clutter/clutter-text.c:3201
-#: ../clutter/clutter-text.c:3202
-msgid "Selection Color"
-msgstr ""
-
-#: ../clutter/clutter-text.c:3216
-msgid "Selection Color Set"
-msgstr ""
-
-#: ../clutter/clutter-text.c:3217
-msgid "Whether the selection color has been set"
-msgstr ""
-
-#: ../clutter/clutter-text.c:3232
-msgid "Attributes"
-msgstr ""
-
-#: ../clutter/clutter-text.c:3233
-msgid "A list of style attributes to apply to the contents of the actor"
-msgstr ""
-
-#: ../clutter/clutter-text.c:3255
-msgid "Use markup"
-msgstr ""
-
-#: ../clutter/clutter-text.c:3256
-msgid "Whether or not the text includes Pango markup"
-msgstr ""
-
-#: ../clutter/clutter-text.c:3272
-msgid "Line wrap"
-msgstr ""
-
-#: ../clutter/clutter-text.c:3273
-msgid "If set, wrap the lines if the text becomes too wide"
-msgstr ""
-
-#: ../clutter/clutter-text.c:3288
-msgid "Line wrap mode"
-msgstr ""
-
-#: ../clutter/clutter-text.c:3289
-msgid "Control how line-wrapping is done"
-msgstr ""
-
-#: ../clutter/clutter-text.c:3304
-msgid "Ellipsize"
-msgstr ""
-
-#: ../clutter/clutter-text.c:3305
-msgid "The preferred place to ellipsize the string"
-msgstr ""
-
-#: ../clutter/clutter-text.c:3321
-msgid "Line Alignment"
-msgstr ""
-
-#: ../clutter/clutter-text.c:3322
-msgid "The preferred alignment for the string, for multi-line text"
-msgstr ""
-
-#: ../clutter/clutter-text.c:3338
-msgid "Justify"
-msgstr ""
-
-#: ../clutter/clutter-text.c:3339
-msgid "Whether the text should be justified"
-msgstr ""
-
-#: ../clutter/clutter-text.c:3354
-msgid "Password Character"
-msgstr ""
-
-#: ../clutter/clutter-text.c:3355
-msgid "If non-zero, use this character to display the actor's contents"
-msgstr ""
-
-#: ../clutter/clutter-text.c:3369
-msgid "Max Length"
-msgstr ""
-
-#: ../clutter/clutter-text.c:3370
-msgid "Maximum length of the text inside the actor"
-msgstr ""
-
-#: ../clutter/clutter-text.c:3393
-msgid "Single Line Mode"
-msgstr ""
-
-#: ../clutter/clutter-text.c:3394
-msgid "Whether the text should be a single line"
-msgstr ""
-
-#: ../clutter/clutter-text.c:3408
-#: ../clutter/clutter-text.c:3409
-msgid "Selected Text Color"
-msgstr ""
-
-#: ../clutter/clutter-text.c:3423
-msgid "Selected Text Color Set"
-msgstr ""
-
-#: ../clutter/clutter-text.c:3424
-msgid "Whether the selected text color has been set"
-msgstr ""
-
-#: ../clutter/clutter-texture.c:985
+#: ../clutter/deprecated/clutter-texture.c:992
 msgid "Sync size of actor"
-msgstr ""
+msgstr "Sync size of actor"
 
-#: ../clutter/clutter-texture.c:986
+#: ../clutter/deprecated/clutter-texture.c:993
 msgid "Auto sync size of actor to underlying pixbuf dimensions"
-msgstr ""
+msgstr "Auto sync size of actor to underlying pixbuf dimensions"
 
-#: ../clutter/clutter-texture.c:993
+#: ../clutter/deprecated/clutter-texture.c:1000
 msgid "Disable Slicing"
-msgstr ""
+msgstr "Disable Slicing"
 
-#: ../clutter/clutter-texture.c:994
-msgid "Forces the underlying texture to be singular and not made of smaller space saving individual textures"
+#: ../clutter/deprecated/clutter-texture.c:1001
+msgid ""
+"Forces the underlying texture to be singular and not made of smaller space "
+"saving individual textures"
 msgstr ""
+"Forces the underlying texture to be singular and not made of smaller space "
+"saving individual textures"
 
-#: ../clutter/clutter-texture.c:1003
+#: ../clutter/deprecated/clutter-texture.c:1010
 msgid "Tile Waste"
-msgstr ""
+msgstr "Tile Waste"
 
-#: ../clutter/clutter-texture.c:1004
+#: ../clutter/deprecated/clutter-texture.c:1011
 msgid "Maximum waste area of a sliced texture"
-msgstr ""
+msgstr "Maximum waste area of a sliced texture"
 
-#: ../clutter/clutter-texture.c:1012
+#: ../clutter/deprecated/clutter-texture.c:1019
 msgid "Horizontal repeat"
-msgstr ""
+msgstr "Horizontal repeat"
 
-#: ../clutter/clutter-texture.c:1013
+#: ../clutter/deprecated/clutter-texture.c:1020
 msgid "Repeat the contents rather than scaling them horizontally"
-msgstr ""
+msgstr "Repeat the contents rather than scaling them horizontally"
 
-#: ../clutter/clutter-texture.c:1020
+#: ../clutter/deprecated/clutter-texture.c:1027
 msgid "Vertical repeat"
-msgstr ""
+msgstr "Vertical repeat"
 
-#: ../clutter/clutter-texture.c:1021
+#: ../clutter/deprecated/clutter-texture.c:1028
 msgid "Repeat the contents rather than scaling them vertically"
-msgstr ""
+msgstr "Repeat the contents rather than scaling them vertically"
 
-#: ../clutter/clutter-texture.c:1028
+#: ../clutter/deprecated/clutter-texture.c:1035
 msgid "Filter Quality"
-msgstr ""
+msgstr "Filter Quality"
 
-#: ../clutter/clutter-texture.c:1029
+#: ../clutter/deprecated/clutter-texture.c:1036
 msgid "Rendering quality used when drawing the texture"
-msgstr ""
+msgstr "Rendering quality used when drawing the texture"
 
-#: ../clutter/clutter-texture.c:1037
+#: ../clutter/deprecated/clutter-texture.c:1044
 msgid "Pixel Format"
-msgstr ""
+msgstr "Pixel Format"
 
-#: ../clutter/clutter-texture.c:1038
+#: ../clutter/deprecated/clutter-texture.c:1045
 msgid "The Cogl pixel format to use"
-msgstr ""
+msgstr "The Cogl pixel format to use"
 
-#: ../clutter/clutter-texture.c:1046
+#: ../clutter/deprecated/clutter-texture.c:1053
+#: ../clutter/wayland/clutter-wayland-surface.c:445
 msgid "Cogl Texture"
-msgstr ""
+msgstr "Cogl Texture"
 
-#: ../clutter/clutter-texture.c:1047
+#: ../clutter/deprecated/clutter-texture.c:1054
+#: ../clutter/wayland/clutter-wayland-surface.c:446
 msgid "The underlying Cogl texture handle used to draw this actor"
-msgstr ""
+msgstr "The underlying Cogl texture handle used to draw this actor"
 
-#: ../clutter/clutter-texture.c:1054
+#: ../clutter/deprecated/clutter-texture.c:1061
 msgid "Cogl Material"
-msgstr ""
+msgstr "Cogl Material"
 
-#: ../clutter/clutter-texture.c:1055
+#: ../clutter/deprecated/clutter-texture.c:1062
 msgid "The underlying Cogl material handle used to draw this actor"
-msgstr ""
+msgstr "The underlying Cogl material handle used to draw this actor"
 
-#: ../clutter/clutter-texture.c:1072
+#: ../clutter/deprecated/clutter-texture.c:1081
 msgid "The path of the file containing the image data"
-msgstr ""
+msgstr "The path of the file containing the image data"
 
-#: ../clutter/clutter-texture.c:1079
+#: ../clutter/deprecated/clutter-texture.c:1088
 msgid "Keep Aspect Ratio"
-msgstr ""
+msgstr "Keep Aspect Ratio"
 
-#: ../clutter/clutter-texture.c:1080
-msgid "Keep the aspect ratio of the texture when requesting the preferred width or height"
+#: ../clutter/deprecated/clutter-texture.c:1089
+msgid ""
+"Keep the aspect ratio of the texture when requesting the preferred width or "
+"height"
 msgstr ""
+"Keep the aspect ratio of the texture when requesting the preferred width or "
+"height"
 
-#: ../clutter/clutter-texture.c:1106
+#: ../clutter/deprecated/clutter-texture.c:1117
 msgid "Load asynchronously"
-msgstr ""
+msgstr "Load asynchronously"
 
-#: ../clutter/clutter-texture.c:1107
-msgid "Load files inside a thread to avoid blocking when loading images from disk"
+#: ../clutter/deprecated/clutter-texture.c:1118
+msgid ""
+"Load files inside a thread to avoid blocking when loading images from disk"
 msgstr ""
+"Load files inside a thread to avoid blocking when loading images from disk"
 
-#: ../clutter/clutter-texture.c:1123
+#: ../clutter/deprecated/clutter-texture.c:1136
 msgid "Load data asynchronously"
-msgstr ""
+msgstr "Load data asynchronously"
 
-#: ../clutter/clutter-texture.c:1124
-msgid "Decode image data files inside a thread to reduce blocking when loading images from disk"
+#: ../clutter/deprecated/clutter-texture.c:1137
+msgid ""
+"Decode image data files inside a thread to reduce blocking when loading "
+"images from disk"
 msgstr ""
+"Decode image data files inside a thread to reduce blocking when loading "
+"images from disk"
 
-#: ../clutter/clutter-texture.c:1148
+#: ../clutter/deprecated/clutter-texture.c:1163
 msgid "Pick With Alpha"
-msgstr ""
+msgstr "Pick With Alpha"
 
-#: ../clutter/clutter-texture.c:1149
+#: ../clutter/deprecated/clutter-texture.c:1164
 msgid "Shape actor with alpha channel when picking"
-msgstr ""
+msgstr "Shape actor with alpha channel when picking"
 
-#: ../clutter/clutter-texture.c:1547
-#: ../clutter/clutter-texture.c:1930
-#: ../clutter/clutter-texture.c:2024
-#: ../clutter/clutter-texture.c:2305
+#: ../clutter/deprecated/clutter-texture.c:1597
+#: ../clutter/deprecated/clutter-texture.c:1992
+#: ../clutter/deprecated/clutter-texture.c:2088
+#: ../clutter/deprecated/clutter-texture.c:2386
 #, c-format
 msgid "Failed to load the image data"
-msgstr ""
+msgstr "Failed to load the image data"
 
-#: ../clutter/clutter-texture.c:1693
+#: ../clutter/deprecated/clutter-texture.c:1756
 #, c-format
 msgid "YUV textures are not supported"
-msgstr ""
+msgstr "YUV textures are not supported"
 
-#: ../clutter/clutter-texture.c:1702
+#: ../clutter/deprecated/clutter-texture.c:1765
 #, c-format
 msgid "YUV2 textues are not supported"
-msgstr ""
+msgstr "YUV2 textues are not supported"
 
-#: ../clutter/clutter-timeline.c:264
-msgid "Should the timeline automatically restart"
-msgstr ""
+#: ../clutter/gdk/clutter-backend-gdk.c:290
+#, c-format
+msgid "Could not find a suitable CoglWinsys for a GdkDisplay of type %s"
+msgstr "Could not find a suitable CoglWinsys for a GdkDisplay of type %s"
 
-#: ../clutter/clutter-timeline.c:278
-msgid "Delay"
-msgstr ""
+#: ../clutter/wayland/clutter-wayland-surface.c:419
+msgid "Surface"
+msgstr "Surface"
 
-#: ../clutter/clutter-timeline.c:279
-msgid "Delay before start"
-msgstr ""
+#: ../clutter/wayland/clutter-wayland-surface.c:420
+msgid "The underlying wayland surface"
+msgstr "The underlying wayland surface"
 
-#: ../clutter/clutter-timeline.c:295
-msgid "Duration of the timeline in milliseconds"
-msgstr ""
+#: ../clutter/wayland/clutter-wayland-surface.c:427
+msgid "Surface width"
+msgstr "Surface width"
 
-#: ../clutter/clutter-timeline.c:311
-msgid "Direction of the timeline"
-msgstr ""
+#: ../clutter/wayland/clutter-wayland-surface.c:428
+msgid "The width of the underlying wayland surface"
+msgstr "The width of the underlying wayland surface"
 
-#: ../clutter/clutter-timeline.c:326
-msgid "Auto Reverse"
-msgstr ""
+#: ../clutter/wayland/clutter-wayland-surface.c:436
+msgid "Surface height"
+msgstr "Surface height"
 
-#: ../clutter/clutter-timeline.c:327
-msgid "Whether the direction should be reversed when reaching the end"
-msgstr ""
-
-#: ../clutter/evdev/clutter-input-device-evdev.c:147
-msgid "sysfs Path"
-msgstr ""
-
-#: ../clutter/evdev/clutter-input-device-evdev.c:148
-msgid "Path of the device in sysfs"
-msgstr ""
-
-#: ../clutter/evdev/clutter-input-device-evdev.c:163
-msgid "Device Path"
-msgstr ""
-
-#: ../clutter/evdev/clutter-input-device-evdev.c:164
-msgid "Path of the device node"
-msgstr ""
-
-#: ../clutter/x11/clutter-backend-x11.c:483
-msgid "X display to use"
-msgstr ""
+#: ../clutter/wayland/clutter-wayland-surface.c:437
+msgid "The height of the underlying wayland surface"
+msgstr "The height of the underlying wayland surface"
 
 #: ../clutter/x11/clutter-backend-x11.c:489
+msgid "X display to use"
+msgstr "X display to use"
+
+#: ../clutter/x11/clutter-backend-x11.c:495
 msgid "X screen to use"
-msgstr ""
+msgstr "X screen to use"
 
-#: ../clutter/x11/clutter-backend-x11.c:494
+#: ../clutter/x11/clutter-backend-x11.c:500
 msgid "Make X calls synchronous"
-msgstr ""
+msgstr "Make X calls synchronous"
 
-#: ../clutter/x11/clutter-backend-x11.c:501
-msgid "Enable XInput support"
-msgstr ""
+#: ../clutter/x11/clutter-backend-x11.c:507
+msgid "Disable XInput support"
+msgstr "Disable XInput support"
 
-#: ../clutter/x11/clutter-keymap-x11.c:317
+#: ../clutter/x11/clutter-keymap-x11.c:458
 msgid "The Clutter backend"
-msgstr ""
+msgstr "The Clutter backend"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:545
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:534
 msgid "Pixmap"
-msgstr ""
+msgstr "Pixmap"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:546
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:535
 msgid "The X11 Pixmap to be bound"
-msgstr ""
+msgstr "The X11 Pixmap to be bound"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:554
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:543
 msgid "Pixmap width"
-msgstr ""
+msgstr "Pixmap width"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:555
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:544
 msgid "The width of the pixmap bound to this texture"
-msgstr ""
+msgstr "The width of the pixmap bound to this texture"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:563
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:552
 msgid "Pixmap height"
-msgstr ""
+msgstr "Pixmap height"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:564
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:553
 msgid "The height of the pixmap bound to this texture"
-msgstr ""
+msgstr "The height of the pixmap bound to this texture"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:572
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:561
 msgid "Pixmap Depth"
-msgstr ""
+msgstr "Pixmap Depth"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:573
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:562
 msgid "The depth (in number of bits) of the pixmap bound to this texture"
-msgstr ""
+msgstr "The depth (in number of bits) of the pixmap bound to this texture"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:581
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:570
 msgid "Automatic Updates"
-msgstr ""
+msgstr "Automatic Updates"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:582
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:571
 msgid "If the texture should be kept in sync with any pixmap changes."
-msgstr ""
+msgstr "If the texture should be kept in sync with any pixmap changes."
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:590
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:579
 msgid "Window"
-msgstr ""
+msgstr "Window"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:591
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:580
 msgid "The X11 Window to be bound"
-msgstr ""
+msgstr "The X11 Window to be bound"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:599
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:588
 msgid "Window Redirect Automatic"
-msgstr ""
+msgstr "Window Redirect Automatic"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:600
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:589
 msgid "If composite window redirects are set to Automatic (or Manual if false)"
 msgstr ""
+"If composite window redirects are set to Automatic (or Manual if false)"
+
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:599
+msgid "Window Mapped"
+msgstr "Window Mapped"
+
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:600
+msgid "If window is mapped"
+msgstr "If window is mapped"
+
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:609
+msgid "Destroyed"
+msgstr "Destroyed"
 
 #: ../clutter/x11/clutter-x11-texture-pixmap.c:610
-msgid "Window Mapped"
-msgstr ""
-
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:611
-msgid "If window is mapped"
-msgstr ""
-
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:620
-msgid "Destroyed"
-msgstr ""
-
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:621
 msgid "If window has been destroyed"
-msgstr ""
+msgstr "If window has been destroyed"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:629
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:618
 msgid "Window X"
-msgstr ""
+msgstr "Window X"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:630
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:619
 msgid "X position of window on screen according to X11"
-msgstr ""
+msgstr "X position of window on screen according to X11"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:638
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:627
 msgid "Window Y"
-msgstr ""
+msgstr "Window Y"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:639
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:628
 msgid "Y position of window on screen according to X11"
-msgstr ""
+msgstr "Y position of window on screen according to X11"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:646
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:635
 msgid "Window Override Redirect"
-msgstr ""
+msgstr "Window Override Redirect"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:647
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:636
 msgid "If this is an override-redirect window"
-msgstr ""
+msgstr "If this is an override-redirect window"
 
+#~ msgid "sysfs Path"
+#~ msgstr "sysfs Path"
+
+#~ msgid "Path of the device in sysfs"
+#~ msgstr "Path of the device in sysfs"
+
+#~ msgid "Device Path"
+#~ msgstr "Device Path"
+
+#~ msgid "Path of the device node"
+#~ msgstr "Path of the device node"
diff --git a/po/hu.po b/po/hu.po
new file mode 100644
index 000000000..5dd428497
--- /dev/null
+++ b/po/hu.po
@@ -0,0 +1,2871 @@
+# Hungarian translation for clutter.
+# Copyright (C) 2013 clutter's COPYRIGHT HOLDER
+# This file is distributed under the same license as the clutter package.
+#
+# Balázs Úr <urbalazs@gmail.com>, 2013.
+# Balázs Úr <urbalazs at gmail dot com>, 2013, 2014.
+msgid ""
+msgstr ""
+"Project-Id-Version: clutter clutter-1.16\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+"product=clutter&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2014-02-23 04:08+0000\n"
+"PO-Revision-Date: 2014-02-23 16:29+0100\n"
+"Last-Translator: Balázs Úr <urbalazs at gmail dot com>\n"
+"Language-Team: Hungarian <gnome-hu-list@gnome.org>\n"
+"Language: hu\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"
+"X-Generator: Lokalize 1.2\n"
+
+#: ../clutter/clutter-actor.c:6214
+msgid "X coordinate"
+msgstr "X koordináta"
+
+#: ../clutter/clutter-actor.c:6215
+msgid "X coordinate of the actor"
+msgstr "A szereplő X koordinátája"
+
+#: ../clutter/clutter-actor.c:6233
+msgid "Y coordinate"
+msgstr "Y koordináta"
+
+#: ../clutter/clutter-actor.c:6234
+msgid "Y coordinate of the actor"
+msgstr "A szereplő Y koordinátája"
+
+#: ../clutter/clutter-actor.c:6256
+msgid "Position"
+msgstr "Pozíció"
+
+#: ../clutter/clutter-actor.c:6257
+msgid "The position of the origin of the actor"
+msgstr "A szereplő kezdetének pozíciója"
+
+#: ../clutter/clutter-actor.c:6274 ../clutter/clutter-canvas.c:247
+#: ../clutter/clutter-grid-layout.c:1239
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:474
+msgid "Width"
+msgstr "Szélesség"
+
+#: ../clutter/clutter-actor.c:6275
+msgid "Width of the actor"
+msgstr "A szereplő szélessége"
+
+#: ../clutter/clutter-actor.c:6293 ../clutter/clutter-canvas.c:263
+#: ../clutter/clutter-grid-layout.c:1246
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:490
+msgid "Height"
+msgstr "Magasság"
+
+#: ../clutter/clutter-actor.c:6294
+msgid "Height of the actor"
+msgstr "A szereplő magassága"
+
+#: ../clutter/clutter-actor.c:6315
+msgid "Size"
+msgstr "Méret"
+
+#: ../clutter/clutter-actor.c:6316
+msgid "The size of the actor"
+msgstr "A szereplő mérete"
+
+#: ../clutter/clutter-actor.c:6334
+msgid "Fixed X"
+msgstr "Rögzített X"
+
+#: ../clutter/clutter-actor.c:6335
+msgid "Forced X position of the actor"
+msgstr "A szereplő erőltetett X pozíciója"
+
+#: ../clutter/clutter-actor.c:6352
+msgid "Fixed Y"
+msgstr "Rögzített Y"
+
+#: ../clutter/clutter-actor.c:6353
+msgid "Forced Y position of the actor"
+msgstr "A szereplő erőltetett Y pozíciója"
+
+#: ../clutter/clutter-actor.c:6368
+msgid "Fixed position set"
+msgstr "Rögzített pozíció beállítva"
+
+#: ../clutter/clutter-actor.c:6369
+msgid "Whether to use fixed positioning for the actor"
+msgstr "Használjon-e rögzített pozicionálást a szereplőhöz"
+
+#: ../clutter/clutter-actor.c:6387
+msgid "Min Width"
+msgstr "Minimális szélesség"
+
+#: ../clutter/clutter-actor.c:6388
+msgid "Forced minimum width request for the actor"
+msgstr "Erőltetett minimális szélesség kérés a szereplőhöz"
+
+#: ../clutter/clutter-actor.c:6406
+msgid "Min Height"
+msgstr "Minimális magasság"
+
+#: ../clutter/clutter-actor.c:6407
+msgid "Forced minimum height request for the actor"
+msgstr "Erőltetett minimális magasság kérés a szereplőhöz"
+
+#: ../clutter/clutter-actor.c:6425
+msgid "Natural Width"
+msgstr "Természetes szélesség"
+
+#: ../clutter/clutter-actor.c:6426
+msgid "Forced natural width request for the actor"
+msgstr "Erőltetett természetes szélesség kérés a szereplőhöz"
+
+#: ../clutter/clutter-actor.c:6444
+msgid "Natural Height"
+msgstr "Természetes magasság"
+
+#: ../clutter/clutter-actor.c:6445
+msgid "Forced natural height request for the actor"
+msgstr "Erőltetett természetes magasság kérés a szereplőhöz"
+
+#: ../clutter/clutter-actor.c:6460
+msgid "Minimum width set"
+msgstr "Minimális szélesség beállítva"
+
+#: ../clutter/clutter-actor.c:6461
+msgid "Whether to use the min-width property"
+msgstr "Használja-e a min-width tulajdonságot"
+
+#: ../clutter/clutter-actor.c:6475
+msgid "Minimum height set"
+msgstr "Minimális magasság beállítva"
+
+#: ../clutter/clutter-actor.c:6476
+msgid "Whether to use the min-height property"
+msgstr "Használja-e a min-height tulajdonságot"
+
+#: ../clutter/clutter-actor.c:6490
+msgid "Natural width set"
+msgstr "Természetes szélesség beállítva"
+
+#: ../clutter/clutter-actor.c:6491
+msgid "Whether to use the natural-width property"
+msgstr "Használja-e a natural-width tulajdonságot"
+
+#: ../clutter/clutter-actor.c:6505
+msgid "Natural height set"
+msgstr "Természetes magasság beállítva"
+
+#: ../clutter/clutter-actor.c:6506
+msgid "Whether to use the natural-height property"
+msgstr "Használja-e a natural-height tulajdonságot"
+
+#: ../clutter/clutter-actor.c:6522
+msgid "Allocation"
+msgstr "Lefoglalás"
+
+#: ../clutter/clutter-actor.c:6523
+msgid "The actor's allocation"
+msgstr "A szereplő lefoglalása"
+
+#: ../clutter/clutter-actor.c:6580
+msgid "Request Mode"
+msgstr "Kérés mód"
+
+#: ../clutter/clutter-actor.c:6581
+msgid "The actor's request mode"
+msgstr "A szereplő kérés módja"
+
+#: ../clutter/clutter-actor.c:6605
+msgid "Depth"
+msgstr "Mélység"
+
+#: ../clutter/clutter-actor.c:6606
+msgid "Position on the Z axis"
+msgstr "Pozíció a Z tengelyen"
+
+#: ../clutter/clutter-actor.c:6633
+msgid "Z Position"
+msgstr "Z pozíció"
+
+#: ../clutter/clutter-actor.c:6634
+msgid "The actor's position on the Z axis"
+msgstr "A szereplő pozíciója a Z tengelyen"
+
+#: ../clutter/clutter-actor.c:6651
+msgid "Opacity"
+msgstr "Átlátszatlanság"
+
+#: ../clutter/clutter-actor.c:6652
+msgid "Opacity of an actor"
+msgstr "Egy szereplő átlátszatlansága"
+
+#: ../clutter/clutter-actor.c:6672
+msgid "Offscreen redirect"
+msgstr "Képernyőn kívüli átirányítás"
+
+#: ../clutter/clutter-actor.c:6673
+msgid "Flags controlling when to flatten the actor into a single image"
+msgstr ""
+"Zászlók annak vezérlésére, amikor a szereplő egy egyszerű képpé van lapítva"
+
+#: ../clutter/clutter-actor.c:6687
+msgid "Visible"
+msgstr "Látható"
+
+#: ../clutter/clutter-actor.c:6688
+msgid "Whether the actor is visible or not"
+msgstr "A szereplő legyen-e látható vagy ne"
+
+#: ../clutter/clutter-actor.c:6702
+msgid "Mapped"
+msgstr "Leképezett"
+
+#: ../clutter/clutter-actor.c:6703
+msgid "Whether the actor will be painted"
+msgstr "A szereplő legyen-e megrajzolva"
+
+#: ../clutter/clutter-actor.c:6716
+msgid "Realized"
+msgstr "Megvalósult"
+
+#: ../clutter/clutter-actor.c:6717
+msgid "Whether the actor has been realized"
+msgstr "A szereplő meg lett-e valósítva"
+
+#: ../clutter/clutter-actor.c:6732
+msgid "Reactive"
+msgstr "Reaktív"
+
+#: ../clutter/clutter-actor.c:6733
+msgid "Whether the actor is reactive to events"
+msgstr "A szereplő legyen-e reaktív az eseményekkel"
+
+#: ../clutter/clutter-actor.c:6744
+msgid "Has Clip"
+msgstr "Van vágása"
+
+#: ../clutter/clutter-actor.c:6745
+msgid "Whether the actor has a clip set"
+msgstr "A szereplőnek van-e beállított vágása"
+
+#: ../clutter/clutter-actor.c:6758
+msgid "Clip"
+msgstr "Vágás"
+
+#: ../clutter/clutter-actor.c:6759
+msgid "The clip region for the actor"
+msgstr "A vágási terület a szereplőhöz"
+
+#: ../clutter/clutter-actor.c:6778
+msgid "Clip Rectangle"
+msgstr "Téglalap levágása"
+
+#: ../clutter/clutter-actor.c:6779
+msgid "The visible region of the actor"
+msgstr "A szereplő látható területe"
+
+#: ../clutter/clutter-actor.c:6793 ../clutter/clutter-actor-meta.c:205
+#: ../clutter/clutter-binding-pool.c:319 ../clutter/clutter-input-device.c:247
+msgid "Name"
+msgstr "Név"
+
+#: ../clutter/clutter-actor.c:6794
+msgid "Name of the actor"
+msgstr "A szereplő neve"
+
+#: ../clutter/clutter-actor.c:6815
+msgid "Pivot Point"
+msgstr "Forgatási pont"
+
+#: ../clutter/clutter-actor.c:6816
+msgid "The point around which the scaling and rotation occur"
+msgstr "Az a pont, amely körül a méretezés és a forgatás történik"
+
+#: ../clutter/clutter-actor.c:6834
+msgid "Pivot Point Z"
+msgstr "Z forgatási pont"
+
+#: ../clutter/clutter-actor.c:6835
+msgid "Z component of the pivot point"
+msgstr "A forgatási pont Z komponense"
+
+#: ../clutter/clutter-actor.c:6853
+msgid "Scale X"
+msgstr "X méretezés"
+
+#: ../clutter/clutter-actor.c:6854
+msgid "Scale factor on the X axis"
+msgstr "Méretezési tényező az X tengelyen"
+
+#: ../clutter/clutter-actor.c:6872
+msgid "Scale Y"
+msgstr "Y méretezés"
+
+#: ../clutter/clutter-actor.c:6873
+msgid "Scale factor on the Y axis"
+msgstr "Méretezési tényező az Y tengelyen"
+
+#: ../clutter/clutter-actor.c:6891
+msgid "Scale Z"
+msgstr "Z méretezés"
+
+#: ../clutter/clutter-actor.c:6892
+msgid "Scale factor on the Z axis"
+msgstr "Méretezési tényező a Z tengelyen"
+
+#: ../clutter/clutter-actor.c:6910
+msgid "Scale Center X"
+msgstr "X méretezés közép"
+
+#: ../clutter/clutter-actor.c:6911
+msgid "Horizontal scale center"
+msgstr "Vízszintes méretezés közép"
+
+#: ../clutter/clutter-actor.c:6929
+msgid "Scale Center Y"
+msgstr "Y méretezés közép"
+
+#: ../clutter/clutter-actor.c:6930
+msgid "Vertical scale center"
+msgstr "Függőleges méretezés közép"
+
+#: ../clutter/clutter-actor.c:6948
+msgid "Scale Gravity"
+msgstr "Gravitáció méretezés"
+
+#: ../clutter/clutter-actor.c:6949
+msgid "The center of scaling"
+msgstr "A méretezés közepe"
+
+#: ../clutter/clutter-actor.c:6967
+msgid "Rotation Angle X"
+msgstr "X forgatási szög"
+
+#: ../clutter/clutter-actor.c:6968
+msgid "The rotation angle on the X axis"
+msgstr "A forgatási szög az X tengelyen"
+
+#: ../clutter/clutter-actor.c:6986
+msgid "Rotation Angle Y"
+msgstr "Y forgatási szög"
+
+#: ../clutter/clutter-actor.c:6987
+msgid "The rotation angle on the Y axis"
+msgstr "A forgatási szög az Y tengelyen"
+
+#: ../clutter/clutter-actor.c:7005
+msgid "Rotation Angle Z"
+msgstr "Z forgatási szög"
+
+#: ../clutter/clutter-actor.c:7006
+msgid "The rotation angle on the Z axis"
+msgstr "A forgatási szög a Z tengelyen"
+
+#: ../clutter/clutter-actor.c:7024
+msgid "Rotation Center X"
+msgstr "X forgatási közép"
+
+#: ../clutter/clutter-actor.c:7025
+msgid "The rotation center on the X axis"
+msgstr "A forgatási közép az X tengelyen"
+
+#: ../clutter/clutter-actor.c:7042
+msgid "Rotation Center Y"
+msgstr "Y forgatási közép"
+
+#: ../clutter/clutter-actor.c:7043
+msgid "The rotation center on the Y axis"
+msgstr "A forgatási közép az Y tengelyen"
+
+#: ../clutter/clutter-actor.c:7060
+msgid "Rotation Center Z"
+msgstr "Z forgatási közép"
+
+#: ../clutter/clutter-actor.c:7061
+msgid "The rotation center on the Z axis"
+msgstr "A forgatási közép a Z tengelyen"
+
+#: ../clutter/clutter-actor.c:7078
+msgid "Rotation Center Z Gravity"
+msgstr "Z forgatási közép gravitáció"
+
+#: ../clutter/clutter-actor.c:7079
+msgid "Center point for rotation around the Z axis"
+msgstr "Középpont a Z tengely körüli forgatáshoz"
+
+#: ../clutter/clutter-actor.c:7107
+msgid "Anchor X"
+msgstr "X horgony"
+
+#: ../clutter/clutter-actor.c:7108
+msgid "X coordinate of the anchor point"
+msgstr "A horgonypont X koordinátája"
+
+#: ../clutter/clutter-actor.c:7136
+msgid "Anchor Y"
+msgstr "Y horgony"
+
+#: ../clutter/clutter-actor.c:7137
+msgid "Y coordinate of the anchor point"
+msgstr "A horgonypont Y koordinátája"
+
+#: ../clutter/clutter-actor.c:7164
+msgid "Anchor Gravity"
+msgstr "Horgony gravitáció"
+
+#: ../clutter/clutter-actor.c:7165
+msgid "The anchor point as a ClutterGravity"
+msgstr "A horgonypont mint egy ClutterGravity"
+
+#: ../clutter/clutter-actor.c:7184
+msgid "Translation X"
+msgstr "X elcsúszás"
+
+#: ../clutter/clutter-actor.c:7185
+msgid "Translation along the X axis"
+msgstr "Elcsúszás az X tengely mentén"
+
+#: ../clutter/clutter-actor.c:7204
+msgid "Translation Y"
+msgstr "Y elcsúszás"
+
+#: ../clutter/clutter-actor.c:7205
+msgid "Translation along the Y axis"
+msgstr "Elcsúszás az Y tengely mentén"
+
+#: ../clutter/clutter-actor.c:7224
+msgid "Translation Z"
+msgstr "Z elcsúszás"
+
+#: ../clutter/clutter-actor.c:7225
+msgid "Translation along the Z axis"
+msgstr "Elcsúszás a Z tengely mentén"
+
+#: ../clutter/clutter-actor.c:7255
+msgid "Transform"
+msgstr "Átalakítás"
+
+#: ../clutter/clutter-actor.c:7256
+msgid "Transformation matrix"
+msgstr "Transzformációs mátrix"
+
+#: ../clutter/clutter-actor.c:7271
+msgid "Transform Set"
+msgstr "Átalakítás beállítva"
+
+#: ../clutter/clutter-actor.c:7272
+msgid "Whether the transform property is set"
+msgstr "A transform tulajdonság be van-e állítva"
+
+#: ../clutter/clutter-actor.c:7293
+msgid "Child Transform"
+msgstr "Gyermek átalakítás"
+
+#: ../clutter/clutter-actor.c:7294
+msgid "Children transformation matrix"
+msgstr "Gyermekek transzformációs mátrix"
+
+#: ../clutter/clutter-actor.c:7309
+msgid "Child Transform Set"
+msgstr "Gyermek átalakítás beállítva"
+
+#: ../clutter/clutter-actor.c:7310
+msgid "Whether the child-transform property is set"
+msgstr "A child-transform tulajdonság be van-e állítva"
+
+#: ../clutter/clutter-actor.c:7327
+msgid "Show on set parent"
+msgstr "A beállított szülő megjelenítése"
+
+#: ../clutter/clutter-actor.c:7328
+msgid "Whether the actor is shown when parented"
+msgstr "Jelenjen-e meg a szereplő, amikor szülője van"
+
+#: ../clutter/clutter-actor.c:7345
+msgid "Clip to Allocation"
+msgstr "Vágás a lefoglalásra"
+
+#: ../clutter/clutter-actor.c:7346
+msgid "Sets the clip region to track the actor's allocation"
+msgstr "Beállítja a vágási területet a szereplő foglalásának követéséhez"
+
+#: ../clutter/clutter-actor.c:7359
+msgid "Text Direction"
+msgstr "Szövegirány"
+
+#: ../clutter/clutter-actor.c:7360
+msgid "Direction of the text"
+msgstr "A szöveg iránya"
+
+#: ../clutter/clutter-actor.c:7375
+msgid "Has Pointer"
+msgstr "Van mutatója"
+
+#: ../clutter/clutter-actor.c:7376
+msgid "Whether the actor contains the pointer of an input device"
+msgstr "A szereplő tartalmazza-e egy bemeneti eszköz mutatóját"
+
+#: ../clutter/clutter-actor.c:7389
+msgid "Actions"
+msgstr "Műveletek"
+
+#: ../clutter/clutter-actor.c:7390
+msgid "Adds an action to the actor"
+msgstr "Hozzáad egy műveletet a szereplőhöz"
+
+#: ../clutter/clutter-actor.c:7403
+msgid "Constraints"
+msgstr "Megszorítások"
+
+#: ../clutter/clutter-actor.c:7404
+msgid "Adds a constraint to the actor"
+msgstr "Hozzáad egy megszorítást a szereplőhöz"
+
+#: ../clutter/clutter-actor.c:7417
+msgid "Effect"
+msgstr "Hatás"
+
+#: ../clutter/clutter-actor.c:7418
+msgid "Add an effect to be applied on the actor"
+msgstr "A szereplőn alkalmazandó hatás hozzáadása"
+
+#: ../clutter/clutter-actor.c:7432
+msgid "Layout Manager"
+msgstr "Elrendezéskezelő"
+
+#: ../clutter/clutter-actor.c:7433
+msgid "The object controlling the layout of an actor's children"
+msgstr "Egy szereplő gyermekeinek elrendezését vezérlő objektum"
+
+#: ../clutter/clutter-actor.c:7447
+msgid "X Expand"
+msgstr "X bővítés"
+
+#: ../clutter/clutter-actor.c:7448
+msgid "Whether extra horizontal space should be assigned to the actor"
+msgstr "Legyen-e további vízszintes térköz hozzárendelve a szereplőhöz"
+
+#: ../clutter/clutter-actor.c:7463
+msgid "Y Expand"
+msgstr "Y bővítés"
+
+#: ../clutter/clutter-actor.c:7464
+msgid "Whether extra vertical space should be assigned to the actor"
+msgstr "Legyen-e további függőleges térköz hozzárendelve a szereplőhöz"
+
+#: ../clutter/clutter-actor.c:7480
+msgid "X Alignment"
+msgstr "X igazítás"
+
+#: ../clutter/clutter-actor.c:7481
+msgid "The alignment of the actor on the X axis within its allocation"
+msgstr "A szereplő igazítása az X tengelyen a lefoglalásán belül"
+
+#: ../clutter/clutter-actor.c:7496
+msgid "Y Alignment"
+msgstr "Y igazítás"
+
+#: ../clutter/clutter-actor.c:7497
+msgid "The alignment of the actor on the Y axis within its allocation"
+msgstr "A szereplő igazítása az Y tengelyen a lefoglalásán belül"
+
+#: ../clutter/clutter-actor.c:7516
+msgid "Margin Top"
+msgstr "Felső margó"
+
+#: ../clutter/clutter-actor.c:7517
+msgid "Extra space at the top"
+msgstr "További terület felül"
+
+#: ../clutter/clutter-actor.c:7538
+msgid "Margin Bottom"
+msgstr "Alsó margó"
+
+#: ../clutter/clutter-actor.c:7539
+msgid "Extra space at the bottom"
+msgstr "További terület alul"
+
+#: ../clutter/clutter-actor.c:7560
+msgid "Margin Left"
+msgstr "Bal margó"
+
+#: ../clutter/clutter-actor.c:7561
+msgid "Extra space at the left"
+msgstr "További terület a bal oldalon"
+
+#: ../clutter/clutter-actor.c:7582
+msgid "Margin Right"
+msgstr "Jobb margó"
+
+#: ../clutter/clutter-actor.c:7583
+msgid "Extra space at the right"
+msgstr "További terület a jobb oldalon"
+
+#: ../clutter/clutter-actor.c:7599
+msgid "Background Color Set"
+msgstr "Háttérszín beállítva"
+
+#: ../clutter/clutter-actor.c:7600 ../clutter/deprecated/clutter-box.c:271
+msgid "Whether the background color is set"
+msgstr "A háttérszín be van-e állítva"
+
+#: ../clutter/clutter-actor.c:7616
+msgid "Background color"
+msgstr "Háttérszín"
+
+#: ../clutter/clutter-actor.c:7617
+msgid "The actor's background color"
+msgstr "A szereplő háttérszíne"
+
+#: ../clutter/clutter-actor.c:7632
+msgid "First Child"
+msgstr "Első gyermek"
+
+#: ../clutter/clutter-actor.c:7633
+msgid "The actor's first child"
+msgstr "A szereplő első gyermeke"
+
+#: ../clutter/clutter-actor.c:7646
+msgid "Last Child"
+msgstr "Utolsó gyermek"
+
+#: ../clutter/clutter-actor.c:7647
+msgid "The actor's last child"
+msgstr "A szereplő utolsó gyermeke"
+
+#: ../clutter/clutter-actor.c:7661
+msgid "Content"
+msgstr "Tartalom"
+
+#: ../clutter/clutter-actor.c:7662
+msgid "Delegate object for painting the actor's content"
+msgstr "Objektum delegálása a szereplő tartalmának kirajzolásához"
+
+#: ../clutter/clutter-actor.c:7687
+msgid "Content Gravity"
+msgstr "Tartalom gravitáció"
+
+#: ../clutter/clutter-actor.c:7688
+msgid "Alignment of the actor's content"
+msgstr "A szereplő tartalmának igazítása"
+
+#: ../clutter/clutter-actor.c:7708
+msgid "Content Box"
+msgstr "Tartalom doboz"
+
+#: ../clutter/clutter-actor.c:7709
+msgid "The bounding box of the actor's content"
+msgstr "A szereplő tartalmának határoló doboza"
+
+#: ../clutter/clutter-actor.c:7717
+msgid "Minification Filter"
+msgstr "Kicsinyítési szűrő"
+
+#: ../clutter/clutter-actor.c:7718
+msgid "The filter used when reducing the size of the content"
+msgstr "A tartalom méretének csökkentésekor használt szűrő"
+
+#: ../clutter/clutter-actor.c:7725
+msgid "Magnification Filter"
+msgstr "Nagyítási szűrő"
+
+#: ../clutter/clutter-actor.c:7726
+msgid "The filter used when increasing the size of the content"
+msgstr "A tartalom méretének növelésekor használt szűrő"
+
+#: ../clutter/clutter-actor.c:7740
+msgid "Content Repeat"
+msgstr "Tartalom ismétlés"
+
+#: ../clutter/clutter-actor.c:7741
+msgid "The repeat policy for the actor's content"
+msgstr "A szereplő tartalmának ismétlési házirendje"
+
+#: ../clutter/clutter-actor-meta.c:191 ../clutter/clutter-child-meta.c:142
+msgid "Actor"
+msgstr "Szereplő"
+
+#: ../clutter/clutter-actor-meta.c:192
+msgid "The actor attached to the meta"
+msgstr "A metához csatolt szereplő"
+
+#: ../clutter/clutter-actor-meta.c:206
+msgid "The name of the meta"
+msgstr "A meta neve"
+
+#: ../clutter/clutter-actor-meta.c:219 ../clutter/clutter-input-device.c:326
+#: ../clutter/deprecated/clutter-shader.c:309
+msgid "Enabled"
+msgstr "Engedélyezve"
+
+#: ../clutter/clutter-actor-meta.c:220
+msgid "Whether the meta is enabled"
+msgstr "Engedélyezve van-e a meta"
+
+#: ../clutter/clutter-align-constraint.c:279
+#: ../clutter/clutter-bind-constraint.c:358 ../clutter/clutter-clone.c:341
+#: ../clutter/clutter-snap-constraint.c:321
+msgid "Source"
+msgstr "Forrás"
+
+#: ../clutter/clutter-align-constraint.c:280
+msgid "The source of the alignment"
+msgstr "Az igazítás forrása"
+
+#: ../clutter/clutter-align-constraint.c:293
+msgid "Align Axis"
+msgstr "Igazítási tengely"
+
+#: ../clutter/clutter-align-constraint.c:294
+msgid "The axis to align the position to"
+msgstr "A tengely a pozíció igazításához"
+
+#: ../clutter/clutter-align-constraint.c:313
+#: ../clutter/clutter-desaturate-effect.c:270
+msgid "Factor"
+msgstr "Tényező"
+
+#: ../clutter/clutter-align-constraint.c:314
+msgid "The alignment factor, between 0.0 and 1.0"
+msgstr "Az igazítási tényező, 0,0 és 1,0 között"
+
+#: ../clutter/clutter-backend.c:380
+msgid "Unable to initialize the Clutter backend"
+msgstr "Nem lehet előkészíteni a Clutter háttérprogramot"
+
+#: ../clutter/clutter-backend.c:454
+#, c-format
+msgid "The backend of type '%s' does not support creating multiple stages"
+msgstr ""
+"A(z) „%s” típusú háttérprogram nem támogatja több helyszín létrehozását"
+
+#: ../clutter/clutter-bind-constraint.c:359
+msgid "The source of the binding"
+msgstr "A kötés forrása"
+
+#: ../clutter/clutter-bind-constraint.c:372
+msgid "Coordinate"
+msgstr "Koordináta"
+
+#: ../clutter/clutter-bind-constraint.c:373
+msgid "The coordinate to bind"
+msgstr "A kötendő koordináta"
+
+#: ../clutter/clutter-bind-constraint.c:387
+#: ../clutter/clutter-path-constraint.c:226
+#: ../clutter/clutter-snap-constraint.c:366
+msgid "Offset"
+msgstr "Eltolás"
+
+#: ../clutter/clutter-bind-constraint.c:388
+msgid "The offset in pixels to apply to the binding"
+msgstr "A kötésre alkalmazandó eltolás képpontokban"
+
+#: ../clutter/clutter-binding-pool.c:320
+msgid "The unique name of the binding pool"
+msgstr "A kötéstároló egyedi neve"
+
+#: ../clutter/clutter-bin-layout.c:238 ../clutter/clutter-bin-layout.c:651
+#: ../clutter/clutter-box-layout.c:388
+#: ../clutter/deprecated/clutter-table-layout.c:610
+msgid "Horizontal Alignment"
+msgstr "Vízszintes igazítás"
+
+#: ../clutter/clutter-bin-layout.c:239
+msgid "Horizontal alignment for the actor inside the layout manager"
+msgstr "Vízszintes igazítás a szereplőhöz az elrendezéskezelőn belül"
+
+#: ../clutter/clutter-bin-layout.c:247 ../clutter/clutter-bin-layout.c:671
+#: ../clutter/clutter-box-layout.c:397
+#: ../clutter/deprecated/clutter-table-layout.c:625
+msgid "Vertical Alignment"
+msgstr "Függőleges igazítás"
+
+#: ../clutter/clutter-bin-layout.c:248
+msgid "Vertical alignment for the actor inside the layout manager"
+msgstr "Függőleges igazítás a szereplőhöz az elrendezéskezelőn belül"
+
+#: ../clutter/clutter-bin-layout.c:652
+msgid "Default horizontal alignment for the actors inside the layout manager"
+msgstr ""
+"Alapértelmezett vízszintes igazítás a szereplőkhöz az elrendezéskezelőn belül"
+
+#: ../clutter/clutter-bin-layout.c:672
+msgid "Default vertical alignment for the actors inside the layout manager"
+msgstr ""
+"Alapértelmezett függőleges igazítás a szereplőkhöz az elrendezéskezelőn belül"
+
+#: ../clutter/clutter-box-layout.c:363
+msgid "Expand"
+msgstr "Bővítés"
+
+#: ../clutter/clutter-box-layout.c:364
+msgid "Allocate extra space for the child"
+msgstr "További terület lefoglalása a gyermeknek"
+
+#: ../clutter/clutter-box-layout.c:370
+#: ../clutter/deprecated/clutter-table-layout.c:589
+msgid "Horizontal Fill"
+msgstr "Vízszintes kitöltés"
+
+#: ../clutter/clutter-box-layout.c:371
+#: ../clutter/deprecated/clutter-table-layout.c:590
+msgid ""
+"Whether the child should receive priority when the container is allocating "
+"spare space on the horizontal axis"
+msgstr ""
+"Kapjon-e elsőbbséget a gyermek, amikor a konténer tartalék területet foglal "
+"le a vízszintes tengelyen"
+
+#: ../clutter/clutter-box-layout.c:379
+#: ../clutter/deprecated/clutter-table-layout.c:596
+msgid "Vertical Fill"
+msgstr "Függőleges kitöltés"
+
+#: ../clutter/clutter-box-layout.c:380
+#: ../clutter/deprecated/clutter-table-layout.c:597
+msgid ""
+"Whether the child should receive priority when the container is allocating "
+"spare space on the vertical axis"
+msgstr ""
+"Kapjon-e elsőbbséget a gyermek, amikor a konténer tartalék területet foglal "
+"le a függőleges tengelyen"
+
+#: ../clutter/clutter-box-layout.c:389
+#: ../clutter/deprecated/clutter-table-layout.c:611
+msgid "Horizontal alignment of the actor within the cell"
+msgstr "A szereplő vízszintes igazítása a cellán belül"
+
+#: ../clutter/clutter-box-layout.c:398
+#: ../clutter/deprecated/clutter-table-layout.c:626
+msgid "Vertical alignment of the actor within the cell"
+msgstr "A szereplő függőleges igazítása a cellán belül"
+
+#: ../clutter/clutter-box-layout.c:1359
+msgid "Vertical"
+msgstr "Függőleges"
+
+#: ../clutter/clutter-box-layout.c:1360
+msgid "Whether the layout should be vertical, rather than horizontal"
+msgstr "Az elrendezés legyen-e függőleges a vízszintes helyett"
+
+#: ../clutter/clutter-box-layout.c:1377 ../clutter/clutter-flow-layout.c:942
+#: ../clutter/clutter-grid-layout.c:1549
+msgid "Orientation"
+msgstr "Tájolás"
+
+#: ../clutter/clutter-box-layout.c:1378 ../clutter/clutter-flow-layout.c:943
+#: ../clutter/clutter-grid-layout.c:1550
+msgid "The orientation of the layout"
+msgstr "Az elrendezés tájolása"
+
+#: ../clutter/clutter-box-layout.c:1394 ../clutter/clutter-flow-layout.c:958
+msgid "Homogeneous"
+msgstr "Homogén"
+
+#: ../clutter/clutter-box-layout.c:1395
+msgid ""
+"Whether the layout should be homogeneous, i.e. all childs get the same size"
+msgstr ""
+"Az elrendezés legyen-e homogén, azaz minden gyermek ugyanazt a magasságot "
+"kapja"
+
+#: ../clutter/clutter-box-layout.c:1410
+msgid "Pack Start"
+msgstr "Csomagolás kezdete"
+
+#: ../clutter/clutter-box-layout.c:1411
+msgid "Whether to pack items at the start of the box"
+msgstr "Csomagolja-e az elemeket a doboz kezdetekor"
+
+#: ../clutter/clutter-box-layout.c:1424
+msgid "Spacing"
+msgstr "Térköz"
+
+#: ../clutter/clutter-box-layout.c:1425
+msgid "Spacing between children"
+msgstr "A gyermekek közötti térköz"
+
+#: ../clutter/clutter-box-layout.c:1442
+#: ../clutter/deprecated/clutter-table-layout.c:1677
+msgid "Use Animations"
+msgstr "Animációk használata"
+
+#: ../clutter/clutter-box-layout.c:1443
+#: ../clutter/deprecated/clutter-table-layout.c:1678
+msgid "Whether layout changes should be animated"
+msgstr "Az elrendezés változásai legyenek-e animálva"
+
+#: ../clutter/clutter-box-layout.c:1467
+#: ../clutter/deprecated/clutter-table-layout.c:1702
+msgid "Easing Mode"
+msgstr "Enyhítés mód"
+
+#: ../clutter/clutter-box-layout.c:1468
+#: ../clutter/deprecated/clutter-table-layout.c:1703
+msgid "The easing mode of the animations"
+msgstr "Az animációk enyhítés módja"
+
+#: ../clutter/clutter-box-layout.c:1488
+#: ../clutter/deprecated/clutter-table-layout.c:1723
+msgid "Easing Duration"
+msgstr "Enyhítés időtartam"
+
+#: ../clutter/clutter-box-layout.c:1489
+#: ../clutter/deprecated/clutter-table-layout.c:1724
+msgid "The duration of the animations"
+msgstr "Az animációk időtartama"
+
+#: ../clutter/clutter-brightness-contrast-effect.c:321
+msgid "Brightness"
+msgstr "Fényerő"
+
+#: ../clutter/clutter-brightness-contrast-effect.c:322
+msgid "The brightness change to apply"
+msgstr "Az alkalmazandó fényerő változtatás"
+
+#: ../clutter/clutter-brightness-contrast-effect.c:341
+msgid "Contrast"
+msgstr "Kontraszt"
+
+#: ../clutter/clutter-brightness-contrast-effect.c:342
+msgid "The contrast change to apply"
+msgstr "Az alkalmazandó kontraszt változtatás"
+
+#: ../clutter/clutter-canvas.c:248
+msgid "The width of the canvas"
+msgstr "A vászon szélessége"
+
+#: ../clutter/clutter-canvas.c:264
+msgid "The height of the canvas"
+msgstr "A vászon magassága"
+
+#: ../clutter/clutter-canvas.c:283
+#| msgid "Selection Color Set"
+msgid "Scale Factor Set"
+msgstr "Méretezési tényező beállítva"
+
+#: ../clutter/clutter-canvas.c:284
+#| msgid "Whether the transform property is set"
+msgid "Whether the scale-factor property is set"
+msgstr "A scale-factor tulajdonság be van-e állítva"
+
+#: ../clutter/clutter-canvas.c:305
+#| msgid "Factor"
+msgid "Scale Factor"
+msgstr "Méretezési tényező"
+
+#: ../clutter/clutter-canvas.c:306
+#| msgid "The height of the Cairo surface"
+msgid "The scaling factor for the surface"
+msgstr "A felület méretezési tényezője"
+
+#: ../clutter/clutter-child-meta.c:127
+msgid "Container"
+msgstr "Konténer"
+
+#: ../clutter/clutter-child-meta.c:128
+msgid "The container that created this data"
+msgstr "Az a konténer, amely ezt az adatot létrehozta"
+
+#: ../clutter/clutter-child-meta.c:143
+msgid "The actor wrapped by this data"
+msgstr "Ezen adatok által csomagolt szereplő"
+
+#: ../clutter/clutter-click-action.c:586
+msgid "Pressed"
+msgstr "Lenyomott"
+
+#: ../clutter/clutter-click-action.c:587
+msgid "Whether the clickable should be in pressed state"
+msgstr "A kattintható legyen-e lenyomott állapotban"
+
+#: ../clutter/clutter-click-action.c:600
+msgid "Held"
+msgstr "Visszatartva"
+
+#: ../clutter/clutter-click-action.c:601
+msgid "Whether the clickable has a grab"
+msgstr "A kattinthatónak legyen-e fogantyúja"
+
+#: ../clutter/clutter-click-action.c:618 ../clutter/clutter-settings.c:653
+msgid "Long Press Duration"
+msgstr "Hosszú lenyomás időtartam"
+
+#: ../clutter/clutter-click-action.c:619
+msgid "The minimum duration of a long press to recognize the gesture"
+msgstr "Egy hosszú lenyomás minimális időtartama a gesztus felismeréséhez"
+
+#: ../clutter/clutter-click-action.c:637
+msgid "Long Press Threshold"
+msgstr "Hosszú lenyomás küszöbszint"
+
+#: ../clutter/clutter-click-action.c:638
+msgid "The maximum threshold before a long press is cancelled"
+msgstr "A maximális küszöbszint egy hosszú lenyomás megszakítása előtt"
+
+#: ../clutter/clutter-clone.c:342
+msgid "Specifies the actor to be cloned"
+msgstr "Megadja a klónozandó szereplőt"
+
+#: ../clutter/clutter-colorize-effect.c:251
+msgid "Tint"
+msgstr "Színezés"
+
+#: ../clutter/clutter-colorize-effect.c:252
+msgid "The tint to apply"
+msgstr "Az alkalmazandó színezés"
+
+#: ../clutter/clutter-deform-effect.c:592
+msgid "Horizontal Tiles"
+msgstr "Vízszintes csempék"
+
+#: ../clutter/clutter-deform-effect.c:593
+msgid "The number of horizontal tiles"
+msgstr "A vízszintes csempék száma"
+
+#: ../clutter/clutter-deform-effect.c:608
+msgid "Vertical Tiles"
+msgstr "Függőleges csempék"
+
+#: ../clutter/clutter-deform-effect.c:609
+msgid "The number of vertical tiles"
+msgstr "A függőleges csempék száma"
+
+#: ../clutter/clutter-deform-effect.c:626
+msgid "Back Material"
+msgstr "Háttér anyag"
+
+#: ../clutter/clutter-deform-effect.c:627
+msgid "The material to be used when painting the back of the actor"
+msgstr "A használandó anyag a szereplő hátuljának festéséhez"
+
+#: ../clutter/clutter-desaturate-effect.c:271
+msgid "The desaturation factor"
+msgstr "A telítetlenné tevési tényező"
+
+#: ../clutter/clutter-device-manager.c:127
+#: ../clutter/clutter-input-device.c:355
+#: ../clutter/x11/clutter-keymap-x11.c:321
+msgid "Backend"
+msgstr "Háttérprogram"
+
+#: ../clutter/clutter-device-manager.c:128
+msgid "The ClutterBackend of the device manager"
+msgstr "Az eszközkezelő ClutterBackend-je"
+
+#: ../clutter/clutter-drag-action.c:741
+msgid "Horizontal Drag Threshold"
+msgstr "Vízszintes húzási küszöb"
+
+#: ../clutter/clutter-drag-action.c:742
+msgid "The horizontal amount of pixels required to start dragging"
+msgstr "A kívánt képpontok vízszintes mennyisége a húzás elkezdéséhez"
+
+#: ../clutter/clutter-drag-action.c:769
+msgid "Vertical Drag Threshold"
+msgstr "Függőleges húzási küszöb"
+
+#: ../clutter/clutter-drag-action.c:770
+msgid "The vertical amount of pixels required to start dragging"
+msgstr "A kívánt képpontok függőleges mennyisége a húzás elkezdéséhez"
+
+#: ../clutter/clutter-drag-action.c:791
+msgid "Drag Handle"
+msgstr "Húzási fogantyú"
+
+#: ../clutter/clutter-drag-action.c:792
+msgid "The actor that is being dragged"
+msgstr "Az a szereplő, amely húzva van"
+
+#: ../clutter/clutter-drag-action.c:805
+msgid "Drag Axis"
+msgstr "Húzási tengely"
+
+#: ../clutter/clutter-drag-action.c:806
+msgid "Constraints the dragging to an axis"
+msgstr "Kényszeríti a húzást egy tengelyre"
+
+#: ../clutter/clutter-drag-action.c:822
+msgid "Drag Area"
+msgstr "Húzási terület"
+
+#: ../clutter/clutter-drag-action.c:823
+msgid "Constrains the dragging to a rectangle"
+msgstr "Kényszeríti a húzást egy téglalapra"
+
+#: ../clutter/clutter-drag-action.c:836
+msgid "Drag Area Set"
+msgstr "Húzási terület beállítva"
+
+#: ../clutter/clutter-drag-action.c:837
+msgid "Whether the drag area is set"
+msgstr "A húzási terület be van-e állítva"
+
+#: ../clutter/clutter-flow-layout.c:959
+msgid "Whether each item should receive the same allocation"
+msgstr "Minden egyes elem ugyanazt a lefoglalást kapja-e"
+
+#: ../clutter/clutter-flow-layout.c:974
+#: ../clutter/deprecated/clutter-table-layout.c:1637
+msgid "Column Spacing"
+msgstr "Oszloptávolság"
+
+#: ../clutter/clutter-flow-layout.c:975
+msgid "The spacing between columns"
+msgstr "Az oszlopok közötti térköz"
+
+#: ../clutter/clutter-flow-layout.c:991
+#: ../clutter/deprecated/clutter-table-layout.c:1653
+msgid "Row Spacing"
+msgstr "Sortávolság"
+
+#: ../clutter/clutter-flow-layout.c:992
+msgid "The spacing between rows"
+msgstr "A sorok közötti térköz"
+
+#: ../clutter/clutter-flow-layout.c:1006
+msgid "Minimum Column Width"
+msgstr "Legkisebb oszlopszélesség"
+
+#: ../clutter/clutter-flow-layout.c:1007
+msgid "Minimum width for each column"
+msgstr "Legkisebb szélesség minden oszlophoz"
+
+#: ../clutter/clutter-flow-layout.c:1022
+msgid "Maximum Column Width"
+msgstr "Legnagyobb oszlopszélesség"
+
+#: ../clutter/clutter-flow-layout.c:1023
+msgid "Maximum width for each column"
+msgstr "Legnagyobb szélesség minden oszlophoz"
+
+#: ../clutter/clutter-flow-layout.c:1037
+msgid "Minimum Row Height"
+msgstr "Legkisebb sormagasság"
+
+#: ../clutter/clutter-flow-layout.c:1038
+msgid "Minimum height for each row"
+msgstr "Legkisebb magasság minden sorhoz"
+
+#: ../clutter/clutter-flow-layout.c:1053
+msgid "Maximum Row Height"
+msgstr "Legnagyobb sormagasság"
+
+#: ../clutter/clutter-flow-layout.c:1054
+msgid "Maximum height for each row"
+msgstr "Legnagyobb magasság minden sorhoz"
+
+#: ../clutter/clutter-flow-layout.c:1069 ../clutter/clutter-flow-layout.c:1070
+msgid "Snap to grid"
+msgstr "Rácshoz illesztés"
+
+#: ../clutter/clutter-gesture-action.c:668
+msgid "Number touch points"
+msgstr "Érintési pontok száma"
+
+#: ../clutter/clutter-gesture-action.c:669
+msgid "Number of touch points"
+msgstr "Érintési pontok száma"
+
+#: ../clutter/clutter-gesture-action.c:684
+msgid "Threshold Trigger Edge"
+msgstr "Küszöbszint aktiváló szél"
+
+#: ../clutter/clutter-gesture-action.c:685
+#| msgid "The timeline used by the animation"
+msgid "The trigger edge used by the action"
+msgstr "A művelet által használt aktiváló szél"
+
+#: ../clutter/clutter-gesture-action.c:704
+msgid "Threshold Trigger Horizontal Distance"
+msgstr "Küszöbszint aktiváló vízszintes távolság"
+
+#: ../clutter/clutter-gesture-action.c:705
+#| msgid "The timeline used by the animation"
+msgid "The horizontal trigger distance used by the action"
+msgstr "A művelet által használt vízszintes aktiváló távolsága"
+
+#: ../clutter/clutter-gesture-action.c:723
+msgid "Threshold Trigger Vertical Distance"
+msgstr "Küszöbszint aktiváló függőleges távolság"
+
+#: ../clutter/clutter-gesture-action.c:724
+#| msgid "The timeline used by the animation"
+msgid "The vertical trigger distance used by the action"
+msgstr "A művelet által használt függőleges aktiváló távolsága"
+
+#: ../clutter/clutter-grid-layout.c:1223
+msgid "Left attachment"
+msgstr "Bal csatolás"
+
+#: ../clutter/clutter-grid-layout.c:1224
+msgid "The column number to attach the left side of the child to"
+msgstr "Az oszlop száma, amelyhez a gyermek bal széle csatolásra kerül"
+
+#: ../clutter/clutter-grid-layout.c:1231
+msgid "Top attachment"
+msgstr "Felső csatolás"
+
+#: ../clutter/clutter-grid-layout.c:1232
+msgid "The row number to attach the top side of a child widget to"
+msgstr ""
+"A sor száma, amelyhez a gyermek felületi elem felső oldala csatolásra kerül"
+
+#: ../clutter/clutter-grid-layout.c:1240
+msgid "The number of columns that a child spans"
+msgstr "Az oszlopok száma, amelyekbe a gyermek átnyúlhat"
+
+#: ../clutter/clutter-grid-layout.c:1247
+msgid "The number of rows that a child spans"
+msgstr "A sorok száma, amelyekbe a gyermek átnyúlhat"
+
+#: ../clutter/clutter-grid-layout.c:1564
+msgid "Row spacing"
+msgstr "Sortávolság"
+
+#: ../clutter/clutter-grid-layout.c:1565
+msgid "The amount of space between two consecutive rows"
+msgstr "Két egymás utáni sor közötti térköz mértéke"
+
+#: ../clutter/clutter-grid-layout.c:1578
+msgid "Column spacing"
+msgstr "Oszloptávolság"
+
+#: ../clutter/clutter-grid-layout.c:1579
+msgid "The amount of space between two consecutive columns"
+msgstr "Két egymás utáni oszlop közötti térköz mértéke"
+
+#: ../clutter/clutter-grid-layout.c:1593
+msgid "Row Homogeneous"
+msgstr "Sor homogenitás"
+
+#: ../clutter/clutter-grid-layout.c:1594
+msgid "If TRUE, the rows are all the same height"
+msgstr "Ha TRUE, akkor a sorok egyforma magasak"
+
+#: ../clutter/clutter-grid-layout.c:1607
+msgid "Column Homogeneous"
+msgstr "Oszlop homogenitás"
+
+#: ../clutter/clutter-grid-layout.c:1608
+msgid "If TRUE, the columns are all the same width"
+msgstr "Ha TRUE, akkor az oszlopok egyforma szélesek"
+
+#: ../clutter/clutter-image.c:249 ../clutter/clutter-image.c:312
+#: ../clutter/clutter-image.c:400
+msgid "Unable to load image data"
+msgstr "Nem lehet betölteni a képadatokat"
+
+#: ../clutter/clutter-input-device.c:231
+msgid "Id"
+msgstr "Azonosító"
+
+#: ../clutter/clutter-input-device.c:232
+msgid "Unique identifier of the device"
+msgstr "Az eszköz egyedi azonosítója"
+
+#: ../clutter/clutter-input-device.c:248
+msgid "The name of the device"
+msgstr "Az eszköz neve"
+
+#: ../clutter/clutter-input-device.c:262
+msgid "Device Type"
+msgstr "Eszköztípus"
+
+#: ../clutter/clutter-input-device.c:263
+msgid "The type of the device"
+msgstr "Az eszköz típusa"
+
+#: ../clutter/clutter-input-device.c:278
+msgid "Device Manager"
+msgstr "Eszközkezelő"
+
+#: ../clutter/clutter-input-device.c:279
+msgid "The device manager instance"
+msgstr "Az eszközkezelő példány"
+
+#: ../clutter/clutter-input-device.c:292
+msgid "Device Mode"
+msgstr "Eszközmód"
+
+#: ../clutter/clutter-input-device.c:293
+msgid "The mode of the device"
+msgstr "Az eszköz módja"
+
+#: ../clutter/clutter-input-device.c:307
+msgid "Has Cursor"
+msgstr "Van kurzora"
+
+#: ../clutter/clutter-input-device.c:308
+msgid "Whether the device has a cursor"
+msgstr "Az eszköz rendelkezik-e kurzorral"
+
+#: ../clutter/clutter-input-device.c:327
+msgid "Whether the device is enabled"
+msgstr "Az eszköz engedélyezve van-e"
+
+#: ../clutter/clutter-input-device.c:340
+msgid "Number of Axes"
+msgstr "Tengelyek száma"
+
+#: ../clutter/clutter-input-device.c:341
+msgid "The number of axes on the device"
+msgstr "Tengelyek száma az eszközön"
+
+#: ../clutter/clutter-input-device.c:356
+msgid "The backend instance"
+msgstr "A háttérprogram példány"
+
+#: ../clutter/clutter-interval.c:553
+msgid "Value Type"
+msgstr "Értéktípus"
+
+#: ../clutter/clutter-interval.c:554
+msgid "The type of the values in the interval"
+msgstr "Az értékek típusa az időközben"
+
+#: ../clutter/clutter-interval.c:569
+msgid "Initial Value"
+msgstr "Kezdeti érték"
+
+#: ../clutter/clutter-interval.c:570
+msgid "Initial value of the interval"
+msgstr "Az időköz kezdeti értéke"
+
+#: ../clutter/clutter-interval.c:584
+msgid "Final Value"
+msgstr "Végső érték"
+
+#: ../clutter/clutter-interval.c:585
+msgid "Final value of the interval"
+msgstr "Az időköz végső értéke"
+
+#: ../clutter/clutter-layout-meta.c:117
+msgid "Manager"
+msgstr "Kezelő"
+
+#: ../clutter/clutter-layout-meta.c:118
+msgid "The manager that created this data"
+msgstr "Az a kezelő, amely ezt az adatot létrehozta"
+
+#. Translators: Leave this UNTRANSLATED if your language is
+#. * left-to-right.  If your language is right-to-left
+#. * (e.g. Hebrew, Arabic), translate it to "default:RTL".
+#. *
+#. * Do NOT translate it to non-English e.g. "predefinito:LTR"! If
+#. * it isn't default:LTR or default:RTL it will not work.
+#.
+#: ../clutter/clutter-main.c:795
+msgid "default:LTR"
+msgstr "default:LTR"
+
+#: ../clutter/clutter-main.c:1622
+msgid "Show frames per second"
+msgstr "Másodpercenkénti képkockák megjelenítése"
+
+#: ../clutter/clutter-main.c:1624
+msgid "Default frame rate"
+msgstr "Alapértelmezett képkockasebesség"
+
+#: ../clutter/clutter-main.c:1626
+msgid "Make all warnings fatal"
+msgstr "Minden figyelmeztetés végzetes legyen"
+
+#: ../clutter/clutter-main.c:1629
+msgid "Direction for the text"
+msgstr "A szöveg iránya"
+
+#: ../clutter/clutter-main.c:1632
+msgid "Disable mipmapping on text"
+msgstr "Mipmapelés tiltása a szövegen"
+
+#: ../clutter/clutter-main.c:1635
+msgid "Use 'fuzzy' picking"
+msgstr "„fuzzy” jelölés használata"
+
+#: ../clutter/clutter-main.c:1638
+msgid "Clutter debugging flags to set"
+msgstr "Beállítandó Clutter hibakeresési jelzőbitek"
+
+#: ../clutter/clutter-main.c:1640
+msgid "Clutter debugging flags to unset"
+msgstr "Kikapcsolandó Clutter hibakeresési jelzőbitek"
+
+#: ../clutter/clutter-main.c:1644
+msgid "Clutter profiling flags to set"
+msgstr "Beállítandó Clutter profilozási jelzőbitek"
+
+#: ../clutter/clutter-main.c:1646
+msgid "Clutter profiling flags to unset"
+msgstr "Kikapcsolandó Clutter profilozási jelzőbitek"
+
+#: ../clutter/clutter-main.c:1649
+msgid "Enable accessibility"
+msgstr "Akadálymentesítés engedélyezése"
+
+#: ../clutter/clutter-main.c:1841
+msgid "Clutter Options"
+msgstr "Clutter beállítások"
+
+#: ../clutter/clutter-main.c:1842
+msgid "Show Clutter Options"
+msgstr "Clutter beállítások megjelenítése"
+
+#: ../clutter/clutter-pan-action.c:455
+msgid "Pan Axis"
+msgstr "Tengely mozgatása"
+
+#: ../clutter/clutter-pan-action.c:456
+msgid "Constraints the panning to an axis"
+msgstr "Kényszeríti a mozgatást egy tengelyre"
+
+#: ../clutter/clutter-pan-action.c:470
+msgid "Interpolate"
+msgstr "Interpolálás"
+
+#: ../clutter/clutter-pan-action.c:471
+msgid "Whether interpolated events emission is enabled."
+msgstr "Az interpolált események kibocsátása engedélyezve van-e."
+
+#: ../clutter/clutter-pan-action.c:487
+msgid "Deceleration"
+msgstr "Lassítás"
+
+#: ../clutter/clutter-pan-action.c:488
+msgid "Rate at which the interpolated panning will decelerate in"
+msgstr "Az az arány, amelyre az interpolált mozgatás lassulni fog"
+
+#: ../clutter/clutter-pan-action.c:505
+msgid "Initial acceleration factor"
+msgstr "Kezdeti gyorsítási tényező"
+
+#: ../clutter/clutter-pan-action.c:506
+msgid "Factor applied to the momentum when starting the interpolated phase"
+msgstr "A lendületre alkalmazott tényező az interpolált fázis kezdetekor"
+
+#: ../clutter/clutter-path-constraint.c:212
+#: ../clutter/deprecated/clutter-behaviour-path.c:221
+msgid "Path"
+msgstr "Útvonal"
+
+#: ../clutter/clutter-path-constraint.c:213
+msgid "The path used to constrain an actor"
+msgstr "Egy szereplő kényszerítéséhez használandó útvonal"
+
+#: ../clutter/clutter-path-constraint.c:227
+msgid "The offset along the path, between -1.0 and 2.0"
+msgstr "Az eltolás az útvonal mentén, -1,0 és 2,0 között"
+
+#: ../clutter/clutter-property-transition.c:269
+msgid "Property Name"
+msgstr "Tulajdonságnév"
+
+#: ../clutter/clutter-property-transition.c:270
+msgid "The name of the property to animate"
+msgstr "Az animálandó tulajdonság neve"
+
+#: ../clutter/clutter-script.c:464
+msgid "Filename Set"
+msgstr "Fájlnév beállítva"
+
+#: ../clutter/clutter-script.c:465
+msgid "Whether the :filename property is set"
+msgstr "A :filename tulajdonság be van-e állítva"
+
+#: ../clutter/clutter-script.c:479
+#: ../clutter/deprecated/clutter-texture.c:1080
+msgid "Filename"
+msgstr "Fájlnév"
+
+#: ../clutter/clutter-script.c:480
+msgid "The path of the currently parsed file"
+msgstr "A jelenleg feldolgozott fájl útvonala"
+
+#: ../clutter/clutter-script.c:497
+msgid "Translation Domain"
+msgstr "Fordítási tartomány"
+
+#: ../clutter/clutter-script.c:498
+msgid "The translation domain used to localize string"
+msgstr "A szöveg honosításához használt fordítási tartomány"
+
+#: ../clutter/clutter-scroll-actor.c:189
+msgid "Scroll Mode"
+msgstr "Görgetés mód"
+
+#: ../clutter/clutter-scroll-actor.c:190
+msgid "The scrolling direction"
+msgstr "A görgetés iránya"
+
+#: ../clutter/clutter-settings.c:486
+msgid "Double Click Time"
+msgstr "Dupla kattintás ideje"
+
+#: ../clutter/clutter-settings.c:487
+msgid "The time between clicks necessary to detect a multiple click"
+msgstr "A többszörös kattintás észleléséhez szükséges kattintások közötti idő"
+
+#: ../clutter/clutter-settings.c:502
+msgid "Double Click Distance"
+msgstr "Dupla kattintás távolsága"
+
+#: ../clutter/clutter-settings.c:503
+msgid "The distance between clicks necessary to detect a multiple click"
+msgstr ""
+"A többszörös kattintás észleléséhez szükséges kattintások közötti távolság"
+
+#: ../clutter/clutter-settings.c:518
+msgid "Drag Threshold"
+msgstr "Húzási küszöb"
+
+#: ../clutter/clutter-settings.c:519
+msgid "The distance the cursor should travel before starting to drag"
+msgstr "Az a távolság, ameddig a kurzornak mozognia kell a húzás előtt"
+
+#: ../clutter/clutter-settings.c:534 ../clutter/clutter-text.c:3404
+msgid "Font Name"
+msgstr "Betűkészlet neve"
+
+#: ../clutter/clutter-settings.c:535
+msgid ""
+"The description of the default font, as one that could be parsed by Pango"
+msgstr ""
+"Az alapértelmezett betűkészlet leírása úgy, ahogy a Pango feldolgozhatja"
+
+#: ../clutter/clutter-settings.c:550
+msgid "Font Antialias"
+msgstr "Betűkészlet élsimítás"
+
+#: ../clutter/clutter-settings.c:551
+msgid ""
+"Whether to use antialiasing (1 to enable, 0 to disable, and -1 to use the "
+"default)"
+msgstr ""
+"Használjon-e élsimítást (1: engedélyezve, 0: tiltva, -1: alapértelmezett "
+"használata)"
+
+#: ../clutter/clutter-settings.c:567 ../clutter/clutter-settings.c:575
+msgid "Font DPI"
+msgstr "Betűkészlet DPI"
+
+#: ../clutter/clutter-settings.c:568 ../clutter/clutter-settings.c:576
+msgid ""
+"The resolution of the font, in 1024 * dots/inch, or -1 to use the default"
+msgstr ""
+"A betűkészlet felbontása 1024 * pont/hüvelykben, vagy -1 esetén az "
+"alapértelmezett használata"
+
+#: ../clutter/clutter-settings.c:592
+msgid "Font Hinting"
+msgstr "Betűkészlet hinting"
+
+#: ../clutter/clutter-settings.c:593
+msgid ""
+"Whether to use hinting (1 to enable, 0 to disable and -1 to use the default)"
+msgstr ""
+"Használjon-e hintinget (: engedélyezve, 0: tiltva, -1: alapértelmezett "
+"használata)"
+
+#: ../clutter/clutter-settings.c:614
+msgid "Font Hint Style"
+msgstr "Betűstílus hint stílus"
+
+#: ../clutter/clutter-settings.c:615
+msgid "The style of hinting (hintnone, hintslight, hintmedium, hintfull)"
+msgstr "A hinting stílusa (hintnone, hintslight, hintmedium, hintfull)"
+
+#: ../clutter/clutter-settings.c:636
+msgid "Font Subpixel Order"
+msgstr "Betűkészlet képponton belüli sorrend"
+
+#: ../clutter/clutter-settings.c:637
+msgid "The type of subpixel antialiasing (none, rgb, bgr, vrgb, vbgr)"
+msgstr "A képponton belüli élsimítás típusa (none, rgb, bgr, vrgb, vbgr)"
+
+#: ../clutter/clutter-settings.c:654
+msgid "The minimum duration for a long press gesture to be recognized"
+msgstr "Egy hosszú lenyomás minimális időtartama a gesztus felismeréséhez"
+
+#: ../clutter/clutter-settings.c:661
+msgid "Window Scaling Factor"
+msgstr "Ablakméretezési tényező"
+
+#: ../clutter/clutter-settings.c:662
+#| msgid "Add an effect to be applied on the actor"
+msgid "The scaling factor to be applied to windows"
+msgstr "Az ablakokon alkalmazandó méretezési tényező"
+
+#: ../clutter/clutter-settings.c:669
+msgid "Fontconfig configuration timestamp"
+msgstr "Fontconfig beállítás időbélyeg"
+
+#: ../clutter/clutter-settings.c:670
+msgid "Timestamp of the current fontconfig configuration"
+msgstr "A jelenlegi fontconfig beállítás időbélyege"
+
+#: ../clutter/clutter-settings.c:687
+msgid "Password Hint Time"
+msgstr "Jelszótipp ideje"
+
+#: ../clutter/clutter-settings.c:688
+msgid "How long to show the last input character in hidden entries"
+msgstr ""
+"Meddig jelenjen meg az utoljára bevitt karakter a rejtett bejegyzésekben"
+
+#: ../clutter/clutter-shader-effect.c:485
+msgid "Shader Type"
+msgstr "Árnyékoló típus"
+
+#: ../clutter/clutter-shader-effect.c:486
+msgid "The type of shader used"
+msgstr "A használt árnyékoló típusa"
+
+#: ../clutter/clutter-snap-constraint.c:322
+msgid "The source of the constraint"
+msgstr "A megszorítás forrása"
+
+#: ../clutter/clutter-snap-constraint.c:335
+msgid "From Edge"
+msgstr "Élből"
+
+#: ../clutter/clutter-snap-constraint.c:336
+msgid "The edge of the actor that should be snapped"
+msgstr "Az illesztendő szereplő éle"
+
+#: ../clutter/clutter-snap-constraint.c:350
+msgid "To Edge"
+msgstr "Élhez"
+
+#: ../clutter/clutter-snap-constraint.c:351
+msgid "The edge of the source that should be snapped"
+msgstr "Az illesztendő forrás éle"
+
+#: ../clutter/clutter-snap-constraint.c:367
+msgid "The offset in pixels to apply to the constraint"
+msgstr "A megszorításra alkalmazandó eltolás képpontokban"
+
+#: ../clutter/clutter-stage.c:1899
+msgid "Fullscreen Set"
+msgstr "Teljes képernyő beállítva"
+
+#: ../clutter/clutter-stage.c:1900
+msgid "Whether the main stage is fullscreen"
+msgstr "A fő helyszín teljes képernyős-e"
+
+#: ../clutter/clutter-stage.c:1914
+msgid "Offscreen"
+msgstr "Képernyőn kívüli"
+
+#: ../clutter/clutter-stage.c:1915
+msgid "Whether the main stage should be rendered offscreen"
+msgstr "A fő helyszín képernyőn kívül legyen-e megjelenítve"
+
+#: ../clutter/clutter-stage.c:1927 ../clutter/clutter-text.c:3518
+msgid "Cursor Visible"
+msgstr "Kurzor látható"
+
+#: ../clutter/clutter-stage.c:1928
+msgid "Whether the mouse pointer is visible on the main stage"
+msgstr "Az egérmutató látható-e a fő helyszínen"
+
+#: ../clutter/clutter-stage.c:1942
+msgid "User Resizable"
+msgstr "A felhasználó átméretezhető"
+
+#: ../clutter/clutter-stage.c:1943
+msgid "Whether the stage is able to be resized via user interaction"
+msgstr ""
+"A fő helyszín átméretezhető legyen-e felhasználói interakción keresztül"
+
+#: ../clutter/clutter-stage.c:1958 ../clutter/deprecated/clutter-box.c:256
+#: ../clutter/deprecated/clutter-rectangle.c:270
+msgid "Color"
+msgstr "Szín"
+
+#: ../clutter/clutter-stage.c:1959
+msgid "The color of the stage"
+msgstr "A helyszín színe"
+
+#: ../clutter/clutter-stage.c:1974
+msgid "Perspective"
+msgstr "Perspektíva"
+
+#: ../clutter/clutter-stage.c:1975
+msgid "Perspective projection parameters"
+msgstr "Perspektíva vetítési paraméterek"
+
+#: ../clutter/clutter-stage.c:1990
+msgid "Title"
+msgstr "Cím"
+
+#: ../clutter/clutter-stage.c:1991
+msgid "Stage Title"
+msgstr "Helyszín címe"
+
+#: ../clutter/clutter-stage.c:2008
+msgid "Use Fog"
+msgstr "Köd használata"
+
+#: ../clutter/clutter-stage.c:2009
+msgid "Whether to enable depth cueing"
+msgstr "Engedélyezze-e a mélység jelzést"
+
+#: ../clutter/clutter-stage.c:2025
+msgid "Fog"
+msgstr "Köd"
+
+#: ../clutter/clutter-stage.c:2026
+msgid "Settings for the depth cueing"
+msgstr "A mélység jelzés beállításai"
+
+#: ../clutter/clutter-stage.c:2042
+msgid "Use Alpha"
+msgstr "Alfa használata"
+
+#: ../clutter/clutter-stage.c:2043
+msgid "Whether to honour the alpha component of the stage color"
+msgstr "Tartsa-e tiszteletben a helyszín színének alfa komponensét"
+
+#: ../clutter/clutter-stage.c:2059
+msgid "Key Focus"
+msgstr "Kulcsfókusz"
+
+#: ../clutter/clutter-stage.c:2060
+msgid "The currently key focused actor"
+msgstr "A jelenlegi kulcsfókuszált szereplő"
+
+#: ../clutter/clutter-stage.c:2076
+msgid "No Clear Hint"
+msgstr "Ne javaslat törlés"
+
+#: ../clutter/clutter-stage.c:2077
+msgid "Whether the stage should clear its contents"
+msgstr "A helyszín törölheti-e a tartalmait"
+
+#: ../clutter/clutter-stage.c:2090
+msgid "Accept Focus"
+msgstr "Fókusz fogadása"
+
+#: ../clutter/clutter-stage.c:2091
+msgid "Whether the stage should accept focus on show"
+msgstr "A helyszín fogadhat-e fókuszt megjelenítéskor"
+
+#: ../clutter/clutter-text-buffer.c:347 ../clutter/clutter-text.c:3439
+msgid "Text"
+msgstr "Szöveg"
+
+#: ../clutter/clutter-text-buffer.c:348
+msgid "The contents of the buffer"
+msgstr "A puffer tartalma"
+
+#: ../clutter/clutter-text-buffer.c:361
+msgid "Text length"
+msgstr "Szöveghossz"
+
+#: ../clutter/clutter-text-buffer.c:362
+msgid "Length of the text currently in the buffer"
+msgstr "A jelenleg a pufferben lévő szöveg hossza"
+
+#: ../clutter/clutter-text-buffer.c:375
+msgid "Maximum length"
+msgstr "Maximális hossz"
+
+#: ../clutter/clutter-text-buffer.c:376
+msgid "Maximum number of characters for this entry. Zero if no maximum"
+msgstr ""
+"A bejegyzésben felhasználható karakterek maximális száma. Ha nulla, akkor "
+"nincs maximum "
+
+#: ../clutter/clutter-text.c:3386
+msgid "Buffer"
+msgstr "Puffer"
+
+#: ../clutter/clutter-text.c:3387
+msgid "The buffer for the text"
+msgstr "A szöveg puffere"
+
+#: ../clutter/clutter-text.c:3405
+msgid "The font to be used by the text"
+msgstr "A szöveg által használandó betűkészlet"
+
+#: ../clutter/clutter-text.c:3422
+msgid "Font Description"
+msgstr "Betűkészlet leírása"
+
+#: ../clutter/clutter-text.c:3423
+msgid "The font description to be used"
+msgstr "A használandó betűkészlet leírása"
+
+#: ../clutter/clutter-text.c:3440
+msgid "The text to render"
+msgstr "A megjelenítendő szöveg"
+
+#: ../clutter/clutter-text.c:3454
+msgid "Font Color"
+msgstr "Betűkészlet színe"
+
+#: ../clutter/clutter-text.c:3455
+msgid "Color of the font used by the text"
+msgstr "A szöveg által használandó betűkészlet színe"
+
+#: ../clutter/clutter-text.c:3470
+msgid "Editable"
+msgstr "Szerkeszthető"
+
+#: ../clutter/clutter-text.c:3471
+msgid "Whether the text is editable"
+msgstr "A szöveg szerkeszthető-e"
+
+#: ../clutter/clutter-text.c:3486
+msgid "Selectable"
+msgstr "Kijelölhető"
+
+#: ../clutter/clutter-text.c:3487
+msgid "Whether the text is selectable"
+msgstr "A szöveg kijelölhető-e"
+
+#: ../clutter/clutter-text.c:3501
+msgid "Activatable"
+msgstr "Aktiválható"
+
+#: ../clutter/clutter-text.c:3502
+msgid "Whether pressing return causes the activate signal to be emitted"
+msgstr "A visszaadott lenyomás okozza-e a kibocsátandó jel aktiválását"
+
+#: ../clutter/clutter-text.c:3519
+msgid "Whether the input cursor is visible"
+msgstr "A bemeneti kurzor látható-e"
+
+#: ../clutter/clutter-text.c:3533 ../clutter/clutter-text.c:3534
+msgid "Cursor Color"
+msgstr "Kurzor színe"
+
+#: ../clutter/clutter-text.c:3549
+msgid "Cursor Color Set"
+msgstr "Kurzor színe beállítva"
+
+#: ../clutter/clutter-text.c:3550
+msgid "Whether the cursor color has been set"
+msgstr "A kurzor színe be lett-e állítva"
+
+#: ../clutter/clutter-text.c:3565
+msgid "Cursor Size"
+msgstr "Kurzor mérete"
+
+#: ../clutter/clutter-text.c:3566
+msgid "The width of the cursor, in pixels"
+msgstr "A kurzor szélessége képpontokban"
+
+#: ../clutter/clutter-text.c:3582 ../clutter/clutter-text.c:3600
+msgid "Cursor Position"
+msgstr "Kurzor pozíciója"
+
+#: ../clutter/clutter-text.c:3583 ../clutter/clutter-text.c:3601
+msgid "The cursor position"
+msgstr "A kurzor pozíciója"
+
+#: ../clutter/clutter-text.c:3616
+msgid "Selection-bound"
+msgstr "Kijelölés-határ"
+
+#: ../clutter/clutter-text.c:3617
+msgid "The cursor position of the other end of the selection"
+msgstr "A kijelölés másik végének kurzor pozíciója"
+
+#: ../clutter/clutter-text.c:3632 ../clutter/clutter-text.c:3633
+msgid "Selection Color"
+msgstr "Kijelölés színe"
+
+#: ../clutter/clutter-text.c:3648
+msgid "Selection Color Set"
+msgstr "Kijelölés színe beállítva"
+
+#: ../clutter/clutter-text.c:3649
+msgid "Whether the selection color has been set"
+msgstr "A kijelölés színe be lett-e állítva"
+
+#: ../clutter/clutter-text.c:3664
+msgid "Attributes"
+msgstr "Attribútumok"
+
+#: ../clutter/clutter-text.c:3665
+msgid "A list of style attributes to apply to the contents of the actor"
+msgstr "A szereplő tartalmain alkalmazandó stílusattribútumok listája"
+
+#: ../clutter/clutter-text.c:3687
+msgid "Use markup"
+msgstr "Jelölőkód használata"
+
+#: ../clutter/clutter-text.c:3688
+msgid "Whether or not the text includes Pango markup"
+msgstr "A szöveg tartalmaz-e Pango jelölőkódot vagy sem"
+
+#: ../clutter/clutter-text.c:3704
+msgid "Line wrap"
+msgstr "Sorok tördelése"
+
+#: ../clutter/clutter-text.c:3705
+msgid "If set, wrap the lines if the text becomes too wide"
+msgstr "Ha be van állítva, a sorok megtörnek, ha a szöveg túl hosszú"
+
+#: ../clutter/clutter-text.c:3720
+msgid "Line wrap mode"
+msgstr "Sorok tördelésének módja"
+
+#: ../clutter/clutter-text.c:3721
+msgid "Control how line-wrapping is done"
+msgstr "Annak vezérlése, hogy hogyan teljesüljön a sorok tördelése"
+
+#: ../clutter/clutter-text.c:3736
+msgid "Ellipsize"
+msgstr "Kihagyások"
+
+#: ../clutter/clutter-text.c:3737
+msgid "The preferred place to ellipsize the string"
+msgstr "A szöveg kihagyásának előnyben részesített helye"
+
+#: ../clutter/clutter-text.c:3753
+msgid "Line Alignment"
+msgstr "Sorok igazítása"
+
+#: ../clutter/clutter-text.c:3754
+msgid "The preferred alignment for the string, for multi-line text"
+msgstr "A szöveg előnyben részesített igazítása többsoros szövegnél"
+
+#: ../clutter/clutter-text.c:3770
+msgid "Justify"
+msgstr "Sorkizárt"
+
+#: ../clutter/clutter-text.c:3771
+msgid "Whether the text should be justified"
+msgstr "A szöveg legyen-e sorkizárt"
+
+#: ../clutter/clutter-text.c:3786
+msgid "Password Character"
+msgstr "Jelszó karakter"
+
+#: ../clutter/clutter-text.c:3787
+msgid "If non-zero, use this character to display the actor's contents"
+msgstr ""
+"Ha nem nulla, használja ezt a karaktert a szereplő tartalmainak "
+"megjelenítéséhez"
+
+#: ../clutter/clutter-text.c:3801
+msgid "Max Length"
+msgstr "Legnagyobb hossz"
+
+#: ../clutter/clutter-text.c:3802
+msgid "Maximum length of the text inside the actor"
+msgstr "A szöveg legnagyobb hossza a szereplőn belül"
+
+#: ../clutter/clutter-text.c:3825
+msgid "Single Line Mode"
+msgstr "Egysoros mód"
+
+#: ../clutter/clutter-text.c:3826
+msgid "Whether the text should be a single line"
+msgstr "A szöveg lehet-e egysoros"
+
+#: ../clutter/clutter-text.c:3840 ../clutter/clutter-text.c:3841
+msgid "Selected Text Color"
+msgstr "Kijelölt szöveg színe"
+
+#: ../clutter/clutter-text.c:3856
+msgid "Selected Text Color Set"
+msgstr "Kijelölt szöveg színe beállítva"
+
+#: ../clutter/clutter-text.c:3857
+msgid "Whether the selected text color has been set"
+msgstr "A kijelölt szöveg színe be lett-e állítva"
+
+#: ../clutter/clutter-timeline.c:593
+#: ../clutter/deprecated/clutter-animation.c:557
+msgid "Loop"
+msgstr "Ismétlés"
+
+#: ../clutter/clutter-timeline.c:594
+msgid "Should the timeline automatically restart"
+msgstr "Az idővonal automatikusan újraindulhat"
+
+#: ../clutter/clutter-timeline.c:608
+msgid "Delay"
+msgstr "Késleltetés"
+
+#: ../clutter/clutter-timeline.c:609
+msgid "Delay before start"
+msgstr "Késleltetés indítás előtt"
+
+#: ../clutter/clutter-timeline.c:624
+#: ../clutter/deprecated/clutter-animation.c:541
+#: ../clutter/deprecated/clutter-animator.c:1801
+#: ../clutter/deprecated/clutter-media.c:224
+#: ../clutter/deprecated/clutter-state.c:1517
+msgid "Duration"
+msgstr "Időtartam"
+
+#: ../clutter/clutter-timeline.c:625
+msgid "Duration of the timeline in milliseconds"
+msgstr "Az idővonal időtartama ezredmásodpercben"
+
+#: ../clutter/clutter-timeline.c:640
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:521
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:330
+msgid "Direction"
+msgstr "Irány"
+
+#: ../clutter/clutter-timeline.c:641
+msgid "Direction of the timeline"
+msgstr "Az idővonal iránya"
+
+#: ../clutter/clutter-timeline.c:656
+msgid "Auto Reverse"
+msgstr "Automatikus megfordítás"
+
+#: ../clutter/clutter-timeline.c:657
+msgid "Whether the direction should be reversed when reaching the end"
+msgstr "Megfordulhat-e az irány, amikor a végére ér"
+
+#: ../clutter/clutter-timeline.c:675
+msgid "Repeat Count"
+msgstr "Ismétlések száma"
+
+#: ../clutter/clutter-timeline.c:676
+msgid "How many times the timeline should repeat"
+msgstr "Hányszor ismétlődjön az idővonal"
+
+#: ../clutter/clutter-timeline.c:690
+msgid "Progress Mode"
+msgstr "Folyamat mód"
+
+#: ../clutter/clutter-timeline.c:691
+msgid "How the timeline should compute the progress"
+msgstr "Hogyan számolja az idővonal a folyamatot"
+
+#: ../clutter/clutter-transition.c:244
+msgid "Interval"
+msgstr "Időköz"
+
+#: ../clutter/clutter-transition.c:245
+msgid "The interval of values to transition"
+msgstr "Az értékek időköze az átmenethez"
+
+#: ../clutter/clutter-transition.c:259
+msgid "Animatable"
+msgstr "Animálható"
+
+#: ../clutter/clutter-transition.c:260
+msgid "The animatable object"
+msgstr "Az animálható objektum"
+
+#: ../clutter/clutter-transition.c:281
+msgid "Remove on Complete"
+msgstr "Eltávolítás befejezéskor"
+
+#: ../clutter/clutter-transition.c:282
+msgid "Detach the transition when completed"
+msgstr "Átmenet leválasztása, amikor befejeződött"
+
+#: ../clutter/clutter-zoom-action.c:365
+msgid "Zoom Axis"
+msgstr "Nagyítási tengely"
+
+#: ../clutter/clutter-zoom-action.c:366
+msgid "Constraints the zoom to an axis"
+msgstr "Kényszeríti a nagyítást egy tengelyre"
+
+#: ../clutter/deprecated/clutter-alpha.c:354
+#: ../clutter/deprecated/clutter-animation.c:572
+#: ../clutter/deprecated/clutter-animator.c:1818
+msgid "Timeline"
+msgstr "Idővonal"
+
+#: ../clutter/deprecated/clutter-alpha.c:355
+msgid "Timeline used by the alpha"
+msgstr "Az alfa által használt idővonal"
+
+#: ../clutter/deprecated/clutter-alpha.c:371
+msgid "Alpha value"
+msgstr "Alfa érték"
+
+#: ../clutter/deprecated/clutter-alpha.c:372
+msgid "Alpha value as computed by the alpha"
+msgstr "Alfa érték az alfa által kiszámítottként"
+
+#: ../clutter/deprecated/clutter-alpha.c:393
+#: ../clutter/deprecated/clutter-animation.c:525
+msgid "Mode"
+msgstr "Mód"
+
+#: ../clutter/deprecated/clutter-alpha.c:394
+msgid "Progress mode"
+msgstr "Folyamat mód"
+
+#: ../clutter/deprecated/clutter-animation.c:508
+msgid "Object"
+msgstr "Objektum"
+
+#: ../clutter/deprecated/clutter-animation.c:509
+msgid "Object to which the animation applies"
+msgstr "Objektum, amelyre az animáció alkalmazzák"
+
+#: ../clutter/deprecated/clutter-animation.c:526
+msgid "The mode of the animation"
+msgstr "Az animáció módja"
+
+#: ../clutter/deprecated/clutter-animation.c:542
+msgid "Duration of the animation, in milliseconds"
+msgstr "Az animáció időtartama ezredmásodpercben"
+
+#: ../clutter/deprecated/clutter-animation.c:558
+msgid "Whether the animation should loop"
+msgstr "Ismétlődjön-e az animáció"
+
+#: ../clutter/deprecated/clutter-animation.c:573
+msgid "The timeline used by the animation"
+msgstr "Az animáció által használt idővonal"
+
+#: ../clutter/deprecated/clutter-animation.c:589
+#: ../clutter/deprecated/clutter-behaviour.c:237
+msgid "Alpha"
+msgstr "Alfa"
+
+#: ../clutter/deprecated/clutter-animation.c:590
+msgid "The alpha used by the animation"
+msgstr "Az animáció által használt alfa"
+
+#: ../clutter/deprecated/clutter-animator.c:1802
+msgid "The duration of the animation"
+msgstr "Az animáció időtartama"
+
+#: ../clutter/deprecated/clutter-animator.c:1819
+msgid "The timeline of the animation"
+msgstr "Az animáció idővonala"
+
+#: ../clutter/deprecated/clutter-behaviour.c:238
+msgid "Alpha Object to drive the behaviour"
+msgstr "Alfa objektum a viselkedés vezetéséhez"
+
+#: ../clutter/deprecated/clutter-behaviour-depth.c:180
+msgid "Start Depth"
+msgstr "Kezdőmélység"
+
+#: ../clutter/deprecated/clutter-behaviour-depth.c:181
+msgid "Initial depth to apply"
+msgstr "Az alkalmazandó kezdeti mélység"
+
+#: ../clutter/deprecated/clutter-behaviour-depth.c:196
+msgid "End Depth"
+msgstr "Zárómélység"
+
+#: ../clutter/deprecated/clutter-behaviour-depth.c:197
+msgid "Final depth to apply"
+msgstr "Az alkalmazandó végső mélység"
+
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:394
+msgid "Start Angle"
+msgstr "Kezdőszög"
+
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:395
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:277
+msgid "Initial angle"
+msgstr "Kezdeti szög"
+
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:410
+msgid "End Angle"
+msgstr "Zárószög"
+
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:411
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:295
+msgid "Final angle"
+msgstr "Végső szög"
+
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:426
+msgid "Angle x tilt"
+msgstr "X dőlésszög"
+
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:427
+msgid "Tilt of the ellipse around x axis"
+msgstr "Az ellipszis dőlése az X tengely körül"
+
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:442
+msgid "Angle y tilt"
+msgstr "Y dőlésszög"
+
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:443
+msgid "Tilt of the ellipse around y axis"
+msgstr "Az ellipszis dőlése az Y tengely körül"
+
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:458
+msgid "Angle z tilt"
+msgstr "Z dőlésszög"
+
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:459
+msgid "Tilt of the ellipse around z axis"
+msgstr "Az ellipszis dőlése a Z tengely körül"
+
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:475
+msgid "Width of the ellipse"
+msgstr "Az ellipszis szélessége"
+
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:491
+msgid "Height of ellipse"
+msgstr "Az ellipszis magassága"
+
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:506
+msgid "Center"
+msgstr "Közép"
+
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:507
+msgid "Center of ellipse"
+msgstr "Az ellipszis közepe"
+
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:522
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:331
+msgid "Direction of rotation"
+msgstr "A forgatás iránya"
+
+#: ../clutter/deprecated/clutter-behaviour-opacity.c:177
+msgid "Opacity Start"
+msgstr "Kezdő átlátszatlanság"
+
+#: ../clutter/deprecated/clutter-behaviour-opacity.c:178
+msgid "Initial opacity level"
+msgstr "Kezdeti átlátszatlansági szint"
+
+#: ../clutter/deprecated/clutter-behaviour-opacity.c:195
+msgid "Opacity End"
+msgstr "Záró átlátszatlanság"
+
+#: ../clutter/deprecated/clutter-behaviour-opacity.c:196
+msgid "Final opacity level"
+msgstr "Végső átlátszatlansági szint"
+
+#: ../clutter/deprecated/clutter-behaviour-path.c:222
+msgid "The ClutterPath object representing the path to animate along"
+msgstr ""
+"A ClutterPath objektum ábrázolja azt az útvonalat, amely mentén az animáció "
+"történik"
+
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:276
+msgid "Angle Begin"
+msgstr "Kezdő szög"
+
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:294
+msgid "Angle End"
+msgstr "Záró szög"
+
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:312
+msgid "Axis"
+msgstr "Tengely"
+
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:313
+msgid "Axis of rotation"
+msgstr "A forgatás tengelye"
+
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:348
+msgid "Center X"
+msgstr "X közép"
+
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:349
+msgid "X coordinate of the center of rotation"
+msgstr "A forgatás közepének X koordinátája"
+
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:366
+msgid "Center Y"
+msgstr "Y közép"
+
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:367
+msgid "Y coordinate of the center of rotation"
+msgstr "A forgatás közepének Y koordinátája"
+
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:384
+msgid "Center Z"
+msgstr "Z közép"
+
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:385
+msgid "Z coordinate of the center of rotation"
+msgstr "A forgatás közepének Z koordinátája"
+
+#: ../clutter/deprecated/clutter-behaviour-scale.c:222
+msgid "X Start Scale"
+msgstr "X kezdő méretezés"
+
+#: ../clutter/deprecated/clutter-behaviour-scale.c:223
+msgid "Initial scale on the X axis"
+msgstr "Kezdeti méretezés az X tengelyen"
+
+#: ../clutter/deprecated/clutter-behaviour-scale.c:241
+msgid "X End Scale"
+msgstr "X záró méretezés"
+
+#: ../clutter/deprecated/clutter-behaviour-scale.c:242
+msgid "Final scale on the X axis"
+msgstr "Végső méretezés az X tengelyen"
+
+#: ../clutter/deprecated/clutter-behaviour-scale.c:260
+msgid "Y Start Scale"
+msgstr "Y kezdő méretezés"
+
+#: ../clutter/deprecated/clutter-behaviour-scale.c:261
+msgid "Initial scale on the Y axis"
+msgstr "Kezdeti méretezés az Y tengelyen"
+
+#: ../clutter/deprecated/clutter-behaviour-scale.c:279
+msgid "Y End Scale"
+msgstr "Y záró méretezés"
+
+#: ../clutter/deprecated/clutter-behaviour-scale.c:280
+msgid "Final scale on the Y axis"
+msgstr "Végső méretezés az Y tengelyen"
+
+#: ../clutter/deprecated/clutter-box.c:257
+msgid "The background color of the box"
+msgstr "A doboz háttérszíne"
+
+#: ../clutter/deprecated/clutter-box.c:270
+msgid "Color Set"
+msgstr "Szín beállítva"
+
+#: ../clutter/deprecated/clutter-cairo-texture.c:593
+msgid "Surface Width"
+msgstr "Felület szélesség"
+
+#: ../clutter/deprecated/clutter-cairo-texture.c:594
+msgid "The width of the Cairo surface"
+msgstr "A Cairo felület szélessége"
+
+#: ../clutter/deprecated/clutter-cairo-texture.c:611
+msgid "Surface Height"
+msgstr "Felület magasság"
+
+#: ../clutter/deprecated/clutter-cairo-texture.c:612
+msgid "The height of the Cairo surface"
+msgstr "A Cairo felület magassága"
+
+#: ../clutter/deprecated/clutter-cairo-texture.c:632
+msgid "Auto Resize"
+msgstr "Automatikus átméretezés"
+
+#: ../clutter/deprecated/clutter-cairo-texture.c:633
+msgid "Whether the surface should match the allocation"
+msgstr "A felület illeszkedjen-e a lefoglalásra"
+
+#: ../clutter/deprecated/clutter-media.c:83
+msgid "URI"
+msgstr "URI"
+
+#: ../clutter/deprecated/clutter-media.c:84
+msgid "URI of a media file"
+msgstr "Egy médiafájl URI-ja"
+
+#: ../clutter/deprecated/clutter-media.c:100
+msgid "Playing"
+msgstr "Lejátszás"
+
+#: ../clutter/deprecated/clutter-media.c:101
+msgid "Whether the actor is playing"
+msgstr "A szereplő lejátszás alatt van-e"
+
+#: ../clutter/deprecated/clutter-media.c:118
+msgid "Progress"
+msgstr "Folyamat"
+
+#: ../clutter/deprecated/clutter-media.c:119
+msgid "Current progress of the playback"
+msgstr "A lejátszás jelenlegi folyamata"
+
+#: ../clutter/deprecated/clutter-media.c:135
+msgid "Subtitle URI"
+msgstr "Felirat URI"
+
+#: ../clutter/deprecated/clutter-media.c:136
+msgid "URI of a subtitle file"
+msgstr "Egy feliratfájl URI-ja"
+
+#: ../clutter/deprecated/clutter-media.c:154
+msgid "Subtitle Font Name"
+msgstr "Felirat betűkészletneve"
+
+#: ../clutter/deprecated/clutter-media.c:155
+msgid "The font used to display subtitles"
+msgstr "A feliratok megjelenítéséhez használt betűkészlet"
+
+#: ../clutter/deprecated/clutter-media.c:172
+msgid "Audio Volume"
+msgstr "Hangerő"
+
+#: ../clutter/deprecated/clutter-media.c:173
+msgid "The volume of the audio"
+msgstr "A hang hangereje"
+
+#: ../clutter/deprecated/clutter-media.c:189
+msgid "Can Seek"
+msgstr "Tekerhető"
+
+#: ../clutter/deprecated/clutter-media.c:190
+msgid "Whether the current stream is seekable"
+msgstr "A jelenlegi folyam tekerhető-e"
+
+#: ../clutter/deprecated/clutter-media.c:207
+msgid "Buffer Fill"
+msgstr "Pufferkitöltés"
+
+#: ../clutter/deprecated/clutter-media.c:208
+msgid "The fill level of the buffer"
+msgstr "A puffer kitöltési szintje"
+
+#: ../clutter/deprecated/clutter-media.c:225
+msgid "The duration of the stream, in seconds"
+msgstr "A folyam időtartama másodpercben"
+
+#: ../clutter/deprecated/clutter-rectangle.c:271
+msgid "The color of the rectangle"
+msgstr "A téglalap színe"
+
+#: ../clutter/deprecated/clutter-rectangle.c:284
+msgid "Border Color"
+msgstr "Szegélyszín"
+
+#: ../clutter/deprecated/clutter-rectangle.c:285
+msgid "The color of the border of the rectangle"
+msgstr "A téglalap szegélyének színe"
+
+#: ../clutter/deprecated/clutter-rectangle.c:300
+msgid "Border Width"
+msgstr "Szegélyvastagság"
+
+#: ../clutter/deprecated/clutter-rectangle.c:301
+msgid "The width of the border of the rectangle"
+msgstr "A téglalap szegélyének vastagsága"
+
+#: ../clutter/deprecated/clutter-rectangle.c:315
+msgid "Has Border"
+msgstr "Van szegélye"
+
+#: ../clutter/deprecated/clutter-rectangle.c:316
+msgid "Whether the rectangle should have a border"
+msgstr "A téglalapnak legyen-e szegélye"
+
+#: ../clutter/deprecated/clutter-shader.c:257
+msgid "Vertex Source"
+msgstr "Csúcs forrás"
+
+#: ../clutter/deprecated/clutter-shader.c:258
+msgid "Source of vertex shader"
+msgstr "A csúcs árnyékoló forrása"
+
+#: ../clutter/deprecated/clutter-shader.c:274
+msgid "Fragment Source"
+msgstr "Töredék forrás"
+
+#: ../clutter/deprecated/clutter-shader.c:275
+msgid "Source of fragment shader"
+msgstr "A töredék árnyékoló forrása"
+
+#: ../clutter/deprecated/clutter-shader.c:292
+msgid "Compiled"
+msgstr "Fordított"
+
+#: ../clutter/deprecated/clutter-shader.c:293
+msgid "Whether the shader is compiled and linked"
+msgstr "Az árnyékoló le van-e fordítva és linkelve van-e"
+
+#: ../clutter/deprecated/clutter-shader.c:310
+msgid "Whether the shader is enabled"
+msgstr "Engedélyezve van-e az árnyékoló"
+
+#: ../clutter/deprecated/clutter-shader.c:521
+#, c-format
+msgid "%s compilation failed: %s"
+msgstr "%s fordítása nem sikerült: %s"
+
+#: ../clutter/deprecated/clutter-shader.c:522
+msgid "Vertex shader"
+msgstr "Csúcs árnyékoló"
+
+#: ../clutter/deprecated/clutter-shader.c:523
+msgid "Fragment shader"
+msgstr "Töredék árnyékoló"
+
+#: ../clutter/deprecated/clutter-state.c:1499
+msgid "State"
+msgstr "Állapot"
+
+#: ../clutter/deprecated/clutter-state.c:1500
+msgid "Currently set state, (transition to this state might not be complete)"
+msgstr ""
+"A jelenleg beállított állapot, (az átmenet talán nem teljes ehhez a "
+"helyszínhez)"
+
+#: ../clutter/deprecated/clutter-state.c:1518
+msgid "Default transition duration"
+msgstr "Alapértelmezett átmenet időtartam"
+
+#: ../clutter/deprecated/clutter-table-layout.c:543
+msgid "Column Number"
+msgstr "Oszlopszám"
+
+#: ../clutter/deprecated/clutter-table-layout.c:544
+msgid "The column the widget resides in"
+msgstr "Az oszlop, amelyben a felületi elem található"
+
+#: ../clutter/deprecated/clutter-table-layout.c:551
+msgid "Row Number"
+msgstr "Sorszám"
+
+#: ../clutter/deprecated/clutter-table-layout.c:552
+msgid "The row the widget resides in"
+msgstr "A sor, amelyben a felületi elem található"
+
+#: ../clutter/deprecated/clutter-table-layout.c:559
+msgid "Column Span"
+msgstr "Oszlopátnyúlás"
+
+#: ../clutter/deprecated/clutter-table-layout.c:560
+msgid "The number of columns the widget should span"
+msgstr "Az oszlopok száma, amelybe a felületi elem átnyúlhat"
+
+#: ../clutter/deprecated/clutter-table-layout.c:567
+msgid "Row Span"
+msgstr "Sorátnyúlás"
+
+#: ../clutter/deprecated/clutter-table-layout.c:568
+msgid "The number of rows the widget should span"
+msgstr "A sorok száma, amelybe a felületi elem átnyúlhat"
+
+#: ../clutter/deprecated/clutter-table-layout.c:575
+msgid "Horizontal Expand"
+msgstr "Vízszintes bővülés"
+
+#: ../clutter/deprecated/clutter-table-layout.c:576
+msgid "Allocate extra space for the child in horizontal axis"
+msgstr "További terület lefoglalása a gyermeknek a vízszintes tengelyen"
+
+#: ../clutter/deprecated/clutter-table-layout.c:582
+msgid "Vertical Expand"
+msgstr "Függőleges bővülés"
+
+#: ../clutter/deprecated/clutter-table-layout.c:583
+msgid "Allocate extra space for the child in vertical axis"
+msgstr "További terület lefoglalása a gyermeknek a függőleges tengelyen"
+
+#: ../clutter/deprecated/clutter-table-layout.c:1638
+msgid "Spacing between columns"
+msgstr "Térköz az oszlopok között"
+
+#: ../clutter/deprecated/clutter-table-layout.c:1654
+msgid "Spacing between rows"
+msgstr "Térköz a sorok között"
+
+#: ../clutter/deprecated/clutter-texture.c:992
+msgid "Sync size of actor"
+msgstr "Szereplő méretének szinkronizálása"
+
+#: ../clutter/deprecated/clutter-texture.c:993
+msgid "Auto sync size of actor to underlying pixbuf dimensions"
+msgstr ""
+"Szereplő méretének automatikus szinkronizálása a kép dimenzióinak alapjául "
+"szolgálva"
+
+#: ../clutter/deprecated/clutter-texture.c:1000
+msgid "Disable Slicing"
+msgstr "Szeletelés letiltása"
+
+#: ../clutter/deprecated/clutter-texture.c:1001
+msgid ""
+"Forces the underlying texture to be singular and not made of smaller space "
+"saving individual textures"
+msgstr ""
+"Az alapul szolgáló mintázat kényszerítése, hogy egyszerű legyen és ne kisebb "
+"méretű, egyedülálló mintázatokból mentett legyen"
+
+#: ../clutter/deprecated/clutter-texture.c:1010
+msgid "Tile Waste"
+msgstr "Csempe hulladék"
+
+#: ../clutter/deprecated/clutter-texture.c:1011
+msgid "Maximum waste area of a sliced texture"
+msgstr "Egy szeletelt mintázat legnagyobb kárba veszett területe"
+
+#: ../clutter/deprecated/clutter-texture.c:1019
+msgid "Horizontal repeat"
+msgstr "Vízszintes ismétlés"
+
+#: ../clutter/deprecated/clutter-texture.c:1020
+msgid "Repeat the contents rather than scaling them horizontally"
+msgstr "Tartalom ismétlése ahelyett, hogy vízszintesen szeletelve lennének"
+
+#: ../clutter/deprecated/clutter-texture.c:1027
+msgid "Vertical repeat"
+msgstr "Függőleges ismétlés"
+
+#: ../clutter/deprecated/clutter-texture.c:1028
+msgid "Repeat the contents rather than scaling them vertically"
+msgstr "Tartalom ismétlése ahelyett, hogy függőlegesen szeletelve lennének"
+
+#: ../clutter/deprecated/clutter-texture.c:1035
+msgid "Filter Quality"
+msgstr "Szűrő minőség"
+
+#: ../clutter/deprecated/clutter-texture.c:1036
+msgid "Rendering quality used when drawing the texture"
+msgstr "A használt megjelenítési minőség a mintázat rajzolásakor"
+
+#: ../clutter/deprecated/clutter-texture.c:1044
+msgid "Pixel Format"
+msgstr "Képpont formátum"
+
+#: ../clutter/deprecated/clutter-texture.c:1045
+msgid "The Cogl pixel format to use"
+msgstr "A használandó Cogl képpont formátum"
+
+#: ../clutter/deprecated/clutter-texture.c:1053
+#: ../clutter/wayland/clutter-wayland-surface.c:445
+msgid "Cogl Texture"
+msgstr "Cogl mintázat"
+
+#: ../clutter/deprecated/clutter-texture.c:1054
+#: ../clutter/wayland/clutter-wayland-surface.c:446
+msgid "The underlying Cogl texture handle used to draw this actor"
+msgstr "Ezen szereplő rajzolásához használt alapul szolgáló Cogl mintázat"
+
+#: ../clutter/deprecated/clutter-texture.c:1061
+msgid "Cogl Material"
+msgstr "Cogl anyag"
+
+#: ../clutter/deprecated/clutter-texture.c:1062
+msgid "The underlying Cogl material handle used to draw this actor"
+msgstr "Ezen szereplő rajzolásához használt alapul szolgáló Cogl anyag"
+
+#: ../clutter/deprecated/clutter-texture.c:1081
+msgid "The path of the file containing the image data"
+msgstr "A képadatokat tartalmazó fájl útvonala"
+
+#: ../clutter/deprecated/clutter-texture.c:1088
+msgid "Keep Aspect Ratio"
+msgstr "Méretarány megőrzése"
+
+#: ../clutter/deprecated/clutter-texture.c:1089
+msgid ""
+"Keep the aspect ratio of the texture when requesting the preferred width or "
+"height"
+msgstr ""
+"A mintázat méretarányának megőrzése az előnyben részesített szélesség vagy "
+"magasság kérésekor"
+
+#: ../clutter/deprecated/clutter-texture.c:1117
+msgid "Load asynchronously"
+msgstr "Betöltés aszinkron módon"
+
+#: ../clutter/deprecated/clutter-texture.c:1118
+msgid ""
+"Load files inside a thread to avoid blocking when loading images from disk"
+msgstr ""
+"Fájlok betöltése egy szálon belül a blokkolás elkerülése érdekében, amikor "
+"képeket tölt be a lemezről"
+
+#: ../clutter/deprecated/clutter-texture.c:1136
+msgid "Load data asynchronously"
+msgstr "Adatok betöltése aszinkron módon"
+
+#: ../clutter/deprecated/clutter-texture.c:1137
+msgid ""
+"Decode image data files inside a thread to reduce blocking when loading "
+"images from disk"
+msgstr ""
+"Képadat fájlok dekódolása egy szálon belül a blokkolás csökkentése "
+"érdekében, amikor képeket tölt be a lemezről"
+
+#: ../clutter/deprecated/clutter-texture.c:1163
+msgid "Pick With Alpha"
+msgstr "Kiválasztás alfával"
+
+#: ../clutter/deprecated/clutter-texture.c:1164
+msgid "Shape actor with alpha channel when picking"
+msgstr "Szereplő formálása alfa csatornával kiválasztáskor"
+
+#: ../clutter/deprecated/clutter-texture.c:1597
+#: ../clutter/deprecated/clutter-texture.c:1992
+#: ../clutter/deprecated/clutter-texture.c:2088
+#: ../clutter/deprecated/clutter-texture.c:2386
+#, c-format
+msgid "Failed to load the image data"
+msgstr "Nem sikerült betölteni a képadatokat"
+
+#: ../clutter/deprecated/clutter-texture.c:1756
+#, c-format
+msgid "YUV textures are not supported"
+msgstr "YUV mintázatok nem támogatottak"
+
+#: ../clutter/deprecated/clutter-texture.c:1765
+#, c-format
+msgid "YUV2 textues are not supported"
+msgstr "YUV2 mintázatok nem támogatottak"
+
+#: ../clutter/evdev/clutter-input-device-evdev.c:154
+msgid "sysfs Path"
+msgstr "sysfs útvonal"
+
+#: ../clutter/evdev/clutter-input-device-evdev.c:155
+msgid "Path of the device in sysfs"
+msgstr "Az eszköz útvonala a sysfs-ben"
+
+#: ../clutter/evdev/clutter-input-device-evdev.c:170
+msgid "Device Path"
+msgstr "Eszköz útvonala"
+
+#: ../clutter/evdev/clutter-input-device-evdev.c:171
+msgid "Path of the device node"
+msgstr "Az eszközcsomópont útvonala"
+
+#: ../clutter/gdk/clutter-backend-gdk.c:289
+#, c-format
+msgid "Could not find a suitable CoglWinsys for a GdkDisplay of type %s"
+msgstr "Nem található megfelelő CoglWinsys a(z) %s típusú GdkDisplay számára"
+
+#: ../clutter/wayland/clutter-wayland-surface.c:419
+msgid "Surface"
+msgstr "Felület"
+
+#: ../clutter/wayland/clutter-wayland-surface.c:420
+msgid "The underlying wayland surface"
+msgstr "Az alapul szolgáló wayland felület"
+
+#: ../clutter/wayland/clutter-wayland-surface.c:427
+msgid "Surface width"
+msgstr "Felület szélesség"
+
+#: ../clutter/wayland/clutter-wayland-surface.c:428
+msgid "The width of the underlying wayland surface"
+msgstr "Az alapul szolgáló wayland felület szélessége"
+
+#: ../clutter/wayland/clutter-wayland-surface.c:436
+msgid "Surface height"
+msgstr "Felület magasság"
+
+#: ../clutter/wayland/clutter-wayland-surface.c:437
+msgid "The height of the underlying wayland surface"
+msgstr "Az alapul szolgáló wayland felület magassága"
+
+#: ../clutter/x11/clutter-backend-x11.c:488
+msgid "X display to use"
+msgstr "Használandó X-megjelenítő"
+
+#: ../clutter/x11/clutter-backend-x11.c:494
+msgid "X screen to use"
+msgstr "Használandó X-képernyő"
+
+#: ../clutter/x11/clutter-backend-x11.c:499
+msgid "Make X calls synchronous"
+msgstr "Az X-hívások szinkronná tétele"
+
+#: ../clutter/x11/clutter-backend-x11.c:506
+msgid "Disable XInput support"
+msgstr "XInput támogatás letiltása"
+
+#: ../clutter/x11/clutter-keymap-x11.c:322
+msgid "The Clutter backend"
+msgstr "A Clutter háttérprogram"
+
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:534
+msgid "Pixmap"
+msgstr "Kép"
+
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:535
+msgid "The X11 Pixmap to be bound"
+msgstr "A kötendő X11 kép"
+
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:543
+msgid "Pixmap width"
+msgstr "Kép szélessége"
+
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:544
+msgid "The width of the pixmap bound to this texture"
+msgstr "Ehhez a mintához kötött kép szélessége"
+
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:552
+msgid "Pixmap height"
+msgstr "Kép magassága"
+
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:553
+msgid "The height of the pixmap bound to this texture"
+msgstr "Ehhez a mintához kötött kép magassága"
+
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:561
+msgid "Pixmap Depth"
+msgstr "Kép mélysége"
+
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:562
+msgid "The depth (in number of bits) of the pixmap bound to this texture"
+msgstr "Ehhez a mintához kötött kép mélysége (bitek számában)"
+
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:570
+msgid "Automatic Updates"
+msgstr "Automatikus frissítések"
+
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:571
+msgid "If the texture should be kept in sync with any pixmap changes."
+msgstr ""
+"Ha a mintázatot szinkronizációban kellene tartani bármilyen "
+"képváltoztatással."
+
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:579
+msgid "Window"
+msgstr "Ablak"
+
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:580
+msgid "The X11 Window to be bound"
+msgstr "A kötendő X11 ablak"
+
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:588
+msgid "Window Redirect Automatic"
+msgstr "Ablak átirányítás automatikus"
+
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:589
+msgid "If composite window redirects are set to Automatic (or Manual if false)"
+msgstr ""
+"Ha az összetett ablak átirányítások automatikusra vannak állítva (vagy kézi, "
+"ha hamis)"
+
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:599
+msgid "Window Mapped"
+msgstr "Leképezett ablak"
+
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:600
+msgid "If window is mapped"
+msgstr "Ha az ablak leképezett"
+
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:609
+msgid "Destroyed"
+msgstr "Megsemmisített"
+
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:610
+msgid "If window has been destroyed"
+msgstr "Ha az ablak meg lett semmisítve"
+
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:618
+msgid "Window X"
+msgstr "Ablak X"
+
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:619
+msgid "X position of window on screen according to X11"
+msgstr "Az ablak X pozíciója a képernyőn az X11 szerint"
+
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:627
+msgid "Window Y"
+msgstr "Ablak Y"
+
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:628
+msgid "Y position of window on screen according to X11"
+msgstr "Az ablak Y pozíciója a képernyőn az X11 szerint"
+
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:635
+msgid "Window Override Redirect"
+msgstr "Ablak felülbírálás átirányítás"
+
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:636
+msgid "If this is an override-redirect window"
+msgstr "Ha ez egy felülbírálás-átirányítás ablak"
+
diff --git a/po/id.po b/po/id.po
index a8a4bd99e..850dea3dd 100644
--- a/po/id.po
+++ b/po/id.po
@@ -2,15 +2,15 @@
 # Copyright (C) 2010 Intel Corporation
 # This file is distributed under the same license as the clutter package.
 #
-# Andika Triwidada <andika@gmail.com>, 2010, 2011, 2012.
-# Dirgita <dirgitadevina@yahoo.co.id>, 2012.
+# Andika Triwidada <andika@gmail.com>, 2010, 2011, 2012, 2013, 2014.
+# Dirgita <dirgitadevina@yahoo.co.id>, 2012, 2014.
 msgid ""
 msgstr ""
-"Project-Id-Version: clutter master\n"
+"Project-Id-Version: clutter clutter-1.18\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=clutter&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2012-09-04 10:50+0000\n"
-"PO-Revision-Date: 2012-09-04 17:19+0700\n"
+"POT-Creation-Date: 2014-04-05 15:11+0000\n"
+"PO-Revision-Date: 2014-04-09 05:39+0700\n"
 "Last-Translator: Dirgita <dirgitadevina@yahoo.co.id>\n"
 "Language-Team: Indonesian <gnome-l10n-id@googlegroups.com>\n"
 "Language: id\n"
@@ -18,692 +18,692 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Lokalize 1.2\n"
+"X-Generator: Lokalize 1.5\n"
 
-#: ../clutter/clutter-actor.c:6125
+#: ../clutter/clutter-actor.c:6224
 msgid "X coordinate"
 msgstr "Koordinat X"
 
-#: ../clutter/clutter-actor.c:6126
+#: ../clutter/clutter-actor.c:6225
 msgid "X coordinate of the actor"
 msgstr "Koordinat X dari aktor"
 
-#: ../clutter/clutter-actor.c:6144
+#: ../clutter/clutter-actor.c:6243
 msgid "Y coordinate"
 msgstr "Koordinat Y"
 
-#: ../clutter/clutter-actor.c:6145
+#: ../clutter/clutter-actor.c:6244
 msgid "Y coordinate of the actor"
 msgstr "Koordinat Y dari aktor"
 
-#: ../clutter/clutter-actor.c:6167
+#: ../clutter/clutter-actor.c:6266
 msgid "Position"
 msgstr "Posisi"
 
-#: ../clutter/clutter-actor.c:6168
+#: ../clutter/clutter-actor.c:6267
 msgid "The position of the origin of the actor"
 msgstr "Posisi titik asal aktor"
 
-#: ../clutter/clutter-actor.c:6185 ../clutter/clutter-canvas.c:215
-#: ../clutter/clutter-grid-layout.c:1238
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:481
+#: ../clutter/clutter-actor.c:6284 ../clutter/clutter-canvas.c:242
+#: ../clutter/clutter-grid-layout.c:1239
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:474
 msgid "Width"
 msgstr "Lebar"
 
-#: ../clutter/clutter-actor.c:6186
+#: ../clutter/clutter-actor.c:6285
 msgid "Width of the actor"
 msgstr "Lebar aktor"
 
-#: ../clutter/clutter-actor.c:6204 ../clutter/clutter-canvas.c:231
-#: ../clutter/clutter-grid-layout.c:1245
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:497
+#: ../clutter/clutter-actor.c:6303 ../clutter/clutter-canvas.c:258
+#: ../clutter/clutter-grid-layout.c:1246
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:490
 msgid "Height"
 msgstr "Tinggi"
 
-#: ../clutter/clutter-actor.c:6205
+#: ../clutter/clutter-actor.c:6304
 msgid "Height of the actor"
 msgstr "Tinggi aktor"
 
-#: ../clutter/clutter-actor.c:6226
+#: ../clutter/clutter-actor.c:6325
 msgid "Size"
 msgstr "Ukuran"
 
-#: ../clutter/clutter-actor.c:6227
+#: ../clutter/clutter-actor.c:6326
 msgid "The size of the actor"
 msgstr "Ukuran aktor"
 
-#: ../clutter/clutter-actor.c:6245
+#: ../clutter/clutter-actor.c:6344
 msgid "Fixed X"
 msgstr "X Tetap"
 
-#: ../clutter/clutter-actor.c:6246
+#: ../clutter/clutter-actor.c:6345
 msgid "Forced X position of the actor"
 msgstr "Posisi X aktor yang dipaksakan"
 
-#: ../clutter/clutter-actor.c:6263
+#: ../clutter/clutter-actor.c:6362
 msgid "Fixed Y"
 msgstr "Y Tetap"
 
-#: ../clutter/clutter-actor.c:6264
+#: ../clutter/clutter-actor.c:6363
 msgid "Forced Y position of the actor"
 msgstr "Posisi Y aktor yang dipaksakan"
 
-#: ../clutter/clutter-actor.c:6279
+#: ../clutter/clutter-actor.c:6378
 msgid "Fixed position set"
 msgstr "Posisi yang ditetapkan ditata"
 
-#: ../clutter/clutter-actor.c:6280
+#: ../clutter/clutter-actor.c:6379
 msgid "Whether to use fixed positioning for the actor"
 msgstr "Apakah memakai penempatan yang ditetapkan bagi aktor"
 
-#: ../clutter/clutter-actor.c:6298
+#: ../clutter/clutter-actor.c:6397
 msgid "Min Width"
 msgstr "Lebar Min"
 
-#: ../clutter/clutter-actor.c:6299
+#: ../clutter/clutter-actor.c:6398
 msgid "Forced minimum width request for the actor"
 msgstr "Permintaan lebar minimal yang dipaksakan bagi aktor"
 
-#: ../clutter/clutter-actor.c:6317
+#: ../clutter/clutter-actor.c:6416
 msgid "Min Height"
 msgstr "Tinggi Min"
 
-#: ../clutter/clutter-actor.c:6318
+#: ../clutter/clutter-actor.c:6417
 msgid "Forced minimum height request for the actor"
 msgstr "Permintaan tinggi minimal yang dipaksakan bagi aktor"
 
-#: ../clutter/clutter-actor.c:6336
+#: ../clutter/clutter-actor.c:6435
 msgid "Natural Width"
 msgstr "Lebar Alami"
 
-#: ../clutter/clutter-actor.c:6337
+#: ../clutter/clutter-actor.c:6436
 msgid "Forced natural width request for the actor"
 msgstr "Permintaan lebar alami yang dipaksakan bagi aktor"
 
-#: ../clutter/clutter-actor.c:6355
+#: ../clutter/clutter-actor.c:6454
 msgid "Natural Height"
 msgstr "Tinggi Alami"
 
-#: ../clutter/clutter-actor.c:6356
+#: ../clutter/clutter-actor.c:6455
 msgid "Forced natural height request for the actor"
 msgstr "Permintaan tinggi alami yang dipaksakan bagi aktor"
 
-#: ../clutter/clutter-actor.c:6371
+#: ../clutter/clutter-actor.c:6470
 msgid "Minimum width set"
 msgstr "Lebar minimal ditata"
 
-#: ../clutter/clutter-actor.c:6372
+#: ../clutter/clutter-actor.c:6471
 msgid "Whether to use the min-width property"
 msgstr "Apakah memakai properti min-width"
 
-#: ../clutter/clutter-actor.c:6386
+#: ../clutter/clutter-actor.c:6485
 msgid "Minimum height set"
 msgstr "Tinggi minimal ditata"
 
-#: ../clutter/clutter-actor.c:6387
+#: ../clutter/clutter-actor.c:6486
 msgid "Whether to use the min-height property"
 msgstr "Apakah memakai properti min-height"
 
-#: ../clutter/clutter-actor.c:6401
+#: ../clutter/clutter-actor.c:6500
 msgid "Natural width set"
 msgstr "Lebar alami ditata"
 
-#: ../clutter/clutter-actor.c:6402
+#: ../clutter/clutter-actor.c:6501
 msgid "Whether to use the natural-width property"
 msgstr "Apakah memakai properti natural-width"
 
-#: ../clutter/clutter-actor.c:6416
+#: ../clutter/clutter-actor.c:6515
 msgid "Natural height set"
 msgstr "Tinggi alami ditata"
 
-#: ../clutter/clutter-actor.c:6417
+#: ../clutter/clutter-actor.c:6516
 msgid "Whether to use the natural-height property"
 msgstr "Apakah memakai properti natural-height"
 
-#: ../clutter/clutter-actor.c:6433
+#: ../clutter/clutter-actor.c:6532
 msgid "Allocation"
 msgstr "Alokasi"
 
-#: ../clutter/clutter-actor.c:6434
+#: ../clutter/clutter-actor.c:6533
 msgid "The actor's allocation"
 msgstr "Alokasi aktor"
 
-#: ../clutter/clutter-actor.c:6491
+#: ../clutter/clutter-actor.c:6590
 msgid "Request Mode"
 msgstr "Moda Permintaan"
 
-#: ../clutter/clutter-actor.c:6492
+#: ../clutter/clutter-actor.c:6591
 msgid "The actor's request mode"
 msgstr "Moda permintaan aktor"
 
-#: ../clutter/clutter-actor.c:6516
+#: ../clutter/clutter-actor.c:6615
 msgid "Depth"
 msgstr "Kedalaman"
 
-#: ../clutter/clutter-actor.c:6517
+#: ../clutter/clutter-actor.c:6616
 msgid "Position on the Z axis"
 msgstr "Posisi pada sumbu Z"
 
-#: ../clutter/clutter-actor.c:6544
+#: ../clutter/clutter-actor.c:6643
 msgid "Z Position"
 msgstr "Posisi Z"
 
-#: ../clutter/clutter-actor.c:6545
+#: ../clutter/clutter-actor.c:6644
 msgid "The actor's position on the Z axis"
 msgstr "Posisi aktor pada sumbu Z"
 
-#: ../clutter/clutter-actor.c:6562
+#: ../clutter/clutter-actor.c:6661
 msgid "Opacity"
 msgstr "Kelegapan"
 
-#: ../clutter/clutter-actor.c:6563
+#: ../clutter/clutter-actor.c:6662
 msgid "Opacity of an actor"
 msgstr "Tingkat kelegapan aktor"
 
-#: ../clutter/clutter-actor.c:6583
+#: ../clutter/clutter-actor.c:6682
 msgid "Offscreen redirect"
 msgstr "Pengalihan luar layar"
 
-#: ../clutter/clutter-actor.c:6584
+#: ../clutter/clutter-actor.c:6683
 msgid "Flags controlling when to flatten the actor into a single image"
 msgstr "Flag yang mengendalikan kapan untuk meratakan aktor ke gambar tunggal"
 
-#: ../clutter/clutter-actor.c:6598
+#: ../clutter/clutter-actor.c:6697
 msgid "Visible"
 msgstr "Tampak"
 
-#: ../clutter/clutter-actor.c:6599
+#: ../clutter/clutter-actor.c:6698
 msgid "Whether the actor is visible or not"
 msgstr "Apakah aktor nampak atau tidak"
 
-#: ../clutter/clutter-actor.c:6613
+#: ../clutter/clutter-actor.c:6712
 msgid "Mapped"
 msgstr "Dipetakan"
 
-#: ../clutter/clutter-actor.c:6614
+#: ../clutter/clutter-actor.c:6713
 msgid "Whether the actor will be painted"
 msgstr "Apakah aktor akan digambar"
 
-#: ../clutter/clutter-actor.c:6627
+#: ../clutter/clutter-actor.c:6726
 msgid "Realized"
 msgstr "Direalisasikan"
 
-#: ../clutter/clutter-actor.c:6628
+#: ../clutter/clutter-actor.c:6727
 msgid "Whether the actor has been realized"
 msgstr "Apakah aktor telah direalisasikan"
 
-#: ../clutter/clutter-actor.c:6643
+#: ../clutter/clutter-actor.c:6742
 msgid "Reactive"
 msgstr "Reaktif"
 
-#: ../clutter/clutter-actor.c:6644
+#: ../clutter/clutter-actor.c:6743
 msgid "Whether the actor is reactive to events"
 msgstr "Apakah aktor reaktif terhadap kejadian"
 
-#: ../clutter/clutter-actor.c:6655
+#: ../clutter/clutter-actor.c:6754
 msgid "Has Clip"
 msgstr "Punya Klip"
 
-#: ../clutter/clutter-actor.c:6656
+#: ../clutter/clutter-actor.c:6755
 msgid "Whether the actor has a clip set"
 msgstr "Apakah aktor telah ditata punya klip"
 
-#: ../clutter/clutter-actor.c:6669
+#: ../clutter/clutter-actor.c:6768
 msgid "Clip"
 msgstr "Klip"
 
-#: ../clutter/clutter-actor.c:6670
+#: ../clutter/clutter-actor.c:6769
 msgid "The clip region for the actor"
 msgstr "Wilayah klip bagi aktor"
 
-#: ../clutter/clutter-actor.c:6689
+#: ../clutter/clutter-actor.c:6788
 msgid "Clip Rectangle"
 msgstr "Klip Persegi Panjang"
 
-#: ../clutter/clutter-actor.c:6690
+#: ../clutter/clutter-actor.c:6789
 msgid "The visible region of the actor"
 msgstr "Wilayah tampak pada aktor"
 
-#: ../clutter/clutter-actor.c:6704 ../clutter/clutter-actor-meta.c:207
-#: ../clutter/clutter-binding-pool.c:319 ../clutter/clutter-input-device.c:258
+#: ../clutter/clutter-actor.c:6803 ../clutter/clutter-actor-meta.c:205
+#: ../clutter/clutter-binding-pool.c:318 ../clutter/clutter-input-device.c:247
 msgid "Name"
 msgstr "Nama"
 
-#: ../clutter/clutter-actor.c:6705
+#: ../clutter/clutter-actor.c:6804
 msgid "Name of the actor"
 msgstr "Nama aktor"
 
-#: ../clutter/clutter-actor.c:6726
+#: ../clutter/clutter-actor.c:6825
 msgid "Pivot Point"
 msgstr "Titik Pivot"
 
-#: ../clutter/clutter-actor.c:6727
+#: ../clutter/clutter-actor.c:6826
 msgid "The point around which the scaling and rotation occur"
 msgstr "Titik asal penskalaan dan rotasi terjadi"
 
-#: ../clutter/clutter-actor.c:6745
+#: ../clutter/clutter-actor.c:6844
 msgid "Pivot Point Z"
 msgstr "Titik Pivot Z"
 
-#: ../clutter/clutter-actor.c:6746
+#: ../clutter/clutter-actor.c:6845
 msgid "Z component of the pivot point"
 msgstr "Koordinat Z titik jangkar"
 
-#: ../clutter/clutter-actor.c:6764
+#: ../clutter/clutter-actor.c:6863
 msgid "Scale X"
 msgstr "Skala X"
 
-#: ../clutter/clutter-actor.c:6765
+#: ../clutter/clutter-actor.c:6864
 msgid "Scale factor on the X axis"
 msgstr "Faktor skala pada sumbu X"
 
-#: ../clutter/clutter-actor.c:6783
+#: ../clutter/clutter-actor.c:6882
 msgid "Scale Y"
 msgstr "Skala Y"
 
-#: ../clutter/clutter-actor.c:6784
+#: ../clutter/clutter-actor.c:6883
 msgid "Scale factor on the Y axis"
 msgstr "Faktor skala pada sumbu Y"
 
-#: ../clutter/clutter-actor.c:6802
+#: ../clutter/clutter-actor.c:6901
 msgid "Scale Z"
 msgstr "Skala Z"
 
-#: ../clutter/clutter-actor.c:6803
+#: ../clutter/clutter-actor.c:6902
 msgid "Scale factor on the Z axis"
 msgstr "Faktor skala pada sumbu Z"
 
-#: ../clutter/clutter-actor.c:6821
+#: ../clutter/clutter-actor.c:6920
 msgid "Scale Center X"
 msgstr "Pusat Skala X"
 
-#: ../clutter/clutter-actor.c:6822
+#: ../clutter/clutter-actor.c:6921
 msgid "Horizontal scale center"
 msgstr "Pusat skala horisontal"
 
-#: ../clutter/clutter-actor.c:6840
+#: ../clutter/clutter-actor.c:6939
 msgid "Scale Center Y"
 msgstr "Pusat Skala Y"
 
-#: ../clutter/clutter-actor.c:6841
+#: ../clutter/clutter-actor.c:6940
 msgid "Vertical scale center"
 msgstr "Pusat skala vertikal"
 
-#: ../clutter/clutter-actor.c:6859
+#: ../clutter/clutter-actor.c:6958
 msgid "Scale Gravity"
 msgstr "Gravitasi Skala"
 
-#: ../clutter/clutter-actor.c:6860
+#: ../clutter/clutter-actor.c:6959
 msgid "The center of scaling"
 msgstr "Pusat penskalaan"
 
-#: ../clutter/clutter-actor.c:6878
+#: ../clutter/clutter-actor.c:6977
 msgid "Rotation Angle X"
 msgstr "Sudut Rotasi X"
 
-#: ../clutter/clutter-actor.c:6879
+#: ../clutter/clutter-actor.c:6978
 msgid "The rotation angle on the X axis"
 msgstr "Sudut rotasi dari sumbu X"
 
-#: ../clutter/clutter-actor.c:6897
+#: ../clutter/clutter-actor.c:6996
 msgid "Rotation Angle Y"
 msgstr "Sudut Rotasi Y"
 
-#: ../clutter/clutter-actor.c:6898
+#: ../clutter/clutter-actor.c:6997
 msgid "The rotation angle on the Y axis"
 msgstr "Sudut rotasi dari sumbu Y"
 
-#: ../clutter/clutter-actor.c:6916
+#: ../clutter/clutter-actor.c:7015
 msgid "Rotation Angle Z"
 msgstr "Sudut Rotasi Z"
 
-#: ../clutter/clutter-actor.c:6917
+#: ../clutter/clutter-actor.c:7016
 msgid "The rotation angle on the Z axis"
 msgstr "Sudut rotasi dari sumbu Z"
 
-#: ../clutter/clutter-actor.c:6935
+#: ../clutter/clutter-actor.c:7034
 msgid "Rotation Center X"
 msgstr "Pusat Rotasi X"
 
-#: ../clutter/clutter-actor.c:6936
+#: ../clutter/clutter-actor.c:7035
 msgid "The rotation center on the X axis"
 msgstr "Pusat rotasi pada sumbu X"
 
-#: ../clutter/clutter-actor.c:6953
+#: ../clutter/clutter-actor.c:7052
 msgid "Rotation Center Y"
 msgstr "Pusat Rotasi Y"
 
-#: ../clutter/clutter-actor.c:6954
+#: ../clutter/clutter-actor.c:7053
 msgid "The rotation center on the Y axis"
 msgstr "Pusat rotasi pada sumbu Y"
 
-#: ../clutter/clutter-actor.c:6971
+#: ../clutter/clutter-actor.c:7070
 msgid "Rotation Center Z"
 msgstr "Pusat Rotasi Z"
 
-#: ../clutter/clutter-actor.c:6972
+#: ../clutter/clutter-actor.c:7071
 msgid "The rotation center on the Z axis"
 msgstr "Pusat rotasi pada sumbu Z"
 
-#: ../clutter/clutter-actor.c:6989
+#: ../clutter/clutter-actor.c:7088
 msgid "Rotation Center Z Gravity"
 msgstr "Gravitasi Z Pusat Rotasi"
 
-#: ../clutter/clutter-actor.c:6990
+#: ../clutter/clutter-actor.c:7089
 msgid "Center point for rotation around the Z axis"
 msgstr "Titik pusat rotasi seputar sumbu Z"
 
-#: ../clutter/clutter-actor.c:7018
+#: ../clutter/clutter-actor.c:7117
 msgid "Anchor X"
 msgstr "Jangkar X"
 
-#: ../clutter/clutter-actor.c:7019
+#: ../clutter/clutter-actor.c:7118
 msgid "X coordinate of the anchor point"
 msgstr "Koordinat X titik jangkar"
 
-#: ../clutter/clutter-actor.c:7047
+#: ../clutter/clutter-actor.c:7146
 msgid "Anchor Y"
 msgstr "Jangkar Y"
 
-#: ../clutter/clutter-actor.c:7048
+#: ../clutter/clutter-actor.c:7147
 msgid "Y coordinate of the anchor point"
 msgstr "Koordinat Y titik jangkar"
 
-#: ../clutter/clutter-actor.c:7075
+#: ../clutter/clutter-actor.c:7174
 msgid "Anchor Gravity"
 msgstr "Gravitasi Jangkar"
 
-#: ../clutter/clutter-actor.c:7076
+#: ../clutter/clutter-actor.c:7175
 msgid "The anchor point as a ClutterGravity"
 msgstr "Titik jangkar sebagai ClutterGravity"
 
-#: ../clutter/clutter-actor.c:7095
+#: ../clutter/clutter-actor.c:7194
 msgid "Translation X"
 msgstr "Pergeseran X"
 
-#: ../clutter/clutter-actor.c:7096
+#: ../clutter/clutter-actor.c:7195
 msgid "Translation along the X axis"
 msgstr "Pergeseran sepanjang sumbu X"
 
-#: ../clutter/clutter-actor.c:7115
+#: ../clutter/clutter-actor.c:7214
 msgid "Translation Y"
 msgstr "Pergeseran Y"
 
-#: ../clutter/clutter-actor.c:7116
+#: ../clutter/clutter-actor.c:7215
 msgid "Translation along the Y axis"
 msgstr "Pergeseran sepanjang sumbu Y"
 
-#: ../clutter/clutter-actor.c:7135
+#: ../clutter/clutter-actor.c:7234
 msgid "Translation Z"
 msgstr "Pergeseran Z"
 
-#: ../clutter/clutter-actor.c:7136
+#: ../clutter/clutter-actor.c:7235
 msgid "Translation along the Z axis"
 msgstr "Pergeseran sepanjang sumbu Z"
 
-#: ../clutter/clutter-actor.c:7166
+#: ../clutter/clutter-actor.c:7265
 msgid "Transform"
 msgstr "Transformasi"
 
-#: ../clutter/clutter-actor.c:7167
+#: ../clutter/clutter-actor.c:7266
 msgid "Transformation matrix"
 msgstr "Matriks transformasi"
 
-#: ../clutter/clutter-actor.c:7182
+#: ../clutter/clutter-actor.c:7281
 msgid "Transform Set"
 msgstr "Transformasi Ditata"
 
-#: ../clutter/clutter-actor.c:7183
+#: ../clutter/clutter-actor.c:7282
 msgid "Whether the transform property is set"
 msgstr "Apakah properti transformasi telah ditetapkan"
 
-#: ../clutter/clutter-actor.c:7204
+#: ../clutter/clutter-actor.c:7303
 msgid "Child Transform"
 msgstr "Transformasi Anak"
 
-#: ../clutter/clutter-actor.c:7205
+#: ../clutter/clutter-actor.c:7304
 msgid "Children transformation matrix"
 msgstr "Matriks transformasi anak"
 
-#: ../clutter/clutter-actor.c:7220
+#: ../clutter/clutter-actor.c:7319
 msgid "Child Transform Set"
 msgstr "Transformasi Anak Ditata"
 
-#: ../clutter/clutter-actor.c:7221
+#: ../clutter/clutter-actor.c:7320
 msgid "Whether the child-transform property is set"
 msgstr "Apakah properti transformasi anak telah ditetapkan"
 
-#: ../clutter/clutter-actor.c:7238
+#: ../clutter/clutter-actor.c:7337
 msgid "Show on set parent"
 msgstr "Tampilkan saat jadi induk"
 
-#: ../clutter/clutter-actor.c:7239
+#: ../clutter/clutter-actor.c:7338
 msgid "Whether the actor is shown when parented"
 msgstr "Apakah aktor ditampilkan ketika dijadikan induk"
 
-#: ../clutter/clutter-actor.c:7256
+#: ../clutter/clutter-actor.c:7355
 msgid "Clip to Allocation"
 msgstr "Klip ke Alokasi"
 
-#: ../clutter/clutter-actor.c:7257
+#: ../clutter/clutter-actor.c:7356
 msgid "Sets the clip region to track the actor's allocation"
 msgstr "Tata wilayah pemotongan untuk melacak alokasi aktor"
 
-#: ../clutter/clutter-actor.c:7270
+#: ../clutter/clutter-actor.c:7369
 msgid "Text Direction"
 msgstr "Arah Teks"
 
-#: ../clutter/clutter-actor.c:7271
+#: ../clutter/clutter-actor.c:7370
 msgid "Direction of the text"
 msgstr "Arah teks"
 
-#: ../clutter/clutter-actor.c:7286
+#: ../clutter/clutter-actor.c:7385
 msgid "Has Pointer"
 msgstr "Punya Penunjuk"
 
-#: ../clutter/clutter-actor.c:7287
+#: ../clutter/clutter-actor.c:7386
 msgid "Whether the actor contains the pointer of an input device"
 msgstr "Apakah aktor memuat penunjuk dari suatu perangkat masukan"
 
-#: ../clutter/clutter-actor.c:7300
+#: ../clutter/clutter-actor.c:7399
 msgid "Actions"
 msgstr "Aksi"
 
-#: ../clutter/clutter-actor.c:7301
+#: ../clutter/clutter-actor.c:7400
 msgid "Adds an action to the actor"
 msgstr "Tambahkan aksi ke aktor"
 
-#: ../clutter/clutter-actor.c:7314
+#: ../clutter/clutter-actor.c:7413
 msgid "Constraints"
 msgstr "Kendala"
 
-#: ../clutter/clutter-actor.c:7315
+#: ../clutter/clutter-actor.c:7414
 msgid "Adds a constraint to the actor"
 msgstr "Tambahkan kendala ke aktor"
 
-#: ../clutter/clutter-actor.c:7328
+#: ../clutter/clutter-actor.c:7427
 msgid "Effect"
 msgstr "Efek"
 
-#: ../clutter/clutter-actor.c:7329
+#: ../clutter/clutter-actor.c:7428
 msgid "Add an effect to be applied on the actor"
 msgstr "Tambahkan efek untuk diterapkan ke aktor"
 
-#: ../clutter/clutter-actor.c:7343
+#: ../clutter/clutter-actor.c:7442
 msgid "Layout Manager"
 msgstr "Manajer Tata Letak"
 
-#: ../clutter/clutter-actor.c:7344
+#: ../clutter/clutter-actor.c:7443
 msgid "The object controlling the layout of an actor's children"
 msgstr "Objek yang mengendalikan tata letak anak aktor"
 
-#: ../clutter/clutter-actor.c:7358
+#: ../clutter/clutter-actor.c:7457
 msgid "X Expand"
 msgstr "X Mengembang"
 
-#: ../clutter/clutter-actor.c:7359
+#: ../clutter/clutter-actor.c:7458
 msgid "Whether extra horizontal space should be assigned to the actor"
 msgstr "Apakah ruang horisontal ekstra mesti diberikan ke aktor"
 
-#: ../clutter/clutter-actor.c:7374
+#: ../clutter/clutter-actor.c:7473
 msgid "Y Expand"
 msgstr "Y Mengembang"
 
-#: ../clutter/clutter-actor.c:7375
+#: ../clutter/clutter-actor.c:7474
 msgid "Whether extra vertical space should be assigned to the actor"
 msgstr "Apakah ruang vertikal ekstra mesti diberikan ke aktor"
 
-#: ../clutter/clutter-actor.c:7391
+#: ../clutter/clutter-actor.c:7490
 msgid "X Alignment"
 msgstr "Perataan X"
 
-#: ../clutter/clutter-actor.c:7392
+#: ../clutter/clutter-actor.c:7491
 msgid "The alignment of the actor on the X axis within its allocation"
 msgstr "Perataan aktor pada sumbu X dalam alokasinya"
 
-#: ../clutter/clutter-actor.c:7407
+#: ../clutter/clutter-actor.c:7506
 msgid "Y Alignment"
 msgstr "Perataan Y"
 
-#: ../clutter/clutter-actor.c:7408
+#: ../clutter/clutter-actor.c:7507
 msgid "The alignment of the actor on the Y axis within its allocation"
 msgstr "Perataan aktor pada sumbu Y dalam alokasinya"
 
-#: ../clutter/clutter-actor.c:7427
+#: ../clutter/clutter-actor.c:7526
 msgid "Margin Top"
 msgstr "Marjin Puncak"
 
-#: ../clutter/clutter-actor.c:7428
+#: ../clutter/clutter-actor.c:7527
 msgid "Extra space at the top"
 msgstr "Ruang ekstra di puncak"
 
-#: ../clutter/clutter-actor.c:7449
+#: ../clutter/clutter-actor.c:7548
 msgid "Margin Bottom"
 msgstr "Marjin Dasar"
 
-#: ../clutter/clutter-actor.c:7450
+#: ../clutter/clutter-actor.c:7549
 msgid "Extra space at the bottom"
 msgstr "Ruang ekstra di dasar"
 
-#: ../clutter/clutter-actor.c:7471
+#: ../clutter/clutter-actor.c:7570
 msgid "Margin Left"
 msgstr "Marjin Kiri"
 
-#: ../clutter/clutter-actor.c:7472
+#: ../clutter/clutter-actor.c:7571
 msgid "Extra space at the left"
 msgstr "Ruang ekstra di kiri"
 
-#: ../clutter/clutter-actor.c:7493
+#: ../clutter/clutter-actor.c:7592
 msgid "Margin Right"
 msgstr "Marjin Kanan"
 
-#: ../clutter/clutter-actor.c:7494
+#: ../clutter/clutter-actor.c:7593
 msgid "Extra space at the right"
 msgstr "Ruang ekstra di kanan"
 
-#: ../clutter/clutter-actor.c:7510
+#: ../clutter/clutter-actor.c:7609
 msgid "Background Color Set"
 msgstr "Warna Latar Belakang Ditata"
 
-#: ../clutter/clutter-actor.c:7511 ../clutter/deprecated/clutter-box.c:275
+#: ../clutter/clutter-actor.c:7610 ../clutter/deprecated/clutter-box.c:269
 msgid "Whether the background color is set"
 msgstr "Apakah warna latar belakang ditata"
 
-#: ../clutter/clutter-actor.c:7527
+#: ../clutter/clutter-actor.c:7626
 msgid "Background color"
 msgstr "Warna latar belakang"
 
-#: ../clutter/clutter-actor.c:7528
+#: ../clutter/clutter-actor.c:7627
 msgid "The actor's background color"
 msgstr "Warna latar belakang aktor"
 
-#: ../clutter/clutter-actor.c:7543
+#: ../clutter/clutter-actor.c:7642
 msgid "First Child"
 msgstr "Anak Pertama"
 
-#: ../clutter/clutter-actor.c:7544
+#: ../clutter/clutter-actor.c:7643
 msgid "The actor's first child"
 msgstr "Anak pertama aktor"
 
-#: ../clutter/clutter-actor.c:7557
+#: ../clutter/clutter-actor.c:7656
 msgid "Last Child"
 msgstr "Anak Terakhir"
 
-#: ../clutter/clutter-actor.c:7558
+#: ../clutter/clutter-actor.c:7657
 msgid "The actor's last child"
 msgstr "Anak terakhir aktor"
 
-#: ../clutter/clutter-actor.c:7572
+#: ../clutter/clutter-actor.c:7671
 msgid "Content"
 msgstr "Isi"
 
-#: ../clutter/clutter-actor.c:7573
+#: ../clutter/clutter-actor.c:7672
 msgid "Delegate object for painting the actor's content"
 msgstr "Delegasikan objek untuk menggambar isi aktor"
 
-#: ../clutter/clutter-actor.c:7598
+#: ../clutter/clutter-actor.c:7697
 msgid "Content Gravity"
 msgstr "Gravitasi Isi"
 
-#: ../clutter/clutter-actor.c:7599
+#: ../clutter/clutter-actor.c:7698
 msgid "Alignment of the actor's content"
 msgstr "Perataan isi aktor"
 
-#: ../clutter/clutter-actor.c:7619
+#: ../clutter/clutter-actor.c:7718
 msgid "Content Box"
 msgstr "Kotak Isi"
 
-#: ../clutter/clutter-actor.c:7620
+#: ../clutter/clutter-actor.c:7719
 msgid "The bounding box of the actor's content"
 msgstr "Kotak batas dari isi aktor"
 
-#: ../clutter/clutter-actor.c:7628
+#: ../clutter/clutter-actor.c:7727
 msgid "Minification Filter"
 msgstr "Penyaring Peminian"
 
-#: ../clutter/clutter-actor.c:7629
+#: ../clutter/clutter-actor.c:7728
 msgid "The filter used when reducing the size of the content"
 msgstr "Penyaring yang dipakai ketika mengurangi ukuran isi"
 
-#: ../clutter/clutter-actor.c:7636
+#: ../clutter/clutter-actor.c:7735
 msgid "Magnification Filter"
 msgstr "Penyarin Pembesaran"
 
-#: ../clutter/clutter-actor.c:7637
+#: ../clutter/clutter-actor.c:7736
 msgid "The filter used when increasing the size of the content"
 msgstr "Penyaring yang dipakai ketika memperbesar ukuran isi"
 
-#: ../clutter/clutter-actor.c:7651
+#: ../clutter/clutter-actor.c:7750
 msgid "Content Repeat"
 msgstr "Pengulangan Isi"
 
-#: ../clutter/clutter-actor.c:7652
+#: ../clutter/clutter-actor.c:7751
 msgid "The repeat policy for the actor's content"
 msgstr "Kebijakan pengulangan bagi isi aktor"
 
-#: ../clutter/clutter-actor-meta.c:193 ../clutter/clutter-child-meta.c:142
+#: ../clutter/clutter-actor-meta.c:191 ../clutter/clutter-child-meta.c:142
 msgid "Actor"
 msgstr "Aktor"
 
-#: ../clutter/clutter-actor-meta.c:194
+#: ../clutter/clutter-actor-meta.c:192
 msgid "The actor attached to the meta"
 msgstr "Aktor yang dicantolkan ke meta"
 
-#: ../clutter/clutter-actor-meta.c:208
+#: ../clutter/clutter-actor-meta.c:206
 msgid "The name of the meta"
 msgstr "Nama meta"
 
-#: ../clutter/clutter-actor-meta.c:221 ../clutter/clutter-input-device.c:337
-#: ../clutter/deprecated/clutter-shader.c:313
+#: ../clutter/clutter-actor-meta.c:219 ../clutter/clutter-input-device.c:326
+#: ../clutter/deprecated/clutter-shader.c:309
 msgid "Enabled"
 msgstr "Diaktifkan"
 
-#: ../clutter/clutter-actor-meta.c:222
+#: ../clutter/clutter-actor-meta.c:220
 msgid "Whether the meta is enabled"
 msgstr "Apakah meta diaktifkan"
 
 #: ../clutter/clutter-align-constraint.c:279
-#: ../clutter/clutter-bind-constraint.c:358 ../clutter/clutter-clone.c:345
+#: ../clutter/clutter-bind-constraint.c:343 ../clutter/clutter-clone.c:341
 #: ../clutter/clutter-snap-constraint.c:321
 msgid "Source"
 msgstr "Sumber"
@@ -729,80 +729,84 @@ msgstr "Faktor"
 msgid "The alignment factor, between 0.0 and 1.0"
 msgstr "Faktor perataan, antara 0.0 dan 1.0"
 
-#: ../clutter/clutter-backend.c:379
+#: ../clutter/clutter-backend.c:380
 msgid "Unable to initialize the Clutter backend"
 msgstr "Tak bisa menginisialisasi backend Clutter"
 
-#: ../clutter/clutter-backend.c:453
+#: ../clutter/clutter-backend.c:454
 #, c-format
 msgid "The backend of type '%s' does not support creating multiple stages"
 msgstr "Tipe backend '%s' tak mendukung pembuatan tingkat berganda"
 
-#: ../clutter/clutter-bind-constraint.c:359
+#: ../clutter/clutter-bind-constraint.c:344
 msgid "The source of the binding"
 msgstr "Sumber pengikatan"
 
-#: ../clutter/clutter-bind-constraint.c:372
+#: ../clutter/clutter-bind-constraint.c:357
 msgid "Coordinate"
 msgstr "Koordinat"
 
-#: ../clutter/clutter-bind-constraint.c:373
+#: ../clutter/clutter-bind-constraint.c:358
 msgid "The coordinate to bind"
 msgstr "Koordinat ikatan"
 
-#: ../clutter/clutter-bind-constraint.c:387
+#: ../clutter/clutter-bind-constraint.c:372
 #: ../clutter/clutter-path-constraint.c:226
 #: ../clutter/clutter-snap-constraint.c:366
 msgid "Offset"
 msgstr "Ofset"
 
-#: ../clutter/clutter-bind-constraint.c:388
+#: ../clutter/clutter-bind-constraint.c:373
 msgid "The offset in pixels to apply to the binding"
 msgstr "Ofset dalam piksel untuk menerapkan pengikatan"
 
-#: ../clutter/clutter-binding-pool.c:320
+#: ../clutter/clutter-binding-pool.c:319
 msgid "The unique name of the binding pool"
 msgstr "Nama unik dari pul pengikatan"
 
-#: ../clutter/clutter-bin-layout.c:240 ../clutter/clutter-bin-layout.c:649
-#: ../clutter/clutter-box-layout.c:390 ../clutter/clutter-table-layout.c:610
+#: ../clutter/clutter-bin-layout.c:220 ../clutter/clutter-bin-layout.c:633
+#: ../clutter/clutter-box-layout.c:374
+#: ../clutter/deprecated/clutter-table-layout.c:602
 msgid "Horizontal Alignment"
 msgstr "Perataan Horisontal"
 
-#: ../clutter/clutter-bin-layout.c:241
+#: ../clutter/clutter-bin-layout.c:221
 msgid "Horizontal alignment for the actor inside the layout manager"
 msgstr "Perataan horisontal bagi aktor di dalam manajer tata letak"
 
-#: ../clutter/clutter-bin-layout.c:249 ../clutter/clutter-bin-layout.c:669
-#: ../clutter/clutter-box-layout.c:399 ../clutter/clutter-table-layout.c:625
+#: ../clutter/clutter-bin-layout.c:229 ../clutter/clutter-bin-layout.c:653
+#: ../clutter/clutter-box-layout.c:383
+#: ../clutter/deprecated/clutter-table-layout.c:617
 msgid "Vertical Alignment"
 msgstr "Perataan Vertikal"
 
-#: ../clutter/clutter-bin-layout.c:250
+#: ../clutter/clutter-bin-layout.c:230
 msgid "Vertical alignment for the actor inside the layout manager"
 msgstr "Perataan vertikal bagi aktor di dalam manajer tata letak"
 
-#: ../clutter/clutter-bin-layout.c:650
+#: ../clutter/clutter-bin-layout.c:634
 msgid "Default horizontal alignment for the actors inside the layout manager"
 msgstr "Perataan horisontal baku bagi aktor di dalam manajer tata letak"
 
-#: ../clutter/clutter-bin-layout.c:670
+#: ../clutter/clutter-bin-layout.c:654
 msgid "Default vertical alignment for the actors inside the layout manager"
 msgstr "Perataan vertikal baku bagi aktor di dalam manajer tata letak"
 
-#: ../clutter/clutter-box-layout.c:365
+#: ../clutter/clutter-box-layout.c:349
 msgid "Expand"
 msgstr "Kembangkan"
 
-#: ../clutter/clutter-box-layout.c:366
+#: ../clutter/clutter-box-layout.c:350
 msgid "Allocate extra space for the child"
 msgstr "Alokasikan ruang ekstra bagi anak"
 
-#: ../clutter/clutter-box-layout.c:372 ../clutter/clutter-table-layout.c:589
+#: ../clutter/clutter-box-layout.c:356
+#: ../clutter/deprecated/clutter-table-layout.c:581
 msgid "Horizontal Fill"
 msgstr "Penuhi Horisontal"
 
-#: ../clutter/clutter-box-layout.c:373 ../clutter/clutter-table-layout.c:590
+#: ../clutter/clutter-box-layout.c:357
+#: ../clutter/deprecated/clutter-table-layout.c:582
 msgid ""
 "Whether the child should receive priority when the container is allocating "
 "spare space on the horizontal axis"
@@ -810,11 +814,13 @@ msgstr ""
 "Apakah anak mesti menerima prioritas ketika wadah sedang mengalokasikan "
 "ruang cadangan pada sumbu horisontal"
 
-#: ../clutter/clutter-box-layout.c:381 ../clutter/clutter-table-layout.c:596
+#: ../clutter/clutter-box-layout.c:365
+#: ../clutter/deprecated/clutter-table-layout.c:588
 msgid "Vertical Fill"
 msgstr "Penuhi Vertikal"
 
-#: ../clutter/clutter-box-layout.c:382 ../clutter/clutter-table-layout.c:597
+#: ../clutter/clutter-box-layout.c:366
+#: ../clutter/deprecated/clutter-table-layout.c:589
 msgid ""
 "Whether the child should receive priority when the container is allocating "
 "spare space on the vertical axis"
@@ -822,79 +828,87 @@ msgstr ""
 "Apakah anak mesti menerima prioritas ketika wadah sedang mengalokasikan "
 "ruang cadangan pada sumbu vertikal"
 
-#: ../clutter/clutter-box-layout.c:391 ../clutter/clutter-table-layout.c:611
+#: ../clutter/clutter-box-layout.c:375
+#: ../clutter/deprecated/clutter-table-layout.c:603
 msgid "Horizontal alignment of the actor within the cell"
 msgstr "Perataan horisontal dari aktor dalam sel"
 
-#: ../clutter/clutter-box-layout.c:400 ../clutter/clutter-table-layout.c:626
+#: ../clutter/clutter-box-layout.c:384
+#: ../clutter/deprecated/clutter-table-layout.c:618
 msgid "Vertical alignment of the actor within the cell"
 msgstr "Perataan vertikal dari aktor dalam sel"
 
-#: ../clutter/clutter-box-layout.c:1365
+#: ../clutter/clutter-box-layout.c:1345
 msgid "Vertical"
 msgstr "Vertikal"
 
-#: ../clutter/clutter-box-layout.c:1366
+#: ../clutter/clutter-box-layout.c:1346
 msgid "Whether the layout should be vertical, rather than horizontal"
 msgstr "Apakah tata letak mesti vertikal daripada horisontal"
 
-#: ../clutter/clutter-box-layout.c:1383 ../clutter/clutter-flow-layout.c:890
-#: ../clutter/clutter-grid-layout.c:1547
+#: ../clutter/clutter-box-layout.c:1363 ../clutter/clutter-flow-layout.c:927
+#: ../clutter/clutter-grid-layout.c:1549
 msgid "Orientation"
 msgstr "Orientasi"
 
-#: ../clutter/clutter-box-layout.c:1384 ../clutter/clutter-flow-layout.c:891
-#: ../clutter/clutter-grid-layout.c:1548
+#: ../clutter/clutter-box-layout.c:1364 ../clutter/clutter-flow-layout.c:928
+#: ../clutter/clutter-grid-layout.c:1550
 msgid "The orientation of the layout"
 msgstr "Orientasi tata letak"
 
-#: ../clutter/clutter-box-layout.c:1400 ../clutter/clutter-flow-layout.c:906
+#: ../clutter/clutter-box-layout.c:1380 ../clutter/clutter-flow-layout.c:943
 msgid "Homogeneous"
 msgstr "Homogen"
 
-#: ../clutter/clutter-box-layout.c:1401
+#: ../clutter/clutter-box-layout.c:1381
 msgid ""
 "Whether the layout should be homogeneous, i.e. all childs get the same size"
 msgstr ""
 "Apakah tata letak mesti homogen, yaitu semua anak mendapat ukuran yang sama"
 
-#: ../clutter/clutter-box-layout.c:1416
+#: ../clutter/clutter-box-layout.c:1396
 msgid "Pack Start"
 msgstr "Pak Awal"
 
-#: ../clutter/clutter-box-layout.c:1417
+#: ../clutter/clutter-box-layout.c:1397
 msgid "Whether to pack items at the start of the box"
 msgstr "Apakah mengepak butir-butir di awal kotak"
 
-#: ../clutter/clutter-box-layout.c:1430
+#: ../clutter/clutter-box-layout.c:1410
 msgid "Spacing"
 msgstr "Sela"
 
-#: ../clutter/clutter-box-layout.c:1431
+#: ../clutter/clutter-box-layout.c:1411
 msgid "Spacing between children"
 msgstr "Sela antar anak"
 
-#: ../clutter/clutter-box-layout.c:1448 ../clutter/clutter-table-layout.c:1675
+#: ../clutter/clutter-box-layout.c:1428
+#: ../clutter/deprecated/clutter-table-layout.c:1669
 msgid "Use Animations"
 msgstr "Gunakan Animasi"
 
-#: ../clutter/clutter-box-layout.c:1449 ../clutter/clutter-table-layout.c:1676
+#: ../clutter/clutter-box-layout.c:1429
+#: ../clutter/deprecated/clutter-table-layout.c:1670
 msgid "Whether layout changes should be animated"
 msgstr "Apakah perubahan tata letak mesti dianimasi"
 
-#: ../clutter/clutter-box-layout.c:1473 ../clutter/clutter-table-layout.c:1700
+#: ../clutter/clutter-box-layout.c:1453
+#: ../clutter/deprecated/clutter-table-layout.c:1694
 msgid "Easing Mode"
 msgstr "Moda Perpindahan"
 
-#: ../clutter/clutter-box-layout.c:1474 ../clutter/clutter-table-layout.c:1701
+#: ../clutter/clutter-box-layout.c:1454
+#: ../clutter/deprecated/clutter-table-layout.c:1695
 msgid "The easing mode of the animations"
 msgstr "Mode perpindahan dari animasi"
 
-#: ../clutter/clutter-box-layout.c:1494 ../clutter/clutter-table-layout.c:1721
+#: ../clutter/clutter-box-layout.c:1474
+#: ../clutter/deprecated/clutter-table-layout.c:1715
 msgid "Easing Duration"
 msgstr "Durasi perpindahan"
 
-#: ../clutter/clutter-box-layout.c:1495 ../clutter/clutter-table-layout.c:1722
+#: ../clutter/clutter-box-layout.c:1475
+#: ../clutter/deprecated/clutter-table-layout.c:1716
 msgid "The duration of the animations"
 msgstr "Durasi animasi"
 
@@ -914,14 +928,30 @@ msgstr "Kontras"
 msgid "The contrast change to apply"
 msgstr "Perubahan kontras yang akan diterapkan"
 
-#: ../clutter/clutter-canvas.c:216
+#: ../clutter/clutter-canvas.c:243
 msgid "The width of the canvas"
 msgstr "Lebar kanvas"
 
-#: ../clutter/clutter-canvas.c:232
+#: ../clutter/clutter-canvas.c:259
 msgid "The height of the canvas"
 msgstr "Tinggi kanvas"
 
+#: ../clutter/clutter-canvas.c:278
+msgid "Scale Factor Set"
+msgstr "Faktor Skala Ditata"
+
+#: ../clutter/clutter-canvas.c:279
+msgid "Whether the scale-factor property is set"
+msgstr "Apakah properti faktor skala telah ditetapkan"
+
+#: ../clutter/clutter-canvas.c:300
+msgid "Scale Factor"
+msgstr "Faktor Skala"
+
+#: ../clutter/clutter-canvas.c:301
+msgid "The scaling factor for the surface"
+msgstr "Fakto penskalaan bagi permukaan"
+
 #: ../clutter/clutter-child-meta.c:127
 msgid "Container"
 msgstr "Kontainer"
@@ -934,39 +964,39 @@ msgstr "Kontainer yang membuat data ini"
 msgid "The actor wrapped by this data"
 msgstr "Aktor yang dibungkus oleh data ini"
 
-#: ../clutter/clutter-click-action.c:546
+#: ../clutter/clutter-click-action.c:586
 msgid "Pressed"
 msgstr "Ditekan"
 
-#: ../clutter/clutter-click-action.c:547
+#: ../clutter/clutter-click-action.c:587
 msgid "Whether the clickable should be in pressed state"
 msgstr "Apakah yang-dapat-diklik mesti dalam keadaan ditekan"
 
-#: ../clutter/clutter-click-action.c:560
+#: ../clutter/clutter-click-action.c:600
 msgid "Held"
 msgstr "Ditahan"
 
-#: ../clutter/clutter-click-action.c:561
+#: ../clutter/clutter-click-action.c:601
 msgid "Whether the clickable has a grab"
 msgstr "Apakah yang-dapat-diklik memiliki penyeret"
 
-#: ../clutter/clutter-click-action.c:578 ../clutter/clutter-settings.c:599
+#: ../clutter/clutter-click-action.c:618 ../clutter/clutter-settings.c:651
 msgid "Long Press Duration"
 msgstr "Durasi Tekan Lama"
 
-#: ../clutter/clutter-click-action.c:579
+#: ../clutter/clutter-click-action.c:619
 msgid "The minimum duration of a long press to recognize the gesture"
 msgstr "Durasi minimum dari penakanan panjang untuk mengenali gestur"
 
-#: ../clutter/clutter-click-action.c:597
+#: ../clutter/clutter-click-action.c:637
 msgid "Long Press Threshold"
 msgstr "Ambang Tekan Lama"
 
-#: ../clutter/clutter-click-action.c:598
+#: ../clutter/clutter-click-action.c:638
 msgid "The maximum threshold before a long press is cancelled"
 msgstr "Ambang maksimum sebelum penekanan panjang dibatalkan"
 
-#: ../clutter/clutter-clone.c:346
+#: ../clutter/clutter-clone.c:342
 msgid "Specifies the actor to be cloned"
 msgstr "Nyatakan aktor yang akan digandakan"
 
@@ -978,27 +1008,27 @@ msgstr "Pewarnaan"
 msgid "The tint to apply"
 msgstr "Pewarnaan yang akan diterapkan"
 
-#: ../clutter/clutter-deform-effect.c:588
+#: ../clutter/clutter-deform-effect.c:591
 msgid "Horizontal Tiles"
 msgstr "Ubin Horisontal"
 
-#: ../clutter/clutter-deform-effect.c:589
+#: ../clutter/clutter-deform-effect.c:592
 msgid "The number of horizontal tiles"
 msgstr "Cacah ubin horisontal"
 
-#: ../clutter/clutter-deform-effect.c:604
+#: ../clutter/clutter-deform-effect.c:607
 msgid "Vertical Tiles"
 msgstr "Ubin Vertikal"
 
-#: ../clutter/clutter-deform-effect.c:605
+#: ../clutter/clutter-deform-effect.c:608
 msgid "The number of vertical tiles"
 msgstr "Cacah ubin vertikal"
 
-#: ../clutter/clutter-deform-effect.c:622
+#: ../clutter/clutter-deform-effect.c:625
 msgid "Back Material"
 msgstr "Material Belakang"
 
-#: ../clutter/clutter-deform-effect.c:623
+#: ../clutter/clutter-deform-effect.c:626
 msgid "The material to be used when painting the back of the actor"
 msgstr "Material yang dipakai ketika mengecat belakang aktor"
 
@@ -1006,258 +1036,296 @@ msgstr "Material yang dipakai ketika mengecat belakang aktor"
 msgid "The desaturation factor"
 msgstr "Faktor desaturasi"
 
-#: ../clutter/clutter-device-manager.c:131
-#: ../clutter/clutter-input-device.c:366
-#: ../clutter/x11/clutter-keymap-x11.c:316
+#: ../clutter/clutter-device-manager.c:127
+#: ../clutter/clutter-input-device.c:355
+#: ../clutter/x11/clutter-keymap-x11.c:457
 msgid "Backend"
 msgstr "Backend"
 
-#: ../clutter/clutter-device-manager.c:132
+#: ../clutter/clutter-device-manager.c:128
 msgid "The ClutterBackend of the device manager"
 msgstr "ClutterBackend dari manajer perangkat"
 
-#: ../clutter/clutter-drag-action.c:709
+#: ../clutter/clutter-drag-action.c:733
 msgid "Horizontal Drag Threshold"
 msgstr "Ambang Penyeretan Horisontal"
 
-#: ../clutter/clutter-drag-action.c:710
+#: ../clutter/clutter-drag-action.c:734
 msgid "The horizontal amount of pixels required to start dragging"
 msgstr "Banyaknya piksel horisontal yang diperlukan untuk memulai penyeretan"
 
-#: ../clutter/clutter-drag-action.c:737
+#: ../clutter/clutter-drag-action.c:761
 msgid "Vertical Drag Threshold"
 msgstr "Ambang Penyeretan Vertikal"
 
-#: ../clutter/clutter-drag-action.c:738
+#: ../clutter/clutter-drag-action.c:762
 msgid "The vertical amount of pixels required to start dragging"
 msgstr "Banyaknya piksel vertikal yang diperlukan untuk memulai penyeretan"
 
-#: ../clutter/clutter-drag-action.c:759
+#: ../clutter/clutter-drag-action.c:783
 msgid "Drag Handle"
 msgstr "Handel Penyeretan"
 
-#: ../clutter/clutter-drag-action.c:760
+#: ../clutter/clutter-drag-action.c:784
 msgid "The actor that is being dragged"
 msgstr "Aktor yang sedang diseret"
 
-#: ../clutter/clutter-drag-action.c:773
+#: ../clutter/clutter-drag-action.c:797
 msgid "Drag Axis"
 msgstr "Sumbu Seret"
 
-#: ../clutter/clutter-drag-action.c:774
+#: ../clutter/clutter-drag-action.c:798
 msgid "Constraints the dragging to an axis"
 msgstr "Batasi penyeretan ke suatu sumbu"
 
-#: ../clutter/clutter-drag-action.c:790
+#: ../clutter/clutter-drag-action.c:814
 msgid "Drag Area"
 msgstr "Area Seret"
 
-#: ../clutter/clutter-drag-action.c:791
+#: ../clutter/clutter-drag-action.c:815
 msgid "Constrains the dragging to a rectangle"
 msgstr "Membatasi penyeretan ke suatu persegi panjang"
 
-#: ../clutter/clutter-drag-action.c:804
+#: ../clutter/clutter-drag-action.c:828
 msgid "Drag Area Set"
 msgstr "Area Seret Ditata"
 
-#: ../clutter/clutter-drag-action.c:805
+#: ../clutter/clutter-drag-action.c:829
 msgid "Whether the drag area is set"
 msgstr "Apakah area penyeretan telah ditetapkan"
 
-#: ../clutter/clutter-flow-layout.c:907
+#: ../clutter/clutter-flow-layout.c:944
 msgid "Whether each item should receive the same allocation"
 msgstr "Apakah setiap butir mesti menerima alokasi yang sama"
 
-#: ../clutter/clutter-flow-layout.c:922 ../clutter/clutter-table-layout.c:1637
+#: ../clutter/clutter-flow-layout.c:959
+#: ../clutter/deprecated/clutter-table-layout.c:1629
 msgid "Column Spacing"
 msgstr "Sela Kolom"
 
-#: ../clutter/clutter-flow-layout.c:923
+#: ../clutter/clutter-flow-layout.c:960
 msgid "The spacing between columns"
 msgstr "Jarak sela antar kolom"
 
-#: ../clutter/clutter-flow-layout.c:939 ../clutter/clutter-table-layout.c:1651
+#: ../clutter/clutter-flow-layout.c:976
+#: ../clutter/deprecated/clutter-table-layout.c:1645
 msgid "Row Spacing"
 msgstr "Sela Baris"
 
-#: ../clutter/clutter-flow-layout.c:940
+#: ../clutter/clutter-flow-layout.c:977
 msgid "The spacing between rows"
 msgstr "Jarak sela antar baris"
 
-#: ../clutter/clutter-flow-layout.c:954
+#: ../clutter/clutter-flow-layout.c:991
 msgid "Minimum Column Width"
 msgstr "Lebar Kolom Minimum"
 
-#: ../clutter/clutter-flow-layout.c:955
+#: ../clutter/clutter-flow-layout.c:992
 msgid "Minimum width for each column"
 msgstr "Lebar minimum bagi setiap kolom"
 
-#: ../clutter/clutter-flow-layout.c:970
+#: ../clutter/clutter-flow-layout.c:1007
 msgid "Maximum Column Width"
 msgstr "Lebar Kolom Maksimum"
 
-#: ../clutter/clutter-flow-layout.c:971
+#: ../clutter/clutter-flow-layout.c:1008
 msgid "Maximum width for each column"
 msgstr "Lebar maksimum bagi setiap kolom"
 
-#: ../clutter/clutter-flow-layout.c:985
+#: ../clutter/clutter-flow-layout.c:1022
 msgid "Minimum Row Height"
 msgstr "Tinggi Baris Minimum"
 
-#: ../clutter/clutter-flow-layout.c:986
+#: ../clutter/clutter-flow-layout.c:1023
 msgid "Minimum height for each row"
 msgstr "Tinggi minimum bagi setiap baris"
 
-#: ../clutter/clutter-flow-layout.c:1001
+#: ../clutter/clutter-flow-layout.c:1038
 msgid "Maximum Row Height"
 msgstr "Tinggi Baris Maksimum"
 
-#: ../clutter/clutter-flow-layout.c:1002
+#: ../clutter/clutter-flow-layout.c:1039
 msgid "Maximum height for each row"
 msgstr "Tinggi maksimum bagi setiap baris"
 
-#: ../clutter/clutter-grid-layout.c:1222
+#: ../clutter/clutter-flow-layout.c:1054 ../clutter/clutter-flow-layout.c:1055
+msgid "Snap to grid"
+msgstr "Melekat ke kisi"
+
+#: ../clutter/clutter-gesture-action.c:668
+msgid "Number touch points"
+msgstr "Cacah titik sentuh"
+
+#: ../clutter/clutter-gesture-action.c:669
+msgid "Number of touch points"
+msgstr "Banyaknya titik sentuh"
+
+#: ../clutter/clutter-gesture-action.c:684
+msgid "Threshold Trigger Edge"
+msgstr "Ambang Picu Tepi"
+
+#: ../clutter/clutter-gesture-action.c:685
+msgid "The trigger edge used by the action"
+msgstr "Picu tepi yang dipakai oleh aksi"
+
+#: ../clutter/clutter-gesture-action.c:704
+msgid "Threshold Trigger Horizontal Distance"
+msgstr "Jarak Horisontal Ambang Picu"
+
+#: ../clutter/clutter-gesture-action.c:705
+msgid "The horizontal trigger distance used by the action"
+msgstr "Jarak picu horisontal yang dipakai oleh aksi"
+
+#: ../clutter/clutter-gesture-action.c:723
+msgid "Threshold Trigger Vertical Distance"
+msgstr "Jarak Vertikal Ambang Picu"
+
+#: ../clutter/clutter-gesture-action.c:724
+msgid "The vertical trigger distance used by the action"
+msgstr "Jarak picu vertikal yang dipakai oleh aksi"
+
+#: ../clutter/clutter-grid-layout.c:1223
 msgid "Left attachment"
 msgstr "Cantolan kiri"
 
-#: ../clutter/clutter-grid-layout.c:1223
+#: ../clutter/clutter-grid-layout.c:1224
 msgid "The column number to attach the left side of the child to"
 msgstr "Nomor kolom tempat mencantolkan ke sisi kiri anak"
 
-#: ../clutter/clutter-grid-layout.c:1230
+#: ../clutter/clutter-grid-layout.c:1231
 msgid "Top attachment"
 msgstr "Cantolan puncah"
 
-#: ../clutter/clutter-grid-layout.c:1231
+#: ../clutter/clutter-grid-layout.c:1232
 msgid "The row number to attach the top side of a child widget to"
 msgstr "Nomor baris tempat mencantolkan ke sisi puncak widget anak"
 
-#: ../clutter/clutter-grid-layout.c:1239
+#: ../clutter/clutter-grid-layout.c:1240
 msgid "The number of columns that a child spans"
 msgstr "Cacah kolom yang mesti dicakup anak"
 
-#: ../clutter/clutter-grid-layout.c:1246
+#: ../clutter/clutter-grid-layout.c:1247
 msgid "The number of rows that a child spans"
 msgstr "Cacah baris yang mesti dicakup anak"
 
-#: ../clutter/clutter-grid-layout.c:1562
+#: ../clutter/clutter-grid-layout.c:1564
 msgid "Row spacing"
 msgstr "Sela baris"
 
-#: ../clutter/clutter-grid-layout.c:1563
+#: ../clutter/clutter-grid-layout.c:1565
 msgid "The amount of space between two consecutive rows"
 msgstr "Banyaknya ruang di antara dua baris berturutan"
 
-#: ../clutter/clutter-grid-layout.c:1576
+#: ../clutter/clutter-grid-layout.c:1578
 msgid "Column spacing"
 msgstr "Sela Kolom"
 
-#: ../clutter/clutter-grid-layout.c:1577
+#: ../clutter/clutter-grid-layout.c:1579
 msgid "The amount of space between two consecutive columns"
 msgstr "Banyaknya ruang di antara dua kolom berturutan"
 
-#: ../clutter/clutter-grid-layout.c:1591
+#: ../clutter/clutter-grid-layout.c:1593
 msgid "Row Homogeneous"
 msgstr "Baris Homogen"
 
-#: ../clutter/clutter-grid-layout.c:1592
+#: ../clutter/clutter-grid-layout.c:1594
 msgid "If TRUE, the rows are all the same height"
 msgstr "Bila TRUE, semua baris sama tinggi"
 
-#: ../clutter/clutter-grid-layout.c:1605
+#: ../clutter/clutter-grid-layout.c:1607
 msgid "Column Homogeneous"
 msgstr "Kolom Homogen"
 
-#: ../clutter/clutter-grid-layout.c:1606
+#: ../clutter/clutter-grid-layout.c:1608
 msgid "If TRUE, the columns are all the same width"
 msgstr "Bila TRUE, semua kolom sama lebar"
 
-#: ../clutter/clutter-image.c:248 ../clutter/clutter-image.c:311
-#: ../clutter/clutter-image.c:399
+#: ../clutter/clutter-image.c:246 ../clutter/clutter-image.c:309
+#: ../clutter/clutter-image.c:397
 msgid "Unable to load image data"
 msgstr "Tak bisa memuat data gambar"
 
-#: ../clutter/clutter-input-device.c:242
+#: ../clutter/clutter-input-device.c:231
 msgid "Id"
 msgstr "Id"
 
-#: ../clutter/clutter-input-device.c:243
+#: ../clutter/clutter-input-device.c:232
 msgid "Unique identifier of the device"
 msgstr "Identifier unik dari perangkat"
 
-#: ../clutter/clutter-input-device.c:259
+#: ../clutter/clutter-input-device.c:248
 msgid "The name of the device"
 msgstr "Nama perangkat"
 
-#: ../clutter/clutter-input-device.c:273
+#: ../clutter/clutter-input-device.c:262
 msgid "Device Type"
 msgstr "Jenis Perangkat"
 
-#: ../clutter/clutter-input-device.c:274
+#: ../clutter/clutter-input-device.c:263
 msgid "The type of the device"
 msgstr "Jenis perangkat"
 
-#: ../clutter/clutter-input-device.c:289
+#: ../clutter/clutter-input-device.c:278
 msgid "Device Manager"
 msgstr "Manajer Perangkat"
 
-#: ../clutter/clutter-input-device.c:290
+#: ../clutter/clutter-input-device.c:279
 msgid "The device manager instance"
 msgstr "Instansi manajer perangkat"
 
-#: ../clutter/clutter-input-device.c:303
+#: ../clutter/clutter-input-device.c:292
 msgid "Device Mode"
 msgstr "Moda Perangkat"
 
-#: ../clutter/clutter-input-device.c:304
+#: ../clutter/clutter-input-device.c:293
 msgid "The mode of the device"
 msgstr "Mode dari perangkat"
 
-#: ../clutter/clutter-input-device.c:318
+#: ../clutter/clutter-input-device.c:307
 msgid "Has Cursor"
 msgstr "Punya Kursor"
 
-#: ../clutter/clutter-input-device.c:319
+#: ../clutter/clutter-input-device.c:308
 msgid "Whether the device has a cursor"
 msgstr "Apakah perangkat memiliki kursor"
 
-#: ../clutter/clutter-input-device.c:338
+#: ../clutter/clutter-input-device.c:327
 msgid "Whether the device is enabled"
 msgstr "Apakah perangkat diaktifkan"
 
-#: ../clutter/clutter-input-device.c:351
+#: ../clutter/clutter-input-device.c:340
 msgid "Number of Axes"
 msgstr "Cacah Sumbu"
 
-#: ../clutter/clutter-input-device.c:352
+#: ../clutter/clutter-input-device.c:341
 msgid "The number of axes on the device"
 msgstr "Cacah sumbu pada perangkat"
 
-#: ../clutter/clutter-input-device.c:367
+#: ../clutter/clutter-input-device.c:356
 msgid "The backend instance"
 msgstr "Instansi backend"
 
-#: ../clutter/clutter-interval.c:506
+#: ../clutter/clutter-interval.c:557
 msgid "Value Type"
 msgstr "Jenis Nilai"
 
-#: ../clutter/clutter-interval.c:507
+#: ../clutter/clutter-interval.c:558
 msgid "The type of the values in the interval"
 msgstr "Jenis nilai dalam interval"
 
-#: ../clutter/clutter-interval.c:522
+#: ../clutter/clutter-interval.c:573
 msgid "Initial Value"
 msgstr "Nilai Awal"
 
-#: ../clutter/clutter-interval.c:523
+#: ../clutter/clutter-interval.c:574
 msgid "Initial value of the interval"
 msgstr "Nilai awal dari interval"
 
-#: ../clutter/clutter-interval.c:537
+#: ../clutter/clutter-interval.c:588
 msgid "Final Value"
 msgstr "Nilai Akhir"
 
-#: ../clutter/clutter-interval.c:538
+#: ../clutter/clutter-interval.c:589
 msgid "Final value of the interval"
 msgstr "Nilai akhir dari interval"
 
@@ -1276,96 +1344,96 @@ msgstr "Manajer yang membuat data ini"
 #. * Do NOT translate it to non-English e.g. "predefinito:LTR"! If
 #. * it isn't default:LTR or default:RTL it will not work.
 #.
-#: ../clutter/clutter-main.c:762
+#: ../clutter/clutter-main.c:751
 msgid "default:LTR"
 msgstr "default:LTR"
 
-#: ../clutter/clutter-main.c:1633
+#: ../clutter/clutter-main.c:1578
 msgid "Show frames per second"
 msgstr "Tampilkan frame per detik"
 
-#: ../clutter/clutter-main.c:1635
+#: ../clutter/clutter-main.c:1580
 msgid "Default frame rate"
 msgstr "Laju frame baku"
 
-#: ../clutter/clutter-main.c:1637
+#: ../clutter/clutter-main.c:1582
 msgid "Make all warnings fatal"
 msgstr "Jadikan semua peringatan dianggap fatal"
 
-#: ../clutter/clutter-main.c:1640
+#: ../clutter/clutter-main.c:1585
 msgid "Direction for the text"
 msgstr "Arah teks"
 
-#: ../clutter/clutter-main.c:1643
+#: ../clutter/clutter-main.c:1588
 msgid "Disable mipmapping on text"
 msgstr "Matikan mipmap pada teks"
 
-#: ../clutter/clutter-main.c:1646
+#: ../clutter/clutter-main.c:1591
 msgid "Use 'fuzzy' picking"
 msgstr "Gunakan pemetikan fuzzy"
 
-#: ../clutter/clutter-main.c:1649
+#: ../clutter/clutter-main.c:1594
 msgid "Clutter debugging flags to set"
 msgstr "Flag pengawakutuan Clutter yang akan ditata"
 
-#: ../clutter/clutter-main.c:1651
+#: ../clutter/clutter-main.c:1596
 msgid "Clutter debugging flags to unset"
 msgstr "Flag pengawakutuan yang akan dibebaskan"
 
-#: ../clutter/clutter-main.c:1655
+#: ../clutter/clutter-main.c:1600
 msgid "Clutter profiling flags to set"
 msgstr "Flag pemrofilan Clutter yang akan ditata"
 
-#: ../clutter/clutter-main.c:1657
+#: ../clutter/clutter-main.c:1602
 msgid "Clutter profiling flags to unset"
 msgstr "Flag pemrofilan Clutter yang akan dibebaskan"
 
-#: ../clutter/clutter-main.c:1660
+#: ../clutter/clutter-main.c:1605
 msgid "Enable accessibility"
 msgstr "Aktifkan aksesibilitas"
 
-#: ../clutter/clutter-main.c:1852
+#: ../clutter/clutter-main.c:1797
 msgid "Clutter Options"
 msgstr "Opsi Clutter"
 
-#: ../clutter/clutter-main.c:1853
+#: ../clutter/clutter-main.c:1798
 msgid "Show Clutter Options"
 msgstr "Tampilkan Opsi Clutter"
 
-#: ../clutter/clutter-pan-action.c:440
+#: ../clutter/clutter-pan-action.c:455
 msgid "Pan Axis"
 msgstr "Sumbu Seret"
 
-#: ../clutter/clutter-pan-action.c:441
+#: ../clutter/clutter-pan-action.c:456
 msgid "Constraints the panning to an axis"
 msgstr "Membatasi penyeretan pada sumbu"
 
-#: ../clutter/clutter-pan-action.c:455
+#: ../clutter/clutter-pan-action.c:470
 msgid "Interpolate"
 msgstr "Interpolasi"
 
-#: ../clutter/clutter-pan-action.c:456
+#: ../clutter/clutter-pan-action.c:471
 msgid "Whether interpolated events emission is enabled."
 msgstr "Apakah emisi interpolasi diaktifkan."
 
-#: ../clutter/clutter-pan-action.c:472
+#: ../clutter/clutter-pan-action.c:487
 msgid "Deceleration"
 msgstr "Deselerasi"
 
-#: ../clutter/clutter-pan-action.c:473
+#: ../clutter/clutter-pan-action.c:488
 msgid "Rate at which the interpolated panning will decelerate in"
 msgstr "Pada tingkatan apa penyeretan yang diinterpolasi mengalami deselerasi"
 
-#: ../clutter/clutter-pan-action.c:490
+#: ../clutter/clutter-pan-action.c:505
 msgid "Initial acceleration factor"
 msgstr "Faktor akselerasi awal"
 
-#: ../clutter/clutter-pan-action.c:491
+#: ../clutter/clutter-pan-action.c:506
 msgid "Factor applied to the momentum when starting the interpolated phase"
 msgstr "Faktor yang diterapkan pada momentum saat memulai fase interpolasi"
 
 #: ../clutter/clutter-path-constraint.c:212
-#: ../clutter/deprecated/clutter-behaviour-path.c:225
+#: ../clutter/deprecated/clutter-behaviour-path.c:221
 msgid "Path"
 msgstr "Path"
 
@@ -1377,85 +1445,85 @@ msgstr "Path yang dipakai untuk membatasi aktor"
 msgid "The offset along the path, between -1.0 and 2.0"
 msgstr "Ofset sepanjang path, antara -1.0 dan 2.0"
 
-#: ../clutter/clutter-property-transition.c:271
+#: ../clutter/clutter-property-transition.c:269
 msgid "Property Name"
 msgstr "Nama Properti"
 
-#: ../clutter/clutter-property-transition.c:272
+#: ../clutter/clutter-property-transition.c:270
 msgid "The name of the property to animate"
 msgstr "Nama properti yang akan dianimasi"
 
-#: ../clutter/clutter-script.c:466
+#: ../clutter/clutter-script.c:464
 msgid "Filename Set"
 msgstr "Nama Berkas Ditata"
 
-#: ../clutter/clutter-script.c:467
+#: ../clutter/clutter-script.c:465
 msgid "Whether the :filename property is set"
 msgstr "Apakah properti :filename ditata"
 
-#: ../clutter/clutter-script.c:481
-#: ../clutter/deprecated/clutter-texture.c:1082
+#: ../clutter/clutter-script.c:479
+#: ../clutter/deprecated/clutter-texture.c:1080
 msgid "Filename"
 msgstr "Nama Berkas"
 
-#: ../clutter/clutter-script.c:482
+#: ../clutter/clutter-script.c:480
 msgid "The path of the currently parsed file"
 msgstr "Path dari berkas yang sedang diurai"
 
-#: ../clutter/clutter-script.c:499
+#: ../clutter/clutter-script.c:497
 msgid "Translation Domain"
 msgstr "Ranah Penerjemahan"
 
-#: ../clutter/clutter-script.c:500
+#: ../clutter/clutter-script.c:498
 msgid "The translation domain used to localize string"
 msgstr "Ranah penerjemahan yang dipakai untuk melokalkan kalimat"
 
-#: ../clutter/clutter-scroll-actor.c:263
+#: ../clutter/clutter-scroll-actor.c:184
 msgid "Scroll Mode"
 msgstr "Mode Penggulungan"
 
-#: ../clutter/clutter-scroll-actor.c:264
+#: ../clutter/clutter-scroll-actor.c:185
 msgid "The scrolling direction"
 msgstr "Arah penggulungan"
 
-#: ../clutter/clutter-settings.c:440
+#: ../clutter/clutter-settings.c:486
 msgid "Double Click Time"
 msgstr "Waktu Klik Ganda"
 
-#: ../clutter/clutter-settings.c:441
+#: ../clutter/clutter-settings.c:487
 msgid "The time between clicks necessary to detect a multiple click"
 msgstr "Waktu antar klik yang diperlukan untuk mendeteksi klik berganda"
 
-#: ../clutter/clutter-settings.c:456
+#: ../clutter/clutter-settings.c:502
 msgid "Double Click Distance"
 msgstr "Jarak Klik Ganda"
 
-#: ../clutter/clutter-settings.c:457
+#: ../clutter/clutter-settings.c:503
 msgid "The distance between clicks necessary to detect a multiple click"
 msgstr "Jarak antar klik yang diperlukan untuk mendeteksi klik berganda"
 
-#: ../clutter/clutter-settings.c:472
+#: ../clutter/clutter-settings.c:518
 msgid "Drag Threshold"
 msgstr "Ambang Penyeretan"
 
-#: ../clutter/clutter-settings.c:473
+#: ../clutter/clutter-settings.c:519
 msgid "The distance the cursor should travel before starting to drag"
 msgstr "Jarak yang mesti ditempuh kursor sebelum memulai penyeretan"
 
-#: ../clutter/clutter-settings.c:488 ../clutter/clutter-text.c:3368
+#: ../clutter/clutter-settings.c:534 ../clutter/clutter-text.c:3437
 msgid "Font Name"
 msgstr "Nama Fonta"
 
-#: ../clutter/clutter-settings.c:489
+#: ../clutter/clutter-settings.c:535
 msgid ""
 "The description of the default font, as one that could be parsed by Pango"
 msgstr "Keterangan atas fonta baku, dalam bentuk yang dapat diurai oleh Pango"
 
-#: ../clutter/clutter-settings.c:504
+#: ../clutter/clutter-settings.c:550
 msgid "Font Antialias"
 msgstr "Antialias Fonta"
 
-#: ../clutter/clutter-settings.c:505
+#: ../clutter/clutter-settings.c:551
 msgid ""
 "Whether to use antialiasing (1 to enable, 0 to disable, and -1 to use the "
 "default)"
@@ -1463,69 +1531,77 @@ msgstr ""
 "Apakah memakai antialias (1 untuk aktifkan, 0 untuk matikan, dan -1 untuk "
 "memakai nilai baku)"
 
-#: ../clutter/clutter-settings.c:521
+#: ../clutter/clutter-settings.c:567 ../clutter/clutter-settings.c:575
 msgid "Font DPI"
 msgstr "DPI Fonta"
 
-#: ../clutter/clutter-settings.c:522
+#: ../clutter/clutter-settings.c:568 ../clutter/clutter-settings.c:576
 msgid ""
 "The resolution of the font, in 1024 * dots/inch, or -1 to use the default"
 msgstr ""
 "Resolusi fonta, dalam 1024 * dot/inci, atau -1 untuk memakai nilai baku"
 
-#: ../clutter/clutter-settings.c:538
+#: ../clutter/clutter-settings.c:592
 msgid "Font Hinting"
 msgstr "Hint Fonta"
 
-#: ../clutter/clutter-settings.c:539
+#: ../clutter/clutter-settings.c:593
 msgid ""
 "Whether to use hinting (1 to enable, 0 to disable and -1 to use the default)"
 msgstr ""
 "Apakah memakai hint (1 untuk mengaktifkan, 0 untuk mematikan, dan -1 untuk "
 "memakai nilai baku)"
 
-#: ../clutter/clutter-settings.c:560
+#: ../clutter/clutter-settings.c:613
 msgid "Font Hint Style"
 msgstr "Gaya Hint Fonta"
 
-#: ../clutter/clutter-settings.c:561
+#: ../clutter/clutter-settings.c:614
 msgid "The style of hinting (hintnone, hintslight, hintmedium, hintfull)"
 msgstr "Gaya hint (hintnone, hintslight, hintmedium, hintfull)"
 
-#: ../clutter/clutter-settings.c:582
+#: ../clutter/clutter-settings.c:634
 msgid "Font Subpixel Order"
 msgstr "Urutan Subpiksel Fonta"
 
-#: ../clutter/clutter-settings.c:583
+#: ../clutter/clutter-settings.c:635
 msgid "The type of subpixel antialiasing (none, rgb, bgr, vrgb, vbgr)"
 msgstr "Jenis antialias subpiksel (none, rgb, bgt, vrgb, vbgr)"
 
-#: ../clutter/clutter-settings.c:600
+#: ../clutter/clutter-settings.c:652
 msgid "The minimum duration for a long press gesture to be recognized"
 msgstr "Durasi minimum bagi gestur penekanan panjang untuk dikenali"
 
-#: ../clutter/clutter-settings.c:607
+#: ../clutter/clutter-settings.c:659
+msgid "Window Scaling Factor"
+msgstr "Fakto Skala Jendela"
+
+#: ../clutter/clutter-settings.c:660
+msgid "The scaling factor to be applied to windows"
+msgstr "Faktor penskalaan yang akan diterapkan ke jendela"
+
+#: ../clutter/clutter-settings.c:667
 msgid "Fontconfig configuration timestamp"
 msgstr "Penanda waktu konfigurasi fontconfig"
 
-#: ../clutter/clutter-settings.c:608
+#: ../clutter/clutter-settings.c:668
 msgid "Timestamp of the current fontconfig configuration"
 msgstr "Penanda waktu dari konfigurasi fontconfig kini"
 
-#: ../clutter/clutter-settings.c:625
+#: ../clutter/clutter-settings.c:685
 msgid "Password Hint Time"
 msgstr "Waktu Petunjuk Sandi"
 
-#: ../clutter/clutter-settings.c:626
+#: ../clutter/clutter-settings.c:686
 msgid "How long to show the last input character in hidden entries"
 msgstr ""
 "Berapa lama menampilkan karakter masukan terakhir dalam entri tersembunyi"
 
-#: ../clutter/clutter-shader-effect.c:486
+#: ../clutter/clutter-shader-effect.c:487
 msgid "Shader Type"
 msgstr "Jenis Shader"
 
-#: ../clutter/clutter-shader-effect.c:487
+#: ../clutter/clutter-shader-effect.c:488
 msgid "The type of shader used"
 msgstr "Jenis shader yang digunakan"
 
@@ -1553,760 +1629,704 @@ msgstr "Tepi sumber yang mesti ditempelkan"
 msgid "The offset in pixels to apply to the constraint"
 msgstr "Ofset dalam piksel untuk diterapkan pada kendala"
 
-#: ../clutter/clutter-stage.c:1895
+#: ../clutter/clutter-stage.c:1918
 msgid "Fullscreen Set"
 msgstr "Ditata Layar Penuh"
 
-#: ../clutter/clutter-stage.c:1896
+#: ../clutter/clutter-stage.c:1919
 msgid "Whether the main stage is fullscreen"
 msgstr "Apakah pentas utama diluar layar"
 
-#: ../clutter/clutter-stage.c:1910
+#: ../clutter/clutter-stage.c:1933
 msgid "Offscreen"
 msgstr "Diluar Layar"
 
-#: ../clutter/clutter-stage.c:1911
+#: ../clutter/clutter-stage.c:1934
 msgid "Whether the main stage should be rendered offscreen"
 msgstr "Apakah pentas utama mesti dirender diluar layar"
 
-#: ../clutter/clutter-stage.c:1923 ../clutter/clutter-text.c:3482
+#: ../clutter/clutter-stage.c:1946 ../clutter/clutter-text.c:3551
 msgid "Cursor Visible"
 msgstr "Kursor Nampak"
 
-#: ../clutter/clutter-stage.c:1924
+#: ../clutter/clutter-stage.c:1947
 msgid "Whether the mouse pointer is visible on the main stage"
 msgstr "Apakah penunjuk tetikus nampak pada pentas utama"
 
-#: ../clutter/clutter-stage.c:1938
+#: ../clutter/clutter-stage.c:1961
 msgid "User Resizable"
 msgstr "Pengguna Dapat Mengubah Ukuran"
 
-#: ../clutter/clutter-stage.c:1939
+#: ../clutter/clutter-stage.c:1962
 msgid "Whether the stage is able to be resized via user interaction"
 msgstr "Apakah pentas dapat diubah ukurannya melalui interaksi pengguna"
 
-#: ../clutter/clutter-stage.c:1954 ../clutter/deprecated/clutter-box.c:260
-#: ../clutter/deprecated/clutter-rectangle.c:273
+#: ../clutter/clutter-stage.c:1977 ../clutter/deprecated/clutter-box.c:254
+#: ../clutter/deprecated/clutter-rectangle.c:270
 msgid "Color"
 msgstr "Warna"
 
-#: ../clutter/clutter-stage.c:1955
+#: ../clutter/clutter-stage.c:1978
 msgid "The color of the stage"
 msgstr "Warna pentas"
 
-#: ../clutter/clutter-stage.c:1970
+#: ../clutter/clutter-stage.c:1993
 msgid "Perspective"
 msgstr "Perspektif"
 
-#: ../clutter/clutter-stage.c:1971
+#: ../clutter/clutter-stage.c:1994
 msgid "Perspective projection parameters"
-msgstr "Parameter projeksi perspektif"
+msgstr "Parameter proyeksi perspektif"
 
-#: ../clutter/clutter-stage.c:1986
+#: ../clutter/clutter-stage.c:2009
 msgid "Title"
 msgstr "Judul"
 
-#: ../clutter/clutter-stage.c:1987
+#: ../clutter/clutter-stage.c:2010
 msgid "Stage Title"
 msgstr "Judul Pentas"
 
-#: ../clutter/clutter-stage.c:2004
+#: ../clutter/clutter-stage.c:2027
 msgid "Use Fog"
 msgstr "Gunakan Kabut"
 
-#: ../clutter/clutter-stage.c:2005
+#: ../clutter/clutter-stage.c:2028
 msgid "Whether to enable depth cueing"
 msgstr "Apakah mengaktifkan depth cueing"
 
-#: ../clutter/clutter-stage.c:2021
+#: ../clutter/clutter-stage.c:2044
 msgid "Fog"
 msgstr "Kabut"
 
-#: ../clutter/clutter-stage.c:2022
+#: ../clutter/clutter-stage.c:2045
 msgid "Settings for the depth cueing"
 msgstr "Pengaturan bagi depth cueing"
 
-#: ../clutter/clutter-stage.c:2038
+#: ../clutter/clutter-stage.c:2061
 msgid "Use Alpha"
 msgstr "Gunakan Alfa"
 
-#: ../clutter/clutter-stage.c:2039
+#: ../clutter/clutter-stage.c:2062
 msgid "Whether to honour the alpha component of the stage color"
 msgstr "Apakah menghormati komponen alfa dari warna pentas"
 
-#: ../clutter/clutter-stage.c:2055
+#: ../clutter/clutter-stage.c:2078
 msgid "Key Focus"
 msgstr "Fokus Tombol"
 
-#: ../clutter/clutter-stage.c:2056
+#: ../clutter/clutter-stage.c:2079
 msgid "The currently key focused actor"
 msgstr "Aktur yang kini mendapat fokus tombol"
 
-#: ../clutter/clutter-stage.c:2072
+#: ../clutter/clutter-stage.c:2095
 msgid "No Clear Hint"
 msgstr "Tanpa Hint Pembersihan"
 
-#: ../clutter/clutter-stage.c:2073
+#: ../clutter/clutter-stage.c:2096
 msgid "Whether the stage should clear its contents"
 msgstr "Apakah pentas mesti membersihkan isinya"
 
-#: ../clutter/clutter-stage.c:2086
+#: ../clutter/clutter-stage.c:2109
 msgid "Accept Focus"
 msgstr "Terima Fokus"
 
-#: ../clutter/clutter-stage.c:2087
+#: ../clutter/clutter-stage.c:2110
 msgid "Whether the stage should accept focus on show"
 msgstr "Apakah pentas mesti menerima fokus saat ditampilkan"
 
-#: ../clutter/clutter-table-layout.c:543
-msgid "Column Number"
-msgstr "Nomor Kolom"
-
-#: ../clutter/clutter-table-layout.c:544
-msgid "The column the widget resides in"
-msgstr "Nomor kolom tempat widget berada"
-
-#: ../clutter/clutter-table-layout.c:551
-msgid "Row Number"
-msgstr "Nomor Baris"
-
-#: ../clutter/clutter-table-layout.c:552
-msgid "The row the widget resides in"
-msgstr "Nomor baris tempat widget berada"
-
-#: ../clutter/clutter-table-layout.c:559
-msgid "Column Span"
-msgstr "Rentang Kolom"
-
-#: ../clutter/clutter-table-layout.c:560
-msgid "The number of columns the widget should span"
-msgstr "Cacah kolom yang mesti dicakup widget"
-
-#: ../clutter/clutter-table-layout.c:567
-msgid "Row Span"
-msgstr "Rentang Baris"
-
-#: ../clutter/clutter-table-layout.c:568
-msgid "The number of rows the widget should span"
-msgstr "Cacah baris yang mesti dicakup widget"
-
-#: ../clutter/clutter-table-layout.c:575
-msgid "Horizontal Expand"
-msgstr "Mengembang Horisontal"
-
-#: ../clutter/clutter-table-layout.c:576
-msgid "Allocate extra space for the child in horizontal axis"
-msgstr "Alokasikan ruang ekstra bagi anak di sumbu horisontal"
-
-#: ../clutter/clutter-table-layout.c:582
-msgid "Vertical Expand"
-msgstr "Mengembang Vertikal"
-
-#: ../clutter/clutter-table-layout.c:583
-msgid "Allocate extra space for the child in vertical axis"
-msgstr "Alokasikan ruang ekstra bagi anak di sumbu vertikal"
-
-#: ../clutter/clutter-table-layout.c:1638
-msgid "Spacing between columns"
-msgstr "Ruang sela antar kolom"
-
-#: ../clutter/clutter-table-layout.c:1652
-msgid "Spacing between rows"
-msgstr "Ruang sela antar baris"
-
-#: ../clutter/clutter-text-buffer.c:351 ../clutter/clutter-text.c:3403
+#: ../clutter/clutter-text-buffer.c:347 ../clutter/clutter-text.c:3472
 msgid "Text"
 msgstr "Teks"
 
-#: ../clutter/clutter-text-buffer.c:352
+#: ../clutter/clutter-text-buffer.c:348
 msgid "The contents of the buffer"
 msgstr "Isi penyangga"
 
-#: ../clutter/clutter-text-buffer.c:365
+#: ../clutter/clutter-text-buffer.c:361
 msgid "Text length"
 msgstr "Panjang teks"
 
-#: ../clutter/clutter-text-buffer.c:366
+#: ../clutter/clutter-text-buffer.c:362
 msgid "Length of the text currently in the buffer"
 msgstr "Path dari teks yang kini sedang di penyangga"
 
-#: ../clutter/clutter-text-buffer.c:379
+#: ../clutter/clutter-text-buffer.c:375
 msgid "Maximum length"
 msgstr "Panjang maksimum"
 
-#: ../clutter/clutter-text-buffer.c:380
+#: ../clutter/clutter-text-buffer.c:376
 msgid "Maximum number of characters for this entry. Zero if no maximum"
 msgstr "Cacah maksimum karakter bagi entri ini. Nol bila tanpa maksimum"
 
-#: ../clutter/clutter-text.c:3350
+#: ../clutter/clutter-text.c:3419
 msgid "Buffer"
 msgstr "Penyangga"
 
-#: ../clutter/clutter-text.c:3351
+#: ../clutter/clutter-text.c:3420
 msgid "The buffer for the text"
 msgstr "Penyangga bagi teks"
 
-#: ../clutter/clutter-text.c:3369
+#: ../clutter/clutter-text.c:3438
 msgid "The font to be used by the text"
 msgstr "Fonta yang akan dipakai oleh teks"
 
-#: ../clutter/clutter-text.c:3386
+#: ../clutter/clutter-text.c:3455
 msgid "Font Description"
 msgstr "Keterangan Fonta"
 
-#: ../clutter/clutter-text.c:3387
+#: ../clutter/clutter-text.c:3456
 msgid "The font description to be used"
 msgstr "Keterangan fonta untuk dipakai"
 
-#: ../clutter/clutter-text.c:3404
+#: ../clutter/clutter-text.c:3473
 msgid "The text to render"
 msgstr "Teks untuk dirender"
 
-#: ../clutter/clutter-text.c:3418
+#: ../clutter/clutter-text.c:3487
 msgid "Font Color"
 msgstr "Warna Fonta"
 
-#: ../clutter/clutter-text.c:3419
+#: ../clutter/clutter-text.c:3488
 msgid "Color of the font used by the text"
 msgstr "Warna fonta yang akan dipakai oleh teks"
 
-#: ../clutter/clutter-text.c:3434
+#: ../clutter/clutter-text.c:3503
 msgid "Editable"
 msgstr "Dapat disunting"
 
-#: ../clutter/clutter-text.c:3435
+#: ../clutter/clutter-text.c:3504
 msgid "Whether the text is editable"
 msgstr "Apakah teks dapat disunting"
 
-#: ../clutter/clutter-text.c:3450
+#: ../clutter/clutter-text.c:3519
 msgid "Selectable"
 msgstr "Dapat dipilih"
 
-#: ../clutter/clutter-text.c:3451
+#: ../clutter/clutter-text.c:3520
 msgid "Whether the text is selectable"
 msgstr "Apakah teks dapat dipilih"
 
-#: ../clutter/clutter-text.c:3465
+#: ../clutter/clutter-text.c:3534
 msgid "Activatable"
 msgstr "Dapat diaktifkan"
 
-#: ../clutter/clutter-text.c:3466
+#: ../clutter/clutter-text.c:3535
 msgid "Whether pressing return causes the activate signal to be emitted"
 msgstr "Apakah menekan return menyebabkan sinyal aktifkan dipancarkan"
 
-#: ../clutter/clutter-text.c:3483
+#: ../clutter/clutter-text.c:3552
 msgid "Whether the input cursor is visible"
 msgstr "Apakah kursor masukan nampak"
 
-#: ../clutter/clutter-text.c:3497 ../clutter/clutter-text.c:3498
+#: ../clutter/clutter-text.c:3566 ../clutter/clutter-text.c:3567
 msgid "Cursor Color"
 msgstr "Warna Kursor"
 
-#: ../clutter/clutter-text.c:3513
+#: ../clutter/clutter-text.c:3582
 msgid "Cursor Color Set"
 msgstr "Warna Kursor Ditata"
 
-#: ../clutter/clutter-text.c:3514
+#: ../clutter/clutter-text.c:3583
 msgid "Whether the cursor color has been set"
 msgstr "Apakah warna kursor telah ditata"
 
-#: ../clutter/clutter-text.c:3529
+#: ../clutter/clutter-text.c:3598
 msgid "Cursor Size"
 msgstr "Ukuran Kursor"
 
-#: ../clutter/clutter-text.c:3530
+#: ../clutter/clutter-text.c:3599
 msgid "The width of the cursor, in pixels"
 msgstr "Lebar kursor, dalam piksel"
 
-#: ../clutter/clutter-text.c:3546 ../clutter/clutter-text.c:3564
+#: ../clutter/clutter-text.c:3615 ../clutter/clutter-text.c:3633
 msgid "Cursor Position"
 msgstr "Posisi Kursor"
 
-#: ../clutter/clutter-text.c:3547 ../clutter/clutter-text.c:3565
+#: ../clutter/clutter-text.c:3616 ../clutter/clutter-text.c:3634
 msgid "The cursor position"
 msgstr "Posisi kursor"
 
-#: ../clutter/clutter-text.c:3580
+#: ../clutter/clutter-text.c:3649
 msgid "Selection-bound"
 msgstr "Batas-pemilihan"
 
-#: ../clutter/clutter-text.c:3581
+#: ../clutter/clutter-text.c:3650
 msgid "The cursor position of the other end of the selection"
 msgstr "Posisi kursor dari ujung lain seleksi"
 
-#: ../clutter/clutter-text.c:3596 ../clutter/clutter-text.c:3597
+#: ../clutter/clutter-text.c:3665 ../clutter/clutter-text.c:3666
 msgid "Selection Color"
 msgstr "Warna Pilihan"
 
-#: ../clutter/clutter-text.c:3612
+#: ../clutter/clutter-text.c:3681
 msgid "Selection Color Set"
 msgstr "Warna Pilihan Ditata"
 
-#: ../clutter/clutter-text.c:3613
+#: ../clutter/clutter-text.c:3682
 msgid "Whether the selection color has been set"
 msgstr "Apakah warna pilihan telah ditata"
 
-#: ../clutter/clutter-text.c:3628
+#: ../clutter/clutter-text.c:3697
 msgid "Attributes"
 msgstr "Atribut"
 
-#: ../clutter/clutter-text.c:3629
+#: ../clutter/clutter-text.c:3698
 msgid "A list of style attributes to apply to the contents of the actor"
 msgstr "Daftar atribut gaya untuk diterapkan pada isi aktor"
 
-#: ../clutter/clutter-text.c:3651
+#: ../clutter/clutter-text.c:3720
 msgid "Use markup"
 msgstr "Gunakan markup"
 
-#: ../clutter/clutter-text.c:3652
+#: ../clutter/clutter-text.c:3721
 msgid "Whether or not the text includes Pango markup"
 msgstr "Apakah teks termasuk markup Pango"
 
-#: ../clutter/clutter-text.c:3668
+#: ../clutter/clutter-text.c:3737
 msgid "Line wrap"
 msgstr "Lipat baris"
 
-#: ../clutter/clutter-text.c:3669
+#: ../clutter/clutter-text.c:3738
 msgid "If set, wrap the lines if the text becomes too wide"
 msgstr ""
 "Jika diset, teks akan dipotong dan diteruskan pada baris berikutnya bila "
 "terlalu lebar"
 
-#: ../clutter/clutter-text.c:3684
+#: ../clutter/clutter-text.c:3753
 msgid "Line wrap mode"
 msgstr "Mode pelipatan baris"
 
-#: ../clutter/clutter-text.c:3685
+#: ../clutter/clutter-text.c:3754
 msgid "Control how line-wrapping is done"
 msgstr "Mengendalikan bagaimana pelipatan baris dilakukan"
 
-#: ../clutter/clutter-text.c:3700
+#: ../clutter/clutter-text.c:3769
 msgid "Ellipsize"
 msgstr "Singkatkan"
 
-#: ../clutter/clutter-text.c:3701
+#: ../clutter/clutter-text.c:3770
 msgid "The preferred place to ellipsize the string"
 msgstr "Tempat yang disukai untuk menyingkat kalimat"
 
-#: ../clutter/clutter-text.c:3717
+#: ../clutter/clutter-text.c:3786
 msgid "Line Alignment"
 msgstr "Perataan Baris"
 
-#: ../clutter/clutter-text.c:3718
+#: ../clutter/clutter-text.c:3787
 msgid "The preferred alignment for the string, for multi-line text"
 msgstr "Perataan yang disukai bagi kalimat, bagi teks multi baris"
 
-#: ../clutter/clutter-text.c:3734
+#: ../clutter/clutter-text.c:3803
 msgid "Justify"
 msgstr "Diratakan"
 
-#: ../clutter/clutter-text.c:3735
+#: ../clutter/clutter-text.c:3804
 msgid "Whether the text should be justified"
 msgstr "Apakah teks mesti diratakan"
 
-#: ../clutter/clutter-text.c:3750
+#: ../clutter/clutter-text.c:3819
 msgid "Password Character"
 msgstr "Karakter Sandi"
 
-#: ../clutter/clutter-text.c:3751
+#: ../clutter/clutter-text.c:3820
 msgid "If non-zero, use this character to display the actor's contents"
 msgstr "Bila bukan nol, gunakan karakter ini untuk menampilkan isi aktor"
 
-#: ../clutter/clutter-text.c:3765
+#: ../clutter/clutter-text.c:3834
 msgid "Max Length"
 msgstr "Panjang Maks"
 
-#: ../clutter/clutter-text.c:3766
+#: ../clutter/clutter-text.c:3835
 msgid "Maximum length of the text inside the actor"
 msgstr "Panjang maksimum teks di dalam aktor"
 
-#: ../clutter/clutter-text.c:3789
+#: ../clutter/clutter-text.c:3858
 msgid "Single Line Mode"
 msgstr "Moda Satu Baris"
 
-#: ../clutter/clutter-text.c:3790
+#: ../clutter/clutter-text.c:3859
 msgid "Whether the text should be a single line"
 msgstr "Apakah teks mesti hanya sebaris"
 
-#: ../clutter/clutter-text.c:3804 ../clutter/clutter-text.c:3805
+#: ../clutter/clutter-text.c:3873 ../clutter/clutter-text.c:3874
 msgid "Selected Text Color"
 msgstr "Warna Teks Yang Dipilih"
 
-#: ../clutter/clutter-text.c:3820
+#: ../clutter/clutter-text.c:3889
 msgid "Selected Text Color Set"
 msgstr "Warna Teks Terpilih Ditata"
 
-#: ../clutter/clutter-text.c:3821
+#: ../clutter/clutter-text.c:3890
 msgid "Whether the selected text color has been set"
 msgstr "Apakah warna teks yang dipilih telah ditata"
 
-#: ../clutter/clutter-timeline.c:561
-#: ../clutter/deprecated/clutter-animation.c:560
+#: ../clutter/clutter-timeline.c:591
+#: ../clutter/deprecated/clutter-animation.c:506
 msgid "Loop"
 msgstr "Pengulangan"
 
-#: ../clutter/clutter-timeline.c:562
+#: ../clutter/clutter-timeline.c:592
 msgid "Should the timeline automatically restart"
 msgstr "Apakah garis waktu otomatis dimulai ulang"
 
-#: ../clutter/clutter-timeline.c:576
+#: ../clutter/clutter-timeline.c:606
 msgid "Delay"
 msgstr "Tunda"
 
-#: ../clutter/clutter-timeline.c:577
+#: ../clutter/clutter-timeline.c:607
 msgid "Delay before start"
 msgstr "Tundaan sebelum mulai"
 
-#: ../clutter/clutter-timeline.c:592
-#: ../clutter/deprecated/clutter-animation.c:544
-#: ../clutter/deprecated/clutter-animator.c:1803
+#: ../clutter/clutter-timeline.c:622
+#: ../clutter/deprecated/clutter-animation.c:490
+#: ../clutter/deprecated/clutter-animator.c:1792
 #: ../clutter/deprecated/clutter-media.c:224
-#: ../clutter/deprecated/clutter-state.c:1522
+#: ../clutter/deprecated/clutter-state.c:1515
 msgid "Duration"
 msgstr "Durasi"
 
-#: ../clutter/clutter-timeline.c:593
+#: ../clutter/clutter-timeline.c:623
 msgid "Duration of the timeline in milliseconds"
 msgstr "Durasi garis waktu dalam mili detik"
 
-#: ../clutter/clutter-timeline.c:608
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:528
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:337
+#: ../clutter/clutter-timeline.c:638
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:521
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:330
 msgid "Direction"
 msgstr "Arah"
 
-#: ../clutter/clutter-timeline.c:609
+#: ../clutter/clutter-timeline.c:639
 msgid "Direction of the timeline"
 msgstr "Arah garis waktu"
 
-#: ../clutter/clutter-timeline.c:624
+#: ../clutter/clutter-timeline.c:654
 msgid "Auto Reverse"
 msgstr "Membalik Otomatis"
 
-#: ../clutter/clutter-timeline.c:625
+#: ../clutter/clutter-timeline.c:655
 msgid "Whether the direction should be reversed when reaching the end"
 msgstr "Apakah arah mesti dibalik ketika mencapai akhir"
 
-#: ../clutter/clutter-timeline.c:643
+#: ../clutter/clutter-timeline.c:673
 msgid "Repeat Count"
 msgstr "Cacah Pengulangan"
 
-#: ../clutter/clutter-timeline.c:644
+#: ../clutter/clutter-timeline.c:674
 msgid "How many times the timeline should repeat"
 msgstr "Berapa kali garis waktu mesti diulangi"
 
-#: ../clutter/clutter-timeline.c:658
+#: ../clutter/clutter-timeline.c:688
 msgid "Progress Mode"
 msgstr "Moda Kemajuan"
 
-#: ../clutter/clutter-timeline.c:659
+#: ../clutter/clutter-timeline.c:689
 msgid "How the timeline should compute the progress"
 msgstr "Bagaimana garis waktu mesti menghitung kemajuan"
 
-#: ../clutter/clutter-transition.c:246
+#: ../clutter/clutter-transition.c:244
 msgid "Interval"
 msgstr "Interval"
 
-#: ../clutter/clutter-transition.c:247
+#: ../clutter/clutter-transition.c:245
 msgid "The interval of values to transition"
 msgstr "Interval nilai untuk transisi"
 
-#: ../clutter/clutter-transition.c:261
+#: ../clutter/clutter-transition.c:259
 msgid "Animatable"
 msgstr "Dapat dianimasikan"
 
-#: ../clutter/clutter-transition.c:262
+#: ../clutter/clutter-transition.c:260
 msgid "The animatable object"
 msgstr "Objek yang dapat dianimasikan"
 
-#: ../clutter/clutter-transition.c:283
+#: ../clutter/clutter-transition.c:281
 msgid "Remove on Complete"
 msgstr "Hapus saat Komplit"
 
-#: ../clutter/clutter-transition.c:284
+#: ../clutter/clutter-transition.c:282
 msgid "Detach the transition when completed"
 msgstr "Lepaskan transisi setelah komplit"
 
-#: ../clutter/clutter-zoom-action.c:353
+#: ../clutter/clutter-zoom-action.c:365
 msgid "Zoom Axis"
 msgstr "Sumbu Zum"
 
-#: ../clutter/clutter-zoom-action.c:354
+#: ../clutter/clutter-zoom-action.c:366
 msgid "Constraints the zoom to an axis"
 msgstr "Batasi zum ke suatu sumbu"
 
-#: ../clutter/deprecated/clutter-alpha.c:355
-#: ../clutter/deprecated/clutter-animation.c:575
-#: ../clutter/deprecated/clutter-animator.c:1820
+#: ../clutter/deprecated/clutter-alpha.c:347
+#: ../clutter/deprecated/clutter-animation.c:521
+#: ../clutter/deprecated/clutter-animator.c:1809
 msgid "Timeline"
 msgstr "Alur waktu"
 
-#: ../clutter/deprecated/clutter-alpha.c:356
+#: ../clutter/deprecated/clutter-alpha.c:348
 msgid "Timeline used by the alpha"
 msgstr "Alur waktu (timeline) yang dipakai oleh alfa"
 
-#: ../clutter/deprecated/clutter-alpha.c:372
+#: ../clutter/deprecated/clutter-alpha.c:364
 msgid "Alpha value"
 msgstr "Nilai alfa"
 
-#: ../clutter/deprecated/clutter-alpha.c:373
+#: ../clutter/deprecated/clutter-alpha.c:365
 msgid "Alpha value as computed by the alpha"
 msgstr "Nilai alfa yang dihitung oleh alfa"
 
-#: ../clutter/deprecated/clutter-alpha.c:394
-#: ../clutter/deprecated/clutter-animation.c:528
+#: ../clutter/deprecated/clutter-alpha.c:386
+#: ../clutter/deprecated/clutter-animation.c:474
 msgid "Mode"
 msgstr "Mode"
 
-#: ../clutter/deprecated/clutter-alpha.c:395
+#: ../clutter/deprecated/clutter-alpha.c:387
 msgid "Progress mode"
 msgstr "Moda kemajuan"
 
-#: ../clutter/deprecated/clutter-animation.c:511
+#: ../clutter/deprecated/clutter-animation.c:457
 msgid "Object"
 msgstr "Objek"
 
-#: ../clutter/deprecated/clutter-animation.c:512
+#: ../clutter/deprecated/clutter-animation.c:458
 msgid "Object to which the animation applies"
 msgstr "Objek yang menerapkan animasi"
 
-#: ../clutter/deprecated/clutter-animation.c:529
+#: ../clutter/deprecated/clutter-animation.c:475
 msgid "The mode of the animation"
 msgstr "Mode animasi"
 
-#: ../clutter/deprecated/clutter-animation.c:545
+#: ../clutter/deprecated/clutter-animation.c:491
 msgid "Duration of the animation, in milliseconds"
 msgstr "Durasi animasi, dalam milidetik"
 
-#: ../clutter/deprecated/clutter-animation.c:561
+#: ../clutter/deprecated/clutter-animation.c:507
 msgid "Whether the animation should loop"
 msgstr "Apakah animasi mesti berulang"
 
-#: ../clutter/deprecated/clutter-animation.c:576
+#: ../clutter/deprecated/clutter-animation.c:522
 msgid "The timeline used by the animation"
 msgstr "Alur waktu yang dipakai oleh animasi"
 
-#: ../clutter/deprecated/clutter-animation.c:592
-#: ../clutter/deprecated/clutter-behaviour.c:241
+#: ../clutter/deprecated/clutter-animation.c:538
+#: ../clutter/deprecated/clutter-behaviour.c:237
 msgid "Alpha"
 msgstr "Alfa"
 
-#: ../clutter/deprecated/clutter-animation.c:593
+#: ../clutter/deprecated/clutter-animation.c:539
 msgid "The alpha used by the animation"
 msgstr "Alfa yang dipakai oleh animasi"
 
-#: ../clutter/deprecated/clutter-animator.c:1804
+#: ../clutter/deprecated/clutter-animator.c:1793
 msgid "The duration of the animation"
 msgstr "Durasi animasi"
 
-#: ../clutter/deprecated/clutter-animator.c:1821
+#: ../clutter/deprecated/clutter-animator.c:1810
 msgid "The timeline of the animation"
 msgstr "Alur waktu animasi"
 
-#: ../clutter/deprecated/clutter-behaviour.c:242
+#: ../clutter/deprecated/clutter-behaviour.c:238
 msgid "Alpha Object to drive the behaviour"
 msgstr "Objek Alfa untuk mendorong perilaku"
 
-#: ../clutter/deprecated/clutter-behaviour-depth.c:182
+#: ../clutter/deprecated/clutter-behaviour-depth.c:180
 msgid "Start Depth"
 msgstr "Kedalaman Awal"
 
-#: ../clutter/deprecated/clutter-behaviour-depth.c:183
+#: ../clutter/deprecated/clutter-behaviour-depth.c:181
 msgid "Initial depth to apply"
 msgstr "Kedalaman awal untuk diterapkan"
 
-#: ../clutter/deprecated/clutter-behaviour-depth.c:198
+#: ../clutter/deprecated/clutter-behaviour-depth.c:196
 msgid "End Depth"
 msgstr "Kedalaman Akhir"
 
-#: ../clutter/deprecated/clutter-behaviour-depth.c:199
+#: ../clutter/deprecated/clutter-behaviour-depth.c:197
 msgid "Final depth to apply"
 msgstr "Kedalaman akhir untuk diterapkan"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:401
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:394
 msgid "Start Angle"
 msgstr "Sudut Awal"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:402
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:284
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:395
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:277
 msgid "Initial angle"
 msgstr "Sudut awal"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:417
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:410
 msgid "End Angle"
 msgstr "Sudut Akhir"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:418
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:302
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:411
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:295
 msgid "Final angle"
 msgstr "Sudut akhir"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:433
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:426
 msgid "Angle x tilt"
 msgstr "Sudut miring x"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:434
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:427
 msgid "Tilt of the ellipse around x axis"
 msgstr "Kemiringan elips terhadap sumbu x"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:449
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:442
 msgid "Angle y tilt"
 msgstr "Sudut miring y"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:450
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:443
 msgid "Tilt of the ellipse around y axis"
 msgstr "Kemiringan elips terhadap sumbu y"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:465
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:458
 msgid "Angle z tilt"
 msgstr "Sudut miring z"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:466
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:459
 msgid "Tilt of the ellipse around z axis"
 msgstr "Kemiringan elips terhadap sumbu z"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:482
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:475
 msgid "Width of the ellipse"
 msgstr "Lebar elips"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:498
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:491
 msgid "Height of ellipse"
 msgstr "Tinggi elips"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:513
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:506
 msgid "Center"
 msgstr "Pusat"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:514
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:507
 msgid "Center of ellipse"
 msgstr "Pusat elips"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:529
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:338
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:522
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:331
 msgid "Direction of rotation"
 msgstr "Arah rotasi"
 
-#: ../clutter/deprecated/clutter-behaviour-opacity.c:184
+#: ../clutter/deprecated/clutter-behaviour-opacity.c:177
 msgid "Opacity Start"
 msgstr "Kelegapan Awal"
 
-#: ../clutter/deprecated/clutter-behaviour-opacity.c:185
+#: ../clutter/deprecated/clutter-behaviour-opacity.c:178
 msgid "Initial opacity level"
 msgstr "Aras kelegapan awal"
 
-#: ../clutter/deprecated/clutter-behaviour-opacity.c:202
+#: ../clutter/deprecated/clutter-behaviour-opacity.c:195
 msgid "Opacity End"
 msgstr "Kelegapan Akhir"
 
-#: ../clutter/deprecated/clutter-behaviour-opacity.c:203
+#: ../clutter/deprecated/clutter-behaviour-opacity.c:196
 msgid "Final opacity level"
 msgstr "Aras kelegapan akhir"
 
-#: ../clutter/deprecated/clutter-behaviour-path.c:226
+#: ../clutter/deprecated/clutter-behaviour-path.c:222
 msgid "The ClutterPath object representing the path to animate along"
 msgstr "Objek ClutterPath yang mewakili lintasan animasi"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:283
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:276
 msgid "Angle Begin"
 msgstr "Awal Sudut"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:301
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:294
 msgid "Angle End"
 msgstr "Akhir Sudut"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:319
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:312
 msgid "Axis"
 msgstr "Sumbu"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:320
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:313
 msgid "Axis of rotation"
 msgstr "Sumbu rotasi"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:355
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:348
 msgid "Center X"
 msgstr "Pusat X"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:356
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:349
 msgid "X coordinate of the center of rotation"
 msgstr "Koordinat X dari pusat rotasi"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:373
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:366
 msgid "Center Y"
 msgstr "Pusat Y"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:374
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:367
 msgid "Y coordinate of the center of rotation"
 msgstr "Koordinat Y dari pusat rotasi"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:391
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:384
 msgid "Center Z"
 msgstr "Pusat Z"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:392
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:385
 msgid "Z coordinate of the center of rotation"
 msgstr "Koordinat Z dari pusat rotasi"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:226
+#: ../clutter/deprecated/clutter-behaviour-scale.c:222
 msgid "X Start Scale"
 msgstr "Skala Awal X"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:227
+#: ../clutter/deprecated/clutter-behaviour-scale.c:223
 msgid "Initial scale on the X axis"
 msgstr "Skala awal pada sumbu X"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:245
+#: ../clutter/deprecated/clutter-behaviour-scale.c:241
 msgid "X End Scale"
 msgstr "Skala Akhir X"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:246
+#: ../clutter/deprecated/clutter-behaviour-scale.c:242
 msgid "Final scale on the X axis"
 msgstr "Skala akhir pada sumbu X"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:264
+#: ../clutter/deprecated/clutter-behaviour-scale.c:260
 msgid "Y Start Scale"
 msgstr "Skala Awal Y"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:265
+#: ../clutter/deprecated/clutter-behaviour-scale.c:261
 msgid "Initial scale on the Y axis"
 msgstr "Skala awal pada sumbu Y"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:283
+#: ../clutter/deprecated/clutter-behaviour-scale.c:279
 msgid "Y End Scale"
 msgstr "Skala Akhir Y"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:284
+#: ../clutter/deprecated/clutter-behaviour-scale.c:280
 msgid "Final scale on the Y axis"
 msgstr "Skala akhir pada sumbu Y"
 
-#: ../clutter/deprecated/clutter-box.c:261
+#: ../clutter/deprecated/clutter-box.c:255
 msgid "The background color of the box"
 msgstr "Warna latar belakang kotak"
 
-#: ../clutter/deprecated/clutter-box.c:274
+#: ../clutter/deprecated/clutter-box.c:268
 msgid "Color Set"
 msgstr "Warna Ditata"
 
-#: ../clutter/deprecated/clutter-cairo-texture.c:597
+#: ../clutter/deprecated/clutter-cairo-texture.c:585
 msgid "Surface Width"
 msgstr "Lebar Permukaan"
 
-#: ../clutter/deprecated/clutter-cairo-texture.c:598
+#: ../clutter/deprecated/clutter-cairo-texture.c:586
 msgid "The width of the Cairo surface"
 msgstr "Lebar permukaan Cairo"
 
-#: ../clutter/deprecated/clutter-cairo-texture.c:615
+#: ../clutter/deprecated/clutter-cairo-texture.c:603
 msgid "Surface Height"
 msgstr "Tinggi permukaan"
 
-#: ../clutter/deprecated/clutter-cairo-texture.c:616
+#: ../clutter/deprecated/clutter-cairo-texture.c:604
 msgid "The height of the Cairo surface"
 msgstr "Tinggi permukaan Cairo"
 
-#: ../clutter/deprecated/clutter-cairo-texture.c:636
+#: ../clutter/deprecated/clutter-cairo-texture.c:624
 msgid "Auto Resize"
 msgstr "Otomatis Ubah Ukuran"
 
-#: ../clutter/deprecated/clutter-cairo-texture.c:637
+#: ../clutter/deprecated/clutter-cairo-texture.c:625
 msgid "Whether the surface should match the allocation"
 msgstr "Apakah permukaan mesti cocok dengan alokasi"
 
@@ -2378,101 +2398,157 @@ msgstr "Tingkat pengisian penyangga"
 msgid "The duration of the stream, in seconds"
 msgstr "Durasi stream, dalam detik"
 
-#: ../clutter/deprecated/clutter-rectangle.c:274
+#: ../clutter/deprecated/clutter-rectangle.c:271
 msgid "The color of the rectangle"
 msgstr "Warna persegi panjang"
 
-#: ../clutter/deprecated/clutter-rectangle.c:287
+#: ../clutter/deprecated/clutter-rectangle.c:284
 msgid "Border Color"
 msgstr "Warna Batas"
 
-#: ../clutter/deprecated/clutter-rectangle.c:288
+#: ../clutter/deprecated/clutter-rectangle.c:285
 msgid "The color of the border of the rectangle"
 msgstr "Warna pinggir persegi panjang"
 
-#: ../clutter/deprecated/clutter-rectangle.c:303
+#: ../clutter/deprecated/clutter-rectangle.c:300
 msgid "Border Width"
 msgstr "Lebar Batas"
 
-#: ../clutter/deprecated/clutter-rectangle.c:304
+#: ../clutter/deprecated/clutter-rectangle.c:301
 msgid "The width of the border of the rectangle"
 msgstr "Lebar tepi persegi panjang"
 
-#: ../clutter/deprecated/clutter-rectangle.c:318
+#: ../clutter/deprecated/clutter-rectangle.c:315
 msgid "Has Border"
 msgstr "Punya Tepi"
 
-#: ../clutter/deprecated/clutter-rectangle.c:319
+#: ../clutter/deprecated/clutter-rectangle.c:316
 msgid "Whether the rectangle should have a border"
 msgstr "Apakah persegi panjang mesti memiliki tepi"
 
-#: ../clutter/deprecated/clutter-shader.c:261
+#: ../clutter/deprecated/clutter-shader.c:257
 msgid "Vertex Source"
 msgstr "Sumber Verteks"
 
-#: ../clutter/deprecated/clutter-shader.c:262
+#: ../clutter/deprecated/clutter-shader.c:258
 msgid "Source of vertex shader"
 msgstr "Sumber dari shader verteks"
 
-#: ../clutter/deprecated/clutter-shader.c:278
+#: ../clutter/deprecated/clutter-shader.c:274
 msgid "Fragment Source"
 msgstr "Sumber Pecahan"
 
-#: ../clutter/deprecated/clutter-shader.c:279
+#: ../clutter/deprecated/clutter-shader.c:275
 msgid "Source of fragment shader"
 msgstr "Sumber dari shader fragmen"
 
-#: ../clutter/deprecated/clutter-shader.c:296
+#: ../clutter/deprecated/clutter-shader.c:292
 msgid "Compiled"
 msgstr "Dikompilasi"
 
-#: ../clutter/deprecated/clutter-shader.c:297
+#: ../clutter/deprecated/clutter-shader.c:293
 msgid "Whether the shader is compiled and linked"
 msgstr "Apakah shader dikompail dan di-link"
 
-#: ../clutter/deprecated/clutter-shader.c:314
+#: ../clutter/deprecated/clutter-shader.c:310
 msgid "Whether the shader is enabled"
 msgstr "Apakah shader diaktifkan"
 
-#: ../clutter/deprecated/clutter-shader.c:525
+#: ../clutter/deprecated/clutter-shader.c:521
 #, c-format
 msgid "%s compilation failed: %s"
 msgstr "kompilasi %s gagal: %s"
 
-#: ../clutter/deprecated/clutter-shader.c:526
+#: ../clutter/deprecated/clutter-shader.c:522
 msgid "Vertex shader"
 msgstr "Shader verteks"
 
-#: ../clutter/deprecated/clutter-shader.c:527
+#: ../clutter/deprecated/clutter-shader.c:523
 msgid "Fragment shader"
 msgstr "Shader fragmen"
 
-#: ../clutter/deprecated/clutter-state.c:1504
+#: ../clutter/deprecated/clutter-state.c:1497
 msgid "State"
 msgstr "Keadaan"
 
-#: ../clutter/deprecated/clutter-state.c:1505
+#: ../clutter/deprecated/clutter-state.c:1498
 msgid "Currently set state, (transition to this state might not be complete)"
 msgstr "Keadaan sekarang, (transisi ke keadaan ini mungkin tak lengkap)"
 
-#: ../clutter/deprecated/clutter-state.c:1523
+#: ../clutter/deprecated/clutter-state.c:1516
 msgid "Default transition duration"
 msgstr "Durasi transisi baku"
 
-#: ../clutter/deprecated/clutter-texture.c:994
+#: ../clutter/deprecated/clutter-table-layout.c:535
+msgid "Column Number"
+msgstr "Nomor Kolom"
+
+#: ../clutter/deprecated/clutter-table-layout.c:536
+msgid "The column the widget resides in"
+msgstr "Nomor kolom tempat widget berada"
+
+#: ../clutter/deprecated/clutter-table-layout.c:543
+msgid "Row Number"
+msgstr "Nomor Baris"
+
+#: ../clutter/deprecated/clutter-table-layout.c:544
+msgid "The row the widget resides in"
+msgstr "Nomor baris tempat widget berada"
+
+#: ../clutter/deprecated/clutter-table-layout.c:551
+msgid "Column Span"
+msgstr "Rentang Kolom"
+
+#: ../clutter/deprecated/clutter-table-layout.c:552
+msgid "The number of columns the widget should span"
+msgstr "Cacah kolom yang mesti dicakup widget"
+
+#: ../clutter/deprecated/clutter-table-layout.c:559
+msgid "Row Span"
+msgstr "Rentang Baris"
+
+#: ../clutter/deprecated/clutter-table-layout.c:560
+msgid "The number of rows the widget should span"
+msgstr "Cacah baris yang mesti dicakup widget"
+
+#: ../clutter/deprecated/clutter-table-layout.c:567
+msgid "Horizontal Expand"
+msgstr "Mengembang Horisontal"
+
+#: ../clutter/deprecated/clutter-table-layout.c:568
+msgid "Allocate extra space for the child in horizontal axis"
+msgstr "Alokasikan ruang ekstra bagi anak di sumbu horisontal"
+
+#: ../clutter/deprecated/clutter-table-layout.c:574
+msgid "Vertical Expand"
+msgstr "Mengembang Vertikal"
+
+#: ../clutter/deprecated/clutter-table-layout.c:575
+msgid "Allocate extra space for the child in vertical axis"
+msgstr "Alokasikan ruang ekstra bagi anak di sumbu vertikal"
+
+#: ../clutter/deprecated/clutter-table-layout.c:1630
+msgid "Spacing between columns"
+msgstr "Ruang sela antar kolom"
+
+#: ../clutter/deprecated/clutter-table-layout.c:1646
+msgid "Spacing between rows"
+msgstr "Ruang sela antar baris"
+
+#: ../clutter/deprecated/clutter-texture.c:992
 msgid "Sync size of actor"
 msgstr "Ukuran penyelarasan aktor"
 
-#: ../clutter/deprecated/clutter-texture.c:995
+#: ../clutter/deprecated/clutter-texture.c:993
 msgid "Auto sync size of actor to underlying pixbuf dimensions"
 msgstr ""
 "Ukuran penyelarasn otomatis dari aktor ke dimensi pixbuf yang mendasarinya"
 
-#: ../clutter/deprecated/clutter-texture.c:1002
+#: ../clutter/deprecated/clutter-texture.c:1000
 msgid "Disable Slicing"
 msgstr "Nonaktifkan Mengiris"
 
-#: ../clutter/deprecated/clutter-texture.c:1003
+#: ../clutter/deprecated/clutter-texture.c:1001
 msgid ""
 "Forces the underlying texture to be singular and not made of smaller space "
 "saving individual textures"
@@ -2480,75 +2556,75 @@ msgstr ""
 "Memaksa tekstur yang mendasari agar singuler dan tak dibuat dari tekstur-"
 "tekstur individu yang lebih kecil untuk menghemat ruang"
 
-#: ../clutter/deprecated/clutter-texture.c:1012
+#: ../clutter/deprecated/clutter-texture.c:1010
 msgid "Tile Waste"
 msgstr "Limbah Ubih"
 
-#: ../clutter/deprecated/clutter-texture.c:1013
+#: ../clutter/deprecated/clutter-texture.c:1011
 msgid "Maximum waste area of a sliced texture"
 msgstr "Area terbuang maksimum dari tekstur yang diiris"
 
-#: ../clutter/deprecated/clutter-texture.c:1021
+#: ../clutter/deprecated/clutter-texture.c:1019
 msgid "Horizontal repeat"
 msgstr "Pengulangan horisontal"
 
-#: ../clutter/deprecated/clutter-texture.c:1022
+#: ../clutter/deprecated/clutter-texture.c:1020
 msgid "Repeat the contents rather than scaling them horizontally"
 msgstr "Ulangi isi, bukan diskalakan secara horisontal"
 
-#: ../clutter/deprecated/clutter-texture.c:1029
+#: ../clutter/deprecated/clutter-texture.c:1027
 msgid "Vertical repeat"
 msgstr "Pengulangan vertikal"
 
-#: ../clutter/deprecated/clutter-texture.c:1030
+#: ../clutter/deprecated/clutter-texture.c:1028
 msgid "Repeat the contents rather than scaling them vertically"
 msgstr "Ulangi isi, bukan diskalakan secara vertikal"
 
-#: ../clutter/deprecated/clutter-texture.c:1037
+#: ../clutter/deprecated/clutter-texture.c:1035
 msgid "Filter Quality"
 msgstr "Kualitas Penyaring"
 
-#: ../clutter/deprecated/clutter-texture.c:1038
+#: ../clutter/deprecated/clutter-texture.c:1036
 msgid "Rendering quality used when drawing the texture"
 msgstr "Kualitas perenderan yang dipakai ketika menggambar tekstur"
 
-#: ../clutter/deprecated/clutter-texture.c:1046
+#: ../clutter/deprecated/clutter-texture.c:1044
 msgid "Pixel Format"
 msgstr "Format Piksel"
 
-#: ../clutter/deprecated/clutter-texture.c:1047
+#: ../clutter/deprecated/clutter-texture.c:1045
 msgid "The Cogl pixel format to use"
 msgstr "Format piksel Cogl yang akan dipakai"
 
-#: ../clutter/deprecated/clutter-texture.c:1055
-#: ../clutter/wayland/clutter-wayland-surface.c:449
+#: ../clutter/deprecated/clutter-texture.c:1053
+#: ../clutter/wayland/clutter-wayland-surface.c:445
 msgid "Cogl Texture"
 msgstr "Tekstur Cogl"
 
-#: ../clutter/deprecated/clutter-texture.c:1056
-#: ../clutter/wayland/clutter-wayland-surface.c:450
+#: ../clutter/deprecated/clutter-texture.c:1054
+#: ../clutter/wayland/clutter-wayland-surface.c:446
 msgid "The underlying Cogl texture handle used to draw this actor"
 msgstr ""
 "Handle tekstur Cogl yang mendasari, yang dipakai untuk menggambar aktor ini"
 
-#: ../clutter/deprecated/clutter-texture.c:1063
+#: ../clutter/deprecated/clutter-texture.c:1061
 msgid "Cogl Material"
 msgstr "Material Cogl"
 
-#: ../clutter/deprecated/clutter-texture.c:1064
+#: ../clutter/deprecated/clutter-texture.c:1062
 msgid "The underlying Cogl material handle used to draw this actor"
 msgstr ""
 "Handle material Cogl yang mendasari, yang dipakai untuk menggambar aktor ini"
 
-#: ../clutter/deprecated/clutter-texture.c:1083
+#: ../clutter/deprecated/clutter-texture.c:1081
 msgid "The path of the file containing the image data"
 msgstr "Path berkas yang memuat data gambar"
 
-#: ../clutter/deprecated/clutter-texture.c:1090
+#: ../clutter/deprecated/clutter-texture.c:1088
 msgid "Keep Aspect Ratio"
 msgstr "Jaga Rasio Aspek"
 
-#: ../clutter/deprecated/clutter-texture.c:1091
+#: ../clutter/deprecated/clutter-texture.c:1089
 msgid ""
 "Keep the aspect ratio of the texture when requesting the preferred width or "
 "height"
@@ -2556,22 +2632,22 @@ msgstr ""
 "Pertahankan rasio aspek dari tekstur ketika meminta lebar atau tinggi yang "
 "disukai"
 
-#: ../clutter/deprecated/clutter-texture.c:1119
+#: ../clutter/deprecated/clutter-texture.c:1117
 msgid "Load asynchronously"
 msgstr "Muat secara asinkron"
 
-#: ../clutter/deprecated/clutter-texture.c:1120
+#: ../clutter/deprecated/clutter-texture.c:1118
 msgid ""
 "Load files inside a thread to avoid blocking when loading images from disk"
 msgstr ""
 "Muat berkas di dalam suatu thread untuk menghindari pemblokiran ketika "
 "memuat gambar dari disk"
 
-#: ../clutter/deprecated/clutter-texture.c:1138
+#: ../clutter/deprecated/clutter-texture.c:1136
 msgid "Load data asynchronously"
 msgstr "Muat data secara asinkron"
 
-#: ../clutter/deprecated/clutter-texture.c:1139
+#: ../clutter/deprecated/clutter-texture.c:1137
 msgid ""
 "Decode image data files inside a thread to reduce blocking when loading "
 "images from disk"
@@ -2579,191 +2655,176 @@ msgstr ""
 "Dekodekan berkas data gambar di dalam suatu thread untuk mengurangi "
 "pemblokiran ketika memuat gambar dari disk"
 
-#: ../clutter/deprecated/clutter-texture.c:1165
+#: ../clutter/deprecated/clutter-texture.c:1163
 msgid "Pick With Alpha"
 msgstr "Ambil Dengan Alfa"
 
-#: ../clutter/deprecated/clutter-texture.c:1166
+#: ../clutter/deprecated/clutter-texture.c:1164
 msgid "Shape actor with alpha channel when picking"
 msgstr "Bentuk aktor dengan kanal alfa ketika mengambil"
 
-#: ../clutter/deprecated/clutter-texture.c:1599
-#: ../clutter/deprecated/clutter-texture.c:1994
-#: ../clutter/deprecated/clutter-texture.c:2090
-#: ../clutter/deprecated/clutter-texture.c:2388
+#: ../clutter/deprecated/clutter-texture.c:1597
+#: ../clutter/deprecated/clutter-texture.c:1992
+#: ../clutter/deprecated/clutter-texture.c:2088
+#: ../clutter/deprecated/clutter-texture.c:2386
 #, c-format
 msgid "Failed to load the image data"
 msgstr "Gagal memuat data gambar"
 
-#: ../clutter/deprecated/clutter-texture.c:1758
+#: ../clutter/deprecated/clutter-texture.c:1756
 #, c-format
 msgid "YUV textures are not supported"
 msgstr "Tekstur YUV tak didukung"
 
-#: ../clutter/deprecated/clutter-texture.c:1767
+#: ../clutter/deprecated/clutter-texture.c:1765
 #, c-format
 msgid "YUV2 textues are not supported"
 msgstr "Tekstur YUV2 tak didukung"
 
-#: ../clutter/evdev/clutter-input-device-evdev.c:159
-msgid "sysfs Path"
-msgstr "Path sysfs"
-
-#: ../clutter/evdev/clutter-input-device-evdev.c:160
-msgid "Path of the device in sysfs"
-msgstr "Path perangkat di sysfs"
-
-#: ../clutter/evdev/clutter-input-device-evdev.c:175
-msgid "Device Path"
-msgstr "Path Perangkat"
-
-#: ../clutter/evdev/clutter-input-device-evdev.c:176
-msgid "Path of the device node"
-msgstr "Path dari node perangkat"
-
-#: ../clutter/gdk/clutter-backend-gdk.c:296
+#: ../clutter/gdk/clutter-backend-gdk.c:289
 #, c-format
 msgid "Could not find a suitable CoglWinsys for a GdkDisplay of type %s"
 msgstr "Tak bisa temukan CoglWinsys yang cocok bagi GdkDisplay bertipa %s"
 
-#: ../clutter/wayland/clutter-wayland-surface.c:423
+#: ../clutter/wayland/clutter-wayland-surface.c:419
 msgid "Surface"
 msgstr "Permukaan"
 
-#: ../clutter/wayland/clutter-wayland-surface.c:424
+#: ../clutter/wayland/clutter-wayland-surface.c:420
 msgid "The underlying wayland surface"
 msgstr "Permukaan wayland yang mendasari"
 
-#: ../clutter/wayland/clutter-wayland-surface.c:431
+#: ../clutter/wayland/clutter-wayland-surface.c:427
 msgid "Surface width"
 msgstr "Lebar permukaan"
 
-#: ../clutter/wayland/clutter-wayland-surface.c:432
+#: ../clutter/wayland/clutter-wayland-surface.c:428
 msgid "The width of the underlying wayland surface"
 msgstr "Lebar permukaan wayland yang mendasari"
 
-#: ../clutter/wayland/clutter-wayland-surface.c:440
+#: ../clutter/wayland/clutter-wayland-surface.c:436
 msgid "Surface height"
 msgstr "Tinggi permukaan"
 
-#: ../clutter/wayland/clutter-wayland-surface.c:441
+#: ../clutter/wayland/clutter-wayland-surface.c:437
 msgid "The height of the underlying wayland surface"
 msgstr "Tinggi permukaan wayland yang mendasari"
 
-#: ../clutter/x11/clutter-backend-x11.c:516
+#: ../clutter/x11/clutter-backend-x11.c:488
 msgid "X display to use"
 msgstr "Tampilan X yang akan dipakai"
 
-#: ../clutter/x11/clutter-backend-x11.c:522
+#: ../clutter/x11/clutter-backend-x11.c:494
 msgid "X screen to use"
 msgstr "Layar X yang akan dipakai"
 
-#: ../clutter/x11/clutter-backend-x11.c:527
+#: ../clutter/x11/clutter-backend-x11.c:499
 msgid "Make X calls synchronous"
 msgstr "Jadikan panggilan X sinkron"
 
-#: ../clutter/x11/clutter-backend-x11.c:534
-msgid "Enable XInput support"
-msgstr "Aktifkan dukungan XInput"
+#: ../clutter/x11/clutter-backend-x11.c:506
+msgid "Disable XInput support"
+msgstr "Matikan dukungan XInput"
 
-#: ../clutter/x11/clutter-keymap-x11.c:317
+#: ../clutter/x11/clutter-keymap-x11.c:458
 msgid "The Clutter backend"
 msgstr "Backend Clutter"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:539
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:534
 msgid "Pixmap"
 msgstr "Pixmap"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:540
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:535
 msgid "The X11 Pixmap to be bound"
 msgstr "Pixmap X11 yang akan diikat"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:548
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:543
 msgid "Pixmap width"
 msgstr "Lebar pixmap"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:549
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:544
 msgid "The width of the pixmap bound to this texture"
 msgstr "Lebar pixmap yang diikat ke tekstur ini"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:557
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:552
 msgid "Pixmap height"
 msgstr "Tinggi pixmap"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:558
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:553
 msgid "The height of the pixmap bound to this texture"
 msgstr "Tinggi pixmap yang diikat ke tekstur ini"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:566
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:561
 msgid "Pixmap Depth"
 msgstr "Kedalaman Pixmap"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:567
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:562
 msgid "The depth (in number of bits) of the pixmap bound to this texture"
 msgstr "Kedalaman (dalam cacah bit) dari pixmap yang diikat ke tekstur ini"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:575
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:570
 msgid "Automatic Updates"
 msgstr "Pemutakhiran Otomatis"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:576
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:571
 msgid "If the texture should be kept in sync with any pixmap changes."
 msgstr ""
 "Bila tekstur mesti dipertahankan selaras dengan sebarang perubahan pixmap."
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:584
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:579
 msgid "Window"
 msgstr "Jendela"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:585
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:580
 msgid "The X11 Window to be bound"
 msgstr "Window X11 yang akan diikat"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:593
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:588
 msgid "Window Redirect Automatic"
 msgstr "Otomatis Mengalihkan Jendela"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:594
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:589
 msgid "If composite window redirects are set to Automatic (or Manual if false)"
 msgstr ""
 "Bila pengalihan jendela komposit ditata ke Otomatis (atau Manual bila false)"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:604
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:599
 msgid "Window Mapped"
 msgstr "Jendela Dipetakan"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:605
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:600
 msgid "If window is mapped"
 msgstr "Bila jendela dipetakan"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:614
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:609
 msgid "Destroyed"
 msgstr "Dihancurkan"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:615
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:610
 msgid "If window has been destroyed"
 msgstr "Bila jendela telah dihancurkan"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:623
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:618
 msgid "Window X"
 msgstr "X Jendela"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:624
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:619
 msgid "X position of window on screen according to X11"
 msgstr "Posisi X dari jendela pada layar menurut X11"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:632
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:627
 msgid "Window Y"
 msgstr "Y Jendela"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:633
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:628
 msgid "Y position of window on screen according to X11"
 msgstr "Posisi Y dari jendela pada layar menurut X11"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:640
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:635
 msgid "Window Override Redirect"
 msgstr "Pengalihan Penimpaan Jendela"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:641
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:636
 msgid "If this is an override-redirect window"
 msgstr "Bila ini adalah jendela pengalihan-penimpaan"
+
diff --git a/po/it.po b/po/it.po
index 2cecc8483..2c7ef74d8 100644
--- a/po/it.po
+++ b/po/it.po
@@ -1,712 +1,713 @@
 # clutter Italian translation
-# Copyright (C) 2012, 2013 The Free Software Foundation
+# Copyright (C) 2012, 2013, 2014 The Free Software Foundation
 # This file is distributed under the same license as the clutter package.
-# Milo Casagrande <milo@ubuntu.com>, 2012, 2013.
+# Milo Casagrande <milo@ubuntu.com>, 2012, 2013, 2014.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: clutter\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
-"product=clutter\n"
-"POT-Creation-Date: 2013-01-27 18:16+0100\n"
-"PO-Revision-Date: 2013-01-27 18:17+0100\n"
+"product=clutter&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2014-02-16 04:09+0000\n"
+"PO-Revision-Date: 2014-02-16 12:20+0100\n"
 "Last-Translator: Milo Casagrande <milo@ubuntu.com>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
 "Language: it\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8-bit\n"
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
+"X-Generator: Poedit 1.6.4\n"
 
-#: ../clutter/clutter-actor.c:6144
+#: ../clutter/clutter-actor.c:6214
 msgid "X coordinate"
 msgstr "Coordinata X"
 
-#: ../clutter/clutter-actor.c:6145
+#: ../clutter/clutter-actor.c:6215
 msgid "X coordinate of the actor"
 msgstr "Coordinata X dell'attore"
 
-#: ../clutter/clutter-actor.c:6163
+#: ../clutter/clutter-actor.c:6233
 msgid "Y coordinate"
 msgstr "Coordinata Y"
 
-#: ../clutter/clutter-actor.c:6164
+#: ../clutter/clutter-actor.c:6234
 msgid "Y coordinate of the actor"
 msgstr "Coordinata Y dell'attore"
 
-#: ../clutter/clutter-actor.c:6186
+#: ../clutter/clutter-actor.c:6256
 msgid "Position"
 msgstr "Posizione"
 
-#: ../clutter/clutter-actor.c:6187
+#: ../clutter/clutter-actor.c:6257
 msgid "The position of the origin of the actor"
 msgstr "La posizione dell'origine dell'attore"
 
-#: ../clutter/clutter-actor.c:6204 ../clutter/clutter-canvas.c:215
-#: ../clutter/clutter-grid-layout.c:1238
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:481
+#: ../clutter/clutter-actor.c:6274 ../clutter/clutter-canvas.c:247
+#: ../clutter/clutter-grid-layout.c:1239
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:474
 msgid "Width"
 msgstr "Larghezza"
 
-#: ../clutter/clutter-actor.c:6205
+#: ../clutter/clutter-actor.c:6275
 msgid "Width of the actor"
 msgstr "Larghezza dell'attore"
 
-#: ../clutter/clutter-actor.c:6223 ../clutter/clutter-canvas.c:231
-#: ../clutter/clutter-grid-layout.c:1245
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:497
+#: ../clutter/clutter-actor.c:6293 ../clutter/clutter-canvas.c:263
+#: ../clutter/clutter-grid-layout.c:1246
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:490
 msgid "Height"
 msgstr "Altezza"
 
-#: ../clutter/clutter-actor.c:6224
+#: ../clutter/clutter-actor.c:6294
 msgid "Height of the actor"
 msgstr "Altezza dell'attore"
 
-#: ../clutter/clutter-actor.c:6245
+#: ../clutter/clutter-actor.c:6315
 msgid "Size"
 msgstr "Dimensione"
 
-#: ../clutter/clutter-actor.c:6246
+#: ../clutter/clutter-actor.c:6316
 msgid "The size of the actor"
 msgstr "La dimensione dell'attore"
 
-#: ../clutter/clutter-actor.c:6264
+#: ../clutter/clutter-actor.c:6334
 msgid "Fixed X"
 msgstr "Fissata X"
 
-#: ../clutter/clutter-actor.c:6265
+#: ../clutter/clutter-actor.c:6335
 msgid "Forced X position of the actor"
 msgstr "Posizione X forzata dell'attore"
 
-#: ../clutter/clutter-actor.c:6282
+#: ../clutter/clutter-actor.c:6352
 msgid "Fixed Y"
 msgstr "Fissata Y"
 
-#: ../clutter/clutter-actor.c:6283
+#: ../clutter/clutter-actor.c:6353
 msgid "Forced Y position of the actor"
 msgstr "Posizione Y forzata dell'attore"
 
-#: ../clutter/clutter-actor.c:6298
+#: ../clutter/clutter-actor.c:6368
 msgid "Fixed position set"
 msgstr "Imposta posizione fissa"
 
-#: ../clutter/clutter-actor.c:6299
+#: ../clutter/clutter-actor.c:6369
 msgid "Whether to use fixed positioning for the actor"
-msgstr "Se usare il posizionamento fisso per l'attore"
+msgstr "Indica se usare il posizionamento fisso per l'attore"
 
-#: ../clutter/clutter-actor.c:6317
+#: ../clutter/clutter-actor.c:6387
 msgid "Min Width"
 msgstr "Larghezza minima"
 
-#: ../clutter/clutter-actor.c:6318
+#: ../clutter/clutter-actor.c:6388
 msgid "Forced minimum width request for the actor"
 msgstr "Larghezza minima forzata richiesta per l'attore"
 
-#: ../clutter/clutter-actor.c:6336
+#: ../clutter/clutter-actor.c:6406
 msgid "Min Height"
 msgstr "Altezza minima"
 
-#: ../clutter/clutter-actor.c:6337
+#: ../clutter/clutter-actor.c:6407
 msgid "Forced minimum height request for the actor"
 msgstr "Altezza minima forzata richiesta per l'attore"
 
-#: ../clutter/clutter-actor.c:6355
+#: ../clutter/clutter-actor.c:6425
 msgid "Natural Width"
 msgstr "Larghezza naturale"
 
-#: ../clutter/clutter-actor.c:6356
+#: ../clutter/clutter-actor.c:6426
 msgid "Forced natural width request for the actor"
 msgstr "Larghezza naturale forzata richiesta per l'attore"
 
-#: ../clutter/clutter-actor.c:6374
+#: ../clutter/clutter-actor.c:6444
 msgid "Natural Height"
 msgstr "Altezza naturale"
 
-#: ../clutter/clutter-actor.c:6375
+#: ../clutter/clutter-actor.c:6445
 msgid "Forced natural height request for the actor"
 msgstr "Altezza naturale forzata richiesta per l'attore"
 
-#: ../clutter/clutter-actor.c:6390
+#: ../clutter/clutter-actor.c:6460
 msgid "Minimum width set"
 msgstr "Imposta larghezza minima"
 
-#: ../clutter/clutter-actor.c:6391
+#: ../clutter/clutter-actor.c:6461
 msgid "Whether to use the min-width property"
-msgstr "Se utilizzare la proprietà larghezza minima"
+msgstr "Indica se utilizzare la proprietà larghezza minima"
 
-#: ../clutter/clutter-actor.c:6405
+#: ../clutter/clutter-actor.c:6475
 msgid "Minimum height set"
 msgstr "Imposta altezza minima"
 
-#: ../clutter/clutter-actor.c:6406
+#: ../clutter/clutter-actor.c:6476
 msgid "Whether to use the min-height property"
-msgstr "Se usare la proprietà altezza minima"
+msgstr "Indica se usare la proprietà altezza minima"
 
-#: ../clutter/clutter-actor.c:6420
+#: ../clutter/clutter-actor.c:6490
 msgid "Natural width set"
 msgstr "Imposta larghezza naturale"
 
-#: ../clutter/clutter-actor.c:6421
+#: ../clutter/clutter-actor.c:6491
 msgid "Whether to use the natural-width property"
-msgstr "Se usare la proprietà larghezza naturale"
+msgstr "Indica se usare la proprietà larghezza naturale"
 
-#: ../clutter/clutter-actor.c:6435
+#: ../clutter/clutter-actor.c:6505
 msgid "Natural height set"
 msgstr "Imposta altezza naturale"
 
-#: ../clutter/clutter-actor.c:6436
+#: ../clutter/clutter-actor.c:6506
 msgid "Whether to use the natural-height property"
-msgstr "Se usare la proprietà altezza naturale"
+msgstr "Indica se usare la proprietà altezza naturale"
 
-#: ../clutter/clutter-actor.c:6452
+#: ../clutter/clutter-actor.c:6522
 msgid "Allocation"
 msgstr "Allocazione"
 
-#: ../clutter/clutter-actor.c:6453
+#: ../clutter/clutter-actor.c:6523
 msgid "The actor's allocation"
 msgstr "Assegnazione dell'attore"
 
-#: ../clutter/clutter-actor.c:6510
+#: ../clutter/clutter-actor.c:6580
 msgid "Request Mode"
 msgstr "Modalità richiesta"
 
-#: ../clutter/clutter-actor.c:6511
+#: ../clutter/clutter-actor.c:6581
 msgid "The actor's request mode"
 msgstr "La modalità richiesta dell'attore"
 
-#: ../clutter/clutter-actor.c:6535
+#: ../clutter/clutter-actor.c:6605
 msgid "Depth"
 msgstr "Profondità"
 
-#: ../clutter/clutter-actor.c:6536
+#: ../clutter/clutter-actor.c:6606
 msgid "Position on the Z axis"
 msgstr "Posizione sull'asse Z"
 
-#: ../clutter/clutter-actor.c:6563
+#: ../clutter/clutter-actor.c:6633
 msgid "Z Position"
 msgstr "Posizione Z"
 
-#: ../clutter/clutter-actor.c:6564
+#: ../clutter/clutter-actor.c:6634
 msgid "The actor's position on the Z axis"
 msgstr "La posizione dell'attore sull'asse Z"
 
-#: ../clutter/clutter-actor.c:6581
+#: ../clutter/clutter-actor.c:6651
 msgid "Opacity"
 msgstr "Opacità"
 
-#: ../clutter/clutter-actor.c:6582
+#: ../clutter/clutter-actor.c:6652
 msgid "Opacity of an actor"
 msgstr "Opacità di un attore"
 
-#: ../clutter/clutter-actor.c:6602
+#: ../clutter/clutter-actor.c:6672
 msgid "Offscreen redirect"
 msgstr "Redirect fuori schermo"
 
-#: ../clutter/clutter-actor.c:6603
+#: ../clutter/clutter-actor.c:6673
 msgid "Flags controlling when to flatten the actor into a single image"
 msgstr "Flag per controllare quanto appiattire l'attore in una sola immagine"
 
-#: ../clutter/clutter-actor.c:6617
+#: ../clutter/clutter-actor.c:6687
 msgid "Visible"
 msgstr "Visibile"
 
-#: ../clutter/clutter-actor.c:6618
+#: ../clutter/clutter-actor.c:6688
 msgid "Whether the actor is visible or not"
-msgstr "Se l'attore è visibile o meno"
+msgstr "Indica se l'attore è visibile o meno"
 
-#: ../clutter/clutter-actor.c:6632
+#: ../clutter/clutter-actor.c:6702
 msgid "Mapped"
 msgstr "Mappato"
 
-#: ../clutter/clutter-actor.c:6633
+#: ../clutter/clutter-actor.c:6703
 msgid "Whether the actor will be painted"
-msgstr "Se l'attore sarà disegnato"
+msgstr "Indica se l'attore sarà disegnato"
 
-#: ../clutter/clutter-actor.c:6646
+#: ../clutter/clutter-actor.c:6716
 msgid "Realized"
 msgstr "Realizzato"
 
-#: ../clutter/clutter-actor.c:6647
+#: ../clutter/clutter-actor.c:6717
 msgid "Whether the actor has been realized"
-msgstr "Se l'attore è stato realizzato"
+msgstr "Indica se l'attore è stato realizzato"
 
-#: ../clutter/clutter-actor.c:6662
+#: ../clutter/clutter-actor.c:6732
 msgid "Reactive"
 msgstr "Reattivo"
 
-#: ../clutter/clutter-actor.c:6663
+#: ../clutter/clutter-actor.c:6733
 msgid "Whether the actor is reactive to events"
-msgstr "Se l'attore è reattivo agli eventi"
+msgstr "Indica se l'attore è reattivo agli eventi"
 
-#: ../clutter/clutter-actor.c:6674
+#: ../clutter/clutter-actor.c:6744
 msgid "Has Clip"
 msgstr "Ha clip"
 
-#: ../clutter/clutter-actor.c:6675
+#: ../clutter/clutter-actor.c:6745
 msgid "Whether the actor has a clip set"
 msgstr "Indica se l'attore ha un clip impostato"
 
-#: ../clutter/clutter-actor.c:6688
+#: ../clutter/clutter-actor.c:6758
 msgid "Clip"
 msgstr "Clip"
 
-#: ../clutter/clutter-actor.c:6689
+#: ../clutter/clutter-actor.c:6759
 msgid "The clip region for the actor"
 msgstr "La regione clip dell'attore"
 
-#: ../clutter/clutter-actor.c:6708
+#: ../clutter/clutter-actor.c:6778
 msgid "Clip Rectangle"
 msgstr "Rettangolo clip"
 
-#: ../clutter/clutter-actor.c:6709
+#: ../clutter/clutter-actor.c:6779
 msgid "The visible region of the actor"
 msgstr "La regione visibile dell'attore"
 
-#: ../clutter/clutter-actor.c:6723 ../clutter/clutter-actor-meta.c:207
-#: ../clutter/clutter-binding-pool.c:319 ../clutter/clutter-input-device.c:258
+#: ../clutter/clutter-actor.c:6793 ../clutter/clutter-actor-meta.c:205
+#: ../clutter/clutter-binding-pool.c:319 ../clutter/clutter-input-device.c:247
 msgid "Name"
 msgstr "Nome"
 
-#: ../clutter/clutter-actor.c:6724
+#: ../clutter/clutter-actor.c:6794
 msgid "Name of the actor"
 msgstr "Nome dell'attore"
 
-#: ../clutter/clutter-actor.c:6745
+#: ../clutter/clutter-actor.c:6815
 msgid "Pivot Point"
 msgstr "Punto di perno"
 
-#: ../clutter/clutter-actor.c:6746
+#: ../clutter/clutter-actor.c:6816
 msgid "The point around which the scaling and rotation occur"
 msgstr "Il punto su cui il ridimensionamento e la rotazione hanno luogo"
 
-#: ../clutter/clutter-actor.c:6764
+#: ../clutter/clutter-actor.c:6834
 msgid "Pivot Point Z"
 msgstr "Punto di perno Z"
 
-#: ../clutter/clutter-actor.c:6765
+#: ../clutter/clutter-actor.c:6835
 msgid "Z component of the pivot point"
 msgstr "Componente Z del punto di perno"
 
-#: ../clutter/clutter-actor.c:6783
+#: ../clutter/clutter-actor.c:6853
 msgid "Scale X"
 msgstr "Scala X"
 
-#: ../clutter/clutter-actor.c:6784
+#: ../clutter/clutter-actor.c:6854
 msgid "Scale factor on the X axis"
 msgstr "Fattore di scala sull'asse X"
 
-#: ../clutter/clutter-actor.c:6802
+#: ../clutter/clutter-actor.c:6872
 msgid "Scale Y"
 msgstr "Scala Y"
 
-#: ../clutter/clutter-actor.c:6803
+#: ../clutter/clutter-actor.c:6873
 msgid "Scale factor on the Y axis"
 msgstr "Fattore di scala sull'asse Y"
 
-#: ../clutter/clutter-actor.c:6821
+#: ../clutter/clutter-actor.c:6891
 msgid "Scale Z"
 msgstr "Scala Z"
 
-#: ../clutter/clutter-actor.c:6822
+#: ../clutter/clutter-actor.c:6892
 msgid "Scale factor on the Z axis"
 msgstr "Fattore di scala sull'asse Z"
 
-#: ../clutter/clutter-actor.c:6840
+#: ../clutter/clutter-actor.c:6910
 msgid "Scale Center X"
 msgstr "Scala centrale X"
 
-#: ../clutter/clutter-actor.c:6841
+#: ../clutter/clutter-actor.c:6911
 msgid "Horizontal scale center"
 msgstr "Scala centrale orizzontale"
 
-#: ../clutter/clutter-actor.c:6859
+#: ../clutter/clutter-actor.c:6929
 msgid "Scale Center Y"
 msgstr "Scala centrale Y"
 
-#: ../clutter/clutter-actor.c:6860
+#: ../clutter/clutter-actor.c:6930
 msgid "Vertical scale center"
 msgstr "Scala centrale verticale"
 
-#: ../clutter/clutter-actor.c:6878
+#: ../clutter/clutter-actor.c:6948
 msgid "Scale Gravity"
 msgstr "Scala di gravità"
 
-#: ../clutter/clutter-actor.c:6879
+#: ../clutter/clutter-actor.c:6949
 msgid "The center of scaling"
 msgstr "Il centro della scala"
 
-#: ../clutter/clutter-actor.c:6897
+#: ../clutter/clutter-actor.c:6967
 msgid "Rotation Angle X"
 msgstr "Angolo di rotazione X"
 
-#: ../clutter/clutter-actor.c:6898
+#: ../clutter/clutter-actor.c:6968
 msgid "The rotation angle on the X axis"
 msgstr "L'angolo di rotazione sull'asse X"
 
-#: ../clutter/clutter-actor.c:6916
+#: ../clutter/clutter-actor.c:6986
 msgid "Rotation Angle Y"
 msgstr "Angolo di rotazione Y"
 
-#: ../clutter/clutter-actor.c:6917
+#: ../clutter/clutter-actor.c:6987
 msgid "The rotation angle on the Y axis"
 msgstr "L'angolo di rotazione sull'asse Y"
 
-#: ../clutter/clutter-actor.c:6935
+#: ../clutter/clutter-actor.c:7005
 msgid "Rotation Angle Z"
 msgstr "Angolo di rotazione Z"
 
-#: ../clutter/clutter-actor.c:6936
+#: ../clutter/clutter-actor.c:7006
 msgid "The rotation angle on the Z axis"
 msgstr "L'angolo di rotazione sull'asse Z"
 
-#: ../clutter/clutter-actor.c:6954
+#: ../clutter/clutter-actor.c:7024
 msgid "Rotation Center X"
 msgstr "Rotazione centrale X"
 
-#: ../clutter/clutter-actor.c:6955
+#: ../clutter/clutter-actor.c:7025
 msgid "The rotation center on the X axis"
 msgstr "La rotazione centrale sull'asse X"
 
-#: ../clutter/clutter-actor.c:6972
+#: ../clutter/clutter-actor.c:7042
 msgid "Rotation Center Y"
 msgstr "Rotazione centrale Y"
 
-#: ../clutter/clutter-actor.c:6973
+#: ../clutter/clutter-actor.c:7043
 msgid "The rotation center on the Y axis"
 msgstr "La rotazione centrale sull'asse Y"
 
-#: ../clutter/clutter-actor.c:6990
+#: ../clutter/clutter-actor.c:7060
 msgid "Rotation Center Z"
 msgstr "Rotazione centrale Z"
 
-#: ../clutter/clutter-actor.c:6991
+#: ../clutter/clutter-actor.c:7061
 msgid "The rotation center on the Z axis"
 msgstr "La rotazione centrale sull'asse Z"
 
-#: ../clutter/clutter-actor.c:7008
+#: ../clutter/clutter-actor.c:7078
 msgid "Rotation Center Z Gravity"
 msgstr "Gravità della rotazione centrale Z"
 
-#: ../clutter/clutter-actor.c:7009
+#: ../clutter/clutter-actor.c:7079
 msgid "Center point for rotation around the Z axis"
 msgstr "Punto centrale per la rotazione sull'asse Z"
 
-#: ../clutter/clutter-actor.c:7037
+#: ../clutter/clutter-actor.c:7107
 msgid "Anchor X"
 msgstr "Ancoraggio X"
 
-#: ../clutter/clutter-actor.c:7038
+#: ../clutter/clutter-actor.c:7108
 msgid "X coordinate of the anchor point"
 msgstr "Coordinata X del punto di ancoraggio"
 
-#: ../clutter/clutter-actor.c:7066
+#: ../clutter/clutter-actor.c:7136
 msgid "Anchor Y"
 msgstr "Ancoraggio Y"
 
-#: ../clutter/clutter-actor.c:7067
+#: ../clutter/clutter-actor.c:7137
 msgid "Y coordinate of the anchor point"
 msgstr "Coordinata Y del punto di ancoraggio"
 
-#: ../clutter/clutter-actor.c:7094
+#: ../clutter/clutter-actor.c:7164
 msgid "Anchor Gravity"
 msgstr "Gravità di ancoraggio"
 
-#: ../clutter/clutter-actor.c:7095
+#: ../clutter/clutter-actor.c:7165
 msgid "The anchor point as a ClutterGravity"
 msgstr "Il punto di ancoraggio come ClutterGravity"
 
-#: ../clutter/clutter-actor.c:7114
+#: ../clutter/clutter-actor.c:7184
 msgid "Translation X"
 msgstr "Traslazione X"
 
-#: ../clutter/clutter-actor.c:7115
+#: ../clutter/clutter-actor.c:7185
 msgid "Translation along the X axis"
 msgstr "Traslazione lungo l'asse X"
 
-#: ../clutter/clutter-actor.c:7134
+#: ../clutter/clutter-actor.c:7204
 msgid "Translation Y"
 msgstr "Traslazione Y"
 
-#: ../clutter/clutter-actor.c:7135
+#: ../clutter/clutter-actor.c:7205
 msgid "Translation along the Y axis"
 msgstr "Traslazione lungo l'asse Y"
 
-#: ../clutter/clutter-actor.c:7154
+#: ../clutter/clutter-actor.c:7224
 msgid "Translation Z"
 msgstr "Traslazione Z"
 
-#: ../clutter/clutter-actor.c:7155
+#: ../clutter/clutter-actor.c:7225
 msgid "Translation along the Z axis"
 msgstr "Traslazione lungo l'asse Z"
 
-#: ../clutter/clutter-actor.c:7185
+#: ../clutter/clutter-actor.c:7255
 msgid "Transform"
 msgstr "Trasformazione"
 
-#: ../clutter/clutter-actor.c:7186
+#: ../clutter/clutter-actor.c:7256
 msgid "Transformation matrix"
 msgstr "Matrice di trasformazione"
 
-#: ../clutter/clutter-actor.c:7201
+#: ../clutter/clutter-actor.c:7271
 msgid "Transform Set"
 msgstr "Imposta trasformazione"
 
-#: ../clutter/clutter-actor.c:7202
+#: ../clutter/clutter-actor.c:7272
 msgid "Whether the transform property is set"
 msgstr "Indica se la proprietà di trasformazione è impostata"
 
-#: ../clutter/clutter-actor.c:7223
+#: ../clutter/clutter-actor.c:7293
 msgid "Child Transform"
 msgstr "Trasformazione figlio"
 
-#: ../clutter/clutter-actor.c:7224
+#: ../clutter/clutter-actor.c:7294
 msgid "Children transformation matrix"
 msgstr "Matrice di trasformazione dei figli"
 
-#: ../clutter/clutter-actor.c:7239
+#: ../clutter/clutter-actor.c:7309
 msgid "Child Transform Set"
 msgstr "Imposta trasformazione figlio"
 
-#: ../clutter/clutter-actor.c:7240
+#: ../clutter/clutter-actor.c:7310
 msgid "Whether the child-transform property is set"
 msgstr "Indica se la proprietà di trasformazione del figlio è impostata"
 
-#: ../clutter/clutter-actor.c:7257
+#: ../clutter/clutter-actor.c:7327
 msgid "Show on set parent"
 msgstr "Mostra su imposta genitore"
 
-#: ../clutter/clutter-actor.c:7258
+#: ../clutter/clutter-actor.c:7328
 msgid "Whether the actor is shown when parented"
 msgstr "Se l'attore è mostrato quando genitore"
 
-#: ../clutter/clutter-actor.c:7275
+#: ../clutter/clutter-actor.c:7345
 msgid "Clip to Allocation"
 msgstr "Clip all'allocazione"
 
-#: ../clutter/clutter-actor.c:7276
+#: ../clutter/clutter-actor.c:7346
 msgid "Sets the clip region to track the actor's allocation"
 msgstr "Imposta la regione del clip per tracciare l'allocazione dell'attore"
 
-#: ../clutter/clutter-actor.c:7289
+#: ../clutter/clutter-actor.c:7359
 msgid "Text Direction"
 msgstr "Direzione del testo"
 
-#: ../clutter/clutter-actor.c:7290
+#: ../clutter/clutter-actor.c:7360
 msgid "Direction of the text"
 msgstr "Direzione del testo"
 
-#: ../clutter/clutter-actor.c:7305
+#: ../clutter/clutter-actor.c:7375
 msgid "Has Pointer"
 msgstr "Ha il puntatore"
 
-#: ../clutter/clutter-actor.c:7306
+#: ../clutter/clutter-actor.c:7376
 msgid "Whether the actor contains the pointer of an input device"
 msgstr "Se l'attore contiene il puntatore di un dispositivo di input"
 
-#: ../clutter/clutter-actor.c:7319
+#: ../clutter/clutter-actor.c:7389
 msgid "Actions"
 msgstr "Azioni"
 
-#: ../clutter/clutter-actor.c:7320
+#: ../clutter/clutter-actor.c:7390
 msgid "Adds an action to the actor"
 msgstr "Aggiunge un'azione per l'attore"
 
-#: ../clutter/clutter-actor.c:7333
+#: ../clutter/clutter-actor.c:7403
 msgid "Constraints"
 msgstr "Vincoli"
 
-#: ../clutter/clutter-actor.c:7334
+#: ../clutter/clutter-actor.c:7404
 msgid "Adds a constraint to the actor"
 msgstr "Aggiunge un vincolo per l'attore"
 
-#: ../clutter/clutter-actor.c:7347
+#: ../clutter/clutter-actor.c:7417
 msgid "Effect"
 msgstr "Effetto"
 
-#: ../clutter/clutter-actor.c:7348
+#: ../clutter/clutter-actor.c:7418
 msgid "Add an effect to be applied on the actor"
 msgstr "Aggiunge un effetto da applicare all'attore"
 
-#: ../clutter/clutter-actor.c:7362
+#: ../clutter/clutter-actor.c:7432
 msgid "Layout Manager"
 msgstr "Gestore di layout"
 
-#: ../clutter/clutter-actor.c:7363
+#: ../clutter/clutter-actor.c:7433
 msgid "The object controlling the layout of an actor's children"
 msgstr "L'oggetto che controlla il layout del figlio di un attore"
 
-#: ../clutter/clutter-actor.c:7377
+#: ../clutter/clutter-actor.c:7447
 msgid "X Expand"
 msgstr "Espansione X"
 
-#: ../clutter/clutter-actor.c:7378
+#: ../clutter/clutter-actor.c:7448
 msgid "Whether extra horizontal space should be assigned to the actor"
 msgstr ""
 "Indica se deve essere assegnato dello spazio orizzontale aggiuntivo "
 "all'attore"
 
-#: ../clutter/clutter-actor.c:7393
+#: ../clutter/clutter-actor.c:7463
 msgid "Y Expand"
 msgstr "Espansione Y"
 
-#: ../clutter/clutter-actor.c:7394
+#: ../clutter/clutter-actor.c:7464
 msgid "Whether extra vertical space should be assigned to the actor"
 msgstr ""
 "Indica se deve essere assegnato dello spazio verticale aggiuntivo all'attore"
 
-#: ../clutter/clutter-actor.c:7410
+#: ../clutter/clutter-actor.c:7480
 msgid "X Alignment"
 msgstr "Allineamento X"
 
-#: ../clutter/clutter-actor.c:7411
+#: ../clutter/clutter-actor.c:7481
 msgid "The alignment of the actor on the X axis within its allocation"
 msgstr ""
 "L'allineamento dell'attore sull'asse X all'interno della propria allocazione"
 
-#: ../clutter/clutter-actor.c:7426
+#: ../clutter/clutter-actor.c:7496
 msgid "Y Alignment"
 msgstr "Allineamento Y"
 
-#: ../clutter/clutter-actor.c:7427
+#: ../clutter/clutter-actor.c:7497
 msgid "The alignment of the actor on the Y axis within its allocation"
 msgstr ""
 "L'allineamento dell'attore sull'asse Y all'interno della propria allocazione"
 
-#: ../clutter/clutter-actor.c:7446
+#: ../clutter/clutter-actor.c:7516
 msgid "Margin Top"
 msgstr "Margine superiore"
 
-#: ../clutter/clutter-actor.c:7447
+#: ../clutter/clutter-actor.c:7517
 msgid "Extra space at the top"
 msgstr "Spazio aggiuntivo in alto"
 
-#: ../clutter/clutter-actor.c:7468
+#: ../clutter/clutter-actor.c:7538
 msgid "Margin Bottom"
 msgstr "Margine inferiore"
 
-#: ../clutter/clutter-actor.c:7469
+#: ../clutter/clutter-actor.c:7539
 msgid "Extra space at the bottom"
 msgstr "Spazio aggiuntivo in basso"
 
-#: ../clutter/clutter-actor.c:7490
+#: ../clutter/clutter-actor.c:7560
 msgid "Margin Left"
 msgstr "Margine sinistro"
 
-#: ../clutter/clutter-actor.c:7491
+#: ../clutter/clutter-actor.c:7561
 msgid "Extra space at the left"
 msgstr "Spazio aggiuntivo a sinistra"
 
-#: ../clutter/clutter-actor.c:7512
+#: ../clutter/clutter-actor.c:7582
 msgid "Margin Right"
 msgstr "Margine destro"
 
-#: ../clutter/clutter-actor.c:7513
+#: ../clutter/clutter-actor.c:7583
 msgid "Extra space at the right"
 msgstr "Spazio aggiuntivo a destra"
 
-#: ../clutter/clutter-actor.c:7529
+#: ../clutter/clutter-actor.c:7599
 msgid "Background Color Set"
 msgstr "Imposta colore di sfondo"
 
-#: ../clutter/clutter-actor.c:7530 ../clutter/deprecated/clutter-box.c:275
+#: ../clutter/clutter-actor.c:7600 ../clutter/deprecated/clutter-box.c:271
 msgid "Whether the background color is set"
 msgstr "Indica se il colore di sfondo è impostato"
 
-#: ../clutter/clutter-actor.c:7546
+#: ../clutter/clutter-actor.c:7616
 msgid "Background color"
 msgstr "Colore di sfondo"
 
-#: ../clutter/clutter-actor.c:7547
+#: ../clutter/clutter-actor.c:7617
 msgid "The actor's background color"
 msgstr "Il colore di sfondo dell'attore"
 
-#: ../clutter/clutter-actor.c:7562
+#: ../clutter/clutter-actor.c:7632
 msgid "First Child"
 msgstr "Primo figlio"
 
-#: ../clutter/clutter-actor.c:7563
+#: ../clutter/clutter-actor.c:7633
 msgid "The actor's first child"
 msgstr "Il primo discendente diretto dell'attore"
 
-#: ../clutter/clutter-actor.c:7576
+#: ../clutter/clutter-actor.c:7646
 msgid "Last Child"
 msgstr "Ultimo figlio"
 
-#: ../clutter/clutter-actor.c:7577
+#: ../clutter/clutter-actor.c:7647
 msgid "The actor's last child"
 msgstr "L'ultimo discendente diretto dell'attore"
 
-#: ../clutter/clutter-actor.c:7591
+#: ../clutter/clutter-actor.c:7661
 msgid "Content"
 msgstr "Contenuto"
 
-#: ../clutter/clutter-actor.c:7592
+#: ../clutter/clutter-actor.c:7662
 msgid "Delegate object for painting the actor's content"
 msgstr "L'oggetto delegato al disegno del contenuto dell'attore"
 
-#: ../clutter/clutter-actor.c:7617
+#: ../clutter/clutter-actor.c:7687
 msgid "Content Gravity"
 msgstr "Gravità del contenuto"
 
-#: ../clutter/clutter-actor.c:7618
+#: ../clutter/clutter-actor.c:7688
 msgid "Alignment of the actor's content"
 msgstr "L'allineamento del contenuto dell'attore"
 
-#: ../clutter/clutter-actor.c:7638
+#: ../clutter/clutter-actor.c:7708
 msgid "Content Box"
 msgstr "Contenitore"
 
-#: ../clutter/clutter-actor.c:7639
+#: ../clutter/clutter-actor.c:7709
 msgid "The bounding box of the actor's content"
 msgstr "Il contenitore per il contenuto dell'attore"
 
-#: ../clutter/clutter-actor.c:7647
+#: ../clutter/clutter-actor.c:7717
 msgid "Minification Filter"
 msgstr "Filtro di rimpicciolimento"
 
-#: ../clutter/clutter-actor.c:7648
+#: ../clutter/clutter-actor.c:7718
 msgid "The filter used when reducing the size of the content"
 msgstr "Il filtro da usare per rimpicciolire la dimensione del cotenuto"
 
-#: ../clutter/clutter-actor.c:7655
+#: ../clutter/clutter-actor.c:7725
 msgid "Magnification Filter"
 msgstr "Filtro d'ingrandimento"
 
-#: ../clutter/clutter-actor.c:7656
+#: ../clutter/clutter-actor.c:7726
 msgid "The filter used when increasing the size of the content"
 msgstr "Il filtro da usare per ingrandire la dimensione del contenuto"
 
-#: ../clutter/clutter-actor.c:7670
+#: ../clutter/clutter-actor.c:7740
 msgid "Content Repeat"
 msgstr "Ripetizione cotenuto"
 
-#: ../clutter/clutter-actor.c:7671
+#: ../clutter/clutter-actor.c:7741
 msgid "The repeat policy for the actor's content"
 msgstr "La regola di ripetizione del contenuto dell'attore"
 
-#: ../clutter/clutter-actor-meta.c:193 ../clutter/clutter-child-meta.c:142
+#: ../clutter/clutter-actor-meta.c:191 ../clutter/clutter-child-meta.c:142
 msgid "Actor"
 msgstr "Attore"
 
-#: ../clutter/clutter-actor-meta.c:194
+#: ../clutter/clutter-actor-meta.c:192
 msgid "The actor attached to the meta"
 msgstr "L'attore collegato al meta"
 
-#: ../clutter/clutter-actor-meta.c:208
+#: ../clutter/clutter-actor-meta.c:206
 msgid "The name of the meta"
 msgstr "Il nome del meta"
 
-#: ../clutter/clutter-actor-meta.c:221 ../clutter/clutter-input-device.c:337
-#: ../clutter/deprecated/clutter-shader.c:313
+#: ../clutter/clutter-actor-meta.c:219 ../clutter/clutter-input-device.c:326
+#: ../clutter/deprecated/clutter-shader.c:309
 msgid "Enabled"
 msgstr "Attivato"
 
-#: ../clutter/clutter-actor-meta.c:222
+#: ../clutter/clutter-actor-meta.c:220
 msgid "Whether the meta is enabled"
 msgstr "Se il meta è attivato"
 
 #: ../clutter/clutter-align-constraint.c:279
-#: ../clutter/clutter-bind-constraint.c:358 ../clutter/clutter-clone.c:345
+#: ../clutter/clutter-bind-constraint.c:358 ../clutter/clutter-clone.c:341
 #: ../clutter/clutter-snap-constraint.c:321
 msgid "Source"
 msgstr "Origine"
@@ -732,11 +733,11 @@ msgstr "Fattore"
 msgid "The alignment factor, between 0.0 and 1.0"
 msgstr "Il fattore di allineamento, tra 0.0 e 1.0"
 
-#: ../clutter/clutter-backend.c:379
+#: ../clutter/clutter-backend.c:380
 msgid "Unable to initialize the Clutter backend"
 msgstr "Impossibile inizializzare il backend Clutter"
 
-#: ../clutter/clutter-backend.c:453
+#: ../clutter/clutter-backend.c:454
 #, c-format
 msgid "The backend of type '%s' does not support creating multiple stages"
 msgstr "Il backend di tipo «%s» non supporta la creazione di stadi multipli"
@@ -767,47 +768,51 @@ msgstr "Lo spostamento in pixel da applicare all'associazione"
 msgid "The unique name of the binding pool"
 msgstr "Il nome unico dell'insieme di associazione"
 
-#: ../clutter/clutter-bin-layout.c:240 ../clutter/clutter-bin-layout.c:655
-#: ../clutter/clutter-box-layout.c:390 ../clutter/clutter-table-layout.c:610
+#: ../clutter/clutter-bin-layout.c:238 ../clutter/clutter-bin-layout.c:651
+#: ../clutter/clutter-box-layout.c:388
+#: ../clutter/deprecated/clutter-table-layout.c:610
 msgid "Horizontal Alignment"
 msgstr "Allineamento orizzontale"
 
-#: ../clutter/clutter-bin-layout.c:241
+#: ../clutter/clutter-bin-layout.c:239
 msgid "Horizontal alignment for the actor inside the layout manager"
 msgstr "Allineamento orizzontale per l'attore dentro il gestore di layout"
 
-#: ../clutter/clutter-bin-layout.c:249 ../clutter/clutter-bin-layout.c:675
-#: ../clutter/clutter-box-layout.c:399 ../clutter/clutter-table-layout.c:625
+#: ../clutter/clutter-bin-layout.c:247 ../clutter/clutter-bin-layout.c:671
+#: ../clutter/clutter-box-layout.c:397
+#: ../clutter/deprecated/clutter-table-layout.c:625
 msgid "Vertical Alignment"
 msgstr "Allineamento verticale"
 
-#: ../clutter/clutter-bin-layout.c:250
+#: ../clutter/clutter-bin-layout.c:248
 msgid "Vertical alignment for the actor inside the layout manager"
 msgstr "Allineamento verticale per l'attore dentro il gestore di layout"
 
-#: ../clutter/clutter-bin-layout.c:656
+#: ../clutter/clutter-bin-layout.c:652
 msgid "Default horizontal alignment for the actors inside the layout manager"
 msgstr ""
 "Allineamento orizzontale predefinito per l'attore dentro il gestore di layout"
 
-#: ../clutter/clutter-bin-layout.c:676
+#: ../clutter/clutter-bin-layout.c:672
 msgid "Default vertical alignment for the actors inside the layout manager"
 msgstr ""
 "Allineamento verticale predefinito per l'attore dentro il gestore di layout"
 
-#: ../clutter/clutter-box-layout.c:365
+#: ../clutter/clutter-box-layout.c:363
 msgid "Expand"
 msgstr "Espandere"
 
-#: ../clutter/clutter-box-layout.c:366
+#: ../clutter/clutter-box-layout.c:364
 msgid "Allocate extra space for the child"
 msgstr "Alloca spazio extra per il figlio"
 
-#: ../clutter/clutter-box-layout.c:372 ../clutter/clutter-table-layout.c:589
+#: ../clutter/clutter-box-layout.c:370
+#: ../clutter/deprecated/clutter-table-layout.c:589
 msgid "Horizontal Fill"
 msgstr "Riempimento orizzontale"
 
-#: ../clutter/clutter-box-layout.c:373 ../clutter/clutter-table-layout.c:590
+#: ../clutter/clutter-box-layout.c:371
+#: ../clutter/deprecated/clutter-table-layout.c:590
 msgid ""
 "Whether the child should receive priority when the container is allocating "
 "spare space on the horizontal axis"
@@ -815,11 +820,13 @@ msgstr ""
 "Se il figlio dovrebbe ricevere priorità quando il contenitore sta allocando "
 "spazio aggiuntivo sull'asse orizzontale"
 
-#: ../clutter/clutter-box-layout.c:381 ../clutter/clutter-table-layout.c:596
+#: ../clutter/clutter-box-layout.c:379
+#: ../clutter/deprecated/clutter-table-layout.c:596
 msgid "Vertical Fill"
 msgstr "Riempimento verticale"
 
-#: ../clutter/clutter-box-layout.c:382 ../clutter/clutter-table-layout.c:597
+#: ../clutter/clutter-box-layout.c:380
+#: ../clutter/deprecated/clutter-table-layout.c:597
 msgid ""
 "Whether the child should receive priority when the container is allocating "
 "spare space on the vertical axis"
@@ -827,80 +834,88 @@ msgstr ""
 "Se il figlio dovrebbe ricevere priorità quando il contenitore sta allocando "
 "spazio aggiuntivo sull'asse verticale"
 
-#: ../clutter/clutter-box-layout.c:391 ../clutter/clutter-table-layout.c:611
+#: ../clutter/clutter-box-layout.c:389
+#: ../clutter/deprecated/clutter-table-layout.c:611
 msgid "Horizontal alignment of the actor within the cell"
 msgstr "Allineamento orizzontale dell'attore all'interno della cella"
 
-#: ../clutter/clutter-box-layout.c:400 ../clutter/clutter-table-layout.c:626
+#: ../clutter/clutter-box-layout.c:398
+#: ../clutter/deprecated/clutter-table-layout.c:626
 msgid "Vertical alignment of the actor within the cell"
 msgstr "Allineamento verticale dell'attore all'interno della cella"
 
-#: ../clutter/clutter-box-layout.c:1365
+#: ../clutter/clutter-box-layout.c:1359
 msgid "Vertical"
 msgstr "Verticale"
 
-#: ../clutter/clutter-box-layout.c:1366
+#: ../clutter/clutter-box-layout.c:1360
 msgid "Whether the layout should be vertical, rather than horizontal"
 msgstr "Se il layout dovrebbe essere verticale, invece che orizzontale"
 
-#: ../clutter/clutter-box-layout.c:1383 ../clutter/clutter-flow-layout.c:890
-#: ../clutter/clutter-grid-layout.c:1550
+#: ../clutter/clutter-box-layout.c:1377 ../clutter/clutter-flow-layout.c:942
+#: ../clutter/clutter-grid-layout.c:1549
 msgid "Orientation"
 msgstr "Orientamento"
 
-#: ../clutter/clutter-box-layout.c:1384 ../clutter/clutter-flow-layout.c:891
-#: ../clutter/clutter-grid-layout.c:1551
+#: ../clutter/clutter-box-layout.c:1378 ../clutter/clutter-flow-layout.c:943
+#: ../clutter/clutter-grid-layout.c:1550
 msgid "The orientation of the layout"
 msgstr "L'orientamento del layout"
 
-#: ../clutter/clutter-box-layout.c:1400 ../clutter/clutter-flow-layout.c:906
+#: ../clutter/clutter-box-layout.c:1394 ../clutter/clutter-flow-layout.c:958
 msgid "Homogeneous"
 msgstr "Omogeneo"
 
-#: ../clutter/clutter-box-layout.c:1401
+#: ../clutter/clutter-box-layout.c:1395
 msgid ""
 "Whether the layout should be homogeneous, i.e. all childs get the same size"
 msgstr ""
 "Se il layout dovrebbe essere omogeneo, per esempoi tutti i figli alla stessa "
 "dimensione"
 
-#: ../clutter/clutter-box-layout.c:1416
+#: ../clutter/clutter-box-layout.c:1410
 msgid "Pack Start"
 msgstr "Raggruppamento iniziale"
 
-#: ../clutter/clutter-box-layout.c:1417
+#: ../clutter/clutter-box-layout.c:1411
 msgid "Whether to pack items at the start of the box"
 msgstr "Se raggruppare gli elementi all'inizio del box"
 
-#: ../clutter/clutter-box-layout.c:1430
+#: ../clutter/clutter-box-layout.c:1424
 msgid "Spacing"
 msgstr "Spaziatura"
 
-#: ../clutter/clutter-box-layout.c:1431
+#: ../clutter/clutter-box-layout.c:1425
 msgid "Spacing between children"
 msgstr "Spaziatura tra i figli"
 
-#: ../clutter/clutter-box-layout.c:1448 ../clutter/clutter-table-layout.c:1675
+#: ../clutter/clutter-box-layout.c:1442
+#: ../clutter/deprecated/clutter-table-layout.c:1677
 msgid "Use Animations"
 msgstr "Usa animazioni"
 
-#: ../clutter/clutter-box-layout.c:1449 ../clutter/clutter-table-layout.c:1676
+#: ../clutter/clutter-box-layout.c:1443
+#: ../clutter/deprecated/clutter-table-layout.c:1678
 msgid "Whether layout changes should be animated"
 msgstr "Se i cambiamenti al layout dovrebbero essere animati"
 
-#: ../clutter/clutter-box-layout.c:1473 ../clutter/clutter-table-layout.c:1700
+#: ../clutter/clutter-box-layout.c:1467
+#: ../clutter/deprecated/clutter-table-layout.c:1702
 msgid "Easing Mode"
 msgstr "Modalità facilitata"
 
-#: ../clutter/clutter-box-layout.c:1474 ../clutter/clutter-table-layout.c:1701
+#: ../clutter/clutter-box-layout.c:1468
+#: ../clutter/deprecated/clutter-table-layout.c:1703
 msgid "The easing mode of the animations"
 msgstr "La modalità facilitata delle animazioni"
 
-#: ../clutter/clutter-box-layout.c:1494 ../clutter/clutter-table-layout.c:1721
+#: ../clutter/clutter-box-layout.c:1488
+#: ../clutter/deprecated/clutter-table-layout.c:1723
 msgid "Easing Duration"
 msgstr "Durata modalità facilitata"
 
-#: ../clutter/clutter-box-layout.c:1495 ../clutter/clutter-table-layout.c:1722
+#: ../clutter/clutter-box-layout.c:1489
+#: ../clutter/deprecated/clutter-table-layout.c:1724
 msgid "The duration of the animations"
 msgstr "La durata delle animazioni"
 
@@ -920,14 +935,30 @@ msgstr "Contrasto"
 msgid "The contrast change to apply"
 msgstr "Il contrasto da applicare"
 
-#: ../clutter/clutter-canvas.c:216
+#: ../clutter/clutter-canvas.c:248
 msgid "The width of the canvas"
 msgstr "La larghezza della superficie"
 
-#: ../clutter/clutter-canvas.c:232
+#: ../clutter/clutter-canvas.c:264
 msgid "The height of the canvas"
 msgstr "L'altezza della superficie"
 
+#: ../clutter/clutter-canvas.c:283
+msgid "Scale Factor Set"
+msgstr "Imposta il fattore di scala"
+
+#: ../clutter/clutter-canvas.c:284
+msgid "Whether the scale-factor property is set"
+msgstr "Indica se la proprietà scale-factor è impostata"
+
+#: ../clutter/clutter-canvas.c:305
+msgid "Scale Factor"
+msgstr "Fattore di scala"
+
+#: ../clutter/clutter-canvas.c:306
+msgid "The scaling factor for the surface"
+msgstr "Il fattore di scala per la superficie"
+
 #: ../clutter/clutter-child-meta.c:127
 msgid "Container"
 msgstr "Contenitore"
@@ -940,39 +971,39 @@ msgstr "Il contenitore che ha creato questo dato"
 msgid "The actor wrapped by this data"
 msgstr "L'attore contenuto in questo dato"
 
-#: ../clutter/clutter-click-action.c:559
+#: ../clutter/clutter-click-action.c:586
 msgid "Pressed"
 msgstr "Premuto"
 
-#: ../clutter/clutter-click-action.c:560
+#: ../clutter/clutter-click-action.c:587
 msgid "Whether the clickable should be in pressed state"
 msgstr "Se il cliccabile dovrebbe essere in stato premuto"
 
-#: ../clutter/clutter-click-action.c:573
+#: ../clutter/clutter-click-action.c:600
 msgid "Held"
 msgstr "Mantenuto"
 
-#: ../clutter/clutter-click-action.c:574
+#: ../clutter/clutter-click-action.c:601
 msgid "Whether the clickable has a grab"
 msgstr "Se il cliccabile ha la maniglia"
 
-#: ../clutter/clutter-click-action.c:591 ../clutter/clutter-settings.c:599
+#: ../clutter/clutter-click-action.c:618 ../clutter/clutter-settings.c:653
 msgid "Long Press Duration"
 msgstr "Durata pressione lunga"
 
-#: ../clutter/clutter-click-action.c:592
+#: ../clutter/clutter-click-action.c:619
 msgid "The minimum duration of a long press to recognize the gesture"
 msgstr "La durata minima di una pressione lunga per riconoscere il gesto"
 
-#: ../clutter/clutter-click-action.c:610
+#: ../clutter/clutter-click-action.c:637
 msgid "Long Press Threshold"
 msgstr "Soglia pressione lunga"
 
-#: ../clutter/clutter-click-action.c:611
+#: ../clutter/clutter-click-action.c:638
 msgid "The maximum threshold before a long press is cancelled"
 msgstr "La soglia massima prima che una pressione lunga venga annullata"
 
-#: ../clutter/clutter-clone.c:346
+#: ../clutter/clutter-clone.c:342
 msgid "Specifies the actor to be cloned"
 msgstr "Specifica l'attore da clonare"
 
@@ -984,27 +1015,27 @@ msgstr "Tinta"
 msgid "The tint to apply"
 msgstr "La tinta da applicare"
 
-#: ../clutter/clutter-deform-effect.c:588
+#: ../clutter/clutter-deform-effect.c:592
 msgid "Horizontal Tiles"
 msgstr "Caselle orizzontali"
 
-#: ../clutter/clutter-deform-effect.c:589
+#: ../clutter/clutter-deform-effect.c:593
 msgid "The number of horizontal tiles"
 msgstr "Il numero di caselle orizzontali"
 
-#: ../clutter/clutter-deform-effect.c:604
+#: ../clutter/clutter-deform-effect.c:608
 msgid "Vertical Tiles"
 msgstr "Caselle verticali"
 
-#: ../clutter/clutter-deform-effect.c:605
+#: ../clutter/clutter-deform-effect.c:609
 msgid "The number of vertical tiles"
 msgstr "Il numero di caselle verticali"
 
-#: ../clutter/clutter-deform-effect.c:622
+#: ../clutter/clutter-deform-effect.c:626
 msgid "Back Material"
 msgstr "Materiale posteriore"
 
-#: ../clutter/clutter-deform-effect.c:623
+#: ../clutter/clutter-deform-effect.c:627
 msgid "The material to be used when painting the back of the actor"
 msgstr "Il materiale da usare nel disegno del posteriore dell'attore"
 
@@ -1012,260 +1043,302 @@ msgstr "Il materiale da usare nel disegno del posteriore dell'attore"
 msgid "The desaturation factor"
 msgstr "Il fattore desaturazione"
 
-#: ../clutter/clutter-device-manager.c:131
-#: ../clutter/clutter-input-device.c:366
+#: ../clutter/clutter-device-manager.c:127
+#: ../clutter/clutter-input-device.c:355
 #: ../clutter/x11/clutter-keymap-x11.c:321
 msgid "Backend"
 msgstr "Backend"
 
-#: ../clutter/clutter-device-manager.c:132
+#: ../clutter/clutter-device-manager.c:128
 msgid "The ClutterBackend of the device manager"
 msgstr "Il ClutterBackend del gestore di dispositivo"
 
-#: ../clutter/clutter-drag-action.c:742
+#: ../clutter/clutter-drag-action.c:741
 msgid "Horizontal Drag Threshold"
 msgstr "Soglia di trascinamento orizzontale"
 
-#: ../clutter/clutter-drag-action.c:743
+#: ../clutter/clutter-drag-action.c:742
 msgid "The horizontal amount of pixels required to start dragging"
 msgstr "Il numero di pixel orizzontali richiesto per iniziare il trascinamento"
 
-#: ../clutter/clutter-drag-action.c:770
+#: ../clutter/clutter-drag-action.c:769
 msgid "Vertical Drag Threshold"
 msgstr "Soglia di trascinamento verticale"
 
-#: ../clutter/clutter-drag-action.c:771
+#: ../clutter/clutter-drag-action.c:770
 msgid "The vertical amount of pixels required to start dragging"
 msgstr "Il numero di pixel verticali richiesto per iniziare il trascinamento"
 
-#: ../clutter/clutter-drag-action.c:792
+#: ../clutter/clutter-drag-action.c:791
 msgid "Drag Handle"
 msgstr "Maniglia di trascinamento"
 
-#: ../clutter/clutter-drag-action.c:793
+#: ../clutter/clutter-drag-action.c:792
 msgid "The actor that is being dragged"
 msgstr "L'attore che si sta trascinando"
 
-#: ../clutter/clutter-drag-action.c:806
+#: ../clutter/clutter-drag-action.c:805
 msgid "Drag Axis"
 msgstr "Asse di trascinamento"
 
-#: ../clutter/clutter-drag-action.c:807
+#: ../clutter/clutter-drag-action.c:806
 msgid "Constraints the dragging to an axis"
 msgstr "Vincoli di trascinamento di un asse"
 
-#: ../clutter/clutter-drag-action.c:823
+#: ../clutter/clutter-drag-action.c:822
 msgid "Drag Area"
 msgstr "Area di trascinamento"
 
-#: ../clutter/clutter-drag-action.c:824
+#: ../clutter/clutter-drag-action.c:823
 msgid "Constrains the dragging to a rectangle"
 msgstr "Limita il trascinamento a un rettangolo"
 
-#: ../clutter/clutter-drag-action.c:837
+#: ../clutter/clutter-drag-action.c:836
 msgid "Drag Area Set"
 msgstr "Imposta l'area di trascinamento"
 
-#: ../clutter/clutter-drag-action.c:838
+#: ../clutter/clutter-drag-action.c:837
 msgid "Whether the drag area is set"
 msgstr "Indica se l'area di trascinamento è impostata"
 
-#: ../clutter/clutter-flow-layout.c:907
+#: ../clutter/clutter-flow-layout.c:959
 msgid "Whether each item should receive the same allocation"
 msgstr "Se ogni elemento dovrebbe ricevere la stessa allocazione"
 
-#: ../clutter/clutter-flow-layout.c:922 ../clutter/clutter-table-layout.c:1637
+#: ../clutter/clutter-flow-layout.c:974
+#: ../clutter/deprecated/clutter-table-layout.c:1637
 msgid "Column Spacing"
 msgstr "Spaziatura di colonna"
 
-#: ../clutter/clutter-flow-layout.c:923
+#: ../clutter/clutter-flow-layout.c:975
 msgid "The spacing between columns"
 msgstr "Lo spazio tra le colonne"
 
-#: ../clutter/clutter-flow-layout.c:939 ../clutter/clutter-table-layout.c:1651
+#: ../clutter/clutter-flow-layout.c:991
+#: ../clutter/deprecated/clutter-table-layout.c:1653
 msgid "Row Spacing"
 msgstr "Spaziatura di riga"
 
-#: ../clutter/clutter-flow-layout.c:940
+#: ../clutter/clutter-flow-layout.c:992
 msgid "The spacing between rows"
 msgstr "Lo spazio tra le righe"
 
-#: ../clutter/clutter-flow-layout.c:954
+#: ../clutter/clutter-flow-layout.c:1006
 msgid "Minimum Column Width"
 msgstr "Larghezza di colonna minima"
 
-#: ../clutter/clutter-flow-layout.c:955
+#: ../clutter/clutter-flow-layout.c:1007
 msgid "Minimum width for each column"
 msgstr "Larghezza minima di ogni colonna"
 
-#: ../clutter/clutter-flow-layout.c:970
+#: ../clutter/clutter-flow-layout.c:1022
 msgid "Maximum Column Width"
 msgstr "Larghezza di colonna massima"
 
-#: ../clutter/clutter-flow-layout.c:971
+#: ../clutter/clutter-flow-layout.c:1023
 msgid "Maximum width for each column"
 msgstr "Larghezza massima di ogni colonna"
 
-#: ../clutter/clutter-flow-layout.c:985
+#: ../clutter/clutter-flow-layout.c:1037
 msgid "Minimum Row Height"
 msgstr "Altezza di riga minima"
 
-#: ../clutter/clutter-flow-layout.c:986
+#: ../clutter/clutter-flow-layout.c:1038
 msgid "Minimum height for each row"
 msgstr "Altezza minima di ogni riga"
 
-#: ../clutter/clutter-flow-layout.c:1001
+#: ../clutter/clutter-flow-layout.c:1053
 msgid "Maximum Row Height"
 msgstr "Altezza di riga massima"
 
-#: ../clutter/clutter-flow-layout.c:1002
+#: ../clutter/clutter-flow-layout.c:1054
 msgid "Maximum height for each row"
 msgstr "Altezza massima di ogni riga"
 
-#: ../clutter/clutter-grid-layout.c:1222
+#: ../clutter/clutter-flow-layout.c:1069 ../clutter/clutter-flow-layout.c:1070
+msgid "Snap to grid"
+msgstr "Aggancia alla griglia"
+
+#: ../clutter/clutter-gesture-action.c:668
+msgid "Number touch points"
+msgstr "Numero di punti di contatto"
+
+#: ../clutter/clutter-gesture-action.c:669
+msgid "Number of touch points"
+msgstr "Numero di punti di contatto"
+
+#: ../clutter/clutter-gesture-action.c:684
+msgid "Threshold Trigger Edge"
+msgstr "Bordo per la soglia di attivazione"
+
+#: ../clutter/clutter-gesture-action.c:685
+msgid "The trigger edge used by the action"
+msgstr "Il bordo di attivazione usato dall'azione"
+
+#: ../clutter/clutter-gesture-action.c:704
+#| msgid "Threshold Trigger Edge"
+msgid "Threshold Trigger Horizontal Distance"
+msgstr "Distanza per la soglia di attivazione orizzontale"
+
+#: ../clutter/clutter-gesture-action.c:705
+#| msgid "The trigger edge used by the action"
+msgid "The horizontal trigger distance used by the action"
+msgstr "La distanza di attivazione orizzontale usata dall'azione"
+
+#: ../clutter/clutter-gesture-action.c:723
+#| msgid "Threshold Trigger Edge"
+msgid "Threshold Trigger Vertical Distance"
+msgstr "Distanza per la soglia di attivazione verticale"
+
+#: ../clutter/clutter-gesture-action.c:724
+#| msgid "The trigger edge used by the action"
+msgid "The vertical trigger distance used by the action"
+msgstr "La distanza di attivazione verticale usata dall'azione"
+
+#: ../clutter/clutter-grid-layout.c:1223
 msgid "Left attachment"
 msgstr "Allegato sinistro"
 
-#: ../clutter/clutter-grid-layout.c:1223
+#: ../clutter/clutter-grid-layout.c:1224
 msgid "The column number to attach the left side of the child to"
 msgstr ""
 "Il numero della colonna su cui allegare la parte sinistra di un widget figlio"
 
-#: ../clutter/clutter-grid-layout.c:1230
+#: ../clutter/clutter-grid-layout.c:1231
 msgid "Top attachment"
 msgstr "Allegato superiore"
 
-#: ../clutter/clutter-grid-layout.c:1231
+#: ../clutter/clutter-grid-layout.c:1232
 msgid "The row number to attach the top side of a child widget to"
 msgstr ""
 "Il numero della riga su cui allegare la parte superiore di un widget figlio"
 
-#: ../clutter/clutter-grid-layout.c:1239
+#: ../clutter/clutter-grid-layout.c:1240
 msgid "The number of columns that a child spans"
 msgstr "Il numero di colonne attraversate da un figlio"
 
-#: ../clutter/clutter-grid-layout.c:1246
+#: ../clutter/clutter-grid-layout.c:1247
 msgid "The number of rows that a child spans"
 msgstr "Il numero di righe attraversate da un figlio"
 
-#: ../clutter/clutter-grid-layout.c:1565
+#: ../clutter/clutter-grid-layout.c:1564
 msgid "Row spacing"
 msgstr "Spaziatura riga"
 
-#: ../clutter/clutter-grid-layout.c:1566
+#: ../clutter/clutter-grid-layout.c:1565
 msgid "The amount of space between two consecutive rows"
 msgstr "Lo spazio tra due righe consecutive"
 
-#: ../clutter/clutter-grid-layout.c:1579
+#: ../clutter/clutter-grid-layout.c:1578
 msgid "Column spacing"
 msgstr "Spaziatura colonna"
 
-#: ../clutter/clutter-grid-layout.c:1580
+#: ../clutter/clutter-grid-layout.c:1579
 msgid "The amount of space between two consecutive columns"
 msgstr "Lo spazio tra due colonne consecutive"
 
-#: ../clutter/clutter-grid-layout.c:1594
+#: ../clutter/clutter-grid-layout.c:1593
 msgid "Row Homogeneous"
 msgstr "Righe omogenee"
 
-#: ../clutter/clutter-grid-layout.c:1595
+#: ../clutter/clutter-grid-layout.c:1594
 msgid "If TRUE, the rows are all the same height"
 msgstr "Se VERO, le righe hanno tutte la stessa altezza"
 
-#: ../clutter/clutter-grid-layout.c:1608
+#: ../clutter/clutter-grid-layout.c:1607
 msgid "Column Homogeneous"
 msgstr "Colonne omogenee"
 
-#: ../clutter/clutter-grid-layout.c:1609
+#: ../clutter/clutter-grid-layout.c:1608
 msgid "If TRUE, the columns are all the same width"
 msgstr "Se VERO, le colonne hanno tutte la stessa larghezza"
 
-#: ../clutter/clutter-image.c:248 ../clutter/clutter-image.c:311
-#: ../clutter/clutter-image.c:399
+#: ../clutter/clutter-image.c:249 ../clutter/clutter-image.c:312
+#: ../clutter/clutter-image.c:400
 msgid "Unable to load image data"
 msgstr "Impossibile caricare i dati dell'immagine"
 
-#: ../clutter/clutter-input-device.c:242
+#: ../clutter/clutter-input-device.c:231
 msgid "Id"
 msgstr "Id"
 
-#: ../clutter/clutter-input-device.c:243
+#: ../clutter/clutter-input-device.c:232
 msgid "Unique identifier of the device"
 msgstr "Identificativo unico del dispositivo"
 
-#: ../clutter/clutter-input-device.c:259
+#: ../clutter/clutter-input-device.c:248
 msgid "The name of the device"
 msgstr "Il nome del dispositivo"
 
-#: ../clutter/clutter-input-device.c:273
+#: ../clutter/clutter-input-device.c:262
 msgid "Device Type"
 msgstr "Tipo di dispositivo"
 
-#: ../clutter/clutter-input-device.c:274
+#: ../clutter/clutter-input-device.c:263
 msgid "The type of the device"
 msgstr "Il tipo di dispositivo"
 
-#: ../clutter/clutter-input-device.c:289
+#: ../clutter/clutter-input-device.c:278
 msgid "Device Manager"
 msgstr "Gestore dispositivo"
 
-#: ../clutter/clutter-input-device.c:290
+#: ../clutter/clutter-input-device.c:279
 msgid "The device manager instance"
 msgstr "L'istanza del gestore del dispositivo"
 
-#: ../clutter/clutter-input-device.c:303
+#: ../clutter/clutter-input-device.c:292
 msgid "Device Mode"
 msgstr "Modalità dispositivo"
 
-#: ../clutter/clutter-input-device.c:304
+#: ../clutter/clutter-input-device.c:293
 msgid "The mode of the device"
 msgstr "La modalità del dispositivo"
 
-#: ../clutter/clutter-input-device.c:318
+#: ../clutter/clutter-input-device.c:307
 msgid "Has Cursor"
 msgstr "Ha il cursore"
 
-#: ../clutter/clutter-input-device.c:319
+#: ../clutter/clutter-input-device.c:308
 msgid "Whether the device has a cursor"
 msgstr "Indica se il dispositivo ha un cursore"
 
-#: ../clutter/clutter-input-device.c:338
+#: ../clutter/clutter-input-device.c:327
 msgid "Whether the device is enabled"
 msgstr "Indica se il dispositivo è abilitato"
 
-#: ../clutter/clutter-input-device.c:351
+#: ../clutter/clutter-input-device.c:340
 msgid "Number of Axes"
 msgstr "Numero di assi"
 
-#: ../clutter/clutter-input-device.c:352
+#: ../clutter/clutter-input-device.c:341
 msgid "The number of axes on the device"
 msgstr "Il numero di assi del dispositivo"
 
-#: ../clutter/clutter-input-device.c:367
+#: ../clutter/clutter-input-device.c:356
 msgid "The backend instance"
 msgstr "L'istanza del backend"
 
-#: ../clutter/clutter-interval.c:506
+#: ../clutter/clutter-interval.c:553
 msgid "Value Type"
 msgstr "Tipo di valore"
 
-#: ../clutter/clutter-interval.c:507
+#: ../clutter/clutter-interval.c:554
 msgid "The type of the values in the interval"
 msgstr "Il tipo di valori nell'intervallo"
 
-#: ../clutter/clutter-interval.c:522
+#: ../clutter/clutter-interval.c:569
 msgid "Initial Value"
 msgstr "Valore iniziale"
 
-#: ../clutter/clutter-interval.c:523
+#: ../clutter/clutter-interval.c:570
 msgid "Initial value of the interval"
 msgstr "Valore iniziale dell'intervallo"
 
-#: ../clutter/clutter-interval.c:537
+#: ../clutter/clutter-interval.c:584
 msgid "Final Value"
 msgstr "Valore finale"
 
-#: ../clutter/clutter-interval.c:538
+#: ../clutter/clutter-interval.c:585
 msgid "Final value of the interval"
 msgstr "Valore finale dell'intervallo"
 
@@ -1284,97 +1357,97 @@ msgstr "Il gestore che ha creato questo dato"
 #. * Do NOT translate it to non-English e.g. "predefinito:LTR"! If
 #. * it isn't default:LTR or default:RTL it will not work.
 #.
-#: ../clutter/clutter-main.c:772
+#: ../clutter/clutter-main.c:795
 msgid "default:LTR"
 msgstr "default:LTR"
 
-#: ../clutter/clutter-main.c:1646
+#: ../clutter/clutter-main.c:1622
 msgid "Show frames per second"
 msgstr "Mostra i fotogrammi per secondo"
 
-#: ../clutter/clutter-main.c:1648
+#: ../clutter/clutter-main.c:1624
 msgid "Default frame rate"
 msgstr "Framerate predefinito"
 
-#: ../clutter/clutter-main.c:1650
+#: ../clutter/clutter-main.c:1626
 msgid "Make all warnings fatal"
 msgstr "Rende tutti i warning critici"
 
-#: ../clutter/clutter-main.c:1653
+#: ../clutter/clutter-main.c:1629
 msgid "Direction for the text"
 msgstr "Direzione del testo"
 
-#: ../clutter/clutter-main.c:1656
+#: ../clutter/clutter-main.c:1632
 msgid "Disable mipmapping on text"
 msgstr "Disabilita il mipmapping sul testo"
 
-#: ../clutter/clutter-main.c:1659
+#: ../clutter/clutter-main.c:1635
 msgid "Use 'fuzzy' picking"
 msgstr "Usa il picking \"fuzzy\""
 
-#: ../clutter/clutter-main.c:1662
+#: ../clutter/clutter-main.c:1638
 msgid "Clutter debugging flags to set"
 msgstr "Flag per il debug di Clutter da attivare"
 
-#: ../clutter/clutter-main.c:1664
+#: ../clutter/clutter-main.c:1640
 msgid "Clutter debugging flags to unset"
 msgstr "Flag per il debug di Clutter da disattivare"
 
-#: ../clutter/clutter-main.c:1668
+#: ../clutter/clutter-main.c:1644
 msgid "Clutter profiling flags to set"
 msgstr "Flag per il profiling di Clutter da attivare"
 
-#: ../clutter/clutter-main.c:1670
+#: ../clutter/clutter-main.c:1646
 msgid "Clutter profiling flags to unset"
 msgstr "Flag per il profiling di Clutter da disattivare"
 
-#: ../clutter/clutter-main.c:1673
+#: ../clutter/clutter-main.c:1649
 msgid "Enable accessibility"
 msgstr "Attiva l'accessibilità"
 
-#: ../clutter/clutter-main.c:1865
+#: ../clutter/clutter-main.c:1841
 msgid "Clutter Options"
 msgstr "Opzioni di Clutter"
 
-#: ../clutter/clutter-main.c:1866
+#: ../clutter/clutter-main.c:1842
 msgid "Show Clutter Options"
 msgstr "Mostra le opzioni di Clutter"
 
-#: ../clutter/clutter-pan-action.c:448
+#: ../clutter/clutter-pan-action.c:455
 msgid "Pan Axis"
 msgstr "Asse per la panoramica"
 
-#: ../clutter/clutter-pan-action.c:449
+#: ../clutter/clutter-pan-action.c:456
 msgid "Constraints the panning to an axis"
 msgstr "Vincola la panoramica a un solo asse"
 
-#: ../clutter/clutter-pan-action.c:463
+#: ../clutter/clutter-pan-action.c:470
 msgid "Interpolate"
 msgstr "Interpolazione"
 
-#: ../clutter/clutter-pan-action.c:464
+#: ../clutter/clutter-pan-action.c:471
 msgid "Whether interpolated events emission is enabled."
 msgstr "Indica se l'emissione di eventi interpolati è abilitata"
 
-#: ../clutter/clutter-pan-action.c:480
+#: ../clutter/clutter-pan-action.c:487
 msgid "Deceleration"
 msgstr "Decelerazione"
 
-#: ../clutter/clutter-pan-action.c:481
+#: ../clutter/clutter-pan-action.c:488
 msgid "Rate at which the interpolated panning will decelerate in"
 msgstr "A che velocità viene rallentata la panoramica interpolata"
 
-#: ../clutter/clutter-pan-action.c:498
+#: ../clutter/clutter-pan-action.c:505
 msgid "Initial acceleration factor"
 msgstr "Fattore iniziale di accelerazione"
 
-#: ../clutter/clutter-pan-action.c:499
+#: ../clutter/clutter-pan-action.c:506
 msgid "Factor applied to the momentum when starting the interpolated phase"
 msgstr ""
 "Fattore applicato al momento quando viene avviata la fase di interpolazione"
 
 #: ../clutter/clutter-path-constraint.c:212
-#: ../clutter/deprecated/clutter-behaviour-path.c:225
+#: ../clutter/deprecated/clutter-behaviour-path.c:221
 msgid "Path"
 msgstr "Percorso"
 
@@ -1386,87 +1459,87 @@ msgstr "Il percorso usato per vincolare un attore"
 msgid "The offset along the path, between -1.0 and 2.0"
 msgstr "L'offset sul percorso, tra -1.0 e 2.0"
 
-#: ../clutter/clutter-property-transition.c:271
+#: ../clutter/clutter-property-transition.c:269
 msgid "Property Name"
 msgstr "Nome proprietà"
 
-#: ../clutter/clutter-property-transition.c:272
+#: ../clutter/clutter-property-transition.c:270
 msgid "The name of the property to animate"
 msgstr "Il nome della proprietà da animare"
 
-#: ../clutter/clutter-script.c:466
+#: ../clutter/clutter-script.c:464
 msgid "Filename Set"
 msgstr "Imposta il nome del file"
 
-#: ../clutter/clutter-script.c:467
+#: ../clutter/clutter-script.c:465
 msgid "Whether the :filename property is set"
 msgstr "Se la proprietà nome del file è impostata"
 
-#: ../clutter/clutter-script.c:481
-#: ../clutter/deprecated/clutter-texture.c:1082
+#: ../clutter/clutter-script.c:479
+#: ../clutter/deprecated/clutter-texture.c:1080
 msgid "Filename"
 msgstr "Nome del file"
 
-#: ../clutter/clutter-script.c:482
+#: ../clutter/clutter-script.c:480
 msgid "The path of the currently parsed file"
 msgstr "Il percorso del file attuale analizzato"
 
-#: ../clutter/clutter-script.c:499
+#: ../clutter/clutter-script.c:497
 msgid "Translation Domain"
 msgstr "Dominio di traduzione"
 
-#: ../clutter/clutter-script.c:500
+#: ../clutter/clutter-script.c:498
 msgid "The translation domain used to localize string"
 msgstr "Il dominio di traduzione utilizzato per tradurre una stringa"
 
-#: ../clutter/clutter-scroll-actor.c:263
+#: ../clutter/clutter-scroll-actor.c:189
 msgid "Scroll Mode"
 msgstr "Modalità scorrimento"
 
-#: ../clutter/clutter-scroll-actor.c:264
+#: ../clutter/clutter-scroll-actor.c:190
 msgid "The scrolling direction"
 msgstr "La direzione di scorrimento"
 
-#: ../clutter/clutter-settings.c:440
+#: ../clutter/clutter-settings.c:486
 msgid "Double Click Time"
 msgstr "Durata doppio-clic"
 
-#: ../clutter/clutter-settings.c:441
+#: ../clutter/clutter-settings.c:487
 msgid "The time between clicks necessary to detect a multiple click"
 msgstr "Il tempo tra i clic per determinare un clic multiplo"
 
-#: ../clutter/clutter-settings.c:456
+#: ../clutter/clutter-settings.c:502
 msgid "Double Click Distance"
 msgstr "Distanza doppio-clic"
 
-#: ../clutter/clutter-settings.c:457
+#: ../clutter/clutter-settings.c:503
 msgid "The distance between clicks necessary to detect a multiple click"
 msgstr "La distanza tra i clic per determinare un clic multiplo"
 
-#: ../clutter/clutter-settings.c:472
+#: ../clutter/clutter-settings.c:518
 msgid "Drag Threshold"
 msgstr "Soglia di trascinamento"
 
-#: ../clutter/clutter-settings.c:473
+#: ../clutter/clutter-settings.c:519
 msgid "The distance the cursor should travel before starting to drag"
 msgstr "La distanza coperta dal cursore prima di avviare il trascinamento"
 
-#: ../clutter/clutter-settings.c:488 ../clutter/clutter-text.c:3367
+#: ../clutter/clutter-settings.c:534 ../clutter/clutter-text.c:3404
 msgid "Font Name"
 msgstr "Nome carattere"
 
-#: ../clutter/clutter-settings.c:489
+#: ../clutter/clutter-settings.c:535
 msgid ""
 "The description of the default font, as one that could be parsed by Pango"
 msgstr ""
 "La descrizione del carattere predefinito, come una descrizione leggibile da "
 "Pango"
 
-#: ../clutter/clutter-settings.c:504
+#: ../clutter/clutter-settings.c:550
 msgid "Font Antialias"
 msgstr "Antialas carattere"
 
-#: ../clutter/clutter-settings.c:505
+#: ../clutter/clutter-settings.c:551
 msgid ""
 "Whether to use antialiasing (1 to enable, 0 to disable, and -1 to use the "
 "default)"
@@ -1474,72 +1547,80 @@ msgstr ""
 "Indica se usare l'antialias (1 per abilitare, 0 per disabilitare e -1 per il "
 "predefinito)"
 
-#: ../clutter/clutter-settings.c:521
+#: ../clutter/clutter-settings.c:567 ../clutter/clutter-settings.c:575
 msgid "Font DPI"
 msgstr "DPI carattere"
 
-#: ../clutter/clutter-settings.c:522
+#: ../clutter/clutter-settings.c:568 ../clutter/clutter-settings.c:576
 msgid ""
 "The resolution of the font, in 1024 * dots/inch, or -1 to use the default"
 msgstr ""
 "La risoluzione del carattere, espressa come 1024 * dot/inch o -1 per il "
 "valore predefinito"
 
-#: ../clutter/clutter-settings.c:538
+#: ../clutter/clutter-settings.c:592
 msgid "Font Hinting"
 msgstr "Hinting del carattere"
 
-#: ../clutter/clutter-settings.c:539
+#: ../clutter/clutter-settings.c:593
 msgid ""
 "Whether to use hinting (1 to enable, 0 to disable and -1 to use the default)"
 msgstr ""
 "Indica se usare l'hinting (1 per abilitare, 0 per disabilitare e -1 per il "
 "predefinito)"
 
-#: ../clutter/clutter-settings.c:560
+#: ../clutter/clutter-settings.c:614
 msgid "Font Hint Style"
 msgstr "Stile di hint del carattere"
 
-#: ../clutter/clutter-settings.c:561
+#: ../clutter/clutter-settings.c:615
 msgid "The style of hinting (hintnone, hintslight, hintmedium, hintfull)"
 msgstr "Lo stile dell'hinting (hintnone, hintslight, hintmedium, hintfull)"
 
-#: ../clutter/clutter-settings.c:582
+#: ../clutter/clutter-settings.c:636
 msgid "Font Subpixel Order"
 msgstr "Ordine sub-pixel del carattere"
 
-#: ../clutter/clutter-settings.c:583
+#: ../clutter/clutter-settings.c:637
 msgid "The type of subpixel antialiasing (none, rgb, bgr, vrgb, vbgr)"
 msgstr "Il tipo di antialias sub-pixel (none, rgb, bgr, vrgb, vbgr)"
 
-#: ../clutter/clutter-settings.c:600
+#: ../clutter/clutter-settings.c:654
 msgid "The minimum duration for a long press gesture to be recognized"
 msgstr ""
 "La durata minima di una pressione lunga per essere riconosciuta come gesto"
 
-#: ../clutter/clutter-settings.c:607
+#: ../clutter/clutter-settings.c:661
+msgid "Window Scaling Factor"
+msgstr "Fattore di scala della finestra"
+
+#: ../clutter/clutter-settings.c:662
+msgid "The scaling factor to be applied to windows"
+msgstr "Il fattore di scala da applicare alle finestre"
+
+#: ../clutter/clutter-settings.c:669
 msgid "Fontconfig configuration timestamp"
 msgstr "Marcatura oraria della configurazione fontconfig"
 
-#: ../clutter/clutter-settings.c:608
+#: ../clutter/clutter-settings.c:670
 msgid "Timestamp of the current fontconfig configuration"
 msgstr "Marcatura oraria della configurazione fontconfig corrente"
 
-#: ../clutter/clutter-settings.c:625
+#: ../clutter/clutter-settings.c:687
 msgid "Password Hint Time"
 msgstr "Tempo suggerimento della password"
 
-#: ../clutter/clutter-settings.c:626
+#: ../clutter/clutter-settings.c:688
 msgid "How long to show the last input character in hidden entries"
 msgstr ""
 "Quanto a lungo deve essere mostrato l'ultimo carattere nei campi di testo "
 "segreti"
 
-#: ../clutter/clutter-shader-effect.c:486
+#: ../clutter/clutter-shader-effect.c:485
 msgid "Shader Type"
 msgstr "Tipo di shader"
 
-#: ../clutter/clutter-shader-effect.c:487
+#: ../clutter/clutter-shader-effect.c:486
 msgid "The type of shader used"
 msgstr "Il tipo di shader usato"
 
@@ -1567,761 +1648,705 @@ msgstr "Il bordo della fonte che dovrebbe essere spezzato"
 msgid "The offset in pixels to apply to the constraint"
 msgstr "Lo spostamento in pixel da applicare al vincolo"
 
-#: ../clutter/clutter-stage.c:1895
+#: ../clutter/clutter-stage.c:1899
 msgid "Fullscreen Set"
 msgstr "Imposta a schermo intero"
 
-#: ../clutter/clutter-stage.c:1896
+#: ../clutter/clutter-stage.c:1900
 msgid "Whether the main stage is fullscreen"
 msgstr "Se il livello principale è a schermo intero"
 
-#: ../clutter/clutter-stage.c:1910
+#: ../clutter/clutter-stage.c:1914
 msgid "Offscreen"
 msgstr "Fuorischermo"
 
-#: ../clutter/clutter-stage.c:1911
+#: ../clutter/clutter-stage.c:1915
 msgid "Whether the main stage should be rendered offscreen"
 msgstr "Se il livello principale dovrebbe essere renderizzato fuori schermo"
 
-#: ../clutter/clutter-stage.c:1923 ../clutter/clutter-text.c:3481
+#: ../clutter/clutter-stage.c:1927 ../clutter/clutter-text.c:3518
 msgid "Cursor Visible"
 msgstr "Cursore visibile"
 
-#: ../clutter/clutter-stage.c:1924
+#: ../clutter/clutter-stage.c:1928
 msgid "Whether the mouse pointer is visible on the main stage"
 msgstr "Se il puntatore del mouse è visibile sul livello principale"
 
-#: ../clutter/clutter-stage.c:1938
+#: ../clutter/clutter-stage.c:1942
 msgid "User Resizable"
 msgstr "Ridimensionabile dall'utente"
 
-#: ../clutter/clutter-stage.c:1939
+#: ../clutter/clutter-stage.c:1943
 msgid "Whether the stage is able to be resized via user interaction"
 msgstr ""
 "Se il livello può essere ridimensionato attraverso l'interazione dell'utente"
 
-#: ../clutter/clutter-stage.c:1954 ../clutter/deprecated/clutter-box.c:260
-#: ../clutter/deprecated/clutter-rectangle.c:273
+#: ../clutter/clutter-stage.c:1958 ../clutter/deprecated/clutter-box.c:256
+#: ../clutter/deprecated/clutter-rectangle.c:270
 msgid "Color"
 msgstr "Colore"
 
-#: ../clutter/clutter-stage.c:1955
+#: ../clutter/clutter-stage.c:1959
 msgid "The color of the stage"
 msgstr "Il colore del livello"
 
-#: ../clutter/clutter-stage.c:1970
+#: ../clutter/clutter-stage.c:1974
 msgid "Perspective"
 msgstr "Prospettiva"
 
-#: ../clutter/clutter-stage.c:1971
+#: ../clutter/clutter-stage.c:1975
 msgid "Perspective projection parameters"
 msgstr "Parametri di proiezione prospettica"
 
-#: ../clutter/clutter-stage.c:1986
+#: ../clutter/clutter-stage.c:1990
 msgid "Title"
 msgstr "Titolo"
 
-#: ../clutter/clutter-stage.c:1987
+#: ../clutter/clutter-stage.c:1991
 msgid "Stage Title"
 msgstr "Titolo del livello"
 
-#: ../clutter/clutter-stage.c:2004
+#: ../clutter/clutter-stage.c:2008
 msgid "Use Fog"
 msgstr "Usa nebbia"
 
-#: ../clutter/clutter-stage.c:2005
+#: ../clutter/clutter-stage.c:2009
 msgid "Whether to enable depth cueing"
 msgstr "Indica se abilitare il depth cueing"
 
-#: ../clutter/clutter-stage.c:2021
+#: ../clutter/clutter-stage.c:2025
 msgid "Fog"
 msgstr "Nebbia"
 
-#: ../clutter/clutter-stage.c:2022
+#: ../clutter/clutter-stage.c:2026
 msgid "Settings for the depth cueing"
 msgstr "Impostazioni per il depth cueing"
 
-#: ../clutter/clutter-stage.c:2038
+#: ../clutter/clutter-stage.c:2042
 msgid "Use Alpha"
 msgstr "Usa Alpha"
 
-#: ../clutter/clutter-stage.c:2039
+#: ../clutter/clutter-stage.c:2043
 msgid "Whether to honour the alpha component of the stage color"
 msgstr "Se rispettare il componente alpha del colore del livello"
 
-#: ../clutter/clutter-stage.c:2055
+#: ../clutter/clutter-stage.c:2059
 msgid "Key Focus"
 msgstr "Fuoco chiave"
 
-#: ../clutter/clutter-stage.c:2056
+#: ../clutter/clutter-stage.c:2060
 msgid "The currently key focused actor"
 msgstr "L'attore chiave attuale con fuoco"
 
-#: ../clutter/clutter-stage.c:2072
+#: ../clutter/clutter-stage.c:2076
 msgid "No Clear Hint"
 msgstr "Suggerimento per nessuna pulizia"
 
-#: ../clutter/clutter-stage.c:2073
+#: ../clutter/clutter-stage.c:2077
 msgid "Whether the stage should clear its contents"
 msgstr "Indica se lo stadio debba ripulire il proprio contenuto"
 
-#: ../clutter/clutter-stage.c:2086
+#: ../clutter/clutter-stage.c:2090
 msgid "Accept Focus"
 msgstr "Accetta il focus"
 
-#: ../clutter/clutter-stage.c:2087
+#: ../clutter/clutter-stage.c:2091
 msgid "Whether the stage should accept focus on show"
 msgstr "Indica se lo stadio debba accettare il focus alla visualizzazione"
 
-#: ../clutter/clutter-table-layout.c:543
-msgid "Column Number"
-msgstr "Numero colonna"
-
-#: ../clutter/clutter-table-layout.c:544
-msgid "The column the widget resides in"
-msgstr "La colonna su cui risiede il widget"
-
-#: ../clutter/clutter-table-layout.c:551
-msgid "Row Number"
-msgstr "Numero riga"
-
-#: ../clutter/clutter-table-layout.c:552
-msgid "The row the widget resides in"
-msgstr "La riga su cui risiede il widget"
-
-#: ../clutter/clutter-table-layout.c:559
-msgid "Column Span"
-msgstr "Estensione colonna"
-
-#: ../clutter/clutter-table-layout.c:560
-msgid "The number of columns the widget should span"
-msgstr "Il numero di colonne che il widget dovrebbe coprire"
-
-#: ../clutter/clutter-table-layout.c:567
-msgid "Row Span"
-msgstr "Estensione riga"
-
-#: ../clutter/clutter-table-layout.c:568
-msgid "The number of rows the widget should span"
-msgstr "Il numero di righe che il widget dovrebbe coprire"
-
-#: ../clutter/clutter-table-layout.c:575
-msgid "Horizontal Expand"
-msgstr "Espansione orizzontale"
-
-#: ../clutter/clutter-table-layout.c:576
-msgid "Allocate extra space for the child in horizontal axis"
-msgstr "Alloca spazio aggiuntivo sull'asse orizzontale per il figlio"
-
-#: ../clutter/clutter-table-layout.c:582
-msgid "Vertical Expand"
-msgstr "Espansione verticale"
-
-#: ../clutter/clutter-table-layout.c:583
-msgid "Allocate extra space for the child in vertical axis"
-msgstr "Alloca spazio aggiuntivo sull'asse verticale per il figlio"
-
-#: ../clutter/clutter-table-layout.c:1638
-msgid "Spacing between columns"
-msgstr "Lo spazio tra le colonne"
-
-#: ../clutter/clutter-table-layout.c:1652
-msgid "Spacing between rows"
-msgstr "Lo spazio tra le righe"
-
-#: ../clutter/clutter-text-buffer.c:351 ../clutter/clutter-text.c:3402
+#: ../clutter/clutter-text-buffer.c:347 ../clutter/clutter-text.c:3439
 msgid "Text"
 msgstr "Testo"
 
-#: ../clutter/clutter-text-buffer.c:352
+#: ../clutter/clutter-text-buffer.c:348
 msgid "The contents of the buffer"
 msgstr "Il contenuto del buffer"
 
-#: ../clutter/clutter-text-buffer.c:365
+#: ../clutter/clutter-text-buffer.c:361
 msgid "Text length"
 msgstr "Lunghezza testo"
 
-#: ../clutter/clutter-text-buffer.c:366
+#: ../clutter/clutter-text-buffer.c:362
 msgid "Length of the text currently in the buffer"
 msgstr "La lunghezza del testo attualmente nel buffer"
 
-#: ../clutter/clutter-text-buffer.c:379
+#: ../clutter/clutter-text-buffer.c:375
 msgid "Maximum length"
 msgstr "Lunghezza massima"
 
-#: ../clutter/clutter-text-buffer.c:380
+#: ../clutter/clutter-text-buffer.c:376
 msgid "Maximum number of characters for this entry. Zero if no maximum"
 msgstr "Il massimo numero di caratteri per questa voce, 0 per nessun massimo"
 
-#: ../clutter/clutter-text.c:3349
+#: ../clutter/clutter-text.c:3386
 msgid "Buffer"
 msgstr "Buffer"
 
-#: ../clutter/clutter-text.c:3350
+#: ../clutter/clutter-text.c:3387
 msgid "The buffer for the text"
 msgstr "Il buffer per il testo"
 
-#: ../clutter/clutter-text.c:3368
+#: ../clutter/clutter-text.c:3405
 msgid "The font to be used by the text"
 msgstr "Il carattere utilizzato dal testo"
 
-#: ../clutter/clutter-text.c:3385
+#: ../clutter/clutter-text.c:3422
 msgid "Font Description"
 msgstr "Descrizione carattere"
 
-#: ../clutter/clutter-text.c:3386
+#: ../clutter/clutter-text.c:3423
 msgid "The font description to be used"
 msgstr "La descrizione del carattere da usare"
 
-#: ../clutter/clutter-text.c:3403
+#: ../clutter/clutter-text.c:3440
 msgid "The text to render"
 msgstr "Il testo da riprodurre"
 
-#: ../clutter/clutter-text.c:3417
+#: ../clutter/clutter-text.c:3454
 msgid "Font Color"
 msgstr "Colore carattere"
 
-#: ../clutter/clutter-text.c:3418
+#: ../clutter/clutter-text.c:3455
 msgid "Color of the font used by the text"
 msgstr "Il colore del carattere usato dal testo"
 
-#: ../clutter/clutter-text.c:3433
+#: ../clutter/clutter-text.c:3470
 msgid "Editable"
 msgstr "Modificabile"
 
-#: ../clutter/clutter-text.c:3434
+#: ../clutter/clutter-text.c:3471
 msgid "Whether the text is editable"
 msgstr "Se il testo è modificabile"
 
-#: ../clutter/clutter-text.c:3449
+#: ../clutter/clutter-text.c:3486
 msgid "Selectable"
 msgstr "Selezionabile"
 
-#: ../clutter/clutter-text.c:3450
+#: ../clutter/clutter-text.c:3487
 msgid "Whether the text is selectable"
 msgstr "Se il testo è selezionabile"
 
-#: ../clutter/clutter-text.c:3464
+#: ../clutter/clutter-text.c:3501
 msgid "Activatable"
 msgstr "Attivabile"
 
-#: ../clutter/clutter-text.c:3465
+#: ../clutter/clutter-text.c:3502
 msgid "Whether pressing return causes the activate signal to be emitted"
 msgstr "Se la pressione di invio causa l'emissione del segnale activate"
 
-#: ../clutter/clutter-text.c:3482
+#: ../clutter/clutter-text.c:3519
 msgid "Whether the input cursor is visible"
 msgstr "Se il cursore di input è visibile"
 
-#: ../clutter/clutter-text.c:3496 ../clutter/clutter-text.c:3497
+#: ../clutter/clutter-text.c:3533 ../clutter/clutter-text.c:3534
 msgid "Cursor Color"
 msgstr "Colore del cursore"
 
-#: ../clutter/clutter-text.c:3512
+#: ../clutter/clutter-text.c:3549
 msgid "Cursor Color Set"
 msgstr "Imposta colore cursore"
 
-#: ../clutter/clutter-text.c:3513
+#: ../clutter/clutter-text.c:3550
 msgid "Whether the cursor color has been set"
 msgstr "Se il colore del cursore è stato impostato"
 
-#: ../clutter/clutter-text.c:3528
+#: ../clutter/clutter-text.c:3565
 msgid "Cursor Size"
 msgstr "Dimensione cursore"
 
-#: ../clutter/clutter-text.c:3529
+#: ../clutter/clutter-text.c:3566
 msgid "The width of the cursor, in pixels"
 msgstr "La larghezza del cursore, in pixel"
 
-#: ../clutter/clutter-text.c:3545 ../clutter/clutter-text.c:3563
+#: ../clutter/clutter-text.c:3582 ../clutter/clutter-text.c:3600
 msgid "Cursor Position"
 msgstr "Posizione cursore"
 
-#: ../clutter/clutter-text.c:3546 ../clutter/clutter-text.c:3564
+#: ../clutter/clutter-text.c:3583 ../clutter/clutter-text.c:3601
 msgid "The cursor position"
 msgstr "La posizione del cursore"
 
-#: ../clutter/clutter-text.c:3579
+#: ../clutter/clutter-text.c:3616
 msgid "Selection-bound"
 msgstr "Rettangolo di selezione"
 
-#: ../clutter/clutter-text.c:3580
+#: ../clutter/clutter-text.c:3617
 msgid "The cursor position of the other end of the selection"
 msgstr "La posizione del cursore dell'altro capo della selezione"
 
-#: ../clutter/clutter-text.c:3595 ../clutter/clutter-text.c:3596
+#: ../clutter/clutter-text.c:3632 ../clutter/clutter-text.c:3633
 msgid "Selection Color"
 msgstr "Colore selezione"
 
-#: ../clutter/clutter-text.c:3611
+#: ../clutter/clutter-text.c:3648
 msgid "Selection Color Set"
 msgstr "Imposta il colore selezione"
 
-#: ../clutter/clutter-text.c:3612
+#: ../clutter/clutter-text.c:3649
 msgid "Whether the selection color has been set"
 msgstr "Se il colore della selezione è stato impostato"
 
-#: ../clutter/clutter-text.c:3627
+#: ../clutter/clutter-text.c:3664
 msgid "Attributes"
 msgstr "Attributi"
 
-#: ../clutter/clutter-text.c:3628
+#: ../clutter/clutter-text.c:3665
 msgid "A list of style attributes to apply to the contents of the actor"
 msgstr "Una lista di attributi di stile da applicare ai contenuti degli attori"
 
-#: ../clutter/clutter-text.c:3650
+#: ../clutter/clutter-text.c:3687
 msgid "Use markup"
 msgstr "Usa marcatura"
 
-#: ../clutter/clutter-text.c:3651
+#: ../clutter/clutter-text.c:3688
 msgid "Whether or not the text includes Pango markup"
 msgstr "Se il testo include o meno la marcatura Pango"
 
-#: ../clutter/clutter-text.c:3667
+#: ../clutter/clutter-text.c:3704
 msgid "Line wrap"
 msgstr "Ritorno a capo"
 
-#: ../clutter/clutter-text.c:3668
+#: ../clutter/clutter-text.c:3705
 msgid "If set, wrap the lines if the text becomes too wide"
 msgstr "Se impostato, manda a capo le righe se il testo diviene troppo largo"
 
-#: ../clutter/clutter-text.c:3683
+#: ../clutter/clutter-text.c:3720
 msgid "Line wrap mode"
 msgstr "Modalità ritorno a capo"
 
-#: ../clutter/clutter-text.c:3684
+#: ../clutter/clutter-text.c:3721
 msgid "Control how line-wrapping is done"
 msgstr "Controlla come il ritorno a capo è fatto"
 
-#: ../clutter/clutter-text.c:3699
+#: ../clutter/clutter-text.c:3736
 msgid "Ellipsize"
 msgstr "Punteggiatura"
 
-#: ../clutter/clutter-text.c:3700
+#: ../clutter/clutter-text.c:3737
 msgid "The preferred place to ellipsize the string"
 msgstr "Il punto preferito per punteggiare la stringa"
 
-#: ../clutter/clutter-text.c:3716
+#: ../clutter/clutter-text.c:3753
 msgid "Line Alignment"
 msgstr "Allineamento riga"
 
-#: ../clutter/clutter-text.c:3717
+#: ../clutter/clutter-text.c:3754
 msgid "The preferred alignment for the string, for multi-line text"
 msgstr "L'allineamento preferito per la stringa, per il testo a righe multiple"
 
-#: ../clutter/clutter-text.c:3733
+#: ../clutter/clutter-text.c:3770
 msgid "Justify"
 msgstr "Giustifica"
 
-#: ../clutter/clutter-text.c:3734
+#: ../clutter/clutter-text.c:3771
 msgid "Whether the text should be justified"
 msgstr "Se il testo dovrebbe essere giustificato"
 
-#: ../clutter/clutter-text.c:3749
+#: ../clutter/clutter-text.c:3786
 msgid "Password Character"
 msgstr "Carattere password"
 
-#: ../clutter/clutter-text.c:3750
+#: ../clutter/clutter-text.c:3787
 msgid "If non-zero, use this character to display the actor's contents"
 msgstr ""
 "Se non zero, usa questo carattere per mostrare il contenuto degli attori"
 
-#: ../clutter/clutter-text.c:3764
+#: ../clutter/clutter-text.c:3801
 msgid "Max Length"
 msgstr "Lunghezza massima"
 
-#: ../clutter/clutter-text.c:3765
+#: ../clutter/clutter-text.c:3802
 msgid "Maximum length of the text inside the actor"
 msgstr "Lunghezza massima del testo all'interno dell'attore"
 
-#: ../clutter/clutter-text.c:3788
+#: ../clutter/clutter-text.c:3825
 msgid "Single Line Mode"
 msgstr "Modalità linea singola"
 
-#: ../clutter/clutter-text.c:3789
+#: ../clutter/clutter-text.c:3826
 msgid "Whether the text should be a single line"
 msgstr "Se il testo dovrebbe essere in una linea singola"
 
-#: ../clutter/clutter-text.c:3803 ../clutter/clutter-text.c:3804
+#: ../clutter/clutter-text.c:3840 ../clutter/clutter-text.c:3841
 msgid "Selected Text Color"
 msgstr "Colore del testo selezionato"
 
-#: ../clutter/clutter-text.c:3819
+#: ../clutter/clutter-text.c:3856
 msgid "Selected Text Color Set"
 msgstr "Imposta il colore del testo selezionato"
 
-#: ../clutter/clutter-text.c:3820
+#: ../clutter/clutter-text.c:3857
 msgid "Whether the selected text color has been set"
 msgstr "Indica se il colore del testo selezionato è stato impostato"
 
-#: ../clutter/clutter-timeline.c:561
-#: ../clutter/deprecated/clutter-animation.c:560
+#: ../clutter/clutter-timeline.c:593
+#: ../clutter/deprecated/clutter-animation.c:557
 msgid "Loop"
 msgstr "Ciclo"
 
-#: ../clutter/clutter-timeline.c:562
+#: ../clutter/clutter-timeline.c:594
 msgid "Should the timeline automatically restart"
 msgstr "Se la timeline deve ricominciare automaticamente"
 
-#: ../clutter/clutter-timeline.c:576
+#: ../clutter/clutter-timeline.c:608
 msgid "Delay"
 msgstr "Ritardo"
 
-#: ../clutter/clutter-timeline.c:577
+#: ../clutter/clutter-timeline.c:609
 msgid "Delay before start"
 msgstr "Ritardo prima di iniziare"
 
-#: ../clutter/clutter-timeline.c:592
-#: ../clutter/deprecated/clutter-animation.c:544
-#: ../clutter/deprecated/clutter-animator.c:1804
+#: ../clutter/clutter-timeline.c:624
+#: ../clutter/deprecated/clutter-animation.c:541
+#: ../clutter/deprecated/clutter-animator.c:1801
 #: ../clutter/deprecated/clutter-media.c:224
-#: ../clutter/deprecated/clutter-state.c:1523
+#: ../clutter/deprecated/clutter-state.c:1517
 msgid "Duration"
 msgstr "Durata"
 
-#: ../clutter/clutter-timeline.c:593
+#: ../clutter/clutter-timeline.c:625
 msgid "Duration of the timeline in milliseconds"
 msgstr "Durata della timeline in millisecondi"
 
-#: ../clutter/clutter-timeline.c:608
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:528
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:337
+#: ../clutter/clutter-timeline.c:640
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:521
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:330
 msgid "Direction"
 msgstr "Direzione"
 
-#: ../clutter/clutter-timeline.c:609
+#: ../clutter/clutter-timeline.c:641
 msgid "Direction of the timeline"
 msgstr "Direzione della timeline"
 
-#: ../clutter/clutter-timeline.c:624
+#: ../clutter/clutter-timeline.c:656
 msgid "Auto Reverse"
 msgstr "Inversione automatica"
 
-#: ../clutter/clutter-timeline.c:625
+#: ../clutter/clutter-timeline.c:657
 msgid "Whether the direction should be reversed when reaching the end"
 msgstr ""
 "Indica se la direzione deve essere invertita quando si raggiunge la fine"
 
-#: ../clutter/clutter-timeline.c:643
+#: ../clutter/clutter-timeline.c:675
 msgid "Repeat Count"
 msgstr "Conteggio ripetizioni"
 
-#: ../clutter/clutter-timeline.c:644
+#: ../clutter/clutter-timeline.c:676
 msgid "How many times the timeline should repeat"
 msgstr "Quante volte la timeline deve ripetere"
 
-#: ../clutter/clutter-timeline.c:658
+#: ../clutter/clutter-timeline.c:690
 msgid "Progress Mode"
 msgstr "Modalità di avanzamento"
 
-#: ../clutter/clutter-timeline.c:659
+#: ../clutter/clutter-timeline.c:691
 msgid "How the timeline should compute the progress"
 msgstr "Come la timeline dovrebbe calcolare l'avanzamento"
 
-#: ../clutter/clutter-transition.c:246
+#: ../clutter/clutter-transition.c:244
 msgid "Interval"
 msgstr "Intervallo"
 
-#: ../clutter/clutter-transition.c:247
+#: ../clutter/clutter-transition.c:245
 msgid "The interval of values to transition"
 msgstr "L'intervallo di valori per la transizione"
 
-#: ../clutter/clutter-transition.c:261
+#: ../clutter/clutter-transition.c:259
 msgid "Animatable"
 msgstr "Animabile"
 
-#: ../clutter/clutter-transition.c:262
+#: ../clutter/clutter-transition.c:260
 msgid "The animatable object"
 msgstr "L'oggetto che può essere animato"
 
-#: ../clutter/clutter-transition.c:283
+#: ../clutter/clutter-transition.c:281
 msgid "Remove on Complete"
 msgstr "Rimozione al completamento"
 
-#: ../clutter/clutter-transition.c:284
+#: ../clutter/clutter-transition.c:282
 msgid "Detach the transition when completed"
 msgstr "Scollega la transizione quando completata"
 
-#: ../clutter/clutter-zoom-action.c:354
+#: ../clutter/clutter-zoom-action.c:365
 msgid "Zoom Axis"
 msgstr "Asse di zoom"
 
-#: ../clutter/clutter-zoom-action.c:355
+#: ../clutter/clutter-zoom-action.c:366
 msgid "Constraints the zoom to an axis"
 msgstr "Vincola lo zoom a un asse"
 
-#: ../clutter/deprecated/clutter-alpha.c:355
-#: ../clutter/deprecated/clutter-animation.c:575
-#: ../clutter/deprecated/clutter-animator.c:1821
+#: ../clutter/deprecated/clutter-alpha.c:354
+#: ../clutter/deprecated/clutter-animation.c:572
+#: ../clutter/deprecated/clutter-animator.c:1818
 msgid "Timeline"
 msgstr "Timeline"
 
-#: ../clutter/deprecated/clutter-alpha.c:356
+#: ../clutter/deprecated/clutter-alpha.c:355
 msgid "Timeline used by the alpha"
 msgstr "La timeline usata dall'alpha"
 
-#: ../clutter/deprecated/clutter-alpha.c:372
+#: ../clutter/deprecated/clutter-alpha.c:371
 msgid "Alpha value"
 msgstr "Valore alpha"
 
-#: ../clutter/deprecated/clutter-alpha.c:373
+#: ../clutter/deprecated/clutter-alpha.c:372
 msgid "Alpha value as computed by the alpha"
 msgstr "Valore alpha come calcolato dall'alpha"
 
-#: ../clutter/deprecated/clutter-alpha.c:394
-#: ../clutter/deprecated/clutter-animation.c:528
+#: ../clutter/deprecated/clutter-alpha.c:393
+#: ../clutter/deprecated/clutter-animation.c:525
 msgid "Mode"
 msgstr "Modalità"
 
-#: ../clutter/deprecated/clutter-alpha.c:395
+#: ../clutter/deprecated/clutter-alpha.c:394
 msgid "Progress mode"
 msgstr "Modalità di avanzamento"
 
-#: ../clutter/deprecated/clutter-animation.c:511
+#: ../clutter/deprecated/clutter-animation.c:508
 msgid "Object"
 msgstr "Oggetto"
 
-#: ../clutter/deprecated/clutter-animation.c:512
+#: ../clutter/deprecated/clutter-animation.c:509
 msgid "Object to which the animation applies"
 msgstr "Oggetto a cui l'animazione si applica"
 
-#: ../clutter/deprecated/clutter-animation.c:529
+#: ../clutter/deprecated/clutter-animation.c:526
 msgid "The mode of the animation"
 msgstr "La modalità di animazione"
 
-#: ../clutter/deprecated/clutter-animation.c:545
+#: ../clutter/deprecated/clutter-animation.c:542
 msgid "Duration of the animation, in milliseconds"
 msgstr "Durata dell'animazione, in millisecondi"
 
-#: ../clutter/deprecated/clutter-animation.c:561
+#: ../clutter/deprecated/clutter-animation.c:558
 msgid "Whether the animation should loop"
 msgstr "Se l'animazione deve ciclare"
 
-#: ../clutter/deprecated/clutter-animation.c:576
+#: ../clutter/deprecated/clutter-animation.c:573
 msgid "The timeline used by the animation"
 msgstr "La timeline usata dall'animazione"
 
-#: ../clutter/deprecated/clutter-animation.c:592
-#: ../clutter/deprecated/clutter-behaviour.c:241
+#: ../clutter/deprecated/clutter-animation.c:589
+#: ../clutter/deprecated/clutter-behaviour.c:237
 msgid "Alpha"
 msgstr "Alpha"
 
-#: ../clutter/deprecated/clutter-animation.c:593
+#: ../clutter/deprecated/clutter-animation.c:590
 msgid "The alpha used by the animation"
 msgstr "L'alpha usato dall'animazione"
 
-#: ../clutter/deprecated/clutter-animator.c:1805
+#: ../clutter/deprecated/clutter-animator.c:1802
 msgid "The duration of the animation"
 msgstr "La durata dell'animazione"
 
-#: ../clutter/deprecated/clutter-animator.c:1822
+#: ../clutter/deprecated/clutter-animator.c:1819
 msgid "The timeline of the animation"
 msgstr "La timeline dell'animazione"
 
-#: ../clutter/deprecated/clutter-behaviour.c:242
+#: ../clutter/deprecated/clutter-behaviour.c:238
 msgid "Alpha Object to drive the behaviour"
 msgstr "Oggetto alpha per guidare il comportamento"
 
-#: ../clutter/deprecated/clutter-behaviour-depth.c:182
+#: ../clutter/deprecated/clutter-behaviour-depth.c:180
 msgid "Start Depth"
 msgstr "Profondità iniziale"
 
-#: ../clutter/deprecated/clutter-behaviour-depth.c:183
+#: ../clutter/deprecated/clutter-behaviour-depth.c:181
 msgid "Initial depth to apply"
 msgstr "Profondità iniziale da applicare"
 
-#: ../clutter/deprecated/clutter-behaviour-depth.c:198
+#: ../clutter/deprecated/clutter-behaviour-depth.c:196
 msgid "End Depth"
 msgstr "Profondità finale"
 
-#: ../clutter/deprecated/clutter-behaviour-depth.c:199
+#: ../clutter/deprecated/clutter-behaviour-depth.c:197
 msgid "Final depth to apply"
 msgstr "Profondità finale da applicare"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:401
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:394
 msgid "Start Angle"
 msgstr "Angolo iniziale"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:402
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:284
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:395
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:277
 msgid "Initial angle"
 msgstr "Angolo iniziale"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:417
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:410
 msgid "End Angle"
 msgstr "Angolo finale"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:418
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:302
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:411
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:295
 msgid "Final angle"
 msgstr "Angolo finale"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:433
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:426
 msgid "Angle x tilt"
 msgstr "Inclinazione angolare X"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:434
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:427
 msgid "Tilt of the ellipse around x axis"
 msgstr "L'inclinazione dell'ellisse sull'asse X"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:449
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:442
 msgid "Angle y tilt"
 msgstr "Inclinazione angolare Y"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:450
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:443
 msgid "Tilt of the ellipse around y axis"
 msgstr "L'inclinazione dell'ellisse sull'asse Y"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:465
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:458
 msgid "Angle z tilt"
 msgstr "Inclinazione angolare Z"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:466
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:459
 msgid "Tilt of the ellipse around z axis"
 msgstr "L'inclinazione dell'ellisse sull'asse Z"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:482
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:475
 msgid "Width of the ellipse"
 msgstr "Larghezza dell'ellisse"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:498
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:491
 msgid "Height of ellipse"
 msgstr "Altezza dell'ellisse"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:513
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:506
 msgid "Center"
 msgstr "Centro"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:514
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:507
 msgid "Center of ellipse"
 msgstr "Centro dell'ellisse"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:529
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:338
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:522
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:331
 msgid "Direction of rotation"
 msgstr "Direzione della rotazione"
 
-#: ../clutter/deprecated/clutter-behaviour-opacity.c:184
+#: ../clutter/deprecated/clutter-behaviour-opacity.c:177
 msgid "Opacity Start"
 msgstr "Opacità iniziale"
 
-#: ../clutter/deprecated/clutter-behaviour-opacity.c:185
+#: ../clutter/deprecated/clutter-behaviour-opacity.c:178
 msgid "Initial opacity level"
 msgstr "Livello di opacità iniziale"
 
-#: ../clutter/deprecated/clutter-behaviour-opacity.c:202
+#: ../clutter/deprecated/clutter-behaviour-opacity.c:195
 msgid "Opacity End"
 msgstr "Opacità finale"
 
-#: ../clutter/deprecated/clutter-behaviour-opacity.c:203
+#: ../clutter/deprecated/clutter-behaviour-opacity.c:196
 msgid "Final opacity level"
 msgstr "Livello di opacità finale"
 
-#: ../clutter/deprecated/clutter-behaviour-path.c:226
+#: ../clutter/deprecated/clutter-behaviour-path.c:222
 msgid "The ClutterPath object representing the path to animate along"
 msgstr "L'oggetto ClutterPath che rappresenta il percorso dell'animazione"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:283
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:276
 msgid "Angle Begin"
 msgstr "Angolo iniziale"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:301
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:294
 msgid "Angle End"
 msgstr "Angolo finale"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:319
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:312
 msgid "Axis"
 msgstr "Assi"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:320
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:313
 msgid "Axis of rotation"
 msgstr "Assi di rotazione"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:355
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:348
 msgid "Center X"
 msgstr "Centro X"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:356
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:349
 msgid "X coordinate of the center of rotation"
 msgstr "Coordinata X del centro di rotazione"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:373
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:366
 msgid "Center Y"
 msgstr "Centro Y"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:374
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:367
 msgid "Y coordinate of the center of rotation"
 msgstr "Coordinata Y del centro di rotazione"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:391
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:384
 msgid "Center Z"
 msgstr "Centro"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:392
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:385
 msgid "Z coordinate of the center of rotation"
 msgstr "Coordinata Z del centro di rotazione"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:226
+#: ../clutter/deprecated/clutter-behaviour-scale.c:222
 msgid "X Start Scale"
 msgstr "Scala iniziale X"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:227
+#: ../clutter/deprecated/clutter-behaviour-scale.c:223
 msgid "Initial scale on the X axis"
 msgstr "Scala iniziale sull'asse X"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:245
+#: ../clutter/deprecated/clutter-behaviour-scale.c:241
 msgid "X End Scale"
 msgstr "Scala finale X"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:246
+#: ../clutter/deprecated/clutter-behaviour-scale.c:242
 msgid "Final scale on the X axis"
 msgstr "Scala finale sull'asse X"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:264
+#: ../clutter/deprecated/clutter-behaviour-scale.c:260
 msgid "Y Start Scale"
 msgstr "Scala iniziale Y"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:265
+#: ../clutter/deprecated/clutter-behaviour-scale.c:261
 msgid "Initial scale on the Y axis"
 msgstr "Scala iniziale sull'asse U"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:283
+#: ../clutter/deprecated/clutter-behaviour-scale.c:279
 msgid "Y End Scale"
 msgstr "Scala finale Y"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:284
+#: ../clutter/deprecated/clutter-behaviour-scale.c:280
 msgid "Final scale on the Y axis"
 msgstr "Scala finale sull'asse Y"
 
-#: ../clutter/deprecated/clutter-box.c:261
+#: ../clutter/deprecated/clutter-box.c:257
 msgid "The background color of the box"
 msgstr "Il colore di sfondo del box"
 
-#: ../clutter/deprecated/clutter-box.c:274
+#: ../clutter/deprecated/clutter-box.c:270
 msgid "Color Set"
 msgstr "Imposta colore"
 
-#: ../clutter/deprecated/clutter-cairo-texture.c:597
+#: ../clutter/deprecated/clutter-cairo-texture.c:593
 msgid "Surface Width"
 msgstr "Larghezza superficie"
 
-#: ../clutter/deprecated/clutter-cairo-texture.c:598
+#: ../clutter/deprecated/clutter-cairo-texture.c:594
 msgid "The width of the Cairo surface"
 msgstr "La larghezza della superficie Cairo"
 
-#: ../clutter/deprecated/clutter-cairo-texture.c:615
+#: ../clutter/deprecated/clutter-cairo-texture.c:611
 msgid "Surface Height"
 msgstr "Altezza superficie"
 
-#: ../clutter/deprecated/clutter-cairo-texture.c:616
+#: ../clutter/deprecated/clutter-cairo-texture.c:612
 msgid "The height of the Cairo surface"
 msgstr "L'altezza della superficie Cairo"
 
-#: ../clutter/deprecated/clutter-cairo-texture.c:636
+#: ../clutter/deprecated/clutter-cairo-texture.c:632
 msgid "Auto Resize"
 msgstr "Ridimensionamento automatico"
 
-#: ../clutter/deprecated/clutter-cairo-texture.c:637
+#: ../clutter/deprecated/clutter-cairo-texture.c:633
 msgid "Whether the surface should match the allocation"
 msgstr "Indica se la superficie deve corrispondere all'allocazione"
 
@@ -2393,104 +2418,160 @@ msgstr "Il livello di riempimento del buffer"
 msgid "The duration of the stream, in seconds"
 msgstr "La durata del flusso, in secondi"
 
-#: ../clutter/deprecated/clutter-rectangle.c:274
+#: ../clutter/deprecated/clutter-rectangle.c:271
 msgid "The color of the rectangle"
 msgstr "Il colore del rettangolo"
 
-#: ../clutter/deprecated/clutter-rectangle.c:287
+#: ../clutter/deprecated/clutter-rectangle.c:284
 msgid "Border Color"
 msgstr "Colore del bordo"
 
-#: ../clutter/deprecated/clutter-rectangle.c:288
+#: ../clutter/deprecated/clutter-rectangle.c:285
 msgid "The color of the border of the rectangle"
 msgstr "Il colore del bordo del rettangolo"
 
-#: ../clutter/deprecated/clutter-rectangle.c:303
+#: ../clutter/deprecated/clutter-rectangle.c:300
 msgid "Border Width"
 msgstr "Spessore bordo"
 
-#: ../clutter/deprecated/clutter-rectangle.c:304
+#: ../clutter/deprecated/clutter-rectangle.c:301
 msgid "The width of the border of the rectangle"
 msgstr "La larghezza del bordo del rettangolo"
 
-#: ../clutter/deprecated/clutter-rectangle.c:318
+#: ../clutter/deprecated/clutter-rectangle.c:315
 msgid "Has Border"
 msgstr "Ha bordo"
 
-#: ../clutter/deprecated/clutter-rectangle.c:319
+#: ../clutter/deprecated/clutter-rectangle.c:316
 msgid "Whether the rectangle should have a border"
 msgstr "Se il rettangolo dovrebbe avere un bordo"
 
-#: ../clutter/deprecated/clutter-shader.c:261
+#: ../clutter/deprecated/clutter-shader.c:257
 msgid "Vertex Source"
 msgstr "Origine vertice"
 
-#: ../clutter/deprecated/clutter-shader.c:262
+#: ../clutter/deprecated/clutter-shader.c:258
 msgid "Source of vertex shader"
 msgstr "Origine del vertex shader"
 
-#: ../clutter/deprecated/clutter-shader.c:278
+#: ../clutter/deprecated/clutter-shader.c:274
 msgid "Fragment Source"
 msgstr "Origine frammento"
 
-#: ../clutter/deprecated/clutter-shader.c:279
+#: ../clutter/deprecated/clutter-shader.c:275
 msgid "Source of fragment shader"
 msgstr "Origine del fragment shader"
 
-#: ../clutter/deprecated/clutter-shader.c:296
+#: ../clutter/deprecated/clutter-shader.c:292
 msgid "Compiled"
 msgstr "Compilato"
 
-#: ../clutter/deprecated/clutter-shader.c:297
+#: ../clutter/deprecated/clutter-shader.c:293
 msgid "Whether the shader is compiled and linked"
 msgstr "Se lo shader è compilato e collegato"
 
-#: ../clutter/deprecated/clutter-shader.c:314
+#: ../clutter/deprecated/clutter-shader.c:310
 msgid "Whether the shader is enabled"
 msgstr "Se lo shader è abilitato"
 
-#: ../clutter/deprecated/clutter-shader.c:525
+#: ../clutter/deprecated/clutter-shader.c:521
 #, c-format
 msgid "%s compilation failed: %s"
 msgstr "Compilazione di %s non riuscita: %s"
 
-#: ../clutter/deprecated/clutter-shader.c:526
+#: ../clutter/deprecated/clutter-shader.c:522
 msgid "Vertex shader"
 msgstr "Vertex shader"
 
-#: ../clutter/deprecated/clutter-shader.c:527
+#: ../clutter/deprecated/clutter-shader.c:523
 msgid "Fragment shader"
 msgstr "Fragment shader"
 
-#: ../clutter/deprecated/clutter-state.c:1505
+#: ../clutter/deprecated/clutter-state.c:1499
 msgid "State"
 msgstr "Stato"
 
-#: ../clutter/deprecated/clutter-state.c:1506
+#: ../clutter/deprecated/clutter-state.c:1500
 msgid "Currently set state, (transition to this state might not be complete)"
 msgstr ""
 "Stato attualmente impostato (la transizione a questo stato potrebbe non "
 "essere completa)"
 
-#: ../clutter/deprecated/clutter-state.c:1524
+#: ../clutter/deprecated/clutter-state.c:1518
 msgid "Default transition duration"
 msgstr "Durata predefinita delle transazioni"
 
-#: ../clutter/deprecated/clutter-texture.c:994
+#: ../clutter/deprecated/clutter-table-layout.c:543
+msgid "Column Number"
+msgstr "Numero colonna"
+
+#: ../clutter/deprecated/clutter-table-layout.c:544
+msgid "The column the widget resides in"
+msgstr "La colonna su cui risiede il widget"
+
+#: ../clutter/deprecated/clutter-table-layout.c:551
+msgid "Row Number"
+msgstr "Numero riga"
+
+#: ../clutter/deprecated/clutter-table-layout.c:552
+msgid "The row the widget resides in"
+msgstr "La riga su cui risiede il widget"
+
+#: ../clutter/deprecated/clutter-table-layout.c:559
+msgid "Column Span"
+msgstr "Estensione colonna"
+
+#: ../clutter/deprecated/clutter-table-layout.c:560
+msgid "The number of columns the widget should span"
+msgstr "Il numero di colonne che il widget dovrebbe coprire"
+
+#: ../clutter/deprecated/clutter-table-layout.c:567
+msgid "Row Span"
+msgstr "Estensione riga"
+
+#: ../clutter/deprecated/clutter-table-layout.c:568
+msgid "The number of rows the widget should span"
+msgstr "Il numero di righe che il widget dovrebbe coprire"
+
+#: ../clutter/deprecated/clutter-table-layout.c:575
+msgid "Horizontal Expand"
+msgstr "Espansione orizzontale"
+
+#: ../clutter/deprecated/clutter-table-layout.c:576
+msgid "Allocate extra space for the child in horizontal axis"
+msgstr "Alloca spazio aggiuntivo sull'asse orizzontale per il figlio"
+
+#: ../clutter/deprecated/clutter-table-layout.c:582
+msgid "Vertical Expand"
+msgstr "Espansione verticale"
+
+#: ../clutter/deprecated/clutter-table-layout.c:583
+msgid "Allocate extra space for the child in vertical axis"
+msgstr "Alloca spazio aggiuntivo sull'asse verticale per il figlio"
+
+#: ../clutter/deprecated/clutter-table-layout.c:1638
+msgid "Spacing between columns"
+msgstr "Lo spazio tra le colonne"
+
+#: ../clutter/deprecated/clutter-table-layout.c:1654
+msgid "Spacing between rows"
+msgstr "Lo spazio tra le righe"
+
+#: ../clutter/deprecated/clutter-texture.c:992
 msgid "Sync size of actor"
 msgstr "Sincronizza dimensione dell'attore"
 
-#: ../clutter/deprecated/clutter-texture.c:995
+#: ../clutter/deprecated/clutter-texture.c:993
 msgid "Auto sync size of actor to underlying pixbuf dimensions"
 msgstr ""
 "Sincronizza automaticamente la dimensione dell'attore alle dimensioni "
 "sottostanti del pixbuf"
 
-#: ../clutter/deprecated/clutter-texture.c:1002
+#: ../clutter/deprecated/clutter-texture.c:1000
 msgid "Disable Slicing"
 msgstr "Disabilita segmentazione"
 
-#: ../clutter/deprecated/clutter-texture.c:1003
+#: ../clutter/deprecated/clutter-texture.c:1001
 msgid ""
 "Forces the underlying texture to be singular and not made of smaller space "
 "saving individual textures"
@@ -2498,73 +2579,73 @@ msgstr ""
 "Forza la texture sottostante ad essere singola e non composta di segmenti di "
 "texture più piccoli"
 
-#: ../clutter/deprecated/clutter-texture.c:1012
+#: ../clutter/deprecated/clutter-texture.c:1010
 msgid "Tile Waste"
 msgstr "Scarto"
 
-#: ../clutter/deprecated/clutter-texture.c:1013
+#: ../clutter/deprecated/clutter-texture.c:1011
 msgid "Maximum waste area of a sliced texture"
 msgstr "Area di scarto massima per una texture tagliata"
 
-#: ../clutter/deprecated/clutter-texture.c:1021
+#: ../clutter/deprecated/clutter-texture.c:1019
 msgid "Horizontal repeat"
 msgstr "Ripetizione orizzontale"
 
-#: ../clutter/deprecated/clutter-texture.c:1022
+#: ../clutter/deprecated/clutter-texture.c:1020
 msgid "Repeat the contents rather than scaling them horizontally"
 msgstr "Ripetere il contenuto invece di adattarlo orizzontalmente"
 
-#: ../clutter/deprecated/clutter-texture.c:1029
+#: ../clutter/deprecated/clutter-texture.c:1027
 msgid "Vertical repeat"
 msgstr "Ripetizione verticale"
 
-#: ../clutter/deprecated/clutter-texture.c:1030
+#: ../clutter/deprecated/clutter-texture.c:1028
 msgid "Repeat the contents rather than scaling them vertically"
 msgstr "Ripetere il contenuto invece di adattarlo verticalmente"
 
-#: ../clutter/deprecated/clutter-texture.c:1037
+#: ../clutter/deprecated/clutter-texture.c:1035
 msgid "Filter Quality"
 msgstr "Qualità filtro"
 
-#: ../clutter/deprecated/clutter-texture.c:1038
+#: ../clutter/deprecated/clutter-texture.c:1036
 msgid "Rendering quality used when drawing the texture"
 msgstr "Qualità di render utilizzato nel disegnare le texture"
 
-#: ../clutter/deprecated/clutter-texture.c:1046
+#: ../clutter/deprecated/clutter-texture.c:1044
 msgid "Pixel Format"
 msgstr "Formato pixel"
 
-#: ../clutter/deprecated/clutter-texture.c:1047
+#: ../clutter/deprecated/clutter-texture.c:1045
 msgid "The Cogl pixel format to use"
 msgstr "Il formato di pixel Cogl da usare"
 
-#: ../clutter/deprecated/clutter-texture.c:1055
-#: ../clutter/wayland/clutter-wayland-surface.c:449
+#: ../clutter/deprecated/clutter-texture.c:1053
+#: ../clutter/wayland/clutter-wayland-surface.c:445
 msgid "Cogl Texture"
 msgstr "Cogl Texture"
 
-#: ../clutter/deprecated/clutter-texture.c:1056
-#: ../clutter/wayland/clutter-wayland-surface.c:450
+#: ../clutter/deprecated/clutter-texture.c:1054
+#: ../clutter/wayland/clutter-wayland-surface.c:446
 msgid "The underlying Cogl texture handle used to draw this actor"
 msgstr "La gestione della texture Cogl sottostante per disegnare questo attore"
 
-#: ../clutter/deprecated/clutter-texture.c:1063
+#: ../clutter/deprecated/clutter-texture.c:1061
 msgid "Cogl Material"
 msgstr "Materiale Cogl"
 
-#: ../clutter/deprecated/clutter-texture.c:1064
+#: ../clutter/deprecated/clutter-texture.c:1062
 msgid "The underlying Cogl material handle used to draw this actor"
 msgstr "La gestione del materiale Cogl sottostante per disegnare questo attore"
 
-#: ../clutter/deprecated/clutter-texture.c:1083
+#: ../clutter/deprecated/clutter-texture.c:1081
 msgid "The path of the file containing the image data"
 msgstr "Il percorso del file contenente i dati dell'immagine"
 
-#: ../clutter/deprecated/clutter-texture.c:1090
+#: ../clutter/deprecated/clutter-texture.c:1088
 msgid "Keep Aspect Ratio"
 msgstr "Mantieni rapporto dimensioni"
 
-#: ../clutter/deprecated/clutter-texture.c:1091
+#: ../clutter/deprecated/clutter-texture.c:1089
 msgid ""
 "Keep the aspect ratio of the texture when requesting the preferred width or "
 "height"
@@ -2572,22 +2653,22 @@ msgstr ""
 "Mantieni il rapporto delle dimensioni della texture quando è richiesta una "
 "larghezza o altezza preferita"
 
-#: ../clutter/deprecated/clutter-texture.c:1119
+#: ../clutter/deprecated/clutter-texture.c:1117
 msgid "Load asynchronously"
 msgstr "Carica in maniera asincrona"
 
-#: ../clutter/deprecated/clutter-texture.c:1120
+#: ../clutter/deprecated/clutter-texture.c:1118
 msgid ""
 "Load files inside a thread to avoid blocking when loading images from disk"
 msgstr ""
 "Carica i files dentro un thread per evitare il blocco durante il caricamento "
 "delle immagini da disco"
 
-#: ../clutter/deprecated/clutter-texture.c:1138
+#: ../clutter/deprecated/clutter-texture.c:1136
 msgid "Load data asynchronously"
 msgstr "Carica i dati in maniera asincrona"
 
-#: ../clutter/deprecated/clutter-texture.c:1139
+#: ../clutter/deprecated/clutter-texture.c:1137
 msgid ""
 "Decode image data files inside a thread to reduce blocking when loading "
 "images from disk"
@@ -2595,90 +2676,90 @@ msgstr ""
 "Decodifica i dati dei files immagine dentro un thread per ridurre il blocco "
 "nel caricamento delle immagini da disco"
 
-#: ../clutter/deprecated/clutter-texture.c:1165
+#: ../clutter/deprecated/clutter-texture.c:1163
 msgid "Pick With Alpha"
 msgstr "Cattura con Alpha"
 
-#: ../clutter/deprecated/clutter-texture.c:1166
+#: ../clutter/deprecated/clutter-texture.c:1164
 msgid "Shape actor with alpha channel when picking"
 msgstr "Attore di forma con canale alpha nella cattura"
 
-#: ../clutter/deprecated/clutter-texture.c:1599
-#: ../clutter/deprecated/clutter-texture.c:1994
-#: ../clutter/deprecated/clutter-texture.c:2090
-#: ../clutter/deprecated/clutter-texture.c:2388
+#: ../clutter/deprecated/clutter-texture.c:1597
+#: ../clutter/deprecated/clutter-texture.c:1992
+#: ../clutter/deprecated/clutter-texture.c:2088
+#: ../clutter/deprecated/clutter-texture.c:2386
 #, c-format
 msgid "Failed to load the image data"
 msgstr "Impossibile caricare i dati dell'immagine"
 
-#: ../clutter/deprecated/clutter-texture.c:1758
+#: ../clutter/deprecated/clutter-texture.c:1756
 #, c-format
 msgid "YUV textures are not supported"
 msgstr "Le texture YUV non sono supportate"
 
-#: ../clutter/deprecated/clutter-texture.c:1767
+#: ../clutter/deprecated/clutter-texture.c:1765
 #, c-format
 msgid "YUV2 textues are not supported"
 msgstr "Le texture YUV2 non sono supportate"
 
-#: ../clutter/evdev/clutter-input-device-evdev.c:159
+#: ../clutter/evdev/clutter-input-device-evdev.c:154
 msgid "sysfs Path"
 msgstr "Percorso sysfs"
 
-#: ../clutter/evdev/clutter-input-device-evdev.c:160
+#: ../clutter/evdev/clutter-input-device-evdev.c:155
 msgid "Path of the device in sysfs"
 msgstr "Il percorso del dispositivo in sysfs"
 
-#: ../clutter/evdev/clutter-input-device-evdev.c:175
+#: ../clutter/evdev/clutter-input-device-evdev.c:170
 msgid "Device Path"
 msgstr "Percorso dispositivo"
 
-#: ../clutter/evdev/clutter-input-device-evdev.c:176
+#: ../clutter/evdev/clutter-input-device-evdev.c:171
 msgid "Path of the device node"
 msgstr "Il percorso del nodo del dispositivo"
 
-#: ../clutter/gdk/clutter-backend-gdk.c:296
+#: ../clutter/gdk/clutter-backend-gdk.c:289
 #, c-format
 msgid "Could not find a suitable CoglWinsys for a GdkDisplay of type %s"
 msgstr "Impossibile trovare un CoglWinsys valido per un GdkDisplay di tipo %s"
 
-#: ../clutter/wayland/clutter-wayland-surface.c:423
+#: ../clutter/wayland/clutter-wayland-surface.c:419
 msgid "Surface"
 msgstr "Superficie"
 
-#: ../clutter/wayland/clutter-wayland-surface.c:424
+#: ../clutter/wayland/clutter-wayland-surface.c:420
 msgid "The underlying wayland surface"
 msgstr "La superficie Wayland sottostante"
 
-#: ../clutter/wayland/clutter-wayland-surface.c:431
+#: ../clutter/wayland/clutter-wayland-surface.c:427
 msgid "Surface width"
 msgstr "Larghezza superficie"
 
-#: ../clutter/wayland/clutter-wayland-surface.c:432
+#: ../clutter/wayland/clutter-wayland-surface.c:428
 msgid "The width of the underlying wayland surface"
 msgstr "La larghezza della superficie Wayland sottostante"
 
-#: ../clutter/wayland/clutter-wayland-surface.c:440
+#: ../clutter/wayland/clutter-wayland-surface.c:436
 msgid "Surface height"
 msgstr "Altezza superficie"
 
-#: ../clutter/wayland/clutter-wayland-surface.c:441
+#: ../clutter/wayland/clutter-wayland-surface.c:437
 msgid "The height of the underlying wayland surface"
 msgstr "L'altezza della superficie Wayland sottostante"
 
-#: ../clutter/x11/clutter-backend-x11.c:516
+#: ../clutter/x11/clutter-backend-x11.c:488
 msgid "X display to use"
 msgstr "Display X da usare"
 
-#: ../clutter/x11/clutter-backend-x11.c:522
+#: ../clutter/x11/clutter-backend-x11.c:494
 msgid "X screen to use"
 msgstr "Schermo X da usare"
 
-#: ../clutter/x11/clutter-backend-x11.c:527
+#: ../clutter/x11/clutter-backend-x11.c:499
 msgid "Make X calls synchronous"
 msgstr "Rende le chiamate a X sincrone"
 
-#: ../clutter/x11/clutter-backend-x11.c:534
+#: ../clutter/x11/clutter-backend-x11.c:506
 msgid "Disable XInput support"
 msgstr "Disabilita il supporto a XInput"
 
@@ -2686,102 +2767,102 @@ msgstr "Disabilita il supporto a XInput"
 msgid "The Clutter backend"
 msgstr "Il backend clutter"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:539
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:534
 msgid "Pixmap"
 msgstr "Pixmap"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:540
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:535
 msgid "The X11 Pixmap to be bound"
 msgstr "La pixmap X11 da associare"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:548
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:543
 msgid "Pixmap width"
 msgstr "Larghezza pixmap"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:549
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:544
 msgid "The width of the pixmap bound to this texture"
 msgstr "La larghezza della pixmap associata a questa texture"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:557
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:552
 msgid "Pixmap height"
 msgstr "Altezza pixmap"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:558
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:553
 msgid "The height of the pixmap bound to this texture"
 msgstr "L'altezza della pixmap associata a questa texture"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:566
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:561
 msgid "Pixmap Depth"
 msgstr "Profondità pixmap"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:567
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:562
 msgid "The depth (in number of bits) of the pixmap bound to this texture"
 msgstr ""
 "La profondità (in numero di bit) della pixmap associata a questa texture"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:575
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:570
 msgid "Automatic Updates"
 msgstr "Aggiornamenti automatici"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:576
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:571
 msgid "If the texture should be kept in sync with any pixmap changes."
 msgstr ""
 "Se la texture dovrebbe essere sincronizzata con ogni cambiamento della pixmap"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:584
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:579
 msgid "Window"
 msgstr "Finestra"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:585
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:580
 msgid "The X11 Window to be bound"
 msgstr "La finestra X11 da associare"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:593
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:588
 msgid "Window Redirect Automatic"
 msgstr "Redirezione finestra automatica"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:594
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:589
 msgid "If composite window redirects are set to Automatic (or Manual if false)"
 msgstr ""
 "Se le redirezioni della finestra composita sono impostate su Automatico (o "
 "Manuale se falso)"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:604
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:599
 msgid "Window Mapped"
 msgstr "Finestra mappata"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:605
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:600
 msgid "If window is mapped"
 msgstr "Se la finestra è mappata"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:614
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:609
 msgid "Destroyed"
 msgstr "Distrutta"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:615
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:610
 msgid "If window has been destroyed"
 msgstr "Se la finestra è stata distrutta"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:623
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:618
 msgid "Window X"
 msgstr "X Finestra"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:624
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:619
 msgid "X position of window on screen according to X11"
 msgstr "Posizione X della finestra sullo schermo in accordo con X11"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:632
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:627
 msgid "Window Y"
 msgstr "Y Finestra"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:633
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:628
 msgid "Y position of window on screen according to X11"
 msgstr "Posizione Y della finestra sullo schermo in accordo con X11"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:640
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:635
 msgid "Window Override Redirect"
 msgstr "Finestra con override-redirect"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:641
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:636
 msgid "If this is an override-redirect window"
 msgstr "Indica se questa è una finestra con override-redirect"
diff --git a/po/ko.po b/po/ko.po
new file mode 100644
index 000000000..933a746b6
--- /dev/null
+++ b/po/ko.po
@@ -0,0 +1,2799 @@
+# Korean translation for clutter.
+# Copyright (C) 2014 clutter's COPYRIGHT HOLDER
+# This file is distributed under the same license as the clutter package.
+# Changwoo Ryu <cwryu@debian.org>, 2014.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: clutter\n"
+"Report-Msgid-Bugs-To: http://bugzilla.clutter-project.org/enter_bug.cgi?product=clutter\n"
+"POT-Creation-Date: 2011-09-24 10:10+0900\n"
+"PO-Revision-Date: 2014-03-12 09:35+0900\n"
+"Last-Translator: Changwoo Ryu <cwryu@debian.org>\n"
+"Language-Team: Korean <gnome-kr@googlegroups.org>\n"
+"Language: ko\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ../clutter/clutter-actor.c:6214
+msgid "X coordinate"
+msgstr "가로 좌표"
+
+#: ../clutter/clutter-actor.c:6215
+msgid "X coordinate of the actor"
+msgstr ""
+
+#: ../clutter/clutter-actor.c:6233
+msgid "Y coordinate"
+msgstr "세로 좌표"
+
+#: ../clutter/clutter-actor.c:6234
+msgid "Y coordinate of the actor"
+msgstr ""
+
+#: ../clutter/clutter-actor.c:6256
+msgid "Position"
+msgstr "위치"
+
+#: ../clutter/clutter-actor.c:6257
+msgid "The position of the origin of the actor"
+msgstr ""
+
+#: ../clutter/clutter-actor.c:6274 ../clutter/clutter-canvas.c:247
+#: ../clutter/clutter-grid-layout.c:1239
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:474
+msgid "Width"
+msgstr "너비"
+
+#: ../clutter/clutter-actor.c:6275
+msgid "Width of the actor"
+msgstr ""
+
+#: ../clutter/clutter-actor.c:6293 ../clutter/clutter-canvas.c:263
+#: ../clutter/clutter-grid-layout.c:1246
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:490
+msgid "Height"
+msgstr "높이"
+
+#: ../clutter/clutter-actor.c:6294
+msgid "Height of the actor"
+msgstr ""
+
+#: ../clutter/clutter-actor.c:6315
+msgid "Size"
+msgstr "크기"
+
+#: ../clutter/clutter-actor.c:6316
+msgid "The size of the actor"
+msgstr ""
+
+#: ../clutter/clutter-actor.c:6334
+msgid "Fixed X"
+msgstr ""
+
+#: ../clutter/clutter-actor.c:6335
+msgid "Forced X position of the actor"
+msgstr ""
+
+#: ../clutter/clutter-actor.c:6352
+msgid "Fixed Y"
+msgstr ""
+
+#: ../clutter/clutter-actor.c:6353
+msgid "Forced Y position of the actor"
+msgstr ""
+
+#: ../clutter/clutter-actor.c:6368
+msgid "Fixed position set"
+msgstr ""
+
+#: ../clutter/clutter-actor.c:6369
+msgid "Whether to use fixed positioning for the actor"
+msgstr ""
+
+#: ../clutter/clutter-actor.c:6387
+msgid "Min Width"
+msgstr ""
+
+#: ../clutter/clutter-actor.c:6388
+msgid "Forced minimum width request for the actor"
+msgstr ""
+
+#: ../clutter/clutter-actor.c:6406
+msgid "Min Height"
+msgstr ""
+
+#: ../clutter/clutter-actor.c:6407
+msgid "Forced minimum height request for the actor"
+msgstr ""
+
+#: ../clutter/clutter-actor.c:6425
+msgid "Natural Width"
+msgstr ""
+
+#: ../clutter/clutter-actor.c:6426
+msgid "Forced natural width request for the actor"
+msgstr ""
+
+#: ../clutter/clutter-actor.c:6444
+msgid "Natural Height"
+msgstr ""
+
+#: ../clutter/clutter-actor.c:6445
+msgid "Forced natural height request for the actor"
+msgstr ""
+
+#: ../clutter/clutter-actor.c:6460
+msgid "Minimum width set"
+msgstr ""
+
+#: ../clutter/clutter-actor.c:6461
+msgid "Whether to use the min-width property"
+msgstr ""
+
+#: ../clutter/clutter-actor.c:6475
+msgid "Minimum height set"
+msgstr ""
+
+#: ../clutter/clutter-actor.c:6476
+msgid "Whether to use the min-height property"
+msgstr ""
+
+#: ../clutter/clutter-actor.c:6490
+msgid "Natural width set"
+msgstr ""
+
+#: ../clutter/clutter-actor.c:6491
+msgid "Whether to use the natural-width property"
+msgstr ""
+
+#: ../clutter/clutter-actor.c:6505
+msgid "Natural height set"
+msgstr ""
+
+#: ../clutter/clutter-actor.c:6506
+msgid "Whether to use the natural-height property"
+msgstr ""
+
+#: ../clutter/clutter-actor.c:6522
+msgid "Allocation"
+msgstr ""
+
+#: ../clutter/clutter-actor.c:6523
+msgid "The actor's allocation"
+msgstr ""
+
+#: ../clutter/clutter-actor.c:6580
+msgid "Request Mode"
+msgstr ""
+
+#: ../clutter/clutter-actor.c:6581
+msgid "The actor's request mode"
+msgstr ""
+
+#: ../clutter/clutter-actor.c:6605
+msgid "Depth"
+msgstr ""
+
+#: ../clutter/clutter-actor.c:6606
+msgid "Position on the Z axis"
+msgstr ""
+
+#: ../clutter/clutter-actor.c:6633
+msgid "Z Position"
+msgstr ""
+
+#: ../clutter/clutter-actor.c:6634
+msgid "The actor's position on the Z axis"
+msgstr ""
+
+#: ../clutter/clutter-actor.c:6651
+msgid "Opacity"
+msgstr ""
+
+#: ../clutter/clutter-actor.c:6652
+msgid "Opacity of an actor"
+msgstr ""
+
+#: ../clutter/clutter-actor.c:6672
+msgid "Offscreen redirect"
+msgstr ""
+
+#: ../clutter/clutter-actor.c:6673
+msgid "Flags controlling when to flatten the actor into a single image"
+msgstr ""
+
+#: ../clutter/clutter-actor.c:6687
+msgid "Visible"
+msgstr ""
+
+#: ../clutter/clutter-actor.c:6688
+msgid "Whether the actor is visible or not"
+msgstr ""
+
+#: ../clutter/clutter-actor.c:6702
+msgid "Mapped"
+msgstr ""
+
+#: ../clutter/clutter-actor.c:6703
+msgid "Whether the actor will be painted"
+msgstr ""
+
+#: ../clutter/clutter-actor.c:6716
+msgid "Realized"
+msgstr ""
+
+#: ../clutter/clutter-actor.c:6717
+msgid "Whether the actor has been realized"
+msgstr ""
+
+#: ../clutter/clutter-actor.c:6732
+msgid "Reactive"
+msgstr ""
+
+#: ../clutter/clutter-actor.c:6733
+msgid "Whether the actor is reactive to events"
+msgstr ""
+
+#: ../clutter/clutter-actor.c:6744
+msgid "Has Clip"
+msgstr ""
+
+#: ../clutter/clutter-actor.c:6745
+msgid "Whether the actor has a clip set"
+msgstr ""
+
+#: ../clutter/clutter-actor.c:6758
+msgid "Clip"
+msgstr ""
+
+#: ../clutter/clutter-actor.c:6759
+msgid "The clip region for the actor"
+msgstr ""
+
+#: ../clutter/clutter-actor.c:6778
+msgid "Clip Rectangle"
+msgstr ""
+
+#: ../clutter/clutter-actor.c:6779
+msgid "The visible region of the actor"
+msgstr ""
+
+#: ../clutter/clutter-actor.c:6793 ../clutter/clutter-actor-meta.c:205
+#: ../clutter/clutter-binding-pool.c:319 ../clutter/clutter-input-device.c:247
+msgid "Name"
+msgstr ""
+
+#: ../clutter/clutter-actor.c:6794
+msgid "Name of the actor"
+msgstr ""
+
+#: ../clutter/clutter-actor.c:6815
+msgid "Pivot Point"
+msgstr ""
+
+#: ../clutter/clutter-actor.c:6816
+msgid "The point around which the scaling and rotation occur"
+msgstr ""
+
+#: ../clutter/clutter-actor.c:6834
+msgid "Pivot Point Z"
+msgstr ""
+
+#: ../clutter/clutter-actor.c:6835
+msgid "Z component of the pivot point"
+msgstr ""
+
+#: ../clutter/clutter-actor.c:6853
+msgid "Scale X"
+msgstr ""
+
+#: ../clutter/clutter-actor.c:6854
+msgid "Scale factor on the X axis"
+msgstr ""
+
+#: ../clutter/clutter-actor.c:6872
+msgid "Scale Y"
+msgstr ""
+
+#: ../clutter/clutter-actor.c:6873
+msgid "Scale factor on the Y axis"
+msgstr ""
+
+#: ../clutter/clutter-actor.c:6891
+msgid "Scale Z"
+msgstr ""
+
+#: ../clutter/clutter-actor.c:6892
+msgid "Scale factor on the Z axis"
+msgstr ""
+
+#: ../clutter/clutter-actor.c:6910
+msgid "Scale Center X"
+msgstr ""
+
+#: ../clutter/clutter-actor.c:6911
+msgid "Horizontal scale center"
+msgstr ""
+
+#: ../clutter/clutter-actor.c:6929
+msgid "Scale Center Y"
+msgstr ""
+
+#: ../clutter/clutter-actor.c:6930
+msgid "Vertical scale center"
+msgstr ""
+
+#: ../clutter/clutter-actor.c:6948
+msgid "Scale Gravity"
+msgstr ""
+
+#: ../clutter/clutter-actor.c:6949
+msgid "The center of scaling"
+msgstr ""
+
+#: ../clutter/clutter-actor.c:6967
+msgid "Rotation Angle X"
+msgstr ""
+
+#: ../clutter/clutter-actor.c:6968
+msgid "The rotation angle on the X axis"
+msgstr ""
+
+#: ../clutter/clutter-actor.c:6986
+msgid "Rotation Angle Y"
+msgstr ""
+
+#: ../clutter/clutter-actor.c:6987
+msgid "The rotation angle on the Y axis"
+msgstr ""
+
+#: ../clutter/clutter-actor.c:7005
+msgid "Rotation Angle Z"
+msgstr ""
+
+#: ../clutter/clutter-actor.c:7006
+msgid "The rotation angle on the Z axis"
+msgstr ""
+
+#: ../clutter/clutter-actor.c:7024
+msgid "Rotation Center X"
+msgstr ""
+
+#: ../clutter/clutter-actor.c:7025
+msgid "The rotation center on the X axis"
+msgstr ""
+
+#: ../clutter/clutter-actor.c:7042
+msgid "Rotation Center Y"
+msgstr ""
+
+#: ../clutter/clutter-actor.c:7043
+msgid "The rotation center on the Y axis"
+msgstr ""
+
+#: ../clutter/clutter-actor.c:7060
+msgid "Rotation Center Z"
+msgstr ""
+
+#: ../clutter/clutter-actor.c:7061
+msgid "The rotation center on the Z axis"
+msgstr ""
+
+#: ../clutter/clutter-actor.c:7078
+msgid "Rotation Center Z Gravity"
+msgstr ""
+
+#: ../clutter/clutter-actor.c:7079
+msgid "Center point for rotation around the Z axis"
+msgstr ""
+
+#: ../clutter/clutter-actor.c:7107
+msgid "Anchor X"
+msgstr ""
+
+#: ../clutter/clutter-actor.c:7108
+msgid "X coordinate of the anchor point"
+msgstr ""
+
+#: ../clutter/clutter-actor.c:7136
+msgid "Anchor Y"
+msgstr ""
+
+#: ../clutter/clutter-actor.c:7137
+msgid "Y coordinate of the anchor point"
+msgstr ""
+
+#: ../clutter/clutter-actor.c:7164
+msgid "Anchor Gravity"
+msgstr ""
+
+#: ../clutter/clutter-actor.c:7165
+msgid "The anchor point as a ClutterGravity"
+msgstr ""
+
+#: ../clutter/clutter-actor.c:7184
+msgid "Translation X"
+msgstr ""
+
+#: ../clutter/clutter-actor.c:7185
+msgid "Translation along the X axis"
+msgstr ""
+
+#: ../clutter/clutter-actor.c:7204
+msgid "Translation Y"
+msgstr ""
+
+#: ../clutter/clutter-actor.c:7205
+msgid "Translation along the Y axis"
+msgstr ""
+
+#: ../clutter/clutter-actor.c:7224
+msgid "Translation Z"
+msgstr ""
+
+#: ../clutter/clutter-actor.c:7225
+msgid "Translation along the Z axis"
+msgstr ""
+
+#: ../clutter/clutter-actor.c:7255
+msgid "Transform"
+msgstr ""
+
+#: ../clutter/clutter-actor.c:7256
+msgid "Transformation matrix"
+msgstr ""
+
+#: ../clutter/clutter-actor.c:7271
+msgid "Transform Set"
+msgstr ""
+
+#: ../clutter/clutter-actor.c:7272
+msgid "Whether the transform property is set"
+msgstr ""
+
+#: ../clutter/clutter-actor.c:7293
+msgid "Child Transform"
+msgstr ""
+
+#: ../clutter/clutter-actor.c:7294
+msgid "Children transformation matrix"
+msgstr ""
+
+#: ../clutter/clutter-actor.c:7309
+msgid "Child Transform Set"
+msgstr ""
+
+#: ../clutter/clutter-actor.c:7310
+msgid "Whether the child-transform property is set"
+msgstr ""
+
+#: ../clutter/clutter-actor.c:7327
+msgid "Show on set parent"
+msgstr ""
+
+#: ../clutter/clutter-actor.c:7328
+msgid "Whether the actor is shown when parented"
+msgstr ""
+
+#: ../clutter/clutter-actor.c:7345
+msgid "Clip to Allocation"
+msgstr ""
+
+#: ../clutter/clutter-actor.c:7346
+msgid "Sets the clip region to track the actor's allocation"
+msgstr ""
+
+#: ../clutter/clutter-actor.c:7359
+msgid "Text Direction"
+msgstr ""
+
+#: ../clutter/clutter-actor.c:7360
+msgid "Direction of the text"
+msgstr ""
+
+#: ../clutter/clutter-actor.c:7375
+msgid "Has Pointer"
+msgstr ""
+
+#: ../clutter/clutter-actor.c:7376
+msgid "Whether the actor contains the pointer of an input device"
+msgstr ""
+
+#: ../clutter/clutter-actor.c:7389
+msgid "Actions"
+msgstr ""
+
+#: ../clutter/clutter-actor.c:7390
+msgid "Adds an action to the actor"
+msgstr ""
+
+#: ../clutter/clutter-actor.c:7403
+msgid "Constraints"
+msgstr ""
+
+#: ../clutter/clutter-actor.c:7404
+msgid "Adds a constraint to the actor"
+msgstr ""
+
+#: ../clutter/clutter-actor.c:7417
+msgid "Effect"
+msgstr ""
+
+#: ../clutter/clutter-actor.c:7418
+msgid "Add an effect to be applied on the actor"
+msgstr ""
+
+#: ../clutter/clutter-actor.c:7432
+msgid "Layout Manager"
+msgstr ""
+
+#: ../clutter/clutter-actor.c:7433
+msgid "The object controlling the layout of an actor's children"
+msgstr ""
+
+#: ../clutter/clutter-actor.c:7447
+msgid "X Expand"
+msgstr ""
+
+#: ../clutter/clutter-actor.c:7448
+msgid "Whether extra horizontal space should be assigned to the actor"
+msgstr ""
+
+#: ../clutter/clutter-actor.c:7463
+msgid "Y Expand"
+msgstr ""
+
+#: ../clutter/clutter-actor.c:7464
+msgid "Whether extra vertical space should be assigned to the actor"
+msgstr ""
+
+#: ../clutter/clutter-actor.c:7480
+msgid "X Alignment"
+msgstr ""
+
+#: ../clutter/clutter-actor.c:7481
+msgid "The alignment of the actor on the X axis within its allocation"
+msgstr ""
+
+#: ../clutter/clutter-actor.c:7496
+msgid "Y Alignment"
+msgstr ""
+
+#: ../clutter/clutter-actor.c:7497
+msgid "The alignment of the actor on the Y axis within its allocation"
+msgstr ""
+
+#: ../clutter/clutter-actor.c:7516
+msgid "Margin Top"
+msgstr ""
+
+#: ../clutter/clutter-actor.c:7517
+msgid "Extra space at the top"
+msgstr ""
+
+#: ../clutter/clutter-actor.c:7538
+msgid "Margin Bottom"
+msgstr ""
+
+#: ../clutter/clutter-actor.c:7539
+msgid "Extra space at the bottom"
+msgstr ""
+
+#: ../clutter/clutter-actor.c:7560
+msgid "Margin Left"
+msgstr ""
+
+#: ../clutter/clutter-actor.c:7561
+msgid "Extra space at the left"
+msgstr ""
+
+#: ../clutter/clutter-actor.c:7582
+msgid "Margin Right"
+msgstr ""
+
+#: ../clutter/clutter-actor.c:7583
+msgid "Extra space at the right"
+msgstr ""
+
+#: ../clutter/clutter-actor.c:7599
+msgid "Background Color Set"
+msgstr ""
+
+#: ../clutter/clutter-actor.c:7600 ../clutter/deprecated/clutter-box.c:271
+msgid "Whether the background color is set"
+msgstr ""
+
+#: ../clutter/clutter-actor.c:7616
+msgid "Background color"
+msgstr ""
+
+#: ../clutter/clutter-actor.c:7617
+msgid "The actor's background color"
+msgstr ""
+
+#: ../clutter/clutter-actor.c:7632
+msgid "First Child"
+msgstr ""
+
+#: ../clutter/clutter-actor.c:7633
+msgid "The actor's first child"
+msgstr ""
+
+#: ../clutter/clutter-actor.c:7646
+msgid "Last Child"
+msgstr ""
+
+#: ../clutter/clutter-actor.c:7647
+msgid "The actor's last child"
+msgstr ""
+
+#: ../clutter/clutter-actor.c:7661
+msgid "Content"
+msgstr ""
+
+#: ../clutter/clutter-actor.c:7662
+msgid "Delegate object for painting the actor's content"
+msgstr ""
+
+#: ../clutter/clutter-actor.c:7687
+msgid "Content Gravity"
+msgstr ""
+
+#: ../clutter/clutter-actor.c:7688
+msgid "Alignment of the actor's content"
+msgstr ""
+
+#: ../clutter/clutter-actor.c:7708
+msgid "Content Box"
+msgstr ""
+
+#: ../clutter/clutter-actor.c:7709
+msgid "The bounding box of the actor's content"
+msgstr ""
+
+#: ../clutter/clutter-actor.c:7717
+msgid "Minification Filter"
+msgstr ""
+
+#: ../clutter/clutter-actor.c:7718
+msgid "The filter used when reducing the size of the content"
+msgstr ""
+
+#: ../clutter/clutter-actor.c:7725
+msgid "Magnification Filter"
+msgstr ""
+
+#: ../clutter/clutter-actor.c:7726
+msgid "The filter used when increasing the size of the content"
+msgstr ""
+
+#: ../clutter/clutter-actor.c:7740
+msgid "Content Repeat"
+msgstr ""
+
+#: ../clutter/clutter-actor.c:7741
+msgid "The repeat policy for the actor's content"
+msgstr ""
+
+#: ../clutter/clutter-actor-meta.c:191 ../clutter/clutter-child-meta.c:142
+msgid "Actor"
+msgstr ""
+
+#: ../clutter/clutter-actor-meta.c:192
+msgid "The actor attached to the meta"
+msgstr ""
+
+#: ../clutter/clutter-actor-meta.c:206
+msgid "The name of the meta"
+msgstr ""
+
+#: ../clutter/clutter-actor-meta.c:219 ../clutter/clutter-input-device.c:326
+#: ../clutter/deprecated/clutter-shader.c:309
+msgid "Enabled"
+msgstr ""
+
+#: ../clutter/clutter-actor-meta.c:220
+msgid "Whether the meta is enabled"
+msgstr ""
+
+#: ../clutter/clutter-align-constraint.c:279
+#: ../clutter/clutter-bind-constraint.c:358 ../clutter/clutter-clone.c:341
+#: ../clutter/clutter-snap-constraint.c:321
+msgid "Source"
+msgstr ""
+
+#: ../clutter/clutter-align-constraint.c:280
+msgid "The source of the alignment"
+msgstr ""
+
+#: ../clutter/clutter-align-constraint.c:293
+msgid "Align Axis"
+msgstr ""
+
+#: ../clutter/clutter-align-constraint.c:294
+msgid "The axis to align the position to"
+msgstr ""
+
+#: ../clutter/clutter-align-constraint.c:313
+#: ../clutter/clutter-desaturate-effect.c:270
+msgid "Factor"
+msgstr ""
+
+#: ../clutter/clutter-align-constraint.c:314
+msgid "The alignment factor, between 0.0 and 1.0"
+msgstr ""
+
+#: ../clutter/clutter-backend.c:380
+msgid "Unable to initialize the Clutter backend"
+msgstr ""
+
+#: ../clutter/clutter-backend.c:454
+#, c-format
+msgid "The backend of type '%s' does not support creating multiple stages"
+msgstr ""
+
+#: ../clutter/clutter-bind-constraint.c:359
+msgid "The source of the binding"
+msgstr ""
+
+#: ../clutter/clutter-bind-constraint.c:372
+msgid "Coordinate"
+msgstr ""
+
+#: ../clutter/clutter-bind-constraint.c:373
+msgid "The coordinate to bind"
+msgstr ""
+
+#: ../clutter/clutter-bind-constraint.c:387
+#: ../clutter/clutter-path-constraint.c:226
+#: ../clutter/clutter-snap-constraint.c:366
+msgid "Offset"
+msgstr ""
+
+#: ../clutter/clutter-bind-constraint.c:388
+msgid "The offset in pixels to apply to the binding"
+msgstr ""
+
+#: ../clutter/clutter-binding-pool.c:320
+msgid "The unique name of the binding pool"
+msgstr ""
+
+#: ../clutter/clutter-bin-layout.c:238 ../clutter/clutter-bin-layout.c:651
+#: ../clutter/clutter-box-layout.c:388
+#: ../clutter/deprecated/clutter-table-layout.c:610
+msgid "Horizontal Alignment"
+msgstr ""
+
+#: ../clutter/clutter-bin-layout.c:239
+msgid "Horizontal alignment for the actor inside the layout manager"
+msgstr ""
+
+#: ../clutter/clutter-bin-layout.c:247 ../clutter/clutter-bin-layout.c:671
+#: ../clutter/clutter-box-layout.c:397
+#: ../clutter/deprecated/clutter-table-layout.c:625
+msgid "Vertical Alignment"
+msgstr ""
+
+#: ../clutter/clutter-bin-layout.c:248
+msgid "Vertical alignment for the actor inside the layout manager"
+msgstr ""
+
+#: ../clutter/clutter-bin-layout.c:652
+msgid "Default horizontal alignment for the actors inside the layout manager"
+msgstr ""
+
+#: ../clutter/clutter-bin-layout.c:672
+msgid "Default vertical alignment for the actors inside the layout manager"
+msgstr ""
+
+#: ../clutter/clutter-box-layout.c:363
+msgid "Expand"
+msgstr ""
+
+#: ../clutter/clutter-box-layout.c:364
+msgid "Allocate extra space for the child"
+msgstr ""
+
+#: ../clutter/clutter-box-layout.c:370
+#: ../clutter/deprecated/clutter-table-layout.c:589
+msgid "Horizontal Fill"
+msgstr ""
+
+#: ../clutter/clutter-box-layout.c:371
+#: ../clutter/deprecated/clutter-table-layout.c:590
+msgid ""
+"Whether the child should receive priority when the container is allocating "
+"spare space on the horizontal axis"
+msgstr ""
+
+#: ../clutter/clutter-box-layout.c:379
+#: ../clutter/deprecated/clutter-table-layout.c:596
+msgid "Vertical Fill"
+msgstr ""
+
+#: ../clutter/clutter-box-layout.c:380
+#: ../clutter/deprecated/clutter-table-layout.c:597
+msgid ""
+"Whether the child should receive priority when the container is allocating "
+"spare space on the vertical axis"
+msgstr ""
+
+#: ../clutter/clutter-box-layout.c:389
+#: ../clutter/deprecated/clutter-table-layout.c:611
+msgid "Horizontal alignment of the actor within the cell"
+msgstr ""
+
+#: ../clutter/clutter-box-layout.c:398
+#: ../clutter/deprecated/clutter-table-layout.c:626
+msgid "Vertical alignment of the actor within the cell"
+msgstr ""
+
+#: ../clutter/clutter-box-layout.c:1359
+msgid "Vertical"
+msgstr ""
+
+#: ../clutter/clutter-box-layout.c:1360
+msgid "Whether the layout should be vertical, rather than horizontal"
+msgstr ""
+
+#: ../clutter/clutter-box-layout.c:1377 ../clutter/clutter-flow-layout.c:942
+#: ../clutter/clutter-grid-layout.c:1549
+msgid "Orientation"
+msgstr ""
+
+#: ../clutter/clutter-box-layout.c:1378 ../clutter/clutter-flow-layout.c:943
+#: ../clutter/clutter-grid-layout.c:1550
+msgid "The orientation of the layout"
+msgstr ""
+
+#: ../clutter/clutter-box-layout.c:1394 ../clutter/clutter-flow-layout.c:958
+msgid "Homogeneous"
+msgstr ""
+
+#: ../clutter/clutter-box-layout.c:1395
+msgid ""
+"Whether the layout should be homogeneous, i.e. all childs get the same size"
+msgstr ""
+
+#: ../clutter/clutter-box-layout.c:1410
+msgid "Pack Start"
+msgstr ""
+
+#: ../clutter/clutter-box-layout.c:1411
+msgid "Whether to pack items at the start of the box"
+msgstr ""
+
+#: ../clutter/clutter-box-layout.c:1424
+msgid "Spacing"
+msgstr ""
+
+#: ../clutter/clutter-box-layout.c:1425
+msgid "Spacing between children"
+msgstr ""
+
+#: ../clutter/clutter-box-layout.c:1442
+#: ../clutter/deprecated/clutter-table-layout.c:1677
+msgid "Use Animations"
+msgstr ""
+
+#: ../clutter/clutter-box-layout.c:1443
+#: ../clutter/deprecated/clutter-table-layout.c:1678
+msgid "Whether layout changes should be animated"
+msgstr ""
+
+#: ../clutter/clutter-box-layout.c:1467
+#: ../clutter/deprecated/clutter-table-layout.c:1702
+msgid "Easing Mode"
+msgstr ""
+
+#: ../clutter/clutter-box-layout.c:1468
+#: ../clutter/deprecated/clutter-table-layout.c:1703
+msgid "The easing mode of the animations"
+msgstr ""
+
+#: ../clutter/clutter-box-layout.c:1488
+#: ../clutter/deprecated/clutter-table-layout.c:1723
+msgid "Easing Duration"
+msgstr ""
+
+#: ../clutter/clutter-box-layout.c:1489
+#: ../clutter/deprecated/clutter-table-layout.c:1724
+msgid "The duration of the animations"
+msgstr ""
+
+#: ../clutter/clutter-brightness-contrast-effect.c:321
+msgid "Brightness"
+msgstr ""
+
+#: ../clutter/clutter-brightness-contrast-effect.c:322
+msgid "The brightness change to apply"
+msgstr ""
+
+#: ../clutter/clutter-brightness-contrast-effect.c:341
+msgid "Contrast"
+msgstr ""
+
+#: ../clutter/clutter-brightness-contrast-effect.c:342
+msgid "The contrast change to apply"
+msgstr ""
+
+#: ../clutter/clutter-canvas.c:248
+msgid "The width of the canvas"
+msgstr ""
+
+#: ../clutter/clutter-canvas.c:264
+msgid "The height of the canvas"
+msgstr ""
+
+#: ../clutter/clutter-canvas.c:283
+msgid "Scale Factor Set"
+msgstr ""
+
+#: ../clutter/clutter-canvas.c:284
+msgid "Whether the scale-factor property is set"
+msgstr ""
+
+#: ../clutter/clutter-canvas.c:305
+msgid "Scale Factor"
+msgstr ""
+
+#: ../clutter/clutter-canvas.c:306
+msgid "The scaling factor for the surface"
+msgstr ""
+
+#: ../clutter/clutter-child-meta.c:127
+msgid "Container"
+msgstr ""
+
+#: ../clutter/clutter-child-meta.c:128
+msgid "The container that created this data"
+msgstr ""
+
+#: ../clutter/clutter-child-meta.c:143
+msgid "The actor wrapped by this data"
+msgstr ""
+
+#: ../clutter/clutter-click-action.c:586
+msgid "Pressed"
+msgstr ""
+
+#: ../clutter/clutter-click-action.c:587
+msgid "Whether the clickable should be in pressed state"
+msgstr ""
+
+#: ../clutter/clutter-click-action.c:600
+msgid "Held"
+msgstr ""
+
+#: ../clutter/clutter-click-action.c:601
+msgid "Whether the clickable has a grab"
+msgstr ""
+
+#: ../clutter/clutter-click-action.c:618 ../clutter/clutter-settings.c:653
+msgid "Long Press Duration"
+msgstr ""
+
+#: ../clutter/clutter-click-action.c:619
+msgid "The minimum duration of a long press to recognize the gesture"
+msgstr ""
+
+#: ../clutter/clutter-click-action.c:637
+msgid "Long Press Threshold"
+msgstr ""
+
+#: ../clutter/clutter-click-action.c:638
+msgid "The maximum threshold before a long press is cancelled"
+msgstr ""
+
+#: ../clutter/clutter-clone.c:342
+msgid "Specifies the actor to be cloned"
+msgstr ""
+
+#: ../clutter/clutter-colorize-effect.c:251
+msgid "Tint"
+msgstr ""
+
+#: ../clutter/clutter-colorize-effect.c:252
+msgid "The tint to apply"
+msgstr ""
+
+#: ../clutter/clutter-deform-effect.c:592
+msgid "Horizontal Tiles"
+msgstr ""
+
+#: ../clutter/clutter-deform-effect.c:593
+msgid "The number of horizontal tiles"
+msgstr ""
+
+#: ../clutter/clutter-deform-effect.c:608
+msgid "Vertical Tiles"
+msgstr ""
+
+#: ../clutter/clutter-deform-effect.c:609
+msgid "The number of vertical tiles"
+msgstr ""
+
+#: ../clutter/clutter-deform-effect.c:626
+msgid "Back Material"
+msgstr ""
+
+#: ../clutter/clutter-deform-effect.c:627
+msgid "The material to be used when painting the back of the actor"
+msgstr ""
+
+#: ../clutter/clutter-desaturate-effect.c:271
+msgid "The desaturation factor"
+msgstr ""
+
+#: ../clutter/clutter-device-manager.c:127
+#: ../clutter/clutter-input-device.c:355
+#: ../clutter/x11/clutter-keymap-x11.c:457
+msgid "Backend"
+msgstr ""
+
+#: ../clutter/clutter-device-manager.c:128
+msgid "The ClutterBackend of the device manager"
+msgstr ""
+
+#: ../clutter/clutter-drag-action.c:741
+msgid "Horizontal Drag Threshold"
+msgstr ""
+
+#: ../clutter/clutter-drag-action.c:742
+msgid "The horizontal amount of pixels required to start dragging"
+msgstr ""
+
+#: ../clutter/clutter-drag-action.c:769
+msgid "Vertical Drag Threshold"
+msgstr ""
+
+#: ../clutter/clutter-drag-action.c:770
+msgid "The vertical amount of pixels required to start dragging"
+msgstr ""
+
+#: ../clutter/clutter-drag-action.c:791
+msgid "Drag Handle"
+msgstr ""
+
+#: ../clutter/clutter-drag-action.c:792
+msgid "The actor that is being dragged"
+msgstr ""
+
+#: ../clutter/clutter-drag-action.c:805
+msgid "Drag Axis"
+msgstr ""
+
+#: ../clutter/clutter-drag-action.c:806
+msgid "Constraints the dragging to an axis"
+msgstr ""
+
+#: ../clutter/clutter-drag-action.c:822
+msgid "Drag Area"
+msgstr ""
+
+#: ../clutter/clutter-drag-action.c:823
+msgid "Constrains the dragging to a rectangle"
+msgstr ""
+
+#: ../clutter/clutter-drag-action.c:836
+msgid "Drag Area Set"
+msgstr ""
+
+#: ../clutter/clutter-drag-action.c:837
+msgid "Whether the drag area is set"
+msgstr ""
+
+#: ../clutter/clutter-flow-layout.c:959
+msgid "Whether each item should receive the same allocation"
+msgstr ""
+
+#: ../clutter/clutter-flow-layout.c:974
+#: ../clutter/deprecated/clutter-table-layout.c:1637
+msgid "Column Spacing"
+msgstr ""
+
+#: ../clutter/clutter-flow-layout.c:975
+msgid "The spacing between columns"
+msgstr ""
+
+#: ../clutter/clutter-flow-layout.c:991
+#: ../clutter/deprecated/clutter-table-layout.c:1653
+msgid "Row Spacing"
+msgstr ""
+
+#: ../clutter/clutter-flow-layout.c:992
+msgid "The spacing between rows"
+msgstr ""
+
+#: ../clutter/clutter-flow-layout.c:1006
+msgid "Minimum Column Width"
+msgstr ""
+
+#: ../clutter/clutter-flow-layout.c:1007
+msgid "Minimum width for each column"
+msgstr ""
+
+#: ../clutter/clutter-flow-layout.c:1022
+msgid "Maximum Column Width"
+msgstr ""
+
+#: ../clutter/clutter-flow-layout.c:1023
+msgid "Maximum width for each column"
+msgstr ""
+
+#: ../clutter/clutter-flow-layout.c:1037
+msgid "Minimum Row Height"
+msgstr ""
+
+#: ../clutter/clutter-flow-layout.c:1038
+msgid "Minimum height for each row"
+msgstr ""
+
+#: ../clutter/clutter-flow-layout.c:1053
+msgid "Maximum Row Height"
+msgstr ""
+
+#: ../clutter/clutter-flow-layout.c:1054
+msgid "Maximum height for each row"
+msgstr ""
+
+#: ../clutter/clutter-flow-layout.c:1069 ../clutter/clutter-flow-layout.c:1070
+msgid "Snap to grid"
+msgstr ""
+
+#: ../clutter/clutter-gesture-action.c:668
+msgid "Number touch points"
+msgstr ""
+
+#: ../clutter/clutter-gesture-action.c:669
+msgid "Number of touch points"
+msgstr ""
+
+#: ../clutter/clutter-gesture-action.c:684
+msgid "Threshold Trigger Edge"
+msgstr ""
+
+#: ../clutter/clutter-gesture-action.c:685
+msgid "The trigger edge used by the action"
+msgstr ""
+
+#: ../clutter/clutter-gesture-action.c:704
+msgid "Threshold Trigger Horizontal Distance"
+msgstr ""
+
+#: ../clutter/clutter-gesture-action.c:705
+msgid "The horizontal trigger distance used by the action"
+msgstr ""
+
+#: ../clutter/clutter-gesture-action.c:723
+msgid "Threshold Trigger Vertical Distance"
+msgstr ""
+
+#: ../clutter/clutter-gesture-action.c:724
+msgid "The vertical trigger distance used by the action"
+msgstr ""
+
+#: ../clutter/clutter-grid-layout.c:1223
+msgid "Left attachment"
+msgstr ""
+
+#: ../clutter/clutter-grid-layout.c:1224
+msgid "The column number to attach the left side of the child to"
+msgstr ""
+
+#: ../clutter/clutter-grid-layout.c:1231
+msgid "Top attachment"
+msgstr ""
+
+#: ../clutter/clutter-grid-layout.c:1232
+msgid "The row number to attach the top side of a child widget to"
+msgstr ""
+
+#: ../clutter/clutter-grid-layout.c:1240
+msgid "The number of columns that a child spans"
+msgstr ""
+
+#: ../clutter/clutter-grid-layout.c:1247
+msgid "The number of rows that a child spans"
+msgstr ""
+
+#: ../clutter/clutter-grid-layout.c:1564
+msgid "Row spacing"
+msgstr ""
+
+#: ../clutter/clutter-grid-layout.c:1565
+msgid "The amount of space between two consecutive rows"
+msgstr ""
+
+#: ../clutter/clutter-grid-layout.c:1578
+msgid "Column spacing"
+msgstr ""
+
+#: ../clutter/clutter-grid-layout.c:1579
+msgid "The amount of space between two consecutive columns"
+msgstr ""
+
+#: ../clutter/clutter-grid-layout.c:1593
+msgid "Row Homogeneous"
+msgstr ""
+
+#: ../clutter/clutter-grid-layout.c:1594
+msgid "If TRUE, the rows are all the same height"
+msgstr ""
+
+#: ../clutter/clutter-grid-layout.c:1607
+msgid "Column Homogeneous"
+msgstr ""
+
+#: ../clutter/clutter-grid-layout.c:1608
+msgid "If TRUE, the columns are all the same width"
+msgstr ""
+
+#: ../clutter/clutter-image.c:249 ../clutter/clutter-image.c:312
+#: ../clutter/clutter-image.c:400
+msgid "Unable to load image data"
+msgstr ""
+
+#: ../clutter/clutter-input-device.c:231
+msgid "Id"
+msgstr ""
+
+#: ../clutter/clutter-input-device.c:232
+msgid "Unique identifier of the device"
+msgstr ""
+
+#: ../clutter/clutter-input-device.c:248
+msgid "The name of the device"
+msgstr ""
+
+#: ../clutter/clutter-input-device.c:262
+msgid "Device Type"
+msgstr ""
+
+#: ../clutter/clutter-input-device.c:263
+msgid "The type of the device"
+msgstr ""
+
+#: ../clutter/clutter-input-device.c:278
+msgid "Device Manager"
+msgstr ""
+
+#: ../clutter/clutter-input-device.c:279
+msgid "The device manager instance"
+msgstr ""
+
+#: ../clutter/clutter-input-device.c:292
+msgid "Device Mode"
+msgstr ""
+
+#: ../clutter/clutter-input-device.c:293
+msgid "The mode of the device"
+msgstr ""
+
+#: ../clutter/clutter-input-device.c:307
+msgid "Has Cursor"
+msgstr ""
+
+#: ../clutter/clutter-input-device.c:308
+msgid "Whether the device has a cursor"
+msgstr ""
+
+#: ../clutter/clutter-input-device.c:327
+msgid "Whether the device is enabled"
+msgstr ""
+
+#: ../clutter/clutter-input-device.c:340
+msgid "Number of Axes"
+msgstr ""
+
+#: ../clutter/clutter-input-device.c:341
+msgid "The number of axes on the device"
+msgstr ""
+
+#: ../clutter/clutter-input-device.c:356
+msgid "The backend instance"
+msgstr ""
+
+#: ../clutter/clutter-interval.c:553
+msgid "Value Type"
+msgstr ""
+
+#: ../clutter/clutter-interval.c:554
+msgid "The type of the values in the interval"
+msgstr ""
+
+#: ../clutter/clutter-interval.c:569
+msgid "Initial Value"
+msgstr ""
+
+#: ../clutter/clutter-interval.c:570
+msgid "Initial value of the interval"
+msgstr ""
+
+#: ../clutter/clutter-interval.c:584
+msgid "Final Value"
+msgstr ""
+
+#: ../clutter/clutter-interval.c:585
+msgid "Final value of the interval"
+msgstr ""
+
+#: ../clutter/clutter-layout-meta.c:117
+msgid "Manager"
+msgstr ""
+
+#: ../clutter/clutter-layout-meta.c:118
+msgid "The manager that created this data"
+msgstr ""
+
+#. Translators: Leave this UNTRANSLATED if your language is
+#. * left-to-right.  If your language is right-to-left
+#. * (e.g. Hebrew, Arabic), translate it to "default:RTL".
+#. *
+#. * Do NOT translate it to non-English e.g. "predefinito:LTR"! If
+#. * it isn't default:LTR or default:RTL it will not work.
+#.
+#: ../clutter/clutter-main.c:795
+msgid "default:LTR"
+msgstr ""
+
+#: ../clutter/clutter-main.c:1622
+msgid "Show frames per second"
+msgstr ""
+
+#: ../clutter/clutter-main.c:1624
+msgid "Default frame rate"
+msgstr ""
+
+#: ../clutter/clutter-main.c:1626
+msgid "Make all warnings fatal"
+msgstr ""
+
+#: ../clutter/clutter-main.c:1629
+msgid "Direction for the text"
+msgstr ""
+
+#: ../clutter/clutter-main.c:1632
+msgid "Disable mipmapping on text"
+msgstr ""
+
+#: ../clutter/clutter-main.c:1635
+msgid "Use 'fuzzy' picking"
+msgstr ""
+
+#: ../clutter/clutter-main.c:1638
+msgid "Clutter debugging flags to set"
+msgstr ""
+
+#: ../clutter/clutter-main.c:1640
+msgid "Clutter debugging flags to unset"
+msgstr ""
+
+#: ../clutter/clutter-main.c:1644
+msgid "Clutter profiling flags to set"
+msgstr ""
+
+#: ../clutter/clutter-main.c:1646
+msgid "Clutter profiling flags to unset"
+msgstr ""
+
+#: ../clutter/clutter-main.c:1649
+msgid "Enable accessibility"
+msgstr ""
+
+#: ../clutter/clutter-main.c:1841
+msgid "Clutter Options"
+msgstr "클러터 옵션"
+
+#: ../clutter/clutter-main.c:1842
+msgid "Show Clutter Options"
+msgstr "클러터 옵션을 표시합니다"
+
+#: ../clutter/clutter-pan-action.c:455
+msgid "Pan Axis"
+msgstr ""
+
+#: ../clutter/clutter-pan-action.c:456
+msgid "Constraints the panning to an axis"
+msgstr ""
+
+#: ../clutter/clutter-pan-action.c:470
+msgid "Interpolate"
+msgstr ""
+
+#: ../clutter/clutter-pan-action.c:471
+msgid "Whether interpolated events emission is enabled."
+msgstr ""
+
+#: ../clutter/clutter-pan-action.c:487
+msgid "Deceleration"
+msgstr ""
+
+#: ../clutter/clutter-pan-action.c:488
+msgid "Rate at which the interpolated panning will decelerate in"
+msgstr ""
+
+#: ../clutter/clutter-pan-action.c:505
+msgid "Initial acceleration factor"
+msgstr ""
+
+#: ../clutter/clutter-pan-action.c:506
+msgid "Factor applied to the momentum when starting the interpolated phase"
+msgstr ""
+
+#: ../clutter/clutter-path-constraint.c:212
+#: ../clutter/deprecated/clutter-behaviour-path.c:221
+msgid "Path"
+msgstr ""
+
+#: ../clutter/clutter-path-constraint.c:213
+msgid "The path used to constrain an actor"
+msgstr ""
+
+#: ../clutter/clutter-path-constraint.c:227
+msgid "The offset along the path, between -1.0 and 2.0"
+msgstr ""
+
+#: ../clutter/clutter-property-transition.c:269
+msgid "Property Name"
+msgstr ""
+
+#: ../clutter/clutter-property-transition.c:270
+msgid "The name of the property to animate"
+msgstr ""
+
+#: ../clutter/clutter-script.c:464
+msgid "Filename Set"
+msgstr ""
+
+#: ../clutter/clutter-script.c:465
+msgid "Whether the :filename property is set"
+msgstr ""
+
+#: ../clutter/clutter-script.c:479
+#: ../clutter/deprecated/clutter-texture.c:1080
+msgid "Filename"
+msgstr ""
+
+#: ../clutter/clutter-script.c:480
+msgid "The path of the currently parsed file"
+msgstr ""
+
+#: ../clutter/clutter-script.c:497
+msgid "Translation Domain"
+msgstr ""
+
+#: ../clutter/clutter-script.c:498
+msgid "The translation domain used to localize string"
+msgstr ""
+
+#: ../clutter/clutter-scroll-actor.c:189
+msgid "Scroll Mode"
+msgstr ""
+
+#: ../clutter/clutter-scroll-actor.c:190
+msgid "The scrolling direction"
+msgstr ""
+
+#: ../clutter/clutter-settings.c:486
+msgid "Double Click Time"
+msgstr ""
+
+#: ../clutter/clutter-settings.c:487
+msgid "The time between clicks necessary to detect a multiple click"
+msgstr ""
+
+#: ../clutter/clutter-settings.c:502
+msgid "Double Click Distance"
+msgstr ""
+
+#: ../clutter/clutter-settings.c:503
+msgid "The distance between clicks necessary to detect a multiple click"
+msgstr ""
+
+#: ../clutter/clutter-settings.c:518
+msgid "Drag Threshold"
+msgstr ""
+
+#: ../clutter/clutter-settings.c:519
+msgid "The distance the cursor should travel before starting to drag"
+msgstr ""
+
+#: ../clutter/clutter-settings.c:534 ../clutter/clutter-text.c:3437
+msgid "Font Name"
+msgstr ""
+
+#: ../clutter/clutter-settings.c:535
+msgid ""
+"The description of the default font, as one that could be parsed by Pango"
+msgstr ""
+
+#: ../clutter/clutter-settings.c:550
+msgid "Font Antialias"
+msgstr ""
+
+#: ../clutter/clutter-settings.c:551
+msgid ""
+"Whether to use antialiasing (1 to enable, 0 to disable, and -1 to use the "
+"default)"
+msgstr ""
+
+#: ../clutter/clutter-settings.c:567 ../clutter/clutter-settings.c:575
+msgid "Font DPI"
+msgstr ""
+
+#: ../clutter/clutter-settings.c:568 ../clutter/clutter-settings.c:576
+msgid ""
+"The resolution of the font, in 1024 * dots/inch, or -1 to use the default"
+msgstr ""
+
+#: ../clutter/clutter-settings.c:592
+msgid "Font Hinting"
+msgstr ""
+
+#: ../clutter/clutter-settings.c:593
+msgid ""
+"Whether to use hinting (1 to enable, 0 to disable and -1 to use the default)"
+msgstr ""
+
+#: ../clutter/clutter-settings.c:614
+msgid "Font Hint Style"
+msgstr ""
+
+#: ../clutter/clutter-settings.c:615
+msgid "The style of hinting (hintnone, hintslight, hintmedium, hintfull)"
+msgstr ""
+
+#: ../clutter/clutter-settings.c:636
+msgid "Font Subpixel Order"
+msgstr ""
+
+#: ../clutter/clutter-settings.c:637
+msgid "The type of subpixel antialiasing (none, rgb, bgr, vrgb, vbgr)"
+msgstr ""
+
+#: ../clutter/clutter-settings.c:654
+msgid "The minimum duration for a long press gesture to be recognized"
+msgstr ""
+
+#: ../clutter/clutter-settings.c:661
+msgid "Window Scaling Factor"
+msgstr ""
+
+#: ../clutter/clutter-settings.c:662
+msgid "The scaling factor to be applied to windows"
+msgstr ""
+
+#: ../clutter/clutter-settings.c:669
+msgid "Fontconfig configuration timestamp"
+msgstr ""
+
+#: ../clutter/clutter-settings.c:670
+msgid "Timestamp of the current fontconfig configuration"
+msgstr ""
+
+#: ../clutter/clutter-settings.c:687
+msgid "Password Hint Time"
+msgstr ""
+
+#: ../clutter/clutter-settings.c:688
+msgid "How long to show the last input character in hidden entries"
+msgstr ""
+
+#: ../clutter/clutter-shader-effect.c:485
+msgid "Shader Type"
+msgstr ""
+
+#: ../clutter/clutter-shader-effect.c:486
+msgid "The type of shader used"
+msgstr ""
+
+#: ../clutter/clutter-snap-constraint.c:322
+msgid "The source of the constraint"
+msgstr ""
+
+#: ../clutter/clutter-snap-constraint.c:335
+msgid "From Edge"
+msgstr ""
+
+#: ../clutter/clutter-snap-constraint.c:336
+msgid "The edge of the actor that should be snapped"
+msgstr ""
+
+#: ../clutter/clutter-snap-constraint.c:350
+msgid "To Edge"
+msgstr ""
+
+#: ../clutter/clutter-snap-constraint.c:351
+msgid "The edge of the source that should be snapped"
+msgstr ""
+
+#: ../clutter/clutter-snap-constraint.c:367
+msgid "The offset in pixels to apply to the constraint"
+msgstr ""
+
+#: ../clutter/clutter-stage.c:1899
+msgid "Fullscreen Set"
+msgstr ""
+
+#: ../clutter/clutter-stage.c:1900
+msgid "Whether the main stage is fullscreen"
+msgstr ""
+
+#: ../clutter/clutter-stage.c:1914
+msgid "Offscreen"
+msgstr ""
+
+#: ../clutter/clutter-stage.c:1915
+msgid "Whether the main stage should be rendered offscreen"
+msgstr ""
+
+#: ../clutter/clutter-stage.c:1927 ../clutter/clutter-text.c:3551
+msgid "Cursor Visible"
+msgstr ""
+
+#: ../clutter/clutter-stage.c:1928
+msgid "Whether the mouse pointer is visible on the main stage"
+msgstr ""
+
+#: ../clutter/clutter-stage.c:1942
+msgid "User Resizable"
+msgstr ""
+
+#: ../clutter/clutter-stage.c:1943
+msgid "Whether the stage is able to be resized via user interaction"
+msgstr ""
+
+#: ../clutter/clutter-stage.c:1958 ../clutter/deprecated/clutter-box.c:256
+#: ../clutter/deprecated/clutter-rectangle.c:270
+msgid "Color"
+msgstr ""
+
+#: ../clutter/clutter-stage.c:1959
+msgid "The color of the stage"
+msgstr ""
+
+#: ../clutter/clutter-stage.c:1974
+msgid "Perspective"
+msgstr ""
+
+#: ../clutter/clutter-stage.c:1975
+msgid "Perspective projection parameters"
+msgstr ""
+
+#: ../clutter/clutter-stage.c:1990
+msgid "Title"
+msgstr ""
+
+#: ../clutter/clutter-stage.c:1991
+msgid "Stage Title"
+msgstr ""
+
+#: ../clutter/clutter-stage.c:2008
+msgid "Use Fog"
+msgstr ""
+
+#: ../clutter/clutter-stage.c:2009
+msgid "Whether to enable depth cueing"
+msgstr ""
+
+#: ../clutter/clutter-stage.c:2025
+msgid "Fog"
+msgstr ""
+
+#: ../clutter/clutter-stage.c:2026
+msgid "Settings for the depth cueing"
+msgstr ""
+
+#: ../clutter/clutter-stage.c:2042
+msgid "Use Alpha"
+msgstr ""
+
+#: ../clutter/clutter-stage.c:2043
+msgid "Whether to honour the alpha component of the stage color"
+msgstr ""
+
+#: ../clutter/clutter-stage.c:2059
+msgid "Key Focus"
+msgstr ""
+
+#: ../clutter/clutter-stage.c:2060
+msgid "The currently key focused actor"
+msgstr ""
+
+#: ../clutter/clutter-stage.c:2076
+msgid "No Clear Hint"
+msgstr ""
+
+#: ../clutter/clutter-stage.c:2077
+msgid "Whether the stage should clear its contents"
+msgstr ""
+
+#: ../clutter/clutter-stage.c:2090
+msgid "Accept Focus"
+msgstr ""
+
+#: ../clutter/clutter-stage.c:2091
+msgid "Whether the stage should accept focus on show"
+msgstr ""
+
+#: ../clutter/clutter-text-buffer.c:347 ../clutter/clutter-text.c:3472
+msgid "Text"
+msgstr ""
+
+#: ../clutter/clutter-text-buffer.c:348
+msgid "The contents of the buffer"
+msgstr ""
+
+#: ../clutter/clutter-text-buffer.c:361
+msgid "Text length"
+msgstr ""
+
+#: ../clutter/clutter-text-buffer.c:362
+msgid "Length of the text currently in the buffer"
+msgstr ""
+
+#: ../clutter/clutter-text-buffer.c:375
+msgid "Maximum length"
+msgstr ""
+
+#: ../clutter/clutter-text-buffer.c:376
+msgid "Maximum number of characters for this entry. Zero if no maximum"
+msgstr ""
+
+#: ../clutter/clutter-text.c:3419
+msgid "Buffer"
+msgstr ""
+
+#: ../clutter/clutter-text.c:3420
+msgid "The buffer for the text"
+msgstr ""
+
+#: ../clutter/clutter-text.c:3438
+msgid "The font to be used by the text"
+msgstr ""
+
+#: ../clutter/clutter-text.c:3455
+msgid "Font Description"
+msgstr ""
+
+#: ../clutter/clutter-text.c:3456
+msgid "The font description to be used"
+msgstr ""
+
+#: ../clutter/clutter-text.c:3473
+msgid "The text to render"
+msgstr ""
+
+#: ../clutter/clutter-text.c:3487
+msgid "Font Color"
+msgstr ""
+
+#: ../clutter/clutter-text.c:3488
+msgid "Color of the font used by the text"
+msgstr ""
+
+#: ../clutter/clutter-text.c:3503
+msgid "Editable"
+msgstr ""
+
+#: ../clutter/clutter-text.c:3504
+msgid "Whether the text is editable"
+msgstr ""
+
+#: ../clutter/clutter-text.c:3519
+msgid "Selectable"
+msgstr ""
+
+#: ../clutter/clutter-text.c:3520
+msgid "Whether the text is selectable"
+msgstr ""
+
+#: ../clutter/clutter-text.c:3534
+msgid "Activatable"
+msgstr ""
+
+#: ../clutter/clutter-text.c:3535
+msgid "Whether pressing return causes the activate signal to be emitted"
+msgstr ""
+
+#: ../clutter/clutter-text.c:3552
+msgid "Whether the input cursor is visible"
+msgstr ""
+
+#: ../clutter/clutter-text.c:3566 ../clutter/clutter-text.c:3567
+msgid "Cursor Color"
+msgstr ""
+
+#: ../clutter/clutter-text.c:3582
+msgid "Cursor Color Set"
+msgstr ""
+
+#: ../clutter/clutter-text.c:3583
+msgid "Whether the cursor color has been set"
+msgstr ""
+
+#: ../clutter/clutter-text.c:3598
+msgid "Cursor Size"
+msgstr ""
+
+#: ../clutter/clutter-text.c:3599
+msgid "The width of the cursor, in pixels"
+msgstr ""
+
+#: ../clutter/clutter-text.c:3615 ../clutter/clutter-text.c:3633
+msgid "Cursor Position"
+msgstr ""
+
+#: ../clutter/clutter-text.c:3616 ../clutter/clutter-text.c:3634
+msgid "The cursor position"
+msgstr ""
+
+#: ../clutter/clutter-text.c:3649
+msgid "Selection-bound"
+msgstr ""
+
+#: ../clutter/clutter-text.c:3650
+msgid "The cursor position of the other end of the selection"
+msgstr ""
+
+#: ../clutter/clutter-text.c:3665 ../clutter/clutter-text.c:3666
+msgid "Selection Color"
+msgstr ""
+
+#: ../clutter/clutter-text.c:3681
+msgid "Selection Color Set"
+msgstr ""
+
+#: ../clutter/clutter-text.c:3682
+msgid "Whether the selection color has been set"
+msgstr ""
+
+#: ../clutter/clutter-text.c:3697
+msgid "Attributes"
+msgstr ""
+
+#: ../clutter/clutter-text.c:3698
+msgid "A list of style attributes to apply to the contents of the actor"
+msgstr ""
+
+#: ../clutter/clutter-text.c:3720
+msgid "Use markup"
+msgstr ""
+
+#: ../clutter/clutter-text.c:3721
+msgid "Whether or not the text includes Pango markup"
+msgstr ""
+
+#: ../clutter/clutter-text.c:3737
+msgid "Line wrap"
+msgstr ""
+
+#: ../clutter/clutter-text.c:3738
+msgid "If set, wrap the lines if the text becomes too wide"
+msgstr ""
+
+#: ../clutter/clutter-text.c:3753
+msgid "Line wrap mode"
+msgstr ""
+
+#: ../clutter/clutter-text.c:3754
+msgid "Control how line-wrapping is done"
+msgstr ""
+
+#: ../clutter/clutter-text.c:3769
+msgid "Ellipsize"
+msgstr ""
+
+#: ../clutter/clutter-text.c:3770
+msgid "The preferred place to ellipsize the string"
+msgstr ""
+
+#: ../clutter/clutter-text.c:3786
+msgid "Line Alignment"
+msgstr ""
+
+#: ../clutter/clutter-text.c:3787
+msgid "The preferred alignment for the string, for multi-line text"
+msgstr ""
+
+#: ../clutter/clutter-text.c:3803
+msgid "Justify"
+msgstr ""
+
+#: ../clutter/clutter-text.c:3804
+msgid "Whether the text should be justified"
+msgstr ""
+
+#: ../clutter/clutter-text.c:3819
+msgid "Password Character"
+msgstr ""
+
+#: ../clutter/clutter-text.c:3820
+msgid "If non-zero, use this character to display the actor's contents"
+msgstr ""
+
+#: ../clutter/clutter-text.c:3834
+msgid "Max Length"
+msgstr ""
+
+#: ../clutter/clutter-text.c:3835
+msgid "Maximum length of the text inside the actor"
+msgstr ""
+
+#: ../clutter/clutter-text.c:3858
+msgid "Single Line Mode"
+msgstr ""
+
+#: ../clutter/clutter-text.c:3859
+msgid "Whether the text should be a single line"
+msgstr ""
+
+#: ../clutter/clutter-text.c:3873 ../clutter/clutter-text.c:3874
+msgid "Selected Text Color"
+msgstr ""
+
+#: ../clutter/clutter-text.c:3889
+msgid "Selected Text Color Set"
+msgstr ""
+
+#: ../clutter/clutter-text.c:3890
+msgid "Whether the selected text color has been set"
+msgstr ""
+
+#: ../clutter/clutter-timeline.c:593
+#: ../clutter/deprecated/clutter-animation.c:557
+msgid "Loop"
+msgstr ""
+
+#: ../clutter/clutter-timeline.c:594
+msgid "Should the timeline automatically restart"
+msgstr ""
+
+#: ../clutter/clutter-timeline.c:608
+msgid "Delay"
+msgstr ""
+
+#: ../clutter/clutter-timeline.c:609
+msgid "Delay before start"
+msgstr ""
+
+#: ../clutter/clutter-timeline.c:624
+#: ../clutter/deprecated/clutter-animation.c:541
+#: ../clutter/deprecated/clutter-animator.c:1801
+#: ../clutter/deprecated/clutter-media.c:224
+#: ../clutter/deprecated/clutter-state.c:1517
+msgid "Duration"
+msgstr ""
+
+#: ../clutter/clutter-timeline.c:625
+msgid "Duration of the timeline in milliseconds"
+msgstr ""
+
+#: ../clutter/clutter-timeline.c:640
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:521
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:330
+msgid "Direction"
+msgstr ""
+
+#: ../clutter/clutter-timeline.c:641
+msgid "Direction of the timeline"
+msgstr ""
+
+#: ../clutter/clutter-timeline.c:656
+msgid "Auto Reverse"
+msgstr ""
+
+#: ../clutter/clutter-timeline.c:657
+msgid "Whether the direction should be reversed when reaching the end"
+msgstr ""
+
+#: ../clutter/clutter-timeline.c:675
+msgid "Repeat Count"
+msgstr ""
+
+#: ../clutter/clutter-timeline.c:676
+msgid "How many times the timeline should repeat"
+msgstr ""
+
+#: ../clutter/clutter-timeline.c:690
+msgid "Progress Mode"
+msgstr ""
+
+#: ../clutter/clutter-timeline.c:691
+msgid "How the timeline should compute the progress"
+msgstr ""
+
+#: ../clutter/clutter-transition.c:244
+msgid "Interval"
+msgstr ""
+
+#: ../clutter/clutter-transition.c:245
+msgid "The interval of values to transition"
+msgstr ""
+
+#: ../clutter/clutter-transition.c:259
+msgid "Animatable"
+msgstr ""
+
+#: ../clutter/clutter-transition.c:260
+msgid "The animatable object"
+msgstr ""
+
+#: ../clutter/clutter-transition.c:281
+msgid "Remove on Complete"
+msgstr ""
+
+#: ../clutter/clutter-transition.c:282
+msgid "Detach the transition when completed"
+msgstr ""
+
+#: ../clutter/clutter-zoom-action.c:365
+msgid "Zoom Axis"
+msgstr ""
+
+#: ../clutter/clutter-zoom-action.c:366
+msgid "Constraints the zoom to an axis"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-alpha.c:354
+#: ../clutter/deprecated/clutter-animation.c:572
+#: ../clutter/deprecated/clutter-animator.c:1818
+msgid "Timeline"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-alpha.c:355
+msgid "Timeline used by the alpha"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-alpha.c:371
+msgid "Alpha value"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-alpha.c:372
+msgid "Alpha value as computed by the alpha"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-alpha.c:393
+#: ../clutter/deprecated/clutter-animation.c:525
+msgid "Mode"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-alpha.c:394
+msgid "Progress mode"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-animation.c:508
+msgid "Object"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-animation.c:509
+msgid "Object to which the animation applies"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-animation.c:526
+msgid "The mode of the animation"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-animation.c:542
+msgid "Duration of the animation, in milliseconds"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-animation.c:558
+msgid "Whether the animation should loop"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-animation.c:573
+msgid "The timeline used by the animation"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-animation.c:589
+#: ../clutter/deprecated/clutter-behaviour.c:237
+msgid "Alpha"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-animation.c:590
+msgid "The alpha used by the animation"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-animator.c:1802
+msgid "The duration of the animation"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-animator.c:1819
+msgid "The timeline of the animation"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-behaviour.c:238
+msgid "Alpha Object to drive the behaviour"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-behaviour-depth.c:180
+msgid "Start Depth"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-behaviour-depth.c:181
+msgid "Initial depth to apply"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-behaviour-depth.c:196
+msgid "End Depth"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-behaviour-depth.c:197
+msgid "Final depth to apply"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:394
+msgid "Start Angle"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:395
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:277
+msgid "Initial angle"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:410
+msgid "End Angle"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:411
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:295
+msgid "Final angle"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:426
+msgid "Angle x tilt"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:427
+msgid "Tilt of the ellipse around x axis"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:442
+msgid "Angle y tilt"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:443
+msgid "Tilt of the ellipse around y axis"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:458
+msgid "Angle z tilt"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:459
+msgid "Tilt of the ellipse around z axis"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:475
+msgid "Width of the ellipse"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:491
+msgid "Height of ellipse"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:506
+msgid "Center"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:507
+msgid "Center of ellipse"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:522
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:331
+msgid "Direction of rotation"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-behaviour-opacity.c:177
+msgid "Opacity Start"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-behaviour-opacity.c:178
+msgid "Initial opacity level"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-behaviour-opacity.c:195
+msgid "Opacity End"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-behaviour-opacity.c:196
+msgid "Final opacity level"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-behaviour-path.c:222
+msgid "The ClutterPath object representing the path to animate along"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:276
+msgid "Angle Begin"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:294
+msgid "Angle End"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:312
+msgid "Axis"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:313
+msgid "Axis of rotation"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:348
+msgid "Center X"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:349
+msgid "X coordinate of the center of rotation"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:366
+msgid "Center Y"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:367
+msgid "Y coordinate of the center of rotation"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:384
+msgid "Center Z"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:385
+msgid "Z coordinate of the center of rotation"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-behaviour-scale.c:222
+msgid "X Start Scale"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-behaviour-scale.c:223
+msgid "Initial scale on the X axis"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-behaviour-scale.c:241
+msgid "X End Scale"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-behaviour-scale.c:242
+msgid "Final scale on the X axis"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-behaviour-scale.c:260
+msgid "Y Start Scale"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-behaviour-scale.c:261
+msgid "Initial scale on the Y axis"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-behaviour-scale.c:279
+msgid "Y End Scale"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-behaviour-scale.c:280
+msgid "Final scale on the Y axis"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-box.c:257
+msgid "The background color of the box"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-box.c:270
+msgid "Color Set"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-cairo-texture.c:593
+msgid "Surface Width"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-cairo-texture.c:594
+msgid "The width of the Cairo surface"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-cairo-texture.c:611
+msgid "Surface Height"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-cairo-texture.c:612
+msgid "The height of the Cairo surface"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-cairo-texture.c:632
+msgid "Auto Resize"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-cairo-texture.c:633
+msgid "Whether the surface should match the allocation"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-media.c:83
+msgid "URI"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-media.c:84
+msgid "URI of a media file"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-media.c:100
+msgid "Playing"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-media.c:101
+msgid "Whether the actor is playing"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-media.c:118
+msgid "Progress"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-media.c:119
+msgid "Current progress of the playback"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-media.c:135
+msgid "Subtitle URI"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-media.c:136
+msgid "URI of a subtitle file"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-media.c:154
+msgid "Subtitle Font Name"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-media.c:155
+msgid "The font used to display subtitles"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-media.c:172
+msgid "Audio Volume"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-media.c:173
+msgid "The volume of the audio"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-media.c:189
+msgid "Can Seek"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-media.c:190
+msgid "Whether the current stream is seekable"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-media.c:207
+msgid "Buffer Fill"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-media.c:208
+msgid "The fill level of the buffer"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-media.c:225
+msgid "The duration of the stream, in seconds"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-rectangle.c:271
+msgid "The color of the rectangle"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-rectangle.c:284
+msgid "Border Color"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-rectangle.c:285
+msgid "The color of the border of the rectangle"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-rectangle.c:300
+msgid "Border Width"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-rectangle.c:301
+msgid "The width of the border of the rectangle"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-rectangle.c:315
+msgid "Has Border"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-rectangle.c:316
+msgid "Whether the rectangle should have a border"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-shader.c:257
+msgid "Vertex Source"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-shader.c:258
+msgid "Source of vertex shader"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-shader.c:274
+msgid "Fragment Source"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-shader.c:275
+msgid "Source of fragment shader"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-shader.c:292
+msgid "Compiled"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-shader.c:293
+msgid "Whether the shader is compiled and linked"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-shader.c:310
+msgid "Whether the shader is enabled"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-shader.c:521
+#, c-format
+msgid "%s compilation failed: %s"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-shader.c:522
+msgid "Vertex shader"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-shader.c:523
+msgid "Fragment shader"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-state.c:1499
+msgid "State"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-state.c:1500
+msgid "Currently set state, (transition to this state might not be complete)"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-state.c:1518
+msgid "Default transition duration"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-table-layout.c:543
+msgid "Column Number"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-table-layout.c:544
+msgid "The column the widget resides in"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-table-layout.c:551
+msgid "Row Number"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-table-layout.c:552
+msgid "The row the widget resides in"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-table-layout.c:559
+msgid "Column Span"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-table-layout.c:560
+msgid "The number of columns the widget should span"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-table-layout.c:567
+msgid "Row Span"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-table-layout.c:568
+msgid "The number of rows the widget should span"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-table-layout.c:575
+msgid "Horizontal Expand"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-table-layout.c:576
+msgid "Allocate extra space for the child in horizontal axis"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-table-layout.c:582
+msgid "Vertical Expand"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-table-layout.c:583
+msgid "Allocate extra space for the child in vertical axis"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-table-layout.c:1638
+msgid "Spacing between columns"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-table-layout.c:1654
+msgid "Spacing between rows"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-texture.c:992
+msgid "Sync size of actor"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-texture.c:993
+msgid "Auto sync size of actor to underlying pixbuf dimensions"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-texture.c:1000
+msgid "Disable Slicing"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-texture.c:1001
+msgid ""
+"Forces the underlying texture to be singular and not made of smaller space "
+"saving individual textures"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-texture.c:1010
+msgid "Tile Waste"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-texture.c:1011
+msgid "Maximum waste area of a sliced texture"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-texture.c:1019
+msgid "Horizontal repeat"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-texture.c:1020
+msgid "Repeat the contents rather than scaling them horizontally"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-texture.c:1027
+msgid "Vertical repeat"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-texture.c:1028
+msgid "Repeat the contents rather than scaling them vertically"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-texture.c:1035
+msgid "Filter Quality"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-texture.c:1036
+msgid "Rendering quality used when drawing the texture"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-texture.c:1044
+msgid "Pixel Format"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-texture.c:1045
+msgid "The Cogl pixel format to use"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-texture.c:1053
+#: ../clutter/wayland/clutter-wayland-surface.c:445
+msgid "Cogl Texture"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-texture.c:1054
+#: ../clutter/wayland/clutter-wayland-surface.c:446
+msgid "The underlying Cogl texture handle used to draw this actor"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-texture.c:1061
+msgid "Cogl Material"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-texture.c:1062
+msgid "The underlying Cogl material handle used to draw this actor"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-texture.c:1081
+msgid "The path of the file containing the image data"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-texture.c:1088
+msgid "Keep Aspect Ratio"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-texture.c:1089
+msgid ""
+"Keep the aspect ratio of the texture when requesting the preferred width or "
+"height"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-texture.c:1117
+msgid "Load asynchronously"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-texture.c:1118
+msgid ""
+"Load files inside a thread to avoid blocking when loading images from disk"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-texture.c:1136
+msgid "Load data asynchronously"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-texture.c:1137
+msgid ""
+"Decode image data files inside a thread to reduce blocking when loading "
+"images from disk"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-texture.c:1163
+msgid "Pick With Alpha"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-texture.c:1164
+msgid "Shape actor with alpha channel when picking"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-texture.c:1597
+#: ../clutter/deprecated/clutter-texture.c:1992
+#: ../clutter/deprecated/clutter-texture.c:2088
+#: ../clutter/deprecated/clutter-texture.c:2386
+#, c-format
+msgid "Failed to load the image data"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-texture.c:1756
+#, c-format
+msgid "YUV textures are not supported"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-texture.c:1765
+#, c-format
+msgid "YUV2 textues are not supported"
+msgstr ""
+
+#: ../clutter/gdk/clutter-backend-gdk.c:289
+#, c-format
+msgid "Could not find a suitable CoglWinsys for a GdkDisplay of type %s"
+msgstr ""
+
+#: ../clutter/wayland/clutter-wayland-surface.c:419
+msgid "Surface"
+msgstr ""
+
+#: ../clutter/wayland/clutter-wayland-surface.c:420
+msgid "The underlying wayland surface"
+msgstr ""
+
+#: ../clutter/wayland/clutter-wayland-surface.c:427
+msgid "Surface width"
+msgstr ""
+
+#: ../clutter/wayland/clutter-wayland-surface.c:428
+msgid "The width of the underlying wayland surface"
+msgstr ""
+
+#: ../clutter/wayland/clutter-wayland-surface.c:436
+msgid "Surface height"
+msgstr ""
+
+#: ../clutter/wayland/clutter-wayland-surface.c:437
+msgid "The height of the underlying wayland surface"
+msgstr ""
+
+#: ../clutter/x11/clutter-backend-x11.c:488
+msgid "X display to use"
+msgstr "사용할 X 디스플레이"
+
+#: ../clutter/x11/clutter-backend-x11.c:494
+msgid "X screen to use"
+msgstr "사용할 X 스크린"
+
+#: ../clutter/x11/clutter-backend-x11.c:499
+msgid "Make X calls synchronous"
+msgstr "X 호출을 동기로 하기"
+
+#: ../clutter/x11/clutter-backend-x11.c:506
+msgid "Disable XInput support"
+msgstr "XInput 기능 사용하지 않기"
+
+#: ../clutter/x11/clutter-keymap-x11.c:458
+msgid "The Clutter backend"
+msgstr ""
+
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:534
+msgid "Pixmap"
+msgstr ""
+
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:535
+msgid "The X11 Pixmap to be bound"
+msgstr ""
+
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:543
+msgid "Pixmap width"
+msgstr ""
+
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:544
+msgid "The width of the pixmap bound to this texture"
+msgstr ""
+
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:552
+msgid "Pixmap height"
+msgstr ""
+
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:553
+msgid "The height of the pixmap bound to this texture"
+msgstr ""
+
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:561
+msgid "Pixmap Depth"
+msgstr ""
+
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:562
+msgid "The depth (in number of bits) of the pixmap bound to this texture"
+msgstr ""
+
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:570
+msgid "Automatic Updates"
+msgstr ""
+
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:571
+msgid "If the texture should be kept in sync with any pixmap changes."
+msgstr ""
+
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:579
+msgid "Window"
+msgstr ""
+
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:580
+msgid "The X11 Window to be bound"
+msgstr ""
+
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:588
+msgid "Window Redirect Automatic"
+msgstr ""
+
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:589
+msgid "If composite window redirects are set to Automatic (or Manual if false)"
+msgstr ""
+
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:599
+msgid "Window Mapped"
+msgstr ""
+
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:600
+msgid "If window is mapped"
+msgstr ""
+
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:609
+msgid "Destroyed"
+msgstr ""
+
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:610
+msgid "If window has been destroyed"
+msgstr ""
+
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:618
+msgid "Window X"
+msgstr "창 가로"
+
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:619
+msgid "X position of window on screen according to X11"
+msgstr "X11 스크린에서 창의 가로 위치"
+
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:627
+msgid "Window Y"
+msgstr "창 세로"
+
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:628
+msgid "Y position of window on screen according to X11"
+msgstr "X11 스크린에서 창의 세로 위치"
+
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:635
+msgid "Window Override Redirect"
+msgstr ""
+
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:636
+msgid "If this is an override-redirect window"
+msgstr ""
diff --git a/po/lt.po b/po/lt.po
index 78ad75035..1b441d906 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -1,715 +1,710 @@
 # Lithuanian translation for clutter.
 # Copyright (C) 2011 clutter's COPYRIGHT HOLDER
 # This file is distributed under the same license as the clutter package.
-# Aurimas Černius <aurisc4@gmail.com>, 2011.
 # Algimantas Margevičius <gymka@mail.ru>, 2011.
+# Aurimas Černius <aurisc4@gmail.com>, 2011, 2013, 2014.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: clutter master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=clutter&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2012-08-28 13:46+0000\n"
-"PO-Revision-Date: 2012-08-28 21:53+0300\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+"product=clutter&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2014-02-21 16:08+0000\n"
+"PO-Revision-Date: 2014-02-21 22:12+0200\n"
 "Last-Translator: Aurimas Černius <aurisc4@gmail.com>\n"
-"Language-Team: Lietuvių <>\n"
+"Language-Team: Lietuvių <gnome-lt@lists.akl.lt>\n"
 "Language: lt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n"
+"%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Gtranslator 2.91.6\n"
 
-#: ../clutter/clutter-actor.c:6121
+#: ../clutter/clutter-actor.c:6214
 msgid "X coordinate"
 msgstr "X koordinatė"
 
-#: ../clutter/clutter-actor.c:6122
+#: ../clutter/clutter-actor.c:6215
 msgid "X coordinate of the actor"
 msgstr "Aktoriaus X koordinatė"
 
-#: ../clutter/clutter-actor.c:6140
+#: ../clutter/clutter-actor.c:6233
 msgid "Y coordinate"
 msgstr "Y koordinatė"
 
-#: ../clutter/clutter-actor.c:6141
+#: ../clutter/clutter-actor.c:6234
 msgid "Y coordinate of the actor"
 msgstr "Aktoriaus Y koordinatė"
 
-#: ../clutter/clutter-actor.c:6163
+#: ../clutter/clutter-actor.c:6256
 msgid "Position"
 msgstr "Padėtis"
 
-#: ../clutter/clutter-actor.c:6164
+#: ../clutter/clutter-actor.c:6257
 msgid "The position of the origin of the actor"
 msgstr "Aktoriaus originali padėtis"
 
-#: ../clutter/clutter-actor.c:6181
-#: ../clutter/clutter-canvas.c:215
-#: ../clutter/clutter-grid-layout.c:1238
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:481
+#: ../clutter/clutter-actor.c:6274 ../clutter/clutter-canvas.c:247
+#: ../clutter/clutter-grid-layout.c:1239
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:474
 msgid "Width"
 msgstr "Plotis"
 
-#: ../clutter/clutter-actor.c:6182
+#: ../clutter/clutter-actor.c:6275
 msgid "Width of the actor"
 msgstr "Aktoriaus plotis"
 
-#: ../clutter/clutter-actor.c:6200
-#: ../clutter/clutter-canvas.c:231
-#: ../clutter/clutter-grid-layout.c:1245
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:497
+#: ../clutter/clutter-actor.c:6293 ../clutter/clutter-canvas.c:263
+#: ../clutter/clutter-grid-layout.c:1246
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:490
 msgid "Height"
 msgstr "Aukštis"
 
-#: ../clutter/clutter-actor.c:6201
+#: ../clutter/clutter-actor.c:6294
 msgid "Height of the actor"
 msgstr "Aktoriaus aukštis"
 
-#: ../clutter/clutter-actor.c:6222
+#: ../clutter/clutter-actor.c:6315
 msgid "Size"
 msgstr "Dydis"
 
-#: ../clutter/clutter-actor.c:6223
+#: ../clutter/clutter-actor.c:6316
 msgid "The size of the actor"
 msgstr "Aktoriaus dydis"
 
-#: ../clutter/clutter-actor.c:6241
+#: ../clutter/clutter-actor.c:6334
 msgid "Fixed X"
 msgstr "Fiksuota X"
 
-#: ../clutter/clutter-actor.c:6242
+#: ../clutter/clutter-actor.c:6335
 msgid "Forced X position of the actor"
 msgstr "Aktoriaus priverstinė X padėtis"
 
-#: ../clutter/clutter-actor.c:6259
+#: ../clutter/clutter-actor.c:6352
 msgid "Fixed Y"
 msgstr "Fiksuota Y"
 
-#: ../clutter/clutter-actor.c:6260
+#: ../clutter/clutter-actor.c:6353
 msgid "Forced Y position of the actor"
 msgstr "Aktoriaus priverstinė Y padėtis"
 
-#: ../clutter/clutter-actor.c:6275
+#: ../clutter/clutter-actor.c:6368
 msgid "Fixed position set"
 msgstr "Fiksuota padėties aibė"
 
-#: ../clutter/clutter-actor.c:6276
+#: ../clutter/clutter-actor.c:6369
 msgid "Whether to use fixed positioning for the actor"
 msgstr "Ar naudoti fiksuotą aktoriaus padėtį"
 
-#: ../clutter/clutter-actor.c:6294
+#: ../clutter/clutter-actor.c:6387
 msgid "Min Width"
 msgstr "Mažiausias plotis"
 
-#: ../clutter/clutter-actor.c:6295
+#: ../clutter/clutter-actor.c:6388
 msgid "Forced minimum width request for the actor"
 msgstr "Priverstinis mažiausias pločio prašymas aktoriui"
 
-#: ../clutter/clutter-actor.c:6313
+#: ../clutter/clutter-actor.c:6406
 msgid "Min Height"
 msgstr "Mažiausias aukštis"
 
-#: ../clutter/clutter-actor.c:6314
+#: ../clutter/clutter-actor.c:6407
 msgid "Forced minimum height request for the actor"
 msgstr "Priverstinis mažiausias aukščio prašymas aktoriui"
 
-#: ../clutter/clutter-actor.c:6332
+#: ../clutter/clutter-actor.c:6425
 msgid "Natural Width"
 msgstr "Natūralusis plotis"
 
-#: ../clutter/clutter-actor.c:6333
+#: ../clutter/clutter-actor.c:6426
 msgid "Forced natural width request for the actor"
 msgstr "Priverstinis natūralusis pločio prašymas aktoriui"
 
-#: ../clutter/clutter-actor.c:6351
+#: ../clutter/clutter-actor.c:6444
 msgid "Natural Height"
 msgstr "Natūralusis aukštis"
 
-#: ../clutter/clutter-actor.c:6352
+#: ../clutter/clutter-actor.c:6445
 msgid "Forced natural height request for the actor"
 msgstr "Priverstinis natūralusis aukščio prašymas aktoriui"
 
-#: ../clutter/clutter-actor.c:6367
+#: ../clutter/clutter-actor.c:6460
 msgid "Minimum width set"
 msgstr "Mažiausiais plotis nustatytas"
 
-#: ../clutter/clutter-actor.c:6368
+#: ../clutter/clutter-actor.c:6461
 msgid "Whether to use the min-width property"
 msgstr "Ar naudoti min-width savybę"
 
-#: ../clutter/clutter-actor.c:6382
+#: ../clutter/clutter-actor.c:6475
 msgid "Minimum height set"
 msgstr "Mažiausias aukštis nustatytas"
 
-#: ../clutter/clutter-actor.c:6383
+#: ../clutter/clutter-actor.c:6476
 msgid "Whether to use the min-height property"
 msgstr "Ar naudoti min-height savybę"
 
-#: ../clutter/clutter-actor.c:6397
+#: ../clutter/clutter-actor.c:6490
 msgid "Natural width set"
 msgstr "Natūralusis plotis nustatytas"
 
-#: ../clutter/clutter-actor.c:6398
+#: ../clutter/clutter-actor.c:6491
 msgid "Whether to use the natural-width property"
 msgstr "Ar naudoti natural-width savybę"
 
-#: ../clutter/clutter-actor.c:6412
+#: ../clutter/clutter-actor.c:6505
 msgid "Natural height set"
 msgstr "Natūralusis aukštis nustatytas"
 
-#: ../clutter/clutter-actor.c:6413
+#: ../clutter/clutter-actor.c:6506
 msgid "Whether to use the natural-height property"
 msgstr "Ar naudoti natural-height savybę"
 
-#: ../clutter/clutter-actor.c:6429
+#: ../clutter/clutter-actor.c:6522
 msgid "Allocation"
 msgstr "Išskyrimas"
 
-#: ../clutter/clutter-actor.c:6430
+#: ../clutter/clutter-actor.c:6523
 msgid "The actor's allocation"
 msgstr "Aktoriaus išskyrimas"
 
-#: ../clutter/clutter-actor.c:6487
+#: ../clutter/clutter-actor.c:6580
 msgid "Request Mode"
 msgstr "Prašymo veiksena"
 
-#: ../clutter/clutter-actor.c:6488
+#: ../clutter/clutter-actor.c:6581
 msgid "The actor's request mode"
 msgstr "Aktoriaus prašymo veiksena"
 
-#: ../clutter/clutter-actor.c:6512
+#: ../clutter/clutter-actor.c:6605
 msgid "Depth"
 msgstr "Gylis"
 
-#: ../clutter/clutter-actor.c:6513
+#: ../clutter/clutter-actor.c:6606
 msgid "Position on the Z axis"
 msgstr "Padėtis Z ašyje"
 
-#: ../clutter/clutter-actor.c:6540
+#: ../clutter/clutter-actor.c:6633
 msgid "Z Position"
 msgstr "Z padėtis"
 
-#: ../clutter/clutter-actor.c:6541
+#: ../clutter/clutter-actor.c:6634
 msgid "The actor's position on the Z axis"
 msgstr "Aktoriaus padėtis Z ašyje"
 
-#: ../clutter/clutter-actor.c:6558
+#: ../clutter/clutter-actor.c:6651
 msgid "Opacity"
 msgstr "Nepermatomumas"
 
-#: ../clutter/clutter-actor.c:6559
+#: ../clutter/clutter-actor.c:6652
 msgid "Opacity of an actor"
 msgstr "Aktoriaus nepermatomumas"
 
-#: ../clutter/clutter-actor.c:6579
+#: ../clutter/clutter-actor.c:6672
 msgid "Offscreen redirect"
 msgstr "Nukreipimas už ekrano"
 
-#: ../clutter/clutter-actor.c:6580
+#: ../clutter/clutter-actor.c:6673
 msgid "Flags controlling when to flatten the actor into a single image"
 msgstr "Požymiai, valdantys, kada projektuoti aktorių į vieną paveikslėlį"
 
-#: ../clutter/clutter-actor.c:6594
+#: ../clutter/clutter-actor.c:6687
 msgid "Visible"
 msgstr "Matomas"
 
-#: ../clutter/clutter-actor.c:6595
+#: ../clutter/clutter-actor.c:6688
 msgid "Whether the actor is visible or not"
 msgstr "Ar aktorius yra matomas"
 
-#: ../clutter/clutter-actor.c:6609
+#: ../clutter/clutter-actor.c:6702
 msgid "Mapped"
 msgstr "Patalpintas"
 
-#: ../clutter/clutter-actor.c:6610
+#: ../clutter/clutter-actor.c:6703
 msgid "Whether the actor will be painted"
 msgstr "Ar aktorius bus piešiamas"
 
-#: ../clutter/clutter-actor.c:6623
+#: ../clutter/clutter-actor.c:6716
 msgid "Realized"
 msgstr "Realizuotas"
 
-#: ../clutter/clutter-actor.c:6624
+#: ../clutter/clutter-actor.c:6717
 msgid "Whether the actor has been realized"
 msgstr "Ar aktorius buvo realizuotas"
 
-#: ../clutter/clutter-actor.c:6639
+#: ../clutter/clutter-actor.c:6732
 msgid "Reactive"
 msgstr "Reaktyvus"
 
-#: ../clutter/clutter-actor.c:6640
+#: ../clutter/clutter-actor.c:6733
 msgid "Whether the actor is reactive to events"
 msgstr "Ar aktorius reaguoja į įvykius"
 
-#: ../clutter/clutter-actor.c:6651
+#: ../clutter/clutter-actor.c:6744
 msgid "Has Clip"
 msgstr "Turi įkirpimą"
 
-#: ../clutter/clutter-actor.c:6652
+#: ../clutter/clutter-actor.c:6745
 msgid "Whether the actor has a clip set"
 msgstr "Ar aktorius turi nustatytą įkirpimą"
 
-#: ../clutter/clutter-actor.c:6665
+#: ../clutter/clutter-actor.c:6758
 msgid "Clip"
 msgstr "Įkirpimas"
 
-#: ../clutter/clutter-actor.c:6666
+#: ../clutter/clutter-actor.c:6759
 msgid "The clip region for the actor"
 msgstr "Aktoriaus įkirpimo sritis"
 
-#: ../clutter/clutter-actor.c:6685
+#: ../clutter/clutter-actor.c:6778
 msgid "Clip Rectangle"
 msgstr "Apkirpti stačiakampį"
 
-#: ../clutter/clutter-actor.c:6686
+#: ../clutter/clutter-actor.c:6779
 msgid "The visible region of the actor"
 msgstr "Aktoriaus matoma sritis"
 
-#: ../clutter/clutter-actor.c:6700
-#: ../clutter/clutter-actor-meta.c:207
-#: ../clutter/clutter-binding-pool.c:319
-#: ../clutter/clutter-input-device.c:258
+#: ../clutter/clutter-actor.c:6793 ../clutter/clutter-actor-meta.c:205
+#: ../clutter/clutter-binding-pool.c:319 ../clutter/clutter-input-device.c:247
 msgid "Name"
 msgstr "Vardas"
 
-#: ../clutter/clutter-actor.c:6701
+#: ../clutter/clutter-actor.c:6794
 msgid "Name of the actor"
 msgstr "Aktoriaus vardas"
 
-#: ../clutter/clutter-actor.c:6722
+#: ../clutter/clutter-actor.c:6815
 msgid "Pivot Point"
 msgstr "Inkaro taškas"
 
-#: ../clutter/clutter-actor.c:6723
+#: ../clutter/clutter-actor.c:6816
 msgid "The point around which the scaling and rotation occur"
 msgstr "Taškas, aplink kūrį vyksta didinimas ir sukimas"
 
-#: ../clutter/clutter-actor.c:6741
+#: ../clutter/clutter-actor.c:6834
 msgid "Pivot Point Z"
 msgstr "Inkaro taškas Z"
 
-#: ../clutter/clutter-actor.c:6742
+#: ../clutter/clutter-actor.c:6835
 msgid "Z component of the pivot point"
 msgstr "Inkaro taško Z koordinatė"
 
-#: ../clutter/clutter-actor.c:6760
+#: ../clutter/clutter-actor.c:6853
 msgid "Scale X"
 msgstr "X plėtimasis"
 
-#: ../clutter/clutter-actor.c:6761
+#: ../clutter/clutter-actor.c:6854
 msgid "Scale factor on the X axis"
 msgstr "Plėtimosi faktorius X ašyje"
 
-#: ../clutter/clutter-actor.c:6779
+#: ../clutter/clutter-actor.c:6872
 msgid "Scale Y"
 msgstr "Y plėtimasis"
 
-#: ../clutter/clutter-actor.c:6780
+#: ../clutter/clutter-actor.c:6873
 msgid "Scale factor on the Y axis"
 msgstr "Plėtimosi faktorius Y ašyje"
 
-#: ../clutter/clutter-actor.c:6798
+#: ../clutter/clutter-actor.c:6891
 msgid "Scale Z"
 msgstr "Z plėtimasis"
 
-#: ../clutter/clutter-actor.c:6799
+#: ../clutter/clutter-actor.c:6892
 msgid "Scale factor on the Z axis"
 msgstr "Plėtimosi faktorius Z ašyje"
 
-#: ../clutter/clutter-actor.c:6817
+#: ../clutter/clutter-actor.c:6910
 msgid "Scale Center X"
 msgstr "X centruotas plėtimasis"
 
-#: ../clutter/clutter-actor.c:6818
+#: ../clutter/clutter-actor.c:6911
 msgid "Horizontal scale center"
 msgstr "Horizontalus centruotas plėtimasis"
 
-#: ../clutter/clutter-actor.c:6836
+#: ../clutter/clutter-actor.c:6929
 msgid "Scale Center Y"
 msgstr "Y centruotas plėtimasis"
 
-#: ../clutter/clutter-actor.c:6837
+#: ../clutter/clutter-actor.c:6930
 msgid "Vertical scale center"
 msgstr "Vertikalus centruotas plėtimasis"
 
-#: ../clutter/clutter-actor.c:6855
+#: ../clutter/clutter-actor.c:6948
 msgid "Scale Gravity"
 msgstr "Plėtimosi trauka"
 
-#: ../clutter/clutter-actor.c:6856
+#: ../clutter/clutter-actor.c:6949
 msgid "The center of scaling"
 msgstr "Plėtimosi centras"
 
-#: ../clutter/clutter-actor.c:6874
+#: ../clutter/clutter-actor.c:6967
 msgid "Rotation Angle X"
 msgstr "X posūkio kampas"
 
-#: ../clutter/clutter-actor.c:6875
+#: ../clutter/clutter-actor.c:6968
 msgid "The rotation angle on the X axis"
 msgstr "Posūkio kampas X ašyje"
 
-#: ../clutter/clutter-actor.c:6893
+#: ../clutter/clutter-actor.c:6986
 msgid "Rotation Angle Y"
 msgstr "Y posūkio kampas"
 
-#: ../clutter/clutter-actor.c:6894
+#: ../clutter/clutter-actor.c:6987
 msgid "The rotation angle on the Y axis"
 msgstr "Posūkio kampas Y ašyje"
 
-#: ../clutter/clutter-actor.c:6912
+#: ../clutter/clutter-actor.c:7005
 msgid "Rotation Angle Z"
 msgstr "Z posūkio kampas"
 
-#: ../clutter/clutter-actor.c:6913
+#: ../clutter/clutter-actor.c:7006
 msgid "The rotation angle on the Z axis"
 msgstr "Posūkio kampas Z ašyje"
 
-#: ../clutter/clutter-actor.c:6931
+#: ../clutter/clutter-actor.c:7024
 msgid "Rotation Center X"
 msgstr "X posūkio centras"
 
-#: ../clutter/clutter-actor.c:6932
+#: ../clutter/clutter-actor.c:7025
 msgid "The rotation center on the X axis"
 msgstr "Posūkio centras X ašyje"
 
-#: ../clutter/clutter-actor.c:6949
+#: ../clutter/clutter-actor.c:7042
 msgid "Rotation Center Y"
 msgstr "Y posūkio centras"
 
-#: ../clutter/clutter-actor.c:6950
+#: ../clutter/clutter-actor.c:7043
 msgid "The rotation center on the Y axis"
 msgstr "Posūkio centras Y ašyje"
 
-#: ../clutter/clutter-actor.c:6967
+#: ../clutter/clutter-actor.c:7060
 msgid "Rotation Center Z"
 msgstr "Z posūkio centras"
 
-#: ../clutter/clutter-actor.c:6968
+#: ../clutter/clutter-actor.c:7061
 msgid "The rotation center on the Z axis"
 msgstr "Posūkio centras Z ašyje"
 
-#: ../clutter/clutter-actor.c:6985
+#: ../clutter/clutter-actor.c:7078
 msgid "Rotation Center Z Gravity"
 msgstr "Posūkio centro Z trauka"
 
-#: ../clutter/clutter-actor.c:6986
+#: ../clutter/clutter-actor.c:7079
 msgid "Center point for rotation around the Z axis"
 msgstr "Centrinis taškas posūkiui apie Z ašį"
 
-#: ../clutter/clutter-actor.c:7014
+#: ../clutter/clutter-actor.c:7107
 msgid "Anchor X"
 msgstr "Inkaro X"
 
-#: ../clutter/clutter-actor.c:7015
+#: ../clutter/clutter-actor.c:7108
 msgid "X coordinate of the anchor point"
 msgstr "Inkaro taško X koordinatė"
 
-#: ../clutter/clutter-actor.c:7043
+#: ../clutter/clutter-actor.c:7136
 msgid "Anchor Y"
 msgstr "Inkaro Y"
 
-#: ../clutter/clutter-actor.c:7044
+#: ../clutter/clutter-actor.c:7137
 msgid "Y coordinate of the anchor point"
 msgstr "Inkaro taško Y koordinatė"
 
-#: ../clutter/clutter-actor.c:7071
+#: ../clutter/clutter-actor.c:7164
 msgid "Anchor Gravity"
 msgstr "Inkaro trauka"
 
-#: ../clutter/clutter-actor.c:7072
+#: ../clutter/clutter-actor.c:7165
 msgid "The anchor point as a ClutterGravity"
 msgstr "Inkaro taškas kaip ClutterGravity"
 
-#: ../clutter/clutter-actor.c:7091
+#: ../clutter/clutter-actor.c:7184
 msgid "Translation X"
 msgstr "Vertimas X"
 
-#: ../clutter/clutter-actor.c:7092
+#: ../clutter/clutter-actor.c:7185
 msgid "Translation along the X axis"
 msgstr "Vertimas X ašyje"
 
-#: ../clutter/clutter-actor.c:7111
+#: ../clutter/clutter-actor.c:7204
 msgid "Translation Y"
 msgstr "Vertimas Y"
 
-#: ../clutter/clutter-actor.c:7112
+#: ../clutter/clutter-actor.c:7205
 msgid "Translation along the Y axis"
 msgstr "Vertimas Y ašyje"
 
-#: ../clutter/clutter-actor.c:7131
+#: ../clutter/clutter-actor.c:7224
 msgid "Translation Z"
 msgstr "Vertimas Z"
 
-#: ../clutter/clutter-actor.c:7132
+#: ../clutter/clutter-actor.c:7225
 msgid "Translation along the Z axis"
 msgstr "Vertimas Z ašyje"
 
-#: ../clutter/clutter-actor.c:7160
+#: ../clutter/clutter-actor.c:7255
 msgid "Transform"
 msgstr "Transformuoti"
 
-#: ../clutter/clutter-actor.c:7161
+#: ../clutter/clutter-actor.c:7256
 msgid "Transformation matrix"
 msgstr "Transformacijos matrica"
 
-#: ../clutter/clutter-actor.c:7175
+#: ../clutter/clutter-actor.c:7271
 msgid "Transform Set"
 msgstr "Transformacija nustatyta"
 
-#: ../clutter/clutter-actor.c:7176
+#: ../clutter/clutter-actor.c:7272
 msgid "Whether the transform property is set"
 msgstr "Ar transformavimo savybė yra nustatyta"
 
-#: ../clutter/clutter-actor.c:7195
+#: ../clutter/clutter-actor.c:7293
 msgid "Child Transform"
 msgstr "Vaiko transformavimas"
 
-#: ../clutter/clutter-actor.c:7196
+#: ../clutter/clutter-actor.c:7294
 msgid "Children transformation matrix"
 msgstr "Vaikų transformacijos matrica"
 
-#: ../clutter/clutter-actor.c:7210
+#: ../clutter/clutter-actor.c:7309
 msgid "Child Transform Set"
 msgstr "Vaiko transformacija nustatyta"
 
-#: ../clutter/clutter-actor.c:7211
+#: ../clutter/clutter-actor.c:7310
 msgid "Whether the child-transform property is set"
 msgstr "Ar vaiko transformavimo savybė yra nustatyta"
 
-#: ../clutter/clutter-actor.c:7228
+#: ../clutter/clutter-actor.c:7327
 msgid "Show on set parent"
 msgstr "Rodyti nustačius tėvą"
 
-#: ../clutter/clutter-actor.c:7229
+#: ../clutter/clutter-actor.c:7328
 msgid "Whether the actor is shown when parented"
 msgstr "Ar aktorius yra rodomas kai turi tėvą"
 
-#: ../clutter/clutter-actor.c:7246
+#: ../clutter/clutter-actor.c:7345
 msgid "Clip to Allocation"
 msgstr "Iškirpimas į išskyrimą"
 
-#: ../clutter/clutter-actor.c:7247
+#: ../clutter/clutter-actor.c:7346
 msgid "Sets the clip region to track the actor's allocation"
 msgstr "Nustato iškirpimo regioną aktoriaus išskyrimo sekimui"
 
-#: ../clutter/clutter-actor.c:7260
+#: ../clutter/clutter-actor.c:7359
 msgid "Text Direction"
 msgstr "Teksto kryptis"
 
-#: ../clutter/clutter-actor.c:7261
+#: ../clutter/clutter-actor.c:7360
 msgid "Direction of the text"
 msgstr "Teksto kryptis"
 
-#: ../clutter/clutter-actor.c:7276
+#: ../clutter/clutter-actor.c:7375
 msgid "Has Pointer"
 msgstr "Turi žymeklį"
 
-#: ../clutter/clutter-actor.c:7277
+#: ../clutter/clutter-actor.c:7376
 msgid "Whether the actor contains the pointer of an input device"
 msgstr "Ar aktorius turi įvesties įrenginio žymeklį"
 
-#: ../clutter/clutter-actor.c:7290
+#: ../clutter/clutter-actor.c:7389
 msgid "Actions"
 msgstr "Veiksmai"
 
-#: ../clutter/clutter-actor.c:7291
+#: ../clutter/clutter-actor.c:7390
 msgid "Adds an action to the actor"
 msgstr "Prideda aktoriui veiksmą"
 
-#: ../clutter/clutter-actor.c:7304
+#: ../clutter/clutter-actor.c:7403
 msgid "Constraints"
 msgstr "Ribojimai"
 
-#: ../clutter/clutter-actor.c:7305
+#: ../clutter/clutter-actor.c:7404
 msgid "Adds a constraint to the actor"
 msgstr "Prideda aktoriui ribojimą"
 
-#: ../clutter/clutter-actor.c:7318
+#: ../clutter/clutter-actor.c:7417
 msgid "Effect"
 msgstr "Efektas"
 
-#: ../clutter/clutter-actor.c:7319
+#: ../clutter/clutter-actor.c:7418
 msgid "Add an effect to be applied on the actor"
 msgstr "Prideda efektą, kuris bus pritaikytas aktoriui"
 
-#: ../clutter/clutter-actor.c:7333
+#: ../clutter/clutter-actor.c:7432
 msgid "Layout Manager"
 msgstr "Lygiavimų tvarkyklė"
 
-#: ../clutter/clutter-actor.c:7334
+#: ../clutter/clutter-actor.c:7433
 msgid "The object controlling the layout of an actor's children"
 msgstr "Objektas, valdantis aktoriaus vaikų išdėstymą"
 
-#: ../clutter/clutter-actor.c:7348
+#: ../clutter/clutter-actor.c:7447
 msgid "X Expand"
 msgstr "X plėtimasis"
 
-#: ../clutter/clutter-actor.c:7349
+#: ../clutter/clutter-actor.c:7448
 msgid "Whether extra horizontal space should be assigned to the actor"
 msgstr "Ar aktoriui turi būti priskirta papildoma vieta horizontaliai"
 
-#: ../clutter/clutter-actor.c:7364
+#: ../clutter/clutter-actor.c:7463
 msgid "Y Expand"
 msgstr "Y plėtimasis"
 
-#: ../clutter/clutter-actor.c:7365
+#: ../clutter/clutter-actor.c:7464
 msgid "Whether extra vertical space should be assigned to the actor"
 msgstr "Ar aktoriui turi būti priskirta papildoma vieta vertikaliai"
 
-#: ../clutter/clutter-actor.c:7381
+#: ../clutter/clutter-actor.c:7480
 msgid "X Alignment"
 msgstr "X lygiuotė"
 
-#: ../clutter/clutter-actor.c:7382
+#: ../clutter/clutter-actor.c:7481
 msgid "The alignment of the actor on the X axis within its allocation"
 msgstr "Aktoriaus lygiuotė X ašyje šioje vietoje"
 
-#: ../clutter/clutter-actor.c:7397
+#: ../clutter/clutter-actor.c:7496
 msgid "Y Alignment"
 msgstr "Y lygiuotė"
 
-#: ../clutter/clutter-actor.c:7398
+#: ../clutter/clutter-actor.c:7497
 msgid "The alignment of the actor on the Y axis within its allocation"
 msgstr "Aktoriaus lygiuotė Y ašyje šioje vietoje"
 
-#: ../clutter/clutter-actor.c:7417
+#: ../clutter/clutter-actor.c:7516
 msgid "Margin Top"
 msgstr "Paraštės viršus"
 
-#: ../clutter/clutter-actor.c:7418
+#: ../clutter/clutter-actor.c:7517
 msgid "Extra space at the top"
 msgstr "Papildoma vieta viršuje"
 
-#: ../clutter/clutter-actor.c:7439
+#: ../clutter/clutter-actor.c:7538
 msgid "Margin Bottom"
 msgstr "Paraštės apačia"
 
-#: ../clutter/clutter-actor.c:7440
+#: ../clutter/clutter-actor.c:7539
 msgid "Extra space at the bottom"
 msgstr "Papildoma vieta apačioje"
 
-#: ../clutter/clutter-actor.c:7461
+#: ../clutter/clutter-actor.c:7560
 msgid "Margin Left"
 msgstr "Paraštės kairė"
 
-#: ../clutter/clutter-actor.c:7462
+#: ../clutter/clutter-actor.c:7561
 msgid "Extra space at the left"
 msgstr "Papildoma vieta kairėje"
 
-#: ../clutter/clutter-actor.c:7483
+#: ../clutter/clutter-actor.c:7582
 msgid "Margin Right"
 msgstr "Paraštės dešinė"
 
-#: ../clutter/clutter-actor.c:7484
+#: ../clutter/clutter-actor.c:7583
 msgid "Extra space at the right"
 msgstr "Papildoma vieta dešinėje"
 
-#: ../clutter/clutter-actor.c:7500
+#: ../clutter/clutter-actor.c:7599
 msgid "Background Color Set"
 msgstr "Fono spalva nustatyta"
 
-#: ../clutter/clutter-actor.c:7501
-#: ../clutter/deprecated/clutter-box.c:275
+#: ../clutter/clutter-actor.c:7600 ../clutter/deprecated/clutter-box.c:271
 msgid "Whether the background color is set"
 msgstr "Ar fono spalva nustatyta"
 
-#: ../clutter/clutter-actor.c:7517
+#: ../clutter/clutter-actor.c:7616
 msgid "Background color"
 msgstr "Fono spalva"
 
-#: ../clutter/clutter-actor.c:7518
+#: ../clutter/clutter-actor.c:7617
 msgid "The actor's background color"
 msgstr "Aktoriaus fono spalva"
 
-#: ../clutter/clutter-actor.c:7533
+#: ../clutter/clutter-actor.c:7632
 msgid "First Child"
 msgstr "Pirmas vaikas"
 
-#: ../clutter/clutter-actor.c:7534
+#: ../clutter/clutter-actor.c:7633
 msgid "The actor's first child"
 msgstr "Aktoriaus pirmasis vaikas"
 
-#: ../clutter/clutter-actor.c:7547
+#: ../clutter/clutter-actor.c:7646
 msgid "Last Child"
 msgstr "Paskutinis vaikas"
 
-#: ../clutter/clutter-actor.c:7548
+#: ../clutter/clutter-actor.c:7647
 msgid "The actor's last child"
 msgstr "Aktoriaus paskutinis vaikas"
 
-#: ../clutter/clutter-actor.c:7562
+#: ../clutter/clutter-actor.c:7661
 msgid "Content"
 msgstr "Turinys"
 
-#: ../clutter/clutter-actor.c:7563
+#: ../clutter/clutter-actor.c:7662
 msgid "Delegate object for painting the actor's content"
 msgstr "Deleguotas objektas aktoriaus turinio piešimui"
 
-#: ../clutter/clutter-actor.c:7588
+#: ../clutter/clutter-actor.c:7687
 msgid "Content Gravity"
 msgstr "Turinio trauka"
 
-#: ../clutter/clutter-actor.c:7589
+#: ../clutter/clutter-actor.c:7688
 msgid "Alignment of the actor's content"
 msgstr "Aktoriaus turinio lygiavimas"
 
-#: ../clutter/clutter-actor.c:7609
+#: ../clutter/clutter-actor.c:7708
 msgid "Content Box"
 msgstr "Dabartinė dėžutė"
 
-#: ../clutter/clutter-actor.c:7610
+#: ../clutter/clutter-actor.c:7709
 msgid "The bounding box of the actor's content"
 msgstr "Aktoriaus turinio ribojimo dėžutė"
 
-#: ../clutter/clutter-actor.c:7618
+#: ../clutter/clutter-actor.c:7717
 msgid "Minification Filter"
 msgstr "Mažinimo filtras"
 
-#: ../clutter/clutter-actor.c:7619
+#: ../clutter/clutter-actor.c:7718
 msgid "The filter used when reducing the size of the content"
 msgstr "Filtras, naudojamas mažinant turinio dydį"
 
-#: ../clutter/clutter-actor.c:7626
+#: ../clutter/clutter-actor.c:7725
 msgid "Magnification Filter"
 msgstr "Didinimo filtras"
 
-#: ../clutter/clutter-actor.c:7627
+#: ../clutter/clutter-actor.c:7726
 msgid "The filter used when increasing the size of the content"
 msgstr "Filtras, naudojamas didinant turinio dydį"
 
-#: ../clutter/clutter-actor.c:7641
+#: ../clutter/clutter-actor.c:7740
 msgid "Content Repeat"
 msgstr "Turinio pakartojimas"
 
-#: ../clutter/clutter-actor.c:7642
+#: ../clutter/clutter-actor.c:7741
 msgid "The repeat policy for the actor's content"
 msgstr "Aktoriaus turinio pakartojimo tvarka"
 
-#: ../clutter/clutter-actor-meta.c:193
-#: ../clutter/clutter-child-meta.c:142
+#: ../clutter/clutter-actor-meta.c:191 ../clutter/clutter-child-meta.c:142
 msgid "Actor"
 msgstr "Aktorius"
 
-#: ../clutter/clutter-actor-meta.c:194
+#: ../clutter/clutter-actor-meta.c:192
 msgid "The actor attached to the meta"
 msgstr "Aktorius susietas su meta"
 
-#: ../clutter/clutter-actor-meta.c:208
+#: ../clutter/clutter-actor-meta.c:206
 msgid "The name of the meta"
 msgstr "Meta vardas"
 
-#: ../clutter/clutter-actor-meta.c:221
-#: ../clutter/clutter-input-device.c:337
-#: ../clutter/deprecated/clutter-shader.c:313
+#: ../clutter/clutter-actor-meta.c:219 ../clutter/clutter-input-device.c:326
+#: ../clutter/deprecated/clutter-shader.c:309
 msgid "Enabled"
 msgstr "Leista"
 
-#: ../clutter/clutter-actor-meta.c:222
+#: ../clutter/clutter-actor-meta.c:220
 msgid "Whether the meta is enabled"
 msgstr "Ar meta yra leista"
 
 #: ../clutter/clutter-align-constraint.c:279
-#: ../clutter/clutter-bind-constraint.c:358
-#: ../clutter/clutter-clone.c:345
+#: ../clutter/clutter-bind-constraint.c:358 ../clutter/clutter-clone.c:341
 #: ../clutter/clutter-snap-constraint.c:321
 msgid "Source"
 msgstr "Šaltinis"
@@ -735,11 +730,11 @@ msgstr "Faktorius"
 msgid "The alignment factor, between 0.0 and 1.0"
 msgstr "Lygiavimo faktorius, tarp 0.0 ir 1.0"
 
-#: ../clutter/clutter-backend.c:379
+#: ../clutter/clutter-backend.c:380
 msgid "Unable to initialize the Clutter backend"
 msgstr "Nepavyko inicijuoti Clutter realizacijos"
 
-#: ../clutter/clutter-backend.c:453
+#: ../clutter/clutter-backend.c:454
 #, c-format
 msgid "The backend of type '%s' does not support creating multiple stages"
 msgstr "„%s“ tipo realizacija nepalaiko daugelio scenų sukūrimo"
@@ -770,173 +765,198 @@ msgstr "Poslinkis pikseliais, taikomas pririšimui"
 msgid "The unique name of the binding pool"
 msgstr "Unikalus pririšimo vardas"
 
-#: ../clutter/clutter-bin-layout.c:240
-#: ../clutter/clutter-bin-layout.c:649
-#: ../clutter/clutter-box-layout.c:390
-#: ../clutter/clutter-table-layout.c:610
+#: ../clutter/clutter-bin-layout.c:238 ../clutter/clutter-bin-layout.c:651
+#: ../clutter/clutter-box-layout.c:388
+#: ../clutter/deprecated/clutter-table-layout.c:610
 msgid "Horizontal Alignment"
 msgstr "Horizontalus lygiavimas"
 
-#: ../clutter/clutter-bin-layout.c:241
+#: ../clutter/clutter-bin-layout.c:239
 msgid "Horizontal alignment for the actor inside the layout manager"
 msgstr "Aktoriaus horizontalus lygiavimas lygiavimo tvarkyklėje"
 
-#: ../clutter/clutter-bin-layout.c:249
-#: ../clutter/clutter-bin-layout.c:669
-#: ../clutter/clutter-box-layout.c:399
-#: ../clutter/clutter-table-layout.c:625
+#: ../clutter/clutter-bin-layout.c:247 ../clutter/clutter-bin-layout.c:671
+#: ../clutter/clutter-box-layout.c:397
+#: ../clutter/deprecated/clutter-table-layout.c:625
 msgid "Vertical Alignment"
 msgstr "Vertikalus lygiavimas"
 
-#: ../clutter/clutter-bin-layout.c:250
+#: ../clutter/clutter-bin-layout.c:248
 msgid "Vertical alignment for the actor inside the layout manager"
 msgstr "Aktoriaus vertikalus lygiavimas lygiavimo tvarkyklėje"
 
-#: ../clutter/clutter-bin-layout.c:650
+#: ../clutter/clutter-bin-layout.c:652
 msgid "Default horizontal alignment for the actors inside the layout manager"
 msgstr "Aktoriaus numatytasis horizontalus lygiavimas lygiavimo tvarkyklėje"
 
-#: ../clutter/clutter-bin-layout.c:670
+#: ../clutter/clutter-bin-layout.c:672
 msgid "Default vertical alignment for the actors inside the layout manager"
 msgstr "Aktoriaus numatytasis vertikalus lygiavimas lygiavimo tvarkyklėje"
 
-#: ../clutter/clutter-box-layout.c:365
+#: ../clutter/clutter-box-layout.c:363
 msgid "Expand"
 msgstr "Išplėsti"
 
-#: ../clutter/clutter-box-layout.c:366
+#: ../clutter/clutter-box-layout.c:364
 msgid "Allocate extra space for the child"
 msgstr "Išskirti papildomai vietos vaikui"
 
-#: ../clutter/clutter-box-layout.c:372
-#: ../clutter/clutter-table-layout.c:589
+#: ../clutter/clutter-box-layout.c:370
+#: ../clutter/deprecated/clutter-table-layout.c:589
 msgid "Horizontal Fill"
 msgstr "Horizontalus užpildas"
 
-#: ../clutter/clutter-box-layout.c:373
-#: ../clutter/clutter-table-layout.c:590
-msgid "Whether the child should receive priority when the container is allocating spare space on the horizontal axis"
-msgstr "Ar laikas turi gauti prioritetą, kai konteineris išskiria laisvą vietą horizontalioje ašyje"
+#: ../clutter/clutter-box-layout.c:371
+#: ../clutter/deprecated/clutter-table-layout.c:590
+msgid ""
+"Whether the child should receive priority when the container is allocating "
+"spare space on the horizontal axis"
+msgstr ""
+"Ar laikas turi gauti prioritetą, kai konteineris išskiria laisvą vietą "
+"horizontalioje ašyje"
 
-#: ../clutter/clutter-box-layout.c:381
-#: ../clutter/clutter-table-layout.c:596
+#: ../clutter/clutter-box-layout.c:379
+#: ../clutter/deprecated/clutter-table-layout.c:596
 msgid "Vertical Fill"
 msgstr "Vertikalus užpildas"
 
-#: ../clutter/clutter-box-layout.c:382
-#: ../clutter/clutter-table-layout.c:597
-msgid "Whether the child should receive priority when the container is allocating spare space on the vertical axis"
-msgstr "Ar laikas turi gauti prioritetą, kai konteineris išskiria laisvą vietą vertikalioje ašyje"
+#: ../clutter/clutter-box-layout.c:380
+#: ../clutter/deprecated/clutter-table-layout.c:597
+msgid ""
+"Whether the child should receive priority when the container is allocating "
+"spare space on the vertical axis"
+msgstr ""
+"Ar laikas turi gauti prioritetą, kai konteineris išskiria laisvą vietą "
+"vertikalioje ašyje"
 
-#: ../clutter/clutter-box-layout.c:391
-#: ../clutter/clutter-table-layout.c:611
+#: ../clutter/clutter-box-layout.c:389
+#: ../clutter/deprecated/clutter-table-layout.c:611
 msgid "Horizontal alignment of the actor within the cell"
 msgstr "Horizontalus aktoriaus lygiavimas ląstelėje"
 
-#: ../clutter/clutter-box-layout.c:400
-#: ../clutter/clutter-table-layout.c:626
+#: ../clutter/clutter-box-layout.c:398
+#: ../clutter/deprecated/clutter-table-layout.c:626
 msgid "Vertical alignment of the actor within the cell"
 msgstr "Vertikalus aktoriaus lygiavimas ląstelėje"
 
-#: ../clutter/clutter-box-layout.c:1365
+#: ../clutter/clutter-box-layout.c:1359
 msgid "Vertical"
 msgstr "Vertikalus"
 
-#: ../clutter/clutter-box-layout.c:1366
+#: ../clutter/clutter-box-layout.c:1360
 msgid "Whether the layout should be vertical, rather than horizontal"
 msgstr "Ar išdėstymas turi būti vertikalus, užuot buvęs horizontalus"
 
-#: ../clutter/clutter-box-layout.c:1383
-#: ../clutter/clutter-flow-layout.c:890
-#: ../clutter/clutter-grid-layout.c:1547
+#: ../clutter/clutter-box-layout.c:1377 ../clutter/clutter-flow-layout.c:942
+#: ../clutter/clutter-grid-layout.c:1549
 msgid "Orientation"
 msgstr "Orientacija"
 
-#: ../clutter/clutter-box-layout.c:1384
-#: ../clutter/clutter-flow-layout.c:891
-#: ../clutter/clutter-grid-layout.c:1548
+#: ../clutter/clutter-box-layout.c:1378 ../clutter/clutter-flow-layout.c:943
+#: ../clutter/clutter-grid-layout.c:1550
 msgid "The orientation of the layout"
 msgstr "Išdėstymo orientacija"
 
-#: ../clutter/clutter-box-layout.c:1400
-#: ../clutter/clutter-flow-layout.c:906
+#: ../clutter/clutter-box-layout.c:1394 ../clutter/clutter-flow-layout.c:958
 msgid "Homogeneous"
 msgstr "Vienalytis"
 
-#: ../clutter/clutter-box-layout.c:1401
-msgid "Whether the layout should be homogeneous, i.e. all childs get the same size"
-msgstr "Ar išdėstymas turi būti vienalytis, t. y. visi vaikai yra to paties dydžio"
+#: ../clutter/clutter-box-layout.c:1395
+msgid ""
+"Whether the layout should be homogeneous, i.e. all childs get the same size"
+msgstr ""
+"Ar išdėstymas turi būti vienalytis, t. y. visi vaikai yra to paties dydžio"
 
-#: ../clutter/clutter-box-layout.c:1416
+#: ../clutter/clutter-box-layout.c:1410
 msgid "Pack Start"
 msgstr "Pakuoti pradžioje"
 
-#: ../clutter/clutter-box-layout.c:1417
+#: ../clutter/clutter-box-layout.c:1411
 msgid "Whether to pack items at the start of the box"
 msgstr "Ar pakuoti elementus dėžutės pradžioje"
 
-#: ../clutter/clutter-box-layout.c:1430
+#: ../clutter/clutter-box-layout.c:1424
 msgid "Spacing"
 msgstr "Tarpai"
 
-#: ../clutter/clutter-box-layout.c:1431
+#: ../clutter/clutter-box-layout.c:1425
 msgid "Spacing between children"
 msgstr "Tarpai tarp vaikų"
 
-#: ../clutter/clutter-box-layout.c:1448
-#: ../clutter/clutter-table-layout.c:1675
+#: ../clutter/clutter-box-layout.c:1442
+#: ../clutter/deprecated/clutter-table-layout.c:1677
 msgid "Use Animations"
 msgstr "Naudoti animacijas"
 
-#: ../clutter/clutter-box-layout.c:1449
-#: ../clutter/clutter-table-layout.c:1676
+#: ../clutter/clutter-box-layout.c:1443
+#: ../clutter/deprecated/clutter-table-layout.c:1678
 msgid "Whether layout changes should be animated"
 msgstr "Ar išdėstymo pasikeitimai turi būti animuoti"
 
-#: ../clutter/clutter-box-layout.c:1473
-#: ../clutter/clutter-table-layout.c:1700
+#: ../clutter/clutter-box-layout.c:1467
+#: ../clutter/deprecated/clutter-table-layout.c:1702
 msgid "Easing Mode"
 msgstr "Lengvinimo veiksena"
 
-#: ../clutter/clutter-box-layout.c:1474
-#: ../clutter/clutter-table-layout.c:1701
+#: ../clutter/clutter-box-layout.c:1468
+#: ../clutter/deprecated/clutter-table-layout.c:1703
 msgid "The easing mode of the animations"
 msgstr "Lengvinimo veiksena animacijoms"
 
-#: ../clutter/clutter-box-layout.c:1494
-#: ../clutter/clutter-table-layout.c:1721
+#: ../clutter/clutter-box-layout.c:1488
+#: ../clutter/deprecated/clutter-table-layout.c:1723
 msgid "Easing Duration"
 msgstr "Lengvinimo trukmė"
 
-#: ../clutter/clutter-box-layout.c:1495
-#: ../clutter/clutter-table-layout.c:1722
+#: ../clutter/clutter-box-layout.c:1489
+#: ../clutter/deprecated/clutter-table-layout.c:1724
 msgid "The duration of the animations"
 msgstr "Animacijų trukmė"
 
-#: ../clutter/clutter-brightness-contrast-effect.c:307
+#: ../clutter/clutter-brightness-contrast-effect.c:321
 msgid "Brightness"
 msgstr "Ryškumas"
 
-#: ../clutter/clutter-brightness-contrast-effect.c:308
+#: ../clutter/clutter-brightness-contrast-effect.c:322
 msgid "The brightness change to apply"
 msgstr "Taikomas ryškumo pakeitimas"
 
-#: ../clutter/clutter-brightness-contrast-effect.c:327
+#: ../clutter/clutter-brightness-contrast-effect.c:341
 msgid "Contrast"
 msgstr "Kontrastas"
 
-#: ../clutter/clutter-brightness-contrast-effect.c:328
+#: ../clutter/clutter-brightness-contrast-effect.c:342
 msgid "The contrast change to apply"
 msgstr "Taikomas kontrasto pakeitimas"
 
-#: ../clutter/clutter-canvas.c:216
+#: ../clutter/clutter-canvas.c:248
 msgid "The width of the canvas"
 msgstr "Piešimo paviršiaus plotis"
 
-#: ../clutter/clutter-canvas.c:232
+#: ../clutter/clutter-canvas.c:264
 msgid "The height of the canvas"
 msgstr "Piešimo paviršiaus aukštis"
 
+#: ../clutter/clutter-canvas.c:283
+#| msgid "Selection Color Set"
+msgid "Scale Factor Set"
+msgstr "Skalės faktorius nustatytas"
+
+#: ../clutter/clutter-canvas.c:284
+#| msgid "Whether the transform property is set"
+msgid "Whether the scale-factor property is set"
+msgstr "Ar skalės faktoriaus savybė yra nustatyta"
+
+#: ../clutter/clutter-canvas.c:305
+#| msgid "Factor"
+msgid "Scale Factor"
+msgstr "Skalės faktorius"
+
+#: ../clutter/clutter-canvas.c:306
+#| msgid "The height of the Cairo surface"
+msgid "The scaling factor for the surface"
+msgstr "Paviršiaus skalės faktorius"
+
 #: ../clutter/clutter-child-meta.c:127
 msgid "Container"
 msgstr "Konteineris"
@@ -949,40 +969,39 @@ msgstr "Konteineris, kuris sukūrė šiuos duomenis"
 msgid "The actor wrapped by this data"
 msgstr "Aktorius, apvilktas šiais duomenimis"
 
-#: ../clutter/clutter-click-action.c:546
+#: ../clutter/clutter-click-action.c:586
 msgid "Pressed"
 msgstr "Nuspaustas"
 
-#: ../clutter/clutter-click-action.c:547
+#: ../clutter/clutter-click-action.c:587
 msgid "Whether the clickable should be in pressed state"
 msgstr "Ar paspaudžiamas elementas turi būti nuspaustos būsenos"
 
-#: ../clutter/clutter-click-action.c:560
+#: ../clutter/clutter-click-action.c:600
 msgid "Held"
 msgstr "Laikomas"
 
-#: ../clutter/clutter-click-action.c:561
+#: ../clutter/clutter-click-action.c:601
 msgid "Whether the clickable has a grab"
 msgstr "Ar nuspaudžiamas elementas turi pagriebimą"
 
-#: ../clutter/clutter-click-action.c:578
-#: ../clutter/clutter-settings.c:599
+#: ../clutter/clutter-click-action.c:618 ../clutter/clutter-settings.c:653
 msgid "Long Press Duration"
 msgstr "Ilgo paspaudimo trukmė"
 
-#: ../clutter/clutter-click-action.c:579
+#: ../clutter/clutter-click-action.c:619
 msgid "The minimum duration of a long press to recognize the gesture"
 msgstr "Ilgo paspaudimo mažiausia trukmė gesto atpažinimui"
 
-#: ../clutter/clutter-click-action.c:597
+#: ../clutter/clutter-click-action.c:637
 msgid "Long Press Threshold"
 msgstr "Ilgo paspaudimo užlaikymas"
 
-#: ../clutter/clutter-click-action.c:598
+#: ../clutter/clutter-click-action.c:638
 msgid "The maximum threshold before a long press is cancelled"
 msgstr "Ilgiausias užlaikymas iki ilgo paspaudimo atšaukimo"
 
-#: ../clutter/clutter-clone.c:346
+#: ../clutter/clutter-clone.c:342
 msgid "Specifies the actor to be cloned"
 msgstr "Nurodo klonuojamą aktorių"
 
@@ -994,27 +1013,27 @@ msgstr "Atspalvis"
 msgid "The tint to apply"
 msgstr "Taikomas atspalvis"
 
-#: ../clutter/clutter-deform-effect.c:588
+#: ../clutter/clutter-deform-effect.c:592
 msgid "Horizontal Tiles"
 msgstr "Horizontalūs kokliai"
 
-#: ../clutter/clutter-deform-effect.c:589
+#: ../clutter/clutter-deform-effect.c:593
 msgid "The number of horizontal tiles"
 msgstr "Horizontalių koklių skaičius"
 
-#: ../clutter/clutter-deform-effect.c:604
+#: ../clutter/clutter-deform-effect.c:608
 msgid "Vertical Tiles"
 msgstr "Vertikalūs kokliai"
 
-#: ../clutter/clutter-deform-effect.c:605
+#: ../clutter/clutter-deform-effect.c:609
 msgid "The number of vertical tiles"
 msgstr "Vertikalių koklių skaičius"
 
-#: ../clutter/clutter-deform-effect.c:622
+#: ../clutter/clutter-deform-effect.c:626
 msgid "Back Material"
 msgstr "Fono medžiaga"
 
-#: ../clutter/clutter-deform-effect.c:623
+#: ../clutter/clutter-deform-effect.c:627
 msgid "The material to be used when painting the back of the actor"
 msgstr "Medžiaga, naudojama piešiant aktoriaus foną"
 
@@ -1022,261 +1041,299 @@ msgstr "Medžiaga, naudojama piešiant aktoriaus foną"
 msgid "The desaturation factor"
 msgstr "Nesodrinimo faktorius"
 
-#: ../clutter/clutter-device-manager.c:131
-#: ../clutter/clutter-input-device.c:366
-#: ../clutter/x11/clutter-keymap-x11.c:316
+#: ../clutter/clutter-device-manager.c:127
+#: ../clutter/clutter-input-device.c:355
+#: ../clutter/x11/clutter-keymap-x11.c:321
 msgid "Backend"
 msgstr "Realizacija"
 
-#: ../clutter/clutter-device-manager.c:132
+#: ../clutter/clutter-device-manager.c:128
 msgid "The ClutterBackend of the device manager"
 msgstr "Įrenginių tvarkyklės ClutterBackend"
 
-#: ../clutter/clutter-drag-action.c:709
+#: ../clutter/clutter-drag-action.c:741
 msgid "Horizontal Drag Threshold"
 msgstr "Horizontalaus tempimo užlaikymas"
 
-#: ../clutter/clutter-drag-action.c:710
+#: ../clutter/clutter-drag-action.c:742
 msgid "The horizontal amount of pixels required to start dragging"
 msgstr "Horizontalus pikselių skaičius, būtinas tempimo pradėjimui"
 
-#: ../clutter/clutter-drag-action.c:737
+#: ../clutter/clutter-drag-action.c:769
 msgid "Vertical Drag Threshold"
 msgstr "Vertikalaus tempimo užlaikymas"
 
-#: ../clutter/clutter-drag-action.c:738
+#: ../clutter/clutter-drag-action.c:770
 msgid "The vertical amount of pixels required to start dragging"
 msgstr "Vertikalus pikselių skaičius, būtinas tempimo pradėjimui"
 
-#: ../clutter/clutter-drag-action.c:759
+#: ../clutter/clutter-drag-action.c:791
 msgid "Drag Handle"
 msgstr "Tempimo rankenėlė"
 
-#: ../clutter/clutter-drag-action.c:760
+#: ../clutter/clutter-drag-action.c:792
 msgid "The actor that is being dragged"
 msgstr "Tempiamas inkaras"
 
-#: ../clutter/clutter-drag-action.c:773
+#: ../clutter/clutter-drag-action.c:805
 msgid "Drag Axis"
 msgstr "Tempimo ašis"
 
-#: ../clutter/clutter-drag-action.c:774
+#: ../clutter/clutter-drag-action.c:806
 msgid "Constraints the dragging to an axis"
 msgstr "Apriboja tempimą ašimi"
 
-#: ../clutter/clutter-drag-action.c:790
+#: ../clutter/clutter-drag-action.c:822
 msgid "Drag Area"
 msgstr "Tempimo sritis"
 
-#: ../clutter/clutter-drag-action.c:791
+#: ../clutter/clutter-drag-action.c:823
 msgid "Constrains the dragging to a rectangle"
 msgstr "Apriboja tempimą stačiakampiu"
 
-#: ../clutter/clutter-drag-action.c:804
+#: ../clutter/clutter-drag-action.c:836
 msgid "Drag Area Set"
 msgstr "Tempimo sritis nustatyta"
 
-#: ../clutter/clutter-drag-action.c:805
+#: ../clutter/clutter-drag-action.c:837
 msgid "Whether the drag area is set"
 msgstr "Ar tempimo sritis nustatyta"
 
-#: ../clutter/clutter-flow-layout.c:907
+#: ../clutter/clutter-flow-layout.c:959
 msgid "Whether each item should receive the same allocation"
 msgstr "Ar kiekvienas elementas turi gauti tą patį išskyrimą"
 
-#: ../clutter/clutter-flow-layout.c:922
-#: ../clutter/clutter-table-layout.c:1637
+#: ../clutter/clutter-flow-layout.c:974
+#: ../clutter/deprecated/clutter-table-layout.c:1637
 msgid "Column Spacing"
 msgstr "Stulpelių tarpai"
 
-#: ../clutter/clutter-flow-layout.c:923
+#: ../clutter/clutter-flow-layout.c:975
 msgid "The spacing between columns"
 msgstr "Tarpai tarp stulpelių"
 
-#: ../clutter/clutter-flow-layout.c:939
-#: ../clutter/clutter-table-layout.c:1651
+#: ../clutter/clutter-flow-layout.c:991
+#: ../clutter/deprecated/clutter-table-layout.c:1653
 msgid "Row Spacing"
 msgstr "Eilučių tarpai"
 
-#: ../clutter/clutter-flow-layout.c:940
+#: ../clutter/clutter-flow-layout.c:992
 msgid "The spacing between rows"
 msgstr "Tarpai tarp eilučių"
 
-#: ../clutter/clutter-flow-layout.c:954
+#: ../clutter/clutter-flow-layout.c:1006
 msgid "Minimum Column Width"
 msgstr "Mažiausias stulpelio plotis"
 
-#: ../clutter/clutter-flow-layout.c:955
+#: ../clutter/clutter-flow-layout.c:1007
 msgid "Minimum width for each column"
 msgstr "Kiekvieno stulpelio mažiausias plotis"
 
-#: ../clutter/clutter-flow-layout.c:970
+#: ../clutter/clutter-flow-layout.c:1022
 msgid "Maximum Column Width"
 msgstr "Didžiausias stulpelio plotis"
 
-#: ../clutter/clutter-flow-layout.c:971
+#: ../clutter/clutter-flow-layout.c:1023
 msgid "Maximum width for each column"
 msgstr "Kiekvieno stulpelio didžiausias plotis"
 
-#: ../clutter/clutter-flow-layout.c:985
+#: ../clutter/clutter-flow-layout.c:1037
 msgid "Minimum Row Height"
 msgstr "Mažiausias eilutės aukštis"
 
-#: ../clutter/clutter-flow-layout.c:986
+#: ../clutter/clutter-flow-layout.c:1038
 msgid "Minimum height for each row"
 msgstr "Kiekvienos eilutės mažiausias aukštis"
 
-#: ../clutter/clutter-flow-layout.c:1001
+#: ../clutter/clutter-flow-layout.c:1053
 msgid "Maximum Row Height"
 msgstr "Didžiausias eilutės aukštis"
 
-#: ../clutter/clutter-flow-layout.c:1002
+#: ../clutter/clutter-flow-layout.c:1054
 msgid "Maximum height for each row"
 msgstr "Kiekvienos didžiausias eilutės aukštis"
 
-#: ../clutter/clutter-grid-layout.c:1222
+#: ../clutter/clutter-flow-layout.c:1069 ../clutter/clutter-flow-layout.c:1070
+msgid "Snap to grid"
+msgstr "Pritraukti prie tinklelio"
+
+#: ../clutter/clutter-gesture-action.c:668
+msgid "Number touch points"
+msgstr "Liečiamų taškų skaičius"
+
+#: ../clutter/clutter-gesture-action.c:669
+msgid "Number of touch points"
+msgstr "Liečiamų taškų skaičius"
+
+#: ../clutter/clutter-gesture-action.c:684
+msgid "Threshold Trigger Edge"
+msgstr "Sukėlimo slenkstis pakraščiui"
+
+#: ../clutter/clutter-gesture-action.c:685
+#| msgid "The timeline used by the animation"
+msgid "The trigger edge used by the action"
+msgstr "Veiksmo naudojamas sukėlimo pakraštys"
+
+#: ../clutter/clutter-gesture-action.c:704
+msgid "Threshold Trigger Horizontal Distance"
+msgstr "Sukėlimo slenkstis horizontaliam atstumui"
+
+#: ../clutter/clutter-gesture-action.c:705
+#| msgid "The timeline used by the animation"
+msgid "The horizontal trigger distance used by the action"
+msgstr "Veiksmo naudojamas horizontalus sukėlimo atstumas"
+
+#: ../clutter/clutter-gesture-action.c:723
+msgid "Threshold Trigger Vertical Distance"
+msgstr "Sukėlimo slenkstis vertikaliam atstumui"
+
+#: ../clutter/clutter-gesture-action.c:724
+#| msgid "The timeline used by the animation"
+msgid "The vertical trigger distance used by the action"
+msgstr "Veiksmo naudojamas vertikalus sukėlimo atstumas"
+
+#: ../clutter/clutter-grid-layout.c:1223
 msgid "Left attachment"
 msgstr "Kairysis prikabinimas"
 
-#: ../clutter/clutter-grid-layout.c:1223
+#: ../clutter/clutter-grid-layout.c:1224
 msgid "The column number to attach the left side of the child to"
 msgstr "Stulpelio numeris, prie kurio prikabinti vaiko kairiąją pusę"
 
-#: ../clutter/clutter-grid-layout.c:1230
+#: ../clutter/clutter-grid-layout.c:1231
 msgid "Top attachment"
 msgstr "Viršutinis prikabinimas"
 
-#: ../clutter/clutter-grid-layout.c:1231
+#: ../clutter/clutter-grid-layout.c:1232
 msgid "The row number to attach the top side of a child widget to"
 msgstr "Eilutės numeris, prie kurio prikabinti vaiko viršutinį kraštą"
 
-#: ../clutter/clutter-grid-layout.c:1239
+#: ../clutter/clutter-grid-layout.c:1240
 msgid "The number of columns that a child spans"
 msgstr "Vaiko apimamų stulpelių skaičius"
 
-#: ../clutter/clutter-grid-layout.c:1246
+#: ../clutter/clutter-grid-layout.c:1247
 msgid "The number of rows that a child spans"
 msgstr "Vaiko apimamų eilučių skaičius"
 
-#: ../clutter/clutter-grid-layout.c:1562
+#: ../clutter/clutter-grid-layout.c:1564
 msgid "Row spacing"
 msgstr "Eilučių tarpai"
 
-#: ../clutter/clutter-grid-layout.c:1563
+#: ../clutter/clutter-grid-layout.c:1565
 msgid "The amount of space between two consecutive rows"
 msgstr "Vietos kiekis tarp dviejų gretimų eilučių"
 
-#: ../clutter/clutter-grid-layout.c:1576
+#: ../clutter/clutter-grid-layout.c:1578
 msgid "Column spacing"
 msgstr "Stulpelių tarpai"
 
-#: ../clutter/clutter-grid-layout.c:1577
+#: ../clutter/clutter-grid-layout.c:1579
 msgid "The amount of space between two consecutive columns"
 msgstr "Tarpai tarp gretimų stulpelių"
 
-#: ../clutter/clutter-grid-layout.c:1591
+#: ../clutter/clutter-grid-layout.c:1593
 msgid "Row Homogeneous"
 msgstr "Eilutės vienalyčios"
 
-#: ../clutter/clutter-grid-layout.c:1592
+#: ../clutter/clutter-grid-layout.c:1594
 msgid "If TRUE, the rows are all the same height"
 msgstr "Jei TEIGIAMA, visos eilutės yra to paties aukščio"
 
-#: ../clutter/clutter-grid-layout.c:1605
+#: ../clutter/clutter-grid-layout.c:1607
 msgid "Column Homogeneous"
 msgstr "Stulpeliai vienalyčiai"
 
-#: ../clutter/clutter-grid-layout.c:1606
+#: ../clutter/clutter-grid-layout.c:1608
 msgid "If TRUE, the columns are all the same width"
 msgstr "Jei TEIGIAMA, visi stulpeliai yra to paties pločio"
 
-#: ../clutter/clutter-image.c:248
-#: ../clutter/clutter-image.c:311
-#: ../clutter/clutter-image.c:399
+#: ../clutter/clutter-image.c:249 ../clutter/clutter-image.c:312
+#: ../clutter/clutter-image.c:400
 msgid "Unable to load image data"
 msgstr "Nepavyko įkelti paveikslėlio duomenų"
 
-#: ../clutter/clutter-input-device.c:242
+#: ../clutter/clutter-input-device.c:231
 msgid "Id"
 msgstr "Id"
 
-#: ../clutter/clutter-input-device.c:243
+#: ../clutter/clutter-input-device.c:232
 msgid "Unique identifier of the device"
 msgstr "Unikalus įrenginio identifikatorius"
 
-#: ../clutter/clutter-input-device.c:259
+#: ../clutter/clutter-input-device.c:248
 msgid "The name of the device"
 msgstr "Įrenginio pavadinimas"
 
-#: ../clutter/clutter-input-device.c:273
+#: ../clutter/clutter-input-device.c:262
 msgid "Device Type"
 msgstr "Įrenginio tipas"
 
-#: ../clutter/clutter-input-device.c:274
+#: ../clutter/clutter-input-device.c:263
 msgid "The type of the device"
 msgstr "Įrenginio tipas"
 
-#: ../clutter/clutter-input-device.c:289
+#: ../clutter/clutter-input-device.c:278
 msgid "Device Manager"
 msgstr "Įrenginių tvarkyklė"
 
-#: ../clutter/clutter-input-device.c:290
+#: ../clutter/clutter-input-device.c:279
 msgid "The device manager instance"
 msgstr "Įrenginių tvarkyklės egzempliorius"
 
-#: ../clutter/clutter-input-device.c:303
+#: ../clutter/clutter-input-device.c:292
 msgid "Device Mode"
 msgstr "Įrenginio veiksena"
 
-#: ../clutter/clutter-input-device.c:304
+#: ../clutter/clutter-input-device.c:293
 msgid "The mode of the device"
 msgstr "Įrenginio veiksena"
 
-#: ../clutter/clutter-input-device.c:318
+#: ../clutter/clutter-input-device.c:307
 msgid "Has Cursor"
 msgstr "Turi žymeklį"
 
-#: ../clutter/clutter-input-device.c:319
+#: ../clutter/clutter-input-device.c:308
 msgid "Whether the device has a cursor"
 msgstr "Ar įrenginys turi žymeklį"
 
-#: ../clutter/clutter-input-device.c:338
+#: ../clutter/clutter-input-device.c:327
 msgid "Whether the device is enabled"
 msgstr "Ar įrenginys yra jungtas"
 
-#: ../clutter/clutter-input-device.c:351
+#: ../clutter/clutter-input-device.c:340
 msgid "Number of Axes"
 msgstr "Ašių skaičius"
 
-#: ../clutter/clutter-input-device.c:352
+#: ../clutter/clutter-input-device.c:341
 msgid "The number of axes on the device"
 msgstr "Įrenginio ašių skaičius"
 
-#: ../clutter/clutter-input-device.c:367
+#: ../clutter/clutter-input-device.c:356
 msgid "The backend instance"
 msgstr "Realizacijos egzempliorius"
 
-#: ../clutter/clutter-interval.c:506
+#: ../clutter/clutter-interval.c:553
 msgid "Value Type"
 msgstr "Reikšmės tipas"
 
-#: ../clutter/clutter-interval.c:507
+#: ../clutter/clutter-interval.c:554
 msgid "The type of the values in the interval"
 msgstr "Reikšmių tipas intervale"
 
-#: ../clutter/clutter-interval.c:522
+#: ../clutter/clutter-interval.c:569
 msgid "Initial Value"
 msgstr "Pradinė vertė"
 
-#: ../clutter/clutter-interval.c:523
+#: ../clutter/clutter-interval.c:570
 msgid "Initial value of the interval"
 msgstr "Pradinė intervalo vertė"
 
-#: ../clutter/clutter-interval.c:537
+#: ../clutter/clutter-interval.c:584
 msgid "Final Value"
 msgstr "Galutinė vertė"
 
-#: ../clutter/clutter-interval.c:538
+#: ../clutter/clutter-interval.c:585
 msgid "Final value of the interval"
 msgstr "Galutinė intervalo vertė"
 
@@ -1295,102 +1352,96 @@ msgstr "Tvarkyklė, sukūrusi šiuos duomenis"
 #. * Do NOT translate it to non-English e.g. "predefinito:LTR"! If
 #. * it isn't default:LTR or default:RTL it will not work.
 #.
-#: ../clutter/clutter-main.c:762
+#: ../clutter/clutter-main.c:795
 msgid "default:LTR"
 msgstr "default:LTR"
 
-#: ../clutter/clutter-main.c:1633
+#: ../clutter/clutter-main.c:1622
 msgid "Show frames per second"
 msgstr "Rodyti kadrus per sekundę"
 
-#: ../clutter/clutter-main.c:1635
+#: ../clutter/clutter-main.c:1624
 msgid "Default frame rate"
 msgstr "Numatytasis kadrų dažnis"
 
-#: ../clutter/clutter-main.c:1637
+#: ../clutter/clutter-main.c:1626
 msgid "Make all warnings fatal"
 msgstr "Paversti visus įspėjimus lemtingais"
 
-#: ../clutter/clutter-main.c:1640
+#: ../clutter/clutter-main.c:1629
 msgid "Direction for the text"
 msgstr "Teksto kryptis"
 
-#: ../clutter/clutter-main.c:1643
+#: ../clutter/clutter-main.c:1632
 msgid "Disable mipmapping on text"
 msgstr "Drausti teksto miniatiūras"
 
-#: ../clutter/clutter-main.c:1646
+#: ../clutter/clutter-main.c:1635
 msgid "Use 'fuzzy' picking"
 msgstr "Naudoti „neaiškų“ pasirinkimą"
 
-#: ../clutter/clutter-main.c:1649
+#: ../clutter/clutter-main.c:1638
 msgid "Clutter debugging flags to set"
 msgstr "Nustatomi clutter derinimo požymiai"
 
-#: ../clutter/clutter-main.c:1651
+#: ../clutter/clutter-main.c:1640
 msgid "Clutter debugging flags to unset"
 msgstr "Išjungiami clutter derinimo požymiai"
 
-#: ../clutter/clutter-main.c:1655
+#: ../clutter/clutter-main.c:1644
 msgid "Clutter profiling flags to set"
 msgstr "Nustatomi clutter profiliavimo požymiai"
 
-#: ../clutter/clutter-main.c:1657
+#: ../clutter/clutter-main.c:1646
 msgid "Clutter profiling flags to unset"
 msgstr "Išjungiami clutter profiliavimo požymiai"
 
-#: ../clutter/clutter-main.c:1660
+#: ../clutter/clutter-main.c:1649
 msgid "Enable accessibility"
 msgstr "Įjungti pritaikymą neįgaliesiems"
 
-#: ../clutter/clutter-main.c:1852
+#: ../clutter/clutter-main.c:1841
 msgid "Clutter Options"
 msgstr "Clutter parinktys"
 
-#: ../clutter/clutter-main.c:1853
+#: ../clutter/clutter-main.c:1842
 msgid "Show Clutter Options"
 msgstr "Rodyti Clutter parinktis"
 
-#: ../clutter/clutter-pan-action.c:440
-#| msgid "Drag Axis"
+#: ../clutter/clutter-pan-action.c:455
 msgid "Pan Axis"
 msgstr "Dėjimo ašis"
 
-#: ../clutter/clutter-pan-action.c:441
-#| msgid "Constraints the dragging to an axis"
+#: ../clutter/clutter-pan-action.c:456
 msgid "Constraints the panning to an axis"
 msgstr "Ribojimą dėjimą ašimi"
 
-#: ../clutter/clutter-pan-action.c:455
-#| msgid "Interval"
+#: ../clutter/clutter-pan-action.c:470
 msgid "Interpolate"
 msgstr "Interpoliuoti"
 
-#: ../clutter/clutter-pan-action.c:456
-#| msgid "Whether the device is enabled"
+#: ../clutter/clutter-pan-action.c:471
 msgid "Whether interpolated events emission is enabled."
 msgstr "Ar interpoliuotų įvykių kėlimas yra įjungtas."
 
-#: ../clutter/clutter-pan-action.c:472
-#| msgid "Duration"
+#: ../clutter/clutter-pan-action.c:487
 msgid "Deceleration"
 msgstr "Lėtėjimas"
 
-#: ../clutter/clutter-pan-action.c:473
+#: ../clutter/clutter-pan-action.c:488
 msgid "Rate at which the interpolated panning will decelerate in"
 msgstr "Dažnis, kuriuo lėtės interpoliuotas išdėstymas"
 
-#: ../clutter/clutter-pan-action.c:490
-#| msgid "The desaturation factor"
+#: ../clutter/clutter-pan-action.c:505
 msgid "Initial acceleration factor"
 msgstr "Pradinis greitėjimo faktorius"
 
-#: ../clutter/clutter-pan-action.c:491
+#: ../clutter/clutter-pan-action.c:506
 msgid "Factor applied to the momentum when starting the interpolated phase"
 msgstr "Momentui taikomas faktorius pradedant interpoliacijos fazę"
 
 #: ../clutter/clutter-path-constraint.c:212
-#: ../clutter/deprecated/clutter-behaviour-path.c:225
+#: ../clutter/deprecated/clutter-behaviour-path.c:221
 msgid "Path"
 msgstr "Kelias"
 
@@ -1402,145 +1453,160 @@ msgstr "Kelias, naudojamas aktoriaus ribojimams"
 msgid "The offset along the path, between -1.0 and 2.0"
 msgstr "Poslinkis kelyje, tarp -1.0 ir 2.0"
 
-#: ../clutter/clutter-property-transition.c:271
+#: ../clutter/clutter-property-transition.c:269
 msgid "Property Name"
 msgstr "Savybės vardas"
 
-#: ../clutter/clutter-property-transition.c:272
+#: ../clutter/clutter-property-transition.c:270
 msgid "The name of the property to animate"
 msgstr "Animuojamos savybės vardas"
 
-#: ../clutter/clutter-script.c:466
+#: ../clutter/clutter-script.c:464
 msgid "Filename Set"
 msgstr "Failo vardas nustatytas"
 
-#: ../clutter/clutter-script.c:467
+#: ../clutter/clutter-script.c:465
 msgid "Whether the :filename property is set"
 msgstr "Ar savybė :filename yra nustatyta"
 
-#: ../clutter/clutter-script.c:481
-#: ../clutter/deprecated/clutter-texture.c:1082
+#: ../clutter/clutter-script.c:479
+#: ../clutter/deprecated/clutter-texture.c:1080
 msgid "Filename"
 msgstr "Failo vardas"
 
-#: ../clutter/clutter-script.c:482
+#: ../clutter/clutter-script.c:480
 msgid "The path of the currently parsed file"
 msgstr "Šiuo metu skaitomo failo vardas"
 
-#: ../clutter/clutter-script.c:499
+#: ../clutter/clutter-script.c:497
 msgid "Translation Domain"
 msgstr "Vertimo sritis"
 
-#: ../clutter/clutter-script.c:500
+#: ../clutter/clutter-script.c:498
 msgid "The translation domain used to localize string"
 msgstr "Vertimo sritis, naudojama eilutės lokalizavimui"
 
-#: ../clutter/clutter-scroll-actor.c:263
+#: ../clutter/clutter-scroll-actor.c:189
 msgid "Scroll Mode"
 msgstr "Slinkimo veiksena"
 
-#: ../clutter/clutter-scroll-actor.c:264
+#: ../clutter/clutter-scroll-actor.c:190
 msgid "The scrolling direction"
 msgstr "Slinkimo kryptis"
 
-#: ../clutter/clutter-settings.c:440
+#: ../clutter/clutter-settings.c:486
 msgid "Double Click Time"
 msgstr "Dvigubo paspaudimo laikas"
 
-#: ../clutter/clutter-settings.c:441
+#: ../clutter/clutter-settings.c:487
 msgid "The time between clicks necessary to detect a multiple click"
 msgstr "Laikas tarp paspaudimų, reikalingas dvigubo paspaudimo aptikimui"
 
-#: ../clutter/clutter-settings.c:456
+#: ../clutter/clutter-settings.c:502
 msgid "Double Click Distance"
 msgstr "Dvigubo paspaudimo atstumas"
 
-#: ../clutter/clutter-settings.c:457
+#: ../clutter/clutter-settings.c:503
 msgid "The distance between clicks necessary to detect a multiple click"
 msgstr "Atstumas tarp paspaudimų, reikalingas dvigubo paspaudimo aptikimui"
 
-#: ../clutter/clutter-settings.c:472
+#: ../clutter/clutter-settings.c:518
 msgid "Drag Threshold"
 msgstr "Tempimo užlaikymas"
 
-#: ../clutter/clutter-settings.c:473
+#: ../clutter/clutter-settings.c:519
 msgid "The distance the cursor should travel before starting to drag"
 msgstr "Atstumas, kurį turi nueiti žymeklis prieš pradedant tempimą"
 
-#: ../clutter/clutter-settings.c:488
-#: ../clutter/clutter-text.c:3368
+#: ../clutter/clutter-settings.c:534 ../clutter/clutter-text.c:3404
 msgid "Font Name"
 msgstr "Šrifto vardas"
 
-#: ../clutter/clutter-settings.c:489
-msgid "The description of the default font, as one that could be parsed by Pango"
+#: ../clutter/clutter-settings.c:535
+msgid ""
+"The description of the default font, as one that could be parsed by Pango"
 msgstr "Numatytojo šrifto aprašymas, kurį gali perskaityti Pango"
 
-#: ../clutter/clutter-settings.c:504
+#: ../clutter/clutter-settings.c:550
 msgid "Font Antialias"
 msgstr "Šrifto glotninimas"
 
-#: ../clutter/clutter-settings.c:505
-msgid "Whether to use antialiasing (1 to enable, 0 to disable, and -1 to use the default)"
-msgstr "Ar naudoti glotninimą (1 naudojimui, 0 draudimui, -1 numatytai veiksenai)"
+#: ../clutter/clutter-settings.c:551
+msgid ""
+"Whether to use antialiasing (1 to enable, 0 to disable, and -1 to use the "
+"default)"
+msgstr ""
+"Ar naudoti glotninimą (1 naudojimui, 0 draudimui, -1 numatytai veiksenai)"
 
-#: ../clutter/clutter-settings.c:521
+#: ../clutter/clutter-settings.c:567 ../clutter/clutter-settings.c:575
 msgid "Font DPI"
 msgstr "Šrifto DPI"
 
-#: ../clutter/clutter-settings.c:522
-msgid "The resolution of the font, in 1024 * dots/inch, or -1 to use the default"
+#: ../clutter/clutter-settings.c:568 ../clutter/clutter-settings.c:576
+msgid ""
+"The resolution of the font, in 1024 * dots/inch, or -1 to use the default"
 msgstr "Šrifto raiška, 1024 * taškai colyje arba -1 numatytajai reikšmei"
 
-#: ../clutter/clutter-settings.c:538
+#: ../clutter/clutter-settings.c:592
 msgid "Font Hinting"
 msgstr "Šrifto patarimai"
 
-#: ../clutter/clutter-settings.c:539
-msgid "Whether to use hinting (1 to enable, 0 to disable and -1 to use the default)"
-msgstr "Ar naudoti patarimus (1 įjungimui, 0 išjungimui ir -1 numatytai veiksenai)"
+#: ../clutter/clutter-settings.c:593
+msgid ""
+"Whether to use hinting (1 to enable, 0 to disable and -1 to use the default)"
+msgstr ""
+"Ar naudoti patarimus (1 įjungimui, 0 išjungimui ir -1 numatytai veiksenai)"
 
-#: ../clutter/clutter-settings.c:560
+#: ../clutter/clutter-settings.c:614
 msgid "Font Hint Style"
 msgstr "Šrifto patarimo stilius"
 
-#: ../clutter/clutter-settings.c:561
+#: ../clutter/clutter-settings.c:615
 msgid "The style of hinting (hintnone, hintslight, hintmedium, hintfull)"
 msgstr "Patarimo stilius (hintnone, hintslight, hintmedium, hintfull)"
 
-#: ../clutter/clutter-settings.c:582
+#: ../clutter/clutter-settings.c:636
 msgid "Font Subpixel Order"
 msgstr "Šrifto subpikselių tvarka"
 
-#: ../clutter/clutter-settings.c:583
+#: ../clutter/clutter-settings.c:637
 msgid "The type of subpixel antialiasing (none, rgb, bgr, vrgb, vbgr)"
 msgstr "Subpikselių glotninimo tipas (none, rgb, bgr, vrgb, vbgr)"
 
-#: ../clutter/clutter-settings.c:600
+#: ../clutter/clutter-settings.c:654
 msgid "The minimum duration for a long press gesture to be recognized"
 msgstr "Mažiausia atpažįstama ilgo paspaudimo gesto trukmė"
 
-#: ../clutter/clutter-settings.c:607
+#: ../clutter/clutter-settings.c:661
+msgid "Window Scaling Factor"
+msgstr "Lango skalės faktorius"
+
+#: ../clutter/clutter-settings.c:662
+#| msgid "Add an effect to be applied on the actor"
+msgid "The scaling factor to be applied to windows"
+msgstr "Langams taikomas skalės faktorius"
+
+#: ../clutter/clutter-settings.c:669
 msgid "Fontconfig configuration timestamp"
 msgstr "Fontconfig konfigūracijos data ir laikas"
 
-#: ../clutter/clutter-settings.c:608
+#: ../clutter/clutter-settings.c:670
 msgid "Timestamp of the current fontconfig configuration"
 msgstr "Dabartinės fontconfig konfigūracijos data ir laikas"
 
-#: ../clutter/clutter-settings.c:625
+#: ../clutter/clutter-settings.c:687
 msgid "Password Hint Time"
 msgstr "Slaptažodžio priminimo laikas"
 
-#: ../clutter/clutter-settings.c:626
+#: ../clutter/clutter-settings.c:688
 msgid "How long to show the last input character in hidden entries"
 msgstr "Kaip ilgai rodyti paskutinį įvestą simbolį paslėptose įvestyse"
 
-#: ../clutter/clutter-shader-effect.c:486
+#: ../clutter/clutter-shader-effect.c:485
 msgid "Shader Type"
 msgstr "Piešėjo tipas"
 
-#: ../clutter/clutter-shader-effect.c:487
+#: ../clutter/clutter-shader-effect.c:486
 msgid "The type of shader used"
 msgstr "Naudojamo piešėjo tipas"
 
@@ -1584,8 +1650,7 @@ msgstr "Už ekrano"
 msgid "Whether the main stage should be rendered offscreen"
 msgstr "Ar pagrindinė scena turi būti piešiama už ekrano"
 
-#: ../clutter/clutter-stage.c:1927
-#: ../clutter/clutter-text.c:3482
+#: ../clutter/clutter-stage.c:1927 ../clutter/clutter-text.c:3518
 msgid "Cursor Visible"
 msgstr "Žymeklis matomas"
 
@@ -1601,9 +1666,8 @@ msgstr "Naudotojo keičiamas dydis"
 msgid "Whether the stage is able to be resized via user interaction"
 msgstr "Ar naudotojas gali keisti scenos dydį"
 
-#: ../clutter/clutter-stage.c:1958
-#: ../clutter/deprecated/clutter-box.c:260
-#: ../clutter/deprecated/clutter-rectangle.c:273
+#: ../clutter/clutter-stage.c:1958 ../clutter/deprecated/clutter-box.c:256
+#: ../clutter/deprecated/clutter-rectangle.c:270
 msgid "Color"
 msgstr "Spalva"
 
@@ -1675,661 +1739,598 @@ msgstr "Tapti aktyvia"
 msgid "Whether the stage should accept focus on show"
 msgstr "Ar scena turi tapti aktyvia parodymo metu"
 
-#: ../clutter/clutter-table-layout.c:543
-msgid "Column Number"
-msgstr "Stulpelio numeris"
-
-#: ../clutter/clutter-table-layout.c:544
-msgid "The column the widget resides in"
-msgstr "Stulpelis, kuriame yra elementas"
-
-#: ../clutter/clutter-table-layout.c:551
-msgid "Row Number"
-msgstr "Eilutės numeris"
-
-#: ../clutter/clutter-table-layout.c:552
-msgid "The row the widget resides in"
-msgstr "Eilutė, kurioje yra elementas"
-
-#: ../clutter/clutter-table-layout.c:559
-msgid "Column Span"
-msgstr "Stulpelių apimtis"
-
-#: ../clutter/clutter-table-layout.c:560
-msgid "The number of columns the widget should span"
-msgstr "Elemento apimamų stulpelių skaičius"
-
-#: ../clutter/clutter-table-layout.c:567
-msgid "Row Span"
-msgstr "Eilučių apimtis"
-
-#: ../clutter/clutter-table-layout.c:568
-msgid "The number of rows the widget should span"
-msgstr "Elemento apimamų eilučių skaičius"
-
-#: ../clutter/clutter-table-layout.c:575
-msgid "Horizontal Expand"
-msgstr "Horizontalus plėtimasis"
-
-#: ../clutter/clutter-table-layout.c:576
-msgid "Allocate extra space for the child in horizontal axis"
-msgstr "Išskirti papildomai vietos vaikui horizontalioje ašyje"
-
-#: ../clutter/clutter-table-layout.c:582
-msgid "Vertical Expand"
-msgstr "Vertikalus plėtimasis"
-
-#: ../clutter/clutter-table-layout.c:583
-msgid "Allocate extra space for the child in vertical axis"
-msgstr "Išskirti papildomai vietos vaikui vertikalioje ašyje"
-
-#: ../clutter/clutter-table-layout.c:1638
-msgid "Spacing between columns"
-msgstr "Tarpai tarp stulpelių"
-
-#: ../clutter/clutter-table-layout.c:1652
-msgid "Spacing between rows"
-msgstr "Tarpai tarp eilučių"
-
-#: ../clutter/clutter-text-buffer.c:351
-#: ../clutter/clutter-text.c:3403
+#: ../clutter/clutter-text-buffer.c:347 ../clutter/clutter-text.c:3439
 msgid "Text"
 msgstr "Tekstas"
 
-#: ../clutter/clutter-text-buffer.c:352
+#: ../clutter/clutter-text-buffer.c:348
 msgid "The contents of the buffer"
 msgstr "Buferio turinys"
 
-#: ../clutter/clutter-text-buffer.c:365
+#: ../clutter/clutter-text-buffer.c:361
 msgid "Text length"
 msgstr "Teksto ilgis"
 
-#: ../clutter/clutter-text-buffer.c:366
+#: ../clutter/clutter-text-buffer.c:362
 msgid "Length of the text currently in the buffer"
 msgstr "Šiuo metu buferyje esančio teksto ilgis"
 
-#: ../clutter/clutter-text-buffer.c:379
+#: ../clutter/clutter-text-buffer.c:375
 msgid "Maximum length"
 msgstr "Didžiausias ilgis"
 
-#: ../clutter/clutter-text-buffer.c:380
+#: ../clutter/clutter-text-buffer.c:376
 msgid "Maximum number of characters for this entry. Zero if no maximum"
-msgstr "Didžiausias simbolių skaičius šiam įvedimo laukui. Nulis, jei neribojama"
+msgstr ""
+"Didžiausias simbolių skaičius šiam įvedimo laukui. Nulis, jei neribojama"
 
-#: ../clutter/clutter-text.c:3350
+#: ../clutter/clutter-text.c:3386
 msgid "Buffer"
 msgstr "Buferis"
 
-#: ../clutter/clutter-text.c:3351
+#: ../clutter/clutter-text.c:3387
 msgid "The buffer for the text"
 msgstr "Teksto buferis"
 
-#: ../clutter/clutter-text.c:3369
+#: ../clutter/clutter-text.c:3405
 msgid "The font to be used by the text"
 msgstr "Tekstui naudojamas šriftas"
 
-#: ../clutter/clutter-text.c:3386
+#: ../clutter/clutter-text.c:3422
 msgid "Font Description"
 msgstr "Šrifto aprašymas"
 
-#: ../clutter/clutter-text.c:3387
+#: ../clutter/clutter-text.c:3423
 msgid "The font description to be used"
 msgstr "Naudotinas šrifto aprašymas"
 
-#: ../clutter/clutter-text.c:3404
+#: ../clutter/clutter-text.c:3440
 msgid "The text to render"
 msgstr "Piešiamas tekstas"
 
-#: ../clutter/clutter-text.c:3418
+#: ../clutter/clutter-text.c:3454
 msgid "Font Color"
 msgstr "Šrifto spalva"
 
-#: ../clutter/clutter-text.c:3419
+#: ../clutter/clutter-text.c:3455
 msgid "Color of the font used by the text"
 msgstr "Teksto naudojamo šrifto spalva"
 
-#: ../clutter/clutter-text.c:3434
+#: ../clutter/clutter-text.c:3470
 msgid "Editable"
 msgstr "Redaguojamas"
 
-#: ../clutter/clutter-text.c:3435
+#: ../clutter/clutter-text.c:3471
 msgid "Whether the text is editable"
 msgstr "Ar tekstas yra redaguojamas"
 
-#: ../clutter/clutter-text.c:3450
+#: ../clutter/clutter-text.c:3486
 msgid "Selectable"
 msgstr "Žymimas"
 
-#: ../clutter/clutter-text.c:3451
+#: ../clutter/clutter-text.c:3487
 msgid "Whether the text is selectable"
 msgstr "Ar tekstas leidžia žymėjimus"
 
-#: ../clutter/clutter-text.c:3465
+#: ../clutter/clutter-text.c:3501
 msgid "Activatable"
 msgstr "Aktyvuojamas"
 
-#: ../clutter/clutter-text.c:3466
+#: ../clutter/clutter-text.c:3502
 msgid "Whether pressing return causes the activate signal to be emitted"
 msgstr "Ar enter paspaudimas sukelia aktyvavimo signalo siuntimą"
 
-#: ../clutter/clutter-text.c:3483
+#: ../clutter/clutter-text.c:3519
 msgid "Whether the input cursor is visible"
 msgstr "Ar įvesties žymeklis yra matomas"
 
-#: ../clutter/clutter-text.c:3497
-#: ../clutter/clutter-text.c:3498
+#: ../clutter/clutter-text.c:3533 ../clutter/clutter-text.c:3534
 msgid "Cursor Color"
 msgstr "Žymeklio spalva"
 
-#: ../clutter/clutter-text.c:3513
+#: ../clutter/clutter-text.c:3549
 msgid "Cursor Color Set"
 msgstr "Žymeklio spalva nustatyta"
 
-#: ../clutter/clutter-text.c:3514
+#: ../clutter/clutter-text.c:3550
 msgid "Whether the cursor color has been set"
 msgstr "Ar žymeklio spalva nustatyta"
 
-#: ../clutter/clutter-text.c:3529
+#: ../clutter/clutter-text.c:3565
 msgid "Cursor Size"
 msgstr "Žymeklio dydis"
 
-#: ../clutter/clutter-text.c:3530
+#: ../clutter/clutter-text.c:3566
 msgid "The width of the cursor, in pixels"
 msgstr "Žymeklio plotis pikseliais"
 
-#: ../clutter/clutter-text.c:3546
-#: ../clutter/clutter-text.c:3564
+#: ../clutter/clutter-text.c:3582 ../clutter/clutter-text.c:3600
 msgid "Cursor Position"
 msgstr "Žymeklio padėtis"
 
-#: ../clutter/clutter-text.c:3547
-#: ../clutter/clutter-text.c:3565
+#: ../clutter/clutter-text.c:3583 ../clutter/clutter-text.c:3601
 msgid "The cursor position"
 msgstr "Žymeklio padėtis"
 
-#: ../clutter/clutter-text.c:3580
+#: ../clutter/clutter-text.c:3616
 msgid "Selection-bound"
 msgstr "Žymėjimo riba"
 
-#: ../clutter/clutter-text.c:3581
+#: ../clutter/clutter-text.c:3617
 msgid "The cursor position of the other end of the selection"
 msgstr "Žymeklio padėtis kitame pažymėjimo gale"
 
-#: ../clutter/clutter-text.c:3596
-#: ../clutter/clutter-text.c:3597
+#: ../clutter/clutter-text.c:3632 ../clutter/clutter-text.c:3633
 msgid "Selection Color"
 msgstr "Žymėjimo spalva"
 
-#: ../clutter/clutter-text.c:3612
+#: ../clutter/clutter-text.c:3648
 msgid "Selection Color Set"
 msgstr "Žymėjimo spalva nustatyta"
 
-#: ../clutter/clutter-text.c:3613
+#: ../clutter/clutter-text.c:3649
 msgid "Whether the selection color has been set"
 msgstr "Ar žymėjimo spalva buvo nustatyta"
 
-#: ../clutter/clutter-text.c:3628
+#: ../clutter/clutter-text.c:3664
 msgid "Attributes"
 msgstr "Atributai"
 
-#: ../clutter/clutter-text.c:3629
+#: ../clutter/clutter-text.c:3665
 msgid "A list of style attributes to apply to the contents of the actor"
 msgstr "Aktoriaus turiniui taikomų stiliaus atributų sąrašas"
 
-#: ../clutter/clutter-text.c:3651
+#: ../clutter/clutter-text.c:3687
 msgid "Use markup"
 msgstr "Naudoti žymėjimą"
 
-#: ../clutter/clutter-text.c:3652
+#: ../clutter/clutter-text.c:3688
 msgid "Whether or not the text includes Pango markup"
 msgstr "Ar tektas turi Pango žymėjimus"
 
-#: ../clutter/clutter-text.c:3668
+#: ../clutter/clutter-text.c:3704
 msgid "Line wrap"
 msgstr "Eilučių laužymas"
 
-#: ../clutter/clutter-text.c:3669
+#: ../clutter/clutter-text.c:3705
 msgid "If set, wrap the lines if the text becomes too wide"
 msgstr "Jei nustatyta, eilutės laužomos, kai tekstas tampa per platus"
 
-#: ../clutter/clutter-text.c:3684
+#: ../clutter/clutter-text.c:3720
 msgid "Line wrap mode"
 msgstr "Eilučių laužymo veiksena"
 
-#: ../clutter/clutter-text.c:3685
+#: ../clutter/clutter-text.c:3721
 msgid "Control how line-wrapping is done"
 msgstr "Valdyti, kaip atliekamas eilučių laužymas"
 
-#: ../clutter/clutter-text.c:3700
+#: ../clutter/clutter-text.c:3736
 msgid "Ellipsize"
 msgstr "Daugtaškis"
 
-#: ../clutter/clutter-text.c:3701
+#: ../clutter/clutter-text.c:3737
 msgid "The preferred place to ellipsize the string"
 msgstr "Pageidaujama vieta daugtaškiui eilutėje"
 
-#: ../clutter/clutter-text.c:3717
+#: ../clutter/clutter-text.c:3753
 msgid "Line Alignment"
 msgstr "Eilutės lygiavimas"
 
-#: ../clutter/clutter-text.c:3718
+#: ../clutter/clutter-text.c:3754
 msgid "The preferred alignment for the string, for multi-line text"
 msgstr "Pageidaujamas eilučių lygiavimas daugelio eilučių tekstui"
 
-#: ../clutter/clutter-text.c:3734
+#: ../clutter/clutter-text.c:3770
 msgid "Justify"
 msgstr "Abi pusės"
 
-#: ../clutter/clutter-text.c:3735
+#: ../clutter/clutter-text.c:3771
 msgid "Whether the text should be justified"
 msgstr "Ar tekstas turi būti lygiuojamos"
 
-#: ../clutter/clutter-text.c:3750
+#: ../clutter/clutter-text.c:3786
 msgid "Password Character"
 msgstr "Slaptažodžio simbolis"
 
-#: ../clutter/clutter-text.c:3751
+#: ../clutter/clutter-text.c:3787
 msgid "If non-zero, use this character to display the actor's contents"
 msgstr "Jei ne nulis, naudoti šį simbolį aktoriaus turiniui parodyti"
 
-#: ../clutter/clutter-text.c:3765
+#: ../clutter/clutter-text.c:3801
 msgid "Max Length"
 msgstr "Didžiausias ilgis"
 
-#: ../clutter/clutter-text.c:3766
+#: ../clutter/clutter-text.c:3802
 msgid "Maximum length of the text inside the actor"
 msgstr "Didžiausias teksto ilgis aktoriuje"
 
-#: ../clutter/clutter-text.c:3789
+#: ../clutter/clutter-text.c:3825
 msgid "Single Line Mode"
 msgstr "Vienos eilutės veiksena"
 
-#: ../clutter/clutter-text.c:3790
+#: ../clutter/clutter-text.c:3826
 msgid "Whether the text should be a single line"
 msgstr "Ar tekstas turi būti viena eilutė"
 
-#: ../clutter/clutter-text.c:3804
-#: ../clutter/clutter-text.c:3805
+#: ../clutter/clutter-text.c:3840 ../clutter/clutter-text.c:3841
 msgid "Selected Text Color"
 msgstr "Pažymėto teksto spalva"
 
-#: ../clutter/clutter-text.c:3820
+#: ../clutter/clutter-text.c:3856
 msgid "Selected Text Color Set"
 msgstr "Pažymėto teksto spalva nustatyta"
 
-#: ../clutter/clutter-text.c:3821
+#: ../clutter/clutter-text.c:3857
 msgid "Whether the selected text color has been set"
 msgstr "Ar pažymėto teksto spalva buvo nustatyta"
 
-#: ../clutter/clutter-timeline.c:561
-#: ../clutter/deprecated/clutter-animation.c:560
+#: ../clutter/clutter-timeline.c:593
+#: ../clutter/deprecated/clutter-animation.c:557
 msgid "Loop"
 msgstr "Ciklas"
 
-#: ../clutter/clutter-timeline.c:562
+#: ../clutter/clutter-timeline.c:594
 msgid "Should the timeline automatically restart"
 msgstr "Ar laiko linija turi automatiškai prasidėti iš naujo"
 
-#: ../clutter/clutter-timeline.c:576
+#: ../clutter/clutter-timeline.c:608
 msgid "Delay"
 msgstr "Delsa"
 
-#: ../clutter/clutter-timeline.c:577
+#: ../clutter/clutter-timeline.c:609
 msgid "Delay before start"
 msgstr "Delsa prieš pradžią"
 
-#: ../clutter/clutter-timeline.c:592
-#: ../clutter/deprecated/clutter-animation.c:544
-#: ../clutter/deprecated/clutter-animator.c:1803
+#: ../clutter/clutter-timeline.c:624
+#: ../clutter/deprecated/clutter-animation.c:541
+#: ../clutter/deprecated/clutter-animator.c:1801
 #: ../clutter/deprecated/clutter-media.c:224
-#: ../clutter/deprecated/clutter-state.c:1522
+#: ../clutter/deprecated/clutter-state.c:1517
 msgid "Duration"
 msgstr "Trukmė"
 
-#: ../clutter/clutter-timeline.c:593
+#: ../clutter/clutter-timeline.c:625
 msgid "Duration of the timeline in milliseconds"
 msgstr "Laiko linijos trukmė milisekundėmis"
 
-#: ../clutter/clutter-timeline.c:608
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:528
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:337
+#: ../clutter/clutter-timeline.c:640
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:521
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:330
 msgid "Direction"
 msgstr "Kryptis"
 
-#: ../clutter/clutter-timeline.c:609
+#: ../clutter/clutter-timeline.c:641
 msgid "Direction of the timeline"
 msgstr "Laiko linijos kryptis"
 
-#: ../clutter/clutter-timeline.c:624
+#: ../clutter/clutter-timeline.c:656
 msgid "Auto Reverse"
 msgstr "Automatinis apsukimas"
 
-#: ../clutter/clutter-timeline.c:625
+#: ../clutter/clutter-timeline.c:657
 msgid "Whether the direction should be reversed when reaching the end"
 msgstr "Ar kryptis turi būti apsukta pasiekus pabaigą"
 
-#: ../clutter/clutter-timeline.c:643
+#: ../clutter/clutter-timeline.c:675
 msgid "Repeat Count"
 msgstr "Pakartojimų skaičius"
 
-#: ../clutter/clutter-timeline.c:644
+#: ../clutter/clutter-timeline.c:676
 msgid "How many times the timeline should repeat"
 msgstr "Kiek kartų pakartoti laiko liniją"
 
-#: ../clutter/clutter-timeline.c:658
+#: ../clutter/clutter-timeline.c:690
 msgid "Progress Mode"
 msgstr "Progreso veiksena"
 
-#: ../clutter/clutter-timeline.c:659
+#: ../clutter/clutter-timeline.c:691
 msgid "How the timeline should compute the progress"
 msgstr "Kaip laiko linija turėtų skaičiuoti progresą"
 
-#: ../clutter/clutter-transition.c:246
+#: ../clutter/clutter-transition.c:244
 msgid "Interval"
 msgstr "Intervalas"
 
-#: ../clutter/clutter-transition.c:247
+#: ../clutter/clutter-transition.c:245
 msgid "The interval of values to transition"
 msgstr "Perėjimo intervalo vertės"
 
-#: ../clutter/clutter-transition.c:261
+#: ../clutter/clutter-transition.c:259
 msgid "Animatable"
 msgstr "Animuojamas"
 
-#: ../clutter/clutter-transition.c:262
+#: ../clutter/clutter-transition.c:260
 msgid "The animatable object"
 msgstr "Animuojamas objektas"
 
-#: ../clutter/clutter-transition.c:283
+#: ../clutter/clutter-transition.c:281
 msgid "Remove on Complete"
 msgstr "Pašalinti pabaigus"
 
-#: ../clutter/clutter-transition.c:284
+#: ../clutter/clutter-transition.c:282
 msgid "Detach the transition when completed"
 msgstr "Atjungti perėjimą baigus"
 
-#: ../clutter/clutter-zoom-action.c:353
-#| msgid "Axis"
+#: ../clutter/clutter-zoom-action.c:365
 msgid "Zoom Axis"
 msgstr "Didinimo ašis"
 
-#: ../clutter/clutter-zoom-action.c:354
-#| msgid "Constraints the dragging to an axis"
+#: ../clutter/clutter-zoom-action.c:366
 msgid "Constraints the zoom to an axis"
 msgstr "Apriboja didinimą ašimi"
 
-#: ../clutter/deprecated/clutter-alpha.c:355
-#: ../clutter/deprecated/clutter-animation.c:575
-#: ../clutter/deprecated/clutter-animator.c:1820
+#: ../clutter/deprecated/clutter-alpha.c:354
+#: ../clutter/deprecated/clutter-animation.c:572
+#: ../clutter/deprecated/clutter-animator.c:1818
 msgid "Timeline"
 msgstr "Laiko linija"
 
-#: ../clutter/deprecated/clutter-alpha.c:356
+#: ../clutter/deprecated/clutter-alpha.c:355
 msgid "Timeline used by the alpha"
 msgstr "Alfa naudojama laiko linija"
 
-#: ../clutter/deprecated/clutter-alpha.c:372
+#: ../clutter/deprecated/clutter-alpha.c:371
 msgid "Alpha value"
 msgstr "Alfa reikšmė"
 
-#: ../clutter/deprecated/clutter-alpha.c:373
+#: ../clutter/deprecated/clutter-alpha.c:372
 msgid "Alpha value as computed by the alpha"
 msgstr "Alfa reikšmė, kaip ją apskaičiavo alfa"
 
-#: ../clutter/deprecated/clutter-alpha.c:394
-#: ../clutter/deprecated/clutter-animation.c:528
+#: ../clutter/deprecated/clutter-alpha.c:393
+#: ../clutter/deprecated/clutter-animation.c:525
 msgid "Mode"
 msgstr "Būsena"
 
-#: ../clutter/deprecated/clutter-alpha.c:395
+#: ../clutter/deprecated/clutter-alpha.c:394
 msgid "Progress mode"
 msgstr "Progreso būsena"
 
-#: ../clutter/deprecated/clutter-animation.c:511
+#: ../clutter/deprecated/clutter-animation.c:508
 msgid "Object"
 msgstr "Objektas"
 
-#: ../clutter/deprecated/clutter-animation.c:512
+#: ../clutter/deprecated/clutter-animation.c:509
 msgid "Object to which the animation applies"
 msgstr "Objektas, kuriam taikoma animacija"
 
-#: ../clutter/deprecated/clutter-animation.c:529
+#: ../clutter/deprecated/clutter-animation.c:526
 msgid "The mode of the animation"
 msgstr "Animacijos veiksena"
 
-#: ../clutter/deprecated/clutter-animation.c:545
+#: ../clutter/deprecated/clutter-animation.c:542
 msgid "Duration of the animation, in milliseconds"
 msgstr "Animacijos trukmė milisekundėmis"
 
-#: ../clutter/deprecated/clutter-animation.c:561
+#: ../clutter/deprecated/clutter-animation.c:558
 msgid "Whether the animation should loop"
 msgstr "Ar animacija yra ciklinė"
 
-#: ../clutter/deprecated/clutter-animation.c:576
+#: ../clutter/deprecated/clutter-animation.c:573
 msgid "The timeline used by the animation"
 msgstr "Animacijos naudojama laiko linija"
 
-#: ../clutter/deprecated/clutter-animation.c:592
-#: ../clutter/deprecated/clutter-behaviour.c:241
+#: ../clutter/deprecated/clutter-animation.c:589
+#: ../clutter/deprecated/clutter-behaviour.c:237
 msgid "Alpha"
 msgstr "Alfa"
 
-#: ../clutter/deprecated/clutter-animation.c:593
+#: ../clutter/deprecated/clutter-animation.c:590
 msgid "The alpha used by the animation"
 msgstr "Animacijos naudojama alfa"
 
-#: ../clutter/deprecated/clutter-animator.c:1804
+#: ../clutter/deprecated/clutter-animator.c:1802
 msgid "The duration of the animation"
 msgstr "Animacijos trukmė"
 
-#: ../clutter/deprecated/clutter-animator.c:1821
+#: ../clutter/deprecated/clutter-animator.c:1819
 msgid "The timeline of the animation"
 msgstr "Animacijos laiko linija"
 
-#: ../clutter/deprecated/clutter-behaviour.c:242
+#: ../clutter/deprecated/clutter-behaviour.c:238
 msgid "Alpha Object to drive the behaviour"
 msgstr "Alfa objektas, valdantis elgseną"
 
-#: ../clutter/deprecated/clutter-behaviour-depth.c:182
+#: ../clutter/deprecated/clutter-behaviour-depth.c:180
 msgid "Start Depth"
 msgstr "Pradžios gylis"
 
-#: ../clutter/deprecated/clutter-behaviour-depth.c:183
+#: ../clutter/deprecated/clutter-behaviour-depth.c:181
 msgid "Initial depth to apply"
 msgstr "Pradinis taikomas gylis"
 
-#: ../clutter/deprecated/clutter-behaviour-depth.c:198
+#: ../clutter/deprecated/clutter-behaviour-depth.c:196
 msgid "End Depth"
 msgstr "Pabaigos gylis"
 
-#: ../clutter/deprecated/clutter-behaviour-depth.c:199
+#: ../clutter/deprecated/clutter-behaviour-depth.c:197
 msgid "Final depth to apply"
 msgstr "Galutinis taikomas gylis"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:401
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:394
 msgid "Start Angle"
 msgstr "Pradžios kampas"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:402
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:284
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:395
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:277
 msgid "Initial angle"
 msgstr "Pradinis kampas"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:417
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:410
 msgid "End Angle"
 msgstr "Pabaigos kampas"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:418
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:302
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:411
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:295
 msgid "Final angle"
 msgstr "Galutinis kampas"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:433
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:426
 msgid "Angle x tilt"
 msgstr "Kampo x pakrypimas"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:434
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:427
 msgid "Tilt of the ellipse around x axis"
 msgstr "Elipsės pakrypimas apie x ašį"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:449
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:442
 msgid "Angle y tilt"
 msgstr "Kampo y pakrypimas"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:450
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:443
 msgid "Tilt of the ellipse around y axis"
 msgstr "Elipsės pakrypimas apie y ašį"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:465
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:458
 msgid "Angle z tilt"
 msgstr "Kampo z pakrypimas"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:466
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:459
 msgid "Tilt of the ellipse around z axis"
 msgstr "Elipsės pakrypimas apie z ašį"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:482
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:475
 msgid "Width of the ellipse"
 msgstr "Elipsės plotis"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:498
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:491
 msgid "Height of ellipse"
 msgstr "Elipsės aukštis"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:513
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:506
 msgid "Center"
 msgstr "Centras"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:514
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:507
 msgid "Center of ellipse"
 msgstr "Elipsės centras"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:529
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:338
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:522
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:331
 msgid "Direction of rotation"
 msgstr "Sukimosi kryptis"
 
-#: ../clutter/deprecated/clutter-behaviour-opacity.c:184
+#: ../clutter/deprecated/clutter-behaviour-opacity.c:177
 msgid "Opacity Start"
 msgstr "Neaiškumo pradžia"
 
-#: ../clutter/deprecated/clutter-behaviour-opacity.c:185
+#: ../clutter/deprecated/clutter-behaviour-opacity.c:178
 msgid "Initial opacity level"
 msgstr "Pradinis neaiškumo lygis"
 
-#: ../clutter/deprecated/clutter-behaviour-opacity.c:202
+#: ../clutter/deprecated/clutter-behaviour-opacity.c:195
 msgid "Opacity End"
 msgstr "Neaiškumo pabaiga"
 
-#: ../clutter/deprecated/clutter-behaviour-opacity.c:203
+#: ../clutter/deprecated/clutter-behaviour-opacity.c:196
 msgid "Final opacity level"
 msgstr "Galutinis neaiškumo lygis"
 
-#: ../clutter/deprecated/clutter-behaviour-path.c:226
+#: ../clutter/deprecated/clutter-behaviour-path.c:222
 msgid "The ClutterPath object representing the path to animate along"
 msgstr "ClutterPath objektas, reprezentuojantis animacijos kelią"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:283
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:276
 msgid "Angle Begin"
 msgstr "Kampo pradžia"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:301
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:294
 msgid "Angle End"
 msgstr "Kampo pabaiga"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:319
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:312
 msgid "Axis"
 msgstr "Ašis"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:320
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:313
 msgid "Axis of rotation"
 msgstr "Sukimosi ašis"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:355
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:348
 msgid "Center X"
 msgstr "Centro X"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:356
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:349
 msgid "X coordinate of the center of rotation"
 msgstr "Sukimosi centro X koordinatė"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:373
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:366
 msgid "Center Y"
 msgstr "Centro Y"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:374
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:367
 msgid "Y coordinate of the center of rotation"
 msgstr "Sukimosi centro Y koordinatė"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:391
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:384
 msgid "Center Z"
 msgstr "Centro Z"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:392
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:385
 msgid "Z coordinate of the center of rotation"
 msgstr "Sukimosi centro Y koordinatė"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:226
+#: ../clutter/deprecated/clutter-behaviour-scale.c:222
 msgid "X Start Scale"
 msgstr "X pradinė skalė"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:227
+#: ../clutter/deprecated/clutter-behaviour-scale.c:223
 msgid "Initial scale on the X axis"
 msgstr "Pradinė skalė X ašyje"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:245
+#: ../clutter/deprecated/clutter-behaviour-scale.c:241
 msgid "X End Scale"
 msgstr "X galutinė skalė"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:246
+#: ../clutter/deprecated/clutter-behaviour-scale.c:242
 msgid "Final scale on the X axis"
 msgstr "Galutinė skalė X ašyje"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:264
+#: ../clutter/deprecated/clutter-behaviour-scale.c:260
 msgid "Y Start Scale"
 msgstr "X pradinė skalė"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:265
+#: ../clutter/deprecated/clutter-behaviour-scale.c:261
 msgid "Initial scale on the Y axis"
 msgstr "Pradinė skalė Y ašyje"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:283
+#: ../clutter/deprecated/clutter-behaviour-scale.c:279
 msgid "Y End Scale"
 msgstr "Y galutinė skalė"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:284
+#: ../clutter/deprecated/clutter-behaviour-scale.c:280
 msgid "Final scale on the Y axis"
 msgstr "Galutinė skalė Y ašyje"
 
-#: ../clutter/deprecated/clutter-box.c:261
+#: ../clutter/deprecated/clutter-box.c:257
 msgid "The background color of the box"
 msgstr "Dėžutės fono spalva"
 
-#: ../clutter/deprecated/clutter-box.c:274
+#: ../clutter/deprecated/clutter-box.c:270
 msgid "Color Set"
 msgstr "Spalva nustatyta"
 
-#: ../clutter/deprecated/clutter-cairo-texture.c:597
+#: ../clutter/deprecated/clutter-cairo-texture.c:593
 msgid "Surface Width"
 msgstr "Paviršiaus plotis"
 
-#: ../clutter/deprecated/clutter-cairo-texture.c:598
+#: ../clutter/deprecated/clutter-cairo-texture.c:594
 msgid "The width of the Cairo surface"
 msgstr "Cairo paviršiaus plotis"
 
-#: ../clutter/deprecated/clutter-cairo-texture.c:615
+#: ../clutter/deprecated/clutter-cairo-texture.c:611
 msgid "Surface Height"
 msgstr "Paviršiaus aukštis"
 
-#: ../clutter/deprecated/clutter-cairo-texture.c:616
+#: ../clutter/deprecated/clutter-cairo-texture.c:612
 msgid "The height of the Cairo surface"
 msgstr "Cairo paviršiaus aukštis"
 
-#: ../clutter/deprecated/clutter-cairo-texture.c:636
+#: ../clutter/deprecated/clutter-cairo-texture.c:632
 msgid "Auto Resize"
 msgstr "Automatinis dydžio keitimas"
 
-#: ../clutter/deprecated/clutter-cairo-texture.c:637
+#: ../clutter/deprecated/clutter-cairo-texture.c:633
 msgid "Whether the surface should match the allocation"
 msgstr "Ar paviršius turi atitikti išskyrimą"
 
@@ -2401,373 +2402,444 @@ msgstr "Buferio užpildymo lygis"
 msgid "The duration of the stream, in seconds"
 msgstr "Srauto trukmė sekundėmis"
 
-#: ../clutter/deprecated/clutter-rectangle.c:274
+#: ../clutter/deprecated/clutter-rectangle.c:271
 msgid "The color of the rectangle"
 msgstr "Stačiakampio spalva"
 
-#: ../clutter/deprecated/clutter-rectangle.c:287
+#: ../clutter/deprecated/clutter-rectangle.c:284
 msgid "Border Color"
 msgstr "Rėmelio spalva"
 
-#: ../clutter/deprecated/clutter-rectangle.c:288
+#: ../clutter/deprecated/clutter-rectangle.c:285
 msgid "The color of the border of the rectangle"
 msgstr "Stačiakampio rėmelio spalva"
 
-#: ../clutter/deprecated/clutter-rectangle.c:303
+#: ../clutter/deprecated/clutter-rectangle.c:300
 msgid "Border Width"
 msgstr "Rėmelio plotis"
 
-#: ../clutter/deprecated/clutter-rectangle.c:304
+#: ../clutter/deprecated/clutter-rectangle.c:301
 msgid "The width of the border of the rectangle"
 msgstr "Stačiakampio rėmelio plotis"
 
-#: ../clutter/deprecated/clutter-rectangle.c:318
+#: ../clutter/deprecated/clutter-rectangle.c:315
 msgid "Has Border"
 msgstr "Turi rėmelį"
 
-#: ../clutter/deprecated/clutter-rectangle.c:319
+#: ../clutter/deprecated/clutter-rectangle.c:316
 msgid "Whether the rectangle should have a border"
 msgstr "Ar stačiakampis turi rėmelį"
 
-#: ../clutter/deprecated/clutter-shader.c:261
+#: ../clutter/deprecated/clutter-shader.c:257
 msgid "Vertex Source"
 msgstr "Viršūnės šaltinis"
 
-#: ../clutter/deprecated/clutter-shader.c:262
+#: ../clutter/deprecated/clutter-shader.c:258
 msgid "Source of vertex shader"
 msgstr "Viršūnės piešėjo šaltinis"
 
-#: ../clutter/deprecated/clutter-shader.c:278
+#: ../clutter/deprecated/clutter-shader.c:274
 msgid "Fragment Source"
 msgstr "Fragmento šaltinis"
 
-#: ../clutter/deprecated/clutter-shader.c:279
+#: ../clutter/deprecated/clutter-shader.c:275
 msgid "Source of fragment shader"
 msgstr "Fragmento piešėjo šaltinis"
 
-#: ../clutter/deprecated/clutter-shader.c:296
+#: ../clutter/deprecated/clutter-shader.c:292
 msgid "Compiled"
 msgstr "Kompiliuotas"
 
-#: ../clutter/deprecated/clutter-shader.c:297
+#: ../clutter/deprecated/clutter-shader.c:293
 msgid "Whether the shader is compiled and linked"
 msgstr "Ar piešėjas yra kompiliuotas ir surištas"
 
-#: ../clutter/deprecated/clutter-shader.c:314
+#: ../clutter/deprecated/clutter-shader.c:310
 msgid "Whether the shader is enabled"
 msgstr "Ar piešėjas yra įjungtas"
 
-#: ../clutter/deprecated/clutter-shader.c:525
+#: ../clutter/deprecated/clutter-shader.c:521
 #, c-format
 msgid "%s compilation failed: %s"
 msgstr "%s kompiliavimas nepavyko: %s"
 
-#: ../clutter/deprecated/clutter-shader.c:526
+#: ../clutter/deprecated/clutter-shader.c:522
 msgid "Vertex shader"
 msgstr "Viršūnės piešėjas"
 
-#: ../clutter/deprecated/clutter-shader.c:527
+#: ../clutter/deprecated/clutter-shader.c:523
 msgid "Fragment shader"
 msgstr "Fragmento piešėjas"
 
-#: ../clutter/deprecated/clutter-state.c:1504
+#: ../clutter/deprecated/clutter-state.c:1499
 msgid "State"
 msgstr "Būsena"
 
-#: ../clutter/deprecated/clutter-state.c:1505
+#: ../clutter/deprecated/clutter-state.c:1500
 msgid "Currently set state, (transition to this state might not be complete)"
 msgstr "Dabartinė būsena (perėjimas į šią būseną gali būti neužbaigtas)"
 
-#: ../clutter/deprecated/clutter-state.c:1523
+#: ../clutter/deprecated/clutter-state.c:1518
 msgid "Default transition duration"
 msgstr "Numatyta perėjimo trukmė"
 
-#: ../clutter/deprecated/clutter-texture.c:994
+#: ../clutter/deprecated/clutter-table-layout.c:543
+msgid "Column Number"
+msgstr "Stulpelio numeris"
+
+#: ../clutter/deprecated/clutter-table-layout.c:544
+msgid "The column the widget resides in"
+msgstr "Stulpelis, kuriame yra elementas"
+
+#: ../clutter/deprecated/clutter-table-layout.c:551
+msgid "Row Number"
+msgstr "Eilutės numeris"
+
+#: ../clutter/deprecated/clutter-table-layout.c:552
+msgid "The row the widget resides in"
+msgstr "Eilutė, kurioje yra elementas"
+
+#: ../clutter/deprecated/clutter-table-layout.c:559
+msgid "Column Span"
+msgstr "Stulpelių apimtis"
+
+#: ../clutter/deprecated/clutter-table-layout.c:560
+msgid "The number of columns the widget should span"
+msgstr "Elemento apimamų stulpelių skaičius"
+
+#: ../clutter/deprecated/clutter-table-layout.c:567
+msgid "Row Span"
+msgstr "Eilučių apimtis"
+
+#: ../clutter/deprecated/clutter-table-layout.c:568
+msgid "The number of rows the widget should span"
+msgstr "Elemento apimamų eilučių skaičius"
+
+#: ../clutter/deprecated/clutter-table-layout.c:575
+msgid "Horizontal Expand"
+msgstr "Horizontalus plėtimasis"
+
+#: ../clutter/deprecated/clutter-table-layout.c:576
+msgid "Allocate extra space for the child in horizontal axis"
+msgstr "Išskirti papildomai vietos vaikui horizontalioje ašyje"
+
+#: ../clutter/deprecated/clutter-table-layout.c:582
+msgid "Vertical Expand"
+msgstr "Vertikalus plėtimasis"
+
+#: ../clutter/deprecated/clutter-table-layout.c:583
+msgid "Allocate extra space for the child in vertical axis"
+msgstr "Išskirti papildomai vietos vaikui vertikalioje ašyje"
+
+#: ../clutter/deprecated/clutter-table-layout.c:1638
+msgid "Spacing between columns"
+msgstr "Tarpai tarp stulpelių"
+
+#: ../clutter/deprecated/clutter-table-layout.c:1654
+msgid "Spacing between rows"
+msgstr "Tarpai tarp eilučių"
+
+#: ../clutter/deprecated/clutter-texture.c:992
 msgid "Sync size of actor"
 msgstr "Sinchronizuoti aktoriaus dydį"
 
-#: ../clutter/deprecated/clutter-texture.c:995
+#: ../clutter/deprecated/clutter-texture.c:993
 msgid "Auto sync size of actor to underlying pixbuf dimensions"
-msgstr "Automatiškai sinchronizuoti aktoriaus dydį į pikselių buferio dimensijas"
+msgstr ""
+"Automatiškai sinchronizuoti aktoriaus dydį į pikselių buferio dimensijas"
 
-#: ../clutter/deprecated/clutter-texture.c:1002
+#: ../clutter/deprecated/clutter-texture.c:1000
 msgid "Disable Slicing"
 msgstr "Išjungti dalinimą"
 
-#: ../clutter/deprecated/clutter-texture.c:1003
-msgid "Forces the underlying texture to be singular and not made of smaller space saving individual textures"
-msgstr "Verčia tekstūrą būti vientisa ir nesudaryta iš mažesnių vietą taupančių atskirų tekstūrų"
+#: ../clutter/deprecated/clutter-texture.c:1001
+msgid ""
+"Forces the underlying texture to be singular and not made of smaller space "
+"saving individual textures"
+msgstr ""
+"Verčia tekstūrą būti vientisa ir nesudaryta iš mažesnių vietą taupančių "
+"atskirų tekstūrų"
 
-#: ../clutter/deprecated/clutter-texture.c:1012
+#: ../clutter/deprecated/clutter-texture.c:1010
 msgid "Tile Waste"
 msgstr "Koklių šiukšlinė"
 
-#: ../clutter/deprecated/clutter-texture.c:1013
+#: ../clutter/deprecated/clutter-texture.c:1011
 msgid "Maximum waste area of a sliced texture"
 msgstr "Didžiausia šiukšlių viena padalintoms tekstūroms"
 
-#: ../clutter/deprecated/clutter-texture.c:1021
+#: ../clutter/deprecated/clutter-texture.c:1019
 msgid "Horizontal repeat"
 msgstr "Horizontalus pasikartojimas"
 
-#: ../clutter/deprecated/clutter-texture.c:1022
+#: ../clutter/deprecated/clutter-texture.c:1020
 msgid "Repeat the contents rather than scaling them horizontally"
 msgstr "Pakartoti turinį užuot jį didinus horizontaliai"
 
-#: ../clutter/deprecated/clutter-texture.c:1029
+#: ../clutter/deprecated/clutter-texture.c:1027
 msgid "Vertical repeat"
 msgstr "Vertikalus pakartojimas"
 
-#: ../clutter/deprecated/clutter-texture.c:1030
+#: ../clutter/deprecated/clutter-texture.c:1028
 msgid "Repeat the contents rather than scaling them vertically"
 msgstr "Pakartoti turinį užuot jį didinus vertikaliai"
 
-#: ../clutter/deprecated/clutter-texture.c:1037
+#: ../clutter/deprecated/clutter-texture.c:1035
 msgid "Filter Quality"
 msgstr "Filtro kokybė"
 
-#: ../clutter/deprecated/clutter-texture.c:1038
+#: ../clutter/deprecated/clutter-texture.c:1036
 msgid "Rendering quality used when drawing the texture"
 msgstr "Piešimo kokybė piešiant tekstūrą"
 
-#: ../clutter/deprecated/clutter-texture.c:1046
+#: ../clutter/deprecated/clutter-texture.c:1044
 msgid "Pixel Format"
 msgstr "Pikselių formatas"
 
-#: ../clutter/deprecated/clutter-texture.c:1047
+#: ../clutter/deprecated/clutter-texture.c:1045
 msgid "The Cogl pixel format to use"
 msgstr "Naudotinas Cogl pikselių formatas"
 
-#: ../clutter/deprecated/clutter-texture.c:1055
-#: ../clutter/wayland/clutter-wayland-surface.c:449
+#: ../clutter/deprecated/clutter-texture.c:1053
+#: ../clutter/wayland/clutter-wayland-surface.c:445
 msgid "Cogl Texture"
 msgstr "Cogl tekstūra"
 
-#: ../clutter/deprecated/clutter-texture.c:1056
-#: ../clutter/wayland/clutter-wayland-surface.c:450
+#: ../clutter/deprecated/clutter-texture.c:1054
+#: ../clutter/wayland/clutter-wayland-surface.c:446
 msgid "The underlying Cogl texture handle used to draw this actor"
 msgstr "Šiam aktoriui piešti naudojamos Cogl tekstūros deskriptorius"
 
-#: ../clutter/deprecated/clutter-texture.c:1063
+#: ../clutter/deprecated/clutter-texture.c:1061
 msgid "Cogl Material"
 msgstr "Cogl medžiaga"
 
-#: ../clutter/deprecated/clutter-texture.c:1064
+#: ../clutter/deprecated/clutter-texture.c:1062
 msgid "The underlying Cogl material handle used to draw this actor"
 msgstr "Šiam aktoriui piešti naudojamos Cogl medžiagos deskriptorius"
 
-#: ../clutter/deprecated/clutter-texture.c:1083
+#: ../clutter/deprecated/clutter-texture.c:1081
 msgid "The path of the file containing the image data"
 msgstr "Failo, turinčio paveikslėlio duomenis, kelias"
 
-#: ../clutter/deprecated/clutter-texture.c:1090
+#: ../clutter/deprecated/clutter-texture.c:1088
 msgid "Keep Aspect Ratio"
 msgstr "Išlaikyti proporcijas"
 
-#: ../clutter/deprecated/clutter-texture.c:1091
-msgid "Keep the aspect ratio of the texture when requesting the preferred width or height"
+#: ../clutter/deprecated/clutter-texture.c:1089
+msgid ""
+"Keep the aspect ratio of the texture when requesting the preferred width or "
+"height"
 msgstr "Išlaikyti tekstūros proporcijas prašant pageidaujamo pločio ir aukščio"
 
-#: ../clutter/deprecated/clutter-texture.c:1119
+#: ../clutter/deprecated/clutter-texture.c:1117
 msgid "Load asynchronously"
 msgstr "Įkelti asinchroniškai"
 
-#: ../clutter/deprecated/clutter-texture.c:1120
-msgid "Load files inside a thread to avoid blocking when loading images from disk"
-msgstr "Įkelti failus gijoje išvengiant blokavimo įkeliant paveikslėlius iš disko"
+#: ../clutter/deprecated/clutter-texture.c:1118
+msgid ""
+"Load files inside a thread to avoid blocking when loading images from disk"
+msgstr ""
+"Įkelti failus gijoje išvengiant blokavimo įkeliant paveikslėlius iš disko"
 
-#: ../clutter/deprecated/clutter-texture.c:1138
+#: ../clutter/deprecated/clutter-texture.c:1136
 msgid "Load data asynchronously"
 msgstr "Įkelti duomenis asinchroniškai"
 
-#: ../clutter/deprecated/clutter-texture.c:1139
-msgid "Decode image data files inside a thread to reduce blocking when loading images from disk"
-msgstr "Dekoduoti paveikslėlių failus gijoje sumažinant blokavimą įkeliant paveikslėlius iš disko"
+#: ../clutter/deprecated/clutter-texture.c:1137
+msgid ""
+"Decode image data files inside a thread to reduce blocking when loading "
+"images from disk"
+msgstr ""
+"Dekoduoti paveikslėlių failus gijoje sumažinant blokavimą įkeliant "
+"paveikslėlius iš disko"
 
-#: ../clutter/deprecated/clutter-texture.c:1165
+#: ../clutter/deprecated/clutter-texture.c:1163
 msgid "Pick With Alpha"
 msgstr "Parinkti su alfa"
 
-#: ../clutter/deprecated/clutter-texture.c:1166
+#: ../clutter/deprecated/clutter-texture.c:1164
 msgid "Shape actor with alpha channel when picking"
 msgstr "Sudaryti aktorių su alfa kanalu parinkimo metu"
 
-#: ../clutter/deprecated/clutter-texture.c:1599
-#: ../clutter/deprecated/clutter-texture.c:1994
-#: ../clutter/deprecated/clutter-texture.c:2090
-#: ../clutter/deprecated/clutter-texture.c:2388
+#: ../clutter/deprecated/clutter-texture.c:1597
+#: ../clutter/deprecated/clutter-texture.c:1992
+#: ../clutter/deprecated/clutter-texture.c:2088
+#: ../clutter/deprecated/clutter-texture.c:2386
 #, c-format
 msgid "Failed to load the image data"
 msgstr "Nepavyko įkelti paveikslėlio duomenų"
 
-#: ../clutter/deprecated/clutter-texture.c:1758
+#: ../clutter/deprecated/clutter-texture.c:1756
 #, c-format
 msgid "YUV textures are not supported"
 msgstr "YUV tekstūros nepalaikomos"
 
-#: ../clutter/deprecated/clutter-texture.c:1767
+#: ../clutter/deprecated/clutter-texture.c:1765
 #, c-format
 msgid "YUV2 textues are not supported"
 msgstr "YUV2 tekstūros nepalaikomos"
 
-#: ../clutter/evdev/clutter-input-device-evdev.c:159
+#: ../clutter/evdev/clutter-input-device-evdev.c:154
 msgid "sysfs Path"
 msgstr "sysfs kelias"
 
-#: ../clutter/evdev/clutter-input-device-evdev.c:160
+#: ../clutter/evdev/clutter-input-device-evdev.c:155
 msgid "Path of the device in sysfs"
 msgstr "sysfs įrenginio kelias"
 
-#: ../clutter/evdev/clutter-input-device-evdev.c:175
+#: ../clutter/evdev/clutter-input-device-evdev.c:170
 msgid "Device Path"
 msgstr "Įrenginio kelias"
 
-#: ../clutter/evdev/clutter-input-device-evdev.c:176
+#: ../clutter/evdev/clutter-input-device-evdev.c:171
 msgid "Path of the device node"
 msgstr "Įrenginio viršūnės kelias"
 
-#: ../clutter/gdk/clutter-backend-gdk.c:296
+#: ../clutter/gdk/clutter-backend-gdk.c:289
 #, c-format
 msgid "Could not find a suitable CoglWinsys for a GdkDisplay of type %s"
 msgstr "Nepavyko rasti tinkamo CoglWinsys elemento %s tipo GdkDisplay"
 
-#: ../clutter/wayland/clutter-wayland-surface.c:423
+#: ../clutter/wayland/clutter-wayland-surface.c:419
 msgid "Surface"
 msgstr "Paviršius"
 
-#: ../clutter/wayland/clutter-wayland-surface.c:424
+#: ../clutter/wayland/clutter-wayland-surface.c:420
 msgid "The underlying wayland surface"
 msgstr "Naudojamas wayland paviršius"
 
-#: ../clutter/wayland/clutter-wayland-surface.c:431
+#: ../clutter/wayland/clutter-wayland-surface.c:427
 msgid "Surface width"
 msgstr "Paviršiaus plotis"
 
-#: ../clutter/wayland/clutter-wayland-surface.c:432
+#: ../clutter/wayland/clutter-wayland-surface.c:428
 msgid "The width of the underlying wayland surface"
 msgstr "Esamo wayland paviršiaus plotis"
 
-#: ../clutter/wayland/clutter-wayland-surface.c:440
+#: ../clutter/wayland/clutter-wayland-surface.c:436
 msgid "Surface height"
 msgstr "Paviršiaus aukštis"
 
-#: ../clutter/wayland/clutter-wayland-surface.c:441
+#: ../clutter/wayland/clutter-wayland-surface.c:437
 msgid "The height of the underlying wayland surface"
 msgstr "Esamo wayland paviršiaus aukštis"
 
-#: ../clutter/x11/clutter-backend-x11.c:516
+#: ../clutter/x11/clutter-backend-x11.c:488
 msgid "X display to use"
 msgstr "Naudojamas X vaizduoklis"
 
-#: ../clutter/x11/clutter-backend-x11.c:522
+#: ../clutter/x11/clutter-backend-x11.c:494
 msgid "X screen to use"
 msgstr "Naudojamas X ekranas"
 
-#: ../clutter/x11/clutter-backend-x11.c:527
+#: ../clutter/x11/clutter-backend-x11.c:499
 msgid "Make X calls synchronous"
 msgstr "Naudoti sinchroninius X kvietimus"
 
-#: ../clutter/x11/clutter-backend-x11.c:534
-msgid "Enable XInput support"
-msgstr "Įjungti XInput palaikymą"
+#: ../clutter/x11/clutter-backend-x11.c:506
+msgid "Disable XInput support"
+msgstr "Išjungti XInput palaikymą"
 
-#: ../clutter/x11/clutter-keymap-x11.c:317
+#: ../clutter/x11/clutter-keymap-x11.c:322
 msgid "The Clutter backend"
 msgstr "Clutter realizacija"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:539
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:534
 msgid "Pixmap"
 msgstr "Pikselių žemėlapis"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:540
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:535
 msgid "The X11 Pixmap to be bound"
 msgstr "Ribojamas X11 pikselių žemėlapis"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:548
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:543
 msgid "Pixmap width"
 msgstr "Pikselių žemėlapio plotis"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:549
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:544
 msgid "The width of the pixmap bound to this texture"
 msgstr "Pikselių žemėlapio, ribojamo šia tekstūra, plotis"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:557
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:552
 msgid "Pixmap height"
 msgstr "Pikselių žemėlapio aukštis"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:558
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:553
 msgid "The height of the pixmap bound to this texture"
 msgstr "Pikselių žemėlapio, ribojamo šia tekstūra, aukštis"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:566
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:561
 msgid "Pixmap Depth"
 msgstr "Pikselių žemėlapio gylis"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:567
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:562
 msgid "The depth (in number of bits) of the pixmap bound to this texture"
 msgstr "Šios tekstūros ribojamo pikselių žemėlapio gylis (bitų skaičiumi)"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:575
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:570
 msgid "Automatic Updates"
 msgstr "Automatiniai atnaujinimai"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:576
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:571
 msgid "If the texture should be kept in sync with any pixmap changes."
-msgstr "Ar tekstūra turi būti sinchroniška su pikselių žemėlapio pasikeitimais."
+msgstr ""
+"Ar tekstūra turi būti sinchroniška su pikselių žemėlapio pasikeitimais."
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:584
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:579
 msgid "Window"
 msgstr "Langas"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:585
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:580
 msgid "The X11 Window to be bound"
 msgstr "Ribojamas X11 langas"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:593
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:588
 msgid "Window Redirect Automatic"
 msgstr "Automatinis lango nukreipimas"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:594
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:589
 msgid "If composite window redirects are set to Automatic (or Manual if false)"
-msgstr "Ar komponavimo lango nukreipimai yra nustatyti į automatinius (priešingu atveju priverstiniai)"
+msgstr ""
+"Ar komponavimo lango nukreipimai yra nustatyti į automatinius (priešingu "
+"atveju priverstiniai)"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:604
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:599
 msgid "Window Mapped"
 msgstr "Langas pavaizduotas"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:605
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:600
 msgid "If window is mapped"
 msgstr "Ar langas yra pavaizduotas"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:614
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:609
 msgid "Destroyed"
 msgstr "Sunaikintas"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:615
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:610
 msgid "If window has been destroyed"
 msgstr "Ar langas buvo sunaikintas"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:623
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:618
 msgid "Window X"
 msgstr "Lango X"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:624
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:619
 msgid "X position of window on screen according to X11"
 msgstr "Lango X padėtis ekrane pagal X11"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:632
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:627
 msgid "Window Y"
 msgstr "Lango Y"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:633
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:628
 msgid "Y position of window on screen according to X11"
 msgstr "Lango Y padėtis ekrane pagal X11"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:640
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:635
 msgid "Window Override Redirect"
 msgstr "Langas nepaiso nukreipimo"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:641
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:636
 msgid "If this is an override-redirect window"
 msgstr "Ar langas nepaiso nukreipimo"
-
diff --git a/po/lv.po b/po/lv.po
index 72ab6f460..aa2ddb923 100644
--- a/po/lv.po
+++ b/po/lv.po
@@ -2,14 +2,14 @@
 # Copyright (C) 2011 clutter's COPYRIGHT HOLDER
 # This file is distributed under the same license as the clutter package.
 #
-# Rūdofls Mazurs <rudolfs.mazurs@gmail.com>, 2011, 2012.
+# Rūdofls Mazurs <rudolfs.mazurs@gmail.com>, 2011, 2012, 2013, 2014.
 msgid ""
 msgstr ""
 "Project-Id-Version: clutter master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
-"product=clutter\n"
-"POT-Creation-Date: 2012-09-24 23:05+0300\n"
-"PO-Revision-Date: 2012-09-24 23:24+0300\n"
+"product=clutter&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2014-03-07 04:08+0000\n"
+"PO-Revision-Date: 2014-03-08 19:46+0200\n"
 "Last-Translator: Rūdolfs Mazurs <rudolfs.mazurs@gmail.com>\n"
 "Language-Team: Latvian <lata-l10n@googlegroups.com>\n"
 "Language: lv\n"
@@ -18,692 +18,692 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : "
 "2);\n"
-"X-Generator: Lokalize 1.4\n"
+"X-Generator: Lokalize 1.5\n"
 
-#: ../clutter/clutter-actor.c:6125
+#: ../clutter/clutter-actor.c:6214
 msgid "X coordinate"
 msgstr "X koordināta"
 
-#: ../clutter/clutter-actor.c:6126
+#: ../clutter/clutter-actor.c:6215
 msgid "X coordinate of the actor"
 msgstr "Izpildītāja X koordināta"
 
-#: ../clutter/clutter-actor.c:6144
+#: ../clutter/clutter-actor.c:6233
 msgid "Y coordinate"
 msgstr "Y koordināta"
 
-#: ../clutter/clutter-actor.c:6145
+#: ../clutter/clutter-actor.c:6234
 msgid "Y coordinate of the actor"
 msgstr "Izpildītāja Y koordināta"
 
-#: ../clutter/clutter-actor.c:6167
+#: ../clutter/clutter-actor.c:6256
 msgid "Position"
 msgstr "Pozīcija"
 
-#: ../clutter/clutter-actor.c:6168
+#: ../clutter/clutter-actor.c:6257
 msgid "The position of the origin of the actor"
 msgstr "Sākotnējā izpildītāja pozīcija"
 
-#: ../clutter/clutter-actor.c:6185 ../clutter/clutter-canvas.c:215
-#: ../clutter/clutter-grid-layout.c:1238
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:481
+#: ../clutter/clutter-actor.c:6274 ../clutter/clutter-canvas.c:247
+#: ../clutter/clutter-grid-layout.c:1239
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:474
 msgid "Width"
 msgstr "Platums"
 
-#: ../clutter/clutter-actor.c:6186
+#: ../clutter/clutter-actor.c:6275
 msgid "Width of the actor"
 msgstr "Izpildītāja platums"
 
-#: ../clutter/clutter-actor.c:6204 ../clutter/clutter-canvas.c:231
-#: ../clutter/clutter-grid-layout.c:1245
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:497
+#: ../clutter/clutter-actor.c:6293 ../clutter/clutter-canvas.c:263
+#: ../clutter/clutter-grid-layout.c:1246
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:490
 msgid "Height"
 msgstr "Augstums"
 
-#: ../clutter/clutter-actor.c:6205
+#: ../clutter/clutter-actor.c:6294
 msgid "Height of the actor"
 msgstr "Izpildītāja augstums"
 
-#: ../clutter/clutter-actor.c:6226
+#: ../clutter/clutter-actor.c:6315
 msgid "Size"
 msgstr "Izmērs"
 
-#: ../clutter/clutter-actor.c:6227
+#: ../clutter/clutter-actor.c:6316
 msgid "The size of the actor"
 msgstr "Izpildītāja izmērs"
 
-#: ../clutter/clutter-actor.c:6245
+#: ../clutter/clutter-actor.c:6334
 msgid "Fixed X"
 msgstr "Fiksēts X"
 
-#: ../clutter/clutter-actor.c:6246
+#: ../clutter/clutter-actor.c:6335
 msgid "Forced X position of the actor"
 msgstr "Fiksēta izpildītāja X pozīcija"
 
-#: ../clutter/clutter-actor.c:6263
+#: ../clutter/clutter-actor.c:6352
 msgid "Fixed Y"
 msgstr "Fiksēts Y"
 
-#: ../clutter/clutter-actor.c:6264
+#: ../clutter/clutter-actor.c:6353
 msgid "Forced Y position of the actor"
 msgstr "Fiksēta izpildītāja Y pozīcija"
 
-#: ../clutter/clutter-actor.c:6279
+#: ../clutter/clutter-actor.c:6368
 msgid "Fixed position set"
 msgstr "Fiksēta pozīcija iestatīta"
 
-#: ../clutter/clutter-actor.c:6280
+#: ../clutter/clutter-actor.c:6369
 msgid "Whether to use fixed positioning for the actor"
 msgstr "Vai izpildītājam izmantot fiksētu pozicionēšanu"
 
-#: ../clutter/clutter-actor.c:6298
+#: ../clutter/clutter-actor.c:6387
 msgid "Min Width"
 msgstr "Min. platums"
 
-#: ../clutter/clutter-actor.c:6299
+#: ../clutter/clutter-actor.c:6388
 msgid "Forced minimum width request for the actor"
 msgstr "Aktiem forsēts minimālā platuma pieprasījums"
 
-#: ../clutter/clutter-actor.c:6317
+#: ../clutter/clutter-actor.c:6406
 msgid "Min Height"
 msgstr "Min. augstums"
 
-#: ../clutter/clutter-actor.c:6318
+#: ../clutter/clutter-actor.c:6407
 msgid "Forced minimum height request for the actor"
 msgstr "Aktiem forsēts minimālā augstuma pieprasījums"
 
-#: ../clutter/clutter-actor.c:6336
+#: ../clutter/clutter-actor.c:6425
 msgid "Natural Width"
 msgstr "Dabīgais platums"
 
-#: ../clutter/clutter-actor.c:6337
+#: ../clutter/clutter-actor.c:6426
 msgid "Forced natural width request for the actor"
 msgstr "Aktiem forsēts dabīgā platuma pieprasījums"
 
-#: ../clutter/clutter-actor.c:6355
+#: ../clutter/clutter-actor.c:6444
 msgid "Natural Height"
 msgstr "Dabīgais augstums"
 
-#: ../clutter/clutter-actor.c:6356
+#: ../clutter/clutter-actor.c:6445
 msgid "Forced natural height request for the actor"
 msgstr "Aktiem forsēts dabīgā augstuma pieprasījums"
 
-#: ../clutter/clutter-actor.c:6371
+#: ../clutter/clutter-actor.c:6460
 msgid "Minimum width set"
 msgstr "Minimālais platums iestatīts"
 
-#: ../clutter/clutter-actor.c:6372
+#: ../clutter/clutter-actor.c:6461
 msgid "Whether to use the min-width property"
 msgstr "Vai izmantot minimālā platuma īpašību"
 
-#: ../clutter/clutter-actor.c:6386
+#: ../clutter/clutter-actor.c:6475
 msgid "Minimum height set"
 msgstr "Minimālais augstums iestatīts"
 
-#: ../clutter/clutter-actor.c:6387
+#: ../clutter/clutter-actor.c:6476
 msgid "Whether to use the min-height property"
 msgstr "Vai izmantot minimālā augstuma īpašību"
 
-#: ../clutter/clutter-actor.c:6401
+#: ../clutter/clutter-actor.c:6490
 msgid "Natural width set"
 msgstr "Dabīgs platums iestatīts"
 
-#: ../clutter/clutter-actor.c:6402
+#: ../clutter/clutter-actor.c:6491
 msgid "Whether to use the natural-width property"
 msgstr "Vai izmantot dabīgā platuma īpašību"
 
-#: ../clutter/clutter-actor.c:6416
+#: ../clutter/clutter-actor.c:6505
 msgid "Natural height set"
 msgstr "Dabīgs augstums iestatīts"
 
-#: ../clutter/clutter-actor.c:6417
+#: ../clutter/clutter-actor.c:6506
 msgid "Whether to use the natural-height property"
 msgstr "Vai izmantot dabīgā augstuma īpašību"
 
-#: ../clutter/clutter-actor.c:6433
+#: ../clutter/clutter-actor.c:6522
 msgid "Allocation"
 msgstr "Piešķiršana"
 
-#: ../clutter/clutter-actor.c:6434
+#: ../clutter/clutter-actor.c:6523
 msgid "The actor's allocation"
 msgstr "Izpildītāja piešķiršana"
 
-#: ../clutter/clutter-actor.c:6491
+#: ../clutter/clutter-actor.c:6580
 msgid "Request Mode"
 msgstr "Pieprasīšanas režīms"
 
-#: ../clutter/clutter-actor.c:6492
+#: ../clutter/clutter-actor.c:6581
 msgid "The actor's request mode"
 msgstr "Izpildītāja pieprasīšanas režīms"
 
-#: ../clutter/clutter-actor.c:6516
+#: ../clutter/clutter-actor.c:6605
 msgid "Depth"
 msgstr "Dziļums"
 
-#: ../clutter/clutter-actor.c:6517
+#: ../clutter/clutter-actor.c:6606
 msgid "Position on the Z axis"
 msgstr "Z ass pozīcija"
 
-#: ../clutter/clutter-actor.c:6544
+#: ../clutter/clutter-actor.c:6633
 msgid "Z Position"
 msgstr "Z pozīcija"
 
-#: ../clutter/clutter-actor.c:6545
+#: ../clutter/clutter-actor.c:6634
 msgid "The actor's position on the Z axis"
 msgstr "Izpildītāja pozīcija uz Z ass"
 
-#: ../clutter/clutter-actor.c:6562
+#: ../clutter/clutter-actor.c:6651
 msgid "Opacity"
 msgstr "Necaurspīdīgums"
 
-#: ../clutter/clutter-actor.c:6563
+#: ../clutter/clutter-actor.c:6652
 msgid "Opacity of an actor"
 msgstr "Izpildītāja necaurspīdīgums"
 
-#: ../clutter/clutter-actor.c:6583
+#: ../clutter/clutter-actor.c:6672
 msgid "Offscreen redirect"
 msgstr "Ārpus ekrāna pārsūtīšana"
 
-#: ../clutter/clutter-actor.c:6584
+#: ../clutter/clutter-actor.c:6673
 msgid "Flags controlling when to flatten the actor into a single image"
 msgstr "Atzīme, kas nosaka, kad saplacināt izpildītāju uz vienu attēlu"
 
-#: ../clutter/clutter-actor.c:6598
+#: ../clutter/clutter-actor.c:6687
 msgid "Visible"
 msgstr "Redzams"
 
-#: ../clutter/clutter-actor.c:6599
+#: ../clutter/clutter-actor.c:6688
 msgid "Whether the actor is visible or not"
 msgstr "Vai izpildītājs ir redzams vai neredzams"
 
-#: ../clutter/clutter-actor.c:6613
+#: ../clutter/clutter-actor.c:6702
 msgid "Mapped"
 msgstr "Kartēts"
 
-#: ../clutter/clutter-actor.c:6614
+#: ../clutter/clutter-actor.c:6703
 msgid "Whether the actor will be painted"
 msgstr "Vai izpildītājs tiks uzzīmēts"
 
-#: ../clutter/clutter-actor.c:6627
+#: ../clutter/clutter-actor.c:6716
 msgid "Realized"
 msgstr "Realizēts"
 
-#: ../clutter/clutter-actor.c:6628
+#: ../clutter/clutter-actor.c:6717
 msgid "Whether the actor has been realized"
 msgstr "Vai izpildītājs tika realizēts"
 
-#: ../clutter/clutter-actor.c:6643
+#: ../clutter/clutter-actor.c:6732
 msgid "Reactive"
 msgstr "Reaktīvs"
 
-#: ../clutter/clutter-actor.c:6644
+#: ../clutter/clutter-actor.c:6733
 msgid "Whether the actor is reactive to events"
 msgstr "Vai izpildītājs uz notikumiem ir reaktīvs"
 
-#: ../clutter/clutter-actor.c:6655
+#: ../clutter/clutter-actor.c:6744
 msgid "Has Clip"
 msgstr "Ir klips"
 
-#: ../clutter/clutter-actor.c:6656
+#: ../clutter/clutter-actor.c:6745
 msgid "Whether the actor has a clip set"
 msgstr "Vai izpildītājam ir klipu kopa"
 
-#: ../clutter/clutter-actor.c:6669
+#: ../clutter/clutter-actor.c:6758
 msgid "Clip"
 msgstr "Klips"
 
-#: ../clutter/clutter-actor.c:6670
+#: ../clutter/clutter-actor.c:6759
 msgid "The clip region for the actor"
 msgstr "Klipa apgabals izpildītājam"
 
-#: ../clutter/clutter-actor.c:6689
+#: ../clutter/clutter-actor.c:6778
 msgid "Clip Rectangle"
 msgstr "Klipa taisnstūris"
 
-#: ../clutter/clutter-actor.c:6690
+#: ../clutter/clutter-actor.c:6779
 msgid "The visible region of the actor"
 msgstr "Izpildītāja redzamais apgabals"
 
-#: ../clutter/clutter-actor.c:6704 ../clutter/clutter-actor-meta.c:207
-#: ../clutter/clutter-binding-pool.c:319 ../clutter/clutter-input-device.c:258
+#: ../clutter/clutter-actor.c:6793 ../clutter/clutter-actor-meta.c:205
+#: ../clutter/clutter-binding-pool.c:319 ../clutter/clutter-input-device.c:247
 msgid "Name"
 msgstr "Nosaukums"
 
-#: ../clutter/clutter-actor.c:6705
+#: ../clutter/clutter-actor.c:6794
 msgid "Name of the actor"
 msgstr "Nosaukums izpildītāja"
 
-#: ../clutter/clutter-actor.c:6726
+#: ../clutter/clutter-actor.c:6815
 msgid "Pivot Point"
 msgstr "Ass punkts"
 
-#: ../clutter/clutter-actor.c:6727
+#: ../clutter/clutter-actor.c:6816
 msgid "The point around which the scaling and rotation occur"
 msgstr "Punkts, ap ko notiek izmēra maiņa un pagriešana"
 
-#: ../clutter/clutter-actor.c:6745
+#: ../clutter/clutter-actor.c:6834
 msgid "Pivot Point Z"
 msgstr "Ass punkts Z"
 
-#: ../clutter/clutter-actor.c:6746
+#: ../clutter/clutter-actor.c:6835
 msgid "Z component of the pivot point"
 msgstr "Ass punkta Z komponente"
 
-#: ../clutter/clutter-actor.c:6764
+#: ../clutter/clutter-actor.c:6853
 msgid "Scale X"
 msgstr "Mērogs X"
 
-#: ../clutter/clutter-actor.c:6765
+#: ../clutter/clutter-actor.c:6854
 msgid "Scale factor on the X axis"
 msgstr "Mēroga koeficients uz X ass"
 
-#: ../clutter/clutter-actor.c:6783
+#: ../clutter/clutter-actor.c:6872
 msgid "Scale Y"
 msgstr "Mērogs Y"
 
-#: ../clutter/clutter-actor.c:6784
+#: ../clutter/clutter-actor.c:6873
 msgid "Scale factor on the Y axis"
 msgstr "Mēroga koeficients uz Y ass"
 
-#: ../clutter/clutter-actor.c:6802
+#: ../clutter/clutter-actor.c:6891
 msgid "Scale Z"
 msgstr "Mērogs Z"
 
-#: ../clutter/clutter-actor.c:6803
+#: ../clutter/clutter-actor.c:6892
 msgid "Scale factor on the Z axis"
 msgstr "Mēroga koeficients uz Z ass"
 
-#: ../clutter/clutter-actor.c:6821
+#: ../clutter/clutter-actor.c:6910
 msgid "Scale Center X"
 msgstr "Mēroga vidus X"
 
-#: ../clutter/clutter-actor.c:6822
+#: ../clutter/clutter-actor.c:6911
 msgid "Horizontal scale center"
 msgstr "Horizontālā mēroga vidus"
 
-#: ../clutter/clutter-actor.c:6840
+#: ../clutter/clutter-actor.c:6929
 msgid "Scale Center Y"
 msgstr "Mēroga vidus Y"
 
-#: ../clutter/clutter-actor.c:6841
+#: ../clutter/clutter-actor.c:6930
 msgid "Vertical scale center"
 msgstr "Vertikālā mēroga vidus"
 
-#: ../clutter/clutter-actor.c:6859
+#: ../clutter/clutter-actor.c:6948
 msgid "Scale Gravity"
 msgstr "Mēroga svars"
 
-#: ../clutter/clutter-actor.c:6860
+#: ../clutter/clutter-actor.c:6949
 msgid "The center of scaling"
 msgstr "Mērogošanas vidus"
 
-#: ../clutter/clutter-actor.c:6878
+#: ../clutter/clutter-actor.c:6967
 msgid "Rotation Angle X"
 msgstr "Rotācijas leņķis X"
 
-#: ../clutter/clutter-actor.c:6879
+#: ../clutter/clutter-actor.c:6968
 msgid "The rotation angle on the X axis"
 msgstr "X ass rotācijas leņķis"
 
-#: ../clutter/clutter-actor.c:6897
+#: ../clutter/clutter-actor.c:6986
 msgid "Rotation Angle Y"
 msgstr "Rotācijas leņķis Y"
 
-#: ../clutter/clutter-actor.c:6898
+#: ../clutter/clutter-actor.c:6987
 msgid "The rotation angle on the Y axis"
 msgstr "Y ass rotācijas leņķis"
 
-#: ../clutter/clutter-actor.c:6916
+#: ../clutter/clutter-actor.c:7005
 msgid "Rotation Angle Z"
 msgstr "Rotācijas leņķis Z"
 
-#: ../clutter/clutter-actor.c:6917
+#: ../clutter/clutter-actor.c:7006
 msgid "The rotation angle on the Z axis"
 msgstr "Z ass rotācijas leņķis"
 
-#: ../clutter/clutter-actor.c:6935
+#: ../clutter/clutter-actor.c:7024
 msgid "Rotation Center X"
 msgstr "Rotācijas centrs X"
 
-#: ../clutter/clutter-actor.c:6936
+#: ../clutter/clutter-actor.c:7025
 msgid "The rotation center on the X axis"
 msgstr "X ass rotācijas centrs"
 
-#: ../clutter/clutter-actor.c:6953
+#: ../clutter/clutter-actor.c:7042
 msgid "Rotation Center Y"
 msgstr "Rotācijas centrs Y"
 
-#: ../clutter/clutter-actor.c:6954
+#: ../clutter/clutter-actor.c:7043
 msgid "The rotation center on the Y axis"
 msgstr "Y ass rotācijas centrs"
 
-#: ../clutter/clutter-actor.c:6971
+#: ../clutter/clutter-actor.c:7060
 msgid "Rotation Center Z"
 msgstr "Rotācijas centrs Z"
 
-#: ../clutter/clutter-actor.c:6972
+#: ../clutter/clutter-actor.c:7061
 msgid "The rotation center on the Z axis"
 msgstr "Z ass rotācijas centrs"
 
-#: ../clutter/clutter-actor.c:6989
+#: ../clutter/clutter-actor.c:7078
 msgid "Rotation Center Z Gravity"
 msgstr "Rotācijas centra Z svars"
 
-#: ../clutter/clutter-actor.c:6990
+#: ../clutter/clutter-actor.c:7079
 msgid "Center point for rotation around the Z axis"
 msgstr "Viduspunkts rotācijai ap Z asi"
 
-#: ../clutter/clutter-actor.c:7018
+#: ../clutter/clutter-actor.c:7107
 msgid "Anchor X"
 msgstr "Enkurs X"
 
-#: ../clutter/clutter-actor.c:7019
+#: ../clutter/clutter-actor.c:7108
 msgid "X coordinate of the anchor point"
 msgstr "Enkura punkta X koordināta"
 
-#: ../clutter/clutter-actor.c:7047
+#: ../clutter/clutter-actor.c:7136
 msgid "Anchor Y"
 msgstr "Enkurs Y"
 
-#: ../clutter/clutter-actor.c:7048
+#: ../clutter/clutter-actor.c:7137
 msgid "Y coordinate of the anchor point"
 msgstr "Enkura punkta Y koordināta"
 
-#: ../clutter/clutter-actor.c:7075
+#: ../clutter/clutter-actor.c:7164
 msgid "Anchor Gravity"
 msgstr "Enkura svars"
 
-#: ../clutter/clutter-actor.c:7076
+#: ../clutter/clutter-actor.c:7165
 msgid "The anchor point as a ClutterGravity"
 msgstr "Enkura punkts kā ClutterGravity"
 
-#: ../clutter/clutter-actor.c:7095
+#: ../clutter/clutter-actor.c:7184
 msgid "Translation X"
 msgstr "Translācija X"
 
-#: ../clutter/clutter-actor.c:7096
+#: ../clutter/clutter-actor.c:7185
 msgid "Translation along the X axis"
 msgstr "Translācija gar X asi"
 
-#: ../clutter/clutter-actor.c:7115
+#: ../clutter/clutter-actor.c:7204
 msgid "Translation Y"
 msgstr "Translācija Y"
 
-#: ../clutter/clutter-actor.c:7116
+#: ../clutter/clutter-actor.c:7205
 msgid "Translation along the Y axis"
 msgstr "Translācija gar Y asi"
 
-#: ../clutter/clutter-actor.c:7135
+#: ../clutter/clutter-actor.c:7224
 msgid "Translation Z"
 msgstr "Translācija Z"
 
-#: ../clutter/clutter-actor.c:7136
+#: ../clutter/clutter-actor.c:7225
 msgid "Translation along the Z axis"
 msgstr "Translācija gar Z asi"
 
-#: ../clutter/clutter-actor.c:7166
+#: ../clutter/clutter-actor.c:7255
 msgid "Transform"
 msgstr "Pārveidot"
 
-#: ../clutter/clutter-actor.c:7167
+#: ../clutter/clutter-actor.c:7256
 msgid "Transformation matrix"
 msgstr "Pārveidojumu matrica"
 
-#: ../clutter/clutter-actor.c:7182
+#: ../clutter/clutter-actor.c:7271
 msgid "Transform Set"
 msgstr "Pārveidošana iestatīta"
 
-#: ../clutter/clutter-actor.c:7183
+#: ../clutter/clutter-actor.c:7272
 msgid "Whether the transform property is set"
 msgstr "Vai pārveidošanas īpašība ir iestatīta"
 
-#: ../clutter/clutter-actor.c:7204
+#: ../clutter/clutter-actor.c:7293
 msgid "Child Transform"
 msgstr "Bērna pārveidošana"
 
-#: ../clutter/clutter-actor.c:7205
+#: ../clutter/clutter-actor.c:7294
 msgid "Children transformation matrix"
 msgstr "Bērna pārveidošanas matrica"
 
-#: ../clutter/clutter-actor.c:7220
+#: ../clutter/clutter-actor.c:7309
 msgid "Child Transform Set"
 msgstr "Bērna pārveidošana iestatīta"
 
-#: ../clutter/clutter-actor.c:7221
+#: ../clutter/clutter-actor.c:7310
 msgid "Whether the child-transform property is set"
 msgstr "Vai bērna pārveidošanas īpašība ir iestatīta"
 
-#: ../clutter/clutter-actor.c:7238
+#: ../clutter/clutter-actor.c:7327
 msgid "Show on set parent"
 msgstr "Rādīt uz vecāka iestatīts"
 
-#: ../clutter/clutter-actor.c:7239
+#: ../clutter/clutter-actor.c:7328
 msgid "Whether the actor is shown when parented"
 msgstr "Vai izpildītājs ir redzams, kad ar vecāku"
 
-#: ../clutter/clutter-actor.c:7256
+#: ../clutter/clutter-actor.c:7345
 msgid "Clip to Allocation"
 msgstr "Klips pie piešķiršanas"
 
-#: ../clutter/clutter-actor.c:7257
+#: ../clutter/clutter-actor.c:7346
 msgid "Sets the clip region to track the actor's allocation"
 msgstr "Iestata klipa reģionu, lai izsekotu izpildītāja piešķīrumu"
 
-#: ../clutter/clutter-actor.c:7270
+#: ../clutter/clutter-actor.c:7359
 msgid "Text Direction"
 msgstr "Teksta virziens"
 
-#: ../clutter/clutter-actor.c:7271
+#: ../clutter/clutter-actor.c:7360
 msgid "Direction of the text"
 msgstr "Teksta virziens"
 
-#: ../clutter/clutter-actor.c:7286
+#: ../clutter/clutter-actor.c:7375
 msgid "Has Pointer"
 msgstr "Ir rādītājs"
 
-#: ../clutter/clutter-actor.c:7287
+#: ../clutter/clutter-actor.c:7376
 msgid "Whether the actor contains the pointer of an input device"
 msgstr "Vai izpildītājs satur ievades ierīces norādi"
 
-#: ../clutter/clutter-actor.c:7300
+#: ../clutter/clutter-actor.c:7389
 msgid "Actions"
 msgstr "Darbības"
 
-#: ../clutter/clutter-actor.c:7301
+#: ../clutter/clutter-actor.c:7390
 msgid "Adds an action to the actor"
 msgstr "Izpildītājam pievieno darbību"
 
-#: ../clutter/clutter-actor.c:7314
+#: ../clutter/clutter-actor.c:7403
 msgid "Constraints"
 msgstr "Ierobežojumi"
 
-#: ../clutter/clutter-actor.c:7315
+#: ../clutter/clutter-actor.c:7404
 msgid "Adds a constraint to the actor"
 msgstr "Izpildītājam pievieno ierobežojumu"
 
-#: ../clutter/clutter-actor.c:7328
+#: ../clutter/clutter-actor.c:7417
 msgid "Effect"
 msgstr "Efekts"
 
-#: ../clutter/clutter-actor.c:7329
+#: ../clutter/clutter-actor.c:7418
 msgid "Add an effect to be applied on the actor"
 msgstr "Izpildītājam pievieno efektu"
 
-#: ../clutter/clutter-actor.c:7343
+#: ../clutter/clutter-actor.c:7432
 msgid "Layout Manager"
 msgstr "Slāņu pārvaldnieks"
 
-#: ../clutter/clutter-actor.c:7344
+#: ../clutter/clutter-actor.c:7433
 msgid "The object controlling the layout of an actor's children"
 msgstr "Objekts, kas nosaka izpildītāja bērna izkārtojumu"
 
-#: ../clutter/clutter-actor.c:7358
+#: ../clutter/clutter-actor.c:7447
 msgid "X Expand"
 msgstr "X izvērst"
 
-#: ../clutter/clutter-actor.c:7359
+#: ../clutter/clutter-actor.c:7448
 msgid "Whether extra horizontal space should be assigned to the actor"
 msgstr "Vai horizontālajai telpai jābūt piešķirtai izpildītājam"
 
-#: ../clutter/clutter-actor.c:7374
+#: ../clutter/clutter-actor.c:7463
 msgid "Y Expand"
 msgstr "Y izvērst"
 
-#: ../clutter/clutter-actor.c:7375
+#: ../clutter/clutter-actor.c:7464
 msgid "Whether extra vertical space should be assigned to the actor"
 msgstr "Vai vertikālajai telpai jābūt piešķirtai izpildītājam"
 
-#: ../clutter/clutter-actor.c:7391
+#: ../clutter/clutter-actor.c:7480
 msgid "X Alignment"
 msgstr "X līdzinājums"
 
-#: ../clutter/clutter-actor.c:7392
+#: ../clutter/clutter-actor.c:7481
 msgid "The alignment of the actor on the X axis within its allocation"
 msgstr "Izpildītāja līdzinājums uz X ass savā piešķīrumā"
 
-#: ../clutter/clutter-actor.c:7407
+#: ../clutter/clutter-actor.c:7496
 msgid "Y Alignment"
 msgstr "Y līdzinājums"
 
-#: ../clutter/clutter-actor.c:7408
+#: ../clutter/clutter-actor.c:7497
 msgid "The alignment of the actor on the Y axis within its allocation"
 msgstr "Izpildītāja līdzinājums uz Y ass savā piešķīrumā"
 
-#: ../clutter/clutter-actor.c:7427
+#: ../clutter/clutter-actor.c:7516
 msgid "Margin Top"
 msgstr "Mala augšpusē"
 
-#: ../clutter/clutter-actor.c:7428
+#: ../clutter/clutter-actor.c:7517
 msgid "Extra space at the top"
 msgstr "Papildu vieta augšpusē"
 
-#: ../clutter/clutter-actor.c:7449
+#: ../clutter/clutter-actor.c:7538
 msgid "Margin Bottom"
 msgstr "Mala apakšā"
 
-#: ../clutter/clutter-actor.c:7450
+#: ../clutter/clutter-actor.c:7539
 msgid "Extra space at the bottom"
 msgstr "Papildu vieta apakšpusē"
 
-#: ../clutter/clutter-actor.c:7471
+#: ../clutter/clutter-actor.c:7560
 msgid "Margin Left"
 msgstr "Mala pa kreisi"
 
-#: ../clutter/clutter-actor.c:7472
+#: ../clutter/clutter-actor.c:7561
 msgid "Extra space at the left"
 msgstr "Papildu vieta pa kreisi"
 
-#: ../clutter/clutter-actor.c:7493
+#: ../clutter/clutter-actor.c:7582
 msgid "Margin Right"
 msgstr "Mala pa labi"
 
-#: ../clutter/clutter-actor.c:7494
+#: ../clutter/clutter-actor.c:7583
 msgid "Extra space at the right"
 msgstr "Papildu vieta pa labi"
 
-#: ../clutter/clutter-actor.c:7510
+#: ../clutter/clutter-actor.c:7599
 msgid "Background Color Set"
 msgstr "Fona krāsas iestatījums"
 
-#: ../clutter/clutter-actor.c:7511 ../clutter/deprecated/clutter-box.c:275
+#: ../clutter/clutter-actor.c:7600 ../clutter/deprecated/clutter-box.c:271
 msgid "Whether the background color is set"
 msgstr "Vai ir iestatīta fona krāsa"
 
-#: ../clutter/clutter-actor.c:7527
+#: ../clutter/clutter-actor.c:7616
 msgid "Background color"
 msgstr "Fona krāsa"
 
-#: ../clutter/clutter-actor.c:7528
+#: ../clutter/clutter-actor.c:7617
 msgid "The actor's background color"
 msgstr "Izpildītāja fona krāsa"
 
-#: ../clutter/clutter-actor.c:7543
+#: ../clutter/clutter-actor.c:7632
 msgid "First Child"
 msgstr "Pirmais bērns"
 
-#: ../clutter/clutter-actor.c:7544
+#: ../clutter/clutter-actor.c:7633
 msgid "The actor's first child"
 msgstr "Izpildītāja pirmais bērns"
 
-#: ../clutter/clutter-actor.c:7557
+#: ../clutter/clutter-actor.c:7646
 msgid "Last Child"
 msgstr "Pēdējais bērns"
 
-#: ../clutter/clutter-actor.c:7558
+#: ../clutter/clutter-actor.c:7647
 msgid "The actor's last child"
 msgstr "Izpildītāja pēdējais bērns"
 
-#: ../clutter/clutter-actor.c:7572
+#: ../clutter/clutter-actor.c:7661
 msgid "Content"
 msgstr "Saturs"
 
-#: ../clutter/clutter-actor.c:7573
+#: ../clutter/clutter-actor.c:7662
 msgid "Delegate object for painting the actor's content"
 msgstr "Deleģēt objektus izpildītāja satura krāsošanai"
 
-#: ../clutter/clutter-actor.c:7598
+#: ../clutter/clutter-actor.c:7687
 msgid "Content Gravity"
 msgstr "Satura svars"
 
-#: ../clutter/clutter-actor.c:7599
+#: ../clutter/clutter-actor.c:7688
 msgid "Alignment of the actor's content"
 msgstr "Izpildītāja satura līdzinājums"
 
-#: ../clutter/clutter-actor.c:7619
+#: ../clutter/clutter-actor.c:7708
 msgid "Content Box"
 msgstr "Satura kaste"
 
-#: ../clutter/clutter-actor.c:7620
+#: ../clutter/clutter-actor.c:7709
 msgid "The bounding box of the actor's content"
 msgstr "Izpildītāja satura ierobežojošā kaste"
 
-#: ../clutter/clutter-actor.c:7628
+#: ../clutter/clutter-actor.c:7717
 msgid "Minification Filter"
 msgstr "Samazinājuma filtrs"
 
-#: ../clutter/clutter-actor.c:7629
+#: ../clutter/clutter-actor.c:7718
 msgid "The filter used when reducing the size of the content"
 msgstr "Filtrs, ko izmantot, kad samazina satura izmēru"
 
-#: ../clutter/clutter-actor.c:7636
+#: ../clutter/clutter-actor.c:7725
 msgid "Magnification Filter"
 msgstr "Palielinājuma filtrs"
 
-#: ../clutter/clutter-actor.c:7637
+#: ../clutter/clutter-actor.c:7726
 msgid "The filter used when increasing the size of the content"
 msgstr "Filtrs, ko izmantot, kad palielina satura izmēru"
 
-#: ../clutter/clutter-actor.c:7651
+#: ../clutter/clutter-actor.c:7740
 msgid "Content Repeat"
 msgstr "Satura atkārtojums"
 
-#: ../clutter/clutter-actor.c:7652
+#: ../clutter/clutter-actor.c:7741
 msgid "The repeat policy for the actor's content"
 msgstr "Izpildītāja satura atkārtošanas politika"
 
-#: ../clutter/clutter-actor-meta.c:193 ../clutter/clutter-child-meta.c:142
+#: ../clutter/clutter-actor-meta.c:191 ../clutter/clutter-child-meta.c:142
 msgid "Actor"
 msgstr "Izpildītājs"
 
-#: ../clutter/clutter-actor-meta.c:194
+#: ../clutter/clutter-actor-meta.c:192
 msgid "The actor attached to the meta"
 msgstr "Pie meta pievienotais izpildītājs"
 
-#: ../clutter/clutter-actor-meta.c:208
+#: ../clutter/clutter-actor-meta.c:206
 msgid "The name of the meta"
 msgstr "Šī meta nosaukums"
 
-#: ../clutter/clutter-actor-meta.c:221 ../clutter/clutter-input-device.c:337
-#: ../clutter/deprecated/clutter-shader.c:313
+#: ../clutter/clutter-actor-meta.c:219 ../clutter/clutter-input-device.c:326
+#: ../clutter/deprecated/clutter-shader.c:309
 msgid "Enabled"
 msgstr "Aktivēts"
 
-#: ../clutter/clutter-actor-meta.c:222
+#: ../clutter/clutter-actor-meta.c:220
 msgid "Whether the meta is enabled"
 msgstr "Vai meta ir aktivēts"
 
 #: ../clutter/clutter-align-constraint.c:279
-#: ../clutter/clutter-bind-constraint.c:358 ../clutter/clutter-clone.c:345
+#: ../clutter/clutter-bind-constraint.c:358 ../clutter/clutter-clone.c:341
 #: ../clutter/clutter-snap-constraint.c:321
 msgid "Source"
 msgstr "Avots"
@@ -729,11 +729,11 @@ msgstr "Koeficients"
 msgid "The alignment factor, between 0.0 and 1.0"
 msgstr "Līdzināšanas koeficients, starp 0.0 un 1.0"
 
-#: ../clutter/clutter-backend.c:379
+#: ../clutter/clutter-backend.c:380
 msgid "Unable to initialize the Clutter backend"
 msgstr "Nevar inicializēt Clutter aizmuguri"
 
-#: ../clutter/clutter-backend.c:453
+#: ../clutter/clutter-backend.c:454
 #, c-format
 msgid "The backend of type '%s' does not support creating multiple stages"
 msgstr "Aizmugure ar tipu '%s' neatbalsta vairāku skatuvju veidošanu"
@@ -764,45 +764,49 @@ msgstr "Nobīde pikseļos, ko pielietot saistījumiem"
 msgid "The unique name of the binding pool"
 msgstr "Unikāls nosaukums saistījumu pūls"
 
-#: ../clutter/clutter-bin-layout.c:240 ../clutter/clutter-bin-layout.c:655
-#: ../clutter/clutter-box-layout.c:390 ../clutter/clutter-table-layout.c:610
+#: ../clutter/clutter-bin-layout.c:238 ../clutter/clutter-bin-layout.c:651
+#: ../clutter/clutter-box-layout.c:388
+#: ../clutter/deprecated/clutter-table-layout.c:610
 msgid "Horizontal Alignment"
 msgstr "Horizontālā līdzināšana"
 
-#: ../clutter/clutter-bin-layout.c:241
+#: ../clutter/clutter-bin-layout.c:239
 msgid "Horizontal alignment for the actor inside the layout manager"
 msgstr "Horizontālais līdzinājums izpildītājam slāņu pārvaldniekā"
 
-#: ../clutter/clutter-bin-layout.c:249 ../clutter/clutter-bin-layout.c:675
-#: ../clutter/clutter-box-layout.c:399 ../clutter/clutter-table-layout.c:625
+#: ../clutter/clutter-bin-layout.c:247 ../clutter/clutter-bin-layout.c:671
+#: ../clutter/clutter-box-layout.c:397
+#: ../clutter/deprecated/clutter-table-layout.c:625
 msgid "Vertical Alignment"
 msgstr "Vertikālā līdzināšana"
 
-#: ../clutter/clutter-bin-layout.c:250
+#: ../clutter/clutter-bin-layout.c:248
 msgid "Vertical alignment for the actor inside the layout manager"
 msgstr "Vertikālais līdzinājums izpildītājam slāņu pārvaldniekā"
 
-#: ../clutter/clutter-bin-layout.c:656
+#: ../clutter/clutter-bin-layout.c:652
 msgid "Default horizontal alignment for the actors inside the layout manager"
 msgstr "Noklusētais horizontālais līdzinājums izpildītājiem slāņu pārvaldniekā"
 
-#: ../clutter/clutter-bin-layout.c:676
+#: ../clutter/clutter-bin-layout.c:672
 msgid "Default vertical alignment for the actors inside the layout manager"
 msgstr "Noklusētais vertikālais līdzinājums izpildītājiem slāņu pārvaldniekā"
 
-#: ../clutter/clutter-box-layout.c:365
+#: ../clutter/clutter-box-layout.c:363
 msgid "Expand"
 msgstr "Izvērst"
 
-#: ../clutter/clutter-box-layout.c:366
+#: ../clutter/clutter-box-layout.c:364
 msgid "Allocate extra space for the child"
 msgstr "Bērnam piešķirt papildu vietu"
 
-#: ../clutter/clutter-box-layout.c:372 ../clutter/clutter-table-layout.c:589
+#: ../clutter/clutter-box-layout.c:370
+#: ../clutter/deprecated/clutter-table-layout.c:589
 msgid "Horizontal Fill"
 msgstr "Horizontālais aizpildījums"
 
-#: ../clutter/clutter-box-layout.c:373 ../clutter/clutter-table-layout.c:590
+#: ../clutter/clutter-box-layout.c:371
+#: ../clutter/deprecated/clutter-table-layout.c:590
 msgid ""
 "Whether the child should receive priority when the container is allocating "
 "spare space on the horizontal axis"
@@ -810,11 +814,13 @@ msgstr ""
 "Vai bērnam vajadzētu saņemt prioritāti, kad konteineris piešķir papildu "
 "vietu uz horizontālās ass"
 
-#: ../clutter/clutter-box-layout.c:381 ../clutter/clutter-table-layout.c:596
+#: ../clutter/clutter-box-layout.c:379
+#: ../clutter/deprecated/clutter-table-layout.c:596
 msgid "Vertical Fill"
 msgstr "Vertikālais aizpildījums"
 
-#: ../clutter/clutter-box-layout.c:382 ../clutter/clutter-table-layout.c:597
+#: ../clutter/clutter-box-layout.c:380
+#: ../clutter/deprecated/clutter-table-layout.c:597
 msgid ""
 "Whether the child should receive priority when the container is allocating "
 "spare space on the vertical axis"
@@ -822,79 +828,87 @@ msgstr ""
 "Vai bērnam vajadzētu saņemt prioritāti, kad konteineris piešķir papildu "
 "vietu uz vertikālās ass"
 
-#: ../clutter/clutter-box-layout.c:391 ../clutter/clutter-table-layout.c:611
+#: ../clutter/clutter-box-layout.c:389
+#: ../clutter/deprecated/clutter-table-layout.c:611
 msgid "Horizontal alignment of the actor within the cell"
 msgstr "Izpildītāja horizontālais līdzinājums šūnā"
 
-#: ../clutter/clutter-box-layout.c:400 ../clutter/clutter-table-layout.c:626
+#: ../clutter/clutter-box-layout.c:398
+#: ../clutter/deprecated/clutter-table-layout.c:626
 msgid "Vertical alignment of the actor within the cell"
 msgstr "Izpildītāja vertikālais līdzinājums šūnā"
 
-#: ../clutter/clutter-box-layout.c:1365
+#: ../clutter/clutter-box-layout.c:1359
 msgid "Vertical"
 msgstr "Vertikāls"
 
-#: ../clutter/clutter-box-layout.c:1366
+#: ../clutter/clutter-box-layout.c:1360
 msgid "Whether the layout should be vertical, rather than horizontal"
 msgstr "Vai izkārtojumam jābūt drīzāk vertikālam, nevis horizontālam"
 
-#: ../clutter/clutter-box-layout.c:1383 ../clutter/clutter-flow-layout.c:890
-#: ../clutter/clutter-grid-layout.c:1547
+#: ../clutter/clutter-box-layout.c:1377 ../clutter/clutter-flow-layout.c:942
+#: ../clutter/clutter-grid-layout.c:1549
 msgid "Orientation"
 msgstr "Virziens"
 
-#: ../clutter/clutter-box-layout.c:1384 ../clutter/clutter-flow-layout.c:891
-#: ../clutter/clutter-grid-layout.c:1548
+#: ../clutter/clutter-box-layout.c:1378 ../clutter/clutter-flow-layout.c:943
+#: ../clutter/clutter-grid-layout.c:1550
 msgid "The orientation of the layout"
 msgstr "Izkārtojuma virziens"
 
-#: ../clutter/clutter-box-layout.c:1400 ../clutter/clutter-flow-layout.c:906
+#: ../clutter/clutter-box-layout.c:1394 ../clutter/clutter-flow-layout.c:958
 msgid "Homogeneous"
 msgstr "Viendabīgs"
 
-#: ../clutter/clutter-box-layout.c:1401
+#: ../clutter/clutter-box-layout.c:1395
 msgid ""
 "Whether the layout should be homogeneous, i.e. all childs get the same size"
 msgstr ""
 "Vai izkārtojumam jābūt viendabīgam, tas ir, visiem bērniem ir vienāds izmērs"
 
-#: ../clutter/clutter-box-layout.c:1416
+#: ../clutter/clutter-box-layout.c:1410
 msgid "Pack Start"
 msgstr "Pakas sākums"
 
-#: ../clutter/clutter-box-layout.c:1417
+#: ../clutter/clutter-box-layout.c:1411
 msgid "Whether to pack items at the start of the box"
 msgstr "Vai pakot vienumus kastes sākumā"
 
-#: ../clutter/clutter-box-layout.c:1430
+#: ../clutter/clutter-box-layout.c:1424
 msgid "Spacing"
 msgstr "Atstatums"
 
-#: ../clutter/clutter-box-layout.c:1431
+#: ../clutter/clutter-box-layout.c:1425
 msgid "Spacing between children"
 msgstr "Atstarpes starp bērniem"
 
-#: ../clutter/clutter-box-layout.c:1448 ../clutter/clutter-table-layout.c:1675
+#: ../clutter/clutter-box-layout.c:1442
+#: ../clutter/deprecated/clutter-table-layout.c:1677
 msgid "Use Animations"
 msgstr "Lietot animācijas"
 
-#: ../clutter/clutter-box-layout.c:1449 ../clutter/clutter-table-layout.c:1676
+#: ../clutter/clutter-box-layout.c:1443
+#: ../clutter/deprecated/clutter-table-layout.c:1678
 msgid "Whether layout changes should be animated"
 msgstr "Vai vajadzētu animēt izkārtojuma izmaiņas"
 
-#: ../clutter/clutter-box-layout.c:1473 ../clutter/clutter-table-layout.c:1700
+#: ../clutter/clutter-box-layout.c:1467
+#: ../clutter/deprecated/clutter-table-layout.c:1702
 msgid "Easing Mode"
 msgstr "Vienkāršošanas režīms"
 
-#: ../clutter/clutter-box-layout.c:1474 ../clutter/clutter-table-layout.c:1701
+#: ../clutter/clutter-box-layout.c:1468
+#: ../clutter/deprecated/clutter-table-layout.c:1703
 msgid "The easing mode of the animations"
 msgstr "Animāciju vienkāršošanas režīms"
 
-#: ../clutter/clutter-box-layout.c:1494 ../clutter/clutter-table-layout.c:1721
+#: ../clutter/clutter-box-layout.c:1488
+#: ../clutter/deprecated/clutter-table-layout.c:1723
 msgid "Easing Duration"
 msgstr "Vienkāršošanas ilgums"
 
-#: ../clutter/clutter-box-layout.c:1495 ../clutter/clutter-table-layout.c:1722
+#: ../clutter/clutter-box-layout.c:1489
+#: ../clutter/deprecated/clutter-table-layout.c:1724
 msgid "The duration of the animations"
 msgstr "Animāciju ilgums"
 
@@ -914,14 +928,34 @@ msgstr "Kontrasts"
 msgid "The contrast change to apply"
 msgstr "Kontrasta izmaiņas, ko izmantot"
 
-#: ../clutter/clutter-canvas.c:216
+#: ../clutter/clutter-canvas.c:248
 msgid "The width of the canvas"
 msgstr "Audekla platums"
 
-#: ../clutter/clutter-canvas.c:232
+#: ../clutter/clutter-canvas.c:264
 msgid "The height of the canvas"
 msgstr "Audekla augstums"
 
+#: ../clutter/clutter-canvas.c:283
+#| msgid "Selection Color Set"
+msgid "Scale Factor Set"
+msgstr "Iestatīts mērogs"
+
+#: ../clutter/clutter-canvas.c:284
+#| msgid "Whether the transform property is set"
+msgid "Whether the scale-factor property is set"
+msgstr "Vai ir iestatīta mēroga īpašība"
+
+#: ../clutter/clutter-canvas.c:305
+#| msgid "Factor"
+msgid "Scale Factor"
+msgstr "Mērogs"
+
+#: ../clutter/clutter-canvas.c:306
+#| msgid "The height of the Cairo surface"
+msgid "The scaling factor for the surface"
+msgstr "Virsmas mērogs"
+
 #: ../clutter/clutter-child-meta.c:127
 msgid "Container"
 msgstr "Konteineris"
@@ -934,39 +968,39 @@ msgstr "Konteineris, kas izveidoja šos datus"
 msgid "The actor wrapped by this data"
 msgstr "Izpildītājs, ko šie dati ietina"
 
-#: ../clutter/clutter-click-action.c:559
+#: ../clutter/clutter-click-action.c:586
 msgid "Pressed"
 msgstr "Piespiests"
 
-#: ../clutter/clutter-click-action.c:560
+#: ../clutter/clutter-click-action.c:587
 msgid "Whether the clickable should be in pressed state"
 msgstr "Vai klikšķināmajam būtu jābūt piespiestā stāvoklī"
 
-#: ../clutter/clutter-click-action.c:573
+#: ../clutter/clutter-click-action.c:600
 msgid "Held"
 msgstr "Turēts"
 
-#: ../clutter/clutter-click-action.c:574
+#: ../clutter/clutter-click-action.c:601
 msgid "Whether the clickable has a grab"
 msgstr "Vai klikšķināmajam ir satvēriens"
 
-#: ../clutter/clutter-click-action.c:591 ../clutter/clutter-settings.c:599
+#: ../clutter/clutter-click-action.c:618 ../clutter/clutter-settings.c:653
 msgid "Long Press Duration"
 msgstr "Ilgās piespiešanas ilgums"
 
-#: ../clutter/clutter-click-action.c:592
+#: ../clutter/clutter-click-action.c:619
 msgid "The minimum duration of a long press to recognize the gesture"
 msgstr "Ilgās piespiešanas ilgums, līdz to atpazīst kā mājienu"
 
-#: ../clutter/clutter-click-action.c:610
+#: ../clutter/clutter-click-action.c:637
 msgid "Long Press Threshold"
 msgstr "Ilgās piespiešanas slieksnis"
 
-#: ../clutter/clutter-click-action.c:611
+#: ../clutter/clutter-click-action.c:638
 msgid "The maximum threshold before a long press is cancelled"
 msgstr "Maksimālais slieksnis, pirms ilgā piespiešana tiek atcelta"
 
-#: ../clutter/clutter-clone.c:346
+#: ../clutter/clutter-clone.c:342
 msgid "Specifies the actor to be cloned"
 msgstr "Norāda izpildītāju, ko klonēt"
 
@@ -978,27 +1012,27 @@ msgstr "Tonis"
 msgid "The tint to apply"
 msgstr "Tonis, ko izmantot"
 
-#: ../clutter/clutter-deform-effect.c:588
+#: ../clutter/clutter-deform-effect.c:592
 msgid "Horizontal Tiles"
 msgstr "Horizontālās flīzes"
 
-#: ../clutter/clutter-deform-effect.c:589
+#: ../clutter/clutter-deform-effect.c:593
 msgid "The number of horizontal tiles"
 msgstr "Horizontālo flīžu skaits"
 
-#: ../clutter/clutter-deform-effect.c:604
+#: ../clutter/clutter-deform-effect.c:608
 msgid "Vertical Tiles"
 msgstr "Vertikālas flīzes"
 
-#: ../clutter/clutter-deform-effect.c:605
+#: ../clutter/clutter-deform-effect.c:609
 msgid "The number of vertical tiles"
 msgstr "Vertikālo flīžu skaits"
 
-#: ../clutter/clutter-deform-effect.c:622
+#: ../clutter/clutter-deform-effect.c:626
 msgid "Back Material"
 msgstr "Melns materiāls"
 
-#: ../clutter/clutter-deform-effect.c:623
+#: ../clutter/clutter-deform-effect.c:627
 msgid "The material to be used when painting the back of the actor"
 msgstr "Materiāls, kuru izmantot izpildītāja aizmugures drukāšanai"
 
@@ -1006,258 +1040,299 @@ msgstr "Materiāls, kuru izmantot izpildītāja aizmugures drukāšanai"
 msgid "The desaturation factor"
 msgstr "Piesātinājuma mazinājuma koeficients"
 
-#: ../clutter/clutter-device-manager.c:131
-#: ../clutter/clutter-input-device.c:366
-#: ../clutter/x11/clutter-keymap-x11.c:316
+#: ../clutter/clutter-device-manager.c:127
+#: ../clutter/clutter-input-device.c:355
+#: ../clutter/x11/clutter-keymap-x11.c:457
 msgid "Backend"
 msgstr "Aizmugure"
 
-#: ../clutter/clutter-device-manager.c:132
+#: ../clutter/clutter-device-manager.c:128
 msgid "The ClutterBackend of the device manager"
 msgstr "ClutterBackend ierīces pārvaldnieks"
 
-#: ../clutter/clutter-drag-action.c:742
+#: ../clutter/clutter-drag-action.c:741
 msgid "Horizontal Drag Threshold"
 msgstr "Horizontālās vilkšanas aizture"
 
-#: ../clutter/clutter-drag-action.c:743
+#: ../clutter/clutter-drag-action.c:742
 msgid "The horizontal amount of pixels required to start dragging"
 msgstr "Horizontālais pikseļu skaits, lai sāktu vilkšanu"
 
-#: ../clutter/clutter-drag-action.c:770
+#: ../clutter/clutter-drag-action.c:769
 msgid "Vertical Drag Threshold"
 msgstr "Vertikālās vilkšanas aizture"
 
-#: ../clutter/clutter-drag-action.c:771
+#: ../clutter/clutter-drag-action.c:770
 msgid "The vertical amount of pixels required to start dragging"
 msgstr "Vertikālais pikseļu skaits, lai sāktu vilkšanu"
 
-#: ../clutter/clutter-drag-action.c:792
+#: ../clutter/clutter-drag-action.c:791
 msgid "Drag Handle"
 msgstr "Vilkt turi"
 
-#: ../clutter/clutter-drag-action.c:793
+#: ../clutter/clutter-drag-action.c:792
 msgid "The actor that is being dragged"
 msgstr "Izpildītājs, kas tiek vilkts"
 
-#: ../clutter/clutter-drag-action.c:806
+#: ../clutter/clutter-drag-action.c:805
 msgid "Drag Axis"
 msgstr "Vilkt asi"
 
-#: ../clutter/clutter-drag-action.c:807
+#: ../clutter/clutter-drag-action.c:806
 msgid "Constraints the dragging to an axis"
 msgstr "Ierobežo vilkšanu pie ass"
 
-#: ../clutter/clutter-drag-action.c:823
+#: ../clutter/clutter-drag-action.c:822
 msgid "Drag Area"
 msgstr "Vilkt laukumu"
 
-#: ../clutter/clutter-drag-action.c:824
+#: ../clutter/clutter-drag-action.c:823
 msgid "Constrains the dragging to a rectangle"
 msgstr "Ierobežo taisnstūra vilkšanu"
 
-#: ../clutter/clutter-drag-action.c:837
+#: ../clutter/clutter-drag-action.c:836
 msgid "Drag Area Set"
 msgstr "Vilkšanas laukums iestatīts"
 
-#: ../clutter/clutter-drag-action.c:838
+#: ../clutter/clutter-drag-action.c:837
 msgid "Whether the drag area is set"
 msgstr "Vai ir iestatīts vilkšanas laukums"
 
-#: ../clutter/clutter-flow-layout.c:907
+#: ../clutter/clutter-flow-layout.c:959
 msgid "Whether each item should receive the same allocation"
 msgstr "Vai katram vienumam vajadzēt saņemt to pašu piešķīrumu"
 
-#: ../clutter/clutter-flow-layout.c:922 ../clutter/clutter-table-layout.c:1637
+#: ../clutter/clutter-flow-layout.c:974
+#: ../clutter/deprecated/clutter-table-layout.c:1637
 msgid "Column Spacing"
 msgstr "Kolonnu atstarpe"
 
-#: ../clutter/clutter-flow-layout.c:923
+#: ../clutter/clutter-flow-layout.c:975
 msgid "The spacing between columns"
 msgstr "Atstarpe starp kolonnām"
 
-#: ../clutter/clutter-flow-layout.c:939 ../clutter/clutter-table-layout.c:1651
+#: ../clutter/clutter-flow-layout.c:991
+#: ../clutter/deprecated/clutter-table-layout.c:1653
 msgid "Row Spacing"
 msgstr "Rindu atstarpe"
 
-#: ../clutter/clutter-flow-layout.c:940
+#: ../clutter/clutter-flow-layout.c:992
 msgid "The spacing between rows"
 msgstr "Atstarpe starp rindām"
 
-#: ../clutter/clutter-flow-layout.c:954
+#: ../clutter/clutter-flow-layout.c:1006
 msgid "Minimum Column Width"
 msgstr "Minimālais kolonnas platums"
 
-#: ../clutter/clutter-flow-layout.c:955
+#: ../clutter/clutter-flow-layout.c:1007
 msgid "Minimum width for each column"
 msgstr "Minimālais platums katrai kolonnai"
 
-#: ../clutter/clutter-flow-layout.c:970
+#: ../clutter/clutter-flow-layout.c:1022
 msgid "Maximum Column Width"
 msgstr "Maksimālais kolonnas platums"
 
-#: ../clutter/clutter-flow-layout.c:971
+#: ../clutter/clutter-flow-layout.c:1023
 msgid "Maximum width for each column"
 msgstr "Maksimālais platums katrai kolonnai"
 
-#: ../clutter/clutter-flow-layout.c:985
+#: ../clutter/clutter-flow-layout.c:1037
 msgid "Minimum Row Height"
 msgstr "Minimālais rindas augstums"
 
-#: ../clutter/clutter-flow-layout.c:986
+#: ../clutter/clutter-flow-layout.c:1038
 msgid "Minimum height for each row"
 msgstr "Minimālais augstums katrai rindai"
 
-#: ../clutter/clutter-flow-layout.c:1001
+#: ../clutter/clutter-flow-layout.c:1053
 msgid "Maximum Row Height"
 msgstr "Maksimālais rindas augstums"
 
-#: ../clutter/clutter-flow-layout.c:1002
+#: ../clutter/clutter-flow-layout.c:1054
 msgid "Maximum height for each row"
 msgstr "Maksimālais augstums katrai rindai"
 
-#: ../clutter/clutter-grid-layout.c:1222
+#: ../clutter/clutter-flow-layout.c:1069 ../clutter/clutter-flow-layout.c:1070
+msgid "Snap to grid"
+msgstr "Pievilkt pie režģa"
+
+#: ../clutter/clutter-gesture-action.c:668
+msgid "Number touch points"
+msgstr "Skārienu punktu skaits"
+
+#: ../clutter/clutter-gesture-action.c:669
+msgid "Number of touch points"
+msgstr "Skārienu punktu skaits"
+
+#: ../clutter/clutter-gesture-action.c:684
+msgid "Threshold Trigger Edge"
+msgstr "Trigera malas slieksnis"
+
+#: ../clutter/clutter-gesture-action.c:685
+#| msgid "The timeline used by the animation"
+msgid "The trigger edge used by the action"
+msgstr "Trigera mala, ko izmantot šai darbībai"
+
+#: ../clutter/clutter-gesture-action.c:704
+msgid "Threshold Trigger Horizontal Distance"
+msgstr "Trigera malas horizontālais attālums"
+
+#: ../clutter/clutter-gesture-action.c:705
+#| msgid "The timeline used by the animation"
+msgid "The horizontal trigger distance used by the action"
+msgstr "Horizontālā trigera attālums, ko izmanto darbība"
+
+#: ../clutter/clutter-gesture-action.c:723
+msgid "Threshold Trigger Vertical Distance"
+msgstr "Trigera malas vertikālais attālums"
+
+#: ../clutter/clutter-gesture-action.c:724
+#| msgid "The timeline used by the animation"
+msgid "The vertical trigger distance used by the action"
+msgstr "Vertikālais trigera attālums, ko izmanto darbība"
+
+#: ../clutter/clutter-grid-layout.c:1223
 msgid "Left attachment"
 msgstr "Kreisā piesaistne"
 
-#: ../clutter/clutter-grid-layout.c:1223
+#: ../clutter/clutter-grid-layout.c:1224
 msgid "The column number to attach the left side of the child to"
 msgstr "Kolonnas numurs, ko piesaistīt bērnam kreisajā pusē"
 
-#: ../clutter/clutter-grid-layout.c:1230
+#: ../clutter/clutter-grid-layout.c:1231
 msgid "Top attachment"
 msgstr "Augšas piesaistne"
 
-#: ../clutter/clutter-grid-layout.c:1231
+#: ../clutter/clutter-grid-layout.c:1232
 msgid "The row number to attach the top side of a child widget to"
 msgstr "Rindas numurs, ko piesaistīt bērna augšas logdaļai"
 
-#: ../clutter/clutter-grid-layout.c:1239
+#: ../clutter/clutter-grid-layout.c:1240
 msgid "The number of columns that a child spans"
 msgstr "Kolonnu skaits, ko bērns izvērš"
 
-#: ../clutter/clutter-grid-layout.c:1246
+#: ../clutter/clutter-grid-layout.c:1247
 msgid "The number of rows that a child spans"
 msgstr "Rindu skaits, ko bērns izvērš"
 
-#: ../clutter/clutter-grid-layout.c:1562
+#: ../clutter/clutter-grid-layout.c:1564
 msgid "Row spacing"
 msgstr "Rindu atstarpe"
 
-#: ../clutter/clutter-grid-layout.c:1563
+#: ../clutter/clutter-grid-layout.c:1565
 msgid "The amount of space between two consecutive rows"
 msgstr "Atstarpe starp divām secīgām rindām"
 
-#: ../clutter/clutter-grid-layout.c:1576
+#: ../clutter/clutter-grid-layout.c:1578
 msgid "Column spacing"
 msgstr "Kolonnu atstarpe"
 
-#: ../clutter/clutter-grid-layout.c:1577
+#: ../clutter/clutter-grid-layout.c:1579
 msgid "The amount of space between two consecutive columns"
 msgstr "Atstarpe starp divām secīgām kolonnām"
 
-#: ../clutter/clutter-grid-layout.c:1591
+#: ../clutter/clutter-grid-layout.c:1593
 msgid "Row Homogeneous"
 msgstr "Rindu viendabīgums"
 
-#: ../clutter/clutter-grid-layout.c:1592
+#: ../clutter/clutter-grid-layout.c:1594
 msgid "If TRUE, the rows are all the same height"
 msgstr "Ja PATIESS, visas rindas ir ar vienādu augstumu"
 
-#: ../clutter/clutter-grid-layout.c:1605
+#: ../clutter/clutter-grid-layout.c:1607
 msgid "Column Homogeneous"
 msgstr "Kolonnu viendabīgums"
 
-#: ../clutter/clutter-grid-layout.c:1606
+#: ../clutter/clutter-grid-layout.c:1608
 msgid "If TRUE, the columns are all the same width"
 msgstr "Ja PATIESS, visas kolonnas ir ar vienādu platumu"
 
-#: ../clutter/clutter-image.c:248 ../clutter/clutter-image.c:311
-#: ../clutter/clutter-image.c:399
+#: ../clutter/clutter-image.c:249 ../clutter/clutter-image.c:312
+#: ../clutter/clutter-image.c:400
 msgid "Unable to load image data"
 msgstr "Neizdevās ielādēt attēla datus"
 
-#: ../clutter/clutter-input-device.c:242
+#: ../clutter/clutter-input-device.c:231
 msgid "Id"
 msgstr "ID"
 
-#: ../clutter/clutter-input-device.c:243
+#: ../clutter/clutter-input-device.c:232
 msgid "Unique identifier of the device"
 msgstr "Unikāls ierīces identifikators"
 
-#: ../clutter/clutter-input-device.c:259
+#: ../clutter/clutter-input-device.c:248
 msgid "The name of the device"
 msgstr "Ierīces nosaukums"
 
-#: ../clutter/clutter-input-device.c:273
+#: ../clutter/clutter-input-device.c:262
 msgid "Device Type"
 msgstr "Ierīces tips"
 
-#: ../clutter/clutter-input-device.c:274
+#: ../clutter/clutter-input-device.c:263
 msgid "The type of the device"
 msgstr "Ierīces tips"
 
-#: ../clutter/clutter-input-device.c:289
+#: ../clutter/clutter-input-device.c:278
 msgid "Device Manager"
 msgstr "Ierīču pārvaldnieks"
 
-#: ../clutter/clutter-input-device.c:290
+#: ../clutter/clutter-input-device.c:279
 msgid "The device manager instance"
 msgstr "Ierīces pārvaldnieka instance"
 
-#: ../clutter/clutter-input-device.c:303
+#: ../clutter/clutter-input-device.c:292
 msgid "Device Mode"
 msgstr "Ierīces režīms"
 
-#: ../clutter/clutter-input-device.c:304
+#: ../clutter/clutter-input-device.c:293
 msgid "The mode of the device"
 msgstr "Ierīces režīms"
 
-#: ../clutter/clutter-input-device.c:318
+#: ../clutter/clutter-input-device.c:307
 msgid "Has Cursor"
 msgstr "Ir kursors"
 
-#: ../clutter/clutter-input-device.c:319
+#: ../clutter/clutter-input-device.c:308
 msgid "Whether the device has a cursor"
 msgstr "Vai ierīcei ir kursors"
 
-#: ../clutter/clutter-input-device.c:338
+#: ../clutter/clutter-input-device.c:327
 msgid "Whether the device is enabled"
 msgstr "Vai ierīce ir aktivēta"
 
-#: ../clutter/clutter-input-device.c:351
+#: ../clutter/clutter-input-device.c:340
 msgid "Number of Axes"
 msgstr "Asu skaits"
 
-#: ../clutter/clutter-input-device.c:352
+#: ../clutter/clutter-input-device.c:341
 msgid "The number of axes on the device"
 msgstr "Asu skaits ierīcē"
 
-#: ../clutter/clutter-input-device.c:367
+#: ../clutter/clutter-input-device.c:356
 msgid "The backend instance"
 msgstr "Aizmugures instance"
 
-#: ../clutter/clutter-interval.c:506
+#: ../clutter/clutter-interval.c:553
 msgid "Value Type"
 msgstr "Vērtības tips"
 
-#: ../clutter/clutter-interval.c:507
+#: ../clutter/clutter-interval.c:554
 msgid "The type of the values in the interval"
 msgstr "Vērtību tipi intervālā"
 
-#: ../clutter/clutter-interval.c:522
+#: ../clutter/clutter-interval.c:569
 msgid "Initial Value"
 msgstr "Sākotnējā vērtība"
 
-#: ../clutter/clutter-interval.c:523
+#: ../clutter/clutter-interval.c:570
 msgid "Initial value of the interval"
 msgstr "Intervāla sākotnējā vērtība"
 
-#: ../clutter/clutter-interval.c:537
+#: ../clutter/clutter-interval.c:584
 msgid "Final Value"
 msgstr "Beigu vērība"
 
-#: ../clutter/clutter-interval.c:538
+#: ../clutter/clutter-interval.c:585
 msgid "Final value of the interval"
 msgstr "Intervāla beigu vērtība"
 
@@ -1276,96 +1351,96 @@ msgstr "Pārvaldnieks, kas ir izveidojis šos datus"
 #. * Do NOT translate it to non-English e.g. "predefinito:LTR"! If
 #. * it isn't default:LTR or default:RTL it will not work.
 #.
-#: ../clutter/clutter-main.c:762
+#: ../clutter/clutter-main.c:795
 msgid "default:LTR"
 msgstr "default:LTR"
 
-#: ../clutter/clutter-main.c:1636
+#: ../clutter/clutter-main.c:1622
 msgid "Show frames per second"
 msgstr "Rādīt kadrus sekundē"
 
-#: ../clutter/clutter-main.c:1638
+#: ../clutter/clutter-main.c:1624
 msgid "Default frame rate"
 msgstr "Noklusētais kadru ātrums"
 
-#: ../clutter/clutter-main.c:1640
+#: ../clutter/clutter-main.c:1626
 msgid "Make all warnings fatal"
 msgstr "Atzīmēt visus brīdinājumus kā fatālus"
 
-#: ../clutter/clutter-main.c:1643
+#: ../clutter/clutter-main.c:1629
 msgid "Direction for the text"
 msgstr "Teksta virziens"
 
-#: ../clutter/clutter-main.c:1646
+#: ../clutter/clutter-main.c:1632
 msgid "Disable mipmapping on text"
 msgstr "Deaktivēt mip-kartēšanu uz teksta"
 
-#: ../clutter/clutter-main.c:1649
+#: ../clutter/clutter-main.c:1635
 msgid "Use 'fuzzy' picking"
 msgstr "Lietot 'aptuveno' izvēli"
 
-#: ../clutter/clutter-main.c:1652
+#: ../clutter/clutter-main.c:1638
 msgid "Clutter debugging flags to set"
 msgstr "Iestatāmie Clutter atkļūdošanas karodziņi"
 
-#: ../clutter/clutter-main.c:1654
+#: ../clutter/clutter-main.c:1640
 msgid "Clutter debugging flags to unset"
 msgstr "Noņemamie Clutter atkļūdošanas karodziņi"
 
-#: ../clutter/clutter-main.c:1658
+#: ../clutter/clutter-main.c:1644
 msgid "Clutter profiling flags to set"
 msgstr "Iestatāmie Clutter profilēšanas karodziņi"
 
-#: ../clutter/clutter-main.c:1660
+#: ../clutter/clutter-main.c:1646
 msgid "Clutter profiling flags to unset"
 msgstr "Noņemamie Clutter profilēšanas karodziņi"
 
-#: ../clutter/clutter-main.c:1663
+#: ../clutter/clutter-main.c:1649
 msgid "Enable accessibility"
 msgstr "Ieslēgt pieejamību"
 
-#: ../clutter/clutter-main.c:1855
+#: ../clutter/clutter-main.c:1841
 msgid "Clutter Options"
 msgstr "Clutter opcijas"
 
-#: ../clutter/clutter-main.c:1856
+#: ../clutter/clutter-main.c:1842
 msgid "Show Clutter Options"
 msgstr "Rādīt Clutter opcijas"
 
-#: ../clutter/clutter-pan-action.c:451
+#: ../clutter/clutter-pan-action.c:455
 msgid "Pan Axis"
 msgstr "Panoramēšanas ass"
 
-#: ../clutter/clutter-pan-action.c:452
+#: ../clutter/clutter-pan-action.c:456
 msgid "Constraints the panning to an axis"
 msgstr "Ierobežo panoramēšanu pie ass"
 
-#: ../clutter/clutter-pan-action.c:466
+#: ../clutter/clutter-pan-action.c:470
 msgid "Interpolate"
 msgstr "Interpolēt"
 
-#: ../clutter/clutter-pan-action.c:467
+#: ../clutter/clutter-pan-action.c:471
 msgid "Whether interpolated events emission is enabled."
 msgstr "Vai ir aktivēta notikumu izlaišanas interpolācija"
 
-#: ../clutter/clutter-pan-action.c:483
+#: ../clutter/clutter-pan-action.c:487
 msgid "Deceleration"
 msgstr "Deklarācija"
 
-#: ../clutter/clutter-pan-action.c:484
+#: ../clutter/clutter-pan-action.c:488
 msgid "Rate at which the interpolated panning will decelerate in"
 msgstr "Ātrums, ar kādu interpolētā panoramēšana deklarēs"
 
-#: ../clutter/clutter-pan-action.c:501
+#: ../clutter/clutter-pan-action.c:505
 msgid "Initial acceleration factor"
 msgstr "Sākotnējais paātrinājuma koeficients"
 
-#: ../clutter/clutter-pan-action.c:502
+#: ../clutter/clutter-pan-action.c:506
 msgid "Factor applied to the momentum when starting the interpolated phase"
 msgstr "Koeficients, kas pielikts momentam, kad sākas interpolētā fāze"
 
 #: ../clutter/clutter-path-constraint.c:212
-#: ../clutter/deprecated/clutter-behaviour-path.c:225
+#: ../clutter/deprecated/clutter-behaviour-path.c:221
 msgid "Path"
 msgstr "Ceļš"
 
@@ -1377,87 +1452,87 @@ msgstr "Ceļš, ko izmantot izpildītāja ierobežošanai"
 msgid "The offset along the path, between -1.0 and 2.0"
 msgstr "Nobīde gar ceļu, starp -1.0 un 2.0"
 
-#: ../clutter/clutter-property-transition.c:271
+#: ../clutter/clutter-property-transition.c:269
 msgid "Property Name"
 msgstr "Īpašības nosaukums"
 
-#: ../clutter/clutter-property-transition.c:272
+#: ../clutter/clutter-property-transition.c:270
 msgid "The name of the property to animate"
 msgstr "Īpašības, kuru animēt, nosaukums"
 
-#: ../clutter/clutter-script.c:466
+#: ../clutter/clutter-script.c:464
 msgid "Filename Set"
 msgstr "Datnes nosaukums iestatīts"
 
-#: ../clutter/clutter-script.c:467
+#: ../clutter/clutter-script.c:465
 msgid "Whether the :filename property is set"
 msgstr "Vai :filename īpašība tiek iestatīta"
 
-#: ../clutter/clutter-script.c:481
-#: ../clutter/deprecated/clutter-texture.c:1082
+#: ../clutter/clutter-script.c:479
+#: ../clutter/deprecated/clutter-texture.c:1080
 msgid "Filename"
 msgstr "Datnes nosaukums"
 
-#: ../clutter/clutter-script.c:482
+#: ../clutter/clutter-script.c:480
 msgid "The path of the currently parsed file"
 msgstr "Pašlaik parsētās datnes ceļš"
 
-#: ../clutter/clutter-script.c:499
+#: ../clutter/clutter-script.c:497
 msgid "Translation Domain"
 msgstr "Tulkošanas domēns"
 
-#: ../clutter/clutter-script.c:500
+#: ../clutter/clutter-script.c:498
 msgid "The translation domain used to localize string"
 msgstr "Tulkošanas domēns, kuru izmanto virknes lokalizēšanai"
 
-#: ../clutter/clutter-scroll-actor.c:263
+#: ../clutter/clutter-scroll-actor.c:189
 msgid "Scroll Mode"
 msgstr "Ritināšanas režīms"
 
-#: ../clutter/clutter-scroll-actor.c:264
+#: ../clutter/clutter-scroll-actor.c:190
 msgid "The scrolling direction"
 msgstr "Ritināšanas virziens"
 
-#: ../clutter/clutter-settings.c:440
+#: ../clutter/clutter-settings.c:486
 msgid "Double Click Time"
 msgstr "Dubultklikšķa laiks"
 
-#: ../clutter/clutter-settings.c:441
+#: ../clutter/clutter-settings.c:487
 msgid "The time between clicks necessary to detect a multiple click"
 msgstr ""
 "Laiks starp klikšķiem, kas nepieciešams, lai noteiktu vairākus klikšķus"
 
-#: ../clutter/clutter-settings.c:456
+#: ../clutter/clutter-settings.c:502
 msgid "Double Click Distance"
 msgstr "Dubultklikšķa attālums"
 
-#: ../clutter/clutter-settings.c:457
+#: ../clutter/clutter-settings.c:503
 msgid "The distance between clicks necessary to detect a multiple click"
 msgstr ""
 "Attālums starp klikšķiem, kas nepieciešams, lai noteiktu vairākus klikšķus"
 
-#: ../clutter/clutter-settings.c:472
+#: ../clutter/clutter-settings.c:518
 msgid "Drag Threshold"
 msgstr "Vilkšanas slieksnis"
 
-#: ../clutter/clutter-settings.c:473
+#: ../clutter/clutter-settings.c:519
 msgid "The distance the cursor should travel before starting to drag"
 msgstr "Attālums, kas jāveic kursoram, pirms sākt vilkt"
 
-#: ../clutter/clutter-settings.c:488 ../clutter/clutter-text.c:3368
+#: ../clutter/clutter-settings.c:534 ../clutter/clutter-text.c:3437
 msgid "Font Name"
 msgstr "Fonta nosaukums"
 
-#: ../clutter/clutter-settings.c:489
+#: ../clutter/clutter-settings.c:535
 msgid ""
 "The description of the default font, as one that could be parsed by Pango"
 msgstr "Noklusētā fonta apraksts, kādu var parsēt Pango"
 
-#: ../clutter/clutter-settings.c:504
+#: ../clutter/clutter-settings.c:550
 msgid "Font Antialias"
 msgstr "Fonta nogludināšana"
 
-#: ../clutter/clutter-settings.c:505
+#: ../clutter/clutter-settings.c:551
 msgid ""
 "Whether to use antialiasing (1 to enable, 0 to disable, and -1 to use the "
 "default)"
@@ -1465,69 +1540,78 @@ msgstr ""
 "Vai lietot nogludināšanu (1, lai aktivētu; 0, lai deaktivētu; -1, lai "
 "izmantotu noklusēto)"
 
-#: ../clutter/clutter-settings.c:521
+#: ../clutter/clutter-settings.c:567 ../clutter/clutter-settings.c:575
 msgid "Font DPI"
 msgstr "Fonta DPI"
 
-#: ../clutter/clutter-settings.c:522
+#: ../clutter/clutter-settings.c:568 ../clutter/clutter-settings.c:576
 msgid ""
 "The resolution of the font, in 1024 * dots/inch, or -1 to use the default"
 msgstr ""
 "Fonta izšķirtspēja, izteikta 1024 * punkti/colla, vai -1, lai izmantotu "
 "noklusēto"
 
-#: ../clutter/clutter-settings.c:538
+#: ../clutter/clutter-settings.c:592
 msgid "Font Hinting"
 msgstr "Fonta norādīšana"
 
-#: ../clutter/clutter-settings.c:539
+#: ../clutter/clutter-settings.c:593
 msgid ""
 "Whether to use hinting (1 to enable, 0 to disable and -1 to use the default)"
 msgstr ""
 "Vai lietot norādīšanu (1, lai aktivētu; 0, lai deaktivētu; -1, lai izmantotu "
 "noklusēto)"
 
-#: ../clutter/clutter-settings.c:560
+#: ../clutter/clutter-settings.c:614
 msgid "Font Hint Style"
 msgstr "Datnes norādīšanas stils"
 
-#: ../clutter/clutter-settings.c:561
+#: ../clutter/clutter-settings.c:615
 msgid "The style of hinting (hintnone, hintslight, hintmedium, hintfull)"
 msgstr "Norādīšanas stils (hintnone, hintslight, hintmedium, hintfull)"
 
-#: ../clutter/clutter-settings.c:582
+#: ../clutter/clutter-settings.c:636
 msgid "Font Subpixel Order"
 msgstr "Fonta apakšpikseļu secība"
 
-#: ../clutter/clutter-settings.c:583
+#: ../clutter/clutter-settings.c:637
 msgid "The type of subpixel antialiasing (none, rgb, bgr, vrgb, vbgr)"
 msgstr "Apakšpikseļu gludināšanas tips (nekāds, rgb, bgr, vrgb, vbgr)"
 
-#: ../clutter/clutter-settings.c:600
+#: ../clutter/clutter-settings.c:654
 msgid "The minimum duration for a long press gesture to be recognized"
 msgstr "Minimālais ilgums, līdz tiek atpazīts ilgās piespiešanas žests"
 
-#: ../clutter/clutter-settings.c:607
+#: ../clutter/clutter-settings.c:661
+msgid "Window Scaling Factor"
+msgstr "Loga mērogs"
+
+#: ../clutter/clutter-settings.c:662
+#| msgid "Add an effect to be applied on the actor"
+msgid "The scaling factor to be applied to windows"
+msgstr "Loga mērogs, ko izmanto logiem"
+
+#: ../clutter/clutter-settings.c:669
 msgid "Fontconfig configuration timestamp"
 msgstr "Fontconfig konfigurācijas laika spiedogs"
 
-#: ../clutter/clutter-settings.c:608
+#: ../clutter/clutter-settings.c:670
 msgid "Timestamp of the current fontconfig configuration"
 msgstr "Pašreizējās fontconfig konfigurācijas laika spiedogs"
 
-#: ../clutter/clutter-settings.c:625
+#: ../clutter/clutter-settings.c:687
 msgid "Password Hint Time"
 msgstr "Paroles padoma laiks"
 
-#: ../clutter/clutter-settings.c:626
+#: ../clutter/clutter-settings.c:688
 msgid "How long to show the last input character in hidden entries"
 msgstr "Cik ilgi rādīt ievades rakstzīmes slēptajās ievadēs"
 
-#: ../clutter/clutter-shader-effect.c:486
+#: ../clutter/clutter-shader-effect.c:485
 msgid "Shader Type"
 msgstr "Ēnotāja tips"
 
-#: ../clutter/clutter-shader-effect.c:487
+#: ../clutter/clutter-shader-effect.c:486
 msgid "The type of shader used"
 msgstr "Izmantojamā ēnotāja tips"
 
@@ -1555,758 +1639,702 @@ msgstr "Avota mala, kas būtu jāpievelk"
 msgid "The offset in pixels to apply to the constraint"
 msgstr "Nobīde pikseļos, ko pielietot konstante"
 
-#: ../clutter/clutter-stage.c:1895
+#: ../clutter/clutter-stage.c:1899
 msgid "Fullscreen Set"
 msgstr "Pilnekrāna iestatījums"
 
-#: ../clutter/clutter-stage.c:1896
+#: ../clutter/clutter-stage.c:1900
 msgid "Whether the main stage is fullscreen"
 msgstr "Vai galvenajai skatuvei ir jābūt pilnekrāna"
 
-#: ../clutter/clutter-stage.c:1910
+#: ../clutter/clutter-stage.c:1914
 msgid "Offscreen"
 msgstr "Ārpus ekrāna"
 
-#: ../clutter/clutter-stage.c:1911
+#: ../clutter/clutter-stage.c:1915
 msgid "Whether the main stage should be rendered offscreen"
 msgstr "Vai galvenajai skatuvei ir jābūt renderētai ārpus ekrāna"
 
-#: ../clutter/clutter-stage.c:1923 ../clutter/clutter-text.c:3482
+#: ../clutter/clutter-stage.c:1927 ../clutter/clutter-text.c:3551
 msgid "Cursor Visible"
 msgstr "Kursora redzamība"
 
-#: ../clutter/clutter-stage.c:1924
+#: ../clutter/clutter-stage.c:1928
 msgid "Whether the mouse pointer is visible on the main stage"
 msgstr "Vai peles rādītājam ir jābūt redzamam galvenajā skatuvē"
 
-#: ../clutter/clutter-stage.c:1938
+#: ../clutter/clutter-stage.c:1942
 msgid "User Resizable"
 msgstr "Lietotājs var mainīt izmēru"
 
-#: ../clutter/clutter-stage.c:1939
+#: ../clutter/clutter-stage.c:1943
 msgid "Whether the stage is able to be resized via user interaction"
 msgstr "Vai lietotāja mijiedarbība var mainīt skatuves izmēru"
 
-#: ../clutter/clutter-stage.c:1954 ../clutter/deprecated/clutter-box.c:260
-#: ../clutter/deprecated/clutter-rectangle.c:273
+#: ../clutter/clutter-stage.c:1958 ../clutter/deprecated/clutter-box.c:256
+#: ../clutter/deprecated/clutter-rectangle.c:270
 msgid "Color"
 msgstr "Krāsa"
 
-#: ../clutter/clutter-stage.c:1955
+#: ../clutter/clutter-stage.c:1959
 msgid "The color of the stage"
 msgstr "Skatuves krāsa"
 
-#: ../clutter/clutter-stage.c:1970
+#: ../clutter/clutter-stage.c:1974
 msgid "Perspective"
 msgstr "Perspektīva"
 
-#: ../clutter/clutter-stage.c:1971
+#: ../clutter/clutter-stage.c:1975
 msgid "Perspective projection parameters"
 msgstr "Perspektīvas projekcijas parametri"
 
-#: ../clutter/clutter-stage.c:1986
+#: ../clutter/clutter-stage.c:1990
 msgid "Title"
 msgstr "Nosaukums"
 
-#: ../clutter/clutter-stage.c:1987
+#: ../clutter/clutter-stage.c:1991
 msgid "Stage Title"
 msgstr "Skatuves nosaukums"
 
-#: ../clutter/clutter-stage.c:2004
+#: ../clutter/clutter-stage.c:2008
 msgid "Use Fog"
 msgstr "Lietot miglu"
 
-#: ../clutter/clutter-stage.c:2005
+#: ../clutter/clutter-stage.c:2009
 msgid "Whether to enable depth cueing"
 msgstr "Vai aktivēt dziļuma norādīšanu"
 
-#: ../clutter/clutter-stage.c:2021
+#: ../clutter/clutter-stage.c:2025
 msgid "Fog"
 msgstr "Migla"
 
-#: ../clutter/clutter-stage.c:2022
+#: ../clutter/clutter-stage.c:2026
 msgid "Settings for the depth cueing"
 msgstr "Iestatījumi dziļuma norādīšanai"
 
-#: ../clutter/clutter-stage.c:2038
+#: ../clutter/clutter-stage.c:2042
 msgid "Use Alpha"
 msgstr "Lietot alfa"
 
-#: ../clutter/clutter-stage.c:2039
+#: ../clutter/clutter-stage.c:2043
 msgid "Whether to honour the alpha component of the stage color"
 msgstr "Vai ņemt vērā skatuves krāsas alfa komponenti"
 
-#: ../clutter/clutter-stage.c:2055
+#: ../clutter/clutter-stage.c:2059
 msgid "Key Focus"
 msgstr "Atslēgas fokuss"
 
-#: ../clutter/clutter-stage.c:2056
+#: ../clutter/clutter-stage.c:2060
 msgid "The currently key focused actor"
 msgstr "Pašreizējais atslēgas fokusētais izpildītājs"
 
-#: ../clutter/clutter-stage.c:2072
+#: ../clutter/clutter-stage.c:2076
 msgid "No Clear Hint"
 msgstr "Nav attīrīšanas norādes"
 
-#: ../clutter/clutter-stage.c:2073
+#: ../clutter/clutter-stage.c:2077
 msgid "Whether the stage should clear its contents"
 msgstr "Vai skatuvei vajadzētu attīrīt savu saturu"
 
-#: ../clutter/clutter-stage.c:2086
+#: ../clutter/clutter-stage.c:2090
 msgid "Accept Focus"
 msgstr "Pieņemt fokusu"
 
-#: ../clutter/clutter-stage.c:2087
+#: ../clutter/clutter-stage.c:2091
 msgid "Whether the stage should accept focus on show"
 msgstr "Vai skatuvei šovā vajadzētu pieņemt fokusu"
 
-#: ../clutter/clutter-table-layout.c:543
-msgid "Column Number"
-msgstr "Kolonnas numurs"
-
-#: ../clutter/clutter-table-layout.c:544
-msgid "The column the widget resides in"
-msgstr "Kolonna, kurā atrodas logdaļa"
-
-#: ../clutter/clutter-table-layout.c:551
-msgid "Row Number"
-msgstr "Rindas numurs"
-
-#: ../clutter/clutter-table-layout.c:552
-msgid "The row the widget resides in"
-msgstr "Rinda, kurā atrodas logdaļa"
-
-#: ../clutter/clutter-table-layout.c:559
-msgid "Column Span"
-msgstr "Kolonnu apvienojums"
-
-#: ../clutter/clutter-table-layout.c:560
-msgid "The number of columns the widget should span"
-msgstr "Kolonnu skaits, ko logdaļai apvienot"
-
-#: ../clutter/clutter-table-layout.c:567
-msgid "Row Span"
-msgstr "Rindu apvienojums"
-
-#: ../clutter/clutter-table-layout.c:568
-msgid "The number of rows the widget should span"
-msgstr "Rindu skaits, ko logdaļai apvienot"
-
-#: ../clutter/clutter-table-layout.c:575
-msgid "Horizontal Expand"
-msgstr "Horizontāli izvērsts"
-
-#: ../clutter/clutter-table-layout.c:576
-msgid "Allocate extra space for the child in horizontal axis"
-msgstr "Bērnam piešķirt papildu vietu uz horizontālās ass"
-
-#: ../clutter/clutter-table-layout.c:582
-msgid "Vertical Expand"
-msgstr "Vertikāli izvērsts"
-
-#: ../clutter/clutter-table-layout.c:583
-msgid "Allocate extra space for the child in vertical axis"
-msgstr "Bērnam piešķirt papildu vietu uz vertikālās ass"
-
-#: ../clutter/clutter-table-layout.c:1638
-msgid "Spacing between columns"
-msgstr "Atstarpe starp kolonnām"
-
-#: ../clutter/clutter-table-layout.c:1652
-msgid "Spacing between rows"
-msgstr "Atstarpe starp rindām"
-
-#: ../clutter/clutter-text-buffer.c:351 ../clutter/clutter-text.c:3403
+#: ../clutter/clutter-text-buffer.c:347 ../clutter/clutter-text.c:3472
 msgid "Text"
 msgstr "Teksts"
 
-#: ../clutter/clutter-text-buffer.c:352
+#: ../clutter/clutter-text-buffer.c:348
 msgid "The contents of the buffer"
 msgstr "Bufera saturs"
 
-#: ../clutter/clutter-text-buffer.c:365
+#: ../clutter/clutter-text-buffer.c:361
 msgid "Text length"
 msgstr "Teksta garums"
 
-#: ../clutter/clutter-text-buffer.c:366
+#: ../clutter/clutter-text-buffer.c:362
 msgid "Length of the text currently in the buffer"
 msgstr "Garums tekstam, kas pašlaik ir buferī"
 
-#: ../clutter/clutter-text-buffer.c:379
+#: ../clutter/clutter-text-buffer.c:375
 msgid "Maximum length"
 msgstr "Maksimālais garums"
 
-#: ../clutter/clutter-text-buffer.c:380
+#: ../clutter/clutter-text-buffer.c:376
 msgid "Maximum number of characters for this entry. Zero if no maximum"
 msgstr "Maksimālais rakstzīmju daudzums šim ierakstam. Nulle, ja nav maksimuma"
 
-#: ../clutter/clutter-text.c:3350
+#: ../clutter/clutter-text.c:3419
 msgid "Buffer"
 msgstr "Buferis"
 
-#: ../clutter/clutter-text.c:3351
+#: ../clutter/clutter-text.c:3420
 msgid "The buffer for the text"
 msgstr "Buferis tekstam"
 
-#: ../clutter/clutter-text.c:3369
+#: ../clutter/clutter-text.c:3438
 msgid "The font to be used by the text"
 msgstr "Fonts, kuru izmantot tekstam"
 
-#: ../clutter/clutter-text.c:3386
+#: ../clutter/clutter-text.c:3455
 msgid "Font Description"
 msgstr "Fonta apraksts"
 
-#: ../clutter/clutter-text.c:3387
+#: ../clutter/clutter-text.c:3456
 msgid "The font description to be used"
 msgstr "Izmantojamais fonta apraksts"
 
-#: ../clutter/clutter-text.c:3404
+#: ../clutter/clutter-text.c:3473
 msgid "The text to render"
 msgstr "Teksts renderēšanai"
 
-#: ../clutter/clutter-text.c:3418
+#: ../clutter/clutter-text.c:3487
 msgid "Font Color"
 msgstr "Fonta krāsa"
 
-#: ../clutter/clutter-text.c:3419
+#: ../clutter/clutter-text.c:3488
 msgid "Color of the font used by the text"
 msgstr "Krāsa fontam, kuru izmantot tekstam"
 
-#: ../clutter/clutter-text.c:3434
+#: ../clutter/clutter-text.c:3503
 msgid "Editable"
 msgstr "Rediģējams"
 
-#: ../clutter/clutter-text.c:3435
+#: ../clutter/clutter-text.c:3504
 msgid "Whether the text is editable"
 msgstr "Vai teksts ir rediģējams"
 
-#: ../clutter/clutter-text.c:3450
+#: ../clutter/clutter-text.c:3519
 msgid "Selectable"
 msgstr "Izvēlams"
 
-#: ../clutter/clutter-text.c:3451
+#: ../clutter/clutter-text.c:3520
 msgid "Whether the text is selectable"
 msgstr "Vai tekstu var izvēlēties"
 
-#: ../clutter/clutter-text.c:3465
+#: ../clutter/clutter-text.c:3534
 msgid "Activatable"
 msgstr "Aktivizējams"
 
-#: ../clutter/clutter-text.c:3466
+#: ../clutter/clutter-text.c:3535
 msgid "Whether pressing return causes the activate signal to be emitted"
 msgstr "Vai “Enter” piespiešana liek raidīt aktivizēšanas signālu"
 
-#: ../clutter/clutter-text.c:3483
+#: ../clutter/clutter-text.c:3552
 msgid "Whether the input cursor is visible"
 msgstr "Vai ir redzams ievades kursors"
 
-#: ../clutter/clutter-text.c:3497 ../clutter/clutter-text.c:3498
+#: ../clutter/clutter-text.c:3566 ../clutter/clutter-text.c:3567
 msgid "Cursor Color"
 msgstr "Kursora krāsa"
 
-#: ../clutter/clutter-text.c:3513
+#: ../clutter/clutter-text.c:3582
 msgid "Cursor Color Set"
 msgstr "Kursora krāsa iestatīta"
 
-#: ../clutter/clutter-text.c:3514
+#: ../clutter/clutter-text.c:3583
 msgid "Whether the cursor color has been set"
 msgstr "Vai kursora krāsa ir iestatīta"
 
-#: ../clutter/clutter-text.c:3529
+#: ../clutter/clutter-text.c:3598
 msgid "Cursor Size"
 msgstr "Kursora izmērs"
 
-#: ../clutter/clutter-text.c:3530
+#: ../clutter/clutter-text.c:3599
 msgid "The width of the cursor, in pixels"
 msgstr "Kursora platums, pikseļos"
 
-#: ../clutter/clutter-text.c:3546 ../clutter/clutter-text.c:3564
+#: ../clutter/clutter-text.c:3615 ../clutter/clutter-text.c:3633
 msgid "Cursor Position"
 msgstr "Kursora pozīcija"
 
-#: ../clutter/clutter-text.c:3547 ../clutter/clutter-text.c:3565
+#: ../clutter/clutter-text.c:3616 ../clutter/clutter-text.c:3634
 msgid "The cursor position"
 msgstr "Kursora novietojums"
 
-#: ../clutter/clutter-text.c:3580
+#: ../clutter/clutter-text.c:3649
 msgid "Selection-bound"
 msgstr "Izvēles ierobežojums"
 
-#: ../clutter/clutter-text.c:3581
+#: ../clutter/clutter-text.c:3650
 msgid "The cursor position of the other end of the selection"
 msgstr "Kursora pozīcija otrā izvēles galā"
 
-#: ../clutter/clutter-text.c:3596 ../clutter/clutter-text.c:3597
+#: ../clutter/clutter-text.c:3665 ../clutter/clutter-text.c:3666
 msgid "Selection Color"
 msgstr "Izvēles krāsa"
 
-#: ../clutter/clutter-text.c:3612
+#: ../clutter/clutter-text.c:3681
 msgid "Selection Color Set"
 msgstr "Izvēles krāsa iestatīta"
 
-#: ../clutter/clutter-text.c:3613
+#: ../clutter/clutter-text.c:3682
 msgid "Whether the selection color has been set"
 msgstr "Vai izvēles krāsa ir iestatīta"
 
-#: ../clutter/clutter-text.c:3628
+#: ../clutter/clutter-text.c:3697
 msgid "Attributes"
 msgstr "Atribūti"
 
-#: ../clutter/clutter-text.c:3629
+#: ../clutter/clutter-text.c:3698
 msgid "A list of style attributes to apply to the contents of the actor"
 msgstr "Stila atribūtu saraksts, kuru pielietot izpildītāja saturam"
 
-#: ../clutter/clutter-text.c:3651
+#: ../clutter/clutter-text.c:3720
 msgid "Use markup"
 msgstr "Lietot marķējumu"
 
-#: ../clutter/clutter-text.c:3652
+#: ../clutter/clutter-text.c:3721
 msgid "Whether or not the text includes Pango markup"
 msgstr "Vai tekstam jāiekļauj Pango marķējums"
 
-#: ../clutter/clutter-text.c:3668
+#: ../clutter/clutter-text.c:3737
 msgid "Line wrap"
 msgstr "Rindiņu aplaušana"
 
-#: ../clutter/clutter-text.c:3669
+#: ../clutter/clutter-text.c:3738
 msgid "If set, wrap the lines if the text becomes too wide"
 msgstr "Ja iestatīts, aplauzt rindas, ja teksts kļūst pārāk plašs"
 
-#: ../clutter/clutter-text.c:3684
+#: ../clutter/clutter-text.c:3753
 msgid "Line wrap mode"
 msgstr "Rindiņu aplaušanas režīms"
 
-#: ../clutter/clutter-text.c:3685
+#: ../clutter/clutter-text.c:3754
 msgid "Control how line-wrapping is done"
 msgstr "Kontrolēt, kā notiek rindiņu aplaušana"
 
-#: ../clutter/clutter-text.c:3700
+#: ../clutter/clutter-text.c:3769
 msgid "Ellipsize"
 msgstr "Īsināt ar daudzpunkti"
 
-#: ../clutter/clutter-text.c:3701
+#: ../clutter/clutter-text.c:3770
 msgid "The preferred place to ellipsize the string"
 msgstr "Vēlamā vieta, kur virkni īsināt ar daudzpunkti"
 
-#: ../clutter/clutter-text.c:3717
+#: ../clutter/clutter-text.c:3786
 msgid "Line Alignment"
 msgstr "Rindu līdzināšana"
 
-#: ../clutter/clutter-text.c:3718
+#: ../clutter/clutter-text.c:3787
 msgid "The preferred alignment for the string, for multi-line text"
 msgstr "Vēlamais virknes līdzinājums vairāku rindiņu tekstam"
 
-#: ../clutter/clutter-text.c:3734
+#: ../clutter/clutter-text.c:3803
 msgid "Justify"
 msgstr "Izlīdzināt"
 
-#: ../clutter/clutter-text.c:3735
+#: ../clutter/clutter-text.c:3804
 msgid "Whether the text should be justified"
 msgstr "Vai teksts būtu jāizlīdzina"
 
-#: ../clutter/clutter-text.c:3750
+#: ../clutter/clutter-text.c:3819
 msgid "Password Character"
 msgstr "Paroles rakstzīme"
 
-#: ../clutter/clutter-text.c:3751
+#: ../clutter/clutter-text.c:3820
 msgid "If non-zero, use this character to display the actor's contents"
 msgstr "Ja nav nulle, lietot šo rakstzīmi, lai attēlotu izpildītāja saturu"
 
-#: ../clutter/clutter-text.c:3765
+#: ../clutter/clutter-text.c:3834
 msgid "Max Length"
 msgstr "Maks. garums"
 
-#: ../clutter/clutter-text.c:3766
+#: ../clutter/clutter-text.c:3835
 msgid "Maximum length of the text inside the actor"
 msgstr "Maksimālais teksta garums izpildītājā"
 
-#: ../clutter/clutter-text.c:3789
+#: ../clutter/clutter-text.c:3858
 msgid "Single Line Mode"
 msgstr "Vienas rindas režīms"
 
-#: ../clutter/clutter-text.c:3790
+#: ../clutter/clutter-text.c:3859
 msgid "Whether the text should be a single line"
 msgstr "Vai tekstam jābūt vienā rindiņā"
 
-#: ../clutter/clutter-text.c:3804 ../clutter/clutter-text.c:3805
+#: ../clutter/clutter-text.c:3873 ../clutter/clutter-text.c:3874
 msgid "Selected Text Color"
 msgstr "Izvēlētā teksta krāsa"
 
-#: ../clutter/clutter-text.c:3820
+#: ../clutter/clutter-text.c:3889
 msgid "Selected Text Color Set"
 msgstr "Izvēlētā teksta krāsa iestatīta"
 
-#: ../clutter/clutter-text.c:3821
+#: ../clutter/clutter-text.c:3890
 msgid "Whether the selected text color has been set"
 msgstr "Vai izvēlētā teksta krāsa ir iestatīta"
 
-#: ../clutter/clutter-timeline.c:561
-#: ../clutter/deprecated/clutter-animation.c:560
+#: ../clutter/clutter-timeline.c:593
+#: ../clutter/deprecated/clutter-animation.c:557
 msgid "Loop"
 msgstr "Cikls"
 
-#: ../clutter/clutter-timeline.c:562
+#: ../clutter/clutter-timeline.c:594
 msgid "Should the timeline automatically restart"
 msgstr "Vai automātiski jāpārstartē laika skalas"
 
-#: ../clutter/clutter-timeline.c:576
+#: ../clutter/clutter-timeline.c:608
 msgid "Delay"
 msgstr "Aizture"
 
-#: ../clutter/clutter-timeline.c:577
+#: ../clutter/clutter-timeline.c:609
 msgid "Delay before start"
 msgstr "Aizture pirms sākt"
 
-#: ../clutter/clutter-timeline.c:592
-#: ../clutter/deprecated/clutter-animation.c:544
-#: ../clutter/deprecated/clutter-animator.c:1803
+#: ../clutter/clutter-timeline.c:624
+#: ../clutter/deprecated/clutter-animation.c:541
+#: ../clutter/deprecated/clutter-animator.c:1801
 #: ../clutter/deprecated/clutter-media.c:224
-#: ../clutter/deprecated/clutter-state.c:1522
+#: ../clutter/deprecated/clutter-state.c:1517
 msgid "Duration"
 msgstr "Ilgums"
 
-#: ../clutter/clutter-timeline.c:593
+#: ../clutter/clutter-timeline.c:625
 msgid "Duration of the timeline in milliseconds"
 msgstr "Laika skalas ilgums milisekundēs"
 
-#: ../clutter/clutter-timeline.c:608
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:528
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:337
+#: ../clutter/clutter-timeline.c:640
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:521
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:330
 msgid "Direction"
 msgstr "Virziens"
 
-#: ../clutter/clutter-timeline.c:609
+#: ../clutter/clutter-timeline.c:641
 msgid "Direction of the timeline"
 msgstr "Laika skalas virziens"
 
-#: ../clutter/clutter-timeline.c:624
+#: ../clutter/clutter-timeline.c:656
 msgid "Auto Reverse"
 msgstr "Autom. apgriezt"
 
-#: ../clutter/clutter-timeline.c:625
+#: ../clutter/clutter-timeline.c:657
 msgid "Whether the direction should be reversed when reaching the end"
 msgstr "Vai virziens būtu jāapgriež, kas sasniedz beigas"
 
-#: ../clutter/clutter-timeline.c:643
+#: ../clutter/clutter-timeline.c:675
 msgid "Repeat Count"
 msgstr "Atkārtot skaitu"
 
-#: ../clutter/clutter-timeline.c:644
+#: ../clutter/clutter-timeline.c:676
 msgid "How many times the timeline should repeat"
 msgstr "Cik reizes vajadzētu atkārtot laika skalu"
 
-#: ../clutter/clutter-timeline.c:658
+#: ../clutter/clutter-timeline.c:690
 msgid "Progress Mode"
 msgstr "Progresa režīms"
 
-#: ../clutter/clutter-timeline.c:659
+#: ../clutter/clutter-timeline.c:691
 msgid "How the timeline should compute the progress"
 msgstr "Kā laika skalai vajadzētu aprēķināt progresu"
 
-#: ../clutter/clutter-transition.c:246
+#: ../clutter/clutter-transition.c:244
 msgid "Interval"
 msgstr "Intervāls"
 
-#: ../clutter/clutter-transition.c:247
+#: ../clutter/clutter-transition.c:245
 msgid "The interval of values to transition"
 msgstr "Intervāls vērtībai uz pāreju"
 
-#: ../clutter/clutter-transition.c:261
+#: ../clutter/clutter-transition.c:259
 msgid "Animatable"
 msgstr "Animējams"
 
-#: ../clutter/clutter-transition.c:262
+#: ../clutter/clutter-transition.c:260
 msgid "The animatable object"
 msgstr "Animējams objekts"
 
-#: ../clutter/clutter-transition.c:283
+#: ../clutter/clutter-transition.c:281
 msgid "Remove on Complete"
 msgstr "Pie izpildes izņemt"
 
-#: ../clutter/clutter-transition.c:284
+#: ../clutter/clutter-transition.c:282
 msgid "Detach the transition when completed"
 msgstr "Kad pabeigts, atvienot pāreju"
 
-#: ../clutter/clutter-zoom-action.c:353
+#: ../clutter/clutter-zoom-action.c:365
 msgid "Zoom Axis"
 msgstr "Mēroga ass"
 
-#: ../clutter/clutter-zoom-action.c:354
+#: ../clutter/clutter-zoom-action.c:366
 msgid "Constraints the zoom to an axis"
 msgstr "Ierobežo mērogu pie ass"
 
-#: ../clutter/deprecated/clutter-alpha.c:355
-#: ../clutter/deprecated/clutter-animation.c:575
-#: ../clutter/deprecated/clutter-animator.c:1820
+#: ../clutter/deprecated/clutter-alpha.c:354
+#: ../clutter/deprecated/clutter-animation.c:572
+#: ../clutter/deprecated/clutter-animator.c:1818
 msgid "Timeline"
 msgstr "Laika skala"
 
-#: ../clutter/deprecated/clutter-alpha.c:356
+#: ../clutter/deprecated/clutter-alpha.c:355
 msgid "Timeline used by the alpha"
 msgstr "Laika skala, ko izmanto alfa"
 
-#: ../clutter/deprecated/clutter-alpha.c:372
+#: ../clutter/deprecated/clutter-alpha.c:371
 msgid "Alpha value"
 msgstr "Alfa vērtība"
 
-#: ../clutter/deprecated/clutter-alpha.c:373
+#: ../clutter/deprecated/clutter-alpha.c:372
 msgid "Alpha value as computed by the alpha"
 msgstr "Alfa vērtība, kādu izskaitļo alfa"
 
-#: ../clutter/deprecated/clutter-alpha.c:394
-#: ../clutter/deprecated/clutter-animation.c:528
+#: ../clutter/deprecated/clutter-alpha.c:393
+#: ../clutter/deprecated/clutter-animation.c:525
 msgid "Mode"
 msgstr "Režīms"
 
-#: ../clutter/deprecated/clutter-alpha.c:395
+#: ../clutter/deprecated/clutter-alpha.c:394
 msgid "Progress mode"
 msgstr "Progresa režīms"
 
-#: ../clutter/deprecated/clutter-animation.c:511
+#: ../clutter/deprecated/clutter-animation.c:508
 msgid "Object"
 msgstr "Objekts"
 
-#: ../clutter/deprecated/clutter-animation.c:512
+#: ../clutter/deprecated/clutter-animation.c:509
 msgid "Object to which the animation applies"
 msgstr "Objekts, uz ko attiecināma animācija"
 
-#: ../clutter/deprecated/clutter-animation.c:529
+#: ../clutter/deprecated/clutter-animation.c:526
 msgid "The mode of the animation"
 msgstr "Animācijas režīms"
 
-#: ../clutter/deprecated/clutter-animation.c:545
+#: ../clutter/deprecated/clutter-animation.c:542
 msgid "Duration of the animation, in milliseconds"
 msgstr "Animācijas ilgums milisekundēs"
 
-#: ../clutter/deprecated/clutter-animation.c:561
+#: ../clutter/deprecated/clutter-animation.c:558
 msgid "Whether the animation should loop"
 msgstr "Vai animācijai jāciklojas"
 
-#: ../clutter/deprecated/clutter-animation.c:576
+#: ../clutter/deprecated/clutter-animation.c:573
 msgid "The timeline used by the animation"
 msgstr "Laika skala, ko izmanto animācija"
 
-#: ../clutter/deprecated/clutter-animation.c:592
-#: ../clutter/deprecated/clutter-behaviour.c:241
+#: ../clutter/deprecated/clutter-animation.c:589
+#: ../clutter/deprecated/clutter-behaviour.c:237
 msgid "Alpha"
 msgstr "Alfa"
 
-#: ../clutter/deprecated/clutter-animation.c:593
+#: ../clutter/deprecated/clutter-animation.c:590
 msgid "The alpha used by the animation"
 msgstr "Alfa, ko izmanto animācija"
 
-#: ../clutter/deprecated/clutter-animator.c:1804
+#: ../clutter/deprecated/clutter-animator.c:1802
 msgid "The duration of the animation"
 msgstr "Animācijas ilgums"
 
-#: ../clutter/deprecated/clutter-animator.c:1821
+#: ../clutter/deprecated/clutter-animator.c:1819
 msgid "The timeline of the animation"
 msgstr "Animācijas laika skala"
 
-#: ../clutter/deprecated/clutter-behaviour.c:242
+#: ../clutter/deprecated/clutter-behaviour.c:238
 msgid "Alpha Object to drive the behaviour"
 msgstr "Alfas objekts, kas nosaka uzvedību"
 
-#: ../clutter/deprecated/clutter-behaviour-depth.c:182
+#: ../clutter/deprecated/clutter-behaviour-depth.c:180
 msgid "Start Depth"
 msgstr "Sākuma dziļums"
 
-#: ../clutter/deprecated/clutter-behaviour-depth.c:183
+#: ../clutter/deprecated/clutter-behaviour-depth.c:181
 msgid "Initial depth to apply"
 msgstr "Sākotnējais dziļums, ko pielietot"
 
-#: ../clutter/deprecated/clutter-behaviour-depth.c:198
+#: ../clutter/deprecated/clutter-behaviour-depth.c:196
 msgid "End Depth"
 msgstr "Beigu dziļums"
 
-#: ../clutter/deprecated/clutter-behaviour-depth.c:199
+#: ../clutter/deprecated/clutter-behaviour-depth.c:197
 msgid "Final depth to apply"
 msgstr "Beigu dziļums, ko pielietot"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:401
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:394
 msgid "Start Angle"
 msgstr "Starta leņķis"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:402
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:284
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:395
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:277
 msgid "Initial angle"
 msgstr "Sākotnējais leņķis"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:417
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:410
 msgid "End Angle"
 msgstr "Finiša leņķis"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:418
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:302
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:411
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:295
 msgid "Final angle"
 msgstr "Beigu leņķis"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:433
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:426
 msgid "Angle x tilt"
 msgstr "Leņķa x slīpums"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:434
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:427
 msgid "Tilt of the ellipse around x axis"
 msgstr "Elipses slīpums ap x asi"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:449
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:442
 msgid "Angle y tilt"
 msgstr "Leņķa y slīpums"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:450
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:443
 msgid "Tilt of the ellipse around y axis"
 msgstr "Elipses slīpums ap y asi"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:465
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:458
 msgid "Angle z tilt"
 msgstr "Leņķa z slīpums"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:466
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:459
 msgid "Tilt of the ellipse around z axis"
 msgstr "Elipses slīpums ap z asi"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:482
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:475
 msgid "Width of the ellipse"
 msgstr "Elipses platums"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:498
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:491
 msgid "Height of ellipse"
 msgstr "Elipses augstums"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:513
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:506
 msgid "Center"
 msgstr "Vidus"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:514
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:507
 msgid "Center of ellipse"
 msgstr "Elipses vidus"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:529
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:338
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:522
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:331
 msgid "Direction of rotation"
 msgstr "Rotācijas virziens"
 
-#: ../clutter/deprecated/clutter-behaviour-opacity.c:184
+#: ../clutter/deprecated/clutter-behaviour-opacity.c:177
 msgid "Opacity Start"
 msgstr "Necaurspīdīguma sākums"
 
-#: ../clutter/deprecated/clutter-behaviour-opacity.c:185
+#: ../clutter/deprecated/clutter-behaviour-opacity.c:178
 msgid "Initial opacity level"
 msgstr "Sākotnējais necaurspīdīguma līmenis"
 
-#: ../clutter/deprecated/clutter-behaviour-opacity.c:202
+#: ../clutter/deprecated/clutter-behaviour-opacity.c:195
 msgid "Opacity End"
 msgstr "Necaurspīdīguma beigas"
 
-#: ../clutter/deprecated/clutter-behaviour-opacity.c:203
+#: ../clutter/deprecated/clutter-behaviour-opacity.c:196
 msgid "Final opacity level"
 msgstr "Beidzamais necaurspīdīguma līmenis"
 
-#: ../clutter/deprecated/clutter-behaviour-path.c:226
+#: ../clutter/deprecated/clutter-behaviour-path.c:222
 msgid "The ClutterPath object representing the path to animate along"
 msgstr "ClutterPath objekts, kas norāda ceļu, gar ko jāanimē"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:283
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:276
 msgid "Angle Begin"
 msgstr "Leņķa sākums"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:301
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:294
 msgid "Angle End"
 msgstr "Leņķa beigas"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:319
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:312
 msgid "Axis"
 msgstr "Ass"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:320
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:313
 msgid "Axis of rotation"
 msgstr "Rotācijas ass"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:355
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:348
 msgid "Center X"
 msgstr "Centrs X"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:356
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:349
 msgid "X coordinate of the center of rotation"
 msgstr "Rotācijas centra X koordināta"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:373
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:366
 msgid "Center Y"
 msgstr "Centrs Y"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:374
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:367
 msgid "Y coordinate of the center of rotation"
 msgstr "Rotācijas centra Y koordināta"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:391
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:384
 msgid "Center Z"
 msgstr "Centrs Z"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:392
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:385
 msgid "Z coordinate of the center of rotation"
 msgstr "Rotācijas centra Z koordināta"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:226
+#: ../clutter/deprecated/clutter-behaviour-scale.c:222
 msgid "X Start Scale"
 msgstr "X sākuma mērogs"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:227
+#: ../clutter/deprecated/clutter-behaviour-scale.c:223
 msgid "Initial scale on the X axis"
 msgstr "Sākuma mērogs uz X ass"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:245
+#: ../clutter/deprecated/clutter-behaviour-scale.c:241
 msgid "X End Scale"
 msgstr "X beigu mērogs"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:246
+#: ../clutter/deprecated/clutter-behaviour-scale.c:242
 msgid "Final scale on the X axis"
 msgstr "Beigu mērogs uz X ass"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:264
+#: ../clutter/deprecated/clutter-behaviour-scale.c:260
 msgid "Y Start Scale"
 msgstr "Y sākuma mērogs"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:265
+#: ../clutter/deprecated/clutter-behaviour-scale.c:261
 msgid "Initial scale on the Y axis"
 msgstr "Sākuma mērogs uz Y ass"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:283
+#: ../clutter/deprecated/clutter-behaviour-scale.c:279
 msgid "Y End Scale"
 msgstr "Y beigu mērogs"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:284
+#: ../clutter/deprecated/clutter-behaviour-scale.c:280
 msgid "Final scale on the Y axis"
 msgstr "Beigu mērogs uz Y ass"
 
-#: ../clutter/deprecated/clutter-box.c:261
+#: ../clutter/deprecated/clutter-box.c:257
 msgid "The background color of the box"
 msgstr "Kastes fona krāsa"
 
-#: ../clutter/deprecated/clutter-box.c:274
+#: ../clutter/deprecated/clutter-box.c:270
 msgid "Color Set"
 msgstr "Krāsa iestatīta"
 
-#: ../clutter/deprecated/clutter-cairo-texture.c:597
+#: ../clutter/deprecated/clutter-cairo-texture.c:593
 msgid "Surface Width"
 msgstr "Virsmas platums"
 
-#: ../clutter/deprecated/clutter-cairo-texture.c:598
+#: ../clutter/deprecated/clutter-cairo-texture.c:594
 msgid "The width of the Cairo surface"
 msgstr "Cairo virsmas platums"
 
-#: ../clutter/deprecated/clutter-cairo-texture.c:615
+#: ../clutter/deprecated/clutter-cairo-texture.c:611
 msgid "Surface Height"
 msgstr "Virsmas augstums"
 
-#: ../clutter/deprecated/clutter-cairo-texture.c:616
+#: ../clutter/deprecated/clutter-cairo-texture.c:612
 msgid "The height of the Cairo surface"
 msgstr "Cairo virsmas augstums"
 
-#: ../clutter/deprecated/clutter-cairo-texture.c:636
+#: ../clutter/deprecated/clutter-cairo-texture.c:632
 msgid "Auto Resize"
 msgstr "Autom. mainīt izmēru"
 
-#: ../clutter/deprecated/clutter-cairo-texture.c:637
+#: ../clutter/deprecated/clutter-cairo-texture.c:633
 msgid "Whether the surface should match the allocation"
 msgstr "Vai virsmai būtu jāatbilst piešķīrumam"
 
@@ -2378,103 +2406,159 @@ msgstr "Bufera aizpildījuma līmenis"
 msgid "The duration of the stream, in seconds"
 msgstr "Straumes ilgums, sekundēs"
 
-#: ../clutter/deprecated/clutter-rectangle.c:274
+#: ../clutter/deprecated/clutter-rectangle.c:271
 msgid "The color of the rectangle"
 msgstr "Taisnstūra krāsa"
 
-#: ../clutter/deprecated/clutter-rectangle.c:287
+#: ../clutter/deprecated/clutter-rectangle.c:284
 msgid "Border Color"
 msgstr "Malas krāsa"
 
-#: ../clutter/deprecated/clutter-rectangle.c:288
+#: ../clutter/deprecated/clutter-rectangle.c:285
 msgid "The color of the border of the rectangle"
 msgstr "Taisnstūra malas krāsa"
 
-#: ../clutter/deprecated/clutter-rectangle.c:303
+#: ../clutter/deprecated/clutter-rectangle.c:300
 msgid "Border Width"
 msgstr "Malas platums"
 
-#: ../clutter/deprecated/clutter-rectangle.c:304
+#: ../clutter/deprecated/clutter-rectangle.c:301
 msgid "The width of the border of the rectangle"
 msgstr "Taisnstūra malas platums"
 
-#: ../clutter/deprecated/clutter-rectangle.c:318
+#: ../clutter/deprecated/clutter-rectangle.c:315
 msgid "Has Border"
 msgstr "Ir mala"
 
-#: ../clutter/deprecated/clutter-rectangle.c:319
+#: ../clutter/deprecated/clutter-rectangle.c:316
 msgid "Whether the rectangle should have a border"
 msgstr "Vai taisnstūrim ir vajadzīga mala"
 
-#: ../clutter/deprecated/clutter-shader.c:261
+#: ../clutter/deprecated/clutter-shader.c:257
 msgid "Vertex Source"
 msgstr "Virsotnes avots"
 
-#: ../clutter/deprecated/clutter-shader.c:262
+#: ../clutter/deprecated/clutter-shader.c:258
 msgid "Source of vertex shader"
 msgstr "Virsotnes ēnotāja avots"
 
-#: ../clutter/deprecated/clutter-shader.c:278
+#: ../clutter/deprecated/clutter-shader.c:274
 msgid "Fragment Source"
 msgstr "Fragmenta avots"
 
-#: ../clutter/deprecated/clutter-shader.c:279
+#: ../clutter/deprecated/clutter-shader.c:275
 msgid "Source of fragment shader"
 msgstr "Fragmenta ēnotāja avots"
 
-#: ../clutter/deprecated/clutter-shader.c:296
+#: ../clutter/deprecated/clutter-shader.c:292
 msgid "Compiled"
 msgstr "Kompilēts"
 
-#: ../clutter/deprecated/clutter-shader.c:297
+#: ../clutter/deprecated/clutter-shader.c:293
 msgid "Whether the shader is compiled and linked"
 msgstr "Kad ēnotājs ir kompilēts un piesaistīts"
 
-#: ../clutter/deprecated/clutter-shader.c:314
+#: ../clutter/deprecated/clutter-shader.c:310
 msgid "Whether the shader is enabled"
 msgstr "Kad ēnotājs ir aktivēts"
 
-#: ../clutter/deprecated/clutter-shader.c:525
+#: ../clutter/deprecated/clutter-shader.c:521
 #, c-format
 msgid "%s compilation failed: %s"
 msgstr "%s kompilēšana neizdevās: %s"
 
-#: ../clutter/deprecated/clutter-shader.c:526
+#: ../clutter/deprecated/clutter-shader.c:522
 msgid "Vertex shader"
 msgstr "Virsotnes ēnotājs"
 
-#: ../clutter/deprecated/clutter-shader.c:527
+#: ../clutter/deprecated/clutter-shader.c:523
 msgid "Fragment shader"
 msgstr "Fragmenta ēnotājs"
 
-#: ../clutter/deprecated/clutter-state.c:1504
+#: ../clutter/deprecated/clutter-state.c:1499
 msgid "State"
 msgstr "Stāvoklis"
 
-#: ../clutter/deprecated/clutter-state.c:1505
+#: ../clutter/deprecated/clutter-state.c:1500
 msgid "Currently set state, (transition to this state might not be complete)"
 msgstr ""
 "Pašlaik iestatītais stāvoklis, (pāreja uz šo stāvokli varētu nebūt pabeigta)"
 
-#: ../clutter/deprecated/clutter-state.c:1523
+#: ../clutter/deprecated/clutter-state.c:1518
 msgid "Default transition duration"
 msgstr "Noklusētais pārejas ilgums"
 
-#: ../clutter/deprecated/clutter-texture.c:994
+#: ../clutter/deprecated/clutter-table-layout.c:543
+msgid "Column Number"
+msgstr "Kolonnas numurs"
+
+#: ../clutter/deprecated/clutter-table-layout.c:544
+msgid "The column the widget resides in"
+msgstr "Kolonna, kurā atrodas logdaļa"
+
+#: ../clutter/deprecated/clutter-table-layout.c:551
+msgid "Row Number"
+msgstr "Rindas numurs"
+
+#: ../clutter/deprecated/clutter-table-layout.c:552
+msgid "The row the widget resides in"
+msgstr "Rinda, kurā atrodas logdaļa"
+
+#: ../clutter/deprecated/clutter-table-layout.c:559
+msgid "Column Span"
+msgstr "Kolonnu apvienojums"
+
+#: ../clutter/deprecated/clutter-table-layout.c:560
+msgid "The number of columns the widget should span"
+msgstr "Kolonnu skaits, ko logdaļai apvienot"
+
+#: ../clutter/deprecated/clutter-table-layout.c:567
+msgid "Row Span"
+msgstr "Rindu apvienojums"
+
+#: ../clutter/deprecated/clutter-table-layout.c:568
+msgid "The number of rows the widget should span"
+msgstr "Rindu skaits, ko logdaļai apvienot"
+
+#: ../clutter/deprecated/clutter-table-layout.c:575
+msgid "Horizontal Expand"
+msgstr "Horizontāli izvērsts"
+
+#: ../clutter/deprecated/clutter-table-layout.c:576
+msgid "Allocate extra space for the child in horizontal axis"
+msgstr "Bērnam piešķirt papildu vietu uz horizontālās ass"
+
+#: ../clutter/deprecated/clutter-table-layout.c:582
+msgid "Vertical Expand"
+msgstr "Vertikāli izvērsts"
+
+#: ../clutter/deprecated/clutter-table-layout.c:583
+msgid "Allocate extra space for the child in vertical axis"
+msgstr "Bērnam piešķirt papildu vietu uz vertikālās ass"
+
+#: ../clutter/deprecated/clutter-table-layout.c:1638
+msgid "Spacing between columns"
+msgstr "Atstarpe starp kolonnām"
+
+#: ../clutter/deprecated/clutter-table-layout.c:1654
+msgid "Spacing between rows"
+msgstr "Atstarpe starp rindām"
+
+#: ../clutter/deprecated/clutter-texture.c:992
 msgid "Sync size of actor"
 msgstr "Izpildītājā sinhronizēšanas izmērs"
 
-#: ../clutter/deprecated/clutter-texture.c:995
+#: ../clutter/deprecated/clutter-texture.c:993
 msgid "Auto sync size of actor to underlying pixbuf dimensions"
 msgstr ""
 "Automātiski sinhronizēt izpildītāja izmēru uz apakšējā pikseļu bufera "
 "dimensijām"
 
-#: ../clutter/deprecated/clutter-texture.c:1002
+#: ../clutter/deprecated/clutter-texture.c:1000
 msgid "Disable Slicing"
 msgstr "Deaktivēt sagriešanu"
 
-#: ../clutter/deprecated/clutter-texture.c:1003
+#: ../clutter/deprecated/clutter-texture.c:1001
 msgid ""
 "Forces the underlying texture to be singular and not made of smaller space "
 "saving individual textures"
@@ -2482,95 +2566,95 @@ msgstr ""
 "Piespiež apakšējo tekstūru būt viengabalainai un nevis veidotai no mazākām "
 "telpām, kas satur atsevišķas tekstūras"
 
-#: ../clutter/deprecated/clutter-texture.c:1012
+#: ../clutter/deprecated/clutter-texture.c:1010
 msgid "Tile Waste"
 msgstr "Flīžu zudumi"
 
-#: ../clutter/deprecated/clutter-texture.c:1013
+#: ../clutter/deprecated/clutter-texture.c:1011
 msgid "Maximum waste area of a sliced texture"
 msgstr "Maksimālais izniekotais sagrieztas tekstūras laukums"
 
-#: ../clutter/deprecated/clutter-texture.c:1021
+#: ../clutter/deprecated/clutter-texture.c:1019
 msgid "Horizontal repeat"
 msgstr "Horizontālā atkārtošana"
 
-#: ../clutter/deprecated/clutter-texture.c:1022
+#: ../clutter/deprecated/clutter-texture.c:1020
 msgid "Repeat the contents rather than scaling them horizontally"
 msgstr "Atkārtot saturu, nevis to horizontāli mērogot"
 
-#: ../clutter/deprecated/clutter-texture.c:1029
+#: ../clutter/deprecated/clutter-texture.c:1027
 msgid "Vertical repeat"
 msgstr "Vertikālā atkārtošana"
 
-#: ../clutter/deprecated/clutter-texture.c:1030
+#: ../clutter/deprecated/clutter-texture.c:1028
 msgid "Repeat the contents rather than scaling them vertically"
 msgstr "Atkārtot saturu, nevis to vertikāli mērogot"
 
-#: ../clutter/deprecated/clutter-texture.c:1037
+#: ../clutter/deprecated/clutter-texture.c:1035
 msgid "Filter Quality"
 msgstr "Filtra kvalitāte"
 
-#: ../clutter/deprecated/clutter-texture.c:1038
+#: ../clutter/deprecated/clutter-texture.c:1036
 msgid "Rendering quality used when drawing the texture"
 msgstr "Renderēšanas kvalitāte, zīmējot tekstūru"
 
-#: ../clutter/deprecated/clutter-texture.c:1046
+#: ../clutter/deprecated/clutter-texture.c:1044
 msgid "Pixel Format"
 msgstr "Pikseļu formāts"
 
-#: ../clutter/deprecated/clutter-texture.c:1047
+#: ../clutter/deprecated/clutter-texture.c:1045
 msgid "The Cogl pixel format to use"
 msgstr "Izmantojamais Cogl pikseļu formāts"
 
-#: ../clutter/deprecated/clutter-texture.c:1055
-#: ../clutter/wayland/clutter-wayland-surface.c:449
+#: ../clutter/deprecated/clutter-texture.c:1053
+#: ../clutter/wayland/clutter-wayland-surface.c:445
 msgid "Cogl Texture"
 msgstr "Cogl tekstūra"
 
-#: ../clutter/deprecated/clutter-texture.c:1056
-#: ../clutter/wayland/clutter-wayland-surface.c:450
+#: ../clutter/deprecated/clutter-texture.c:1054
+#: ../clutter/wayland/clutter-wayland-surface.c:446
 msgid "The underlying Cogl texture handle used to draw this actor"
 msgstr "Apakšējais Cogl tekstūras turis, ko izmanto šī izpildītāja zīmēšanai"
 
-#: ../clutter/deprecated/clutter-texture.c:1063
+#: ../clutter/deprecated/clutter-texture.c:1061
 msgid "Cogl Material"
 msgstr "Cogl materiāls"
 
-#: ../clutter/deprecated/clutter-texture.c:1064
+#: ../clutter/deprecated/clutter-texture.c:1062
 msgid "The underlying Cogl material handle used to draw this actor"
 msgstr "Apakšējais Cogl materiāla turis, ko izmanto šī izpildītāja zīmēšanai"
 
-#: ../clutter/deprecated/clutter-texture.c:1083
+#: ../clutter/deprecated/clutter-texture.c:1081
 msgid "The path of the file containing the image data"
 msgstr "Datnes ceļš, kas satur attēla datus"
 
-#: ../clutter/deprecated/clutter-texture.c:1090
+#: ../clutter/deprecated/clutter-texture.c:1088
 msgid "Keep Aspect Ratio"
 msgstr "Paturēt izmēra attiecību"
 
-#: ../clutter/deprecated/clutter-texture.c:1091
+#: ../clutter/deprecated/clutter-texture.c:1089
 msgid ""
 "Keep the aspect ratio of the texture when requesting the preferred width or "
 "height"
 msgstr ""
 "Paturēt tekstūras izmēra attiecību, kad pieprasa vēlamo platumu vai augstumu"
 
-#: ../clutter/deprecated/clutter-texture.c:1119
+#: ../clutter/deprecated/clutter-texture.c:1117
 msgid "Load asynchronously"
 msgstr "Ielādēt asinhroni"
 
-#: ../clutter/deprecated/clutter-texture.c:1120
+#: ../clutter/deprecated/clutter-texture.c:1118
 msgid ""
 "Load files inside a thread to avoid blocking when loading images from disk"
 msgstr ""
 "Ielādēt datnes pavedienā, lai izvairītos no bloķēšanas, kad ielādē attēlus "
 "no diska"
 
-#: ../clutter/deprecated/clutter-texture.c:1138
+#: ../clutter/deprecated/clutter-texture.c:1136
 msgid "Load data asynchronously"
 msgstr "Ielādēt datus asinhroni"
 
-#: ../clutter/deprecated/clutter-texture.c:1139
+#: ../clutter/deprecated/clutter-texture.c:1137
 msgid ""
 "Decode image data files inside a thread to reduce blocking when loading "
 "images from disk"
@@ -2578,195 +2662,191 @@ msgstr ""
 "Atšifrēt attēla datu datnes pavedienā, lai samazinātu bloķēšanu, kad ielādē "
 "attēlus no diska"
 
-#: ../clutter/deprecated/clutter-texture.c:1165
+#: ../clutter/deprecated/clutter-texture.c:1163
 msgid "Pick With Alpha"
 msgstr "Paņemt ar alfa"
 
-#: ../clutter/deprecated/clutter-texture.c:1166
+#: ../clutter/deprecated/clutter-texture.c:1164
 msgid "Shape actor with alpha channel when picking"
 msgstr "Formēt izpildītāju ar alfa kanālu, kad paņem"
 
-#: ../clutter/deprecated/clutter-texture.c:1599
-#: ../clutter/deprecated/clutter-texture.c:1994
-#: ../clutter/deprecated/clutter-texture.c:2090
-#: ../clutter/deprecated/clutter-texture.c:2388
+#: ../clutter/deprecated/clutter-texture.c:1597
+#: ../clutter/deprecated/clutter-texture.c:1992
+#: ../clutter/deprecated/clutter-texture.c:2088
+#: ../clutter/deprecated/clutter-texture.c:2386
 #, c-format
 msgid "Failed to load the image data"
 msgstr "Neizdevās ielādēt attēla datus"
 
-#: ../clutter/deprecated/clutter-texture.c:1758
+#: ../clutter/deprecated/clutter-texture.c:1756
 #, c-format
 msgid "YUV textures are not supported"
 msgstr "YUV tekstūras nav atbalstītas"
 
-#: ../clutter/deprecated/clutter-texture.c:1767
+#: ../clutter/deprecated/clutter-texture.c:1765
 #, c-format
 msgid "YUV2 textues are not supported"
 msgstr "YUV2 tekstūras nav atbalstītas"
 
-#: ../clutter/evdev/clutter-input-device-evdev.c:159
-msgid "sysfs Path"
-msgstr "sysfs ceļš"
-
-#: ../clutter/evdev/clutter-input-device-evdev.c:160
-msgid "Path of the device in sysfs"
-msgstr "sysfs ierīces ceļš"
-
-#: ../clutter/evdev/clutter-input-device-evdev.c:175
-msgid "Device Path"
-msgstr "Ierīces ceļš"
-
-#: ../clutter/evdev/clutter-input-device-evdev.c:176
-msgid "Path of the device node"
-msgstr "Ierīces mezgla ceļš"
-
-#: ../clutter/gdk/clutter-backend-gdk.c:296
+#: ../clutter/gdk/clutter-backend-gdk.c:289
 #, c-format
 msgid "Could not find a suitable CoglWinsys for a GdkDisplay of type %s"
 msgstr "Nevarēja atrast piemērotu CoglWinsys priekš GdkDisplay tipa %s"
 
-#: ../clutter/wayland/clutter-wayland-surface.c:423
+#: ../clutter/wayland/clutter-wayland-surface.c:419
 msgid "Surface"
 msgstr "Virsma"
 
-#: ../clutter/wayland/clutter-wayland-surface.c:424
+#: ../clutter/wayland/clutter-wayland-surface.c:420
 msgid "The underlying wayland surface"
 msgstr "Apakšējā wayland virsma"
 
-#: ../clutter/wayland/clutter-wayland-surface.c:431
+#: ../clutter/wayland/clutter-wayland-surface.c:427
 msgid "Surface width"
 msgstr "Virsmas platums"
 
-#: ../clutter/wayland/clutter-wayland-surface.c:432
+#: ../clutter/wayland/clutter-wayland-surface.c:428
 msgid "The width of the underlying wayland surface"
 msgstr "Apakšējās wayland virsmas platums"
 
-#: ../clutter/wayland/clutter-wayland-surface.c:440
+#: ../clutter/wayland/clutter-wayland-surface.c:436
 msgid "Surface height"
 msgstr "Virsmas augstums"
 
-#: ../clutter/wayland/clutter-wayland-surface.c:441
+#: ../clutter/wayland/clutter-wayland-surface.c:437
 msgid "The height of the underlying wayland surface"
 msgstr "Apakšējās wayland virsmas augstums"
 
-#: ../clutter/x11/clutter-backend-x11.c:516
+#: ../clutter/x11/clutter-backend-x11.c:488
 msgid "X display to use"
 msgstr "Lietojamais X displejs"
 
-#: ../clutter/x11/clutter-backend-x11.c:522
+#: ../clutter/x11/clutter-backend-x11.c:494
 msgid "X screen to use"
 msgstr "Izmantojamais X ekrāns"
 
-#: ../clutter/x11/clutter-backend-x11.c:527
+#: ../clutter/x11/clutter-backend-x11.c:499
 msgid "Make X calls synchronous"
 msgstr "Padarīt X izsaukumus sinhronus"
 
-#: ../clutter/x11/clutter-backend-x11.c:534
-msgid "Enable XInput support"
-msgstr "Aktivēt XInput atbalstu"
+#: ../clutter/x11/clutter-backend-x11.c:506
+msgid "Disable XInput support"
+msgstr "Deaktivēt XInput atbalstu"
 
-#: ../clutter/x11/clutter-keymap-x11.c:317
+#: ../clutter/x11/clutter-keymap-x11.c:458
 msgid "The Clutter backend"
 msgstr "Clutter aizmugure"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:539
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:534
 msgid "Pixmap"
 msgstr "Pikseļu karte"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:540
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:535
 msgid "The X11 Pixmap to be bound"
 msgstr "X11 pikseļu karte, ko saistīt"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:548
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:543
 msgid "Pixmap width"
 msgstr "Pikseļu kartes platums"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:549
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:544
 msgid "The width of the pixmap bound to this texture"
 msgstr "Platums pikseļu kartei, kas saistīta uz šīs tekstūras"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:557
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:552
 msgid "Pixmap height"
 msgstr "Pikseļu kartes augstums"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:558
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:553
 msgid "The height of the pixmap bound to this texture"
 msgstr "Augstums pikseļu kartei, kas saistīta uz šīs tekstūras"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:566
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:561
 msgid "Pixmap Depth"
 msgstr "Pikseļu kartes dziļums"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:567
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:562
 msgid "The depth (in number of bits) of the pixmap bound to this texture"
 msgstr ""
 "Dziļums (izteikts bitu skaitā) pikseļu kartei, kas saistīta uz šīs tekstūras"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:575
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:570
 msgid "Automatic Updates"
 msgstr "Automātiska atjaunināšana"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:576
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:571
 msgid "If the texture should be kept in sync with any pixmap changes."
 msgstr "Ja tekstūru jāuztur sinhronu ar jebkādām pikseļu kartes izmaiņām."
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:584
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:579
 msgid "Window"
 msgstr "Logs"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:585
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:580
 msgid "The X11 Window to be bound"
 msgstr "X11 logs, ko saistīt"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:593
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:588
 msgid "Window Redirect Automatic"
 msgstr "Loga pārsūtīšana automātiska"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:594
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:589
 msgid "If composite window redirects are set to Automatic (or Manual if false)"
 msgstr ""
 "Vai kompozītloga pārsūtījumi ir iestatīti kā Automātiski (vai Manuāli, ja "
 "aplams)"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:604
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:599
 msgid "Window Mapped"
 msgstr "Loga kartējums"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:605
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:600
 msgid "If window is mapped"
 msgstr "Vai logs ir kartēts"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:614
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:609
 msgid "Destroyed"
 msgstr "Iznīcināts"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:615
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:610
 msgid "If window has been destroyed"
 msgstr "Vai logs tika iznīcināts"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:623
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:618
 msgid "Window X"
 msgstr "Logs X"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:624
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:619
 msgid "X position of window on screen according to X11"
 msgstr "Loga X novietojums uz ekrāna, pēc X11"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:632
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:627
 msgid "Window Y"
 msgstr "Logs Y"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:633
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:628
 msgid "Y position of window on screen according to X11"
 msgstr "Loga Y novietojums uz ekrāna, pēc X11"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:640
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:635
 msgid "Window Override Redirect"
 msgstr "Loga pārrakstīšanas pārsūtīšana"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:641
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:636
 msgid "If this is an override-redirect window"
 msgstr "Vai šis ir pārrakstīšanas-pārsūtīšanas logs"
 
+#~ msgid "sysfs Path"
+#~ msgstr "sysfs ceļš"
+
+#~ msgid "Path of the device in sysfs"
+#~ msgstr "sysfs ierīces ceļš"
+
+#~ msgid "Device Path"
+#~ msgstr "Ierīces ceļš"
+
+#~ msgid "Path of the device node"
+#~ msgstr "Ierīces mezgla ceļš"
+
 #~ msgid "The layout manager used by the box"
 #~ msgstr "Izkārtojuma pārvaldnieks, ko izmanto kaste"
diff --git a/po/nb.po b/po/nb.po
index 07067e1c9..38044d387 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -1,14 +1,14 @@
 # Norwegian bokmål translation of clutter.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# Kjartan Maraas <kmaraas@gnome.org>, 2011-2012.
+# Kjartan Maraas <kmaraas@gnome.org>, 2011-2014.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: clutter 1.8.x\n"
+"Project-Id-Version: clutter 1.17.x\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=clutter\n"
-"POT-Creation-Date: 2012-07-10 13:16+0200\n"
-"PO-Revision-Date: 2012-07-10 13:26+0200\n"
+"POT-Creation-Date: 2014-02-12 20:26+0100\n"
+"PO-Revision-Date: 2014-02-12 20:29+0100\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian bokmål <i18n-nb@lister.ping.uio.no>\n"
 "Language: \n"
@@ -16,597 +16,702 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../clutter/clutter-actor.c:5649
+#: ../clutter/clutter-actor.c:6214
 msgid "X coordinate"
 msgstr "X-koordinat"
 
-#: ../clutter/clutter-actor.c:5650
+#: ../clutter/clutter-actor.c:6215
 msgid "X coordinate of the actor"
 msgstr "X-koordinat for aktøren"
 
-#: ../clutter/clutter-actor.c:5668
+#: ../clutter/clutter-actor.c:6233
 msgid "Y coordinate"
 msgstr "Y-koordinat"
 
-#: ../clutter/clutter-actor.c:5669
+#: ../clutter/clutter-actor.c:6234
 msgid "Y coordinate of the actor"
 msgstr "Y-koordinat for aktøren"
 
-#: ../clutter/clutter-actor.c:5691
+#: ../clutter/clutter-actor.c:6256
 msgid "Position"
 msgstr "Posisjon"
 
-#: ../clutter/clutter-actor.c:5692
+#: ../clutter/clutter-actor.c:6257
 #, fuzzy
 msgid "The position of the origin of the actor"
 msgstr "Farge på kanten av rektangelet"
 
-#: ../clutter/clutter-actor.c:5709 ../clutter/clutter-canvas.c:215
-#: ../clutter/clutter-grid-layout.c:1238
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:480
+#: ../clutter/clutter-actor.c:6274 ../clutter/clutter-canvas.c:247
+#: ../clutter/clutter-grid-layout.c:1239
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:474
 msgid "Width"
 msgstr "Bredde"
 
-#: ../clutter/clutter-actor.c:5710
+#: ../clutter/clutter-actor.c:6275
 msgid "Width of the actor"
 msgstr "Bredde på aktøren"
 
-#: ../clutter/clutter-actor.c:5728 ../clutter/clutter-canvas.c:231
-#: ../clutter/clutter-grid-layout.c:1245
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:496
+#: ../clutter/clutter-actor.c:6293 ../clutter/clutter-canvas.c:263
+#: ../clutter/clutter-grid-layout.c:1246
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:490
 msgid "Height"
 msgstr "Høyde"
 
-#: ../clutter/clutter-actor.c:5729
+#: ../clutter/clutter-actor.c:6294
 msgid "Height of the actor"
 msgstr "Høyde på aktøren"
 
-#: ../clutter/clutter-actor.c:5750
+#: ../clutter/clutter-actor.c:6315
 msgid "Size"
 msgstr "Størrelse"
 
-#: ../clutter/clutter-actor.c:5751
+#: ../clutter/clutter-actor.c:6316
 msgid "The size of the actor"
 msgstr "Størrelse på aktøren"
 
-#: ../clutter/clutter-actor.c:5769
+#: ../clutter/clutter-actor.c:6334
 msgid "Fixed X"
 msgstr "Fast X"
 
-#: ../clutter/clutter-actor.c:5770
+#: ../clutter/clutter-actor.c:6335
 msgid "Forced X position of the actor"
 msgstr "Tvunget X-posisjon for aktøren"
 
-#: ../clutter/clutter-actor.c:5787
+#: ../clutter/clutter-actor.c:6352
 msgid "Fixed Y"
 msgstr "Fast Y"
 
-#: ../clutter/clutter-actor.c:5788
+#: ../clutter/clutter-actor.c:6353
 msgid "Forced Y position of the actor"
 msgstr "Tvunget Y-posisjon for aktøren"
 
-#: ../clutter/clutter-actor.c:5803
+#: ../clutter/clutter-actor.c:6368
 msgid "Fixed position set"
 msgstr "Fast posisjon satt"
 
-#: ../clutter/clutter-actor.c:5804
+#: ../clutter/clutter-actor.c:6369
 msgid "Whether to use fixed positioning for the actor"
 msgstr ""
 
-#: ../clutter/clutter-actor.c:5822
+#: ../clutter/clutter-actor.c:6387
 msgid "Min Width"
 msgstr "Minste bredde"
 
-#: ../clutter/clutter-actor.c:5823
+#: ../clutter/clutter-actor.c:6388
 msgid "Forced minimum width request for the actor"
 msgstr ""
 
-#: ../clutter/clutter-actor.c:5841
+#: ../clutter/clutter-actor.c:6406
 msgid "Min Height"
 msgstr "Minste høyde"
 
-#: ../clutter/clutter-actor.c:5842
+#: ../clutter/clutter-actor.c:6407
 msgid "Forced minimum height request for the actor"
 msgstr ""
 
-#: ../clutter/clutter-actor.c:5860
+#: ../clutter/clutter-actor.c:6425
 msgid "Natural Width"
 msgstr "Naturlig bredde"
 
-#: ../clutter/clutter-actor.c:5861
+#: ../clutter/clutter-actor.c:6426
 msgid "Forced natural width request for the actor"
 msgstr ""
 
-#: ../clutter/clutter-actor.c:5879
+#: ../clutter/clutter-actor.c:6444
 msgid "Natural Height"
 msgstr "Naturlig høyde"
 
-#: ../clutter/clutter-actor.c:5880
+#: ../clutter/clutter-actor.c:6445
 msgid "Forced natural height request for the actor"
 msgstr ""
 
-#: ../clutter/clutter-actor.c:5895
+#: ../clutter/clutter-actor.c:6460
 msgid "Minimum width set"
 msgstr "Minimum bredde satt"
 
-#: ../clutter/clutter-actor.c:5896
+#: ../clutter/clutter-actor.c:6461
 msgid "Whether to use the min-width property"
 msgstr ""
 
-#: ../clutter/clutter-actor.c:5910
+#: ../clutter/clutter-actor.c:6475
 msgid "Minimum height set"
 msgstr "Minimum høyde satt"
 
-#: ../clutter/clutter-actor.c:5911
+#: ../clutter/clutter-actor.c:6476
 msgid "Whether to use the min-height property"
 msgstr ""
 
-#: ../clutter/clutter-actor.c:5925
+#: ../clutter/clutter-actor.c:6490
 msgid "Natural width set"
 msgstr "Naturlig bredde satt"
 
-#: ../clutter/clutter-actor.c:5926
+#: ../clutter/clutter-actor.c:6491
 msgid "Whether to use the natural-width property"
 msgstr ""
 
-#: ../clutter/clutter-actor.c:5940
+#: ../clutter/clutter-actor.c:6505
 msgid "Natural height set"
 msgstr "Naturlig høyde satt"
 
-#: ../clutter/clutter-actor.c:5941
+#: ../clutter/clutter-actor.c:6506
 msgid "Whether to use the natural-height property"
 msgstr ""
 
-#: ../clutter/clutter-actor.c:5957
+#: ../clutter/clutter-actor.c:6522
 msgid "Allocation"
 msgstr "Allokering"
 
-#: ../clutter/clutter-actor.c:5958
+#: ../clutter/clutter-actor.c:6523
 msgid "The actor's allocation"
-msgstr ""
+msgstr "Allokering for aktør"
 
-#: ../clutter/clutter-actor.c:6015
+#: ../clutter/clutter-actor.c:6580
 msgid "Request Mode"
 msgstr ""
 
-#: ../clutter/clutter-actor.c:6016
+#: ../clutter/clutter-actor.c:6581
 msgid "The actor's request mode"
 msgstr ""
 
-#: ../clutter/clutter-actor.c:6035
+#: ../clutter/clutter-actor.c:6605
 msgid "Depth"
 msgstr "Dybde"
 
-#: ../clutter/clutter-actor.c:6036
+#: ../clutter/clutter-actor.c:6606
 msgid "Position on the Z axis"
-msgstr "Posisjonn på Z-aksen"
+msgstr "Posisjon på Z-aksen"
 
-#: ../clutter/clutter-actor.c:6053
+#: ../clutter/clutter-actor.c:6633
+msgid "Z Position"
+msgstr "Z-posisjon"
+
+#: ../clutter/clutter-actor.c:6634
+msgid "The actor's position on the Z axis"
+msgstr "Aktørens posisjon på Z-aksen"
+
+#: ../clutter/clutter-actor.c:6651
 msgid "Opacity"
 msgstr "Ugjennomsiktighet"
 
-#: ../clutter/clutter-actor.c:6054
+#: ../clutter/clutter-actor.c:6652
 msgid "Opacity of an actor"
 msgstr ""
 
-#: ../clutter/clutter-actor.c:6074
+#: ../clutter/clutter-actor.c:6672
 msgid "Offscreen redirect"
 msgstr ""
 
-#: ../clutter/clutter-actor.c:6075
+#: ../clutter/clutter-actor.c:6673
 msgid "Flags controlling when to flatten the actor into a single image"
 msgstr ""
 
-#: ../clutter/clutter-actor.c:6089
+#: ../clutter/clutter-actor.c:6687
 msgid "Visible"
 msgstr "Synlig"
 
-#: ../clutter/clutter-actor.c:6090
+#: ../clutter/clutter-actor.c:6688
 msgid "Whether the actor is visible or not"
 msgstr ""
 
-#: ../clutter/clutter-actor.c:6104
+#: ../clutter/clutter-actor.c:6702
 msgid "Mapped"
 msgstr ""
 
-#: ../clutter/clutter-actor.c:6105
+#: ../clutter/clutter-actor.c:6703
 msgid "Whether the actor will be painted"
 msgstr ""
 
-#: ../clutter/clutter-actor.c:6118
+#: ../clutter/clutter-actor.c:6716
 msgid "Realized"
 msgstr "Realisert"
 
-#: ../clutter/clutter-actor.c:6119
+#: ../clutter/clutter-actor.c:6717
 msgid "Whether the actor has been realized"
 msgstr ""
 
-#: ../clutter/clutter-actor.c:6134
+#: ../clutter/clutter-actor.c:6732
 msgid "Reactive"
 msgstr "Reaktiv"
 
-#: ../clutter/clutter-actor.c:6135
+#: ../clutter/clutter-actor.c:6733
 msgid "Whether the actor is reactive to events"
 msgstr ""
 
-#: ../clutter/clutter-actor.c:6146
+#: ../clutter/clutter-actor.c:6744
 msgid "Has Clip"
 msgstr ""
 
-#: ../clutter/clutter-actor.c:6147
+#: ../clutter/clutter-actor.c:6745
 msgid "Whether the actor has a clip set"
 msgstr ""
 
-#: ../clutter/clutter-actor.c:6161
+#: ../clutter/clutter-actor.c:6758
 msgid "Clip"
 msgstr ""
 
-#: ../clutter/clutter-actor.c:6162
+#: ../clutter/clutter-actor.c:6759
 msgid "The clip region for the actor"
 msgstr ""
 
-#: ../clutter/clutter-actor.c:6175 ../clutter/clutter-actor-meta.c:207
-#: ../clutter/clutter-binding-pool.c:319 ../clutter/clutter-input-device.c:236
+#: ../clutter/clutter-actor.c:6778
+msgid "Clip Rectangle"
+msgstr ""
+
+#: ../clutter/clutter-actor.c:6779
+#, fuzzy
+msgid "The visible region of the actor"
+msgstr "Størrelse på aktøren"
+
+#: ../clutter/clutter-actor.c:6793 ../clutter/clutter-actor-meta.c:205
+#: ../clutter/clutter-binding-pool.c:319 ../clutter/clutter-input-device.c:247
 msgid "Name"
 msgstr "Navn"
 
-#: ../clutter/clutter-actor.c:6176
+#: ../clutter/clutter-actor.c:6794
 msgid "Name of the actor"
+msgstr "Navn på aktør"
+
+#: ../clutter/clutter-actor.c:6815
+msgid "Pivot Point"
 msgstr ""
 
-#: ../clutter/clutter-actor.c:6191
+#: ../clutter/clutter-actor.c:6816
+msgid "The point around which the scaling and rotation occur"
+msgstr ""
+
+#: ../clutter/clutter-actor.c:6834
+msgid "Pivot Point Z"
+msgstr ""
+
+#: ../clutter/clutter-actor.c:6835
+#, fuzzy
+msgid "Z component of the pivot point"
+msgstr "X-koordinat for ankerpunkt"
+
+#: ../clutter/clutter-actor.c:6853
 msgid "Scale X"
 msgstr ""
 
-#: ../clutter/clutter-actor.c:6192
+#: ../clutter/clutter-actor.c:6854
 msgid "Scale factor on the X axis"
 msgstr ""
 
-#: ../clutter/clutter-actor.c:6210
+#: ../clutter/clutter-actor.c:6872
 msgid "Scale Y"
 msgstr ""
 
-#: ../clutter/clutter-actor.c:6211
+#: ../clutter/clutter-actor.c:6873
 msgid "Scale factor on the Y axis"
 msgstr ""
 
-#: ../clutter/clutter-actor.c:6227
+#: ../clutter/clutter-actor.c:6891
+msgid "Scale Z"
+msgstr ""
+
+#: ../clutter/clutter-actor.c:6892
+#, fuzzy
+msgid "Scale factor on the Z axis"
+msgstr "Posisjonn på Z-aksen"
+
+#: ../clutter/clutter-actor.c:6910
 msgid "Scale Center X"
 msgstr ""
 
-#: ../clutter/clutter-actor.c:6228
+#: ../clutter/clutter-actor.c:6911
 msgid "Horizontal scale center"
 msgstr ""
 
-#: ../clutter/clutter-actor.c:6242
+#: ../clutter/clutter-actor.c:6929
 msgid "Scale Center Y"
 msgstr ""
 
-#: ../clutter/clutter-actor.c:6243
+#: ../clutter/clutter-actor.c:6930
 msgid "Vertical scale center"
 msgstr ""
 
-#: ../clutter/clutter-actor.c:6257
+#: ../clutter/clutter-actor.c:6948
 msgid "Scale Gravity"
 msgstr ""
 
-#: ../clutter/clutter-actor.c:6258
+#: ../clutter/clutter-actor.c:6949
 msgid "The center of scaling"
 msgstr ""
 
-#: ../clutter/clutter-actor.c:6274
+#: ../clutter/clutter-actor.c:6967
 msgid "Rotation Angle X"
 msgstr ""
 
-#: ../clutter/clutter-actor.c:6275
+#: ../clutter/clutter-actor.c:6968
 msgid "The rotation angle on the X axis"
 msgstr ""
 
-#: ../clutter/clutter-actor.c:6293
+#: ../clutter/clutter-actor.c:6986
 msgid "Rotation Angle Y"
 msgstr ""
 
-#: ../clutter/clutter-actor.c:6294
+#: ../clutter/clutter-actor.c:6987
 msgid "The rotation angle on the Y axis"
 msgstr ""
 
-#: ../clutter/clutter-actor.c:6312
+#: ../clutter/clutter-actor.c:7005
 msgid "Rotation Angle Z"
 msgstr ""
 
-#: ../clutter/clutter-actor.c:6313
+#: ../clutter/clutter-actor.c:7006
 msgid "The rotation angle on the Z axis"
 msgstr ""
 
-#: ../clutter/clutter-actor.c:6329
+#: ../clutter/clutter-actor.c:7024
 msgid "Rotation Center X"
 msgstr ""
 
-#: ../clutter/clutter-actor.c:6330
+#: ../clutter/clutter-actor.c:7025
 msgid "The rotation center on the X axis"
 msgstr ""
 
-#: ../clutter/clutter-actor.c:6343
+#: ../clutter/clutter-actor.c:7042
 msgid "Rotation Center Y"
 msgstr ""
 
-#: ../clutter/clutter-actor.c:6344
+#: ../clutter/clutter-actor.c:7043
 msgid "The rotation center on the Y axis"
 msgstr ""
 
-#: ../clutter/clutter-actor.c:6357
+#: ../clutter/clutter-actor.c:7060
 msgid "Rotation Center Z"
 msgstr ""
 
-#: ../clutter/clutter-actor.c:6358
+#: ../clutter/clutter-actor.c:7061
 msgid "The rotation center on the Z axis"
 msgstr ""
 
-#: ../clutter/clutter-actor.c:6371
+#: ../clutter/clutter-actor.c:7078
 msgid "Rotation Center Z Gravity"
 msgstr ""
 
-#: ../clutter/clutter-actor.c:6372
+#: ../clutter/clutter-actor.c:7079
 msgid "Center point for rotation around the Z axis"
 msgstr ""
 
-#: ../clutter/clutter-actor.c:6387
+#: ../clutter/clutter-actor.c:7107
 msgid "Anchor X"
 msgstr "Anker X"
 
-#: ../clutter/clutter-actor.c:6388
+#: ../clutter/clutter-actor.c:7108
 msgid "X coordinate of the anchor point"
 msgstr "X-koordinat for ankerpunkt"
 
-#: ../clutter/clutter-actor.c:6403
+#: ../clutter/clutter-actor.c:7136
 msgid "Anchor Y"
 msgstr "Anker Y"
 
-#: ../clutter/clutter-actor.c:6404
+#: ../clutter/clutter-actor.c:7137
 msgid "Y coordinate of the anchor point"
 msgstr "Y-koordinat for ankerpunkt"
 
-#: ../clutter/clutter-actor.c:6418
+#: ../clutter/clutter-actor.c:7164
 msgid "Anchor Gravity"
 msgstr ""
 
-#: ../clutter/clutter-actor.c:6419
+#: ../clutter/clutter-actor.c:7165
 msgid "The anchor point as a ClutterGravity"
 msgstr ""
 
-#: ../clutter/clutter-actor.c:6436
+#: ../clutter/clutter-actor.c:7184
+#, fuzzy
+msgid "Translation X"
+msgstr "Oversettelsesdomene"
+
+#: ../clutter/clutter-actor.c:7185
+#, fuzzy
+msgid "Translation along the X axis"
+msgstr "Posisjon på Z-aksen"
+
+#: ../clutter/clutter-actor.c:7204
+#, fuzzy
+msgid "Translation Y"
+msgstr "Oversettelsesdomene"
+
+#: ../clutter/clutter-actor.c:7205
+msgid "Translation along the Y axis"
+msgstr "Posisjon på Z-aksen"
+
+#: ../clutter/clutter-actor.c:7224
+#, fuzzy
+msgid "Translation Z"
+msgstr "Oversettelsesdomene"
+
+#: ../clutter/clutter-actor.c:7225
+msgid "Translation along the Z axis"
+msgstr "Posisjon på Z-aksen"
+
+#: ../clutter/clutter-actor.c:7255
+msgid "Transform"
+msgstr "Transformer"
+
+#: ../clutter/clutter-actor.c:7256
+msgid "Transformation matrix"
+msgstr "Transformeringsmatrise"
+
+#: ../clutter/clutter-actor.c:7271
+msgid "Transform Set"
+msgstr ""
+
+#: ../clutter/clutter-actor.c:7272
+#, fuzzy
+msgid "Whether the transform property is set"
+msgstr "Om bakgrunnsfarge er satt"
+
+#: ../clutter/clutter-actor.c:7293
+msgid "Child Transform"
+msgstr ""
+
+#: ../clutter/clutter-actor.c:7294
+msgid "Children transformation matrix"
+msgstr ""
+
+#: ../clutter/clutter-actor.c:7309
+msgid "Child Transform Set"
+msgstr ""
+
+#: ../clutter/clutter-actor.c:7310
+#, fuzzy
+msgid "Whether the child-transform property is set"
+msgstr "Om bakgrunnsfarge er satt"
+
+#: ../clutter/clutter-actor.c:7327
 msgid "Show on set parent"
 msgstr ""
 
-#: ../clutter/clutter-actor.c:6437
+#: ../clutter/clutter-actor.c:7328
 msgid "Whether the actor is shown when parented"
 msgstr ""
 
-#: ../clutter/clutter-actor.c:6454
+#: ../clutter/clutter-actor.c:7345
 msgid "Clip to Allocation"
 msgstr ""
 
-#: ../clutter/clutter-actor.c:6455
+#: ../clutter/clutter-actor.c:7346
 msgid "Sets the clip region to track the actor's allocation"
 msgstr ""
 
-#: ../clutter/clutter-actor.c:6468
+#: ../clutter/clutter-actor.c:7359
 msgid "Text Direction"
 msgstr "Tekstretning"
 
-#: ../clutter/clutter-actor.c:6469
+#: ../clutter/clutter-actor.c:7360
 msgid "Direction of the text"
 msgstr "Retning for teksten"
 
-#: ../clutter/clutter-actor.c:6484
+#: ../clutter/clutter-actor.c:7375
 msgid "Has Pointer"
 msgstr "Har peker"
 
-#: ../clutter/clutter-actor.c:6485
+#: ../clutter/clutter-actor.c:7376
 msgid "Whether the actor contains the pointer of an input device"
 msgstr ""
 
-#: ../clutter/clutter-actor.c:6498
+#: ../clutter/clutter-actor.c:7389
 msgid "Actions"
-msgstr "Hendlinger"
+msgstr "Handlinger"
 
-#: ../clutter/clutter-actor.c:6499
+#: ../clutter/clutter-actor.c:7390
 msgid "Adds an action to the actor"
 msgstr ""
 
-#: ../clutter/clutter-actor.c:6512
+#: ../clutter/clutter-actor.c:7403
 msgid "Constraints"
 msgstr "Begrensninger"
 
-#: ../clutter/clutter-actor.c:6513
+#: ../clutter/clutter-actor.c:7404
 msgid "Adds a constraint to the actor"
 msgstr ""
 
-#: ../clutter/clutter-actor.c:6526
+#: ../clutter/clutter-actor.c:7417
 msgid "Effect"
 msgstr "Effekt"
 
-#: ../clutter/clutter-actor.c:6527
+#: ../clutter/clutter-actor.c:7418
 msgid "Add an effect to be applied on the actor"
 msgstr ""
 
-#: ../clutter/clutter-actor.c:6541
+#: ../clutter/clutter-actor.c:7432
 msgid "Layout Manager"
 msgstr "Utformingshåndterer"
 
-#: ../clutter/clutter-actor.c:6542
+#: ../clutter/clutter-actor.c:7433
 msgid "The object controlling the layout of an actor's children"
 msgstr ""
 
-#: ../clutter/clutter-actor.c:6556
+#: ../clutter/clutter-actor.c:7447
 msgid "X Expand"
 msgstr "Utvid X"
 
-#: ../clutter/clutter-actor.c:6557
+#: ../clutter/clutter-actor.c:7448
 #, fuzzy
 msgid "Whether extra horizontal space should be assigned to the actor"
 msgstr "Om overflaten skal være lik allokering"
 
-#: ../clutter/clutter-actor.c:6572
+#: ../clutter/clutter-actor.c:7463
 msgid "Y Expand"
 msgstr "Utvid Y"
 
-#: ../clutter/clutter-actor.c:6573
+#: ../clutter/clutter-actor.c:7464
 #, fuzzy
 msgid "Whether extra vertical space should be assigned to the actor"
 msgstr "Om overflaten skal være lik allokering"
 
-#: ../clutter/clutter-actor.c:6589
+#: ../clutter/clutter-actor.c:7480
 msgid "X Alignment"
 msgstr "X-justering"
 
-#: ../clutter/clutter-actor.c:6590
+#: ../clutter/clutter-actor.c:7481
 msgid "The alignment of the actor on the X axis within its allocation"
 msgstr ""
 
-#: ../clutter/clutter-actor.c:6605
+#: ../clutter/clutter-actor.c:7496
 msgid "Y Alignment"
 msgstr "Y-justering"
 
-#: ../clutter/clutter-actor.c:6606
+#: ../clutter/clutter-actor.c:7497
 msgid "The alignment of the actor on the Y axis within its allocation"
 msgstr ""
 
-#: ../clutter/clutter-actor.c:6625
+#: ../clutter/clutter-actor.c:7516
 msgid "Margin Top"
 msgstr "Toppmarg"
 
-#: ../clutter/clutter-actor.c:6626
+#: ../clutter/clutter-actor.c:7517
 msgid "Extra space at the top"
 msgstr "Ekstra plass på toppen"
 
-#: ../clutter/clutter-actor.c:6647
+#: ../clutter/clutter-actor.c:7538
 msgid "Margin Bottom"
 msgstr "Bunnmarg"
 
-#: ../clutter/clutter-actor.c:6648
+#: ../clutter/clutter-actor.c:7539
 msgid "Extra space at the bottom"
 msgstr "Ekstra plass nederst"
 
-#: ../clutter/clutter-actor.c:6669
+#: ../clutter/clutter-actor.c:7560
 msgid "Margin Left"
 msgstr "Venstre marg"
 
-#: ../clutter/clutter-actor.c:6670
+#: ../clutter/clutter-actor.c:7561
 msgid "Extra space at the left"
 msgstr "Ekstra plass til venstre"
 
-#: ../clutter/clutter-actor.c:6691
+#: ../clutter/clutter-actor.c:7582
 msgid "Margin Right"
 msgstr "Høyre marg"
 
-#: ../clutter/clutter-actor.c:6692
+#: ../clutter/clutter-actor.c:7583
 msgid "Extra space at the right"
 msgstr "Ekstra plass til høyre"
 
-#: ../clutter/clutter-actor.c:6708
+#: ../clutter/clutter-actor.c:7599
 msgid "Background Color Set"
 msgstr "Bakgrunnsfarge satt"
 
-#: ../clutter/clutter-actor.c:6709 ../clutter/deprecated/clutter-box.c:275
+#: ../clutter/clutter-actor.c:7600 ../clutter/deprecated/clutter-box.c:271
 msgid "Whether the background color is set"
 msgstr "Om bakgrunnsfarge er satt"
 
-#: ../clutter/clutter-actor.c:6725
+#: ../clutter/clutter-actor.c:7616
 msgid "Background color"
 msgstr "Bakgrunnsfarge"
 
-#: ../clutter/clutter-actor.c:6726
+#: ../clutter/clutter-actor.c:7617
 msgid "The actor's background color"
 msgstr "Bakgrunnsfarge for aktøren"
 
-#: ../clutter/clutter-actor.c:6741
+#: ../clutter/clutter-actor.c:7632
 msgid "First Child"
 msgstr "Første barn"
 
-#: ../clutter/clutter-actor.c:6742
+#: ../clutter/clutter-actor.c:7633
 msgid "The actor's first child"
 msgstr "Aktørens første barn"
 
-#: ../clutter/clutter-actor.c:6755
+#: ../clutter/clutter-actor.c:7646
 msgid "Last Child"
 msgstr "Siste barn"
 
-#: ../clutter/clutter-actor.c:6756
+#: ../clutter/clutter-actor.c:7647
 msgid "The actor's last child"
 msgstr "Aktørens siste barn"
 
-#: ../clutter/clutter-actor.c:6770
+#: ../clutter/clutter-actor.c:7661
 msgid "Content"
 msgstr "Innhold"
 
-#: ../clutter/clutter-actor.c:6771
+#: ../clutter/clutter-actor.c:7662
 msgid "Delegate object for painting the actor's content"
 msgstr ""
 
-#: ../clutter/clutter-actor.c:6796
+#: ../clutter/clutter-actor.c:7687
 msgid "Content Gravity"
 msgstr "Gravitet for innholdet"
 
-#: ../clutter/clutter-actor.c:6797
+#: ../clutter/clutter-actor.c:7688
 msgid "Alignment of the actor's content"
 msgstr ""
 
-#: ../clutter/clutter-actor.c:6817
+#: ../clutter/clutter-actor.c:7708
 msgid "Content Box"
 msgstr "Innholdsboks"
 
-#: ../clutter/clutter-actor.c:6818
+#: ../clutter/clutter-actor.c:7709
 msgid "The bounding box of the actor's content"
 msgstr ""
 
-#: ../clutter/clutter-actor.c:6826
+#: ../clutter/clutter-actor.c:7717
 msgid "Minification Filter"
 msgstr ""
 
-#: ../clutter/clutter-actor.c:6827
+#: ../clutter/clutter-actor.c:7718
 msgid "The filter used when reducing the size of the content"
 msgstr ""
 
-#: ../clutter/clutter-actor.c:6834
+#: ../clutter/clutter-actor.c:7725
 msgid "Magnification Filter"
 msgstr ""
 
-#: ../clutter/clutter-actor.c:6835
+#: ../clutter/clutter-actor.c:7726
 msgid "The filter used when increasing the size of the content"
 msgstr ""
 
-#: ../clutter/clutter-actor.c:6849
+#: ../clutter/clutter-actor.c:7740
 msgid "Content Repeat"
 msgstr ""
 
-#: ../clutter/clutter-actor.c:6850
+#: ../clutter/clutter-actor.c:7741
 msgid "The repeat policy for the actor's content"
 msgstr ""
 
-#: ../clutter/clutter-actor-meta.c:193 ../clutter/clutter-child-meta.c:142
+#: ../clutter/clutter-actor-meta.c:191 ../clutter/clutter-child-meta.c:142
 msgid "Actor"
 msgstr "Aktør"
 
-#: ../clutter/clutter-actor-meta.c:194
+#: ../clutter/clutter-actor-meta.c:192
 msgid "The actor attached to the meta"
 msgstr ""
 
-#: ../clutter/clutter-actor-meta.c:208
+#: ../clutter/clutter-actor-meta.c:206
 msgid "The name of the meta"
 msgstr ""
 
-#: ../clutter/clutter-actor-meta.c:221 ../clutter/clutter-input-device.c:315
-#: ../clutter/deprecated/clutter-shader.c:313
+#: ../clutter/clutter-actor-meta.c:219 ../clutter/clutter-input-device.c:326
+#: ../clutter/deprecated/clutter-shader.c:309
 msgid "Enabled"
 msgstr "Aktivert"
 
-#: ../clutter/clutter-actor-meta.c:222
+#: ../clutter/clutter-actor-meta.c:220
 msgid "Whether the meta is enabled"
 msgstr ""
 
 #: ../clutter/clutter-align-constraint.c:279
-#: ../clutter/clutter-bind-constraint.c:358 ../clutter/clutter-clone.c:345
+#: ../clutter/clutter-bind-constraint.c:358 ../clutter/clutter-clone.c:341
 #: ../clutter/clutter-snap-constraint.c:321
 msgid "Source"
 msgstr "Kilde"
@@ -632,11 +737,11 @@ msgstr "Faktor"
 msgid "The alignment factor, between 0.0 and 1.0"
 msgstr ""
 
-#: ../clutter/clutter-backend.c:376
+#: ../clutter/clutter-backend.c:380
 msgid "Unable to initialize the Clutter backend"
 msgstr ""
 
-#: ../clutter/clutter-backend.c:450
+#: ../clutter/clutter-backend.c:454
 #, c-format
 msgid "The backend of type '%s' does not support creating multiple stages"
 msgstr ""
@@ -667,147 +772,192 @@ msgstr ""
 msgid "The unique name of the binding pool"
 msgstr ""
 
-#: ../clutter/clutter-bin-layout.c:240 ../clutter/clutter-bin-layout.c:644
-#: ../clutter/clutter-box-layout.c:370 ../clutter/clutter-table-layout.c:602
+#: ../clutter/clutter-bin-layout.c:238 ../clutter/clutter-bin-layout.c:651
+#: ../clutter/clutter-box-layout.c:388
+#: ../clutter/deprecated/clutter-table-layout.c:610
 msgid "Horizontal Alignment"
 msgstr "Horisontal justering"
 
-#: ../clutter/clutter-bin-layout.c:241
+#: ../clutter/clutter-bin-layout.c:239
 msgid "Horizontal alignment for the actor inside the layout manager"
 msgstr ""
 
-#: ../clutter/clutter-bin-layout.c:249 ../clutter/clutter-bin-layout.c:664
-#: ../clutter/clutter-box-layout.c:379 ../clutter/clutter-table-layout.c:617
+#: ../clutter/clutter-bin-layout.c:247 ../clutter/clutter-bin-layout.c:671
+#: ../clutter/clutter-box-layout.c:397
+#: ../clutter/deprecated/clutter-table-layout.c:625
 msgid "Vertical Alignment"
 msgstr "Vertikal justering"
 
-#: ../clutter/clutter-bin-layout.c:250
+#: ../clutter/clutter-bin-layout.c:248
 msgid "Vertical alignment for the actor inside the layout manager"
 msgstr ""
 
-#: ../clutter/clutter-bin-layout.c:645
+#: ../clutter/clutter-bin-layout.c:652
 msgid "Default horizontal alignment for the actors inside the layout manager"
 msgstr ""
 
-#: ../clutter/clutter-bin-layout.c:665
+#: ../clutter/clutter-bin-layout.c:672
 msgid "Default vertical alignment for the actors inside the layout manager"
 msgstr ""
 
-#: ../clutter/clutter-box-layout.c:345
+#: ../clutter/clutter-box-layout.c:363
 msgid "Expand"
 msgstr "Utvid"
 
-#: ../clutter/clutter-box-layout.c:346
+#: ../clutter/clutter-box-layout.c:364
 msgid "Allocate extra space for the child"
 msgstr "Alloker ekstra plass for barn"
 
-#: ../clutter/clutter-box-layout.c:352 ../clutter/clutter-table-layout.c:581
+#: ../clutter/clutter-box-layout.c:370
+#: ../clutter/deprecated/clutter-table-layout.c:589
 msgid "Horizontal Fill"
 msgstr "Horisontalt fyll"
 
-#: ../clutter/clutter-box-layout.c:353 ../clutter/clutter-table-layout.c:582
+#: ../clutter/clutter-box-layout.c:371
+#: ../clutter/deprecated/clutter-table-layout.c:590
 msgid ""
 "Whether the child should receive priority when the container is allocating "
 "spare space on the horizontal axis"
 msgstr ""
 
-#: ../clutter/clutter-box-layout.c:361 ../clutter/clutter-table-layout.c:588
+#: ../clutter/clutter-box-layout.c:379
+#: ../clutter/deprecated/clutter-table-layout.c:596
 msgid "Vertical Fill"
 msgstr "Vertikalt fyll"
 
-#: ../clutter/clutter-box-layout.c:362 ../clutter/clutter-table-layout.c:589
+#: ../clutter/clutter-box-layout.c:380
+#: ../clutter/deprecated/clutter-table-layout.c:597
 msgid ""
 "Whether the child should receive priority when the container is allocating "
 "spare space on the vertical axis"
 msgstr ""
 
-#: ../clutter/clutter-box-layout.c:371 ../clutter/clutter-table-layout.c:603
+#: ../clutter/clutter-box-layout.c:389
+#: ../clutter/deprecated/clutter-table-layout.c:611
 msgid "Horizontal alignment of the actor within the cell"
 msgstr ""
 
-#: ../clutter/clutter-box-layout.c:380 ../clutter/clutter-table-layout.c:618
+#: ../clutter/clutter-box-layout.c:398
+#: ../clutter/deprecated/clutter-table-layout.c:626
 msgid "Vertical alignment of the actor within the cell"
 msgstr ""
 
-#: ../clutter/clutter-box-layout.c:1223
+#: ../clutter/clutter-box-layout.c:1359
 msgid "Vertical"
 msgstr "Vertikal"
 
-#: ../clutter/clutter-box-layout.c:1224
+#: ../clutter/clutter-box-layout.c:1360
 msgid "Whether the layout should be vertical, rather than horizontal"
 msgstr ""
 
-#: ../clutter/clutter-box-layout.c:1241 ../clutter/clutter-flow-layout.c:910
-#: ../clutter/clutter-grid-layout.c:1566
+#: ../clutter/clutter-box-layout.c:1377 ../clutter/clutter-flow-layout.c:942
+#: ../clutter/clutter-grid-layout.c:1549
 msgid "Orientation"
 msgstr "Orientering"
 
-#: ../clutter/clutter-box-layout.c:1242 ../clutter/clutter-flow-layout.c:911
-#: ../clutter/clutter-grid-layout.c:1567
+#: ../clutter/clutter-box-layout.c:1378 ../clutter/clutter-flow-layout.c:943
+#: ../clutter/clutter-grid-layout.c:1550
 msgid "The orientation of the layout"
 msgstr "Orientering for utformingen"
 
-#: ../clutter/clutter-box-layout.c:1258 ../clutter/clutter-flow-layout.c:926
+#: ../clutter/clutter-box-layout.c:1394 ../clutter/clutter-flow-layout.c:958
 msgid "Homogeneous"
 msgstr "Homogen"
 
-#: ../clutter/clutter-box-layout.c:1259
+#: ../clutter/clutter-box-layout.c:1395
 msgid ""
 "Whether the layout should be homogeneous, i.e. all childs get the same size"
 msgstr ""
 
-#: ../clutter/clutter-box-layout.c:1274
+#: ../clutter/clutter-box-layout.c:1410
 msgid "Pack Start"
 msgstr ""
 
-#: ../clutter/clutter-box-layout.c:1275
+#: ../clutter/clutter-box-layout.c:1411
 msgid "Whether to pack items at the start of the box"
 msgstr ""
 
-#: ../clutter/clutter-box-layout.c:1288
+#: ../clutter/clutter-box-layout.c:1424
 msgid "Spacing"
 msgstr "Mellomrom"
 
-#: ../clutter/clutter-box-layout.c:1289
+#: ../clutter/clutter-box-layout.c:1425
 msgid "Spacing between children"
 msgstr "Mellomrom mellom barn"
 
-#: ../clutter/clutter-box-layout.c:1296
-#: ../clutter/clutter-layout-manager.c:744
-#: ../clutter/clutter-table-layout.c:1637
+#: ../clutter/clutter-box-layout.c:1442
+#: ../clutter/deprecated/clutter-table-layout.c:1677
+msgid "Use Animations"
+msgstr "Bruk animasjoner"
+
+#: ../clutter/clutter-box-layout.c:1443
+#: ../clutter/deprecated/clutter-table-layout.c:1678
+msgid "Whether layout changes should be animated"
+msgstr ""
+
+#: ../clutter/clutter-box-layout.c:1467
+#: ../clutter/deprecated/clutter-table-layout.c:1702
+msgid "Easing Mode"
+msgstr ""
+
+#: ../clutter/clutter-box-layout.c:1468
+#: ../clutter/deprecated/clutter-table-layout.c:1703
+msgid "The easing mode of the animations"
+msgstr ""
+
+#: ../clutter/clutter-box-layout.c:1488
+#: ../clutter/deprecated/clutter-table-layout.c:1723
 msgid "Easing Duration"
 msgstr ""
 
-#: ../clutter/clutter-box-layout.c:1297
-#: ../clutter/clutter-layout-manager.c:745
-#: ../clutter/clutter-table-layout.c:1638
+#: ../clutter/clutter-box-layout.c:1489
+#: ../clutter/deprecated/clutter-table-layout.c:1724
 msgid "The duration of the animations"
 msgstr "Varighet på animasjonene"
 
-#: ../clutter/clutter-brightness-contrast-effect.c:307
+#: ../clutter/clutter-brightness-contrast-effect.c:321
 msgid "Brightness"
 msgstr "Lysstyrke"
 
-#: ../clutter/clutter-brightness-contrast-effect.c:308
+#: ../clutter/clutter-brightness-contrast-effect.c:322
 msgid "The brightness change to apply"
 msgstr ""
 
-#: ../clutter/clutter-brightness-contrast-effect.c:327
+#: ../clutter/clutter-brightness-contrast-effect.c:341
 msgid "Contrast"
 msgstr "Kontrast"
 
-#: ../clutter/clutter-brightness-contrast-effect.c:328
+#: ../clutter/clutter-brightness-contrast-effect.c:342
 msgid "The contrast change to apply"
 msgstr ""
 
-#: ../clutter/clutter-canvas.c:216
+#: ../clutter/clutter-canvas.c:248
 msgid "The width of the canvas"
 msgstr "Bredde på kanvas"
 
-#: ../clutter/clutter-canvas.c:232
+#: ../clutter/clutter-canvas.c:264
 msgid "The height of the canvas"
 msgstr "Høyde på kanvas"
 
+#: ../clutter/clutter-canvas.c:283
+msgid "Scale Factor Set"
+msgstr ""
+
+#: ../clutter/clutter-canvas.c:284
+#, fuzzy
+msgid "Whether the scale-factor property is set"
+msgstr "Om bakgrunnsfarge er satt"
+
+#: ../clutter/clutter-canvas.c:305
+#, fuzzy
+msgid "Scale Factor"
+msgstr "Faktor"
+
+#: ../clutter/clutter-canvas.c:306
+#, fuzzy
+msgid "The scaling factor for the surface"
+msgstr "Høyde på Cairo-overflate"
+
 #: ../clutter/clutter-child-meta.c:127
 msgid "Container"
 msgstr "Konteiner"
@@ -820,39 +970,39 @@ msgstr ""
 msgid "The actor wrapped by this data"
 msgstr ""
 
-#: ../clutter/clutter-click-action.c:546
+#: ../clutter/clutter-click-action.c:586
 msgid "Pressed"
 msgstr "Trykket"
 
-#: ../clutter/clutter-click-action.c:547
+#: ../clutter/clutter-click-action.c:587
 msgid "Whether the clickable should be in pressed state"
 msgstr ""
 
-#: ../clutter/clutter-click-action.c:560
+#: ../clutter/clutter-click-action.c:600
 msgid "Held"
 msgstr "Holdt"
 
-#: ../clutter/clutter-click-action.c:561
+#: ../clutter/clutter-click-action.c:601
 msgid "Whether the clickable has a grab"
 msgstr ""
 
-#: ../clutter/clutter-click-action.c:578 ../clutter/clutter-settings.c:599
+#: ../clutter/clutter-click-action.c:618 ../clutter/clutter-settings.c:653
 msgid "Long Press Duration"
 msgstr ""
 
-#: ../clutter/clutter-click-action.c:579
+#: ../clutter/clutter-click-action.c:619
 msgid "The minimum duration of a long press to recognize the gesture"
 msgstr ""
 
-#: ../clutter/clutter-click-action.c:597
+#: ../clutter/clutter-click-action.c:637
 msgid "Long Press Threshold"
 msgstr ""
 
-#: ../clutter/clutter-click-action.c:598
+#: ../clutter/clutter-click-action.c:638
 msgid "The maximum threshold before a long press is cancelled"
 msgstr ""
 
-#: ../clutter/clutter-clone.c:346
+#: ../clutter/clutter-clone.c:342
 msgid "Specifies the actor to be cloned"
 msgstr ""
 
@@ -864,27 +1014,27 @@ msgstr ""
 msgid "The tint to apply"
 msgstr ""
 
-#: ../clutter/clutter-deform-effect.c:588
+#: ../clutter/clutter-deform-effect.c:592
 msgid "Horizontal Tiles"
 msgstr "Horisontale fliser"
 
-#: ../clutter/clutter-deform-effect.c:589
+#: ../clutter/clutter-deform-effect.c:593
 msgid "The number of horizontal tiles"
 msgstr "Antall horisontale fliser"
 
-#: ../clutter/clutter-deform-effect.c:604
+#: ../clutter/clutter-deform-effect.c:608
 msgid "Vertical Tiles"
 msgstr "Vertikale fliser"
 
-#: ../clutter/clutter-deform-effect.c:605
+#: ../clutter/clutter-deform-effect.c:609
 msgid "The number of vertical tiles"
 msgstr "Antall vertikale fliser"
 
-#: ../clutter/clutter-deform-effect.c:622
+#: ../clutter/clutter-deform-effect.c:626
 msgid "Back Material"
 msgstr "Bakgrunnsmateriale"
 
-#: ../clutter/clutter-deform-effect.c:623
+#: ../clutter/clutter-deform-effect.c:627
 msgid "The material to be used when painting the back of the actor"
 msgstr ""
 
@@ -892,275 +1042,293 @@ msgstr ""
 msgid "The desaturation factor"
 msgstr ""
 
-#: ../clutter/clutter-device-manager.c:131
-#: ../clutter/clutter-input-device.c:344
-#: ../clutter/x11/clutter-keymap-x11.c:316
+#: ../clutter/clutter-device-manager.c:127
+#: ../clutter/clutter-input-device.c:355
+#: ../clutter/x11/clutter-keymap-x11.c:321
 msgid "Backend"
 msgstr ""
 
-#: ../clutter/clutter-device-manager.c:132
+#: ../clutter/clutter-device-manager.c:128
 msgid "The ClutterBackend of the device manager"
 msgstr ""
 
-#: ../clutter/clutter-drag-action.c:658
+#: ../clutter/clutter-drag-action.c:741
 msgid "Horizontal Drag Threshold"
 msgstr ""
 
-#: ../clutter/clutter-drag-action.c:659
+#: ../clutter/clutter-drag-action.c:742
 msgid "The horizontal amount of pixels required to start dragging"
 msgstr ""
 
-#: ../clutter/clutter-drag-action.c:686
+#: ../clutter/clutter-drag-action.c:769
 msgid "Vertical Drag Threshold"
 msgstr ""
 
-#: ../clutter/clutter-drag-action.c:687
+#: ../clutter/clutter-drag-action.c:770
 msgid "The vertical amount of pixels required to start dragging"
 msgstr ""
 
-#: ../clutter/clutter-drag-action.c:708
+#: ../clutter/clutter-drag-action.c:791
 msgid "Drag Handle"
 msgstr "Drahåndtak"
 
-#: ../clutter/clutter-drag-action.c:709
+#: ../clutter/clutter-drag-action.c:792
 msgid "The actor that is being dragged"
 msgstr ""
 
-#: ../clutter/clutter-drag-action.c:722
+#: ../clutter/clutter-drag-action.c:805
 msgid "Drag Axis"
 msgstr ""
 
-#: ../clutter/clutter-drag-action.c:723
+#: ../clutter/clutter-drag-action.c:806
 msgid "Constraints the dragging to an axis"
 msgstr ""
 
-#: ../clutter/clutter-flow-layout.c:927
+#: ../clutter/clutter-drag-action.c:822
+#, fuzzy
+msgid "Drag Area"
+msgstr "Drahåndtak"
+
+#: ../clutter/clutter-drag-action.c:823
+msgid "Constrains the dragging to a rectangle"
+msgstr ""
+
+#: ../clutter/clutter-drag-action.c:836
+msgid "Drag Area Set"
+msgstr ""
+
+#: ../clutter/clutter-drag-action.c:837
+#, fuzzy
+msgid "Whether the drag area is set"
+msgstr "Om bakgrunnsfarge er satt"
+
+#: ../clutter/clutter-flow-layout.c:959
 msgid "Whether each item should receive the same allocation"
 msgstr ""
 
-#: ../clutter/clutter-flow-layout.c:942 ../clutter/clutter-table-layout.c:1615
+#: ../clutter/clutter-flow-layout.c:974
+#: ../clutter/deprecated/clutter-table-layout.c:1637
 msgid "Column Spacing"
 msgstr "Mellomrom for kolonner"
 
-#: ../clutter/clutter-flow-layout.c:943
+#: ../clutter/clutter-flow-layout.c:975
 msgid "The spacing between columns"
 msgstr "Mellomrom mellom kolonner"
 
-#: ../clutter/clutter-flow-layout.c:959 ../clutter/clutter-table-layout.c:1629
+#: ../clutter/clutter-flow-layout.c:991
+#: ../clutter/deprecated/clutter-table-layout.c:1653
 msgid "Row Spacing"
 msgstr "Mellomrom for rader"
 
-#: ../clutter/clutter-flow-layout.c:960
+#: ../clutter/clutter-flow-layout.c:992
 msgid "The spacing between rows"
 msgstr "Mellomrom mellom rader"
 
-#: ../clutter/clutter-flow-layout.c:974
+#: ../clutter/clutter-flow-layout.c:1006
 msgid "Minimum Column Width"
 msgstr "Minste bredde på kolonne"
 
-#: ../clutter/clutter-flow-layout.c:975
+#: ../clutter/clutter-flow-layout.c:1007
 msgid "Minimum width for each column"
 msgstr "Minste bredde for hver kolonne"
 
-#: ../clutter/clutter-flow-layout.c:990
+#: ../clutter/clutter-flow-layout.c:1022
 msgid "Maximum Column Width"
 msgstr "Maskimal bredde på kolonne"
 
-#: ../clutter/clutter-flow-layout.c:991
+#: ../clutter/clutter-flow-layout.c:1023
 msgid "Maximum width for each column"
 msgstr "Maksimal bredde for hver kolonne"
 
-#: ../clutter/clutter-flow-layout.c:1005
+#: ../clutter/clutter-flow-layout.c:1037
 msgid "Minimum Row Height"
 msgstr "Minste høyde på rad"
 
-#: ../clutter/clutter-flow-layout.c:1006
+#: ../clutter/clutter-flow-layout.c:1038
 msgid "Minimum height for each row"
 msgstr "Minste høyde for hver rad"
 
-#: ../clutter/clutter-flow-layout.c:1021
+#: ../clutter/clutter-flow-layout.c:1053
 msgid "Maximum Row Height"
 msgstr "Maskimal høyde på rad"
 
-#: ../clutter/clutter-flow-layout.c:1022
+#: ../clutter/clutter-flow-layout.c:1054
 msgid "Maximum height for each row"
 msgstr "Maksimal høyde for hver rad"
 
-#: ../clutter/clutter-grid-layout.c:1222
+#: ../clutter/clutter-flow-layout.c:1069 ../clutter/clutter-flow-layout.c:1070
+msgid "Snap to grid"
+msgstr ""
+
+#: ../clutter/clutter-gesture-action.c:639
+#, fuzzy
+msgid "Number touch points"
+msgstr "Antall akser"
+
+#: ../clutter/clutter-gesture-action.c:640
+#, fuzzy
+msgid "Number of touch points"
+msgstr "Antall akser"
+
+#: ../clutter/clutter-gesture-action.c:655
+msgid "Threshold Trigger Edge"
+msgstr ""
+
+#: ../clutter/clutter-gesture-action.c:656
+#, fuzzy
+msgid "The trigger edge used by the action"
+msgstr "Tidslinje brukt av animasjonen"
+
+#: ../clutter/clutter-grid-layout.c:1223
 msgid "Left attachment"
 msgstr ""
 
-#: ../clutter/clutter-grid-layout.c:1223
+#: ../clutter/clutter-grid-layout.c:1224
 msgid "The column number to attach the left side of the child to"
 msgstr ""
 
-#: ../clutter/clutter-grid-layout.c:1230
+#: ../clutter/clutter-grid-layout.c:1231
 msgid "Top attachment"
 msgstr ""
 
-#: ../clutter/clutter-grid-layout.c:1231
+#: ../clutter/clutter-grid-layout.c:1232
 msgid "The row number to attach the top side of a child widget to"
 msgstr ""
 
-#: ../clutter/clutter-grid-layout.c:1239
+#: ../clutter/clutter-grid-layout.c:1240
 #, fuzzy
 msgid "The number of columns that a child spans"
 msgstr "Antall horisontale fliser"
 
-#: ../clutter/clutter-grid-layout.c:1246
+#: ../clutter/clutter-grid-layout.c:1247
 #, fuzzy
 msgid "The number of rows that a child spans"
 msgstr "Antall horisontale fliser"
 
-#: ../clutter/clutter-grid-layout.c:1581
+#: ../clutter/clutter-grid-layout.c:1564
 msgid "Row spacing"
 msgstr "Mellomrom for rader"
 
-#: ../clutter/clutter-grid-layout.c:1582
+#: ../clutter/clutter-grid-layout.c:1565
 msgid "The amount of space between two consecutive rows"
 msgstr ""
 
-#: ../clutter/clutter-grid-layout.c:1595
+#: ../clutter/clutter-grid-layout.c:1578
 msgid "Column spacing"
 msgstr "Mellomrom for kolonner"
 
-#: ../clutter/clutter-grid-layout.c:1596
+#: ../clutter/clutter-grid-layout.c:1579
 #, fuzzy
 msgid "The amount of space between two consecutive columns"
 msgstr "Mellomrom mellom kolonner"
 
-#: ../clutter/clutter-grid-layout.c:1610
+#: ../clutter/clutter-grid-layout.c:1593
 #, fuzzy
 msgid "Row Homogeneous"
 msgstr "Homogen"
 
-#: ../clutter/clutter-grid-layout.c:1611
+#: ../clutter/clutter-grid-layout.c:1594
 msgid "If TRUE, the rows are all the same height"
 msgstr ""
 
-#: ../clutter/clutter-grid-layout.c:1624
+#: ../clutter/clutter-grid-layout.c:1607
 #, fuzzy
 msgid "Column Homogeneous"
 msgstr "Homogen"
 
-#: ../clutter/clutter-grid-layout.c:1625
+#: ../clutter/clutter-grid-layout.c:1608
 msgid "If TRUE, the columns are all the same width"
 msgstr ""
 
-#: ../clutter/clutter-image.c:248 ../clutter/clutter-image.c:311
-#: ../clutter/clutter-image.c:399
+#: ../clutter/clutter-image.c:249 ../clutter/clutter-image.c:312
+#: ../clutter/clutter-image.c:400
 msgid "Unable to load image data"
 msgstr "Kan ikke laste bildedata"
 
-#: ../clutter/clutter-input-device.c:220
+#: ../clutter/clutter-input-device.c:231
 msgid "Id"
 msgstr "ID"
 
-#: ../clutter/clutter-input-device.c:221
+#: ../clutter/clutter-input-device.c:232
 msgid "Unique identifier of the device"
 msgstr "Unik identifikator for enheten"
 
-#: ../clutter/clutter-input-device.c:237
+#: ../clutter/clutter-input-device.c:248
 msgid "The name of the device"
 msgstr "Navn på enhet"
 
-#: ../clutter/clutter-input-device.c:251
+#: ../clutter/clutter-input-device.c:262
 msgid "Device Type"
 msgstr "Type enhet"
 
-#: ../clutter/clutter-input-device.c:252
+#: ../clutter/clutter-input-device.c:263
 msgid "The type of the device"
 msgstr "Type enhet"
 
-#: ../clutter/clutter-input-device.c:267
+#: ../clutter/clutter-input-device.c:278
 msgid "Device Manager"
 msgstr "Enhetshåndterer"
 
-#: ../clutter/clutter-input-device.c:268
+#: ../clutter/clutter-input-device.c:279
 msgid "The device manager instance"
 msgstr ""
 
-#: ../clutter/clutter-input-device.c:281
+#: ../clutter/clutter-input-device.c:292
 msgid "Device Mode"
 msgstr "Enhetsmodus"
 
-#: ../clutter/clutter-input-device.c:282
+#: ../clutter/clutter-input-device.c:293
 msgid "The mode of the device"
 msgstr "Modus for enheten"
 
-#: ../clutter/clutter-input-device.c:296
+#: ../clutter/clutter-input-device.c:307
 msgid "Has Cursor"
 msgstr "Har markør"
 
-#: ../clutter/clutter-input-device.c:297
+#: ../clutter/clutter-input-device.c:308
 msgid "Whether the device has a cursor"
 msgstr "Om enheten har en markør"
 
-#: ../clutter/clutter-input-device.c:316
+#: ../clutter/clutter-input-device.c:327
 msgid "Whether the device is enabled"
 msgstr "Om enheten er slått på"
 
-#: ../clutter/clutter-input-device.c:329
+#: ../clutter/clutter-input-device.c:340
 msgid "Number of Axes"
 msgstr "Antall akser"
 
-#: ../clutter/clutter-input-device.c:330
+#: ../clutter/clutter-input-device.c:341
 msgid "The number of axes on the device"
 msgstr "Antall akser på enheten"
 
-#: ../clutter/clutter-input-device.c:345
+#: ../clutter/clutter-input-device.c:356
 msgid "The backend instance"
 msgstr ""
 
-#: ../clutter/clutter-interval.c:506
+#: ../clutter/clutter-interval.c:553
 msgid "Value Type"
 msgstr "Type verdi"
 
-#: ../clutter/clutter-interval.c:507
+#: ../clutter/clutter-interval.c:554
 msgid "The type of the values in the interval"
 msgstr ""
 
-#: ../clutter/clutter-interval.c:522
+#: ../clutter/clutter-interval.c:569
 msgid "Initial Value"
 msgstr "Utgangsverdi"
 
-#: ../clutter/clutter-interval.c:523
+#: ../clutter/clutter-interval.c:570
 msgid "Initial value of the interval"
 msgstr ""
 
-#: ../clutter/clutter-interval.c:537
+#: ../clutter/clutter-interval.c:584
 msgid "Final Value"
 msgstr "Endelig verdi"
 
-#: ../clutter/clutter-interval.c:538
+#: ../clutter/clutter-interval.c:585
 msgid "Final value of the interval"
 msgstr ""
 
-#: ../clutter/clutter-layout-manager.c:704
-msgid "Use Animations"
-msgstr "Bruk animasjoner"
-
-#: ../clutter/clutter-layout-manager.c:705
-msgid "Whether layout changes should be animated"
-msgstr ""
-
-#: ../clutter/clutter-layout-manager.c:726
-msgid "Easing Mode"
-msgstr ""
-
-#: ../clutter/clutter-layout-manager.c:727
-msgid "The easing mode of the animations"
-msgstr ""
-
-#: ../clutter/clutter-layout-manager.c:761
-msgid "Easing Delay"
-msgstr ""
-
-#: ../clutter/clutter-layout-manager.c:762
-#, fuzzy
-msgid "The delay befor the animations start"
-msgstr "Modus for animasjonen"
-
 #: ../clutter/clutter-layout-meta.c:117
 msgid "Manager"
 msgstr "Håndterer"
@@ -1176,64 +1344,100 @@ msgstr ""
 #. * Do NOT translate it to non-English e.g. "predefinito:LTR"! If
 #. * it isn't default:LTR or default:RTL it will not work.
 #.
-#: ../clutter/clutter-main.c:762
+#: ../clutter/clutter-main.c:795
 msgid "default:LTR"
 msgstr "default:LTR"
 
-#: ../clutter/clutter-main.c:1609
+#: ../clutter/clutter-main.c:1622
 msgid "Show frames per second"
 msgstr "Vis rammer per sekund"
 
-#: ../clutter/clutter-main.c:1611
+#: ../clutter/clutter-main.c:1624
 msgid "Default frame rate"
 msgstr "Forvalgt bilderate"
 
-#: ../clutter/clutter-main.c:1613
+#: ../clutter/clutter-main.c:1626
 msgid "Make all warnings fatal"
 msgstr "La alle advarsler være fatale"
 
-#: ../clutter/clutter-main.c:1616
+#: ../clutter/clutter-main.c:1629
 msgid "Direction for the text"
 msgstr "Retning for teksten"
 
-#: ../clutter/clutter-main.c:1619
+#: ../clutter/clutter-main.c:1632
 msgid "Disable mipmapping on text"
 msgstr ""
 
-#: ../clutter/clutter-main.c:1622
+#: ../clutter/clutter-main.c:1635
 msgid "Use 'fuzzy' picking"
 msgstr ""
 
-#: ../clutter/clutter-main.c:1625
+#: ../clutter/clutter-main.c:1638
 msgid "Clutter debugging flags to set"
 msgstr ""
 
-#: ../clutter/clutter-main.c:1627
+#: ../clutter/clutter-main.c:1640
 msgid "Clutter debugging flags to unset"
 msgstr ""
 
-#: ../clutter/clutter-main.c:1631
+#: ../clutter/clutter-main.c:1644
 msgid "Clutter profiling flags to set"
 msgstr ""
 
-#: ../clutter/clutter-main.c:1633
+#: ../clutter/clutter-main.c:1646
 msgid "Clutter profiling flags to unset"
 msgstr ""
 
-#: ../clutter/clutter-main.c:1636
+#: ../clutter/clutter-main.c:1649
 msgid "Enable accessibility"
 msgstr "Slå på tilgjengelighet"
 
-#: ../clutter/clutter-main.c:1828
+#: ../clutter/clutter-main.c:1841
 msgid "Clutter Options"
 msgstr "Alternativer for Clutter"
 
-#: ../clutter/clutter-main.c:1829
+#: ../clutter/clutter-main.c:1842
 msgid "Show Clutter Options"
 msgstr "Vis alternativer for Clutter"
 
+#: ../clutter/clutter-pan-action.c:446
+#, fuzzy
+msgid "Pan Axis"
+msgstr "Justeringsakse"
+
+#: ../clutter/clutter-pan-action.c:447
+msgid "Constraints the panning to an axis"
+msgstr ""
+
+#: ../clutter/clutter-pan-action.c:461
+#, fuzzy
+msgid "Interpolate"
+msgstr "Intervall"
+
+#: ../clutter/clutter-pan-action.c:462
+#, fuzzy
+msgid "Whether interpolated events emission is enabled."
+msgstr "Om enheten er slått på"
+
+#: ../clutter/clutter-pan-action.c:478
+#, fuzzy
+msgid "Deceleration"
+msgstr "Varighet"
+
+#: ../clutter/clutter-pan-action.c:479
+msgid "Rate at which the interpolated panning will decelerate in"
+msgstr ""
+
+#: ../clutter/clutter-pan-action.c:496
+msgid "Initial acceleration factor"
+msgstr ""
+
+#: ../clutter/clutter-pan-action.c:497
+msgid "Factor applied to the momentum when starting the interpolated phase"
+msgstr ""
+
 #: ../clutter/clutter-path-constraint.c:212
-#: ../clutter/deprecated/clutter-behaviour-path.c:225
+#: ../clutter/deprecated/clutter-behaviour-path.c:221
 msgid "Path"
 msgstr "Sti"
 
@@ -1245,150 +1449,158 @@ msgstr ""
 msgid "The offset along the path, between -1.0 and 2.0"
 msgstr ""
 
-#: ../clutter/clutter-property-transition.c:271
-#, fuzzy
+#: ../clutter/clutter-property-transition.c:269
 msgid "Property Name"
-msgstr "Skriftnavn"
+msgstr "Navn på egenskap"
 
-#: ../clutter/clutter-property-transition.c:272
+#: ../clutter/clutter-property-transition.c:270
 #, fuzzy
 msgid "The name of the property to animate"
 msgstr "Navn på enhet"
 
-#: ../clutter/clutter-script.c:466
+#: ../clutter/clutter-script.c:464
 msgid "Filename Set"
 msgstr "Filnavn satt"
 
-#: ../clutter/clutter-script.c:467
+#: ../clutter/clutter-script.c:465
 msgid "Whether the :filename property is set"
 msgstr ""
 
-#: ../clutter/clutter-script.c:481 ../clutter/clutter-texture.c:1077
+#: ../clutter/clutter-script.c:479
+#: ../clutter/deprecated/clutter-texture.c:1080
 msgid "Filename"
 msgstr "Filnavn"
 
-#: ../clutter/clutter-script.c:482
+#: ../clutter/clutter-script.c:480
 msgid "The path of the currently parsed file"
 msgstr ""
 
-#: ../clutter/clutter-script.c:499
+#: ../clutter/clutter-script.c:497
 msgid "Translation Domain"
 msgstr "Oversettelsesdomene"
 
-#: ../clutter/clutter-script.c:500
+#: ../clutter/clutter-script.c:498
 msgid "The translation domain used to localize string"
 msgstr ""
 
-#: ../clutter/clutter-scroll-actor.c:263
+#: ../clutter/clutter-scroll-actor.c:189
 msgid "Scroll Mode"
 msgstr "Rullemodus"
 
-#: ../clutter/clutter-scroll-actor.c:264
+#: ../clutter/clutter-scroll-actor.c:190
 msgid "The scrolling direction"
 msgstr "Rulleretning"
 
-#: ../clutter/clutter-settings.c:440
+#: ../clutter/clutter-settings.c:486
 msgid "Double Click Time"
 msgstr "Tid for dobbeltklikk"
 
-#: ../clutter/clutter-settings.c:441
+#: ../clutter/clutter-settings.c:487
 msgid "The time between clicks necessary to detect a multiple click"
 msgstr ""
 
-#: ../clutter/clutter-settings.c:456
+#: ../clutter/clutter-settings.c:502
 msgid "Double Click Distance"
 msgstr "Avstand ved dobbeltklikk"
 
-#: ../clutter/clutter-settings.c:457
+#: ../clutter/clutter-settings.c:503
 msgid "The distance between clicks necessary to detect a multiple click"
 msgstr ""
 
-#: ../clutter/clutter-settings.c:472
+#: ../clutter/clutter-settings.c:518
 msgid "Drag Threshold"
 msgstr ""
 
-#: ../clutter/clutter-settings.c:473
+#: ../clutter/clutter-settings.c:519
 msgid "The distance the cursor should travel before starting to drag"
 msgstr ""
 
-#: ../clutter/clutter-settings.c:488 ../clutter/clutter-text.c:3352
+#: ../clutter/clutter-settings.c:534 ../clutter/clutter-text.c:3404
 msgid "Font Name"
 msgstr "Skriftnavn"
 
-#: ../clutter/clutter-settings.c:489
+#: ../clutter/clutter-settings.c:535
 msgid ""
 "The description of the default font, as one that could be parsed by Pango"
 msgstr ""
 
-#: ../clutter/clutter-settings.c:504
+#: ../clutter/clutter-settings.c:550
 msgid "Font Antialias"
 msgstr ""
 
-#: ../clutter/clutter-settings.c:505
+#: ../clutter/clutter-settings.c:551
 msgid ""
 "Whether to use antialiasing (1 to enable, 0 to disable, and -1 to use the "
 "default)"
 msgstr ""
 
-#: ../clutter/clutter-settings.c:521
+#: ../clutter/clutter-settings.c:567 ../clutter/clutter-settings.c:575
 msgid "Font DPI"
 msgstr "DPI for skrift"
 
-#: ../clutter/clutter-settings.c:522
+#: ../clutter/clutter-settings.c:568 ../clutter/clutter-settings.c:576
 msgid ""
 "The resolution of the font, in 1024 * dots/inch, or -1 to use the default"
 msgstr ""
 
-#: ../clutter/clutter-settings.c:538
+#: ../clutter/clutter-settings.c:592
 msgid "Font Hinting"
 msgstr ""
 
-#: ../clutter/clutter-settings.c:539
+#: ../clutter/clutter-settings.c:593
 msgid ""
 "Whether to use hinting (1 to enable, 0 to disable and -1 to use the default)"
 msgstr ""
 
-#: ../clutter/clutter-settings.c:560
+#: ../clutter/clutter-settings.c:614
 msgid "Font Hint Style"
 msgstr ""
 
-#: ../clutter/clutter-settings.c:561
+#: ../clutter/clutter-settings.c:615
 msgid "The style of hinting (hintnone, hintslight, hintmedium, hintfull)"
 msgstr ""
 
-#: ../clutter/clutter-settings.c:582
+#: ../clutter/clutter-settings.c:636
 msgid "Font Subpixel Order"
 msgstr ""
 
-#: ../clutter/clutter-settings.c:583
+#: ../clutter/clutter-settings.c:637
 msgid "The type of subpixel antialiasing (none, rgb, bgr, vrgb, vbgr)"
 msgstr ""
 
-#: ../clutter/clutter-settings.c:600
+#: ../clutter/clutter-settings.c:654
 msgid "The minimum duration for a long press gesture to be recognized"
 msgstr ""
 
-#: ../clutter/clutter-settings.c:607
+#: ../clutter/clutter-settings.c:661
+msgid "Window Scaling Factor"
+msgstr ""
+
+#: ../clutter/clutter-settings.c:662
+msgid "The scaling factor to be applied to windows"
+msgstr ""
+
+#: ../clutter/clutter-settings.c:669
 msgid "Fontconfig configuration timestamp"
 msgstr ""
 
-#: ../clutter/clutter-settings.c:608
+#: ../clutter/clutter-settings.c:670
 msgid "Timestamp of the current fontconfig configuration"
 msgstr ""
 
-#: ../clutter/clutter-settings.c:625
+#: ../clutter/clutter-settings.c:687
 msgid "Password Hint Time"
 msgstr "Tid for passordhint"
 
-#: ../clutter/clutter-settings.c:626
+#: ../clutter/clutter-settings.c:688
 msgid "How long to show the last input character in hidden entries"
 msgstr ""
 
-#: ../clutter/clutter-shader-effect.c:486
+#: ../clutter/clutter-shader-effect.c:485
 msgid "Shader Type"
 msgstr ""
 
-#: ../clutter/clutter-shader-effect.c:487
+#: ../clutter/clutter-shader-effect.c:486
 msgid "The type of shader used"
 msgstr ""
 
@@ -1416,888 +1628,707 @@ msgstr ""
 msgid "The offset in pixels to apply to the constraint"
 msgstr ""
 
-#: ../clutter/clutter-stage.c:1894
+#: ../clutter/clutter-stage.c:1899
 msgid "Fullscreen Set"
 msgstr "Fullskjerm satt"
 
-#: ../clutter/clutter-stage.c:1895
+#: ../clutter/clutter-stage.c:1900
 msgid "Whether the main stage is fullscreen"
 msgstr ""
 
-#: ../clutter/clutter-stage.c:1909
+#: ../clutter/clutter-stage.c:1914
 msgid "Offscreen"
 msgstr "Utenfor skjermen"
 
-#: ../clutter/clutter-stage.c:1910
+#: ../clutter/clutter-stage.c:1915
 msgid "Whether the main stage should be rendered offscreen"
 msgstr ""
 
-#: ../clutter/clutter-stage.c:1922 ../clutter/clutter-text.c:3466
+#: ../clutter/clutter-stage.c:1927 ../clutter/clutter-text.c:3518
 msgid "Cursor Visible"
 msgstr "Markør synlig"
 
-#: ../clutter/clutter-stage.c:1923
+#: ../clutter/clutter-stage.c:1928
 msgid "Whether the mouse pointer is visible on the main stage"
 msgstr ""
 
-#: ../clutter/clutter-stage.c:1937
+#: ../clutter/clutter-stage.c:1942
 msgid "User Resizable"
 msgstr ""
 
-#: ../clutter/clutter-stage.c:1938
+#: ../clutter/clutter-stage.c:1943
 msgid "Whether the stage is able to be resized via user interaction"
 msgstr ""
 
-#: ../clutter/clutter-stage.c:1953 ../clutter/deprecated/clutter-box.c:260
-#: ../clutter/deprecated/clutter-rectangle.c:272
+#: ../clutter/clutter-stage.c:1958 ../clutter/deprecated/clutter-box.c:256
+#: ../clutter/deprecated/clutter-rectangle.c:270
 msgid "Color"
 msgstr "Farge"
 
-#: ../clutter/clutter-stage.c:1954
+#: ../clutter/clutter-stage.c:1959
 msgid "The color of the stage"
 msgstr ""
 
-#: ../clutter/clutter-stage.c:1969
+#: ../clutter/clutter-stage.c:1974
 msgid "Perspective"
 msgstr "Prespektiv"
 
-#: ../clutter/clutter-stage.c:1970
+#: ../clutter/clutter-stage.c:1975
 msgid "Perspective projection parameters"
 msgstr ""
 
-#: ../clutter/clutter-stage.c:1985
+#: ../clutter/clutter-stage.c:1990
 msgid "Title"
 msgstr "Tittel"
 
-#: ../clutter/clutter-stage.c:1986
+#: ../clutter/clutter-stage.c:1991
 msgid "Stage Title"
 msgstr "Tittel for scene"
 
-#: ../clutter/clutter-stage.c:2003
+#: ../clutter/clutter-stage.c:2008
 msgid "Use Fog"
 msgstr "Bruk tåke"
 
-#: ../clutter/clutter-stage.c:2004
+#: ../clutter/clutter-stage.c:2009
 msgid "Whether to enable depth cueing"
 msgstr ""
 
-#: ../clutter/clutter-stage.c:2020
+#: ../clutter/clutter-stage.c:2025
 msgid "Fog"
 msgstr "Tåke"
 
-#: ../clutter/clutter-stage.c:2021
+#: ../clutter/clutter-stage.c:2026
 msgid "Settings for the depth cueing"
 msgstr ""
 
-#: ../clutter/clutter-stage.c:2037
+#: ../clutter/clutter-stage.c:2042
 msgid "Use Alpha"
 msgstr ""
 
-#: ../clutter/clutter-stage.c:2038
+#: ../clutter/clutter-stage.c:2043
 msgid "Whether to honour the alpha component of the stage color"
 msgstr ""
 
-#: ../clutter/clutter-stage.c:2054
+#: ../clutter/clutter-stage.c:2059
 msgid "Key Focus"
 msgstr ""
 
-#: ../clutter/clutter-stage.c:2055
+#: ../clutter/clutter-stage.c:2060
 msgid "The currently key focused actor"
 msgstr ""
 
-#: ../clutter/clutter-stage.c:2071
+#: ../clutter/clutter-stage.c:2076
 msgid "No Clear Hint"
 msgstr ""
 
-#: ../clutter/clutter-stage.c:2072
+#: ../clutter/clutter-stage.c:2077
 msgid "Whether the stage should clear its contents"
 msgstr ""
 
-#: ../clutter/clutter-stage.c:2085
+#: ../clutter/clutter-stage.c:2090
 msgid "Accept Focus"
 msgstr ""
 
-#: ../clutter/clutter-stage.c:2086
+#: ../clutter/clutter-stage.c:2091
 msgid "Whether the stage should accept focus on show"
 msgstr ""
 
-#: ../clutter/clutter-table-layout.c:535
-msgid "Column Number"
-msgstr "Kolonnenummer"
-
-#: ../clutter/clutter-table-layout.c:536
-msgid "The column the widget resides in"
-msgstr ""
-
-#: ../clutter/clutter-table-layout.c:543
-msgid "Row Number"
-msgstr "Radnummer"
-
-#: ../clutter/clutter-table-layout.c:544
-msgid "The row the widget resides in"
-msgstr ""
-
-#: ../clutter/clutter-table-layout.c:551
-msgid "Column Span"
-msgstr ""
-
-#: ../clutter/clutter-table-layout.c:552
-msgid "The number of columns the widget should span"
-msgstr ""
-
-#: ../clutter/clutter-table-layout.c:559
-msgid "Row Span"
-msgstr ""
-
-#: ../clutter/clutter-table-layout.c:560
-msgid "The number of rows the widget should span"
-msgstr ""
-
-#: ../clutter/clutter-table-layout.c:567
-msgid "Horizontal Expand"
-msgstr ""
-
-#: ../clutter/clutter-table-layout.c:568
-msgid "Allocate extra space for the child in horizontal axis"
-msgstr ""
-
-#: ../clutter/clutter-table-layout.c:574
-msgid "Vertical Expand"
-msgstr ""
-
-#: ../clutter/clutter-table-layout.c:575
-msgid "Allocate extra space for the child in vertical axis"
-msgstr ""
-
-#: ../clutter/clutter-table-layout.c:1616
-msgid "Spacing between columns"
-msgstr ""
-
-#: ../clutter/clutter-table-layout.c:1630
-msgid "Spacing between rows"
-msgstr ""
-
-#: ../clutter/clutter-text-buffer.c:351 ../clutter/clutter-text.c:3387
+#: ../clutter/clutter-text-buffer.c:347 ../clutter/clutter-text.c:3439
 msgid "Text"
 msgstr "Tekst"
 
-#: ../clutter/clutter-text-buffer.c:352
+#: ../clutter/clutter-text-buffer.c:348
 #, fuzzy
 msgid "The contents of the buffer"
 msgstr "Navn på enhet"
 
-#: ../clutter/clutter-text-buffer.c:365
+#: ../clutter/clutter-text-buffer.c:361
 msgid "Text length"
 msgstr "Lengde på tekst"
 
-#: ../clutter/clutter-text-buffer.c:366
+#: ../clutter/clutter-text-buffer.c:362
 msgid "Length of the text currently in the buffer"
 msgstr ""
 
-#: ../clutter/clutter-text-buffer.c:379
+#: ../clutter/clutter-text-buffer.c:375
 msgid "Maximum length"
 msgstr "Maksimal lengde"
 
-#: ../clutter/clutter-text-buffer.c:380
+#: ../clutter/clutter-text-buffer.c:376
 msgid "Maximum number of characters for this entry. Zero if no maximum"
 msgstr ""
 
-#: ../clutter/clutter-text.c:3334
+#: ../clutter/clutter-text.c:3386
 msgid "Buffer"
-msgstr ""
+msgstr "Buffer"
 
-#: ../clutter/clutter-text.c:3335
-#, fuzzy
+#: ../clutter/clutter-text.c:3387
 msgid "The buffer for the text"
-msgstr "Retning for teksten"
+msgstr "Buffer for teksten"
 
-#: ../clutter/clutter-text.c:3353
+#: ../clutter/clutter-text.c:3405
 msgid "The font to be used by the text"
 msgstr "Skrift som skal brukes av teksten"
 
-#: ../clutter/clutter-text.c:3370
+#: ../clutter/clutter-text.c:3422
 msgid "Font Description"
 msgstr "Skriftbeskrivelse"
 
-#: ../clutter/clutter-text.c:3371
+#: ../clutter/clutter-text.c:3423
 msgid "The font description to be used"
 msgstr "Skriftbeskrivelse som skal brukes"
 
-#: ../clutter/clutter-text.c:3388
+#: ../clutter/clutter-text.c:3440
 msgid "The text to render"
 msgstr "Tekst som skal vises"
 
-#: ../clutter/clutter-text.c:3402
+#: ../clutter/clutter-text.c:3454
 msgid "Font Color"
 msgstr "Skriftfarge"
 
-#: ../clutter/clutter-text.c:3403
+#: ../clutter/clutter-text.c:3455
 msgid "Color of the font used by the text"
 msgstr "Farge på skriften som brukes av teksten"
 
-#: ../clutter/clutter-text.c:3418
+#: ../clutter/clutter-text.c:3470
 msgid "Editable"
 msgstr "Redigerbar"
 
-#: ../clutter/clutter-text.c:3419
+#: ../clutter/clutter-text.c:3471
 msgid "Whether the text is editable"
 msgstr "Om teksten er redigerbar"
 
-#: ../clutter/clutter-text.c:3434
+#: ../clutter/clutter-text.c:3486
 msgid "Selectable"
 msgstr "Markerbar"
 
-#: ../clutter/clutter-text.c:3435
+#: ../clutter/clutter-text.c:3487
 msgid "Whether the text is selectable"
 msgstr "Om teksten kan markeres"
 
-#: ../clutter/clutter-text.c:3449
+#: ../clutter/clutter-text.c:3501
 msgid "Activatable"
 msgstr "Kan aktiveres"
 
-#: ../clutter/clutter-text.c:3450
+#: ../clutter/clutter-text.c:3502
 msgid "Whether pressing return causes the activate signal to be emitted"
 msgstr ""
 
-#: ../clutter/clutter-text.c:3467
+#: ../clutter/clutter-text.c:3519
 msgid "Whether the input cursor is visible"
 msgstr ""
 
-#: ../clutter/clutter-text.c:3481 ../clutter/clutter-text.c:3482
+#: ../clutter/clutter-text.c:3533 ../clutter/clutter-text.c:3534
 msgid "Cursor Color"
 msgstr "Markørfarge"
 
-#: ../clutter/clutter-text.c:3497
+#: ../clutter/clutter-text.c:3549
 msgid "Cursor Color Set"
 msgstr "Markørfarge satt"
 
-#: ../clutter/clutter-text.c:3498
+#: ../clutter/clutter-text.c:3550
 msgid "Whether the cursor color has been set"
 msgstr ""
 
-#: ../clutter/clutter-text.c:3513
+#: ../clutter/clutter-text.c:3565
 msgid "Cursor Size"
 msgstr "Markørstørrelse"
 
-#: ../clutter/clutter-text.c:3514
+#: ../clutter/clutter-text.c:3566
 msgid "The width of the cursor, in pixels"
 msgstr ""
 
-#: ../clutter/clutter-text.c:3528
+#: ../clutter/clutter-text.c:3582 ../clutter/clutter-text.c:3600
 msgid "Cursor Position"
 msgstr "Markørposisjon"
 
-#: ../clutter/clutter-text.c:3529
+#: ../clutter/clutter-text.c:3583 ../clutter/clutter-text.c:3601
 msgid "The cursor position"
 msgstr "Posisjon for markøren"
 
-#: ../clutter/clutter-text.c:3544
+#: ../clutter/clutter-text.c:3616
 msgid "Selection-bound"
 msgstr ""
 
-#: ../clutter/clutter-text.c:3545
+#: ../clutter/clutter-text.c:3617
 msgid "The cursor position of the other end of the selection"
 msgstr ""
 
-#: ../clutter/clutter-text.c:3560 ../clutter/clutter-text.c:3561
+#: ../clutter/clutter-text.c:3632 ../clutter/clutter-text.c:3633
 msgid "Selection Color"
 msgstr "Utvalgsfarge"
 
-#: ../clutter/clutter-text.c:3576
+#: ../clutter/clutter-text.c:3648
 msgid "Selection Color Set"
 msgstr ""
 
-#: ../clutter/clutter-text.c:3577
+#: ../clutter/clutter-text.c:3649
 msgid "Whether the selection color has been set"
 msgstr ""
 
-#: ../clutter/clutter-text.c:3592
+#: ../clutter/clutter-text.c:3664
 msgid "Attributes"
 msgstr "Attributter"
 
-#: ../clutter/clutter-text.c:3593
+#: ../clutter/clutter-text.c:3665
 msgid "A list of style attributes to apply to the contents of the actor"
 msgstr ""
 
-#: ../clutter/clutter-text.c:3615
+#: ../clutter/clutter-text.c:3687
 msgid "Use markup"
 msgstr ""
 
-#: ../clutter/clutter-text.c:3616
+#: ../clutter/clutter-text.c:3688
 msgid "Whether or not the text includes Pango markup"
 msgstr ""
 
-#: ../clutter/clutter-text.c:3632
+#: ../clutter/clutter-text.c:3704
 msgid "Line wrap"
 msgstr "Linjebryting"
 
-#: ../clutter/clutter-text.c:3633
+#: ../clutter/clutter-text.c:3705
 msgid "If set, wrap the lines if the text becomes too wide"
 msgstr ""
 
-#: ../clutter/clutter-text.c:3648
+#: ../clutter/clutter-text.c:3720
 msgid "Line wrap mode"
 msgstr ""
 
-#: ../clutter/clutter-text.c:3649
+#: ../clutter/clutter-text.c:3721
 msgid "Control how line-wrapping is done"
 msgstr ""
 
-#: ../clutter/clutter-text.c:3664
+#: ../clutter/clutter-text.c:3736
 msgid "Ellipsize"
 msgstr ""
 
-#: ../clutter/clutter-text.c:3665
+#: ../clutter/clutter-text.c:3737
 msgid "The preferred place to ellipsize the string"
 msgstr ""
 
-#: ../clutter/clutter-text.c:3681
+#: ../clutter/clutter-text.c:3753
 msgid "Line Alignment"
 msgstr "Linjejustering"
 
-#: ../clutter/clutter-text.c:3682
+#: ../clutter/clutter-text.c:3754
 msgid "The preferred alignment for the string, for multi-line text"
 msgstr ""
 
-#: ../clutter/clutter-text.c:3698
+#: ../clutter/clutter-text.c:3770
 msgid "Justify"
 msgstr ""
 
-#: ../clutter/clutter-text.c:3699
+#: ../clutter/clutter-text.c:3771
 msgid "Whether the text should be justified"
 msgstr ""
 
-#: ../clutter/clutter-text.c:3714
+#: ../clutter/clutter-text.c:3786
 msgid "Password Character"
 msgstr "Passordtegn"
 
-#: ../clutter/clutter-text.c:3715
+#: ../clutter/clutter-text.c:3787
 msgid "If non-zero, use this character to display the actor's contents"
 msgstr ""
 
-#: ../clutter/clutter-text.c:3729
+#: ../clutter/clutter-text.c:3801
 msgid "Max Length"
 msgstr "Maks lengde"
 
-#: ../clutter/clutter-text.c:3730
+#: ../clutter/clutter-text.c:3802
 msgid "Maximum length of the text inside the actor"
 msgstr ""
 
-#: ../clutter/clutter-text.c:3753
+#: ../clutter/clutter-text.c:3825
 msgid "Single Line Mode"
 msgstr ""
 
-#: ../clutter/clutter-text.c:3754
+#: ../clutter/clutter-text.c:3826
 msgid "Whether the text should be a single line"
 msgstr ""
 
-#: ../clutter/clutter-text.c:3768 ../clutter/clutter-text.c:3769
+#: ../clutter/clutter-text.c:3840 ../clutter/clutter-text.c:3841
 msgid "Selected Text Color"
 msgstr "Valgt tekstfarge"
 
-#: ../clutter/clutter-text.c:3784
+#: ../clutter/clutter-text.c:3856
 msgid "Selected Text Color Set"
 msgstr ""
 
-#: ../clutter/clutter-text.c:3785
+#: ../clutter/clutter-text.c:3857
 msgid "Whether the selected text color has been set"
 msgstr ""
 
-#: ../clutter/clutter-texture.c:991
-msgid "Sync size of actor"
-msgstr ""
-
-#: ../clutter/clutter-texture.c:992
-msgid "Auto sync size of actor to underlying pixbuf dimensions"
-msgstr ""
-
-#: ../clutter/clutter-texture.c:999
-msgid "Disable Slicing"
-msgstr ""
-
-#: ../clutter/clutter-texture.c:1000
-msgid ""
-"Forces the underlying texture to be singular and not made of smaller space "
-"saving individual textures"
-msgstr ""
-
-#: ../clutter/clutter-texture.c:1009
-msgid "Tile Waste"
-msgstr ""
-
-#: ../clutter/clutter-texture.c:1010
-msgid "Maximum waste area of a sliced texture"
-msgstr ""
-
-#: ../clutter/clutter-texture.c:1018
-msgid "Horizontal repeat"
-msgstr ""
-
-#: ../clutter/clutter-texture.c:1019
-msgid "Repeat the contents rather than scaling them horizontally"
-msgstr ""
-
-#: ../clutter/clutter-texture.c:1026
-msgid "Vertical repeat"
-msgstr ""
-
-#: ../clutter/clutter-texture.c:1027
-msgid "Repeat the contents rather than scaling them vertically"
-msgstr ""
-
-#: ../clutter/clutter-texture.c:1034
-msgid "Filter Quality"
-msgstr ""
-
-#: ../clutter/clutter-texture.c:1035
-msgid "Rendering quality used when drawing the texture"
-msgstr ""
-
-#: ../clutter/clutter-texture.c:1043
-msgid "Pixel Format"
-msgstr ""
-
-#: ../clutter/clutter-texture.c:1044
-msgid "The Cogl pixel format to use"
-msgstr ""
-
-#: ../clutter/clutter-texture.c:1052
-#: ../clutter/wayland/clutter-wayland-surface.c:449
-msgid "Cogl Texture"
-msgstr ""
-
-#: ../clutter/clutter-texture.c:1053
-#: ../clutter/wayland/clutter-wayland-surface.c:450
-msgid "The underlying Cogl texture handle used to draw this actor"
-msgstr ""
-
-#: ../clutter/clutter-texture.c:1060
-msgid "Cogl Material"
-msgstr ""
-
-#: ../clutter/clutter-texture.c:1061
-msgid "The underlying Cogl material handle used to draw this actor"
-msgstr ""
-
-#: ../clutter/clutter-texture.c:1078
-msgid "The path of the file containing the image data"
-msgstr ""
-
-#: ../clutter/clutter-texture.c:1085
-msgid "Keep Aspect Ratio"
-msgstr ""
-
-#: ../clutter/clutter-texture.c:1086
-msgid ""
-"Keep the aspect ratio of the texture when requesting the preferred width or "
-"height"
-msgstr ""
-
-#: ../clutter/clutter-texture.c:1112
-msgid "Load asynchronously"
-msgstr ""
-
-#: ../clutter/clutter-texture.c:1113
-msgid ""
-"Load files inside a thread to avoid blocking when loading images from disk"
-msgstr ""
-
-#: ../clutter/clutter-texture.c:1129
-msgid "Load data asynchronously"
-msgstr ""
-
-#: ../clutter/clutter-texture.c:1130
-msgid ""
-"Decode image data files inside a thread to reduce blocking when loading "
-"images from disk"
-msgstr ""
-
-#: ../clutter/clutter-texture.c:1154
-msgid "Pick With Alpha"
-msgstr ""
-
-#: ../clutter/clutter-texture.c:1155
-msgid "Shape actor with alpha channel when picking"
-msgstr ""
-
-#: ../clutter/clutter-texture.c:1575 ../clutter/clutter-texture.c:1968
-#: ../clutter/clutter-texture.c:2062 ../clutter/clutter-texture.c:2346
-#, c-format
-msgid "Failed to load the image data"
-msgstr ""
-
-#: ../clutter/clutter-texture.c:1732
-#, c-format
-msgid "YUV textures are not supported"
-msgstr ""
-
-#: ../clutter/clutter-texture.c:1741
-#, c-format
-msgid "YUV2 textues are not supported"
-msgstr ""
-
-#: ../clutter/clutter-timeline.c:553
-#: ../clutter/deprecated/clutter-animation.c:560
+#: ../clutter/clutter-timeline.c:593
+#: ../clutter/deprecated/clutter-animation.c:557
 msgid "Loop"
 msgstr "Løkke"
 
-#: ../clutter/clutter-timeline.c:554
+#: ../clutter/clutter-timeline.c:594
 msgid "Should the timeline automatically restart"
 msgstr ""
 
-#: ../clutter/clutter-timeline.c:568
+#: ../clutter/clutter-timeline.c:608
 msgid "Delay"
 msgstr "Pause"
 
-#: ../clutter/clutter-timeline.c:569
+#: ../clutter/clutter-timeline.c:609
 msgid "Delay before start"
 msgstr "Pause før start"
 
-#: ../clutter/clutter-timeline.c:584
-#: ../clutter/deprecated/clutter-animation.c:544
-#: ../clutter/deprecated/clutter-animator.c:1803
+#: ../clutter/clutter-timeline.c:624
+#: ../clutter/deprecated/clutter-animation.c:541
+#: ../clutter/deprecated/clutter-animator.c:1801
 #: ../clutter/deprecated/clutter-media.c:224
-#: ../clutter/deprecated/clutter-state.c:1522
+#: ../clutter/deprecated/clutter-state.c:1517
 msgid "Duration"
 msgstr "Varighet"
 
-#: ../clutter/clutter-timeline.c:585
+#: ../clutter/clutter-timeline.c:625
 msgid "Duration of the timeline in milliseconds"
 msgstr "Varighet for tidslinjen i millisekunder"
 
-#: ../clutter/clutter-timeline.c:600
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:527
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:336
+#: ../clutter/clutter-timeline.c:640
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:521
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:330
 msgid "Direction"
 msgstr "Retning"
 
-#: ../clutter/clutter-timeline.c:601
+#: ../clutter/clutter-timeline.c:641
 msgid "Direction of the timeline"
 msgstr "Retning for tidslinjen"
 
-#: ../clutter/clutter-timeline.c:616
+#: ../clutter/clutter-timeline.c:656
 msgid "Auto Reverse"
 msgstr ""
 
-#: ../clutter/clutter-timeline.c:617
+#: ../clutter/clutter-timeline.c:657
 msgid "Whether the direction should be reversed when reaching the end"
 msgstr ""
 
-#: ../clutter/clutter-timeline.c:635
+#: ../clutter/clutter-timeline.c:675
 msgid "Repeat Count"
 msgstr ""
 
-#: ../clutter/clutter-timeline.c:636
+#: ../clutter/clutter-timeline.c:676
 msgid "How many times the timeline should repeat"
 msgstr ""
 
-#: ../clutter/clutter-timeline.c:650
+#: ../clutter/clutter-timeline.c:690
 #, fuzzy
 msgid "Progress Mode"
 msgstr "Fremdriftsmodus"
 
-#: ../clutter/clutter-timeline.c:651
+#: ../clutter/clutter-timeline.c:691
 msgid "How the timeline should compute the progress"
 msgstr ""
 
-#: ../clutter/clutter-transition.c:246
+#: ../clutter/clutter-transition.c:244
 msgid "Interval"
 msgstr "Intervall"
 
-#: ../clutter/clutter-transition.c:247
+#: ../clutter/clutter-transition.c:245
 #, fuzzy
 msgid "The interval of values to transition"
 msgstr "Tidslinje for animasjonen"
 
-#: ../clutter/clutter-transition.c:261
+#: ../clutter/clutter-transition.c:259
 #, fuzzy
 msgid "Animatable"
 msgstr "Kan aktiveres"
 
-#: ../clutter/clutter-transition.c:262
+#: ../clutter/clutter-transition.c:260
 msgid "The animatable object"
 msgstr ""
 
-#: ../clutter/clutter-transition.c:283
+#: ../clutter/clutter-transition.c:281
 msgid "Remove on Complete"
 msgstr ""
 
-#: ../clutter/clutter-transition.c:284
+#: ../clutter/clutter-transition.c:282
 msgid "Detach the transition when completed"
 msgstr ""
 
-#: ../clutter/deprecated/clutter-alpha.c:355
-#: ../clutter/deprecated/clutter-animation.c:575
-#: ../clutter/deprecated/clutter-animator.c:1820
+#: ../clutter/clutter-zoom-action.c:355
+#, fuzzy
+msgid "Zoom Axis"
+msgstr "Akse"
+
+#: ../clutter/clutter-zoom-action.c:356
+msgid "Constraints the zoom to an axis"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-alpha.c:354
+#: ../clutter/deprecated/clutter-animation.c:572
+#: ../clutter/deprecated/clutter-animator.c:1818
 msgid "Timeline"
 msgstr "Tidslinje"
 
-#: ../clutter/deprecated/clutter-alpha.c:356
+#: ../clutter/deprecated/clutter-alpha.c:355
 msgid "Timeline used by the alpha"
 msgstr ""
 
-#: ../clutter/deprecated/clutter-alpha.c:372
+#: ../clutter/deprecated/clutter-alpha.c:371
 msgid "Alpha value"
 msgstr ""
 
-#: ../clutter/deprecated/clutter-alpha.c:373
+#: ../clutter/deprecated/clutter-alpha.c:372
 msgid "Alpha value as computed by the alpha"
 msgstr ""
 
-#: ../clutter/deprecated/clutter-alpha.c:394
-#: ../clutter/deprecated/clutter-animation.c:528
+#: ../clutter/deprecated/clutter-alpha.c:393
+#: ../clutter/deprecated/clutter-animation.c:525
 msgid "Mode"
 msgstr "Modus"
 
-#: ../clutter/deprecated/clutter-alpha.c:395
+#: ../clutter/deprecated/clutter-alpha.c:394
 msgid "Progress mode"
 msgstr "Fremdriftsmodus"
 
-#: ../clutter/deprecated/clutter-animation.c:511
+#: ../clutter/deprecated/clutter-animation.c:508
 msgid "Object"
 msgstr "Objekt"
 
-#: ../clutter/deprecated/clutter-animation.c:512
+#: ../clutter/deprecated/clutter-animation.c:509
 msgid "Object to which the animation applies"
 msgstr ""
 
-#: ../clutter/deprecated/clutter-animation.c:529
+#: ../clutter/deprecated/clutter-animation.c:526
 msgid "The mode of the animation"
 msgstr "Modus for animasjonen"
 
-#: ../clutter/deprecated/clutter-animation.c:545
+#: ../clutter/deprecated/clutter-animation.c:542
 msgid "Duration of the animation, in milliseconds"
 msgstr "Varighet for animasjonen, i millisekunder"
 
-#: ../clutter/deprecated/clutter-animation.c:561
+#: ../clutter/deprecated/clutter-animation.c:558
 msgid "Whether the animation should loop"
 msgstr "Om animasjonen skal gå i løkke"
 
-#: ../clutter/deprecated/clutter-animation.c:576
+#: ../clutter/deprecated/clutter-animation.c:573
 msgid "The timeline used by the animation"
 msgstr "Tidslinje brukt av animasjonen"
 
-#: ../clutter/deprecated/clutter-animation.c:592
-#: ../clutter/deprecated/clutter-behaviour.c:241
+#: ../clutter/deprecated/clutter-animation.c:589
+#: ../clutter/deprecated/clutter-behaviour.c:237
 msgid "Alpha"
 msgstr ""
 
-#: ../clutter/deprecated/clutter-animation.c:593
+#: ../clutter/deprecated/clutter-animation.c:590
 msgid "The alpha used by the animation"
 msgstr ""
 
-#: ../clutter/deprecated/clutter-animator.c:1804
+#: ../clutter/deprecated/clutter-animator.c:1802
 msgid "The duration of the animation"
 msgstr "Varighet for animasjonen"
 
-#: ../clutter/deprecated/clutter-animator.c:1821
+#: ../clutter/deprecated/clutter-animator.c:1819
 msgid "The timeline of the animation"
 msgstr "Tidslinje for animasjonen"
 
-#: ../clutter/deprecated/clutter-behaviour.c:242
+#: ../clutter/deprecated/clutter-behaviour.c:238
 msgid "Alpha Object to drive the behaviour"
 msgstr ""
 
-#: ../clutter/deprecated/clutter-behaviour-depth.c:181
+#: ../clutter/deprecated/clutter-behaviour-depth.c:180
 msgid "Start Depth"
 msgstr "Startdybde"
 
-#: ../clutter/deprecated/clutter-behaviour-depth.c:182
+#: ../clutter/deprecated/clutter-behaviour-depth.c:181
 msgid "Initial depth to apply"
 msgstr ""
 
-#: ../clutter/deprecated/clutter-behaviour-depth.c:197
+#: ../clutter/deprecated/clutter-behaviour-depth.c:196
 msgid "End Depth"
 msgstr ""
 
-#: ../clutter/deprecated/clutter-behaviour-depth.c:198
+#: ../clutter/deprecated/clutter-behaviour-depth.c:197
 msgid "Final depth to apply"
 msgstr ""
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:400
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:394
 msgid "Start Angle"
 msgstr "Startvinkel"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:401
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:283
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:395
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:277
 msgid "Initial angle"
 msgstr "Utgangsvinkel"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:416
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:410
 msgid "End Angle"
 msgstr "Sluttvinkel"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:417
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:301
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:411
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:295
 msgid "Final angle"
 msgstr "Endelig vinkel"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:432
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:426
 msgid "Angle x tilt"
 msgstr ""
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:433
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:427
 msgid "Tilt of the ellipse around x axis"
 msgstr ""
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:448
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:442
 msgid "Angle y tilt"
 msgstr ""
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:449
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:443
 msgid "Tilt of the ellipse around y axis"
 msgstr ""
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:464
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:458
 msgid "Angle z tilt"
 msgstr ""
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:465
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:459
 msgid "Tilt of the ellipse around z axis"
 msgstr ""
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:481
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:475
 msgid "Width of the ellipse"
 msgstr "Bredde på ellipse"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:497
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:491
 msgid "Height of ellipse"
 msgstr "Høyde på ellipse"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:512
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:506
 msgid "Center"
 msgstr "Senter"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:513
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:507
 msgid "Center of ellipse"
 msgstr "Senter av ellipse"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:528
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:337
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:522
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:331
 msgid "Direction of rotation"
 msgstr "Retning for rotasjon"
 
-#: ../clutter/deprecated/clutter-behaviour-opacity.c:184
+#: ../clutter/deprecated/clutter-behaviour-opacity.c:177
 msgid "Opacity Start"
 msgstr ""
 
-#: ../clutter/deprecated/clutter-behaviour-opacity.c:185
+#: ../clutter/deprecated/clutter-behaviour-opacity.c:178
 msgid "Initial opacity level"
 msgstr ""
 
-#: ../clutter/deprecated/clutter-behaviour-opacity.c:202
+#: ../clutter/deprecated/clutter-behaviour-opacity.c:195
 msgid "Opacity End"
 msgstr ""
 
-#: ../clutter/deprecated/clutter-behaviour-opacity.c:203
+#: ../clutter/deprecated/clutter-behaviour-opacity.c:196
 msgid "Final opacity level"
 msgstr ""
 
-#: ../clutter/deprecated/clutter-behaviour-path.c:226
+#: ../clutter/deprecated/clutter-behaviour-path.c:222
 msgid "The ClutterPath object representing the path to animate along"
 msgstr ""
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:282
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:276
 msgid "Angle Begin"
 msgstr "Vinkel start"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:300
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:294
 msgid "Angle End"
 msgstr "Vinkel slutt"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:318
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:312
 msgid "Axis"
 msgstr "Akse"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:319
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:313
 msgid "Axis of rotation"
 msgstr "Rotasjonsakse"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:354
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:348
 msgid "Center X"
 msgstr ""
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:355
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:349
 msgid "X coordinate of the center of rotation"
 msgstr ""
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:372
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:366
 msgid "Center Y"
 msgstr ""
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:373
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:367
 msgid "Y coordinate of the center of rotation"
 msgstr ""
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:390
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:384
 msgid "Center Z"
 msgstr ""
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:391
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:385
 msgid "Z coordinate of the center of rotation"
 msgstr ""
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:225
+#: ../clutter/deprecated/clutter-behaviour-scale.c:222
 msgid "X Start Scale"
 msgstr ""
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:226
+#: ../clutter/deprecated/clutter-behaviour-scale.c:223
 msgid "Initial scale on the X axis"
 msgstr ""
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:244
+#: ../clutter/deprecated/clutter-behaviour-scale.c:241
 msgid "X End Scale"
 msgstr ""
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:245
+#: ../clutter/deprecated/clutter-behaviour-scale.c:242
 msgid "Final scale on the X axis"
 msgstr ""
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:263
+#: ../clutter/deprecated/clutter-behaviour-scale.c:260
 msgid "Y Start Scale"
 msgstr ""
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:264
+#: ../clutter/deprecated/clutter-behaviour-scale.c:261
 msgid "Initial scale on the Y axis"
 msgstr ""
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:282
+#: ../clutter/deprecated/clutter-behaviour-scale.c:279
 msgid "Y End Scale"
 msgstr ""
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:283
+#: ../clutter/deprecated/clutter-behaviour-scale.c:280
 msgid "Final scale on the Y axis"
 msgstr ""
 
-#: ../clutter/deprecated/clutter-box.c:261
+#: ../clutter/deprecated/clutter-box.c:257
 msgid "The background color of the box"
 msgstr "Bakgrunnsfarge for boksen"
 
-#: ../clutter/deprecated/clutter-box.c:274
+#: ../clutter/deprecated/clutter-box.c:270
 msgid "Color Set"
 msgstr "Farge satt"
 
-#: ../clutter/deprecated/clutter-cairo-texture.c:597
+#: ../clutter/deprecated/clutter-cairo-texture.c:593
 msgid "Surface Width"
 msgstr "Bredde på overflate"
 
-#: ../clutter/deprecated/clutter-cairo-texture.c:598
+#: ../clutter/deprecated/clutter-cairo-texture.c:594
 msgid "The width of the Cairo surface"
 msgstr "Bredde på Cairo-overflate"
 
-#: ../clutter/deprecated/clutter-cairo-texture.c:615
+#: ../clutter/deprecated/clutter-cairo-texture.c:611
 msgid "Surface Height"
 msgstr "Høyde på overflate"
 
-#: ../clutter/deprecated/clutter-cairo-texture.c:616
+#: ../clutter/deprecated/clutter-cairo-texture.c:612
 msgid "The height of the Cairo surface"
 msgstr "Høyde på Cairo-overflate"
 
-#: ../clutter/deprecated/clutter-cairo-texture.c:636
+#: ../clutter/deprecated/clutter-cairo-texture.c:632
 msgid "Auto Resize"
 msgstr "Automatisk endring av størrelse"
 
-#: ../clutter/deprecated/clutter-cairo-texture.c:637
+#: ../clutter/deprecated/clutter-cairo-texture.c:633
 msgid "Whether the surface should match the allocation"
 msgstr "Om overflaten skal være lik allokering"
 
@@ -2369,244 +2400,435 @@ msgstr ""
 msgid "The duration of the stream, in seconds"
 msgstr ""
 
-#: ../clutter/deprecated/clutter-rectangle.c:273
+#: ../clutter/deprecated/clutter-rectangle.c:271
 msgid "The color of the rectangle"
 msgstr "Farge på rektangelet"
 
-#: ../clutter/deprecated/clutter-rectangle.c:286
+#: ../clutter/deprecated/clutter-rectangle.c:284
 msgid "Border Color"
 msgstr "Kantfarge"
 
-#: ../clutter/deprecated/clutter-rectangle.c:287
+#: ../clutter/deprecated/clutter-rectangle.c:285
 msgid "The color of the border of the rectangle"
 msgstr "Farge på kanten av rektangelet"
 
-#: ../clutter/deprecated/clutter-rectangle.c:302
+#: ../clutter/deprecated/clutter-rectangle.c:300
 msgid "Border Width"
 msgstr "Kantbredde"
 
-#: ../clutter/deprecated/clutter-rectangle.c:303
+#: ../clutter/deprecated/clutter-rectangle.c:301
 msgid "The width of the border of the rectangle"
 msgstr "Bredde på kanten av rektangelet"
 
-#: ../clutter/deprecated/clutter-rectangle.c:317
+#: ../clutter/deprecated/clutter-rectangle.c:315
 msgid "Has Border"
 msgstr "Har kant"
 
-#: ../clutter/deprecated/clutter-rectangle.c:318
+#: ../clutter/deprecated/clutter-rectangle.c:316
 msgid "Whether the rectangle should have a border"
 msgstr "Om rektangelet skal ha en kant"
 
-#: ../clutter/deprecated/clutter-shader.c:261
+#: ../clutter/deprecated/clutter-shader.c:257
 msgid "Vertex Source"
 msgstr ""
 
-#: ../clutter/deprecated/clutter-shader.c:262
+#: ../clutter/deprecated/clutter-shader.c:258
 msgid "Source of vertex shader"
 msgstr ""
 
-#: ../clutter/deprecated/clutter-shader.c:278
+#: ../clutter/deprecated/clutter-shader.c:274
 msgid "Fragment Source"
 msgstr ""
 
-#: ../clutter/deprecated/clutter-shader.c:279
+#: ../clutter/deprecated/clutter-shader.c:275
 msgid "Source of fragment shader"
 msgstr ""
 
-#: ../clutter/deprecated/clutter-shader.c:296
+#: ../clutter/deprecated/clutter-shader.c:292
 msgid "Compiled"
 msgstr "Kompilert"
 
-#: ../clutter/deprecated/clutter-shader.c:297
+#: ../clutter/deprecated/clutter-shader.c:293
 msgid "Whether the shader is compiled and linked"
 msgstr ""
 
-#: ../clutter/deprecated/clutter-shader.c:314
+#: ../clutter/deprecated/clutter-shader.c:310
 msgid "Whether the shader is enabled"
 msgstr ""
 
-#: ../clutter/deprecated/clutter-shader.c:525
+#: ../clutter/deprecated/clutter-shader.c:521
 #, c-format
 msgid "%s compilation failed: %s"
 msgstr ""
 
-#: ../clutter/deprecated/clutter-shader.c:526
+#: ../clutter/deprecated/clutter-shader.c:522
 msgid "Vertex shader"
 msgstr ""
 
-#: ../clutter/deprecated/clutter-shader.c:527
+#: ../clutter/deprecated/clutter-shader.c:523
 msgid "Fragment shader"
 msgstr ""
 
-#: ../clutter/deprecated/clutter-state.c:1504
+#: ../clutter/deprecated/clutter-state.c:1499
 msgid "State"
 msgstr "Tilstand"
 
-#: ../clutter/deprecated/clutter-state.c:1505
+#: ../clutter/deprecated/clutter-state.c:1500
 msgid "Currently set state, (transition to this state might not be complete)"
 msgstr ""
 
-#: ../clutter/deprecated/clutter-state.c:1523
+#: ../clutter/deprecated/clutter-state.c:1518
 msgid "Default transition duration"
 msgstr ""
 
-#: ../clutter/evdev/clutter-input-device-evdev.c:159
+#: ../clutter/deprecated/clutter-table-layout.c:543
+msgid "Column Number"
+msgstr "Kolonnenummer"
+
+#: ../clutter/deprecated/clutter-table-layout.c:544
+msgid "The column the widget resides in"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-table-layout.c:551
+msgid "Row Number"
+msgstr "Radnummer"
+
+#: ../clutter/deprecated/clutter-table-layout.c:552
+msgid "The row the widget resides in"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-table-layout.c:559
+msgid "Column Span"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-table-layout.c:560
+msgid "The number of columns the widget should span"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-table-layout.c:567
+msgid "Row Span"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-table-layout.c:568
+msgid "The number of rows the widget should span"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-table-layout.c:575
+msgid "Horizontal Expand"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-table-layout.c:576
+msgid "Allocate extra space for the child in horizontal axis"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-table-layout.c:582
+msgid "Vertical Expand"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-table-layout.c:583
+msgid "Allocate extra space for the child in vertical axis"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-table-layout.c:1638
+msgid "Spacing between columns"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-table-layout.c:1654
+msgid "Spacing between rows"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-texture.c:992
+msgid "Sync size of actor"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-texture.c:993
+msgid "Auto sync size of actor to underlying pixbuf dimensions"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-texture.c:1000
+msgid "Disable Slicing"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-texture.c:1001
+msgid ""
+"Forces the underlying texture to be singular and not made of smaller space "
+"saving individual textures"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-texture.c:1010
+msgid "Tile Waste"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-texture.c:1011
+msgid "Maximum waste area of a sliced texture"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-texture.c:1019
+msgid "Horizontal repeat"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-texture.c:1020
+msgid "Repeat the contents rather than scaling them horizontally"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-texture.c:1027
+msgid "Vertical repeat"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-texture.c:1028
+msgid "Repeat the contents rather than scaling them vertically"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-texture.c:1035
+msgid "Filter Quality"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-texture.c:1036
+msgid "Rendering quality used when drawing the texture"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-texture.c:1044
+msgid "Pixel Format"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-texture.c:1045
+msgid "The Cogl pixel format to use"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-texture.c:1053
+#: ../clutter/wayland/clutter-wayland-surface.c:445
+msgid "Cogl Texture"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-texture.c:1054
+#: ../clutter/wayland/clutter-wayland-surface.c:446
+msgid "The underlying Cogl texture handle used to draw this actor"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-texture.c:1061
+msgid "Cogl Material"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-texture.c:1062
+msgid "The underlying Cogl material handle used to draw this actor"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-texture.c:1081
+msgid "The path of the file containing the image data"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-texture.c:1088
+msgid "Keep Aspect Ratio"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-texture.c:1089
+msgid ""
+"Keep the aspect ratio of the texture when requesting the preferred width or "
+"height"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-texture.c:1117
+msgid "Load asynchronously"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-texture.c:1118
+msgid ""
+"Load files inside a thread to avoid blocking when loading images from disk"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-texture.c:1136
+msgid "Load data asynchronously"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-texture.c:1137
+msgid ""
+"Decode image data files inside a thread to reduce blocking when loading "
+"images from disk"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-texture.c:1163
+msgid "Pick With Alpha"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-texture.c:1164
+msgid "Shape actor with alpha channel when picking"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-texture.c:1597
+#: ../clutter/deprecated/clutter-texture.c:1992
+#: ../clutter/deprecated/clutter-texture.c:2088
+#: ../clutter/deprecated/clutter-texture.c:2386
+#, c-format
+msgid "Failed to load the image data"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-texture.c:1756
+#, c-format
+msgid "YUV textures are not supported"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-texture.c:1765
+#, c-format
+msgid "YUV2 textues are not supported"
+msgstr ""
+
+#: ../clutter/evdev/clutter-input-device-evdev.c:154
 msgid "sysfs Path"
 msgstr ""
 
-#: ../clutter/evdev/clutter-input-device-evdev.c:160
+#: ../clutter/evdev/clutter-input-device-evdev.c:155
 msgid "Path of the device in sysfs"
 msgstr ""
 
-#: ../clutter/evdev/clutter-input-device-evdev.c:175
+#: ../clutter/evdev/clutter-input-device-evdev.c:170
 msgid "Device Path"
 msgstr ""
 
-#: ../clutter/evdev/clutter-input-device-evdev.c:176
+#: ../clutter/evdev/clutter-input-device-evdev.c:171
 msgid "Path of the device node"
 msgstr ""
 
-#: ../clutter/gdk/clutter-backend-gdk.c:294
+#: ../clutter/gdk/clutter-backend-gdk.c:289
 #, c-format
 msgid "Could not find a suitable CoglWinsys for a GdkDisplay of type %s"
 msgstr ""
 
-#: ../clutter/wayland/clutter-wayland-surface.c:423
+#: ../clutter/wayland/clutter-wayland-surface.c:419
 msgid "Surface"
 msgstr "Overflate"
 
-#: ../clutter/wayland/clutter-wayland-surface.c:424
+#: ../clutter/wayland/clutter-wayland-surface.c:420
 msgid "The underlying wayland surface"
 msgstr ""
 
-#: ../clutter/wayland/clutter-wayland-surface.c:431
+#: ../clutter/wayland/clutter-wayland-surface.c:427
 msgid "Surface width"
 msgstr "Bredde på overflate"
 
-#: ../clutter/wayland/clutter-wayland-surface.c:432
+#: ../clutter/wayland/clutter-wayland-surface.c:428
 msgid "The width of the underlying wayland surface"
 msgstr "Bredde på underliggende wayland-overflate"
 
-#: ../clutter/wayland/clutter-wayland-surface.c:440
+#: ../clutter/wayland/clutter-wayland-surface.c:436
 msgid "Surface height"
 msgstr "Høyde på overflate"
 
-#: ../clutter/wayland/clutter-wayland-surface.c:441
+#: ../clutter/wayland/clutter-wayland-surface.c:437
 msgid "The height of the underlying wayland surface"
 msgstr "Høyde på underliggende wayland-overflate"
 
-#: ../clutter/x11/clutter-backend-x11.c:516
+#: ../clutter/x11/clutter-backend-x11.c:488
 msgid "X display to use"
 msgstr "X-skjerm som skal brukes"
 
-#: ../clutter/x11/clutter-backend-x11.c:522
+#: ../clutter/x11/clutter-backend-x11.c:494
 msgid "X screen to use"
 msgstr "X-skjerm som skal brukes"
 
-#: ../clutter/x11/clutter-backend-x11.c:527
+#: ../clutter/x11/clutter-backend-x11.c:499
 msgid "Make X calls synchronous"
 msgstr ""
 
-#: ../clutter/x11/clutter-backend-x11.c:534
-msgid "Enable XInput support"
+#: ../clutter/x11/clutter-backend-x11.c:506
+msgid "Disable XInput support"
 msgstr ""
 
-#: ../clutter/x11/clutter-keymap-x11.c:317
+#: ../clutter/x11/clutter-keymap-x11.c:322
 msgid "The Clutter backend"
 msgstr ""
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:538
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:534
 msgid "Pixmap"
 msgstr ""
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:539
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:535
 msgid "The X11 Pixmap to be bound"
 msgstr ""
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:547
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:543
 msgid "Pixmap width"
 msgstr ""
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:548
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:544
 msgid "The width of the pixmap bound to this texture"
 msgstr ""
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:556
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:552
 msgid "Pixmap height"
 msgstr ""
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:557
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:553
 msgid "The height of the pixmap bound to this texture"
 msgstr ""
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:565
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:561
 msgid "Pixmap Depth"
 msgstr ""
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:566
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:562
 msgid "The depth (in number of bits) of the pixmap bound to this texture"
 msgstr ""
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:574
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:570
 msgid "Automatic Updates"
 msgstr "Automatiske oppdateringer"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:575
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:571
 msgid "If the texture should be kept in sync with any pixmap changes."
 msgstr ""
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:583
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:579
 msgid "Window"
 msgstr "Vindu"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:584
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:580
 msgid "The X11 Window to be bound"
 msgstr ""
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:592
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:588
 msgid "Window Redirect Automatic"
 msgstr ""
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:593
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:589
 msgid "If composite window redirects are set to Automatic (or Manual if false)"
 msgstr ""
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:603
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:599
 msgid "Window Mapped"
 msgstr ""
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:604
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:600
 msgid "If window is mapped"
 msgstr ""
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:613
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:609
 msgid "Destroyed"
 msgstr "Ødelagt"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:614
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:610
 msgid "If window has been destroyed"
 msgstr ""
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:622
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:618
 msgid "Window X"
 msgstr "Vindu X"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:623
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:619
 msgid "X position of window on screen according to X11"
 msgstr ""
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:631
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:627
 msgid "Window Y"
 msgstr "Vindu Y"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:632
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:628
 msgid "Y position of window on screen according to X11"
 msgstr ""
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:639
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:635
 msgid "Window Override Redirect"
 msgstr ""
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:640
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:636
 msgid "If this is an override-redirect window"
 msgstr ""
diff --git a/po/pl.po b/po/pl.po
index 3d4f9687b..77cce7757 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -4,15 +4,15 @@
 # pomóc w jego rozwijaniu i pielęgnowaniu, napisz do nas:
 # gnomepl@aviary.pl
 # -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
-# Piotr Drąg <piotrdrag@gmail.com>, 2010-2013.
-# Aviary.pl <gnomepl@aviary.pl>, 2010-2013.
+# Piotr Drąg <piotrdrag@gmail.com>, 2010-2014.
+# Aviary.pl <gnomepl@aviary.pl>, 2010-2014.
 msgid ""
 msgstr ""
 "Project-Id-Version: clutter\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=clutter\n"
-"POT-Creation-Date: 2013-02-16 21:15+0100\n"
-"PO-Revision-Date: 2013-02-16 21:16+0100\n"
+"POT-Creation-Date: 2014-03-02 18:48+0100\n"
+"PO-Revision-Date: 2014-03-02 18:49+0100\n"
 "Last-Translator: Piotr Drąg <piotrdrag@gmail.com>\n"
 "Language-Team: Polish <gnomepl@aviary.pl>\n"
 "Language: pl\n"
@@ -24,694 +24,694 @@ msgstr ""
 "X-Poedit-Language: Polish\n"
 "X-Poedit-Country: Poland\n"
 
-#: ../clutter/clutter-actor.c:6144
+#: ../clutter/clutter-actor.c:6214
 msgid "X coordinate"
 msgstr "Współrzędna X"
 
-#: ../clutter/clutter-actor.c:6145
+#: ../clutter/clutter-actor.c:6215
 msgid "X coordinate of the actor"
 msgstr "Współrzędna X aktora"
 
-#: ../clutter/clutter-actor.c:6163
+#: ../clutter/clutter-actor.c:6233
 msgid "Y coordinate"
 msgstr "Współrzędna Y"
 
-#: ../clutter/clutter-actor.c:6164
+#: ../clutter/clutter-actor.c:6234
 msgid "Y coordinate of the actor"
 msgstr "Współrzędna Y aktora"
 
-#: ../clutter/clutter-actor.c:6186
+#: ../clutter/clutter-actor.c:6256
 msgid "Position"
 msgstr "Położenie"
 
-#: ../clutter/clutter-actor.c:6187
+#: ../clutter/clutter-actor.c:6257
 msgid "The position of the origin of the actor"
 msgstr "Pierwotne położenie aktora"
 
-#: ../clutter/clutter-actor.c:6204 ../clutter/clutter-canvas.c:215
-#: ../clutter/clutter-grid-layout.c:1238
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:481
+#: ../clutter/clutter-actor.c:6274 ../clutter/clutter-canvas.c:247
+#: ../clutter/clutter-grid-layout.c:1239
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:474
 msgid "Width"
 msgstr "Szerokość"
 
-#: ../clutter/clutter-actor.c:6205
+#: ../clutter/clutter-actor.c:6275
 msgid "Width of the actor"
 msgstr "Szerokość aktora"
 
-#: ../clutter/clutter-actor.c:6223 ../clutter/clutter-canvas.c:231
-#: ../clutter/clutter-grid-layout.c:1245
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:497
+#: ../clutter/clutter-actor.c:6293 ../clutter/clutter-canvas.c:263
+#: ../clutter/clutter-grid-layout.c:1246
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:490
 msgid "Height"
 msgstr "Wysokość"
 
-#: ../clutter/clutter-actor.c:6224
+#: ../clutter/clutter-actor.c:6294
 msgid "Height of the actor"
 msgstr "Wysokość aktora"
 
-#: ../clutter/clutter-actor.c:6245
+#: ../clutter/clutter-actor.c:6315
 msgid "Size"
 msgstr "Rozmiar"
 
-#: ../clutter/clutter-actor.c:6246
+#: ../clutter/clutter-actor.c:6316
 msgid "The size of the actor"
 msgstr "Rozmiar aktora"
 
-#: ../clutter/clutter-actor.c:6264
+#: ../clutter/clutter-actor.c:6334
 msgid "Fixed X"
 msgstr "Stała współrzędna X"
 
-#: ../clutter/clutter-actor.c:6265
+#: ../clutter/clutter-actor.c:6335
 msgid "Forced X position of the actor"
 msgstr "Wymuszone położenie X aktora"
 
-#: ../clutter/clutter-actor.c:6282
+#: ../clutter/clutter-actor.c:6352
 msgid "Fixed Y"
 msgstr "Stała współrzędna Y"
 
-#: ../clutter/clutter-actor.c:6283
+#: ../clutter/clutter-actor.c:6353
 msgid "Forced Y position of the actor"
 msgstr "Wymuszone położenie Y aktora"
 
-#: ../clutter/clutter-actor.c:6298
+#: ../clutter/clutter-actor.c:6368
 msgid "Fixed position set"
 msgstr "Ustawienie stałego położenia"
 
-#: ../clutter/clutter-actor.c:6299
+#: ../clutter/clutter-actor.c:6369
 msgid "Whether to use fixed positioning for the actor"
 msgstr "Określa, czy używać stałego położenia aktora"
 
-#: ../clutter/clutter-actor.c:6317
+#: ../clutter/clutter-actor.c:6387
 msgid "Min Width"
 msgstr "Minimalna szerokość"
 
-#: ../clutter/clutter-actor.c:6318
+#: ../clutter/clutter-actor.c:6388
 msgid "Forced minimum width request for the actor"
 msgstr "Wymuszone żądanie minimalnej szerokości aktora"
 
-#: ../clutter/clutter-actor.c:6336
+#: ../clutter/clutter-actor.c:6406
 msgid "Min Height"
 msgstr "Minimalna wysokość"
 
-#: ../clutter/clutter-actor.c:6337
+#: ../clutter/clutter-actor.c:6407
 msgid "Forced minimum height request for the actor"
 msgstr "Wymuszone żądanie minimalnej wysokości aktora"
 
-#: ../clutter/clutter-actor.c:6355
+#: ../clutter/clutter-actor.c:6425
 msgid "Natural Width"
 msgstr "Naturalna szerokość"
 
-#: ../clutter/clutter-actor.c:6356
+#: ../clutter/clutter-actor.c:6426
 msgid "Forced natural width request for the actor"
 msgstr "Wymuszone żądanie naturalnej szerokości aktora"
 
-#: ../clutter/clutter-actor.c:6374
+#: ../clutter/clutter-actor.c:6444
 msgid "Natural Height"
 msgstr "Naturalna wysokość"
 
-#: ../clutter/clutter-actor.c:6375
+#: ../clutter/clutter-actor.c:6445
 msgid "Forced natural height request for the actor"
 msgstr "Wymuszone żądanie naturalnej wysokości aktora"
 
-#: ../clutter/clutter-actor.c:6390
+#: ../clutter/clutter-actor.c:6460
 msgid "Minimum width set"
 msgstr "Ustawienie minimalnej szerokości"
 
-#: ../clutter/clutter-actor.c:6391
+#: ../clutter/clutter-actor.c:6461
 msgid "Whether to use the min-width property"
 msgstr "Określa, czy używać właściwości \"min-width\""
 
-#: ../clutter/clutter-actor.c:6405
+#: ../clutter/clutter-actor.c:6475
 msgid "Minimum height set"
 msgstr "Ustawienie minimalnej wysokości"
 
-#: ../clutter/clutter-actor.c:6406
+#: ../clutter/clutter-actor.c:6476
 msgid "Whether to use the min-height property"
 msgstr "Określa, czy używać właściwości \"min-height\""
 
-#: ../clutter/clutter-actor.c:6420
+#: ../clutter/clutter-actor.c:6490
 msgid "Natural width set"
 msgstr "Ustawienie naturalnej szerokości"
 
-#: ../clutter/clutter-actor.c:6421
+#: ../clutter/clutter-actor.c:6491
 msgid "Whether to use the natural-width property"
 msgstr "Określa, czy używać właściwości \"natural-width\""
 
-#: ../clutter/clutter-actor.c:6435
+#: ../clutter/clutter-actor.c:6505
 msgid "Natural height set"
 msgstr "Ustawienie naturalnej wysokości"
 
-#: ../clutter/clutter-actor.c:6436
+#: ../clutter/clutter-actor.c:6506
 msgid "Whether to use the natural-height property"
 msgstr "Określa, czy używać właściwości \"natural-height\""
 
-#: ../clutter/clutter-actor.c:6452
+#: ../clutter/clutter-actor.c:6522
 msgid "Allocation"
 msgstr "Przydzielenie"
 
-#: ../clutter/clutter-actor.c:6453
+#: ../clutter/clutter-actor.c:6523
 msgid "The actor's allocation"
 msgstr "Przydzielenie aktora"
 
-#: ../clutter/clutter-actor.c:6510
+#: ../clutter/clutter-actor.c:6580
 msgid "Request Mode"
 msgstr "Tryb żądania"
 
-#: ../clutter/clutter-actor.c:6511
+#: ../clutter/clutter-actor.c:6581
 msgid "The actor's request mode"
 msgstr "Tryb żądania aktora"
 
-#: ../clutter/clutter-actor.c:6535
+#: ../clutter/clutter-actor.c:6605
 msgid "Depth"
 msgstr "Głębia"
 
-#: ../clutter/clutter-actor.c:6536
+#: ../clutter/clutter-actor.c:6606
 msgid "Position on the Z axis"
 msgstr "Położenie na osi Z"
 
-#: ../clutter/clutter-actor.c:6563
+#: ../clutter/clutter-actor.c:6633
 msgid "Z Position"
 msgstr "Położenie na osi Z"
 
-#: ../clutter/clutter-actor.c:6564
+#: ../clutter/clutter-actor.c:6634
 msgid "The actor's position on the Z axis"
 msgstr "Położenie aktora na osi Z"
 
-#: ../clutter/clutter-actor.c:6581
+#: ../clutter/clutter-actor.c:6651
 msgid "Opacity"
 msgstr "Nieprzezroczystość"
 
-#: ../clutter/clutter-actor.c:6582
+#: ../clutter/clutter-actor.c:6652
 msgid "Opacity of an actor"
 msgstr "Nieprzezroczystość aktora"
 
-#: ../clutter/clutter-actor.c:6602
+#: ../clutter/clutter-actor.c:6672
 msgid "Offscreen redirect"
 msgstr "Przekierowanie poza ekranem"
 
-#: ../clutter/clutter-actor.c:6603
+#: ../clutter/clutter-actor.c:6673
 msgid "Flags controlling when to flatten the actor into a single image"
 msgstr "Flaga kontrolująca, kiedy spłaszczać aktora do pojedynczego obrazu"
 
-#: ../clutter/clutter-actor.c:6617
+#: ../clutter/clutter-actor.c:6687
 msgid "Visible"
 msgstr "Widoczny"
 
-#: ../clutter/clutter-actor.c:6618
+#: ../clutter/clutter-actor.c:6688
 msgid "Whether the actor is visible or not"
 msgstr "Określa, czy aktor jest widoczny"
 
-#: ../clutter/clutter-actor.c:6632
+#: ../clutter/clutter-actor.c:6702
 msgid "Mapped"
 msgstr "Mapowany"
 
-#: ../clutter/clutter-actor.c:6633
+#: ../clutter/clutter-actor.c:6703
 msgid "Whether the actor will be painted"
 msgstr "Określa, czy aktor będzie pomalowany"
 
-#: ../clutter/clutter-actor.c:6646
+#: ../clutter/clutter-actor.c:6716
 msgid "Realized"
 msgstr "Zrealizowany"
 
-#: ../clutter/clutter-actor.c:6647
+#: ../clutter/clutter-actor.c:6717
 msgid "Whether the actor has been realized"
 msgstr "Określa, czy aktor został zrealizowany"
 
-#: ../clutter/clutter-actor.c:6662
+#: ../clutter/clutter-actor.c:6732
 msgid "Reactive"
 msgstr "Reakcyjny"
 
-#: ../clutter/clutter-actor.c:6663
+#: ../clutter/clutter-actor.c:6733
 msgid "Whether the actor is reactive to events"
 msgstr "Określa, czy aktor reaguje na zdarzenia"
 
-#: ../clutter/clutter-actor.c:6674
+#: ../clutter/clutter-actor.c:6744
 msgid "Has Clip"
 msgstr "Posiada klamrę"
 
-#: ../clutter/clutter-actor.c:6675
+#: ../clutter/clutter-actor.c:6745
 msgid "Whether the actor has a clip set"
 msgstr "Określa, czy aktor posiada ustawioną klamrę"
 
-#: ../clutter/clutter-actor.c:6688
+#: ../clutter/clutter-actor.c:6758
 msgid "Clip"
 msgstr "Klamra"
 
-#: ../clutter/clutter-actor.c:6689
+#: ../clutter/clutter-actor.c:6759
 msgid "The clip region for the actor"
 msgstr "Obszar klamry aktora"
 
-#: ../clutter/clutter-actor.c:6708
+#: ../clutter/clutter-actor.c:6778
 msgid "Clip Rectangle"
 msgstr "Prostokąt klamry"
 
-#: ../clutter/clutter-actor.c:6709
+#: ../clutter/clutter-actor.c:6779
 msgid "The visible region of the actor"
 msgstr "Widoczny obszar aktora"
 
-#: ../clutter/clutter-actor.c:6723 ../clutter/clutter-actor-meta.c:207
-#: ../clutter/clutter-binding-pool.c:319 ../clutter/clutter-input-device.c:258
+#: ../clutter/clutter-actor.c:6793 ../clutter/clutter-actor-meta.c:205
+#: ../clutter/clutter-binding-pool.c:319 ../clutter/clutter-input-device.c:247
 msgid "Name"
 msgstr "Nazwa"
 
-#: ../clutter/clutter-actor.c:6724
+#: ../clutter/clutter-actor.c:6794
 msgid "Name of the actor"
 msgstr "Nazwa aktora"
 
-#: ../clutter/clutter-actor.c:6745
+#: ../clutter/clutter-actor.c:6815
 msgid "Pivot Point"
 msgstr "Punkt obrotu"
 
-#: ../clutter/clutter-actor.c:6746
+#: ../clutter/clutter-actor.c:6816
 msgid "The point around which the scaling and rotation occur"
 msgstr "Punkt, wokół którego następuje skalowanie i obracanie"
 
-#: ../clutter/clutter-actor.c:6764
+#: ../clutter/clutter-actor.c:6834
 msgid "Pivot Point Z"
 msgstr "Punkt Z obrotu"
 
-#: ../clutter/clutter-actor.c:6765
+#: ../clutter/clutter-actor.c:6835
 msgid "Z component of the pivot point"
 msgstr "Składnik Z punktu obrotu"
 
-#: ../clutter/clutter-actor.c:6783
+#: ../clutter/clutter-actor.c:6853
 msgid "Scale X"
 msgstr "Skalowanie współrzędnej X"
 
-#: ../clutter/clutter-actor.c:6784
+#: ../clutter/clutter-actor.c:6854
 msgid "Scale factor on the X axis"
 msgstr "Czynnik skalowania na osi X"
 
-#: ../clutter/clutter-actor.c:6802
+#: ../clutter/clutter-actor.c:6872
 msgid "Scale Y"
 msgstr "Skalowanie współrzędnej Y"
 
-#: ../clutter/clutter-actor.c:6803
+#: ../clutter/clutter-actor.c:6873
 msgid "Scale factor on the Y axis"
 msgstr "Czynnik skalowania na osi Y"
 
-#: ../clutter/clutter-actor.c:6821
+#: ../clutter/clutter-actor.c:6891
 msgid "Scale Z"
 msgstr "Skalowanie współrzędnej X"
 
-#: ../clutter/clutter-actor.c:6822
+#: ../clutter/clutter-actor.c:6892
 msgid "Scale factor on the Z axis"
 msgstr "Czynnik skalowania na osi Z"
 
-#: ../clutter/clutter-actor.c:6840
+#: ../clutter/clutter-actor.c:6910
 msgid "Scale Center X"
 msgstr "Środek skalowania współrzędnej X"
 
-#: ../clutter/clutter-actor.c:6841
+#: ../clutter/clutter-actor.c:6911
 msgid "Horizontal scale center"
 msgstr "Poziomy środek skalowania"
 
-#: ../clutter/clutter-actor.c:6859
+#: ../clutter/clutter-actor.c:6929
 msgid "Scale Center Y"
 msgstr "Środek skalowania współrzędnej Y"
 
-#: ../clutter/clutter-actor.c:6860
+#: ../clutter/clutter-actor.c:6930
 msgid "Vertical scale center"
 msgstr "Pionowy środek skalowania"
 
-#: ../clutter/clutter-actor.c:6878
+#: ../clutter/clutter-actor.c:6948
 msgid "Scale Gravity"
 msgstr "Grawitacja skalowania"
 
-#: ../clutter/clutter-actor.c:6879
+#: ../clutter/clutter-actor.c:6949
 msgid "The center of scaling"
 msgstr "Środek skalowania"
 
-#: ../clutter/clutter-actor.c:6897
+#: ../clutter/clutter-actor.c:6967
 msgid "Rotation Angle X"
 msgstr "Kąt obrotu współrzędnej X"
 
-#: ../clutter/clutter-actor.c:6898
+#: ../clutter/clutter-actor.c:6968
 msgid "The rotation angle on the X axis"
 msgstr "Kąt obrotu na osi X"
 
-#: ../clutter/clutter-actor.c:6916
+#: ../clutter/clutter-actor.c:6986
 msgid "Rotation Angle Y"
 msgstr "Kąt obrotu współrzędnej Y"
 
-#: ../clutter/clutter-actor.c:6917
+#: ../clutter/clutter-actor.c:6987
 msgid "The rotation angle on the Y axis"
 msgstr "Kąt obrotu na osi Y"
 
-#: ../clutter/clutter-actor.c:6935
+#: ../clutter/clutter-actor.c:7005
 msgid "Rotation Angle Z"
 msgstr "Kąt obrotu współrzędnej Z"
 
-#: ../clutter/clutter-actor.c:6936
+#: ../clutter/clutter-actor.c:7006
 msgid "The rotation angle on the Z axis"
 msgstr "Kąt obrotu na osi Z"
 
-#: ../clutter/clutter-actor.c:6954
+#: ../clutter/clutter-actor.c:7024
 msgid "Rotation Center X"
 msgstr "Środek obrotu współrzędnej X"
 
-#: ../clutter/clutter-actor.c:6955
+#: ../clutter/clutter-actor.c:7025
 msgid "The rotation center on the X axis"
 msgstr "Środek obrotu na osi X"
 
-#: ../clutter/clutter-actor.c:6972
+#: ../clutter/clutter-actor.c:7042
 msgid "Rotation Center Y"
 msgstr "Środek obrotu współrzędnej Y"
 
-#: ../clutter/clutter-actor.c:6973
+#: ../clutter/clutter-actor.c:7043
 msgid "The rotation center on the Y axis"
 msgstr "Środek obrotu na osi Y"
 
-#: ../clutter/clutter-actor.c:6990
+#: ../clutter/clutter-actor.c:7060
 msgid "Rotation Center Z"
 msgstr "Środek obrotu współrzędnej Z"
 
-#: ../clutter/clutter-actor.c:6991
+#: ../clutter/clutter-actor.c:7061
 msgid "The rotation center on the Z axis"
 msgstr "Środek obrotu na osi Z"
 
-#: ../clutter/clutter-actor.c:7008
+#: ../clutter/clutter-actor.c:7078
 msgid "Rotation Center Z Gravity"
 msgstr "Grawitacja środka obrotu współrzędnej Z"
 
-#: ../clutter/clutter-actor.c:7009
+#: ../clutter/clutter-actor.c:7079
 msgid "Center point for rotation around the Z axis"
 msgstr "Punkt środkowy dla obrotu wokół osi Z"
 
-#: ../clutter/clutter-actor.c:7037
+#: ../clutter/clutter-actor.c:7107
 msgid "Anchor X"
 msgstr "Kotwica współrzędnej X"
 
-#: ../clutter/clutter-actor.c:7038
+#: ../clutter/clutter-actor.c:7108
 msgid "X coordinate of the anchor point"
 msgstr "Współrzędna X punktu kotwicy"
 
-#: ../clutter/clutter-actor.c:7066
+#: ../clutter/clutter-actor.c:7136
 msgid "Anchor Y"
 msgstr "Kotwica współrzędnej Y"
 
-#: ../clutter/clutter-actor.c:7067
+#: ../clutter/clutter-actor.c:7137
 msgid "Y coordinate of the anchor point"
 msgstr "Współrzędna Y punktu kotwicy"
 
-#: ../clutter/clutter-actor.c:7094
+#: ../clutter/clutter-actor.c:7164
 msgid "Anchor Gravity"
 msgstr "Grawitacja kotwicy"
 
-#: ../clutter/clutter-actor.c:7095
+#: ../clutter/clutter-actor.c:7165
 msgid "The anchor point as a ClutterGravity"
 msgstr "Punkt kotwicy jako \"ClutterGravity\""
 
-#: ../clutter/clutter-actor.c:7114
+#: ../clutter/clutter-actor.c:7184
 msgid "Translation X"
 msgstr "Współrzędna X tłumaczenia"
 
-#: ../clutter/clutter-actor.c:7115
+#: ../clutter/clutter-actor.c:7185
 msgid "Translation along the X axis"
 msgstr "Tłumaczenie na osi X"
 
-#: ../clutter/clutter-actor.c:7134
+#: ../clutter/clutter-actor.c:7204
 msgid "Translation Y"
 msgstr "Współrzędna Y tłumaczenia"
 
-#: ../clutter/clutter-actor.c:7135
+#: ../clutter/clutter-actor.c:7205
 msgid "Translation along the Y axis"
 msgstr "Tłumaczenie na osi Y"
 
-#: ../clutter/clutter-actor.c:7154
+#: ../clutter/clutter-actor.c:7224
 msgid "Translation Z"
 msgstr "Współrzędna Z tłumaczenia"
 
-#: ../clutter/clutter-actor.c:7155
+#: ../clutter/clutter-actor.c:7225
 msgid "Translation along the Z axis"
 msgstr "Tłumaczenie na osi Z"
 
-#: ../clutter/clutter-actor.c:7185
+#: ../clutter/clutter-actor.c:7255
 msgid "Transform"
 msgstr "Przekształcanie"
 
-#: ../clutter/clutter-actor.c:7186
+#: ../clutter/clutter-actor.c:7256
 msgid "Transformation matrix"
 msgstr "Macierz przekształceń"
 
-#: ../clutter/clutter-actor.c:7201
+#: ../clutter/clutter-actor.c:7271
 msgid "Transform Set"
 msgstr "Ustawienie przekształcania"
 
-#: ../clutter/clutter-actor.c:7202
+#: ../clutter/clutter-actor.c:7272
 msgid "Whether the transform property is set"
 msgstr "Określa, czy właściwość \"transform\" jest ustawiona"
 
-#: ../clutter/clutter-actor.c:7223
+#: ../clutter/clutter-actor.c:7293
 msgid "Child Transform"
 msgstr "Przekształcanie elementu potomnego"
 
-#: ../clutter/clutter-actor.c:7224
+#: ../clutter/clutter-actor.c:7294
 msgid "Children transformation matrix"
 msgstr "Macierz przekształcania elementów potomnych"
 
-#: ../clutter/clutter-actor.c:7239
+#: ../clutter/clutter-actor.c:7309
 msgid "Child Transform Set"
 msgstr "Ustawienie przekształcania elementu potomnego"
 
-#: ../clutter/clutter-actor.c:7240
+#: ../clutter/clutter-actor.c:7310
 msgid "Whether the child-transform property is set"
 msgstr "Określa, czy właściwość \"child-transform\" jest ustawiona"
 
-#: ../clutter/clutter-actor.c:7257
+#: ../clutter/clutter-actor.c:7327
 msgid "Show on set parent"
 msgstr "Wyświetlanie na ustawionym rodzicu"
 
-#: ../clutter/clutter-actor.c:7258
+#: ../clutter/clutter-actor.c:7328
 msgid "Whether the actor is shown when parented"
 msgstr "Określa, czy aktor jest wyświetlany, kiedy posiada rodzica"
 
-#: ../clutter/clutter-actor.c:7275
+#: ../clutter/clutter-actor.c:7345
 msgid "Clip to Allocation"
 msgstr "Klamra do przydziału"
 
-#: ../clutter/clutter-actor.c:7276
+#: ../clutter/clutter-actor.c:7346
 msgid "Sets the clip region to track the actor's allocation"
 msgstr "Ustawia obszar klamry do śledzenia przydzielenia aktora"
 
-#: ../clutter/clutter-actor.c:7289
+#: ../clutter/clutter-actor.c:7359
 msgid "Text Direction"
 msgstr "Kierunek tekstu"
 
-#: ../clutter/clutter-actor.c:7290
+#: ../clutter/clutter-actor.c:7360
 msgid "Direction of the text"
 msgstr "Kierunek tekstu"
 
-#: ../clutter/clutter-actor.c:7305
+#: ../clutter/clutter-actor.c:7375
 msgid "Has Pointer"
 msgstr "Posiada kursor"
 
-#: ../clutter/clutter-actor.c:7306
+#: ../clutter/clutter-actor.c:7376
 msgid "Whether the actor contains the pointer of an input device"
 msgstr "Określa, czy aktor zawiera kursor urządzenia wejścia"
 
-#: ../clutter/clutter-actor.c:7319
+#: ../clutter/clutter-actor.c:7389
 msgid "Actions"
 msgstr "Działania"
 
-#: ../clutter/clutter-actor.c:7320
+#: ../clutter/clutter-actor.c:7390
 msgid "Adds an action to the actor"
 msgstr "Dodaje działania do aktora"
 
-#: ../clutter/clutter-actor.c:7333
+#: ../clutter/clutter-actor.c:7403
 msgid "Constraints"
 msgstr "Ograniczenia"
 
-#: ../clutter/clutter-actor.c:7334
+#: ../clutter/clutter-actor.c:7404
 msgid "Adds a constraint to the actor"
 msgstr "Dodaje ograniczenie do aktora"
 
-#: ../clutter/clutter-actor.c:7347
+#: ../clutter/clutter-actor.c:7417
 msgid "Effect"
 msgstr "Efekt"
 
-#: ../clutter/clutter-actor.c:7348
+#: ../clutter/clutter-actor.c:7418
 msgid "Add an effect to be applied on the actor"
 msgstr "Dodaje efekt do aktora"
 
-#: ../clutter/clutter-actor.c:7362
+#: ../clutter/clutter-actor.c:7432
 msgid "Layout Manager"
 msgstr "Menedżer warstw"
 
-#: ../clutter/clutter-actor.c:7363
+#: ../clutter/clutter-actor.c:7433
 msgid "The object controlling the layout of an actor's children"
 msgstr "Obiekt kontrolujący układ potomków aktora"
 
-#: ../clutter/clutter-actor.c:7377
+#: ../clutter/clutter-actor.c:7447
 msgid "X Expand"
 msgstr "Rozwinięcie współrzędnej X"
 
-#: ../clutter/clutter-actor.c:7378
+#: ../clutter/clutter-actor.c:7448
 msgid "Whether extra horizontal space should be assigned to the actor"
 msgstr ""
 "Określa, czy dodatkowa powierzchnia pozioma powinna być przydzielona do "
 "aktora"
 
-#: ../clutter/clutter-actor.c:7393
+#: ../clutter/clutter-actor.c:7463
 msgid "Y Expand"
 msgstr "Rozwinięcie współrzędnej Y"
 
-#: ../clutter/clutter-actor.c:7394
+#: ../clutter/clutter-actor.c:7464
 msgid "Whether extra vertical space should be assigned to the actor"
 msgstr ""
 "Określa, czy dodatkowa powierzchnia pionowa powinna być przydzielona do "
 "aktora"
 
-#: ../clutter/clutter-actor.c:7410
+#: ../clutter/clutter-actor.c:7480
 msgid "X Alignment"
 msgstr "Wyrównanie współrzędnej X"
 
-#: ../clutter/clutter-actor.c:7411
+#: ../clutter/clutter-actor.c:7481
 msgid "The alignment of the actor on the X axis within its allocation"
 msgstr "Wyrównanie aktora na osi X wewnątrz jego przydziału"
 
-#: ../clutter/clutter-actor.c:7426
+#: ../clutter/clutter-actor.c:7496
 msgid "Y Alignment"
 msgstr "Wyrównanie współrzędnej Y"
 
-#: ../clutter/clutter-actor.c:7427
+#: ../clutter/clutter-actor.c:7497
 msgid "The alignment of the actor on the Y axis within its allocation"
 msgstr "Wyrównanie aktora na osi Y wewnątrz jego przydziału"
 
-#: ../clutter/clutter-actor.c:7446
+#: ../clutter/clutter-actor.c:7516
 msgid "Margin Top"
 msgstr "Górny margines"
 
-#: ../clutter/clutter-actor.c:7447
+#: ../clutter/clutter-actor.c:7517
 msgid "Extra space at the top"
 msgstr "Dodatkowe miejsce na górze"
 
-#: ../clutter/clutter-actor.c:7468
+#: ../clutter/clutter-actor.c:7538
 msgid "Margin Bottom"
 msgstr "Dolny margines"
 
-#: ../clutter/clutter-actor.c:7469
+#: ../clutter/clutter-actor.c:7539
 msgid "Extra space at the bottom"
 msgstr "Dodatkowe miejsce na dole"
 
-#: ../clutter/clutter-actor.c:7490
+#: ../clutter/clutter-actor.c:7560
 msgid "Margin Left"
 msgstr "Lewy margines"
 
-#: ../clutter/clutter-actor.c:7491
+#: ../clutter/clutter-actor.c:7561
 msgid "Extra space at the left"
 msgstr "Dodatkowe miejsce po lewej"
 
-#: ../clutter/clutter-actor.c:7512
+#: ../clutter/clutter-actor.c:7582
 msgid "Margin Right"
 msgstr "Prawy margines"
 
-#: ../clutter/clutter-actor.c:7513
+#: ../clutter/clutter-actor.c:7583
 msgid "Extra space at the right"
 msgstr "Dodatkowe miejsce po prawej"
 
-#: ../clutter/clutter-actor.c:7529
+#: ../clutter/clutter-actor.c:7599
 msgid "Background Color Set"
 msgstr "Ustawienie koloru tła"
 
-#: ../clutter/clutter-actor.c:7530 ../clutter/deprecated/clutter-box.c:275
+#: ../clutter/clutter-actor.c:7600 ../clutter/deprecated/clutter-box.c:271
 msgid "Whether the background color is set"
 msgstr "Określa, czy kolor tła jest ustawiony"
 
-#: ../clutter/clutter-actor.c:7546
+#: ../clutter/clutter-actor.c:7616
 msgid "Background color"
 msgstr "Kolor tła"
 
-#: ../clutter/clutter-actor.c:7547
+#: ../clutter/clutter-actor.c:7617
 msgid "The actor's background color"
 msgstr "Kolor tła aktora"
 
-#: ../clutter/clutter-actor.c:7562
+#: ../clutter/clutter-actor.c:7632
 msgid "First Child"
 msgstr "Pierwszy potomek"
 
-#: ../clutter/clutter-actor.c:7563
+#: ../clutter/clutter-actor.c:7633
 msgid "The actor's first child"
 msgstr "Pierwszy potomek aktora"
 
-#: ../clutter/clutter-actor.c:7576
+#: ../clutter/clutter-actor.c:7646
 msgid "Last Child"
 msgstr "Ostatni potomek"
 
-#: ../clutter/clutter-actor.c:7577
+#: ../clutter/clutter-actor.c:7647
 msgid "The actor's last child"
 msgstr "Ostatni potomek aktora"
 
-#: ../clutter/clutter-actor.c:7591
+#: ../clutter/clutter-actor.c:7661
 msgid "Content"
 msgstr "Zawartość"
 
-#: ../clutter/clutter-actor.c:7592
+#: ../clutter/clutter-actor.c:7662
 msgid "Delegate object for painting the actor's content"
 msgstr "Deleguje obiekt do malowania zawartości aktora"
 
-#: ../clutter/clutter-actor.c:7617
+#: ../clutter/clutter-actor.c:7687
 msgid "Content Gravity"
 msgstr "Grawitacja zawartości"
 
-#: ../clutter/clutter-actor.c:7618
+#: ../clutter/clutter-actor.c:7688
 msgid "Alignment of the actor's content"
 msgstr "Wyrównanie zawartości aktora"
 
-#: ../clutter/clutter-actor.c:7638
+#: ../clutter/clutter-actor.c:7708
 msgid "Content Box"
 msgstr "Pole zawartości"
 
-#: ../clutter/clutter-actor.c:7639
+#: ../clutter/clutter-actor.c:7709
 msgid "The bounding box of the actor's content"
 msgstr "Pole dookoła zawartości aktora"
 
-#: ../clutter/clutter-actor.c:7647
+#: ../clutter/clutter-actor.c:7717
 msgid "Minification Filter"
 msgstr "Filtr pomniejszenia"
 
-#: ../clutter/clutter-actor.c:7648
+#: ../clutter/clutter-actor.c:7718
 msgid "The filter used when reducing the size of the content"
 msgstr "Filtr używany podczas zmniejszania rozmiaru zawartości"
 
-#: ../clutter/clutter-actor.c:7655
+#: ../clutter/clutter-actor.c:7725
 msgid "Magnification Filter"
 msgstr "Filtr powiększenia"
 
-#: ../clutter/clutter-actor.c:7656
+#: ../clutter/clutter-actor.c:7726
 msgid "The filter used when increasing the size of the content"
 msgstr "Filtr używany podczas zwiększania rozmiaru zawartości"
 
-#: ../clutter/clutter-actor.c:7670
+#: ../clutter/clutter-actor.c:7740
 msgid "Content Repeat"
 msgstr "Powtarzanie zawartości"
 
-#: ../clutter/clutter-actor.c:7671
+#: ../clutter/clutter-actor.c:7741
 msgid "The repeat policy for the actor's content"
 msgstr "Polityka powtarzania dla zawartości aktora"
 
-#: ../clutter/clutter-actor-meta.c:193 ../clutter/clutter-child-meta.c:142
+#: ../clutter/clutter-actor-meta.c:191 ../clutter/clutter-child-meta.c:142
 msgid "Actor"
 msgstr "Aktor"
 
-#: ../clutter/clutter-actor-meta.c:194
+#: ../clutter/clutter-actor-meta.c:192
 msgid "The actor attached to the meta"
 msgstr "Aktor dołączony do mety"
 
-#: ../clutter/clutter-actor-meta.c:208
+#: ../clutter/clutter-actor-meta.c:206
 msgid "The name of the meta"
 msgstr "Nazwa mety"
 
-#: ../clutter/clutter-actor-meta.c:221 ../clutter/clutter-input-device.c:337
-#: ../clutter/deprecated/clutter-shader.c:313
+#: ../clutter/clutter-actor-meta.c:219 ../clutter/clutter-input-device.c:326
+#: ../clutter/deprecated/clutter-shader.c:309
 msgid "Enabled"
 msgstr "Włączone"
 
-#: ../clutter/clutter-actor-meta.c:222
+#: ../clutter/clutter-actor-meta.c:220
 msgid "Whether the meta is enabled"
 msgstr "Określa, czy meta jest włączona"
 
 #: ../clutter/clutter-align-constraint.c:279
-#: ../clutter/clutter-bind-constraint.c:358 ../clutter/clutter-clone.c:345
+#: ../clutter/clutter-bind-constraint.c:358 ../clutter/clutter-clone.c:341
 #: ../clutter/clutter-snap-constraint.c:321
 msgid "Source"
 msgstr "Źródło"
@@ -737,11 +737,11 @@ msgstr "Czynnik"
 msgid "The alignment factor, between 0.0 and 1.0"
 msgstr "Czynnik wyrównania, między 0.0 a 1.0"
 
-#: ../clutter/clutter-backend.c:379
+#: ../clutter/clutter-backend.c:380
 msgid "Unable to initialize the Clutter backend"
 msgstr "Nie można zainicjować mechanizmu biblioteki Clutter"
 
-#: ../clutter/clutter-backend.c:453
+#: ../clutter/clutter-backend.c:454
 #, c-format
 msgid "The backend of type '%s' does not support creating multiple stages"
 msgstr "Mechanizm typu \"%s\" nie obsługuje tworzenia wielu scen"
@@ -772,45 +772,49 @@ msgstr "Offset w pikselach do zastosowania do dowiązania"
 msgid "The unique name of the binding pool"
 msgstr "Unikalna nazwa puli dowiązania"
 
-#: ../clutter/clutter-bin-layout.c:240 ../clutter/clutter-bin-layout.c:655
-#: ../clutter/clutter-box-layout.c:390 ../clutter/clutter-table-layout.c:610
+#: ../clutter/clutter-bin-layout.c:238 ../clutter/clutter-bin-layout.c:651
+#: ../clutter/clutter-box-layout.c:388
+#: ../clutter/deprecated/clutter-table-layout.c:610
 msgid "Horizontal Alignment"
 msgstr "Wyrównanie poziome"
 
-#: ../clutter/clutter-bin-layout.c:241
+#: ../clutter/clutter-bin-layout.c:239
 msgid "Horizontal alignment for the actor inside the layout manager"
 msgstr "Poziome wyrównanie aktora wewnątrz menedżera warstw"
 
-#: ../clutter/clutter-bin-layout.c:249 ../clutter/clutter-bin-layout.c:675
-#: ../clutter/clutter-box-layout.c:399 ../clutter/clutter-table-layout.c:625
+#: ../clutter/clutter-bin-layout.c:247 ../clutter/clutter-bin-layout.c:671
+#: ../clutter/clutter-box-layout.c:397
+#: ../clutter/deprecated/clutter-table-layout.c:625
 msgid "Vertical Alignment"
 msgstr "Wyrównanie pionowe"
 
-#: ../clutter/clutter-bin-layout.c:250
+#: ../clutter/clutter-bin-layout.c:248
 msgid "Vertical alignment for the actor inside the layout manager"
 msgstr "Pionowe wyrównanie aktora wewnątrz menedżera warstw"
 
-#: ../clutter/clutter-bin-layout.c:656
+#: ../clutter/clutter-bin-layout.c:652
 msgid "Default horizontal alignment for the actors inside the layout manager"
 msgstr "Domyślne poziome wyrównanie aktora wewnątrz menedżera warstw"
 
-#: ../clutter/clutter-bin-layout.c:676
+#: ../clutter/clutter-bin-layout.c:672
 msgid "Default vertical alignment for the actors inside the layout manager"
 msgstr "Domyślne pionowe wyrównanie aktora wewnątrz menedżera warstw"
 
-#: ../clutter/clutter-box-layout.c:365
+#: ../clutter/clutter-box-layout.c:363
 msgid "Expand"
 msgstr "Rozwinięcie"
 
-#: ../clutter/clutter-box-layout.c:366
+#: ../clutter/clutter-box-layout.c:364
 msgid "Allocate extra space for the child"
 msgstr "Przydziela dodatkowe miejsca na potomka"
 
-#: ../clutter/clutter-box-layout.c:372 ../clutter/clutter-table-layout.c:589
+#: ../clutter/clutter-box-layout.c:370
+#: ../clutter/deprecated/clutter-table-layout.c:589
 msgid "Horizontal Fill"
 msgstr "Wypełnienie poziome"
 
-#: ../clutter/clutter-box-layout.c:373 ../clutter/clutter-table-layout.c:590
+#: ../clutter/clutter-box-layout.c:371
+#: ../clutter/deprecated/clutter-table-layout.c:590
 msgid ""
 "Whether the child should receive priority when the container is allocating "
 "spare space on the horizontal axis"
@@ -818,11 +822,13 @@ msgstr ""
 "Określa, czy potomek powinien otrzymać priorytet, kiedy kontener przydziela "
 "zapasowe miejsce na osi poziomej"
 
-#: ../clutter/clutter-box-layout.c:381 ../clutter/clutter-table-layout.c:596
+#: ../clutter/clutter-box-layout.c:379
+#: ../clutter/deprecated/clutter-table-layout.c:596
 msgid "Vertical Fill"
 msgstr "Wypełnienie pionowe"
 
-#: ../clutter/clutter-box-layout.c:382 ../clutter/clutter-table-layout.c:597
+#: ../clutter/clutter-box-layout.c:380
+#: ../clutter/deprecated/clutter-table-layout.c:597
 msgid ""
 "Whether the child should receive priority when the container is allocating "
 "spare space on the vertical axis"
@@ -830,80 +836,88 @@ msgstr ""
 "Określa, czy potomek powinien otrzymać priorytet, kiedy kontener przydziela "
 "zapasowe miejsce na osi pionowej"
 
-#: ../clutter/clutter-box-layout.c:391 ../clutter/clutter-table-layout.c:611
+#: ../clutter/clutter-box-layout.c:389
+#: ../clutter/deprecated/clutter-table-layout.c:611
 msgid "Horizontal alignment of the actor within the cell"
 msgstr "Poziome wyrównanie aktora wewnątrz komórki"
 
-#: ../clutter/clutter-box-layout.c:400 ../clutter/clutter-table-layout.c:626
+#: ../clutter/clutter-box-layout.c:398
+#: ../clutter/deprecated/clutter-table-layout.c:626
 msgid "Vertical alignment of the actor within the cell"
 msgstr "Pionowe wyrównanie aktora wewnątrz komórki"
 
-#: ../clutter/clutter-box-layout.c:1365
+#: ../clutter/clutter-box-layout.c:1359
 msgid "Vertical"
 msgstr "Pionowe"
 
-#: ../clutter/clutter-box-layout.c:1366
+#: ../clutter/clutter-box-layout.c:1360
 msgid "Whether the layout should be vertical, rather than horizontal"
 msgstr "Określa, czy układ powinien być pionowy, zamiast poziomego"
 
-#: ../clutter/clutter-box-layout.c:1383 ../clutter/clutter-flow-layout.c:890
-#: ../clutter/clutter-grid-layout.c:1550
+#: ../clutter/clutter-box-layout.c:1377 ../clutter/clutter-flow-layout.c:942
+#: ../clutter/clutter-grid-layout.c:1549
 msgid "Orientation"
 msgstr "Orientacja"
 
-#: ../clutter/clutter-box-layout.c:1384 ../clutter/clutter-flow-layout.c:891
-#: ../clutter/clutter-grid-layout.c:1551
+#: ../clutter/clutter-box-layout.c:1378 ../clutter/clutter-flow-layout.c:943
+#: ../clutter/clutter-grid-layout.c:1550
 msgid "The orientation of the layout"
 msgstr "Orientacja układu"
 
-#: ../clutter/clutter-box-layout.c:1400 ../clutter/clutter-flow-layout.c:906
+#: ../clutter/clutter-box-layout.c:1394 ../clutter/clutter-flow-layout.c:958
 msgid "Homogeneous"
 msgstr "Homogeniczny"
 
-#: ../clutter/clutter-box-layout.c:1401
+#: ../clutter/clutter-box-layout.c:1395
 msgid ""
 "Whether the layout should be homogeneous, i.e. all childs get the same size"
 msgstr ""
 "Określa, czy układ powinien być homogeniczny, tzn. wszyscy potomkowie "
 "otrzymują ten sam rozmiar"
 
-#: ../clutter/clutter-box-layout.c:1416
+#: ../clutter/clutter-box-layout.c:1410
 msgid "Pack Start"
 msgstr "Początek pakowania"
 
-#: ../clutter/clutter-box-layout.c:1417
+#: ../clutter/clutter-box-layout.c:1411
 msgid "Whether to pack items at the start of the box"
 msgstr "Określa, czy pakować elementy na początku pola"
 
-#: ../clutter/clutter-box-layout.c:1430
+#: ../clutter/clutter-box-layout.c:1424
 msgid "Spacing"
 msgstr "Odstęp"
 
-#: ../clutter/clutter-box-layout.c:1431
+#: ../clutter/clutter-box-layout.c:1425
 msgid "Spacing between children"
 msgstr "Odstęp między potomkami"
 
-#: ../clutter/clutter-box-layout.c:1448 ../clutter/clutter-table-layout.c:1675
+#: ../clutter/clutter-box-layout.c:1442
+#: ../clutter/deprecated/clutter-table-layout.c:1677
 msgid "Use Animations"
 msgstr "Użycie animacji"
 
-#: ../clutter/clutter-box-layout.c:1449 ../clutter/clutter-table-layout.c:1676
+#: ../clutter/clutter-box-layout.c:1443
+#: ../clutter/deprecated/clutter-table-layout.c:1678
 msgid "Whether layout changes should be animated"
 msgstr "Określa, czy zmiany układu powinny być animowane"
 
-#: ../clutter/clutter-box-layout.c:1473 ../clutter/clutter-table-layout.c:1700
+#: ../clutter/clutter-box-layout.c:1467
+#: ../clutter/deprecated/clutter-table-layout.c:1702
 msgid "Easing Mode"
 msgstr "Tryb upraszczania"
 
-#: ../clutter/clutter-box-layout.c:1474 ../clutter/clutter-table-layout.c:1701
+#: ../clutter/clutter-box-layout.c:1468
+#: ../clutter/deprecated/clutter-table-layout.c:1703
 msgid "The easing mode of the animations"
 msgstr "Tryb upraszczania animacji"
 
-#: ../clutter/clutter-box-layout.c:1494 ../clutter/clutter-table-layout.c:1721
+#: ../clutter/clutter-box-layout.c:1488
+#: ../clutter/deprecated/clutter-table-layout.c:1723
 msgid "Easing Duration"
 msgstr "Czas trwania upraszczania"
 
-#: ../clutter/clutter-box-layout.c:1495 ../clutter/clutter-table-layout.c:1722
+#: ../clutter/clutter-box-layout.c:1489
+#: ../clutter/deprecated/clutter-table-layout.c:1724
 msgid "The duration of the animations"
 msgstr "Czas trwania animacji"
 
@@ -923,14 +937,30 @@ msgstr "Kontrast"
 msgid "The contrast change to apply"
 msgstr "Zmiana kontrastu do zastosowania"
 
-#: ../clutter/clutter-canvas.c:216
+#: ../clutter/clutter-canvas.c:248
 msgid "The width of the canvas"
 msgstr "Szerokość płótna"
 
-#: ../clutter/clutter-canvas.c:232
+#: ../clutter/clutter-canvas.c:264
 msgid "The height of the canvas"
 msgstr "Wysokość płótna"
 
+#: ../clutter/clutter-canvas.c:283
+msgid "Scale Factor Set"
+msgstr "Ustawienie czynniku skalowania"
+
+#: ../clutter/clutter-canvas.c:284
+msgid "Whether the scale-factor property is set"
+msgstr "Określa, czy właściwość \"scale-factor\" jest ustawiona"
+
+#: ../clutter/clutter-canvas.c:305
+msgid "Scale Factor"
+msgstr "Czynnik skalowania"
+
+#: ../clutter/clutter-canvas.c:306
+msgid "The scaling factor for the surface"
+msgstr "Czynnik skalowania powierzchni"
+
 #: ../clutter/clutter-child-meta.c:127
 msgid "Container"
 msgstr "Kontener"
@@ -943,39 +973,39 @@ msgstr "Kontener, który utworzył te dane"
 msgid "The actor wrapped by this data"
 msgstr "Aktor opakowany przez te dane"
 
-#: ../clutter/clutter-click-action.c:559
+#: ../clutter/clutter-click-action.c:586
 msgid "Pressed"
 msgstr "Wciśnięte"
 
-#: ../clutter/clutter-click-action.c:560
+#: ../clutter/clutter-click-action.c:587
 msgid "Whether the clickable should be in pressed state"
 msgstr "Określa, czy element klikalny jest w stanie wciśniętym"
 
-#: ../clutter/clutter-click-action.c:573
+#: ../clutter/clutter-click-action.c:600
 msgid "Held"
 msgstr "Przytrzymane"
 
-#: ../clutter/clutter-click-action.c:574
+#: ../clutter/clutter-click-action.c:601
 msgid "Whether the clickable has a grab"
 msgstr "Określa, czy element klikalny posiada przytrzymanie"
 
-#: ../clutter/clutter-click-action.c:591 ../clutter/clutter-settings.c:607
+#: ../clutter/clutter-click-action.c:618 ../clutter/clutter-settings.c:653
 msgid "Long Press Duration"
 msgstr "Czas trwania długiego przyciśnięcia"
 
-#: ../clutter/clutter-click-action.c:592
+#: ../clutter/clutter-click-action.c:619
 msgid "The minimum duration of a long press to recognize the gesture"
 msgstr "Minimalny czas trwania długiego przyciśnięcia, aby rozpoznać gest"
 
-#: ../clutter/clutter-click-action.c:610
+#: ../clutter/clutter-click-action.c:637
 msgid "Long Press Threshold"
 msgstr "Próg długiego przyciśnięcia"
 
-#: ../clutter/clutter-click-action.c:611
+#: ../clutter/clutter-click-action.c:638
 msgid "The maximum threshold before a long press is cancelled"
 msgstr "Maksymalny próg, zanim długie przyciśnięcie zostanie anulowane"
 
-#: ../clutter/clutter-clone.c:346
+#: ../clutter/clutter-clone.c:342
 msgid "Specifies the actor to be cloned"
 msgstr "Podaje aktora do sklonowania"
 
@@ -987,27 +1017,27 @@ msgstr "Odcień"
 msgid "The tint to apply"
 msgstr "Odcień do zastosowania"
 
-#: ../clutter/clutter-deform-effect.c:588
+#: ../clutter/clutter-deform-effect.c:592
 msgid "Horizontal Tiles"
 msgstr "Kafle poziome"
 
-#: ../clutter/clutter-deform-effect.c:589
+#: ../clutter/clutter-deform-effect.c:593
 msgid "The number of horizontal tiles"
 msgstr "Liczba poziomych kafli"
 
-#: ../clutter/clutter-deform-effect.c:604
+#: ../clutter/clutter-deform-effect.c:608
 msgid "Vertical Tiles"
 msgstr "Kafle pionowe"
 
-#: ../clutter/clutter-deform-effect.c:605
+#: ../clutter/clutter-deform-effect.c:609
 msgid "The number of vertical tiles"
 msgstr "Liczba pionowych kafli"
 
-#: ../clutter/clutter-deform-effect.c:622
+#: ../clutter/clutter-deform-effect.c:626
 msgid "Back Material"
 msgstr "Materiał tyłu"
 
-#: ../clutter/clutter-deform-effect.c:623
+#: ../clutter/clutter-deform-effect.c:627
 msgid "The material to be used when painting the back of the actor"
 msgstr "Materiał używany podczas malowania tyłu aktora"
 
@@ -1015,262 +1045,300 @@ msgstr "Materiał używany podczas malowania tyłu aktora"
 msgid "The desaturation factor"
 msgstr "Czynnik usuwania nasycenia"
 
-#: ../clutter/clutter-device-manager.c:131
-#: ../clutter/clutter-input-device.c:366
+#: ../clutter/clutter-device-manager.c:127
+#: ../clutter/clutter-input-device.c:355
 #: ../clutter/x11/clutter-keymap-x11.c:321
 msgid "Backend"
 msgstr "Mechanizm"
 
-#: ../clutter/clutter-device-manager.c:132
+#: ../clutter/clutter-device-manager.c:128
 msgid "The ClutterBackend of the device manager"
 msgstr "Mechanizm \"ClutterBackend\" menedżera urządzeń"
 
-#: ../clutter/clutter-drag-action.c:742
+#: ../clutter/clutter-drag-action.c:741
 msgid "Horizontal Drag Threshold"
 msgstr "Poziomy próg przeciągania"
 
-#: ../clutter/clutter-drag-action.c:743
+#: ../clutter/clutter-drag-action.c:742
 msgid "The horizontal amount of pixels required to start dragging"
 msgstr "Liczba poziomych pikseli wymaganych do rozpoczęcia przeciągania"
 
-#: ../clutter/clutter-drag-action.c:770
+#: ../clutter/clutter-drag-action.c:769
 msgid "Vertical Drag Threshold"
 msgstr "Pionowy próg przeciągania"
 
-#: ../clutter/clutter-drag-action.c:771
+#: ../clutter/clutter-drag-action.c:770
 msgid "The vertical amount of pixels required to start dragging"
 msgstr "Liczba pionowych pikseli wymaganych do rozpoczęcia przeciągania"
 
-#: ../clutter/clutter-drag-action.c:792
+#: ../clutter/clutter-drag-action.c:791
 msgid "Drag Handle"
 msgstr "Uchwyt przeciągania"
 
-#: ../clutter/clutter-drag-action.c:793
+#: ../clutter/clutter-drag-action.c:792
 msgid "The actor that is being dragged"
 msgstr "Przeciągany aktor"
 
-#: ../clutter/clutter-drag-action.c:806
+#: ../clutter/clutter-drag-action.c:805
 msgid "Drag Axis"
 msgstr "Osie przeciągania"
 
-#: ../clutter/clutter-drag-action.c:807
+#: ../clutter/clutter-drag-action.c:806
 msgid "Constraints the dragging to an axis"
 msgstr "Ogranicza przeciąganie do osi"
 
-#: ../clutter/clutter-drag-action.c:823
+#: ../clutter/clutter-drag-action.c:822
 msgid "Drag Area"
 msgstr "Obszar przeciągania"
 
-#: ../clutter/clutter-drag-action.c:824
+#: ../clutter/clutter-drag-action.c:823
 msgid "Constrains the dragging to a rectangle"
 msgstr "Ogranicza przeciąganie do prostokąta"
 
-#: ../clutter/clutter-drag-action.c:837
+#: ../clutter/clutter-drag-action.c:836
 msgid "Drag Area Set"
 msgstr "Ustawienie obszaru przeciągania"
 
-#: ../clutter/clutter-drag-action.c:838
+#: ../clutter/clutter-drag-action.c:837
 msgid "Whether the drag area is set"
 msgstr "Określa, czy obszar przeciągania jest ustawiony"
 
-#: ../clutter/clutter-flow-layout.c:907
+#: ../clutter/clutter-flow-layout.c:959
 msgid "Whether each item should receive the same allocation"
 msgstr "Określa, czy każdy element powinien otrzymać to samo przydzielenie"
 
-#: ../clutter/clutter-flow-layout.c:922 ../clutter/clutter-table-layout.c:1637
+#: ../clutter/clutter-flow-layout.c:974
+#: ../clutter/deprecated/clutter-table-layout.c:1637
 msgid "Column Spacing"
 msgstr "Odstępy kolumn"
 
-#: ../clutter/clutter-flow-layout.c:923
+#: ../clutter/clutter-flow-layout.c:975
 msgid "The spacing between columns"
 msgstr "Odstęp między kolumnami"
 
-#: ../clutter/clutter-flow-layout.c:939 ../clutter/clutter-table-layout.c:1651
+#: ../clutter/clutter-flow-layout.c:991
+#: ../clutter/deprecated/clutter-table-layout.c:1653
 msgid "Row Spacing"
 msgstr "Odstępy wierszy"
 
-#: ../clutter/clutter-flow-layout.c:940
+#: ../clutter/clutter-flow-layout.c:992
 msgid "The spacing between rows"
 msgstr "Odstęp między wierszami"
 
-#: ../clutter/clutter-flow-layout.c:954
+#: ../clutter/clutter-flow-layout.c:1006
 msgid "Minimum Column Width"
 msgstr "Minimalna szerokość kolumny"
 
-#: ../clutter/clutter-flow-layout.c:955
+#: ../clutter/clutter-flow-layout.c:1007
 msgid "Minimum width for each column"
 msgstr "Minimalna szerokość każdej kolumny"
 
-#: ../clutter/clutter-flow-layout.c:970
+#: ../clutter/clutter-flow-layout.c:1022
 msgid "Maximum Column Width"
 msgstr "Maksymalna szerokość kolumny"
 
-#: ../clutter/clutter-flow-layout.c:971
+#: ../clutter/clutter-flow-layout.c:1023
 msgid "Maximum width for each column"
 msgstr "Maksymalna szerokość każdej kolumny"
 
-#: ../clutter/clutter-flow-layout.c:985
+#: ../clutter/clutter-flow-layout.c:1037
 msgid "Minimum Row Height"
 msgstr "Minimalna wysokość wiersza"
 
-#: ../clutter/clutter-flow-layout.c:986
+#: ../clutter/clutter-flow-layout.c:1038
 msgid "Minimum height for each row"
 msgstr "Minimalna wysokość każdego wiersza"
 
-#: ../clutter/clutter-flow-layout.c:1001
+#: ../clutter/clutter-flow-layout.c:1053
 msgid "Maximum Row Height"
 msgstr "Maksymalna wysokość wiersza"
 
-#: ../clutter/clutter-flow-layout.c:1002
+#: ../clutter/clutter-flow-layout.c:1054
 msgid "Maximum height for each row"
 msgstr "Maksymalna wysokość każdego wiersza"
 
-#: ../clutter/clutter-grid-layout.c:1222
+#: ../clutter/clutter-flow-layout.c:1069 ../clutter/clutter-flow-layout.c:1070
+msgid "Snap to grid"
+msgstr "Przyciąganie do siatki"
+
+#: ../clutter/clutter-gesture-action.c:668
+msgid "Number touch points"
+msgstr "Liczba punktów dotykowych"
+
+#: ../clutter/clutter-gesture-action.c:669
+msgid "Number of touch points"
+msgstr "Liczba punktów dotykowych"
+
+#: ../clutter/clutter-gesture-action.c:684
+msgid "Threshold Trigger Edge"
+msgstr "Krawędź przełącznika progu"
+
+#: ../clutter/clutter-gesture-action.c:685
+msgid "The trigger edge used by the action"
+msgstr "Krawędź przełącznika używana przez działanie"
+
+#: ../clutter/clutter-gesture-action.c:704
+msgid "Threshold Trigger Horizontal Distance"
+msgstr "Poziomy dystans przełącznika progu"
+
+#: ../clutter/clutter-gesture-action.c:705
+msgid "The horizontal trigger distance used by the action"
+msgstr "Poziomy dystans przełącznika używany przez działanie"
+
+#: ../clutter/clutter-gesture-action.c:723
+msgid "Threshold Trigger Vertical Distance"
+msgstr "Dystans pionowy przełącznika progu"
+
+#: ../clutter/clutter-gesture-action.c:724
+msgid "The vertical trigger distance used by the action"
+msgstr "Pionowy dystans przełącznika używany przez działanie"
+
+#: ../clutter/clutter-grid-layout.c:1223
 msgid "Left attachment"
 msgstr "Lewy załącznik"
 
-#: ../clutter/clutter-grid-layout.c:1223
+#: ../clutter/clutter-grid-layout.c:1224
 msgid "The column number to attach the left side of the child to"
 msgstr "Numer kolumny, do której dołączyć lewą stronę elementu potomnego"
 
-#: ../clutter/clutter-grid-layout.c:1230
+#: ../clutter/clutter-grid-layout.c:1231
 msgid "Top attachment"
 msgstr "Górny załącznik"
 
-#: ../clutter/clutter-grid-layout.c:1231
+#: ../clutter/clutter-grid-layout.c:1232
 msgid "The row number to attach the top side of a child widget to"
 msgstr "Numer rzędu, do którego dołączyć górną stronę widżetu potomnego"
 
-#: ../clutter/clutter-grid-layout.c:1239
+#: ../clutter/clutter-grid-layout.c:1240
 msgid "The number of columns that a child spans"
 msgstr "Liczba kolumn, na które rozciąga się element potomny"
 
-#: ../clutter/clutter-grid-layout.c:1246
+#: ../clutter/clutter-grid-layout.c:1247
 msgid "The number of rows that a child spans"
 msgstr "Liczba rzędów, na które rozciąga się element potomny"
 
-#: ../clutter/clutter-grid-layout.c:1565
+#: ../clutter/clutter-grid-layout.c:1564
 msgid "Row spacing"
 msgstr "Odstępy wierszy"
 
-#: ../clutter/clutter-grid-layout.c:1566
+#: ../clutter/clutter-grid-layout.c:1565
 msgid "The amount of space between two consecutive rows"
 msgstr "Ilość miejsca między dwoma kolejnymi rzędami"
 
-#: ../clutter/clutter-grid-layout.c:1579
+#: ../clutter/clutter-grid-layout.c:1578
 msgid "Column spacing"
 msgstr "Odstępy kolumn"
 
-#: ../clutter/clutter-grid-layout.c:1580
+#: ../clutter/clutter-grid-layout.c:1579
 msgid "The amount of space between two consecutive columns"
 msgstr "Ilość miejsca między dwiema kolejnymi kolumnami"
 
-#: ../clutter/clutter-grid-layout.c:1594
+#: ../clutter/clutter-grid-layout.c:1593
 msgid "Row Homogeneous"
 msgstr "Rzędy homogeniczne"
 
-#: ../clutter/clutter-grid-layout.c:1595
+#: ../clutter/clutter-grid-layout.c:1594
 msgid "If TRUE, the rows are all the same height"
 msgstr ""
 "Jeśli jest ustawione na wartość \"true\", to wszystkie rzędy mają taką samą "
 "wysokość"
 
-#: ../clutter/clutter-grid-layout.c:1608
+#: ../clutter/clutter-grid-layout.c:1607
 msgid "Column Homogeneous"
 msgstr "Kolumny homogeniczne"
 
-#: ../clutter/clutter-grid-layout.c:1609
+#: ../clutter/clutter-grid-layout.c:1608
 msgid "If TRUE, the columns are all the same width"
 msgstr ""
 "Jeśli jest ustawione na wartość \"true\", to wszystkie kolumny mają taką "
 "samą szerokość"
 
-#: ../clutter/clutter-image.c:248 ../clutter/clutter-image.c:311
-#: ../clutter/clutter-image.c:399
+#: ../clutter/clutter-image.c:249 ../clutter/clutter-image.c:312
+#: ../clutter/clutter-image.c:400
 msgid "Unable to load image data"
 msgstr "Nie można wczytać danych obrazu"
 
-#: ../clutter/clutter-input-device.c:242
+#: ../clutter/clutter-input-device.c:231
 msgid "Id"
 msgstr "Identyfikator"
 
-#: ../clutter/clutter-input-device.c:243
+#: ../clutter/clutter-input-device.c:232
 msgid "Unique identifier of the device"
 msgstr "Unikalny identyfikator urządzenia"
 
-#: ../clutter/clutter-input-device.c:259
+#: ../clutter/clutter-input-device.c:248
 msgid "The name of the device"
 msgstr "Nazwa urządzenia"
 
-#: ../clutter/clutter-input-device.c:273
+#: ../clutter/clutter-input-device.c:262
 msgid "Device Type"
 msgstr "Typ urządzenia"
 
-#: ../clutter/clutter-input-device.c:274
+#: ../clutter/clutter-input-device.c:263
 msgid "The type of the device"
 msgstr "Typ urządzenia"
 
-#: ../clutter/clutter-input-device.c:289
+#: ../clutter/clutter-input-device.c:278
 msgid "Device Manager"
 msgstr "Menedżer urządzeń"
 
-#: ../clutter/clutter-input-device.c:290
+#: ../clutter/clutter-input-device.c:279
 msgid "The device manager instance"
 msgstr "Wystąpienie menedżera urządzeń"
 
-#: ../clutter/clutter-input-device.c:303
+#: ../clutter/clutter-input-device.c:292
 msgid "Device Mode"
 msgstr "Tryb urządzenia"
 
-#: ../clutter/clutter-input-device.c:304
+#: ../clutter/clutter-input-device.c:293
 msgid "The mode of the device"
 msgstr "Tryb urządzenia"
 
-#: ../clutter/clutter-input-device.c:318
+#: ../clutter/clutter-input-device.c:307
 msgid "Has Cursor"
 msgstr "Posiada kursor"
 
-#: ../clutter/clutter-input-device.c:319
+#: ../clutter/clutter-input-device.c:308
 msgid "Whether the device has a cursor"
 msgstr "Określa, czy urządzenie posiada kursor"
 
-#: ../clutter/clutter-input-device.c:338
+#: ../clutter/clutter-input-device.c:327
 msgid "Whether the device is enabled"
 msgstr "Określa, czy urządzenie jest włączone"
 
-#: ../clutter/clutter-input-device.c:351
+#: ../clutter/clutter-input-device.c:340
 msgid "Number of Axes"
 msgstr "Liczba osi"
 
-#: ../clutter/clutter-input-device.c:352
+#: ../clutter/clutter-input-device.c:341
 msgid "The number of axes on the device"
 msgstr "Liczba osi urządzenia"
 
-#: ../clutter/clutter-input-device.c:367
+#: ../clutter/clutter-input-device.c:356
 msgid "The backend instance"
 msgstr "Wystąpienie mechanizmu"
 
-#: ../clutter/clutter-interval.c:506
+#: ../clutter/clutter-interval.c:553
 msgid "Value Type"
 msgstr "Typ wartości"
 
-#: ../clutter/clutter-interval.c:507
+#: ../clutter/clutter-interval.c:554
 msgid "The type of the values in the interval"
 msgstr "Typ wartości w okresie"
 
-#: ../clutter/clutter-interval.c:522
+#: ../clutter/clutter-interval.c:569
 msgid "Initial Value"
 msgstr "Początkowa wartość"
 
-#: ../clutter/clutter-interval.c:523
+#: ../clutter/clutter-interval.c:570
 msgid "Initial value of the interval"
 msgstr "Początkowa wartość odstępu"
 
-#: ../clutter/clutter-interval.c:537
+#: ../clutter/clutter-interval.c:584
 msgid "Final Value"
 msgstr "Wartość końcowa"
 
-#: ../clutter/clutter-interval.c:538
+#: ../clutter/clutter-interval.c:585
 msgid "Final value of the interval"
 msgstr "Końcowa wartość odstępu"
 
@@ -1289,97 +1357,97 @@ msgstr "Menedżer, który utworzył te dane"
 #. * Do NOT translate it to non-English e.g. "predefinito:LTR"! If
 #. * it isn't default:LTR or default:RTL it will not work.
 #.
-#: ../clutter/clutter-main.c:772
+#: ../clutter/clutter-main.c:795
 msgid "default:LTR"
 msgstr "default:LTR"
 
-#: ../clutter/clutter-main.c:1646
+#: ../clutter/clutter-main.c:1622
 msgid "Show frames per second"
 msgstr "Wyświetla liczbę klatek na sekundę"
 
-#: ../clutter/clutter-main.c:1648
+#: ../clutter/clutter-main.c:1624
 msgid "Default frame rate"
 msgstr "Domyślna liczba klatek na sekundę"
 
-#: ../clutter/clutter-main.c:1650
+#: ../clutter/clutter-main.c:1626
 msgid "Make all warnings fatal"
 msgstr "Wszystkie ostrzeżenia są krytyczne"
 
-#: ../clutter/clutter-main.c:1653
+#: ../clutter/clutter-main.c:1629
 msgid "Direction for the text"
 msgstr "Kierunek tekstu"
 
-#: ../clutter/clutter-main.c:1656
+#: ../clutter/clutter-main.c:1632
 msgid "Disable mipmapping on text"
 msgstr "Wyłącza mipmapowanie na tekście"
 
-#: ../clutter/clutter-main.c:1659
+#: ../clutter/clutter-main.c:1635
 msgid "Use 'fuzzy' picking"
 msgstr "Używa wybierania \"rozmytego\""
 
-#: ../clutter/clutter-main.c:1662
+#: ../clutter/clutter-main.c:1638
 msgid "Clutter debugging flags to set"
 msgstr "Flagi debugowania biblioteki Clutter do ustawienia"
 
-#: ../clutter/clutter-main.c:1664
+#: ../clutter/clutter-main.c:1640
 msgid "Clutter debugging flags to unset"
 msgstr "Flagi debugowania biblioteki Clutter do usunięcia"
 
-#: ../clutter/clutter-main.c:1668
+#: ../clutter/clutter-main.c:1644
 msgid "Clutter profiling flags to set"
 msgstr "Flagi profilowania biblioteki Clutter do ustawienia"
 
-#: ../clutter/clutter-main.c:1670
+#: ../clutter/clutter-main.c:1646
 msgid "Clutter profiling flags to unset"
 msgstr "Flagi profilowania biblioteki Clutter do usunięcia"
 
-#: ../clutter/clutter-main.c:1673
+#: ../clutter/clutter-main.c:1649
 msgid "Enable accessibility"
 msgstr "Włącza dostępność"
 
-#: ../clutter/clutter-main.c:1865
+#: ../clutter/clutter-main.c:1841
 msgid "Clutter Options"
 msgstr "Opcje biblioteki Clutter"
 
-#: ../clutter/clutter-main.c:1866
+#: ../clutter/clutter-main.c:1842
 msgid "Show Clutter Options"
 msgstr "Wyświetla opcje biblioteki Clutter"
 
-#: ../clutter/clutter-pan-action.c:448
+#: ../clutter/clutter-pan-action.c:455
 msgid "Pan Axis"
 msgstr "Osie balansu"
 
-#: ../clutter/clutter-pan-action.c:449
+#: ../clutter/clutter-pan-action.c:456
 msgid "Constraints the panning to an axis"
 msgstr "Ogranicza balans do osi"
 
-#: ../clutter/clutter-pan-action.c:463
+#: ../clutter/clutter-pan-action.c:470
 msgid "Interpolate"
 msgstr "Interpolacja"
 
-#: ../clutter/clutter-pan-action.c:464
+#: ../clutter/clutter-pan-action.c:471
 msgid "Whether interpolated events emission is enabled."
 msgstr "Określa, czy emitowanie interpolowanych zdarzeń jest włączone."
 
-#: ../clutter/clutter-pan-action.c:480
+#: ../clutter/clutter-pan-action.c:487
 msgid "Deceleration"
 msgstr "Zwolnienie"
 
-#: ../clutter/clutter-pan-action.c:481
+#: ../clutter/clutter-pan-action.c:488
 msgid "Rate at which the interpolated panning will decelerate in"
 msgstr "Prędkość, po jakiej interpolowany balans zwolni"
 
-#: ../clutter/clutter-pan-action.c:498
+#: ../clutter/clutter-pan-action.c:505
 msgid "Initial acceleration factor"
 msgstr "Początkowy czynnik przyspieszenia"
 
-#: ../clutter/clutter-pan-action.c:499
+#: ../clutter/clutter-pan-action.c:506
 msgid "Factor applied to the momentum when starting the interpolated phase"
 msgstr ""
 "Czynnik zastosowywany do pędu podczas rozpoczynania fazy interpolowanej"
 
 #: ../clutter/clutter-path-constraint.c:212
-#: ../clutter/deprecated/clutter-behaviour-path.c:225
+#: ../clutter/deprecated/clutter-behaviour-path.c:221
 msgid "Path"
 msgstr "Ścieżka"
 
@@ -1391,88 +1459,88 @@ msgstr "Ścieżka używana do ograniczenia aktora"
 msgid "The offset along the path, between -1.0 and 2.0"
 msgstr "Offset ścieżki, między -1.0 a 2.0"
 
-#: ../clutter/clutter-property-transition.c:271
+#: ../clutter/clutter-property-transition.c:269
 msgid "Property Name"
 msgstr "Nazwa właściwości"
 
-#: ../clutter/clutter-property-transition.c:272
+#: ../clutter/clutter-property-transition.c:270
 msgid "The name of the property to animate"
 msgstr "Nazwa właściwości do animowania"
 
-#: ../clutter/clutter-script.c:466
+#: ../clutter/clutter-script.c:464
 msgid "Filename Set"
 msgstr "Ustawienie nazwy pliku"
 
-#: ../clutter/clutter-script.c:467
+#: ../clutter/clutter-script.c:465
 msgid "Whether the :filename property is set"
 msgstr "Określa, czy właściwość \":filename\" jest ustawiona"
 
-#: ../clutter/clutter-script.c:481
-#: ../clutter/deprecated/clutter-texture.c:1082
+#: ../clutter/clutter-script.c:479
+#: ../clutter/deprecated/clutter-texture.c:1080
 msgid "Filename"
 msgstr "Nazwa pliku"
 
-#: ../clutter/clutter-script.c:482
+#: ../clutter/clutter-script.c:480
 msgid "The path of the currently parsed file"
 msgstr "Ścieżka do obecnie przetwarzanego pliku"
 
-#: ../clutter/clutter-script.c:499
+#: ../clutter/clutter-script.c:497
 msgid "Translation Domain"
 msgstr "Domena tłumaczeń"
 
-#: ../clutter/clutter-script.c:500
+#: ../clutter/clutter-script.c:498
 msgid "The translation domain used to localize string"
 msgstr "Domena tłumaczeń używana do lokalizowania tekstów"
 
-#: ../clutter/clutter-scroll-actor.c:263
+#: ../clutter/clutter-scroll-actor.c:189
 msgid "Scroll Mode"
 msgstr "Tryb przewijania"
 
-#: ../clutter/clutter-scroll-actor.c:264
+#: ../clutter/clutter-scroll-actor.c:190
 msgid "The scrolling direction"
 msgstr "Kierunek przewijania"
 
-#: ../clutter/clutter-settings.c:448
+#: ../clutter/clutter-settings.c:486
 msgid "Double Click Time"
 msgstr "Czas podwójnego kliknięcia"
 
-#: ../clutter/clutter-settings.c:449
+#: ../clutter/clutter-settings.c:487
 msgid "The time between clicks necessary to detect a multiple click"
 msgstr "Czas między kliknięciami wymagany, aby wykryć wielokrotne kliknięcie"
 
-#: ../clutter/clutter-settings.c:464
+#: ../clutter/clutter-settings.c:502
 msgid "Double Click Distance"
 msgstr "Odległość podwójnego kliknięcia"
 
-#: ../clutter/clutter-settings.c:465
+#: ../clutter/clutter-settings.c:503
 msgid "The distance between clicks necessary to detect a multiple click"
 msgstr ""
 "Odległość między kliknięciami wymagane, aby wykryć wielokrotne kliknięcie"
 
-#: ../clutter/clutter-settings.c:480
+#: ../clutter/clutter-settings.c:518
 msgid "Drag Threshold"
 msgstr "Próg przeciągania"
 
-#: ../clutter/clutter-settings.c:481
+#: ../clutter/clutter-settings.c:519
 msgid "The distance the cursor should travel before starting to drag"
 msgstr ""
 "Odległość, jaką musi przemierzyć kursor przed rozpoczęciem przeciągania"
 
-#: ../clutter/clutter-settings.c:496 ../clutter/clutter-text.c:3367
+#: ../clutter/clutter-settings.c:534 ../clutter/clutter-text.c:3404
 msgid "Font Name"
 msgstr "Nazwa czcionki"
 
-#: ../clutter/clutter-settings.c:497
+#: ../clutter/clutter-settings.c:535
 msgid ""
 "The description of the default font, as one that could be parsed by Pango"
 msgstr ""
 "Opis domyślnej czcionki, możliwy do przetworzenia przez bibliotekę Pango"
 
-#: ../clutter/clutter-settings.c:512
+#: ../clutter/clutter-settings.c:550
 msgid "Font Antialias"
 msgstr "Wygładzanie czcionki"
 
-#: ../clutter/clutter-settings.c:513
+#: ../clutter/clutter-settings.c:551
 msgid ""
 "Whether to use antialiasing (1 to enable, 0 to disable, and -1 to use the "
 "default)"
@@ -1480,68 +1548,76 @@ msgstr ""
 "Określa, czy używać wygładzania (1 włącza, 0 wyłącza, a -1 używa wartości "
 "domyślnej)"
 
-#: ../clutter/clutter-settings.c:529
+#: ../clutter/clutter-settings.c:567 ../clutter/clutter-settings.c:575
 msgid "Font DPI"
 msgstr "DPI czcionki"
 
-#: ../clutter/clutter-settings.c:530
+#: ../clutter/clutter-settings.c:568 ../clutter/clutter-settings.c:576
 msgid ""
 "The resolution of the font, in 1024 * dots/inch, or -1 to use the default"
 msgstr ""
 "Rozdzielczość czcionki, w 1024 * punktów na cal, lub -1, aby użyć domyślnej"
 
-#: ../clutter/clutter-settings.c:546
+#: ../clutter/clutter-settings.c:592
 msgid "Font Hinting"
 msgstr "Hinting czcionki"
 
-#: ../clutter/clutter-settings.c:547
+#: ../clutter/clutter-settings.c:593
 msgid ""
 "Whether to use hinting (1 to enable, 0 to disable and -1 to use the default)"
 msgstr ""
 "Określa, czy używać hintingu (1 włącza, 0 wyłącza, a -1 używa wartości "
 "domyślnej)"
 
-#: ../clutter/clutter-settings.c:568
+#: ../clutter/clutter-settings.c:614
 msgid "Font Hint Style"
 msgstr "Styl hintingu czcionki"
 
-#: ../clutter/clutter-settings.c:569
+#: ../clutter/clutter-settings.c:615
 msgid "The style of hinting (hintnone, hintslight, hintmedium, hintfull)"
 msgstr "Styl hintingu (hintnone, hintslight, hintmedium, hintfull)"
 
-#: ../clutter/clutter-settings.c:590
+#: ../clutter/clutter-settings.c:636
 msgid "Font Subpixel Order"
 msgstr "Kolejność podpikseli czcionki"
 
-#: ../clutter/clutter-settings.c:591
+#: ../clutter/clutter-settings.c:637
 msgid "The type of subpixel antialiasing (none, rgb, bgr, vrgb, vbgr)"
 msgstr "Typ wygładzania podpikselowego (none, rgb, bgr, vrgb, vbgr)"
 
-#: ../clutter/clutter-settings.c:608
+#: ../clutter/clutter-settings.c:654
 msgid "The minimum duration for a long press gesture to be recognized"
 msgstr "Minimalny czas trwania gestu długiego przyciśnięcia"
 
-#: ../clutter/clutter-settings.c:615
+#: ../clutter/clutter-settings.c:661
+msgid "Window Scaling Factor"
+msgstr "Czynnik skalowania okien"
+
+#: ../clutter/clutter-settings.c:662
+msgid "The scaling factor to be applied to windows"
+msgstr "Czynnik skalowania zastosowywany do okien"
+
+#: ../clutter/clutter-settings.c:669
 msgid "Fontconfig configuration timestamp"
 msgstr "Czas konfiguracji fontconfig"
 
-#: ../clutter/clutter-settings.c:616
+#: ../clutter/clutter-settings.c:670
 msgid "Timestamp of the current fontconfig configuration"
 msgstr "Czas bieżącej konfiguracji fontconfig"
 
-#: ../clutter/clutter-settings.c:633
+#: ../clutter/clutter-settings.c:687
 msgid "Password Hint Time"
 msgstr "Czas wskazówki hasła"
 
-#: ../clutter/clutter-settings.c:634
+#: ../clutter/clutter-settings.c:688
 msgid "How long to show the last input character in hidden entries"
 msgstr "Jak długo wyświetlać ostatni znak w ukrytych wpisach"
 
-#: ../clutter/clutter-shader-effect.c:486
+#: ../clutter/clutter-shader-effect.c:485
 msgid "Shader Type"
 msgstr "Typ cieniowania"
 
-#: ../clutter/clutter-shader-effect.c:487
+#: ../clutter/clutter-shader-effect.c:486
 msgid "The type of shader used"
 msgstr "Typ używanego cieniowania"
 
@@ -1569,760 +1645,704 @@ msgstr "Krawędź źródła, która powinna być przełamana"
 msgid "The offset in pixels to apply to the constraint"
 msgstr "Offset w pikselach do zastosowania do ograniczenia"
 
-#: ../clutter/clutter-stage.c:1929
+#: ../clutter/clutter-stage.c:1899
 msgid "Fullscreen Set"
 msgstr "Ustawienie pełnego ekranu"
 
-#: ../clutter/clutter-stage.c:1930
+#: ../clutter/clutter-stage.c:1900
 msgid "Whether the main stage is fullscreen"
 msgstr "Określa, czy główna scena jest na pełnym ekranie"
 
-#: ../clutter/clutter-stage.c:1944
+#: ../clutter/clutter-stage.c:1914
 msgid "Offscreen"
 msgstr "Poza ekranem"
 
-#: ../clutter/clutter-stage.c:1945
+#: ../clutter/clutter-stage.c:1915
 msgid "Whether the main stage should be rendered offscreen"
 msgstr "Określa, czy główna scena powinna być wyświetlana poza ekranem"
 
-#: ../clutter/clutter-stage.c:1957 ../clutter/clutter-text.c:3481
+#: ../clutter/clutter-stage.c:1927 ../clutter/clutter-text.c:3518
 msgid "Cursor Visible"
 msgstr "Widoczność kursora"
 
-#: ../clutter/clutter-stage.c:1958
+#: ../clutter/clutter-stage.c:1928
 msgid "Whether the mouse pointer is visible on the main stage"
 msgstr "Określa, czy kursor myszy jest widoczny na głównej scenie"
 
-#: ../clutter/clutter-stage.c:1972
+#: ../clutter/clutter-stage.c:1942
 msgid "User Resizable"
 msgstr "Użytkownik może zmieniać rozmiar"
 
-#: ../clutter/clutter-stage.c:1973
+#: ../clutter/clutter-stage.c:1943
 msgid "Whether the stage is able to be resized via user interaction"
 msgstr "Określa, czy można zmieniać rozmiar sceny przez działania użytkownika"
 
-#: ../clutter/clutter-stage.c:1988 ../clutter/deprecated/clutter-box.c:260
-#: ../clutter/deprecated/clutter-rectangle.c:273
+#: ../clutter/clutter-stage.c:1958 ../clutter/deprecated/clutter-box.c:256
+#: ../clutter/deprecated/clutter-rectangle.c:270
 msgid "Color"
 msgstr "Kolor"
 
-#: ../clutter/clutter-stage.c:1989
+#: ../clutter/clutter-stage.c:1959
 msgid "The color of the stage"
 msgstr "Kolor sceny"
 
-#: ../clutter/clutter-stage.c:2004
+#: ../clutter/clutter-stage.c:1974
 msgid "Perspective"
 msgstr "Perspektywa"
 
-#: ../clutter/clutter-stage.c:2005
+#: ../clutter/clutter-stage.c:1975
 msgid "Perspective projection parameters"
 msgstr "Parametry projekcji perspektywy"
 
-#: ../clutter/clutter-stage.c:2020
+#: ../clutter/clutter-stage.c:1990
 msgid "Title"
 msgstr "Tytuł"
 
-#: ../clutter/clutter-stage.c:2021
+#: ../clutter/clutter-stage.c:1991
 msgid "Stage Title"
 msgstr "Tytuł sceny"
 
-#: ../clutter/clutter-stage.c:2038
+#: ../clutter/clutter-stage.c:2008
 msgid "Use Fog"
 msgstr "Użycie mgły"
 
-#: ../clutter/clutter-stage.c:2039
+#: ../clutter/clutter-stage.c:2009
 msgid "Whether to enable depth cueing"
 msgstr "Określa, czy włączyć wskazówki głębi"
 
-#: ../clutter/clutter-stage.c:2055
+#: ../clutter/clutter-stage.c:2025
 msgid "Fog"
 msgstr "Mgła"
 
-#: ../clutter/clutter-stage.c:2056
+#: ../clutter/clutter-stage.c:2026
 msgid "Settings for the depth cueing"
 msgstr "Ustawienia dla wskazówek głębi"
 
-#: ../clutter/clutter-stage.c:2072
+#: ../clutter/clutter-stage.c:2042
 msgid "Use Alpha"
 msgstr "Użycie alfy"
 
-#: ../clutter/clutter-stage.c:2073
+#: ../clutter/clutter-stage.c:2043
 msgid "Whether to honour the alpha component of the stage color"
 msgstr "Określa, czy uwzględniać składnik alfa koloru sceny"
 
-#: ../clutter/clutter-stage.c:2089
+#: ../clutter/clutter-stage.c:2059
 msgid "Key Focus"
 msgstr "Aktywny klawisz"
 
-#: ../clutter/clutter-stage.c:2090
+#: ../clutter/clutter-stage.c:2060
 msgid "The currently key focused actor"
 msgstr "Aktor obecnie posiadający aktywny klawisz"
 
-#: ../clutter/clutter-stage.c:2106
+#: ../clutter/clutter-stage.c:2076
 msgid "No Clear Hint"
 msgstr "Bez wskazówki czyszczenia"
 
-#: ../clutter/clutter-stage.c:2107
+#: ../clutter/clutter-stage.c:2077
 msgid "Whether the stage should clear its contents"
 msgstr "Określa, czy scena powinna czyścić swoją zawartość"
 
-#: ../clutter/clutter-stage.c:2120
+#: ../clutter/clutter-stage.c:2090
 msgid "Accept Focus"
 msgstr "Akceptowanie aktywności"
 
-#: ../clutter/clutter-stage.c:2121
+#: ../clutter/clutter-stage.c:2091
 msgid "Whether the stage should accept focus on show"
 msgstr "Określa, czy scena powinna akceptować aktywność podczas wyświetlania"
 
-#: ../clutter/clutter-table-layout.c:543
-msgid "Column Number"
-msgstr "Numer kolumny"
-
-#: ../clutter/clutter-table-layout.c:544
-msgid "The column the widget resides in"
-msgstr "Kolumna, w której znajdują się widżety"
-
-#: ../clutter/clutter-table-layout.c:551
-msgid "Row Number"
-msgstr "Numer wiersza"
-
-#: ../clutter/clutter-table-layout.c:552
-msgid "The row the widget resides in"
-msgstr "Wiersz, w którym znajdują się widżety"
-
-#: ../clutter/clutter-table-layout.c:559
-msgid "Column Span"
-msgstr "Rozciągnięcie kolumny"
-
-#: ../clutter/clutter-table-layout.c:560
-msgid "The number of columns the widget should span"
-msgstr "Liczba kolumn, na które powinien rozciągać się widżet"
-
-#: ../clutter/clutter-table-layout.c:567
-msgid "Row Span"
-msgstr "Rozciągnięcie wiersza"
-
-#: ../clutter/clutter-table-layout.c:568
-msgid "The number of rows the widget should span"
-msgstr "Liczba rzędów, na które powinien rozciągać się widżet"
-
-#: ../clutter/clutter-table-layout.c:575
-msgid "Horizontal Expand"
-msgstr "Rozszerzenie poziome"
-
-#: ../clutter/clutter-table-layout.c:576
-msgid "Allocate extra space for the child in horizontal axis"
-msgstr "Przydziela dodatkowe miejsca na potomka w osi poziomej"
-
-#: ../clutter/clutter-table-layout.c:582
-msgid "Vertical Expand"
-msgstr "Rozszerzenie pionowe"
-
-#: ../clutter/clutter-table-layout.c:583
-msgid "Allocate extra space for the child in vertical axis"
-msgstr "Przydziela dodatkowe miejsca na potomka w osi pionowej"
-
-#: ../clutter/clutter-table-layout.c:1638
-msgid "Spacing between columns"
-msgstr "Odstęp między kolumnami"
-
-#: ../clutter/clutter-table-layout.c:1652
-msgid "Spacing between rows"
-msgstr "Odstęp między wierszami"
-
-#: ../clutter/clutter-text-buffer.c:351 ../clutter/clutter-text.c:3402
+#: ../clutter/clutter-text-buffer.c:347 ../clutter/clutter-text.c:3439
 msgid "Text"
 msgstr "Tekst"
 
-#: ../clutter/clutter-text-buffer.c:352
+#: ../clutter/clutter-text-buffer.c:348
 msgid "The contents of the buffer"
 msgstr "Zawartość bufora"
 
-#: ../clutter/clutter-text-buffer.c:365
+#: ../clutter/clutter-text-buffer.c:361
 msgid "Text length"
 msgstr "Długość tekstu"
 
-#: ../clutter/clutter-text-buffer.c:366
+#: ../clutter/clutter-text-buffer.c:362
 msgid "Length of the text currently in the buffer"
 msgstr "Długość tekstu znajdującego się obecnie w buforze"
 
-#: ../clutter/clutter-text-buffer.c:379
+#: ../clutter/clutter-text-buffer.c:375
 msgid "Maximum length"
 msgstr "Maksymalna długość"
 
-#: ../clutter/clutter-text-buffer.c:380
+#: ../clutter/clutter-text-buffer.c:376
 msgid "Maximum number of characters for this entry. Zero if no maximum"
 msgstr "Maksymalna liczba znaków dla tego wpisu. Zero, jeśli nie ma maksimum"
 
-#: ../clutter/clutter-text.c:3349
+#: ../clutter/clutter-text.c:3386
 msgid "Buffer"
 msgstr "Bufor"
 
-#: ../clutter/clutter-text.c:3350
+#: ../clutter/clutter-text.c:3387
 msgid "The buffer for the text"
 msgstr "Bufor dla tekstu"
 
-#: ../clutter/clutter-text.c:3368
+#: ../clutter/clutter-text.c:3405
 msgid "The font to be used by the text"
 msgstr "Czcionka używana przez tekst"
 
-#: ../clutter/clutter-text.c:3385
+#: ../clutter/clutter-text.c:3422
 msgid "Font Description"
 msgstr "Opis czcionki"
 
-#: ../clutter/clutter-text.c:3386
+#: ../clutter/clutter-text.c:3423
 msgid "The font description to be used"
 msgstr "Używany opis czcionki"
 
-#: ../clutter/clutter-text.c:3403
+#: ../clutter/clutter-text.c:3440
 msgid "The text to render"
 msgstr "Tekst do wyświetlenia"
 
-#: ../clutter/clutter-text.c:3417
+#: ../clutter/clutter-text.c:3454
 msgid "Font Color"
 msgstr "Kolor czcionki"
 
-#: ../clutter/clutter-text.c:3418
+#: ../clutter/clutter-text.c:3455
 msgid "Color of the font used by the text"
 msgstr "Kolor czcionki używanej przez tekst"
 
-#: ../clutter/clutter-text.c:3433
+#: ../clutter/clutter-text.c:3470
 msgid "Editable"
 msgstr "Można modyfikować"
 
-#: ../clutter/clutter-text.c:3434
+#: ../clutter/clutter-text.c:3471
 msgid "Whether the text is editable"
 msgstr "Określa, czy tekst można modyfikować"
 
-#: ../clutter/clutter-text.c:3449
+#: ../clutter/clutter-text.c:3486
 msgid "Selectable"
 msgstr "Można skalować"
 
-#: ../clutter/clutter-text.c:3450
+#: ../clutter/clutter-text.c:3487
 msgid "Whether the text is selectable"
 msgstr "Określa, czy tekst można skalować"
 
-#: ../clutter/clutter-text.c:3464
+#: ../clutter/clutter-text.c:3501
 msgid "Activatable"
 msgstr "Można aktywować"
 
-#: ../clutter/clutter-text.c:3465
+#: ../clutter/clutter-text.c:3502
 msgid "Whether pressing return causes the activate signal to be emitted"
 msgstr ""
 "Określa, czy wciśnięcie klawisza Return powoduje wysłanie sygnały aktywacji"
 
-#: ../clutter/clutter-text.c:3482
+#: ../clutter/clutter-text.c:3519
 msgid "Whether the input cursor is visible"
 msgstr "Określa, czy kursor wejścia jest widoczny"
 
-#: ../clutter/clutter-text.c:3496 ../clutter/clutter-text.c:3497
+#: ../clutter/clutter-text.c:3533 ../clutter/clutter-text.c:3534
 msgid "Cursor Color"
 msgstr "Kolor kursora"
 
-#: ../clutter/clutter-text.c:3512
+#: ../clutter/clutter-text.c:3549
 msgid "Cursor Color Set"
 msgstr "Ustawienie koloru kursora"
 
-#: ../clutter/clutter-text.c:3513
+#: ../clutter/clutter-text.c:3550
 msgid "Whether the cursor color has been set"
 msgstr "Określa, czy kolor kursora został ustawiony"
 
-#: ../clutter/clutter-text.c:3528
+#: ../clutter/clutter-text.c:3565
 msgid "Cursor Size"
 msgstr "Rozmiar kursora"
 
-#: ../clutter/clutter-text.c:3529
+#: ../clutter/clutter-text.c:3566
 msgid "The width of the cursor, in pixels"
 msgstr "Szerokość kursora w pikselach"
 
-#: ../clutter/clutter-text.c:3545 ../clutter/clutter-text.c:3563
+#: ../clutter/clutter-text.c:3582 ../clutter/clutter-text.c:3600
 msgid "Cursor Position"
 msgstr "Położenie kursora"
 
-#: ../clutter/clutter-text.c:3546 ../clutter/clutter-text.c:3564
+#: ../clutter/clutter-text.c:3583 ../clutter/clutter-text.c:3601
 msgid "The cursor position"
 msgstr "Położenie kursora"
 
-#: ../clutter/clutter-text.c:3579
+#: ../clutter/clutter-text.c:3616
 msgid "Selection-bound"
 msgstr "Powiązanie zaznaczenia"
 
-#: ../clutter/clutter-text.c:3580
+#: ../clutter/clutter-text.c:3617
 msgid "The cursor position of the other end of the selection"
 msgstr "Położenie kursora na drugim końcu zaznaczenia"
 
-#: ../clutter/clutter-text.c:3595 ../clutter/clutter-text.c:3596
+#: ../clutter/clutter-text.c:3632 ../clutter/clutter-text.c:3633
 msgid "Selection Color"
 msgstr "Kolor zaznaczenia"
 
-#: ../clutter/clutter-text.c:3611
+#: ../clutter/clutter-text.c:3648
 msgid "Selection Color Set"
 msgstr "Ustawienie koloru zaznaczenia"
 
-#: ../clutter/clutter-text.c:3612
+#: ../clutter/clutter-text.c:3649
 msgid "Whether the selection color has been set"
 msgstr "Określa, czy kolor zaznaczenia został ustawiony"
 
-#: ../clutter/clutter-text.c:3627
+#: ../clutter/clutter-text.c:3664
 msgid "Attributes"
 msgstr "Atrybuty"
 
-#: ../clutter/clutter-text.c:3628
+#: ../clutter/clutter-text.c:3665
 msgid "A list of style attributes to apply to the contents of the actor"
 msgstr "Lista atrybutów stylu do zastosowania do zawartości aktora"
 
-#: ../clutter/clutter-text.c:3650
+#: ../clutter/clutter-text.c:3687
 msgid "Use markup"
 msgstr "Użycie znaczników"
 
-#: ../clutter/clutter-text.c:3651
+#: ../clutter/clutter-text.c:3688
 msgid "Whether or not the text includes Pango markup"
 msgstr "Określa, czy tekst zawiera znaczniki biblioteki Pango"
 
-#: ../clutter/clutter-text.c:3667
+#: ../clutter/clutter-text.c:3704
 msgid "Line wrap"
 msgstr "Zawijanie wierszy"
 
-#: ../clutter/clutter-text.c:3668
+#: ../clutter/clutter-text.c:3705
 msgid "If set, wrap the lines if the text becomes too wide"
 msgstr "Jeśli ustawione, zawija wiersze, jeśli tekst staje się za szeroki"
 
-#: ../clutter/clutter-text.c:3683
+#: ../clutter/clutter-text.c:3720
 msgid "Line wrap mode"
 msgstr "Tryb zawijania wierszy"
 
-#: ../clutter/clutter-text.c:3684
+#: ../clutter/clutter-text.c:3721
 msgid "Control how line-wrapping is done"
 msgstr "Kontroluje, jak wykonywać zawijanie wierszy"
 
-#: ../clutter/clutter-text.c:3699
+#: ../clutter/clutter-text.c:3736
 msgid "Ellipsize"
 msgstr "Przycięcie"
 
-#: ../clutter/clutter-text.c:3700
+#: ../clutter/clutter-text.c:3737
 msgid "The preferred place to ellipsize the string"
 msgstr "Preferowane miejsce do przycięcia ciągu"
 
-#: ../clutter/clutter-text.c:3716
+#: ../clutter/clutter-text.c:3753
 msgid "Line Alignment"
 msgstr "Wyrównanie wiersza"
 
-#: ../clutter/clutter-text.c:3717
+#: ../clutter/clutter-text.c:3754
 msgid "The preferred alignment for the string, for multi-line text"
 msgstr "Preferowane wyrównanie ciągu dla tekstu wielowierszowego"
 
-#: ../clutter/clutter-text.c:3733
+#: ../clutter/clutter-text.c:3770
 msgid "Justify"
 msgstr "Justowanie"
 
-#: ../clutter/clutter-text.c:3734
+#: ../clutter/clutter-text.c:3771
 msgid "Whether the text should be justified"
 msgstr "Określa, czy tekst powinien być justowany"
 
-#: ../clutter/clutter-text.c:3749
+#: ../clutter/clutter-text.c:3786
 msgid "Password Character"
 msgstr "Znak hasła"
 
-#: ../clutter/clutter-text.c:3750
+#: ../clutter/clutter-text.c:3787
 msgid "If non-zero, use this character to display the actor's contents"
 msgstr ""
 "Jeśli nie wynosi zero, używa tego znaku do wyświetlania zawartości aktora"
 
-#: ../clutter/clutter-text.c:3764
+#: ../clutter/clutter-text.c:3801
 msgid "Max Length"
 msgstr "Maksymalna długość"
 
-#: ../clutter/clutter-text.c:3765
+#: ../clutter/clutter-text.c:3802
 msgid "Maximum length of the text inside the actor"
 msgstr "Maksymalna długość tekstu w aktorze"
 
-#: ../clutter/clutter-text.c:3788
+#: ../clutter/clutter-text.c:3825
 msgid "Single Line Mode"
 msgstr "Tryb pojedynczego wiersza"
 
-#: ../clutter/clutter-text.c:3789
+#: ../clutter/clutter-text.c:3826
 msgid "Whether the text should be a single line"
 msgstr "Określa, czy tekst powinien być pojedynczym wierszem"
 
-#: ../clutter/clutter-text.c:3803 ../clutter/clutter-text.c:3804
+#: ../clutter/clutter-text.c:3840 ../clutter/clutter-text.c:3841
 msgid "Selected Text Color"
 msgstr "Kolor zaznaczonego tekstu"
 
-#: ../clutter/clutter-text.c:3819
+#: ../clutter/clutter-text.c:3856
 msgid "Selected Text Color Set"
 msgstr "Ustawienie koloru zaznaczonego tekstu"
 
-#: ../clutter/clutter-text.c:3820
+#: ../clutter/clutter-text.c:3857
 msgid "Whether the selected text color has been set"
 msgstr "Określa, czy kolor zaznaczonego tekstu został ustawiony"
 
-#: ../clutter/clutter-timeline.c:561
-#: ../clutter/deprecated/clutter-animation.c:560
+#: ../clutter/clutter-timeline.c:593
+#: ../clutter/deprecated/clutter-animation.c:557
 msgid "Loop"
 msgstr "Pętla"
 
-#: ../clutter/clutter-timeline.c:562
+#: ../clutter/clutter-timeline.c:594
 msgid "Should the timeline automatically restart"
 msgstr "Czy oś czasu powinna być automatycznie rozpoczynana od początku"
 
-#: ../clutter/clutter-timeline.c:576
+#: ../clutter/clutter-timeline.c:608
 msgid "Delay"
 msgstr "Opóźnienie"
 
-#: ../clutter/clutter-timeline.c:577
+#: ../clutter/clutter-timeline.c:609
 msgid "Delay before start"
 msgstr "Opóźnienie przed rozpoczęciem"
 
-#: ../clutter/clutter-timeline.c:592
-#: ../clutter/deprecated/clutter-animation.c:544
-#: ../clutter/deprecated/clutter-animator.c:1804
+#: ../clutter/clutter-timeline.c:624
+#: ../clutter/deprecated/clutter-animation.c:541
+#: ../clutter/deprecated/clutter-animator.c:1801
 #: ../clutter/deprecated/clutter-media.c:224
-#: ../clutter/deprecated/clutter-state.c:1523
+#: ../clutter/deprecated/clutter-state.c:1517
 msgid "Duration"
 msgstr "Czas trwania"
 
-#: ../clutter/clutter-timeline.c:593
+#: ../clutter/clutter-timeline.c:625
 msgid "Duration of the timeline in milliseconds"
 msgstr "Czas trwania osi czasu, w milisekundach"
 
-#: ../clutter/clutter-timeline.c:608
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:528
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:337
+#: ../clutter/clutter-timeline.c:640
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:521
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:330
 msgid "Direction"
 msgstr "Kierunek"
 
-#: ../clutter/clutter-timeline.c:609
+#: ../clutter/clutter-timeline.c:641
 msgid "Direction of the timeline"
 msgstr "Kierunek osi czasu"
 
-#: ../clutter/clutter-timeline.c:624
+#: ../clutter/clutter-timeline.c:656
 msgid "Auto Reverse"
 msgstr "Automatyczne odwracanie"
 
-#: ../clutter/clutter-timeline.c:625
+#: ../clutter/clutter-timeline.c:657
 msgid "Whether the direction should be reversed when reaching the end"
 msgstr "Określa, czy kierunek powinien być odwracany po dojściu do końca"
 
-#: ../clutter/clutter-timeline.c:643
+#: ../clutter/clutter-timeline.c:675
 msgid "Repeat Count"
 msgstr "Liczba powtórzeń"
 
-#: ../clutter/clutter-timeline.c:644
+#: ../clutter/clutter-timeline.c:676
 msgid "How many times the timeline should repeat"
 msgstr "Ile razy oś czasu powinna być powtarzana"
 
-#: ../clutter/clutter-timeline.c:658
+#: ../clutter/clutter-timeline.c:690
 msgid "Progress Mode"
 msgstr "Tryb postępu"
 
-#: ../clutter/clutter-timeline.c:659
+#: ../clutter/clutter-timeline.c:691
 msgid "How the timeline should compute the progress"
 msgstr "Jak oś czasu powinna obliczać postęp"
 
-#: ../clutter/clutter-transition.c:246
+#: ../clutter/clutter-transition.c:244
 msgid "Interval"
 msgstr "Okres czasu"
 
-#: ../clutter/clutter-transition.c:247
+#: ../clutter/clutter-transition.c:245
 msgid "The interval of values to transition"
 msgstr "Okres czasu wartości do przejścia"
 
-#: ../clutter/clutter-transition.c:261
+#: ../clutter/clutter-transition.c:259
 msgid "Animatable"
 msgstr "Można animować"
 
-#: ../clutter/clutter-transition.c:262
+#: ../clutter/clutter-transition.c:260
 msgid "The animatable object"
 msgstr "Obiekt, który można animować"
 
-#: ../clutter/clutter-transition.c:283
+#: ../clutter/clutter-transition.c:281
 msgid "Remove on Complete"
 msgstr "Usunięcie po ukończeniu"
 
-#: ../clutter/clutter-transition.c:284
+#: ../clutter/clutter-transition.c:282
 msgid "Detach the transition when completed"
 msgstr "Odłącza przejście po ukończeniu"
 
-#: ../clutter/clutter-zoom-action.c:354
+#: ../clutter/clutter-zoom-action.c:365
 msgid "Zoom Axis"
 msgstr "Powiększanie na osi"
 
-#: ../clutter/clutter-zoom-action.c:355
+#: ../clutter/clutter-zoom-action.c:366
 msgid "Constraints the zoom to an axis"
 msgstr "Ogranicza powiększanie do osi"
 
-#: ../clutter/deprecated/clutter-alpha.c:355
-#: ../clutter/deprecated/clutter-animation.c:575
-#: ../clutter/deprecated/clutter-animator.c:1821
+#: ../clutter/deprecated/clutter-alpha.c:354
+#: ../clutter/deprecated/clutter-animation.c:572
+#: ../clutter/deprecated/clutter-animator.c:1818
 msgid "Timeline"
 msgstr "Oś czasu"
 
-#: ../clutter/deprecated/clutter-alpha.c:356
+#: ../clutter/deprecated/clutter-alpha.c:355
 msgid "Timeline used by the alpha"
 msgstr "Oś czasu używana przez alfę"
 
-#: ../clutter/deprecated/clutter-alpha.c:372
+#: ../clutter/deprecated/clutter-alpha.c:371
 msgid "Alpha value"
 msgstr "Wartość alfa"
 
-#: ../clutter/deprecated/clutter-alpha.c:373
+#: ../clutter/deprecated/clutter-alpha.c:372
 msgid "Alpha value as computed by the alpha"
 msgstr "Wartość alfa obliczona przez alfę"
 
-#: ../clutter/deprecated/clutter-alpha.c:394
-#: ../clutter/deprecated/clutter-animation.c:528
+#: ../clutter/deprecated/clutter-alpha.c:393
+#: ../clutter/deprecated/clutter-animation.c:525
 msgid "Mode"
 msgstr "Tryb"
 
-#: ../clutter/deprecated/clutter-alpha.c:395
+#: ../clutter/deprecated/clutter-alpha.c:394
 msgid "Progress mode"
 msgstr "Tryb postępu"
 
-#: ../clutter/deprecated/clutter-animation.c:511
+#: ../clutter/deprecated/clutter-animation.c:508
 msgid "Object"
 msgstr "Obiekt"
 
-#: ../clutter/deprecated/clutter-animation.c:512
+#: ../clutter/deprecated/clutter-animation.c:509
 msgid "Object to which the animation applies"
 msgstr "Obiekt, do którego animacja jest zastosowywana"
 
-#: ../clutter/deprecated/clutter-animation.c:529
+#: ../clutter/deprecated/clutter-animation.c:526
 msgid "The mode of the animation"
 msgstr "Tryb animacji"
 
-#: ../clutter/deprecated/clutter-animation.c:545
+#: ../clutter/deprecated/clutter-animation.c:542
 msgid "Duration of the animation, in milliseconds"
 msgstr "Czas trwania animacji, w milisekundach"
 
-#: ../clutter/deprecated/clutter-animation.c:561
+#: ../clutter/deprecated/clutter-animation.c:558
 msgid "Whether the animation should loop"
 msgstr "Określa, czy animacja powinna być zapętlona"
 
-#: ../clutter/deprecated/clutter-animation.c:576
+#: ../clutter/deprecated/clutter-animation.c:573
 msgid "The timeline used by the animation"
 msgstr "Oś czasu używana przez animację"
 
-#: ../clutter/deprecated/clutter-animation.c:592
-#: ../clutter/deprecated/clutter-behaviour.c:241
+#: ../clutter/deprecated/clutter-animation.c:589
+#: ../clutter/deprecated/clutter-behaviour.c:237
 msgid "Alpha"
 msgstr "Alfa"
 
-#: ../clutter/deprecated/clutter-animation.c:593
+#: ../clutter/deprecated/clutter-animation.c:590
 msgid "The alpha used by the animation"
 msgstr "Alfa używana przez animację"
 
-#: ../clutter/deprecated/clutter-animator.c:1805
+#: ../clutter/deprecated/clutter-animator.c:1802
 msgid "The duration of the animation"
 msgstr "Czas trwania animacji"
 
-#: ../clutter/deprecated/clutter-animator.c:1822
+#: ../clutter/deprecated/clutter-animator.c:1819
 msgid "The timeline of the animation"
 msgstr "Oś czasu animacji"
 
-#: ../clutter/deprecated/clutter-behaviour.c:242
+#: ../clutter/deprecated/clutter-behaviour.c:238
 msgid "Alpha Object to drive the behaviour"
 msgstr "Obiekt alfa prowadzący zachowanie"
 
-#: ../clutter/deprecated/clutter-behaviour-depth.c:182
+#: ../clutter/deprecated/clutter-behaviour-depth.c:180
 msgid "Start Depth"
 msgstr "Głębia początkowa"
 
-#: ../clutter/deprecated/clutter-behaviour-depth.c:183
+#: ../clutter/deprecated/clutter-behaviour-depth.c:181
 msgid "Initial depth to apply"
 msgstr "Początkowa głębia do zastosowania"
 
-#: ../clutter/deprecated/clutter-behaviour-depth.c:198
+#: ../clutter/deprecated/clutter-behaviour-depth.c:196
 msgid "End Depth"
 msgstr "Głębia końcowa"
 
-#: ../clutter/deprecated/clutter-behaviour-depth.c:199
+#: ../clutter/deprecated/clutter-behaviour-depth.c:197
 msgid "Final depth to apply"
 msgstr "Końcowa głębia do zastosowania"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:401
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:394
 msgid "Start Angle"
 msgstr "Kąt początkowy"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:402
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:284
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:395
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:277
 msgid "Initial angle"
 msgstr "Kąt początkowy"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:417
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:410
 msgid "End Angle"
 msgstr "Kąt końcowy"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:418
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:302
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:411
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:295
 msgid "Final angle"
 msgstr "Kąt końcowy"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:433
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:426
 msgid "Angle x tilt"
 msgstr "Nachylenie kąta współrzędnej X"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:434
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:427
 msgid "Tilt of the ellipse around x axis"
 msgstr "Nachylenie elipsy wokół osi X"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:449
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:442
 msgid "Angle y tilt"
 msgstr "Nachylenie kąta współrzędnej Y"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:450
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:443
 msgid "Tilt of the ellipse around y axis"
 msgstr "Nachylenie elipsy wokół osi Y"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:465
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:458
 msgid "Angle z tilt"
 msgstr "Nachylenie kąta współrzędnej Z"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:466
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:459
 msgid "Tilt of the ellipse around z axis"
 msgstr "Nachylenie elipsy wokół osi Z"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:482
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:475
 msgid "Width of the ellipse"
 msgstr "Szerokość alipsy"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:498
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:491
 msgid "Height of ellipse"
 msgstr "Wysokość elipsy"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:513
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:506
 msgid "Center"
 msgstr "Środek"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:514
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:507
 msgid "Center of ellipse"
 msgstr "Środek elipsy"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:529
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:338
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:522
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:331
 msgid "Direction of rotation"
 msgstr "Kierunek obrotu"
 
-#: ../clutter/deprecated/clutter-behaviour-opacity.c:184
+#: ../clutter/deprecated/clutter-behaviour-opacity.c:177
 msgid "Opacity Start"
 msgstr "Początkowa nieprzezroczystość"
 
-#: ../clutter/deprecated/clutter-behaviour-opacity.c:185
+#: ../clutter/deprecated/clutter-behaviour-opacity.c:178
 msgid "Initial opacity level"
 msgstr "Początkowy poziom nieprzezroczystości"
 
-#: ../clutter/deprecated/clutter-behaviour-opacity.c:202
+#: ../clutter/deprecated/clutter-behaviour-opacity.c:195
 msgid "Opacity End"
 msgstr "Końcowa nieprzezroczystość"
 
-#: ../clutter/deprecated/clutter-behaviour-opacity.c:203
+#: ../clutter/deprecated/clutter-behaviour-opacity.c:196
 msgid "Final opacity level"
 msgstr "Końcowy poziom nieprzezroczystości"
 
-#: ../clutter/deprecated/clutter-behaviour-path.c:226
+#: ../clutter/deprecated/clutter-behaviour-path.c:222
 msgid "The ClutterPath object representing the path to animate along"
 msgstr "Obiekt \"ClutterPath\" przedstawiający ścieżkę, na której animować"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:283
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:276
 msgid "Angle Begin"
 msgstr "Kąt początkowy"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:301
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:294
 msgid "Angle End"
 msgstr "Kąt końcowy"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:319
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:312
 msgid "Axis"
 msgstr "Oś"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:320
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:313
 msgid "Axis of rotation"
 msgstr "Oś obrotu"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:355
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:348
 msgid "Center X"
 msgstr "Środek współrzędnej X"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:356
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:349
 msgid "X coordinate of the center of rotation"
 msgstr "Współrzędna X środka obrotu"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:373
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:366
 msgid "Center Y"
 msgstr "Środek współrzędnej Y"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:374
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:367
 msgid "Y coordinate of the center of rotation"
 msgstr "Współrzędna Y środka obrotu"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:391
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:384
 msgid "Center Z"
 msgstr "Środek współrzędnej Z"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:392
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:385
 msgid "Z coordinate of the center of rotation"
 msgstr "Współrzędna Z środka obrotu"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:226
+#: ../clutter/deprecated/clutter-behaviour-scale.c:222
 msgid "X Start Scale"
 msgstr "Początkowe skalowanie współrzędnej X"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:227
+#: ../clutter/deprecated/clutter-behaviour-scale.c:223
 msgid "Initial scale on the X axis"
 msgstr "Początkowe skalowanie na osi X"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:245
+#: ../clutter/deprecated/clutter-behaviour-scale.c:241
 msgid "X End Scale"
 msgstr "Końcowe skalowanie współrzędnej X"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:246
+#: ../clutter/deprecated/clutter-behaviour-scale.c:242
 msgid "Final scale on the X axis"
 msgstr "Końcowe skalowanie na osi X"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:264
+#: ../clutter/deprecated/clutter-behaviour-scale.c:260
 msgid "Y Start Scale"
 msgstr "Początkowe skalowanie współrzędnej Y"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:265
+#: ../clutter/deprecated/clutter-behaviour-scale.c:261
 msgid "Initial scale on the Y axis"
 msgstr "Początkowe skalowanie na osi Y"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:283
+#: ../clutter/deprecated/clutter-behaviour-scale.c:279
 msgid "Y End Scale"
 msgstr "Końcowe skalowanie współrzędnej Y"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:284
+#: ../clutter/deprecated/clutter-behaviour-scale.c:280
 msgid "Final scale on the Y axis"
 msgstr "Końcowe skalowanie na osi Y"
 
-#: ../clutter/deprecated/clutter-box.c:261
+#: ../clutter/deprecated/clutter-box.c:257
 msgid "The background color of the box"
 msgstr "Kolor tła pola"
 
-#: ../clutter/deprecated/clutter-box.c:274
+#: ../clutter/deprecated/clutter-box.c:270
 msgid "Color Set"
 msgstr "Ustawienie koloru"
 
-#: ../clutter/deprecated/clutter-cairo-texture.c:597
+#: ../clutter/deprecated/clutter-cairo-texture.c:593
 msgid "Surface Width"
 msgstr "Szerokość powierzchni"
 
-#: ../clutter/deprecated/clutter-cairo-texture.c:598
+#: ../clutter/deprecated/clutter-cairo-texture.c:594
 msgid "The width of the Cairo surface"
 msgstr "Szerokość powierzchni biblioteki cairo"
 
-#: ../clutter/deprecated/clutter-cairo-texture.c:615
+#: ../clutter/deprecated/clutter-cairo-texture.c:611
 msgid "Surface Height"
 msgstr "Wysokość powierzchni"
 
-#: ../clutter/deprecated/clutter-cairo-texture.c:616
+#: ../clutter/deprecated/clutter-cairo-texture.c:612
 msgid "The height of the Cairo surface"
 msgstr "Wysokość powierzchni biblioteki cairo"
 
-#: ../clutter/deprecated/clutter-cairo-texture.c:636
+#: ../clutter/deprecated/clutter-cairo-texture.c:632
 msgid "Auto Resize"
 msgstr "Automatyczna zmiana rozmiaru"
 
-#: ../clutter/deprecated/clutter-cairo-texture.c:637
+#: ../clutter/deprecated/clutter-cairo-texture.c:633
 msgid "Whether the surface should match the allocation"
 msgstr "Określa, czy powierzchnia powinna pasować do przydzielenia"
 
@@ -2394,103 +2414,159 @@ msgstr "Poziom wypełnienia bufora"
 msgid "The duration of the stream, in seconds"
 msgstr "Czas trwania strumienia w sekundach"
 
-#: ../clutter/deprecated/clutter-rectangle.c:274
+#: ../clutter/deprecated/clutter-rectangle.c:271
 msgid "The color of the rectangle"
 msgstr "Kolor prostokąta"
 
-#: ../clutter/deprecated/clutter-rectangle.c:287
+#: ../clutter/deprecated/clutter-rectangle.c:284
 msgid "Border Color"
 msgstr "Kolor krawędzi"
 
-#: ../clutter/deprecated/clutter-rectangle.c:288
+#: ../clutter/deprecated/clutter-rectangle.c:285
 msgid "The color of the border of the rectangle"
 msgstr "Kolor krawędzi prostokąta"
 
-#: ../clutter/deprecated/clutter-rectangle.c:303
+#: ../clutter/deprecated/clutter-rectangle.c:300
 msgid "Border Width"
 msgstr "Szerokość krawędzi"
 
-#: ../clutter/deprecated/clutter-rectangle.c:304
+#: ../clutter/deprecated/clutter-rectangle.c:301
 msgid "The width of the border of the rectangle"
 msgstr "Szerokość krawędzi prostokąta"
 
-#: ../clutter/deprecated/clutter-rectangle.c:318
+#: ../clutter/deprecated/clutter-rectangle.c:315
 msgid "Has Border"
 msgstr "Posiada krawędź"
 
-#: ../clutter/deprecated/clutter-rectangle.c:319
+#: ../clutter/deprecated/clutter-rectangle.c:316
 msgid "Whether the rectangle should have a border"
 msgstr "Określa, czy prostokąt powinien posiadać krawędź"
 
-#: ../clutter/deprecated/clutter-shader.c:261
+#: ../clutter/deprecated/clutter-shader.c:257
 msgid "Vertex Source"
 msgstr "Źródło wierzchołków"
 
-#: ../clutter/deprecated/clutter-shader.c:262
+#: ../clutter/deprecated/clutter-shader.c:258
 msgid "Source of vertex shader"
 msgstr "Źródło cieniowania wierzchołkowego"
 
-#: ../clutter/deprecated/clutter-shader.c:278
+#: ../clutter/deprecated/clutter-shader.c:274
 msgid "Fragment Source"
 msgstr "Źródło fragmentów"
 
-#: ../clutter/deprecated/clutter-shader.c:279
+#: ../clutter/deprecated/clutter-shader.c:275
 msgid "Source of fragment shader"
 msgstr "Źródło cieniowania fragmentów"
 
-#: ../clutter/deprecated/clutter-shader.c:296
+#: ../clutter/deprecated/clutter-shader.c:292
 msgid "Compiled"
 msgstr "Skompilowany"
 
-#: ../clutter/deprecated/clutter-shader.c:297
+#: ../clutter/deprecated/clutter-shader.c:293
 msgid "Whether the shader is compiled and linked"
 msgstr "Określa, czy cieniowanie jest skompilowane i skonsolidowane"
 
-#: ../clutter/deprecated/clutter-shader.c:314
+#: ../clutter/deprecated/clutter-shader.c:310
 msgid "Whether the shader is enabled"
 msgstr "Określa, czy cieniowanie jest włączone"
 
-#: ../clutter/deprecated/clutter-shader.c:525
+#: ../clutter/deprecated/clutter-shader.c:521
 #, c-format
 msgid "%s compilation failed: %s"
 msgstr "Kompilacja %s się nie powiodła: %s"
 
-#: ../clutter/deprecated/clutter-shader.c:526
+#: ../clutter/deprecated/clutter-shader.c:522
 msgid "Vertex shader"
 msgstr "Cieniowanie wierzchołkowe"
 
-#: ../clutter/deprecated/clutter-shader.c:527
+#: ../clutter/deprecated/clutter-shader.c:523
 msgid "Fragment shader"
 msgstr "Cieniowanie fragmentów"
 
-#: ../clutter/deprecated/clutter-state.c:1505
+#: ../clutter/deprecated/clutter-state.c:1499
 msgid "State"
 msgstr "Stan"
 
-#: ../clutter/deprecated/clutter-state.c:1506
+#: ../clutter/deprecated/clutter-state.c:1500
 msgid "Currently set state, (transition to this state might not be complete)"
 msgstr ""
 "Obecnie ustawiony stan (przejście do tego stanu może nie zostać ukończone)"
 
-#: ../clutter/deprecated/clutter-state.c:1524
+#: ../clutter/deprecated/clutter-state.c:1518
 msgid "Default transition duration"
 msgstr "Domyślny czas trwania przejścia"
 
-#: ../clutter/deprecated/clutter-texture.c:994
+#: ../clutter/deprecated/clutter-table-layout.c:543
+msgid "Column Number"
+msgstr "Numer kolumny"
+
+#: ../clutter/deprecated/clutter-table-layout.c:544
+msgid "The column the widget resides in"
+msgstr "Kolumna, w której znajdują się widżety"
+
+#: ../clutter/deprecated/clutter-table-layout.c:551
+msgid "Row Number"
+msgstr "Numer wiersza"
+
+#: ../clutter/deprecated/clutter-table-layout.c:552
+msgid "The row the widget resides in"
+msgstr "Wiersz, w którym znajdują się widżety"
+
+#: ../clutter/deprecated/clutter-table-layout.c:559
+msgid "Column Span"
+msgstr "Rozciągnięcie kolumny"
+
+#: ../clutter/deprecated/clutter-table-layout.c:560
+msgid "The number of columns the widget should span"
+msgstr "Liczba kolumn, na które powinien rozciągać się widżet"
+
+#: ../clutter/deprecated/clutter-table-layout.c:567
+msgid "Row Span"
+msgstr "Rozciągnięcie wiersza"
+
+#: ../clutter/deprecated/clutter-table-layout.c:568
+msgid "The number of rows the widget should span"
+msgstr "Liczba rzędów, na które powinien rozciągać się widżet"
+
+#: ../clutter/deprecated/clutter-table-layout.c:575
+msgid "Horizontal Expand"
+msgstr "Rozszerzenie poziome"
+
+#: ../clutter/deprecated/clutter-table-layout.c:576
+msgid "Allocate extra space for the child in horizontal axis"
+msgstr "Przydziela dodatkowe miejsca na potomka w osi poziomej"
+
+#: ../clutter/deprecated/clutter-table-layout.c:582
+msgid "Vertical Expand"
+msgstr "Rozszerzenie pionowe"
+
+#: ../clutter/deprecated/clutter-table-layout.c:583
+msgid "Allocate extra space for the child in vertical axis"
+msgstr "Przydziela dodatkowe miejsca na potomka w osi pionowej"
+
+#: ../clutter/deprecated/clutter-table-layout.c:1638
+msgid "Spacing between columns"
+msgstr "Odstęp między kolumnami"
+
+#: ../clutter/deprecated/clutter-table-layout.c:1654
+msgid "Spacing between rows"
+msgstr "Odstęp między wierszami"
+
+#: ../clutter/deprecated/clutter-texture.c:992
 msgid "Sync size of actor"
 msgstr "Synchronizacja rozmiaru aktora"
 
-#: ../clutter/deprecated/clutter-texture.c:995
+#: ../clutter/deprecated/clutter-texture.c:993
 msgid "Auto sync size of actor to underlying pixbuf dimensions"
 msgstr ""
 "Automatycznie synchronizuje rozmiar aktora z wymiarami podstawowej mapy "
 "pikseli"
 
-#: ../clutter/deprecated/clutter-texture.c:1002
+#: ../clutter/deprecated/clutter-texture.c:1000
 msgid "Disable Slicing"
 msgstr "Wyłączenie dzielenia"
 
-#: ../clutter/deprecated/clutter-texture.c:1003
+#: ../clutter/deprecated/clutter-texture.c:1001
 msgid ""
 "Forces the underlying texture to be singular and not made of smaller space "
 "saving individual textures"
@@ -2498,77 +2574,77 @@ msgstr ""
 "Wymusza pojedynczą teksturę podstawową, zamiast mniejszych tekstur "
 "zachowujących miejsce"
 
-#: ../clutter/deprecated/clutter-texture.c:1012
+#: ../clutter/deprecated/clutter-texture.c:1010
 msgid "Tile Waste"
 msgstr "Marnowanie kafla"
 
-#: ../clutter/deprecated/clutter-texture.c:1013
+#: ../clutter/deprecated/clutter-texture.c:1011
 msgid "Maximum waste area of a sliced texture"
 msgstr "Maksymalny marnowany obszar podzielonej tekstury"
 
-#: ../clutter/deprecated/clutter-texture.c:1021
+#: ../clutter/deprecated/clutter-texture.c:1019
 msgid "Horizontal repeat"
 msgstr "Powtórzenie poziome"
 
-#: ../clutter/deprecated/clutter-texture.c:1022
+#: ../clutter/deprecated/clutter-texture.c:1020
 msgid "Repeat the contents rather than scaling them horizontally"
 msgstr "Powtarza zawartość, zamiast skalowania poziomego"
 
-#: ../clutter/deprecated/clutter-texture.c:1029
+#: ../clutter/deprecated/clutter-texture.c:1027
 msgid "Vertical repeat"
 msgstr "Powtarzanie pionowe"
 
-#: ../clutter/deprecated/clutter-texture.c:1030
+#: ../clutter/deprecated/clutter-texture.c:1028
 msgid "Repeat the contents rather than scaling them vertically"
 msgstr "Powtarza zawartość, zamiast skalowania pionowego"
 
-#: ../clutter/deprecated/clutter-texture.c:1037
+#: ../clutter/deprecated/clutter-texture.c:1035
 msgid "Filter Quality"
 msgstr "Jakość filtru"
 
-#: ../clutter/deprecated/clutter-texture.c:1038
+#: ../clutter/deprecated/clutter-texture.c:1036
 msgid "Rendering quality used when drawing the texture"
 msgstr "Jakość wyświetlania tekstury"
 
-#: ../clutter/deprecated/clutter-texture.c:1046
+#: ../clutter/deprecated/clutter-texture.c:1044
 msgid "Pixel Format"
 msgstr "Format pikseli"
 
-#: ../clutter/deprecated/clutter-texture.c:1047
+#: ../clutter/deprecated/clutter-texture.c:1045
 msgid "The Cogl pixel format to use"
 msgstr "Używany format pikseli biblioteki Cogl"
 
-#: ../clutter/deprecated/clutter-texture.c:1055
-#: ../clutter/wayland/clutter-wayland-surface.c:449
+#: ../clutter/deprecated/clutter-texture.c:1053
+#: ../clutter/wayland/clutter-wayland-surface.c:445
 msgid "Cogl Texture"
 msgstr "Tekstura biblioteki Cogl"
 
-#: ../clutter/deprecated/clutter-texture.c:1056
-#: ../clutter/wayland/clutter-wayland-surface.c:450
+#: ../clutter/deprecated/clutter-texture.c:1054
+#: ../clutter/wayland/clutter-wayland-surface.c:446
 msgid "The underlying Cogl texture handle used to draw this actor"
 msgstr ""
 "Podstawowy uchwyt tekstury biblioteki Cogl używany do wyświetlania tego "
 "aktora"
 
-#: ../clutter/deprecated/clutter-texture.c:1063
+#: ../clutter/deprecated/clutter-texture.c:1061
 msgid "Cogl Material"
 msgstr "Materiał biblioteki Cogl"
 
-#: ../clutter/deprecated/clutter-texture.c:1064
+#: ../clutter/deprecated/clutter-texture.c:1062
 msgid "The underlying Cogl material handle used to draw this actor"
 msgstr ""
 "Podstawowy uchwyt materiału biblioteki Cogl używany do wyświetlania tego "
 "aktora"
 
-#: ../clutter/deprecated/clutter-texture.c:1083
+#: ../clutter/deprecated/clutter-texture.c:1081
 msgid "The path of the file containing the image data"
 msgstr "Ścieżka pliku zawierającego dane obrazu"
 
-#: ../clutter/deprecated/clutter-texture.c:1090
+#: ../clutter/deprecated/clutter-texture.c:1088
 msgid "Keep Aspect Ratio"
 msgstr "Utrzymywanie współczynnika proporcji"
 
-#: ../clutter/deprecated/clutter-texture.c:1091
+#: ../clutter/deprecated/clutter-texture.c:1089
 msgid ""
 "Keep the aspect ratio of the texture when requesting the preferred width or "
 "height"
@@ -2576,22 +2652,22 @@ msgstr ""
 "Utrzymuje współczynnik proporcji tekstury podczas żądania preferowanej "
 "szerokości lub wysokości"
 
-#: ../clutter/deprecated/clutter-texture.c:1119
+#: ../clutter/deprecated/clutter-texture.c:1117
 msgid "Load asynchronously"
 msgstr "Wczytywanie asynchroniczne"
 
-#: ../clutter/deprecated/clutter-texture.c:1120
+#: ../clutter/deprecated/clutter-texture.c:1118
 msgid ""
 "Load files inside a thread to avoid blocking when loading images from disk"
 msgstr ""
 "Wczytuje pliki wewnątrz wątku, aby unikać blokowanie podczas wczytywania "
 "obrazów z dysku"
 
-#: ../clutter/deprecated/clutter-texture.c:1138
+#: ../clutter/deprecated/clutter-texture.c:1136
 msgid "Load data asynchronously"
 msgstr "Asynchroniczne wczytywanie danych"
 
-#: ../clutter/deprecated/clutter-texture.c:1139
+#: ../clutter/deprecated/clutter-texture.c:1137
 msgid ""
 "Decode image data files inside a thread to reduce blocking when loading "
 "images from disk"
@@ -2599,90 +2675,74 @@ msgstr ""
 "Dekoduje pliki danych obrazów wewnątrz wątku, aby zmniejszyć blokowanie "
 "podczas wczytywania obrazów z dysku"
 
-#: ../clutter/deprecated/clutter-texture.c:1165
+#: ../clutter/deprecated/clutter-texture.c:1163
 msgid "Pick With Alpha"
 msgstr "Wybieranie za pomocą alfy"
 
-#: ../clutter/deprecated/clutter-texture.c:1166
+#: ../clutter/deprecated/clutter-texture.c:1164
 msgid "Shape actor with alpha channel when picking"
 msgstr "Kształtowanie aktora za pomocą kanału alfa podczas wybierania"
 
-#: ../clutter/deprecated/clutter-texture.c:1599
-#: ../clutter/deprecated/clutter-texture.c:1994
-#: ../clutter/deprecated/clutter-texture.c:2090
-#: ../clutter/deprecated/clutter-texture.c:2388
+#: ../clutter/deprecated/clutter-texture.c:1597
+#: ../clutter/deprecated/clutter-texture.c:1992
+#: ../clutter/deprecated/clutter-texture.c:2088
+#: ../clutter/deprecated/clutter-texture.c:2386
 #, c-format
 msgid "Failed to load the image data"
 msgstr "Wczytanie danych obrazu się nie powiodło"
 
-#: ../clutter/deprecated/clutter-texture.c:1758
+#: ../clutter/deprecated/clutter-texture.c:1756
 #, c-format
 msgid "YUV textures are not supported"
 msgstr "Tekstury YUV nie są obsługiwane"
 
-#: ../clutter/deprecated/clutter-texture.c:1767
+#: ../clutter/deprecated/clutter-texture.c:1765
 #, c-format
 msgid "YUV2 textues are not supported"
 msgstr "Tekstury YUV2 nie są obsługiwane"
 
-#: ../clutter/evdev/clutter-input-device-evdev.c:159
-msgid "sysfs Path"
-msgstr "Ścieżka sysfs"
-
-#: ../clutter/evdev/clutter-input-device-evdev.c:160
-msgid "Path of the device in sysfs"
-msgstr "Ścieżka urządzenia w sysfs"
-
-#: ../clutter/evdev/clutter-input-device-evdev.c:175
-msgid "Device Path"
-msgstr "Ścieżka urządzenia"
-
-#: ../clutter/evdev/clutter-input-device-evdev.c:176
-msgid "Path of the device node"
-msgstr "Ścieżka węzła urządzenia"
-
-#: ../clutter/gdk/clutter-backend-gdk.c:296
+#: ../clutter/gdk/clutter-backend-gdk.c:289
 #, c-format
 msgid "Could not find a suitable CoglWinsys for a GdkDisplay of type %s"
 msgstr "Nie można odnaleźć odpowiedniego CoglWinsys dla GdkDisplay typu %s"
 
-#: ../clutter/wayland/clutter-wayland-surface.c:423
+#: ../clutter/wayland/clutter-wayland-surface.c:419
 msgid "Surface"
 msgstr "Powierzchnia"
 
-#: ../clutter/wayland/clutter-wayland-surface.c:424
+#: ../clutter/wayland/clutter-wayland-surface.c:420
 msgid "The underlying wayland surface"
 msgstr "Podstawowa powierzchnia systemu Wayland"
 
-#: ../clutter/wayland/clutter-wayland-surface.c:431
+#: ../clutter/wayland/clutter-wayland-surface.c:427
 msgid "Surface width"
 msgstr "Szerokość powierzchni"
 
-#: ../clutter/wayland/clutter-wayland-surface.c:432
+#: ../clutter/wayland/clutter-wayland-surface.c:428
 msgid "The width of the underlying wayland surface"
 msgstr "Szerokość podstawowej powierzchni systemu Wayland"
 
-#: ../clutter/wayland/clutter-wayland-surface.c:440
+#: ../clutter/wayland/clutter-wayland-surface.c:436
 msgid "Surface height"
 msgstr "Wysokość powierzchni"
 
-#: ../clutter/wayland/clutter-wayland-surface.c:441
+#: ../clutter/wayland/clutter-wayland-surface.c:437
 msgid "The height of the underlying wayland surface"
 msgstr "Wysokość podstawowej powierzchni systemu Wayland"
 
-#: ../clutter/x11/clutter-backend-x11.c:516
+#: ../clutter/x11/clutter-backend-x11.c:488
 msgid "X display to use"
 msgstr "Używany ekran X"
 
-#: ../clutter/x11/clutter-backend-x11.c:522
+#: ../clutter/x11/clutter-backend-x11.c:494
 msgid "X screen to use"
 msgstr "Używany ekran X"
 
-#: ../clutter/x11/clutter-backend-x11.c:527
+#: ../clutter/x11/clutter-backend-x11.c:499
 msgid "Make X calls synchronous"
 msgstr "Synchroniczne wywołania X"
 
-#: ../clutter/x11/clutter-backend-x11.c:534
+#: ../clutter/x11/clutter-backend-x11.c:506
 msgid "Disable XInput support"
 msgstr "Wyłącza obsługę XInput"
 
@@ -2690,102 +2750,102 @@ msgstr "Wyłącza obsługę XInput"
 msgid "The Clutter backend"
 msgstr "Mechanizm biblioteki Clutter"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:539
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:534
 msgid "Pixmap"
 msgstr "Mapa pikseli"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:540
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:535
 msgid "The X11 Pixmap to be bound"
 msgstr "Mapa pikseli X11 do powiązania"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:548
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:543
 msgid "Pixmap width"
 msgstr "Szerokość mapy pikseli"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:549
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:544
 msgid "The width of the pixmap bound to this texture"
 msgstr "Szerokość mapy pikseli powiązanej z tą teksturą"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:557
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:552
 msgid "Pixmap height"
 msgstr "Wysokość mapy pikseli"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:558
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:553
 msgid "The height of the pixmap bound to this texture"
 msgstr "Wysokość mapy pikseli powiązanej z tą teksturą"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:566
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:561
 msgid "Pixmap Depth"
 msgstr "Głębia mapy pikseli"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:567
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:562
 msgid "The depth (in number of bits) of the pixmap bound to this texture"
 msgstr "Głębia (w liczbie bitów) mapy pikseli powiązanej z tą teksturą"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:575
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:570
 msgid "Automatic Updates"
 msgstr "Automatyczne aktualizacje"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:576
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:571
 msgid "If the texture should be kept in sync with any pixmap changes."
 msgstr ""
 "Czy tekstura powinna być utrzymywana w synchronizacji ze wszystkimi zmianami "
 "mapy pikseli."
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:584
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:579
 msgid "Window"
 msgstr "Okno"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:585
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:580
 msgid "The X11 Window to be bound"
 msgstr "Okno X11 do powiązania"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:593
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:588
 msgid "Window Redirect Automatic"
 msgstr "Automatyczne przekierowanie okien"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:594
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:589
 msgid "If composite window redirects are set to Automatic (or Manual if false)"
 msgstr ""
 "Czy składane przekierowania składanych okien powinny być automatyczne (lub "
 "ręczne, jeśli ustawione na fałsz)"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:604
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:599
 msgid "Window Mapped"
 msgstr "Mapowanie okien"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:605
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:600
 msgid "If window is mapped"
 msgstr "Czy okna są mapowane"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:614
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:609
 msgid "Destroyed"
 msgstr "Zniszczone"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:615
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:610
 msgid "If window has been destroyed"
 msgstr "Czy okno zostało zniszczone"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:623
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:618
 msgid "Window X"
 msgstr "Współrzędna X okna"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:624
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:619
 msgid "X position of window on screen according to X11"
 msgstr "Współrzędna X okna na ekranie według X11"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:632
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:627
 msgid "Window Y"
 msgstr "Współrzędna Y okna"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:633
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:628
 msgid "Y position of window on screen according to X11"
 msgstr "Współrzędna Y okna na ekranie według X11"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:640
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:635
 msgid "Window Override Redirect"
 msgstr "Przekierowanie zastąpienia okna"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:641
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:636
 msgid "If this is an override-redirect window"
 msgstr "Czy to jest okno zastąpienia przekierowania"
diff --git a/po/pt.po b/po/pt.po
index a007e895c..da80119d5 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -1,15 +1,15 @@
 # clutter's Portuguese translation.
-# Copyright © 2011, 2012, 2013 clutter
+# Copyright © 2011, 2012, 2013, 2014 clutter
 # This file is distributed under the same license as the clutter package.
-# Duarte Loreto <happyguy_pt@hotmail.com>, 2011, 2012, 2013.
+# Duarte Loreto <happyguy_pt@hotmail.com>, 2011, 2012, 2013, 2014.
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: 3.8\n"
+"Project-Id-Version: 3.12\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
-"product=clutter\n"
-"POT-Creation-Date: 2013-03-15 14:30+0000\n"
-"PO-Revision-Date: 2013-03-15 14:35+0000\n"
+"product=clutter&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2014-03-12 00:39+0000\n"
+"PO-Revision-Date: 2014-03-12 01:40+0000\n"
 "Last-Translator: Duarte Loreto <happyguy_pt@hotmail.com>\n"
 "Language-Team: Portuguese <gnome_pt@yahoogroups.com>\n"
 "Language: pt\n"
@@ -17,690 +17,690 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../clutter/clutter-actor.c:6175
+#: ../clutter/clutter-actor.c:6214
 msgid "X coordinate"
 msgstr "Coordenada X"
 
-#: ../clutter/clutter-actor.c:6176
+#: ../clutter/clutter-actor.c:6215
 msgid "X coordinate of the actor"
 msgstr "Coordenada X do ator"
 
-#: ../clutter/clutter-actor.c:6194
+#: ../clutter/clutter-actor.c:6233
 msgid "Y coordinate"
 msgstr "Coordenada Y"
 
-#: ../clutter/clutter-actor.c:6195
+#: ../clutter/clutter-actor.c:6234
 msgid "Y coordinate of the actor"
 msgstr "Coordenada Y do ator"
 
-#: ../clutter/clutter-actor.c:6217
+#: ../clutter/clutter-actor.c:6256
 msgid "Position"
 msgstr "Posição"
 
-#: ../clutter/clutter-actor.c:6218
+#: ../clutter/clutter-actor.c:6257
 msgid "The position of the origin of the actor"
 msgstr "A posição da origem do ator"
 
-#: ../clutter/clutter-actor.c:6235 ../clutter/clutter-canvas.c:215
-#: ../clutter/clutter-grid-layout.c:1238
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:481
+#: ../clutter/clutter-actor.c:6274 ../clutter/clutter-canvas.c:247
+#: ../clutter/clutter-grid-layout.c:1239
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:474
 msgid "Width"
 msgstr "Largura"
 
-#: ../clutter/clutter-actor.c:6236
+#: ../clutter/clutter-actor.c:6275
 msgid "Width of the actor"
 msgstr "Largura do ator"
 
-#: ../clutter/clutter-actor.c:6254 ../clutter/clutter-canvas.c:231
-#: ../clutter/clutter-grid-layout.c:1245
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:497
+#: ../clutter/clutter-actor.c:6293 ../clutter/clutter-canvas.c:263
+#: ../clutter/clutter-grid-layout.c:1246
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:490
 msgid "Height"
 msgstr "Altura"
 
-#: ../clutter/clutter-actor.c:6255
+#: ../clutter/clutter-actor.c:6294
 msgid "Height of the actor"
 msgstr "Altura do ator"
 
-#: ../clutter/clutter-actor.c:6276
+#: ../clutter/clutter-actor.c:6315
 msgid "Size"
 msgstr "Tamanho"
 
-#: ../clutter/clutter-actor.c:6277
+#: ../clutter/clutter-actor.c:6316
 msgid "The size of the actor"
 msgstr "O tamanho do ator"
 
-#: ../clutter/clutter-actor.c:6295
+#: ../clutter/clutter-actor.c:6334
 msgid "Fixed X"
 msgstr "X Fixo"
 
-#: ../clutter/clutter-actor.c:6296
+#: ../clutter/clutter-actor.c:6335
 msgid "Forced X position of the actor"
 msgstr "Posição X forçada do ator"
 
-#: ../clutter/clutter-actor.c:6313
+#: ../clutter/clutter-actor.c:6352
 msgid "Fixed Y"
 msgstr "Y Fixo"
 
-#: ../clutter/clutter-actor.c:6314
+#: ../clutter/clutter-actor.c:6353
 msgid "Forced Y position of the actor"
 msgstr "Posição Y forçada do ator"
 
-#: ../clutter/clutter-actor.c:6329
+#: ../clutter/clutter-actor.c:6368
 msgid "Fixed position set"
 msgstr "Conjunto de posição fixa"
 
-#: ../clutter/clutter-actor.c:6330
+#: ../clutter/clutter-actor.c:6369
 msgid "Whether to use fixed positioning for the actor"
 msgstr "Se utilizar ou não posição forçada para o ator"
 
-#: ../clutter/clutter-actor.c:6348
+#: ../clutter/clutter-actor.c:6387
 msgid "Min Width"
 msgstr "Largura Mín"
 
-#: ../clutter/clutter-actor.c:6349
+#: ../clutter/clutter-actor.c:6388
 msgid "Forced minimum width request for the actor"
 msgstr "Largura forçada mínima requerida para o ator"
 
-#: ../clutter/clutter-actor.c:6367
+#: ../clutter/clutter-actor.c:6406
 msgid "Min Height"
 msgstr "Altura Mín"
 
-#: ../clutter/clutter-actor.c:6368
+#: ../clutter/clutter-actor.c:6407
 msgid "Forced minimum height request for the actor"
 msgstr "Altura forçada mínima requerida para o ator"
 
-#: ../clutter/clutter-actor.c:6386
+#: ../clutter/clutter-actor.c:6425
 msgid "Natural Width"
 msgstr "Largura Natural"
 
-#: ../clutter/clutter-actor.c:6387
+#: ../clutter/clutter-actor.c:6426
 msgid "Forced natural width request for the actor"
 msgstr "Largura forçada natural requerida para o ator"
 
-#: ../clutter/clutter-actor.c:6405
+#: ../clutter/clutter-actor.c:6444
 msgid "Natural Height"
 msgstr "Altura Natural"
 
-#: ../clutter/clutter-actor.c:6406
+#: ../clutter/clutter-actor.c:6445
 msgid "Forced natural height request for the actor"
 msgstr "Altura forçada natural requerida para o ator"
 
-#: ../clutter/clutter-actor.c:6421
+#: ../clutter/clutter-actor.c:6460
 msgid "Minimum width set"
 msgstr "Conjunto de largura mínima"
 
-#: ../clutter/clutter-actor.c:6422
+#: ../clutter/clutter-actor.c:6461
 msgid "Whether to use the min-width property"
 msgstr "Se utilizar ou não a propriedade min-width"
 
-#: ../clutter/clutter-actor.c:6436
+#: ../clutter/clutter-actor.c:6475
 msgid "Minimum height set"
 msgstr "Conjunto de altura mínima"
 
-#: ../clutter/clutter-actor.c:6437
+#: ../clutter/clutter-actor.c:6476
 msgid "Whether to use the min-height property"
 msgstr "Se utilizar ou não a propriedade min-height"
 
-#: ../clutter/clutter-actor.c:6451
+#: ../clutter/clutter-actor.c:6490
 msgid "Natural width set"
 msgstr "Conjunto de largura natural"
 
-#: ../clutter/clutter-actor.c:6452
+#: ../clutter/clutter-actor.c:6491
 msgid "Whether to use the natural-width property"
 msgstr "Se utilizar ou não a propriedade natural-width"
 
-#: ../clutter/clutter-actor.c:6466
+#: ../clutter/clutter-actor.c:6505
 msgid "Natural height set"
 msgstr "Conjunto de altura natural"
 
-#: ../clutter/clutter-actor.c:6467
+#: ../clutter/clutter-actor.c:6506
 msgid "Whether to use the natural-height property"
 msgstr "Se utilizar ou não a propriedade natural-height"
 
-#: ../clutter/clutter-actor.c:6483
+#: ../clutter/clutter-actor.c:6522
 msgid "Allocation"
 msgstr "Alocação"
 
-#: ../clutter/clutter-actor.c:6484
+#: ../clutter/clutter-actor.c:6523
 msgid "The actor's allocation"
 msgstr "A alocação do ator"
 
-#: ../clutter/clutter-actor.c:6541
+#: ../clutter/clutter-actor.c:6580
 msgid "Request Mode"
 msgstr "Modo de Pedido"
 
-#: ../clutter/clutter-actor.c:6542
+#: ../clutter/clutter-actor.c:6581
 msgid "The actor's request mode"
 msgstr "O modo de pedido do ator"
 
-#: ../clutter/clutter-actor.c:6566
+#: ../clutter/clutter-actor.c:6605
 msgid "Depth"
 msgstr "Profundidade"
 
-#: ../clutter/clutter-actor.c:6567
+#: ../clutter/clutter-actor.c:6606
 msgid "Position on the Z axis"
 msgstr "Posição no eixo Z"
 
-#: ../clutter/clutter-actor.c:6594
+#: ../clutter/clutter-actor.c:6633
 msgid "Z Position"
 msgstr "Posição Z"
 
-#: ../clutter/clutter-actor.c:6595
+#: ../clutter/clutter-actor.c:6634
 msgid "The actor's position on the Z axis"
 msgstr "A posição do ator no eixo Z"
 
-#: ../clutter/clutter-actor.c:6612
+#: ../clutter/clutter-actor.c:6651
 msgid "Opacity"
 msgstr "Opacidade"
 
-#: ../clutter/clutter-actor.c:6613
+#: ../clutter/clutter-actor.c:6652
 msgid "Opacity of an actor"
 msgstr "Opacidade do ator"
 
-#: ../clutter/clutter-actor.c:6633
+#: ../clutter/clutter-actor.c:6672
 msgid "Offscreen redirect"
 msgstr "Redireccionamento fora de ecrã"
 
-#: ../clutter/clutter-actor.c:6634
+#: ../clutter/clutter-actor.c:6673
 msgid "Flags controlling when to flatten the actor into a single image"
 msgstr "Parâmetros que controlam quando alisar o ator numa única imagem"
 
-#: ../clutter/clutter-actor.c:6648
+#: ../clutter/clutter-actor.c:6687
 msgid "Visible"
 msgstr "Visível"
 
-#: ../clutter/clutter-actor.c:6649
+#: ../clutter/clutter-actor.c:6688
 msgid "Whether the actor is visible or not"
 msgstr "Se o ator é ou não visível"
 
-#: ../clutter/clutter-actor.c:6663
+#: ../clutter/clutter-actor.c:6702
 msgid "Mapped"
 msgstr "Mapeado"
 
-#: ../clutter/clutter-actor.c:6664
+#: ../clutter/clutter-actor.c:6703
 msgid "Whether the actor will be painted"
 msgstr "Se o ator será ou não pintado"
 
-#: ../clutter/clutter-actor.c:6677
+#: ../clutter/clutter-actor.c:6716
 msgid "Realized"
 msgstr "Criado"
 
-#: ../clutter/clutter-actor.c:6678
+#: ../clutter/clutter-actor.c:6717
 msgid "Whether the actor has been realized"
 msgstr "Se o ator foi ou não criado"
 
-#: ../clutter/clutter-actor.c:6693
+#: ../clutter/clutter-actor.c:6732
 msgid "Reactive"
 msgstr "Reativo"
 
-#: ../clutter/clutter-actor.c:6694
+#: ../clutter/clutter-actor.c:6733
 msgid "Whether the actor is reactive to events"
 msgstr "Se o ator é ou não reativo a eventos"
 
-#: ../clutter/clutter-actor.c:6705
+#: ../clutter/clutter-actor.c:6744
 msgid "Has Clip"
 msgstr "Tem Corte"
 
-#: ../clutter/clutter-actor.c:6706
+#: ../clutter/clutter-actor.c:6745
 msgid "Whether the actor has a clip set"
 msgstr "Se o ator tem ou não um conjunto de corte"
 
-#: ../clutter/clutter-actor.c:6719
+#: ../clutter/clutter-actor.c:6758
 msgid "Clip"
 msgstr "Corte"
 
-#: ../clutter/clutter-actor.c:6720
+#: ../clutter/clutter-actor.c:6759
 msgid "The clip region for the actor"
 msgstr "A região de corte do ator"
 
-#: ../clutter/clutter-actor.c:6739
+#: ../clutter/clutter-actor.c:6778
 msgid "Clip Rectangle"
 msgstr "Retângulo de Corte"
 
-#: ../clutter/clutter-actor.c:6740
+#: ../clutter/clutter-actor.c:6779
 msgid "The visible region of the actor"
 msgstr "A região visível do ator"
 
-#: ../clutter/clutter-actor.c:6754 ../clutter/clutter-actor-meta.c:207
-#: ../clutter/clutter-binding-pool.c:319 ../clutter/clutter-input-device.c:258
+#: ../clutter/clutter-actor.c:6793 ../clutter/clutter-actor-meta.c:205
+#: ../clutter/clutter-binding-pool.c:319 ../clutter/clutter-input-device.c:247
 msgid "Name"
 msgstr "Nome"
 
-#: ../clutter/clutter-actor.c:6755
+#: ../clutter/clutter-actor.c:6794
 msgid "Name of the actor"
 msgstr "Nome do ator"
 
-#: ../clutter/clutter-actor.c:6776
+#: ../clutter/clutter-actor.c:6815
 msgid "Pivot Point"
 msgstr "Ponto de Pivot"
 
-#: ../clutter/clutter-actor.c:6777
+#: ../clutter/clutter-actor.c:6816
 msgid "The point around which the scaling and rotation occur"
 msgstr "O ponto em torno do qual ocorre o escalar e a rotação"
 
-#: ../clutter/clutter-actor.c:6795
+#: ../clutter/clutter-actor.c:6834
 msgid "Pivot Point Z"
 msgstr "Ponto Pivot Z"
 
-#: ../clutter/clutter-actor.c:6796
+#: ../clutter/clutter-actor.c:6835
 msgid "Z component of the pivot point"
 msgstr "Componente Z do ponto de pivot"
 
-#: ../clutter/clutter-actor.c:6814
+#: ../clutter/clutter-actor.c:6853
 msgid "Scale X"
 msgstr "Escala X"
 
-#: ../clutter/clutter-actor.c:6815
+#: ../clutter/clutter-actor.c:6854
 msgid "Scale factor on the X axis"
 msgstr "Fator de escala do eixo X"
 
-#: ../clutter/clutter-actor.c:6833
+#: ../clutter/clutter-actor.c:6872
 msgid "Scale Y"
 msgstr "Escala Y"
 
-#: ../clutter/clutter-actor.c:6834
+#: ../clutter/clutter-actor.c:6873
 msgid "Scale factor on the Y axis"
 msgstr "Fator de escala do eixo Y"
 
-#: ../clutter/clutter-actor.c:6852
+#: ../clutter/clutter-actor.c:6891
 msgid "Scale Z"
 msgstr "Escala Z"
 
-#: ../clutter/clutter-actor.c:6853
+#: ../clutter/clutter-actor.c:6892
 msgid "Scale factor on the Z axis"
 msgstr "Fator de escala do eixo Z"
 
-#: ../clutter/clutter-actor.c:6871
+#: ../clutter/clutter-actor.c:6910
 msgid "Scale Center X"
 msgstr "Centro da Escala X"
 
-#: ../clutter/clutter-actor.c:6872
+#: ../clutter/clutter-actor.c:6911
 msgid "Horizontal scale center"
 msgstr "Centro da escala horizontal"
 
-#: ../clutter/clutter-actor.c:6890
+#: ../clutter/clutter-actor.c:6929
 msgid "Scale Center Y"
 msgstr "Centro da Escala Y"
 
-#: ../clutter/clutter-actor.c:6891
+#: ../clutter/clutter-actor.c:6930
 msgid "Vertical scale center"
 msgstr "Centro da escala vertical"
 
-#: ../clutter/clutter-actor.c:6909
+#: ../clutter/clutter-actor.c:6948
 msgid "Scale Gravity"
 msgstr "Gravidade da Escala"
 
-#: ../clutter/clutter-actor.c:6910
+#: ../clutter/clutter-actor.c:6949
 msgid "The center of scaling"
 msgstr "O centro da escala"
 
-#: ../clutter/clutter-actor.c:6928
+#: ../clutter/clutter-actor.c:6967
 msgid "Rotation Angle X"
 msgstr "Ângulo de Rotação X"
 
-#: ../clutter/clutter-actor.c:6929
+#: ../clutter/clutter-actor.c:6968
 msgid "The rotation angle on the X axis"
 msgstr "O ângulo de rotação no eixo X"
 
-#: ../clutter/clutter-actor.c:6947
+#: ../clutter/clutter-actor.c:6986
 msgid "Rotation Angle Y"
 msgstr "Ângulo de Rotação Y"
 
-#: ../clutter/clutter-actor.c:6948
+#: ../clutter/clutter-actor.c:6987
 msgid "The rotation angle on the Y axis"
 msgstr "O ângulo de rotação no eixo Y"
 
-#: ../clutter/clutter-actor.c:6966
+#: ../clutter/clutter-actor.c:7005
 msgid "Rotation Angle Z"
 msgstr "Ângulo de Rotação Z"
 
-#: ../clutter/clutter-actor.c:6967
+#: ../clutter/clutter-actor.c:7006
 msgid "The rotation angle on the Z axis"
 msgstr "O ângulo de rotação no eixo Z"
 
-#: ../clutter/clutter-actor.c:6985
+#: ../clutter/clutter-actor.c:7024
 msgid "Rotation Center X"
 msgstr "Centro de Rotação X"
 
-#: ../clutter/clutter-actor.c:6986
+#: ../clutter/clutter-actor.c:7025
 msgid "The rotation center on the X axis"
 msgstr "O centro de rotação no eixo X"
 
-#: ../clutter/clutter-actor.c:7003
+#: ../clutter/clutter-actor.c:7042
 msgid "Rotation Center Y"
 msgstr "Centro de Rotação Y"
 
-#: ../clutter/clutter-actor.c:7004
+#: ../clutter/clutter-actor.c:7043
 msgid "The rotation center on the Y axis"
 msgstr "O centro de rotação no eixo Y"
 
-#: ../clutter/clutter-actor.c:7021
+#: ../clutter/clutter-actor.c:7060
 msgid "Rotation Center Z"
 msgstr "Centro de Rotação Z"
 
-#: ../clutter/clutter-actor.c:7022
+#: ../clutter/clutter-actor.c:7061
 msgid "The rotation center on the Z axis"
 msgstr "O centro de rotação no eixo Z"
 
-#: ../clutter/clutter-actor.c:7039
+#: ../clutter/clutter-actor.c:7078
 msgid "Rotation Center Z Gravity"
 msgstr "Gravidade do Centro de Rotação Z"
 
-#: ../clutter/clutter-actor.c:7040
+#: ../clutter/clutter-actor.c:7079
 msgid "Center point for rotation around the Z axis"
 msgstr "Ponto central da rotação em torno do eixo Z"
 
-#: ../clutter/clutter-actor.c:7068
+#: ../clutter/clutter-actor.c:7107
 msgid "Anchor X"
 msgstr "Âncora X"
 
-#: ../clutter/clutter-actor.c:7069
+#: ../clutter/clutter-actor.c:7108
 msgid "X coordinate of the anchor point"
 msgstr "Coordenada X do ponto de ancoragem"
 
-#: ../clutter/clutter-actor.c:7097
+#: ../clutter/clutter-actor.c:7136
 msgid "Anchor Y"
 msgstr "Âncora Y"
 
-#: ../clutter/clutter-actor.c:7098
+#: ../clutter/clutter-actor.c:7137
 msgid "Y coordinate of the anchor point"
 msgstr "Coordenada Y do ponto de ancoragem"
 
-#: ../clutter/clutter-actor.c:7125
+#: ../clutter/clutter-actor.c:7164
 msgid "Anchor Gravity"
 msgstr "Gravidade da Âncora"
 
-#: ../clutter/clutter-actor.c:7126
+#: ../clutter/clutter-actor.c:7165
 msgid "The anchor point as a ClutterGravity"
 msgstr "O ponto de ancoragem como um ClutterGravity"
 
-#: ../clutter/clutter-actor.c:7145
+#: ../clutter/clutter-actor.c:7184
 msgid "Translation X"
 msgstr "Tradução X"
 
-#: ../clutter/clutter-actor.c:7146
+#: ../clutter/clutter-actor.c:7185
 msgid "Translation along the X axis"
 msgstr "Tradução ao longo do eixo X"
 
-#: ../clutter/clutter-actor.c:7165
+#: ../clutter/clutter-actor.c:7204
 msgid "Translation Y"
 msgstr "Tradução Y"
 
-#: ../clutter/clutter-actor.c:7166
+#: ../clutter/clutter-actor.c:7205
 msgid "Translation along the Y axis"
 msgstr "Tradução ao longo do eixo Y"
 
-#: ../clutter/clutter-actor.c:7185
+#: ../clutter/clutter-actor.c:7224
 msgid "Translation Z"
 msgstr "Tradução Z"
 
-#: ../clutter/clutter-actor.c:7186
+#: ../clutter/clutter-actor.c:7225
 msgid "Translation along the Z axis"
 msgstr "Tradução ao longo do eixo Z"
 
-#: ../clutter/clutter-actor.c:7216
+#: ../clutter/clutter-actor.c:7255
 msgid "Transform"
 msgstr "Transformação"
 
-#: ../clutter/clutter-actor.c:7217
+#: ../clutter/clutter-actor.c:7256
 msgid "Transformation matrix"
 msgstr "Matriz de transformação"
 
-#: ../clutter/clutter-actor.c:7232
+#: ../clutter/clutter-actor.c:7271
 msgid "Transform Set"
 msgstr "Transformação Definida"
 
-#: ../clutter/clutter-actor.c:7233
+#: ../clutter/clutter-actor.c:7272
 msgid "Whether the transform property is set"
 msgstr "Se a propriedade de transformação está ou não definida"
 
-#: ../clutter/clutter-actor.c:7254
+#: ../clutter/clutter-actor.c:7293
 msgid "Child Transform"
 msgstr "Transformação do Filho"
 
-#: ../clutter/clutter-actor.c:7255
+#: ../clutter/clutter-actor.c:7294
 msgid "Children transformation matrix"
 msgstr "Matriz de transformação dos filhos"
 
-#: ../clutter/clutter-actor.c:7270
+#: ../clutter/clutter-actor.c:7309
 msgid "Child Transform Set"
 msgstr "Transformação do Filho Definida"
 
-#: ../clutter/clutter-actor.c:7271
+#: ../clutter/clutter-actor.c:7310
 msgid "Whether the child-transform property is set"
 msgstr "Se a propriedade de transformação do filho está ou não definida"
 
-#: ../clutter/clutter-actor.c:7288
+#: ../clutter/clutter-actor.c:7327
 msgid "Show on set parent"
 msgstr "Apresentar ao definir pai"
 
-#: ../clutter/clutter-actor.c:7289
+#: ../clutter/clutter-actor.c:7328
 msgid "Whether the actor is shown when parented"
 msgstr "Se o ator é apresentado quando tem pai"
 
-#: ../clutter/clutter-actor.c:7306
+#: ../clutter/clutter-actor.c:7345
 msgid "Clip to Allocation"
 msgstr "Cortar para a Alocação"
 
-#: ../clutter/clutter-actor.c:7307
+#: ../clutter/clutter-actor.c:7346
 msgid "Sets the clip region to track the actor's allocation"
 msgstr "Define a região de corte para acompanhar a alocação do ator"
 
-#: ../clutter/clutter-actor.c:7320
+#: ../clutter/clutter-actor.c:7359
 msgid "Text Direction"
 msgstr "Direção do Texto"
 
-#: ../clutter/clutter-actor.c:7321
+#: ../clutter/clutter-actor.c:7360
 msgid "Direction of the text"
 msgstr "Direção do texto"
 
-#: ../clutter/clutter-actor.c:7336
+#: ../clutter/clutter-actor.c:7375
 msgid "Has Pointer"
 msgstr "Tem Ponteiro"
 
-#: ../clutter/clutter-actor.c:7337
+#: ../clutter/clutter-actor.c:7376
 msgid "Whether the actor contains the pointer of an input device"
 msgstr "Se o ator contém ou não o ponteiro de um dispositivo de entrada"
 
-#: ../clutter/clutter-actor.c:7350
+#: ../clutter/clutter-actor.c:7389
 msgid "Actions"
 msgstr "Ações"
 
-#: ../clutter/clutter-actor.c:7351
+#: ../clutter/clutter-actor.c:7390
 msgid "Adds an action to the actor"
 msgstr "Adiciona uma ação ao ator"
 
-#: ../clutter/clutter-actor.c:7364
+#: ../clutter/clutter-actor.c:7403
 msgid "Constraints"
 msgstr "Limitações"
 
-#: ../clutter/clutter-actor.c:7365
+#: ../clutter/clutter-actor.c:7404
 msgid "Adds a constraint to the actor"
 msgstr "Adiciona uma limitação ao ator"
 
-#: ../clutter/clutter-actor.c:7378
+#: ../clutter/clutter-actor.c:7417
 msgid "Effect"
 msgstr "Efeito"
 
-#: ../clutter/clutter-actor.c:7379
+#: ../clutter/clutter-actor.c:7418
 msgid "Add an effect to be applied on the actor"
 msgstr "Adicionar um efeito a ser aplicado ao ator"
 
-#: ../clutter/clutter-actor.c:7393
+#: ../clutter/clutter-actor.c:7432
 msgid "Layout Manager"
 msgstr "Gestor de Disposição"
 
-#: ../clutter/clutter-actor.c:7394
+#: ../clutter/clutter-actor.c:7433
 msgid "The object controlling the layout of an actor's children"
 msgstr "O objeto que controla a disposição dos filhos do ator"
 
-#: ../clutter/clutter-actor.c:7408
+#: ../clutter/clutter-actor.c:7447
 msgid "X Expand"
 msgstr "Expansão X"
 
-#: ../clutter/clutter-actor.c:7409
+#: ../clutter/clutter-actor.c:7448
 msgid "Whether extra horizontal space should be assigned to the actor"
 msgstr "Se um espaço extra horizontal deverá ou não ser atribuído ao ator"
 
-#: ../clutter/clutter-actor.c:7424
+#: ../clutter/clutter-actor.c:7463
 msgid "Y Expand"
 msgstr "Expansão Y"
 
-#: ../clutter/clutter-actor.c:7425
+#: ../clutter/clutter-actor.c:7464
 msgid "Whether extra vertical space should be assigned to the actor"
 msgstr "Se um espaço extra vertical deverá ou não ser atribuído ao ator"
 
-#: ../clutter/clutter-actor.c:7441
+#: ../clutter/clutter-actor.c:7480
 msgid "X Alignment"
 msgstr "Alinhamento X"
 
-#: ../clutter/clutter-actor.c:7442
+#: ../clutter/clutter-actor.c:7481
 msgid "The alignment of the actor on the X axis within its allocation"
 msgstr "O alinhamento do ator sobre o eixo X dentro da sua alocação"
 
-#: ../clutter/clutter-actor.c:7457
+#: ../clutter/clutter-actor.c:7496
 msgid "Y Alignment"
 msgstr "Alinhamento Y"
 
-#: ../clutter/clutter-actor.c:7458
+#: ../clutter/clutter-actor.c:7497
 msgid "The alignment of the actor on the Y axis within its allocation"
 msgstr "O alinhamento do ator sobre o eixo Y dentro da sua alocação"
 
-#: ../clutter/clutter-actor.c:7477
+#: ../clutter/clutter-actor.c:7516
 msgid "Margin Top"
 msgstr "Margem Superior"
 
-#: ../clutter/clutter-actor.c:7478
+#: ../clutter/clutter-actor.c:7517
 msgid "Extra space at the top"
 msgstr "Espaço extra no topo"
 
-#: ../clutter/clutter-actor.c:7499
+#: ../clutter/clutter-actor.c:7538
 msgid "Margin Bottom"
 msgstr "Margem Inferior"
 
-#: ../clutter/clutter-actor.c:7500
+#: ../clutter/clutter-actor.c:7539
 msgid "Extra space at the bottom"
 msgstr "Espaço extra no fundo"
 
-#: ../clutter/clutter-actor.c:7521
+#: ../clutter/clutter-actor.c:7560
 msgid "Margin Left"
 msgstr "Margem Esquerda"
 
-#: ../clutter/clutter-actor.c:7522
+#: ../clutter/clutter-actor.c:7561
 msgid "Extra space at the left"
 msgstr "Espaço extra à esquerda"
 
-#: ../clutter/clutter-actor.c:7543
+#: ../clutter/clutter-actor.c:7582
 msgid "Margin Right"
 msgstr "Margem Direita"
 
-#: ../clutter/clutter-actor.c:7544
+#: ../clutter/clutter-actor.c:7583
 msgid "Extra space at the right"
 msgstr "Espaço extra à direita"
 
-#: ../clutter/clutter-actor.c:7560
+#: ../clutter/clutter-actor.c:7599
 msgid "Background Color Set"
 msgstr "Cor de Fundo Definida"
 
-#: ../clutter/clutter-actor.c:7561 ../clutter/deprecated/clutter-box.c:275
+#: ../clutter/clutter-actor.c:7600 ../clutter/deprecated/clutter-box.c:271
 msgid "Whether the background color is set"
 msgstr "Se a cor de fundo está ou não definida"
 
-#: ../clutter/clutter-actor.c:7577
+#: ../clutter/clutter-actor.c:7616
 msgid "Background color"
 msgstr "Cor de fundo"
 
-#: ../clutter/clutter-actor.c:7578
+#: ../clutter/clutter-actor.c:7617
 msgid "The actor's background color"
 msgstr "A cor de fundo do ator"
 
-#: ../clutter/clutter-actor.c:7593
+#: ../clutter/clutter-actor.c:7632
 msgid "First Child"
 msgstr "Primeiro Filho"
 
-#: ../clutter/clutter-actor.c:7594
+#: ../clutter/clutter-actor.c:7633
 msgid "The actor's first child"
 msgstr "O primeiro filho do ator"
 
-#: ../clutter/clutter-actor.c:7607
+#: ../clutter/clutter-actor.c:7646
 msgid "Last Child"
 msgstr "Último Filho"
 
-#: ../clutter/clutter-actor.c:7608
+#: ../clutter/clutter-actor.c:7647
 msgid "The actor's last child"
 msgstr "O último filho do ator"
 
-#: ../clutter/clutter-actor.c:7622
+#: ../clutter/clutter-actor.c:7661
 msgid "Content"
 msgstr "Conteúdo"
 
-#: ../clutter/clutter-actor.c:7623
+#: ../clutter/clutter-actor.c:7662
 msgid "Delegate object for painting the actor's content"
 msgstr "O objeto delegado para pintar o conteúdo do ator"
 
-#: ../clutter/clutter-actor.c:7648
+#: ../clutter/clutter-actor.c:7687
 msgid "Content Gravity"
 msgstr "Gravidade do Conteúdo"
 
-#: ../clutter/clutter-actor.c:7649
+#: ../clutter/clutter-actor.c:7688
 msgid "Alignment of the actor's content"
 msgstr "Alinhamento do conteúdo do ator"
 
-#: ../clutter/clutter-actor.c:7669
+#: ../clutter/clutter-actor.c:7708
 msgid "Content Box"
 msgstr "Caixa de Conteúdo"
 
-#: ../clutter/clutter-actor.c:7670
+#: ../clutter/clutter-actor.c:7709
 msgid "The bounding box of the actor's content"
 msgstr "A caixa limitadora do conteúdo do ator"
 
-#: ../clutter/clutter-actor.c:7678
+#: ../clutter/clutter-actor.c:7717
 msgid "Minification Filter"
 msgstr "Filtro de Redução"
 
-#: ../clutter/clutter-actor.c:7679
+#: ../clutter/clutter-actor.c:7718
 msgid "The filter used when reducing the size of the content"
 msgstr "O filtro utilizado ao reduzir o tamanho do conteúdo"
 
-#: ../clutter/clutter-actor.c:7686
+#: ../clutter/clutter-actor.c:7725
 msgid "Magnification Filter"
 msgstr "Filtro de Ampliação"
 
-#: ../clutter/clutter-actor.c:7687
+#: ../clutter/clutter-actor.c:7726
 msgid "The filter used when increasing the size of the content"
 msgstr "O filtro utilizado ao aumentar o tamanho do conteúdo"
 
-#: ../clutter/clutter-actor.c:7701
+#: ../clutter/clutter-actor.c:7740
 msgid "Content Repeat"
 msgstr "Repetição do Conteúdo"
 
-#: ../clutter/clutter-actor.c:7702
+#: ../clutter/clutter-actor.c:7741
 msgid "The repeat policy for the actor's content"
 msgstr "A política de repetição do conteúdo do ator"
 
-#: ../clutter/clutter-actor-meta.c:193 ../clutter/clutter-child-meta.c:142
+#: ../clutter/clutter-actor-meta.c:191 ../clutter/clutter-child-meta.c:142
 msgid "Actor"
 msgstr "Ator"
 
-#: ../clutter/clutter-actor-meta.c:194
+#: ../clutter/clutter-actor-meta.c:192
 msgid "The actor attached to the meta"
 msgstr "O ator anexado ao meta"
 
-#: ../clutter/clutter-actor-meta.c:208
+#: ../clutter/clutter-actor-meta.c:206
 msgid "The name of the meta"
 msgstr "O nome do meta"
 
-#: ../clutter/clutter-actor-meta.c:221 ../clutter/clutter-input-device.c:337
-#: ../clutter/deprecated/clutter-shader.c:313
+#: ../clutter/clutter-actor-meta.c:219 ../clutter/clutter-input-device.c:326
+#: ../clutter/deprecated/clutter-shader.c:309
 msgid "Enabled"
 msgstr "Ativo"
 
-#: ../clutter/clutter-actor-meta.c:222
+#: ../clutter/clutter-actor-meta.c:220
 msgid "Whether the meta is enabled"
 msgstr "Se o meta está ou não ativo"
 
 #: ../clutter/clutter-align-constraint.c:279
-#: ../clutter/clutter-bind-constraint.c:358 ../clutter/clutter-clone.c:345
+#: ../clutter/clutter-bind-constraint.c:358 ../clutter/clutter-clone.c:341
 #: ../clutter/clutter-snap-constraint.c:321
 msgid "Source"
 msgstr "Origem"
@@ -726,11 +726,11 @@ msgstr "Fator"
 msgid "The alignment factor, between 0.0 and 1.0"
 msgstr "O fator de alinhamento, entre 0.0 e 1.0"
 
-#: ../clutter/clutter-backend.c:379
+#: ../clutter/clutter-backend.c:380
 msgid "Unable to initialize the Clutter backend"
 msgstr "Incapaz de iniciar o motor do Clutter"
 
-#: ../clutter/clutter-backend.c:453
+#: ../clutter/clutter-backend.c:454
 #, c-format
 msgid "The backend of type '%s' does not support creating multiple stages"
 msgstr "O motor do tipo '%s' não suportar criar múltiplas etapas"
@@ -761,47 +761,51 @@ msgstr "O deslocamento em pixels a aplicar à ligação"
 msgid "The unique name of the binding pool"
 msgstr "O nome único do repositório de ligações"
 
-#: ../clutter/clutter-bin-layout.c:240 ../clutter/clutter-bin-layout.c:655
-#: ../clutter/clutter-box-layout.c:390 ../clutter/clutter-table-layout.c:610
+#: ../clutter/clutter-bin-layout.c:238 ../clutter/clutter-bin-layout.c:651
+#: ../clutter/clutter-box-layout.c:388
+#: ../clutter/deprecated/clutter-table-layout.c:610
 msgid "Horizontal Alignment"
 msgstr "Alinhamento Horizontal"
 
-#: ../clutter/clutter-bin-layout.c:241
+#: ../clutter/clutter-bin-layout.c:239
 msgid "Horizontal alignment for the actor inside the layout manager"
 msgstr "Alinhamento horizontal do ator dentro do gestor de disposição"
 
-#: ../clutter/clutter-bin-layout.c:249 ../clutter/clutter-bin-layout.c:675
-#: ../clutter/clutter-box-layout.c:399 ../clutter/clutter-table-layout.c:625
+#: ../clutter/clutter-bin-layout.c:247 ../clutter/clutter-bin-layout.c:671
+#: ../clutter/clutter-box-layout.c:397
+#: ../clutter/deprecated/clutter-table-layout.c:625
 msgid "Vertical Alignment"
 msgstr "Alinhamento Vertical"
 
-#: ../clutter/clutter-bin-layout.c:250
+#: ../clutter/clutter-bin-layout.c:248
 msgid "Vertical alignment for the actor inside the layout manager"
 msgstr "Alinhamento vertical do ator dentro do gestor de disposição"
 
-#: ../clutter/clutter-bin-layout.c:656
+#: ../clutter/clutter-bin-layout.c:652
 msgid "Default horizontal alignment for the actors inside the layout manager"
 msgstr ""
 "Alinhamento horizontal por omissão dos atores dentro do gestor de disposição"
 
-#: ../clutter/clutter-bin-layout.c:676
+#: ../clutter/clutter-bin-layout.c:672
 msgid "Default vertical alignment for the actors inside the layout manager"
 msgstr ""
 "Alinhamento vertical por omissão dos atores dentro do gestor de disposição"
 
-#: ../clutter/clutter-box-layout.c:365
+#: ../clutter/clutter-box-layout.c:363
 msgid "Expand"
 msgstr "Expandir"
 
-#: ../clutter/clutter-box-layout.c:366
+#: ../clutter/clutter-box-layout.c:364
 msgid "Allocate extra space for the child"
 msgstr "Alocar espaço extra para o filho"
 
-#: ../clutter/clutter-box-layout.c:372 ../clutter/clutter-table-layout.c:589
+#: ../clutter/clutter-box-layout.c:370
+#: ../clutter/deprecated/clutter-table-layout.c:589
 msgid "Horizontal Fill"
 msgstr "Enchimento Horizontal"
 
-#: ../clutter/clutter-box-layout.c:373 ../clutter/clutter-table-layout.c:590
+#: ../clutter/clutter-box-layout.c:371
+#: ../clutter/deprecated/clutter-table-layout.c:590
 msgid ""
 "Whether the child should receive priority when the container is allocating "
 "spare space on the horizontal axis"
@@ -809,11 +813,13 @@ msgstr ""
 "Se o filho deverá ou não receber prioridade quando o contentor está a alocar "
 "espaço extra no eixo horizontal"
 
-#: ../clutter/clutter-box-layout.c:381 ../clutter/clutter-table-layout.c:596
+#: ../clutter/clutter-box-layout.c:379
+#: ../clutter/deprecated/clutter-table-layout.c:596
 msgid "Vertical Fill"
 msgstr "Enchimento Vertical"
 
-#: ../clutter/clutter-box-layout.c:382 ../clutter/clutter-table-layout.c:597
+#: ../clutter/clutter-box-layout.c:380
+#: ../clutter/deprecated/clutter-table-layout.c:597
 msgid ""
 "Whether the child should receive priority when the container is allocating "
 "spare space on the vertical axis"
@@ -821,80 +827,88 @@ msgstr ""
 "Se o filho deverá ou não receber prioridade quando o contentor está a alocar "
 "espaço extra no eixo vertical"
 
-#: ../clutter/clutter-box-layout.c:391 ../clutter/clutter-table-layout.c:611
+#: ../clutter/clutter-box-layout.c:389
+#: ../clutter/deprecated/clutter-table-layout.c:611
 msgid "Horizontal alignment of the actor within the cell"
 msgstr "Alinhamento horizontal do ator dentro da célula"
 
-#: ../clutter/clutter-box-layout.c:400 ../clutter/clutter-table-layout.c:626
+#: ../clutter/clutter-box-layout.c:398
+#: ../clutter/deprecated/clutter-table-layout.c:626
 msgid "Vertical alignment of the actor within the cell"
 msgstr "Alinhamento vertical do ator dentro da célula"
 
-#: ../clutter/clutter-box-layout.c:1365
+#: ../clutter/clutter-box-layout.c:1359
 msgid "Vertical"
 msgstr "Vertical"
 
-#: ../clutter/clutter-box-layout.c:1366
+#: ../clutter/clutter-box-layout.c:1360
 msgid "Whether the layout should be vertical, rather than horizontal"
 msgstr "Se a disposição deverá ser vertical em vez de horizontal"
 
-#: ../clutter/clutter-box-layout.c:1383 ../clutter/clutter-flow-layout.c:890
-#: ../clutter/clutter-grid-layout.c:1550
+#: ../clutter/clutter-box-layout.c:1377 ../clutter/clutter-flow-layout.c:942
+#: ../clutter/clutter-grid-layout.c:1549
 msgid "Orientation"
 msgstr "Orientação"
 
-#: ../clutter/clutter-box-layout.c:1384 ../clutter/clutter-flow-layout.c:891
-#: ../clutter/clutter-grid-layout.c:1551
+#: ../clutter/clutter-box-layout.c:1378 ../clutter/clutter-flow-layout.c:943
+#: ../clutter/clutter-grid-layout.c:1550
 msgid "The orientation of the layout"
 msgstr "A orientação da disposição"
 
-#: ../clutter/clutter-box-layout.c:1400 ../clutter/clutter-flow-layout.c:906
+#: ../clutter/clutter-box-layout.c:1394 ../clutter/clutter-flow-layout.c:958
 msgid "Homogeneous"
 msgstr "Homogénea"
 
-#: ../clutter/clutter-box-layout.c:1401
+#: ../clutter/clutter-box-layout.c:1395
 msgid ""
 "Whether the layout should be homogeneous, i.e. all childs get the same size"
 msgstr ""
 "Se a disposição deverá ou não ser homogénea, por ex. todos os filhos do "
 "mesmo tamanho"
 
-#: ../clutter/clutter-box-layout.c:1416
+#: ../clutter/clutter-box-layout.c:1410
 msgid "Pack Start"
 msgstr "Arrumar no Início"
 
-#: ../clutter/clutter-box-layout.c:1417
+#: ../clutter/clutter-box-layout.c:1411
 msgid "Whether to pack items at the start of the box"
 msgstr "Se arrumar os itens no início da caixa"
 
-#: ../clutter/clutter-box-layout.c:1430
+#: ../clutter/clutter-box-layout.c:1424
 msgid "Spacing"
 msgstr "Espaçamento"
 
-#: ../clutter/clutter-box-layout.c:1431
+#: ../clutter/clutter-box-layout.c:1425
 msgid "Spacing between children"
 msgstr "Espaçamento entre filhos"
 
-#: ../clutter/clutter-box-layout.c:1448 ../clutter/clutter-table-layout.c:1675
+#: ../clutter/clutter-box-layout.c:1442
+#: ../clutter/deprecated/clutter-table-layout.c:1677
 msgid "Use Animations"
 msgstr "Utilizar Animações"
 
-#: ../clutter/clutter-box-layout.c:1449 ../clutter/clutter-table-layout.c:1676
+#: ../clutter/clutter-box-layout.c:1443
+#: ../clutter/deprecated/clutter-table-layout.c:1678
 msgid "Whether layout changes should be animated"
 msgstr "Se as alterações de disposição deverão ou não ser animadas"
 
-#: ../clutter/clutter-box-layout.c:1473 ../clutter/clutter-table-layout.c:1700
+#: ../clutter/clutter-box-layout.c:1467
+#: ../clutter/deprecated/clutter-table-layout.c:1702
 msgid "Easing Mode"
 msgstr "Modo de Transição"
 
-#: ../clutter/clutter-box-layout.c:1474 ../clutter/clutter-table-layout.c:1701
+#: ../clutter/clutter-box-layout.c:1468
+#: ../clutter/deprecated/clutter-table-layout.c:1703
 msgid "The easing mode of the animations"
 msgstr "O modo de transição das animações"
 
-#: ../clutter/clutter-box-layout.c:1494 ../clutter/clutter-table-layout.c:1721
+#: ../clutter/clutter-box-layout.c:1488
+#: ../clutter/deprecated/clutter-table-layout.c:1723
 msgid "Easing Duration"
 msgstr "Duração da Transição"
 
-#: ../clutter/clutter-box-layout.c:1495 ../clutter/clutter-table-layout.c:1722
+#: ../clutter/clutter-box-layout.c:1489
+#: ../clutter/deprecated/clutter-table-layout.c:1724
 msgid "The duration of the animations"
 msgstr "A duração das animações"
 
@@ -914,14 +928,30 @@ msgstr "Contraste"
 msgid "The contrast change to apply"
 msgstr "A alteração de contraste a aplicar"
 
-#: ../clutter/clutter-canvas.c:216
+#: ../clutter/clutter-canvas.c:248
 msgid "The width of the canvas"
 msgstr "A largura da tela"
 
-#: ../clutter/clutter-canvas.c:232
+#: ../clutter/clutter-canvas.c:264
 msgid "The height of the canvas"
 msgstr "A altura da tela"
 
+#: ../clutter/clutter-canvas.c:283
+msgid "Scale Factor Set"
+msgstr "Fator de Escala Definido"
+
+#: ../clutter/clutter-canvas.c:284
+msgid "Whether the scale-factor property is set"
+msgstr "Se a propriedade de fator de escala está ou não definida"
+
+#: ../clutter/clutter-canvas.c:305
+msgid "Scale Factor"
+msgstr "Fator de Escala"
+
+#: ../clutter/clutter-canvas.c:306
+msgid "The scaling factor for the surface"
+msgstr "O fator de escala da superfície"
+
 #: ../clutter/clutter-child-meta.c:127
 msgid "Container"
 msgstr "Contentor"
@@ -934,40 +964,40 @@ msgstr "O contentor que criou estes dados"
 msgid "The actor wrapped by this data"
 msgstr "O ator englobado por estes dados"
 
-#: ../clutter/clutter-click-action.c:559
+#: ../clutter/clutter-click-action.c:586
 msgid "Pressed"
 msgstr "Premido"
 
-#: ../clutter/clutter-click-action.c:560
+#: ../clutter/clutter-click-action.c:587
 msgid "Whether the clickable should be in pressed state"
 msgstr "Se o o clicável deverá ou não estar no estado premido"
 
-#: ../clutter/clutter-click-action.c:573
+#: ../clutter/clutter-click-action.c:600
 msgid "Held"
 msgstr "Manipulador"
 
-#: ../clutter/clutter-click-action.c:574
+#: ../clutter/clutter-click-action.c:601
 msgid "Whether the clickable has a grab"
 msgstr "Se o clicável tem ou não um manipulador"
 
-#: ../clutter/clutter-click-action.c:591 ../clutter/clutter-settings.c:607
+#: ../clutter/clutter-click-action.c:618 ../clutter/clutter-settings.c:653
 msgid "Long Press Duration"
 msgstr "Duração da Pressão Longa"
 
-#: ../clutter/clutter-click-action.c:592
+#: ../clutter/clutter-click-action.c:619
 msgid "The minimum duration of a long press to recognize the gesture"
 msgstr ""
 "A duração mínima de uma pressão longa para que o gesto seja reconhecido"
 
-#: ../clutter/clutter-click-action.c:610
+#: ../clutter/clutter-click-action.c:637
 msgid "Long Press Threshold"
 msgstr "Tolerância de Pressão Longa"
 
-#: ../clutter/clutter-click-action.c:611
+#: ../clutter/clutter-click-action.c:638
 msgid "The maximum threshold before a long press is cancelled"
 msgstr "A tolerância máxima antes da qual uma pressão longa é cancelada"
 
-#: ../clutter/clutter-clone.c:346
+#: ../clutter/clutter-clone.c:342
 msgid "Specifies the actor to be cloned"
 msgstr "Especifica o ator a ser clonado"
 
@@ -979,27 +1009,27 @@ msgstr "Tingimento"
 msgid "The tint to apply"
 msgstr "O tingimento a aplicar"
 
-#: ../clutter/clutter-deform-effect.c:594
+#: ../clutter/clutter-deform-effect.c:592
 msgid "Horizontal Tiles"
 msgstr "Mosaico Horizontal"
 
-#: ../clutter/clutter-deform-effect.c:595
+#: ../clutter/clutter-deform-effect.c:593
 msgid "The number of horizontal tiles"
 msgstr "O número de mosaicos na horizontal"
 
-#: ../clutter/clutter-deform-effect.c:610
+#: ../clutter/clutter-deform-effect.c:608
 msgid "Vertical Tiles"
 msgstr "Mosaico Vertical"
 
-#: ../clutter/clutter-deform-effect.c:611
+#: ../clutter/clutter-deform-effect.c:609
 msgid "The number of vertical tiles"
 msgstr "O número de mosaicos na vertical"
 
-#: ../clutter/clutter-deform-effect.c:628
+#: ../clutter/clutter-deform-effect.c:626
 msgid "Back Material"
 msgstr "Material de Fundo"
 
-#: ../clutter/clutter-deform-effect.c:629
+#: ../clutter/clutter-deform-effect.c:627
 msgid "The material to be used when painting the back of the actor"
 msgstr "O material a utilizar ao pintar o fundo do ator"
 
@@ -1007,260 +1037,298 @@ msgstr "O material a utilizar ao pintar o fundo do ator"
 msgid "The desaturation factor"
 msgstr "O fator de des-saturação"
 
-#: ../clutter/clutter-device-manager.c:131
-#: ../clutter/clutter-input-device.c:366
-#: ../clutter/x11/clutter-keymap-x11.c:321
+#: ../clutter/clutter-device-manager.c:127
+#: ../clutter/clutter-input-device.c:355
+#: ../clutter/x11/clutter-keymap-x11.c:457
 msgid "Backend"
 msgstr "Motor"
 
-#: ../clutter/clutter-device-manager.c:132
+#: ../clutter/clutter-device-manager.c:128
 msgid "The ClutterBackend of the device manager"
 msgstr "O ClutterBackend do gestor de dispositivos"
 
-#: ../clutter/clutter-drag-action.c:742
+#: ../clutter/clutter-drag-action.c:741
 msgid "Horizontal Drag Threshold"
 msgstr "Tolerância do Arrastamento Horizontal"
 
-#: ../clutter/clutter-drag-action.c:743
+#: ../clutter/clutter-drag-action.c:742
 msgid "The horizontal amount of pixels required to start dragging"
 msgstr ""
 "A quantidade de pixels necessários na horizontal para se iniciar o arrasto"
 
-#: ../clutter/clutter-drag-action.c:770
+#: ../clutter/clutter-drag-action.c:769
 msgid "Vertical Drag Threshold"
 msgstr "Tolerância do Arrastamento Vertical"
 
-#: ../clutter/clutter-drag-action.c:771
+#: ../clutter/clutter-drag-action.c:770
 msgid "The vertical amount of pixels required to start dragging"
 msgstr ""
 "A quantidade de pixels necessários na vertical para se iniciar o arrasto"
 
-#: ../clutter/clutter-drag-action.c:792
+#: ../clutter/clutter-drag-action.c:791
 msgid "Drag Handle"
 msgstr "Manípulo de Arrasto"
 
-#: ../clutter/clutter-drag-action.c:793
+#: ../clutter/clutter-drag-action.c:792
 msgid "The actor that is being dragged"
 msgstr "O ator que está a ser arrastado"
 
-#: ../clutter/clutter-drag-action.c:806
+#: ../clutter/clutter-drag-action.c:805
 msgid "Drag Axis"
 msgstr "Eixo de Arrasto"
 
-#: ../clutter/clutter-drag-action.c:807
+#: ../clutter/clutter-drag-action.c:806
 msgid "Constraints the dragging to an axis"
 msgstr "Restringe o arrastamento a um eixo"
 
-#: ../clutter/clutter-drag-action.c:823
+#: ../clutter/clutter-drag-action.c:822
 msgid "Drag Area"
 msgstr "Área de Arrasto"
 
-#: ../clutter/clutter-drag-action.c:824
+#: ../clutter/clutter-drag-action.c:823
 msgid "Constrains the dragging to a rectangle"
 msgstr "Restringe o arrastamento a um retângulo"
 
-#: ../clutter/clutter-drag-action.c:837
+#: ../clutter/clutter-drag-action.c:836
 msgid "Drag Area Set"
 msgstr "Área de Arrasto Definida"
 
-#: ../clutter/clutter-drag-action.c:838
+#: ../clutter/clutter-drag-action.c:837
 msgid "Whether the drag area is set"
 msgstr "Se a área de arrasto está ou não definida"
 
-#: ../clutter/clutter-flow-layout.c:907
+#: ../clutter/clutter-flow-layout.c:959
 msgid "Whether each item should receive the same allocation"
 msgstr "Se cada item deverá ou não receber a mesma alocação"
 
-#: ../clutter/clutter-flow-layout.c:922 ../clutter/clutter-table-layout.c:1637
+#: ../clutter/clutter-flow-layout.c:974
+#: ../clutter/deprecated/clutter-table-layout.c:1637
 msgid "Column Spacing"
 msgstr "Espaçamento de Coluna"
 
-#: ../clutter/clutter-flow-layout.c:923
+#: ../clutter/clutter-flow-layout.c:975
 msgid "The spacing between columns"
 msgstr "O espaçamento entre colunas"
 
-#: ../clutter/clutter-flow-layout.c:939 ../clutter/clutter-table-layout.c:1651
+#: ../clutter/clutter-flow-layout.c:991
+#: ../clutter/deprecated/clutter-table-layout.c:1653
 msgid "Row Spacing"
 msgstr "Espaçamento de Linha"
 
-#: ../clutter/clutter-flow-layout.c:940
+#: ../clutter/clutter-flow-layout.c:992
 msgid "The spacing between rows"
 msgstr "O espaçamento entre linhas"
 
-#: ../clutter/clutter-flow-layout.c:954
+#: ../clutter/clutter-flow-layout.c:1006
 msgid "Minimum Column Width"
 msgstr "Largura Mínima da Coluna"
 
-#: ../clutter/clutter-flow-layout.c:955
+#: ../clutter/clutter-flow-layout.c:1007
 msgid "Minimum width for each column"
 msgstr "Largura mínima para cada coluna"
 
-#: ../clutter/clutter-flow-layout.c:970
+#: ../clutter/clutter-flow-layout.c:1022
 msgid "Maximum Column Width"
 msgstr "Largura Máxima da Coluna"
 
-#: ../clutter/clutter-flow-layout.c:971
+#: ../clutter/clutter-flow-layout.c:1023
 msgid "Maximum width for each column"
 msgstr "Largura máxima para cada coluna"
 
-#: ../clutter/clutter-flow-layout.c:985
+#: ../clutter/clutter-flow-layout.c:1037
 msgid "Minimum Row Height"
 msgstr "Altura Mínima da Linha"
 
-#: ../clutter/clutter-flow-layout.c:986
+#: ../clutter/clutter-flow-layout.c:1038
 msgid "Minimum height for each row"
 msgstr "Altura mínima para cada linha"
 
-#: ../clutter/clutter-flow-layout.c:1001
+#: ../clutter/clutter-flow-layout.c:1053
 msgid "Maximum Row Height"
 msgstr "Altura Máxima da Linha"
 
-#: ../clutter/clutter-flow-layout.c:1002
+#: ../clutter/clutter-flow-layout.c:1054
 msgid "Maximum height for each row"
 msgstr "Altura máxima para cada linha"
 
-#: ../clutter/clutter-grid-layout.c:1222
+#: ../clutter/clutter-flow-layout.c:1069 ../clutter/clutter-flow-layout.c:1070
+msgid "Snap to grid"
+msgstr "Ajustar à grelha"
+
+#: ../clutter/clutter-gesture-action.c:668
+msgid "Number touch points"
+msgstr "Número de pontos de contato"
+
+#: ../clutter/clutter-gesture-action.c:669
+msgid "Number of touch points"
+msgstr "Número de pontos de contato"
+
+#: ../clutter/clutter-gesture-action.c:684
+msgid "Threshold Trigger Edge"
+msgstr "Intervalo do Limite de Disparo"
+
+#: ../clutter/clutter-gesture-action.c:685
+msgid "The trigger edge used by the action"
+msgstr "O limite de disparo utilizado pela ação"
+
+#: ../clutter/clutter-gesture-action.c:704
+msgid "Threshold Trigger Horizontal Distance"
+msgstr "Distância Horizontal do Intervalo de Disparo"
+
+#: ../clutter/clutter-gesture-action.c:705
+msgid "The horizontal trigger distance used by the action"
+msgstr "A distância horizontal de disparo utilizada pela animação"
+
+#: ../clutter/clutter-gesture-action.c:723
+msgid "Threshold Trigger Vertical Distance"
+msgstr "Distância Vertical do Intervalo de Disparo"
+
+#: ../clutter/clutter-gesture-action.c:724
+msgid "The vertical trigger distance used by the action"
+msgstr "A distância vertical de disparo utilizada pela animação"
+
+#: ../clutter/clutter-grid-layout.c:1223
 msgid "Left attachment"
 msgstr "Anexar o esquerdo"
 
-#: ../clutter/clutter-grid-layout.c:1223
+#: ../clutter/clutter-grid-layout.c:1224
 msgid "The column number to attach the left side of the child to"
 msgstr "O número da coluna à qual anexar o lado esquerdo do filho"
 
-#: ../clutter/clutter-grid-layout.c:1230
+#: ../clutter/clutter-grid-layout.c:1231
 msgid "Top attachment"
 msgstr "Anexar o topo"
 
-#: ../clutter/clutter-grid-layout.c:1231
+#: ../clutter/clutter-grid-layout.c:1232
 msgid "The row number to attach the top side of a child widget to"
 msgstr "O número da linha à qual anexar o lado superior do widget filho"
 
-#: ../clutter/clutter-grid-layout.c:1239
+#: ../clutter/clutter-grid-layout.c:1240
 msgid "The number of columns that a child spans"
 msgstr "O número de colunas pelo qual o filho se estende"
 
-#: ../clutter/clutter-grid-layout.c:1246
+#: ../clutter/clutter-grid-layout.c:1247
 msgid "The number of rows that a child spans"
 msgstr "O número de linhas pelo qual o filho se estende"
 
-#: ../clutter/clutter-grid-layout.c:1565
+#: ../clutter/clutter-grid-layout.c:1564
 msgid "Row spacing"
 msgstr "Espaçamento de linha"
 
-#: ../clutter/clutter-grid-layout.c:1566
+#: ../clutter/clutter-grid-layout.c:1565
 msgid "The amount of space between two consecutive rows"
 msgstr "A quantidade de espaço entre duas linhas consecutivas"
 
-#: ../clutter/clutter-grid-layout.c:1579
+#: ../clutter/clutter-grid-layout.c:1578
 msgid "Column spacing"
 msgstr "Espaçamento de coluna"
 
-#: ../clutter/clutter-grid-layout.c:1580
+#: ../clutter/clutter-grid-layout.c:1579
 msgid "The amount of space between two consecutive columns"
 msgstr "A quantidade de espaço entre duas colunas consecutivas"
 
-#: ../clutter/clutter-grid-layout.c:1594
+#: ../clutter/clutter-grid-layout.c:1593
 msgid "Row Homogeneous"
 msgstr "Linha Homogénea"
 
-#: ../clutter/clutter-grid-layout.c:1595
+#: ../clutter/clutter-grid-layout.c:1594
 msgid "If TRUE, the rows are all the same height"
 msgstr "Se VERDADEIRO, as linhas têm todas a mesma altura"
 
-#: ../clutter/clutter-grid-layout.c:1608
+#: ../clutter/clutter-grid-layout.c:1607
 msgid "Column Homogeneous"
 msgstr "Coluna Homogénea"
 
-#: ../clutter/clutter-grid-layout.c:1609
+#: ../clutter/clutter-grid-layout.c:1608
 msgid "If TRUE, the columns are all the same width"
 msgstr "Se VERDADEIRO, as colunas têm todas a mesma largura"
 
-#: ../clutter/clutter-image.c:248 ../clutter/clutter-image.c:311
-#: ../clutter/clutter-image.c:399
+#: ../clutter/clutter-image.c:249 ../clutter/clutter-image.c:312
+#: ../clutter/clutter-image.c:400
 msgid "Unable to load image data"
 msgstr "Incapaz de ler os dados da imagem"
 
-#: ../clutter/clutter-input-device.c:242
+#: ../clutter/clutter-input-device.c:231
 msgid "Id"
 msgstr "Id"
 
-#: ../clutter/clutter-input-device.c:243
+#: ../clutter/clutter-input-device.c:232
 msgid "Unique identifier of the device"
 msgstr "Identificador único do dispositivo"
 
-#: ../clutter/clutter-input-device.c:259
+#: ../clutter/clutter-input-device.c:248
 msgid "The name of the device"
 msgstr "O nome do dispositivo"
 
-#: ../clutter/clutter-input-device.c:273
+#: ../clutter/clutter-input-device.c:262
 msgid "Device Type"
 msgstr "Tipo de Dispositivo"
 
-#: ../clutter/clutter-input-device.c:274
+#: ../clutter/clutter-input-device.c:263
 msgid "The type of the device"
 msgstr "O tipo do dispositivo"
 
-#: ../clutter/clutter-input-device.c:289
+#: ../clutter/clutter-input-device.c:278
 msgid "Device Manager"
 msgstr "Gestor de Dispositivos"
 
-#: ../clutter/clutter-input-device.c:290
+#: ../clutter/clutter-input-device.c:279
 msgid "The device manager instance"
 msgstr "A instância do gestor de dispositivos"
 
-#: ../clutter/clutter-input-device.c:303
+#: ../clutter/clutter-input-device.c:292
 msgid "Device Mode"
 msgstr "Modo do Dispositivo"
 
-#: ../clutter/clutter-input-device.c:304
+#: ../clutter/clutter-input-device.c:293
 msgid "The mode of the device"
 msgstr "O modo do dispositivo"
 
-#: ../clutter/clutter-input-device.c:318
+#: ../clutter/clutter-input-device.c:307
 msgid "Has Cursor"
 msgstr "Tem Cursor"
 
-#: ../clutter/clutter-input-device.c:319
+#: ../clutter/clutter-input-device.c:308
 msgid "Whether the device has a cursor"
 msgstr "Se o dispositivo tem ou não um cursor"
 
-#: ../clutter/clutter-input-device.c:338
+#: ../clutter/clutter-input-device.c:327
 msgid "Whether the device is enabled"
 msgstr "Se o dispositivo está ou não ativo"
 
-#: ../clutter/clutter-input-device.c:351
+#: ../clutter/clutter-input-device.c:340
 msgid "Number of Axes"
 msgstr "Número de Eixos"
 
-#: ../clutter/clutter-input-device.c:352
+#: ../clutter/clutter-input-device.c:341
 msgid "The number of axes on the device"
 msgstr "O número de eixos no dispositivo"
 
-#: ../clutter/clutter-input-device.c:367
+#: ../clutter/clutter-input-device.c:356
 msgid "The backend instance"
 msgstr "A instância de motor"
 
-#: ../clutter/clutter-interval.c:506
+#: ../clutter/clutter-interval.c:553
 msgid "Value Type"
 msgstr "Tipo de Valor"
 
-#: ../clutter/clutter-interval.c:507
+#: ../clutter/clutter-interval.c:554
 msgid "The type of the values in the interval"
 msgstr "O tipo de valores no intervalo"
 
-#: ../clutter/clutter-interval.c:522
+#: ../clutter/clutter-interval.c:569
 msgid "Initial Value"
 msgstr "Valor Inicial"
 
-#: ../clutter/clutter-interval.c:523
+#: ../clutter/clutter-interval.c:570
 msgid "Initial value of the interval"
 msgstr "Valor inicial do intervalo"
 
-#: ../clutter/clutter-interval.c:537
+#: ../clutter/clutter-interval.c:584
 msgid "Final Value"
 msgstr "Valor Final"
 
-#: ../clutter/clutter-interval.c:538
+#: ../clutter/clutter-interval.c:585
 msgid "Final value of the interval"
 msgstr "Valor final do intervalo"
 
@@ -1283,92 +1351,92 @@ msgstr "O gestor que criou estes dados"
 msgid "default:LTR"
 msgstr "default:LTR"
 
-#: ../clutter/clutter-main.c:1669
+#: ../clutter/clutter-main.c:1622
 msgid "Show frames per second"
 msgstr "Apresentar fotogramas por segundo"
 
-#: ../clutter/clutter-main.c:1671
+#: ../clutter/clutter-main.c:1624
 msgid "Default frame rate"
 msgstr "Taxa de fotogramas por omissão"
 
-#: ../clutter/clutter-main.c:1673
+#: ../clutter/clutter-main.c:1626
 msgid "Make all warnings fatal"
 msgstr "Tornar todos os avisos em erros fatais"
 
-#: ../clutter/clutter-main.c:1676
+#: ../clutter/clutter-main.c:1629
 msgid "Direction for the text"
 msgstr "Direção do texto"
 
-#: ../clutter/clutter-main.c:1679
+#: ../clutter/clutter-main.c:1632
 msgid "Disable mipmapping on text"
 msgstr "Desativar 'mipmapping' no texto"
 
-#: ../clutter/clutter-main.c:1682
+#: ../clutter/clutter-main.c:1635
 msgid "Use 'fuzzy' picking"
 msgstr "Utilizar seleção 'fuzzy'"
 
-#: ../clutter/clutter-main.c:1685
+#: ../clutter/clutter-main.c:1638
 msgid "Clutter debugging flags to set"
 msgstr "Parâmetros de depuração Clutter a definir"
 
-#: ../clutter/clutter-main.c:1687
+#: ../clutter/clutter-main.c:1640
 msgid "Clutter debugging flags to unset"
 msgstr "Parâmetros de depuração Clutter a desativar"
 
-#: ../clutter/clutter-main.c:1691
+#: ../clutter/clutter-main.c:1644
 msgid "Clutter profiling flags to set"
 msgstr "Parâmetros de análise de desempenho Clutter a definir"
 
-#: ../clutter/clutter-main.c:1693
+#: ../clutter/clutter-main.c:1646
 msgid "Clutter profiling flags to unset"
 msgstr "Parâmetros de análise de desempenho Clutter a desativar"
 
-#: ../clutter/clutter-main.c:1696
+#: ../clutter/clutter-main.c:1649
 msgid "Enable accessibility"
 msgstr "Ativar acessibilidade"
 
-#: ../clutter/clutter-main.c:1888
+#: ../clutter/clutter-main.c:1841
 msgid "Clutter Options"
 msgstr "Opções do Clutter"
 
-#: ../clutter/clutter-main.c:1889
+#: ../clutter/clutter-main.c:1842
 msgid "Show Clutter Options"
 msgstr "Apresentar Opções do Clutter"
 
-#: ../clutter/clutter-pan-action.c:448
+#: ../clutter/clutter-pan-action.c:455
 msgid "Pan Axis"
 msgstr "Eixo de Panorâmica"
 
-#: ../clutter/clutter-pan-action.c:449
+#: ../clutter/clutter-pan-action.c:456
 msgid "Constraints the panning to an axis"
 msgstr "Restringe a panorâmica a um eixo"
 
-#: ../clutter/clutter-pan-action.c:463
+#: ../clutter/clutter-pan-action.c:470
 msgid "Interpolate"
 msgstr "Interpolar"
 
-#: ../clutter/clutter-pan-action.c:464
+#: ../clutter/clutter-pan-action.c:471
 msgid "Whether interpolated events emission is enabled."
 msgstr "Se a emissão de eventos de interpolação está ou não ativa."
 
-#: ../clutter/clutter-pan-action.c:480
+#: ../clutter/clutter-pan-action.c:487
 msgid "Deceleration"
 msgstr "Desaceleração"
 
-#: ../clutter/clutter-pan-action.c:481
+#: ../clutter/clutter-pan-action.c:488
 msgid "Rate at which the interpolated panning will decelerate in"
 msgstr "Rácio a que a panorâmica de interpolação irá desacelerar"
 
-#: ../clutter/clutter-pan-action.c:498
+#: ../clutter/clutter-pan-action.c:505
 msgid "Initial acceleration factor"
 msgstr "Fator inicial de aceleração"
 
-#: ../clutter/clutter-pan-action.c:499
+#: ../clutter/clutter-pan-action.c:506
 msgid "Factor applied to the momentum when starting the interpolated phase"
 msgstr "Fator aplicado ao momentum ao iniciar a fase de interpolação"
 
 #: ../clutter/clutter-path-constraint.c:212
-#: ../clutter/deprecated/clutter-behaviour-path.c:225
+#: ../clutter/deprecated/clutter-behaviour-path.c:221
 msgid "Path"
 msgstr "Caminho"
 
@@ -1380,86 +1448,86 @@ msgstr "O caminho utilizado para restringir um ator"
 msgid "The offset along the path, between -1.0 and 2.0"
 msgstr "O deslocamento ao longo do caminho, entre -1.0 e 2.0"
 
-#: ../clutter/clutter-property-transition.c:271
+#: ../clutter/clutter-property-transition.c:269
 msgid "Property Name"
 msgstr "Nome da Propriedade"
 
-#: ../clutter/clutter-property-transition.c:272
+#: ../clutter/clutter-property-transition.c:270
 msgid "The name of the property to animate"
 msgstr "O nome da propriedade a animar"
 
-#: ../clutter/clutter-script.c:466
+#: ../clutter/clutter-script.c:464
 msgid "Filename Set"
 msgstr "Ficheiro Definido"
 
-#: ../clutter/clutter-script.c:467
+#: ../clutter/clutter-script.c:465
 msgid "Whether the :filename property is set"
 msgstr "Se a propriedade :filename está ou não definida"
 
-#: ../clutter/clutter-script.c:481
-#: ../clutter/deprecated/clutter-texture.c:1082
+#: ../clutter/clutter-script.c:479
+#: ../clutter/deprecated/clutter-texture.c:1080
 msgid "Filename"
 msgstr "Ficheiro"
 
-#: ../clutter/clutter-script.c:482
+#: ../clutter/clutter-script.c:480
 msgid "The path of the currently parsed file"
 msgstr "O caminho do ficheiro atualmente processado"
 
-#: ../clutter/clutter-script.c:499
+#: ../clutter/clutter-script.c:497
 msgid "Translation Domain"
 msgstr "Domínio da Tradução"
 
-#: ../clutter/clutter-script.c:500
+#: ../clutter/clutter-script.c:498
 msgid "The translation domain used to localize string"
 msgstr "O domínio da tradução utilizada para localizar a expressão"
 
-#: ../clutter/clutter-scroll-actor.c:190
+#: ../clutter/clutter-scroll-actor.c:189
 msgid "Scroll Mode"
 msgstr "Modo de Rolamento"
 
-#: ../clutter/clutter-scroll-actor.c:191
+#: ../clutter/clutter-scroll-actor.c:190
 msgid "The scrolling direction"
 msgstr "A direção do rolamento"
 
-#: ../clutter/clutter-settings.c:448
+#: ../clutter/clutter-settings.c:486
 msgid "Double Click Time"
 msgstr "Tempo de Clique-Duplo"
 
-#: ../clutter/clutter-settings.c:449
+#: ../clutter/clutter-settings.c:487
 msgid "The time between clicks necessary to detect a multiple click"
 msgstr "O tempo entre cliques necessário para detetar um clique múltiplo"
 
-#: ../clutter/clutter-settings.c:464
+#: ../clutter/clutter-settings.c:502
 msgid "Double Click Distance"
 msgstr "Distância de Clique-Duplo"
 
-#: ../clutter/clutter-settings.c:465
+#: ../clutter/clutter-settings.c:503
 msgid "The distance between clicks necessary to detect a multiple click"
 msgstr "A distância entre cliques necessária para detetar um clique múltiplo"
 
-#: ../clutter/clutter-settings.c:480
+#: ../clutter/clutter-settings.c:518
 msgid "Drag Threshold"
 msgstr "Tolerância de Arrasto"
 
-#: ../clutter/clutter-settings.c:481
+#: ../clutter/clutter-settings.c:519
 msgid "The distance the cursor should travel before starting to drag"
 msgstr "A distância que o cursor terá de percorrer para se iniciar o arrasto"
 
-#: ../clutter/clutter-settings.c:496 ../clutter/clutter-text.c:3367
+#: ../clutter/clutter-settings.c:534 ../clutter/clutter-text.c:3437
 msgid "Font Name"
 msgstr "Nome de Fonte"
 
-#: ../clutter/clutter-settings.c:497
+#: ../clutter/clutter-settings.c:535
 msgid ""
 "The description of the default font, as one that could be parsed by Pango"
 msgstr ""
 "A descrição da fonte por omissão, de forma a poder ser processada pelo Pango"
 
-#: ../clutter/clutter-settings.c:512
+#: ../clutter/clutter-settings.c:550
 msgid "Font Antialias"
 msgstr "Antialias de Fonte"
 
-#: ../clutter/clutter-settings.c:513
+#: ../clutter/clutter-settings.c:551
 msgid ""
 "Whether to use antialiasing (1 to enable, 0 to disable, and -1 to use the "
 "default)"
@@ -1467,76 +1535,84 @@ msgstr ""
 "Se realizar ou não antialias (1 para ativar, 0 para desativar e -1 para "
 "utilizar a omissão)"
 
-#: ../clutter/clutter-settings.c:529
+#: ../clutter/clutter-settings.c:567 ../clutter/clutter-settings.c:575
 msgid "Font DPI"
 msgstr "DPI de Fonte"
 
-#: ../clutter/clutter-settings.c:530
+#: ../clutter/clutter-settings.c:568 ../clutter/clutter-settings.c:576
 msgid ""
 "The resolution of the font, in 1024 * dots/inch, or -1 to use the default"
 msgstr ""
 "A resolução da fonte, em 1024 * pontos/polegada ou -1 para utilizar o valor "
 "por omissão"
 
-#: ../clutter/clutter-settings.c:546
+#: ../clutter/clutter-settings.c:592
 msgid "Font Hinting"
 msgstr "Dicas de Fonte"
 
-#: ../clutter/clutter-settings.c:547
+#: ../clutter/clutter-settings.c:593
 msgid ""
 "Whether to use hinting (1 to enable, 0 to disable and -1 to use the default)"
 msgstr ""
 "Se utilizar ou não dicas (1 para ativar, 0 para desativar e -1 para utilizar "
 "o valor por omissão)"
 
-#: ../clutter/clutter-settings.c:568
+#: ../clutter/clutter-settings.c:614
 msgid "Font Hint Style"
 msgstr "Estilo de Dicas de Fonte"
 
-#: ../clutter/clutter-settings.c:569
+#: ../clutter/clutter-settings.c:615
 msgid "The style of hinting (hintnone, hintslight, hintmedium, hintfull)"
 msgstr ""
 "O estilo de dicas (\"hintnone\", \"hintslight\", \"hintmedium\", ou "
 "\"hintfull\")"
 
-#: ../clutter/clutter-settings.c:590
+#: ../clutter/clutter-settings.c:636
 msgid "Font Subpixel Order"
 msgstr "Ordem de Subpixel de Fonte"
 
-#: ../clutter/clutter-settings.c:591
+#: ../clutter/clutter-settings.c:637
 msgid "The type of subpixel antialiasing (none, rgb, bgr, vrgb, vbgr)"
 msgstr ""
 "O tipo de antialias de subpixel (\"none\", \"rgb\", \"bgr\", \"vfrg\", \"vbgr"
 "\")"
 
-#: ../clutter/clutter-settings.c:608
+#: ../clutter/clutter-settings.c:654
 msgid "The minimum duration for a long press gesture to be recognized"
 msgstr ""
 "A duração mínima de uma pressão longa para que o gesto seja reconhecido"
 
-#: ../clutter/clutter-settings.c:615
+#: ../clutter/clutter-settings.c:661
+msgid "Window Scaling Factor"
+msgstr "Fator de Escala da Janela"
+
+#: ../clutter/clutter-settings.c:662
+msgid "The scaling factor to be applied to windows"
+msgstr "O fator de escala a ser aplicado às janelas"
+
+#: ../clutter/clutter-settings.c:669
 msgid "Fontconfig configuration timestamp"
 msgstr "Data da configuração do fontconfig"
 
-#: ../clutter/clutter-settings.c:616
+#: ../clutter/clutter-settings.c:670
 msgid "Timestamp of the current fontconfig configuration"
 msgstr "Data e hora da configuração atual do fontconfig"
 
-#: ../clutter/clutter-settings.c:633
+#: ../clutter/clutter-settings.c:687
 msgid "Password Hint Time"
 msgstr "Duração da Dica de Senha"
 
-#: ../clutter/clutter-settings.c:634
+#: ../clutter/clutter-settings.c:688
 msgid "How long to show the last input character in hidden entries"
 msgstr ""
 "Durante quanto tempo apresentar o último caracter introduzido em entradas "
 "ocultas"
 
-#: ../clutter/clutter-shader-effect.c:486
+#: ../clutter/clutter-shader-effect.c:485
 msgid "Shader Type"
 msgstr "Tipo de Sombreamento"
 
-#: ../clutter/clutter-shader-effect.c:487
+#: ../clutter/clutter-shader-effect.c:486
 msgid "The type of shader used"
 msgstr "O tipo de sombreamento utilizado"
 
@@ -1564,760 +1640,704 @@ msgstr "A margem da origem que deverá ser encostada"
 msgid "The offset in pixels to apply to the constraint"
 msgstr "O deslocamento em pixels a aplicar à restrição"
 
-#: ../clutter/clutter-stage.c:1929
+#: ../clutter/clutter-stage.c:1899
 msgid "Fullscreen Set"
 msgstr "Ecrã Completo Definido"
 
-#: ../clutter/clutter-stage.c:1930
+#: ../clutter/clutter-stage.c:1900
 msgid "Whether the main stage is fullscreen"
 msgstr "Se o palco principal está em ecrã completo ou não"
 
-#: ../clutter/clutter-stage.c:1944
+#: ../clutter/clutter-stage.c:1914
 msgid "Offscreen"
 msgstr "Fora do Ecrã"
 
-#: ../clutter/clutter-stage.c:1945
+#: ../clutter/clutter-stage.c:1915
 msgid "Whether the main stage should be rendered offscreen"
 msgstr "Se o palco principal deverá ou não ser renderizado fora do ecrã"
 
-#: ../clutter/clutter-stage.c:1957 ../clutter/clutter-text.c:3481
+#: ../clutter/clutter-stage.c:1927 ../clutter/clutter-text.c:3551
 msgid "Cursor Visible"
 msgstr "Cursor Visível"
 
-#: ../clutter/clutter-stage.c:1958
+#: ../clutter/clutter-stage.c:1928
 msgid "Whether the mouse pointer is visible on the main stage"
 msgstr "Se o ponteiro do rato é ou não visível no palco principal"
 
-#: ../clutter/clutter-stage.c:1972
+#: ../clutter/clutter-stage.c:1942
 msgid "User Resizable"
 msgstr "Redimensionável pelo Utilizador"
 
-#: ../clutter/clutter-stage.c:1973
+#: ../clutter/clutter-stage.c:1943
 msgid "Whether the stage is able to be resized via user interaction"
 msgstr "Se o palco pode ou não ser redimensionado por ação do utilizador"
 
-#: ../clutter/clutter-stage.c:1988 ../clutter/deprecated/clutter-box.c:260
-#: ../clutter/deprecated/clutter-rectangle.c:273
+#: ../clutter/clutter-stage.c:1958 ../clutter/deprecated/clutter-box.c:256
+#: ../clutter/deprecated/clutter-rectangle.c:270
 msgid "Color"
 msgstr "Cor"
 
-#: ../clutter/clutter-stage.c:1989
+#: ../clutter/clutter-stage.c:1959
 msgid "The color of the stage"
 msgstr "A cor do palco"
 
-#: ../clutter/clutter-stage.c:2004
+#: ../clutter/clutter-stage.c:1974
 msgid "Perspective"
 msgstr "Perspetiva"
 
-#: ../clutter/clutter-stage.c:2005
+#: ../clutter/clutter-stage.c:1975
 msgid "Perspective projection parameters"
 msgstr "Parâmetros de projeção da perspetiva"
 
-#: ../clutter/clutter-stage.c:2020
+#: ../clutter/clutter-stage.c:1990
 msgid "Title"
 msgstr "Título"
 
-#: ../clutter/clutter-stage.c:2021
+#: ../clutter/clutter-stage.c:1991
 msgid "Stage Title"
 msgstr "Título do Palco"
 
-#: ../clutter/clutter-stage.c:2038
+#: ../clutter/clutter-stage.c:2008
 msgid "Use Fog"
 msgstr "Utilizar Nevoeiro"
 
-#: ../clutter/clutter-stage.c:2039
+#: ../clutter/clutter-stage.c:2009
 msgid "Whether to enable depth cueing"
 msgstr "Se ativar ou não fila de profundidade"
 
-#: ../clutter/clutter-stage.c:2055
+#: ../clutter/clutter-stage.c:2025
 msgid "Fog"
 msgstr "Nevoeiro"
 
-#: ../clutter/clutter-stage.c:2056
+#: ../clutter/clutter-stage.c:2026
 msgid "Settings for the depth cueing"
 msgstr "Definições para a fila de profundidade"
 
-#: ../clutter/clutter-stage.c:2072
+#: ../clutter/clutter-stage.c:2042
 msgid "Use Alpha"
 msgstr "Utilizar Alfa"
 
-#: ../clutter/clutter-stage.c:2073
+#: ../clutter/clutter-stage.c:2043
 msgid "Whether to honour the alpha component of the stage color"
 msgstr "Se honrar ou não o componente alfa da cor de palco"
 
-#: ../clutter/clutter-stage.c:2089
+#: ../clutter/clutter-stage.c:2059
 msgid "Key Focus"
 msgstr "Foco da Tecla"
 
-#: ../clutter/clutter-stage.c:2090
+#: ../clutter/clutter-stage.c:2060
 msgid "The currently key focused actor"
 msgstr "O ator com o foco de tecla atual"
 
-#: ../clutter/clutter-stage.c:2106
+#: ../clutter/clutter-stage.c:2076
 msgid "No Clear Hint"
 msgstr "Dica de Não Limpar"
 
-#: ../clutter/clutter-stage.c:2107
+#: ../clutter/clutter-stage.c:2077
 msgid "Whether the stage should clear its contents"
 msgstr "Se o palco deverá ou não limpar o seu conteúdo"
 
-#: ../clutter/clutter-stage.c:2120
+#: ../clutter/clutter-stage.c:2090
 msgid "Accept Focus"
 msgstr "Aceitar Foco"
 
-#: ../clutter/clutter-stage.c:2121
+#: ../clutter/clutter-stage.c:2091
 msgid "Whether the stage should accept focus on show"
 msgstr "Se o palco deverá ou não aceitar o foco ao apresentar"
 
-#: ../clutter/clutter-table-layout.c:543
-msgid "Column Number"
-msgstr "Número da Coluna"
-
-#: ../clutter/clutter-table-layout.c:544
-msgid "The column the widget resides in"
-msgstr "A coluna em que o widget reside"
-
-#: ../clutter/clutter-table-layout.c:551
-msgid "Row Number"
-msgstr "Número de Linha"
-
-#: ../clutter/clutter-table-layout.c:552
-msgid "The row the widget resides in"
-msgstr "A linha em que o widget reside"
-
-#: ../clutter/clutter-table-layout.c:559
-msgid "Column Span"
-msgstr "Expansão da Coluna"
-
-#: ../clutter/clutter-table-layout.c:560
-msgid "The number of columns the widget should span"
-msgstr "O número de colunas pelo qual o widget se estende"
-
-#: ../clutter/clutter-table-layout.c:567
-msgid "Row Span"
-msgstr "Expansão da Linha"
-
-#: ../clutter/clutter-table-layout.c:568
-msgid "The number of rows the widget should span"
-msgstr "O número de linhas pelo qual o widget se estende"
-
-#: ../clutter/clutter-table-layout.c:575
-msgid "Horizontal Expand"
-msgstr "Expansão Horizontal"
-
-#: ../clutter/clutter-table-layout.c:576
-msgid "Allocate extra space for the child in horizontal axis"
-msgstr "Alocar espaço extra no eixo horizontal para o filho"
-
-#: ../clutter/clutter-table-layout.c:582
-msgid "Vertical Expand"
-msgstr "Expansão Vertical"
-
-#: ../clutter/clutter-table-layout.c:583
-msgid "Allocate extra space for the child in vertical axis"
-msgstr "Alocar espaço extra no eixo vertical para o filho"
-
-#: ../clutter/clutter-table-layout.c:1638
-msgid "Spacing between columns"
-msgstr "Espaçamento entre colunas"
-
-#: ../clutter/clutter-table-layout.c:1652
-msgid "Spacing between rows"
-msgstr "Espaçamento entre linhas"
-
-#: ../clutter/clutter-text-buffer.c:351 ../clutter/clutter-text.c:3402
+#: ../clutter/clutter-text-buffer.c:347 ../clutter/clutter-text.c:3472
 msgid "Text"
 msgstr "Texto"
 
-#: ../clutter/clutter-text-buffer.c:352
+#: ../clutter/clutter-text-buffer.c:348
 msgid "The contents of the buffer"
 msgstr "O conteúdo do buffer"
 
-#: ../clutter/clutter-text-buffer.c:365
+#: ../clutter/clutter-text-buffer.c:361
 msgid "Text length"
 msgstr "Comprimento do texto"
 
-#: ../clutter/clutter-text-buffer.c:366
+#: ../clutter/clutter-text-buffer.c:362
 msgid "Length of the text currently in the buffer"
 msgstr "O comprimento do texto atualmente no buffer"
 
-#: ../clutter/clutter-text-buffer.c:379
+#: ../clutter/clutter-text-buffer.c:375
 msgid "Maximum length"
 msgstr "Comprimento máximo"
 
-#: ../clutter/clutter-text-buffer.c:380
+#: ../clutter/clutter-text-buffer.c:376
 msgid "Maximum number of characters for this entry. Zero if no maximum"
 msgstr "Número máximo de carateres para esta entrada. Zero se nenhum limite"
 
-#: ../clutter/clutter-text.c:3349
+#: ../clutter/clutter-text.c:3419
 msgid "Buffer"
 msgstr "Buffer"
 
-#: ../clutter/clutter-text.c:3350
+#: ../clutter/clutter-text.c:3420
 msgid "The buffer for the text"
 msgstr "O buffer do texto"
 
-#: ../clutter/clutter-text.c:3368
+#: ../clutter/clutter-text.c:3438
 msgid "The font to be used by the text"
 msgstr "A fonte a ser utilizada pelo texto"
 
-#: ../clutter/clutter-text.c:3385
+#: ../clutter/clutter-text.c:3455
 msgid "Font Description"
 msgstr "Descrição de Fonte"
 
-#: ../clutter/clutter-text.c:3386
+#: ../clutter/clutter-text.c:3456
 msgid "The font description to be used"
 msgstr "A descrição de fonte a ser utilizada"
 
-#: ../clutter/clutter-text.c:3403
+#: ../clutter/clutter-text.c:3473
 msgid "The text to render"
 msgstr "O texto a renderizar"
 
-#: ../clutter/clutter-text.c:3417
+#: ../clutter/clutter-text.c:3487
 msgid "Font Color"
 msgstr "Cor da Fonte"
 
-#: ../clutter/clutter-text.c:3418
+#: ../clutter/clutter-text.c:3488
 msgid "Color of the font used by the text"
 msgstr "Cor da fonte a ser utilizada pelo texto"
 
-#: ../clutter/clutter-text.c:3433
+#: ../clutter/clutter-text.c:3503
 msgid "Editable"
 msgstr "Editável"
 
-#: ../clutter/clutter-text.c:3434
+#: ../clutter/clutter-text.c:3504
 msgid "Whether the text is editable"
 msgstr "Se o texto é ou não editável"
 
-#: ../clutter/clutter-text.c:3449
+#: ../clutter/clutter-text.c:3519
 msgid "Selectable"
 msgstr "Selecionável"
 
-#: ../clutter/clutter-text.c:3450
+#: ../clutter/clutter-text.c:3520
 msgid "Whether the text is selectable"
 msgstr "Se o texto é ou não selecionável"
 
-#: ../clutter/clutter-text.c:3464
+#: ../clutter/clutter-text.c:3534
 msgid "Activatable"
 msgstr "Activável"
 
-#: ../clutter/clutter-text.c:3465
+#: ../clutter/clutter-text.c:3535
 msgid "Whether pressing return causes the activate signal to be emitted"
 msgstr "Se premir enter emite ou não o sinal de ativação"
 
-#: ../clutter/clutter-text.c:3482
+#: ../clutter/clutter-text.c:3552
 msgid "Whether the input cursor is visible"
 msgstr "Se o cursor de entrada está ou não visível"
 
-#: ../clutter/clutter-text.c:3496 ../clutter/clutter-text.c:3497
+#: ../clutter/clutter-text.c:3566 ../clutter/clutter-text.c:3567
 msgid "Cursor Color"
 msgstr "Cor do Cursor"
 
-#: ../clutter/clutter-text.c:3512
+#: ../clutter/clutter-text.c:3582
 msgid "Cursor Color Set"
 msgstr "Cor do Cursor Definida"
 
-#: ../clutter/clutter-text.c:3513
+#: ../clutter/clutter-text.c:3583
 msgid "Whether the cursor color has been set"
 msgstr "Se a cor do cursor foi ou não definida"
 
-#: ../clutter/clutter-text.c:3528
+#: ../clutter/clutter-text.c:3598
 msgid "Cursor Size"
 msgstr "Tamanho do Cursor"
 
-#: ../clutter/clutter-text.c:3529
+#: ../clutter/clutter-text.c:3599
 msgid "The width of the cursor, in pixels"
 msgstr "A largura do cursor, em pixels"
 
-#: ../clutter/clutter-text.c:3545 ../clutter/clutter-text.c:3563
+#: ../clutter/clutter-text.c:3615 ../clutter/clutter-text.c:3633
 msgid "Cursor Position"
 msgstr "Posição do Cursor"
 
-#: ../clutter/clutter-text.c:3546 ../clutter/clutter-text.c:3564
+#: ../clutter/clutter-text.c:3616 ../clutter/clutter-text.c:3634
 msgid "The cursor position"
 msgstr "A posição do cursor"
 
-#: ../clutter/clutter-text.c:3579
+#: ../clutter/clutter-text.c:3649
 msgid "Selection-bound"
 msgstr "Limitado à Seleção"
 
-#: ../clutter/clutter-text.c:3580
+#: ../clutter/clutter-text.c:3650
 msgid "The cursor position of the other end of the selection"
 msgstr "A posição do cursor no extremo oposto da seleção"
 
-#: ../clutter/clutter-text.c:3595 ../clutter/clutter-text.c:3596
+#: ../clutter/clutter-text.c:3665 ../clutter/clutter-text.c:3666
 msgid "Selection Color"
 msgstr "Cor de Seleção"
 
-#: ../clutter/clutter-text.c:3611
+#: ../clutter/clutter-text.c:3681
 msgid "Selection Color Set"
 msgstr "Cor de Seleção Definida"
 
-#: ../clutter/clutter-text.c:3612
+#: ../clutter/clutter-text.c:3682
 msgid "Whether the selection color has been set"
 msgstr "Se a cor de seleção foi ou não definida"
 
-#: ../clutter/clutter-text.c:3627
+#: ../clutter/clutter-text.c:3697
 msgid "Attributes"
 msgstr "Atributos"
 
-#: ../clutter/clutter-text.c:3628
+#: ../clutter/clutter-text.c:3698
 msgid "A list of style attributes to apply to the contents of the actor"
 msgstr "Uma lista de atributos de estilo a aplicar ao conteúdo do ator"
 
-#: ../clutter/clutter-text.c:3650
+#: ../clutter/clutter-text.c:3720
 msgid "Use markup"
 msgstr "Utilizar etiquetas"
 
-#: ../clutter/clutter-text.c:3651
+#: ../clutter/clutter-text.c:3721
 msgid "Whether or not the text includes Pango markup"
 msgstr "Se o texto inclui ou não etiquetas Pango"
 
-#: ../clutter/clutter-text.c:3667
+#: ../clutter/clutter-text.c:3737
 msgid "Line wrap"
 msgstr "Quebra de linha"
 
-#: ../clutter/clutter-text.c:3668
+#: ../clutter/clutter-text.c:3738
 msgid "If set, wrap the lines if the text becomes too wide"
 msgstr "Se definido, quebrar as linhas se o texto se tornar demasiado longo"
 
-#: ../clutter/clutter-text.c:3683
+#: ../clutter/clutter-text.c:3753
 msgid "Line wrap mode"
 msgstr "Modo de quebra de linha"
 
-#: ../clutter/clutter-text.c:3684
+#: ../clutter/clutter-text.c:3754
 msgid "Control how line-wrapping is done"
 msgstr "Controla como é efetuada a quebra de linha"
 
-#: ../clutter/clutter-text.c:3699
+#: ../clutter/clutter-text.c:3769
 msgid "Ellipsize"
 msgstr "Reticências"
 
-#: ../clutter/clutter-text.c:3700
+#: ../clutter/clutter-text.c:3770
 msgid "The preferred place to ellipsize the string"
 msgstr "O local preferido para colocar reticências no texto"
 
-#: ../clutter/clutter-text.c:3716
+#: ../clutter/clutter-text.c:3786
 msgid "Line Alignment"
 msgstr "Alinhamento da Linha"
 
-#: ../clutter/clutter-text.c:3717
+#: ../clutter/clutter-text.c:3787
 msgid "The preferred alignment for the string, for multi-line text"
 msgstr "O alinhamento preferido para o texto, em texto multilinha"
 
-#: ../clutter/clutter-text.c:3733
+#: ../clutter/clutter-text.c:3803
 msgid "Justify"
 msgstr "Preencher"
 
-#: ../clutter/clutter-text.c:3734
+#: ../clutter/clutter-text.c:3804
 msgid "Whether the text should be justified"
 msgstr "Se o texto deve ser o não preencher as linhas"
 
-#: ../clutter/clutter-text.c:3749
+#: ../clutter/clutter-text.c:3819
 msgid "Password Character"
 msgstr "Caracter de Senha"
 
-#: ../clutter/clutter-text.c:3750
+#: ../clutter/clutter-text.c:3820
 msgid "If non-zero, use this character to display the actor's contents"
 msgstr ""
 "Se diferente de zero, utilizar este caracter para apresentar o conteúdo do "
 "ator"
 
-#: ../clutter/clutter-text.c:3764
+#: ../clutter/clutter-text.c:3834
 msgid "Max Length"
 msgstr "Comprimento Máximo"
 
-#: ../clutter/clutter-text.c:3765
+#: ../clutter/clutter-text.c:3835
 msgid "Maximum length of the text inside the actor"
 msgstr "Comprimento máximo do texto dentro do ator"
 
-#: ../clutter/clutter-text.c:3788
+#: ../clutter/clutter-text.c:3858
 msgid "Single Line Mode"
 msgstr "Modo de Linha Única"
 
-#: ../clutter/clutter-text.c:3789
+#: ../clutter/clutter-text.c:3859
 msgid "Whether the text should be a single line"
 msgstr "Se o texto deverá ou não estar numa única linha"
 
-#: ../clutter/clutter-text.c:3803 ../clutter/clutter-text.c:3804
+#: ../clutter/clutter-text.c:3873 ../clutter/clutter-text.c:3874
 msgid "Selected Text Color"
 msgstr "Cor do Texto Selecionado"
 
-#: ../clutter/clutter-text.c:3819
+#: ../clutter/clutter-text.c:3889
 msgid "Selected Text Color Set"
 msgstr "Cor do Texto Selecionado Definida"
 
-#: ../clutter/clutter-text.c:3820
+#: ../clutter/clutter-text.c:3890
 msgid "Whether the selected text color has been set"
 msgstr "Se a cor do texto selecionado foi ou não definida"
 
-#: ../clutter/clutter-timeline.c:594
-#: ../clutter/deprecated/clutter-animation.c:560
+#: ../clutter/clutter-timeline.c:593
+#: ../clutter/deprecated/clutter-animation.c:557
 msgid "Loop"
 msgstr "Ciclo"
 
-#: ../clutter/clutter-timeline.c:595
+#: ../clutter/clutter-timeline.c:594
 msgid "Should the timeline automatically restart"
 msgstr "Se a linha temporal deverá reiniciar automaticamente"
 
-#: ../clutter/clutter-timeline.c:609
+#: ../clutter/clutter-timeline.c:608
 msgid "Delay"
 msgstr "Atraso"
 
-#: ../clutter/clutter-timeline.c:610
+#: ../clutter/clutter-timeline.c:609
 msgid "Delay before start"
 msgstr "Atraso antes de iniciar"
 
-#: ../clutter/clutter-timeline.c:625
-#: ../clutter/deprecated/clutter-animation.c:544
-#: ../clutter/deprecated/clutter-animator.c:1804
+#: ../clutter/clutter-timeline.c:624
+#: ../clutter/deprecated/clutter-animation.c:541
+#: ../clutter/deprecated/clutter-animator.c:1801
 #: ../clutter/deprecated/clutter-media.c:224
-#: ../clutter/deprecated/clutter-state.c:1523
+#: ../clutter/deprecated/clutter-state.c:1517
 msgid "Duration"
 msgstr "Duração"
 
-#: ../clutter/clutter-timeline.c:626
+#: ../clutter/clutter-timeline.c:625
 msgid "Duration of the timeline in milliseconds"
 msgstr "Duração da linha temporal em milisegundos"
 
-#: ../clutter/clutter-timeline.c:641
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:528
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:337
+#: ../clutter/clutter-timeline.c:640
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:521
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:330
 msgid "Direction"
 msgstr "Direção"
 
-#: ../clutter/clutter-timeline.c:642
+#: ../clutter/clutter-timeline.c:641
 msgid "Direction of the timeline"
 msgstr "Direção da linha temporal"
 
-#: ../clutter/clutter-timeline.c:657
+#: ../clutter/clutter-timeline.c:656
 msgid "Auto Reverse"
 msgstr "Reversão Automática"
 
-#: ../clutter/clutter-timeline.c:658
+#: ../clutter/clutter-timeline.c:657
 msgid "Whether the direction should be reversed when reaching the end"
 msgstr "Se a direção deverá ou não ser revertida ao atingir o final"
 
-#: ../clutter/clutter-timeline.c:676
+#: ../clutter/clutter-timeline.c:675
 msgid "Repeat Count"
 msgstr "Repetir a Contagem"
 
-#: ../clutter/clutter-timeline.c:677
+#: ../clutter/clutter-timeline.c:676
 msgid "How many times the timeline should repeat"
 msgstr "Quantas vezes deverá a linha temporal repetir-se"
 
-#: ../clutter/clutter-timeline.c:691
+#: ../clutter/clutter-timeline.c:690
 msgid "Progress Mode"
 msgstr "Modo de Progresso"
 
-#: ../clutter/clutter-timeline.c:692
+#: ../clutter/clutter-timeline.c:691
 msgid "How the timeline should compute the progress"
 msgstr "Como deverá a linha temporal calcular o progresso"
 
-#: ../clutter/clutter-transition.c:246
+#: ../clutter/clutter-transition.c:244
 msgid "Interval"
 msgstr "Intervalo"
 
-#: ../clutter/clutter-transition.c:247
+#: ../clutter/clutter-transition.c:245
 msgid "The interval of values to transition"
 msgstr "O intervalo de valores para a transição"
 
-#: ../clutter/clutter-transition.c:261
+#: ../clutter/clutter-transition.c:259
 msgid "Animatable"
 msgstr "Animável"
 
-#: ../clutter/clutter-transition.c:262
+#: ../clutter/clutter-transition.c:260
 msgid "The animatable object"
 msgstr "O objeto animável"
 
-#: ../clutter/clutter-transition.c:283
+#: ../clutter/clutter-transition.c:281
 msgid "Remove on Complete"
 msgstr "Remover ao Terminar"
 
-#: ../clutter/clutter-transition.c:284
+#: ../clutter/clutter-transition.c:282
 msgid "Detach the transition when completed"
 msgstr "Desassociar a transição ao terminar"
 
-#: ../clutter/clutter-zoom-action.c:354
+#: ../clutter/clutter-zoom-action.c:365
 msgid "Zoom Axis"
 msgstr "Eixo de Zoom"
 
-#: ../clutter/clutter-zoom-action.c:355
+#: ../clutter/clutter-zoom-action.c:366
 msgid "Constraints the zoom to an axis"
 msgstr "Restringe o zoom a um eixo"
 
-#: ../clutter/deprecated/clutter-alpha.c:355
-#: ../clutter/deprecated/clutter-animation.c:575
-#: ../clutter/deprecated/clutter-animator.c:1821
+#: ../clutter/deprecated/clutter-alpha.c:354
+#: ../clutter/deprecated/clutter-animation.c:572
+#: ../clutter/deprecated/clutter-animator.c:1818
 msgid "Timeline"
 msgstr "Linha Temporal"
 
-#: ../clutter/deprecated/clutter-alpha.c:356
+#: ../clutter/deprecated/clutter-alpha.c:355
 msgid "Timeline used by the alpha"
 msgstr "Linha temporal utilizada pelo alfa"
 
-#: ../clutter/deprecated/clutter-alpha.c:372
+#: ../clutter/deprecated/clutter-alpha.c:371
 msgid "Alpha value"
 msgstr "Valor alfa"
 
-#: ../clutter/deprecated/clutter-alpha.c:373
+#: ../clutter/deprecated/clutter-alpha.c:372
 msgid "Alpha value as computed by the alpha"
 msgstr "Valor alfa tal como calculado pelo alfa"
 
-#: ../clutter/deprecated/clutter-alpha.c:394
-#: ../clutter/deprecated/clutter-animation.c:528
+#: ../clutter/deprecated/clutter-alpha.c:393
+#: ../clutter/deprecated/clutter-animation.c:525
 msgid "Mode"
 msgstr "Modo"
 
-#: ../clutter/deprecated/clutter-alpha.c:395
+#: ../clutter/deprecated/clutter-alpha.c:394
 msgid "Progress mode"
 msgstr "Modo de progresso"
 
-#: ../clutter/deprecated/clutter-animation.c:511
+#: ../clutter/deprecated/clutter-animation.c:508
 msgid "Object"
 msgstr "Objeto"
 
-#: ../clutter/deprecated/clutter-animation.c:512
+#: ../clutter/deprecated/clutter-animation.c:509
 msgid "Object to which the animation applies"
 msgstr "Objeto sobre o qual se aplica a animação"
 
-#: ../clutter/deprecated/clutter-animation.c:529
+#: ../clutter/deprecated/clutter-animation.c:526
 msgid "The mode of the animation"
 msgstr "O modo da animação"
 
-#: ../clutter/deprecated/clutter-animation.c:545
+#: ../clutter/deprecated/clutter-animation.c:542
 msgid "Duration of the animation, in milliseconds"
 msgstr "Duração da animação, em milisegundos"
 
-#: ../clutter/deprecated/clutter-animation.c:561
+#: ../clutter/deprecated/clutter-animation.c:558
 msgid "Whether the animation should loop"
 msgstr "Se a animação deverá ou não reproduzir em ciclo"
 
-#: ../clutter/deprecated/clutter-animation.c:576
+#: ../clutter/deprecated/clutter-animation.c:573
 msgid "The timeline used by the animation"
 msgstr "A linha temporal utilizada pela animação"
 
-#: ../clutter/deprecated/clutter-animation.c:592
-#: ../clutter/deprecated/clutter-behaviour.c:241
+#: ../clutter/deprecated/clutter-animation.c:589
+#: ../clutter/deprecated/clutter-behaviour.c:237
 msgid "Alpha"
 msgstr "Alfa"
 
-#: ../clutter/deprecated/clutter-animation.c:593
+#: ../clutter/deprecated/clutter-animation.c:590
 msgid "The alpha used by the animation"
 msgstr "O alfa utilizado pela animação"
 
-#: ../clutter/deprecated/clutter-animator.c:1805
+#: ../clutter/deprecated/clutter-animator.c:1802
 msgid "The duration of the animation"
 msgstr "A duração da animação"
 
-#: ../clutter/deprecated/clutter-animator.c:1822
+#: ../clutter/deprecated/clutter-animator.c:1819
 msgid "The timeline of the animation"
 msgstr "A linha temporal da animação"
 
-#: ../clutter/deprecated/clutter-behaviour.c:242
+#: ../clutter/deprecated/clutter-behaviour.c:238
 msgid "Alpha Object to drive the behaviour"
 msgstr "Objeto Alfa para conduzir o comportamento"
 
-#: ../clutter/deprecated/clutter-behaviour-depth.c:182
+#: ../clutter/deprecated/clutter-behaviour-depth.c:180
 msgid "Start Depth"
 msgstr "Profundidade Inicial"
 
-#: ../clutter/deprecated/clutter-behaviour-depth.c:183
+#: ../clutter/deprecated/clutter-behaviour-depth.c:181
 msgid "Initial depth to apply"
 msgstr "Profundidade inicial a aplicar"
 
-#: ../clutter/deprecated/clutter-behaviour-depth.c:198
+#: ../clutter/deprecated/clutter-behaviour-depth.c:196
 msgid "End Depth"
 msgstr "Profundidade Final"
 
-#: ../clutter/deprecated/clutter-behaviour-depth.c:199
+#: ../clutter/deprecated/clutter-behaviour-depth.c:197
 msgid "Final depth to apply"
 msgstr "Profundidade final a aplicar"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:401
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:394
 msgid "Start Angle"
 msgstr "Ângulo Inicial"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:402
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:284
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:395
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:277
 msgid "Initial angle"
 msgstr "Ângulo inicial"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:417
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:410
 msgid "End Angle"
 msgstr "Ângulo Final"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:418
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:302
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:411
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:295
 msgid "Final angle"
 msgstr "Ângulo final"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:433
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:426
 msgid "Angle x tilt"
 msgstr "Inclinação x do ângulo"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:434
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:427
 msgid "Tilt of the ellipse around x axis"
 msgstr "Inclinação da elipse em torno do eixo x"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:449
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:442
 msgid "Angle y tilt"
 msgstr "Inclinação y do ângulo"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:450
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:443
 msgid "Tilt of the ellipse around y axis"
 msgstr "Inclinação da elipse em torno do eixo y"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:465
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:458
 msgid "Angle z tilt"
 msgstr "Inclinação z do ângulo"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:466
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:459
 msgid "Tilt of the ellipse around z axis"
 msgstr "Inclinação da elipse em torno do eixo z"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:482
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:475
 msgid "Width of the ellipse"
 msgstr "Largura da elipse"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:498
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:491
 msgid "Height of ellipse"
 msgstr "Altura da elipse"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:513
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:506
 msgid "Center"
 msgstr "Centro"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:514
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:507
 msgid "Center of ellipse"
 msgstr "Centro da elipse"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:529
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:338
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:522
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:331
 msgid "Direction of rotation"
 msgstr "Direção da rotação"
 
-#: ../clutter/deprecated/clutter-behaviour-opacity.c:184
+#: ../clutter/deprecated/clutter-behaviour-opacity.c:177
 msgid "Opacity Start"
 msgstr "Opacidade Inicial"
 
-#: ../clutter/deprecated/clutter-behaviour-opacity.c:185
+#: ../clutter/deprecated/clutter-behaviour-opacity.c:178
 msgid "Initial opacity level"
 msgstr "Nível inicial de opacidade"
 
-#: ../clutter/deprecated/clutter-behaviour-opacity.c:202
+#: ../clutter/deprecated/clutter-behaviour-opacity.c:195
 msgid "Opacity End"
 msgstr "Opacidade Final"
 
-#: ../clutter/deprecated/clutter-behaviour-opacity.c:203
+#: ../clutter/deprecated/clutter-behaviour-opacity.c:196
 msgid "Final opacity level"
 msgstr "Nível final de opacidade"
 
-#: ../clutter/deprecated/clutter-behaviour-path.c:226
+#: ../clutter/deprecated/clutter-behaviour-path.c:222
 msgid "The ClutterPath object representing the path to animate along"
 msgstr "O objeto ClutterPath que representa o caminho ao longo do qual animar"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:283
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:276
 msgid "Angle Begin"
 msgstr "Ângulo Inicial"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:301
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:294
 msgid "Angle End"
 msgstr "Ângulo Final"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:319
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:312
 msgid "Axis"
 msgstr "Eixo"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:320
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:313
 msgid "Axis of rotation"
 msgstr "Eixo da rotação"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:355
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:348
 msgid "Center X"
 msgstr "Centro X"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:356
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:349
 msgid "X coordinate of the center of rotation"
 msgstr "Coordenada X do centro da rotação"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:373
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:366
 msgid "Center Y"
 msgstr "Centro Y"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:374
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:367
 msgid "Y coordinate of the center of rotation"
 msgstr "Coordenada Y do centro da rotação"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:391
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:384
 msgid "Center Z"
 msgstr "Centro Z"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:392
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:385
 msgid "Z coordinate of the center of rotation"
 msgstr "Coordenada Z do centro da rotação"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:226
+#: ../clutter/deprecated/clutter-behaviour-scale.c:222
 msgid "X Start Scale"
 msgstr "Escala Inicial X"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:227
+#: ../clutter/deprecated/clutter-behaviour-scale.c:223
 msgid "Initial scale on the X axis"
 msgstr "Escala inicial no eixo X"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:245
+#: ../clutter/deprecated/clutter-behaviour-scale.c:241
 msgid "X End Scale"
 msgstr "Escala Final X"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:246
+#: ../clutter/deprecated/clutter-behaviour-scale.c:242
 msgid "Final scale on the X axis"
 msgstr "Escala final no eixo X"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:264
+#: ../clutter/deprecated/clutter-behaviour-scale.c:260
 msgid "Y Start Scale"
 msgstr "Escala Inicial Y"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:265
+#: ../clutter/deprecated/clutter-behaviour-scale.c:261
 msgid "Initial scale on the Y axis"
 msgstr "Escala inicial no eixo Y"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:283
+#: ../clutter/deprecated/clutter-behaviour-scale.c:279
 msgid "Y End Scale"
 msgstr "Escala Final Y"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:284
+#: ../clutter/deprecated/clutter-behaviour-scale.c:280
 msgid "Final scale on the Y axis"
 msgstr "Escala final no eixo Y"
 
-#: ../clutter/deprecated/clutter-box.c:261
+#: ../clutter/deprecated/clutter-box.c:257
 msgid "The background color of the box"
 msgstr "A cor do fundo da caixa"
 
-#: ../clutter/deprecated/clutter-box.c:274
+#: ../clutter/deprecated/clutter-box.c:270
 msgid "Color Set"
 msgstr "Cor Definida"
 
-#: ../clutter/deprecated/clutter-cairo-texture.c:597
+#: ../clutter/deprecated/clutter-cairo-texture.c:593
 msgid "Surface Width"
 msgstr "Largura da Superfície"
 
-#: ../clutter/deprecated/clutter-cairo-texture.c:598
+#: ../clutter/deprecated/clutter-cairo-texture.c:594
 msgid "The width of the Cairo surface"
 msgstr "A largura da superfície Cairo"
 
-#: ../clutter/deprecated/clutter-cairo-texture.c:615
+#: ../clutter/deprecated/clutter-cairo-texture.c:611
 msgid "Surface Height"
 msgstr "Altura da Superfície"
 
-#: ../clutter/deprecated/clutter-cairo-texture.c:616
+#: ../clutter/deprecated/clutter-cairo-texture.c:612
 msgid "The height of the Cairo surface"
 msgstr "A altura da superfície Cairo"
 
-#: ../clutter/deprecated/clutter-cairo-texture.c:636
+#: ../clutter/deprecated/clutter-cairo-texture.c:632
 msgid "Auto Resize"
 msgstr "Redimensionamento Automático"
 
-#: ../clutter/deprecated/clutter-cairo-texture.c:637
+#: ../clutter/deprecated/clutter-cairo-texture.c:633
 msgid "Whether the surface should match the allocation"
 msgstr "Se a superfície deverá ou não coincidir com a alocação"
 
@@ -2389,104 +2409,160 @@ msgstr "O nível de enchimento do buffer"
 msgid "The duration of the stream, in seconds"
 msgstr "A duração do fluxo, em segundos"
 
-#: ../clutter/deprecated/clutter-rectangle.c:274
+#: ../clutter/deprecated/clutter-rectangle.c:271
 msgid "The color of the rectangle"
 msgstr "A cor do retângulo"
 
-#: ../clutter/deprecated/clutter-rectangle.c:287
+#: ../clutter/deprecated/clutter-rectangle.c:284
 msgid "Border Color"
 msgstr "Cor da Margem"
 
-#: ../clutter/deprecated/clutter-rectangle.c:288
+#: ../clutter/deprecated/clutter-rectangle.c:285
 msgid "The color of the border of the rectangle"
 msgstr "A cor da margem do retângulo"
 
-#: ../clutter/deprecated/clutter-rectangle.c:303
+#: ../clutter/deprecated/clutter-rectangle.c:300
 msgid "Border Width"
 msgstr "Largura da Margem"
 
-#: ../clutter/deprecated/clutter-rectangle.c:304
+#: ../clutter/deprecated/clutter-rectangle.c:301
 msgid "The width of the border of the rectangle"
 msgstr "Largura da margem do retângulo"
 
-#: ../clutter/deprecated/clutter-rectangle.c:318
+#: ../clutter/deprecated/clutter-rectangle.c:315
 msgid "Has Border"
 msgstr "Tem Margens"
 
-#: ../clutter/deprecated/clutter-rectangle.c:319
+#: ../clutter/deprecated/clutter-rectangle.c:316
 msgid "Whether the rectangle should have a border"
 msgstr "Se o retângulo deverá ou não ter uma margem"
 
-#: ../clutter/deprecated/clutter-shader.c:261
+#: ../clutter/deprecated/clutter-shader.c:257
 msgid "Vertex Source"
 msgstr "Origem do Vertex"
 
-#: ../clutter/deprecated/clutter-shader.c:262
+#: ../clutter/deprecated/clutter-shader.c:258
 msgid "Source of vertex shader"
 msgstr "Origem do vertex de sombreamento"
 
-#: ../clutter/deprecated/clutter-shader.c:278
+#: ../clutter/deprecated/clutter-shader.c:274
 msgid "Fragment Source"
 msgstr "Origem do Fragmento"
 
-#: ../clutter/deprecated/clutter-shader.c:279
+#: ../clutter/deprecated/clutter-shader.c:275
 msgid "Source of fragment shader"
 msgstr "Origem do fragmento de sombreamento"
 
-#: ../clutter/deprecated/clutter-shader.c:296
+#: ../clutter/deprecated/clutter-shader.c:292
 msgid "Compiled"
 msgstr "Compilado"
 
-#: ../clutter/deprecated/clutter-shader.c:297
+#: ../clutter/deprecated/clutter-shader.c:293
 msgid "Whether the shader is compiled and linked"
 msgstr "Se o sombreamento está ou não compilado e associado"
 
-#: ../clutter/deprecated/clutter-shader.c:314
+#: ../clutter/deprecated/clutter-shader.c:310
 msgid "Whether the shader is enabled"
 msgstr "Se o sombreamento está ou não ativo"
 
-#: ../clutter/deprecated/clutter-shader.c:525
+#: ../clutter/deprecated/clutter-shader.c:521
 #, c-format
 msgid "%s compilation failed: %s"
 msgstr "Falha na compilação de %s: %s"
 
-#: ../clutter/deprecated/clutter-shader.c:526
+#: ../clutter/deprecated/clutter-shader.c:522
 msgid "Vertex shader"
 msgstr "Vertex de sombreamento"
 
-#: ../clutter/deprecated/clutter-shader.c:527
+#: ../clutter/deprecated/clutter-shader.c:523
 msgid "Fragment shader"
 msgstr "Fragmento de sombreamento"
 
-#: ../clutter/deprecated/clutter-state.c:1505
+#: ../clutter/deprecated/clutter-state.c:1499
 msgid "State"
 msgstr "Estado"
 
-#: ../clutter/deprecated/clutter-state.c:1506
+#: ../clutter/deprecated/clutter-state.c:1500
 msgid "Currently set state, (transition to this state might not be complete)"
 msgstr ""
 "Estado atualmente definido (a transição para este estado pode não estar "
 "terminada)"
 
-#: ../clutter/deprecated/clutter-state.c:1524
+#: ../clutter/deprecated/clutter-state.c:1518
 msgid "Default transition duration"
 msgstr "Duração da transição por omissão"
 
-#: ../clutter/deprecated/clutter-texture.c:994
+#: ../clutter/deprecated/clutter-table-layout.c:543
+msgid "Column Number"
+msgstr "Número da Coluna"
+
+#: ../clutter/deprecated/clutter-table-layout.c:544
+msgid "The column the widget resides in"
+msgstr "A coluna em que o widget reside"
+
+#: ../clutter/deprecated/clutter-table-layout.c:551
+msgid "Row Number"
+msgstr "Número de Linha"
+
+#: ../clutter/deprecated/clutter-table-layout.c:552
+msgid "The row the widget resides in"
+msgstr "A linha em que o widget reside"
+
+#: ../clutter/deprecated/clutter-table-layout.c:559
+msgid "Column Span"
+msgstr "Expansão da Coluna"
+
+#: ../clutter/deprecated/clutter-table-layout.c:560
+msgid "The number of columns the widget should span"
+msgstr "O número de colunas pelo qual o widget se estende"
+
+#: ../clutter/deprecated/clutter-table-layout.c:567
+msgid "Row Span"
+msgstr "Expansão da Linha"
+
+#: ../clutter/deprecated/clutter-table-layout.c:568
+msgid "The number of rows the widget should span"
+msgstr "O número de linhas pelo qual o widget se estende"
+
+#: ../clutter/deprecated/clutter-table-layout.c:575
+msgid "Horizontal Expand"
+msgstr "Expansão Horizontal"
+
+#: ../clutter/deprecated/clutter-table-layout.c:576
+msgid "Allocate extra space for the child in horizontal axis"
+msgstr "Alocar espaço extra no eixo horizontal para o filho"
+
+#: ../clutter/deprecated/clutter-table-layout.c:582
+msgid "Vertical Expand"
+msgstr "Expansão Vertical"
+
+#: ../clutter/deprecated/clutter-table-layout.c:583
+msgid "Allocate extra space for the child in vertical axis"
+msgstr "Alocar espaço extra no eixo vertical para o filho"
+
+#: ../clutter/deprecated/clutter-table-layout.c:1638
+msgid "Spacing between columns"
+msgstr "Espaçamento entre colunas"
+
+#: ../clutter/deprecated/clutter-table-layout.c:1654
+msgid "Spacing between rows"
+msgstr "Espaçamento entre linhas"
+
+#: ../clutter/deprecated/clutter-texture.c:992
 msgid "Sync size of actor"
 msgstr "Tamanho de sincronização do ator"
 
-#: ../clutter/deprecated/clutter-texture.c:995
+#: ../clutter/deprecated/clutter-texture.c:993
 msgid "Auto sync size of actor to underlying pixbuf dimensions"
 msgstr ""
 "Tamanho de sincronização automático do ator para as dimensões pixbuf "
 "subjacentes"
 
-#: ../clutter/deprecated/clutter-texture.c:1002
+#: ../clutter/deprecated/clutter-texture.c:1000
 msgid "Disable Slicing"
 msgstr "Desativar Fatiamento"
 
-#: ../clutter/deprecated/clutter-texture.c:1003
+#: ../clutter/deprecated/clutter-texture.c:1001
 msgid ""
 "Forces the underlying texture to be singular and not made of smaller space "
 "saving individual textures"
@@ -2494,97 +2570,97 @@ msgstr ""
 "Força que a textura subjacente seja única e não composta por texturas "
 "individuais de poupança de espaço"
 
-#: ../clutter/deprecated/clutter-texture.c:1012
+#: ../clutter/deprecated/clutter-texture.c:1010
 msgid "Tile Waste"
 msgstr "Desperdício de Mosaico"
 
-#: ../clutter/deprecated/clutter-texture.c:1013
+#: ../clutter/deprecated/clutter-texture.c:1011
 msgid "Maximum waste area of a sliced texture"
 msgstr "Área máxima desperdiçada numa textura fatiada"
 
-#: ../clutter/deprecated/clutter-texture.c:1021
+#: ../clutter/deprecated/clutter-texture.c:1019
 msgid "Horizontal repeat"
 msgstr "Repetimento horizontal"
 
-#: ../clutter/deprecated/clutter-texture.c:1022
+#: ../clutter/deprecated/clutter-texture.c:1020
 msgid "Repeat the contents rather than scaling them horizontally"
 msgstr "Repetir o conteúdo em vez de o escalar horizontalmente"
 
-#: ../clutter/deprecated/clutter-texture.c:1029
+#: ../clutter/deprecated/clutter-texture.c:1027
 msgid "Vertical repeat"
 msgstr "Repetimento vertical"
 
-#: ../clutter/deprecated/clutter-texture.c:1030
+#: ../clutter/deprecated/clutter-texture.c:1028
 msgid "Repeat the contents rather than scaling them vertically"
 msgstr "Repetir o conteúdo em vez de o escalar verticalmente"
 
-#: ../clutter/deprecated/clutter-texture.c:1037
+#: ../clutter/deprecated/clutter-texture.c:1035
 msgid "Filter Quality"
 msgstr "Qualidade do Filtro"
 
-#: ../clutter/deprecated/clutter-texture.c:1038
+#: ../clutter/deprecated/clutter-texture.c:1036
 msgid "Rendering quality used when drawing the texture"
 msgstr "Qualidade de renderização utilizada ao desenhar a textura"
 
-#: ../clutter/deprecated/clutter-texture.c:1046
+#: ../clutter/deprecated/clutter-texture.c:1044
 msgid "Pixel Format"
 msgstr "Formato de Pixel"
 
-#: ../clutter/deprecated/clutter-texture.c:1047
+#: ../clutter/deprecated/clutter-texture.c:1045
 msgid "The Cogl pixel format to use"
 msgstr "O formato de pixel Cogl a utilizar"
 
-#: ../clutter/deprecated/clutter-texture.c:1055
-#: ../clutter/wayland/clutter-wayland-surface.c:449
+#: ../clutter/deprecated/clutter-texture.c:1053
+#: ../clutter/wayland/clutter-wayland-surface.c:445
 msgid "Cogl Texture"
 msgstr "Textura Cogl"
 
-#: ../clutter/deprecated/clutter-texture.c:1056
-#: ../clutter/wayland/clutter-wayland-surface.c:450
+#: ../clutter/deprecated/clutter-texture.c:1054
+#: ../clutter/wayland/clutter-wayland-surface.c:446
 msgid "The underlying Cogl texture handle used to draw this actor"
 msgstr ""
 "O manípulo de textura Cogl subjacente utilizada para desenhar este ator"
 
-#: ../clutter/deprecated/clutter-texture.c:1063
+#: ../clutter/deprecated/clutter-texture.c:1061
 msgid "Cogl Material"
 msgstr "Material Cogl"
 
-#: ../clutter/deprecated/clutter-texture.c:1064
+#: ../clutter/deprecated/clutter-texture.c:1062
 msgid "The underlying Cogl material handle used to draw this actor"
 msgstr ""
 "O manípulo de material Cogl subjacente utilizado para desenhar este ator"
 
-#: ../clutter/deprecated/clutter-texture.c:1083
+#: ../clutter/deprecated/clutter-texture.c:1081
 msgid "The path of the file containing the image data"
 msgstr "O caminho do ficheiro que contém os dados da imagem"
 
-#: ../clutter/deprecated/clutter-texture.c:1090
+#: ../clutter/deprecated/clutter-texture.c:1088
 msgid "Keep Aspect Ratio"
 msgstr "Manter o Rácio de Aparência"
 
-#: ../clutter/deprecated/clutter-texture.c:1091
+#: ../clutter/deprecated/clutter-texture.c:1089
 msgid ""
 "Keep the aspect ratio of the texture when requesting the preferred width or "
 "height"
 msgstr ""
 "Manter o rácio de aparência da textura ao pedir a largura ou altura preferida"
 
-#: ../clutter/deprecated/clutter-texture.c:1119
+#: ../clutter/deprecated/clutter-texture.c:1117
 msgid "Load asynchronously"
 msgstr "Ler assincronamente"
 
-#: ../clutter/deprecated/clutter-texture.c:1120
+#: ../clutter/deprecated/clutter-texture.c:1118
 msgid ""
 "Load files inside a thread to avoid blocking when loading images from disk"
 msgstr ""
 "Ler ficheiros dentro de uma thread para evitar bloqueios ao ler imagens do "
 "disco"
 
-#: ../clutter/deprecated/clutter-texture.c:1138
+#: ../clutter/deprecated/clutter-texture.c:1136
 msgid "Load data asynchronously"
 msgstr "Ler dados assincronamente"
 
-#: ../clutter/deprecated/clutter-texture.c:1139
+#: ../clutter/deprecated/clutter-texture.c:1137
 msgid ""
 "Decode image data files inside a thread to reduce blocking when loading "
 "images from disk"
@@ -2592,197 +2668,193 @@ msgstr ""
 "Descodificar os dados de ficheiros de imagem dentro de uma thread para "
 "evitar bloqueios ao ler imagens do disco"
 
-#: ../clutter/deprecated/clutter-texture.c:1165
+#: ../clutter/deprecated/clutter-texture.c:1163
 msgid "Pick With Alpha"
 msgstr "Selecionar Com Alfa"
 
-#: ../clutter/deprecated/clutter-texture.c:1166
+#: ../clutter/deprecated/clutter-texture.c:1164
 msgid "Shape actor with alpha channel when picking"
 msgstr "Desenhar o ator com o canal alfa ao selecionar"
 
-#: ../clutter/deprecated/clutter-texture.c:1599
-#: ../clutter/deprecated/clutter-texture.c:1994
-#: ../clutter/deprecated/clutter-texture.c:2090
-#: ../clutter/deprecated/clutter-texture.c:2388
+#: ../clutter/deprecated/clutter-texture.c:1597
+#: ../clutter/deprecated/clutter-texture.c:1992
+#: ../clutter/deprecated/clutter-texture.c:2088
+#: ../clutter/deprecated/clutter-texture.c:2386
 #, c-format
 msgid "Failed to load the image data"
 msgstr "Falha ao ler os dados da imagem"
 
-#: ../clutter/deprecated/clutter-texture.c:1758
+#: ../clutter/deprecated/clutter-texture.c:1756
 #, c-format
 msgid "YUV textures are not supported"
 msgstr "Texturas YUV não são suportadas"
 
-#: ../clutter/deprecated/clutter-texture.c:1767
+#: ../clutter/deprecated/clutter-texture.c:1765
 #, c-format
 msgid "YUV2 textues are not supported"
 msgstr "Texturas YUV2 não são suportadas"
 
-#: ../clutter/evdev/clutter-input-device-evdev.c:159
-msgid "sysfs Path"
-msgstr "Caminho sysfs"
-
-#: ../clutter/evdev/clutter-input-device-evdev.c:160
-msgid "Path of the device in sysfs"
-msgstr "Caminho do dispositivo no sysfs"
-
-#: ../clutter/evdev/clutter-input-device-evdev.c:175
-msgid "Device Path"
-msgstr "Caminho do Dispositivo"
-
-#: ../clutter/evdev/clutter-input-device-evdev.c:176
-msgid "Path of the device node"
-msgstr "Caminho do nó do dispositivo"
-
-#: ../clutter/gdk/clutter-backend-gdk.c:287
+#: ../clutter/gdk/clutter-backend-gdk.c:289
 #, c-format
 msgid "Could not find a suitable CoglWinsys for a GdkDisplay of type %s"
 msgstr "Incapaz de encontrar um CoglWinsys adequado a um GdkDisplay do tipo %s"
 
-#: ../clutter/wayland/clutter-wayland-surface.c:423
+#: ../clutter/wayland/clutter-wayland-surface.c:419
 msgid "Surface"
 msgstr "Superfície"
 
-#: ../clutter/wayland/clutter-wayland-surface.c:424
+#: ../clutter/wayland/clutter-wayland-surface.c:420
 msgid "The underlying wayland surface"
 msgstr "A superfície wayland subjacente"
 
-#: ../clutter/wayland/clutter-wayland-surface.c:431
+#: ../clutter/wayland/clutter-wayland-surface.c:427
 msgid "Surface width"
 msgstr "Largura da superfície"
 
-#: ../clutter/wayland/clutter-wayland-surface.c:432
+#: ../clutter/wayland/clutter-wayland-surface.c:428
 msgid "The width of the underlying wayland surface"
 msgstr "A largura da superfície wayland subjacente"
 
-#: ../clutter/wayland/clutter-wayland-surface.c:440
+#: ../clutter/wayland/clutter-wayland-surface.c:436
 msgid "Surface height"
 msgstr "Altura da superfície"
 
-#: ../clutter/wayland/clutter-wayland-surface.c:441
+#: ../clutter/wayland/clutter-wayland-surface.c:437
 msgid "The height of the underlying wayland surface"
 msgstr "A altura da superfície wayland subjacente"
 
-#: ../clutter/x11/clutter-backend-x11.c:507
+#: ../clutter/x11/clutter-backend-x11.c:488
 msgid "X display to use"
 msgstr "Ecrã X a utilizar"
 
-#: ../clutter/x11/clutter-backend-x11.c:513
+#: ../clutter/x11/clutter-backend-x11.c:494
 msgid "X screen to use"
 msgstr "Monitor X a utilizar"
 
-#: ../clutter/x11/clutter-backend-x11.c:518
+#: ../clutter/x11/clutter-backend-x11.c:499
 msgid "Make X calls synchronous"
 msgstr "Efetuar invocações X sincronamente"
 
-#: ../clutter/x11/clutter-backend-x11.c:525
+#: ../clutter/x11/clutter-backend-x11.c:506
 msgid "Disable XInput support"
 msgstr "Desativar suporte XInput"
 
-#: ../clutter/x11/clutter-keymap-x11.c:322
+#: ../clutter/x11/clutter-keymap-x11.c:458
 msgid "The Clutter backend"
 msgstr "O motor do Clutter"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:539
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:534
 msgid "Pixmap"
 msgstr "Pixmap"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:540
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:535
 msgid "The X11 Pixmap to be bound"
 msgstr "O Pixmap X11 a ser associado"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:548
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:543
 msgid "Pixmap width"
 msgstr "Largura do pixmap"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:549
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:544
 msgid "The width of the pixmap bound to this texture"
 msgstr "A largura do pixmap associado a esta textura"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:557
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:552
 msgid "Pixmap height"
 msgstr "Altura do pixmap"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:558
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:553
 msgid "The height of the pixmap bound to this texture"
 msgstr "A altura do pixmap associado a esta textura"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:566
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:561
 msgid "Pixmap Depth"
 msgstr "Profundidade do Pixmap"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:567
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:562
 msgid "The depth (in number of bits) of the pixmap bound to this texture"
 msgstr "A profundidade (em número de bits) do pixmap associado a esta textura"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:575
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:570
 msgid "Automatic Updates"
 msgstr "Atualizações Automáticas"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:576
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:571
 msgid "If the texture should be kept in sync with any pixmap changes."
 msgstr ""
 "Se a textura deverá ser mantida sincronizada com quaisquer alterações de "
 "pixmap."
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:584
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:579
 msgid "Window"
 msgstr "Janela"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:585
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:580
 msgid "The X11 Window to be bound"
 msgstr "A Janela X11 a ser associada"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:593
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:588
 msgid "Window Redirect Automatic"
 msgstr "Redireccionamento de Janela Automático"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:594
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:589
 msgid "If composite window redirects are set to Automatic (or Manual if false)"
 msgstr ""
 "Se os redireccionamentos da janela composta são definidos para Automático "
 "(ou Manual se falso)"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:604
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:599
 msgid "Window Mapped"
 msgstr "Mapeamento de Janela"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:605
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:600
 msgid "If window is mapped"
 msgstr "Se a janela é mapeada"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:614
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:609
 msgid "Destroyed"
 msgstr "Destruida"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:615
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:610
 msgid "If window has been destroyed"
 msgstr "Se a janela foi destruída"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:623
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:618
 msgid "Window X"
 msgstr "X da Janela"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:624
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:619
 msgid "X position of window on screen according to X11"
 msgstr "Posição X da janela no ecrã de acordo com o X11"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:632
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:627
 msgid "Window Y"
 msgstr "Y da Janela"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:633
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:628
 msgid "Y position of window on screen according to X11"
 msgstr "Posição Y da janela no ecrã de acordo com o X11"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:640
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:635
 msgid "Window Override Redirect"
 msgstr "Janela de Sobreposição de Redireccionamento"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:641
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:636
 msgid "If this is an override-redirect window"
 msgstr "Se esta janela é ou não uma de sobreposição de redireccionamento"
 
+#~ msgid "sysfs Path"
+#~ msgstr "Caminho sysfs"
+
+#~ msgid "Path of the device in sysfs"
+#~ msgstr "Caminho do dispositivo no sysfs"
+
+#~ msgid "Device Path"
+#~ msgstr "Caminho do Dispositivo"
+
+#~ msgid "Path of the device node"
+#~ msgstr "Caminho do nó do dispositivo"
+
 #~ msgid "Ator"
 #~ msgstr "Ator"
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index f0f3915f7..4d72d3b11 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -1,711 +1,712 @@
 # Brazilian Portuguese translation of clutter.
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2013 Free Software Foundation, Inc.
 # This file is distributed under the same license as the clutter package.
 # Edvaldo de Souza Cruz <edvaldoscruz@hotmail.com>, 2011.
 # Og Maciel <ogmaciel@gnome.org>, 2011.
 # Jonh Wendell <jwendell@gnome.org>, 2012.
+# Enrico Nicoletto <liverig@gmail.com>, 2012.
+# Rafael Ferreira <rafael.f.f1@gmail.com>, 2013, 2014.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: clutter master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
-"product=clutter\n"
-"POT-Creation-Date: 2012-09-07 11:57-0400\n"
-"PO-Revision-Date: 2012-09-07 12:53-0300\n"
-"Last-Translator: Enrico Nicoletto <liverig@gmail.com>\n"
+"product=clutter&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2014-02-21 04:08+0000\n"
+"PO-Revision-Date: 2014-02-21 11:51-0300\n"
+"Last-Translator: Rafael Ferreira <rafael.f.f1@gmail.com>\n"
 "Language-Team: Brazilian Portuguese <gnome-pt_br-list@gnome.org>\n"
 "Language: pt_BR\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"
-"X-Poedit-Language: Portguese\n"
-"X-Poedit-Country: brazil\n"
+"X-Generator: Poedit 1.6.4\n"
 
-#: ../clutter/clutter-actor.c:6125
+#: ../clutter/clutter-actor.c:6214
 msgid "X coordinate"
 msgstr "Coordenada X"
 
-#: ../clutter/clutter-actor.c:6126
+#: ../clutter/clutter-actor.c:6215
 msgid "X coordinate of the actor"
 msgstr "Coordenada X do ator"
 
-#: ../clutter/clutter-actor.c:6144
+#: ../clutter/clutter-actor.c:6233
 msgid "Y coordinate"
 msgstr "Coordenada Y"
 
-#: ../clutter/clutter-actor.c:6145
+#: ../clutter/clutter-actor.c:6234
 msgid "Y coordinate of the actor"
 msgstr "Coordenada Y do ator"
 
-#: ../clutter/clutter-actor.c:6167
+#: ../clutter/clutter-actor.c:6256
 msgid "Position"
 msgstr "Posição"
 
-#: ../clutter/clutter-actor.c:6168
+#: ../clutter/clutter-actor.c:6257
 msgid "The position of the origin of the actor"
 msgstr "A posição da origem do ator"
 
-#: ../clutter/clutter-actor.c:6185 ../clutter/clutter-canvas.c:215
-#: ../clutter/clutter-grid-layout.c:1238
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:481
+#: ../clutter/clutter-actor.c:6274 ../clutter/clutter-canvas.c:247
+#: ../clutter/clutter-grid-layout.c:1239
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:474
 msgid "Width"
 msgstr "Largura"
 
-#: ../clutter/clutter-actor.c:6186
+#: ../clutter/clutter-actor.c:6275
 msgid "Width of the actor"
 msgstr "Largura do ator"
 
-#: ../clutter/clutter-actor.c:6204 ../clutter/clutter-canvas.c:231
-#: ../clutter/clutter-grid-layout.c:1245
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:497
+#: ../clutter/clutter-actor.c:6293 ../clutter/clutter-canvas.c:263
+#: ../clutter/clutter-grid-layout.c:1246
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:490
 msgid "Height"
 msgstr "Altura"
 
-#: ../clutter/clutter-actor.c:6205
+#: ../clutter/clutter-actor.c:6294
 msgid "Height of the actor"
 msgstr "Altura do ator"
 
-#: ../clutter/clutter-actor.c:6226
+#: ../clutter/clutter-actor.c:6315
 msgid "Size"
 msgstr "Largura"
 
-#: ../clutter/clutter-actor.c:6227
+#: ../clutter/clutter-actor.c:6316
 msgid "The size of the actor"
 msgstr "A largura do ator"
 
-#: ../clutter/clutter-actor.c:6245
+#: ../clutter/clutter-actor.c:6334
 msgid "Fixed X"
 msgstr "X fixo"
 
-#: ../clutter/clutter-actor.c:6246
+#: ../clutter/clutter-actor.c:6335
 msgid "Forced X position of the actor"
 msgstr "Forçando a posição X do ator"
 
-#: ../clutter/clutter-actor.c:6263
+#: ../clutter/clutter-actor.c:6352
 msgid "Fixed Y"
 msgstr "Y fixo"
 
-#: ../clutter/clutter-actor.c:6264
+#: ../clutter/clutter-actor.c:6353
 msgid "Forced Y position of the actor"
 msgstr "Forçando a posição Y do ator"
 
-#: ../clutter/clutter-actor.c:6279
+#: ../clutter/clutter-actor.c:6368
 msgid "Fixed position set"
 msgstr "Posição fixa definida"
 
-#: ../clutter/clutter-actor.c:6280
+#: ../clutter/clutter-actor.c:6369
 msgid "Whether to use fixed positioning for the actor"
 msgstr "Se usar posicionamento fixo para o ator"
 
-#: ../clutter/clutter-actor.c:6298
+#: ../clutter/clutter-actor.c:6387
 msgid "Min Width"
 msgstr "Largura mínima"
 
-#: ../clutter/clutter-actor.c:6299
+#: ../clutter/clutter-actor.c:6388
 msgid "Forced minimum width request for the actor"
 msgstr "Forçando pedido de largura mínima para o ator"
 
-#: ../clutter/clutter-actor.c:6317
+#: ../clutter/clutter-actor.c:6406
 msgid "Min Height"
 msgstr "Altura mínima"
 
-#: ../clutter/clutter-actor.c:6318
+#: ../clutter/clutter-actor.c:6407
 msgid "Forced minimum height request for the actor"
 msgstr "Forçando pedido de altura mínima para o ator"
 
-#: ../clutter/clutter-actor.c:6336
+#: ../clutter/clutter-actor.c:6425
 msgid "Natural Width"
 msgstr "Largura natural"
 
-#: ../clutter/clutter-actor.c:6337
+#: ../clutter/clutter-actor.c:6426
 msgid "Forced natural width request for the actor"
 msgstr "Forçando pedido de largura natural para o ator"
 
-#: ../clutter/clutter-actor.c:6355
+#: ../clutter/clutter-actor.c:6444
 msgid "Natural Height"
 msgstr "Altura natural"
 
-#: ../clutter/clutter-actor.c:6356
+#: ../clutter/clutter-actor.c:6445
 msgid "Forced natural height request for the actor"
 msgstr "Forçando pedido de altura natural para o ator"
 
-#: ../clutter/clutter-actor.c:6371
+#: ../clutter/clutter-actor.c:6460
 msgid "Minimum width set"
 msgstr "Largura mínima definida"
 
-#: ../clutter/clutter-actor.c:6372
+#: ../clutter/clutter-actor.c:6461
 msgid "Whether to use the min-width property"
 msgstr "Se usar a propriedade da largura mínima"
 
-#: ../clutter/clutter-actor.c:6386
+#: ../clutter/clutter-actor.c:6475
 msgid "Minimum height set"
 msgstr "Altura mínima definida"
 
-#: ../clutter/clutter-actor.c:6387
+#: ../clutter/clutter-actor.c:6476
 msgid "Whether to use the min-height property"
 msgstr "Se usar a propriedade de altura mínima"
 
-#: ../clutter/clutter-actor.c:6401
+#: ../clutter/clutter-actor.c:6490
 msgid "Natural width set"
 msgstr "Largura natural definida"
 
-#: ../clutter/clutter-actor.c:6402
+#: ../clutter/clutter-actor.c:6491
 msgid "Whether to use the natural-width property"
 msgstr "Se usar a propriedade de largura natural"
 
-#: ../clutter/clutter-actor.c:6416
+#: ../clutter/clutter-actor.c:6505
 msgid "Natural height set"
 msgstr "Altura natural definida"
 
-#: ../clutter/clutter-actor.c:6417
+#: ../clutter/clutter-actor.c:6506
 msgid "Whether to use the natural-height property"
 msgstr "Se usar a propriedade de altura natural"
 
-#: ../clutter/clutter-actor.c:6433
+#: ../clutter/clutter-actor.c:6522
 msgid "Allocation"
 msgstr "Posição"
 
-#: ../clutter/clutter-actor.c:6434
+#: ../clutter/clutter-actor.c:6523
 msgid "The actor's allocation"
 msgstr "Posição do ator"
 
-#: ../clutter/clutter-actor.c:6491
+#: ../clutter/clutter-actor.c:6580
 msgid "Request Mode"
 msgstr "Modo do pedido"
 
-#: ../clutter/clutter-actor.c:6492
+#: ../clutter/clutter-actor.c:6581
 msgid "The actor's request mode"
 msgstr "O modo do pedido do ator"
 
-#: ../clutter/clutter-actor.c:6516
+#: ../clutter/clutter-actor.c:6605
 msgid "Depth"
 msgstr "Profundidade"
 
-#: ../clutter/clutter-actor.c:6517
+#: ../clutter/clutter-actor.c:6606
 msgid "Position on the Z axis"
 msgstr "Posição no eixo Z"
 
-#: ../clutter/clutter-actor.c:6544
+#: ../clutter/clutter-actor.c:6633
 msgid "Z Position"
 msgstr "Posição Z"
 
-#: ../clutter/clutter-actor.c:6545
+#: ../clutter/clutter-actor.c:6634
 msgid "The actor's position on the Z axis"
 msgstr "A posição do ator no eixo Z"
 
-#: ../clutter/clutter-actor.c:6562
+#: ../clutter/clutter-actor.c:6651
 msgid "Opacity"
 msgstr "Opacidade"
 
-#: ../clutter/clutter-actor.c:6563
+#: ../clutter/clutter-actor.c:6652
 msgid "Opacity of an actor"
 msgstr "Opacidade do ator"
 
-#: ../clutter/clutter-actor.c:6583
+#: ../clutter/clutter-actor.c:6672
 msgid "Offscreen redirect"
 msgstr "Redirecionamento fora da tela"
 
-#: ../clutter/clutter-actor.c:6584
+#: ../clutter/clutter-actor.c:6673
 msgid "Flags controlling when to flatten the actor into a single image"
 msgstr "Sinalizadores controlando quando achatar o ator em uma única imagem"
 
-#: ../clutter/clutter-actor.c:6598
+#: ../clutter/clutter-actor.c:6687
 msgid "Visible"
 msgstr "Visibilidade"
 
-#: ../clutter/clutter-actor.c:6599
+#: ../clutter/clutter-actor.c:6688
 msgid "Whether the actor is visible or not"
 msgstr "Se o ator está visível ou não"
 
-#: ../clutter/clutter-actor.c:6613
+#: ../clutter/clutter-actor.c:6702
 msgid "Mapped"
 msgstr "Mapeado"
 
-#: ../clutter/clutter-actor.c:6614
+#: ../clutter/clutter-actor.c:6703
 msgid "Whether the actor will be painted"
 msgstr "Se o ator vai ser pintado"
 
-#: ../clutter/clutter-actor.c:6627
+#: ../clutter/clutter-actor.c:6716
 msgid "Realized"
 msgstr "Realizado"
 
-#: ../clutter/clutter-actor.c:6628
+#: ../clutter/clutter-actor.c:6717
 msgid "Whether the actor has been realized"
 msgstr "Se o ator foi realizado"
 
-#: ../clutter/clutter-actor.c:6643
+#: ../clutter/clutter-actor.c:6732
 msgid "Reactive"
 msgstr "Responsivo"
 
-#: ../clutter/clutter-actor.c:6644
+#: ../clutter/clutter-actor.c:6733
 msgid "Whether the actor is reactive to events"
 msgstr "Se o ator é responsivo aos eventos"
 
-#: ../clutter/clutter-actor.c:6655
+#: ../clutter/clutter-actor.c:6744
 msgid "Has Clip"
 msgstr "Possui corte"
 
-#: ../clutter/clutter-actor.c:6656
+#: ../clutter/clutter-actor.c:6745
 msgid "Whether the actor has a clip set"
 msgstr "Se o ator tem um corte definido"
 
-#: ../clutter/clutter-actor.c:6669
+#: ../clutter/clutter-actor.c:6758
 msgid "Clip"
 msgstr "Corte"
 
-#: ../clutter/clutter-actor.c:6670
+#: ../clutter/clutter-actor.c:6759
 msgid "The clip region for the actor"
 msgstr "A região do corte para o ator"
 
-#: ../clutter/clutter-actor.c:6689
+#: ../clutter/clutter-actor.c:6778
 msgid "Clip Rectangle"
 msgstr "Cortar retângulo"
 
-#: ../clutter/clutter-actor.c:6690
+#: ../clutter/clutter-actor.c:6779
 msgid "The visible region of the actor"
 msgstr "A região visível do ator"
 
-#: ../clutter/clutter-actor.c:6704 ../clutter/clutter-actor-meta.c:207
-#: ../clutter/clutter-binding-pool.c:319 ../clutter/clutter-input-device.c:258
+#: ../clutter/clutter-actor.c:6793 ../clutter/clutter-actor-meta.c:205
+#: ../clutter/clutter-binding-pool.c:319 ../clutter/clutter-input-device.c:247
 msgid "Name"
 msgstr "Nome"
 
-#: ../clutter/clutter-actor.c:6705
+#: ../clutter/clutter-actor.c:6794
 msgid "Name of the actor"
 msgstr "Nome do ator"
 
-#: ../clutter/clutter-actor.c:6726
+#: ../clutter/clutter-actor.c:6815
 msgid "Pivot Point"
 msgstr "Ponto pivô"
 
-#: ../clutter/clutter-actor.c:6727
+#: ../clutter/clutter-actor.c:6816
 msgid "The point around which the scaling and rotation occur"
 msgstr "O ponto sobre o qual ocorre o dimensionamento e rotação"
 
-#: ../clutter/clutter-actor.c:6745
+#: ../clutter/clutter-actor.c:6834
 msgid "Pivot Point Z"
 msgstr "Ponto pivô Z"
 
-#: ../clutter/clutter-actor.c:6746
+#: ../clutter/clutter-actor.c:6835
 msgid "Z component of the pivot point"
 msgstr "Componente Z do ponto pivô"
 
-#: ../clutter/clutter-actor.c:6764
+#: ../clutter/clutter-actor.c:6853
 msgid "Scale X"
 msgstr "Escala X"
 
-#: ../clutter/clutter-actor.c:6765
+#: ../clutter/clutter-actor.c:6854
 msgid "Scale factor on the X axis"
 msgstr "Fator da escala no eixo X"
 
-#: ../clutter/clutter-actor.c:6783
+#: ../clutter/clutter-actor.c:6872
 msgid "Scale Y"
 msgstr "Escala Y"
 
-#: ../clutter/clutter-actor.c:6784
+#: ../clutter/clutter-actor.c:6873
 msgid "Scale factor on the Y axis"
 msgstr "Fator da escala no eixo Y"
 
-#: ../clutter/clutter-actor.c:6802
+#: ../clutter/clutter-actor.c:6891
 msgid "Scale Z"
 msgstr "Escala Z"
 
-#: ../clutter/clutter-actor.c:6803
+#: ../clutter/clutter-actor.c:6892
 msgid "Scale factor on the Z axis"
 msgstr "Fator da escala no eixo Z"
 
-#: ../clutter/clutter-actor.c:6821
+#: ../clutter/clutter-actor.c:6910
 msgid "Scale Center X"
 msgstr "Escala X central"
 
-#: ../clutter/clutter-actor.c:6822
+#: ../clutter/clutter-actor.c:6911
 msgid "Horizontal scale center"
 msgstr "Centro da escala horizontal"
 
-#: ../clutter/clutter-actor.c:6840
+#: ../clutter/clutter-actor.c:6929
 msgid "Scale Center Y"
 msgstr "Escala Y central"
 
-#: ../clutter/clutter-actor.c:6841
+#: ../clutter/clutter-actor.c:6930
 msgid "Vertical scale center"
 msgstr "Escala central vertical"
 
-#: ../clutter/clutter-actor.c:6859
+#: ../clutter/clutter-actor.c:6948
 msgid "Scale Gravity"
 msgstr "Escala de gravidade"
 
-#: ../clutter/clutter-actor.c:6860
+#: ../clutter/clutter-actor.c:6949
 msgid "The center of scaling"
 msgstr "O centro do dimensionamento"
 
-#: ../clutter/clutter-actor.c:6878
+#: ../clutter/clutter-actor.c:6967
 msgid "Rotation Angle X"
 msgstr "Ângulo de rotação X"
 
-#: ../clutter/clutter-actor.c:6879
+#: ../clutter/clutter-actor.c:6968
 msgid "The rotation angle on the X axis"
 msgstr "O ângulo de rotação no eixo X"
 
-#: ../clutter/clutter-actor.c:6897
+#: ../clutter/clutter-actor.c:6986
 msgid "Rotation Angle Y"
 msgstr "Ângulo de rotação Y"
 
-#: ../clutter/clutter-actor.c:6898
+#: ../clutter/clutter-actor.c:6987
 msgid "The rotation angle on the Y axis"
 msgstr "O ângulo de rotação no eixo Y"
 
-#: ../clutter/clutter-actor.c:6916
+#: ../clutter/clutter-actor.c:7005
 msgid "Rotation Angle Z"
 msgstr "Ângulo de rotação Z"
 
-#: ../clutter/clutter-actor.c:6917
+#: ../clutter/clutter-actor.c:7006
 msgid "The rotation angle on the Z axis"
 msgstr "O ângulo de rotação no eixo Z"
 
-#: ../clutter/clutter-actor.c:6935
+#: ../clutter/clutter-actor.c:7024
 msgid "Rotation Center X"
 msgstr "Centro de rotação X"
 
-#: ../clutter/clutter-actor.c:6936
+#: ../clutter/clutter-actor.c:7025
 msgid "The rotation center on the X axis"
 msgstr "O centro de rotação no eixo X"
 
-#: ../clutter/clutter-actor.c:6953
+#: ../clutter/clutter-actor.c:7042
 msgid "Rotation Center Y"
 msgstr "Centro de rotação Y"
 
-#: ../clutter/clutter-actor.c:6954
+#: ../clutter/clutter-actor.c:7043
 msgid "The rotation center on the Y axis"
 msgstr "O centro de rotação no eixo Y"
 
-#: ../clutter/clutter-actor.c:6971
+#: ../clutter/clutter-actor.c:7060
 msgid "Rotation Center Z"
 msgstr "Centro de rotação Z"
 
-#: ../clutter/clutter-actor.c:6972
+#: ../clutter/clutter-actor.c:7061
 msgid "The rotation center on the Z axis"
 msgstr "O centro de rotação no eixo Z"
 
-#: ../clutter/clutter-actor.c:6989
+#: ../clutter/clutter-actor.c:7078
 msgid "Rotation Center Z Gravity"
 msgstr "Centro de rotação de gravidade Z"
 
-#: ../clutter/clutter-actor.c:6990
+#: ../clutter/clutter-actor.c:7079
 msgid "Center point for rotation around the Z axis"
 msgstr "Ponto central para a rotação em torno do eixo Z"
 
-#: ../clutter/clutter-actor.c:7018
+#: ../clutter/clutter-actor.c:7107
 msgid "Anchor X"
 msgstr "Âncora X"
 
-#: ../clutter/clutter-actor.c:7019
+#: ../clutter/clutter-actor.c:7108
 msgid "X coordinate of the anchor point"
 msgstr "Coordenada X do ponto de ancoragem"
 
-#: ../clutter/clutter-actor.c:7047
+#: ../clutter/clutter-actor.c:7136
 msgid "Anchor Y"
 msgstr "Âncora Y"
 
-#: ../clutter/clutter-actor.c:7048
+#: ../clutter/clutter-actor.c:7137
 msgid "Y coordinate of the anchor point"
 msgstr "Coordenada Y do ponto de ancoragem"
 
-#: ../clutter/clutter-actor.c:7075
+#: ../clutter/clutter-actor.c:7164
 msgid "Anchor Gravity"
 msgstr "Gravidade de âncora"
 
-#: ../clutter/clutter-actor.c:7076
+#: ../clutter/clutter-actor.c:7165
 msgid "The anchor point as a ClutterGravity"
 msgstr "O ponto de ancoragem como um ClutterGravity"
 
-#: ../clutter/clutter-actor.c:7095
+#: ../clutter/clutter-actor.c:7184
 msgid "Translation X"
 msgstr "Translação X"
 
-#: ../clutter/clutter-actor.c:7096
+#: ../clutter/clutter-actor.c:7185
 msgid "Translation along the X axis"
 msgstr "Translação ao longo do eixo X"
 
-#: ../clutter/clutter-actor.c:7115
+#: ../clutter/clutter-actor.c:7204
 msgid "Translation Y"
 msgstr "Translação Y"
 
-#: ../clutter/clutter-actor.c:7116
+#: ../clutter/clutter-actor.c:7205
 msgid "Translation along the Y axis"
 msgstr "Translação ao longo do eixo Y"
 
-#: ../clutter/clutter-actor.c:7135
+#: ../clutter/clutter-actor.c:7224
 msgid "Translation Z"
 msgstr "Translação Z"
 
-#: ../clutter/clutter-actor.c:7136
+#: ../clutter/clutter-actor.c:7225
 msgid "Translation along the Z axis"
 msgstr "Translação ao longo do eixo Z"
 
-#: ../clutter/clutter-actor.c:7166
+#: ../clutter/clutter-actor.c:7255
 msgid "Transform"
 msgstr "Transformar"
 
-#: ../clutter/clutter-actor.c:7167
+#: ../clutter/clutter-actor.c:7256
 msgid "Transformation matrix"
 msgstr "Matriz de transformação"
 
-#: ../clutter/clutter-actor.c:7182
+#: ../clutter/clutter-actor.c:7271
 msgid "Transform Set"
 msgstr "Conjunto de transformação"
 
-#: ../clutter/clutter-actor.c:7183
+#: ../clutter/clutter-actor.c:7272
 msgid "Whether the transform property is set"
 msgstr "Se a propriedade de transformação está definida"
 
-#: ../clutter/clutter-actor.c:7204
+#: ../clutter/clutter-actor.c:7293
 msgid "Child Transform"
 msgstr "Transformação filha"
 
-#: ../clutter/clutter-actor.c:7205
+#: ../clutter/clutter-actor.c:7294
 msgid "Children transformation matrix"
 msgstr "Matriz de transformação filha"
 
-#: ../clutter/clutter-actor.c:7220
+#: ../clutter/clutter-actor.c:7309
 msgid "Child Transform Set"
 msgstr "Conjunto de transformação filha"
 
-#: ../clutter/clutter-actor.c:7221
+#: ../clutter/clutter-actor.c:7310
 msgid "Whether the child-transform property is set"
 msgstr "Se a propriedade de transformação filha está definida"
 
-#: ../clutter/clutter-actor.c:7238
+#: ../clutter/clutter-actor.c:7327
 msgid "Show on set parent"
 msgstr "Mostra no pai definido"
 
-#: ../clutter/clutter-actor.c:7239
+#: ../clutter/clutter-actor.c:7328
 msgid "Whether the actor is shown when parented"
 msgstr "Se o ator é mostrado quando aparentado"
 
-#: ../clutter/clutter-actor.c:7256
+#: ../clutter/clutter-actor.c:7345
 msgid "Clip to Allocation"
 msgstr "Corte para posição"
 
-#: ../clutter/clutter-actor.c:7257
+#: ../clutter/clutter-actor.c:7346
 msgid "Sets the clip region to track the actor's allocation"
 msgstr "Define a região do corte para rastrear a posição do ator"
 
-#: ../clutter/clutter-actor.c:7270
+#: ../clutter/clutter-actor.c:7359
 msgid "Text Direction"
 msgstr "Direção do texto"
 
-#: ../clutter/clutter-actor.c:7271
+#: ../clutter/clutter-actor.c:7360
 msgid "Direction of the text"
 msgstr "Direção do texto"
 
-#: ../clutter/clutter-actor.c:7286
+#: ../clutter/clutter-actor.c:7375
 msgid "Has Pointer"
 msgstr "Possui indicador"
 
-#: ../clutter/clutter-actor.c:7287
+#: ../clutter/clutter-actor.c:7376
 msgid "Whether the actor contains the pointer of an input device"
 msgstr "Se o ator contém o indicador de um dispositivo de entrada"
 
-#: ../clutter/clutter-actor.c:7300
+#: ../clutter/clutter-actor.c:7389
 msgid "Actions"
 msgstr "Ações"
 
-#: ../clutter/clutter-actor.c:7301
+#: ../clutter/clutter-actor.c:7390
 msgid "Adds an action to the actor"
 msgstr "Adiciona uma ação ao ator"
 
-#: ../clutter/clutter-actor.c:7314
+#: ../clutter/clutter-actor.c:7403
 msgid "Constraints"
 msgstr "Restrições"
 
-#: ../clutter/clutter-actor.c:7315
+#: ../clutter/clutter-actor.c:7404
 msgid "Adds a constraint to the actor"
 msgstr "Adiciona uma restrição ao ator"
 
-#: ../clutter/clutter-actor.c:7328
+#: ../clutter/clutter-actor.c:7417
 msgid "Effect"
 msgstr "Efeito"
 
-#: ../clutter/clutter-actor.c:7329
+#: ../clutter/clutter-actor.c:7418
 msgid "Add an effect to be applied on the actor"
 msgstr "Adiciona um efeito a ser aplicado no ator"
 
-#: ../clutter/clutter-actor.c:7343
+#: ../clutter/clutter-actor.c:7432
 msgid "Layout Manager"
 msgstr "Gerenciador de disposição"
 
-#: ../clutter/clutter-actor.c:7344
+#: ../clutter/clutter-actor.c:7433
 msgid "The object controlling the layout of an actor's children"
 msgstr "O objeto que controla a disposição dos filhos de um ator"
 
-#: ../clutter/clutter-actor.c:7358
+#: ../clutter/clutter-actor.c:7447
 msgid "X Expand"
 msgstr "Expandir X"
 
-#: ../clutter/clutter-actor.c:7359
+#: ../clutter/clutter-actor.c:7448
 msgid "Whether extra horizontal space should be assigned to the actor"
 msgstr "Se um espaço horizontal adicional deve ser desiginado ao ator"
 
-#: ../clutter/clutter-actor.c:7374
+#: ../clutter/clutter-actor.c:7463
 msgid "Y Expand"
 msgstr "Expandir Y"
 
-#: ../clutter/clutter-actor.c:7375
+#: ../clutter/clutter-actor.c:7464
 msgid "Whether extra vertical space should be assigned to the actor"
 msgstr "Se um espaço vertical adicional deve ser desiginado ao ator"
 
-#: ../clutter/clutter-actor.c:7391
+#: ../clutter/clutter-actor.c:7480
 msgid "X Alignment"
 msgstr "Alinhamento X"
 
-#: ../clutter/clutter-actor.c:7392
+#: ../clutter/clutter-actor.c:7481
 msgid "The alignment of the actor on the X axis within its allocation"
 msgstr "O alinhamento do ator na base X dentro de sua alocação"
 
-#: ../clutter/clutter-actor.c:7407
+#: ../clutter/clutter-actor.c:7496
 msgid "Y Alignment"
 msgstr "Alinhamento Y"
 
-#: ../clutter/clutter-actor.c:7408
+#: ../clutter/clutter-actor.c:7497
 msgid "The alignment of the actor on the Y axis within its allocation"
 msgstr "O alinhamento do ator na base Y dentro de sua alocação"
 
-#: ../clutter/clutter-actor.c:7427
+#: ../clutter/clutter-actor.c:7516
 msgid "Margin Top"
 msgstr "Margem superior"
 
-#: ../clutter/clutter-actor.c:7428
+#: ../clutter/clutter-actor.c:7517
 msgid "Extra space at the top"
 msgstr "Espaço extra no topo"
 
-#: ../clutter/clutter-actor.c:7449
+#: ../clutter/clutter-actor.c:7538
 msgid "Margin Bottom"
 msgstr "Margem inferior"
 
-#: ../clutter/clutter-actor.c:7450
+#: ../clutter/clutter-actor.c:7539
 msgid "Extra space at the bottom"
 msgstr "Espaço extra embaixo"
 
-#: ../clutter/clutter-actor.c:7471
+#: ../clutter/clutter-actor.c:7560
 msgid "Margin Left"
 msgstr "Margem esquerda"
 
-#: ../clutter/clutter-actor.c:7472
+#: ../clutter/clutter-actor.c:7561
 msgid "Extra space at the left"
 msgstr "Espaço extra a esquerda"
 
-#: ../clutter/clutter-actor.c:7493
+#: ../clutter/clutter-actor.c:7582
 msgid "Margin Right"
 msgstr "Margem direita"
 
-#: ../clutter/clutter-actor.c:7494
+#: ../clutter/clutter-actor.c:7583
 msgid "Extra space at the right"
 msgstr "Espaço extra a direita"
 
-#: ../clutter/clutter-actor.c:7510
+#: ../clutter/clutter-actor.c:7599
 msgid "Background Color Set"
 msgstr "Cor de fundo definida"
 
-#: ../clutter/clutter-actor.c:7511 ../clutter/deprecated/clutter-box.c:275
+#: ../clutter/clutter-actor.c:7600 ../clutter/deprecated/clutter-box.c:271
 msgid "Whether the background color is set"
 msgstr "Se a cor de fundo está definida"
 
-#: ../clutter/clutter-actor.c:7527
+#: ../clutter/clutter-actor.c:7616
 msgid "Background color"
 msgstr "Cor de fundo"
 
-#: ../clutter/clutter-actor.c:7528
+#: ../clutter/clutter-actor.c:7617
 msgid "The actor's background color"
 msgstr "A cor de fundo do ator"
 
-#: ../clutter/clutter-actor.c:7543
+#: ../clutter/clutter-actor.c:7632
 msgid "First Child"
 msgstr "Primeiro filho"
 
-#: ../clutter/clutter-actor.c:7544
+#: ../clutter/clutter-actor.c:7633
 msgid "The actor's first child"
 msgstr "O primeiro filho do ator"
 
-#: ../clutter/clutter-actor.c:7557
+#: ../clutter/clutter-actor.c:7646
 msgid "Last Child"
 msgstr "Último filho"
 
-#: ../clutter/clutter-actor.c:7558
+#: ../clutter/clutter-actor.c:7647
 msgid "The actor's last child"
 msgstr "O último filho do ator"
 
-#: ../clutter/clutter-actor.c:7572
+#: ../clutter/clutter-actor.c:7661
 msgid "Content"
 msgstr "Conteúdo"
 
-#: ../clutter/clutter-actor.c:7573
+#: ../clutter/clutter-actor.c:7662
 msgid "Delegate object for painting the actor's content"
 msgstr "Objeto designado para pintar o conteúdo do ator"
 
-#: ../clutter/clutter-actor.c:7598
+#: ../clutter/clutter-actor.c:7687
 msgid "Content Gravity"
 msgstr "Gravidade do conteúdo"
 
-#: ../clutter/clutter-actor.c:7599
+#: ../clutter/clutter-actor.c:7688
 msgid "Alignment of the actor's content"
 msgstr "Alinhamento do conteúdo do ator"
 
-#: ../clutter/clutter-actor.c:7619
+#: ../clutter/clutter-actor.c:7708
 msgid "Content Box"
 msgstr "Box do conteúdo"
 
-#: ../clutter/clutter-actor.c:7620
+#: ../clutter/clutter-actor.c:7709
 msgid "The bounding box of the actor's content"
 msgstr "O box que contorna o conteúdo"
 
-#: ../clutter/clutter-actor.c:7628
+#: ../clutter/clutter-actor.c:7717
 msgid "Minification Filter"
 msgstr "Filtro de minificação"
 
-#: ../clutter/clutter-actor.c:7629
+#: ../clutter/clutter-actor.c:7718
 msgid "The filter used when reducing the size of the content"
 msgstr "Filtro usado quando reduzir o tamanho do conteúdo"
 
-#: ../clutter/clutter-actor.c:7636
+#: ../clutter/clutter-actor.c:7725
 msgid "Magnification Filter"
 msgstr "Filtro de ampliação"
 
-#: ../clutter/clutter-actor.c:7637
+#: ../clutter/clutter-actor.c:7726
 msgid "The filter used when increasing the size of the content"
 msgstr "Filtro usado quando aumentar o tamanho do conteúdo"
 
-#: ../clutter/clutter-actor.c:7651
+#: ../clutter/clutter-actor.c:7740
 msgid "Content Repeat"
 msgstr "Repetição de conteúdo"
 
-#: ../clutter/clutter-actor.c:7652
+#: ../clutter/clutter-actor.c:7741
 msgid "The repeat policy for the actor's content"
 msgstr "A política de repetição para o conteúdo do ator"
 
-#: ../clutter/clutter-actor-meta.c:193 ../clutter/clutter-child-meta.c:142
+#: ../clutter/clutter-actor-meta.c:191 ../clutter/clutter-child-meta.c:142
 msgid "Actor"
 msgstr "Ator"
 
-#: ../clutter/clutter-actor-meta.c:194
+#: ../clutter/clutter-actor-meta.c:192
 msgid "The actor attached to the meta"
 msgstr "O ator ligado ao meta"
 
-#: ../clutter/clutter-actor-meta.c:208
+#: ../clutter/clutter-actor-meta.c:206
 msgid "The name of the meta"
 msgstr "O nome do meta"
 
-#: ../clutter/clutter-actor-meta.c:221 ../clutter/clutter-input-device.c:337
-#: ../clutter/deprecated/clutter-shader.c:313
+#: ../clutter/clutter-actor-meta.c:219 ../clutter/clutter-input-device.c:326
+#: ../clutter/deprecated/clutter-shader.c:309
 msgid "Enabled"
 msgstr "Habilitado"
 
-#: ../clutter/clutter-actor-meta.c:222
+#: ../clutter/clutter-actor-meta.c:220
 msgid "Whether the meta is enabled"
 msgstr "Se o meta está habilitado"
 
 #: ../clutter/clutter-align-constraint.c:279
-#: ../clutter/clutter-bind-constraint.c:358 ../clutter/clutter-clone.c:345
+#: ../clutter/clutter-bind-constraint.c:358 ../clutter/clutter-clone.c:341
 #: ../clutter/clutter-snap-constraint.c:321
 msgid "Source"
 msgstr "Fonte"
@@ -731,11 +732,11 @@ msgstr "Fator"
 msgid "The alignment factor, between 0.0 and 1.0"
 msgstr "O fator de alinhamento entre 0,0 e 1,0"
 
-#: ../clutter/clutter-backend.c:379
+#: ../clutter/clutter-backend.c:380
 msgid "Unable to initialize the Clutter backend"
 msgstr "Não foi possível inicializar o backend do Clutter"
 
-#: ../clutter/clutter-backend.c:453
+#: ../clutter/clutter-backend.c:454
 #, c-format
 msgid "The backend of type '%s' does not support creating multiple stages"
 msgstr "O backend do tipo \"%s\" não suporta a criação de múltiplos estágios"
@@ -766,49 +767,53 @@ msgstr "O deslocamento em pixels para aplicar ao vínculo"
 msgid "The unique name of the binding pool"
 msgstr "O nome original de vinculação do grupo"
 
-#: ../clutter/clutter-bin-layout.c:240 ../clutter/clutter-bin-layout.c:649
-#: ../clutter/clutter-box-layout.c:390 ../clutter/clutter-table-layout.c:610
+#: ../clutter/clutter-bin-layout.c:238 ../clutter/clutter-bin-layout.c:651
+#: ../clutter/clutter-box-layout.c:388
+#: ../clutter/deprecated/clutter-table-layout.c:610
 msgid "Horizontal Alignment"
 msgstr "Alinhamento horizontal"
 
-#: ../clutter/clutter-bin-layout.c:241
+#: ../clutter/clutter-bin-layout.c:239
 msgid "Horizontal alignment for the actor inside the layout manager"
 msgstr "Alinhamento horizontal para o ator dentro do gerenciador de disposição"
 
-#: ../clutter/clutter-bin-layout.c:249 ../clutter/clutter-bin-layout.c:669
-#: ../clutter/clutter-box-layout.c:399 ../clutter/clutter-table-layout.c:625
+#: ../clutter/clutter-bin-layout.c:247 ../clutter/clutter-bin-layout.c:671
+#: ../clutter/clutter-box-layout.c:397
+#: ../clutter/deprecated/clutter-table-layout.c:625
 msgid "Vertical Alignment"
 msgstr "Alinhamento vertical"
 
-#: ../clutter/clutter-bin-layout.c:250
+#: ../clutter/clutter-bin-layout.c:248
 msgid "Vertical alignment for the actor inside the layout manager"
 msgstr "O alinhamento vertical para o ator dentro do gerenciador de disposição"
 
-#: ../clutter/clutter-bin-layout.c:650
+#: ../clutter/clutter-bin-layout.c:652
 msgid "Default horizontal alignment for the actors inside the layout manager"
 msgstr ""
 "Alinhamento horizontal padrão para os atores dentro do gerenciador de "
 "disposição"
 
-#: ../clutter/clutter-bin-layout.c:670
+#: ../clutter/clutter-bin-layout.c:672
 msgid "Default vertical alignment for the actors inside the layout manager"
 msgstr ""
 "Alinhamento vertical padrão para os atores dentro do gerenciador de "
 "disposição"
 
-#: ../clutter/clutter-box-layout.c:365
+#: ../clutter/clutter-box-layout.c:363
 msgid "Expand"
 msgstr "Ampliar"
 
-#: ../clutter/clutter-box-layout.c:366
+#: ../clutter/clutter-box-layout.c:364
 msgid "Allocate extra space for the child"
 msgstr "Alocar espaço adicional para a criança"
 
-#: ../clutter/clutter-box-layout.c:372 ../clutter/clutter-table-layout.c:589
+#: ../clutter/clutter-box-layout.c:370
+#: ../clutter/deprecated/clutter-table-layout.c:589
 msgid "Horizontal Fill"
 msgstr "Preenchimento horizontal"
 
-#: ../clutter/clutter-box-layout.c:373 ../clutter/clutter-table-layout.c:590
+#: ../clutter/clutter-box-layout.c:371
+#: ../clutter/deprecated/clutter-table-layout.c:590
 msgid ""
 "Whether the child should receive priority when the container is allocating "
 "spare space on the horizontal axis"
@@ -816,11 +821,13 @@ msgstr ""
 "Se a criança deve receber prioridade quando o recipiente está alocando "
 "espaço livre no eixo horizontal"
 
-#: ../clutter/clutter-box-layout.c:381 ../clutter/clutter-table-layout.c:596
+#: ../clutter/clutter-box-layout.c:379
+#: ../clutter/deprecated/clutter-table-layout.c:596
 msgid "Vertical Fill"
 msgstr "Preenchimento vertical"
 
-#: ../clutter/clutter-box-layout.c:382 ../clutter/clutter-table-layout.c:597
+#: ../clutter/clutter-box-layout.c:380
+#: ../clutter/deprecated/clutter-table-layout.c:597
 msgid ""
 "Whether the child should receive priority when the container is allocating "
 "spare space on the vertical axis"
@@ -828,80 +835,88 @@ msgstr ""
 "Se a criança deve receber prioridade quando o recipiente está alocando "
 "espaço livre no eixo vertical"
 
-#: ../clutter/clutter-box-layout.c:391 ../clutter/clutter-table-layout.c:611
+#: ../clutter/clutter-box-layout.c:389
+#: ../clutter/deprecated/clutter-table-layout.c:611
 msgid "Horizontal alignment of the actor within the cell"
 msgstr "Alinhamento horizontal do ator dentro da célula"
 
-#: ../clutter/clutter-box-layout.c:400 ../clutter/clutter-table-layout.c:626
+#: ../clutter/clutter-box-layout.c:398
+#: ../clutter/deprecated/clutter-table-layout.c:626
 msgid "Vertical alignment of the actor within the cell"
 msgstr "Alinhamento vertical do ator dentro da célula"
 
-#: ../clutter/clutter-box-layout.c:1365
+#: ../clutter/clutter-box-layout.c:1359
 msgid "Vertical"
 msgstr "Vertical"
 
-#: ../clutter/clutter-box-layout.c:1366
+#: ../clutter/clutter-box-layout.c:1360
 msgid "Whether the layout should be vertical, rather than horizontal"
 msgstr "Se a disposição deve ser vertical, em vez de horizontal"
 
-#: ../clutter/clutter-box-layout.c:1383 ../clutter/clutter-flow-layout.c:890
-#: ../clutter/clutter-grid-layout.c:1547
+#: ../clutter/clutter-box-layout.c:1377 ../clutter/clutter-flow-layout.c:942
+#: ../clutter/clutter-grid-layout.c:1549
 msgid "Orientation"
 msgstr "Orientação"
 
-#: ../clutter/clutter-box-layout.c:1384 ../clutter/clutter-flow-layout.c:891
-#: ../clutter/clutter-grid-layout.c:1548
+#: ../clutter/clutter-box-layout.c:1378 ../clutter/clutter-flow-layout.c:943
+#: ../clutter/clutter-grid-layout.c:1550
 msgid "The orientation of the layout"
 msgstr "A orientação da disposição"
 
-#: ../clutter/clutter-box-layout.c:1400 ../clutter/clutter-flow-layout.c:906
+#: ../clutter/clutter-box-layout.c:1394 ../clutter/clutter-flow-layout.c:958
 msgid "Homogeneous"
 msgstr "Homogêneo"
 
-#: ../clutter/clutter-box-layout.c:1401
+#: ../clutter/clutter-box-layout.c:1395
 msgid ""
 "Whether the layout should be homogeneous, i.e. all childs get the same size"
 msgstr ""
 "Se a disposição deve ser homogênea, ou seja, todas as crianças ficam do "
 "mesmo tamanho"
 
-#: ../clutter/clutter-box-layout.c:1416
+#: ../clutter/clutter-box-layout.c:1410
 msgid "Pack Start"
 msgstr "Empacotamento inicial"
 
-#: ../clutter/clutter-box-layout.c:1417
+#: ../clutter/clutter-box-layout.c:1411
 msgid "Whether to pack items at the start of the box"
 msgstr "Se empacotar itens no início da caixa"
 
-#: ../clutter/clutter-box-layout.c:1430
+#: ../clutter/clutter-box-layout.c:1424
 msgid "Spacing"
 msgstr "Espaçamento"
 
-#: ../clutter/clutter-box-layout.c:1431
+#: ../clutter/clutter-box-layout.c:1425
 msgid "Spacing between children"
 msgstr "Espaçamento entre as crianças"
 
-#: ../clutter/clutter-box-layout.c:1448 ../clutter/clutter-table-layout.c:1675
+#: ../clutter/clutter-box-layout.c:1442
+#: ../clutter/deprecated/clutter-table-layout.c:1677
 msgid "Use Animations"
 msgstr "Usar animações"
 
-#: ../clutter/clutter-box-layout.c:1449 ../clutter/clutter-table-layout.c:1676
+#: ../clutter/clutter-box-layout.c:1443
+#: ../clutter/deprecated/clutter-table-layout.c:1678
 msgid "Whether layout changes should be animated"
 msgstr "Se as alterações da disposição devem ser animados"
 
-#: ../clutter/clutter-box-layout.c:1473 ../clutter/clutter-table-layout.c:1700
+#: ../clutter/clutter-box-layout.c:1467
+#: ../clutter/deprecated/clutter-table-layout.c:1702
 msgid "Easing Mode"
 msgstr "Modo de liberdade"
 
-#: ../clutter/clutter-box-layout.c:1474 ../clutter/clutter-table-layout.c:1701
+#: ../clutter/clutter-box-layout.c:1468
+#: ../clutter/deprecated/clutter-table-layout.c:1703
 msgid "The easing mode of the animations"
 msgstr "O modo de liberdade das animações"
 
-#: ../clutter/clutter-box-layout.c:1494 ../clutter/clutter-table-layout.c:1721
+#: ../clutter/clutter-box-layout.c:1488
+#: ../clutter/deprecated/clutter-table-layout.c:1723
 msgid "Easing Duration"
 msgstr "Duração de liberdade"
 
-#: ../clutter/clutter-box-layout.c:1495 ../clutter/clutter-table-layout.c:1722
+#: ../clutter/clutter-box-layout.c:1489
+#: ../clutter/deprecated/clutter-table-layout.c:1724
 msgid "The duration of the animations"
 msgstr "A duração das animações"
 
@@ -921,14 +936,30 @@ msgstr "Contraste"
 msgid "The contrast change to apply"
 msgstr "A mudança de contraste para aplicar"
 
-#: ../clutter/clutter-canvas.c:216
+#: ../clutter/clutter-canvas.c:248
 msgid "The width of the canvas"
 msgstr "A largura do canvas"
 
-#: ../clutter/clutter-canvas.c:232
+#: ../clutter/clutter-canvas.c:264
 msgid "The height of the canvas"
 msgstr "A altura do canvas"
 
+#: ../clutter/clutter-canvas.c:283
+msgid "Scale Factor Set"
+msgstr "Fator de escala definido"
+
+#: ../clutter/clutter-canvas.c:284
+msgid "Whether the scale-factor property is set"
+msgstr "Se a propriedade de fator de escala está definida"
+
+#: ../clutter/clutter-canvas.c:305
+msgid "Scale Factor"
+msgstr "Fator de escala"
+
+#: ../clutter/clutter-canvas.c:306
+msgid "The scaling factor for the surface"
+msgstr "O fator de escala da superfície"
+
 #: ../clutter/clutter-child-meta.c:127
 msgid "Container"
 msgstr "Recipiente"
@@ -941,40 +972,40 @@ msgstr "O recipiente que criou estes dados"
 msgid "The actor wrapped by this data"
 msgstr "O ator envolvido por estes dados"
 
-#: ../clutter/clutter-click-action.c:546
+#: ../clutter/clutter-click-action.c:586
 msgid "Pressed"
 msgstr "Pressionado"
 
-#: ../clutter/clutter-click-action.c:547
+#: ../clutter/clutter-click-action.c:587
 msgid "Whether the clickable should be in pressed state"
 msgstr "Se o clicável deve estar em um estado pressionado"
 
-#: ../clutter/clutter-click-action.c:560
+#: ../clutter/clutter-click-action.c:600
 msgid "Held"
 msgstr "Seguro"
 
-#: ../clutter/clutter-click-action.c:561
+#: ../clutter/clutter-click-action.c:601
 msgid "Whether the clickable has a grab"
 msgstr "Se o clicável tem uma garra"
 
-#: ../clutter/clutter-click-action.c:578 ../clutter/clutter-settings.c:599
+#: ../clutter/clutter-click-action.c:618 ../clutter/clutter-settings.c:653
 msgid "Long Press Duration"
 msgstr "Duração de pressionamento prolongado"
 
-#: ../clutter/clutter-click-action.c:579
+#: ../clutter/clutter-click-action.c:619
 msgid "The minimum duration of a long press to recognize the gesture"
 msgstr ""
 "A duração mínima de um pressionamento prolongado para reconhecer um gesto"
 
-#: ../clutter/clutter-click-action.c:597
+#: ../clutter/clutter-click-action.c:637
 msgid "Long Press Threshold"
 msgstr "Limite de pressionamento prolongado"
 
-#: ../clutter/clutter-click-action.c:598
+#: ../clutter/clutter-click-action.c:638
 msgid "The maximum threshold before a long press is cancelled"
 msgstr "O limite máximo antes que um pressionamento prolongado seja cancelado"
 
-#: ../clutter/clutter-clone.c:346
+#: ../clutter/clutter-clone.c:342
 msgid "Specifies the actor to be cloned"
 msgstr "Especifica o ator a ser clonado"
 
@@ -986,27 +1017,27 @@ msgstr "Matiz"
 msgid "The tint to apply"
 msgstr "A matiz a aplicar"
 
-#: ../clutter/clutter-deform-effect.c:588
+#: ../clutter/clutter-deform-effect.c:592
 msgid "Horizontal Tiles"
 msgstr "Ladrilhos horizontais"
 
-#: ../clutter/clutter-deform-effect.c:589
+#: ../clutter/clutter-deform-effect.c:593
 msgid "The number of horizontal tiles"
 msgstr "O número de ladrilhos horizontais"
 
-#: ../clutter/clutter-deform-effect.c:604
+#: ../clutter/clutter-deform-effect.c:608
 msgid "Vertical Tiles"
 msgstr "Ladrilhos verticais"
 
-#: ../clutter/clutter-deform-effect.c:605
+#: ../clutter/clutter-deform-effect.c:609
 msgid "The number of vertical tiles"
 msgstr "O número de ladrilhos verticais"
 
-#: ../clutter/clutter-deform-effect.c:622
+#: ../clutter/clutter-deform-effect.c:626
 msgid "Back Material"
 msgstr "Material de fundo"
 
-#: ../clutter/clutter-deform-effect.c:623
+#: ../clutter/clutter-deform-effect.c:627
 msgid "The material to be used when painting the back of the actor"
 msgstr "O material a ser usado quando pintar o fundo do ator"
 
@@ -1014,259 +1045,301 @@ msgstr "O material a ser usado quando pintar o fundo do ator"
 msgid "The desaturation factor"
 msgstr "O fator de dessaturação"
 
-#: ../clutter/clutter-device-manager.c:131
-#: ../clutter/clutter-input-device.c:366
-#: ../clutter/x11/clutter-keymap-x11.c:316
+#: ../clutter/clutter-device-manager.c:127
+#: ../clutter/clutter-input-device.c:355
+#: ../clutter/x11/clutter-keymap-x11.c:321
 msgid "Backend"
 msgstr "Backend"
 
-#: ../clutter/clutter-device-manager.c:132
+#: ../clutter/clutter-device-manager.c:128
 msgid "The ClutterBackend of the device manager"
 msgstr "O ClutterBackend do gerenciador de dispositivos"
 
-#: ../clutter/clutter-drag-action.c:709
+#: ../clutter/clutter-drag-action.c:741
 msgid "Horizontal Drag Threshold"
 msgstr "Limite de arrasto horizontal"
 
-#: ../clutter/clutter-drag-action.c:710
+#: ../clutter/clutter-drag-action.c:742
 msgid "The horizontal amount of pixels required to start dragging"
 msgstr "O número horizontal de pixels requerido para iniciar um arrasto"
 
-#: ../clutter/clutter-drag-action.c:737
+#: ../clutter/clutter-drag-action.c:769
 msgid "Vertical Drag Threshold"
 msgstr "Limite de arrasto vertical"
 
-#: ../clutter/clutter-drag-action.c:738
+#: ../clutter/clutter-drag-action.c:770
 msgid "The vertical amount of pixels required to start dragging"
 msgstr "O número vertical de pixels requerido para iniciar um arrasto"
 
-#: ../clutter/clutter-drag-action.c:759
+#: ../clutter/clutter-drag-action.c:791
 msgid "Drag Handle"
 msgstr "Barra de arrasto"
 
-#: ../clutter/clutter-drag-action.c:760
+#: ../clutter/clutter-drag-action.c:792
 msgid "The actor that is being dragged"
 msgstr "O ator que está sendo arrastado"
 
-#: ../clutter/clutter-drag-action.c:773
+#: ../clutter/clutter-drag-action.c:805
 msgid "Drag Axis"
 msgstr "Eixo de arrasto"
 
-#: ../clutter/clutter-drag-action.c:774
+#: ../clutter/clutter-drag-action.c:806
 msgid "Constraints the dragging to an axis"
 msgstr "Restringe o arrasto em um eixo"
 
-#: ../clutter/clutter-drag-action.c:790
+#: ../clutter/clutter-drag-action.c:822
 msgid "Drag Area"
 msgstr "Área de arrasto"
 
-#: ../clutter/clutter-drag-action.c:791
+#: ../clutter/clutter-drag-action.c:823
 msgid "Constrains the dragging to a rectangle"
 msgstr "Restringe o arrasto em um retângulo"
 
-#: ../clutter/clutter-drag-action.c:804
+#: ../clutter/clutter-drag-action.c:836
 msgid "Drag Area Set"
 msgstr "Conjunto de área de arrasto"
 
-#: ../clutter/clutter-drag-action.c:805
+#: ../clutter/clutter-drag-action.c:837
 msgid "Whether the drag area is set"
 msgstr "Se a área de arrasto está definida"
 
-#: ../clutter/clutter-flow-layout.c:907
+#: ../clutter/clutter-flow-layout.c:959
 msgid "Whether each item should receive the same allocation"
 msgstr "Se cada item deve receber a mesma posição"
 
-#: ../clutter/clutter-flow-layout.c:922 ../clutter/clutter-table-layout.c:1637
+#: ../clutter/clutter-flow-layout.c:974
+#: ../clutter/deprecated/clutter-table-layout.c:1637
 msgid "Column Spacing"
 msgstr "Espaçamento de colunas"
 
-#: ../clutter/clutter-flow-layout.c:923
+#: ../clutter/clutter-flow-layout.c:975
 msgid "The spacing between columns"
 msgstr "O espaçamento entre colunas"
 
-#: ../clutter/clutter-flow-layout.c:939 ../clutter/clutter-table-layout.c:1651
+#: ../clutter/clutter-flow-layout.c:991
+#: ../clutter/deprecated/clutter-table-layout.c:1653
 msgid "Row Spacing"
 msgstr "Espaçamento de linhas"
 
-#: ../clutter/clutter-flow-layout.c:940
+#: ../clutter/clutter-flow-layout.c:992
 msgid "The spacing between rows"
 msgstr "O espaçamento entre linhas"
 
-#: ../clutter/clutter-flow-layout.c:954
+#: ../clutter/clutter-flow-layout.c:1006
 msgid "Minimum Column Width"
 msgstr "Largura mínima da coluna"
 
-#: ../clutter/clutter-flow-layout.c:955
+#: ../clutter/clutter-flow-layout.c:1007
 msgid "Minimum width for each column"
 msgstr "A largura mínima para cada coluna"
 
-#: ../clutter/clutter-flow-layout.c:970
+#: ../clutter/clutter-flow-layout.c:1022
 msgid "Maximum Column Width"
 msgstr "Largura máxima da coluna"
 
-#: ../clutter/clutter-flow-layout.c:971
+#: ../clutter/clutter-flow-layout.c:1023
 msgid "Maximum width for each column"
 msgstr "A largura máxima para cada coluna"
 
-#: ../clutter/clutter-flow-layout.c:985
+#: ../clutter/clutter-flow-layout.c:1037
 msgid "Minimum Row Height"
 msgstr "Altura mínima da linha"
 
-#: ../clutter/clutter-flow-layout.c:986
+#: ../clutter/clutter-flow-layout.c:1038
 msgid "Minimum height for each row"
 msgstr "A altura mínima para cada linha"
 
-#: ../clutter/clutter-flow-layout.c:1001
+#: ../clutter/clutter-flow-layout.c:1053
 msgid "Maximum Row Height"
 msgstr "Altura máxima da linha"
 
-#: ../clutter/clutter-flow-layout.c:1002
+#: ../clutter/clutter-flow-layout.c:1054
 msgid "Maximum height for each row"
 msgstr "A altura máxima para cada linha"
 
-#: ../clutter/clutter-grid-layout.c:1222
+#: ../clutter/clutter-flow-layout.c:1069 ../clutter/clutter-flow-layout.c:1070
+msgid "Snap to grid"
+msgstr "Alinhar à grade"
+
+#: ../clutter/clutter-gesture-action.c:668
+msgid "Number touch points"
+msgstr "Número de pontos de toque"
+
+#: ../clutter/clutter-gesture-action.c:669
+msgid "Number of touch points"
+msgstr "Número de pontos de toque"
+
+#: ../clutter/clutter-gesture-action.c:684
+msgid "Threshold Trigger Edge"
+msgstr "Borda de limite de disparo"
+
+#: ../clutter/clutter-gesture-action.c:685
+msgid "The trigger edge used by the action"
+msgstr "A linha do tempo utilizado pela ação"
+
+#: ../clutter/clutter-gesture-action.c:704
+#| msgid "Threshold Trigger Edge"
+msgid "Threshold Trigger Horizontal Distance"
+msgstr "Distância horizontal de limite de disparo"
+
+#: ../clutter/clutter-gesture-action.c:705
+#| msgid "The trigger edge used by the action"
+msgid "The horizontal trigger distance used by the action"
+msgstr "A distância horizontal de disparo utilizado pela ação"
+
+#: ../clutter/clutter-gesture-action.c:723
+#| msgid "Threshold Trigger Edge"
+msgid "Threshold Trigger Vertical Distance"
+msgstr "Distância vertical de limite de disparo"
+
+#: ../clutter/clutter-gesture-action.c:724
+#| msgid "The trigger edge used by the action"
+msgid "The vertical trigger distance used by the action"
+msgstr "A distância vertical de disparo utilizado pela ação"
+
+#: ../clutter/clutter-grid-layout.c:1223
 msgid "Left attachment"
 msgstr "Ligação esquerda"
 
-#: ../clutter/clutter-grid-layout.c:1223
+#: ../clutter/clutter-grid-layout.c:1224
 msgid "The column number to attach the left side of the child to"
 msgstr "O número de colunas para ligar o lado esquerdo da filha"
 
-#: ../clutter/clutter-grid-layout.c:1230
+#: ../clutter/clutter-grid-layout.c:1231
 msgid "Top attachment"
 msgstr "Ligação superior"
 
-#: ../clutter/clutter-grid-layout.c:1231
+#: ../clutter/clutter-grid-layout.c:1232
 msgid "The row number to attach the top side of a child widget to"
 msgstr ""
 "O número de linhas para ligar o lado superior (topo) de um widget da filha"
 
-#: ../clutter/clutter-grid-layout.c:1239
+#: ../clutter/clutter-grid-layout.c:1240
 msgid "The number of columns that a child spans"
 msgstr "O número de colunas que uma filha alcança"
 
-#: ../clutter/clutter-grid-layout.c:1246
+#: ../clutter/clutter-grid-layout.c:1247
 msgid "The number of rows that a child spans"
 msgstr "O número de linhas que uma filha alcança"
 
-#: ../clutter/clutter-grid-layout.c:1562
+#: ../clutter/clutter-grid-layout.c:1564
 msgid "Row spacing"
 msgstr "Espaçamento de linhas"
 
-#: ../clutter/clutter-grid-layout.c:1563
+#: ../clutter/clutter-grid-layout.c:1565
 msgid "The amount of space between two consecutive rows"
 msgstr "A quantidade de espaço entre duas linhas consecutivas"
 
-#: ../clutter/clutter-grid-layout.c:1576
+#: ../clutter/clutter-grid-layout.c:1578
 msgid "Column spacing"
 msgstr "Espaçamento de colunas"
 
-#: ../clutter/clutter-grid-layout.c:1577
+#: ../clutter/clutter-grid-layout.c:1579
 msgid "The amount of space between two consecutive columns"
 msgstr "A quantidade de espaço entre duas colunas consecutivas"
 
-#: ../clutter/clutter-grid-layout.c:1591
+#: ../clutter/clutter-grid-layout.c:1593
 msgid "Row Homogeneous"
 msgstr "Linha homogênea"
 
-#: ../clutter/clutter-grid-layout.c:1592
+#: ../clutter/clutter-grid-layout.c:1594
 msgid "If TRUE, the rows are all the same height"
 msgstr "Se VERDADEIRO, as linhas são todas de mesma altura"
 
-#: ../clutter/clutter-grid-layout.c:1605
+#: ../clutter/clutter-grid-layout.c:1607
 msgid "Column Homogeneous"
 msgstr "Coluna homogênea"
 
-#: ../clutter/clutter-grid-layout.c:1606
+#: ../clutter/clutter-grid-layout.c:1608
 msgid "If TRUE, the columns are all the same width"
 msgstr "Se VERDADEIRO, as colunas são todas de mesma largura"
 
-#: ../clutter/clutter-image.c:248 ../clutter/clutter-image.c:311
-#: ../clutter/clutter-image.c:399
+#: ../clutter/clutter-image.c:249 ../clutter/clutter-image.c:312
+#: ../clutter/clutter-image.c:400
 msgid "Unable to load image data"
 msgstr "Falha ao carregar dados da imagem"
 
-#: ../clutter/clutter-input-device.c:242
+#: ../clutter/clutter-input-device.c:231
 msgid "Id"
 msgstr "ID"
 
-#: ../clutter/clutter-input-device.c:243
+#: ../clutter/clutter-input-device.c:232
 msgid "Unique identifier of the device"
 msgstr "Identificador único do dispositivo"
 
-#: ../clutter/clutter-input-device.c:259
+#: ../clutter/clutter-input-device.c:248
 msgid "The name of the device"
 msgstr "O nome do dispositivo"
 
-#: ../clutter/clutter-input-device.c:273
+#: ../clutter/clutter-input-device.c:262
 msgid "Device Type"
 msgstr "Tipo de dispositivo"
 
-#: ../clutter/clutter-input-device.c:274
+#: ../clutter/clutter-input-device.c:263
 msgid "The type of the device"
 msgstr "O tipo do dispositivo"
 
-#: ../clutter/clutter-input-device.c:289
+#: ../clutter/clutter-input-device.c:278
 msgid "Device Manager"
 msgstr "Gerenciador de dispositivos"
 
-#: ../clutter/clutter-input-device.c:290
+#: ../clutter/clutter-input-device.c:279
 msgid "The device manager instance"
 msgstr "A instância do gerenciador de dispositivos"
 
-#: ../clutter/clutter-input-device.c:303
+#: ../clutter/clutter-input-device.c:292
 msgid "Device Mode"
 msgstr "Modo do dispositivo"
 
-#: ../clutter/clutter-input-device.c:304
+#: ../clutter/clutter-input-device.c:293
 msgid "The mode of the device"
 msgstr "O modo do dispositivo"
 
-#: ../clutter/clutter-input-device.c:318
+#: ../clutter/clutter-input-device.c:307
 msgid "Has Cursor"
 msgstr "Tem cursor"
 
-#: ../clutter/clutter-input-device.c:319
+#: ../clutter/clutter-input-device.c:308
 msgid "Whether the device has a cursor"
 msgstr "Se o dispositivo tem um cursor"
 
-#: ../clutter/clutter-input-device.c:338
+#: ../clutter/clutter-input-device.c:327
 msgid "Whether the device is enabled"
 msgstr "Se o dispositivo está habilitado"
 
-#: ../clutter/clutter-input-device.c:351
+#: ../clutter/clutter-input-device.c:340
 msgid "Number of Axes"
 msgstr "Número de eixos"
 
-#: ../clutter/clutter-input-device.c:352
+#: ../clutter/clutter-input-device.c:341
 msgid "The number of axes on the device"
 msgstr "O número de eixos do dispositivo"
 
-#: ../clutter/clutter-input-device.c:367
+#: ../clutter/clutter-input-device.c:356
 msgid "The backend instance"
 msgstr "A instância do backend"
 
-#: ../clutter/clutter-interval.c:506
+#: ../clutter/clutter-interval.c:553
 msgid "Value Type"
 msgstr "Tipo de valor"
 
-#: ../clutter/clutter-interval.c:507
+#: ../clutter/clutter-interval.c:554
 msgid "The type of the values in the interval"
 msgstr "O tipo de valores no intervalo"
 
-#: ../clutter/clutter-interval.c:522
+#: ../clutter/clutter-interval.c:569
 msgid "Initial Value"
 msgstr "Valor inicial"
 
-#: ../clutter/clutter-interval.c:523
+#: ../clutter/clutter-interval.c:570
 msgid "Initial value of the interval"
 msgstr "Valor inicial do intervalo"
 
-#: ../clutter/clutter-interval.c:537
+#: ../clutter/clutter-interval.c:584
 msgid "Final Value"
 msgstr "Valor final"
 
-#: ../clutter/clutter-interval.c:538
+#: ../clutter/clutter-interval.c:585
 msgid "Final value of the interval"
 msgstr "Valor final do intervalo"
 
@@ -1285,96 +1358,96 @@ msgstr "O gerenciador que criou estes dados"
 #. * Do NOT translate it to non-English e.g. "predefinito:LTR"! If
 #. * it isn't default:LTR or default:RTL it will not work.
 #.
-#: ../clutter/clutter-main.c:762
+#: ../clutter/clutter-main.c:795
 msgid "default:LTR"
 msgstr "default:LTR"
 
-#: ../clutter/clutter-main.c:1633
+#: ../clutter/clutter-main.c:1622
 msgid "Show frames per second"
 msgstr "Mostrar quadros por segundo"
 
-#: ../clutter/clutter-main.c:1635
+#: ../clutter/clutter-main.c:1624
 msgid "Default frame rate"
 msgstr "Taxa de quadros padrão"
 
-#: ../clutter/clutter-main.c:1637
+#: ../clutter/clutter-main.c:1626
 msgid "Make all warnings fatal"
 msgstr "Tornar todos os avisos fatais"
 
-#: ../clutter/clutter-main.c:1640
+#: ../clutter/clutter-main.c:1629
 msgid "Direction for the text"
 msgstr "Direção para o texto"
 
-#: ../clutter/clutter-main.c:1643
+#: ../clutter/clutter-main.c:1632
 msgid "Disable mipmapping on text"
 msgstr "Desativar mipmapeamento no texto"
 
-#: ../clutter/clutter-main.c:1646
+#: ../clutter/clutter-main.c:1635
 msgid "Use 'fuzzy' picking"
 msgstr "Usar seleção \"aproximada\""
 
-#: ../clutter/clutter-main.c:1649
+#: ../clutter/clutter-main.c:1638
 msgid "Clutter debugging flags to set"
 msgstr "Sinalizadores de depuração do Clutter para definir"
 
-#: ../clutter/clutter-main.c:1651
+#: ../clutter/clutter-main.c:1640
 msgid "Clutter debugging flags to unset"
 msgstr "Sinalizadores de depuração do Clutter para remover"
 
-#: ../clutter/clutter-main.c:1655
+#: ../clutter/clutter-main.c:1644
 msgid "Clutter profiling flags to set"
 msgstr "Sinalizadores de perfil do Clutter para definir"
 
-#: ../clutter/clutter-main.c:1657
+#: ../clutter/clutter-main.c:1646
 msgid "Clutter profiling flags to unset"
 msgstr "Sinalizadores de perfil do Clutter para remover"
 
-#: ../clutter/clutter-main.c:1660
+#: ../clutter/clutter-main.c:1649
 msgid "Enable accessibility"
 msgstr "Habilitar acessibilidade"
 
-#: ../clutter/clutter-main.c:1852
+#: ../clutter/clutter-main.c:1841
 msgid "Clutter Options"
 msgstr "Opções do Clutter"
 
-#: ../clutter/clutter-main.c:1853
+#: ../clutter/clutter-main.c:1842
 msgid "Show Clutter Options"
 msgstr "Mostrar opções do Clutter"
 
-#: ../clutter/clutter-pan-action.c:451
+#: ../clutter/clutter-pan-action.c:455
 msgid "Pan Axis"
 msgstr "Deslocar eixo"
 
-#: ../clutter/clutter-pan-action.c:452
+#: ../clutter/clutter-pan-action.c:456
 msgid "Constraints the panning to an axis"
 msgstr "Restringe o deslocamento para um eixo"
 
-#: ../clutter/clutter-pan-action.c:466
+#: ../clutter/clutter-pan-action.c:470
 msgid "Interpolate"
 msgstr "Interpolar"
 
-#: ../clutter/clutter-pan-action.c:467
+#: ../clutter/clutter-pan-action.c:471
 msgid "Whether interpolated events emission is enabled."
 msgstr "Se a emissão de eventos interpolados está ativada."
 
-#: ../clutter/clutter-pan-action.c:483
+#: ../clutter/clutter-pan-action.c:487
 msgid "Deceleration"
 msgstr "Desaceleração"
 
-#: ../clutter/clutter-pan-action.c:484
+#: ../clutter/clutter-pan-action.c:488
 msgid "Rate at which the interpolated panning will decelerate in"
 msgstr "Taxa a qual o deslocamento interpolado irá desacelerar"
 
-#: ../clutter/clutter-pan-action.c:501
+#: ../clutter/clutter-pan-action.c:505
 msgid "Initial acceleration factor"
 msgstr "Fator inicial de aceleração"
 
-#: ../clutter/clutter-pan-action.c:502
+#: ../clutter/clutter-pan-action.c:506
 msgid "Factor applied to the momentum when starting the interpolated phase"
 msgstr "Fator aplicado a força cinética quando inicia-se a fase interpolada"
 
 #: ../clutter/clutter-path-constraint.c:212
-#: ../clutter/deprecated/clutter-behaviour-path.c:225
+#: ../clutter/deprecated/clutter-behaviour-path.c:221
 msgid "Path"
 msgstr "Caminho"
 
@@ -1386,87 +1459,87 @@ msgstr "O caminho usado para restringir um ator"
 msgid "The offset along the path, between -1.0 and 2.0"
 msgstr "O deslocamento ao longo do caminho, entre -1,0 e 2,0"
 
-#: ../clutter/clutter-property-transition.c:271
+#: ../clutter/clutter-property-transition.c:269
 msgid "Property Name"
 msgstr "Nome da propriedade"
 
-#: ../clutter/clutter-property-transition.c:272
+#: ../clutter/clutter-property-transition.c:270
 msgid "The name of the property to animate"
 msgstr "Nome da propriedade a ser animada"
 
-#: ../clutter/clutter-script.c:466
+#: ../clutter/clutter-script.c:464
 msgid "Filename Set"
 msgstr "Nome do arquivo definido"
 
-#: ../clutter/clutter-script.c:467
+#: ../clutter/clutter-script.c:465
 msgid "Whether the :filename property is set"
 msgstr "Se a propriedade :nomedoarquivo está definida"
 
-#: ../clutter/clutter-script.c:481
-#: ../clutter/deprecated/clutter-texture.c:1082
+#: ../clutter/clutter-script.c:479
+#: ../clutter/deprecated/clutter-texture.c:1080
 msgid "Filename"
 msgstr "Nome do arquivo"
 
-#: ../clutter/clutter-script.c:482
+#: ../clutter/clutter-script.c:480
 msgid "The path of the currently parsed file"
 msgstr "O caminho do arquivo atualmente analisado"
 
-#: ../clutter/clutter-script.c:499
+#: ../clutter/clutter-script.c:497
 msgid "Translation Domain"
 msgstr "Domínio de tradução"
 
-#: ../clutter/clutter-script.c:500
+#: ../clutter/clutter-script.c:498
 msgid "The translation domain used to localize string"
 msgstr "O domínio de tradução usado para localizar string"
 
-#: ../clutter/clutter-scroll-actor.c:263
+#: ../clutter/clutter-scroll-actor.c:189
 msgid "Scroll Mode"
 msgstr "Modo de rolagem"
 
-#: ../clutter/clutter-scroll-actor.c:264
+#: ../clutter/clutter-scroll-actor.c:190
 msgid "The scrolling direction"
 msgstr "A direção da rolagem"
 
-#: ../clutter/clutter-settings.c:440
+#: ../clutter/clutter-settings.c:486
 msgid "Double Click Time"
 msgstr "Tempo de clique duplo"
 
-#: ../clutter/clutter-settings.c:441
+#: ../clutter/clutter-settings.c:487
 msgid "The time between clicks necessary to detect a multiple click"
 msgstr "O tempo entre os cliques necessários para detectar um clique múltiplo"
 
-#: ../clutter/clutter-settings.c:456
+#: ../clutter/clutter-settings.c:502
 msgid "Double Click Distance"
 msgstr "Distância entre cliques duplos"
 
-#: ../clutter/clutter-settings.c:457
+#: ../clutter/clutter-settings.c:503
 msgid "The distance between clicks necessary to detect a multiple click"
 msgstr ""
 "A distância entre cliques duplos necessários para detectar um clique múltiplo"
 
-#: ../clutter/clutter-settings.c:472
+#: ../clutter/clutter-settings.c:518
 msgid "Drag Threshold"
 msgstr "Limite de arrasto"
 
-#: ../clutter/clutter-settings.c:473
+#: ../clutter/clutter-settings.c:519
 msgid "The distance the cursor should travel before starting to drag"
 msgstr "A distância que o cursor deve mover antes de começar a arrastar"
 
-#: ../clutter/clutter-settings.c:488 ../clutter/clutter-text.c:3368
+#: ../clutter/clutter-settings.c:534 ../clutter/clutter-text.c:3404
 msgid "Font Name"
 msgstr "Nome da fonte"
 
-#: ../clutter/clutter-settings.c:489
+#: ../clutter/clutter-settings.c:535
 msgid ""
 "The description of the default font, as one that could be parsed by Pango"
 msgstr ""
 "A descrição da fonte padrão, como algo que pode ser analisado pelo Pango"
 
-#: ../clutter/clutter-settings.c:504
+#: ../clutter/clutter-settings.c:550
 msgid "Font Antialias"
 msgstr "Suavização de fonte"
 
-#: ../clutter/clutter-settings.c:505
+#: ../clutter/clutter-settings.c:551
 msgid ""
 "Whether to use antialiasing (1 to enable, 0 to disable, and -1 to use the "
 "default)"
@@ -1474,69 +1547,77 @@ msgstr ""
 "Se usar suavização (1 para habilitar, 0 para desabilitar e -1 para usar o "
 "padrão)"
 
-#: ../clutter/clutter-settings.c:521
+#: ../clutter/clutter-settings.c:567 ../clutter/clutter-settings.c:575
 msgid "Font DPI"
 msgstr "DPI da fonte"
 
-#: ../clutter/clutter-settings.c:522
+#: ../clutter/clutter-settings.c:568 ../clutter/clutter-settings.c:576
 msgid ""
 "The resolution of the font, in 1024 * dots/inch, or -1 to use the default"
 msgstr ""
 "A resolução da fonte, em 1024 * pontos / polegada, ou -1 para usar o padrão"
 
-#: ../clutter/clutter-settings.c:538
+#: ../clutter/clutter-settings.c:592
 msgid "Font Hinting"
 msgstr "Dicas de fonte"
 
-#: ../clutter/clutter-settings.c:539
+#: ../clutter/clutter-settings.c:593
 msgid ""
 "Whether to use hinting (1 to enable, 0 to disable and -1 to use the default)"
 msgstr ""
 "Se usar dicas (1 para habilitar, 0 para desabilitar e -1 para usar o padrão)"
 
-#: ../clutter/clutter-settings.c:560
+#: ../clutter/clutter-settings.c:614
 msgid "Font Hint Style"
 msgstr "Estilo de dicas de fonte"
 
-#: ../clutter/clutter-settings.c:561
+#: ../clutter/clutter-settings.c:615
 msgid "The style of hinting (hintnone, hintslight, hintmedium, hintfull)"
 msgstr "O estilo de dicas (nenhuma, leve, média, completa)"
 
-#: ../clutter/clutter-settings.c:582
+#: ../clutter/clutter-settings.c:636
 msgid "Font Subpixel Order"
 msgstr "Ordem subpixel da fonte"
 
-#: ../clutter/clutter-settings.c:583
+#: ../clutter/clutter-settings.c:637
 msgid "The type of subpixel antialiasing (none, rgb, bgr, vrgb, vbgr)"
 msgstr "O tipo de suavização de subpixel (nenhum, rgb, bgr, vrgb vbgr)"
 
-#: ../clutter/clutter-settings.c:600
+#: ../clutter/clutter-settings.c:654
 msgid "The minimum duration for a long press gesture to be recognized"
 msgstr ""
 "A duração mínima para um gesto de pressionamento prolongado ser reconhecido"
 
-#: ../clutter/clutter-settings.c:607
+#: ../clutter/clutter-settings.c:661
+msgid "Window Scaling Factor"
+msgstr "Fator de escala de janela"
+
+#: ../clutter/clutter-settings.c:662
+msgid "The scaling factor to be applied to windows"
+msgstr "O fator de escala a ser aplicado em janelas"
+
+#: ../clutter/clutter-settings.c:669
 msgid "Fontconfig configuration timestamp"
 msgstr "Marca de tempo de configuração da configuração de fontes"
 
-#: ../clutter/clutter-settings.c:608
+#: ../clutter/clutter-settings.c:670
 msgid "Timestamp of the current fontconfig configuration"
 msgstr "A marca de tempo da configuração atual da configuração de fontes"
 
-#: ../clutter/clutter-settings.c:625
+#: ../clutter/clutter-settings.c:687
 msgid "Password Hint Time"
 msgstr "Tempo de amostra da senha"
 
-#: ../clutter/clutter-settings.c:626
+#: ../clutter/clutter-settings.c:688
 msgid "How long to show the last input character in hidden entries"
 msgstr ""
 "Por quanto tempo mostrar o último caractere em entradas de texto ocultas"
 
-#: ../clutter/clutter-shader-effect.c:486
+#: ../clutter/clutter-shader-effect.c:485
 msgid "Shader Type"
 msgstr "Tipo de shader"
 
-#: ../clutter/clutter-shader-effect.c:487
+#: ../clutter/clutter-shader-effect.c:486
 msgid "The type of shader used"
 msgstr "O tipo de shader usado"
 
@@ -1564,758 +1645,702 @@ msgstr "A borda da fonte que deve ser encaixada"
 msgid "The offset in pixels to apply to the constraint"
 msgstr "O deslocamento em pixels para aplicar a restrição"
 
-#: ../clutter/clutter-stage.c:1895
+#: ../clutter/clutter-stage.c:1899
 msgid "Fullscreen Set"
 msgstr "Tela cheia definida"
 
-#: ../clutter/clutter-stage.c:1896
+#: ../clutter/clutter-stage.c:1900
 msgid "Whether the main stage is fullscreen"
 msgstr "Se o palco principal é uma tela cheia"
 
-#: ../clutter/clutter-stage.c:1910
+#: ../clutter/clutter-stage.c:1914
 msgid "Offscreen"
 msgstr "Fora da tela"
 
-#: ../clutter/clutter-stage.c:1911
+#: ../clutter/clutter-stage.c:1915
 msgid "Whether the main stage should be rendered offscreen"
 msgstr "Se o palco principal deve ser processado fora da tela"
 
-#: ../clutter/clutter-stage.c:1923 ../clutter/clutter-text.c:3482
+#: ../clutter/clutter-stage.c:1927 ../clutter/clutter-text.c:3518
 msgid "Cursor Visible"
 msgstr "Cursor visível"
 
-#: ../clutter/clutter-stage.c:1924
+#: ../clutter/clutter-stage.c:1928
 msgid "Whether the mouse pointer is visible on the main stage"
 msgstr "Se o ponteiro do mouse está visível no palco principal"
 
-#: ../clutter/clutter-stage.c:1938
+#: ../clutter/clutter-stage.c:1942
 msgid "User Resizable"
 msgstr "Redimensionável pelo usuário"
 
-#: ../clutter/clutter-stage.c:1939
+#: ../clutter/clutter-stage.c:1943
 msgid "Whether the stage is able to be resized via user interaction"
 msgstr "Se o palco pode ser redimensionado pelo usuário"
 
-#: ../clutter/clutter-stage.c:1954 ../clutter/deprecated/clutter-box.c:260
-#: ../clutter/deprecated/clutter-rectangle.c:273
+#: ../clutter/clutter-stage.c:1958 ../clutter/deprecated/clutter-box.c:256
+#: ../clutter/deprecated/clutter-rectangle.c:270
 msgid "Color"
 msgstr "Cor"
 
-#: ../clutter/clutter-stage.c:1955
+#: ../clutter/clutter-stage.c:1959
 msgid "The color of the stage"
 msgstr "A cor do palco"
 
-#: ../clutter/clutter-stage.c:1970
+#: ../clutter/clutter-stage.c:1974
 msgid "Perspective"
 msgstr "Perspectiva"
 
-#: ../clutter/clutter-stage.c:1971
+#: ../clutter/clutter-stage.c:1975
 msgid "Perspective projection parameters"
 msgstr "Parâmetros de projeção de perspectiva"
 
-#: ../clutter/clutter-stage.c:1986
+#: ../clutter/clutter-stage.c:1990
 msgid "Title"
 msgstr "Título"
 
-#: ../clutter/clutter-stage.c:1987
+#: ../clutter/clutter-stage.c:1991
 msgid "Stage Title"
 msgstr "Título do palco"
 
-#: ../clutter/clutter-stage.c:2004
+#: ../clutter/clutter-stage.c:2008
 msgid "Use Fog"
 msgstr "Usar nevoeiro"
 
-#: ../clutter/clutter-stage.c:2005
+#: ../clutter/clutter-stage.c:2009
 msgid "Whether to enable depth cueing"
 msgstr "Se habilitar profundidade"
 
-#: ../clutter/clutter-stage.c:2021
+#: ../clutter/clutter-stage.c:2025
 msgid "Fog"
 msgstr "Nevoeiro"
 
-#: ../clutter/clutter-stage.c:2022
+#: ../clutter/clutter-stage.c:2026
 msgid "Settings for the depth cueing"
 msgstr "Definições para a profundidade"
 
-#: ../clutter/clutter-stage.c:2038
+#: ../clutter/clutter-stage.c:2042
 msgid "Use Alpha"
 msgstr "Usar alfa"
 
-#: ../clutter/clutter-stage.c:2039
+#: ../clutter/clutter-stage.c:2043
 msgid "Whether to honour the alpha component of the stage color"
 msgstr "Se respeitar o componente alfa da cor do palco"
 
-#: ../clutter/clutter-stage.c:2055
+#: ../clutter/clutter-stage.c:2059
 msgid "Key Focus"
 msgstr "Foco da chave"
 
-#: ../clutter/clutter-stage.c:2056
+#: ../clutter/clutter-stage.c:2060
 msgid "The currently key focused actor"
 msgstr "O ator atualmente focado pela chave"
 
-#: ../clutter/clutter-stage.c:2072
+#: ../clutter/clutter-stage.c:2076
 msgid "No Clear Hint"
 msgstr "Nenhuma dica para limpar"
 
-#: ../clutter/clutter-stage.c:2073
+#: ../clutter/clutter-stage.c:2077
 msgid "Whether the stage should clear its contents"
 msgstr "Se o palco deve limpar o seu contúedo"
 
-#: ../clutter/clutter-stage.c:2086
+#: ../clutter/clutter-stage.c:2090
 msgid "Accept Focus"
 msgstr "Aceitar foco"
 
-#: ../clutter/clutter-stage.c:2087
+#: ../clutter/clutter-stage.c:2091
 msgid "Whether the stage should accept focus on show"
 msgstr "Se o palco deve aceitar o foco ao expor"
 
-#: ../clutter/clutter-table-layout.c:543
-msgid "Column Number"
-msgstr "Número da coluna"
-
-#: ../clutter/clutter-table-layout.c:544
-msgid "The column the widget resides in"
-msgstr "A coluna onde o componente reside"
-
-#: ../clutter/clutter-table-layout.c:551
-msgid "Row Number"
-msgstr "Número da linha"
-
-#: ../clutter/clutter-table-layout.c:552
-msgid "The row the widget resides in"
-msgstr "A linha onde o componente reside"
-
-#: ../clutter/clutter-table-layout.c:559
-msgid "Column Span"
-msgstr "Intervalo de colunas"
-
-#: ../clutter/clutter-table-layout.c:560
-msgid "The number of columns the widget should span"
-msgstr "O número de colunas o componente deve abranger"
-
-#: ../clutter/clutter-table-layout.c:567
-msgid "Row Span"
-msgstr "Intervalo de linhas"
-
-#: ../clutter/clutter-table-layout.c:568
-msgid "The number of rows the widget should span"
-msgstr "O número de linhas o componente deve abranger"
-
-#: ../clutter/clutter-table-layout.c:575
-msgid "Horizontal Expand"
-msgstr "Espandir horizontalmente"
-
-#: ../clutter/clutter-table-layout.c:576
-msgid "Allocate extra space for the child in horizontal axis"
-msgstr "Alocar espaço adicional para a criança no eixo horizontal"
-
-#: ../clutter/clutter-table-layout.c:582
-msgid "Vertical Expand"
-msgstr "Espandir verticalmente"
-
-#: ../clutter/clutter-table-layout.c:583
-msgid "Allocate extra space for the child in vertical axis"
-msgstr "Alocar espaço adicional para a criança no eixo vertical"
-
-#: ../clutter/clutter-table-layout.c:1638
-msgid "Spacing between columns"
-msgstr "Espaçamento entre as colunas"
-
-#: ../clutter/clutter-table-layout.c:1652
-msgid "Spacing between rows"
-msgstr "Espaçamento entre as filas"
-
-#: ../clutter/clutter-text-buffer.c:351 ../clutter/clutter-text.c:3403
+#: ../clutter/clutter-text-buffer.c:347 ../clutter/clutter-text.c:3439
 msgid "Text"
 msgstr "Texto"
 
-#: ../clutter/clutter-text-buffer.c:352
+#: ../clutter/clutter-text-buffer.c:348
 msgid "The contents of the buffer"
 msgstr "O conteúdo do buffer"
 
-#: ../clutter/clutter-text-buffer.c:365
+#: ../clutter/clutter-text-buffer.c:361
 msgid "Text length"
 msgstr "Tamanho do texto"
 
-#: ../clutter/clutter-text-buffer.c:366
+#: ../clutter/clutter-text-buffer.c:362
 msgid "Length of the text currently in the buffer"
 msgstr "Tamanho do texto atualmente no buffer"
 
-#: ../clutter/clutter-text-buffer.c:379
+#: ../clutter/clutter-text-buffer.c:375
 msgid "Maximum length"
 msgstr "Tamanho máximo"
 
-#: ../clutter/clutter-text-buffer.c:380
+#: ../clutter/clutter-text-buffer.c:376
 msgid "Maximum number of characters for this entry. Zero if no maximum"
 msgstr "Número máximo de caracteres para esta entrada. Zero se não tem limite"
 
-#: ../clutter/clutter-text.c:3350
+#: ../clutter/clutter-text.c:3386
 msgid "Buffer"
 msgstr "Buffer"
 
-#: ../clutter/clutter-text.c:3351
+#: ../clutter/clutter-text.c:3387
 msgid "The buffer for the text"
 msgstr "O buffer para o texto"
 
-#: ../clutter/clutter-text.c:3369
+#: ../clutter/clutter-text.c:3405
 msgid "The font to be used by the text"
 msgstr "A fonte a ser usada pelo texto"
 
-#: ../clutter/clutter-text.c:3386
+#: ../clutter/clutter-text.c:3422
 msgid "Font Description"
 msgstr "Descrição da fonte"
 
-#: ../clutter/clutter-text.c:3387
+#: ../clutter/clutter-text.c:3423
 msgid "The font description to be used"
 msgstr "A descrição da fonte a ser utilizada"
 
-#: ../clutter/clutter-text.c:3404
+#: ../clutter/clutter-text.c:3440
 msgid "The text to render"
 msgstr "O texto a processar"
 
-#: ../clutter/clutter-text.c:3418
+#: ../clutter/clutter-text.c:3454
 msgid "Font Color"
 msgstr "Cor da fonte"
 
-#: ../clutter/clutter-text.c:3419
+#: ../clutter/clutter-text.c:3455
 msgid "Color of the font used by the text"
 msgstr "A cor da fonte usada pelo texto"
 
-#: ../clutter/clutter-text.c:3434
+#: ../clutter/clutter-text.c:3470
 msgid "Editable"
 msgstr "Editável"
 
-#: ../clutter/clutter-text.c:3435
+#: ../clutter/clutter-text.c:3471
 msgid "Whether the text is editable"
 msgstr "Se o texto é editável"
 
-#: ../clutter/clutter-text.c:3450
+#: ../clutter/clutter-text.c:3486
 msgid "Selectable"
 msgstr "Selecionável"
 
-#: ../clutter/clutter-text.c:3451
+#: ../clutter/clutter-text.c:3487
 msgid "Whether the text is selectable"
 msgstr "Se o texto é selecionável"
 
-#: ../clutter/clutter-text.c:3465
+#: ../clutter/clutter-text.c:3501
 msgid "Activatable"
 msgstr "Ativável"
 
-#: ../clutter/clutter-text.c:3466
+#: ../clutter/clutter-text.c:3502
 msgid "Whether pressing return causes the activate signal to be emitted"
 msgstr "Se pressionar return causa o sinal de ativação a ser emitido"
 
-#: ../clutter/clutter-text.c:3483
+#: ../clutter/clutter-text.c:3519
 msgid "Whether the input cursor is visible"
 msgstr "Se o cursor de entrada está visível"
 
-#: ../clutter/clutter-text.c:3497 ../clutter/clutter-text.c:3498
+#: ../clutter/clutter-text.c:3533 ../clutter/clutter-text.c:3534
 msgid "Cursor Color"
 msgstr "Cor do cursor"
 
-#: ../clutter/clutter-text.c:3513
+#: ../clutter/clutter-text.c:3549
 msgid "Cursor Color Set"
 msgstr "Cor do cursor definida"
 
-#: ../clutter/clutter-text.c:3514
+#: ../clutter/clutter-text.c:3550
 msgid "Whether the cursor color has been set"
 msgstr "Se a cor do cursor foi definida"
 
-#: ../clutter/clutter-text.c:3529
+#: ../clutter/clutter-text.c:3565
 msgid "Cursor Size"
 msgstr "Tamanho do cursor"
 
-#: ../clutter/clutter-text.c:3530
+#: ../clutter/clutter-text.c:3566
 msgid "The width of the cursor, in pixels"
 msgstr "A largura do cursor, em pixels"
 
-#: ../clutter/clutter-text.c:3546 ../clutter/clutter-text.c:3564
+#: ../clutter/clutter-text.c:3582 ../clutter/clutter-text.c:3600
 msgid "Cursor Position"
 msgstr "Posição do cursor"
 
-#: ../clutter/clutter-text.c:3547 ../clutter/clutter-text.c:3565
+#: ../clutter/clutter-text.c:3583 ../clutter/clutter-text.c:3601
 msgid "The cursor position"
 msgstr "A posição do cursor"
 
-#: ../clutter/clutter-text.c:3580
+#: ../clutter/clutter-text.c:3616
 msgid "Selection-bound"
 msgstr "Vínculo-seleção"
 
-#: ../clutter/clutter-text.c:3581
+#: ../clutter/clutter-text.c:3617
 msgid "The cursor position of the other end of the selection"
 msgstr "A posição do cursor do outro lado da seleção"
 
-#: ../clutter/clutter-text.c:3596 ../clutter/clutter-text.c:3597
+#: ../clutter/clutter-text.c:3632 ../clutter/clutter-text.c:3633
 msgid "Selection Color"
 msgstr "Cor de seleção"
 
-#: ../clutter/clutter-text.c:3612
+#: ../clutter/clutter-text.c:3648
 msgid "Selection Color Set"
 msgstr "Cor de seleção definida"
 
-#: ../clutter/clutter-text.c:3613
+#: ../clutter/clutter-text.c:3649
 msgid "Whether the selection color has been set"
 msgstr "Se a cor de seleção foi definida"
 
-#: ../clutter/clutter-text.c:3628
+#: ../clutter/clutter-text.c:3664
 msgid "Attributes"
 msgstr "Atributos"
 
-#: ../clutter/clutter-text.c:3629
+#: ../clutter/clutter-text.c:3665
 msgid "A list of style attributes to apply to the contents of the actor"
 msgstr "Uma lista de atributos de estilo para aplicar ao conteúdo do ator"
 
-#: ../clutter/clutter-text.c:3651
+#: ../clutter/clutter-text.c:3687
 msgid "Use markup"
 msgstr "Usar marcação"
 
-#: ../clutter/clutter-text.c:3652
+#: ../clutter/clutter-text.c:3688
 msgid "Whether or not the text includes Pango markup"
 msgstr "Se o texto inclui ou não marcação Pango"
 
-#: ../clutter/clutter-text.c:3668
+#: ../clutter/clutter-text.c:3704
 msgid "Line wrap"
 msgstr "Quebra de linha"
 
-#: ../clutter/clutter-text.c:3669
+#: ../clutter/clutter-text.c:3705
 msgid "If set, wrap the lines if the text becomes too wide"
 msgstr "Se definido, quebra as linhas se o texto se torne demasiado grande"
 
-#: ../clutter/clutter-text.c:3684
+#: ../clutter/clutter-text.c:3720
 msgid "Line wrap mode"
 msgstr "Modo de quebra de linha"
 
-#: ../clutter/clutter-text.c:3685
+#: ../clutter/clutter-text.c:3721
 msgid "Control how line-wrapping is done"
 msgstr "Controla como a quebra de linhas é feita"
 
-#: ../clutter/clutter-text.c:3700
+#: ../clutter/clutter-text.c:3736
 msgid "Ellipsize"
 msgstr "Criar elipse"
 
-#: ../clutter/clutter-text.c:3701
+#: ../clutter/clutter-text.c:3737
 msgid "The preferred place to ellipsize the string"
 msgstr "O lugar preferido para criar uma elipse no texto"
 
-#: ../clutter/clutter-text.c:3717
+#: ../clutter/clutter-text.c:3753
 msgid "Line Alignment"
 msgstr "Alinhamento da linha"
 
-#: ../clutter/clutter-text.c:3718
+#: ../clutter/clutter-text.c:3754
 msgid "The preferred alignment for the string, for multi-line text"
 msgstr "O alinhamento preferido para o texto, para textos em linhas múltiplas"
 
-#: ../clutter/clutter-text.c:3734
+#: ../clutter/clutter-text.c:3770
 msgid "Justify"
 msgstr "Justificar"
 
-#: ../clutter/clutter-text.c:3735
+#: ../clutter/clutter-text.c:3771
 msgid "Whether the text should be justified"
 msgstr "Se o texto deve ser justificado"
 
-#: ../clutter/clutter-text.c:3750
+#: ../clutter/clutter-text.c:3786
 msgid "Password Character"
 msgstr "Caractere de senha"
 
-#: ../clutter/clutter-text.c:3751
+#: ../clutter/clutter-text.c:3787
 msgid "If non-zero, use this character to display the actor's contents"
 msgstr "Se maior que zero, usa este caractere para mostrar o conteúdo do ator"
 
-#: ../clutter/clutter-text.c:3765
+#: ../clutter/clutter-text.c:3801
 msgid "Max Length"
 msgstr "Comprimento máximo"
 
-#: ../clutter/clutter-text.c:3766
+#: ../clutter/clutter-text.c:3802
 msgid "Maximum length of the text inside the actor"
 msgstr "O comprimento máximo do texto dentro do ator"
 
-#: ../clutter/clutter-text.c:3789
+#: ../clutter/clutter-text.c:3825
 msgid "Single Line Mode"
 msgstr "Modo de linha única"
 
-#: ../clutter/clutter-text.c:3790
+#: ../clutter/clutter-text.c:3826
 msgid "Whether the text should be a single line"
 msgstr "Se o texto deve ser uma única linha"
 
-#: ../clutter/clutter-text.c:3804 ../clutter/clutter-text.c:3805
+#: ../clutter/clutter-text.c:3840 ../clutter/clutter-text.c:3841
 msgid "Selected Text Color"
 msgstr "Cor de texto selecionado"
 
-#: ../clutter/clutter-text.c:3820
+#: ../clutter/clutter-text.c:3856
 msgid "Selected Text Color Set"
 msgstr "Cor de texto selecionado definida"
 
-#: ../clutter/clutter-text.c:3821
+#: ../clutter/clutter-text.c:3857
 msgid "Whether the selected text color has been set"
 msgstr "Se a cor de texto selecionado foi definido"
 
-#: ../clutter/clutter-timeline.c:561
-#: ../clutter/deprecated/clutter-animation.c:560
+#: ../clutter/clutter-timeline.c:593
+#: ../clutter/deprecated/clutter-animation.c:557
 msgid "Loop"
 msgstr "Laço"
 
-#: ../clutter/clutter-timeline.c:562
+#: ../clutter/clutter-timeline.c:594
 msgid "Should the timeline automatically restart"
 msgstr "Se a linha do tempo deve ser reiniciada automaticamente"
 
-#: ../clutter/clutter-timeline.c:576
+#: ../clutter/clutter-timeline.c:608
 msgid "Delay"
 msgstr "Atraso"
 
-#: ../clutter/clutter-timeline.c:577
+#: ../clutter/clutter-timeline.c:609
 msgid "Delay before start"
 msgstr "Atraso antes do início"
 
-#: ../clutter/clutter-timeline.c:592
-#: ../clutter/deprecated/clutter-animation.c:544
-#: ../clutter/deprecated/clutter-animator.c:1803
+#: ../clutter/clutter-timeline.c:624
+#: ../clutter/deprecated/clutter-animation.c:541
+#: ../clutter/deprecated/clutter-animator.c:1801
 #: ../clutter/deprecated/clutter-media.c:224
-#: ../clutter/deprecated/clutter-state.c:1522
+#: ../clutter/deprecated/clutter-state.c:1517
 msgid "Duration"
 msgstr "Duração"
 
-#: ../clutter/clutter-timeline.c:593
+#: ../clutter/clutter-timeline.c:625
 msgid "Duration of the timeline in milliseconds"
 msgstr "Duração da linha do tempo em milésimos de segundos"
 
-#: ../clutter/clutter-timeline.c:608
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:528
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:337
+#: ../clutter/clutter-timeline.c:640
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:521
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:330
 msgid "Direction"
 msgstr "Direção"
 
-#: ../clutter/clutter-timeline.c:609
+#: ../clutter/clutter-timeline.c:641
 msgid "Direction of the timeline"
 msgstr "Direção da linha do tempo"
 
-#: ../clutter/clutter-timeline.c:624
+#: ../clutter/clutter-timeline.c:656
 msgid "Auto Reverse"
 msgstr "Reverso automático"
 
-#: ../clutter/clutter-timeline.c:625
+#: ../clutter/clutter-timeline.c:657
 msgid "Whether the direction should be reversed when reaching the end"
 msgstr "Se a direção deve ser revertida quando chegar ao fim"
 
-#: ../clutter/clutter-timeline.c:643
+#: ../clutter/clutter-timeline.c:675
 msgid "Repeat Count"
 msgstr "Contador de repetições"
 
-#: ../clutter/clutter-timeline.c:644
+#: ../clutter/clutter-timeline.c:676
 msgid "How many times the timeline should repeat"
 msgstr "Quantas vezes a linha do tempo deve repetir"
 
-#: ../clutter/clutter-timeline.c:658
+#: ../clutter/clutter-timeline.c:690
 msgid "Progress Mode"
 msgstr "Modo do progresso"
 
-#: ../clutter/clutter-timeline.c:659
+#: ../clutter/clutter-timeline.c:691
 msgid "How the timeline should compute the progress"
 msgstr "Como a linha do tempo deve computar o progresso"
 
-#: ../clutter/clutter-transition.c:246
+#: ../clutter/clutter-transition.c:244
 msgid "Interval"
 msgstr "Intervalo"
 
-#: ../clutter/clutter-transition.c:247
+#: ../clutter/clutter-transition.c:245
 msgid "The interval of values to transition"
 msgstr "Intervalo dos valores da transição"
 
-#: ../clutter/clutter-transition.c:261
+#: ../clutter/clutter-transition.c:259
 msgid "Animatable"
 msgstr "Animável"
 
-#: ../clutter/clutter-transition.c:262
+#: ../clutter/clutter-transition.c:260
 msgid "The animatable object"
 msgstr "O objeto animável"
 
-#: ../clutter/clutter-transition.c:283
+#: ../clutter/clutter-transition.c:281
 msgid "Remove on Complete"
 msgstr "Remover ao completar"
 
-#: ../clutter/clutter-transition.c:284
+#: ../clutter/clutter-transition.c:282
 msgid "Detach the transition when completed"
 msgstr "Remove a transição quando tiver completado"
 
-#: ../clutter/clutter-zoom-action.c:353
+#: ../clutter/clutter-zoom-action.c:365
 msgid "Zoom Axis"
 msgstr "Ampliar eixo"
 
-#: ../clutter/clutter-zoom-action.c:354
+#: ../clutter/clutter-zoom-action.c:366
 msgid "Constraints the zoom to an axis"
 msgstr "Restringe a ampliação a um eixo"
 
-#: ../clutter/deprecated/clutter-alpha.c:355
-#: ../clutter/deprecated/clutter-animation.c:575
-#: ../clutter/deprecated/clutter-animator.c:1820
+#: ../clutter/deprecated/clutter-alpha.c:354
+#: ../clutter/deprecated/clutter-animation.c:572
+#: ../clutter/deprecated/clutter-animator.c:1818
 msgid "Timeline"
 msgstr "Linha do tempo"
 
-#: ../clutter/deprecated/clutter-alpha.c:356
+#: ../clutter/deprecated/clutter-alpha.c:355
 msgid "Timeline used by the alpha"
 msgstr "Linha do tempo utilizado pelo alfa"
 
-#: ../clutter/deprecated/clutter-alpha.c:372
+#: ../clutter/deprecated/clutter-alpha.c:371
 msgid "Alpha value"
 msgstr "Valor de alfa"
 
-#: ../clutter/deprecated/clutter-alpha.c:373
+#: ../clutter/deprecated/clutter-alpha.c:372
 msgid "Alpha value as computed by the alpha"
 msgstr "Valor de alfa calculado pelo alfa"
 
-#: ../clutter/deprecated/clutter-alpha.c:394
-#: ../clutter/deprecated/clutter-animation.c:528
+#: ../clutter/deprecated/clutter-alpha.c:393
+#: ../clutter/deprecated/clutter-animation.c:525
 msgid "Mode"
 msgstr "Modo"
 
-#: ../clutter/deprecated/clutter-alpha.c:395
+#: ../clutter/deprecated/clutter-alpha.c:394
 msgid "Progress mode"
 msgstr "Modo do progresso"
 
-#: ../clutter/deprecated/clutter-animation.c:511
+#: ../clutter/deprecated/clutter-animation.c:508
 msgid "Object"
 msgstr "Objeto"
 
-#: ../clutter/deprecated/clutter-animation.c:512
+#: ../clutter/deprecated/clutter-animation.c:509
 msgid "Object to which the animation applies"
 msgstr "Objeto ao qual se aplica a animação"
 
-#: ../clutter/deprecated/clutter-animation.c:529
+#: ../clutter/deprecated/clutter-animation.c:526
 msgid "The mode of the animation"
 msgstr "O modo da animação"
 
-#: ../clutter/deprecated/clutter-animation.c:545
+#: ../clutter/deprecated/clutter-animation.c:542
 msgid "Duration of the animation, in milliseconds"
 msgstr "Duração da animação, em milésimo de segundos"
 
-#: ../clutter/deprecated/clutter-animation.c:561
+#: ../clutter/deprecated/clutter-animation.c:558
 msgid "Whether the animation should loop"
 msgstr "Se a animação deve repetir"
 
-#: ../clutter/deprecated/clutter-animation.c:576
+#: ../clutter/deprecated/clutter-animation.c:573
 msgid "The timeline used by the animation"
 msgstr "A linha do tempo utilizado pela animação"
 
-#: ../clutter/deprecated/clutter-animation.c:592
-#: ../clutter/deprecated/clutter-behaviour.c:241
+#: ../clutter/deprecated/clutter-animation.c:589
+#: ../clutter/deprecated/clutter-behaviour.c:237
 msgid "Alpha"
 msgstr "Alfa"
 
-#: ../clutter/deprecated/clutter-animation.c:593
+#: ../clutter/deprecated/clutter-animation.c:590
 msgid "The alpha used by the animation"
 msgstr "A alfa usada pela animação"
 
-#: ../clutter/deprecated/clutter-animator.c:1804
+#: ../clutter/deprecated/clutter-animator.c:1802
 msgid "The duration of the animation"
 msgstr "A duração da animação"
 
-#: ../clutter/deprecated/clutter-animator.c:1821
+#: ../clutter/deprecated/clutter-animator.c:1819
 msgid "The timeline of the animation"
 msgstr "A linha de tempo da animação"
 
-#: ../clutter/deprecated/clutter-behaviour.c:242
+#: ../clutter/deprecated/clutter-behaviour.c:238
 msgid "Alpha Object to drive the behaviour"
 msgstr "Objeto alfa para dirigir o comportamento"
 
-#: ../clutter/deprecated/clutter-behaviour-depth.c:182
+#: ../clutter/deprecated/clutter-behaviour-depth.c:180
 msgid "Start Depth"
 msgstr "Profundidade inicial"
 
-#: ../clutter/deprecated/clutter-behaviour-depth.c:183
+#: ../clutter/deprecated/clutter-behaviour-depth.c:181
 msgid "Initial depth to apply"
 msgstr "Profundidade inicial a aplicar"
 
-#: ../clutter/deprecated/clutter-behaviour-depth.c:198
+#: ../clutter/deprecated/clutter-behaviour-depth.c:196
 msgid "End Depth"
 msgstr "Profundidade final"
 
-#: ../clutter/deprecated/clutter-behaviour-depth.c:199
+#: ../clutter/deprecated/clutter-behaviour-depth.c:197
 msgid "Final depth to apply"
 msgstr "Profundidade final a aplicar"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:401
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:394
 msgid "Start Angle"
 msgstr "Ângulo inicial"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:402
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:284
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:395
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:277
 msgid "Initial angle"
 msgstr "Ângulo inicial"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:417
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:410
 msgid "End Angle"
 msgstr "Ângulo final"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:418
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:302
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:411
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:295
 msgid "Final angle"
 msgstr "Ângulo final"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:433
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:426
 msgid "Angle x tilt"
 msgstr "Ângulo X de inclinação"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:434
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:427
 msgid "Tilt of the ellipse around x axis"
 msgstr "Inclinação da elipse em torno do eixo X"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:449
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:442
 msgid "Angle y tilt"
 msgstr "Ângulo Y de inclinação"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:450
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:443
 msgid "Tilt of the ellipse around y axis"
 msgstr "Inclinação da elipse em torno do eixo Y"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:465
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:458
 msgid "Angle z tilt"
 msgstr "Ângulo Z de inclinação"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:466
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:459
 msgid "Tilt of the ellipse around z axis"
 msgstr "Inclinação da elipse em torno do eixo Z"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:482
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:475
 msgid "Width of the ellipse"
 msgstr "Largura da elipse"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:498
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:491
 msgid "Height of ellipse"
 msgstr "Altura da elipse"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:513
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:506
 msgid "Center"
 msgstr "Centro"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:514
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:507
 msgid "Center of ellipse"
 msgstr "Centro da elipse"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:529
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:338
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:522
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:331
 msgid "Direction of rotation"
 msgstr "Direção da rotação"
 
-#: ../clutter/deprecated/clutter-behaviour-opacity.c:184
+#: ../clutter/deprecated/clutter-behaviour-opacity.c:177
 msgid "Opacity Start"
 msgstr "Opacidade inicial"
 
-#: ../clutter/deprecated/clutter-behaviour-opacity.c:185
+#: ../clutter/deprecated/clutter-behaviour-opacity.c:178
 msgid "Initial opacity level"
 msgstr "Nível da opacidade inicial"
 
-#: ../clutter/deprecated/clutter-behaviour-opacity.c:202
+#: ../clutter/deprecated/clutter-behaviour-opacity.c:195
 msgid "Opacity End"
 msgstr "Opacidade final"
 
-#: ../clutter/deprecated/clutter-behaviour-opacity.c:203
+#: ../clutter/deprecated/clutter-behaviour-opacity.c:196
 msgid "Final opacity level"
 msgstr "Nível da opacidade final"
 
-#: ../clutter/deprecated/clutter-behaviour-path.c:226
+#: ../clutter/deprecated/clutter-behaviour-path.c:222
 msgid "The ClutterPath object representing the path to animate along"
 msgstr "O objeto ClutterPath representando o caminho da animação"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:283
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:276
 msgid "Angle Begin"
 msgstr "Inicio do ângulo"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:301
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:294
 msgid "Angle End"
 msgstr "Final do ângulo"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:319
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:312
 msgid "Axis"
 msgstr "Eixo"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:320
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:313
 msgid "Axis of rotation"
 msgstr "Eixo de rotação"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:355
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:348
 msgid "Center X"
 msgstr "X central"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:356
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:349
 msgid "X coordinate of the center of rotation"
 msgstr "Coordenada X do centro de rotação"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:373
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:366
 msgid "Center Y"
 msgstr "Y central"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:374
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:367
 msgid "Y coordinate of the center of rotation"
 msgstr "Coordenada Y do centro de rotação"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:391
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:384
 msgid "Center Z"
 msgstr "Z central"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:392
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:385
 msgid "Z coordinate of the center of rotation"
 msgstr "Coordenada Z do centro de rotação"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:226
+#: ../clutter/deprecated/clutter-behaviour-scale.c:222
 msgid "X Start Scale"
 msgstr "Início da escala X"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:227
+#: ../clutter/deprecated/clutter-behaviour-scale.c:223
 msgid "Initial scale on the X axis"
 msgstr "Escala inicial no eixo X"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:245
+#: ../clutter/deprecated/clutter-behaviour-scale.c:241
 msgid "X End Scale"
 msgstr "Final da escala X"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:246
+#: ../clutter/deprecated/clutter-behaviour-scale.c:242
 msgid "Final scale on the X axis"
 msgstr "Final da escala no eixo X"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:264
+#: ../clutter/deprecated/clutter-behaviour-scale.c:260
 msgid "Y Start Scale"
 msgstr "Início da escala Y"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:265
+#: ../clutter/deprecated/clutter-behaviour-scale.c:261
 msgid "Initial scale on the Y axis"
 msgstr "Escala inicial no eixo Y"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:283
+#: ../clutter/deprecated/clutter-behaviour-scale.c:279
 msgid "Y End Scale"
 msgstr "Final da escala Y"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:284
+#: ../clutter/deprecated/clutter-behaviour-scale.c:280
 msgid "Final scale on the Y axis"
 msgstr "Final da escala no eixo Y"
 
-#: ../clutter/deprecated/clutter-box.c:261
+#: ../clutter/deprecated/clutter-box.c:257
 msgid "The background color of the box"
 msgstr "A cor de fundo da caixa"
 
-#: ../clutter/deprecated/clutter-box.c:274
+#: ../clutter/deprecated/clutter-box.c:270
 msgid "Color Set"
 msgstr "Definir a cor"
 
-#: ../clutter/deprecated/clutter-cairo-texture.c:597
+#: ../clutter/deprecated/clutter-cairo-texture.c:593
 msgid "Surface Width"
 msgstr "Largura da superfície"
 
-#: ../clutter/deprecated/clutter-cairo-texture.c:598
+#: ../clutter/deprecated/clutter-cairo-texture.c:594
 msgid "The width of the Cairo surface"
 msgstr "A largura da superfície do Cairo"
 
-#: ../clutter/deprecated/clutter-cairo-texture.c:615
+#: ../clutter/deprecated/clutter-cairo-texture.c:611
 msgid "Surface Height"
 msgstr "Altura da superfície"
 
-#: ../clutter/deprecated/clutter-cairo-texture.c:616
+#: ../clutter/deprecated/clutter-cairo-texture.c:612
 msgid "The height of the Cairo surface"
 msgstr "A altura da superfície do Cairo"
 
-#: ../clutter/deprecated/clutter-cairo-texture.c:636
+#: ../clutter/deprecated/clutter-cairo-texture.c:632
 msgid "Auto Resize"
 msgstr "Redimensionamento automático"
 
-#: ../clutter/deprecated/clutter-cairo-texture.c:637
+#: ../clutter/deprecated/clutter-cairo-texture.c:633
 msgid "Whether the surface should match the allocation"
 msgstr "Se a superfície deve combinar com a posição"
 
@@ -2387,101 +2412,157 @@ msgstr "O nível de preenchimento do buffer"
 msgid "The duration of the stream, in seconds"
 msgstr "A duração do fluxo, em segundos"
 
-#: ../clutter/deprecated/clutter-rectangle.c:274
+#: ../clutter/deprecated/clutter-rectangle.c:271
 msgid "The color of the rectangle"
 msgstr "A cor do retângulo"
 
-#: ../clutter/deprecated/clutter-rectangle.c:287
+#: ../clutter/deprecated/clutter-rectangle.c:284
 msgid "Border Color"
 msgstr "Cor da borda"
 
-#: ../clutter/deprecated/clutter-rectangle.c:288
+#: ../clutter/deprecated/clutter-rectangle.c:285
 msgid "The color of the border of the rectangle"
 msgstr "A cor da borda do retângulo"
 
-#: ../clutter/deprecated/clutter-rectangle.c:303
+#: ../clutter/deprecated/clutter-rectangle.c:300
 msgid "Border Width"
 msgstr "Largura da borda"
 
-#: ../clutter/deprecated/clutter-rectangle.c:304
+#: ../clutter/deprecated/clutter-rectangle.c:301
 msgid "The width of the border of the rectangle"
 msgstr "A largura da borda do retângulo"
 
-#: ../clutter/deprecated/clutter-rectangle.c:318
+#: ../clutter/deprecated/clutter-rectangle.c:315
 msgid "Has Border"
 msgstr "Tem borda"
 
-#: ../clutter/deprecated/clutter-rectangle.c:319
+#: ../clutter/deprecated/clutter-rectangle.c:316
 msgid "Whether the rectangle should have a border"
 msgstr "Se o retângulo deve ter uma borda"
 
-#: ../clutter/deprecated/clutter-shader.c:261
+#: ../clutter/deprecated/clutter-shader.c:257
 msgid "Vertex Source"
 msgstr "Fonte de vértices"
 
-#: ../clutter/deprecated/clutter-shader.c:262
+#: ../clutter/deprecated/clutter-shader.c:258
 msgid "Source of vertex shader"
 msgstr "Fonte do shader de vértices"
 
-#: ../clutter/deprecated/clutter-shader.c:278
+#: ../clutter/deprecated/clutter-shader.c:274
 msgid "Fragment Source"
 msgstr "Fonte de fragmentos"
 
-#: ../clutter/deprecated/clutter-shader.c:279
+#: ../clutter/deprecated/clutter-shader.c:275
 msgid "Source of fragment shader"
 msgstr "Fonte do shader de fragmentos"
 
-#: ../clutter/deprecated/clutter-shader.c:296
+#: ../clutter/deprecated/clutter-shader.c:292
 msgid "Compiled"
 msgstr "Compilado"
 
-#: ../clutter/deprecated/clutter-shader.c:297
+#: ../clutter/deprecated/clutter-shader.c:293
 msgid "Whether the shader is compiled and linked"
 msgstr "Se o shader está compilado e vinculado"
 
-#: ../clutter/deprecated/clutter-shader.c:314
+#: ../clutter/deprecated/clutter-shader.c:310
 msgid "Whether the shader is enabled"
 msgstr "Se o shader está habilitado"
 
-#: ../clutter/deprecated/clutter-shader.c:525
+#: ../clutter/deprecated/clutter-shader.c:521
 #, c-format
 msgid "%s compilation failed: %s"
 msgstr "compilação de %s falhou: %s"
 
-#: ../clutter/deprecated/clutter-shader.c:526
+#: ../clutter/deprecated/clutter-shader.c:522
 msgid "Vertex shader"
 msgstr "Shader de vértices"
 
-#: ../clutter/deprecated/clutter-shader.c:527
+#: ../clutter/deprecated/clutter-shader.c:523
 msgid "Fragment shader"
 msgstr "Shader de fragmentos"
 
-#: ../clutter/deprecated/clutter-state.c:1504
+#: ../clutter/deprecated/clutter-state.c:1499
 msgid "State"
 msgstr "Estado"
 
-#: ../clutter/deprecated/clutter-state.c:1505
+#: ../clutter/deprecated/clutter-state.c:1500
 msgid "Currently set state, (transition to this state might not be complete)"
 msgstr "Estado definido atual (transição para este estado pode ser incompleta)"
 
-#: ../clutter/deprecated/clutter-state.c:1523
+#: ../clutter/deprecated/clutter-state.c:1518
 msgid "Default transition duration"
 msgstr "Duração de transição padrão"
 
-#: ../clutter/deprecated/clutter-texture.c:994
+#: ../clutter/deprecated/clutter-table-layout.c:543
+msgid "Column Number"
+msgstr "Número da coluna"
+
+#: ../clutter/deprecated/clutter-table-layout.c:544
+msgid "The column the widget resides in"
+msgstr "A coluna onde o componente reside"
+
+#: ../clutter/deprecated/clutter-table-layout.c:551
+msgid "Row Number"
+msgstr "Número da linha"
+
+#: ../clutter/deprecated/clutter-table-layout.c:552
+msgid "The row the widget resides in"
+msgstr "A linha onde o componente reside"
+
+#: ../clutter/deprecated/clutter-table-layout.c:559
+msgid "Column Span"
+msgstr "Intervalo de colunas"
+
+#: ../clutter/deprecated/clutter-table-layout.c:560
+msgid "The number of columns the widget should span"
+msgstr "O número de colunas o componente deve abranger"
+
+#: ../clutter/deprecated/clutter-table-layout.c:567
+msgid "Row Span"
+msgstr "Intervalo de linhas"
+
+#: ../clutter/deprecated/clutter-table-layout.c:568
+msgid "The number of rows the widget should span"
+msgstr "O número de linhas o componente deve abranger"
+
+#: ../clutter/deprecated/clutter-table-layout.c:575
+msgid "Horizontal Expand"
+msgstr "Espandir horizontalmente"
+
+#: ../clutter/deprecated/clutter-table-layout.c:576
+msgid "Allocate extra space for the child in horizontal axis"
+msgstr "Alocar espaço adicional para a criança no eixo horizontal"
+
+#: ../clutter/deprecated/clutter-table-layout.c:582
+msgid "Vertical Expand"
+msgstr "Espandir verticalmente"
+
+#: ../clutter/deprecated/clutter-table-layout.c:583
+msgid "Allocate extra space for the child in vertical axis"
+msgstr "Alocar espaço adicional para a criança no eixo vertical"
+
+#: ../clutter/deprecated/clutter-table-layout.c:1638
+msgid "Spacing between columns"
+msgstr "Espaçamento entre as colunas"
+
+#: ../clutter/deprecated/clutter-table-layout.c:1654
+msgid "Spacing between rows"
+msgstr "Espaçamento entre as filas"
+
+#: ../clutter/deprecated/clutter-texture.c:992
 msgid "Sync size of actor"
 msgstr "Sincronizar tamanho do ator"
 
-#: ../clutter/deprecated/clutter-texture.c:995
+#: ../clutter/deprecated/clutter-texture.c:993
 msgid "Auto sync size of actor to underlying pixbuf dimensions"
 msgstr ""
 "Sincronização automática do tamanho do às dimensões do pixbuf subjacente"
 
-#: ../clutter/deprecated/clutter-texture.c:1002
+#: ../clutter/deprecated/clutter-texture.c:1000
 msgid "Disable Slicing"
 msgstr "Desativar fatiamento"
 
-#: ../clutter/deprecated/clutter-texture.c:1003
+#: ../clutter/deprecated/clutter-texture.c:1001
 msgid ""
 "Forces the underlying texture to be singular and not made of smaller space "
 "saving individual textures"
@@ -2489,97 +2570,97 @@ msgstr ""
 "Força a textura subjacente a ser singular e não feita de pequenas texturas "
 "individuais"
 
-#: ../clutter/deprecated/clutter-texture.c:1012
+#: ../clutter/deprecated/clutter-texture.c:1010
 msgid "Tile Waste"
 msgstr "Resíduo de ladrilhos"
 
-#: ../clutter/deprecated/clutter-texture.c:1013
+#: ../clutter/deprecated/clutter-texture.c:1011
 msgid "Maximum waste area of a sliced texture"
 msgstr "Área máxima de resíduos de uma textura em fatias"
 
-#: ../clutter/deprecated/clutter-texture.c:1021
+#: ../clutter/deprecated/clutter-texture.c:1019
 msgid "Horizontal repeat"
 msgstr "Repetir horizontal"
 
-#: ../clutter/deprecated/clutter-texture.c:1022
+#: ../clutter/deprecated/clutter-texture.c:1020
 msgid "Repeat the contents rather than scaling them horizontally"
 msgstr "Repete o conteúdo em vez de escalar na horizontal"
 
-#: ../clutter/deprecated/clutter-texture.c:1029
+#: ../clutter/deprecated/clutter-texture.c:1027
 msgid "Vertical repeat"
 msgstr "Repetir vertical"
 
-#: ../clutter/deprecated/clutter-texture.c:1030
+#: ../clutter/deprecated/clutter-texture.c:1028
 msgid "Repeat the contents rather than scaling them vertically"
 msgstr "Repete o conteúdo em vez de escalar na vertical"
 
-#: ../clutter/deprecated/clutter-texture.c:1037
+#: ../clutter/deprecated/clutter-texture.c:1035
 msgid "Filter Quality"
 msgstr "Qualidade do filtro"
 
-#: ../clutter/deprecated/clutter-texture.c:1038
+#: ../clutter/deprecated/clutter-texture.c:1036
 msgid "Rendering quality used when drawing the texture"
 msgstr "Qualidade da renderização usada para desenhar a textura"
 
-#: ../clutter/deprecated/clutter-texture.c:1046
+#: ../clutter/deprecated/clutter-texture.c:1044
 msgid "Pixel Format"
 msgstr "Formato do pixel"
 
-#: ../clutter/deprecated/clutter-texture.c:1047
+#: ../clutter/deprecated/clutter-texture.c:1045
 msgid "The Cogl pixel format to use"
 msgstr "O formato do pixel Cogl para usar"
 
-#: ../clutter/deprecated/clutter-texture.c:1055
-#: ../clutter/wayland/clutter-wayland-surface.c:449
+#: ../clutter/deprecated/clutter-texture.c:1053
+#: ../clutter/wayland/clutter-wayland-surface.c:445
 msgid "Cogl Texture"
 msgstr "Textura Cogl"
 
-#: ../clutter/deprecated/clutter-texture.c:1056
-#: ../clutter/wayland/clutter-wayland-surface.c:450
+#: ../clutter/deprecated/clutter-texture.c:1054
+#: ../clutter/wayland/clutter-wayland-surface.c:446
 msgid "The underlying Cogl texture handle used to draw this actor"
 msgstr ""
 "O identificador da textura Cogl subjacente usado para desenhar este ator"
 
-#: ../clutter/deprecated/clutter-texture.c:1063
+#: ../clutter/deprecated/clutter-texture.c:1061
 msgid "Cogl Material"
 msgstr "Material Cogl"
 
-#: ../clutter/deprecated/clutter-texture.c:1064
+#: ../clutter/deprecated/clutter-texture.c:1062
 msgid "The underlying Cogl material handle used to draw this actor"
 msgstr ""
 "O identificador do material Cogl subjacente usado para desenhar este ator"
 
-#: ../clutter/deprecated/clutter-texture.c:1083
+#: ../clutter/deprecated/clutter-texture.c:1081
 msgid "The path of the file containing the image data"
 msgstr "O caminho do arquivo contendo os dados da imagem"
 
-#: ../clutter/deprecated/clutter-texture.c:1090
+#: ../clutter/deprecated/clutter-texture.c:1088
 msgid "Keep Aspect Ratio"
 msgstr "Manter proporções"
 
-#: ../clutter/deprecated/clutter-texture.c:1091
+#: ../clutter/deprecated/clutter-texture.c:1089
 msgid ""
 "Keep the aspect ratio of the texture when requesting the preferred width or "
 "height"
 msgstr ""
 "Manter a proporção da textura ao solicitar a largura ou altura preferencial"
 
-#: ../clutter/deprecated/clutter-texture.c:1119
+#: ../clutter/deprecated/clutter-texture.c:1117
 msgid "Load asynchronously"
 msgstr "Carregar de forma assíncrona"
 
-#: ../clutter/deprecated/clutter-texture.c:1120
+#: ../clutter/deprecated/clutter-texture.c:1118
 msgid ""
 "Load files inside a thread to avoid blocking when loading images from disk"
 msgstr ""
 "Carregar arquivos dentro de um thread para evitar o bloqueio ao carregar "
 "imagens do disco"
 
-#: ../clutter/deprecated/clutter-texture.c:1138
+#: ../clutter/deprecated/clutter-texture.c:1136
 msgid "Load data asynchronously"
 msgstr "Carregar dados de forma assíncrona"
 
-#: ../clutter/deprecated/clutter-texture.c:1139
+#: ../clutter/deprecated/clutter-texture.c:1137
 msgid ""
 "Decode image data files inside a thread to reduce blocking when loading "
 "images from disk"
@@ -2587,194 +2668,194 @@ msgstr ""
 "Decodificar arquivos de dados de imagens dentro de um thread para reduzir o "
 "bloqueio ao carregar imagens do disco"
 
-#: ../clutter/deprecated/clutter-texture.c:1165
+#: ../clutter/deprecated/clutter-texture.c:1163
 msgid "Pick With Alpha"
 msgstr "Com o pacote alfa"
 
-#: ../clutter/deprecated/clutter-texture.c:1166
+#: ../clutter/deprecated/clutter-texture.c:1164
 msgid "Shape actor with alpha channel when picking"
 msgstr "Formar ator com o canal alfa ao escolher"
 
-#: ../clutter/deprecated/clutter-texture.c:1599
-#: ../clutter/deprecated/clutter-texture.c:1994
-#: ../clutter/deprecated/clutter-texture.c:2090
-#: ../clutter/deprecated/clutter-texture.c:2388
+#: ../clutter/deprecated/clutter-texture.c:1597
+#: ../clutter/deprecated/clutter-texture.c:1992
+#: ../clutter/deprecated/clutter-texture.c:2088
+#: ../clutter/deprecated/clutter-texture.c:2386
 #, c-format
 msgid "Failed to load the image data"
 msgstr "Falhou ao carregar dados da imagem"
 
-#: ../clutter/deprecated/clutter-texture.c:1758
+#: ../clutter/deprecated/clutter-texture.c:1756
 #, c-format
 msgid "YUV textures are not supported"
 msgstr "Sem suporte para texturas YUV"
 
-#: ../clutter/deprecated/clutter-texture.c:1767
+#: ../clutter/deprecated/clutter-texture.c:1765
 #, c-format
 msgid "YUV2 textues are not supported"
 msgstr "Sem suporte para texturas YUV2"
 
-#: ../clutter/evdev/clutter-input-device-evdev.c:159
+#: ../clutter/evdev/clutter-input-device-evdev.c:154
 msgid "sysfs Path"
 msgstr "Caminho sysfs"
 
-#: ../clutter/evdev/clutter-input-device-evdev.c:160
+#: ../clutter/evdev/clutter-input-device-evdev.c:155
 msgid "Path of the device in sysfs"
 msgstr "Caminho do dispositivo no sysfs"
 
-#: ../clutter/evdev/clutter-input-device-evdev.c:175
+#: ../clutter/evdev/clutter-input-device-evdev.c:170
 msgid "Device Path"
 msgstr "Caminho do dispositivo"
 
-#: ../clutter/evdev/clutter-input-device-evdev.c:176
+#: ../clutter/evdev/clutter-input-device-evdev.c:171
 msgid "Path of the device node"
 msgstr "Caminho do nó do dispositivo"
 
-#: ../clutter/gdk/clutter-backend-gdk.c:296
+#: ../clutter/gdk/clutter-backend-gdk.c:289
 #, c-format
 msgid "Could not find a suitable CoglWinsys for a GdkDisplay of type %s"
 msgstr ""
 "Não foi encontrado um CoglWinsys apropriado para um GdkDisplay do tipo %s"
 
-#: ../clutter/wayland/clutter-wayland-surface.c:423
+#: ../clutter/wayland/clutter-wayland-surface.c:419
 msgid "Surface"
 msgstr "Superfície"
 
-#: ../clutter/wayland/clutter-wayland-surface.c:424
+#: ../clutter/wayland/clutter-wayland-surface.c:420
 msgid "The underlying wayland surface"
 msgstr "A superfície wayland"
 
-#: ../clutter/wayland/clutter-wayland-surface.c:431
+#: ../clutter/wayland/clutter-wayland-surface.c:427
 msgid "Surface width"
 msgstr "Largura da superfície"
 
-#: ../clutter/wayland/clutter-wayland-surface.c:432
+#: ../clutter/wayland/clutter-wayland-surface.c:428
 msgid "The width of the underlying wayland surface"
 msgstr "A largura da superfície wayland"
 
-#: ../clutter/wayland/clutter-wayland-surface.c:440
+#: ../clutter/wayland/clutter-wayland-surface.c:436
 msgid "Surface height"
 msgstr "Altura da superfície"
 
-#: ../clutter/wayland/clutter-wayland-surface.c:441
+#: ../clutter/wayland/clutter-wayland-surface.c:437
 msgid "The height of the underlying wayland surface"
 msgstr "A altura da superfície wayland"
 
-#: ../clutter/x11/clutter-backend-x11.c:516
+#: ../clutter/x11/clutter-backend-x11.c:488
 msgid "X display to use"
 msgstr "Tela X para usar"
 
-#: ../clutter/x11/clutter-backend-x11.c:522
+#: ../clutter/x11/clutter-backend-x11.c:494
 msgid "X screen to use"
 msgstr "Tela X para usar"
 
-#: ../clutter/x11/clutter-backend-x11.c:527
+#: ../clutter/x11/clutter-backend-x11.c:499
 msgid "Make X calls synchronous"
 msgstr "Fazer chamadas X sncronizadas"
 
-#: ../clutter/x11/clutter-backend-x11.c:534
-msgid "Enable XInput support"
-msgstr "Habilitar suporte XInput"
+#: ../clutter/x11/clutter-backend-x11.c:506
+msgid "Disable XInput support"
+msgstr "Desabilitar suporte XInput"
 
-#: ../clutter/x11/clutter-keymap-x11.c:317
+#: ../clutter/x11/clutter-keymap-x11.c:322
 msgid "The Clutter backend"
 msgstr "O backend do Clutter"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:539
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:534
 msgid "Pixmap"
 msgstr "Pixmap"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:540
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:535
 msgid "The X11 Pixmap to be bound"
 msgstr "O Pixmap X11 para vincular"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:548
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:543
 msgid "Pixmap width"
 msgstr "Largura do pixmap"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:549
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:544
 msgid "The width of the pixmap bound to this texture"
 msgstr "A largura do pixmap vinculado a esta textura"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:557
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:552
 msgid "Pixmap height"
 msgstr "Altura do pixmap"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:558
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:553
 msgid "The height of the pixmap bound to this texture"
 msgstr "A altura do pixmap vinculado a esta textura"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:566
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:561
 msgid "Pixmap Depth"
 msgstr "Profundidade do pixmap"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:567
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:562
 msgid "The depth (in number of bits) of the pixmap bound to this texture"
 msgstr "A profundidade (número de bits) do pixmap vinculado a esta textura"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:575
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:570
 msgid "Automatic Updates"
 msgstr "Atualização automática"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:576
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:571
 msgid "If the texture should be kept in sync with any pixmap changes."
 msgstr ""
 "Se a textura deve ser mantida em sincronia com qualquer alteração no pixmap"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:584
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:579
 msgid "Window"
 msgstr "Janela"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:585
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:580
 msgid "The X11 Window to be bound"
 msgstr "A janela X11 a ser vinculada"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:593
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:588
 msgid "Window Redirect Automatic"
 msgstr "Redirecionamento automático de janelas"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:594
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:589
 msgid "If composite window redirects are set to Automatic (or Manual if false)"
 msgstr ""
 "Se o redirecionamento de janelas compostas está definido como Automático (ou "
 "Manual se falso)"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:604
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:599
 msgid "Window Mapped"
 msgstr "Janela mapeada"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:605
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:600
 msgid "If window is mapped"
 msgstr "Se a janela é mapeada"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:614
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:609
 msgid "Destroyed"
 msgstr "Destruída"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:615
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:610
 msgid "If window has been destroyed"
 msgstr "Se a janela foi destruída"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:623
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:618
 msgid "Window X"
 msgstr "Janela X"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:624
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:619
 msgid "X position of window on screen according to X11"
 msgstr "a posição X da janela na tela de acordo com o X11"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:632
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:627
 msgid "Window Y"
 msgstr "Janela Y"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:633
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:628
 msgid "Y position of window on screen according to X11"
 msgstr "A posição Y da janela na tela de acordo com o X11"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:640
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:635
 msgid "Window Override Redirect"
 msgstr "Redirecionamento de substituição de janelas"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:641
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:636
 msgid "If this is an override-redirect window"
 msgstr "Se esta é uma janela com redirecionamento de substituição"
 
diff --git a/po/ru.po b/po/ru.po
index 5ce07f3b0..ce199bdc0 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -8,9 +8,9 @@ msgstr ""
 "Project-Id-Version: clutter master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=clutter&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2012-12-18 02:00+0000\n"
-"PO-Revision-Date: 2012-12-18 09:50+0400\n"
-"Last-Translator: Aleksej Kabanov <ak099@mail.ru>\n"
+"POT-Creation-Date: 2014-03-11 04:08+0000\n"
+"PO-Revision-Date: 2014-03-11 16:18+0300\n"
+"Last-Translator: Yuri Myasoedov <omerta13@yandex.ru>\n"
 "Language-Team: русский <gnome-cyr@gnome.org>\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
@@ -20,690 +20,690 @@ msgstr ""
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Generator: Poedit 1.5.4\n"
 
-#: ../clutter/clutter-actor.c:6144
+#: ../clutter/clutter-actor.c:6214
 msgid "X coordinate"
 msgstr "Координата по оси X"
 
-#: ../clutter/clutter-actor.c:6145
+#: ../clutter/clutter-actor.c:6215
 msgid "X coordinate of the actor"
 msgstr "Координата актора по оси X"
 
-#: ../clutter/clutter-actor.c:6163
+#: ../clutter/clutter-actor.c:6233
 msgid "Y coordinate"
 msgstr "Координата по оси Y"
 
-#: ../clutter/clutter-actor.c:6164
+#: ../clutter/clutter-actor.c:6234
 msgid "Y coordinate of the actor"
 msgstr "Координата актора по оси Y"
 
-#: ../clutter/clutter-actor.c:6186
+#: ../clutter/clutter-actor.c:6256
 msgid "Position"
 msgstr "Положение"
 
-#: ../clutter/clutter-actor.c:6187
+#: ../clutter/clutter-actor.c:6257
 msgid "The position of the origin of the actor"
 msgstr "Исходное положение актора"
 
-#: ../clutter/clutter-actor.c:6204 ../clutter/clutter-canvas.c:215
-#: ../clutter/clutter-grid-layout.c:1238
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:481
+#: ../clutter/clutter-actor.c:6274 ../clutter/clutter-canvas.c:247
+#: ../clutter/clutter-grid-layout.c:1239
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:474
 msgid "Width"
 msgstr "Ширина"
 
-#: ../clutter/clutter-actor.c:6205
+#: ../clutter/clutter-actor.c:6275
 msgid "Width of the actor"
 msgstr "Ширина актора"
 
-#: ../clutter/clutter-actor.c:6223 ../clutter/clutter-canvas.c:231
-#: ../clutter/clutter-grid-layout.c:1245
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:497
+#: ../clutter/clutter-actor.c:6293 ../clutter/clutter-canvas.c:263
+#: ../clutter/clutter-grid-layout.c:1246
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:490
 msgid "Height"
 msgstr "Высота"
 
-#: ../clutter/clutter-actor.c:6224
+#: ../clutter/clutter-actor.c:6294
 msgid "Height of the actor"
 msgstr "Высота актора"
 
-#: ../clutter/clutter-actor.c:6245
+#: ../clutter/clutter-actor.c:6315
 msgid "Size"
 msgstr "Размер"
 
-#: ../clutter/clutter-actor.c:6246
+#: ../clutter/clutter-actor.c:6316
 msgid "The size of the actor"
 msgstr "Размер актора"
 
-#: ../clutter/clutter-actor.c:6264
+#: ../clutter/clutter-actor.c:6334
 msgid "Fixed X"
 msgstr "Фиксировано по оси X"
 
-#: ../clutter/clutter-actor.c:6265
+#: ../clutter/clutter-actor.c:6335
 msgid "Forced X position of the actor"
 msgstr "Принудительное положение размещения актора по оси X"
 
-#: ../clutter/clutter-actor.c:6282
+#: ../clutter/clutter-actor.c:6352
 msgid "Fixed Y"
 msgstr "Фиксировано по оси Y"
 
-#: ../clutter/clutter-actor.c:6283
+#: ../clutter/clutter-actor.c:6353
 msgid "Forced Y position of the actor"
 msgstr "Принудительное положение размещения актора по оси Y"
 
-#: ../clutter/clutter-actor.c:6298
+#: ../clutter/clutter-actor.c:6368
 msgid "Fixed position set"
 msgstr "Фиксированное положение"
 
-#: ../clutter/clutter-actor.c:6299
+#: ../clutter/clutter-actor.c:6369
 msgid "Whether to use fixed positioning for the actor"
 msgstr "Использовать ли фиксированное позиционирование актора"
 
-#: ../clutter/clutter-actor.c:6317
+#: ../clutter/clutter-actor.c:6387
 msgid "Min Width"
 msgstr "Мин. ширина"
 
-#: ../clutter/clutter-actor.c:6318
+#: ../clutter/clutter-actor.c:6388
 msgid "Forced minimum width request for the actor"
 msgstr "Запрос принудительной минимальной ширины актора"
 
-#: ../clutter/clutter-actor.c:6336
+#: ../clutter/clutter-actor.c:6406
 msgid "Min Height"
 msgstr "Мин. высота"
 
-#: ../clutter/clutter-actor.c:6337
+#: ../clutter/clutter-actor.c:6407
 msgid "Forced minimum height request for the actor"
 msgstr "Запрос принудительной минимальной высоты актора"
 
-#: ../clutter/clutter-actor.c:6355
+#: ../clutter/clutter-actor.c:6425
 msgid "Natural Width"
 msgstr "Естественная ширина"
 
-#: ../clutter/clutter-actor.c:6356
+#: ../clutter/clutter-actor.c:6426
 msgid "Forced natural width request for the actor"
 msgstr "Запрос принудительной естественной ширины актора"
 
-#: ../clutter/clutter-actor.c:6374
+#: ../clutter/clutter-actor.c:6444
 msgid "Natural Height"
 msgstr "Естественная высота"
 
-#: ../clutter/clutter-actor.c:6375
+#: ../clutter/clutter-actor.c:6445
 msgid "Forced natural height request for the actor"
 msgstr "Запрос принудительной естественной высоты актора"
 
-#: ../clutter/clutter-actor.c:6390
+#: ../clutter/clutter-actor.c:6460
 msgid "Minimum width set"
 msgstr "Минимальная ширина"
 
-#: ../clutter/clutter-actor.c:6391
+#: ../clutter/clutter-actor.c:6461
 msgid "Whether to use the min-width property"
 msgstr "Использовать ли свойство min-width"
 
-#: ../clutter/clutter-actor.c:6405
+#: ../clutter/clutter-actor.c:6475
 msgid "Minimum height set"
 msgstr "Минимальная высота"
 
-#: ../clutter/clutter-actor.c:6406
+#: ../clutter/clutter-actor.c:6476
 msgid "Whether to use the min-height property"
 msgstr "Использовать ли свойство min-height"
 
-#: ../clutter/clutter-actor.c:6420
+#: ../clutter/clutter-actor.c:6490
 msgid "Natural width set"
 msgstr "Естественная ширина"
 
-#: ../clutter/clutter-actor.c:6421
+#: ../clutter/clutter-actor.c:6491
 msgid "Whether to use the natural-width property"
 msgstr "Использовать ли свойство natural-width"
 
-#: ../clutter/clutter-actor.c:6435
+#: ../clutter/clutter-actor.c:6505
 msgid "Natural height set"
 msgstr "Естественная высота"
 
-#: ../clutter/clutter-actor.c:6436
+#: ../clutter/clutter-actor.c:6506
 msgid "Whether to use the natural-height property"
 msgstr "Использовать ли свойство natural-height"
 
-#: ../clutter/clutter-actor.c:6452
+#: ../clutter/clutter-actor.c:6522
 msgid "Allocation"
 msgstr "Размещение"
 
-#: ../clutter/clutter-actor.c:6453
+#: ../clutter/clutter-actor.c:6523
 msgid "The actor's allocation"
 msgstr "Размещение актора"
 
-#: ../clutter/clutter-actor.c:6510
+#: ../clutter/clutter-actor.c:6580
 msgid "Request Mode"
 msgstr "Режим запроса"
 
-#: ../clutter/clutter-actor.c:6511
+#: ../clutter/clutter-actor.c:6581
 msgid "The actor's request mode"
 msgstr "Режим запроса актора"
 
-#: ../clutter/clutter-actor.c:6535
+#: ../clutter/clutter-actor.c:6605
 msgid "Depth"
 msgstr "Глубина"
 
-#: ../clutter/clutter-actor.c:6536
+#: ../clutter/clutter-actor.c:6606
 msgid "Position on the Z axis"
 msgstr "Положение по оси Z"
 
-#: ../clutter/clutter-actor.c:6563
+#: ../clutter/clutter-actor.c:6633
 msgid "Z Position"
 msgstr "Положение по оси Z"
 
-#: ../clutter/clutter-actor.c:6564
+#: ../clutter/clutter-actor.c:6634
 msgid "The actor's position on the Z axis"
 msgstr "Положение актора по оси Z"
 
-#: ../clutter/clutter-actor.c:6581
+#: ../clutter/clutter-actor.c:6651
 msgid "Opacity"
 msgstr "Непрозрачность"
 
-#: ../clutter/clutter-actor.c:6582
+#: ../clutter/clutter-actor.c:6652
 msgid "Opacity of an actor"
 msgstr "Непрозрачность актора"
 
-#: ../clutter/clutter-actor.c:6602
+#: ../clutter/clutter-actor.c:6672
 msgid "Offscreen redirect"
 msgstr "Закадровое перенаправление"
 
-#: ../clutter/clutter-actor.c:6603
+#: ../clutter/clutter-actor.c:6673
 msgid "Flags controlling when to flatten the actor into a single image"
 msgstr "Флаги, контролирующие перевод актора в одиночное изображение"
 
-#: ../clutter/clutter-actor.c:6617
+#: ../clutter/clutter-actor.c:6687
 msgid "Visible"
 msgstr "Видимость"
 
-#: ../clutter/clutter-actor.c:6618
+#: ../clutter/clutter-actor.c:6688
 msgid "Whether the actor is visible or not"
 msgstr "Является ли актор видимым"
 
-#: ../clutter/clutter-actor.c:6632
+#: ../clutter/clutter-actor.c:6702
 msgid "Mapped"
 msgstr "Отображён"
 
-#: ../clutter/clutter-actor.c:6633
+#: ../clutter/clutter-actor.c:6703
 msgid "Whether the actor will be painted"
 msgstr "Будет ли отрисовываться актор"
 
-#: ../clutter/clutter-actor.c:6646
+#: ../clutter/clutter-actor.c:6716
 msgid "Realized"
 msgstr "Реализован"
 
-#: ../clutter/clutter-actor.c:6647
+#: ../clutter/clutter-actor.c:6717
 msgid "Whether the actor has been realized"
 msgstr "Нужно ли реализовывать актор"
 
-#: ../clutter/clutter-actor.c:6662
+#: ../clutter/clutter-actor.c:6732
 msgid "Reactive"
 msgstr "Реактивный"
 
-#: ../clutter/clutter-actor.c:6663
+#: ../clutter/clutter-actor.c:6733
 msgid "Whether the actor is reactive to events"
 msgstr "Реагирует ли актор на события"
 
-#: ../clutter/clutter-actor.c:6674
+#: ../clutter/clutter-actor.c:6744
 msgid "Has Clip"
 msgstr "Есть кадр"
 
-#: ../clutter/clutter-actor.c:6675
+#: ../clutter/clutter-actor.c:6745
 msgid "Whether the actor has a clip set"
 msgstr "Имеется ли у актора кадр"
 
-#: ../clutter/clutter-actor.c:6688
+#: ../clutter/clutter-actor.c:6758
 msgid "Clip"
 msgstr "Кадрирование"
 
-#: ../clutter/clutter-actor.c:6689
+#: ../clutter/clutter-actor.c:6759
 msgid "The clip region for the actor"
 msgstr "Область кадирорования для актора"
 
-#: ../clutter/clutter-actor.c:6708
+#: ../clutter/clutter-actor.c:6778
 msgid "Clip Rectangle"
 msgstr "Прямоугольник кадрирования"
 
-#: ../clutter/clutter-actor.c:6709
+#: ../clutter/clutter-actor.c:6779
 msgid "The visible region of the actor"
 msgstr "Видимая область актора"
 
-#: ../clutter/clutter-actor.c:6723 ../clutter/clutter-actor-meta.c:207
-#: ../clutter/clutter-binding-pool.c:319 ../clutter/clutter-input-device.c:258
+#: ../clutter/clutter-actor.c:6793 ../clutter/clutter-actor-meta.c:205
+#: ../clutter/clutter-binding-pool.c:319 ../clutter/clutter-input-device.c:247
 msgid "Name"
 msgstr "Имя"
 
-#: ../clutter/clutter-actor.c:6724
+#: ../clutter/clutter-actor.c:6794
 msgid "Name of the actor"
 msgstr "Имя актора"
 
-#: ../clutter/clutter-actor.c:6745
+#: ../clutter/clutter-actor.c:6815
 msgid "Pivot Point"
 msgstr "Точка вращения"
 
-#: ../clutter/clutter-actor.c:6746
+#: ../clutter/clutter-actor.c:6816
 msgid "The point around which the scaling and rotation occur"
 msgstr "Точка, вокруг которой выполняется масштабирование и вращение"
 
-#: ../clutter/clutter-actor.c:6764
+#: ../clutter/clutter-actor.c:6834
 msgid "Pivot Point Z"
 msgstr "Точка вращения Z"
 
-#: ../clutter/clutter-actor.c:6765
+#: ../clutter/clutter-actor.c:6835
 msgid "Z component of the pivot point"
 msgstr "Компонента Z точки вращения"
 
-#: ../clutter/clutter-actor.c:6783
+#: ../clutter/clutter-actor.c:6853
 msgid "Scale X"
 msgstr "Масштаб по оси X"
 
-#: ../clutter/clutter-actor.c:6784
+#: ../clutter/clutter-actor.c:6854
 msgid "Scale factor on the X axis"
 msgstr "Масштабный коэффициент по оси X"
 
-#: ../clutter/clutter-actor.c:6802
+#: ../clutter/clutter-actor.c:6872
 msgid "Scale Y"
 msgstr "Масштаб по оси Y"
 
-#: ../clutter/clutter-actor.c:6803
+#: ../clutter/clutter-actor.c:6873
 msgid "Scale factor on the Y axis"
 msgstr "Масштабный коэффициент по оси Y"
 
-#: ../clutter/clutter-actor.c:6821
+#: ../clutter/clutter-actor.c:6891
 msgid "Scale Z"
 msgstr "Масштаб по оси Z"
 
-#: ../clutter/clutter-actor.c:6822
+#: ../clutter/clutter-actor.c:6892
 msgid "Scale factor on the Z axis"
 msgstr "Масштабный коэффициент по оси Z"
 
-#: ../clutter/clutter-actor.c:6840
+#: ../clutter/clutter-actor.c:6910
 msgid "Scale Center X"
 msgstr "Центр масштабирования по оси X"
 
-#: ../clutter/clutter-actor.c:6841
+#: ../clutter/clutter-actor.c:6911
 msgid "Horizontal scale center"
 msgstr "Центр масштабирования по горизонтали"
 
-#: ../clutter/clutter-actor.c:6859
+#: ../clutter/clutter-actor.c:6929
 msgid "Scale Center Y"
 msgstr "Центр масштабирования по оси Y"
 
-#: ../clutter/clutter-actor.c:6860
+#: ../clutter/clutter-actor.c:6930
 msgid "Vertical scale center"
 msgstr "Центр масштабирования по вертикали"
 
-#: ../clutter/clutter-actor.c:6878
+#: ../clutter/clutter-actor.c:6948
 msgid "Scale Gravity"
 msgstr "Притяжение масштабирования"
 
-#: ../clutter/clutter-actor.c:6879
+#: ../clutter/clutter-actor.c:6949
 msgid "The center of scaling"
 msgstr "Центр масштабирования"
 
-#: ../clutter/clutter-actor.c:6897
+#: ../clutter/clutter-actor.c:6967
 msgid "Rotation Angle X"
 msgstr "Угол поворота на оси X"
 
-#: ../clutter/clutter-actor.c:6898
+#: ../clutter/clutter-actor.c:6968
 msgid "The rotation angle on the X axis"
 msgstr "Угол поворота на оси X"
 
-#: ../clutter/clutter-actor.c:6916
+#: ../clutter/clutter-actor.c:6986
 msgid "Rotation Angle Y"
 msgstr "Угол поворота на оси Y"
 
-#: ../clutter/clutter-actor.c:6917
+#: ../clutter/clutter-actor.c:6987
 msgid "The rotation angle on the Y axis"
 msgstr "Угол поворота на оси Y"
 
-#: ../clutter/clutter-actor.c:6935
+#: ../clutter/clutter-actor.c:7005
 msgid "Rotation Angle Z"
 msgstr "Угол поворота на оси Z"
 
-#: ../clutter/clutter-actor.c:6936
+#: ../clutter/clutter-actor.c:7006
 msgid "The rotation angle on the Z axis"
 msgstr "Угол поворота на оси Z"
 
-#: ../clutter/clutter-actor.c:6954
+#: ../clutter/clutter-actor.c:7024
 msgid "Rotation Center X"
 msgstr "Центр поворота на оси X"
 
-#: ../clutter/clutter-actor.c:6955
+#: ../clutter/clutter-actor.c:7025
 msgid "The rotation center on the X axis"
 msgstr "Центр поворота на оси X"
 
-#: ../clutter/clutter-actor.c:6972
+#: ../clutter/clutter-actor.c:7042
 msgid "Rotation Center Y"
 msgstr "Центр поворота на оси Y"
 
-#: ../clutter/clutter-actor.c:6973
+#: ../clutter/clutter-actor.c:7043
 msgid "The rotation center on the Y axis"
 msgstr "Центр поворота на оси Y"
 
-#: ../clutter/clutter-actor.c:6990
+#: ../clutter/clutter-actor.c:7060
 msgid "Rotation Center Z"
 msgstr "Центр поворота на оси Z"
 
-#: ../clutter/clutter-actor.c:6991
+#: ../clutter/clutter-actor.c:7061
 msgid "The rotation center on the Z axis"
 msgstr "Центр поворота на оси Z"
 
-#: ../clutter/clutter-actor.c:7008
+#: ../clutter/clutter-actor.c:7078
 msgid "Rotation Center Z Gravity"
 msgstr "Притяжение центра поворота по оси Z"
 
-#: ../clutter/clutter-actor.c:7009
+#: ../clutter/clutter-actor.c:7079
 msgid "Center point for rotation around the Z axis"
 msgstr "Центральная точка поворота вокруг оси Z"
 
-#: ../clutter/clutter-actor.c:7037
+#: ../clutter/clutter-actor.c:7107
 msgid "Anchor X"
 msgstr "Привязка по оси X"
 
-#: ../clutter/clutter-actor.c:7038
+#: ../clutter/clutter-actor.c:7108
 msgid "X coordinate of the anchor point"
 msgstr "Координата точки привязки по оси X"
 
-#: ../clutter/clutter-actor.c:7066
+#: ../clutter/clutter-actor.c:7136
 msgid "Anchor Y"
 msgstr "Привязка по оси Y"
 
-#: ../clutter/clutter-actor.c:7067
+#: ../clutter/clutter-actor.c:7137
 msgid "Y coordinate of the anchor point"
 msgstr "Координата точки привязки по оси Y"
 
-#: ../clutter/clutter-actor.c:7094
+#: ../clutter/clutter-actor.c:7164
 msgid "Anchor Gravity"
 msgstr "Притяжение привязки"
 
-#: ../clutter/clutter-actor.c:7095
+#: ../clutter/clutter-actor.c:7165
 msgid "The anchor point as a ClutterGravity"
 msgstr "Точка привязки как ClutterGravity"
 
-#: ../clutter/clutter-actor.c:7114
+#: ../clutter/clutter-actor.c:7184
 msgid "Translation X"
 msgstr "Переход по X"
 
-#: ../clutter/clutter-actor.c:7115
+#: ../clutter/clutter-actor.c:7185
 msgid "Translation along the X axis"
 msgstr "Переход по оси X"
 
-#: ../clutter/clutter-actor.c:7134
+#: ../clutter/clutter-actor.c:7204
 msgid "Translation Y"
 msgstr "Переход по Y"
 
-#: ../clutter/clutter-actor.c:7135
+#: ../clutter/clutter-actor.c:7205
 msgid "Translation along the Y axis"
 msgstr "Переход по оси Y"
 
-#: ../clutter/clutter-actor.c:7154
+#: ../clutter/clutter-actor.c:7224
 msgid "Translation Z"
 msgstr "Переход по Z"
 
-#: ../clutter/clutter-actor.c:7155
+#: ../clutter/clutter-actor.c:7225
 msgid "Translation along the Z axis"
 msgstr "Переход по оси Z"
 
-#: ../clutter/clutter-actor.c:7185
+#: ../clutter/clutter-actor.c:7255
 msgid "Transform"
 msgstr "Преобразование"
 
-#: ../clutter/clutter-actor.c:7186
+#: ../clutter/clutter-actor.c:7256
 msgid "Transformation matrix"
 msgstr "Матрица преобразования"
 
-#: ../clutter/clutter-actor.c:7201
+#: ../clutter/clutter-actor.c:7271
 msgid "Transform Set"
 msgstr "Установить преобразование"
 
-#: ../clutter/clutter-actor.c:7202
+#: ../clutter/clutter-actor.c:7272
 msgid "Whether the transform property is set"
 msgstr "Установлено ли свойство преобразования"
 
-#: ../clutter/clutter-actor.c:7223
+#: ../clutter/clutter-actor.c:7293
 msgid "Child Transform"
 msgstr "Дочернее преобразование"
 
-#: ../clutter/clutter-actor.c:7224
+#: ../clutter/clutter-actor.c:7294
 msgid "Children transformation matrix"
 msgstr "Матрица дочернего преобразования"
 
-#: ../clutter/clutter-actor.c:7239
+#: ../clutter/clutter-actor.c:7309
 msgid "Child Transform Set"
 msgstr "Установить дочернее преобразование"
 
-#: ../clutter/clutter-actor.c:7240
+#: ../clutter/clutter-actor.c:7310
 msgid "Whether the child-transform property is set"
 msgstr "Установлено ли свойство дочернего преобразования"
 
-#: ../clutter/clutter-actor.c:7257
+#: ../clutter/clutter-actor.c:7327
 msgid "Show on set parent"
 msgstr "Показывать на установленном родителе"
 
-#: ../clutter/clutter-actor.c:7258
+#: ../clutter/clutter-actor.c:7328
 msgid "Whether the actor is shown when parented"
 msgstr "Показывать ли актор при наличии у него родителя"
 
-#: ../clutter/clutter-actor.c:7275
+#: ../clutter/clutter-actor.c:7345
 msgid "Clip to Allocation"
 msgstr "Кадрировать по размещению"
 
-#: ../clutter/clutter-actor.c:7276
+#: ../clutter/clutter-actor.c:7346
 msgid "Sets the clip region to track the actor's allocation"
 msgstr "Устанавливает область кадрирования для слежения за размещением актора"
 
-#: ../clutter/clutter-actor.c:7289
+#: ../clutter/clutter-actor.c:7359
 msgid "Text Direction"
 msgstr "Направление текста"
 
-#: ../clutter/clutter-actor.c:7290
+#: ../clutter/clutter-actor.c:7360
 msgid "Direction of the text"
 msgstr "Направление текста"
 
-#: ../clutter/clutter-actor.c:7305
+#: ../clutter/clutter-actor.c:7375
 msgid "Has Pointer"
 msgstr "Указатель"
 
-#: ../clutter/clutter-actor.c:7306
+#: ../clutter/clutter-actor.c:7376
 msgid "Whether the actor contains the pointer of an input device"
 msgstr "Содержит ли актор указатель устройства ввода"
 
-#: ../clutter/clutter-actor.c:7319
+#: ../clutter/clutter-actor.c:7389
 msgid "Actions"
 msgstr "Действия"
 
-#: ../clutter/clutter-actor.c:7320
+#: ../clutter/clutter-actor.c:7390
 msgid "Adds an action to the actor"
 msgstr "Добавляет актору действие"
 
-#: ../clutter/clutter-actor.c:7333
+#: ../clutter/clutter-actor.c:7403
 msgid "Constraints"
 msgstr "Ограничители"
 
-#: ../clutter/clutter-actor.c:7334
+#: ../clutter/clutter-actor.c:7404
 msgid "Adds a constraint to the actor"
 msgstr "Добавляет актору ограничители"
 
-#: ../clutter/clutter-actor.c:7347
+#: ../clutter/clutter-actor.c:7417
 msgid "Effect"
 msgstr "Эффект"
 
-#: ../clutter/clutter-actor.c:7348
+#: ../clutter/clutter-actor.c:7418
 msgid "Add an effect to be applied on the actor"
 msgstr "Добавить эффект, применяемый эффект к актору"
 
-#: ../clutter/clutter-actor.c:7362
+#: ../clutter/clutter-actor.c:7432
 msgid "Layout Manager"
 msgstr "Менеджер компоновки"
 
-#: ../clutter/clutter-actor.c:7363
+#: ../clutter/clutter-actor.c:7433
 msgid "The object controlling the layout of an actor's children"
 msgstr "Объект, управляющий размещением потомков актора"
 
-#: ../clutter/clutter-actor.c:7377
+#: ../clutter/clutter-actor.c:7447
 msgid "X Expand"
 msgstr "Растяжение по X"
 
-#: ../clutter/clutter-actor.c:7378
+#: ../clutter/clutter-actor.c:7448
 msgid "Whether extra horizontal space should be assigned to the actor"
 msgstr "Нужна ли дополнительная область по горизонтали для актора"
 
-#: ../clutter/clutter-actor.c:7393
+#: ../clutter/clutter-actor.c:7463
 msgid "Y Expand"
 msgstr "Растяжение по Y"
 
-#: ../clutter/clutter-actor.c:7394
+#: ../clutter/clutter-actor.c:7464
 msgid "Whether extra vertical space should be assigned to the actor"
 msgstr "Нужна ли дополнительная область по вертикали для актора"
 
-#: ../clutter/clutter-actor.c:7410
+#: ../clutter/clutter-actor.c:7480
 msgid "X Alignment"
 msgstr "Выравнивание по X"
 
-#: ../clutter/clutter-actor.c:7411
+#: ../clutter/clutter-actor.c:7481
 msgid "The alignment of the actor on the X axis within its allocation"
 msgstr "Выравнивание актора по оси X вместе с его размещением"
 
-#: ../clutter/clutter-actor.c:7426
+#: ../clutter/clutter-actor.c:7496
 msgid "Y Alignment"
 msgstr "Выравнивание по Y"
 
-#: ../clutter/clutter-actor.c:7427
+#: ../clutter/clutter-actor.c:7497
 msgid "The alignment of the actor on the Y axis within its allocation"
 msgstr "Выравнивание актора по оси Y вместе с его размещением"
 
-#: ../clutter/clutter-actor.c:7446
+#: ../clutter/clutter-actor.c:7516
 msgid "Margin Top"
 msgstr "Поле сверху"
 
-#: ../clutter/clutter-actor.c:7447
+#: ../clutter/clutter-actor.c:7517
 msgid "Extra space at the top"
 msgstr "Дополнительное место сверху"
 
-#: ../clutter/clutter-actor.c:7468
+#: ../clutter/clutter-actor.c:7538
 msgid "Margin Bottom"
 msgstr "Поле снизу"
 
-#: ../clutter/clutter-actor.c:7469
+#: ../clutter/clutter-actor.c:7539
 msgid "Extra space at the bottom"
 msgstr "Дополнительное место снизу"
 
-#: ../clutter/clutter-actor.c:7490
+#: ../clutter/clutter-actor.c:7560
 msgid "Margin Left"
 msgstr "Поле слева"
 
-#: ../clutter/clutter-actor.c:7491
+#: ../clutter/clutter-actor.c:7561
 msgid "Extra space at the left"
 msgstr "Дополнительное место слева"
 
-#: ../clutter/clutter-actor.c:7512
+#: ../clutter/clutter-actor.c:7582
 msgid "Margin Right"
 msgstr "Поле справа"
 
-#: ../clutter/clutter-actor.c:7513
+#: ../clutter/clutter-actor.c:7583
 msgid "Extra space at the right"
 msgstr "Дополнительное место справа"
 
-#: ../clutter/clutter-actor.c:7529
+#: ../clutter/clutter-actor.c:7599
 msgid "Background Color Set"
 msgstr "Цвет фона"
 
-#: ../clutter/clutter-actor.c:7530 ../clutter/deprecated/clutter-box.c:275
+#: ../clutter/clutter-actor.c:7600 ../clutter/deprecated/clutter-box.c:271
 msgid "Whether the background color is set"
 msgstr "Установлен ли цвет фона"
 
-#: ../clutter/clutter-actor.c:7546
+#: ../clutter/clutter-actor.c:7616
 msgid "Background color"
 msgstr "Цвет фона"
 
-#: ../clutter/clutter-actor.c:7547
+#: ../clutter/clutter-actor.c:7617
 msgid "The actor's background color"
 msgstr "Цвет фона актора"
 
-#: ../clutter/clutter-actor.c:7562
+#: ../clutter/clutter-actor.c:7632
 msgid "First Child"
 msgstr "Первый потомок"
 
-#: ../clutter/clutter-actor.c:7563
+#: ../clutter/clutter-actor.c:7633
 msgid "The actor's first child"
 msgstr "Первый потомок актора"
 
-#: ../clutter/clutter-actor.c:7576
+#: ../clutter/clutter-actor.c:7646
 msgid "Last Child"
 msgstr "Последний потомок"
 
-#: ../clutter/clutter-actor.c:7577
+#: ../clutter/clutter-actor.c:7647
 msgid "The actor's last child"
 msgstr "Последний потомок актора"
 
-#: ../clutter/clutter-actor.c:7591
+#: ../clutter/clutter-actor.c:7661
 msgid "Content"
 msgstr "Содержимое"
 
-#: ../clutter/clutter-actor.c:7592
+#: ../clutter/clutter-actor.c:7662
 msgid "Delegate object for painting the actor's content"
 msgstr "Делегировать объект для отрисовки содержимого актора"
 
-#: ../clutter/clutter-actor.c:7617
+#: ../clutter/clutter-actor.c:7687
 msgid "Content Gravity"
 msgstr "Притяжение содержимого"
 
-#: ../clutter/clutter-actor.c:7618
+#: ../clutter/clutter-actor.c:7688
 msgid "Alignment of the actor's content"
 msgstr "Выравнивание содержимого актора"
 
-#: ../clutter/clutter-actor.c:7638
+#: ../clutter/clutter-actor.c:7708
 msgid "Content Box"
 msgstr "Контейнер содержимого"
 
-#: ../clutter/clutter-actor.c:7639
+#: ../clutter/clutter-actor.c:7709
 msgid "The bounding box of the actor's content"
 msgstr "Контейнер содержимого актора"
 
-#: ../clutter/clutter-actor.c:7647
+#: ../clutter/clutter-actor.c:7717
 msgid "Minification Filter"
 msgstr "Уменьшающий фильтр"
 
-#: ../clutter/clutter-actor.c:7648
+#: ../clutter/clutter-actor.c:7718
 msgid "The filter used when reducing the size of the content"
 msgstr "Фильтр, используемый для уменьшения размеров содержимого"
 
-#: ../clutter/clutter-actor.c:7655
+#: ../clutter/clutter-actor.c:7725
 msgid "Magnification Filter"
 msgstr "Увеличивающий фильтр"
 
-#: ../clutter/clutter-actor.c:7656
+#: ../clutter/clutter-actor.c:7726
 msgid "The filter used when increasing the size of the content"
 msgstr "Фильтр, используемый для увеличения размеров содержимого"
 
-#: ../clutter/clutter-actor.c:7670
+#: ../clutter/clutter-actor.c:7740
 msgid "Content Repeat"
 msgstr "Повторение содержимого"
 
-#: ../clutter/clutter-actor.c:7671
+#: ../clutter/clutter-actor.c:7741
 msgid "The repeat policy for the actor's content"
 msgstr "Политика повторения содержимого актора"
 
-#: ../clutter/clutter-actor-meta.c:193 ../clutter/clutter-child-meta.c:142
+#: ../clutter/clutter-actor-meta.c:191 ../clutter/clutter-child-meta.c:142
 msgid "Actor"
 msgstr "Актор"
 
-#: ../clutter/clutter-actor-meta.c:194
+#: ../clutter/clutter-actor-meta.c:192
 msgid "The actor attached to the meta"
 msgstr "Актор, прикреплённый к метаактору"
 
-#: ../clutter/clutter-actor-meta.c:208
+#: ../clutter/clutter-actor-meta.c:206
 msgid "The name of the meta"
 msgstr "Имя метаактора"
 
-#: ../clutter/clutter-actor-meta.c:221 ../clutter/clutter-input-device.c:337
-#: ../clutter/deprecated/clutter-shader.c:313
+#: ../clutter/clutter-actor-meta.c:219 ../clutter/clutter-input-device.c:326
+#: ../clutter/deprecated/clutter-shader.c:309
 msgid "Enabled"
 msgstr "Включён"
 
-#: ../clutter/clutter-actor-meta.c:222
+#: ../clutter/clutter-actor-meta.c:220
 msgid "Whether the meta is enabled"
 msgstr "Включён ли метаактор"
 
 #: ../clutter/clutter-align-constraint.c:279
-#: ../clutter/clutter-bind-constraint.c:358 ../clutter/clutter-clone.c:345
+#: ../clutter/clutter-bind-constraint.c:358 ../clutter/clutter-clone.c:341
 #: ../clutter/clutter-snap-constraint.c:321
 msgid "Source"
 msgstr "Источник"
@@ -729,11 +729,11 @@ msgstr "Коэффициент"
 msgid "The alignment factor, between 0.0 and 1.0"
 msgstr "Коэффициент выравнивания, между 0.0 и 1.0"
 
-#: ../clutter/clutter-backend.c:379
+#: ../clutter/clutter-backend.c:380
 msgid "Unable to initialize the Clutter backend"
 msgstr "Не удалось инициализировать драйвер Clutter"
 
-#: ../clutter/clutter-backend.c:453
+#: ../clutter/clutter-backend.c:454
 #, c-format
 msgid "The backend of type '%s' does not support creating multiple stages"
 msgstr "Драйвер типа «%s» не поддерживает создание нескольких сцен"
@@ -764,49 +764,53 @@ msgstr "Отступ в пикселах для применения привя
 msgid "The unique name of the binding pool"
 msgstr "Уникальное имя пула привязки"
 
-#: ../clutter/clutter-bin-layout.c:240 ../clutter/clutter-bin-layout.c:655
-#: ../clutter/clutter-box-layout.c:390 ../clutter/clutter-table-layout.c:610
+#: ../clutter/clutter-bin-layout.c:238 ../clutter/clutter-bin-layout.c:651
+#: ../clutter/clutter-box-layout.c:388
+#: ../clutter/deprecated/clutter-table-layout.c:610
 msgid "Horizontal Alignment"
 msgstr "Горизонтальное выравнивание"
 
-#: ../clutter/clutter-bin-layout.c:241
+#: ../clutter/clutter-bin-layout.c:239
 msgid "Horizontal alignment for the actor inside the layout manager"
 msgstr "Горизонтальное выравнивание актора внутри менеджера компоновки"
 
-#: ../clutter/clutter-bin-layout.c:249 ../clutter/clutter-bin-layout.c:675
-#: ../clutter/clutter-box-layout.c:399 ../clutter/clutter-table-layout.c:625
+#: ../clutter/clutter-bin-layout.c:247 ../clutter/clutter-bin-layout.c:671
+#: ../clutter/clutter-box-layout.c:397
+#: ../clutter/deprecated/clutter-table-layout.c:625
 msgid "Vertical Alignment"
 msgstr "Вертикальное выравнивание"
 
-#: ../clutter/clutter-bin-layout.c:250
+#: ../clutter/clutter-bin-layout.c:248
 msgid "Vertical alignment for the actor inside the layout manager"
 msgstr "Вертикальное выравнивание актора внутри менеджера компоновки"
 
-#: ../clutter/clutter-bin-layout.c:656
+#: ../clutter/clutter-bin-layout.c:652
 msgid "Default horizontal alignment for the actors inside the layout manager"
 msgstr ""
 "Горизонтальное выравнивание по умолчанию для акторов внутри менеджера "
 "компоновки"
 
-#: ../clutter/clutter-bin-layout.c:676
+#: ../clutter/clutter-bin-layout.c:672
 msgid "Default vertical alignment for the actors inside the layout manager"
 msgstr ""
 "Вертикальное выравнивание по умолчанию для акторов внутри менеджера "
 "компоновки"
 
-#: ../clutter/clutter-box-layout.c:365
+#: ../clutter/clutter-box-layout.c:363
 msgid "Expand"
 msgstr "Растягивать"
 
-#: ../clutter/clutter-box-layout.c:366
+#: ../clutter/clutter-box-layout.c:364
 msgid "Allocate extra space for the child"
 msgstr "Занимать дополнительное место для дочернего элемента"
 
-#: ../clutter/clutter-box-layout.c:372 ../clutter/clutter-table-layout.c:589
+#: ../clutter/clutter-box-layout.c:370
+#: ../clutter/deprecated/clutter-table-layout.c:589
 msgid "Horizontal Fill"
 msgstr "Горизонтальное заполнение"
 
-#: ../clutter/clutter-box-layout.c:373 ../clutter/clutter-table-layout.c:590
+#: ../clutter/clutter-box-layout.c:371
+#: ../clutter/deprecated/clutter-table-layout.c:590
 msgid ""
 "Whether the child should receive priority when the container is allocating "
 "spare space on the horizontal axis"
@@ -814,11 +818,13 @@ msgstr ""
 "Должен ли дочерний элемент получать приоритет, когда контейнер размещается в "
 "пустом пространстве по горизонтальной оси"
 
-#: ../clutter/clutter-box-layout.c:381 ../clutter/clutter-table-layout.c:596
+#: ../clutter/clutter-box-layout.c:379
+#: ../clutter/deprecated/clutter-table-layout.c:596
 msgid "Vertical Fill"
 msgstr "Вертикальное заполнение"
 
-#: ../clutter/clutter-box-layout.c:382 ../clutter/clutter-table-layout.c:597
+#: ../clutter/clutter-box-layout.c:380
+#: ../clutter/deprecated/clutter-table-layout.c:597
 msgid ""
 "Whether the child should receive priority when the container is allocating "
 "spare space on the vertical axis"
@@ -826,81 +832,89 @@ msgstr ""
 "Должен ли дочерний элемент получать приоритет, когда контейнер размещается в "
 "пустом пространстве по вертикальной оси"
 
-#: ../clutter/clutter-box-layout.c:391 ../clutter/clutter-table-layout.c:611
+#: ../clutter/clutter-box-layout.c:389
+#: ../clutter/deprecated/clutter-table-layout.c:611
 msgid "Horizontal alignment of the actor within the cell"
 msgstr "Горизонтальное выравнивание актора вместе с ячейкой"
 
-#: ../clutter/clutter-box-layout.c:400 ../clutter/clutter-table-layout.c:626
+#: ../clutter/clutter-box-layout.c:398
+#: ../clutter/deprecated/clutter-table-layout.c:626
 msgid "Vertical alignment of the actor within the cell"
 msgstr "Вертикальное выравнивание актора вместе с ячейкой"
 
 # Компоновка
-#: ../clutter/clutter-box-layout.c:1365
+#: ../clutter/clutter-box-layout.c:1359
 msgid "Vertical"
 msgstr "Вертикальная"
 
-#: ../clutter/clutter-box-layout.c:1366
+#: ../clutter/clutter-box-layout.c:1360
 msgid "Whether the layout should be vertical, rather than horizontal"
 msgstr "Приоритет вертикальной компоновки над горизонтальной"
 
-#: ../clutter/clutter-box-layout.c:1383 ../clutter/clutter-flow-layout.c:890
-#: ../clutter/clutter-grid-layout.c:1550
+#: ../clutter/clutter-box-layout.c:1377 ../clutter/clutter-flow-layout.c:942
+#: ../clutter/clutter-grid-layout.c:1549
 msgid "Orientation"
 msgstr "Ориентация"
 
-#: ../clutter/clutter-box-layout.c:1384 ../clutter/clutter-flow-layout.c:891
-#: ../clutter/clutter-grid-layout.c:1551
+#: ../clutter/clutter-box-layout.c:1378 ../clutter/clutter-flow-layout.c:943
+#: ../clutter/clutter-grid-layout.c:1550
 msgid "The orientation of the layout"
 msgstr "Ориентация компоновки"
 
-#: ../clutter/clutter-box-layout.c:1400 ../clutter/clutter-flow-layout.c:906
+#: ../clutter/clutter-box-layout.c:1394 ../clutter/clutter-flow-layout.c:958
 msgid "Homogeneous"
 msgstr "Однородный"
 
-#: ../clutter/clutter-box-layout.c:1401
+#: ../clutter/clutter-box-layout.c:1395
 msgid ""
 "Whether the layout should be homogeneous, i.e. all childs get the same size"
 msgstr ""
 "Должна ли компоновка быть однородной, т. е. все дочерние элементы имеют "
 "одинаковые размеры"
 
-#: ../clutter/clutter-box-layout.c:1416
+#: ../clutter/clutter-box-layout.c:1410
 msgid "Pack Start"
 msgstr "Упаковывать с начала"
 
-#: ../clutter/clutter-box-layout.c:1417
+#: ../clutter/clutter-box-layout.c:1411
 msgid "Whether to pack items at the start of the box"
 msgstr "Упаковывать ли элементы, начиная с начала контейнера"
 
-#: ../clutter/clutter-box-layout.c:1430
+#: ../clutter/clutter-box-layout.c:1424
 msgid "Spacing"
 msgstr "Расстояние"
 
-#: ../clutter/clutter-box-layout.c:1431
+#: ../clutter/clutter-box-layout.c:1425
 msgid "Spacing between children"
 msgstr "Расстояние между дочерними элементами"
 
-#: ../clutter/clutter-box-layout.c:1448 ../clutter/clutter-table-layout.c:1675
+#: ../clutter/clutter-box-layout.c:1442
+#: ../clutter/deprecated/clutter-table-layout.c:1677
 msgid "Use Animations"
 msgstr "Использовать анимацию"
 
-#: ../clutter/clutter-box-layout.c:1449 ../clutter/clutter-table-layout.c:1676
+#: ../clutter/clutter-box-layout.c:1443
+#: ../clutter/deprecated/clutter-table-layout.c:1678
 msgid "Whether layout changes should be animated"
 msgstr "Анимировать ли изменения в компоновке"
 
-#: ../clutter/clutter-box-layout.c:1473 ../clutter/clutter-table-layout.c:1700
+#: ../clutter/clutter-box-layout.c:1467
+#: ../clutter/deprecated/clutter-table-layout.c:1702
 msgid "Easing Mode"
 msgstr "Режим анимации"
 
-#: ../clutter/clutter-box-layout.c:1474 ../clutter/clutter-table-layout.c:1701
+#: ../clutter/clutter-box-layout.c:1468
+#: ../clutter/deprecated/clutter-table-layout.c:1703
 msgid "The easing mode of the animations"
 msgstr "Режим анимации"
 
-#: ../clutter/clutter-box-layout.c:1494 ../clutter/clutter-table-layout.c:1721
+#: ../clutter/clutter-box-layout.c:1488
+#: ../clutter/deprecated/clutter-table-layout.c:1723
 msgid "Easing Duration"
 msgstr "Продолжительность анимации"
 
-#: ../clutter/clutter-box-layout.c:1495 ../clutter/clutter-table-layout.c:1722
+#: ../clutter/clutter-box-layout.c:1489
+#: ../clutter/deprecated/clutter-table-layout.c:1724
 msgid "The duration of the animations"
 msgstr "Продолжительность анимации"
 
@@ -920,14 +934,34 @@ msgstr "Контрастность"
 msgid "The contrast change to apply"
 msgstr "Изменение контрастности"
 
-#: ../clutter/clutter-canvas.c:216
+#: ../clutter/clutter-canvas.c:248
 msgid "The width of the canvas"
 msgstr "Ширина канвы"
 
-#: ../clutter/clutter-canvas.c:232
+#: ../clutter/clutter-canvas.c:264
 msgid "The height of the canvas"
 msgstr "Высота канвы"
 
+#: ../clutter/clutter-canvas.c:283
+#| msgid "Selection Color Set"
+msgid "Scale Factor Set"
+msgstr "Коэффициент масштабирования установлен"
+
+#: ../clutter/clutter-canvas.c:284
+#| msgid "Whether the transform property is set"
+msgid "Whether the scale-factor property is set"
+msgstr "Установлено ли свойство scale-factor"
+
+#: ../clutter/clutter-canvas.c:305
+#| msgid "Factor"
+msgid "Scale Factor"
+msgstr "Коэффициент масштабирования"
+
+#: ../clutter/clutter-canvas.c:306
+#| msgid "The height of the Cairo surface"
+msgid "The scaling factor for the surface"
+msgstr "Коэффициент масштабирования для поверхности"
+
 #: ../clutter/clutter-child-meta.c:127
 msgid "Container"
 msgstr "Контейнер"
@@ -940,39 +974,39 @@ msgstr "Контейнер, создавший эти данные"
 msgid "The actor wrapped by this data"
 msgstr "Актор, описанный этими данными"
 
-#: ../clutter/clutter-click-action.c:559
+#: ../clutter/clutter-click-action.c:586
 msgid "Pressed"
 msgstr "Актор нажат"
 
-#: ../clutter/clutter-click-action.c:560
+#: ../clutter/clutter-click-action.c:587
 msgid "Whether the clickable should be in pressed state"
 msgstr "Должен ли актор, реагирующий на щелчки мыши, быть в нажатом состоянии"
 
-#: ../clutter/clutter-click-action.c:573
+#: ../clutter/clutter-click-action.c:600
 msgid "Held"
 msgstr "Удержание"
 
-#: ../clutter/clutter-click-action.c:574
+#: ../clutter/clutter-click-action.c:601
 msgid "Whether the clickable has a grab"
 msgstr "Должен ли актор, реагирующий на щелчки мыши, захватывать курсор"
 
-#: ../clutter/clutter-click-action.c:591 ../clutter/clutter-settings.c:599
+#: ../clutter/clutter-click-action.c:618 ../clutter/clutter-settings.c:653
 msgid "Long Press Duration"
 msgstr "Время длительного нажатия"
 
-#: ../clutter/clutter-click-action.c:592
+#: ../clutter/clutter-click-action.c:619
 msgid "The minimum duration of a long press to recognize the gesture"
 msgstr "Минимальное время длительного нажатия для распознавания жеста"
 
-#: ../clutter/clutter-click-action.c:610
+#: ../clutter/clutter-click-action.c:637
 msgid "Long Press Threshold"
 msgstr "Порог длительного нажатия"
 
-#: ../clutter/clutter-click-action.c:611
+#: ../clutter/clutter-click-action.c:638
 msgid "The maximum threshold before a long press is cancelled"
 msgstr "Максимальный порог перед отменой длительного нажатия"
 
-#: ../clutter/clutter-clone.c:346
+#: ../clutter/clutter-clone.c:342
 msgid "Specifies the actor to be cloned"
 msgstr "Определяет актора для клонирования"
 
@@ -984,27 +1018,27 @@ msgstr "Окраска"
 msgid "The tint to apply"
 msgstr "Применить окраску"
 
-#: ../clutter/clutter-deform-effect.c:588
+#: ../clutter/clutter-deform-effect.c:592
 msgid "Horizontal Tiles"
 msgstr "Горизонтальные элементы"
 
-#: ../clutter/clutter-deform-effect.c:589
+#: ../clutter/clutter-deform-effect.c:593
 msgid "The number of horizontal tiles"
 msgstr "Количество горизонтальных элементов"
 
-#: ../clutter/clutter-deform-effect.c:604
+#: ../clutter/clutter-deform-effect.c:608
 msgid "Vertical Tiles"
 msgstr "Вертикальные элементы"
 
-#: ../clutter/clutter-deform-effect.c:605
+#: ../clutter/clutter-deform-effect.c:609
 msgid "The number of vertical tiles"
 msgstr "Количество вертикальных элементов"
 
-#: ../clutter/clutter-deform-effect.c:622
+#: ../clutter/clutter-deform-effect.c:626
 msgid "Back Material"
 msgstr "Материал заднего плана"
 
-#: ../clutter/clutter-deform-effect.c:623
+#: ../clutter/clutter-deform-effect.c:627
 msgid "The material to be used when painting the back of the actor"
 msgstr "Материал, используемый при отрисовке заднего плана актора"
 
@@ -1012,260 +1046,301 @@ msgstr "Материал, используемый при отрисовке з
 msgid "The desaturation factor"
 msgstr "Коэффициент разбавления"
 
-#: ../clutter/clutter-device-manager.c:131
-#: ../clutter/clutter-input-device.c:366
-#: ../clutter/x11/clutter-keymap-x11.c:316
+#: ../clutter/clutter-device-manager.c:127
+#: ../clutter/clutter-input-device.c:355
+#: ../clutter/x11/clutter-keymap-x11.c:457
 msgid "Backend"
 msgstr "Драйвер"
 
-#: ../clutter/clutter-device-manager.c:132
+#: ../clutter/clutter-device-manager.c:128
 msgid "The ClutterBackend of the device manager"
 msgstr "ClutterBackend диспетчера устройств"
 
-#: ../clutter/clutter-drag-action.c:742
+#: ../clutter/clutter-drag-action.c:741
 msgid "Horizontal Drag Threshold"
 msgstr "Порог горизонтального перетаскивания"
 
-#: ../clutter/clutter-drag-action.c:743
+#: ../clutter/clutter-drag-action.c:742
 msgid "The horizontal amount of pixels required to start dragging"
 msgstr "Количество пикселов по горизонтали для начала перетаскивания"
 
-#: ../clutter/clutter-drag-action.c:770
+#: ../clutter/clutter-drag-action.c:769
 msgid "Vertical Drag Threshold"
 msgstr "Порог вертикального перетаскивания"
 
-#: ../clutter/clutter-drag-action.c:771
+#: ../clutter/clutter-drag-action.c:770
 msgid "The vertical amount of pixels required to start dragging"
 msgstr "Количество пикселов по вертикали для начала перетаскивания"
 
-#: ../clutter/clutter-drag-action.c:792
+#: ../clutter/clutter-drag-action.c:791
 msgid "Drag Handle"
 msgstr "Область захвата"
 
-#: ../clutter/clutter-drag-action.c:793
+#: ../clutter/clutter-drag-action.c:792
 msgid "The actor that is being dragged"
 msgstr "Перетаскиваемый актор"
 
-#: ../clutter/clutter-drag-action.c:806
+#: ../clutter/clutter-drag-action.c:805
 msgid "Drag Axis"
 msgstr "Ось перетаскивания"
 
-#: ../clutter/clutter-drag-action.c:807
+#: ../clutter/clutter-drag-action.c:806
 msgid "Constraints the dragging to an axis"
 msgstr "Ограничивает перетаскивание по оси"
 
-#: ../clutter/clutter-drag-action.c:823
+#: ../clutter/clutter-drag-action.c:822
 msgid "Drag Area"
 msgstr "Область перетаскивания"
 
-#: ../clutter/clutter-drag-action.c:824
+#: ../clutter/clutter-drag-action.c:823
 msgid "Constrains the dragging to a rectangle"
 msgstr "Ограничить перетаскивание прямоугольником"
 
-#: ../clutter/clutter-drag-action.c:837
+#: ../clutter/clutter-drag-action.c:836
 msgid "Drag Area Set"
 msgstr "Установить область перетаскивания"
 
-#: ../clutter/clutter-drag-action.c:838
+#: ../clutter/clutter-drag-action.c:837
 msgid "Whether the drag area is set"
 msgstr "Установлена ли область перетаскивания"
 
-#: ../clutter/clutter-flow-layout.c:907
+#: ../clutter/clutter-flow-layout.c:959
 msgid "Whether each item should receive the same allocation"
 msgstr "Должен ли каждый элемент получать тоже самое размещение"
 
-#: ../clutter/clutter-flow-layout.c:922 ../clutter/clutter-table-layout.c:1637
+#: ../clutter/clutter-flow-layout.c:974
+#: ../clutter/deprecated/clutter-table-layout.c:1637
 msgid "Column Spacing"
 msgstr "Расстояние между столбцами"
 
-#: ../clutter/clutter-flow-layout.c:923
+#: ../clutter/clutter-flow-layout.c:975
 msgid "The spacing between columns"
 msgstr "Расстояние между столбцами"
 
-#: ../clutter/clutter-flow-layout.c:939 ../clutter/clutter-table-layout.c:1651
+#: ../clutter/clutter-flow-layout.c:991
+#: ../clutter/deprecated/clutter-table-layout.c:1653
 msgid "Row Spacing"
 msgstr "Расстояние между строками"
 
-#: ../clutter/clutter-flow-layout.c:940
+#: ../clutter/clutter-flow-layout.c:992
 msgid "The spacing between rows"
 msgstr "Расстояние между строками"
 
-#: ../clutter/clutter-flow-layout.c:954
+#: ../clutter/clutter-flow-layout.c:1006
 msgid "Minimum Column Width"
 msgstr "Минимальная ширина столбца"
 
-#: ../clutter/clutter-flow-layout.c:955
+#: ../clutter/clutter-flow-layout.c:1007
 msgid "Minimum width for each column"
 msgstr "Минимальная ширина для каждого столбца"
 
-#: ../clutter/clutter-flow-layout.c:970
+#: ../clutter/clutter-flow-layout.c:1022
 msgid "Maximum Column Width"
 msgstr "Максимальная ширина столбца"
 
-#: ../clutter/clutter-flow-layout.c:971
+#: ../clutter/clutter-flow-layout.c:1023
 msgid "Maximum width for each column"
 msgstr "Максимальная ширина для каждого столбца"
 
-#: ../clutter/clutter-flow-layout.c:985
+#: ../clutter/clutter-flow-layout.c:1037
 msgid "Minimum Row Height"
 msgstr "Минимальная высота строки"
 
-#: ../clutter/clutter-flow-layout.c:986
+#: ../clutter/clutter-flow-layout.c:1038
 msgid "Minimum height for each row"
 msgstr "Минимальная ширина для каждой строки"
 
-#: ../clutter/clutter-flow-layout.c:1001
+#: ../clutter/clutter-flow-layout.c:1053
 msgid "Maximum Row Height"
 msgstr "Максимальная высота строки"
 
-#: ../clutter/clutter-flow-layout.c:1002
+#: ../clutter/clutter-flow-layout.c:1054
 msgid "Maximum height for each row"
 msgstr "Максимальная ширина для каждой строки"
 
-#: ../clutter/clutter-grid-layout.c:1222
+#: ../clutter/clutter-flow-layout.c:1069 ../clutter/clutter-flow-layout.c:1070
+msgid "Snap to grid"
+msgstr "Привязать к сетке"
+
+#: ../clutter/clutter-gesture-action.c:668
+msgid "Number touch points"
+msgstr "Количество точек касания"
+
+#: ../clutter/clutter-gesture-action.c:669
+msgid "Number of touch points"
+msgstr "Количество точек касания"
+
+#: ../clutter/clutter-gesture-action.c:684
+msgid "Threshold Trigger Edge"
+msgstr "Пороговая граница срабатывания"
+
+#: ../clutter/clutter-gesture-action.c:685
+#| msgid "The timeline used by the animation"
+msgid "The trigger edge used by the action"
+msgstr "Граница срабатывания действия"
+
+#: ../clutter/clutter-gesture-action.c:704
+msgid "Threshold Trigger Horizontal Distance"
+msgstr "Пороговое расстояние по горизонтали для срабатывания"
+
+#: ../clutter/clutter-gesture-action.c:705
+#| msgid "The timeline used by the animation"
+msgid "The horizontal trigger distance used by the action"
+msgstr "Расстояние по горизонтали для срабатывания действия"
+
+#: ../clutter/clutter-gesture-action.c:723
+msgid "Threshold Trigger Vertical Distance"
+msgstr "Пороговое расстояние по вертикали для срабатывания"
+
+#: ../clutter/clutter-gesture-action.c:724
+#| msgid "The timeline used by the animation"
+msgid "The vertical trigger distance used by the action"
+msgstr "Расстояние по вертикали для срабатывания действия"
+
+#: ../clutter/clutter-grid-layout.c:1223
 msgid "Left attachment"
 msgstr "Вложение слева"
 
-#: ../clutter/clutter-grid-layout.c:1223
+#: ../clutter/clutter-grid-layout.c:1224
 msgid "The column number to attach the left side of the child to"
 msgstr ""
 "Номер столбца, к которому нужно прикрепить левую границу дочернего виджета"
 
-#: ../clutter/clutter-grid-layout.c:1230
+#: ../clutter/clutter-grid-layout.c:1231
 msgid "Top attachment"
 msgstr "Вложение сверху"
 
-#: ../clutter/clutter-grid-layout.c:1231
+#: ../clutter/clutter-grid-layout.c:1232
 msgid "The row number to attach the top side of a child widget to"
 msgstr ""
 "Номер строки, к которой нужно прикрепить верхнюю границу дочернего виджета"
 
-#: ../clutter/clutter-grid-layout.c:1239
+#: ../clutter/clutter-grid-layout.c:1240
 msgid "The number of columns that a child spans"
 msgstr "Количество столбцов, занимаемых дочерним виджетом"
 
-#: ../clutter/clutter-grid-layout.c:1246
+#: ../clutter/clutter-grid-layout.c:1247
 msgid "The number of rows that a child spans"
 msgstr "Количество строк, занимаемых дочерним виджетом"
 
-#: ../clutter/clutter-grid-layout.c:1565
+#: ../clutter/clutter-grid-layout.c:1564
 msgid "Row spacing"
 msgstr "Расстояние между строками"
 
-#: ../clutter/clutter-grid-layout.c:1566
+#: ../clutter/clutter-grid-layout.c:1565
 msgid "The amount of space between two consecutive rows"
 msgstr "Свободное место между двумя соседними строками"
 
-#: ../clutter/clutter-grid-layout.c:1579
+#: ../clutter/clutter-grid-layout.c:1578
 msgid "Column spacing"
 msgstr "Расстояние между столбцами"
 
-#: ../clutter/clutter-grid-layout.c:1580
+#: ../clutter/clutter-grid-layout.c:1579
 msgid "The amount of space between two consecutive columns"
 msgstr "Свободное место между двумя соседними столбцами"
 
-#: ../clutter/clutter-grid-layout.c:1594
+#: ../clutter/clutter-grid-layout.c:1593
 msgid "Row Homogeneous"
 msgstr "Однородные строки"
 
-#: ../clutter/clutter-grid-layout.c:1595
+#: ../clutter/clutter-grid-layout.c:1594
 msgid "If TRUE, the rows are all the same height"
 msgstr "Если установлено, то строки будут иметь одинаковую высоту"
 
-#: ../clutter/clutter-grid-layout.c:1608
+#: ../clutter/clutter-grid-layout.c:1607
 msgid "Column Homogeneous"
 msgstr "Однородные столбцы"
 
-#: ../clutter/clutter-grid-layout.c:1609
+#: ../clutter/clutter-grid-layout.c:1608
 msgid "If TRUE, the columns are all the same width"
 msgstr "Если установлено, то столбцы будут иметь одинаковую ширину"
 
-#: ../clutter/clutter-image.c:248 ../clutter/clutter-image.c:311
-#: ../clutter/clutter-image.c:399
+#: ../clutter/clutter-image.c:249 ../clutter/clutter-image.c:312
+#: ../clutter/clutter-image.c:400
 msgid "Unable to load image data"
 msgstr "Не удалось загрузить данные изображения"
 
-#: ../clutter/clutter-input-device.c:242
+#: ../clutter/clutter-input-device.c:231
 msgid "Id"
 msgstr "ID"
 
-#: ../clutter/clutter-input-device.c:243
+#: ../clutter/clutter-input-device.c:232
 msgid "Unique identifier of the device"
 msgstr "Уникальный идентификатор устройства"
 
-#: ../clutter/clutter-input-device.c:259
+#: ../clutter/clutter-input-device.c:248
 msgid "The name of the device"
 msgstr "Название устройства"
 
-#: ../clutter/clutter-input-device.c:273
+#: ../clutter/clutter-input-device.c:262
 msgid "Device Type"
 msgstr "Тип устройства"
 
-#: ../clutter/clutter-input-device.c:274
+#: ../clutter/clutter-input-device.c:263
 msgid "The type of the device"
 msgstr "Тип устройства"
 
-#: ../clutter/clutter-input-device.c:289
+#: ../clutter/clutter-input-device.c:278
 msgid "Device Manager"
 msgstr "Диспетчер устройств"
 
-#: ../clutter/clutter-input-device.c:290
+#: ../clutter/clutter-input-device.c:279
 msgid "The device manager instance"
 msgstr "Экземпляр диспетчера устройств"
 
-#: ../clutter/clutter-input-device.c:303
+#: ../clutter/clutter-input-device.c:292
 msgid "Device Mode"
 msgstr "Режим устройства"
 
-#: ../clutter/clutter-input-device.c:304
+#: ../clutter/clutter-input-device.c:293
 msgid "The mode of the device"
 msgstr "Режим устройства"
 
-#: ../clutter/clutter-input-device.c:318
+#: ../clutter/clutter-input-device.c:307
 msgid "Has Cursor"
 msgstr "Есть курсор"
 
-#: ../clutter/clutter-input-device.c:319
+#: ../clutter/clutter-input-device.c:308
 msgid "Whether the device has a cursor"
 msgstr "Есть ли у устройства курсор"
 
-#: ../clutter/clutter-input-device.c:338
+#: ../clutter/clutter-input-device.c:327
 msgid "Whether the device is enabled"
 msgstr "Включено ли устройство"
 
-#: ../clutter/clutter-input-device.c:351
+#: ../clutter/clutter-input-device.c:340
 msgid "Number of Axes"
 msgstr "Количество осей"
 
-#: ../clutter/clutter-input-device.c:352
+#: ../clutter/clutter-input-device.c:341
 msgid "The number of axes on the device"
 msgstr "Количество осей в устройстве"
 
-#: ../clutter/clutter-input-device.c:367
+#: ../clutter/clutter-input-device.c:356
 msgid "The backend instance"
 msgstr "Экземпляр драйвера"
 
-#: ../clutter/clutter-interval.c:506
+#: ../clutter/clutter-interval.c:553
 msgid "Value Type"
 msgstr "Тип значения"
 
-#: ../clutter/clutter-interval.c:507
+#: ../clutter/clutter-interval.c:554
 msgid "The type of the values in the interval"
 msgstr "Тип значений в интервале"
 
-#: ../clutter/clutter-interval.c:522
+#: ../clutter/clutter-interval.c:569
 msgid "Initial Value"
 msgstr "Исходное значение"
 
-#: ../clutter/clutter-interval.c:523
+#: ../clutter/clutter-interval.c:570
 msgid "Initial value of the interval"
 msgstr "Исходное значение интервала"
 
-#: ../clutter/clutter-interval.c:537
+#: ../clutter/clutter-interval.c:584
 msgid "Final Value"
 msgstr "Конечное значение"
 
-#: ../clutter/clutter-interval.c:538
+#: ../clutter/clutter-interval.c:585
 msgid "Final value of the interval"
 msgstr "Конечное значение интервала"
 
@@ -1284,96 +1359,96 @@ msgstr "Менеджер, создавший эти данные"
 #. * Do NOT translate it to non-English e.g. "predefinito:LTR"! If
 #. * it isn't default:LTR or default:RTL it will not work.
 #.
-#: ../clutter/clutter-main.c:772
+#: ../clutter/clutter-main.c:795
 msgid "default:LTR"
 msgstr "default:LTR"
 
-#: ../clutter/clutter-main.c:1646
+#: ../clutter/clutter-main.c:1622
 msgid "Show frames per second"
 msgstr "Показывать частоту смены кадров"
 
-#: ../clutter/clutter-main.c:1648
+#: ../clutter/clutter-main.c:1624
 msgid "Default frame rate"
 msgstr "Частота смены кадров по умолчанию"
 
-#: ../clutter/clutter-main.c:1650
+#: ../clutter/clutter-main.c:1626
 msgid "Make all warnings fatal"
 msgstr "Сделать все предупреждения фатальными"
 
-#: ../clutter/clutter-main.c:1653
+#: ../clutter/clutter-main.c:1629
 msgid "Direction for the text"
 msgstr "Направление текста"
 
-#: ../clutter/clutter-main.c:1656
+#: ../clutter/clutter-main.c:1632
 msgid "Disable mipmapping on text"
 msgstr "Отключить MIP-текстурирование текста"
 
-#: ../clutter/clutter-main.c:1659
+#: ../clutter/clutter-main.c:1635
 msgid "Use 'fuzzy' picking"
 msgstr "Использовать «нечёткий» отбор"
 
-#: ../clutter/clutter-main.c:1662
+#: ../clutter/clutter-main.c:1638
 msgid "Clutter debugging flags to set"
 msgstr "Установить отладочные флаги Clutter"
 
-#: ../clutter/clutter-main.c:1664
+#: ../clutter/clutter-main.c:1640
 msgid "Clutter debugging flags to unset"
 msgstr "Сбросить отладочные флаги Clutter"
 
-#: ../clutter/clutter-main.c:1668
+#: ../clutter/clutter-main.c:1644
 msgid "Clutter profiling flags to set"
 msgstr "Установить профилировочные флаги Clutter"
 
-#: ../clutter/clutter-main.c:1670
+#: ../clutter/clutter-main.c:1646
 msgid "Clutter profiling flags to unset"
 msgstr "Сбросить профилировочные флаги Clutter"
 
-#: ../clutter/clutter-main.c:1673
+#: ../clutter/clutter-main.c:1649
 msgid "Enable accessibility"
 msgstr "Включить специальные возможности"
 
-#: ../clutter/clutter-main.c:1865
+#: ../clutter/clutter-main.c:1841
 msgid "Clutter Options"
 msgstr "Параметры Clutter"
 
-#: ../clutter/clutter-main.c:1866
+#: ../clutter/clutter-main.c:1842
 msgid "Show Clutter Options"
 msgstr "Показать параметры Clutter"
 
-#: ../clutter/clutter-pan-action.c:448
+#: ../clutter/clutter-pan-action.c:455
 msgid "Pan Axis"
 msgstr "Ось панорамирования"
 
-#: ../clutter/clutter-pan-action.c:449
+#: ../clutter/clutter-pan-action.c:456
 msgid "Constraints the panning to an axis"
 msgstr "Привязать панорамирование к оси"
 
-#: ../clutter/clutter-pan-action.c:463
+#: ../clutter/clutter-pan-action.c:470
 msgid "Interpolate"
 msgstr "Интерполировать"
 
-#: ../clutter/clutter-pan-action.c:464
+#: ../clutter/clutter-pan-action.c:471
 msgid "Whether interpolated events emission is enabled."
 msgstr "Включена ли отправка событий интерполяции."
 
-#: ../clutter/clutter-pan-action.c:480
+#: ../clutter/clutter-pan-action.c:487
 msgid "Deceleration"
 msgstr "Торможение"
 
-#: ../clutter/clutter-pan-action.c:481
+#: ../clutter/clutter-pan-action.c:488
 msgid "Rate at which the interpolated panning will decelerate in"
 msgstr "Скорость, к которой стремится интерполированное панорамирование"
 
-#: ../clutter/clutter-pan-action.c:498
+#: ../clutter/clutter-pan-action.c:505
 msgid "Initial acceleration factor"
 msgstr "Исходный коэффициент ускорения"
 
-#: ../clutter/clutter-pan-action.c:499
+#: ../clutter/clutter-pan-action.c:506
 msgid "Factor applied to the momentum when starting the interpolated phase"
 msgstr "Коэффициент, применяемый в момент запуска этапа интерполяции"
 
 #: ../clutter/clutter-path-constraint.c:212
-#: ../clutter/deprecated/clutter-behaviour-path.c:225
+#: ../clutter/deprecated/clutter-behaviour-path.c:221
 msgid "Path"
 msgstr "Траектория"
 
@@ -1385,88 +1460,88 @@ msgstr "Траектория используемая для ограничен
 msgid "The offset along the path, between -1.0 and 2.0"
 msgstr "Смещение вдоль траектории, между -1.0 и 2.0"
 
-#: ../clutter/clutter-property-transition.c:271
+#: ../clutter/clutter-property-transition.c:269
 msgid "Property Name"
 msgstr "Имя свойства"
 
-#: ../clutter/clutter-property-transition.c:272
+#: ../clutter/clutter-property-transition.c:270
 msgid "The name of the property to animate"
 msgstr "Имя свойства для анимации"
 
-#: ../clutter/clutter-script.c:466
+#: ../clutter/clutter-script.c:464
 msgid "Filename Set"
 msgstr "Имя файла"
 
-#: ../clutter/clutter-script.c:467
+#: ../clutter/clutter-script.c:465
 msgid "Whether the :filename property is set"
 msgstr "Установлено ли свойство :filename"
 
-#: ../clutter/clutter-script.c:481
-#: ../clutter/deprecated/clutter-texture.c:1082
+#: ../clutter/clutter-script.c:479
+#: ../clutter/deprecated/clutter-texture.c:1080
 msgid "Filename"
 msgstr "Имя файла"
 
-#: ../clutter/clutter-script.c:482
+#: ../clutter/clutter-script.c:480
 msgid "The path of the currently parsed file"
 msgstr "Путь к текущему разбираемому файлу"
 
-#: ../clutter/clutter-script.c:499
+#: ../clutter/clutter-script.c:497
 msgid "Translation Domain"
 msgstr "Домен переводов"
 
-#: ../clutter/clutter-script.c:500
+#: ../clutter/clutter-script.c:498
 msgid "The translation domain used to localize string"
 msgstr "Домен переводов, используемый для локализации строк"
 
-#: ../clutter/clutter-scroll-actor.c:263
+#: ../clutter/clutter-scroll-actor.c:189
 msgid "Scroll Mode"
 msgstr "Режим прокрутки"
 
-#: ../clutter/clutter-scroll-actor.c:264
+#: ../clutter/clutter-scroll-actor.c:190
 msgid "The scrolling direction"
 msgstr "Направление прокрутки"
 
-#: ../clutter/clutter-settings.c:440
+#: ../clutter/clutter-settings.c:486
 msgid "Double Click Time"
 msgstr "Время двойного щелчка"
 
-#: ../clutter/clutter-settings.c:441
+#: ../clutter/clutter-settings.c:487
 msgid "The time between clicks necessary to detect a multiple click"
 msgstr ""
 "Время между щелчками, необходимое для обнаружения множественного щелчка"
 
-#: ../clutter/clutter-settings.c:456
+#: ../clutter/clutter-settings.c:502
 msgid "Double Click Distance"
 msgstr "Интервал двойного щелчка"
 
-#: ../clutter/clutter-settings.c:457
+#: ../clutter/clutter-settings.c:503
 msgid "The distance between clicks necessary to detect a multiple click"
 msgstr ""
 "Интервал между щелчками, необходимый для обнаружения множественного щелчка"
 
-#: ../clutter/clutter-settings.c:472
+#: ../clutter/clutter-settings.c:518
 msgid "Drag Threshold"
 msgstr "Порог перетаскивания"
 
-#: ../clutter/clutter-settings.c:473
+#: ../clutter/clutter-settings.c:519
 msgid "The distance the cursor should travel before starting to drag"
 msgstr ""
 "Расстояние, на которое нужно передвинуть курсор, чтобы начать перетаскивание"
 
-#: ../clutter/clutter-settings.c:488 ../clutter/clutter-text.c:3369
+#: ../clutter/clutter-settings.c:534 ../clutter/clutter-text.c:3437
 msgid "Font Name"
 msgstr "Название шрифта"
 
-#: ../clutter/clutter-settings.c:489
+#: ../clutter/clutter-settings.c:535
 msgid ""
 "The description of the default font, as one that could be parsed by Pango"
 msgstr "Описание шрифта по умолчанию, которое может разобрать Pango"
 
-#: ../clutter/clutter-settings.c:504
+#: ../clutter/clutter-settings.c:550
 msgid "Font Antialias"
 msgstr "Сглаживание шрифта"
 
-#: ../clutter/clutter-settings.c:505
+#: ../clutter/clutter-settings.c:551
 msgid ""
 "Whether to use antialiasing (1 to enable, 0 to disable, and -1 to use the "
 "default)"
@@ -1474,71 +1549,80 @@ msgstr ""
 "Использовать ли сглаживание (1 — использовать; 0 — не использовать; -1 — "
 "использовать настройки по умолчанию)"
 
-#: ../clutter/clutter-settings.c:521
+#: ../clutter/clutter-settings.c:567 ../clutter/clutter-settings.c:575
 msgid "Font DPI"
 msgstr "Разрешение шрифта"
 
-#: ../clutter/clutter-settings.c:522
+#: ../clutter/clutter-settings.c:568 ../clutter/clutter-settings.c:576
 msgid ""
 "The resolution of the font, in 1024 * dots/inch, or -1 to use the default"
 msgstr ""
 "Разрешение шрифта, в 1024 * точек/дюйм, или -1, чтобы использовать "
 "разрешение по умолчанию"
 
-#: ../clutter/clutter-settings.c:538
+#: ../clutter/clutter-settings.c:592
 msgid "Font Hinting"
 msgstr "Хинтинг шрифта"
 
-#: ../clutter/clutter-settings.c:539
+#: ../clutter/clutter-settings.c:593
 msgid ""
 "Whether to use hinting (1 to enable, 0 to disable and -1 to use the default)"
 msgstr ""
 "Использовать ли хинтинг (1 — использовать; 0 — не использовать; -1 — "
 "использовать настройки по умолчанию)"
 
-#: ../clutter/clutter-settings.c:560
+#: ../clutter/clutter-settings.c:614
 msgid "Font Hint Style"
 msgstr "Стиль хинтинга шрифта"
 
-#: ../clutter/clutter-settings.c:561
+#: ../clutter/clutter-settings.c:615
 msgid "The style of hinting (hintnone, hintslight, hintmedium, hintfull)"
 msgstr "Стиль хинтинга (hintnone, hintslight, hintmedium, hintfull)"
 
-#: ../clutter/clutter-settings.c:582
+#: ../clutter/clutter-settings.c:636
 msgid "Font Subpixel Order"
 msgstr "Порядок субпиксельной обработки"
 
-#: ../clutter/clutter-settings.c:583
+#: ../clutter/clutter-settings.c:637
 msgid "The type of subpixel antialiasing (none, rgb, bgr, vrgb, vbgr)"
 msgstr "Тип субпиксельного сглаживания (none, rgb, bgr, vrgb, vbgr)"
 
-#: ../clutter/clutter-settings.c:600
+#: ../clutter/clutter-settings.c:654
 msgid "The minimum duration for a long press gesture to be recognized"
 msgstr ""
 "Минимальная продолжительность, необходимая для распознавания жеста "
 "длительного нажатия"
 
-#: ../clutter/clutter-settings.c:607
+#: ../clutter/clutter-settings.c:661
+msgid "Window Scaling Factor"
+msgstr "Коэффициент масштабирования окон"
+
+#: ../clutter/clutter-settings.c:662
+#| msgid "Add an effect to be applied on the actor"
+msgid "The scaling factor to be applied to windows"
+msgstr "Коэффициент масштабирования, применяемый к окнам"
+
+#: ../clutter/clutter-settings.c:669
 msgid "Fontconfig configuration timestamp"
 msgstr "Метка времени настройки шрифта"
 
-#: ../clutter/clutter-settings.c:608
+#: ../clutter/clutter-settings.c:670
 msgid "Timestamp of the current fontconfig configuration"
 msgstr "Метка времени текущей настройки fontconfig"
 
-#: ../clutter/clutter-settings.c:625
+#: ../clutter/clutter-settings.c:687
 msgid "Password Hint Time"
 msgstr "Время отображения пароля"
 
-#: ../clutter/clutter-settings.c:626
+#: ../clutter/clutter-settings.c:688
 msgid "How long to show the last input character in hidden entries"
 msgstr "Как долго показывать последний введённый символ в скрытых полях"
 
-#: ../clutter/clutter-shader-effect.c:486
+#: ../clutter/clutter-shader-effect.c:485
 msgid "Shader Type"
 msgstr "Тип шейдера"
 
-#: ../clutter/clutter-shader-effect.c:487
+#: ../clutter/clutter-shader-effect.c:486
 msgid "The type of shader used"
 msgstr "Тип используемого шейдера"
 
@@ -1566,760 +1650,704 @@ msgstr "Край источника, который должен быть скр
 msgid "The offset in pixels to apply to the constraint"
 msgstr "Смещение в пикселах для применения к ограничению"
 
-#: ../clutter/clutter-stage.c:1895
+#: ../clutter/clutter-stage.c:1899
 msgid "Fullscreen Set"
 msgstr "На полный экран"
 
-#: ../clutter/clutter-stage.c:1896
+#: ../clutter/clutter-stage.c:1900
 msgid "Whether the main stage is fullscreen"
 msgstr "Должна ли главная сцена занимать весь экран"
 
-#: ../clutter/clutter-stage.c:1910
+#: ../clutter/clutter-stage.c:1914
 msgid "Offscreen"
 msgstr "За кадром"
 
-#: ../clutter/clutter-stage.c:1911
+#: ../clutter/clutter-stage.c:1915
 msgid "Whether the main stage should be rendered offscreen"
 msgstr "Должна ли главная сцена отрисовываться за кадром"
 
-#: ../clutter/clutter-stage.c:1923 ../clutter/clutter-text.c:3483
+#: ../clutter/clutter-stage.c:1927 ../clutter/clutter-text.c:3551
 msgid "Cursor Visible"
 msgstr "Видимый курсор"
 
-#: ../clutter/clutter-stage.c:1924
+#: ../clutter/clutter-stage.c:1928
 msgid "Whether the mouse pointer is visible on the main stage"
 msgstr "Виден ли указатель мыши на главной сцене"
 
-#: ../clutter/clutter-stage.c:1938
+#: ../clutter/clutter-stage.c:1942
 msgid "User Resizable"
 msgstr "Пользователь может менять размер"
 
-#: ../clutter/clutter-stage.c:1939
+#: ../clutter/clutter-stage.c:1943
 msgid "Whether the stage is able to be resized via user interaction"
 msgstr "Может ли сцена изменять размер в зависимости от действий пользователя"
 
-#: ../clutter/clutter-stage.c:1954 ../clutter/deprecated/clutter-box.c:260
-#: ../clutter/deprecated/clutter-rectangle.c:273
+#: ../clutter/clutter-stage.c:1958 ../clutter/deprecated/clutter-box.c:256
+#: ../clutter/deprecated/clutter-rectangle.c:270
 msgid "Color"
 msgstr "Цвет"
 
-#: ../clutter/clutter-stage.c:1955
+#: ../clutter/clutter-stage.c:1959
 msgid "The color of the stage"
 msgstr "Цвет сцены"
 
-#: ../clutter/clutter-stage.c:1970
+#: ../clutter/clutter-stage.c:1974
 msgid "Perspective"
 msgstr "Перспектива"
 
-#: ../clutter/clutter-stage.c:1971
+#: ../clutter/clutter-stage.c:1975
 msgid "Perspective projection parameters"
 msgstr "Параметры проекции перспективы"
 
-#: ../clutter/clutter-stage.c:1986
+#: ../clutter/clutter-stage.c:1990
 msgid "Title"
 msgstr "Заголовок"
 
-#: ../clutter/clutter-stage.c:1987
+#: ../clutter/clutter-stage.c:1991
 msgid "Stage Title"
 msgstr "Заголовок сцены"
 
-#: ../clutter/clutter-stage.c:2004
+#: ../clutter/clutter-stage.c:2008
 msgid "Use Fog"
 msgstr "Использовать туман"
 
-#: ../clutter/clutter-stage.c:2005
+#: ../clutter/clutter-stage.c:2009
 msgid "Whether to enable depth cueing"
 msgstr "Включить ли эффект тумана"
 
-#: ../clutter/clutter-stage.c:2021
+#: ../clutter/clutter-stage.c:2025
 msgid "Fog"
 msgstr "Туман"
 
-#: ../clutter/clutter-stage.c:2022
+#: ../clutter/clutter-stage.c:2026
 msgid "Settings for the depth cueing"
 msgstr "Параметры эффекта тумана"
 
-#: ../clutter/clutter-stage.c:2038
+#: ../clutter/clutter-stage.c:2042
 msgid "Use Alpha"
 msgstr "Использовать полупрозрачность"
 
-#: ../clutter/clutter-stage.c:2039
+#: ../clutter/clutter-stage.c:2043
 msgid "Whether to honour the alpha component of the stage color"
 msgstr "Учитывать ли альфа-слой цвета сцены"
 
-#: ../clutter/clutter-stage.c:2055
+#: ../clutter/clutter-stage.c:2059
 msgid "Key Focus"
 msgstr "Клавишный фокус"
 
-#: ../clutter/clutter-stage.c:2056
+#: ../clutter/clutter-stage.c:2060
 msgid "The currently key focused actor"
 msgstr "Актор, у которого в настоящий момент есть фокус"
 
-#: ../clutter/clutter-stage.c:2072
+#: ../clutter/clutter-stage.c:2076
 msgid "No Clear Hint"
 msgstr "Не очищать"
 
-#: ../clutter/clutter-stage.c:2073
+#: ../clutter/clutter-stage.c:2077
 msgid "Whether the stage should clear its contents"
 msgstr "Должно ли сцена очищать своё содержимое"
 
-#: ../clutter/clutter-stage.c:2086
+#: ../clutter/clutter-stage.c:2090
 msgid "Accept Focus"
 msgstr "Принимать фокус"
 
-#: ../clutter/clutter-stage.c:2087
+#: ../clutter/clutter-stage.c:2091
 msgid "Whether the stage should accept focus on show"
 msgstr "Должна ли сцена принимать фокус"
 
-#: ../clutter/clutter-table-layout.c:543
-msgid "Column Number"
-msgstr "Номер столбца"
-
-#: ../clutter/clutter-table-layout.c:544
-msgid "The column the widget resides in"
-msgstr "Столбец, в котором находится виджет"
-
-#: ../clutter/clutter-table-layout.c:551
-msgid "Row Number"
-msgstr "Номер строки"
-
-#: ../clutter/clutter-table-layout.c:552
-msgid "The row the widget resides in"
-msgstr "Строка, в которой находится виджет"
-
-#: ../clutter/clutter-table-layout.c:559
-msgid "Column Span"
-msgstr "Диапазон столбцов"
-
-#: ../clutter/clutter-table-layout.c:560
-msgid "The number of columns the widget should span"
-msgstr "Количество столбцов, занимаемых виджетом"
-
-#: ../clutter/clutter-table-layout.c:567
-msgid "Row Span"
-msgstr "Диапазон строк"
-
-#: ../clutter/clutter-table-layout.c:568
-msgid "The number of rows the widget should span"
-msgstr "Количество строк, занимаемых виджетом"
-
-#: ../clutter/clutter-table-layout.c:575
-msgid "Horizontal Expand"
-msgstr "Горизонтальное растяжение"
-
-#: ../clutter/clutter-table-layout.c:576
-msgid "Allocate extra space for the child in horizontal axis"
-msgstr "Выделить дополнительное место по горизонтали для дочернего элемента "
-
-#: ../clutter/clutter-table-layout.c:582
-msgid "Vertical Expand"
-msgstr "Вертикальное растяжение"
-
-#: ../clutter/clutter-table-layout.c:583
-msgid "Allocate extra space for the child in vertical axis"
-msgstr "Выделить дополнительное место по вертикали для дочернего элемента "
-
-#: ../clutter/clutter-table-layout.c:1638
-msgid "Spacing between columns"
-msgstr "Расстояние между столбцами"
-
-#: ../clutter/clutter-table-layout.c:1652
-msgid "Spacing between rows"
-msgstr "Расстояние между строками"
-
-#: ../clutter/clutter-text-buffer.c:351 ../clutter/clutter-text.c:3404
+#: ../clutter/clutter-text-buffer.c:347 ../clutter/clutter-text.c:3472
 msgid "Text"
 msgstr "Текст"
 
-#: ../clutter/clutter-text-buffer.c:352
+#: ../clutter/clutter-text-buffer.c:348
 msgid "The contents of the buffer"
 msgstr "Содержимое буфера"
 
-#: ../clutter/clutter-text-buffer.c:365
+#: ../clutter/clutter-text-buffer.c:361
 msgid "Text length"
 msgstr "Длина текста"
 
-#: ../clutter/clutter-text-buffer.c:366
+#: ../clutter/clutter-text-buffer.c:362
 msgid "Length of the text currently in the buffer"
 msgstr "Длина текста, находящегося в буфере"
 
-#: ../clutter/clutter-text-buffer.c:379
+#: ../clutter/clutter-text-buffer.c:375
 msgid "Maximum length"
 msgstr "Максимальная длина"
 
-#: ../clutter/clutter-text-buffer.c:380
+#: ../clutter/clutter-text-buffer.c:376
 msgid "Maximum number of characters for this entry. Zero if no maximum"
 msgstr ""
 "Максимальное количество символов для этого поля. Ноль, если максимум не "
 "указан."
 
-#: ../clutter/clutter-text.c:3351
+#: ../clutter/clutter-text.c:3419
 msgid "Buffer"
 msgstr "Буфер"
 
-#: ../clutter/clutter-text.c:3352
+#: ../clutter/clutter-text.c:3420
 msgid "The buffer for the text"
 msgstr "Буфер для текста"
 
-#: ../clutter/clutter-text.c:3370
+#: ../clutter/clutter-text.c:3438
 msgid "The font to be used by the text"
 msgstr "Шрифт, используемый для текста"
 
-#: ../clutter/clutter-text.c:3387
+#: ../clutter/clutter-text.c:3455
 msgid "Font Description"
 msgstr "Описание шрифта"
 
-#: ../clutter/clutter-text.c:3388
+#: ../clutter/clutter-text.c:3456
 msgid "The font description to be used"
 msgstr "Описание используемого шрифта"
 
-#: ../clutter/clutter-text.c:3405
+#: ../clutter/clutter-text.c:3473
 msgid "The text to render"
 msgstr "Текст для отрисовки"
 
-#: ../clutter/clutter-text.c:3419
+#: ../clutter/clutter-text.c:3487
 msgid "Font Color"
 msgstr "Цвет шрифта"
 
-#: ../clutter/clutter-text.c:3420
+#: ../clutter/clutter-text.c:3488
 msgid "Color of the font used by the text"
 msgstr "Цвет шрифта, используемого для текста"
 
-#: ../clutter/clutter-text.c:3435
+#: ../clutter/clutter-text.c:3503
 msgid "Editable"
 msgstr "Редактирование"
 
-#: ../clutter/clutter-text.c:3436
+#: ../clutter/clutter-text.c:3504
 msgid "Whether the text is editable"
 msgstr "Можно ли изменить текст"
 
-#: ../clutter/clutter-text.c:3451
+#: ../clutter/clutter-text.c:3519
 msgid "Selectable"
 msgstr "Выделение"
 
-#: ../clutter/clutter-text.c:3452
+#: ../clutter/clutter-text.c:3520
 msgid "Whether the text is selectable"
 msgstr "Можно ли выделять текст"
 
-#: ../clutter/clutter-text.c:3466
+#: ../clutter/clutter-text.c:3534
 msgid "Activatable"
 msgstr "Активация"
 
-#: ../clutter/clutter-text.c:3467
+#: ../clutter/clutter-text.c:3535
 msgid "Whether pressing return causes the activate signal to be emitted"
 msgstr "Высылает ли нажатие return сигнал активации"
 
-#: ../clutter/clutter-text.c:3484
+#: ../clutter/clutter-text.c:3552
 msgid "Whether the input cursor is visible"
 msgstr "Является ли курсор ввода видимым"
 
-#: ../clutter/clutter-text.c:3498 ../clutter/clutter-text.c:3499
+#: ../clutter/clutter-text.c:3566 ../clutter/clutter-text.c:3567
 msgid "Cursor Color"
 msgstr "Цвет курсора"
 
-#: ../clutter/clutter-text.c:3514
+#: ../clutter/clutter-text.c:3582
 msgid "Cursor Color Set"
 msgstr "Цвет курсора"
 
-#: ../clutter/clutter-text.c:3515
+#: ../clutter/clutter-text.c:3583
 msgid "Whether the cursor color has been set"
 msgstr "Установлен ли цвет курсора"
 
-#: ../clutter/clutter-text.c:3530
+#: ../clutter/clutter-text.c:3598
 msgid "Cursor Size"
 msgstr "Размер курсора"
 
-#: ../clutter/clutter-text.c:3531
+#: ../clutter/clutter-text.c:3599
 msgid "The width of the cursor, in pixels"
 msgstr "Ширина курсора в пикселах"
 
-#: ../clutter/clutter-text.c:3547 ../clutter/clutter-text.c:3565
+#: ../clutter/clutter-text.c:3615 ../clutter/clutter-text.c:3633
 msgid "Cursor Position"
 msgstr "Положение курсора"
 
-#: ../clutter/clutter-text.c:3548 ../clutter/clutter-text.c:3566
+#: ../clutter/clutter-text.c:3616 ../clutter/clutter-text.c:3634
 msgid "The cursor position"
 msgstr "Положение курсора"
 
-#: ../clutter/clutter-text.c:3581
+#: ../clutter/clutter-text.c:3649
 msgid "Selection-bound"
 msgstr "Граница выделения"
 
-#: ../clutter/clutter-text.c:3582
+#: ../clutter/clutter-text.c:3650
 msgid "The cursor position of the other end of the selection"
 msgstr "Положение курсора другого конца выделения"
 
-#: ../clutter/clutter-text.c:3597 ../clutter/clutter-text.c:3598
+#: ../clutter/clutter-text.c:3665 ../clutter/clutter-text.c:3666
 msgid "Selection Color"
 msgstr "Цвет выделения"
 
-#: ../clutter/clutter-text.c:3613
+#: ../clutter/clutter-text.c:3681
 msgid "Selection Color Set"
 msgstr "Цвет выделения"
 
-#: ../clutter/clutter-text.c:3614
+#: ../clutter/clutter-text.c:3682
 msgid "Whether the selection color has been set"
 msgstr "Установлен ли цвет выделения"
 
-#: ../clutter/clutter-text.c:3629
+#: ../clutter/clutter-text.c:3697
 msgid "Attributes"
 msgstr "Атрибуты"
 
-#: ../clutter/clutter-text.c:3630
+#: ../clutter/clutter-text.c:3698
 msgid "A list of style attributes to apply to the contents of the actor"
 msgstr "Список стилевых атрибутов, применяемых к содержимому актору"
 
-#: ../clutter/clutter-text.c:3652
+#: ../clutter/clutter-text.c:3720
 msgid "Use markup"
 msgstr "Использовать разметку"
 
-#: ../clutter/clutter-text.c:3653
+#: ../clutter/clutter-text.c:3721
 msgid "Whether or not the text includes Pango markup"
 msgstr "Включает ли текст разметку Pango"
 
-#: ../clutter/clutter-text.c:3669
+#: ../clutter/clutter-text.c:3737
 msgid "Line wrap"
 msgstr "Перенос строк"
 
-#: ../clutter/clutter-text.c:3670
+#: ../clutter/clutter-text.c:3738
 msgid "If set, wrap the lines if the text becomes too wide"
 msgstr "Если установлено, то будет включён перенос текста"
 
-#: ../clutter/clutter-text.c:3685
+#: ../clutter/clutter-text.c:3753
 msgid "Line wrap mode"
 msgstr "Режим переноса строк"
 
-#: ../clutter/clutter-text.c:3686
+#: ../clutter/clutter-text.c:3754
 msgid "Control how line-wrapping is done"
 msgstr "Управление переносом строк"
 
-#: ../clutter/clutter-text.c:3701
+#: ../clutter/clutter-text.c:3769
 msgid "Ellipsize"
 msgstr "Усечь"
 
-#: ../clutter/clutter-text.c:3702
+#: ../clutter/clutter-text.c:3770
 msgid "The preferred place to ellipsize the string"
 msgstr "Предпочтительное место для усечения строки"
 
-#: ../clutter/clutter-text.c:3718
+#: ../clutter/clutter-text.c:3786
 msgid "Line Alignment"
 msgstr "Выравнивание строк"
 
-#: ../clutter/clutter-text.c:3719
+#: ../clutter/clutter-text.c:3787
 msgid "The preferred alignment for the string, for multi-line text"
 msgstr "Предпочтительное выравнивание строки, многострочного текста"
 
-#: ../clutter/clutter-text.c:3735
+#: ../clutter/clutter-text.c:3803
 msgid "Justify"
 msgstr "По ширине"
 
-#: ../clutter/clutter-text.c:3736
+#: ../clutter/clutter-text.c:3804
 msgid "Whether the text should be justified"
 msgstr "Должен ли текст растягиваться по ширине"
 
-#: ../clutter/clutter-text.c:3751
+#: ../clutter/clutter-text.c:3819
 msgid "Password Character"
 msgstr "Парольный символ"
 
-#: ../clutter/clutter-text.c:3752
+#: ../clutter/clutter-text.c:3820
 msgid "If non-zero, use this character to display the actor's contents"
 msgstr "Использовать этот символ для отображения содержимого актора"
 
-#: ../clutter/clutter-text.c:3766
+#: ../clutter/clutter-text.c:3834
 msgid "Max Length"
 msgstr "Макс. длина"
 
-#: ../clutter/clutter-text.c:3767
+#: ../clutter/clutter-text.c:3835
 msgid "Maximum length of the text inside the actor"
 msgstr "Максимальная длина текста внутри актора"
 
-#: ../clutter/clutter-text.c:3790
+#: ../clutter/clutter-text.c:3858
 msgid "Single Line Mode"
 msgstr "Режим одиночной строки"
 
-#: ../clutter/clutter-text.c:3791
+#: ../clutter/clutter-text.c:3859
 msgid "Whether the text should be a single line"
 msgstr "Должен ли текст записывать в одну строку"
 
-#: ../clutter/clutter-text.c:3805 ../clutter/clutter-text.c:3806
+#: ../clutter/clutter-text.c:3873 ../clutter/clutter-text.c:3874
 msgid "Selected Text Color"
 msgstr "Цвет выделенного текста"
 
-#: ../clutter/clutter-text.c:3821
+#: ../clutter/clutter-text.c:3889
 msgid "Selected Text Color Set"
 msgstr "Цвет выделенного текста"
 
-#: ../clutter/clutter-text.c:3822
+#: ../clutter/clutter-text.c:3890
 msgid "Whether the selected text color has been set"
 msgstr "Установлен ли цвет для выделенного текста"
 
-#: ../clutter/clutter-timeline.c:561
-#: ../clutter/deprecated/clutter-animation.c:560
+#: ../clutter/clutter-timeline.c:593
+#: ../clutter/deprecated/clutter-animation.c:557
 msgid "Loop"
 msgstr "Зациклить"
 
-#: ../clutter/clutter-timeline.c:562
+#: ../clutter/clutter-timeline.c:594
 msgid "Should the timeline automatically restart"
 msgstr "Должна ли временная шкала автоматически перезапускаться"
 
-#: ../clutter/clutter-timeline.c:576
+#: ../clutter/clutter-timeline.c:608
 msgid "Delay"
 msgstr "Задержка"
 
-#: ../clutter/clutter-timeline.c:577
+#: ../clutter/clutter-timeline.c:609
 msgid "Delay before start"
 msgstr "Задержка перед запуском"
 
-#: ../clutter/clutter-timeline.c:592
-#: ../clutter/deprecated/clutter-animation.c:544
-#: ../clutter/deprecated/clutter-animator.c:1804
+#: ../clutter/clutter-timeline.c:624
+#: ../clutter/deprecated/clutter-animation.c:541
+#: ../clutter/deprecated/clutter-animator.c:1801
 #: ../clutter/deprecated/clutter-media.c:224
-#: ../clutter/deprecated/clutter-state.c:1523
+#: ../clutter/deprecated/clutter-state.c:1517
 msgid "Duration"
 msgstr "Длительность"
 
-#: ../clutter/clutter-timeline.c:593
+#: ../clutter/clutter-timeline.c:625
 msgid "Duration of the timeline in milliseconds"
 msgstr "Длина временной шкалы в миллисекундах"
 
-#: ../clutter/clutter-timeline.c:608
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:528
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:337
+#: ../clutter/clutter-timeline.c:640
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:521
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:330
 msgid "Direction"
 msgstr "Направление"
 
-#: ../clutter/clutter-timeline.c:609
+#: ../clutter/clutter-timeline.c:641
 msgid "Direction of the timeline"
 msgstr "Направление временной шкалы"
 
-#: ../clutter/clutter-timeline.c:624
+#: ../clutter/clutter-timeline.c:656
 msgid "Auto Reverse"
 msgstr "Автоматический переворот"
 
-#: ../clutter/clutter-timeline.c:625
+#: ../clutter/clutter-timeline.c:657
 msgid "Whether the direction should be reversed when reaching the end"
 msgstr "Менять ли направление на обратное при достижении конца"
 
-#: ../clutter/clutter-timeline.c:643
+#: ../clutter/clutter-timeline.c:675
 msgid "Repeat Count"
 msgstr "Количество повторов"
 
-#: ../clutter/clutter-timeline.c:644
+#: ../clutter/clutter-timeline.c:676
 msgid "How many times the timeline should repeat"
 msgstr "Сколько раз должна повторяться временная шкала"
 
-#: ../clutter/clutter-timeline.c:658
+#: ../clutter/clutter-timeline.c:690
 msgid "Progress Mode"
 msgstr "Режим выполнения"
 
-#: ../clutter/clutter-timeline.c:659
+#: ../clutter/clutter-timeline.c:691
 msgid "How the timeline should compute the progress"
 msgstr "Как временная шкала вычисляет выполнение"
 
-#: ../clutter/clutter-transition.c:246
+#: ../clutter/clutter-transition.c:244
 msgid "Interval"
 msgstr "Интервал"
 
-#: ../clutter/clutter-transition.c:247
+#: ../clutter/clutter-transition.c:245
 msgid "The interval of values to transition"
 msgstr "Интервал значений для перехода"
 
-#: ../clutter/clutter-transition.c:261
+#: ../clutter/clutter-transition.c:259
 msgid "Animatable"
 msgstr "Анимационный"
 
-#: ../clutter/clutter-transition.c:262
+#: ../clutter/clutter-transition.c:260
 msgid "The animatable object"
 msgstr "Анимационный объект"
 
-#: ../clutter/clutter-transition.c:283
+#: ../clutter/clutter-transition.c:281
 msgid "Remove on Complete"
 msgstr "Убрать после завершения"
 
-#: ../clutter/clutter-transition.c:284
+#: ../clutter/clutter-transition.c:282
 msgid "Detach the transition when completed"
 msgstr "Отсоединить переход после завершения"
 
-#: ../clutter/clutter-zoom-action.c:354
+#: ../clutter/clutter-zoom-action.c:365
 msgid "Zoom Axis"
 msgstr "Ось масштабирования"
 
-#: ../clutter/clutter-zoom-action.c:355
+#: ../clutter/clutter-zoom-action.c:366
 msgid "Constraints the zoom to an axis"
 msgstr "Привязать масштабирование к оси"
 
-#: ../clutter/deprecated/clutter-alpha.c:355
-#: ../clutter/deprecated/clutter-animation.c:575
-#: ../clutter/deprecated/clutter-animator.c:1821
+#: ../clutter/deprecated/clutter-alpha.c:354
+#: ../clutter/deprecated/clutter-animation.c:572
+#: ../clutter/deprecated/clutter-animator.c:1818
 msgid "Timeline"
 msgstr "Временная шкала"
 
-#: ../clutter/deprecated/clutter-alpha.c:356
+#: ../clutter/deprecated/clutter-alpha.c:355
 msgid "Timeline used by the alpha"
 msgstr "Временная шкала, используемая альфа-функцией"
 
-#: ../clutter/deprecated/clutter-alpha.c:372
+#: ../clutter/deprecated/clutter-alpha.c:371
 msgid "Alpha value"
 msgstr "Значение альфа-функции"
 
-#: ../clutter/deprecated/clutter-alpha.c:373
+#: ../clutter/deprecated/clutter-alpha.c:372
 msgid "Alpha value as computed by the alpha"
 msgstr "Значение, вычисленное альфа-функцией"
 
-#: ../clutter/deprecated/clutter-alpha.c:394
-#: ../clutter/deprecated/clutter-animation.c:528
+#: ../clutter/deprecated/clutter-alpha.c:393
+#: ../clutter/deprecated/clutter-animation.c:525
 msgid "Mode"
 msgstr "Режим"
 
-#: ../clutter/deprecated/clutter-alpha.c:395
+#: ../clutter/deprecated/clutter-alpha.c:394
 msgid "Progress mode"
 msgstr "Режим выполнения"
 
-#: ../clutter/deprecated/clutter-animation.c:511
+#: ../clutter/deprecated/clutter-animation.c:508
 msgid "Object"
 msgstr "Объект"
 
-#: ../clutter/deprecated/clutter-animation.c:512
+#: ../clutter/deprecated/clutter-animation.c:509
 msgid "Object to which the animation applies"
 msgstr "Объект, к которому применяется анимация"
 
-#: ../clutter/deprecated/clutter-animation.c:529
+#: ../clutter/deprecated/clutter-animation.c:526
 msgid "The mode of the animation"
 msgstr "Режим анимации"
 
-#: ../clutter/deprecated/clutter-animation.c:545
+#: ../clutter/deprecated/clutter-animation.c:542
 msgid "Duration of the animation, in milliseconds"
 msgstr "Длительность анимации, в миллисекундах"
 
-#: ../clutter/deprecated/clutter-animation.c:561
+#: ../clutter/deprecated/clutter-animation.c:558
 msgid "Whether the animation should loop"
 msgstr "Зациклить ли анимацию"
 
-#: ../clutter/deprecated/clutter-animation.c:576
+#: ../clutter/deprecated/clutter-animation.c:573
 msgid "The timeline used by the animation"
 msgstr "Временная шкала, используемая для анимации"
 
-#: ../clutter/deprecated/clutter-animation.c:592
-#: ../clutter/deprecated/clutter-behaviour.c:241
+#: ../clutter/deprecated/clutter-animation.c:589
+#: ../clutter/deprecated/clutter-behaviour.c:237
 msgid "Alpha"
 msgstr "Альфа-функция"
 
-#: ../clutter/deprecated/clutter-animation.c:593
+#: ../clutter/deprecated/clutter-animation.c:590
 msgid "The alpha used by the animation"
 msgstr "Альфа-функция, используемая анимацией"
 
-#: ../clutter/deprecated/clutter-animator.c:1805
+#: ../clutter/deprecated/clutter-animator.c:1802
 msgid "The duration of the animation"
 msgstr "Продолжительность анимации"
 
-#: ../clutter/deprecated/clutter-animator.c:1822
+#: ../clutter/deprecated/clutter-animator.c:1819
 msgid "The timeline of the animation"
 msgstr "Временная шкала анимации"
 
-#: ../clutter/deprecated/clutter-behaviour.c:242
+#: ../clutter/deprecated/clutter-behaviour.c:238
 msgid "Alpha Object to drive the behaviour"
 msgstr "Объект альфа-функции для управления поведением"
 
-#: ../clutter/deprecated/clutter-behaviour-depth.c:182
+#: ../clutter/deprecated/clutter-behaviour-depth.c:180
 msgid "Start Depth"
 msgstr "Начальная глубина"
 
-#: ../clutter/deprecated/clutter-behaviour-depth.c:183
+#: ../clutter/deprecated/clutter-behaviour-depth.c:181
 msgid "Initial depth to apply"
 msgstr "Начальная глубина"
 
-#: ../clutter/deprecated/clutter-behaviour-depth.c:198
+#: ../clutter/deprecated/clutter-behaviour-depth.c:196
 msgid "End Depth"
 msgstr "Конечная глубина"
 
-#: ../clutter/deprecated/clutter-behaviour-depth.c:199
+#: ../clutter/deprecated/clutter-behaviour-depth.c:197
 msgid "Final depth to apply"
 msgstr "Конечная глубина"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:401
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:394
 msgid "Start Angle"
 msgstr "Начальный угол"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:402
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:284
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:395
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:277
 msgid "Initial angle"
 msgstr "Начальный угол"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:417
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:410
 msgid "End Angle"
 msgstr "Конечный угол"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:418
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:302
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:411
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:295
 msgid "Final angle"
 msgstr "Конечный угол"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:433
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:426
 msgid "Angle x tilt"
 msgstr "Угол наклона вокруг оси X"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:434
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:427
 msgid "Tilt of the ellipse around x axis"
 msgstr "Наклон эллипса вокруг оси X"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:449
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:442
 msgid "Angle y tilt"
 msgstr "Угол наклона вокруг оси Y"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:450
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:443
 msgid "Tilt of the ellipse around y axis"
 msgstr "Наклон эллипса вокруг оси Y"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:465
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:458
 msgid "Angle z tilt"
 msgstr "Угол наклона вокруг оси Z"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:466
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:459
 msgid "Tilt of the ellipse around z axis"
 msgstr "Наклон эллипса вокруг оси Z"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:482
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:475
 msgid "Width of the ellipse"
 msgstr "Ширина эллипса"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:498
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:491
 msgid "Height of ellipse"
 msgstr "Высота эллипса"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:513
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:506
 msgid "Center"
 msgstr "Центр"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:514
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:507
 msgid "Center of ellipse"
 msgstr "Центр эллипса"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:529
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:338
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:522
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:331
 msgid "Direction of rotation"
 msgstr "Направление вращения"
 
-#: ../clutter/deprecated/clutter-behaviour-opacity.c:184
+#: ../clutter/deprecated/clutter-behaviour-opacity.c:177
 msgid "Opacity Start"
 msgstr "Начальная непрозрачность"
 
-#: ../clutter/deprecated/clutter-behaviour-opacity.c:185
+#: ../clutter/deprecated/clutter-behaviour-opacity.c:178
 msgid "Initial opacity level"
 msgstr "Начальный уровень непрозрачности"
 
-#: ../clutter/deprecated/clutter-behaviour-opacity.c:202
+#: ../clutter/deprecated/clutter-behaviour-opacity.c:195
 msgid "Opacity End"
 msgstr "Конечная непрозрачность"
 
-#: ../clutter/deprecated/clutter-behaviour-opacity.c:203
+#: ../clutter/deprecated/clutter-behaviour-opacity.c:196
 msgid "Final opacity level"
 msgstr "Конечный уровень непрозрачности"
 
-#: ../clutter/deprecated/clutter-behaviour-path.c:226
+#: ../clutter/deprecated/clutter-behaviour-path.c:222
 msgid "The ClutterPath object representing the path to animate along"
 msgstr "Объект ClutterPath, представляющий траекторию для анимации"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:283
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:276
 msgid "Angle Begin"
 msgstr "Начальный угол"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:301
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:294
 msgid "Angle End"
 msgstr "Конечный угол"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:319
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:312
 msgid "Axis"
 msgstr "Ось"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:320
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:313
 msgid "Axis of rotation"
 msgstr "Ось вращения"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:355
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:348
 msgid "Center X"
 msgstr "Центр по оси X"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:356
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:349
 msgid "X coordinate of the center of rotation"
 msgstr "Координата центра вращения по оси X"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:373
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:366
 msgid "Center Y"
 msgstr "Центр по оси Y"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:374
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:367
 msgid "Y coordinate of the center of rotation"
 msgstr "Координата центра вращения по оси Y"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:391
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:384
 msgid "Center Z"
 msgstr "Центр по оси Z"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:392
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:385
 msgid "Z coordinate of the center of rotation"
 msgstr "Координата центра вращения по оси Z"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:226
+#: ../clutter/deprecated/clutter-behaviour-scale.c:222
 msgid "X Start Scale"
 msgstr "Начальный масштаб по оси X"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:227
+#: ../clutter/deprecated/clutter-behaviour-scale.c:223
 msgid "Initial scale on the X axis"
 msgstr "Начальный масштаб по оси X"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:245
+#: ../clutter/deprecated/clutter-behaviour-scale.c:241
 msgid "X End Scale"
 msgstr "Конечный масштаб по оси X"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:246
+#: ../clutter/deprecated/clutter-behaviour-scale.c:242
 msgid "Final scale on the X axis"
 msgstr "Конечный масштаб по оси X"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:264
+#: ../clutter/deprecated/clutter-behaviour-scale.c:260
 msgid "Y Start Scale"
 msgstr "Начальный масштаб по оси Y"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:265
+#: ../clutter/deprecated/clutter-behaviour-scale.c:261
 msgid "Initial scale on the Y axis"
 msgstr "Начальный масштаб по оси Y"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:283
+#: ../clutter/deprecated/clutter-behaviour-scale.c:279
 msgid "Y End Scale"
 msgstr "Конечный масштаб по оси Y"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:284
+#: ../clutter/deprecated/clutter-behaviour-scale.c:280
 msgid "Final scale on the Y axis"
 msgstr "Конечный масштаб по оси Y"
 
-#: ../clutter/deprecated/clutter-box.c:261
+#: ../clutter/deprecated/clutter-box.c:257
 msgid "The background color of the box"
 msgstr "Цвет фона ящика"
 
-#: ../clutter/deprecated/clutter-box.c:274
+#: ../clutter/deprecated/clutter-box.c:270
 msgid "Color Set"
 msgstr "Цвет"
 
-#: ../clutter/deprecated/clutter-cairo-texture.c:597
+#: ../clutter/deprecated/clutter-cairo-texture.c:593
 msgid "Surface Width"
 msgstr "Ширина поверхности"
 
-#: ../clutter/deprecated/clutter-cairo-texture.c:598
+#: ../clutter/deprecated/clutter-cairo-texture.c:594
 msgid "The width of the Cairo surface"
 msgstr "Ширина поверхности Cairo"
 
-#: ../clutter/deprecated/clutter-cairo-texture.c:615
+#: ../clutter/deprecated/clutter-cairo-texture.c:611
 msgid "Surface Height"
 msgstr "Высота поверхности"
 
-#: ../clutter/deprecated/clutter-cairo-texture.c:616
+#: ../clutter/deprecated/clutter-cairo-texture.c:612
 msgid "The height of the Cairo surface"
 msgstr "Высота поверхности Cairo"
 
-#: ../clutter/deprecated/clutter-cairo-texture.c:636
+#: ../clutter/deprecated/clutter-cairo-texture.c:632
 msgid "Auto Resize"
 msgstr "Автоматически изменять размер"
 
-#: ../clutter/deprecated/clutter-cairo-texture.c:637
+#: ../clutter/deprecated/clutter-cairo-texture.c:633
 msgid "Whether the surface should match the allocation"
 msgstr "Должна ли поверхность совпадать с размещением"
 
@@ -2391,179 +2419,235 @@ msgstr "Уровень заполнения буфера"
 msgid "The duration of the stream, in seconds"
 msgstr "Продолжительность потока в секундах"
 
-#: ../clutter/deprecated/clutter-rectangle.c:274
+#: ../clutter/deprecated/clutter-rectangle.c:271
 msgid "The color of the rectangle"
 msgstr "Цвет прямоугольника"
 
-#: ../clutter/deprecated/clutter-rectangle.c:287
+#: ../clutter/deprecated/clutter-rectangle.c:284
 msgid "Border Color"
 msgstr "Цвет рамки"
 
-#: ../clutter/deprecated/clutter-rectangle.c:288
+#: ../clutter/deprecated/clutter-rectangle.c:285
 msgid "The color of the border of the rectangle"
 msgstr "Цвет рамки прямоугольника"
 
-#: ../clutter/deprecated/clutter-rectangle.c:303
+#: ../clutter/deprecated/clutter-rectangle.c:300
 msgid "Border Width"
 msgstr "Ширина рамки"
 
-#: ../clutter/deprecated/clutter-rectangle.c:304
+#: ../clutter/deprecated/clutter-rectangle.c:301
 msgid "The width of the border of the rectangle"
 msgstr "Ширина рамки прямоугольника"
 
-#: ../clutter/deprecated/clutter-rectangle.c:318
+#: ../clutter/deprecated/clutter-rectangle.c:315
 msgid "Has Border"
 msgstr "Есть рамка"
 
-#: ../clutter/deprecated/clutter-rectangle.c:319
+#: ../clutter/deprecated/clutter-rectangle.c:316
 msgid "Whether the rectangle should have a border"
 msgstr "Есть ли у прямоугольника рамка"
 
-#: ../clutter/deprecated/clutter-shader.c:261
+#: ../clutter/deprecated/clutter-shader.c:257
 msgid "Vertex Source"
 msgstr "Источник вершины"
 
-#: ../clutter/deprecated/clutter-shader.c:262
+#: ../clutter/deprecated/clutter-shader.c:258
 msgid "Source of vertex shader"
 msgstr "Источник вершинного шейдера"
 
-#: ../clutter/deprecated/clutter-shader.c:278
+#: ../clutter/deprecated/clutter-shader.c:274
 msgid "Fragment Source"
 msgstr "Источник фрагмента"
 
-#: ../clutter/deprecated/clutter-shader.c:279
+#: ../clutter/deprecated/clutter-shader.c:275
 msgid "Source of fragment shader"
 msgstr "Источник фрагментного шейдера"
 
-#: ../clutter/deprecated/clutter-shader.c:296
+#: ../clutter/deprecated/clutter-shader.c:292
 msgid "Compiled"
 msgstr "Скомпилированный"
 
-#: ../clutter/deprecated/clutter-shader.c:297
+#: ../clutter/deprecated/clutter-shader.c:293
 msgid "Whether the shader is compiled and linked"
 msgstr "Скомпилирован и скомпонован ли шейдер"
 
-#: ../clutter/deprecated/clutter-shader.c:314
+#: ../clutter/deprecated/clutter-shader.c:310
 msgid "Whether the shader is enabled"
 msgstr "Включён ли шейдер"
 
-#: ../clutter/deprecated/clutter-shader.c:525
+#: ../clutter/deprecated/clutter-shader.c:521
 #, c-format
 msgid "%s compilation failed: %s"
 msgstr "Сбой при компиляции %s: %s"
 
-#: ../clutter/deprecated/clutter-shader.c:526
+#: ../clutter/deprecated/clutter-shader.c:522
 msgid "Vertex shader"
 msgstr "Вершинный шейдер"
 
-#: ../clutter/deprecated/clutter-shader.c:527
+#: ../clutter/deprecated/clutter-shader.c:523
 msgid "Fragment shader"
 msgstr "Фрагментный шейдер"
 
-#: ../clutter/deprecated/clutter-state.c:1505
+#: ../clutter/deprecated/clutter-state.c:1499
 msgid "State"
 msgstr "Состояние"
 
-#: ../clutter/deprecated/clutter-state.c:1506
+#: ../clutter/deprecated/clutter-state.c:1500
 msgid "Currently set state, (transition to this state might not be complete)"
 msgstr ""
 "Текущее установленное состояние (переход к этому состоянию может быть "
 "неплоным)"
 
-#: ../clutter/deprecated/clutter-state.c:1524
+#: ../clutter/deprecated/clutter-state.c:1518
 msgid "Default transition duration"
 msgstr "Продолжительность перехода по умолчанию"
 
-#: ../clutter/deprecated/clutter-texture.c:994
+#: ../clutter/deprecated/clutter-table-layout.c:543
+msgid "Column Number"
+msgstr "Номер столбца"
+
+#: ../clutter/deprecated/clutter-table-layout.c:544
+msgid "The column the widget resides in"
+msgstr "Столбец, в котором находится виджет"
+
+#: ../clutter/deprecated/clutter-table-layout.c:551
+msgid "Row Number"
+msgstr "Номер строки"
+
+#: ../clutter/deprecated/clutter-table-layout.c:552
+msgid "The row the widget resides in"
+msgstr "Строка, в которой находится виджет"
+
+#: ../clutter/deprecated/clutter-table-layout.c:559
+msgid "Column Span"
+msgstr "Диапазон столбцов"
+
+#: ../clutter/deprecated/clutter-table-layout.c:560
+msgid "The number of columns the widget should span"
+msgstr "Количество столбцов, занимаемых виджетом"
+
+#: ../clutter/deprecated/clutter-table-layout.c:567
+msgid "Row Span"
+msgstr "Диапазон строк"
+
+#: ../clutter/deprecated/clutter-table-layout.c:568
+msgid "The number of rows the widget should span"
+msgstr "Количество строк, занимаемых виджетом"
+
+#: ../clutter/deprecated/clutter-table-layout.c:575
+msgid "Horizontal Expand"
+msgstr "Горизонтальное растяжение"
+
+#: ../clutter/deprecated/clutter-table-layout.c:576
+msgid "Allocate extra space for the child in horizontal axis"
+msgstr "Выделить дополнительное место по горизонтали для дочернего элемента "
+
+#: ../clutter/deprecated/clutter-table-layout.c:582
+msgid "Vertical Expand"
+msgstr "Вертикальное растяжение"
+
+#: ../clutter/deprecated/clutter-table-layout.c:583
+msgid "Allocate extra space for the child in vertical axis"
+msgstr "Выделить дополнительное место по вертикали для дочернего элемента "
+
+#: ../clutter/deprecated/clutter-table-layout.c:1638
+msgid "Spacing between columns"
+msgstr "Расстояние между столбцами"
+
+#: ../clutter/deprecated/clutter-table-layout.c:1654
+msgid "Spacing between rows"
+msgstr "Расстояние между строками"
+
+#: ../clutter/deprecated/clutter-texture.c:992
 msgid "Sync size of actor"
 msgstr "Синхронизировать размер актора"
 
-#: ../clutter/deprecated/clutter-texture.c:995
+#: ../clutter/deprecated/clutter-texture.c:993
 msgid "Auto sync size of actor to underlying pixbuf dimensions"
 msgstr ""
 "Автоматически синхронизировать размер актора под расположенный за ним "
 "пиксельный буфер"
 
-#: ../clutter/deprecated/clutter-texture.c:1002
+#: ../clutter/deprecated/clutter-texture.c:1000
 msgid "Disable Slicing"
 msgstr "Отключить расщепление"
 
-#: ../clutter/deprecated/clutter-texture.c:1003
+#: ../clutter/deprecated/clutter-texture.c:1001
 msgid ""
 "Forces the underlying texture to be singular and not made of smaller space "
 "saving individual textures"
 msgstr "Запрещает разбиение текстуры на отдельные более мелкие текстуры"
 
-#: ../clutter/deprecated/clutter-texture.c:1012
+#: ../clutter/deprecated/clutter-texture.c:1010
 msgid "Tile Waste"
 msgstr "Остаток черепицы"
 
-#: ../clutter/deprecated/clutter-texture.c:1013
+#: ../clutter/deprecated/clutter-texture.c:1011
 msgid "Maximum waste area of a sliced texture"
 msgstr "Максимальная бесполезная область расщеплённой текстуры"
 
-#: ../clutter/deprecated/clutter-texture.c:1021
+#: ../clutter/deprecated/clutter-texture.c:1019
 msgid "Horizontal repeat"
 msgstr "Повторять по горизонтали"
 
-#: ../clutter/deprecated/clutter-texture.c:1022
+#: ../clutter/deprecated/clutter-texture.c:1020
 msgid "Repeat the contents rather than scaling them horizontally"
 msgstr "Повторять содержимое вместо масштабирования по горизонтали"
 
-#: ../clutter/deprecated/clutter-texture.c:1029
+#: ../clutter/deprecated/clutter-texture.c:1027
 msgid "Vertical repeat"
 msgstr "Повторять по вертикали"
 
-#: ../clutter/deprecated/clutter-texture.c:1030
+#: ../clutter/deprecated/clutter-texture.c:1028
 msgid "Repeat the contents rather than scaling them vertically"
 msgstr "Повторять содержимое вместо масштабирования по вертикали"
 
-#: ../clutter/deprecated/clutter-texture.c:1037
+#: ../clutter/deprecated/clutter-texture.c:1035
 msgid "Filter Quality"
 msgstr "Качество фильтра"
 
-#: ../clutter/deprecated/clutter-texture.c:1038
+#: ../clutter/deprecated/clutter-texture.c:1036
 msgid "Rendering quality used when drawing the texture"
 msgstr "Качество отрисовки, используемое для рисования текстур"
 
-#: ../clutter/deprecated/clutter-texture.c:1046
+#: ../clutter/deprecated/clutter-texture.c:1044
 msgid "Pixel Format"
 msgstr "Пиксельный формат"
 
-#: ../clutter/deprecated/clutter-texture.c:1047
+#: ../clutter/deprecated/clutter-texture.c:1045
 msgid "The Cogl pixel format to use"
 msgstr "Используемый пиксельный формат Cogl"
 
-#: ../clutter/deprecated/clutter-texture.c:1055
-#: ../clutter/wayland/clutter-wayland-surface.c:449
+#: ../clutter/deprecated/clutter-texture.c:1053
+#: ../clutter/wayland/clutter-wayland-surface.c:445
 msgid "Cogl Texture"
 msgstr "Текстура Cogl"
 
-#: ../clutter/deprecated/clutter-texture.c:1056
-#: ../clutter/wayland/clutter-wayland-surface.c:450
+#: ../clutter/deprecated/clutter-texture.c:1054
+#: ../clutter/wayland/clutter-wayland-surface.c:446
 msgid "The underlying Cogl texture handle used to draw this actor"
 msgstr ""
 "Дескриптор нижележащей текстуры Cogl, используемой для отрисовки этого актора"
 
-#: ../clutter/deprecated/clutter-texture.c:1063
+#: ../clutter/deprecated/clutter-texture.c:1061
 msgid "Cogl Material"
 msgstr "Материал Cogl"
 
-#: ../clutter/deprecated/clutter-texture.c:1064
+#: ../clutter/deprecated/clutter-texture.c:1062
 msgid "The underlying Cogl material handle used to draw this actor"
 msgstr ""
 "Дескриптор нижележащего материала Cogl, используемого для отрисовки этого "
 "актора"
 
-#: ../clutter/deprecated/clutter-texture.c:1083
+#: ../clutter/deprecated/clutter-texture.c:1081
 msgid "The path of the file containing the image data"
 msgstr "Путь к файлу, содержащему данные изображения"
 
-#: ../clutter/deprecated/clutter-texture.c:1090
+#: ../clutter/deprecated/clutter-texture.c:1088
 msgid "Keep Aspect Ratio"
 msgstr "Сохранять соотношение сторон"
 
-#: ../clutter/deprecated/clutter-texture.c:1091
+#: ../clutter/deprecated/clutter-texture.c:1089
 msgid ""
 "Keep the aspect ratio of the texture when requesting the preferred width or "
 "height"
@@ -2571,22 +2655,22 @@ msgstr ""
 "Сохранять соотношение сторон текстуры, при запросе предпочтительной ширины и "
 "высоты"
 
-#: ../clutter/deprecated/clutter-texture.c:1119
+#: ../clutter/deprecated/clutter-texture.c:1117
 msgid "Load asynchronously"
 msgstr "Загружать асинхронно"
 
-#: ../clutter/deprecated/clutter-texture.c:1120
+#: ../clutter/deprecated/clutter-texture.c:1118
 msgid ""
 "Load files inside a thread to avoid blocking when loading images from disk"
 msgstr ""
 "Загружать файлы в потоке, чтобы избежать блокирования при загрузке "
 "изображений с диска"
 
-#: ../clutter/deprecated/clutter-texture.c:1138
+#: ../clutter/deprecated/clutter-texture.c:1136
 msgid "Load data asynchronously"
 msgstr "Загружать данные асинхронно"
 
-#: ../clutter/deprecated/clutter-texture.c:1139
+#: ../clutter/deprecated/clutter-texture.c:1137
 msgid ""
 "Decode image data files inside a thread to reduce blocking when loading "
 "images from disk"
@@ -2594,196 +2678,192 @@ msgstr ""
 "Декодировать данные файлов в потоке, чтобы сократить блокирование при "
 "загрузке изображения с диска"
 
-#: ../clutter/deprecated/clutter-texture.c:1165
+#: ../clutter/deprecated/clutter-texture.c:1163
 msgid "Pick With Alpha"
 msgstr "Выбирать с прозрачностью"
 
-#: ../clutter/deprecated/clutter-texture.c:1166
+#: ../clutter/deprecated/clutter-texture.c:1164
 msgid "Shape actor with alpha channel when picking"
 msgstr "Выбирать актор вместе с каналом прозрачности"
 
-#: ../clutter/deprecated/clutter-texture.c:1599
-#: ../clutter/deprecated/clutter-texture.c:1994
-#: ../clutter/deprecated/clutter-texture.c:2090
-#: ../clutter/deprecated/clutter-texture.c:2388
+#: ../clutter/deprecated/clutter-texture.c:1597
+#: ../clutter/deprecated/clutter-texture.c:1992
+#: ../clutter/deprecated/clutter-texture.c:2088
+#: ../clutter/deprecated/clutter-texture.c:2386
 #, c-format
 msgid "Failed to load the image data"
 msgstr "Сбой при загрузке данных изображения"
 
-#: ../clutter/deprecated/clutter-texture.c:1758
+#: ../clutter/deprecated/clutter-texture.c:1756
 #, c-format
 msgid "YUV textures are not supported"
 msgstr "Текстуры YUV не поддерживаются"
 
-#: ../clutter/deprecated/clutter-texture.c:1767
+#: ../clutter/deprecated/clutter-texture.c:1765
 #, c-format
 msgid "YUV2 textues are not supported"
 msgstr "Текстуры YUV2 не поддерживаются"
 
-#: ../clutter/evdev/clutter-input-device-evdev.c:159
-msgid "sysfs Path"
-msgstr "Путь sysfs"
-
-#: ../clutter/evdev/clutter-input-device-evdev.c:160
-msgid "Path of the device in sysfs"
-msgstr "Путь к устройству в sysfs"
-
-#: ../clutter/evdev/clutter-input-device-evdev.c:175
-msgid "Device Path"
-msgstr "Путь к устройству"
-
-#: ../clutter/evdev/clutter-input-device-evdev.c:176
-msgid "Path of the device node"
-msgstr "Путь к узлу устройства"
-
-#: ../clutter/gdk/clutter-backend-gdk.c:296
+#: ../clutter/gdk/clutter-backend-gdk.c:289
 #, c-format
 msgid "Could not find a suitable CoglWinsys for a GdkDisplay of type %s"
 msgstr "Не удалось найти подходящий CoglWinsys для GdkDisplay типа %s"
 
-#: ../clutter/wayland/clutter-wayland-surface.c:423
+#: ../clutter/wayland/clutter-wayland-surface.c:419
 msgid "Surface"
 msgstr "Поверхность"
 
-#: ../clutter/wayland/clutter-wayland-surface.c:424
+#: ../clutter/wayland/clutter-wayland-surface.c:420
 msgid "The underlying wayland surface"
 msgstr "Подложка wayland"
 
-#: ../clutter/wayland/clutter-wayland-surface.c:431
+#: ../clutter/wayland/clutter-wayland-surface.c:427
 msgid "Surface width"
 msgstr "Ширина поверхности"
 
-#: ../clutter/wayland/clutter-wayland-surface.c:432
+#: ../clutter/wayland/clutter-wayland-surface.c:428
 msgid "The width of the underlying wayland surface"
 msgstr "Ширина подложки wayland"
 
-#: ../clutter/wayland/clutter-wayland-surface.c:440
+#: ../clutter/wayland/clutter-wayland-surface.c:436
 msgid "Surface height"
 msgstr "Высота поверхности"
 
-#: ../clutter/wayland/clutter-wayland-surface.c:441
+#: ../clutter/wayland/clutter-wayland-surface.c:437
 msgid "The height of the underlying wayland surface"
 msgstr "Высота подложки wayland"
 
-#: ../clutter/x11/clutter-backend-x11.c:516
+#: ../clutter/x11/clutter-backend-x11.c:488
 msgid "X display to use"
 msgstr "Использовать дисплей X"
 
-#: ../clutter/x11/clutter-backend-x11.c:522
+#: ../clutter/x11/clutter-backend-x11.c:494
 msgid "X screen to use"
 msgstr "Использовать экран X"
 
-#: ../clutter/x11/clutter-backend-x11.c:527
+#: ../clutter/x11/clutter-backend-x11.c:499
 msgid "Make X calls synchronous"
 msgstr "Делать вызовы X синхронно"
 
-#: ../clutter/x11/clutter-backend-x11.c:534
+#: ../clutter/x11/clutter-backend-x11.c:506
 msgid "Disable XInput support"
 msgstr "Отключить поддержку XInput"
 
-#: ../clutter/x11/clutter-keymap-x11.c:317
+#: ../clutter/x11/clutter-keymap-x11.c:458
 msgid "The Clutter backend"
 msgstr "Драйвер Clutter"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:539
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:534
 msgid "Pixmap"
 msgstr "Пиксельная карта"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:540
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:535
 msgid "The X11 Pixmap to be bound"
 msgstr "Ограниченная пиксельная карта X11"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:548
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:543
 msgid "Pixmap width"
 msgstr "Ширина пиксельной карты"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:549
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:544
 msgid "The width of the pixmap bound to this texture"
 msgstr "Ширина пиксельной карты, ограниченная этой текстурой"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:557
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:552
 msgid "Pixmap height"
 msgstr "Высота пиксельной карты"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:558
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:553
 msgid "The height of the pixmap bound to this texture"
 msgstr "Высота пиксельной карты, ограниченная этой текстурой"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:566
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:561
 msgid "Pixmap Depth"
 msgstr "Глубина пиксельной карты"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:567
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:562
 msgid "The depth (in number of bits) of the pixmap bound to this texture"
 msgstr "Глубина (количество бит) пиксельной карты, ограниченная этой текстурой"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:575
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:570
 msgid "Automatic Updates"
 msgstr "Автоматические обновления"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:576
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:571
 msgid "If the texture should be kept in sync with any pixmap changes."
 msgstr ""
 "Если текстура должна синхронизироваться с любыми изменениями пиксельной "
 "карты."
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:584
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:579
 msgid "Window"
 msgstr "Окно"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:585
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:580
 msgid "The X11 Window to be bound"
 msgstr "Ограниченное окно X11"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:593
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:588
 msgid "Window Redirect Automatic"
 msgstr "Автоматическое перенаправление окон"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:594
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:589
 msgid "If composite window redirects are set to Automatic (or Manual if false)"
 msgstr ""
 "Если перенаправления композитных окон установлены в автоматический режим "
 "(или в ручной, если не установлено)"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:604
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:599
 msgid "Window Mapped"
 msgstr "Отображённое (mapped) окно"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:605
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:600
 msgid "If window is mapped"
 msgstr "Если окно отображено (mapped)"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:614
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:609
 msgid "Destroyed"
 msgstr "Уничтожено"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:615
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:610
 msgid "If window has been destroyed"
 msgstr "Если окно было разрушено"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:623
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:618
 msgid "Window X"
 msgstr "Окно по оси X"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:624
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:619
 msgid "X position of window on screen according to X11"
 msgstr "Положение окна на экране в соответствии с X11 по оси X"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:632
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:627
 msgid "Window Y"
 msgstr "Окно по оси Y"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:633
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:628
 msgid "Y position of window on screen according to X11"
 msgstr "Положение окна на экране в соответствии с X11 по оси Y"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:640
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:635
 msgid "Window Override Redirect"
 msgstr "Переопределять перенаправление окна"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:641
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:636
 msgid "If this is an override-redirect window"
 msgstr "Если является окном переопределения перенаправления"
 
+#~ msgid "sysfs Path"
+#~ msgstr "Путь sysfs"
+
+#~ msgid "Path of the device in sysfs"
+#~ msgstr "Путь к устройству в sysfs"
+
+#~ msgid "Device Path"
+#~ msgstr "Путь к устройству"
+
+#~ msgid "Path of the device node"
+#~ msgstr "Путь к узлу устройства"
+
 #~ msgid "The layout manager used by the box"
 #~ msgstr "Менеджер компоновки, используемый ящиком"
diff --git a/po/sk.po b/po/sk.po
new file mode 100644
index 000000000..a70c5031b
--- /dev/null
+++ b/po/sk.po
@@ -0,0 +1,3060 @@
+# Slovak translation for clutter.
+# Copyright (C) 2013 clutter's COPYRIGHT HOLDER
+# This file is distributed under the same license as the clutter package.
+# Jan Kyselica <kyselica.jan@gmail.com>, 2013.
+# Pavol Klačanský <pavol@klacansky.com>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: clutter clutter-1.16\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+"product=clutter&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2013-09-23 23:57+0000\n"
+"PO-Revision-Date: 2013-09-25 20:47+0200\n"
+"Last-Translator: Pavol Klačanský <pavol@klacansky.com>\n"
+"Language-Team: Slovak <gnome-sk-list@gnome.org>\n"
+"Language: sk\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 1 : (n>=2 && n<=4) ? 2 : 0;\n"
+
+# nick
+#: ../clutter/clutter-actor.c:6205
+msgid "X coordinate"
+msgstr "Súradnica X"
+
+# blurb
+#: ../clutter/clutter-actor.c:6206
+msgid "X coordinate of the actor"
+msgstr "Súradnica X aktéra"
+
+# nick
+#: ../clutter/clutter-actor.c:6224
+msgid "Y coordinate"
+msgstr "Súradnica Y"
+
+# blurb
+#: ../clutter/clutter-actor.c:6225
+msgid "Y coordinate of the actor"
+msgstr "Súradnica Y aktéra"
+
+# nick
+#: ../clutter/clutter-actor.c:6247
+msgid "Position"
+msgstr "Pozícia"
+
+# PM: toto sa mi nevidí, podľa mňa to je x a y spolu čiže súradnice polohy actora
+# blurb
+#: ../clutter/clutter-actor.c:6248
+#, fuzzy
+msgid "The position of the origin of the actor"
+msgstr "Pôvodná pozícia aktéra"
+
+# nick
+#: ../clutter/clutter-actor.c:6265 ../clutter/clutter-canvas.c:224
+#: ../clutter/clutter-grid-layout.c:1239
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:474
+msgid "Width"
+msgstr "Šírka"
+
+# blurb
+#: ../clutter/clutter-actor.c:6266
+msgid "Width of the actor"
+msgstr "Šírka aktéra"
+
+# nick
+#: ../clutter/clutter-actor.c:6284 ../clutter/clutter-canvas.c:240
+#: ../clutter/clutter-grid-layout.c:1246
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:490
+msgid "Height"
+msgstr "Výška"
+
+# blurb
+#: ../clutter/clutter-actor.c:6285
+msgid "Height of the actor"
+msgstr "Výška aktéra"
+
+# nick
+#: ../clutter/clutter-actor.c:6306
+msgid "Size"
+msgstr "Rozmery"
+
+# blurb
+#: ../clutter/clutter-actor.c:6307
+msgid "The size of the actor"
+msgstr "Rozmery aktéra"
+
+# nick
+#: ../clutter/clutter-actor.c:6325
+msgid "Fixed X"
+msgstr "Pevné X"
+
+# blurb
+#: ../clutter/clutter-actor.c:6326
+msgid "Forced X position of the actor"
+msgstr "Vnútená súradnica X polohy aktéra"
+
+# nick
+#: ../clutter/clutter-actor.c:6343
+msgid "Fixed Y"
+msgstr "Pevné Y"
+
+# blurb
+#: ../clutter/clutter-actor.c:6344
+msgid "Forced Y position of the actor"
+msgstr "Vnútená súradnica Y polohy aktéra"
+
+# nick
+#: ../clutter/clutter-actor.c:6359
+msgid "Fixed position set"
+msgstr "Nastavená pevná pozícia"
+
+# blurb
+#: ../clutter/clutter-actor.c:6360
+msgid "Whether to use fixed positioning for the actor"
+msgstr "Určuje, či sa má použiť pevne stanovená pozícia pre aktéra"
+
+# nick
+#: ../clutter/clutter-actor.c:6378
+msgid "Min Width"
+msgstr "Minimálna šírka"
+
+# blurb
+#: ../clutter/clutter-actor.c:6379
+msgid "Forced minimum width request for the actor"
+msgstr "Vynútené požadovanie minimálnej šírky aktéra"
+
+# nick
+#: ../clutter/clutter-actor.c:6397
+msgid "Min Height"
+msgstr "Minimálna výška"
+
+# blurb
+#: ../clutter/clutter-actor.c:6398
+msgid "Forced minimum height request for the actor"
+msgstr "Vynútené požadovanie minimálnej výšky aktéra"
+
+# nick
+#: ../clutter/clutter-actor.c:6416
+msgid "Natural Width"
+msgstr "Prirodzená šírka"
+
+# blurb
+#: ../clutter/clutter-actor.c:6417
+msgid "Forced natural width request for the actor"
+msgstr "Vynútené požadovanie prirodzenej šírky aktéra"
+
+# nick
+#: ../clutter/clutter-actor.c:6435
+msgid "Natural Height"
+msgstr "Prirodzená výška"
+
+# blurb
+#: ../clutter/clutter-actor.c:6436
+msgid "Forced natural height request for the actor"
+msgstr "Vynútené požadovanie prirodzenej výšky aktéra"
+
+# nick
+#: ../clutter/clutter-actor.c:6451
+msgid "Minimum width set"
+msgstr "Nastavená minimálna šírka"
+
+# blurb
+#: ../clutter/clutter-actor.c:6452
+msgid "Whether to use the min-width property"
+msgstr "Určuje, či sa má použiť vlastnosť minimálnej šírky"
+
+# nick
+#: ../clutter/clutter-actor.c:6466
+msgid "Minimum height set"
+msgstr "Nastavená minimálna výška"
+
+# blurb
+#: ../clutter/clutter-actor.c:6467
+msgid "Whether to use the min-height property"
+msgstr "Určuje, či sa má použiť vlastnosť minimálnej výšky"
+
+# nick
+#: ../clutter/clutter-actor.c:6481
+msgid "Natural width set"
+msgstr "Nastavená prirodzená šírka"
+
+# blurb
+#: ../clutter/clutter-actor.c:6482
+msgid "Whether to use the natural-width property"
+msgstr "Určuje, či sa má použiť vlastnosť prirodzenej šírky"
+
+# nick
+#: ../clutter/clutter-actor.c:6496
+msgid "Natural height set"
+msgstr "Nastavená prirodzená výška"
+
+# blurb
+#: ../clutter/clutter-actor.c:6497
+msgid "Whether to use the natural-height property"
+msgstr "Určuje, či sa má použiť vlastnosť prirodzenej výšky"
+
+# PK: skor kolko miesta zaberie
+# PM: nemôžeš dvom vlastnostiam objektu dať rovnaký názov; Podla mna je to niečo ako vyhradený priestor, lebo to ako hodnotu očakáva súradnica lavého horného a pravého dolného rohu obdlznika
+# nick
+#: ../clutter/clutter-actor.c:6513
+msgid "Allocation"
+msgstr "Vyhradený priestor"
+
+# blurb
+#: ../clutter/clutter-actor.c:6514
+msgid "The actor's allocation"
+msgstr "Priestor vyhradený pre aktéra"
+
+# PM: Toto nastavenie očakáva výber spomedzi dvoch hodnot a to síce či sa má doplniť výška podľa šírky alebo šírka podľa výšky - nemyslím si že režim požiadaviek je správne
+# nick
+#: ../clutter/clutter-actor.c:6571
+#, fuzzy
+msgid "Request Mode"
+msgstr "Režim požiadaviek"
+
+# blurb
+#: ../clutter/clutter-actor.c:6572
+#, fuzzy
+msgid "The actor's request mode"
+msgstr "Režim požiadaviek objektu"
+
+# nick
+#: ../clutter/clutter-actor.c:6596
+msgid "Depth"
+msgstr "Hĺbka"
+
+# blurb
+#: ../clutter/clutter-actor.c:6597
+msgid "Position on the Z axis"
+msgstr "Pozícia na osi Z"
+
+# nick
+#: ../clutter/clutter-actor.c:6624
+msgid "Z Position"
+msgstr "Pozícia Z"
+
+# blurb
+#: ../clutter/clutter-actor.c:6625
+msgid "The actor's position on the Z axis"
+msgstr "Pozícia aktéra na osi Z"
+
+# nick
+#: ../clutter/clutter-actor.c:6642
+msgid "Opacity"
+msgstr "Krytie"
+
+# blurb
+#: ../clutter/clutter-actor.c:6643
+msgid "Opacity of an actor"
+msgstr "Krytie aktéra"
+
+# PM: je to na názov vlastnosti asi veľmi dlhé
+# PM: a podľa mna nejde o vykreslovanie mimo obrazovku ale mimo výsledný obraz, napr ked je cast objektu skrytá pod iným objektom
+# PM: očakáva to výber z dvoch hodnôt či sa to má použiť iba ak je plné krytie alebo sa to má použiť vždy
+# nick
+#: ../clutter/clutter-actor.c:6663
+msgid "Offscreen redirect"
+msgstr "Presmerovanie vykreslenia mimo obraz"
+
+# blurb
+#: ../clutter/clutter-actor.c:6664
+msgid "Flags controlling when to flatten the actor into a single image"
+msgstr "Príznaky určujúce, kedy sa má aktér zažehliť do jedného obrázka"
+
+# PM: true / false - viditeľný
+# nick
+#: ../clutter/clutter-actor.c:6678
+#, fuzzy
+msgid "Visible"
+msgstr "Viditeľnosť"
+
+# blurb
+#: ../clutter/clutter-actor.c:6679
+msgid "Whether the actor is visible or not"
+msgstr "Určuje, či je alebo nie je aktér viditeľný"
+
+# PK: toto je zle asi
+# PM: toto hovorí či sa má nakresliť súčasne so scénou, ku ktorej je priradený - ako to preložiť aby to bolo výstižné neviem
+# nick
+#: ../clutter/clutter-actor.c:6693
+#, fuzzy
+msgid "Mapped"
+msgstr "Zmapovaný"
+
+# blurb
+#: ../clutter/clutter-actor.c:6694
+msgid "Whether the actor will be painted"
+msgstr "Určuje, či sa aktér nakreslí"
+
+# nick
+#: ../clutter/clutter-actor.c:6707
+msgid "Realized"
+msgstr "Realizovaný"
+
+# blurb
+#: ../clutter/clutter-actor.c:6708
+msgid "Whether the actor has been realized"
+msgstr "Určuje, či bol aktér realizovaný"
+
+# nick
+#: ../clutter/clutter-actor.c:6723
+msgid "Reactive"
+msgstr "Reagujúci"
+
+# blurb
+#: ../clutter/clutter-actor.c:6724
+msgid "Whether the actor is reactive to events"
+msgstr "Určuje, či aktér reaguje na udalosti"
+
+# nick
+#: ../clutter/clutter-actor.c:6735
+msgid "Has Clip"
+msgstr "Má výrez"
+
+# blurb
+#: ../clutter/clutter-actor.c:6736
+msgid "Whether the actor has a clip set"
+msgstr "Určuje, či má aktér nastavený výrez"
+
+# nick
+#: ../clutter/clutter-actor.c:6749
+msgid "Clip"
+msgstr "Výrez"
+
+# blurb
+#: ../clutter/clutter-actor.c:6750
+msgid "The clip region for the actor"
+msgstr "Oblasť výrezu aktéra"
+
+# nick
+#: ../clutter/clutter-actor.c:6769
+msgid "Clip Rectangle"
+msgstr "Obdĺžnik výrezu"
+
+# blurb
+#: ../clutter/clutter-actor.c:6770
+msgid "The visible region of the actor"
+msgstr "Viditeľná oblasť aktéra"
+
+# nick
+#: ../clutter/clutter-actor.c:6784 ../clutter/clutter-actor-meta.c:205
+#: ../clutter/clutter-binding-pool.c:319 ../clutter/clutter-input-device.c:260
+msgid "Name"
+msgstr "Názov"
+
+# blurb
+#: ../clutter/clutter-actor.c:6785
+msgid "Name of the actor"
+msgstr "Názov aktéra"
+
+# nick
+#: ../clutter/clutter-actor.c:6806
+msgid "Pivot Point"
+msgstr "Stredový bod"
+
+# blurb
+#: ../clutter/clutter-actor.c:6807
+msgid "The point around which the scaling and rotation occur"
+msgstr "Bod, od ktorého sa odvíja zmena mierky a rotácia"
+
+# nick
+#: ../clutter/clutter-actor.c:6825
+msgid "Pivot Point Z"
+msgstr "Stredový bod na osi Z"
+
+# blurb
+#: ../clutter/clutter-actor.c:6826
+msgid "Z component of the pivot point"
+msgstr "Súradnica Z stredového bodu"
+
+# nick
+#: ../clutter/clutter-actor.c:6844
+msgid "Scale X"
+msgstr "Mierka X"
+
+# blurb
+#: ../clutter/clutter-actor.c:6845
+msgid "Scale factor on the X axis"
+msgstr "Mierka na osi X"
+
+# nick
+#: ../clutter/clutter-actor.c:6863
+msgid "Scale Y"
+msgstr "Mierka Y"
+
+# blurb
+#: ../clutter/clutter-actor.c:6864
+msgid "Scale factor on the Y axis"
+msgstr "Mierka na osi Y"
+
+# nick
+#: ../clutter/clutter-actor.c:6882
+msgid "Scale Z"
+msgstr "Mierka Z"
+
+# blurb
+#: ../clutter/clutter-actor.c:6883
+msgid "Scale factor on the Z axis"
+msgstr "Mierka na ose Z"
+
+# nick
+#: ../clutter/clutter-actor.c:6901
+msgid "Scale Center X"
+msgstr "Stred mierky X"
+
+# blurb
+#: ../clutter/clutter-actor.c:6902
+msgid "Horizontal scale center"
+msgstr "Stred pre vodorovnú zmenu mierky"
+
+# nick
+#: ../clutter/clutter-actor.c:6920
+msgid "Scale Center Y"
+msgstr "Stred mierky Y"
+
+# blurb
+#: ../clutter/clutter-actor.c:6921
+msgid "Vertical scale center"
+msgstr "Stred pre zvislú zmenu mierky"
+
+# nick
+#: ../clutter/clutter-actor.c:6939
+msgid "Scale Gravity"
+msgstr "Stredový bod mierky"
+
+# blurb
+#: ../clutter/clutter-actor.c:6940
+msgid "The center of scaling"
+msgstr "Stred zmeny mierky"
+
+# nick
+#: ../clutter/clutter-actor.c:6958
+msgid "Rotation Angle X"
+msgstr "Uhol rotácie X"
+
+# blurb
+#: ../clutter/clutter-actor.c:6959
+msgid "The rotation angle on the X axis"
+msgstr "Uhol rotácie vzhľadom na os X"
+
+# nick
+#: ../clutter/clutter-actor.c:6977
+msgid "Rotation Angle Y"
+msgstr "Uhol rotácie Y"
+
+# blurb
+#: ../clutter/clutter-actor.c:6978
+msgid "The rotation angle on the Y axis"
+msgstr "Uhol rotácie vzhľadom na os Y"
+
+# nick
+#: ../clutter/clutter-actor.c:6996
+msgid "Rotation Angle Z"
+msgstr "Uhol rotácie Z"
+
+# blurb
+#: ../clutter/clutter-actor.c:6997
+msgid "The rotation angle on the Z axis"
+msgstr "Uhol rotácie vzhľadom na os Z"
+
+# nick
+#: ../clutter/clutter-actor.c:7015
+msgid "Rotation Center X"
+msgstr "Stred rotácie X"
+
+# blurb
+#: ../clutter/clutter-actor.c:7016
+msgid "The rotation center on the X axis"
+msgstr "Stred rotácie na osi X"
+
+# nick
+#: ../clutter/clutter-actor.c:7033
+msgid "Rotation Center Y"
+msgstr "Stred rotácie Y"
+
+# blurb
+#: ../clutter/clutter-actor.c:7034
+msgid "The rotation center on the Y axis"
+msgstr "Stred rotácie na osi Y"
+
+# nick
+#: ../clutter/clutter-actor.c:7051
+msgid "Rotation Center Z"
+msgstr "Stred rotácie Z"
+
+# blurb
+#: ../clutter/clutter-actor.c:7052
+msgid "The rotation center on the Z axis"
+msgstr "Stred rotácie na osi Z"
+
+# nick
+#: ../clutter/clutter-actor.c:7069
+msgid "Rotation Center Z Gravity"
+msgstr "Stredový bod rotácie Z"
+
+# blurb
+#: ../clutter/clutter-actor.c:7070
+msgid "Center point for rotation around the Z axis"
+msgstr "Stredový bod rotácie okolo osi Z"
+
+# nick
+#: ../clutter/clutter-actor.c:7098
+msgid "Anchor X"
+msgstr "Kotva X"
+
+# blurb
+#: ../clutter/clutter-actor.c:7099
+msgid "X coordinate of the anchor point"
+msgstr "Súradnica X kotviaceho bodu"
+
+# nick
+#: ../clutter/clutter-actor.c:7127
+msgid "Anchor Y"
+msgstr "Kotva Y"
+
+# blurb
+#: ../clutter/clutter-actor.c:7128
+msgid "Y coordinate of the anchor point"
+msgstr "Súradnica Y kotviaceho bodu"
+
+# nick
+#: ../clutter/clutter-actor.c:7155
+msgid "Anchor Gravity"
+msgstr "Stredový bod pre ukotvenie"
+
+# blurb
+#: ../clutter/clutter-actor.c:7156
+msgid "The anchor point as a ClutterGravity"
+msgstr "Bod pre ukotvenie spôsobom ClutterGravity"
+
+# nick
+#: ../clutter/clutter-actor.c:7175
+msgid "Translation X"
+msgstr "Preklad X"
+
+# blurb
+#: ../clutter/clutter-actor.c:7176
+msgid "Translation along the X axis"
+msgstr "Preloženie pozdĺž osi X"
+
+# nick
+#: ../clutter/clutter-actor.c:7195
+msgid "Translation Y"
+msgstr "Preklad Y"
+
+# blurb
+#: ../clutter/clutter-actor.c:7196
+msgid "Translation along the Y axis"
+msgstr "Preloženie pozdĺž osi Y"
+
+# nick
+#: ../clutter/clutter-actor.c:7215
+msgid "Translation Z"
+msgstr "Preklad Z"
+
+# blurb
+#: ../clutter/clutter-actor.c:7216
+msgid "Translation along the Z axis"
+msgstr "Preloženie pozdĺž osi Z"
+
+# nick
+#: ../clutter/clutter-actor.c:7246
+msgid "Transform"
+msgstr "Transformácia"
+
+# blurb
+#: ../clutter/clutter-actor.c:7247
+msgid "Transformation matrix"
+msgstr "Transformačná matica"
+
+# nick
+#: ../clutter/clutter-actor.c:7262
+msgid "Transform Set"
+msgstr "Nastavená transformácia"
+
+# blurb
+#: ../clutter/clutter-actor.c:7263
+msgid "Whether the transform property is set"
+msgstr "Určuje, či je nastavená transformácia"
+
+# nick
+#: ../clutter/clutter-actor.c:7284
+msgid "Child Transform"
+msgstr "Transformácia potomkov"
+
+# blurb
+#: ../clutter/clutter-actor.c:7285
+msgid "Children transformation matrix"
+msgstr "Transformačná matica potomkov"
+
+# nick
+#: ../clutter/clutter-actor.c:7300
+msgid "Child Transform Set"
+msgstr "Nastavená transformácia potomkov"
+
+# blurb
+#: ../clutter/clutter-actor.c:7301
+msgid "Whether the child-transform property is set"
+msgstr "Určuje, či je nastavená transformácia potomkov"
+
+# nick
+#: ../clutter/clutter-actor.c:7318
+msgid "Show on set parent"
+msgstr "Zobraziť po nastavení za rodiča"
+
+# blurb
+#: ../clutter/clutter-actor.c:7319
+msgid "Whether the actor is shown when parented"
+msgstr "Určuje, či je aktér zobrazený pri nastavení za rodiča"
+
+# nick
+#: ../clutter/clutter-actor.c:7336
+msgid "Clip to Allocation"
+msgstr "Výrez podľa vyhradeného priestoru"
+
+# blurb
+#: ../clutter/clutter-actor.c:7337
+msgid "Sets the clip region to track the actor's allocation"
+msgstr "Nastaví oblasť výrezu podľa priestoru vyhradeného pre aktéra"
+
+# nick
+#: ../clutter/clutter-actor.c:7350
+msgid "Text Direction"
+msgstr "Smer textu"
+
+# blurb
+#: ../clutter/clutter-actor.c:7351
+msgid "Direction of the text"
+msgstr "Smer textu"
+
+# nick
+#: ../clutter/clutter-actor.c:7366
+msgid "Has Pointer"
+msgstr "Má ukazovateľ"
+
+# PK: asi ci je ukazovatel vstupneho zariadenia na objekte
+# PM: týmto sa myslí to, či obsahuje napr. kurzor myši
+# blurb
+#: ../clutter/clutter-actor.c:7367
+msgid "Whether the actor contains the pointer of an input device"
+msgstr "Určuje, či aktér obsahuje ukazovateľ vstupného zariadenia"
+
+# nick
+#: ../clutter/clutter-actor.c:7380
+msgid "Actions"
+msgstr "Akcie"
+
+# blurb
+#: ../clutter/clutter-actor.c:7381
+msgid "Adds an action to the actor"
+msgstr "Pridá akciu do aktéra"
+
+# PM: skôr by som to nazval zábrany viac to podľa mňa vystihuje podstatu
+# nick
+#: ../clutter/clutter-actor.c:7394
+msgid "Constraints"
+msgstr "Zábrany"
+
+# blurb
+#: ../clutter/clutter-actor.c:7395
+msgid "Adds a constraint to the actor"
+msgstr "Pridá zábrany do aktéra"
+
+# JK: Myslí sa zoznam efektov
+# PM: podľa vysvetlenia tomu tak nie je
+# nick
+#: ../clutter/clutter-actor.c:7408
+msgid "Effect"
+msgstr "Efekt"
+
+# blurb
+#: ../clutter/clutter-actor.c:7409
+msgid "Add an effect to be applied on the actor"
+msgstr "Pridá efekt, ktorý bude aplikovaný na aktéra"
+
+# nick
+#: ../clutter/clutter-actor.c:7423
+msgid "Layout Manager"
+msgstr "Správca rozloženia"
+
+# blurb
+#: ../clutter/clutter-actor.c:7424
+msgid "The object controlling the layout of an actor's children"
+msgstr "Objekt ovládajúci rozloženie potomka aktéra"
+
+# nick
+#: ../clutter/clutter-actor.c:7438
+msgid "X Expand"
+msgstr "Rozšíriť X"
+
+# blurb
+#: ../clutter/clutter-actor.c:7439
+msgid "Whether extra horizontal space should be assigned to the actor"
+msgstr ""
+"Určuje, či sa má aktérovi priradiť dodatočný priestor vo vodorovnom smere"
+
+# nick
+#: ../clutter/clutter-actor.c:7454
+msgid "Y Expand"
+msgstr "Rozšíriť Y"
+
+# blurb
+#: ../clutter/clutter-actor.c:7455
+msgid "Whether extra vertical space should be assigned to the actor"
+msgstr "Určuje, či sa má aktérovi priradiť dodatočný priestor v zvislom smere"
+
+# PM: nemyslím že "podľa" ale "v smere"
+# nick
+#: ../clutter/clutter-actor.c:7471
+msgid "X Alignment"
+msgstr "Zarovnanie v smere X"
+
+# PK: to umiestnenie prever
+# blurb
+#: ../clutter/clutter-actor.c:7472
+msgid "The alignment of the actor on the X axis within its allocation"
+msgstr "Zarovnanie aktéra podľa osi X v rámci jeho vyhradeného priestoru"
+
+# nick
+#: ../clutter/clutter-actor.c:7487
+msgid "Y Alignment"
+msgstr "Zarovnanie v smere Y"
+
+# blurb
+#: ../clutter/clutter-actor.c:7488
+msgid "The alignment of the actor on the Y axis within its allocation"
+msgstr "Zarovnanie aktéra podľa osi Y v rámci jeho vyhradeného priestoru"
+
+# nick
+#: ../clutter/clutter-actor.c:7507
+msgid "Margin Top"
+msgstr "Horný okraj"
+
+# blurb
+#: ../clutter/clutter-actor.c:7508
+msgid "Extra space at the top"
+msgstr "Dodatočný priestor navrchu"
+
+# nick
+#: ../clutter/clutter-actor.c:7529
+msgid "Margin Bottom"
+msgstr "Dolný okraj"
+
+# blurb
+#: ../clutter/clutter-actor.c:7530
+msgid "Extra space at the bottom"
+msgstr "Dodatočný priestor dole"
+
+# nick
+#: ../clutter/clutter-actor.c:7551
+msgid "Margin Left"
+msgstr "Ľavý okraj"
+
+# blurb
+#: ../clutter/clutter-actor.c:7552
+msgid "Extra space at the left"
+msgstr "Dodatočný priestor naľavo"
+
+# nick
+#: ../clutter/clutter-actor.c:7573
+msgid "Margin Right"
+msgstr "Pravý okraj"
+
+# blurb
+#: ../clutter/clutter-actor.c:7574
+msgid "Extra space at the right"
+msgstr "Dodatočný priestor napravo"
+
+# nick
+#: ../clutter/clutter-actor.c:7590
+msgid "Background Color Set"
+msgstr "Nastavená farba pozadia"
+
+# blurb
+#: ../clutter/clutter-actor.c:7591 ../clutter/deprecated/clutter-box.c:271
+msgid "Whether the background color is set"
+msgstr "Určuje, či je farba pozadia nastavená"
+
+# nick
+#: ../clutter/clutter-actor.c:7607
+msgid "Background color"
+msgstr "Farba pozadia"
+
+# blurb
+#: ../clutter/clutter-actor.c:7608
+msgid "The actor's background color"
+msgstr "Farba pozadia aktéra"
+
+# nick
+#: ../clutter/clutter-actor.c:7623
+msgid "First Child"
+msgstr "Prvý potomok"
+
+# blurb
+#: ../clutter/clutter-actor.c:7624
+msgid "The actor's first child"
+msgstr "Prvý potomok aktéra"
+
+# nick
+#: ../clutter/clutter-actor.c:7637
+msgid "Last Child"
+msgstr "Posledný potomok"
+
+# blurb
+#: ../clutter/clutter-actor.c:7638
+msgid "The actor's last child"
+msgstr "Posledný potomok aktéra"
+
+# nick
+#: ../clutter/clutter-actor.c:7652
+msgid "Content"
+msgstr "Obsah"
+
+# blurb
+#: ../clutter/clutter-actor.c:7653
+msgid "Delegate object for painting the actor's content"
+msgstr "Poverí objekt kreslením obsahu aktéra"
+
+# PK: co robi toto?
+# PM: blurb to dostatocne popisuje nastavuje to zarovnanie "obsahu" (vid content) v allocation
+# nick
+#: ../clutter/clutter-actor.c:7678
+msgid "Content Gravity"
+msgstr "Bod v strede obsahu"
+
+# blurb
+#: ../clutter/clutter-actor.c:7679
+msgid "Alignment of the actor's content"
+msgstr "Zarovnanie obsahu aktéra"
+
+# PM: ovláda to pozíciu a velkost "obsahu"(vid content) v actor's allocation
+# nick
+#: ../clutter/clutter-actor.c:7699
+msgid "Content Box"
+msgstr "Schránka obsahu"
+
+# blurb
+#: ../clutter/clutter-actor.c:7700
+msgid "The bounding box of the actor's content"
+msgstr "Schránka ohraničujúca obsah aktéra"
+
+# nick
+#: ../clutter/clutter-actor.c:7708
+msgid "Minification Filter"
+msgstr "Zmenšujúci filter"
+
+# blurb
+#: ../clutter/clutter-actor.c:7709
+msgid "The filter used when reducing the size of the content"
+msgstr "Filter používaný na zmenšenie veľkosti obsahu"
+
+# nick
+#: ../clutter/clutter-actor.c:7716
+msgid "Magnification Filter"
+msgstr "Zväčšujúci filter"
+
+# blurb
+#: ../clutter/clutter-actor.c:7717
+msgid "The filter used when increasing the size of the content"
+msgstr "Filter používaný na zväčšenie veľkosti obsahu"
+
+# nick
+#: ../clutter/clutter-actor.c:7731
+msgid "Content Repeat"
+msgstr "Opakovanie obsahu"
+
+# PM: v iných moduloch tuším politika - treba preveriť
+# blurb
+#: ../clutter/clutter-actor.c:7732
+msgid "The repeat policy for the actor's content"
+msgstr "Stratégia opakovania obsahu aktéra"
+
+# nick
+#: ../clutter/clutter-actor-meta.c:191 ../clutter/clutter-child-meta.c:142
+msgid "Actor"
+msgstr "Aktér"
+
+# JK: Možno by bolo vhodné nahradiť meta za meta údaje alebo štruktúru. Podľa dokumentácie sa to týka triedy ClutterActorMeta, ktorá poskytuje spoločné API pre správanie, vzhľad a rozloženie objektov ClutterActor.
+# blurb
+#: ../clutter/clutter-actor-meta.c:192
+msgid "The actor attached to the meta"
+msgstr "Aktér pripojený k meta údajom"
+
+# nick
+#: ../clutter/clutter-actor-meta.c:206
+msgid "The name of the meta"
+msgstr "Názov meta údajov"
+
+# JK: Povolené meta údaje
+# nick
+#: ../clutter/clutter-actor-meta.c:219 ../clutter/clutter-input-device.c:339
+#: ../clutter/deprecated/clutter-shader.c:309
+msgid "Enabled"
+msgstr "Povolené"
+
+# blurb
+#: ../clutter/clutter-actor-meta.c:220
+msgid "Whether the meta is enabled"
+msgstr "Určuje, či sú meta údaje povolené"
+
+# nick
+#: ../clutter/clutter-align-constraint.c:279
+#: ../clutter/clutter-bind-constraint.c:358 ../clutter/clutter-clone.c:341
+#: ../clutter/clutter-snap-constraint.c:321
+msgid "Source"
+msgstr "Zdroj"
+
+# blurb
+#: ../clutter/clutter-align-constraint.c:280
+msgid "The source of the alignment"
+msgstr "Zdroj pre zarovnanie"
+
+# PM  tu to očakáva jednu z položiek x,y,obe  - takže asi osi zarovnania
+# nick
+#: ../clutter/clutter-align-constraint.c:293
+msgid "Align Axis"
+msgstr "Osi zarovnania"
+
+# blurb
+#: ../clutter/clutter-align-constraint.c:294
+msgid "The axis to align the position to"
+msgstr "Osi, podľa ktorých sa má zarovnať"
+
+# nick
+#: ../clutter/clutter-align-constraint.c:313
+#: ../clutter/clutter-desaturate-effect.c:270
+msgid "Factor"
+msgstr "Faktor"
+
+# blurb
+#: ../clutter/clutter-align-constraint.c:314
+msgid "The alignment factor, between 0.0 and 1.0"
+msgstr "Faktor zarovnania v rozmedzí 0.0 až 1.0"
+
+# PM: asi pre Clutter/ knižnice Clutter
+#: ../clutter/clutter-backend.c:380
+msgid "Unable to initialize the Clutter backend"
+msgstr "Nepodarilo sa inicializovať obslužný program knižnice Clutter"
+
+#: ../clutter/clutter-backend.c:454
+#, c-format
+msgid "The backend of type '%s' does not support creating multiple stages"
+msgstr "Obslužný program typu „%s“ nepodporuje tvorbu viacerých scén"
+
+# blurb
+#: ../clutter/clutter-bind-constraint.c:359
+msgid "The source of the binding"
+msgstr "Zdroj väzby"
+
+# PM: tu to očakáva výber spomedzi hodnot, x, y, width, height, position, size, all
+# PM: takže to nie sú súradnice, je to niečo iné (neviem ako to nazvať) ale v jednotnom čísle
+# nick
+#: ../clutter/clutter-bind-constraint.c:372
+msgid "Coordinate"
+msgstr "Súradnica"
+
+# blurb
+#: ../clutter/clutter-bind-constraint.c:373
+msgid "The coordinate to bind"
+msgstr "Súradnica, na ktorú sa má viazať"
+
+# nick
+#: ../clutter/clutter-bind-constraint.c:387
+#: ../clutter/clutter-path-constraint.c:226
+#: ../clutter/clutter-snap-constraint.c:366
+msgid "Offset"
+msgstr "Posun"
+
+# PM: zvažujem, či "na" vystihuje význam, ja to chápem tak že je to vzdialenost od coordinátu zdroja ku ktorému je actor viazaný
+# blurb
+#: ../clutter/clutter-bind-constraint.c:388
+msgid "The offset in pixels to apply to the binding"
+msgstr "Posun vyjadrený v pixeloch, ktorý sa má použiť pri väzbe"
+
+# JK: BindingPool je dátová štruktúra, ktorá uchováva klávesové skratky a akcie s nimi spojené
+# blurb
+#: ../clutter/clutter-binding-pool.c:320
+msgid "The unique name of the binding pool"
+msgstr "Jedinečný názov skupiny klávesových skratiek"
+
+# nick
+#: ../clutter/clutter-bin-layout.c:238 ../clutter/clutter-bin-layout.c:651
+#: ../clutter/clutter-box-layout.c:388 ../clutter/clutter-table-layout.c:604
+msgid "Horizontal Alignment"
+msgstr "Vodorovné zarovnanie"
+
+# blurb
+#: ../clutter/clutter-bin-layout.c:239
+msgid "Horizontal alignment for the actor inside the layout manager"
+msgstr "Vodorovné zarovnanie pre aktéra v rámci správcu rozloženia"
+
+# nick
+#: ../clutter/clutter-bin-layout.c:247 ../clutter/clutter-bin-layout.c:671
+#: ../clutter/clutter-box-layout.c:397 ../clutter/clutter-table-layout.c:619
+msgid "Vertical Alignment"
+msgstr "Zvislé zarovnanie"
+
+# JK: Zvazujem, ci by nebolo vhodnejsie "Zvislé zarovnanie aktéra..."
+# blurb
+#: ../clutter/clutter-bin-layout.c:248
+msgid "Vertical alignment for the actor inside the layout manager"
+msgstr "Zvislé zarovnanie pre aktéra v rámci správcu rozloženia"
+
+# blurb
+#: ../clutter/clutter-bin-layout.c:652
+msgid "Default horizontal alignment for the actors inside the layout manager"
+msgstr "Predvolené vodorovné zarovnanie pre aktéra v rámci správcu rozloženia"
+
+# blurb
+#: ../clutter/clutter-bin-layout.c:672
+msgid "Default vertical alignment for the actors inside the layout manager"
+msgstr "Predvolené zvislé zarovnanie pre aktéra v rámci správcu rozloženia"
+
+# PM: true/false - asi treba preložiť rovnakým štýlom ako horizontal a verical fill
+# nick
+#: ../clutter/clutter-box-layout.c:363
+msgid "Expand"
+msgstr "Rozšíriť"
+
+# PK: rezervovat dodatocny priestor
+# PM: hmm, prečo aj tu nie je určuje či sa má... - Skús sa opýtať vývojárov
+# blurb
+#: ../clutter/clutter-box-layout.c:364
+#, fuzzy
+msgid "Allocate extra space for the child"
+msgstr "Rezervovať dodatočný priestor pre potomka"
+
+# true/false
+# nick
+#: ../clutter/clutter-box-layout.c:370 ../clutter/clutter-table-layout.c:583
+msgid "Horizontal Fill"
+msgstr "Vodorovné vyplnenie"
+
+# blurb
+#: ../clutter/clutter-box-layout.c:371 ../clutter/clutter-table-layout.c:584
+msgid ""
+"Whether the child should receive priority when the container is allocating "
+"spare space on the horizontal axis"
+msgstr ""
+"Určuje, či by mal potomok získať vyššiu prioritu v prípade, že kontajner "
+"rezervuje nadbytočné miesto v smere vodorovnej osi"
+
+# true/false
+# nick
+#: ../clutter/clutter-box-layout.c:379 ../clutter/clutter-table-layout.c:590
+msgid "Vertical Fill"
+msgstr "Zvislé vyplnenie"
+
+# blurb
+#: ../clutter/clutter-box-layout.c:380 ../clutter/clutter-table-layout.c:591
+msgid ""
+"Whether the child should receive priority when the container is allocating "
+"spare space on the vertical axis"
+msgstr ""
+"Určuje, či by mal potomok získať vyššiu prioritu v prípade, že kontajner "
+"rezervuje nadbytočné miesto v smere zvislej osi"
+
+# blurb
+#: ../clutter/clutter-box-layout.c:389 ../clutter/clutter-table-layout.c:605
+msgid "Horizontal alignment of the actor within the cell"
+msgstr "Vodorovné zarovnanie aktéra v rámci bunky"
+
+# blurb
+#: ../clutter/clutter-box-layout.c:398 ../clutter/clutter-table-layout.c:620
+msgid "Vertical alignment of the actor within the cell"
+msgstr "Zvislé zarovnanie aktéra v rámci bunky"
+
+# true/false
+# nick
+#: ../clutter/clutter-box-layout.c:1359
+msgid "Vertical"
+msgstr "Zvislé"
+
+# blurb
+#: ../clutter/clutter-box-layout.c:1360
+msgid "Whether the layout should be vertical, rather than horizontal"
+msgstr "Určuje, či sa má uprednostniť zvislé rozloženie pred vodorovným"
+
+# nick
+#: ../clutter/clutter-box-layout.c:1377 ../clutter/clutter-flow-layout.c:942
+#: ../clutter/clutter-grid-layout.c:1549
+msgid "Orientation"
+msgstr "Orientácia"
+
+# blurb
+#: ../clutter/clutter-box-layout.c:1378 ../clutter/clutter-flow-layout.c:943
+#: ../clutter/clutter-grid-layout.c:1550
+msgid "The orientation of the layout"
+msgstr "Orientácia rozloženia"
+
+# nick
+#: ../clutter/clutter-box-layout.c:1394 ../clutter/clutter-flow-layout.c:958
+msgid "Homogeneous"
+msgstr "Homogénne"
+
+# blurb
+#: ../clutter/clutter-box-layout.c:1395
+msgid ""
+"Whether the layout should be homogeneous, i.e. all childs get the same size"
+msgstr ""
+"Určuje, či má byť rozloženie homogénne, napr. všetci potomkovia budú mať "
+"rovnakú veľkosť"
+
+# PK: podla mna skor ze sa to prida na zaciatok, aspon co kodim v clutteri (bude to deprecated v blizkej dobe)
+# PM: ano ako vravi Palo je to že či má byť pribalený na začiatok
+# true/false
+# nick
+#: ../clutter/clutter-box-layout.c:1410
+msgid "Pack Start"
+msgstr "Pribaliť na začiatok"
+
+# blurb
+#: ../clutter/clutter-box-layout.c:1411
+msgid "Whether to pack items at the start of the box"
+msgstr "Určuje, či pribaliť položky na začiatok schránky"
+
+# nick
+#: ../clutter/clutter-box-layout.c:1424
+msgid "Spacing"
+msgstr "Rozostup"
+
+# blurb
+#: ../clutter/clutter-box-layout.c:1425
+msgid "Spacing between children"
+msgstr "Rozostup medzi potomkami"
+
+# true/false
+# nick
+#: ../clutter/clutter-box-layout.c:1442 ../clutter/clutter-table-layout.c:1667
+msgid "Use Animations"
+msgstr "Použiť animácie"
+
+# blurb
+#: ../clutter/clutter-box-layout.c:1443 ../clutter/clutter-table-layout.c:1668
+msgid "Whether layout changes should be animated"
+msgstr "Určuje, či majú byť zmeny v rozložení animované"
+
+# PK: rezim zmiernenia, ja neviem, ale je to proste ze sa prechadza z A do B
+# PM: je to režim "zjemnenia" animovania
+# nick
+#: ../clutter/clutter-box-layout.c:1467 ../clutter/clutter-table-layout.c:1692
+msgid "Easing Mode"
+msgstr "Režim zjemnenia animovania"
+
+# blurb
+#: ../clutter/clutter-box-layout.c:1468 ../clutter/clutter-table-layout.c:1693
+msgid "The easing mode of the animations"
+msgstr "Režim zjemnenia animovania animácií"
+
+# nick
+#: ../clutter/clutter-box-layout.c:1488 ../clutter/clutter-table-layout.c:1713
+msgid "Easing Duration"
+msgstr "Trvanie zjemnenia"
+
+# blurb
+#: ../clutter/clutter-box-layout.c:1489 ../clutter/clutter-table-layout.c:1714
+msgid "The duration of the animations"
+msgstr "Trvanie zjemnenia animácií"
+
+# nick
+#: ../clutter/clutter-brightness-contrast-effect.c:321
+msgid "Brightness"
+msgstr "Jas"
+
+# blurb
+#: ../clutter/clutter-brightness-contrast-effect.c:322
+msgid "The brightness change to apply"
+msgstr "Zmena jasu, ktorá sa má použiť"
+
+# nick
+#: ../clutter/clutter-brightness-contrast-effect.c:341
+msgid "Contrast"
+msgstr "Kontrast"
+
+# blurb
+#: ../clutter/clutter-brightness-contrast-effect.c:342
+msgid "The contrast change to apply"
+msgstr "Zmena kontrastu, ktorá sa má použiť"
+
+# blurb
+#: ../clutter/clutter-canvas.c:225
+msgid "The width of the canvas"
+msgstr "Šírka plátna"
+
+# blurb
+#: ../clutter/clutter-canvas.c:241
+msgid "The height of the canvas"
+msgstr "Výška plátna"
+
+# nick
+#: ../clutter/clutter-child-meta.c:127
+msgid "Container"
+msgstr "Kontajner"
+
+# blurb
+#: ../clutter/clutter-child-meta.c:128
+msgid "The container that created this data"
+msgstr "Kontajner, ktorý vytvoril tieto dáta"
+
+# PM: skôr obalený
+# blurb
+#: ../clutter/clutter-child-meta.c:143
+msgid "The actor wrapped by this data"
+msgstr "Aktér obalený týmito dátami"
+
+#: ../clutter/clutter-click-action.c:586
+msgid "Pressed"
+msgstr ""
+
+#: ../clutter/clutter-click-action.c:587
+msgid "Whether the clickable should be in pressed state"
+msgstr ""
+
+#: ../clutter/clutter-click-action.c:600
+msgid "Held"
+msgstr ""
+
+#: ../clutter/clutter-click-action.c:601
+msgid "Whether the clickable has a grab"
+msgstr ""
+
+#: ../clutter/clutter-click-action.c:618 ../clutter/clutter-settings.c:607
+msgid "Long Press Duration"
+msgstr ""
+
+#: ../clutter/clutter-click-action.c:619
+msgid "The minimum duration of a long press to recognize the gesture"
+msgstr ""
+
+#: ../clutter/clutter-click-action.c:637
+msgid "Long Press Threshold"
+msgstr ""
+
+#: ../clutter/clutter-click-action.c:638
+msgid "The maximum threshold before a long press is cancelled"
+msgstr ""
+
+#: ../clutter/clutter-clone.c:342
+msgid "Specifies the actor to be cloned"
+msgstr ""
+
+#: ../clutter/clutter-colorize-effect.c:251
+msgid "Tint"
+msgstr ""
+
+#: ../clutter/clutter-colorize-effect.c:252
+msgid "The tint to apply"
+msgstr ""
+
+#: ../clutter/clutter-deform-effect.c:592
+msgid "Horizontal Tiles"
+msgstr ""
+
+#: ../clutter/clutter-deform-effect.c:593
+msgid "The number of horizontal tiles"
+msgstr ""
+
+#: ../clutter/clutter-deform-effect.c:608
+msgid "Vertical Tiles"
+msgstr ""
+
+#: ../clutter/clutter-deform-effect.c:609
+msgid "The number of vertical tiles"
+msgstr ""
+
+#: ../clutter/clutter-deform-effect.c:626
+msgid "Back Material"
+msgstr ""
+
+#: ../clutter/clutter-deform-effect.c:627
+msgid "The material to be used when painting the back of the actor"
+msgstr ""
+
+#: ../clutter/clutter-desaturate-effect.c:271
+msgid "The desaturation factor"
+msgstr ""
+
+#: ../clutter/clutter-device-manager.c:127
+#: ../clutter/clutter-input-device.c:368
+#: ../clutter/x11/clutter-keymap-x11.c:321
+msgid "Backend"
+msgstr "Obslužný program"
+
+#: ../clutter/clutter-device-manager.c:128
+msgid "The ClutterBackend of the device manager"
+msgstr "ClutterBackend správcu zariadení"
+
+#: ../clutter/clutter-drag-action.c:740
+msgid "Horizontal Drag Threshold"
+msgstr ""
+
+#: ../clutter/clutter-drag-action.c:741
+msgid "The horizontal amount of pixels required to start dragging"
+msgstr ""
+
+#: ../clutter/clutter-drag-action.c:768
+msgid "Vertical Drag Threshold"
+msgstr ""
+
+#: ../clutter/clutter-drag-action.c:769
+msgid "The vertical amount of pixels required to start dragging"
+msgstr ""
+
+#: ../clutter/clutter-drag-action.c:790
+msgid "Drag Handle"
+msgstr ""
+
+#: ../clutter/clutter-drag-action.c:791
+msgid "The actor that is being dragged"
+msgstr ""
+
+#: ../clutter/clutter-drag-action.c:804
+msgid "Drag Axis"
+msgstr ""
+
+#: ../clutter/clutter-drag-action.c:805
+msgid "Constraints the dragging to an axis"
+msgstr ""
+
+#: ../clutter/clutter-drag-action.c:821
+msgid "Drag Area"
+msgstr ""
+
+#: ../clutter/clutter-drag-action.c:822
+msgid "Constrains the dragging to a rectangle"
+msgstr ""
+
+#: ../clutter/clutter-drag-action.c:835
+msgid "Drag Area Set"
+msgstr ""
+
+#: ../clutter/clutter-drag-action.c:836
+msgid "Whether the drag area is set"
+msgstr ""
+
+#: ../clutter/clutter-flow-layout.c:959
+msgid "Whether each item should receive the same allocation"
+msgstr ""
+
+#: ../clutter/clutter-flow-layout.c:974 ../clutter/clutter-table-layout.c:1629
+msgid "Column Spacing"
+msgstr ""
+
+#: ../clutter/clutter-flow-layout.c:975
+msgid "The spacing between columns"
+msgstr ""
+
+#: ../clutter/clutter-flow-layout.c:991 ../clutter/clutter-table-layout.c:1643
+msgid "Row Spacing"
+msgstr ""
+
+#: ../clutter/clutter-flow-layout.c:992
+msgid "The spacing between rows"
+msgstr ""
+
+#: ../clutter/clutter-flow-layout.c:1006
+msgid "Minimum Column Width"
+msgstr "Minimálna šírka stĺpca"
+
+#: ../clutter/clutter-flow-layout.c:1007
+msgid "Minimum width for each column"
+msgstr "Minimálna šírka každého stĺpca"
+
+#: ../clutter/clutter-flow-layout.c:1022
+msgid "Maximum Column Width"
+msgstr "Maximálna šírka stĺpca"
+
+#: ../clutter/clutter-flow-layout.c:1023
+msgid "Maximum width for each column"
+msgstr "Maximálna šírka každého stĺpca"
+
+#: ../clutter/clutter-flow-layout.c:1037
+msgid "Minimum Row Height"
+msgstr "Minimálna výška riadka"
+
+#: ../clutter/clutter-flow-layout.c:1038
+msgid "Minimum height for each row"
+msgstr "Minimálna výška každého riadka"
+
+#: ../clutter/clutter-flow-layout.c:1053
+msgid "Maximum Row Height"
+msgstr "Maximálna výška riadka"
+
+#: ../clutter/clutter-flow-layout.c:1054
+msgid "Maximum height for each row"
+msgstr "Maximálna výška každého riadka"
+
+# PM: treba rozdeliť aby sa dal popis preložiť inak 
+# PM: neviem či by nebolo vhodnejšie prichytávať k mriežke
+# Whether the layout should place its children on a grid. 
+#: ../clutter/clutter-flow-layout.c:1069 ../clutter/clutter-flow-layout.c:1070
+#, fuzzy
+msgid "Snap to grid"
+msgstr "Prichytiť k mriežke"
+
+#: ../clutter/clutter-gesture-action.c:646
+msgid "Number touch points"
+msgstr "Počet dotykových bodov"
+
+#: ../clutter/clutter-gesture-action.c:647
+msgid "Number of touch points"
+msgstr "Počet dotykových bodov"
+
+#: ../clutter/clutter-grid-layout.c:1223
+msgid "Left attachment"
+msgstr ""
+
+#: ../clutter/clutter-grid-layout.c:1224
+msgid "The column number to attach the left side of the child to"
+msgstr ""
+
+#: ../clutter/clutter-grid-layout.c:1231
+msgid "Top attachment"
+msgstr ""
+
+#: ../clutter/clutter-grid-layout.c:1232
+msgid "The row number to attach the top side of a child widget to"
+msgstr ""
+
+#: ../clutter/clutter-grid-layout.c:1240
+msgid "The number of columns that a child spans"
+msgstr ""
+
+#: ../clutter/clutter-grid-layout.c:1247
+msgid "The number of rows that a child spans"
+msgstr ""
+
+#: ../clutter/clutter-grid-layout.c:1564
+msgid "Row spacing"
+msgstr ""
+
+#: ../clutter/clutter-grid-layout.c:1565
+msgid "The amount of space between two consecutive rows"
+msgstr ""
+
+#: ../clutter/clutter-grid-layout.c:1578
+msgid "Column spacing"
+msgstr ""
+
+#: ../clutter/clutter-grid-layout.c:1579
+msgid "The amount of space between two consecutive columns"
+msgstr ""
+
+#: ../clutter/clutter-grid-layout.c:1593
+msgid "Row Homogeneous"
+msgstr ""
+
+#: ../clutter/clutter-grid-layout.c:1594
+msgid "If TRUE, the rows are all the same height"
+msgstr ""
+
+#: ../clutter/clutter-grid-layout.c:1607
+msgid "Column Homogeneous"
+msgstr ""
+
+#: ../clutter/clutter-grid-layout.c:1608
+msgid "If TRUE, the columns are all the same width"
+msgstr ""
+
+#: ../clutter/clutter-image.c:246 ../clutter/clutter-image.c:309
+#: ../clutter/clutter-image.c:397
+msgid "Unable to load image data"
+msgstr "Nepodarilo sa načítať údaje obrázka"
+
+#: ../clutter/clutter-input-device.c:244
+msgid "Id"
+msgstr "Identifikátor"
+
+#: ../clutter/clutter-input-device.c:245
+msgid "Unique identifier of the device"
+msgstr "Jedinečný identifikátor zariadenia"
+
+#: ../clutter/clutter-input-device.c:261
+msgid "The name of the device"
+msgstr "Názov zariadenia"
+
+#: ../clutter/clutter-input-device.c:275
+msgid "Device Type"
+msgstr "Typ zariadenia"
+
+#: ../clutter/clutter-input-device.c:276
+msgid "The type of the device"
+msgstr "Typ zariadenia"
+
+#: ../clutter/clutter-input-device.c:291
+msgid "Device Manager"
+msgstr "Správca zariadení"
+
+#: ../clutter/clutter-input-device.c:292
+msgid "The device manager instance"
+msgstr "Inštancia správcu zariadení"
+
+#: ../clutter/clutter-input-device.c:305
+msgid "Device Mode"
+msgstr "Režim zariadenia"
+
+#: ../clutter/clutter-input-device.c:306
+msgid "The mode of the device"
+msgstr "Režim zariadenia"
+
+#: ../clutter/clutter-input-device.c:320
+msgid "Has Cursor"
+msgstr "Má kurzor"
+
+#: ../clutter/clutter-input-device.c:321
+msgid "Whether the device has a cursor"
+msgstr "Určuje, či má zariadenie kurzor"
+
+#: ../clutter/clutter-input-device.c:340
+msgid "Whether the device is enabled"
+msgstr "Určuje, či je zariadenie povolené"
+
+#: ../clutter/clutter-input-device.c:353
+msgid "Number of Axes"
+msgstr "Počet osí"
+
+#: ../clutter/clutter-input-device.c:354
+msgid "The number of axes on the device"
+msgstr "Počet osí na zariadení"
+
+#: ../clutter/clutter-input-device.c:369
+msgid "The backend instance"
+msgstr "Inštancia obslužného programu"
+
+#: ../clutter/clutter-interval.c:503
+msgid "Value Type"
+msgstr "Typ hodnoty"
+
+#: ../clutter/clutter-interval.c:504
+msgid "The type of the values in the interval"
+msgstr ""
+
+#: ../clutter/clutter-interval.c:519
+msgid "Initial Value"
+msgstr ""
+
+#: ../clutter/clutter-interval.c:520
+msgid "Initial value of the interval"
+msgstr ""
+
+#: ../clutter/clutter-interval.c:534
+msgid "Final Value"
+msgstr ""
+
+#: ../clutter/clutter-interval.c:535
+msgid "Final value of the interval"
+msgstr ""
+
+#: ../clutter/clutter-layout-meta.c:117
+msgid "Manager"
+msgstr ""
+
+#: ../clutter/clutter-layout-meta.c:118
+msgid "The manager that created this data"
+msgstr ""
+
+#. Translators: Leave this UNTRANSLATED if your language is
+#. * left-to-right.  If your language is right-to-left
+#. * (e.g. Hebrew, Arabic), translate it to "default:RTL".
+#. *
+#. * Do NOT translate it to non-English e.g. "predefinito:LTR"! If
+#. * it isn't default:LTR or default:RTL it will not work.
+#.
+#: ../clutter/clutter-main.c:795
+msgid "default:LTR"
+msgstr ""
+
+#: ../clutter/clutter-main.c:1622
+msgid "Show frames per second"
+msgstr ""
+
+#: ../clutter/clutter-main.c:1624
+msgid "Default frame rate"
+msgstr ""
+
+#: ../clutter/clutter-main.c:1626
+msgid "Make all warnings fatal"
+msgstr ""
+
+#: ../clutter/clutter-main.c:1629
+msgid "Direction for the text"
+msgstr ""
+
+#: ../clutter/clutter-main.c:1632
+msgid "Disable mipmapping on text"
+msgstr ""
+
+#: ../clutter/clutter-main.c:1635
+msgid "Use 'fuzzy' picking"
+msgstr ""
+
+#: ../clutter/clutter-main.c:1638
+msgid "Clutter debugging flags to set"
+msgstr ""
+
+#: ../clutter/clutter-main.c:1640
+msgid "Clutter debugging flags to unset"
+msgstr ""
+
+#: ../clutter/clutter-main.c:1644
+msgid "Clutter profiling flags to set"
+msgstr ""
+
+#: ../clutter/clutter-main.c:1646
+msgid "Clutter profiling flags to unset"
+msgstr ""
+
+#: ../clutter/clutter-main.c:1649
+msgid "Enable accessibility"
+msgstr ""
+
+#: ../clutter/clutter-main.c:1841
+msgid "Clutter Options"
+msgstr ""
+
+#: ../clutter/clutter-main.c:1842
+msgid "Show Clutter Options"
+msgstr ""
+
+#: ../clutter/clutter-pan-action.c:445
+msgid "Pan Axis"
+msgstr ""
+
+#: ../clutter/clutter-pan-action.c:446
+msgid "Constraints the panning to an axis"
+msgstr ""
+
+#: ../clutter/clutter-pan-action.c:460
+msgid "Interpolate"
+msgstr ""
+
+#: ../clutter/clutter-pan-action.c:461
+msgid "Whether interpolated events emission is enabled."
+msgstr ""
+
+#: ../clutter/clutter-pan-action.c:477
+msgid "Deceleration"
+msgstr ""
+
+#: ../clutter/clutter-pan-action.c:478
+msgid "Rate at which the interpolated panning will decelerate in"
+msgstr ""
+
+#: ../clutter/clutter-pan-action.c:495
+msgid "Initial acceleration factor"
+msgstr ""
+
+#: ../clutter/clutter-pan-action.c:496
+msgid "Factor applied to the momentum when starting the interpolated phase"
+msgstr ""
+
+#: ../clutter/clutter-path-constraint.c:212
+#: ../clutter/deprecated/clutter-behaviour-path.c:221
+msgid "Path"
+msgstr ""
+
+#: ../clutter/clutter-path-constraint.c:213
+msgid "The path used to constrain an actor"
+msgstr ""
+
+#: ../clutter/clutter-path-constraint.c:227
+msgid "The offset along the path, between -1.0 and 2.0"
+msgstr ""
+
+#: ../clutter/clutter-property-transition.c:269
+msgid "Property Name"
+msgstr ""
+
+#: ../clutter/clutter-property-transition.c:270
+msgid "The name of the property to animate"
+msgstr ""
+
+#: ../clutter/clutter-script.c:464
+msgid "Filename Set"
+msgstr ""
+
+#: ../clutter/clutter-script.c:465
+msgid "Whether the :filename property is set"
+msgstr ""
+
+#: ../clutter/clutter-script.c:479
+#: ../clutter/deprecated/clutter-texture.c:1080
+msgid "Filename"
+msgstr ""
+
+#: ../clutter/clutter-script.c:480
+msgid "The path of the currently parsed file"
+msgstr ""
+
+#: ../clutter/clutter-script.c:497
+msgid "Translation Domain"
+msgstr ""
+
+#: ../clutter/clutter-script.c:498
+msgid "The translation domain used to localize string"
+msgstr ""
+
+#: ../clutter/clutter-scroll-actor.c:189
+msgid "Scroll Mode"
+msgstr ""
+
+#: ../clutter/clutter-scroll-actor.c:190
+msgid "The scrolling direction"
+msgstr ""
+
+#: ../clutter/clutter-settings.c:448
+msgid "Double Click Time"
+msgstr ""
+
+#: ../clutter/clutter-settings.c:449
+msgid "The time between clicks necessary to detect a multiple click"
+msgstr ""
+
+#: ../clutter/clutter-settings.c:464
+msgid "Double Click Distance"
+msgstr ""
+
+#: ../clutter/clutter-settings.c:465
+msgid "The distance between clicks necessary to detect a multiple click"
+msgstr ""
+
+#: ../clutter/clutter-settings.c:480
+msgid "Drag Threshold"
+msgstr ""
+
+#: ../clutter/clutter-settings.c:481
+msgid "The distance the cursor should travel before starting to drag"
+msgstr ""
+
+#: ../clutter/clutter-settings.c:496 ../clutter/clutter-text.c:3396
+msgid "Font Name"
+msgstr ""
+
+#: ../clutter/clutter-settings.c:497
+msgid ""
+"The description of the default font, as one that could be parsed by Pango"
+msgstr ""
+
+#: ../clutter/clutter-settings.c:512
+msgid "Font Antialias"
+msgstr ""
+
+#: ../clutter/clutter-settings.c:513
+msgid ""
+"Whether to use antialiasing (1 to enable, 0 to disable, and -1 to use the "
+"default)"
+msgstr ""
+
+#: ../clutter/clutter-settings.c:529
+msgid "Font DPI"
+msgstr ""
+
+#: ../clutter/clutter-settings.c:530
+msgid ""
+"The resolution of the font, in 1024 * dots/inch, or -1 to use the default"
+msgstr ""
+
+#: ../clutter/clutter-settings.c:546
+msgid "Font Hinting"
+msgstr ""
+
+#: ../clutter/clutter-settings.c:547
+msgid ""
+"Whether to use hinting (1 to enable, 0 to disable and -1 to use the default)"
+msgstr ""
+
+#: ../clutter/clutter-settings.c:568
+msgid "Font Hint Style"
+msgstr ""
+
+#: ../clutter/clutter-settings.c:569
+msgid "The style of hinting (hintnone, hintslight, hintmedium, hintfull)"
+msgstr ""
+
+#: ../clutter/clutter-settings.c:590
+msgid "Font Subpixel Order"
+msgstr ""
+
+#: ../clutter/clutter-settings.c:591
+msgid "The type of subpixel antialiasing (none, rgb, bgr, vrgb, vbgr)"
+msgstr ""
+
+#: ../clutter/clutter-settings.c:608
+msgid "The minimum duration for a long press gesture to be recognized"
+msgstr ""
+
+#: ../clutter/clutter-settings.c:615
+msgid "Fontconfig configuration timestamp"
+msgstr ""
+
+#: ../clutter/clutter-settings.c:616
+msgid "Timestamp of the current fontconfig configuration"
+msgstr ""
+
+#: ../clutter/clutter-settings.c:633
+msgid "Password Hint Time"
+msgstr ""
+
+#: ../clutter/clutter-settings.c:634
+msgid "How long to show the last input character in hidden entries"
+msgstr ""
+
+#: ../clutter/clutter-shader-effect.c:485
+msgid "Shader Type"
+msgstr ""
+
+#: ../clutter/clutter-shader-effect.c:486
+msgid "The type of shader used"
+msgstr ""
+
+#: ../clutter/clutter-snap-constraint.c:322
+msgid "The source of the constraint"
+msgstr ""
+
+#: ../clutter/clutter-snap-constraint.c:335
+msgid "From Edge"
+msgstr ""
+
+#: ../clutter/clutter-snap-constraint.c:336
+msgid "The edge of the actor that should be snapped"
+msgstr ""
+
+#: ../clutter/clutter-snap-constraint.c:350
+msgid "To Edge"
+msgstr ""
+
+#: ../clutter/clutter-snap-constraint.c:351
+msgid "The edge of the source that should be snapped"
+msgstr ""
+
+#: ../clutter/clutter-snap-constraint.c:367
+msgid "The offset in pixels to apply to the constraint"
+msgstr ""
+
+#: ../clutter/clutter-stage.c:1969
+msgid "Fullscreen Set"
+msgstr ""
+
+#: ../clutter/clutter-stage.c:1970
+msgid "Whether the main stage is fullscreen"
+msgstr ""
+
+#: ../clutter/clutter-stage.c:1984
+msgid "Offscreen"
+msgstr ""
+
+#: ../clutter/clutter-stage.c:1985
+msgid "Whether the main stage should be rendered offscreen"
+msgstr ""
+
+#: ../clutter/clutter-stage.c:1997 ../clutter/clutter-text.c:3510
+msgid "Cursor Visible"
+msgstr ""
+
+#: ../clutter/clutter-stage.c:1998
+msgid "Whether the mouse pointer is visible on the main stage"
+msgstr ""
+
+#: ../clutter/clutter-stage.c:2012
+msgid "User Resizable"
+msgstr ""
+
+#: ../clutter/clutter-stage.c:2013
+msgid "Whether the stage is able to be resized via user interaction"
+msgstr ""
+
+#: ../clutter/clutter-stage.c:2028 ../clutter/deprecated/clutter-box.c:256
+#: ../clutter/deprecated/clutter-rectangle.c:270
+msgid "Color"
+msgstr ""
+
+#: ../clutter/clutter-stage.c:2029
+msgid "The color of the stage"
+msgstr ""
+
+#: ../clutter/clutter-stage.c:2044
+msgid "Perspective"
+msgstr ""
+
+#: ../clutter/clutter-stage.c:2045
+msgid "Perspective projection parameters"
+msgstr ""
+
+#: ../clutter/clutter-stage.c:2060
+msgid "Title"
+msgstr ""
+
+#: ../clutter/clutter-stage.c:2061
+msgid "Stage Title"
+msgstr ""
+
+#: ../clutter/clutter-stage.c:2078
+msgid "Use Fog"
+msgstr ""
+
+#: ../clutter/clutter-stage.c:2079
+msgid "Whether to enable depth cueing"
+msgstr ""
+
+#: ../clutter/clutter-stage.c:2095
+msgid "Fog"
+msgstr ""
+
+#: ../clutter/clutter-stage.c:2096
+msgid "Settings for the depth cueing"
+msgstr ""
+
+#: ../clutter/clutter-stage.c:2112
+msgid "Use Alpha"
+msgstr ""
+
+#: ../clutter/clutter-stage.c:2113
+msgid "Whether to honour the alpha component of the stage color"
+msgstr ""
+
+#: ../clutter/clutter-stage.c:2129
+msgid "Key Focus"
+msgstr ""
+
+#: ../clutter/clutter-stage.c:2130
+msgid "The currently key focused actor"
+msgstr ""
+
+#: ../clutter/clutter-stage.c:2146
+msgid "No Clear Hint"
+msgstr ""
+
+#: ../clutter/clutter-stage.c:2147
+msgid "Whether the stage should clear its contents"
+msgstr ""
+
+#: ../clutter/clutter-stage.c:2160
+msgid "Accept Focus"
+msgstr ""
+
+#: ../clutter/clutter-stage.c:2161
+msgid "Whether the stage should accept focus on show"
+msgstr ""
+
+#: ../clutter/clutter-table-layout.c:537
+msgid "Column Number"
+msgstr ""
+
+#: ../clutter/clutter-table-layout.c:538
+msgid "The column the widget resides in"
+msgstr ""
+
+#: ../clutter/clutter-table-layout.c:545
+msgid "Row Number"
+msgstr ""
+
+#: ../clutter/clutter-table-layout.c:546
+msgid "The row the widget resides in"
+msgstr ""
+
+#: ../clutter/clutter-table-layout.c:553
+msgid "Column Span"
+msgstr ""
+
+#: ../clutter/clutter-table-layout.c:554
+msgid "The number of columns the widget should span"
+msgstr ""
+
+#: ../clutter/clutter-table-layout.c:561
+msgid "Row Span"
+msgstr ""
+
+#: ../clutter/clutter-table-layout.c:562
+msgid "The number of rows the widget should span"
+msgstr ""
+
+#: ../clutter/clutter-table-layout.c:569
+msgid "Horizontal Expand"
+msgstr ""
+
+#: ../clutter/clutter-table-layout.c:570
+msgid "Allocate extra space for the child in horizontal axis"
+msgstr ""
+
+#: ../clutter/clutter-table-layout.c:576
+msgid "Vertical Expand"
+msgstr ""
+
+#: ../clutter/clutter-table-layout.c:577
+msgid "Allocate extra space for the child in vertical axis"
+msgstr ""
+
+#: ../clutter/clutter-table-layout.c:1630
+msgid "Spacing between columns"
+msgstr ""
+
+#: ../clutter/clutter-table-layout.c:1644
+msgid "Spacing between rows"
+msgstr ""
+
+#: ../clutter/clutter-text-buffer.c:347 ../clutter/clutter-text.c:3431
+msgid "Text"
+msgstr ""
+
+#: ../clutter/clutter-text-buffer.c:348
+msgid "The contents of the buffer"
+msgstr ""
+
+#: ../clutter/clutter-text-buffer.c:361
+msgid "Text length"
+msgstr ""
+
+#: ../clutter/clutter-text-buffer.c:362
+msgid "Length of the text currently in the buffer"
+msgstr ""
+
+#: ../clutter/clutter-text-buffer.c:375
+msgid "Maximum length"
+msgstr ""
+
+#: ../clutter/clutter-text-buffer.c:376
+msgid "Maximum number of characters for this entry. Zero if no maximum"
+msgstr ""
+
+#: ../clutter/clutter-text.c:3378
+msgid "Buffer"
+msgstr ""
+
+#: ../clutter/clutter-text.c:3379
+msgid "The buffer for the text"
+msgstr ""
+
+#: ../clutter/clutter-text.c:3397
+msgid "The font to be used by the text"
+msgstr ""
+
+#: ../clutter/clutter-text.c:3414
+msgid "Font Description"
+msgstr ""
+
+#: ../clutter/clutter-text.c:3415
+msgid "The font description to be used"
+msgstr ""
+
+#: ../clutter/clutter-text.c:3432
+msgid "The text to render"
+msgstr ""
+
+#: ../clutter/clutter-text.c:3446
+msgid "Font Color"
+msgstr ""
+
+#: ../clutter/clutter-text.c:3447
+msgid "Color of the font used by the text"
+msgstr ""
+
+#: ../clutter/clutter-text.c:3462
+msgid "Editable"
+msgstr ""
+
+#: ../clutter/clutter-text.c:3463
+msgid "Whether the text is editable"
+msgstr ""
+
+#: ../clutter/clutter-text.c:3478
+msgid "Selectable"
+msgstr ""
+
+#: ../clutter/clutter-text.c:3479
+msgid "Whether the text is selectable"
+msgstr ""
+
+#: ../clutter/clutter-text.c:3493
+msgid "Activatable"
+msgstr ""
+
+#: ../clutter/clutter-text.c:3494
+msgid "Whether pressing return causes the activate signal to be emitted"
+msgstr ""
+
+#: ../clutter/clutter-text.c:3511
+msgid "Whether the input cursor is visible"
+msgstr ""
+
+#: ../clutter/clutter-text.c:3525 ../clutter/clutter-text.c:3526
+msgid "Cursor Color"
+msgstr ""
+
+#: ../clutter/clutter-text.c:3541
+msgid "Cursor Color Set"
+msgstr ""
+
+#: ../clutter/clutter-text.c:3542
+msgid "Whether the cursor color has been set"
+msgstr ""
+
+#: ../clutter/clutter-text.c:3557
+msgid "Cursor Size"
+msgstr ""
+
+#: ../clutter/clutter-text.c:3558
+msgid "The width of the cursor, in pixels"
+msgstr ""
+
+#: ../clutter/clutter-text.c:3574 ../clutter/clutter-text.c:3592
+msgid "Cursor Position"
+msgstr ""
+
+#: ../clutter/clutter-text.c:3575 ../clutter/clutter-text.c:3593
+msgid "The cursor position"
+msgstr ""
+
+#: ../clutter/clutter-text.c:3608
+msgid "Selection-bound"
+msgstr ""
+
+#: ../clutter/clutter-text.c:3609
+msgid "The cursor position of the other end of the selection"
+msgstr ""
+
+#: ../clutter/clutter-text.c:3624 ../clutter/clutter-text.c:3625
+msgid "Selection Color"
+msgstr ""
+
+#: ../clutter/clutter-text.c:3640
+msgid "Selection Color Set"
+msgstr ""
+
+#: ../clutter/clutter-text.c:3641
+msgid "Whether the selection color has been set"
+msgstr ""
+
+#: ../clutter/clutter-text.c:3656
+msgid "Attributes"
+msgstr ""
+
+#: ../clutter/clutter-text.c:3657
+msgid "A list of style attributes to apply to the contents of the actor"
+msgstr ""
+
+#: ../clutter/clutter-text.c:3679
+msgid "Use markup"
+msgstr ""
+
+#: ../clutter/clutter-text.c:3680
+msgid "Whether or not the text includes Pango markup"
+msgstr ""
+
+#: ../clutter/clutter-text.c:3696
+msgid "Line wrap"
+msgstr ""
+
+#: ../clutter/clutter-text.c:3697
+msgid "If set, wrap the lines if the text becomes too wide"
+msgstr ""
+
+#: ../clutter/clutter-text.c:3712
+msgid "Line wrap mode"
+msgstr "Režim zalomenia riadka"
+
+#: ../clutter/clutter-text.c:3713
+msgid "Control how line-wrapping is done"
+msgstr "Ovláda ako sa bude zalamovať riadok"
+
+#: ../clutter/clutter-text.c:3728
+msgid "Ellipsize"
+msgstr ""
+
+#: ../clutter/clutter-text.c:3729
+msgid "The preferred place to ellipsize the string"
+msgstr ""
+
+#: ../clutter/clutter-text.c:3745
+msgid "Line Alignment"
+msgstr "Zarovnanie riadka"
+
+#: ../clutter/clutter-text.c:3746
+msgid "The preferred alignment for the string, for multi-line text"
+msgstr ""
+
+#: ../clutter/clutter-text.c:3762
+msgid "Justify"
+msgstr ""
+
+#: ../clutter/clutter-text.c:3763
+msgid "Whether the text should be justified"
+msgstr ""
+
+#: ../clutter/clutter-text.c:3778
+msgid "Password Character"
+msgstr ""
+
+#: ../clutter/clutter-text.c:3779
+msgid "If non-zero, use this character to display the actor's contents"
+msgstr ""
+
+#: ../clutter/clutter-text.c:3793
+msgid "Max Length"
+msgstr "Maximálna dĺžka"
+
+#: ../clutter/clutter-text.c:3794
+msgid "Maximum length of the text inside the actor"
+msgstr ""
+
+#: ../clutter/clutter-text.c:3817
+msgid "Single Line Mode"
+msgstr "Režim jedného riadka"
+
+#: ../clutter/clutter-text.c:3818
+msgid "Whether the text should be a single line"
+msgstr "Určuje, či má byť text na jednom riadku"
+
+#: ../clutter/clutter-text.c:3832 ../clutter/clutter-text.c:3833
+msgid "Selected Text Color"
+msgstr ""
+
+#: ../clutter/clutter-text.c:3848
+msgid "Selected Text Color Set"
+msgstr ""
+
+#: ../clutter/clutter-text.c:3849
+msgid "Whether the selected text color has been set"
+msgstr ""
+
+#: ../clutter/clutter-timeline.c:593
+#: ../clutter/deprecated/clutter-animation.c:557
+msgid "Loop"
+msgstr "Opakovanie"
+
+#: ../clutter/clutter-timeline.c:594
+msgid "Should the timeline automatically restart"
+msgstr "Určuje, či sa má časová os automaticky reštartovať"
+
+#: ../clutter/clutter-timeline.c:608
+msgid "Delay"
+msgstr "Oneskorenie"
+
+#: ../clutter/clutter-timeline.c:609
+msgid "Delay before start"
+msgstr "Oneskorenie pred začatím"
+
+#: ../clutter/clutter-timeline.c:624
+#: ../clutter/deprecated/clutter-animation.c:541
+#: ../clutter/deprecated/clutter-animator.c:1801
+#: ../clutter/deprecated/clutter-media.c:224
+#: ../clutter/deprecated/clutter-state.c:1517
+msgid "Duration"
+msgstr "Trvanie"
+
+#: ../clutter/clutter-timeline.c:625
+msgid "Duration of the timeline in milliseconds"
+msgstr "Dĺžka časovej osi v milisekundách"
+
+#: ../clutter/clutter-timeline.c:640
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:521
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:330
+msgid "Direction"
+msgstr "Smer"
+
+#: ../clutter/clutter-timeline.c:641
+msgid "Direction of the timeline"
+msgstr "Smer plynutia časovej osy"
+
+#: ../clutter/clutter-timeline.c:656
+msgid "Auto Reverse"
+msgstr "Automatické obrátenie"
+
+#: ../clutter/clutter-timeline.c:657
+msgid "Whether the direction should be reversed when reaching the end"
+msgstr "Určuje, či sa má smer obrátiť po dosiahnutí konca"
+
+#: ../clutter/clutter-timeline.c:675
+msgid "Repeat Count"
+msgstr "Počet opakovaní"
+
+#: ../clutter/clutter-timeline.c:676
+msgid "How many times the timeline should repeat"
+msgstr "Určuje, koľkokrát sa má časová os zopakovať"
+
+#: ../clutter/clutter-timeline.c:690
+msgid "Progress Mode"
+msgstr ""
+
+#: ../clutter/clutter-timeline.c:691
+msgid "How the timeline should compute the progress"
+msgstr ""
+
+# PM: asi to netreba prekladať slovo interval je dostatočne zrozumiteľné a parameter očakáva dátovú štruktúru "ClutterInterval"
+#: ../clutter/clutter-transition.c:244
+msgid "Interval"
+msgstr "Interval"
+
+#: ../clutter/clutter-transition.c:245
+msgid "The interval of values to transition"
+msgstr "Interval hodnôt pre prechod"
+
+#: ../clutter/clutter-transition.c:259
+msgid "Animatable"
+msgstr "Animovateľný"
+
+#: ../clutter/clutter-transition.c:260
+msgid "The animatable object"
+msgstr "Animovateľný objekt"
+
+#: ../clutter/clutter-transition.c:281
+msgid "Remove on Complete"
+msgstr "Odstrániť pri dokončení"
+
+#: ../clutter/clutter-transition.c:282
+msgid "Detach the transition when completed"
+msgstr "Odpojí prechod pri dokončení"
+
+#: ../clutter/clutter-zoom-action.c:354
+msgid "Zoom Axis"
+msgstr ""
+
+#: ../clutter/clutter-zoom-action.c:355
+msgid "Constraints the zoom to an axis"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-alpha.c:354
+#: ../clutter/deprecated/clutter-animation.c:572
+#: ../clutter/deprecated/clutter-animator.c:1818
+msgid "Timeline"
+msgstr "Časová os"
+
+#: ../clutter/deprecated/clutter-alpha.c:355
+msgid "Timeline used by the alpha"
+msgstr "Časová os použitá alfou"
+
+#: ../clutter/deprecated/clutter-alpha.c:371
+msgid "Alpha value"
+msgstr "Hodnota alfa"
+
+# MČ: možno by som tam zakomponoval priehľadnosť. I keď som stratil niť o čo vlastne ide.
+# PM: súhlasím že je to dosť odvedi napísané a minimálne by to chcelo komentár od vývojárov
+# A ClutterAlpha binds a ClutterTimeline to a progress function which translates the time T into an adimensional factor alpha. The factor can then be used to drive a ClutterBehaviour, which will translate the alpha value into something meaningful for a ClutterActor. 
+#: ../clutter/deprecated/clutter-alpha.c:372
+#, fuzzy
+msgid "Alpha value as computed by the alpha"
+msgstr "Hodnota alfa vypočítaná podľa alfy"
+
+#: ../clutter/deprecated/clutter-alpha.c:393
+#: ../clutter/deprecated/clutter-animation.c:525
+msgid "Mode"
+msgstr "Režim"
+
+#: ../clutter/deprecated/clutter-alpha.c:394
+msgid "Progress mode"
+msgstr "Režim priebehu"
+
+#: ../clutter/deprecated/clutter-animation.c:508
+msgid "Object"
+msgstr "Objekt"
+
+# PM: prečo množné číslo?
+#: ../clutter/deprecated/clutter-animation.c:509
+#, fuzzy
+msgid "Object to which the animation applies"
+msgstr "Objekty, ktoré budú animované"
+
+#: ../clutter/deprecated/clutter-animation.c:526
+msgid "The mode of the animation"
+msgstr "Režim animácie"
+
+#: ../clutter/deprecated/clutter-animation.c:542
+msgid "Duration of the animation, in milliseconds"
+msgstr "Trvanie animácie, v milisekundách"
+
+#: ../clutter/deprecated/clutter-animation.c:558
+msgid "Whether the animation should loop"
+msgstr "Určuje, či sa má animácia opakovať"
+
+#: ../clutter/deprecated/clutter-animation.c:573
+msgid "The timeline used by the animation"
+msgstr "Časová os použitá animáciou"
+
+#: ../clutter/deprecated/clutter-animation.c:589
+#: ../clutter/deprecated/clutter-behaviour.c:237
+msgid "Alpha"
+msgstr "Alfa"
+
+#: ../clutter/deprecated/clutter-animation.c:590
+msgid "The alpha used by the animation"
+msgstr "Alfa použitá animáciou"
+
+#: ../clutter/deprecated/clutter-animator.c:1802
+msgid "The duration of the animation"
+msgstr "Trvanie animácie"
+
+#: ../clutter/deprecated/clutter-animator.c:1819
+msgid "The timeline of the animation"
+msgstr "Časová os animácie"
+
+#: ../clutter/deprecated/clutter-behaviour.c:238
+msgid "Alpha Object to drive the behaviour"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-behaviour-depth.c:180
+msgid "Start Depth"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-behaviour-depth.c:181
+msgid "Initial depth to apply"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-behaviour-depth.c:196
+msgid "End Depth"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-behaviour-depth.c:197
+msgid "Final depth to apply"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:394
+msgid "Start Angle"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:395
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:277
+msgid "Initial angle"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:410
+msgid "End Angle"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:411
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:295
+msgid "Final angle"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:426
+msgid "Angle x tilt"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:427
+msgid "Tilt of the ellipse around x axis"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:442
+msgid "Angle y tilt"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:443
+msgid "Tilt of the ellipse around y axis"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:458
+msgid "Angle z tilt"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:459
+msgid "Tilt of the ellipse around z axis"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:475
+msgid "Width of the ellipse"
+msgstr "Šírka elipsy"
+
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:491
+msgid "Height of ellipse"
+msgstr "Výška elipsy"
+
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:506
+msgid "Center"
+msgstr "Stred"
+
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:507
+msgid "Center of ellipse"
+msgstr "Stred elipsy"
+
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:522
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:331
+msgid "Direction of rotation"
+msgstr "Smer otáčania"
+
+#: ../clutter/deprecated/clutter-behaviour-opacity.c:177
+msgid "Opacity Start"
+msgstr "Počiatočné krytie"
+
+#: ../clutter/deprecated/clutter-behaviour-opacity.c:178
+msgid "Initial opacity level"
+msgstr "Počiatočná úroveň krytia"
+
+#: ../clutter/deprecated/clutter-behaviour-opacity.c:195
+msgid "Opacity End"
+msgstr "Konečné krytie"
+
+#: ../clutter/deprecated/clutter-behaviour-opacity.c:196
+msgid "Final opacity level"
+msgstr "Konečná úroveň krytia"
+
+#: ../clutter/deprecated/clutter-behaviour-path.c:222
+msgid "The ClutterPath object representing the path to animate along"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:276
+msgid "Angle Begin"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:294
+msgid "Angle End"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:312
+msgid "Axis"
+msgstr "Os"
+
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:313
+msgid "Axis of rotation"
+msgstr "Os rotácie"
+
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:348
+msgid "Center X"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:349
+msgid "X coordinate of the center of rotation"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:366
+msgid "Center Y"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:367
+msgid "Y coordinate of the center of rotation"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:384
+msgid "Center Z"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:385
+msgid "Z coordinate of the center of rotation"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-behaviour-scale.c:222
+msgid "X Start Scale"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-behaviour-scale.c:223
+msgid "Initial scale on the X axis"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-behaviour-scale.c:241
+msgid "X End Scale"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-behaviour-scale.c:242
+msgid "Final scale on the X axis"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-behaviour-scale.c:260
+msgid "Y Start Scale"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-behaviour-scale.c:261
+msgid "Initial scale on the Y axis"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-behaviour-scale.c:279
+msgid "Y End Scale"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-behaviour-scale.c:280
+msgid "Final scale on the Y axis"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-box.c:257
+msgid "The background color of the box"
+msgstr ""
+
+# PM: Whether the "color" property has been set 
+# PM: takýchto viet končiacich slovom set je tu viacero, treba preveriť či nejde o rovnaký prípad
+#: ../clutter/deprecated/clutter-box.c:270
+#, fuzzy
+msgid "Color Set"
+msgstr "Množina farieb"
+
+#: ../clutter/deprecated/clutter-cairo-texture.c:593
+msgid "Surface Width"
+msgstr "Šírka plochy"
+
+#: ../clutter/deprecated/clutter-cairo-texture.c:594
+msgid "The width of the Cairo surface"
+msgstr "Šírka plochy Cairo"
+
+#: ../clutter/deprecated/clutter-cairo-texture.c:611
+msgid "Surface Height"
+msgstr "Výška plochy"
+
+#: ../clutter/deprecated/clutter-cairo-texture.c:612
+msgid "The height of the Cairo surface"
+msgstr "Výška plochy Cairo"
+
+#: ../clutter/deprecated/clutter-cairo-texture.c:632
+msgid "Auto Resize"
+msgstr "Automatická zmena veľkosti"
+
+#: ../clutter/deprecated/clutter-cairo-texture.c:633
+msgid "Whether the surface should match the allocation"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-media.c:83
+msgid "URI"
+msgstr "URI"
+
+#: ../clutter/deprecated/clutter-media.c:84
+msgid "URI of a media file"
+msgstr "URI multimediálneho súboru"
+
+#: ../clutter/deprecated/clutter-media.c:100
+msgid "Playing"
+msgstr "Prehrávanie"
+
+#: ../clutter/deprecated/clutter-media.c:101
+msgid "Whether the actor is playing"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-media.c:118
+msgid "Progress"
+msgstr "Priebeh"
+
+#: ../clutter/deprecated/clutter-media.c:119
+msgid "Current progress of the playback"
+msgstr "Aktuálny priebeh prehrávania"
+
+#: ../clutter/deprecated/clutter-media.c:135
+msgid "Subtitle URI"
+msgstr "URI titulkov"
+
+#: ../clutter/deprecated/clutter-media.c:136
+msgid "URI of a subtitle file"
+msgstr "URI súboru s titulkami"
+
+#: ../clutter/deprecated/clutter-media.c:154
+msgid "Subtitle Font Name"
+msgstr "Názov písma titulkov"
+
+#: ../clutter/deprecated/clutter-media.c:155
+msgid "The font used to display subtitles"
+msgstr "Písmo použité na zobrazenie titulkov"
+
+#: ../clutter/deprecated/clutter-media.c:172
+msgid "Audio Volume"
+msgstr "Hlasitosť"
+
+#: ../clutter/deprecated/clutter-media.c:173
+msgid "The volume of the audio"
+msgstr "Hlasitosť zvuku"
+
+#: ../clutter/deprecated/clutter-media.c:189
+msgid "Can Seek"
+msgstr "Môže sa posúvať"
+
+#: ../clutter/deprecated/clutter-media.c:190
+msgid "Whether the current stream is seekable"
+msgstr "Určuje, či sa dá v aktuálnom prúde posúvať"
+
+#: ../clutter/deprecated/clutter-media.c:207
+msgid "Buffer Fill"
+msgstr "Naplnenie vyrovnávacej pamäte"
+
+#: ../clutter/deprecated/clutter-media.c:208
+msgid "The fill level of the buffer"
+msgstr "Úroveň naplnenia vyrovnávacej pamäte"
+
+#: ../clutter/deprecated/clutter-media.c:225
+msgid "The duration of the stream, in seconds"
+msgstr "Trvanie prúdu, v sekundách"
+
+#: ../clutter/deprecated/clutter-rectangle.c:271
+msgid "The color of the rectangle"
+msgstr "Farba obdĺžnika"
+
+#: ../clutter/deprecated/clutter-rectangle.c:284
+msgid "Border Color"
+msgstr "Farba okraja"
+
+#: ../clutter/deprecated/clutter-rectangle.c:285
+msgid "The color of the border of the rectangle"
+msgstr "Farba okraja obdĺžnika"
+
+#: ../clutter/deprecated/clutter-rectangle.c:300
+msgid "Border Width"
+msgstr "Šírka okraja"
+
+#: ../clutter/deprecated/clutter-rectangle.c:301
+msgid "The width of the border of the rectangle"
+msgstr "Šírka okraja obdĺžnika"
+
+#: ../clutter/deprecated/clutter-rectangle.c:315
+msgid "Has Border"
+msgstr "Má okraj"
+
+#: ../clutter/deprecated/clutter-rectangle.c:316
+msgid "Whether the rectangle should have a border"
+msgstr "Určuje, či má mať obdĺžnik okraj"
+
+# GLSL source code to be used by a ClutterShader for the vertex program. 
+# PM: že by vertexový zdroják? alebo zdroják pre vertexy?
+#: ../clutter/deprecated/clutter-shader.c:257
+#, fuzzy
+msgid "Vertex Source"
+msgstr "Zdroj vertex"
+
+#: ../clutter/deprecated/clutter-shader.c:258
+msgid "Source of vertex shader"
+msgstr "Zdroj shaderu vertexov"
+
+#: ../clutter/deprecated/clutter-shader.c:274
+#, fuzzy
+msgid "Fragment Source"
+msgstr "Zdroj fragment"
+
+#: ../clutter/deprecated/clutter-shader.c:275
+msgid "Source of fragment shader"
+msgstr "Zdroj shaderu fragmentov"
+
+# MČ: asi skôr „preložený“. Ako ten čo programuje, tiež používam pojem „kompilácia“, ale mal by som používať preklad. Kompilácia, pokiaľ viem, je poskladanie diela z viacerých diel, či ich útržkov.
+#: ../clutter/deprecated/clutter-shader.c:292
+msgid "Compiled"
+msgstr "Preložený"
+
+#: ../clutter/deprecated/clutter-shader.c:293
+msgid "Whether the shader is compiled and linked"
+msgstr "Určuje, či je shader preložený a spojený s knižnicami"
+
+#: ../clutter/deprecated/clutter-shader.c:310
+msgid "Whether the shader is enabled"
+msgstr "Určuje, či je  shader povolený"
+
+#: ../clutter/deprecated/clutter-shader.c:521
+#, c-format
+msgid "%s compilation failed: %s"
+msgstr "Zlyhala preklad %s: %s"
+
+#: ../clutter/deprecated/clutter-shader.c:522
+msgid "Vertex shader"
+msgstr "Shader vertexov"
+
+#: ../clutter/deprecated/clutter-shader.c:523
+msgid "Fragment shader"
+msgstr "Shader fragmentov"
+
+#: ../clutter/deprecated/clutter-state.c:1499
+msgid "State"
+msgstr "Stav"
+
+#: ../clutter/deprecated/clutter-state.c:1500
+msgid "Currently set state, (transition to this state might not be complete)"
+msgstr "Aktuálne nastavený stav (prechod do tejto fázy nemusí byť dokončený)"
+
+#: ../clutter/deprecated/clutter-state.c:1518
+msgid "Default transition duration"
+msgstr "Predvolené trvanie prechodu"
+
+#: ../clutter/deprecated/clutter-texture.c:992
+msgid "Sync size of actor"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-texture.c:993
+msgid "Auto sync size of actor to underlying pixbuf dimensions"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-texture.c:1000
+msgid "Disable Slicing"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-texture.c:1001
+msgid ""
+"Forces the underlying texture to be singular and not made of smaller space "
+"saving individual textures"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-texture.c:1010
+msgid "Tile Waste"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-texture.c:1011
+msgid "Maximum waste area of a sliced texture"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-texture.c:1019
+msgid "Horizontal repeat"
+msgstr "Vodorovné opakovanie"
+
+#: ../clutter/deprecated/clutter-texture.c:1020
+msgid "Repeat the contents rather than scaling them horizontally"
+msgstr "Opakuje obsah namiesto zmeny vodorovnej mierky"
+
+#: ../clutter/deprecated/clutter-texture.c:1027
+msgid "Vertical repeat"
+msgstr "Zvislé opakovanie"
+
+#: ../clutter/deprecated/clutter-texture.c:1028
+msgid "Repeat the contents rather than scaling them vertically"
+msgstr "Opakuje obsah namiesto zmeny zvislej mierky"
+
+#: ../clutter/deprecated/clutter-texture.c:1035
+msgid "Filter Quality"
+msgstr "Kvalita filtra"
+
+#: ../clutter/deprecated/clutter-texture.c:1036
+msgid "Rendering quality used when drawing the texture"
+msgstr "Kvalita vykresľovania pri kreslení textúry"
+
+#: ../clutter/deprecated/clutter-texture.c:1044
+msgid "Pixel Format"
+msgstr "Formát pixelov"
+
+#: ../clutter/deprecated/clutter-texture.c:1045
+msgid "The Cogl pixel format to use"
+msgstr "Formát pixelov v Cogl, ktorý sa použije"
+
+#: ../clutter/deprecated/clutter-texture.c:1053
+#: ../clutter/wayland/clutter-wayland-surface.c:445
+msgid "Cogl Texture"
+msgstr "Textúra v Cogl"
+
+#: ../clutter/deprecated/clutter-texture.c:1054
+#: ../clutter/wayland/clutter-wayland-surface.c:446
+msgid "The underlying Cogl texture handle used to draw this actor"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-texture.c:1061
+msgid "Cogl Material"
+msgstr "Materiál v Cogl"
+
+#: ../clutter/deprecated/clutter-texture.c:1062
+msgid "The underlying Cogl material handle used to draw this actor"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-texture.c:1081
+msgid "The path of the file containing the image data"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-texture.c:1088
+msgid "Keep Aspect Ratio"
+msgstr "Zachovať pomer strán"
+
+#: ../clutter/deprecated/clutter-texture.c:1089
+msgid ""
+"Keep the aspect ratio of the texture when requesting the preferred width or "
+"height"
+msgstr "Zachová pomer strán textúry pri dopyte na preferovanú šírku alebo výšku"
+
+# MČ: aj na slovensku sa tuším používa „asynchrónne“. Ak chceš použiť predponu „ne-“, dal by som „nesynchronizovane“
+#: ../clutter/deprecated/clutter-texture.c:1117
+#, fuzzy
+msgid "Load asynchronously"
+msgstr "Načítať nesynchrónne"
+
+# PM: dal by som pomocou vlákna
+#: ../clutter/deprecated/clutter-texture.c:1118
+#, fuzzy
+msgid ""
+"Load files inside a thread to avoid blocking when loading images from disk"
+msgstr ""
+"Načíta súbory vo vlákne, a tým sa vyhne blokovaniu pri načítavaní obrázkov z "
+"disku"
+
+#: ../clutter/deprecated/clutter-texture.c:1136
+#, fuzzy
+msgid "Load data asynchronously"
+msgstr "Načítať údaje nesynchrónne"
+
+#: ../clutter/deprecated/clutter-texture.c:1137
+msgid ""
+"Decode image data files inside a thread to reduce blocking when loading "
+"images from disk"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-texture.c:1163
+msgid "Pick With Alpha"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-texture.c:1164
+msgid "Shape actor with alpha channel when picking"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-texture.c:1597
+#: ../clutter/deprecated/clutter-texture.c:1992
+#: ../clutter/deprecated/clutter-texture.c:2088
+#: ../clutter/deprecated/clutter-texture.c:2386
+#, c-format
+msgid "Failed to load the image data"
+msgstr "Zlyhalo načítanie údajov obrázka"
+
+#: ../clutter/deprecated/clutter-texture.c:1756
+#, c-format
+msgid "YUV textures are not supported"
+msgstr "Textúry YUV nie sú podporované"
+
+#: ../clutter/deprecated/clutter-texture.c:1765
+#, c-format
+msgid "YUV2 textues are not supported"
+msgstr "Textúry YUV2 nie sú podporované"
+
+#: ../clutter/evdev/clutter-input-device-evdev.c:154
+msgid "sysfs Path"
+msgstr "sysfs cesta"
+
+#: ../clutter/evdev/clutter-input-device-evdev.c:155
+msgid "Path of the device in sysfs"
+msgstr "Cesta k zariadeniu v sysfs"
+
+#: ../clutter/evdev/clutter-input-device-evdev.c:170
+msgid "Device Path"
+msgstr "Cesta k zariadeniu"
+
+#: ../clutter/evdev/clutter-input-device-evdev.c:171
+msgid "Path of the device node"
+msgstr ""
+
+#: ../clutter/gdk/clutter-backend-gdk.c:289
+#, c-format
+msgid "Could not find a suitable CoglWinsys for a GdkDisplay of type %s"
+msgstr ""
+
+#: ../clutter/wayland/clutter-wayland-surface.c:419
+msgid "Surface"
+msgstr "Plocha"
+
+#: ../clutter/wayland/clutter-wayland-surface.c:420
+msgid "The underlying wayland surface"
+msgstr ""
+
+#: ../clutter/wayland/clutter-wayland-surface.c:427
+msgid "Surface width"
+msgstr "Šírka plochy"
+
+#: ../clutter/wayland/clutter-wayland-surface.c:428
+msgid "The width of the underlying wayland surface"
+msgstr ""
+
+#: ../clutter/wayland/clutter-wayland-surface.c:436
+msgid "Surface height"
+msgstr "Výška plochy"
+
+#: ../clutter/wayland/clutter-wayland-surface.c:437
+msgid "The height of the underlying wayland surface"
+msgstr ""
+
+# cmd desc
+#: ../clutter/x11/clutter-backend-x11.c:488
+msgid "X display to use"
+msgstr "Displej X, ktorý sa má použiť"
+
+# cmd desc
+#: ../clutter/x11/clutter-backend-x11.c:494
+msgid "X screen to use"
+msgstr "Obrazovka X, ktorá sa má použiť"
+
+# cmd desc
+#: ../clutter/x11/clutter-backend-x11.c:499
+msgid "Make X calls synchronous"
+msgstr "Urobí volania X synchrónnymi"
+
+# cmd desc
+#: ../clutter/x11/clutter-backend-x11.c:506
+msgid "Disable XInput support"
+msgstr "Zakáže podporu XInput"
+
+#: ../clutter/x11/clutter-keymap-x11.c:322
+msgid "The Clutter backend"
+msgstr "Obslužný program Clutter"
+
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:534
+msgid "Pixmap"
+msgstr "Pixmapa"
+
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:535
+msgid "The X11 Pixmap to be bound"
+msgstr "Pixmapa X11, ktorá sa má zviazať"
+
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:543
+msgid "Pixmap width"
+msgstr "Šírka pixmapy"
+
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:544
+msgid "The width of the pixmap bound to this texture"
+msgstr "Šírka pixmapy zviazanej s touto textúrou"
+
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:552
+msgid "Pixmap height"
+msgstr "Výška pixmapy"
+
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:553
+msgid "The height of the pixmap bound to this texture"
+msgstr "Výška pixmapy zviazanej s touto textúrou"
+
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:561
+msgid "Pixmap Depth"
+msgstr "Hĺbka pixmapy"
+
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:562
+msgid "The depth (in number of bits) of the pixmap bound to this texture"
+msgstr "Hĺbka (v počte bitov) pixmapy zviazanej s touto textúrou"
+
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:570
+msgid "Automatic Updates"
+msgstr "Automatické aktualizácie"
+
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:571
+msgid "If the texture should be kept in sync with any pixmap changes."
+msgstr "Či má byť textúra synchronizovaná so zmenami pixmapy."
+
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:579
+msgid "Window"
+msgstr "Okno"
+
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:580
+msgid "The X11 Window to be bound"
+msgstr ""
+
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:588
+msgid "Window Redirect Automatic"
+msgstr ""
+
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:589
+msgid "If composite window redirects are set to Automatic (or Manual if false)"
+msgstr ""
+
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:599
+msgid "Window Mapped"
+msgstr "Mapované okno"
+
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:600
+msgid "If window is mapped"
+msgstr "Či je okno mapované"
+
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:609
+msgid "Destroyed"
+msgstr "Zničené"
+
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:610
+msgid "If window has been destroyed"
+msgstr "Či bolo okno zničené"
+
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:618
+msgid "Window X"
+msgstr "Súradnica X okna"
+
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:619
+msgid "X position of window on screen according to X11"
+msgstr "Pozícia X okna na obrazovke podľa X11"
+
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:627
+msgid "Window Y"
+msgstr "Súradnica Y okna"
+
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:628
+msgid "Y position of window on screen according to X11"
+msgstr "Pozícia Y okna na obrazovke podľa X11"
+
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:635
+msgid "Window Override Redirect"
+msgstr ""
+
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:636
+msgid "If this is an override-redirect window"
+msgstr ""
diff --git a/po/sl.po b/po/sl.po
index dc7d41657..2b1b80e8c 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -3,15 +3,15 @@
 # This file is distributed under the same license as the clutter-1.0 package.
 #
 # Launchpad, 2010.
-# Matej Urbančič <mateju@svn.gnome.org>, 2011 - 2012.
+# Matej Urbančič <mateju@svn.gnome.org>, 2011 - 2014.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: clutter master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=clutter&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2012-12-18 02:00+0000\n"
-"PO-Revision-Date: 2012-12-18 08:26+0100\n"
+"POT-Creation-Date: 2014-04-28 15:04+0000\n"
+"PO-Revision-Date: 2014-04-28 21:32+0100\n"
 "Last-Translator: Matej Urbančič <mateju@svn.gnome.org>\n"
 "Language-Team: Slovenian GNOME Translation Team <gnome-si@googlegroups.com>\n"
 "Language: sl_SI\n"
@@ -23,690 +23,690 @@ msgstr ""
 "X-Poedit-SourceCharset: utf-8\n"
 "X-Generator: Poedit 1.5.4\n"
 
-#: ../clutter/clutter-actor.c:6144
+#: ../clutter/clutter-actor.c:6224
 msgid "X coordinate"
 msgstr "Koordinata X"
 
-#: ../clutter/clutter-actor.c:6145
+#: ../clutter/clutter-actor.c:6225
 msgid "X coordinate of the actor"
 msgstr "X koordinata predmeta"
 
-#: ../clutter/clutter-actor.c:6163
+#: ../clutter/clutter-actor.c:6243
 msgid "Y coordinate"
 msgstr "Koordinata Y"
 
-#: ../clutter/clutter-actor.c:6164
+#: ../clutter/clutter-actor.c:6244
 msgid "Y coordinate of the actor"
 msgstr "Y koordinata predmeta"
 
-#: ../clutter/clutter-actor.c:6186
+#: ../clutter/clutter-actor.c:6266
 msgid "Position"
 msgstr "Položaj"
 
-#: ../clutter/clutter-actor.c:6187
+#: ../clutter/clutter-actor.c:6267
 msgid "The position of the origin of the actor"
 msgstr "Položaj začetka gradnika"
 
-#: ../clutter/clutter-actor.c:6204 ../clutter/clutter-canvas.c:215
-#: ../clutter/clutter-grid-layout.c:1238
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:481
+#: ../clutter/clutter-actor.c:6284 ../clutter/clutter-canvas.c:242
+#: ../clutter/clutter-grid-layout.c:1239
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:474
 msgid "Width"
 msgstr "Širina"
 
-#: ../clutter/clutter-actor.c:6205
+#: ../clutter/clutter-actor.c:6285
 msgid "Width of the actor"
 msgstr "Širina predmeta"
 
-#: ../clutter/clutter-actor.c:6223 ../clutter/clutter-canvas.c:231
-#: ../clutter/clutter-grid-layout.c:1245
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:497
+#: ../clutter/clutter-actor.c:6303 ../clutter/clutter-canvas.c:258
+#: ../clutter/clutter-grid-layout.c:1246
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:490
 msgid "Height"
 msgstr "Višina"
 
-#: ../clutter/clutter-actor.c:6224
+#: ../clutter/clutter-actor.c:6304
 msgid "Height of the actor"
 msgstr "Višina predmeta"
 
-#: ../clutter/clutter-actor.c:6245
+#: ../clutter/clutter-actor.c:6325
 msgid "Size"
 msgstr "Velikost"
 
-#: ../clutter/clutter-actor.c:6246
+#: ../clutter/clutter-actor.c:6326
 msgid "The size of the actor"
 msgstr "Velikost gradnika"
 
-#: ../clutter/clutter-actor.c:6264
+#: ../clutter/clutter-actor.c:6344
 msgid "Fixed X"
 msgstr "Stalen X"
 
-#: ../clutter/clutter-actor.c:6265
+#: ../clutter/clutter-actor.c:6345
 msgid "Forced X position of the actor"
 msgstr "Vsiljen položaj X predmeta"
 
-#: ../clutter/clutter-actor.c:6282
+#: ../clutter/clutter-actor.c:6362
 msgid "Fixed Y"
 msgstr "Stalen Y"
 
-#: ../clutter/clutter-actor.c:6283
+#: ../clutter/clutter-actor.c:6363
 msgid "Forced Y position of the actor"
 msgstr "Vsiljen Y položaj predmeta"
 
-#: ../clutter/clutter-actor.c:6298
+#: ../clutter/clutter-actor.c:6378
 msgid "Fixed position set"
 msgstr "Stalen položaj je nastavljen"
 
-#: ../clutter/clutter-actor.c:6299
+#: ../clutter/clutter-actor.c:6379
 msgid "Whether to use fixed positioning for the actor"
 msgstr "Ali naj se za predmet uporabi stalen položaj"
 
-#: ../clutter/clutter-actor.c:6317
+#: ../clutter/clutter-actor.c:6397
 msgid "Min Width"
 msgstr "Najmanjša širina"
 
-#: ../clutter/clutter-actor.c:6318
+#: ../clutter/clutter-actor.c:6398
 msgid "Forced minimum width request for the actor"
 msgstr "Vsiljena najmanjša zahteva širine za predmet"
 
-#: ../clutter/clutter-actor.c:6336
+#: ../clutter/clutter-actor.c:6416
 msgid "Min Height"
 msgstr "Najmanjša višina"
 
-#: ../clutter/clutter-actor.c:6337
+#: ../clutter/clutter-actor.c:6417
 msgid "Forced minimum height request for the actor"
 msgstr "Vsiljena najmanjša zahteva višine za predmet"
 
-#: ../clutter/clutter-actor.c:6355
+#: ../clutter/clutter-actor.c:6435
 msgid "Natural Width"
 msgstr "Naravna širina"
 
-#: ../clutter/clutter-actor.c:6356
+#: ../clutter/clutter-actor.c:6436
 msgid "Forced natural width request for the actor"
 msgstr "Vsiljena zahteva naravne širine za predmet"
 
-#: ../clutter/clutter-actor.c:6374
+#: ../clutter/clutter-actor.c:6454
 msgid "Natural Height"
 msgstr "Naravna višina"
 
-#: ../clutter/clutter-actor.c:6375
+#: ../clutter/clutter-actor.c:6455
 msgid "Forced natural height request for the actor"
 msgstr "Vsiljena naravna višina za predmet"
 
-#: ../clutter/clutter-actor.c:6390
+#: ../clutter/clutter-actor.c:6470
 msgid "Minimum width set"
 msgstr "Najmanjša nastavljena širina"
 
-#: ../clutter/clutter-actor.c:6391
+#: ../clutter/clutter-actor.c:6471
 msgid "Whether to use the min-width property"
 msgstr "Ali naj se uporabi lastnost najmanjša širina"
 
-#: ../clutter/clutter-actor.c:6405
+#: ../clutter/clutter-actor.c:6485
 msgid "Minimum height set"
 msgstr "Najmanjša nastavljena višina"
 
-#: ../clutter/clutter-actor.c:6406
+#: ../clutter/clutter-actor.c:6486
 msgid "Whether to use the min-height property"
 msgstr "Ali naj se uporabi lastnost najmanjša višina"
 
-#: ../clutter/clutter-actor.c:6420
+#: ../clutter/clutter-actor.c:6500
 msgid "Natural width set"
 msgstr "Nastavljena naravna širina"
 
-#: ../clutter/clutter-actor.c:6421
+#: ../clutter/clutter-actor.c:6501
 msgid "Whether to use the natural-width property"
 msgstr "Ali naj se uporabi lastnost naravna širina"
 
-#: ../clutter/clutter-actor.c:6435
+#: ../clutter/clutter-actor.c:6515
 msgid "Natural height set"
 msgstr "Nastavljena naravna višina"
 
-#: ../clutter/clutter-actor.c:6436
+#: ../clutter/clutter-actor.c:6516
 msgid "Whether to use the natural-height property"
 msgstr "Ali naj se uporabi lastnost naravna višina"
 
-#: ../clutter/clutter-actor.c:6452
+#: ../clutter/clutter-actor.c:6532
 msgid "Allocation"
 msgstr "Dodelitev"
 
-#: ../clutter/clutter-actor.c:6453
+#: ../clutter/clutter-actor.c:6533
 msgid "The actor's allocation"
 msgstr "Dodelitev predmeta"
 
-#: ../clutter/clutter-actor.c:6510
+#: ../clutter/clutter-actor.c:6590
 msgid "Request Mode"
 msgstr "Način zahteve"
 
-#: ../clutter/clutter-actor.c:6511
+#: ../clutter/clutter-actor.c:6591
 msgid "The actor's request mode"
 msgstr "Način zahteve predmeta"
 
-#: ../clutter/clutter-actor.c:6535
+#: ../clutter/clutter-actor.c:6615
 msgid "Depth"
 msgstr "Globina"
 
-#: ../clutter/clutter-actor.c:6536
+#: ../clutter/clutter-actor.c:6616
 msgid "Position on the Z axis"
 msgstr "Položaj na Z osi"
 
-#: ../clutter/clutter-actor.c:6563
+#: ../clutter/clutter-actor.c:6643
 msgid "Z Position"
 msgstr "Položaj Z"
 
-#: ../clutter/clutter-actor.c:6564
+#: ../clutter/clutter-actor.c:6644
 msgid "The actor's position on the Z axis"
 msgstr "Položaj premeta na osi Z"
 
-#: ../clutter/clutter-actor.c:6581
+#: ../clutter/clutter-actor.c:6661
 msgid "Opacity"
 msgstr "Prekrivnost"
 
-#: ../clutter/clutter-actor.c:6582
+#: ../clutter/clutter-actor.c:6662
 msgid "Opacity of an actor"
 msgstr "Prekrivnost predmeta"
 
-#: ../clutter/clutter-actor.c:6602
+#: ../clutter/clutter-actor.c:6682
 msgid "Offscreen redirect"
 msgstr "Izven-zaslonska preusmeritev"
 
-#: ../clutter/clutter-actor.c:6603
+#: ../clutter/clutter-actor.c:6683
 msgid "Flags controlling when to flatten the actor into a single image"
 msgstr "Ali naj se predmet splošči v enojno sliko"
 
-#: ../clutter/clutter-actor.c:6617
+#: ../clutter/clutter-actor.c:6697
 msgid "Visible"
 msgstr "Vidno"
 
-#: ../clutter/clutter-actor.c:6618
+#: ../clutter/clutter-actor.c:6698
 msgid "Whether the actor is visible or not"
 msgstr "Ali je predmet viden ali ne"
 
-#: ../clutter/clutter-actor.c:6632
+#: ../clutter/clutter-actor.c:6712
 msgid "Mapped"
 msgstr "Preslikano"
 
-#: ../clutter/clutter-actor.c:6633
+#: ../clutter/clutter-actor.c:6713
 msgid "Whether the actor will be painted"
 msgstr "Ali bo predmet naslikan"
 
-#: ../clutter/clutter-actor.c:6646
+#: ../clutter/clutter-actor.c:6726
 msgid "Realized"
 msgstr "Realizirano"
 
-#: ../clutter/clutter-actor.c:6647
+#: ../clutter/clutter-actor.c:6727
 msgid "Whether the actor has been realized"
 msgstr "Ali je predmet izveden"
 
-#: ../clutter/clutter-actor.c:6662
+#: ../clutter/clutter-actor.c:6742
 msgid "Reactive"
 msgstr "Ponovno omogoči"
 
-#: ../clutter/clutter-actor.c:6663
+#: ../clutter/clutter-actor.c:6743
 msgid "Whether the actor is reactive to events"
 msgstr "Ali je predmet omogočen v dogodkih"
 
-#: ../clutter/clutter-actor.c:6674
+#: ../clutter/clutter-actor.c:6754
 msgid "Has Clip"
 msgstr "Ima izrez"
 
-#: ../clutter/clutter-actor.c:6675
+#: ../clutter/clutter-actor.c:6755
 msgid "Whether the actor has a clip set"
 msgstr "Ali ima predmet nastavljen izrez"
 
-#: ../clutter/clutter-actor.c:6688
+#: ../clutter/clutter-actor.c:6768
 msgid "Clip"
 msgstr "Izrez"
 
-#: ../clutter/clutter-actor.c:6689
+#: ../clutter/clutter-actor.c:6769
 msgid "The clip region for the actor"
 msgstr "Območje izreza za predmet"
 
-#: ../clutter/clutter-actor.c:6708
+#: ../clutter/clutter-actor.c:6788
 msgid "Clip Rectangle"
 msgstr "Pravokotnik porezave"
 
-#: ../clutter/clutter-actor.c:6709
+#: ../clutter/clutter-actor.c:6789
 msgid "The visible region of the actor"
 msgstr "Vidno območje za predmet"
 
-#: ../clutter/clutter-actor.c:6723 ../clutter/clutter-actor-meta.c:207
-#: ../clutter/clutter-binding-pool.c:319 ../clutter/clutter-input-device.c:258
+#: ../clutter/clutter-actor.c:6803 ../clutter/clutter-actor-meta.c:205
+#: ../clutter/clutter-binding-pool.c:318 ../clutter/clutter-input-device.c:247
 msgid "Name"
 msgstr "Ime"
 
-#: ../clutter/clutter-actor.c:6724
+#: ../clutter/clutter-actor.c:6804
 msgid "Name of the actor"
 msgstr "Ime predmeta"
 
-#: ../clutter/clutter-actor.c:6745
+#: ../clutter/clutter-actor.c:6825
 msgid "Pivot Point"
 msgstr "Vrtilna točka"
 
-#: ../clutter/clutter-actor.c:6746
+#: ../clutter/clutter-actor.c:6826
 msgid "The point around which the scaling and rotation occur"
 msgstr "Točka, okoli katere se vrši sprememba merila in sukanje"
 
-#: ../clutter/clutter-actor.c:6764
+#: ../clutter/clutter-actor.c:6844
 msgid "Pivot Point Z"
 msgstr "Vrtilna točka Z"
 
-#: ../clutter/clutter-actor.c:6765
+#: ../clutter/clutter-actor.c:6845
 msgid "Z component of the pivot point"
 msgstr "Sestavni del vrtilne točke"
 
-#: ../clutter/clutter-actor.c:6783
+#: ../clutter/clutter-actor.c:6863
 msgid "Scale X"
 msgstr "Merilo X"
 
-#: ../clutter/clutter-actor.c:6784
+#: ../clutter/clutter-actor.c:6864
 msgid "Scale factor on the X axis"
 msgstr "Faktor merila na osi X"
 
-#: ../clutter/clutter-actor.c:6802
+#: ../clutter/clutter-actor.c:6882
 msgid "Scale Y"
 msgstr "Merilo Y"
 
-#: ../clutter/clutter-actor.c:6803
+#: ../clutter/clutter-actor.c:6883
 msgid "Scale factor on the Y axis"
 msgstr "Faktor merila na osi Y"
 
-#: ../clutter/clutter-actor.c:6821
+#: ../clutter/clutter-actor.c:6901
 msgid "Scale Z"
 msgstr "Merilo Z"
 
-#: ../clutter/clutter-actor.c:6822
+#: ../clutter/clutter-actor.c:6902
 msgid "Scale factor on the Z axis"
 msgstr "Faktor merila na osi Z"
 
-#: ../clutter/clutter-actor.c:6840
+#: ../clutter/clutter-actor.c:6920
 msgid "Scale Center X"
 msgstr "Merilo sredine X"
 
-#: ../clutter/clutter-actor.c:6841
+#: ../clutter/clutter-actor.c:6921
 msgid "Horizontal scale center"
 msgstr "Vodoravno merilo sredine"
 
-#: ../clutter/clutter-actor.c:6859
+#: ../clutter/clutter-actor.c:6939
 msgid "Scale Center Y"
 msgstr "Merilo sredine Y"
 
-#: ../clutter/clutter-actor.c:6860
+#: ../clutter/clutter-actor.c:6940
 msgid "Vertical scale center"
 msgstr "Navpično merilo sredine"
 
-#: ../clutter/clutter-actor.c:6878
+#: ../clutter/clutter-actor.c:6958
 msgid "Scale Gravity"
 msgstr "Vrednost poravnave"
 
-#: ../clutter/clutter-actor.c:6879
+#: ../clutter/clutter-actor.c:6959
 msgid "The center of scaling"
 msgstr "Sredina merila"
 
-#: ../clutter/clutter-actor.c:6897
+#: ../clutter/clutter-actor.c:6977
 msgid "Rotation Angle X"
 msgstr "Vrtenje kota X"
 
-#: ../clutter/clutter-actor.c:6898
+#: ../clutter/clutter-actor.c:6978
 msgid "The rotation angle on the X axis"
 msgstr "Vrtenje kota na osi X"
 
-#: ../clutter/clutter-actor.c:6916
+#: ../clutter/clutter-actor.c:6996
 msgid "Rotation Angle Y"
 msgstr "Vrtenje kota Y"
 
-#: ../clutter/clutter-actor.c:6917
+#: ../clutter/clutter-actor.c:6997
 msgid "The rotation angle on the Y axis"
 msgstr "Vrtenje kota na osi Y"
 
-#: ../clutter/clutter-actor.c:6935
+#: ../clutter/clutter-actor.c:7015
 msgid "Rotation Angle Z"
 msgstr "Vrtenje kota Z"
 
-#: ../clutter/clutter-actor.c:6936
+#: ../clutter/clutter-actor.c:7016
 msgid "The rotation angle on the Z axis"
 msgstr "Vrtenje kota na osi Z"
 
-#: ../clutter/clutter-actor.c:6954
+#: ../clutter/clutter-actor.c:7034
 msgid "Rotation Center X"
 msgstr "Vrtenje sredine X"
 
-#: ../clutter/clutter-actor.c:6955
+#: ../clutter/clutter-actor.c:7035
 msgid "The rotation center on the X axis"
 msgstr "Vrtenje sredine na osi X"
 
-#: ../clutter/clutter-actor.c:6972
+#: ../clutter/clutter-actor.c:7052
 msgid "Rotation Center Y"
 msgstr "Vrtenje sredine Y"
 
-#: ../clutter/clutter-actor.c:6973
+#: ../clutter/clutter-actor.c:7053
 msgid "The rotation center on the Y axis"
 msgstr "Vrtenje sredine na osi Y"
 
-#: ../clutter/clutter-actor.c:6990
+#: ../clutter/clutter-actor.c:7070
 msgid "Rotation Center Z"
 msgstr "Vrtenje sredine Z"
 
-#: ../clutter/clutter-actor.c:6991
+#: ../clutter/clutter-actor.c:7071
 msgid "The rotation center on the Z axis"
 msgstr "Vrtenje sredine na osi Z"
 
-#: ../clutter/clutter-actor.c:7008
+#: ../clutter/clutter-actor.c:7088
 msgid "Rotation Center Z Gravity"
 msgstr "Sredina poravnave vrtenja po osi Z"
 
-#: ../clutter/clutter-actor.c:7009
+#: ../clutter/clutter-actor.c:7089
 msgid "Center point for rotation around the Z axis"
 msgstr "Sredina točke za vrtenje okoli osi Z"
 
-#: ../clutter/clutter-actor.c:7037
+#: ../clutter/clutter-actor.c:7117
 msgid "Anchor X"
 msgstr "Sidro X"
 
-#: ../clutter/clutter-actor.c:7038
+#: ../clutter/clutter-actor.c:7118
 msgid "X coordinate of the anchor point"
 msgstr "X koordinata točke sidra"
 
-#: ../clutter/clutter-actor.c:7066
+#: ../clutter/clutter-actor.c:7146
 msgid "Anchor Y"
 msgstr "Sidro Y"
 
-#: ../clutter/clutter-actor.c:7067
+#: ../clutter/clutter-actor.c:7147
 msgid "Y coordinate of the anchor point"
 msgstr "Y koordinata točke sidra"
 
-#: ../clutter/clutter-actor.c:7094
+#: ../clutter/clutter-actor.c:7174
 msgid "Anchor Gravity"
 msgstr "Sidro poravnave"
 
-#: ../clutter/clutter-actor.c:7095
+#: ../clutter/clutter-actor.c:7175
 msgid "The anchor point as a ClutterGravity"
 msgstr "Točka sidra poravnave"
 
-#: ../clutter/clutter-actor.c:7114
+#: ../clutter/clutter-actor.c:7194
 msgid "Translation X"
 msgstr "Translacija X"
 
-#: ../clutter/clutter-actor.c:7115
+#: ../clutter/clutter-actor.c:7195
 msgid "Translation along the X axis"
 msgstr "Translacija vzdolž osi X"
 
-#: ../clutter/clutter-actor.c:7134
+#: ../clutter/clutter-actor.c:7214
 msgid "Translation Y"
 msgstr "Translacija Y"
 
-#: ../clutter/clutter-actor.c:7135
+#: ../clutter/clutter-actor.c:7215
 msgid "Translation along the Y axis"
 msgstr "Translacija vzdolž osi Y"
 
-#: ../clutter/clutter-actor.c:7154
+#: ../clutter/clutter-actor.c:7234
 msgid "Translation Z"
 msgstr "Translacija Z"
 
-#: ../clutter/clutter-actor.c:7155
+#: ../clutter/clutter-actor.c:7235
 msgid "Translation along the Z axis"
 msgstr "Translacija vzdolž osi Z"
 
-#: ../clutter/clutter-actor.c:7185
+#: ../clutter/clutter-actor.c:7265
 msgid "Transform"
 msgstr "Preoblikovanje"
 
-#: ../clutter/clutter-actor.c:7186
+#: ../clutter/clutter-actor.c:7266
 msgid "Transformation matrix"
 msgstr "Matrika preoblikovanja"
 
-#: ../clutter/clutter-actor.c:7201
+#: ../clutter/clutter-actor.c:7281
 msgid "Transform Set"
 msgstr "Preoblikovanje je nastavljeno"
 
-#: ../clutter/clutter-actor.c:7202
+#: ../clutter/clutter-actor.c:7282
 msgid "Whether the transform property is set"
 msgstr "Ali je lastnost preoblikovanja nastavljena"
 
-#: ../clutter/clutter-actor.c:7223
+#: ../clutter/clutter-actor.c:7303
 msgid "Child Transform"
 msgstr "Preoblikovanje podrejenega predmeta"
 
-#: ../clutter/clutter-actor.c:7224
+#: ../clutter/clutter-actor.c:7304
 msgid "Children transformation matrix"
 msgstr "Matrika preoblikovanja podrejenega predmeta"
 
-#: ../clutter/clutter-actor.c:7239
+#: ../clutter/clutter-actor.c:7319
 msgid "Child Transform Set"
 msgstr "Preoblikovanje podrejenega predmeta je določeno"
 
-#: ../clutter/clutter-actor.c:7240
+#: ../clutter/clutter-actor.c:7320
 msgid "Whether the child-transform property is set"
 msgstr "Ali je lastnost preoblikovanja podrejenega predmeta nastavljena"
 
-#: ../clutter/clutter-actor.c:7257
+#: ../clutter/clutter-actor.c:7337
 msgid "Show on set parent"
 msgstr "Pokaži na nastavljenem nadrejenem predmetu"
 
-#: ../clutter/clutter-actor.c:7258
+#: ../clutter/clutter-actor.c:7338
 msgid "Whether the actor is shown when parented"
 msgstr "Ali je predmet prikazan, ko je nastavljen na nadrejeni predmet"
 
-#: ../clutter/clutter-actor.c:7275
+#: ../clutter/clutter-actor.c:7355
 msgid "Clip to Allocation"
 msgstr "Izrez za dodelitev"
 
-#: ../clutter/clutter-actor.c:7276
+#: ../clutter/clutter-actor.c:7356
 msgid "Sets the clip region to track the actor's allocation"
 msgstr "Nastavi območje izreza za sledenje dodelitve predmeta"
 
-#: ../clutter/clutter-actor.c:7289
+#: ../clutter/clutter-actor.c:7369
 msgid "Text Direction"
 msgstr "Smer besedila"
 
-#: ../clutter/clutter-actor.c:7290
+#: ../clutter/clutter-actor.c:7370
 msgid "Direction of the text"
 msgstr "Smer besedila"
 
-#: ../clutter/clutter-actor.c:7305
+#: ../clutter/clutter-actor.c:7385
 msgid "Has Pointer"
 msgstr "Ima kazalec"
 
-#: ../clutter/clutter-actor.c:7306
+#: ../clutter/clutter-actor.c:7386
 msgid "Whether the actor contains the pointer of an input device"
 msgstr "Ali predmet vsebuje kazalnik vhodne naprave"
 
-#: ../clutter/clutter-actor.c:7319
+#: ../clutter/clutter-actor.c:7399
 msgid "Actions"
 msgstr "Dejanja"
 
-#: ../clutter/clutter-actor.c:7320
+#: ../clutter/clutter-actor.c:7400
 msgid "Adds an action to the actor"
 msgstr "Dodajanje dejanja predmeta"
 
-#: ../clutter/clutter-actor.c:7333
+#: ../clutter/clutter-actor.c:7413
 msgid "Constraints"
 msgstr "Omejitve"
 
-#: ../clutter/clutter-actor.c:7334
+#: ../clutter/clutter-actor.c:7414
 msgid "Adds a constraint to the actor"
 msgstr "Dodajanje omejitev predmeta"
 
-#: ../clutter/clutter-actor.c:7347
+#: ../clutter/clutter-actor.c:7427
 msgid "Effect"
 msgstr "Učinek"
 
-#: ../clutter/clutter-actor.c:7348
+#: ../clutter/clutter-actor.c:7428
 msgid "Add an effect to be applied on the actor"
 msgstr "Dodajanje učinka predmeta"
 
-#: ../clutter/clutter-actor.c:7362
+#: ../clutter/clutter-actor.c:7442
 msgid "Layout Manager"
 msgstr "Upravljalnik razporeditev"
 
-#: ../clutter/clutter-actor.c:7363
+#: ../clutter/clutter-actor.c:7443
 msgid "The object controlling the layout of an actor's children"
 msgstr "Predmet, ki nadzira porazdelitev podrejenih predmetov."
 
-#: ../clutter/clutter-actor.c:7377
+#: ../clutter/clutter-actor.c:7457
 msgid "X Expand"
 msgstr "Razširi X"
 
-#: ../clutter/clutter-actor.c:7378
+#: ../clutter/clutter-actor.c:7458
 msgid "Whether extra horizontal space should be assigned to the actor"
 msgstr "Ali naj se gradniku dodeli dodatni vodoravni prostor"
 
-#: ../clutter/clutter-actor.c:7393
+#: ../clutter/clutter-actor.c:7473
 msgid "Y Expand"
 msgstr "Razširi Y"
 
-#: ../clutter/clutter-actor.c:7394
+#: ../clutter/clutter-actor.c:7474
 msgid "Whether extra vertical space should be assigned to the actor"
 msgstr "Ali naj se gradniku dodeli dodatni navpični prostor"
 
-#: ../clutter/clutter-actor.c:7410
+#: ../clutter/clutter-actor.c:7490
 msgid "X Alignment"
 msgstr "Poravnava X"
 
-#: ../clutter/clutter-actor.c:7411
+#: ../clutter/clutter-actor.c:7491
 msgid "The alignment of the actor on the X axis within its allocation"
 msgstr "Poravnava nadrejenega predmeta na osi X znotraj dodeljenega prostora."
 
-#: ../clutter/clutter-actor.c:7426
+#: ../clutter/clutter-actor.c:7506
 msgid "Y Alignment"
 msgstr "Poravnava Y"
 
-#: ../clutter/clutter-actor.c:7427
+#: ../clutter/clutter-actor.c:7507
 msgid "The alignment of the actor on the Y axis within its allocation"
 msgstr "Poravnava nadrejenega predmeta na osi Y znotraj dodeljenega prostora."
 
-#: ../clutter/clutter-actor.c:7446
+#: ../clutter/clutter-actor.c:7526
 msgid "Margin Top"
 msgstr "Zgornji rob"
 
-#: ../clutter/clutter-actor.c:7447
+#: ../clutter/clutter-actor.c:7527
 msgid "Extra space at the top"
 msgstr "Dodaten prostor zgoraj"
 
-#: ../clutter/clutter-actor.c:7468
+#: ../clutter/clutter-actor.c:7548
 msgid "Margin Bottom"
 msgstr "Spodnji rob"
 
-#: ../clutter/clutter-actor.c:7469
+#: ../clutter/clutter-actor.c:7549
 msgid "Extra space at the bottom"
 msgstr "Dodaten prostor na dnu"
 
-#: ../clutter/clutter-actor.c:7490
+#: ../clutter/clutter-actor.c:7570
 msgid "Margin Left"
 msgstr "Levi rob"
 
-#: ../clutter/clutter-actor.c:7491
+#: ../clutter/clutter-actor.c:7571
 msgid "Extra space at the left"
 msgstr "Dodaten prostor na levi strani"
 
-#: ../clutter/clutter-actor.c:7512
+#: ../clutter/clutter-actor.c:7592
 msgid "Margin Right"
 msgstr "Desni rob"
 
-#: ../clutter/clutter-actor.c:7513
+#: ../clutter/clutter-actor.c:7593
 msgid "Extra space at the right"
 msgstr "Dodaten prostor na desni strani"
 
-#: ../clutter/clutter-actor.c:7529
+#: ../clutter/clutter-actor.c:7609
 msgid "Background Color Set"
 msgstr "Nastavitev barve ozadja"
 
-#: ../clutter/clutter-actor.c:7530 ../clutter/deprecated/clutter-box.c:275
+#: ../clutter/clutter-actor.c:7610 ../clutter/deprecated/clutter-box.c:269
 msgid "Whether the background color is set"
 msgstr "Ali je barva ozadja nastavljena"
 
-#: ../clutter/clutter-actor.c:7546
+#: ../clutter/clutter-actor.c:7626
 msgid "Background color"
 msgstr "Barva ozadja"
 
-#: ../clutter/clutter-actor.c:7547
+#: ../clutter/clutter-actor.c:7627
 msgid "The actor's background color"
 msgstr "Barva ozadja nadrejenega predmeta"
 
-#: ../clutter/clutter-actor.c:7562
+#: ../clutter/clutter-actor.c:7642
 msgid "First Child"
 msgstr "Prvi podrejen predmet"
 
-#: ../clutter/clutter-actor.c:7563
+#: ../clutter/clutter-actor.c:7643
 msgid "The actor's first child"
 msgstr "Prvi podrejeni predmet"
 
-#: ../clutter/clutter-actor.c:7576
+#: ../clutter/clutter-actor.c:7656
 msgid "Last Child"
 msgstr "Zadnji podrejeni predmet"
 
-#: ../clutter/clutter-actor.c:7577
+#: ../clutter/clutter-actor.c:7657
 msgid "The actor's last child"
 msgstr "Zadnji podrejeni predmet"
 
-#: ../clutter/clutter-actor.c:7591
+#: ../clutter/clutter-actor.c:7671
 msgid "Content"
 msgstr "Vsebina"
 
-#: ../clutter/clutter-actor.c:7592
+#: ../clutter/clutter-actor.c:7672
 msgid "Delegate object for painting the actor's content"
 msgstr "Določitev načina izrisa vsebine predmeta"
 
-#: ../clutter/clutter-actor.c:7617
+#: ../clutter/clutter-actor.c:7697
 msgid "Content Gravity"
 msgstr "Poravnava vsebine"
 
-#: ../clutter/clutter-actor.c:7618
+#: ../clutter/clutter-actor.c:7698
 msgid "Alignment of the actor's content"
 msgstr "Poravnava vsebine predmeta"
 
-#: ../clutter/clutter-actor.c:7638
+#: ../clutter/clutter-actor.c:7718
 msgid "Content Box"
 msgstr "Okvirjen prostor"
 
-#: ../clutter/clutter-actor.c:7639
+#: ../clutter/clutter-actor.c:7719
 msgid "The bounding box of the actor's content"
 msgstr "Okvirjen prostor vsebine predmeta"
 
-#: ../clutter/clutter-actor.c:7647
+#: ../clutter/clutter-actor.c:7727
 msgid "Minification Filter"
 msgstr "Filter oddaljevanja"
 
-#: ../clutter/clutter-actor.c:7648
+#: ../clutter/clutter-actor.c:7728
 msgid "The filter used when reducing the size of the content"
 msgstr "Filter, uporabljen za oddaljevanje vsebine"
 
-#: ../clutter/clutter-actor.c:7655
+#: ../clutter/clutter-actor.c:7735
 msgid "Magnification Filter"
 msgstr "FIlter približanja"
 
-#: ../clutter/clutter-actor.c:7656
+#: ../clutter/clutter-actor.c:7736
 msgid "The filter used when increasing the size of the content"
 msgstr "Filter, uporabljen za približanje vsebine"
 
-#: ../clutter/clutter-actor.c:7670
+#: ../clutter/clutter-actor.c:7750
 msgid "Content Repeat"
 msgstr "Ponavljanje vsebine"
 
-#: ../clutter/clutter-actor.c:7671
+#: ../clutter/clutter-actor.c:7751
 msgid "The repeat policy for the actor's content"
 msgstr "Načela ponavljanja vsebine predmeta"
 
-#: ../clutter/clutter-actor-meta.c:193 ../clutter/clutter-child-meta.c:142
+#: ../clutter/clutter-actor-meta.c:191 ../clutter/clutter-child-meta.c:142
 msgid "Actor"
 msgstr "Predmet"
 
-#: ../clutter/clutter-actor-meta.c:194
+#: ../clutter/clutter-actor-meta.c:192
 msgid "The actor attached to the meta"
 msgstr "Predmet je pritrjen na meta predmet"
 
-#: ../clutter/clutter-actor-meta.c:208
+#: ../clutter/clutter-actor-meta.c:206
 msgid "The name of the meta"
 msgstr "Ime mete"
 
-#: ../clutter/clutter-actor-meta.c:221 ../clutter/clutter-input-device.c:337
-#: ../clutter/deprecated/clutter-shader.c:313
+#: ../clutter/clutter-actor-meta.c:219 ../clutter/clutter-input-device.c:326
+#: ../clutter/deprecated/clutter-shader.c:309
 msgid "Enabled"
 msgstr "Omogočeno"
 
-#: ../clutter/clutter-actor-meta.c:222
+#: ../clutter/clutter-actor-meta.c:220
 msgid "Whether the meta is enabled"
 msgstr "Ali je meta omogočena"
 
 #: ../clutter/clutter-align-constraint.c:279
-#: ../clutter/clutter-bind-constraint.c:358 ../clutter/clutter-clone.c:345
+#: ../clutter/clutter-bind-constraint.c:343 ../clutter/clutter-clone.c:341
 #: ../clutter/clutter-snap-constraint.c:321
 msgid "Source"
 msgstr "Vir"
@@ -732,80 +732,84 @@ msgstr "Faktor"
 msgid "The alignment factor, between 0.0 and 1.0"
 msgstr "Faktor poravnave med 0.0 in 1.0"
 
-#: ../clutter/clutter-backend.c:379
+#: ../clutter/clutter-backend.c:380
 msgid "Unable to initialize the Clutter backend"
 msgstr "Ni mogoče zagnati ozadnjega programa Clutter"
 
-#: ../clutter/clutter-backend.c:453
+#: ../clutter/clutter-backend.c:454
 #, c-format
 msgid "The backend of type '%s' does not support creating multiple stages"
 msgstr "Ozadnji program vrste '%s' ne podpira ustvarjanja več ravni dejanj"
 
-#: ../clutter/clutter-bind-constraint.c:359
+#: ../clutter/clutter-bind-constraint.c:344
 msgid "The source of the binding"
 msgstr "Vir vezave"
 
-#: ../clutter/clutter-bind-constraint.c:372
+#: ../clutter/clutter-bind-constraint.c:357
 msgid "Coordinate"
 msgstr "Koordinata"
 
-#: ../clutter/clutter-bind-constraint.c:373
+#: ../clutter/clutter-bind-constraint.c:358
 msgid "The coordinate to bind"
 msgstr "Koordinata za vezavo"
 
-#: ../clutter/clutter-bind-constraint.c:387
+#: ../clutter/clutter-bind-constraint.c:372
 #: ../clutter/clutter-path-constraint.c:226
 #: ../clutter/clutter-snap-constraint.c:366
 msgid "Offset"
 msgstr "Odmik"
 
-#: ../clutter/clutter-bind-constraint.c:388
+#: ../clutter/clutter-bind-constraint.c:373
 msgid "The offset in pixels to apply to the binding"
 msgstr "Odmik v slikovnih točkah za uveljavitev vezave"
 
-#: ../clutter/clutter-binding-pool.c:320
+#: ../clutter/clutter-binding-pool.c:319
 msgid "The unique name of the binding pool"
 msgstr "Edinstveno ime obsega vezave"
 
-#: ../clutter/clutter-bin-layout.c:240 ../clutter/clutter-bin-layout.c:655
-#: ../clutter/clutter-box-layout.c:390 ../clutter/clutter-table-layout.c:610
+#: ../clutter/clutter-bin-layout.c:220 ../clutter/clutter-bin-layout.c:633
+#: ../clutter/clutter-box-layout.c:374
+#: ../clutter/deprecated/clutter-table-layout.c:602
 msgid "Horizontal Alignment"
 msgstr "Vodoravna poravnava"
 
-#: ../clutter/clutter-bin-layout.c:241
+#: ../clutter/clutter-bin-layout.c:221
 msgid "Horizontal alignment for the actor inside the layout manager"
 msgstr "Vodoravna poravnava predmeta v upravljalniku razporeditve"
 
-#: ../clutter/clutter-bin-layout.c:249 ../clutter/clutter-bin-layout.c:675
-#: ../clutter/clutter-box-layout.c:399 ../clutter/clutter-table-layout.c:625
+#: ../clutter/clutter-bin-layout.c:229 ../clutter/clutter-bin-layout.c:653
+#: ../clutter/clutter-box-layout.c:383
+#: ../clutter/deprecated/clutter-table-layout.c:617
 msgid "Vertical Alignment"
 msgstr "Navpična poravnava"
 
-#: ../clutter/clutter-bin-layout.c:250
+#: ../clutter/clutter-bin-layout.c:230
 msgid "Vertical alignment for the actor inside the layout manager"
 msgstr "Navpična poravnava predmeta v upravljalniku razporeditev"
 
-#: ../clutter/clutter-bin-layout.c:656
+#: ../clutter/clutter-bin-layout.c:634
 msgid "Default horizontal alignment for the actors inside the layout manager"
 msgstr "Privzeta vodoravna poravnava predmetov v upravljalniku razporeditev"
 
-#: ../clutter/clutter-bin-layout.c:676
+#: ../clutter/clutter-bin-layout.c:654
 msgid "Default vertical alignment for the actors inside the layout manager"
 msgstr "Privzeta navpična poravnava predmetov v upravljalniku razporeditev"
 
-#: ../clutter/clutter-box-layout.c:365
+#: ../clutter/clutter-box-layout.c:349
 msgid "Expand"
 msgstr "Razširi"
 
-#: ../clutter/clutter-box-layout.c:366
+#: ../clutter/clutter-box-layout.c:350
 msgid "Allocate extra space for the child"
 msgstr "Dodeli dodaten prostor za podrejeni predmet"
 
-#: ../clutter/clutter-box-layout.c:372 ../clutter/clutter-table-layout.c:589
+#: ../clutter/clutter-box-layout.c:356
+#: ../clutter/deprecated/clutter-table-layout.c:581
 msgid "Horizontal Fill"
 msgstr "Vodoravna zapolnitev"
 
-#: ../clutter/clutter-box-layout.c:373 ../clutter/clutter-table-layout.c:590
+#: ../clutter/clutter-box-layout.c:357
+#: ../clutter/deprecated/clutter-table-layout.c:582
 msgid ""
 "Whether the child should receive priority when the container is allocating "
 "spare space on the horizontal axis"
@@ -813,11 +817,13 @@ msgstr ""
 "Ali naj podrejeni predmet dobi prednost, ko vsebnik dodeljuje preostali "
 "prostor na vodoravni osi"
 
-#: ../clutter/clutter-box-layout.c:381 ../clutter/clutter-table-layout.c:596
+#: ../clutter/clutter-box-layout.c:365
+#: ../clutter/deprecated/clutter-table-layout.c:588
 msgid "Vertical Fill"
 msgstr "Navpična zapolnitev"
 
-#: ../clutter/clutter-box-layout.c:382 ../clutter/clutter-table-layout.c:597
+#: ../clutter/clutter-box-layout.c:366
+#: ../clutter/deprecated/clutter-table-layout.c:589
 msgid ""
 "Whether the child should receive priority when the container is allocating "
 "spare space on the vertical axis"
@@ -825,80 +831,88 @@ msgstr ""
 "Ali naj podrejeni predmet dobi prednost, ko vsebnik dodeljuje preostali "
 "prostor na navpični osi"
 
-#: ../clutter/clutter-box-layout.c:391 ../clutter/clutter-table-layout.c:611
+#: ../clutter/clutter-box-layout.c:375
+#: ../clutter/deprecated/clutter-table-layout.c:603
 msgid "Horizontal alignment of the actor within the cell"
 msgstr "Vodoravna poravnava predmeta znotraj celice"
 
-#: ../clutter/clutter-box-layout.c:400 ../clutter/clutter-table-layout.c:626
+#: ../clutter/clutter-box-layout.c:384
+#: ../clutter/deprecated/clutter-table-layout.c:618
 msgid "Vertical alignment of the actor within the cell"
 msgstr "Navpična poravnava predmeta znotraj celice"
 
-#: ../clutter/clutter-box-layout.c:1365
+#: ../clutter/clutter-box-layout.c:1345
 msgid "Vertical"
 msgstr "Navpično"
 
-#: ../clutter/clutter-box-layout.c:1366
+#: ../clutter/clutter-box-layout.c:1346
 msgid "Whether the layout should be vertical, rather than horizontal"
 msgstr "Ali naj bo osnutek raje navpičen kot vodoraven"
 
-#: ../clutter/clutter-box-layout.c:1383 ../clutter/clutter-flow-layout.c:890
-#: ../clutter/clutter-grid-layout.c:1550
+#: ../clutter/clutter-box-layout.c:1363 ../clutter/clutter-flow-layout.c:927
+#: ../clutter/clutter-grid-layout.c:1549
 msgid "Orientation"
 msgstr "Usmerjenost"
 
-#: ../clutter/clutter-box-layout.c:1384 ../clutter/clutter-flow-layout.c:891
-#: ../clutter/clutter-grid-layout.c:1551
+#: ../clutter/clutter-box-layout.c:1364 ../clutter/clutter-flow-layout.c:928
+#: ../clutter/clutter-grid-layout.c:1550
 msgid "The orientation of the layout"
 msgstr "Usmerjenost razporeditve"
 
-#: ../clutter/clutter-box-layout.c:1400 ../clutter/clutter-flow-layout.c:906
+#: ../clutter/clutter-box-layout.c:1380 ../clutter/clutter-flow-layout.c:943
 msgid "Homogeneous"
 msgstr "Homogeno"
 
-#: ../clutter/clutter-box-layout.c:1401
+#: ../clutter/clutter-box-layout.c:1381
 msgid ""
 "Whether the layout should be homogeneous, i.e. all childs get the same size"
 msgstr ""
 "Ali naj bo razporeditev enotna. To pomeni, da so vsi podrejeni predmeti "
 "enake velikosti."
 
-#: ../clutter/clutter-box-layout.c:1416
+#: ../clutter/clutter-box-layout.c:1396
 msgid "Pack Start"
 msgstr "Začni pakiranje"
 
-#: ../clutter/clutter-box-layout.c:1417
+#: ../clutter/clutter-box-layout.c:1397
 msgid "Whether to pack items at the start of the box"
 msgstr "Ali se zapakirajo predmeti na začetku polja"
 
-#: ../clutter/clutter-box-layout.c:1430
+#: ../clutter/clutter-box-layout.c:1410
 msgid "Spacing"
 msgstr "Razmik"
 
-#: ../clutter/clutter-box-layout.c:1431
+#: ../clutter/clutter-box-layout.c:1411
 msgid "Spacing between children"
 msgstr "Razmik med podrejenimi elementi"
 
-#: ../clutter/clutter-box-layout.c:1448 ../clutter/clutter-table-layout.c:1675
+#: ../clutter/clutter-box-layout.c:1428
+#: ../clutter/deprecated/clutter-table-layout.c:1669
 msgid "Use Animations"
 msgstr "Uporabi animacije"
 
-#: ../clutter/clutter-box-layout.c:1449 ../clutter/clutter-table-layout.c:1676
+#: ../clutter/clutter-box-layout.c:1429
+#: ../clutter/deprecated/clutter-table-layout.c:1670
 msgid "Whether layout changes should be animated"
 msgstr "Ali naj bodo spremembe v razporeditvi animirane"
 
-#: ../clutter/clutter-box-layout.c:1473 ../clutter/clutter-table-layout.c:1700
+#: ../clutter/clutter-box-layout.c:1453
+#: ../clutter/deprecated/clutter-table-layout.c:1694
 msgid "Easing Mode"
 msgstr "Način blaženja"
 
-#: ../clutter/clutter-box-layout.c:1474 ../clutter/clutter-table-layout.c:1701
+#: ../clutter/clutter-box-layout.c:1454
+#: ../clutter/deprecated/clutter-table-layout.c:1695
 msgid "The easing mode of the animations"
 msgstr "Način blaženja animacij"
 
-#: ../clutter/clutter-box-layout.c:1494 ../clutter/clutter-table-layout.c:1721
+#: ../clutter/clutter-box-layout.c:1474
+#: ../clutter/deprecated/clutter-table-layout.c:1715
 msgid "Easing Duration"
 msgstr "Trajanje blaženja"
 
-#: ../clutter/clutter-box-layout.c:1495 ../clutter/clutter-table-layout.c:1722
+#: ../clutter/clutter-box-layout.c:1475
+#: ../clutter/deprecated/clutter-table-layout.c:1716
 msgid "The duration of the animations"
 msgstr "Trajanje animacije"
 
@@ -918,14 +932,30 @@ msgstr "Kontrast"
 msgid "The contrast change to apply"
 msgstr "Spremembe kontrasta za uveljavitev"
 
-#: ../clutter/clutter-canvas.c:216
+#: ../clutter/clutter-canvas.c:243
 msgid "The width of the canvas"
 msgstr "Širina platna slike."
 
-#: ../clutter/clutter-canvas.c:232
+#: ../clutter/clutter-canvas.c:259
 msgid "The height of the canvas"
 msgstr "Višina platna slike."
 
+#: ../clutter/clutter-canvas.c:278
+msgid "Scale Factor Set"
+msgstr "Nastavitev določila povečave"
+
+#: ../clutter/clutter-canvas.c:279
+msgid "Whether the scale-factor property is set"
+msgstr "Ali je določena lastnost določila povečave"
+
+#: ../clutter/clutter-canvas.c:300
+msgid "Scale Factor"
+msgstr "Določilo povečave"
+
+#: ../clutter/clutter-canvas.c:301
+msgid "The scaling factor for the surface"
+msgstr "Določilo povečave površine"
+
 #: ../clutter/clutter-child-meta.c:127
 msgid "Container"
 msgstr "Vsebnik"
@@ -938,39 +968,39 @@ msgstr "Vsebnik, ki je ustvaril to datoteko"
 msgid "The actor wrapped by this data"
 msgstr "Predmet, ki je ovit s podatki"
 
-#: ../clutter/clutter-click-action.c:559
+#: ../clutter/clutter-click-action.c:586
 msgid "Pressed"
 msgstr "Pritisnjeno"
 
-#: ../clutter/clutter-click-action.c:560
+#: ../clutter/clutter-click-action.c:587
 msgid "Whether the clickable should be in pressed state"
 msgstr "Ali naj bo kliknjeno v pritisnjenem stanju"
 
-#: ../clutter/clutter-click-action.c:573
+#: ../clutter/clutter-click-action.c:600
 msgid "Held"
 msgstr "Zadržano"
 
-#: ../clutter/clutter-click-action.c:574
+#: ../clutter/clutter-click-action.c:601
 msgid "Whether the clickable has a grab"
 msgstr "Ali naj ima kliknjeno zagrabek"
 
-#: ../clutter/clutter-click-action.c:591 ../clutter/clutter-settings.c:599
+#: ../clutter/clutter-click-action.c:618 ../clutter/clutter-settings.c:651
 msgid "Long Press Duration"
 msgstr "Trajanje doglega pritiska gumba"
 
-#: ../clutter/clutter-click-action.c:592
+#: ../clutter/clutter-click-action.c:619
 msgid "The minimum duration of a long press to recognize the gesture"
 msgstr "Najkrajše trajanje dolgega pritiska gumba za prepoznavanje poteze"
 
-#: ../clutter/clutter-click-action.c:610
+#: ../clutter/clutter-click-action.c:637
 msgid "Long Press Threshold"
 msgstr "Prag dolgega pritiska gumba"
 
-#: ../clutter/clutter-click-action.c:611
+#: ../clutter/clutter-click-action.c:638
 msgid "The maximum threshold before a long press is cancelled"
 msgstr "Največji prag preden je dogotrajni pritisk gumba preklican"
 
-#: ../clutter/clutter-clone.c:346
+#: ../clutter/clutter-clone.c:342
 msgid "Specifies the actor to be cloned"
 msgstr "Navede predmet za kloniranje"
 
@@ -982,27 +1012,27 @@ msgstr "Črnilo"
 msgid "The tint to apply"
 msgstr "Črnilo za uveljavitev"
 
-#: ../clutter/clutter-deform-effect.c:588
+#: ../clutter/clutter-deform-effect.c:591
 msgid "Horizontal Tiles"
 msgstr "Vodoravne ploščice"
 
-#: ../clutter/clutter-deform-effect.c:589
+#: ../clutter/clutter-deform-effect.c:592
 msgid "The number of horizontal tiles"
 msgstr "Število vodoravnih ploščic"
 
-#: ../clutter/clutter-deform-effect.c:604
+#: ../clutter/clutter-deform-effect.c:607
 msgid "Vertical Tiles"
 msgstr "Navpične ploščice"
 
-#: ../clutter/clutter-deform-effect.c:605
+#: ../clutter/clutter-deform-effect.c:608
 msgid "The number of vertical tiles"
 msgstr "Število navpičnih ploščic"
 
-#: ../clutter/clutter-deform-effect.c:622
+#: ../clutter/clutter-deform-effect.c:625
 msgid "Back Material"
 msgstr "Hrbtno gradivo"
 
-#: ../clutter/clutter-deform-effect.c:623
+#: ../clutter/clutter-deform-effect.c:626
 msgid "The material to be used when painting the back of the actor"
 msgstr "Gradivo, ki bo uporabljeno za slikanje hrbtne strani predmeta"
 
@@ -1010,259 +1040,297 @@ msgstr "Gradivo, ki bo uporabljeno za slikanje hrbtne strani predmeta"
 msgid "The desaturation factor"
 msgstr "Faktor odstranitve zasičenosti"
 
-#: ../clutter/clutter-device-manager.c:131
-#: ../clutter/clutter-input-device.c:366
-#: ../clutter/x11/clutter-keymap-x11.c:316
+#: ../clutter/clutter-device-manager.c:127
+#: ../clutter/clutter-input-device.c:355
+#: ../clutter/x11/clutter-keymap-x11.c:457
 msgid "Backend"
 msgstr "Zaledje"
 
-#: ../clutter/clutter-device-manager.c:132
+#: ../clutter/clutter-device-manager.c:128
 msgid "The ClutterBackend of the device manager"
 msgstr "ClutterZaledje upravljalnika naprav"
 
-#: ../clutter/clutter-drag-action.c:742
+#: ../clutter/clutter-drag-action.c:733
 msgid "Horizontal Drag Threshold"
 msgstr "Prag vodoravnega vlečenja"
 
-#: ../clutter/clutter-drag-action.c:743
+#: ../clutter/clutter-drag-action.c:734
 msgid "The horizontal amount of pixels required to start dragging"
 msgstr "Vodoravna količina slikovnih točk zahtevanih za začetek vlečenja"
 
-#: ../clutter/clutter-drag-action.c:770
+#: ../clutter/clutter-drag-action.c:761
 msgid "Vertical Drag Threshold"
 msgstr "Prag navpičnega vlečenja"
 
-#: ../clutter/clutter-drag-action.c:771
+#: ../clutter/clutter-drag-action.c:762
 msgid "The vertical amount of pixels required to start dragging"
 msgstr "Navpična količina slikovnih točk zahtevanih za začetek vlečenja"
 
-#: ../clutter/clutter-drag-action.c:792
+#: ../clutter/clutter-drag-action.c:783
 msgid "Drag Handle"
 msgstr "Ročica vlečenja"
 
-#: ../clutter/clutter-drag-action.c:793
+#: ../clutter/clutter-drag-action.c:784
 msgid "The actor that is being dragged"
 msgstr "Predmet, ki je povlečen"
 
-#: ../clutter/clutter-drag-action.c:806
+#: ../clutter/clutter-drag-action.c:797
 msgid "Drag Axis"
 msgstr "Os vlečenja"
 
-#: ../clutter/clutter-drag-action.c:807
+#: ../clutter/clutter-drag-action.c:798
 msgid "Constraints the dragging to an axis"
 msgstr "Omejitve vlečenja na osi"
 
-#: ../clutter/clutter-drag-action.c:823
+#: ../clutter/clutter-drag-action.c:814
 msgid "Drag Area"
 msgstr "Vlečno območje"
 
-#: ../clutter/clutter-drag-action.c:824
+#: ../clutter/clutter-drag-action.c:815
 msgid "Constrains the dragging to a rectangle"
 msgstr "Omeji vleko na pravokotnik"
 
-#: ../clutter/clutter-drag-action.c:837
+#: ../clutter/clutter-drag-action.c:828
 msgid "Drag Area Set"
 msgstr "Vlečno območje je določeno"
 
-#: ../clutter/clutter-drag-action.c:838
+#: ../clutter/clutter-drag-action.c:829
 msgid "Whether the drag area is set"
 msgstr "Ali je vlečno območje nastavljeno"
 
-#: ../clutter/clutter-flow-layout.c:907
+#: ../clutter/clutter-flow-layout.c:944
 msgid "Whether each item should receive the same allocation"
 msgstr "Ali naj vsi predmeti prejmejo enako dodelitev"
 
-#: ../clutter/clutter-flow-layout.c:922 ../clutter/clutter-table-layout.c:1637
+#: ../clutter/clutter-flow-layout.c:959
+#: ../clutter/deprecated/clutter-table-layout.c:1629
 msgid "Column Spacing"
 msgstr "Razmik med stolpci"
 
-#: ../clutter/clutter-flow-layout.c:923
+#: ../clutter/clutter-flow-layout.c:960
 msgid "The spacing between columns"
 msgstr "Prazen prostor med stolpci"
 
-#: ../clutter/clutter-flow-layout.c:939 ../clutter/clutter-table-layout.c:1651
+#: ../clutter/clutter-flow-layout.c:976
+#: ../clutter/deprecated/clutter-table-layout.c:1645
 msgid "Row Spacing"
 msgstr "Razmik med vrsticami"
 
-#: ../clutter/clutter-flow-layout.c:940
+#: ../clutter/clutter-flow-layout.c:977
 msgid "The spacing between rows"
 msgstr "Prazen prostor med vrsticami"
 
-#: ../clutter/clutter-flow-layout.c:954
+#: ../clutter/clutter-flow-layout.c:991
 msgid "Minimum Column Width"
 msgstr "Najmanjša širina stolpca"
 
-#: ../clutter/clutter-flow-layout.c:955
+#: ../clutter/clutter-flow-layout.c:992
 msgid "Minimum width for each column"
 msgstr "Najmanjša širina vsakega stolpca"
 
-#: ../clutter/clutter-flow-layout.c:970
+#: ../clutter/clutter-flow-layout.c:1007
 msgid "Maximum Column Width"
 msgstr "Največja širina stolpca"
 
-#: ../clutter/clutter-flow-layout.c:971
+#: ../clutter/clutter-flow-layout.c:1008
 msgid "Maximum width for each column"
 msgstr "Največja širina vsakega stolpca"
 
-#: ../clutter/clutter-flow-layout.c:985
+#: ../clutter/clutter-flow-layout.c:1022
 msgid "Minimum Row Height"
 msgstr "Najmanjša višina vrstice"
 
-#: ../clutter/clutter-flow-layout.c:986
+#: ../clutter/clutter-flow-layout.c:1023
 msgid "Minimum height for each row"
 msgstr "Najmanjša višina vsake vrstice"
 
-#: ../clutter/clutter-flow-layout.c:1001
+#: ../clutter/clutter-flow-layout.c:1038
 msgid "Maximum Row Height"
 msgstr "Največja višina vrstice"
 
-#: ../clutter/clutter-flow-layout.c:1002
+#: ../clutter/clutter-flow-layout.c:1039
 msgid "Maximum height for each row"
 msgstr "Največja višina vsake vrstice"
 
-#: ../clutter/clutter-grid-layout.c:1222
+#: ../clutter/clutter-flow-layout.c:1054 ../clutter/clutter-flow-layout.c:1055
+msgid "Snap to grid"
+msgstr "Povleci na mrežo"
+
+#: ../clutter/clutter-gesture-action.c:668
+msgid "Number touch points"
+msgstr "Število dotičnih točk"
+
+#: ../clutter/clutter-gesture-action.c:669
+msgid "Number of touch points"
+msgstr "Število dotičnih točk"
+
+#: ../clutter/clutter-gesture-action.c:684
+msgid "Threshold Trigger Edge"
+msgstr "Prag območja robu sprožilnika"
+
+#: ../clutter/clutter-gesture-action.c:685
+msgid "The trigger edge used by the action"
+msgstr "Rob sprožilnika, ki ga določa dejanje"
+
+#: ../clutter/clutter-gesture-action.c:704
+msgid "Threshold Trigger Horizontal Distance"
+msgstr "Prag razdalje vodoravnega sprožilnika"
+
+#: ../clutter/clutter-gesture-action.c:705
+msgid "The horizontal trigger distance used by the action"
+msgstr "Vodoravna razdalja sprožilnika, ki ga določa dejanje"
+
+#: ../clutter/clutter-gesture-action.c:723
+msgid "Threshold Trigger Vertical Distance"
+msgstr "Prag razdalje navpičnega sprožilnika"
+
+#: ../clutter/clutter-gesture-action.c:724
+msgid "The vertical trigger distance used by the action"
+msgstr "Navpična razdalja sprožilnika, ki ga določa dejanje"
+
+#: ../clutter/clutter-grid-layout.c:1223
 msgid "Left attachment"
 msgstr "Leva priloga"
 
-#: ../clutter/clutter-grid-layout.c:1223
+#: ../clutter/clutter-grid-layout.c:1224
 msgid "The column number to attach the left side of the child to"
 msgstr ""
 "Številka stolpca, na katerega je pripeta leva stran podrejenega gradnika"
 
-#: ../clutter/clutter-grid-layout.c:1230
+#: ../clutter/clutter-grid-layout.c:1231
 msgid "Top attachment"
 msgstr "Vrhnja priloga"
 
-#: ../clutter/clutter-grid-layout.c:1231
+#: ../clutter/clutter-grid-layout.c:1232
 msgid "The row number to attach the top side of a child widget to"
 msgstr "Številka vrstice, na katero je pripet vrh podrejenega gradnika"
 
-#: ../clutter/clutter-grid-layout.c:1239
+#: ../clutter/clutter-grid-layout.c:1240
 msgid "The number of columns that a child spans"
 msgstr "Število stolpcev, ki jih zaseda podrejeni predmet"
 
-#: ../clutter/clutter-grid-layout.c:1246
+#: ../clutter/clutter-grid-layout.c:1247
 msgid "The number of rows that a child spans"
 msgstr "Število vrstic, ki jih zaseda podrejeni predmet"
 
-#: ../clutter/clutter-grid-layout.c:1565
+#: ../clutter/clutter-grid-layout.c:1564
 msgid "Row spacing"
 msgstr "Prostor med vrsticami"
 
-#: ../clutter/clutter-grid-layout.c:1566
+#: ../clutter/clutter-grid-layout.c:1565
 msgid "The amount of space between two consecutive rows"
 msgstr "Količina prostora med zaporednima vrsticama"
 
-#: ../clutter/clutter-grid-layout.c:1579
+#: ../clutter/clutter-grid-layout.c:1578
 msgid "Column spacing"
 msgstr "Prostor med stolpci"
 
-#: ../clutter/clutter-grid-layout.c:1580
+#: ../clutter/clutter-grid-layout.c:1579
 msgid "The amount of space between two consecutive columns"
 msgstr "Količina prostora med zaporednima stolpcema"
 
-#: ../clutter/clutter-grid-layout.c:1594
+#: ../clutter/clutter-grid-layout.c:1593
 msgid "Row Homogeneous"
 msgstr "Homogena vrstica"
 
-#: ../clutter/clutter-grid-layout.c:1595
+#: ../clutter/clutter-grid-layout.c:1594
 msgid "If TRUE, the rows are all the same height"
 msgstr "Izbrana možnost omogoča, da imajo vse vrstice enako višino"
 
-#: ../clutter/clutter-grid-layout.c:1608
+#: ../clutter/clutter-grid-layout.c:1607
 msgid "Column Homogeneous"
 msgstr "Homogeni stolpci"
 
-#: ../clutter/clutter-grid-layout.c:1609
+#: ../clutter/clutter-grid-layout.c:1608
 msgid "If TRUE, the columns are all the same width"
 msgstr "Izbrana možnost omogoča, da imajo vsi stolpci enako širino"
 
-#: ../clutter/clutter-image.c:248 ../clutter/clutter-image.c:311
-#: ../clutter/clutter-image.c:399
+#: ../clutter/clutter-image.c:268 ../clutter/clutter-image.c:331
+#: ../clutter/clutter-image.c:419
 msgid "Unable to load image data"
 msgstr "Ni mogoče naložiti podatkov slike"
 
-#: ../clutter/clutter-input-device.c:242
+#: ../clutter/clutter-input-device.c:231
 msgid "Id"
 msgstr "ID"
 
-#: ../clutter/clutter-input-device.c:243
+#: ../clutter/clutter-input-device.c:232
 msgid "Unique identifier of the device"
 msgstr "Edinstveno določilo naprave"
 
-#: ../clutter/clutter-input-device.c:259
+#: ../clutter/clutter-input-device.c:248
 msgid "The name of the device"
 msgstr "Ime naprave"
 
-#: ../clutter/clutter-input-device.c:273
+#: ../clutter/clutter-input-device.c:262
 msgid "Device Type"
 msgstr "Vrsta naprave"
 
-#: ../clutter/clutter-input-device.c:274
+#: ../clutter/clutter-input-device.c:263
 msgid "The type of the device"
 msgstr "Vrsta naprave"
 
-#: ../clutter/clutter-input-device.c:289
+#: ../clutter/clutter-input-device.c:278
 msgid "Device Manager"
 msgstr "Upravljalnik naprav"
 
-#: ../clutter/clutter-input-device.c:290
+#: ../clutter/clutter-input-device.c:279
 msgid "The device manager instance"
 msgstr "Primerek upravitelja naprav"
 
-#: ../clutter/clutter-input-device.c:303
+#: ../clutter/clutter-input-device.c:292
 msgid "Device Mode"
 msgstr "Način naprave"
 
-#: ../clutter/clutter-input-device.c:304
+#: ../clutter/clutter-input-device.c:293
 msgid "The mode of the device"
 msgstr "Način naprave"
 
-#: ../clutter/clutter-input-device.c:318
+#: ../clutter/clutter-input-device.c:307
 msgid "Has Cursor"
 msgstr "Ima kazalec"
 
-#: ../clutter/clutter-input-device.c:319
+#: ../clutter/clutter-input-device.c:308
 msgid "Whether the device has a cursor"
 msgstr "Ali naj ima naprava kazalec"
 
-#: ../clutter/clutter-input-device.c:338
+#: ../clutter/clutter-input-device.c:327
 msgid "Whether the device is enabled"
 msgstr "Ali naj bo naprava omogočena"
 
-#: ../clutter/clutter-input-device.c:351
+#: ../clutter/clutter-input-device.c:340
 msgid "Number of Axes"
 msgstr "Število osi"
 
-#: ../clutter/clutter-input-device.c:352
+#: ../clutter/clutter-input-device.c:341
 msgid "The number of axes on the device"
 msgstr "Število osi na napravi"
 
-#: ../clutter/clutter-input-device.c:367
+#: ../clutter/clutter-input-device.c:356
 msgid "The backend instance"
 msgstr "Primerek zaledja"
 
-#: ../clutter/clutter-interval.c:506
+#: ../clutter/clutter-interval.c:557
 msgid "Value Type"
 msgstr "Vrsta vrednosti"
 
-#: ../clutter/clutter-interval.c:507
+#: ../clutter/clutter-interval.c:558
 msgid "The type of the values in the interval"
 msgstr "Vrsta vrednosti v razmiku"
 
-#: ../clutter/clutter-interval.c:522
+#: ../clutter/clutter-interval.c:573
 msgid "Initial Value"
 msgstr "Začetna vrednost"
 
-#: ../clutter/clutter-interval.c:523
+#: ../clutter/clutter-interval.c:574
 msgid "Initial value of the interval"
 msgstr "Začetna vrednost razmika"
 
-#: ../clutter/clutter-interval.c:537
+#: ../clutter/clutter-interval.c:588
 msgid "Final Value"
 msgstr "Končna vrednost"
 
-#: ../clutter/clutter-interval.c:538
+#: ../clutter/clutter-interval.c:589
 msgid "Final value of the interval"
 msgstr "Končna vrednost razmika"
 
@@ -1281,96 +1349,96 @@ msgstr "Upravljalnik, ki je ustvaril te podatke"
 #. * Do NOT translate it to non-English e.g. "predefinito:LTR"! If
 #. * it isn't default:LTR or default:RTL it will not work.
 #.
-#: ../clutter/clutter-main.c:772
+#: ../clutter/clutter-main.c:751
 msgid "default:LTR"
 msgstr "default:LTR"
 
-#: ../clutter/clutter-main.c:1646
+#: ../clutter/clutter-main.c:1577
 msgid "Show frames per second"
 msgstr "Prikaži število sličic na sekundo (fps)"
 
-#: ../clutter/clutter-main.c:1648
+#: ../clutter/clutter-main.c:1579
 msgid "Default frame rate"
 msgstr "Privzeta hitrost sličic"
 
-#: ../clutter/clutter-main.c:1650
+#: ../clutter/clutter-main.c:1581
 msgid "Make all warnings fatal"
 msgstr "Vsa opozorila naj bodo usodna"
 
-#: ../clutter/clutter-main.c:1653
+#: ../clutter/clutter-main.c:1584
 msgid "Direction for the text"
 msgstr "Smer besedila"
 
-#: ../clutter/clutter-main.c:1656
+#: ../clutter/clutter-main.c:1587
 msgid "Disable mipmapping on text"
 msgstr "Pri besedilu izklopi mipmap"
 
-#: ../clutter/clutter-main.c:1659
+#: ../clutter/clutter-main.c:1590
 msgid "Use 'fuzzy' picking"
 msgstr "Uporabi 'mehko' izbiranje"
 
-#: ../clutter/clutter-main.c:1662
+#: ../clutter/clutter-main.c:1593
 msgid "Clutter debugging flags to set"
 msgstr "Clutterjeve razhroščevalne zastavice, ki naj bodo dvignjene"
 
-#: ../clutter/clutter-main.c:1664
+#: ../clutter/clutter-main.c:1595
 msgid "Clutter debugging flags to unset"
 msgstr "Cluttterjeve razhroščevalne zastavice, ki naj bodo spuščene"
 
-#: ../clutter/clutter-main.c:1668
+#: ../clutter/clutter-main.c:1599
 msgid "Clutter profiling flags to set"
 msgstr "Clutterjeve profilirne zastavice, ki naj bodo dvignjene"
 
-#: ../clutter/clutter-main.c:1670
+#: ../clutter/clutter-main.c:1601
 msgid "Clutter profiling flags to unset"
 msgstr "Clultterjeve profilirne zastavice, ki naj bodo spuščene"
 
-#: ../clutter/clutter-main.c:1673
+#: ../clutter/clutter-main.c:1604
 msgid "Enable accessibility"
 msgstr "Omogoči dostopnost"
 
-#: ../clutter/clutter-main.c:1865
+#: ../clutter/clutter-main.c:1796
 msgid "Clutter Options"
 msgstr "Možnosti Cluttra"
 
-#: ../clutter/clutter-main.c:1866
+#: ../clutter/clutter-main.c:1797
 msgid "Show Clutter Options"
 msgstr "Prikaže možnosti Cluttra"
 
-#: ../clutter/clutter-pan-action.c:448
+#: ../clutter/clutter-pan-action.c:455
 msgid "Pan Axis"
 msgstr "Zamakni os"
 
-#: ../clutter/clutter-pan-action.c:449
+#: ../clutter/clutter-pan-action.c:456
 msgid "Constraints the panning to an axis"
 msgstr "Omeji zamikanje na os"
 
-#: ../clutter/clutter-pan-action.c:463
+#: ../clutter/clutter-pan-action.c:470
 msgid "Interpolate"
 msgstr "Interpoliraj"
 
-#: ../clutter/clutter-pan-action.c:464
+#: ../clutter/clutter-pan-action.c:471
 msgid "Whether interpolated events emission is enabled."
 msgstr "Ali naj bo oddajanje interpoliranih dogodkov omogočeno"
 
-#: ../clutter/clutter-pan-action.c:480
+#: ../clutter/clutter-pan-action.c:487
 msgid "Deceleration"
 msgstr "Upočasnitev"
 
-#: ../clutter/clutter-pan-action.c:481
+#: ../clutter/clutter-pan-action.c:488
 msgid "Rate at which the interpolated panning will decelerate in"
 msgstr "Vrednost, s katero se bo interpolirani zamik pojenjal"
 
-#: ../clutter/clutter-pan-action.c:498
+#: ../clutter/clutter-pan-action.c:505
 msgid "Initial acceleration factor"
 msgstr "Začetni faktor pospeška"
 
-#: ../clutter/clutter-pan-action.c:499
+#: ../clutter/clutter-pan-action.c:506
 msgid "Factor applied to the momentum when starting the interpolated phase"
 msgstr "Faktor za pospešek ob začetku interpolirane faze"
 
 #: ../clutter/clutter-path-constraint.c:212
-#: ../clutter/deprecated/clutter-behaviour-path.c:225
+#: ../clutter/deprecated/clutter-behaviour-path.c:221
 msgid "Path"
 msgstr "Pot"
 
@@ -1382,85 +1450,85 @@ msgstr "Pod uporabljena za omejitev predmeta"
 msgid "The offset along the path, between -1.0 and 2.0"
 msgstr "Odmik od poti, med -1.0 in 2.0"
 
-#: ../clutter/clutter-property-transition.c:271
+#: ../clutter/clutter-property-transition.c:269
 msgid "Property Name"
 msgstr "Ime lastnosti"
 
-#: ../clutter/clutter-property-transition.c:272
+#: ../clutter/clutter-property-transition.c:270
 msgid "The name of the property to animate"
 msgstr "Ime lastnosti za animiranje"
 
-#: ../clutter/clutter-script.c:466
+#: ../clutter/clutter-script.c:464
 msgid "Filename Set"
 msgstr "Urejanje imena datoteke"
 
-#: ../clutter/clutter-script.c:467
+#: ../clutter/clutter-script.c:465
 msgid "Whether the :filename property is set"
 msgstr "Ali je lastnost :filename nastavljena"
 
-#: ../clutter/clutter-script.c:481
-#: ../clutter/deprecated/clutter-texture.c:1082
+#: ../clutter/clutter-script.c:479
+#: ../clutter/deprecated/clutter-texture.c:1080
 msgid "Filename"
 msgstr "Ime datoteke"
 
-#: ../clutter/clutter-script.c:482
+#: ../clutter/clutter-script.c:480
 msgid "The path of the currently parsed file"
 msgstr "Pot do trenutno razčlenjene datoteke"
 
-#: ../clutter/clutter-script.c:499
+#: ../clutter/clutter-script.c:497
 msgid "Translation Domain"
 msgstr "Domena prevajanja"
 
-#: ../clutter/clutter-script.c:500
+#: ../clutter/clutter-script.c:498
 msgid "The translation domain used to localize string"
 msgstr "Uporabljena domena prevajanja za krajevno prilagajanje niza"
 
-#: ../clutter/clutter-scroll-actor.c:263
+#: ../clutter/clutter-scroll-actor.c:184
 msgid "Scroll Mode"
 msgstr "Način drsenja"
 
-#: ../clutter/clutter-scroll-actor.c:264
+#: ../clutter/clutter-scroll-actor.c:185
 msgid "The scrolling direction"
 msgstr "Smer drsenja"
 
-#: ../clutter/clutter-settings.c:440
+#: ../clutter/clutter-settings.c:486
 msgid "Double Click Time"
 msgstr "Čas dvojnega klika"
 
-#: ../clutter/clutter-settings.c:441
+#: ../clutter/clutter-settings.c:487
 msgid "The time between clicks necessary to detect a multiple click"
 msgstr "Časovni razmik med kliki za zaznavanje večkratnega klika"
 
-#: ../clutter/clutter-settings.c:456
+#: ../clutter/clutter-settings.c:502
 msgid "Double Click Distance"
 msgstr "Razmik dvojnega klika"
 
-#: ../clutter/clutter-settings.c:457
+#: ../clutter/clutter-settings.c:503
 msgid "The distance between clicks necessary to detect a multiple click"
 msgstr "Razmik med kliki za zaznavanje večkratnega klika"
 
-#: ../clutter/clutter-settings.c:472
+#: ../clutter/clutter-settings.c:518
 msgid "Drag Threshold"
 msgstr "Prag vleke"
 
-#: ../clutter/clutter-settings.c:473
+#: ../clutter/clutter-settings.c:519
 msgid "The distance the cursor should travel before starting to drag"
 msgstr "Pot, ki naj jo kazalka prepotuje, preden začne delovati vleka predmeta"
 
-#: ../clutter/clutter-settings.c:488 ../clutter/clutter-text.c:3369
+#: ../clutter/clutter-settings.c:534 ../clutter/clutter-text.c:3437
 msgid "Font Name"
 msgstr "Ime pisave"
 
-#: ../clutter/clutter-settings.c:489
+#: ../clutter/clutter-settings.c:535
 msgid ""
 "The description of the default font, as one that could be parsed by Pango"
 msgstr "Opis privzete pisave, ki jo lahko razčleni sistem Pango"
 
-#: ../clutter/clutter-settings.c:504
+#: ../clutter/clutter-settings.c:550
 msgid "Font Antialias"
 msgstr "Glajenje robov pisave"
 
-#: ../clutter/clutter-settings.c:505
+#: ../clutter/clutter-settings.c:551
 msgid ""
 "Whether to use antialiasing (1 to enable, 0 to disable, and -1 to use the "
 "default)"
@@ -1468,71 +1536,79 @@ msgstr ""
 "Ali naj bo uporabljeno glajenje (1 za omogočanje, 0 za onemogočanje in -1 za "
 "uporabo privzete vrednosti)"
 
-#: ../clutter/clutter-settings.c:521
+#: ../clutter/clutter-settings.c:567 ../clutter/clutter-settings.c:575
 msgid "Font DPI"
 msgstr "Vrednost DPI pisave"
 
-#: ../clutter/clutter-settings.c:522
+#: ../clutter/clutter-settings.c:568 ../clutter/clutter-settings.c:576
 msgid ""
 "The resolution of the font, in 1024 * dots/inch, or -1 to use the default"
 msgstr ""
 "Ločljivost pisave, določena kot 1024 * točk/palec, ali pa -1 za uporabo "
 "privzete vrednosti."
 
-#: ../clutter/clutter-settings.c:538
+#: ../clutter/clutter-settings.c:592
 msgid "Font Hinting"
 msgstr "Glajenje pisave"
 
-#: ../clutter/clutter-settings.c:539
+#: ../clutter/clutter-settings.c:593
 msgid ""
 "Whether to use hinting (1 to enable, 0 to disable and -1 to use the default)"
 msgstr ""
 "Ali naj bo uporabljeno glajenje pisav (1 za omogočanje, 0 za onemogočanje in "
 "-1 za uporabo privzete vrednosti)"
 
-#: ../clutter/clutter-settings.c:560
+#: ../clutter/clutter-settings.c:613
 msgid "Font Hint Style"
 msgstr "Slog glajenja pisave"
 
-#: ../clutter/clutter-settings.c:561
+#: ../clutter/clutter-settings.c:614
 msgid "The style of hinting (hintnone, hintslight, hintmedium, hintfull)"
 msgstr "Slog glajenja robov (brez, delno, srednje in polno)"
 
-#: ../clutter/clutter-settings.c:582
+#: ../clutter/clutter-settings.c:634
 msgid "Font Subpixel Order"
 msgstr "Podtočkovni red pisave"
 
-#: ../clutter/clutter-settings.c:583
+#: ../clutter/clutter-settings.c:635
 msgid "The type of subpixel antialiasing (none, rgb, bgr, vrgb, vbgr)"
 msgstr "Vrsta podtočkovnega glajenja robov (brez, rgb, bgr, vrgb, vbgr)"
 
-#: ../clutter/clutter-settings.c:600
+#: ../clutter/clutter-settings.c:652
 msgid "The minimum duration for a long press gesture to be recognized"
 msgstr "Najkrajše trajanje dolgega pritiska gumba pred prepoznavanjem poteze"
 
-#: ../clutter/clutter-settings.c:607
+#: ../clutter/clutter-settings.c:659
+msgid "Window Scaling Factor"
+msgstr "Določilo razmerja povečave"
+
+#: ../clutter/clutter-settings.c:660
+msgid "The scaling factor to be applied to windows"
+msgstr "Določilo razmerja povečave, ki bo uporabljeno pri izrisu okna"
+
+#: ../clutter/clutter-settings.c:667
 msgid "Fontconfig configuration timestamp"
 msgstr "Časovni žig prilagoditev za fontconfig"
 
-#: ../clutter/clutter-settings.c:608
+#: ../clutter/clutter-settings.c:668
 msgid "Timestamp of the current fontconfig configuration"
 msgstr "Časovni žig trenutne prilagoditve fontconfig"
 
-#: ../clutter/clutter-settings.c:625
+#: ../clutter/clutter-settings.c:685
 msgid "Password Hint Time"
 msgstr "Čas namiga za geslo"
 
-#: ../clutter/clutter-settings.c:626
+#: ../clutter/clutter-settings.c:686
 msgid "How long to show the last input character in hidden entries"
 msgstr ""
 "Kako dolgo naj bo prikazan zadnji vpisan znak pri vpisovanje skritih vnosov "
 "gesla."
 
-#: ../clutter/clutter-shader-effect.c:486
+#: ../clutter/clutter-shader-effect.c:487
 msgid "Shader Type"
 msgstr "Vrsta senčilnika"
 
-#: ../clutter/clutter-shader-effect.c:487
+#: ../clutter/clutter-shader-effect.c:488
 msgid "The type of shader used"
 msgstr "Vrsta uporabljenega senčilnika"
 
@@ -1560,760 +1636,704 @@ msgstr "Rob vira, ki je povlečen"
 msgid "The offset in pixels to apply to the constraint"
 msgstr "Odmik v slikovnih točkah za uveljavitev omejitev"
 
-#: ../clutter/clutter-stage.c:1895
+#: ../clutter/clutter-stage.c:1918
 msgid "Fullscreen Set"
 msgstr "Celozaslonska nastavitev"
 
-#: ../clutter/clutter-stage.c:1896
+#: ../clutter/clutter-stage.c:1919
 msgid "Whether the main stage is fullscreen"
 msgstr "Ali je glavna postavitev celozaslonska"
 
-#: ../clutter/clutter-stage.c:1910
+#: ../clutter/clutter-stage.c:1933
 msgid "Offscreen"
 msgstr "Izven zaslona"
 
-#: ../clutter/clutter-stage.c:1911
+#: ../clutter/clutter-stage.c:1934
 msgid "Whether the main stage should be rendered offscreen"
 msgstr "Ali naj bo glavna postavitev izrisana izven zaslona"
 
-#: ../clutter/clutter-stage.c:1923 ../clutter/clutter-text.c:3483
+#: ../clutter/clutter-stage.c:1946 ../clutter/clutter-text.c:3551
 msgid "Cursor Visible"
 msgstr "Viden kazalec"
 
-#: ../clutter/clutter-stage.c:1924
+#: ../clutter/clutter-stage.c:1947
 msgid "Whether the mouse pointer is visible on the main stage"
 msgstr "Ali je miškin kazalec viden na glavni postavitvi"
 
-#: ../clutter/clutter-stage.c:1938
+#: ../clutter/clutter-stage.c:1961
 msgid "User Resizable"
 msgstr "Uporabnik lahko spreminja velikost"
 
-#: ../clutter/clutter-stage.c:1939
+#: ../clutter/clutter-stage.c:1962
 msgid "Whether the stage is able to be resized via user interaction"
 msgstr "Ali lahko uporabnik spreminja velikost postavitve"
 
-#: ../clutter/clutter-stage.c:1954 ../clutter/deprecated/clutter-box.c:260
-#: ../clutter/deprecated/clutter-rectangle.c:273
+#: ../clutter/clutter-stage.c:1977 ../clutter/deprecated/clutter-box.c:254
+#: ../clutter/deprecated/clutter-rectangle.c:270
 msgid "Color"
 msgstr "Barva"
 
-#: ../clutter/clutter-stage.c:1955
+#: ../clutter/clutter-stage.c:1978
 msgid "The color of the stage"
 msgstr "Barva postavitve"
 
-#: ../clutter/clutter-stage.c:1970
+#: ../clutter/clutter-stage.c:1993
 msgid "Perspective"
 msgstr "Perspektiva"
 
-#: ../clutter/clutter-stage.c:1971
+#: ../clutter/clutter-stage.c:1994
 msgid "Perspective projection parameters"
 msgstr "Perspektiva nastavitvenih parametrov"
 
-#: ../clutter/clutter-stage.c:1986
+#: ../clutter/clutter-stage.c:2009
 msgid "Title"
 msgstr "Naslov"
 
-#: ../clutter/clutter-stage.c:1987
+#: ../clutter/clutter-stage.c:2010
 msgid "Stage Title"
 msgstr "Naziv postavitve"
 
-#: ../clutter/clutter-stage.c:2004
+#: ../clutter/clutter-stage.c:2027
 msgid "Use Fog"
 msgstr "Uporabi meglo"
 
-#: ../clutter/clutter-stage.c:2005
+#: ../clutter/clutter-stage.c:2028
 msgid "Whether to enable depth cueing"
 msgstr "Ali naj se omogoči globinska izravnava"
 
-#: ../clutter/clutter-stage.c:2021
+#: ../clutter/clutter-stage.c:2044
 msgid "Fog"
 msgstr "Megla"
 
-#: ../clutter/clutter-stage.c:2022
+#: ../clutter/clutter-stage.c:2045
 msgid "Settings for the depth cueing"
 msgstr "Nastavitve globinske izravnave"
 
-#: ../clutter/clutter-stage.c:2038
+#: ../clutter/clutter-stage.c:2061
 msgid "Use Alpha"
 msgstr "Uporabi alfo"
 
-#: ../clutter/clutter-stage.c:2039
+#: ../clutter/clutter-stage.c:2062
 msgid "Whether to honour the alpha component of the stage color"
 msgstr "Ali naj se upošteva alfa sestavni del barve postavitve"
 
-#: ../clutter/clutter-stage.c:2055
+#: ../clutter/clutter-stage.c:2078
 msgid "Key Focus"
 msgstr "Žarišče tipke"
 
-#: ../clutter/clutter-stage.c:2056
+#: ../clutter/clutter-stage.c:2079
 msgid "The currently key focused actor"
 msgstr "Trenutna tipka predmeta v žarišču"
 
-#: ../clutter/clutter-stage.c:2072
+#: ../clutter/clutter-stage.c:2095
 msgid "No Clear Hint"
 msgstr "Ni jasnega namiga"
 
-#: ../clutter/clutter-stage.c:2073
+#: ../clutter/clutter-stage.c:2096
 msgid "Whether the stage should clear its contents"
 msgstr "Ali naj postavitev počisti svojo vsebino"
 
-#: ../clutter/clutter-stage.c:2086
+#: ../clutter/clutter-stage.c:2109
 msgid "Accept Focus"
 msgstr "Sprejmi žarišče"
 
-#: ../clutter/clutter-stage.c:2087
+#: ../clutter/clutter-stage.c:2110
 msgid "Whether the stage should accept focus on show"
 msgstr "Ali naj postavitev potrdi žarišče na prikazu"
 
-#: ../clutter/clutter-table-layout.c:543
-msgid "Column Number"
-msgstr "Številka stolpca"
-
-#: ../clutter/clutter-table-layout.c:544
-msgid "The column the widget resides in"
-msgstr "Stolpec v katerem je postavljen gradnik"
-
-#: ../clutter/clutter-table-layout.c:551
-msgid "Row Number"
-msgstr "Številka vrstice"
-
-#: ../clutter/clutter-table-layout.c:552
-msgid "The row the widget resides in"
-msgstr "Vrstica v kateri je postavljen gradnik"
-
-#: ../clutter/clutter-table-layout.c:559
-msgid "Column Span"
-msgstr "Razpon stolpca"
-
-#: ../clutter/clutter-table-layout.c:560
-msgid "The number of columns the widget should span"
-msgstr "Število stolpcev preko katerih je razpet gradnik"
-
-#: ../clutter/clutter-table-layout.c:567
-msgid "Row Span"
-msgstr "Razpon vrstice"
-
-#: ../clutter/clutter-table-layout.c:568
-msgid "The number of rows the widget should span"
-msgstr "Število vrstic preko katerih je razpet gradnik"
-
-#: ../clutter/clutter-table-layout.c:575
-msgid "Horizontal Expand"
-msgstr "Vodoravno razširjanje"
-
-#: ../clutter/clutter-table-layout.c:576
-msgid "Allocate extra space for the child in horizontal axis"
-msgstr "Dodeli dodaten prostor za podrejeni predmet na vodoravni osi"
-
-#: ../clutter/clutter-table-layout.c:582
-msgid "Vertical Expand"
-msgstr "Navpično razširjanje"
-
-#: ../clutter/clutter-table-layout.c:583
-msgid "Allocate extra space for the child in vertical axis"
-msgstr "Dodeli dodaten prostor za podrejeni predmet na navpični osi"
-
-#: ../clutter/clutter-table-layout.c:1638
-msgid "Spacing between columns"
-msgstr "razmik med stolpci"
-
-#: ../clutter/clutter-table-layout.c:1652
-msgid "Spacing between rows"
-msgstr "Razmik med vrsticami"
-
-#: ../clutter/clutter-text-buffer.c:351 ../clutter/clutter-text.c:3404
+#: ../clutter/clutter-text-buffer.c:347 ../clutter/clutter-text.c:3472
 msgid "Text"
 msgstr "Besedilo"
 
-#: ../clutter/clutter-text-buffer.c:352
+#: ../clutter/clutter-text-buffer.c:348
 msgid "The contents of the buffer"
 msgstr "Vsebina medpomnilnika"
 
-#: ../clutter/clutter-text-buffer.c:365
+#: ../clutter/clutter-text-buffer.c:361
 msgid "Text length"
 msgstr "Dolžina besedila"
 
-#: ../clutter/clutter-text-buffer.c:366
+#: ../clutter/clutter-text-buffer.c:362
 msgid "Length of the text currently in the buffer"
 msgstr "Dolžina besedila, ki je trenutno v medpomnilniku"
 
-#: ../clutter/clutter-text-buffer.c:379
+#: ../clutter/clutter-text-buffer.c:375
 msgid "Maximum length"
 msgstr "Največja dolžina"
 
-#: ../clutter/clutter-text-buffer.c:380
+#: ../clutter/clutter-text-buffer.c:376
 msgid "Maximum number of characters for this entry. Zero if no maximum"
 msgstr ""
 "Največje število znakov v tem vnosu. Vrednost nič določa neomejeno število."
 
-#: ../clutter/clutter-text.c:3351
+#: ../clutter/clutter-text.c:3419
 msgid "Buffer"
 msgstr "Medpomnilnik"
 
-#: ../clutter/clutter-text.c:3352
+#: ../clutter/clutter-text.c:3420
 msgid "The buffer for the text"
 msgstr "Medpomnilnik besedila"
 
-#: ../clutter/clutter-text.c:3370
+#: ../clutter/clutter-text.c:3438
 msgid "The font to be used by the text"
 msgstr "Pisava, ki jo uporablja besedilo"
 
-#: ../clutter/clutter-text.c:3387
+#: ../clutter/clutter-text.c:3455
 msgid "Font Description"
 msgstr "Opis pisave"
 
-#: ../clutter/clutter-text.c:3388
+#: ../clutter/clutter-text.c:3456
 msgid "The font description to be used"
 msgstr "Opis pisave, ki se uporablja"
 
-#: ../clutter/clutter-text.c:3405
+#: ../clutter/clutter-text.c:3473
 msgid "The text to render"
 msgstr "Besedilo, ki bo izrisano"
 
-#: ../clutter/clutter-text.c:3419
+#: ../clutter/clutter-text.c:3487
 msgid "Font Color"
 msgstr "Barva pisave"
 
-#: ../clutter/clutter-text.c:3420
+#: ../clutter/clutter-text.c:3488
 msgid "Color of the font used by the text"
 msgstr "Barva pisave, ki jo uporablja besedilo"
 
-#: ../clutter/clutter-text.c:3435
+#: ../clutter/clutter-text.c:3503
 msgid "Editable"
 msgstr "Uredljivo"
 
-#: ../clutter/clutter-text.c:3436
+#: ../clutter/clutter-text.c:3504
 msgid "Whether the text is editable"
 msgstr "Ali naj je besedilo uredljivo"
 
-#: ../clutter/clutter-text.c:3451
+#: ../clutter/clutter-text.c:3519
 msgid "Selectable"
 msgstr "Izberljivo"
 
-#: ../clutter/clutter-text.c:3452
+#: ../clutter/clutter-text.c:3520
 msgid "Whether the text is selectable"
 msgstr "Ali naj je besedilo izberljivo"
 
-#: ../clutter/clutter-text.c:3466
+#: ../clutter/clutter-text.c:3534
 msgid "Activatable"
 msgstr "Zagonljiv"
 
-#: ../clutter/clutter-text.c:3467
+#: ../clutter/clutter-text.c:3535
 msgid "Whether pressing return causes the activate signal to be emitted"
 msgstr "Ali naj se ob pritisku vračalke omogoči signal za oddajanje"
 
-#: ../clutter/clutter-text.c:3484
+#: ../clutter/clutter-text.c:3552
 msgid "Whether the input cursor is visible"
 msgstr "Ali naj je vnosni kazalec viden"
 
-#: ../clutter/clutter-text.c:3498 ../clutter/clutter-text.c:3499
+#: ../clutter/clutter-text.c:3566 ../clutter/clutter-text.c:3567
 msgid "Cursor Color"
 msgstr "Barva kazalce"
 
-#: ../clutter/clutter-text.c:3514
+#: ../clutter/clutter-text.c:3582
 msgid "Cursor Color Set"
 msgstr "Nastavitev barv kazalke"
 
-#: ../clutter/clutter-text.c:3515
+#: ../clutter/clutter-text.c:3583
 msgid "Whether the cursor color has been set"
 msgstr "Ali je bila barva kazalca nastavljena"
 
-#: ../clutter/clutter-text.c:3530
+#: ../clutter/clutter-text.c:3598
 msgid "Cursor Size"
 msgstr "Velikost kazalca"
 
-#: ../clutter/clutter-text.c:3531
+#: ../clutter/clutter-text.c:3599
 msgid "The width of the cursor, in pixels"
 msgstr "Širina kazalca, v slikovnih točkah"
 
-#: ../clutter/clutter-text.c:3547 ../clutter/clutter-text.c:3565
+#: ../clutter/clutter-text.c:3615 ../clutter/clutter-text.c:3633
 msgid "Cursor Position"
 msgstr "Položaj kazalca"
 
-#: ../clutter/clutter-text.c:3548 ../clutter/clutter-text.c:3566
+#: ../clutter/clutter-text.c:3616 ../clutter/clutter-text.c:3634
 msgid "The cursor position"
 msgstr "Položaj kazalca"
 
-#: ../clutter/clutter-text.c:3581
+#: ../clutter/clutter-text.c:3649
 msgid "Selection-bound"
 msgstr "Meja Izbora"
 
-#: ../clutter/clutter-text.c:3582
+#: ../clutter/clutter-text.c:3650
 msgid "The cursor position of the other end of the selection"
 msgstr "Položaj kazalke drugega konca izbora"
 
-#: ../clutter/clutter-text.c:3597 ../clutter/clutter-text.c:3598
+#: ../clutter/clutter-text.c:3665 ../clutter/clutter-text.c:3666
 msgid "Selection Color"
 msgstr "Barva izbora"
 
-#: ../clutter/clutter-text.c:3613
+#: ../clutter/clutter-text.c:3681
 msgid "Selection Color Set"
 msgstr "Nastavljena barva izbora"
 
-#: ../clutter/clutter-text.c:3614
+#: ../clutter/clutter-text.c:3682
 msgid "Whether the selection color has been set"
 msgstr "Ali je bila barva izbire nastavljena"
 
-#: ../clutter/clutter-text.c:3629
+#: ../clutter/clutter-text.c:3697
 msgid "Attributes"
 msgstr "Atributi"
 
-#: ../clutter/clutter-text.c:3630
+#: ../clutter/clutter-text.c:3698
 msgid "A list of style attributes to apply to the contents of the actor"
 msgstr "Seznam slogovnih atributov za uveljavitev vsebine predmeta"
 
-#: ../clutter/clutter-text.c:3652
+#: ../clutter/clutter-text.c:3720
 msgid "Use markup"
 msgstr "Uporabi označevanje"
 
-#: ../clutter/clutter-text.c:3653
+#: ../clutter/clutter-text.c:3721
 msgid "Whether or not the text includes Pango markup"
 msgstr "Ali naj besedilo vsebuje označevanje Pango"
 
-#: ../clutter/clutter-text.c:3669
+#: ../clutter/clutter-text.c:3737
 msgid "Line wrap"
 msgstr "Prelom vrstic"
 
-#: ../clutter/clutter-text.c:3670
+#: ../clutter/clutter-text.c:3738
 msgid "If set, wrap the lines if the text becomes too wide"
 msgstr "Izbrana možnost prelomi vrstice, če je besedilo preširoko"
 
-#: ../clutter/clutter-text.c:3685
+#: ../clutter/clutter-text.c:3753
 msgid "Line wrap mode"
 msgstr "Način preloma vrstic"
 
-#: ../clutter/clutter-text.c:3686
+#: ../clutter/clutter-text.c:3754
 msgid "Control how line-wrapping is done"
 msgstr "Nadzor preloma vrstic"
 
-#: ../clutter/clutter-text.c:3701
+#: ../clutter/clutter-text.c:3769
 msgid "Ellipsize"
 msgstr "Elipsiraj"
 
-#: ../clutter/clutter-text.c:3702
+#: ../clutter/clutter-text.c:3770
 msgid "The preferred place to ellipsize the string"
 msgstr "Prednostno mesto za elipsiranje niza"
 
-#: ../clutter/clutter-text.c:3718
+#: ../clutter/clutter-text.c:3786
 msgid "Line Alignment"
 msgstr "Poravnava vrstice"
 
-#: ../clutter/clutter-text.c:3719
+#: ../clutter/clutter-text.c:3787
 msgid "The preferred alignment for the string, for multi-line text"
 msgstr "Prednostna poravnava niza za večvrstično besedilo"
 
-#: ../clutter/clutter-text.c:3735
+#: ../clutter/clutter-text.c:3803
 msgid "Justify"
 msgstr "Obojestranska poravnava"
 
-#: ../clutter/clutter-text.c:3736
+#: ../clutter/clutter-text.c:3804
 msgid "Whether the text should be justified"
 msgstr "Ali naj je besedilo obojestransko poravnano"
 
-#: ../clutter/clutter-text.c:3751
+#: ../clutter/clutter-text.c:3819
 msgid "Password Character"
 msgstr "Lastnost gesla"
 
-#: ../clutter/clutter-text.c:3752
+#: ../clutter/clutter-text.c:3820
 msgid "If non-zero, use this character to display the actor's contents"
 msgstr ""
 "V kolikor vrednost ni nič, uporabi to lastnost za prikaz vsebine predmeta"
 
-#: ../clutter/clutter-text.c:3766
+#: ../clutter/clutter-text.c:3834
 msgid "Max Length"
 msgstr "Največja dolžina"
 
-#: ../clutter/clutter-text.c:3767
+#: ../clutter/clutter-text.c:3835
 msgid "Maximum length of the text inside the actor"
 msgstr "Največja dolžina besedila predmeta"
 
-#: ../clutter/clutter-text.c:3790
+#: ../clutter/clutter-text.c:3858
 msgid "Single Line Mode"
 msgstr "Enovrstični način"
 
-#: ../clutter/clutter-text.c:3791
+#: ../clutter/clutter-text.c:3859
 msgid "Whether the text should be a single line"
 msgstr "Ali naj je besedilo v eni vrstici"
 
-#: ../clutter/clutter-text.c:3805 ../clutter/clutter-text.c:3806
+#: ../clutter/clutter-text.c:3873 ../clutter/clutter-text.c:3874
 msgid "Selected Text Color"
 msgstr "Barva izbora"
 
-#: ../clutter/clutter-text.c:3821
+#: ../clutter/clutter-text.c:3889
 msgid "Selected Text Color Set"
 msgstr "Nastavljena barva izbora"
 
-#: ../clutter/clutter-text.c:3822
+#: ../clutter/clutter-text.c:3890
 msgid "Whether the selected text color has been set"
 msgstr "Ali je bila barva izbire nastavljena"
 
-#: ../clutter/clutter-timeline.c:561
-#: ../clutter/deprecated/clutter-animation.c:560
+#: ../clutter/clutter-timeline.c:591
+#: ../clutter/deprecated/clutter-animation.c:506
 msgid "Loop"
 msgstr "Zanka"
 
-#: ../clutter/clutter-timeline.c:562
+#: ../clutter/clutter-timeline.c:592
 msgid "Should the timeline automatically restart"
 msgstr "Ali naj se časovni potek samodejno ponovno zažene"
 
-#: ../clutter/clutter-timeline.c:576
+#: ../clutter/clutter-timeline.c:606
 msgid "Delay"
 msgstr "Časovni zamik"
 
-#: ../clutter/clutter-timeline.c:577
+#: ../clutter/clutter-timeline.c:607
 msgid "Delay before start"
 msgstr "Časovni zamik pred začetkom"
 
-#: ../clutter/clutter-timeline.c:592
-#: ../clutter/deprecated/clutter-animation.c:544
-#: ../clutter/deprecated/clutter-animator.c:1804
+#: ../clutter/clutter-timeline.c:622
+#: ../clutter/deprecated/clutter-animation.c:490
+#: ../clutter/deprecated/clutter-animator.c:1792
 #: ../clutter/deprecated/clutter-media.c:224
-#: ../clutter/deprecated/clutter-state.c:1523
+#: ../clutter/deprecated/clutter-state.c:1515
 msgid "Duration"
 msgstr "Trajanje"
 
-#: ../clutter/clutter-timeline.c:593
+#: ../clutter/clutter-timeline.c:623
 msgid "Duration of the timeline in milliseconds"
 msgstr "Trajanje časovnega poteka v milisekundah."
 
-#: ../clutter/clutter-timeline.c:608
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:528
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:337
+#: ../clutter/clutter-timeline.c:638
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:521
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:330
 msgid "Direction"
 msgstr "Smer"
 
-#: ../clutter/clutter-timeline.c:609
+#: ../clutter/clutter-timeline.c:639
 msgid "Direction of the timeline"
 msgstr "Smer časovnega poteka"
 
-#: ../clutter/clutter-timeline.c:624
+#: ../clutter/clutter-timeline.c:654
 msgid "Auto Reverse"
 msgstr "Samodejno obračanje"
 
-#: ../clutter/clutter-timeline.c:625
+#: ../clutter/clutter-timeline.c:655
 msgid "Whether the direction should be reversed when reaching the end"
 msgstr "Ali naj se smer obrne ob dosegu konca"
 
-#: ../clutter/clutter-timeline.c:643
+#: ../clutter/clutter-timeline.c:673
 msgid "Repeat Count"
 msgstr "Ponovi štetje"
 
-#: ../clutter/clutter-timeline.c:644
+#: ../clutter/clutter-timeline.c:674
 msgid "How many times the timeline should repeat"
 msgstr "Kolikokrat naj se časovnica ponovi"
 
-#: ../clutter/clutter-timeline.c:658
+#: ../clutter/clutter-timeline.c:688
 msgid "Progress Mode"
 msgstr "Način napredka"
 
-#: ../clutter/clutter-timeline.c:659
+#: ../clutter/clutter-timeline.c:689
 msgid "How the timeline should compute the progress"
 msgstr "Kako naj časovnica izračunava napredek opravila"
 
-#: ../clutter/clutter-transition.c:246
+#: ../clutter/clutter-transition.c:244
 msgid "Interval"
 msgstr "Razmik"
 
-#: ../clutter/clutter-transition.c:247
+#: ../clutter/clutter-transition.c:245
 msgid "The interval of values to transition"
 msgstr "Razmik vrednosti za prehod"
 
-#: ../clutter/clutter-transition.c:261
+#: ../clutter/clutter-transition.c:259
 msgid "Animatable"
 msgstr "Za animiranje"
 
-#: ../clutter/clutter-transition.c:262
+#: ../clutter/clutter-transition.c:260
 msgid "The animatable object"
 msgstr "Animiran predmet"
 
-#: ../clutter/clutter-transition.c:283
+#: ../clutter/clutter-transition.c:281
 msgid "Remove on Complete"
 msgstr "Odstrani po končanju"
 
-#: ../clutter/clutter-transition.c:284
+#: ../clutter/clutter-transition.c:282
 msgid "Detach the transition when completed"
 msgstr "Odstrani prehod po končanju"
 
-#: ../clutter/clutter-zoom-action.c:354
+#: ../clutter/clutter-zoom-action.c:365
 msgid "Zoom Axis"
 msgstr "Približaj po osi"
 
-#: ../clutter/clutter-zoom-action.c:355
+#: ../clutter/clutter-zoom-action.c:366
 msgid "Constraints the zoom to an axis"
 msgstr "Omeji približevanje na os"
 
-#: ../clutter/deprecated/clutter-alpha.c:355
-#: ../clutter/deprecated/clutter-animation.c:575
-#: ../clutter/deprecated/clutter-animator.c:1821
+#: ../clutter/deprecated/clutter-alpha.c:347
+#: ../clutter/deprecated/clutter-animation.c:521
+#: ../clutter/deprecated/clutter-animator.c:1809
 msgid "Timeline"
 msgstr "Časovnica"
 
-#: ../clutter/deprecated/clutter-alpha.c:356
+#: ../clutter/deprecated/clutter-alpha.c:348
 msgid "Timeline used by the alpha"
 msgstr "Časovnica, ki jo uporablja alfa"
 
-#: ../clutter/deprecated/clutter-alpha.c:372
+#: ../clutter/deprecated/clutter-alpha.c:364
 msgid "Alpha value"
 msgstr "Vrednost alfe"
 
-#: ../clutter/deprecated/clutter-alpha.c:373
+#: ../clutter/deprecated/clutter-alpha.c:365
 msgid "Alpha value as computed by the alpha"
 msgstr "Vrednost alfe je izračunana z alfo"
 
-#: ../clutter/deprecated/clutter-alpha.c:394
-#: ../clutter/deprecated/clutter-animation.c:528
+#: ../clutter/deprecated/clutter-alpha.c:386
+#: ../clutter/deprecated/clutter-animation.c:474
 msgid "Mode"
 msgstr "Način"
 
-#: ../clutter/deprecated/clutter-alpha.c:395
+#: ../clutter/deprecated/clutter-alpha.c:387
 msgid "Progress mode"
 msgstr "Način napredka"
 
-#: ../clutter/deprecated/clutter-animation.c:511
+#: ../clutter/deprecated/clutter-animation.c:457
 msgid "Object"
 msgstr "Objekt"
 
-#: ../clutter/deprecated/clutter-animation.c:512
+#: ../clutter/deprecated/clutter-animation.c:458
 msgid "Object to which the animation applies"
 msgstr "Predmet na katerega se animacija nanaša"
 
-#: ../clutter/deprecated/clutter-animation.c:529
+#: ../clutter/deprecated/clutter-animation.c:475
 msgid "The mode of the animation"
 msgstr "Način animacije"
 
-#: ../clutter/deprecated/clutter-animation.c:545
+#: ../clutter/deprecated/clutter-animation.c:491
 msgid "Duration of the animation, in milliseconds"
 msgstr "Trajanje animacije v milisekundah"
 
-#: ../clutter/deprecated/clutter-animation.c:561
+#: ../clutter/deprecated/clutter-animation.c:507
 msgid "Whether the animation should loop"
 msgstr "Ali naj se animacija ponavlja"
 
-#: ../clutter/deprecated/clutter-animation.c:576
+#: ../clutter/deprecated/clutter-animation.c:522
 msgid "The timeline used by the animation"
 msgstr "Časovnica, ki jo uporablja animacija"
 
-#: ../clutter/deprecated/clutter-animation.c:592
-#: ../clutter/deprecated/clutter-behaviour.c:241
+#: ../clutter/deprecated/clutter-animation.c:538
+#: ../clutter/deprecated/clutter-behaviour.c:237
 msgid "Alpha"
 msgstr "Alfa"
 
-#: ../clutter/deprecated/clutter-animation.c:593
+#: ../clutter/deprecated/clutter-animation.c:539
 msgid "The alpha used by the animation"
 msgstr "Alfa, ki jo uporablja animacija"
 
-#: ../clutter/deprecated/clutter-animator.c:1805
+#: ../clutter/deprecated/clutter-animator.c:1793
 msgid "The duration of the animation"
 msgstr "Trajanje animacije"
 
-#: ../clutter/deprecated/clutter-animator.c:1822
+#: ../clutter/deprecated/clutter-animator.c:1810
 msgid "The timeline of the animation"
 msgstr "Časovnica animacije"
 
-#: ../clutter/deprecated/clutter-behaviour.c:242
+#: ../clutter/deprecated/clutter-behaviour.c:238
 msgid "Alpha Object to drive the behaviour"
 msgstr "Alfa predmet za vodenje obnašanja"
 
-#: ../clutter/deprecated/clutter-behaviour-depth.c:182
+#: ../clutter/deprecated/clutter-behaviour-depth.c:180
 msgid "Start Depth"
 msgstr "Globina začetka"
 
-#: ../clutter/deprecated/clutter-behaviour-depth.c:183
+#: ../clutter/deprecated/clutter-behaviour-depth.c:181
 msgid "Initial depth to apply"
 msgstr "Začetna globina"
 
-#: ../clutter/deprecated/clutter-behaviour-depth.c:198
+#: ../clutter/deprecated/clutter-behaviour-depth.c:196
 msgid "End Depth"
 msgstr "Končna globina"
 
-#: ../clutter/deprecated/clutter-behaviour-depth.c:199
+#: ../clutter/deprecated/clutter-behaviour-depth.c:197
 msgid "Final depth to apply"
 msgstr "Končna globina"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:401
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:394
 msgid "Start Angle"
 msgstr "Začetni kot"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:402
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:284
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:395
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:277
 msgid "Initial angle"
 msgstr "Začetni kot"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:417
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:410
 msgid "End Angle"
 msgstr "Končni kot"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:418
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:302
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:411
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:295
 msgid "Final angle"
 msgstr "Končni kot kot"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:433
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:426
 msgid "Angle x tilt"
 msgstr "X nagib kota"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:434
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:427
 msgid "Tilt of the ellipse around x axis"
 msgstr "Nagib elipse okoli x osi"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:449
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:442
 msgid "Angle y tilt"
 msgstr "Y nagib kota"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:450
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:443
 msgid "Tilt of the ellipse around y axis"
 msgstr "Nagib elipse okoli y osi"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:465
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:458
 msgid "Angle z tilt"
 msgstr "Z nagib kota"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:466
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:459
 msgid "Tilt of the ellipse around z axis"
 msgstr "Nagib elipse okoli z osi"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:482
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:475
 msgid "Width of the ellipse"
 msgstr "Širina elipse"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:498
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:491
 msgid "Height of ellipse"
 msgstr "Višina elipse"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:513
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:506
 msgid "Center"
 msgstr "Središče"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:514
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:507
 msgid "Center of ellipse"
 msgstr "Središče elipse"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:529
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:338
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:522
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:331
 msgid "Direction of rotation"
 msgstr "Smer vrtenja"
 
-#: ../clutter/deprecated/clutter-behaviour-opacity.c:184
+#: ../clutter/deprecated/clutter-behaviour-opacity.c:177
 msgid "Opacity Start"
 msgstr "Začetna prekrivnost"
 
-#: ../clutter/deprecated/clutter-behaviour-opacity.c:185
+#: ../clutter/deprecated/clutter-behaviour-opacity.c:178
 msgid "Initial opacity level"
 msgstr "Začetna raven prekrivnosti"
 
-#: ../clutter/deprecated/clutter-behaviour-opacity.c:202
+#: ../clutter/deprecated/clutter-behaviour-opacity.c:195
 msgid "Opacity End"
 msgstr "Končna prekrivnost"
 
-#: ../clutter/deprecated/clutter-behaviour-opacity.c:203
+#: ../clutter/deprecated/clutter-behaviour-opacity.c:196
 msgid "Final opacity level"
 msgstr "Končna raven prekrivnosti"
 
-#: ../clutter/deprecated/clutter-behaviour-path.c:226
+#: ../clutter/deprecated/clutter-behaviour-path.c:222
 msgid "The ClutterPath object representing the path to animate along"
 msgstr "Predmet ClutterPath predstavlja pot za skupno animiranje"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:283
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:276
 msgid "Angle Begin"
 msgstr "Začetni kot"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:301
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:294
 msgid "Angle End"
 msgstr "Končni kot"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:319
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:312
 msgid "Axis"
 msgstr "Os"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:320
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:313
 msgid "Axis of rotation"
 msgstr "Os vrtenja"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:355
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:348
 msgid "Center X"
 msgstr "Središče X"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:356
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:349
 msgid "X coordinate of the center of rotation"
 msgstr "X koordinata središča vrtenja"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:373
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:366
 msgid "Center Y"
 msgstr "Središče Y"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:374
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:367
 msgid "Y coordinate of the center of rotation"
 msgstr "Y koordinata središča vrtenja"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:391
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:384
 msgid "Center Z"
 msgstr "Središče Z"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:392
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:385
 msgid "Z coordinate of the center of rotation"
 msgstr "Z koordinata središča vrtenja"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:226
+#: ../clutter/deprecated/clutter-behaviour-scale.c:222
 msgid "X Start Scale"
 msgstr "X začetna velikost"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:227
+#: ../clutter/deprecated/clutter-behaviour-scale.c:223
 msgid "Initial scale on the X axis"
 msgstr "Začetna velikost na X osi"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:245
+#: ../clutter/deprecated/clutter-behaviour-scale.c:241
 msgid "X End Scale"
 msgstr "X končno velikost"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:246
+#: ../clutter/deprecated/clutter-behaviour-scale.c:242
 msgid "Final scale on the X axis"
 msgstr "Končna velikost na X osi"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:264
+#: ../clutter/deprecated/clutter-behaviour-scale.c:260
 msgid "Y Start Scale"
 msgstr "Y začetna velikost"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:265
+#: ../clutter/deprecated/clutter-behaviour-scale.c:261
 msgid "Initial scale on the Y axis"
 msgstr "Začetna velikost na Y osi"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:283
+#: ../clutter/deprecated/clutter-behaviour-scale.c:279
 msgid "Y End Scale"
 msgstr "Y končna velikost"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:284
+#: ../clutter/deprecated/clutter-behaviour-scale.c:280
 msgid "Final scale on the Y axis"
 msgstr "Končna velikost na Y osi"
 
-#: ../clutter/deprecated/clutter-box.c:261
+#: ../clutter/deprecated/clutter-box.c:255
 msgid "The background color of the box"
 msgstr "Barva ozadja polja"
 
-#: ../clutter/deprecated/clutter-box.c:274
+#: ../clutter/deprecated/clutter-box.c:268
 msgid "Color Set"
 msgstr "Nabor barv"
 
-#: ../clutter/deprecated/clutter-cairo-texture.c:597
+#: ../clutter/deprecated/clutter-cairo-texture.c:585
 msgid "Surface Width"
 msgstr "Širina površine"
 
-#: ../clutter/deprecated/clutter-cairo-texture.c:598
+#: ../clutter/deprecated/clutter-cairo-texture.c:586
 msgid "The width of the Cairo surface"
 msgstr "Širina površine Cairo"
 
-#: ../clutter/deprecated/clutter-cairo-texture.c:615
+#: ../clutter/deprecated/clutter-cairo-texture.c:603
 msgid "Surface Height"
 msgstr "Višina površine"
 
-#: ../clutter/deprecated/clutter-cairo-texture.c:616
+#: ../clutter/deprecated/clutter-cairo-texture.c:604
 msgid "The height of the Cairo surface"
 msgstr "Višina površine Cairo"
 
-#: ../clutter/deprecated/clutter-cairo-texture.c:636
+#: ../clutter/deprecated/clutter-cairo-texture.c:624
 msgid "Auto Resize"
 msgstr "Samodejno prilagajanje velikosti"
 
-#: ../clutter/deprecated/clutter-cairo-texture.c:637
+#: ../clutter/deprecated/clutter-cairo-texture.c:625
 msgid "Whether the surface should match the allocation"
 msgstr "Ali naj se površina ujema z dodelitvijo"
 
@@ -2385,100 +2405,156 @@ msgstr "Raven zapolnjenosti pomnilnika"
 msgid "The duration of the stream, in seconds"
 msgstr "Trajanje pretoka v sekundah"
 
-#: ../clutter/deprecated/clutter-rectangle.c:274
+#: ../clutter/deprecated/clutter-rectangle.c:271
 msgid "The color of the rectangle"
 msgstr "Barva pravokotnika"
 
-#: ../clutter/deprecated/clutter-rectangle.c:287
+#: ../clutter/deprecated/clutter-rectangle.c:284
 msgid "Border Color"
 msgstr "Barva obrobe"
 
-#: ../clutter/deprecated/clutter-rectangle.c:288
+#: ../clutter/deprecated/clutter-rectangle.c:285
 msgid "The color of the border of the rectangle"
 msgstr "Barva obrobe pravokotnika"
 
-#: ../clutter/deprecated/clutter-rectangle.c:303
+#: ../clutter/deprecated/clutter-rectangle.c:300
 msgid "Border Width"
 msgstr "Širina obrobe"
 
-#: ../clutter/deprecated/clutter-rectangle.c:304
+#: ../clutter/deprecated/clutter-rectangle.c:301
 msgid "The width of the border of the rectangle"
 msgstr "Širina obrobe pravokotnika"
 
-#: ../clutter/deprecated/clutter-rectangle.c:318
+#: ../clutter/deprecated/clutter-rectangle.c:315
 msgid "Has Border"
 msgstr "Ima obrobo"
 
-#: ../clutter/deprecated/clutter-rectangle.c:319
+#: ../clutter/deprecated/clutter-rectangle.c:316
 msgid "Whether the rectangle should have a border"
 msgstr "Ali naj ima pravokotnik obrobo"
 
-#: ../clutter/deprecated/clutter-shader.c:261
+#: ../clutter/deprecated/clutter-shader.c:257
 msgid "Vertex Source"
 msgstr "Vir vrha"
 
-#: ../clutter/deprecated/clutter-shader.c:262
+#: ../clutter/deprecated/clutter-shader.c:258
 msgid "Source of vertex shader"
 msgstr "Vir vrha senčilnika"
 
-#: ../clutter/deprecated/clutter-shader.c:278
+#: ../clutter/deprecated/clutter-shader.c:274
 msgid "Fragment Source"
 msgstr "Vir kosa"
 
-#: ../clutter/deprecated/clutter-shader.c:279
+#: ../clutter/deprecated/clutter-shader.c:275
 msgid "Source of fragment shader"
 msgstr "Vir senčilnika kosa"
 
-#: ../clutter/deprecated/clutter-shader.c:296
+#: ../clutter/deprecated/clutter-shader.c:292
 msgid "Compiled"
 msgstr "Kodno prevedeno"
 
-#: ../clutter/deprecated/clutter-shader.c:297
+#: ../clutter/deprecated/clutter-shader.c:293
 msgid "Whether the shader is compiled and linked"
 msgstr "Ali je senčilnik kodno preveden in povezan"
 
-#: ../clutter/deprecated/clutter-shader.c:314
+#: ../clutter/deprecated/clutter-shader.c:310
 msgid "Whether the shader is enabled"
 msgstr "Ali je senčilnik omogočen"
 
-#: ../clutter/deprecated/clutter-shader.c:525
+#: ../clutter/deprecated/clutter-shader.c:521
 #, c-format
 msgid "%s compilation failed: %s"
 msgstr "prevajanje %s je spodletelo: %s"
 
-#: ../clutter/deprecated/clutter-shader.c:526
+#: ../clutter/deprecated/clutter-shader.c:522
 msgid "Vertex shader"
 msgstr "Senčenje vertex"
 
-#: ../clutter/deprecated/clutter-shader.c:527
+#: ../clutter/deprecated/clutter-shader.c:523
 msgid "Fragment shader"
 msgstr "Senčenje delcev"
 
-#: ../clutter/deprecated/clutter-state.c:1505
+#: ../clutter/deprecated/clutter-state.c:1497
 msgid "State"
 msgstr "Stanje"
 
-#: ../clutter/deprecated/clutter-state.c:1506
+#: ../clutter/deprecated/clutter-state.c:1498
 msgid "Currently set state, (transition to this state might not be complete)"
 msgstr "Trenutno nastavljeno stanje (prehod na to stanje morda ni popoln)"
 
-#: ../clutter/deprecated/clutter-state.c:1524
+#: ../clutter/deprecated/clutter-state.c:1516
 msgid "Default transition duration"
 msgstr "Privzeto trajanje prehoda"
 
-#: ../clutter/deprecated/clutter-texture.c:994
+#: ../clutter/deprecated/clutter-table-layout.c:535
+msgid "Column Number"
+msgstr "Številka stolpca"
+
+#: ../clutter/deprecated/clutter-table-layout.c:536
+msgid "The column the widget resides in"
+msgstr "Stolpec v katerem je postavljen gradnik"
+
+#: ../clutter/deprecated/clutter-table-layout.c:543
+msgid "Row Number"
+msgstr "Številka vrstice"
+
+#: ../clutter/deprecated/clutter-table-layout.c:544
+msgid "The row the widget resides in"
+msgstr "Vrstica v kateri je postavljen gradnik"
+
+#: ../clutter/deprecated/clutter-table-layout.c:551
+msgid "Column Span"
+msgstr "Razpon stolpca"
+
+#: ../clutter/deprecated/clutter-table-layout.c:552
+msgid "The number of columns the widget should span"
+msgstr "Število stolpcev preko katerih je razpet gradnik"
+
+#: ../clutter/deprecated/clutter-table-layout.c:559
+msgid "Row Span"
+msgstr "Razpon vrstice"
+
+#: ../clutter/deprecated/clutter-table-layout.c:560
+msgid "The number of rows the widget should span"
+msgstr "Število vrstic preko katerih je razpet gradnik"
+
+#: ../clutter/deprecated/clutter-table-layout.c:567
+msgid "Horizontal Expand"
+msgstr "Vodoravno razširjanje"
+
+#: ../clutter/deprecated/clutter-table-layout.c:568
+msgid "Allocate extra space for the child in horizontal axis"
+msgstr "Dodeli dodaten prostor za podrejeni predmet na vodoravni osi"
+
+#: ../clutter/deprecated/clutter-table-layout.c:574
+msgid "Vertical Expand"
+msgstr "Navpično razširjanje"
+
+#: ../clutter/deprecated/clutter-table-layout.c:575
+msgid "Allocate extra space for the child in vertical axis"
+msgstr "Dodeli dodaten prostor za podrejeni predmet na navpični osi"
+
+#: ../clutter/deprecated/clutter-table-layout.c:1630
+msgid "Spacing between columns"
+msgstr "razmik med stolpci"
+
+#: ../clutter/deprecated/clutter-table-layout.c:1646
+msgid "Spacing between rows"
+msgstr "Razmik med vrsticami"
+
+#: ../clutter/deprecated/clutter-texture.c:992
 msgid "Sync size of actor"
 msgstr "Velikost usklajevanja predmeta"
 
-#: ../clutter/deprecated/clutter-texture.c:995
+#: ../clutter/deprecated/clutter-texture.c:993
 msgid "Auto sync size of actor to underlying pixbuf dimensions"
 msgstr "Samodejna velikost usklajevanja predmeta za podpornih mer bitnih slik"
 
-#: ../clutter/deprecated/clutter-texture.c:1002
+#: ../clutter/deprecated/clutter-texture.c:1000
 msgid "Disable Slicing"
 msgstr "Onemogoči razrezovanje"
 
-#: ../clutter/deprecated/clutter-texture.c:1003
+#: ../clutter/deprecated/clutter-texture.c:1001
 msgid ""
 "Forces the underlying texture to be singular and not made of smaller space "
 "saving individual textures"
@@ -2486,73 +2562,73 @@ msgstr ""
 "Vsili, da je spodnja tekstura posamezna in ni sestavljena in manjših "
 "posameznih tekstur, ki prihranijo prostor"
 
-#: ../clutter/deprecated/clutter-texture.c:1012
+#: ../clutter/deprecated/clutter-texture.c:1010
 msgid "Tile Waste"
 msgstr "Odvečne ploščice"
 
-#: ../clutter/deprecated/clutter-texture.c:1013
+#: ../clutter/deprecated/clutter-texture.c:1011
 msgid "Maximum waste area of a sliced texture"
 msgstr "Največje odvečno področje razrezane teksture"
 
-#: ../clutter/deprecated/clutter-texture.c:1021
+#: ../clutter/deprecated/clutter-texture.c:1019
 msgid "Horizontal repeat"
 msgstr "Vodoravno ponavljanje"
 
-#: ../clutter/deprecated/clutter-texture.c:1022
+#: ../clutter/deprecated/clutter-texture.c:1020
 msgid "Repeat the contents rather than scaling them horizontally"
 msgstr "Ponovi vsebino namesto vodoravnega raztegovanja"
 
-#: ../clutter/deprecated/clutter-texture.c:1029
+#: ../clutter/deprecated/clutter-texture.c:1027
 msgid "Vertical repeat"
 msgstr "Navpično ponavljanje"
 
-#: ../clutter/deprecated/clutter-texture.c:1030
+#: ../clutter/deprecated/clutter-texture.c:1028
 msgid "Repeat the contents rather than scaling them vertically"
 msgstr "Ponovi vsebino namesto navpičnega raztegovanja"
 
-#: ../clutter/deprecated/clutter-texture.c:1037
+#: ../clutter/deprecated/clutter-texture.c:1035
 msgid "Filter Quality"
 msgstr "Kvaliteta filtra"
 
-#: ../clutter/deprecated/clutter-texture.c:1038
+#: ../clutter/deprecated/clutter-texture.c:1036
 msgid "Rendering quality used when drawing the texture"
 msgstr "Kakovost izrisovanja, ki se uporabi pri izrisu teksture"
 
-#: ../clutter/deprecated/clutter-texture.c:1046
+#: ../clutter/deprecated/clutter-texture.c:1044
 msgid "Pixel Format"
 msgstr "Oblika točke"
 
-#: ../clutter/deprecated/clutter-texture.c:1047
+#: ../clutter/deprecated/clutter-texture.c:1045
 msgid "The Cogl pixel format to use"
 msgstr "Oblike točke Cogl za uporabo"
 
-#: ../clutter/deprecated/clutter-texture.c:1055
-#: ../clutter/wayland/clutter-wayland-surface.c:449
+#: ../clutter/deprecated/clutter-texture.c:1053
+#: ../clutter/wayland/clutter-wayland-surface.c:445
 msgid "Cogl Texture"
 msgstr "Tekstura Cogl"
 
-#: ../clutter/deprecated/clutter-texture.c:1056
-#: ../clutter/wayland/clutter-wayland-surface.c:450
+#: ../clutter/deprecated/clutter-texture.c:1054
+#: ../clutter/wayland/clutter-wayland-surface.c:446
 msgid "The underlying Cogl texture handle used to draw this actor"
 msgstr "Podporni ročnik teksture Cogl za izris tega predmeta"
 
-#: ../clutter/deprecated/clutter-texture.c:1063
+#: ../clutter/deprecated/clutter-texture.c:1061
 msgid "Cogl Material"
 msgstr "Material Cogl"
 
-#: ../clutter/deprecated/clutter-texture.c:1064
+#: ../clutter/deprecated/clutter-texture.c:1062
 msgid "The underlying Cogl material handle used to draw this actor"
 msgstr "Podporni ročnik materiala Cogl za izris tega predmeta"
 
-#: ../clutter/deprecated/clutter-texture.c:1083
+#: ../clutter/deprecated/clutter-texture.c:1081
 msgid "The path of the file containing the image data"
 msgstr "Pot do datoteke, ki vsebuje podatke o sliki"
 
-#: ../clutter/deprecated/clutter-texture.c:1090
+#: ../clutter/deprecated/clutter-texture.c:1088
 msgid "Keep Aspect Ratio"
 msgstr "Ohrani razmerje velikosti"
 
-#: ../clutter/deprecated/clutter-texture.c:1091
+#: ../clutter/deprecated/clutter-texture.c:1089
 msgid ""
 "Keep the aspect ratio of the texture when requesting the preferred width or "
 "height"
@@ -2560,21 +2636,21 @@ msgstr ""
 "Obdrži razmerje velikosti teksture pri zahtevanju prednostne širine ali "
 "višine"
 
-#: ../clutter/deprecated/clutter-texture.c:1119
+#: ../clutter/deprecated/clutter-texture.c:1117
 msgid "Load asynchronously"
 msgstr "Naloži asinhrono"
 
-#: ../clutter/deprecated/clutter-texture.c:1120
+#: ../clutter/deprecated/clutter-texture.c:1118
 msgid ""
 "Load files inside a thread to avoid blocking when loading images from disk"
 msgstr ""
 "Naloži datoteke v nit za izogibanje blokiranja pri nalaganju slik z diska"
 
-#: ../clutter/deprecated/clutter-texture.c:1138
+#: ../clutter/deprecated/clutter-texture.c:1136
 msgid "Load data asynchronously"
 msgstr "Naloži podatke asinhrono"
 
-#: ../clutter/deprecated/clutter-texture.c:1139
+#: ../clutter/deprecated/clutter-texture.c:1137
 msgid ""
 "Decode image data files inside a thread to reduce blocking when loading "
 "images from disk"
@@ -2582,193 +2658,189 @@ msgstr ""
 "Dekodiraj sliko podatkovnih datotek v niti za zmanjšanje oviranja med "
 "nalaganjem slik z diska"
 
-#: ../clutter/deprecated/clutter-texture.c:1165
+#: ../clutter/deprecated/clutter-texture.c:1163
 msgid "Pick With Alpha"
 msgstr "Izbira z alfo"
 
-#: ../clutter/deprecated/clutter-texture.c:1166
+#: ../clutter/deprecated/clutter-texture.c:1164
 msgid "Shape actor with alpha channel when picking"
 msgstr "Predmet oblike s kanalom alfa pri izbiranju"
 
-#: ../clutter/deprecated/clutter-texture.c:1599
-#: ../clutter/deprecated/clutter-texture.c:1994
-#: ../clutter/deprecated/clutter-texture.c:2090
-#: ../clutter/deprecated/clutter-texture.c:2388
+#: ../clutter/deprecated/clutter-texture.c:1597
+#: ../clutter/deprecated/clutter-texture.c:1992
+#: ../clutter/deprecated/clutter-texture.c:2088
+#: ../clutter/deprecated/clutter-texture.c:2386
 #, c-format
 msgid "Failed to load the image data"
 msgstr "Nalaganje podatkov slike je spodletelo"
 
-#: ../clutter/deprecated/clutter-texture.c:1758
+#: ../clutter/deprecated/clutter-texture.c:1756
 #, c-format
 msgid "YUV textures are not supported"
 msgstr "Teksture YUV niso podprte"
 
-#: ../clutter/deprecated/clutter-texture.c:1767
+#: ../clutter/deprecated/clutter-texture.c:1765
 #, c-format
 msgid "YUV2 textues are not supported"
 msgstr "Teksture YUV2 niso podprte"
 
-#: ../clutter/evdev/clutter-input-device-evdev.c:159
-msgid "sysfs Path"
-msgstr "Pot do sysfs"
-
-#: ../clutter/evdev/clutter-input-device-evdev.c:160
-msgid "Path of the device in sysfs"
-msgstr "Pot do naprave v sysfs"
-
-#: ../clutter/evdev/clutter-input-device-evdev.c:175
-msgid "Device Path"
-msgstr "Pot naprave"
-
-#: ../clutter/evdev/clutter-input-device-evdev.c:176
-msgid "Path of the device node"
-msgstr "Pot do vozlišča naprave"
-
-#: ../clutter/gdk/clutter-backend-gdk.c:296
+#: ../clutter/gdk/clutter-backend-gdk.c:289
 #, c-format
 msgid "Could not find a suitable CoglWinsys for a GdkDisplay of type %s"
 msgstr "Ni mogoče najti ustreznega predmeta CoglWinsys za vrsto GdkDisplay %s"
 
-#: ../clutter/wayland/clutter-wayland-surface.c:423
+#: ../clutter/wayland/clutter-wayland-surface.c:419
 msgid "Surface"
 msgstr "Površina"
 
-#: ../clutter/wayland/clutter-wayland-surface.c:424
+#: ../clutter/wayland/clutter-wayland-surface.c:420
 msgid "The underlying wayland surface"
 msgstr "Podporna površina wayland"
 
-#: ../clutter/wayland/clutter-wayland-surface.c:431
+#: ../clutter/wayland/clutter-wayland-surface.c:427
 msgid "Surface width"
 msgstr "Širina površine"
 
-#: ../clutter/wayland/clutter-wayland-surface.c:432
+#: ../clutter/wayland/clutter-wayland-surface.c:428
 msgid "The width of the underlying wayland surface"
 msgstr "Širina podporne površine wayland"
 
-#: ../clutter/wayland/clutter-wayland-surface.c:440
+#: ../clutter/wayland/clutter-wayland-surface.c:436
 msgid "Surface height"
 msgstr "Višina površine"
 
-#: ../clutter/wayland/clutter-wayland-surface.c:441
+#: ../clutter/wayland/clutter-wayland-surface.c:437
 msgid "The height of the underlying wayland surface"
 msgstr "Višina podporne površine wayland"
 
-#: ../clutter/x11/clutter-backend-x11.c:516
+#: ../clutter/x11/clutter-backend-x11.c:488
 msgid "X display to use"
 msgstr "Zaslon X, ki naj bo uporabljen"
 
-#: ../clutter/x11/clutter-backend-x11.c:522
+#: ../clutter/x11/clutter-backend-x11.c:494
 msgid "X screen to use"
 msgstr "Zaslon X, ki naj bo uporabljen"
 
-#: ../clutter/x11/clutter-backend-x11.c:527
+#: ../clutter/x11/clutter-backend-x11.c:499
 msgid "Make X calls synchronous"
 msgstr "Časovno uskladi klice X"
 
-#: ../clutter/x11/clutter-backend-x11.c:534
+#: ../clutter/x11/clutter-backend-x11.c:506
 msgid "Disable XInput support"
 msgstr "Onemogoči podporo XInput"
 
-#: ../clutter/x11/clutter-keymap-x11.c:317
+#: ../clutter/x11/clutter-keymap-x11.c:458
 msgid "The Clutter backend"
 msgstr "Ozadnji program Clutter"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:539
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:534
 msgid "Pixmap"
 msgstr "Sličica"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:540
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:535
 msgid "The X11 Pixmap to be bound"
 msgstr "Večbitna sličica X11 za vezavo"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:548
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:543
 msgid "Pixmap width"
 msgstr "Širina sličice"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:549
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:544
 msgid "The width of the pixmap bound to this texture"
 msgstr "Širina večbitne sličice za vezavo na to teksturo"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:557
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:552
 msgid "Pixmap height"
 msgstr "Višina sličice"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:558
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:553
 msgid "The height of the pixmap bound to this texture"
 msgstr "Višina večbitne sličice za vezavo na to teksturo"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:566
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:561
 msgid "Pixmap Depth"
 msgstr "Globina sličice"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:567
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:562
 msgid "The depth (in number of bits) of the pixmap bound to this texture"
 msgstr "Globina (v bitih) večbitne sličice, ki je vezana na to teksturo"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:575
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:570
 msgid "Automatic Updates"
 msgstr "Samodejno posodabljanje"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:576
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:571
 msgid "If the texture should be kept in sync with any pixmap changes."
 msgstr ""
 "Ali naj se tekstura obdrži usklajena z morebitnimi spremembami večbitnih "
 "sličic."
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:584
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:579
 msgid "Window"
 msgstr "Okno"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:585
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:580
 msgid "The X11 Window to be bound"
 msgstr "Okno X11 za vezavo"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:593
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:588
 msgid "Window Redirect Automatic"
 msgstr "Samodejna preusmeritev okna"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:594
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:589
 msgid "If composite window redirects are set to Automatic (or Manual if false)"
 msgstr ""
 "Ali so preusmeritve sestavljenega okna nastavljene na samodejne (ali ročne, "
 "če je napak)"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:604
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:599
 msgid "Window Mapped"
 msgstr "Preslikave okna"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:605
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:600
 msgid "If window is mapped"
 msgstr "Ali je okno preslikano"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:614
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:609
 msgid "Destroyed"
 msgstr "Uničeno"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:615
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:610
 msgid "If window has been destroyed"
 msgstr "Ali je okno uničeno"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:623
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:618
 msgid "Window X"
 msgstr "Okno X"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:624
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:619
 msgid "X position of window on screen according to X11"
 msgstr "X položaj okna na zaslonu, kot ga opredeli X11"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:632
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:627
 msgid "Window Y"
 msgstr "Okno Y"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:633
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:628
 msgid "Y position of window on screen according to X11"
 msgstr "Y položaj okna na zaslonu, kot ga opredeli X11"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:640
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:635
 msgid "Window Override Redirect"
 msgstr "Preusmeritev prepisa okna"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:641
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:636
 msgid "If this is an override-redirect window"
 msgstr "Ali je to okno preusmeritve prepisa"
+
+#~ msgid "sysfs Path"
+#~ msgstr "Pot do sysfs"
+
+#~ msgid "Path of the device in sysfs"
+#~ msgstr "Pot do naprave v sysfs"
+
+#~ msgid "Device Path"
+#~ msgstr "Pot naprave"
+
+#~ msgid "Path of the device node"
+#~ msgstr "Pot do vozlišča naprave"
diff --git a/po/sr.po b/po/sr.po
index 9f7619323..f18ba6a39 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -1,14 +1,14 @@
 # Serbian translation for clutter.
 # Copyright (C) 2011 clutter's COPYRIGHT HOLDER
 # This file is distributed under the same license as the clutter package.
-# Мирослав Николић <miroslavnikolic@rocketmail.com>, 2011, 2012, 2013.
+# Мирослав Николић <miroslavnikolic@rocketmail.com>, 2011—2014.
 msgid ""
 msgstr ""
 "Project-Id-Version: clutter master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=clutte"
 "r&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2012-12-18 02:00+0000\n"
-"PO-Revision-Date: 2013-01-18 10:01+0200\n"
+"POT-Creation-Date: 2014-02-24 16:09+0000\n"
+"PO-Revision-Date: 2014-02-24 22:38+0200\n"
 "Last-Translator: Мирослав Николић <miroslavnikolic@rocketmail.com>\n"
 "Language-Team: Serbian <gnom@prevod.org>\n"
 "Language: sr\n"
@@ -19,690 +19,690 @@ msgstr ""
 "n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 "X-Project-Style: gnome\n"
 
-#: ../clutter/clutter-actor.c:6144
+#: ../clutter/clutter-actor.c:6214
 msgid "X coordinate"
 msgstr "X координата"
 
-#: ../clutter/clutter-actor.c:6145
+#: ../clutter/clutter-actor.c:6215
 msgid "X coordinate of the actor"
 msgstr "X координата чиниоца"
 
-#: ../clutter/clutter-actor.c:6163
+#: ../clutter/clutter-actor.c:6233
 msgid "Y coordinate"
 msgstr "Y координата"
 
-#: ../clutter/clutter-actor.c:6164
+#: ../clutter/clutter-actor.c:6234
 msgid "Y coordinate of the actor"
 msgstr "Y координата чиниоца"
 
-#: ../clutter/clutter-actor.c:6186
+#: ../clutter/clutter-actor.c:6256
 msgid "Position"
 msgstr "Положај"
 
-#: ../clutter/clutter-actor.c:6187
+#: ../clutter/clutter-actor.c:6257
 msgid "The position of the origin of the actor"
 msgstr "Положај порекла чиниоца"
 
-#: ../clutter/clutter-actor.c:6204 ../clutter/clutter-canvas.c:215
-#: ../clutter/clutter-grid-layout.c:1238
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:481
+#: ../clutter/clutter-actor.c:6274 ../clutter/clutter-canvas.c:247
+#: ../clutter/clutter-grid-layout.c:1239
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:474
 msgid "Width"
 msgstr "Ширина"
 
-#: ../clutter/clutter-actor.c:6205
+#: ../clutter/clutter-actor.c:6275
 msgid "Width of the actor"
 msgstr "Ширина чиниоца"
 
-#: ../clutter/clutter-actor.c:6223 ../clutter/clutter-canvas.c:231
-#: ../clutter/clutter-grid-layout.c:1245
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:497
+#: ../clutter/clutter-actor.c:6293 ../clutter/clutter-canvas.c:263
+#: ../clutter/clutter-grid-layout.c:1246
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:490
 msgid "Height"
 msgstr "Висина"
 
-#: ../clutter/clutter-actor.c:6224
+#: ../clutter/clutter-actor.c:6294
 msgid "Height of the actor"
 msgstr "Висина чиниоца"
 
-#: ../clutter/clutter-actor.c:6245
+#: ../clutter/clutter-actor.c:6315
 msgid "Size"
 msgstr "Величина"
 
-#: ../clutter/clutter-actor.c:6246
+#: ../clutter/clutter-actor.c:6316
 msgid "The size of the actor"
 msgstr "Величина чиниоца"
 
-#: ../clutter/clutter-actor.c:6264
+#: ../clutter/clutter-actor.c:6334
 msgid "Fixed X"
 msgstr "Утврђено Х"
 
-#: ../clutter/clutter-actor.c:6265
+#: ../clutter/clutter-actor.c:6335
 msgid "Forced X position of the actor"
 msgstr "Присиљени X положај чиниоца"
 
-#: ../clutter/clutter-actor.c:6282
+#: ../clutter/clutter-actor.c:6352
 msgid "Fixed Y"
 msgstr "Утврђено Y"
 
-#: ../clutter/clutter-actor.c:6283
+#: ../clutter/clutter-actor.c:6353
 msgid "Forced Y position of the actor"
 msgstr "Присиљени Y положај чиниоца"
 
-#: ../clutter/clutter-actor.c:6298
+#: ../clutter/clutter-actor.c:6368
 msgid "Fixed position set"
 msgstr "Подешавање утврђеног положаја"
 
-#: ../clutter/clutter-actor.c:6299
+#: ../clutter/clutter-actor.c:6369
 msgid "Whether to use fixed positioning for the actor"
 msgstr "Да ли ће бити коришћено утврђено постављање чиниоца"
 
-#: ../clutter/clutter-actor.c:6317
+#: ../clutter/clutter-actor.c:6387
 msgid "Min Width"
 msgstr "Најмања ширина"
 
-#: ../clutter/clutter-actor.c:6318
+#: ../clutter/clutter-actor.c:6388
 msgid "Forced minimum width request for the actor"
 msgstr "Присиљена најмања ширина захтевана за чиниоца"
 
-#: ../clutter/clutter-actor.c:6336
+#: ../clutter/clutter-actor.c:6406
 msgid "Min Height"
 msgstr "Најмања висина"
 
-#: ../clutter/clutter-actor.c:6337
+#: ../clutter/clutter-actor.c:6407
 msgid "Forced minimum height request for the actor"
 msgstr "Присиљена најмања висина захтевана за чиниоца"
 
-#: ../clutter/clutter-actor.c:6355
+#: ../clutter/clutter-actor.c:6425
 msgid "Natural Width"
 msgstr "Уобичајена ширина"
 
-#: ../clutter/clutter-actor.c:6356
+#: ../clutter/clutter-actor.c:6426
 msgid "Forced natural width request for the actor"
 msgstr "Присиљена уобичајена ширина захтевана за чиниоца"
 
-#: ../clutter/clutter-actor.c:6374
+#: ../clutter/clutter-actor.c:6444
 msgid "Natural Height"
 msgstr "Уобичајена висина"
 
-#: ../clutter/clutter-actor.c:6375
+#: ../clutter/clutter-actor.c:6445
 msgid "Forced natural height request for the actor"
 msgstr "Присиљена уобичајена висина захтевана за чиниоца"
 
-#: ../clutter/clutter-actor.c:6390
+#: ../clutter/clutter-actor.c:6460
 msgid "Minimum width set"
 msgstr "Подешавање најмање ширине"
 
-#: ../clutter/clutter-actor.c:6391
+#: ../clutter/clutter-actor.c:6461
 msgid "Whether to use the min-width property"
 msgstr "Да ли ће бити коришћено својство најмање ширине"
 
-#: ../clutter/clutter-actor.c:6405
+#: ../clutter/clutter-actor.c:6475
 msgid "Minimum height set"
 msgstr "Подешавање најмање висине"
 
-#: ../clutter/clutter-actor.c:6406
+#: ../clutter/clutter-actor.c:6476
 msgid "Whether to use the min-height property"
 msgstr "Да ли ће бити коришћено својство најмање висине"
 
-#: ../clutter/clutter-actor.c:6420
+#: ../clutter/clutter-actor.c:6490
 msgid "Natural width set"
 msgstr "Подешавање уобичајене ширине"
 
-#: ../clutter/clutter-actor.c:6421
+#: ../clutter/clutter-actor.c:6491
 msgid "Whether to use the natural-width property"
 msgstr "Да ли ће бити коришћено својство уобичајене ширине"
 
-#: ../clutter/clutter-actor.c:6435
+#: ../clutter/clutter-actor.c:6505
 msgid "Natural height set"
 msgstr "Подешавање уобичајене висине"
 
-#: ../clutter/clutter-actor.c:6436
+#: ../clutter/clutter-actor.c:6506
 msgid "Whether to use the natural-height property"
 msgstr "Да ли ће бити коришћено својство уобичајене висине"
 
-#: ../clutter/clutter-actor.c:6452
+#: ../clutter/clutter-actor.c:6522
 msgid "Allocation"
 msgstr "Распоређивање"
 
-#: ../clutter/clutter-actor.c:6453
+#: ../clutter/clutter-actor.c:6523
 msgid "The actor's allocation"
 msgstr "Распоређивање чиниоца"
 
-#: ../clutter/clutter-actor.c:6510
+#: ../clutter/clutter-actor.c:6580
 msgid "Request Mode"
 msgstr "Режим захтева"
 
-#: ../clutter/clutter-actor.c:6511
+#: ../clutter/clutter-actor.c:6581
 msgid "The actor's request mode"
 msgstr "Режим захтева чиниоца"
 
-#: ../clutter/clutter-actor.c:6535
+#: ../clutter/clutter-actor.c:6605
 msgid "Depth"
 msgstr "Дубина"
 
-#: ../clutter/clutter-actor.c:6536
+#: ../clutter/clutter-actor.c:6606
 msgid "Position on the Z axis"
 msgstr "Положај на Z оси"
 
-#: ../clutter/clutter-actor.c:6563
+#: ../clutter/clutter-actor.c:6633
 msgid "Z Position"
 msgstr "Z положај"
 
-#: ../clutter/clutter-actor.c:6564
+#: ../clutter/clutter-actor.c:6634
 msgid "The actor's position on the Z axis"
 msgstr "Положај чиниоца на Z оси"
 
-#: ../clutter/clutter-actor.c:6581
+#: ../clutter/clutter-actor.c:6651
 msgid "Opacity"
 msgstr "Непровидност"
 
-#: ../clutter/clutter-actor.c:6582
+#: ../clutter/clutter-actor.c:6652
 msgid "Opacity of an actor"
 msgstr "Непровидност чиниоца"
 
-#: ../clutter/clutter-actor.c:6602
+#: ../clutter/clutter-actor.c:6672
 msgid "Offscreen redirect"
 msgstr "Преусмеравање ван екрана"
 
-#: ../clutter/clutter-actor.c:6603
+#: ../clutter/clutter-actor.c:6673
 msgid "Flags controlling when to flatten the actor into a single image"
 msgstr "Опције које контролишу када ће чинилац бити изравнат у једну слику"
 
-#: ../clutter/clutter-actor.c:6617
+#: ../clutter/clutter-actor.c:6687
 msgid "Visible"
 msgstr "Видљив"
 
-#: ../clutter/clutter-actor.c:6618
+#: ../clutter/clutter-actor.c:6688
 msgid "Whether the actor is visible or not"
 msgstr "Да ли ће чинилац бити видљив или не"
 
-#: ../clutter/clutter-actor.c:6632
+#: ../clutter/clutter-actor.c:6702
 msgid "Mapped"
 msgstr "Мапиран"
 
-#: ../clutter/clutter-actor.c:6633
+#: ../clutter/clutter-actor.c:6703
 msgid "Whether the actor will be painted"
 msgstr "Да ли ће чинилац бити обојен"
 
-#: ../clutter/clutter-actor.c:6646
+#: ../clutter/clutter-actor.c:6716
 msgid "Realized"
 msgstr "Остварен"
 
-#: ../clutter/clutter-actor.c:6647
+#: ../clutter/clutter-actor.c:6717
 msgid "Whether the actor has been realized"
 msgstr "Да ли ће чинилац бити остварен"
 
-#: ../clutter/clutter-actor.c:6662
+#: ../clutter/clutter-actor.c:6732
 msgid "Reactive"
 msgstr "Реактиван"
 
-#: ../clutter/clutter-actor.c:6663
+#: ../clutter/clutter-actor.c:6733
 msgid "Whether the actor is reactive to events"
 msgstr "Да ли ће чинилац бити осетљив на догађаје"
 
-#: ../clutter/clutter-actor.c:6674
+#: ../clutter/clutter-actor.c:6744
 msgid "Has Clip"
 msgstr "Поседује исецање"
 
-#: ../clutter/clutter-actor.c:6675
+#: ../clutter/clutter-actor.c:6745
 msgid "Whether the actor has a clip set"
 msgstr "Да ли чинилац има подешено исецање"
 
-#: ../clutter/clutter-actor.c:6688
+#: ../clutter/clutter-actor.c:6758
 msgid "Clip"
 msgstr "Исецање"
 
-#: ../clutter/clutter-actor.c:6689
+#: ../clutter/clutter-actor.c:6759
 msgid "The clip region for the actor"
 msgstr "Област исецања за чиниоца"
 
-#: ../clutter/clutter-actor.c:6708
+#: ../clutter/clutter-actor.c:6778
 msgid "Clip Rectangle"
 msgstr "Правоугаоник исецања"
 
-#: ../clutter/clutter-actor.c:6709
+#: ../clutter/clutter-actor.c:6779
 msgid "The visible region of the actor"
 msgstr "Видљива област чиниоца"
 
-#: ../clutter/clutter-actor.c:6723 ../clutter/clutter-actor-meta.c:207
-#: ../clutter/clutter-binding-pool.c:319 ../clutter/clutter-input-device.c:258
+#: ../clutter/clutter-actor.c:6793 ../clutter/clutter-actor-meta.c:205
+#: ../clutter/clutter-binding-pool.c:319 ../clutter/clutter-input-device.c:247
 msgid "Name"
 msgstr "Назив"
 
-#: ../clutter/clutter-actor.c:6724
+#: ../clutter/clutter-actor.c:6794
 msgid "Name of the actor"
 msgstr "Назив чиниоца"
 
-#: ../clutter/clutter-actor.c:6745
+#: ../clutter/clutter-actor.c:6815
 msgid "Pivot Point"
 msgstr "Тачка обртања"
 
-#: ../clutter/clutter-actor.c:6746
+#: ../clutter/clutter-actor.c:6816
 msgid "The point around which the scaling and rotation occur"
 msgstr "Тачка око које се одигравају размеравање и обртање"
 
-#: ../clutter/clutter-actor.c:6764
+#: ../clutter/clutter-actor.c:6834
 msgid "Pivot Point Z"
 msgstr "Z тачка обртања"
 
-#: ../clutter/clutter-actor.c:6765
+#: ../clutter/clutter-actor.c:6835
 msgid "Z component of the pivot point"
 msgstr "Z део тачке обртања"
 
-#: ../clutter/clutter-actor.c:6783
+#: ../clutter/clutter-actor.c:6853
 msgid "Scale X"
 msgstr "X размера"
 
-#: ../clutter/clutter-actor.c:6784
+#: ../clutter/clutter-actor.c:6854
 msgid "Scale factor on the X axis"
 msgstr "Фактор размере на X оси"
 
-#: ../clutter/clutter-actor.c:6802
+#: ../clutter/clutter-actor.c:6872
 msgid "Scale Y"
 msgstr "Y размера"
 
-#: ../clutter/clutter-actor.c:6803
+#: ../clutter/clutter-actor.c:6873
 msgid "Scale factor on the Y axis"
 msgstr "Фактор размере на Y оси"
 
-#: ../clutter/clutter-actor.c:6821
+#: ../clutter/clutter-actor.c:6891
 msgid "Scale Z"
 msgstr "Z размера"
 
-#: ../clutter/clutter-actor.c:6822
+#: ../clutter/clutter-actor.c:6892
 msgid "Scale factor on the Z axis"
 msgstr "Фактор размере на Z оси"
 
-#: ../clutter/clutter-actor.c:6840
+#: ../clutter/clutter-actor.c:6910
 msgid "Scale Center X"
 msgstr "Средиште X размере"
 
-#: ../clutter/clutter-actor.c:6841
+#: ../clutter/clutter-actor.c:6911
 msgid "Horizontal scale center"
 msgstr "Средиште водоравне размере"
 
-#: ../clutter/clutter-actor.c:6859
+#: ../clutter/clutter-actor.c:6929
 msgid "Scale Center Y"
 msgstr "Средиште Y размере"
 
-#: ../clutter/clutter-actor.c:6860
+#: ../clutter/clutter-actor.c:6930
 msgid "Vertical scale center"
 msgstr "Средиште усправне размере"
 
-#: ../clutter/clutter-actor.c:6878
+#: ../clutter/clutter-actor.c:6948
 msgid "Scale Gravity"
 msgstr "Тежиште размере"
 
-#: ../clutter/clutter-actor.c:6879
+#: ../clutter/clutter-actor.c:6949
 msgid "The center of scaling"
 msgstr "Средиште размере"
 
-#: ../clutter/clutter-actor.c:6897
+#: ../clutter/clutter-actor.c:6967
 msgid "Rotation Angle X"
 msgstr "Угао X окретања"
 
-#: ../clutter/clutter-actor.c:6898
+#: ../clutter/clutter-actor.c:6968
 msgid "The rotation angle on the X axis"
 msgstr "Угао окретања на Х оси"
 
-#: ../clutter/clutter-actor.c:6916
+#: ../clutter/clutter-actor.c:6986
 msgid "Rotation Angle Y"
 msgstr "Угао Y окретања"
 
-#: ../clutter/clutter-actor.c:6917
+#: ../clutter/clutter-actor.c:6987
 msgid "The rotation angle on the Y axis"
 msgstr "Угао окретања на Y оси"
 
-#: ../clutter/clutter-actor.c:6935
+#: ../clutter/clutter-actor.c:7005
 msgid "Rotation Angle Z"
 msgstr "Угао Z окретања"
 
-#: ../clutter/clutter-actor.c:6936
+#: ../clutter/clutter-actor.c:7006
 msgid "The rotation angle on the Z axis"
 msgstr "Угао окретања на Z оси"
 
-#: ../clutter/clutter-actor.c:6954
+#: ../clutter/clutter-actor.c:7024
 msgid "Rotation Center X"
 msgstr "Средиште X окретања"
 
-#: ../clutter/clutter-actor.c:6955
+#: ../clutter/clutter-actor.c:7025
 msgid "The rotation center on the X axis"
 msgstr "Средиште окретања на Х оси"
 
-#: ../clutter/clutter-actor.c:6972
+#: ../clutter/clutter-actor.c:7042
 msgid "Rotation Center Y"
 msgstr "Средиште Y окретања"
 
-#: ../clutter/clutter-actor.c:6973
+#: ../clutter/clutter-actor.c:7043
 msgid "The rotation center on the Y axis"
 msgstr "Средиште окретања на Y оси"
 
-#: ../clutter/clutter-actor.c:6990
+#: ../clutter/clutter-actor.c:7060
 msgid "Rotation Center Z"
 msgstr "Средиште Z окретања"
 
-#: ../clutter/clutter-actor.c:6991
+#: ../clutter/clutter-actor.c:7061
 msgid "The rotation center on the Z axis"
 msgstr "Средиште окретања на Z оси"
 
-#: ../clutter/clutter-actor.c:7008
+#: ../clutter/clutter-actor.c:7078
 msgid "Rotation Center Z Gravity"
 msgstr "Тежиште средишта Z окретања"
 
-#: ../clutter/clutter-actor.c:7009
+#: ../clutter/clutter-actor.c:7079
 msgid "Center point for rotation around the Z axis"
 msgstr "Средишња тачка за окретање око Z осе"
 
-#: ../clutter/clutter-actor.c:7037
+#: ../clutter/clutter-actor.c:7107
 msgid "Anchor X"
 msgstr "Х учвршћење"
 
-#: ../clutter/clutter-actor.c:7038
+#: ../clutter/clutter-actor.c:7108
 msgid "X coordinate of the anchor point"
 msgstr "X координате тачке учвршћавања"
 
-#: ../clutter/clutter-actor.c:7066
+#: ../clutter/clutter-actor.c:7136
 msgid "Anchor Y"
 msgstr "Y учвршћење"
 
-#: ../clutter/clutter-actor.c:7067
+#: ../clutter/clutter-actor.c:7137
 msgid "Y coordinate of the anchor point"
 msgstr "Y координате тачке учвршћавања"
 
-#: ../clutter/clutter-actor.c:7094
+#: ../clutter/clutter-actor.c:7164
 msgid "Anchor Gravity"
 msgstr "Тежиште учвршћења"
 
-#: ../clutter/clutter-actor.c:7095
+#: ../clutter/clutter-actor.c:7165
 msgid "The anchor point as a ClutterGravity"
 msgstr "Тачка учвршћавања као тежиште Галамџије"
 
-#: ../clutter/clutter-actor.c:7114
+#: ../clutter/clutter-actor.c:7184
 msgid "Translation X"
 msgstr "X превод"
 
-#: ../clutter/clutter-actor.c:7115
+#: ../clutter/clutter-actor.c:7185
 msgid "Translation along the X axis"
 msgstr "Превод дуж X осе"
 
-#: ../clutter/clutter-actor.c:7134
+#: ../clutter/clutter-actor.c:7204
 msgid "Translation Y"
 msgstr "Y превод"
 
-#: ../clutter/clutter-actor.c:7135
+#: ../clutter/clutter-actor.c:7205
 msgid "Translation along the Y axis"
 msgstr "Превод дуж Y осе"
 
-#: ../clutter/clutter-actor.c:7154
+#: ../clutter/clutter-actor.c:7224
 msgid "Translation Z"
 msgstr "Z превод"
 
-#: ../clutter/clutter-actor.c:7155
+#: ../clutter/clutter-actor.c:7225
 msgid "Translation along the Z axis"
 msgstr "Превод дуж Z осе"
 
-#: ../clutter/clutter-actor.c:7185
+#: ../clutter/clutter-actor.c:7255
 msgid "Transform"
 msgstr "Преображај"
 
-#: ../clutter/clutter-actor.c:7186
+#: ../clutter/clutter-actor.c:7256
 msgid "Transformation matrix"
 msgstr "Матрица преображаја"
 
-#: ../clutter/clutter-actor.c:7201
+#: ../clutter/clutter-actor.c:7271
 msgid "Transform Set"
 msgstr "Подешавање преображаја"
 
-#: ../clutter/clutter-actor.c:7202
+#: ../clutter/clutter-actor.c:7272
 msgid "Whether the transform property is set"
 msgstr "Да ли је подешено својство преображаја"
 
-#: ../clutter/clutter-actor.c:7223
+#: ../clutter/clutter-actor.c:7293
 msgid "Child Transform"
 msgstr "Преображај порода"
 
-#: ../clutter/clutter-actor.c:7224
+#: ../clutter/clutter-actor.c:7294
 msgid "Children transformation matrix"
 msgstr "Матрица преображаја порода"
 
-#: ../clutter/clutter-actor.c:7239
+#: ../clutter/clutter-actor.c:7309
 msgid "Child Transform Set"
 msgstr "Подешавање преображаја порода"
 
-#: ../clutter/clutter-actor.c:7240
+#: ../clutter/clutter-actor.c:7310
 msgid "Whether the child-transform property is set"
 msgstr "Да ли је подешено својство преображаја порода"
 
-#: ../clutter/clutter-actor.c:7257
+#: ../clutter/clutter-actor.c:7327
 msgid "Show on set parent"
 msgstr "Приказ на скупу родитеља"
 
-#: ../clutter/clutter-actor.c:7258
+#: ../clutter/clutter-actor.c:7328
 msgid "Whether the actor is shown when parented"
 msgstr "Да ли ће чинилац бити приказан када је присвојен"
 
-#: ../clutter/clutter-actor.c:7275
+#: ../clutter/clutter-actor.c:7345
 msgid "Clip to Allocation"
 msgstr "Исецање до распоређивања"
 
-#: ../clutter/clutter-actor.c:7276
+#: ../clutter/clutter-actor.c:7346
 msgid "Sets the clip region to track the actor's allocation"
 msgstr "Поставља област исецања за праћење распоређивање чиниоца"
 
-#: ../clutter/clutter-actor.c:7289
+#: ../clutter/clutter-actor.c:7359
 msgid "Text Direction"
 msgstr "Смер текста"
 
-#: ../clutter/clutter-actor.c:7290
+#: ../clutter/clutter-actor.c:7360
 msgid "Direction of the text"
 msgstr "Правац усмерења текста"
 
-#: ../clutter/clutter-actor.c:7305
+#: ../clutter/clutter-actor.c:7375
 msgid "Has Pointer"
 msgstr "Поседује показивач"
 
-#: ../clutter/clutter-actor.c:7306
+#: ../clutter/clutter-actor.c:7376
 msgid "Whether the actor contains the pointer of an input device"
 msgstr "Да ли чинилац садржи показивач неког улазног уређаја"
 
-#: ../clutter/clutter-actor.c:7319
+#: ../clutter/clutter-actor.c:7389
 msgid "Actions"
 msgstr "Радње"
 
-#: ../clutter/clutter-actor.c:7320
+#: ../clutter/clutter-actor.c:7390
 msgid "Adds an action to the actor"
 msgstr "Додаје радњу чиниоцу"
 
-#: ../clutter/clutter-actor.c:7333
+#: ../clutter/clutter-actor.c:7403
 msgid "Constraints"
 msgstr "Ограничења"
 
-#: ../clutter/clutter-actor.c:7334
+#: ../clutter/clutter-actor.c:7404
 msgid "Adds a constraint to the actor"
 msgstr "Додаје ограничења чиниоцу"
 
-#: ../clutter/clutter-actor.c:7347
+#: ../clutter/clutter-actor.c:7417
 msgid "Effect"
 msgstr "Дејство"
 
-#: ../clutter/clutter-actor.c:7348
+#: ../clutter/clutter-actor.c:7418
 msgid "Add an effect to be applied on the actor"
 msgstr "Додаје дејство које ће бити примењено на чиниоцу"
 
-#: ../clutter/clutter-actor.c:7362
+#: ../clutter/clutter-actor.c:7432
 msgid "Layout Manager"
 msgstr "Управник распореда"
 
-#: ../clutter/clutter-actor.c:7363
+#: ../clutter/clutter-actor.c:7433
 msgid "The object controlling the layout of an actor's children"
 msgstr "Објекат који управља распоредом неког порода чиниоца"
 
-#: ../clutter/clutter-actor.c:7377
+#: ../clutter/clutter-actor.c:7447
 msgid "X Expand"
 msgstr "X ширење"
 
-#: ../clutter/clutter-actor.c:7378
+#: ../clutter/clutter-actor.c:7448
 msgid "Whether extra horizontal space should be assigned to the actor"
 msgstr "Да ли додатни водоравни простор треба бити додељен чиниоцу"
 
-#: ../clutter/clutter-actor.c:7393
+#: ../clutter/clutter-actor.c:7463
 msgid "Y Expand"
 msgstr "Y ширење"
 
-#: ../clutter/clutter-actor.c:7394
+#: ../clutter/clutter-actor.c:7464
 msgid "Whether extra vertical space should be assigned to the actor"
 msgstr "Да ли додатни усправни простор треба бити додељен чиниоцу"
 
-#: ../clutter/clutter-actor.c:7410
+#: ../clutter/clutter-actor.c:7480
 msgid "X Alignment"
 msgstr "Х поравнање"
 
-#: ../clutter/clutter-actor.c:7411
+#: ../clutter/clutter-actor.c:7481
 msgid "The alignment of the actor on the X axis within its allocation"
 msgstr "Поравнање чиниоца на икс оси унутар његове расподеле"
 
-#: ../clutter/clutter-actor.c:7426
+#: ../clutter/clutter-actor.c:7496
 msgid "Y Alignment"
 msgstr "Y поравнање"
 
-#: ../clutter/clutter-actor.c:7427
+#: ../clutter/clutter-actor.c:7497
 msgid "The alignment of the actor on the Y axis within its allocation"
 msgstr "Поравнање чиниоца на ипсилон оси унутар његове расподеле"
 
-#: ../clutter/clutter-actor.c:7446
+#: ../clutter/clutter-actor.c:7516
 msgid "Margin Top"
 msgstr "Горња маргина"
 
-#: ../clutter/clutter-actor.c:7447
+#: ../clutter/clutter-actor.c:7517
 msgid "Extra space at the top"
 msgstr "Додатни простор на врху"
 
-#: ../clutter/clutter-actor.c:7468
+#: ../clutter/clutter-actor.c:7538
 msgid "Margin Bottom"
 msgstr "Доња маргина"
 
-#: ../clutter/clutter-actor.c:7469
+#: ../clutter/clutter-actor.c:7539
 msgid "Extra space at the bottom"
 msgstr "Додатни простор на дну"
 
-#: ../clutter/clutter-actor.c:7490
+#: ../clutter/clutter-actor.c:7560
 msgid "Margin Left"
 msgstr "Лева маргина"
 
-#: ../clutter/clutter-actor.c:7491
+#: ../clutter/clutter-actor.c:7561
 msgid "Extra space at the left"
 msgstr "Додатни простор на левој страни"
 
-#: ../clutter/clutter-actor.c:7512
+#: ../clutter/clutter-actor.c:7582
 msgid "Margin Right"
 msgstr "Десна маргина"
 
-#: ../clutter/clutter-actor.c:7513
+#: ../clutter/clutter-actor.c:7583
 msgid "Extra space at the right"
 msgstr "Додатни простор на десној страни"
 
-#: ../clutter/clutter-actor.c:7529
+#: ../clutter/clutter-actor.c:7599
 msgid "Background Color Set"
 msgstr "Подешавање боје позадине"
 
-#: ../clutter/clutter-actor.c:7530 ../clutter/deprecated/clutter-box.c:275
+#: ../clutter/clutter-actor.c:7600 ../clutter/deprecated/clutter-box.c:271
 msgid "Whether the background color is set"
 msgstr "Да ли је подешена боја позадине"
 
-#: ../clutter/clutter-actor.c:7546
+#: ../clutter/clutter-actor.c:7616
 msgid "Background color"
 msgstr "Боја позадине"
 
-#: ../clutter/clutter-actor.c:7547
+#: ../clutter/clutter-actor.c:7617
 msgid "The actor's background color"
 msgstr "Боја позадине чиниоца"
 
-#: ../clutter/clutter-actor.c:7562
+#: ../clutter/clutter-actor.c:7632
 msgid "First Child"
 msgstr "Први пород"
 
-#: ../clutter/clutter-actor.c:7563
+#: ../clutter/clutter-actor.c:7633
 msgid "The actor's first child"
 msgstr "Први пород чиниоца"
 
-#: ../clutter/clutter-actor.c:7576
+#: ../clutter/clutter-actor.c:7646
 msgid "Last Child"
 msgstr "Последњи пород"
 
-#: ../clutter/clutter-actor.c:7577
+#: ../clutter/clutter-actor.c:7647
 msgid "The actor's last child"
 msgstr "Последњи пород чиниоца"
 
-#: ../clutter/clutter-actor.c:7591
+#: ../clutter/clutter-actor.c:7661
 msgid "Content"
 msgstr "Садржај"
 
-#: ../clutter/clutter-actor.c:7592
+#: ../clutter/clutter-actor.c:7662
 msgid "Delegate object for painting the actor's content"
 msgstr "Одређује објекат за бојење садржаја чиниоца"
 
-#: ../clutter/clutter-actor.c:7617
+#: ../clutter/clutter-actor.c:7687
 msgid "Content Gravity"
 msgstr "Тежиште садржаја"
 
-#: ../clutter/clutter-actor.c:7618
+#: ../clutter/clutter-actor.c:7688
 msgid "Alignment of the actor's content"
 msgstr "Поравнање садржаја чиниоца"
 
-#: ../clutter/clutter-actor.c:7638
+#: ../clutter/clutter-actor.c:7708
 msgid "Content Box"
 msgstr "Поље садржаја"
 
-#: ../clutter/clutter-actor.c:7639
+#: ../clutter/clutter-actor.c:7709
 msgid "The bounding box of the actor's content"
 msgstr "Гранично поље садржаја чиниоца"
 
-#: ../clutter/clutter-actor.c:7647
+#: ../clutter/clutter-actor.c:7717
 msgid "Minification Filter"
 msgstr "Филтер умањивања"
 
-#: ../clutter/clutter-actor.c:7648
+#: ../clutter/clutter-actor.c:7718
 msgid "The filter used when reducing the size of the content"
 msgstr "Филтер који се користи приликом смањивања величине садржаја"
 
-#: ../clutter/clutter-actor.c:7655
+#: ../clutter/clutter-actor.c:7725
 msgid "Magnification Filter"
 msgstr "Филтер увећавања"
 
-#: ../clutter/clutter-actor.c:7656
+#: ../clutter/clutter-actor.c:7726
 msgid "The filter used when increasing the size of the content"
 msgstr "Филтер који се користи приликом увећавања величине садржаја"
 
-#: ../clutter/clutter-actor.c:7670
+#: ../clutter/clutter-actor.c:7740
 msgid "Content Repeat"
 msgstr "Понављање садржаја"
 
-#: ../clutter/clutter-actor.c:7671
+#: ../clutter/clutter-actor.c:7741
 msgid "The repeat policy for the actor's content"
 msgstr "Политика понављања садржаја чиниоца"
 
-#: ../clutter/clutter-actor-meta.c:193 ../clutter/clutter-child-meta.c:142
+#: ../clutter/clutter-actor-meta.c:191 ../clutter/clutter-child-meta.c:142
 msgid "Actor"
 msgstr "Чинилац"
 
-#: ../clutter/clutter-actor-meta.c:194
+#: ../clutter/clutter-actor-meta.c:192
 msgid "The actor attached to the meta"
 msgstr "Чинилац придодат мети"
 
-#: ../clutter/clutter-actor-meta.c:208
+#: ../clutter/clutter-actor-meta.c:206
 msgid "The name of the meta"
 msgstr "Назив мете"
 
-#: ../clutter/clutter-actor-meta.c:221 ../clutter/clutter-input-device.c:337
-#: ../clutter/deprecated/clutter-shader.c:313
+#: ../clutter/clutter-actor-meta.c:219 ../clutter/clutter-input-device.c:326
+#: ../clutter/deprecated/clutter-shader.c:309
 msgid "Enabled"
 msgstr "Укључено"
 
-#: ../clutter/clutter-actor-meta.c:222
+#: ../clutter/clutter-actor-meta.c:220
 msgid "Whether the meta is enabled"
 msgstr "Да ли је мета укључена"
 
 #: ../clutter/clutter-align-constraint.c:279
-#: ../clutter/clutter-bind-constraint.c:358 ../clutter/clutter-clone.c:345
+#: ../clutter/clutter-bind-constraint.c:358 ../clutter/clutter-clone.c:341
 #: ../clutter/clutter-snap-constraint.c:321
 msgid "Source"
 msgstr "Извор"
@@ -728,11 +728,11 @@ msgstr "Фактор"
 msgid "The alignment factor, between 0.0 and 1.0"
 msgstr "Фактор поравнања, између 0.0 и 1.0"
 
-#: ../clutter/clutter-backend.c:379
+#: ../clutter/clutter-backend.c:380
 msgid "Unable to initialize the Clutter backend"
 msgstr "Не могу да покренем позадинца Галамџије"
 
-#: ../clutter/clutter-backend.c:453
+#: ../clutter/clutter-backend.c:454
 #, c-format
 msgid "The backend of type '%s' does not support creating multiple stages"
 msgstr "Позадинац врсте „%s“ не подржава стварање више сцена"
@@ -763,45 +763,49 @@ msgstr "Померај у тачкама који ће бити примењен
 msgid "The unique name of the binding pool"
 msgstr "Јединствени назив за удружење пречица"
 
-#: ../clutter/clutter-bin-layout.c:240 ../clutter/clutter-bin-layout.c:655
-#: ../clutter/clutter-box-layout.c:390 ../clutter/clutter-table-layout.c:610
+#: ../clutter/clutter-bin-layout.c:238 ../clutter/clutter-bin-layout.c:651
+#: ../clutter/clutter-box-layout.c:388
+#: ../clutter/deprecated/clutter-table-layout.c:610
 msgid "Horizontal Alignment"
 msgstr "Водоравно поравнање"
 
-#: ../clutter/clutter-bin-layout.c:241
+#: ../clutter/clutter-bin-layout.c:239
 msgid "Horizontal alignment for the actor inside the layout manager"
 msgstr "Водоравно поравнање за чиниоца унутар управника распореда"
 
-#: ../clutter/clutter-bin-layout.c:249 ../clutter/clutter-bin-layout.c:675
-#: ../clutter/clutter-box-layout.c:399 ../clutter/clutter-table-layout.c:625
+#: ../clutter/clutter-bin-layout.c:247 ../clutter/clutter-bin-layout.c:671
+#: ../clutter/clutter-box-layout.c:397
+#: ../clutter/deprecated/clutter-table-layout.c:625
 msgid "Vertical Alignment"
 msgstr "Усправно поравнање"
 
-#: ../clutter/clutter-bin-layout.c:250
+#: ../clutter/clutter-bin-layout.c:248
 msgid "Vertical alignment for the actor inside the layout manager"
 msgstr "Усправно поравнање за чиниоца унутар управника распореда"
 
-#: ../clutter/clutter-bin-layout.c:656
+#: ../clutter/clutter-bin-layout.c:652
 msgid "Default horizontal alignment for the actors inside the layout manager"
 msgstr "Основно водоравно поравнање за чиниоца унутар управника распореда"
 
-#: ../clutter/clutter-bin-layout.c:676
+#: ../clutter/clutter-bin-layout.c:672
 msgid "Default vertical alignment for the actors inside the layout manager"
 msgstr "Основно усправно поравнање за чиниоца унутар управника распореда"
 
-#: ../clutter/clutter-box-layout.c:365
+#: ../clutter/clutter-box-layout.c:363
 msgid "Expand"
 msgstr "Раширено"
 
-#: ../clutter/clutter-box-layout.c:366
+#: ../clutter/clutter-box-layout.c:364
 msgid "Allocate extra space for the child"
 msgstr "Додељује додатни простор за пород"
 
-#: ../clutter/clutter-box-layout.c:372 ../clutter/clutter-table-layout.c:589
+#: ../clutter/clutter-box-layout.c:370
+#: ../clutter/deprecated/clutter-table-layout.c:589
 msgid "Horizontal Fill"
 msgstr "Водоравно испуњење"
 
-#: ../clutter/clutter-box-layout.c:373 ../clutter/clutter-table-layout.c:590
+#: ../clutter/clutter-box-layout.c:371
+#: ../clutter/deprecated/clutter-table-layout.c:590
 msgid ""
 "Whether the child should receive priority when the container is allocating "
 "spare space on the horizontal axis"
@@ -809,11 +813,13 @@ msgstr ""
 "Да ли пород треба да добије приоритет када садржалац додељује резервни "
 "простор на водоравној оси"
 
-#: ../clutter/clutter-box-layout.c:381 ../clutter/clutter-table-layout.c:596
+#: ../clutter/clutter-box-layout.c:379
+#: ../clutter/deprecated/clutter-table-layout.c:596
 msgid "Vertical Fill"
 msgstr "Усправно испуњење"
 
-#: ../clutter/clutter-box-layout.c:382 ../clutter/clutter-table-layout.c:597
+#: ../clutter/clutter-box-layout.c:380
+#: ../clutter/deprecated/clutter-table-layout.c:597
 msgid ""
 "Whether the child should receive priority when the container is allocating "
 "spare space on the vertical axis"
@@ -821,79 +827,87 @@ msgstr ""
 "Да ли пород треба да добије приоритет када садржалац додељује резервни "
 "простор на усправној оси"
 
-#: ../clutter/clutter-box-layout.c:391 ../clutter/clutter-table-layout.c:611
+#: ../clutter/clutter-box-layout.c:389
+#: ../clutter/deprecated/clutter-table-layout.c:611
 msgid "Horizontal alignment of the actor within the cell"
 msgstr "Водоравно поравнање чиниоца унутар ћелије"
 
-#: ../clutter/clutter-box-layout.c:400 ../clutter/clutter-table-layout.c:626
+#: ../clutter/clutter-box-layout.c:398
+#: ../clutter/deprecated/clutter-table-layout.c:626
 msgid "Vertical alignment of the actor within the cell"
 msgstr "Усправно поравнање чиниоца унутар ћелије"
 
-#: ../clutter/clutter-box-layout.c:1365
+#: ../clutter/clutter-box-layout.c:1359
 msgid "Vertical"
 msgstr "Усправно"
 
-#: ../clutter/clutter-box-layout.c:1366
+#: ../clutter/clutter-box-layout.c:1360
 msgid "Whether the layout should be vertical, rather than horizontal"
 msgstr "Да ли распоред треба да буде усправан, уместо водоравног"
 
-#: ../clutter/clutter-box-layout.c:1383 ../clutter/clutter-flow-layout.c:890
-#: ../clutter/clutter-grid-layout.c:1550
+#: ../clutter/clutter-box-layout.c:1377 ../clutter/clutter-flow-layout.c:942
+#: ../clutter/clutter-grid-layout.c:1549
 msgid "Orientation"
 msgstr "Усмерење"
 
-#: ../clutter/clutter-box-layout.c:1384 ../clutter/clutter-flow-layout.c:891
-#: ../clutter/clutter-grid-layout.c:1551
+#: ../clutter/clutter-box-layout.c:1378 ../clutter/clutter-flow-layout.c:943
+#: ../clutter/clutter-grid-layout.c:1550
 msgid "The orientation of the layout"
 msgstr "Усмерење распореда"
 
-#: ../clutter/clutter-box-layout.c:1400 ../clutter/clutter-flow-layout.c:906
+#: ../clutter/clutter-box-layout.c:1394 ../clutter/clutter-flow-layout.c:958
 msgid "Homogeneous"
 msgstr "Истородност"
 
-#: ../clutter/clutter-box-layout.c:1401
+#: ../clutter/clutter-box-layout.c:1395
 msgid ""
 "Whether the layout should be homogeneous, i.e. all childs get the same size"
 msgstr ""
 "Да ли распоред треба да буде истородан, тј. сав пород добија исту величину"
 
-#: ../clutter/clutter-box-layout.c:1416
+#: ../clutter/clutter-box-layout.c:1410
 msgid "Pack Start"
 msgstr "Почетак свежња"
 
-#: ../clutter/clutter-box-layout.c:1417
+#: ../clutter/clutter-box-layout.c:1411
 msgid "Whether to pack items at the start of the box"
 msgstr "Да ли ће ставке бити напаковане на почетак оквира"
 
-#: ../clutter/clutter-box-layout.c:1430
+#: ../clutter/clutter-box-layout.c:1424
 msgid "Spacing"
 msgstr "Размаци"
 
-#: ../clutter/clutter-box-layout.c:1431
+#: ../clutter/clutter-box-layout.c:1425
 msgid "Spacing between children"
 msgstr "Размаи између порода"
 
-#: ../clutter/clutter-box-layout.c:1448 ../clutter/clutter-table-layout.c:1675
+#: ../clutter/clutter-box-layout.c:1442
+#: ../clutter/deprecated/clutter-table-layout.c:1677
 msgid "Use Animations"
 msgstr "Користи анимирања"
 
-#: ../clutter/clutter-box-layout.c:1449 ../clutter/clutter-table-layout.c:1676
+#: ../clutter/clutter-box-layout.c:1443
+#: ../clutter/deprecated/clutter-table-layout.c:1678
 msgid "Whether layout changes should be animated"
 msgstr "Да ли ће измене распореда бити анимиране"
 
-#: ../clutter/clutter-box-layout.c:1473 ../clutter/clutter-table-layout.c:1700
+#: ../clutter/clutter-box-layout.c:1467
+#: ../clutter/deprecated/clutter-table-layout.c:1702
 msgid "Easing Mode"
 msgstr "Режим олакшавања"
 
-#: ../clutter/clutter-box-layout.c:1474 ../clutter/clutter-table-layout.c:1701
+#: ../clutter/clutter-box-layout.c:1468
+#: ../clutter/deprecated/clutter-table-layout.c:1703
 msgid "The easing mode of the animations"
 msgstr "Режим олакшавања анимирања"
 
-#: ../clutter/clutter-box-layout.c:1494 ../clutter/clutter-table-layout.c:1721
+#: ../clutter/clutter-box-layout.c:1488
+#: ../clutter/deprecated/clutter-table-layout.c:1723
 msgid "Easing Duration"
 msgstr "Трајање олакшавања"
 
-#: ../clutter/clutter-box-layout.c:1495 ../clutter/clutter-table-layout.c:1722
+#: ../clutter/clutter-box-layout.c:1489
+#: ../clutter/deprecated/clutter-table-layout.c:1724
 msgid "The duration of the animations"
 msgstr "Трајање анимирања"
 
@@ -913,14 +927,30 @@ msgstr "Контраст"
 msgid "The contrast change to apply"
 msgstr "Промена контраста за примену"
 
-#: ../clutter/clutter-canvas.c:216
+#: ../clutter/clutter-canvas.c:248
 msgid "The width of the canvas"
 msgstr "Ширина платна"
 
-#: ../clutter/clutter-canvas.c:232
+#: ../clutter/clutter-canvas.c:264
 msgid "The height of the canvas"
 msgstr "Висина платна"
 
+#: ../clutter/clutter-canvas.c:283
+msgid "Scale Factor Set"
+msgstr "Подешени чинилац сразмере"
+
+#: ../clutter/clutter-canvas.c:284
+msgid "Whether the scale-factor property is set"
+msgstr "Да ли је подешено својство чиниоца сразмере"
+
+#: ../clutter/clutter-canvas.c:305
+msgid "Scale Factor"
+msgstr "Чинилац сразмере"
+
+#: ../clutter/clutter-canvas.c:306
+msgid "The scaling factor for the surface"
+msgstr "Чинилац сразмере за површину"
+
 #: ../clutter/clutter-child-meta.c:127
 msgid "Container"
 msgstr "Садржалац"
@@ -933,39 +963,39 @@ msgstr "Садржалац који је створио овај податак"
 msgid "The actor wrapped by this data"
 msgstr "Чинилац обавијен овим податком"
 
-#: ../clutter/clutter-click-action.c:559
+#: ../clutter/clutter-click-action.c:586
 msgid "Pressed"
 msgstr "Притиснут"
 
-#: ../clutter/clutter-click-action.c:560
+#: ../clutter/clutter-click-action.c:587
 msgid "Whether the clickable should be in pressed state"
 msgstr "Да ли кликљив треба да буде у притиснутом стању"
 
-#: ../clutter/clutter-click-action.c:573
+#: ../clutter/clutter-click-action.c:600
 msgid "Held"
 msgstr "Задржан"
 
-#: ../clutter/clutter-click-action.c:574
+#: ../clutter/clutter-click-action.c:601
 msgid "Whether the clickable has a grab"
 msgstr "Да ли кликљив има захват"
 
-#: ../clutter/clutter-click-action.c:591 ../clutter/clutter-settings.c:599
+#: ../clutter/clutter-click-action.c:618 ../clutter/clutter-settings.c:653
 msgid "Long Press Duration"
 msgstr "Трајање дугог притиска"
 
-#: ../clutter/clutter-click-action.c:592
+#: ../clutter/clutter-click-action.c:619
 msgid "The minimum duration of a long press to recognize the gesture"
 msgstr "Најмање трајање дугог притиска за препознавање потеза"
 
-#: ../clutter/clutter-click-action.c:610
+#: ../clutter/clutter-click-action.c:637
 msgid "Long Press Threshold"
 msgstr "Праг дугог притиска"
 
-#: ../clutter/clutter-click-action.c:611
+#: ../clutter/clutter-click-action.c:638
 msgid "The maximum threshold before a long press is cancelled"
 msgstr "Највећи праг пре отказивања дугог притиска"
 
-#: ../clutter/clutter-clone.c:346
+#: ../clutter/clutter-clone.c:342
 msgid "Specifies the actor to be cloned"
 msgstr "Одређује чиниоца који ће бити клониран"
 
@@ -977,27 +1007,27 @@ msgstr "Боја"
 msgid "The tint to apply"
 msgstr "Боја за примену"
 
-#: ../clutter/clutter-deform-effect.c:588
+#: ../clutter/clutter-deform-effect.c:592
 msgid "Horizontal Tiles"
 msgstr "Водоравне плочице"
 
-#: ../clutter/clutter-deform-effect.c:589
+#: ../clutter/clutter-deform-effect.c:593
 msgid "The number of horizontal tiles"
 msgstr "Број водоравних плочица"
 
-#: ../clutter/clutter-deform-effect.c:604
+#: ../clutter/clutter-deform-effect.c:608
 msgid "Vertical Tiles"
 msgstr "Усправне плочице"
 
-#: ../clutter/clutter-deform-effect.c:605
+#: ../clutter/clutter-deform-effect.c:609
 msgid "The number of vertical tiles"
 msgstr "Број усправних плочица"
 
-#: ../clutter/clutter-deform-effect.c:622
+#: ../clutter/clutter-deform-effect.c:626
 msgid "Back Material"
 msgstr "Материјал полеђине"
 
-#: ../clutter/clutter-deform-effect.c:623
+#: ../clutter/clutter-deform-effect.c:627
 msgid "The material to be used when painting the back of the actor"
 msgstr "Материјал који ће бити коришћен приликом бојења полеђине чиниоца"
 
@@ -1005,258 +1035,300 @@ msgstr "Материјал који ће бити коришћен прилик
 msgid "The desaturation factor"
 msgstr "Фактор обезбојавања"
 
-#: ../clutter/clutter-device-manager.c:131
-#: ../clutter/clutter-input-device.c:366
-#: ../clutter/x11/clutter-keymap-x11.c:316
+#: ../clutter/clutter-device-manager.c:127
+#: ../clutter/clutter-input-device.c:355
+#: ../clutter/x11/clutter-keymap-x11.c:321
 msgid "Backend"
 msgstr "Позадинац"
 
-#: ../clutter/clutter-device-manager.c:132
+#: ../clutter/clutter-device-manager.c:128
 msgid "The ClutterBackend of the device manager"
 msgstr "Позадинац Галамџије управника уређаја"
 
-#: ../clutter/clutter-drag-action.c:742
+#: ../clutter/clutter-drag-action.c:741
 msgid "Horizontal Drag Threshold"
 msgstr "Водоравни праг превлачења"
 
-#: ../clutter/clutter-drag-action.c:743
+#: ../clutter/clutter-drag-action.c:742
 msgid "The horizontal amount of pixels required to start dragging"
 msgstr "Водоравни износ тачака потребних за почетак превлачења"
 
-#: ../clutter/clutter-drag-action.c:770
+#: ../clutter/clutter-drag-action.c:769
 msgid "Vertical Drag Threshold"
 msgstr "Усправни праг превлачења"
 
-#: ../clutter/clutter-drag-action.c:771
+#: ../clutter/clutter-drag-action.c:770
 msgid "The vertical amount of pixels required to start dragging"
 msgstr "Усправни износ тачака потребних за почетак превлачења"
 
-#: ../clutter/clutter-drag-action.c:792
+#: ../clutter/clutter-drag-action.c:791
 msgid "Drag Handle"
 msgstr "Ручица превлачења"
 
-#: ../clutter/clutter-drag-action.c:793
+#: ../clutter/clutter-drag-action.c:792
 msgid "The actor that is being dragged"
 msgstr "Чинилац који је превучен"
 
-#: ../clutter/clutter-drag-action.c:806
+#: ../clutter/clutter-drag-action.c:805
 msgid "Drag Axis"
 msgstr "Оса превлачења"
 
-#: ../clutter/clutter-drag-action.c:807
+#: ../clutter/clutter-drag-action.c:806
 msgid "Constraints the dragging to an axis"
 msgstr "Ограничава превлачење на осу"
 
-#: ../clutter/clutter-drag-action.c:823
+#: ../clutter/clutter-drag-action.c:822
 msgid "Drag Area"
 msgstr "Област превлачења"
 
-#: ../clutter/clutter-drag-action.c:824
+#: ../clutter/clutter-drag-action.c:823
 msgid "Constrains the dragging to a rectangle"
 msgstr "Ограничава превлачење на правоугаоник"
 
-#: ../clutter/clutter-drag-action.c:837
+#: ../clutter/clutter-drag-action.c:836
 msgid "Drag Area Set"
 msgstr "Подешеност области превлачења"
 
-#: ../clutter/clutter-drag-action.c:838
+#: ../clutter/clutter-drag-action.c:837
 msgid "Whether the drag area is set"
 msgstr "Да ли је подешена област превлачења"
 
-#: ../clutter/clutter-flow-layout.c:907
+#: ../clutter/clutter-flow-layout.c:959
 msgid "Whether each item should receive the same allocation"
 msgstr "Да ли свака ставка треба да прими исто распоређивање"
 
-#: ../clutter/clutter-flow-layout.c:922 ../clutter/clutter-table-layout.c:1637
+#: ../clutter/clutter-flow-layout.c:974
+#: ../clutter/deprecated/clutter-table-layout.c:1637
 msgid "Column Spacing"
 msgstr "Размак колона"
 
-#: ../clutter/clutter-flow-layout.c:923
+#: ../clutter/clutter-flow-layout.c:975
 msgid "The spacing between columns"
 msgstr "Размак између колона"
 
-#: ../clutter/clutter-flow-layout.c:939 ../clutter/clutter-table-layout.c:1651
+#: ../clutter/clutter-flow-layout.c:991
+#: ../clutter/deprecated/clutter-table-layout.c:1653
 msgid "Row Spacing"
 msgstr "Размак редова"
 
-#: ../clutter/clutter-flow-layout.c:940
+#: ../clutter/clutter-flow-layout.c:992
 msgid "The spacing between rows"
 msgstr "Размак између редова"
 
-#: ../clutter/clutter-flow-layout.c:954
+#: ../clutter/clutter-flow-layout.c:1006
 msgid "Minimum Column Width"
 msgstr "Најмања ширина колоне"
 
-#: ../clutter/clutter-flow-layout.c:955
+#: ../clutter/clutter-flow-layout.c:1007
 msgid "Minimum width for each column"
 msgstr "Најмања ширина за сваку колону"
 
-#: ../clutter/clutter-flow-layout.c:970
+#: ../clutter/clutter-flow-layout.c:1022
 msgid "Maximum Column Width"
 msgstr "Највећа ширина колоне"
 
-#: ../clutter/clutter-flow-layout.c:971
+#: ../clutter/clutter-flow-layout.c:1023
 msgid "Maximum width for each column"
 msgstr "Највећа ширина за сваку колону"
 
-#: ../clutter/clutter-flow-layout.c:985
+#: ../clutter/clutter-flow-layout.c:1037
 msgid "Minimum Row Height"
 msgstr "Најмања висина реда"
 
-#: ../clutter/clutter-flow-layout.c:986
+#: ../clutter/clutter-flow-layout.c:1038
 msgid "Minimum height for each row"
 msgstr "Најмања висина за сваки ред"
 
-#: ../clutter/clutter-flow-layout.c:1001
+#: ../clutter/clutter-flow-layout.c:1053
 msgid "Maximum Row Height"
 msgstr "Највећа висина реда"
 
-#: ../clutter/clutter-flow-layout.c:1002
+#: ../clutter/clutter-flow-layout.c:1054
 msgid "Maximum height for each row"
 msgstr "Највећа висина за сваки ред"
 
-#: ../clutter/clutter-grid-layout.c:1222
+#: ../clutter/clutter-flow-layout.c:1069 ../clutter/clutter-flow-layout.c:1070
+msgid "Snap to grid"
+msgstr "Приони на мрежу"
+
+#: ../clutter/clutter-gesture-action.c:668
+msgid "Number touch points"
+msgstr "Број тачака додира"
+
+#: ../clutter/clutter-gesture-action.c:669
+msgid "Number of touch points"
+msgstr "Број додирних тачака"
+
+#: ../clutter/clutter-gesture-action.c:684
+msgid "Threshold Trigger Edge"
+msgstr "Осетљивост ивице окидача"
+
+#: ../clutter/clutter-gesture-action.c:685
+msgid "The trigger edge used by the action"
+msgstr "Ивица окидача коју користи радња"
+
+#: ../clutter/clutter-gesture-action.c:704
+#| msgid "Threshold Trigger Edge"
+msgid "Threshold Trigger Horizontal Distance"
+msgstr "Осетљивост водоравне удаљености окидача"
+
+#: ../clutter/clutter-gesture-action.c:705
+#| msgid "The trigger edge used by the action"
+msgid "The horizontal trigger distance used by the action"
+msgstr "Водоравно одстојање окидача коју користи радња"
+
+#: ../clutter/clutter-gesture-action.c:723
+#| msgid "Threshold Trigger Edge"
+msgid "Threshold Trigger Vertical Distance"
+msgstr "Осетљивост усправне удаљености окидача"
+
+#: ../clutter/clutter-gesture-action.c:724
+#| msgid "The trigger edge used by the action"
+msgid "The vertical trigger distance used by the action"
+msgstr "Усправно одстојање окидача коју користи радња"
+
+#: ../clutter/clutter-grid-layout.c:1223
 msgid "Left attachment"
 msgstr "Лево припајање"
 
-#: ../clutter/clutter-grid-layout.c:1223
+#: ../clutter/clutter-grid-layout.c:1224
 msgid "The column number to attach the left side of the child to"
 msgstr "Број ступца за који прикачити леву страну садржаног елемента"
 
-#: ../clutter/clutter-grid-layout.c:1230
+#: ../clutter/clutter-grid-layout.c:1231
 msgid "Top attachment"
 msgstr "Горње припајање"
 
-#: ../clutter/clutter-grid-layout.c:1231
+#: ../clutter/clutter-grid-layout.c:1232
 msgid "The row number to attach the top side of a child widget to"
 msgstr "Број реда за који прикачити горњу страну садржаног елемента"
 
-#: ../clutter/clutter-grid-layout.c:1239
+#: ../clutter/clutter-grid-layout.c:1240
 msgid "The number of columns that a child spans"
 msgstr "Број колона које садржани елемент обухвата"
 
-#: ../clutter/clutter-grid-layout.c:1246
+#: ../clutter/clutter-grid-layout.c:1247
 msgid "The number of rows that a child spans"
 msgstr "Број редова које садржани елемент обухвата"
 
-#: ../clutter/clutter-grid-layout.c:1565
+#: ../clutter/clutter-grid-layout.c:1564
 msgid "Row spacing"
 msgstr "Размак редова"
 
-#: ../clutter/clutter-grid-layout.c:1566
+#: ../clutter/clutter-grid-layout.c:1565
 msgid "The amount of space between two consecutive rows"
 msgstr "Размак између два суседна реда"
 
-#: ../clutter/clutter-grid-layout.c:1579
+#: ../clutter/clutter-grid-layout.c:1578
 msgid "Column spacing"
 msgstr "Размак колона"
 
-#: ../clutter/clutter-grid-layout.c:1580
+#: ../clutter/clutter-grid-layout.c:1579
 msgid "The amount of space between two consecutive columns"
 msgstr "Размак између два суседна ступца"
 
-#: ../clutter/clutter-grid-layout.c:1594
+#: ../clutter/clutter-grid-layout.c:1593
 msgid "Row Homogeneous"
 msgstr "Истородност реда"
 
-#: ../clutter/clutter-grid-layout.c:1595
+#: ../clutter/clutter-grid-layout.c:1594
 msgid "If TRUE, the rows are all the same height"
 msgstr "Уколико је постављено, онда сви редови имају исту висину"
 
-#: ../clutter/clutter-grid-layout.c:1608
+#: ../clutter/clutter-grid-layout.c:1607
 msgid "Column Homogeneous"
 msgstr "Истородност колоне"
 
-#: ../clutter/clutter-grid-layout.c:1609
+#: ../clutter/clutter-grid-layout.c:1608
 msgid "If TRUE, the columns are all the same width"
 msgstr "Уколико је постављено, онда све колоне имају исту висину"
 
-#: ../clutter/clutter-image.c:248 ../clutter/clutter-image.c:311
-#: ../clutter/clutter-image.c:399
+#: ../clutter/clutter-image.c:249 ../clutter/clutter-image.c:312
+#: ../clutter/clutter-image.c:400
 msgid "Unable to load image data"
 msgstr "Не могу да учитам податке слике"
 
-#: ../clutter/clutter-input-device.c:242
+#: ../clutter/clutter-input-device.c:231
 msgid "Id"
 msgstr "Ид"
 
-#: ../clutter/clutter-input-device.c:243
+#: ../clutter/clutter-input-device.c:232
 msgid "Unique identifier of the device"
 msgstr "Јединствени идентификатор уређаја"
 
-#: ../clutter/clutter-input-device.c:259
+#: ../clutter/clutter-input-device.c:248
 msgid "The name of the device"
 msgstr "Назив уређаја"
 
-#: ../clutter/clutter-input-device.c:273
+#: ../clutter/clutter-input-device.c:262
 msgid "Device Type"
 msgstr "Врста уређаја"
 
-#: ../clutter/clutter-input-device.c:274
+#: ../clutter/clutter-input-device.c:263
 msgid "The type of the device"
 msgstr "Врста уређаја"
 
-#: ../clutter/clutter-input-device.c:289
+#: ../clutter/clutter-input-device.c:278
 msgid "Device Manager"
 msgstr "Управник уређаја"
 
-#: ../clutter/clutter-input-device.c:290
+#: ../clutter/clutter-input-device.c:279
 msgid "The device manager instance"
 msgstr "Примерак управника уређаја"
 
-#: ../clutter/clutter-input-device.c:303
+#: ../clutter/clutter-input-device.c:292
 msgid "Device Mode"
 msgstr "Режим уређаја"
 
-#: ../clutter/clutter-input-device.c:304
+#: ../clutter/clutter-input-device.c:293
 msgid "The mode of the device"
 msgstr "Режим уређаја"
 
-#: ../clutter/clutter-input-device.c:318
+#: ../clutter/clutter-input-device.c:307
 msgid "Has Cursor"
 msgstr "Поседује курсор"
 
-#: ../clutter/clutter-input-device.c:319
+#: ../clutter/clutter-input-device.c:308
 msgid "Whether the device has a cursor"
 msgstr "Да ли уређај има курсор"
 
-#: ../clutter/clutter-input-device.c:338
+#: ../clutter/clutter-input-device.c:327
 msgid "Whether the device is enabled"
 msgstr "Да ли је уређај укључен"
 
-#: ../clutter/clutter-input-device.c:351
+#: ../clutter/clutter-input-device.c:340
 msgid "Number of Axes"
 msgstr "Број оса"
 
-#: ../clutter/clutter-input-device.c:352
+#: ../clutter/clutter-input-device.c:341
 msgid "The number of axes on the device"
 msgstr "Број оса на уређају"
 
-#: ../clutter/clutter-input-device.c:367
+#: ../clutter/clutter-input-device.c:356
 msgid "The backend instance"
 msgstr "Примерак позадинца"
 
-#: ../clutter/clutter-interval.c:506
+#: ../clutter/clutter-interval.c:553
 msgid "Value Type"
 msgstr "Врста вредности"
 
-#: ../clutter/clutter-interval.c:507
+#: ../clutter/clutter-interval.c:554
 msgid "The type of the values in the interval"
 msgstr "Врста вредности у периоду"
 
-#: ../clutter/clutter-interval.c:522
+#: ../clutter/clutter-interval.c:569
 msgid "Initial Value"
 msgstr "Почетна вредност"
 
-#: ../clutter/clutter-interval.c:523
+#: ../clutter/clutter-interval.c:570
 msgid "Initial value of the interval"
 msgstr "Почетна вредност периода"
 
-#: ../clutter/clutter-interval.c:537
+#: ../clutter/clutter-interval.c:584
 msgid "Final Value"
 msgstr "Крајња вредност"
 
-#: ../clutter/clutter-interval.c:538
+#: ../clutter/clutter-interval.c:585
 msgid "Final value of the interval"
 msgstr "Крајња вредност периода"
 
@@ -1275,96 +1347,96 @@ msgstr "Управник који је створио овај податак"
 #. * Do NOT translate it to non-English e.g. "predefinito:LTR"! If
 #. * it isn't default:LTR or default:RTL it will not work.
 #.
-#: ../clutter/clutter-main.c:772
+#: ../clutter/clutter-main.c:795
 msgid "default:LTR"
 msgstr "default:LTR"
 
-#: ../clutter/clutter-main.c:1646
+#: ../clutter/clutter-main.c:1622
 msgid "Show frames per second"
 msgstr "Приказује кадрове у секунди"
 
-#: ../clutter/clutter-main.c:1648
+#: ../clutter/clutter-main.c:1624
 msgid "Default frame rate"
 msgstr "Основни проток кадра"
 
-#: ../clutter/clutter-main.c:1650
+#: ../clutter/clutter-main.c:1626
 msgid "Make all warnings fatal"
 msgstr "Чини сва упозорења кобним"
 
-#: ../clutter/clutter-main.c:1653
+#: ../clutter/clutter-main.c:1629
 msgid "Direction for the text"
 msgstr "Правац усмерења за текст"
 
-#: ../clutter/clutter-main.c:1656
+#: ../clutter/clutter-main.c:1632
 msgid "Disable mipmapping on text"
 msgstr "Искључује мип мапирање на тексту"
 
-#: ../clutter/clutter-main.c:1659
+#: ../clutter/clutter-main.c:1635
 msgid "Use 'fuzzy' picking"
 msgstr "Користи „нејасно“ пребирање"
 
-#: ../clutter/clutter-main.c:1662
+#: ../clutter/clutter-main.c:1638
 msgid "Clutter debugging flags to set"
 msgstr "Опције Галамџије за уклањање грешака за постављање"
 
-#: ../clutter/clutter-main.c:1664
+#: ../clutter/clutter-main.c:1640
 msgid "Clutter debugging flags to unset"
 msgstr "Опције Галамџије за уклањање грешака за искључивање"
 
-#: ../clutter/clutter-main.c:1668
+#: ../clutter/clutter-main.c:1644
 msgid "Clutter profiling flags to set"
 msgstr "Опције профилисања Галамџије за постављање"
 
-#: ../clutter/clutter-main.c:1670
+#: ../clutter/clutter-main.c:1646
 msgid "Clutter profiling flags to unset"
 msgstr "Опције профилисања Галамџије за искључивање"
 
-#: ../clutter/clutter-main.c:1673
+#: ../clutter/clutter-main.c:1649
 msgid "Enable accessibility"
 msgstr "Укључује приступачност"
 
-#: ../clutter/clutter-main.c:1865
+#: ../clutter/clutter-main.c:1841
 msgid "Clutter Options"
 msgstr "Опције Галамџије"
 
-#: ../clutter/clutter-main.c:1866
+#: ../clutter/clutter-main.c:1842
 msgid "Show Clutter Options"
 msgstr "Приказује опције Галамџије"
 
-#: ../clutter/clutter-pan-action.c:448
+#: ../clutter/clutter-pan-action.c:455
 msgid "Pan Axis"
 msgstr "Оса померања"
 
-#: ../clutter/clutter-pan-action.c:449
+#: ../clutter/clutter-pan-action.c:456
 msgid "Constraints the panning to an axis"
 msgstr "Ограничава померање на осу"
 
-#: ../clutter/clutter-pan-action.c:463
+#: ../clutter/clutter-pan-action.c:470
 msgid "Interpolate"
 msgstr "Утапање"
 
-#: ../clutter/clutter-pan-action.c:464
+#: ../clutter/clutter-pan-action.c:471
 msgid "Whether interpolated events emission is enabled."
 msgstr "Да ли је укључено одашиљање утопљених догађаја"
 
-#: ../clutter/clutter-pan-action.c:480
+#: ../clutter/clutter-pan-action.c:487
 msgid "Deceleration"
 msgstr "Успоравање"
 
-#: ../clutter/clutter-pan-action.c:481
+#: ../clutter/clutter-pan-action.c:488
 msgid "Rate at which the interpolated panning will decelerate in"
 msgstr "Однос при у коме ће утопљено померање да успори"
 
-#: ../clutter/clutter-pan-action.c:498
+#: ../clutter/clutter-pan-action.c:505
 msgid "Initial acceleration factor"
 msgstr "Састојак почетног убрзања"
 
-#: ../clutter/clutter-pan-action.c:499
+#: ../clutter/clutter-pan-action.c:506
 msgid "Factor applied to the momentum when starting the interpolated phase"
 msgstr "Састојак који се примењује на замах приликом покретања фазе утапања"
 
 #: ../clutter/clutter-path-constraint.c:212
-#: ../clutter/deprecated/clutter-behaviour-path.c:225
+#: ../clutter/deprecated/clutter-behaviour-path.c:221
 msgid "Path"
 msgstr "Путања"
 
@@ -1376,85 +1448,85 @@ msgstr "Путања коришћена за ограничавање чинио
 msgid "The offset along the path, between -1.0 and 2.0"
 msgstr "Померај дуж путање, између -1.0 и 2.0"
 
-#: ../clutter/clutter-property-transition.c:271
+#: ../clutter/clutter-property-transition.c:269
 msgid "Property Name"
 msgstr "Назив својства"
 
-#: ../clutter/clutter-property-transition.c:272
+#: ../clutter/clutter-property-transition.c:270
 msgid "The name of the property to animate"
 msgstr "Назив својства за анимирање"
 
-#: ../clutter/clutter-script.c:466
+#: ../clutter/clutter-script.c:464
 msgid "Filename Set"
 msgstr "Избор назива датотеке"
 
-#: ../clutter/clutter-script.c:467
+#: ../clutter/clutter-script.c:465
 msgid "Whether the :filename property is set"
 msgstr "Да ли је постављена особина :назив_датотеке"
 
-#: ../clutter/clutter-script.c:481
-#: ../clutter/deprecated/clutter-texture.c:1082
+#: ../clutter/clutter-script.c:479
+#: ../clutter/deprecated/clutter-texture.c:1080
 msgid "Filename"
 msgstr "Назив датотеке"
 
-#: ../clutter/clutter-script.c:482
+#: ../clutter/clutter-script.c:480
 msgid "The path of the currently parsed file"
 msgstr "Путања тренутно обрађиване датотеке"
 
-#: ../clutter/clutter-script.c:499
+#: ../clutter/clutter-script.c:497
 msgid "Translation Domain"
 msgstr "Домен превода"
 
-#: ../clutter/clutter-script.c:500
+#: ../clutter/clutter-script.c:498
 msgid "The translation domain used to localize string"
 msgstr "Домен превода коришћен за локализацију ниске"
 
-#: ../clutter/clutter-scroll-actor.c:263
+#: ../clutter/clutter-scroll-actor.c:189
 msgid "Scroll Mode"
 msgstr "Режим клизања"
 
-#: ../clutter/clutter-scroll-actor.c:264
+#: ../clutter/clutter-scroll-actor.c:190
 msgid "The scrolling direction"
 msgstr "Смер клизања"
 
-#: ../clutter/clutter-settings.c:440
+#: ../clutter/clutter-settings.c:486
 msgid "Double Click Time"
 msgstr "Време дуплог клика"
 
-#: ../clutter/clutter-settings.c:441
+#: ../clutter/clutter-settings.c:487
 msgid "The time between clicks necessary to detect a multiple click"
 msgstr "Време између кликова потребно за откривање вишеструког клика"
 
-#: ../clutter/clutter-settings.c:456
+#: ../clutter/clutter-settings.c:502
 msgid "Double Click Distance"
 msgstr "Размак дуплог клика"
 
-#: ../clutter/clutter-settings.c:457
+#: ../clutter/clutter-settings.c:503
 msgid "The distance between clicks necessary to detect a multiple click"
 msgstr "Размак између кликова потребан за откривање вишеструког клика"
 
-#: ../clutter/clutter-settings.c:472
+#: ../clutter/clutter-settings.c:518
 msgid "Drag Threshold"
 msgstr "Праг превлачења"
 
-#: ../clutter/clutter-settings.c:473
+#: ../clutter/clutter-settings.c:519
 msgid "The distance the cursor should travel before starting to drag"
 msgstr "Растојање које курсор треба да пређе пре почетка превлачења"
 
-#: ../clutter/clutter-settings.c:488 ../clutter/clutter-text.c:3369
+#: ../clutter/clutter-settings.c:534 ../clutter/clutter-text.c:3404
 msgid "Font Name"
 msgstr "Назив словног лика"
 
-#: ../clutter/clutter-settings.c:489
+#: ../clutter/clutter-settings.c:535
 msgid ""
 "The description of the default font, as one that could be parsed by Pango"
 msgstr "Опис основног словног лика, као оно које би Панго требао да обради"
 
-#: ../clutter/clutter-settings.c:504
+#: ../clutter/clutter-settings.c:550
 msgid "Font Antialias"
 msgstr "Умекшавање словног лика"
 
-#: ../clutter/clutter-settings.c:505
+#: ../clutter/clutter-settings.c:551
 msgid ""
 "Whether to use antialiasing (1 to enable, 0 to disable, and -1 to use the "
 "default)"
@@ -1462,70 +1534,78 @@ msgstr ""
 "Да ли ће бити коришћено умекшавање (1 за укључивање, 0 за искључивање, и -1 "
 "за коришћење основног)"
 
-#: ../clutter/clutter-settings.c:521
+#: ../clutter/clutter-settings.c:567 ../clutter/clutter-settings.c:575
 msgid "Font DPI"
 msgstr "ТПИ словног лика"
 
-#: ../clutter/clutter-settings.c:522
+#: ../clutter/clutter-settings.c:568 ../clutter/clutter-settings.c:576
 msgid ""
 "The resolution of the font, in 1024 * dots/inch, or -1 to use the default"
 msgstr ""
 "Резолуција словног лика, у 1024 * тачака/инчу, или -1 за коришћење основне"
 
-#: ../clutter/clutter-settings.c:538
+#: ../clutter/clutter-settings.c:592
 msgid "Font Hinting"
 msgstr "Наговештај словног лика"
 
-#: ../clutter/clutter-settings.c:539
+#: ../clutter/clutter-settings.c:593
 msgid ""
 "Whether to use hinting (1 to enable, 0 to disable and -1 to use the default)"
 msgstr ""
 "Да ли ће бити коришћено наговештавање (1 за укључивање, 0 за искључивање, и "
 "-1 за коришћење основног)"
 
-#: ../clutter/clutter-settings.c:560
+#: ../clutter/clutter-settings.c:614
 msgid "Font Hint Style"
 msgstr "Стил наговештаја словног лика"
 
-#: ../clutter/clutter-settings.c:561
+#: ../clutter/clutter-settings.c:615
 msgid "The style of hinting (hintnone, hintslight, hintmedium, hintfull)"
 msgstr ""
 "Стил наговештавања („hintnone“ (ништа), „hintslight“ (благо), "
 "„hintmedium“ (средње), „hintfull“ (пуно))"
 
-#: ../clutter/clutter-settings.c:582
+#: ../clutter/clutter-settings.c:636
 msgid "Font Subpixel Order"
 msgstr "Поредак подтачака словног лика"
 
-#: ../clutter/clutter-settings.c:583
+#: ../clutter/clutter-settings.c:637
 msgid "The type of subpixel antialiasing (none, rgb, bgr, vrgb, vbgr)"
 msgstr "Врста умекшавања подтачака (none, rgb, bgr, vrgb, vbgr)"
 
-#: ../clutter/clutter-settings.c:600
+#: ../clutter/clutter-settings.c:654
 msgid "The minimum duration for a long press gesture to be recognized"
 msgstr "Најмање трајање потеза дугог притиска да би био препознат"
 
-#: ../clutter/clutter-settings.c:607
+#: ../clutter/clutter-settings.c:661
+msgid "Window Scaling Factor"
+msgstr "Чинилац сразмеравања прозора"
+
+#: ../clutter/clutter-settings.c:662
+msgid "The scaling factor to be applied to windows"
+msgstr "Чинилац сразмеравања који ће се примењивати над прозорима"
+
+#: ../clutter/clutter-settings.c:669
 msgid "Fontconfig configuration timestamp"
 msgstr "Време и датум подешавања словног лика"
 
-#: ../clutter/clutter-settings.c:608
+#: ../clutter/clutter-settings.c:670
 msgid "Timestamp of the current fontconfig configuration"
 msgstr "Време и датум тренутног подешавања словног лика"
 
-#: ../clutter/clutter-settings.c:625
+#: ../clutter/clutter-settings.c:687
 msgid "Password Hint Time"
 msgstr "Време наговештаја лозинке"
 
-#: ../clutter/clutter-settings.c:626
+#: ../clutter/clutter-settings.c:688
 msgid "How long to show the last input character in hidden entries"
 msgstr "Колико дуго ће бити приказан последњи знак уноса у скривеним ставкама"
 
-#: ../clutter/clutter-shader-effect.c:486
+#: ../clutter/clutter-shader-effect.c:485
 msgid "Shader Type"
 msgstr "Врста нијансера"
 
-#: ../clutter/clutter-shader-effect.c:487
+#: ../clutter/clutter-shader-effect.c:486
 msgid "The type of shader used"
 msgstr "Врста коришћеног нијансера"
 
@@ -1553,761 +1633,705 @@ msgstr "Ивица извора која треба да буде обухваћ
 msgid "The offset in pixels to apply to the constraint"
 msgstr "Померај у тачкама који ће бити примењен на ограничење"
 
-#: ../clutter/clutter-stage.c:1895
+#: ../clutter/clutter-stage.c:1899
 msgid "Fullscreen Set"
 msgstr "Избор целог екрана"
 
-#: ../clutter/clutter-stage.c:1896
+#: ../clutter/clutter-stage.c:1900
 msgid "Whether the main stage is fullscreen"
 msgstr "Да ли је главна сцена преко целог екрана"
 
-#: ../clutter/clutter-stage.c:1910
+#: ../clutter/clutter-stage.c:1914
 msgid "Offscreen"
 msgstr "Ван екрана"
 
-#: ../clutter/clutter-stage.c:1911
+#: ../clutter/clutter-stage.c:1915
 msgid "Whether the main stage should be rendered offscreen"
 msgstr "Да ли главна сцена треба да буде исцртана ван екрана"
 
-#: ../clutter/clutter-stage.c:1923 ../clutter/clutter-text.c:3483
+#: ../clutter/clutter-stage.c:1927 ../clutter/clutter-text.c:3518
 msgid "Cursor Visible"
 msgstr "Курсор је видљив"
 
-#: ../clutter/clutter-stage.c:1924
+#: ../clutter/clutter-stage.c:1928
 msgid "Whether the mouse pointer is visible on the main stage"
 msgstr "Да ли је показивач миша видљив на главној сцени"
 
-#: ../clutter/clutter-stage.c:1938
+#: ../clutter/clutter-stage.c:1942
 msgid "User Resizable"
 msgstr "Корисник мења величину"
 
-#: ../clutter/clutter-stage.c:1939
+#: ../clutter/clutter-stage.c:1943
 msgid "Whether the stage is able to be resized via user interaction"
 msgstr "Да ли је могуће променити величану сцене посредством дејства корисника"
 
-#: ../clutter/clutter-stage.c:1954 ../clutter/deprecated/clutter-box.c:260
-#: ../clutter/deprecated/clutter-rectangle.c:273
+#: ../clutter/clutter-stage.c:1958 ../clutter/deprecated/clutter-box.c:256
+#: ../clutter/deprecated/clutter-rectangle.c:270
 msgid "Color"
 msgstr "Боја"
 
-#: ../clutter/clutter-stage.c:1955
+#: ../clutter/clutter-stage.c:1959
 msgid "The color of the stage"
 msgstr "Боја сцене"
 
-#: ../clutter/clutter-stage.c:1970
+#: ../clutter/clutter-stage.c:1974
 msgid "Perspective"
 msgstr "Видокруг"
 
-#: ../clutter/clutter-stage.c:1971
+#: ../clutter/clutter-stage.c:1975
 msgid "Perspective projection parameters"
 msgstr "Параметри пројекције видокруга"
 
-#: ../clutter/clutter-stage.c:1986
+#: ../clutter/clutter-stage.c:1990
 msgid "Title"
 msgstr "Наслов"
 
-#: ../clutter/clutter-stage.c:1987
+#: ../clutter/clutter-stage.c:1991
 msgid "Stage Title"
 msgstr "Наслов сцене"
 
-#: ../clutter/clutter-stage.c:2004
+#: ../clutter/clutter-stage.c:2008
 msgid "Use Fog"
 msgstr "Користи маглу"
 
-#: ../clutter/clutter-stage.c:2005
+#: ../clutter/clutter-stage.c:2009
 msgid "Whether to enable depth cueing"
 msgstr "Да ли ће бити укључено сигнализирање дубине"
 
-#: ../clutter/clutter-stage.c:2021
+#: ../clutter/clutter-stage.c:2025
 msgid "Fog"
 msgstr "Магла"
 
-#: ../clutter/clutter-stage.c:2022
+#: ../clutter/clutter-stage.c:2026
 msgid "Settings for the depth cueing"
 msgstr "Подешавања за сигнализирање дубине"
 
-#: ../clutter/clutter-stage.c:2038
+#: ../clutter/clutter-stage.c:2042
 msgid "Use Alpha"
 msgstr "Користи провидност"
 
-#: ../clutter/clutter-stage.c:2039
+#: ../clutter/clutter-stage.c:2043
 msgid "Whether to honour the alpha component of the stage color"
 msgstr "Да ли да испоштује компоненту провидности боје сцене"
 
-#: ../clutter/clutter-stage.c:2055
+#: ../clutter/clutter-stage.c:2059
 msgid "Key Focus"
 msgstr "Први план тастера"
 
-#: ../clutter/clutter-stage.c:2056
+#: ../clutter/clutter-stage.c:2060
 msgid "The currently key focused actor"
 msgstr "Тренутни чинилац тастером у први план"
 
-#: ../clutter/clutter-stage.c:2072
+#: ../clutter/clutter-stage.c:2076
 msgid "No Clear Hint"
 msgstr "Без брисања савета"
 
-#: ../clutter/clutter-stage.c:2073
+#: ../clutter/clutter-stage.c:2077
 msgid "Whether the stage should clear its contents"
 msgstr "Да ли сцена треба да очисти свој садржај"
 
-#: ../clutter/clutter-stage.c:2086
+#: ../clutter/clutter-stage.c:2090
 msgid "Accept Focus"
 msgstr "Прихватање у први план"
 
-#: ../clutter/clutter-stage.c:2087
+#: ../clutter/clutter-stage.c:2091
 msgid "Whether the stage should accept focus on show"
 msgstr "Да ли сцена треба да прихвати први план при приказу"
 
-#: ../clutter/clutter-table-layout.c:543
-msgid "Column Number"
-msgstr "Број колоне"
-
-#: ../clutter/clutter-table-layout.c:544
-msgid "The column the widget resides in"
-msgstr "Колона у којој се налази елемент"
-
-#: ../clutter/clutter-table-layout.c:551
-msgid "Row Number"
-msgstr "Број реда"
-
-#: ../clutter/clutter-table-layout.c:552
-msgid "The row the widget resides in"
-msgstr "Ред у коме се налази елемент"
-
-#: ../clutter/clutter-table-layout.c:559
-msgid "Column Span"
-msgstr "Распон колоне"
-
-#: ../clutter/clutter-table-layout.c:560
-msgid "The number of columns the widget should span"
-msgstr "Број колона које елемент треба да обухвати"
-
-#: ../clutter/clutter-table-layout.c:567
-msgid "Row Span"
-msgstr "Распон реда"
-
-#: ../clutter/clutter-table-layout.c:568
-msgid "The number of rows the widget should span"
-msgstr "Број редова које елемент треба да обухвати"
-
-#: ../clutter/clutter-table-layout.c:575
-msgid "Horizontal Expand"
-msgstr "Водоравно ширење"
-
-#: ../clutter/clutter-table-layout.c:576
-msgid "Allocate extra space for the child in horizontal axis"
-msgstr "Додељује додатни простор за пород на водоравној оси"
-
-#: ../clutter/clutter-table-layout.c:582
-msgid "Vertical Expand"
-msgstr "Усправно ширење"
-
-#: ../clutter/clutter-table-layout.c:583
-msgid "Allocate extra space for the child in vertical axis"
-msgstr "Додељује додатни простор за пород на усправној оси"
-
-#: ../clutter/clutter-table-layout.c:1638
-msgid "Spacing between columns"
-msgstr "Размак између колона"
-
-#: ../clutter/clutter-table-layout.c:1652
-msgid "Spacing between rows"
-msgstr "Размак између редова"
-
-#: ../clutter/clutter-text-buffer.c:351 ../clutter/clutter-text.c:3404
+#: ../clutter/clutter-text-buffer.c:347 ../clutter/clutter-text.c:3439
 msgid "Text"
 msgstr "Текст"
 
-#: ../clutter/clutter-text-buffer.c:352
+#: ../clutter/clutter-text-buffer.c:348
 msgid "The contents of the buffer"
 msgstr "Садржај приручне меморије"
 
-#: ../clutter/clutter-text-buffer.c:365
+#: ../clutter/clutter-text-buffer.c:361
 msgid "Text length"
 msgstr "Дужина текста"
 
-#: ../clutter/clutter-text-buffer.c:366
+#: ../clutter/clutter-text-buffer.c:362
 msgid "Length of the text currently in the buffer"
 msgstr "Дужина текста који је тренутно у приручној меморији"
 
-#: ../clutter/clutter-text-buffer.c:379
+#: ../clutter/clutter-text-buffer.c:375
 msgid "Maximum length"
 msgstr "Највећа дужина"
 
-#: ../clutter/clutter-text-buffer.c:380
+#: ../clutter/clutter-text-buffer.c:376
 msgid "Maximum number of characters for this entry. Zero if no maximum"
 msgstr "Највећи број знакова за ову ставку. Нула ако нема ограничења"
 
-#: ../clutter/clutter-text.c:3351
+#: ../clutter/clutter-text.c:3386
 msgid "Buffer"
 msgstr "Приручна меморија"
 
-#: ../clutter/clutter-text.c:3352
+#: ../clutter/clutter-text.c:3387
 msgid "The buffer for the text"
 msgstr "Приручна меморија за текст"
 
-#: ../clutter/clutter-text.c:3370
+#: ../clutter/clutter-text.c:3405
 msgid "The font to be used by the text"
 msgstr "Словни лик који ће текст да користи"
 
-#: ../clutter/clutter-text.c:3387
+#: ../clutter/clutter-text.c:3422
 msgid "Font Description"
 msgstr "Опис словног лика"
 
-#: ../clutter/clutter-text.c:3388
+#: ../clutter/clutter-text.c:3423
 msgid "The font description to be used"
 msgstr "Опис словног лика који ће бити коришћен"
 
-#: ../clutter/clutter-text.c:3405
+#: ../clutter/clutter-text.c:3440
 msgid "The text to render"
 msgstr "Текст за приказивање"
 
-#: ../clutter/clutter-text.c:3419
+#: ../clutter/clutter-text.c:3454
 msgid "Font Color"
 msgstr "Боја словног лика"
 
-#: ../clutter/clutter-text.c:3420
+#: ../clutter/clutter-text.c:3455
 msgid "Color of the font used by the text"
 msgstr "Боја словног лика ког користи текст"
 
-#: ../clutter/clutter-text.c:3435
+#: ../clutter/clutter-text.c:3470
 msgid "Editable"
 msgstr "Измењив"
 
-#: ../clutter/clutter-text.c:3436
+#: ../clutter/clutter-text.c:3471
 msgid "Whether the text is editable"
 msgstr "Да ли се текст може мењати"
 
-#: ../clutter/clutter-text.c:3451
+#: ../clutter/clutter-text.c:3486
 msgid "Selectable"
 msgstr "Избирљив"
 
-#: ../clutter/clutter-text.c:3452
+#: ../clutter/clutter-text.c:3487
 msgid "Whether the text is selectable"
 msgstr "Да ли се текст може изабрати"
 
-#: ../clutter/clutter-text.c:3466
+#: ../clutter/clutter-text.c:3501
 msgid "Activatable"
 msgstr "Активирљив"
 
-#: ../clutter/clutter-text.c:3467
+#: ../clutter/clutter-text.c:3502
 msgid "Whether pressing return causes the activate signal to be emitted"
 msgstr "Да ли притисак на повратак изазива емитовање сигнала активирања"
 
-#: ../clutter/clutter-text.c:3484
+#: ../clutter/clutter-text.c:3519
 msgid "Whether the input cursor is visible"
 msgstr "Да ли је курсор уноса видљив"
 
-#: ../clutter/clutter-text.c:3498 ../clutter/clutter-text.c:3499
+#: ../clutter/clutter-text.c:3533 ../clutter/clutter-text.c:3534
 msgid "Cursor Color"
 msgstr "Боја курсора"
 
-#: ../clutter/clutter-text.c:3514
+#: ../clutter/clutter-text.c:3549
 msgid "Cursor Color Set"
 msgstr "Избор боје курсора"
 
-#: ../clutter/clutter-text.c:3515
+#: ../clutter/clutter-text.c:3550
 msgid "Whether the cursor color has been set"
 msgstr "Да ли је боја курсора постављена"
 
-#: ../clutter/clutter-text.c:3530
+#: ../clutter/clutter-text.c:3565
 msgid "Cursor Size"
 msgstr "Величина курсора"
 
-#: ../clutter/clutter-text.c:3531
+#: ../clutter/clutter-text.c:3566
 msgid "The width of the cursor, in pixels"
 msgstr "Ширина курсора, у тачкама"
 
-#: ../clutter/clutter-text.c:3547 ../clutter/clutter-text.c:3565
+#: ../clutter/clutter-text.c:3582 ../clutter/clutter-text.c:3600
 msgid "Cursor Position"
 msgstr "Положај курсора"
 
-#: ../clutter/clutter-text.c:3548 ../clutter/clutter-text.c:3566
+#: ../clutter/clutter-text.c:3583 ../clutter/clutter-text.c:3601
 msgid "The cursor position"
 msgstr "Положај курсора"
 
-#: ../clutter/clutter-text.c:3581
+#: ../clutter/clutter-text.c:3616
 msgid "Selection-bound"
 msgstr "Граница избора"
 
-#: ../clutter/clutter-text.c:3582
+#: ../clutter/clutter-text.c:3617
 msgid "The cursor position of the other end of the selection"
 msgstr "Положај курсора на другом крају избора"
 
-#: ../clutter/clutter-text.c:3597 ../clutter/clutter-text.c:3598
+#: ../clutter/clutter-text.c:3632 ../clutter/clutter-text.c:3633
 msgid "Selection Color"
 msgstr "Боја избора"
 
-#: ../clutter/clutter-text.c:3613
+#: ../clutter/clutter-text.c:3648
 msgid "Selection Color Set"
 msgstr "Избор боје избора"
 
-#: ../clutter/clutter-text.c:3614
+#: ../clutter/clutter-text.c:3649
 msgid "Whether the selection color has been set"
 msgstr "Да ли је боја избора постављена"
 
-#: ../clutter/clutter-text.c:3629
+#: ../clutter/clutter-text.c:3664
 msgid "Attributes"
 msgstr "Особине"
 
-#: ../clutter/clutter-text.c:3630
+#: ../clutter/clutter-text.c:3665
 msgid "A list of style attributes to apply to the contents of the actor"
 msgstr "Списак особина стила које ће бити примењене на садржај чиниоца"
 
-#: ../clutter/clutter-text.c:3652
+#: ../clutter/clutter-text.c:3687
 msgid "Use markup"
 msgstr "Користи означавање"
 
-#: ../clutter/clutter-text.c:3653
+#: ../clutter/clutter-text.c:3688
 msgid "Whether or not the text includes Pango markup"
 msgstr "Да ли текст обухвата Панго означавање или не"
 
-#: ../clutter/clutter-text.c:3669
+#: ../clutter/clutter-text.c:3704
 msgid "Line wrap"
 msgstr "Прелом реда"
 
-#: ../clutter/clutter-text.c:3670
+#: ../clutter/clutter-text.c:3705
 msgid "If set, wrap the lines if the text becomes too wide"
 msgstr ""
 "Ако је подешено, вршиће преламање редова ако текст постане сувише широк"
 
-#: ../clutter/clutter-text.c:3685
+#: ../clutter/clutter-text.c:3720
 msgid "Line wrap mode"
 msgstr "Начин прелома реда"
 
-#: ../clutter/clutter-text.c:3686
+#: ../clutter/clutter-text.c:3721
 msgid "Control how line-wrapping is done"
 msgstr "Контролише како је обављено преламање реда"
 
-#: ../clutter/clutter-text.c:3701
+#: ../clutter/clutter-text.c:3736
 msgid "Ellipsize"
 msgstr "Скраћивање"
 
-#: ../clutter/clutter-text.c:3702
+#: ../clutter/clutter-text.c:3737
 msgid "The preferred place to ellipsize the string"
 msgstr "Жељено место за скраћивање ниске"
 
-#: ../clutter/clutter-text.c:3718
+#: ../clutter/clutter-text.c:3753
 msgid "Line Alignment"
 msgstr "Поравнање реда"
 
-#: ../clutter/clutter-text.c:3719
+#: ../clutter/clutter-text.c:3754
 msgid "The preferred alignment for the string, for multi-line text"
 msgstr "Жељено поравнања за ниску, за више-линијски текст"
 
-#: ../clutter/clutter-text.c:3735
+#: ../clutter/clutter-text.c:3770
 msgid "Justify"
 msgstr "Слагање"
 
-#: ../clutter/clutter-text.c:3736
+#: ../clutter/clutter-text.c:3771
 msgid "Whether the text should be justified"
 msgstr "Да ли текст треба да буде сложен"
 
-#: ../clutter/clutter-text.c:3751
+#: ../clutter/clutter-text.c:3786
 msgid "Password Character"
 msgstr "Знак лозинке"
 
-#: ../clutter/clutter-text.c:3752
+#: ../clutter/clutter-text.c:3787
 msgid "If non-zero, use this character to display the actor's contents"
 msgstr "Ако није нула, користиће овај знак за приказивање садржаја чиниоца"
 
-#: ../clutter/clutter-text.c:3766
+#: ../clutter/clutter-text.c:3801
 msgid "Max Length"
 msgstr "Највећа дужина"
 
-#: ../clutter/clutter-text.c:3767
+#: ../clutter/clutter-text.c:3802
 msgid "Maximum length of the text inside the actor"
 msgstr "Највећа дужина текста унутар чиниоца"
 
-#: ../clutter/clutter-text.c:3790
+#: ../clutter/clutter-text.c:3825
 msgid "Single Line Mode"
 msgstr "Режим једног реда"
 
-#: ../clutter/clutter-text.c:3791
+#: ../clutter/clutter-text.c:3826
 msgid "Whether the text should be a single line"
 msgstr "Да ли текст треба да буде један ред"
 
-#: ../clutter/clutter-text.c:3805 ../clutter/clutter-text.c:3806
+#: ../clutter/clutter-text.c:3840 ../clutter/clutter-text.c:3841
 msgid "Selected Text Color"
 msgstr "Боја изабраног текста"
 
-#: ../clutter/clutter-text.c:3821
+#: ../clutter/clutter-text.c:3856
 msgid "Selected Text Color Set"
 msgstr "Поставка боје изабраног текста"
 
-#: ../clutter/clutter-text.c:3822
+#: ../clutter/clutter-text.c:3857
 msgid "Whether the selected text color has been set"
 msgstr "Да ли је боја изабраног текста постављена"
 
-#: ../clutter/clutter-timeline.c:561
-#: ../clutter/deprecated/clutter-animation.c:560
+#: ../clutter/clutter-timeline.c:593
+#: ../clutter/deprecated/clutter-animation.c:557
 msgid "Loop"
 msgstr "Понављање"
 
-#: ../clutter/clutter-timeline.c:562
+#: ../clutter/clutter-timeline.c:594
 msgid "Should the timeline automatically restart"
 msgstr "Да ли линија времена треба самостално да се поново покрене"
 
-#: ../clutter/clutter-timeline.c:576
+#: ../clutter/clutter-timeline.c:608
 msgid "Delay"
 msgstr "Застој"
 
-#: ../clutter/clutter-timeline.c:577
+#: ../clutter/clutter-timeline.c:609
 msgid "Delay before start"
 msgstr "Застој пре почетка"
 
-#: ../clutter/clutter-timeline.c:592
-#: ../clutter/deprecated/clutter-animation.c:544
-#: ../clutter/deprecated/clutter-animator.c:1804
+#: ../clutter/clutter-timeline.c:624
+#: ../clutter/deprecated/clutter-animation.c:541
+#: ../clutter/deprecated/clutter-animator.c:1801
 #: ../clutter/deprecated/clutter-media.c:224
-#: ../clutter/deprecated/clutter-state.c:1523
+#: ../clutter/deprecated/clutter-state.c:1517
 msgid "Duration"
 msgstr "Трајање"
 
-#: ../clutter/clutter-timeline.c:593
+#: ../clutter/clutter-timeline.c:625
 msgid "Duration of the timeline in milliseconds"
 msgstr "Трајање линије времена, у милисекундама"
 
-#: ../clutter/clutter-timeline.c:608
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:528
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:337
+#: ../clutter/clutter-timeline.c:640
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:521
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:330
 msgid "Direction"
 msgstr "Правац"
 
-#: ../clutter/clutter-timeline.c:609
+#: ../clutter/clutter-timeline.c:641
 msgid "Direction of the timeline"
 msgstr "Смер линије времена"
 
-#: ../clutter/clutter-timeline.c:624
+#: ../clutter/clutter-timeline.c:656
 msgid "Auto Reverse"
 msgstr "Самостално обртање"
 
-#: ../clutter/clutter-timeline.c:625
+#: ../clutter/clutter-timeline.c:657
 msgid "Whether the direction should be reversed when reaching the end"
 msgstr "Да ли смер треба да буде преокренут када стигне до краја"
 
-#: ../clutter/clutter-timeline.c:643
+#: ../clutter/clutter-timeline.c:675
 msgid "Repeat Count"
 msgstr "Број понављања"
 
-#: ../clutter/clutter-timeline.c:644
+#: ../clutter/clutter-timeline.c:676
 msgid "How many times the timeline should repeat"
 msgstr "Колико пута временска линија треба да се понови"
 
-#: ../clutter/clutter-timeline.c:658
+#: ../clutter/clutter-timeline.c:690
 msgid "Progress Mode"
 msgstr "Режим напретка"
 
-#: ../clutter/clutter-timeline.c:659
+#: ../clutter/clutter-timeline.c:691
 msgid "How the timeline should compute the progress"
 msgstr "Како временска линија треба да израчуна напредак"
 
-#: ../clutter/clutter-transition.c:246
+#: ../clutter/clutter-transition.c:244
 msgid "Interval"
 msgstr "Период"
 
-#: ../clutter/clutter-transition.c:247
+#: ../clutter/clutter-transition.c:245
 msgid "The interval of values to transition"
 msgstr "Период вредности за прелаз"
 
-#: ../clutter/clutter-transition.c:261
+#: ../clutter/clutter-transition.c:259
 msgid "Animatable"
 msgstr "Анимирљив"
 
-#: ../clutter/clutter-transition.c:262
+#: ../clutter/clutter-transition.c:260
 msgid "The animatable object"
 msgstr "Објекат за анимирање"
 
-#: ../clutter/clutter-transition.c:283
+#: ../clutter/clutter-transition.c:281
 msgid "Remove on Complete"
 msgstr "Уклони када је обављено"
 
-#: ../clutter/clutter-transition.c:284
+#: ../clutter/clutter-transition.c:282
 msgid "Detach the transition when completed"
 msgstr "Откачиће прелаз након што је обављен"
 
-#: ../clutter/clutter-zoom-action.c:354
+#: ../clutter/clutter-zoom-action.c:365
 msgid "Zoom Axis"
 msgstr "Оса увећања"
 
-#: ../clutter/clutter-zoom-action.c:355
+#: ../clutter/clutter-zoom-action.c:366
 msgid "Constraints the zoom to an axis"
 msgstr "Ограничава увећавање на осу"
 
-#: ../clutter/deprecated/clutter-alpha.c:355
-#: ../clutter/deprecated/clutter-animation.c:575
-#: ../clutter/deprecated/clutter-animator.c:1821
+#: ../clutter/deprecated/clutter-alpha.c:354
+#: ../clutter/deprecated/clutter-animation.c:572
+#: ../clutter/deprecated/clutter-animator.c:1818
 msgid "Timeline"
 msgstr "Линија времена"
 
-#: ../clutter/deprecated/clutter-alpha.c:356
+#: ../clutter/deprecated/clutter-alpha.c:355
 msgid "Timeline used by the alpha"
 msgstr "Линија времена коју користи провидност"
 
-#: ../clutter/deprecated/clutter-alpha.c:372
+#: ../clutter/deprecated/clutter-alpha.c:371
 msgid "Alpha value"
 msgstr "Вредност провидности"
 
-#: ../clutter/deprecated/clutter-alpha.c:373
+#: ../clutter/deprecated/clutter-alpha.c:372
 msgid "Alpha value as computed by the alpha"
 msgstr "Вредност провидности коју прорачунава провидност"
 
-#: ../clutter/deprecated/clutter-alpha.c:394
-#: ../clutter/deprecated/clutter-animation.c:528
+#: ../clutter/deprecated/clutter-alpha.c:393
+#: ../clutter/deprecated/clutter-animation.c:525
 msgid "Mode"
 msgstr "Режим"
 
-#: ../clutter/deprecated/clutter-alpha.c:395
+#: ../clutter/deprecated/clutter-alpha.c:394
 msgid "Progress mode"
 msgstr "Режим напретка"
 
-#: ../clutter/deprecated/clutter-animation.c:511
+#: ../clutter/deprecated/clutter-animation.c:508
 msgid "Object"
 msgstr "Објекат"
 
-#: ../clutter/deprecated/clutter-animation.c:512
+#: ../clutter/deprecated/clutter-animation.c:509
 msgid "Object to which the animation applies"
 msgstr "Објекат на који се примењује анимирање"
 
-#: ../clutter/deprecated/clutter-animation.c:529
+#: ../clutter/deprecated/clutter-animation.c:526
 msgid "The mode of the animation"
 msgstr "Режим анимирања"
 
-#: ../clutter/deprecated/clutter-animation.c:545
+#: ../clutter/deprecated/clutter-animation.c:542
 msgid "Duration of the animation, in milliseconds"
 msgstr "Трајање анимирања, у милисекундама"
 
-#: ../clutter/deprecated/clutter-animation.c:561
+#: ../clutter/deprecated/clutter-animation.c:558
 msgid "Whether the animation should loop"
 msgstr "Да ли анимирање треба да се понавља"
 
-#: ../clutter/deprecated/clutter-animation.c:576
+#: ../clutter/deprecated/clutter-animation.c:573
 msgid "The timeline used by the animation"
 msgstr "Линија времена коју користи анимирање"
 
-#: ../clutter/deprecated/clutter-animation.c:592
-#: ../clutter/deprecated/clutter-behaviour.c:241
+#: ../clutter/deprecated/clutter-animation.c:589
+#: ../clutter/deprecated/clutter-behaviour.c:237
 msgid "Alpha"
 msgstr "Провидност"
 
-#: ../clutter/deprecated/clutter-animation.c:593
+#: ../clutter/deprecated/clutter-animation.c:590
 msgid "The alpha used by the animation"
 msgstr "Провидност коју користи анимирање"
 
-#: ../clutter/deprecated/clutter-animator.c:1805
+#: ../clutter/deprecated/clutter-animator.c:1802
 msgid "The duration of the animation"
 msgstr "Трајање анимирања"
 
-#: ../clutter/deprecated/clutter-animator.c:1822
+#: ../clutter/deprecated/clutter-animator.c:1819
 msgid "The timeline of the animation"
 msgstr "Линија времена анимирања"
 
-#: ../clutter/deprecated/clutter-behaviour.c:242
+#: ../clutter/deprecated/clutter-behaviour.c:238
 msgid "Alpha Object to drive the behaviour"
 msgstr "Објекат провидности који управља понашањем"
 
-#: ../clutter/deprecated/clutter-behaviour-depth.c:182
+#: ../clutter/deprecated/clutter-behaviour-depth.c:180
 msgid "Start Depth"
 msgstr "Почетна дубина"
 
-#: ../clutter/deprecated/clutter-behaviour-depth.c:183
+#: ../clutter/deprecated/clutter-behaviour-depth.c:181
 msgid "Initial depth to apply"
 msgstr "Почетна дубина која ће бити примењена"
 
-#: ../clutter/deprecated/clutter-behaviour-depth.c:198
+#: ../clutter/deprecated/clutter-behaviour-depth.c:196
 msgid "End Depth"
 msgstr "Крајња дубина"
 
-#: ../clutter/deprecated/clutter-behaviour-depth.c:199
+#: ../clutter/deprecated/clutter-behaviour-depth.c:197
 msgid "Final depth to apply"
 msgstr "Крајња дубина која ће бити примењена"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:401
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:394
 msgid "Start Angle"
 msgstr "Почетни угао"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:402
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:284
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:395
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:277
 msgid "Initial angle"
 msgstr "Почетни угао"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:417
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:410
 msgid "End Angle"
 msgstr "Крајњи угао"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:418
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:302
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:411
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:295
 msgid "Final angle"
 msgstr "Крајњи угао"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:433
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:426
 msgid "Angle x tilt"
 msgstr "Угао x нагиба"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:434
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:427
 msgid "Tilt of the ellipse around x axis"
 msgstr "Нагиб елипсе око х осе"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:449
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:442
 msgid "Angle y tilt"
 msgstr "Угао y нагиба"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:450
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:443
 msgid "Tilt of the ellipse around y axis"
 msgstr "Нагиб елипсе око y осе"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:465
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:458
 msgid "Angle z tilt"
 msgstr "Угао z нагиба"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:466
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:459
 msgid "Tilt of the ellipse around z axis"
 msgstr "Нагиб елипсе око z осе"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:482
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:475
 msgid "Width of the ellipse"
 msgstr "Ширина елипсе"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:498
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:491
 msgid "Height of ellipse"
 msgstr "Висина елипсе"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:513
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:506
 msgid "Center"
 msgstr "Средиште"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:514
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:507
 msgid "Center of ellipse"
 msgstr "Средиште елипсе"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:529
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:338
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:522
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:331
 msgid "Direction of rotation"
 msgstr "Правац окретања"
 
-#: ../clutter/deprecated/clutter-behaviour-opacity.c:184
+#: ../clutter/deprecated/clutter-behaviour-opacity.c:177
 msgid "Opacity Start"
 msgstr "Почетак провидности"
 
-#: ../clutter/deprecated/clutter-behaviour-opacity.c:185
+#: ../clutter/deprecated/clutter-behaviour-opacity.c:178
 msgid "Initial opacity level"
 msgstr "Ниво почетне провидности"
 
-#: ../clutter/deprecated/clutter-behaviour-opacity.c:202
+#: ../clutter/deprecated/clutter-behaviour-opacity.c:195
 msgid "Opacity End"
 msgstr "Крај провидности"
 
-#: ../clutter/deprecated/clutter-behaviour-opacity.c:203
+#: ../clutter/deprecated/clutter-behaviour-opacity.c:196
 msgid "Final opacity level"
 msgstr "Ниво крајње провидности"
 
-#: ../clutter/deprecated/clutter-behaviour-path.c:226
+#: ../clutter/deprecated/clutter-behaviour-path.c:222
 msgid "The ClutterPath object representing the path to animate along"
 msgstr ""
 "Објекат путање Галамџије који представља путању која ће бити заједно "
 "анимирана"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:283
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:276
 msgid "Angle Begin"
 msgstr "Почетак угла"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:301
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:294
 msgid "Angle End"
 msgstr "Крај угла"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:319
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:312
 msgid "Axis"
 msgstr "Оса"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:320
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:313
 msgid "Axis of rotation"
 msgstr "Оса окретања"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:355
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:348
 msgid "Center X"
 msgstr "X средиште"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:356
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:349
 msgid "X coordinate of the center of rotation"
 msgstr "Х координата средишта окретања"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:373
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:366
 msgid "Center Y"
 msgstr "Y средиште"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:374
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:367
 msgid "Y coordinate of the center of rotation"
 msgstr "Y координата средишта окретања"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:391
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:384
 msgid "Center Z"
 msgstr "Z средиште"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:392
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:385
 msgid "Z coordinate of the center of rotation"
 msgstr "Z координата средишта окретања"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:226
+#: ../clutter/deprecated/clutter-behaviour-scale.c:222
 msgid "X Start Scale"
 msgstr "Почетна Х размера"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:227
+#: ../clutter/deprecated/clutter-behaviour-scale.c:223
 msgid "Initial scale on the X axis"
 msgstr "Почетна размера на Х оси"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:245
+#: ../clutter/deprecated/clutter-behaviour-scale.c:241
 msgid "X End Scale"
 msgstr "Крајња Х размера"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:246
+#: ../clutter/deprecated/clutter-behaviour-scale.c:242
 msgid "Final scale on the X axis"
 msgstr "Крајња размера на Х оси"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:264
+#: ../clutter/deprecated/clutter-behaviour-scale.c:260
 msgid "Y Start Scale"
 msgstr "Почетна Y размера"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:265
+#: ../clutter/deprecated/clutter-behaviour-scale.c:261
 msgid "Initial scale on the Y axis"
 msgstr "Почетна размера на Y оси"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:283
+#: ../clutter/deprecated/clutter-behaviour-scale.c:279
 msgid "Y End Scale"
 msgstr "Крајња Y размера"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:284
+#: ../clutter/deprecated/clutter-behaviour-scale.c:280
 msgid "Final scale on the Y axis"
 msgstr "Крајња размера на Y оси"
 
-#: ../clutter/deprecated/clutter-box.c:261
+#: ../clutter/deprecated/clutter-box.c:257
 msgid "The background color of the box"
 msgstr "Боја позадине оквира"
 
-#: ../clutter/deprecated/clutter-box.c:274
+#: ../clutter/deprecated/clutter-box.c:270
 msgid "Color Set"
 msgstr "Подешавање боје"
 
-#: ../clutter/deprecated/clutter-cairo-texture.c:597
+#: ../clutter/deprecated/clutter-cairo-texture.c:593
 msgid "Surface Width"
 msgstr "Ширина површине"
 
-#: ../clutter/deprecated/clutter-cairo-texture.c:598
+#: ../clutter/deprecated/clutter-cairo-texture.c:594
 msgid "The width of the Cairo surface"
 msgstr "Ширина Каиро површине"
 
-#: ../clutter/deprecated/clutter-cairo-texture.c:615
+#: ../clutter/deprecated/clutter-cairo-texture.c:611
 msgid "Surface Height"
 msgstr "Висина површине"
 
-#: ../clutter/deprecated/clutter-cairo-texture.c:616
+#: ../clutter/deprecated/clutter-cairo-texture.c:612
 msgid "The height of the Cairo surface"
 msgstr "Висина Каиро површине"
 
-#: ../clutter/deprecated/clutter-cairo-texture.c:636
+#: ../clutter/deprecated/clutter-cairo-texture.c:632
 msgid "Auto Resize"
 msgstr "Самостална промена величине"
 
-#: ../clutter/deprecated/clutter-cairo-texture.c:637
+#: ../clutter/deprecated/clutter-cairo-texture.c:633
 msgid "Whether the surface should match the allocation"
 msgstr "Да ли површина треба да одговара распоређивању"
 
@@ -2379,100 +2403,156 @@ msgstr "Ниво попуњавања приручне меморије"
 msgid "The duration of the stream, in seconds"
 msgstr "Трајање тока, у секундама"
 
-#: ../clutter/deprecated/clutter-rectangle.c:274
+#: ../clutter/deprecated/clutter-rectangle.c:271
 msgid "The color of the rectangle"
 msgstr "Боја правоугаоника"
 
-#: ../clutter/deprecated/clutter-rectangle.c:287
+#: ../clutter/deprecated/clutter-rectangle.c:284
 msgid "Border Color"
 msgstr "Боја ивице"
 
-#: ../clutter/deprecated/clutter-rectangle.c:288
+#: ../clutter/deprecated/clutter-rectangle.c:285
 msgid "The color of the border of the rectangle"
 msgstr "Боја ивице правоугаоника"
 
-#: ../clutter/deprecated/clutter-rectangle.c:303
+#: ../clutter/deprecated/clutter-rectangle.c:300
 msgid "Border Width"
 msgstr "Ширина ивице"
 
-#: ../clutter/deprecated/clutter-rectangle.c:304
+#: ../clutter/deprecated/clutter-rectangle.c:301
 msgid "The width of the border of the rectangle"
 msgstr "Ширина ивице правоугаоника"
 
-#: ../clutter/deprecated/clutter-rectangle.c:318
+#: ../clutter/deprecated/clutter-rectangle.c:315
 msgid "Has Border"
 msgstr "Поседује ивицу"
 
-#: ../clutter/deprecated/clutter-rectangle.c:319
+#: ../clutter/deprecated/clutter-rectangle.c:316
 msgid "Whether the rectangle should have a border"
 msgstr "Да ли правоугаоник треба да има ивице"
 
-#: ../clutter/deprecated/clutter-shader.c:261
+#: ../clutter/deprecated/clutter-shader.c:257
 msgid "Vertex Source"
 msgstr "Извор врхунца"
 
-#: ../clutter/deprecated/clutter-shader.c:262
+#: ../clutter/deprecated/clutter-shader.c:258
 msgid "Source of vertex shader"
 msgstr "Извор нијансера врхунца"
 
-#: ../clutter/deprecated/clutter-shader.c:278
+#: ../clutter/deprecated/clutter-shader.c:274
 msgid "Fragment Source"
 msgstr "Извор одломка"
 
-#: ../clutter/deprecated/clutter-shader.c:279
+#: ../clutter/deprecated/clutter-shader.c:275
 msgid "Source of fragment shader"
 msgstr "Извор нијансера одломка"
 
-#: ../clutter/deprecated/clutter-shader.c:296
+#: ../clutter/deprecated/clutter-shader.c:292
 msgid "Compiled"
 msgstr "Састављен"
 
-#: ../clutter/deprecated/clutter-shader.c:297
+#: ../clutter/deprecated/clutter-shader.c:293
 msgid "Whether the shader is compiled and linked"
 msgstr "Да ли је нијансер састављен и повезан"
 
-#: ../clutter/deprecated/clutter-shader.c:314
+#: ../clutter/deprecated/clutter-shader.c:310
 msgid "Whether the shader is enabled"
 msgstr "Да ли је нијансер укључен"
 
-#: ../clutter/deprecated/clutter-shader.c:525
+#: ../clutter/deprecated/clutter-shader.c:521
 #, c-format
 msgid "%s compilation failed: %s"
 msgstr "Састављање %s није успело: %s"
 
-#: ../clutter/deprecated/clutter-shader.c:526
+#: ../clutter/deprecated/clutter-shader.c:522
 msgid "Vertex shader"
 msgstr "Нијансер врхунца"
 
-#: ../clutter/deprecated/clutter-shader.c:527
+#: ../clutter/deprecated/clutter-shader.c:523
 msgid "Fragment shader"
 msgstr "Нијансер одломка"
 
-#: ../clutter/deprecated/clutter-state.c:1505
+#: ../clutter/deprecated/clutter-state.c:1499
 msgid "State"
 msgstr "Стање"
 
-#: ../clutter/deprecated/clutter-state.c:1506
+#: ../clutter/deprecated/clutter-state.c:1500
 msgid "Currently set state, (transition to this state might not be complete)"
 msgstr "Тренутно изабрано стање, (прелаз на ово стање не може бити потпун)"
 
-#: ../clutter/deprecated/clutter-state.c:1524
+#: ../clutter/deprecated/clutter-state.c:1518
 msgid "Default transition duration"
 msgstr "Основно трајање прелаза"
 
-#: ../clutter/deprecated/clutter-texture.c:994
+#: ../clutter/deprecated/clutter-table-layout.c:543
+msgid "Column Number"
+msgstr "Број колоне"
+
+#: ../clutter/deprecated/clutter-table-layout.c:544
+msgid "The column the widget resides in"
+msgstr "Колона у којој се налази елемент"
+
+#: ../clutter/deprecated/clutter-table-layout.c:551
+msgid "Row Number"
+msgstr "Број реда"
+
+#: ../clutter/deprecated/clutter-table-layout.c:552
+msgid "The row the widget resides in"
+msgstr "Ред у коме се налази елемент"
+
+#: ../clutter/deprecated/clutter-table-layout.c:559
+msgid "Column Span"
+msgstr "Распон колоне"
+
+#: ../clutter/deprecated/clutter-table-layout.c:560
+msgid "The number of columns the widget should span"
+msgstr "Број колона које елемент треба да обухвати"
+
+#: ../clutter/deprecated/clutter-table-layout.c:567
+msgid "Row Span"
+msgstr "Распон реда"
+
+#: ../clutter/deprecated/clutter-table-layout.c:568
+msgid "The number of rows the widget should span"
+msgstr "Број редова које елемент треба да обухвати"
+
+#: ../clutter/deprecated/clutter-table-layout.c:575
+msgid "Horizontal Expand"
+msgstr "Водоравно ширење"
+
+#: ../clutter/deprecated/clutter-table-layout.c:576
+msgid "Allocate extra space for the child in horizontal axis"
+msgstr "Додељује додатни простор за пород на водоравној оси"
+
+#: ../clutter/deprecated/clutter-table-layout.c:582
+msgid "Vertical Expand"
+msgstr "Усправно ширење"
+
+#: ../clutter/deprecated/clutter-table-layout.c:583
+msgid "Allocate extra space for the child in vertical axis"
+msgstr "Додељује додатни простор за пород на усправној оси"
+
+#: ../clutter/deprecated/clutter-table-layout.c:1638
+msgid "Spacing between columns"
+msgstr "Размак између колона"
+
+#: ../clutter/deprecated/clutter-table-layout.c:1654
+msgid "Spacing between rows"
+msgstr "Размак између редова"
+
+#: ../clutter/deprecated/clutter-texture.c:992
 msgid "Sync size of actor"
 msgstr "Величина усклађења чиниоца"
 
-#: ../clutter/deprecated/clutter-texture.c:995
+#: ../clutter/deprecated/clutter-texture.c:993
 msgid "Auto sync size of actor to underlying pixbuf dimensions"
 msgstr "Величина самоусклађења чиниоца за подвлачење димензија сличице"
 
-#: ../clutter/deprecated/clutter-texture.c:1002
+#: ../clutter/deprecated/clutter-texture.c:1000
 msgid "Disable Slicing"
 msgstr "Онемогући одсецање"
 
-#: ../clutter/deprecated/clutter-texture.c:1003
+#: ../clutter/deprecated/clutter-texture.c:1001
 msgid ""
 "Forces the underlying texture to be singular and not made of smaller space "
 "saving individual textures"
@@ -2480,95 +2560,95 @@ msgstr ""
 "Приморава основну текстуру да буде једна, а не састављена од мањих простора "
 "чувајући појединачне текстуре"
 
-#: ../clutter/deprecated/clutter-texture.c:1012
+#: ../clutter/deprecated/clutter-texture.c:1010
 msgid "Tile Waste"
 msgstr "Губитак плочице"
 
-#: ../clutter/deprecated/clutter-texture.c:1013
+#: ../clutter/deprecated/clutter-texture.c:1011
 msgid "Maximum waste area of a sliced texture"
 msgstr "Највећа изгубљена област исецкане текстуре"
 
-#: ../clutter/deprecated/clutter-texture.c:1021
+#: ../clutter/deprecated/clutter-texture.c:1019
 msgid "Horizontal repeat"
 msgstr "Водоравно понављање"
 
-#: ../clutter/deprecated/clutter-texture.c:1022
+#: ../clutter/deprecated/clutter-texture.c:1020
 msgid "Repeat the contents rather than scaling them horizontally"
 msgstr "Понавља садржаје радије него да им мења размеру водоравно"
 
-#: ../clutter/deprecated/clutter-texture.c:1029
+#: ../clutter/deprecated/clutter-texture.c:1027
 msgid "Vertical repeat"
 msgstr "Усправно понављање"
 
-#: ../clutter/deprecated/clutter-texture.c:1030
+#: ../clutter/deprecated/clutter-texture.c:1028
 msgid "Repeat the contents rather than scaling them vertically"
 msgstr "Понавља садржаје радије него да им мења размеру усправно"
 
-#: ../clutter/deprecated/clutter-texture.c:1037
+#: ../clutter/deprecated/clutter-texture.c:1035
 msgid "Filter Quality"
 msgstr "Квалитет филтера"
 
-#: ../clutter/deprecated/clutter-texture.c:1038
+#: ../clutter/deprecated/clutter-texture.c:1036
 msgid "Rendering quality used when drawing the texture"
 msgstr "Квалитет приказа коришћен приликом исцртавања текстуре"
 
-#: ../clutter/deprecated/clutter-texture.c:1046
+#: ../clutter/deprecated/clutter-texture.c:1044
 msgid "Pixel Format"
 msgstr "Формат тачкице"
 
-#: ../clutter/deprecated/clutter-texture.c:1047
+#: ../clutter/deprecated/clutter-texture.c:1045
 msgid "The Cogl pixel format to use"
 msgstr "Когл формат тачкице за коришћење"
 
-#: ../clutter/deprecated/clutter-texture.c:1055
-#: ../clutter/wayland/clutter-wayland-surface.c:449
+#: ../clutter/deprecated/clutter-texture.c:1053
+#: ../clutter/wayland/clutter-wayland-surface.c:445
 msgid "Cogl Texture"
 msgstr "Когл текстура"
 
-#: ../clutter/deprecated/clutter-texture.c:1056
-#: ../clutter/wayland/clutter-wayland-surface.c:450
+#: ../clutter/deprecated/clutter-texture.c:1054
+#: ../clutter/wayland/clutter-wayland-surface.c:446
 msgid "The underlying Cogl texture handle used to draw this actor"
 msgstr "Ручица основне Когл текстура коришћене за цртање овог чиниоца"
 
-#: ../clutter/deprecated/clutter-texture.c:1063
+#: ../clutter/deprecated/clutter-texture.c:1061
 msgid "Cogl Material"
 msgstr "Когл материјал"
 
-#: ../clutter/deprecated/clutter-texture.c:1064
+#: ../clutter/deprecated/clutter-texture.c:1062
 msgid "The underlying Cogl material handle used to draw this actor"
 msgstr "Ручица основног Когл материјала коришћена за цртање овог чиниоца"
 
-#: ../clutter/deprecated/clutter-texture.c:1083
+#: ../clutter/deprecated/clutter-texture.c:1081
 msgid "The path of the file containing the image data"
 msgstr "Путања датотеке која садржи податке о слици"
 
-#: ../clutter/deprecated/clutter-texture.c:1090
+#: ../clutter/deprecated/clutter-texture.c:1088
 msgid "Keep Aspect Ratio"
 msgstr "Задржи однос размере"
 
-#: ../clutter/deprecated/clutter-texture.c:1091
+#: ../clutter/deprecated/clutter-texture.c:1089
 msgid ""
 "Keep the aspect ratio of the texture when requesting the preferred width or "
 "height"
 msgstr ""
 "Задржава однос ширине и висине текстуре када захтева жељену ширину и висину"
 
-#: ../clutter/deprecated/clutter-texture.c:1119
+#: ../clutter/deprecated/clutter-texture.c:1117
 msgid "Load asynchronously"
 msgstr "Учитај неусклађено"
 
-#: ../clutter/deprecated/clutter-texture.c:1120
+#: ../clutter/deprecated/clutter-texture.c:1118
 msgid ""
 "Load files inside a thread to avoid blocking when loading images from disk"
 msgstr ""
 "Учитава датотеке унутар нити да би се избегло блокирање приликом учитавања "
 "слика са диска"
 
-#: ../clutter/deprecated/clutter-texture.c:1138
+#: ../clutter/deprecated/clutter-texture.c:1136
 msgid "Load data asynchronously"
 msgstr "Учитај податке неусклађено"
 
-#: ../clutter/deprecated/clutter-texture.c:1139
+#: ../clutter/deprecated/clutter-texture.c:1137
 msgid ""
 "Decode image data files inside a thread to reduce blocking when loading "
 "images from disk"
@@ -2576,194 +2656,193 @@ msgstr ""
 "Дешифрује датотеке података слика унутар нити да би се смањило блокирање "
 "приликом учитавања слика са диска"
 
-#: ../clutter/deprecated/clutter-texture.c:1165
+#: ../clutter/deprecated/clutter-texture.c:1163
 msgid "Pick With Alpha"
 msgstr "Изабери са провидношћу"
 
-#: ../clutter/deprecated/clutter-texture.c:1166
+#: ../clutter/deprecated/clutter-texture.c:1164
 msgid "Shape actor with alpha channel when picking"
 msgstr "Облик чиниоца са каналом провидности приликом избора"
 
-#: ../clutter/deprecated/clutter-texture.c:1599
-#: ../clutter/deprecated/clutter-texture.c:1994
-#: ../clutter/deprecated/clutter-texture.c:2090
-#: ../clutter/deprecated/clutter-texture.c:2388
+#: ../clutter/deprecated/clutter-texture.c:1597
+#: ../clutter/deprecated/clutter-texture.c:1992
+#: ../clutter/deprecated/clutter-texture.c:2088
+#: ../clutter/deprecated/clutter-texture.c:2386
 #, c-format
 msgid "Failed to load the image data"
 msgstr "Нисам успео да учитам податке слике"
 
-#: ../clutter/deprecated/clutter-texture.c:1758
+#: ../clutter/deprecated/clutter-texture.c:1756
 #, c-format
 msgid "YUV textures are not supported"
 msgstr "ЈУВ текстуре нису подржане"
 
-#: ../clutter/deprecated/clutter-texture.c:1767
+#: ../clutter/deprecated/clutter-texture.c:1765
 #, c-format
 msgid "YUV2 textues are not supported"
 msgstr "ЈУВ2 текстуре нису подржане"
 
-#: ../clutter/evdev/clutter-input-device-evdev.c:159
+#: ../clutter/evdev/clutter-input-device-evdev.c:154
 msgid "sysfs Path"
 msgstr "Путања система датотека система"
 
-#: ../clutter/evdev/clutter-input-device-evdev.c:160
+#: ../clutter/evdev/clutter-input-device-evdev.c:155
 msgid "Path of the device in sysfs"
 msgstr "Пут уређаја у систему датотека система"
 
-#: ../clutter/evdev/clutter-input-device-evdev.c:175
+#: ../clutter/evdev/clutter-input-device-evdev.c:170
 msgid "Device Path"
 msgstr "Путања уређаја"
 
-#: ../clutter/evdev/clutter-input-device-evdev.c:176
+#: ../clutter/evdev/clutter-input-device-evdev.c:171
 msgid "Path of the device node"
 msgstr "Пут чвора уређаја"
 
-#: ../clutter/gdk/clutter-backend-gdk.c:296
+#: ../clutter/gdk/clutter-backend-gdk.c:289
 #, c-format
 msgid "Could not find a suitable CoglWinsys for a GdkDisplay of type %s"
 msgstr ""
 "Не могу да пронађем одговарајући Когл Виндоуз система за Гдк приказ врсте %s"
 
-#: ../clutter/wayland/clutter-wayland-surface.c:423
+#: ../clutter/wayland/clutter-wayland-surface.c:419
 msgid "Surface"
 msgstr "Површина"
 
-#: ../clutter/wayland/clutter-wayland-surface.c:424
+#: ../clutter/wayland/clutter-wayland-surface.c:420
 msgid "The underlying wayland surface"
 msgstr "Основна површина вејланда"
 
-#: ../clutter/wayland/clutter-wayland-surface.c:431
+#: ../clutter/wayland/clutter-wayland-surface.c:427
 msgid "Surface width"
 msgstr "Ширина површине"
 
-#: ../clutter/wayland/clutter-wayland-surface.c:432
+#: ../clutter/wayland/clutter-wayland-surface.c:428
 msgid "The width of the underlying wayland surface"
 msgstr "Ширина основне површине вејланда"
 
-#: ../clutter/wayland/clutter-wayland-surface.c:440
+#: ../clutter/wayland/clutter-wayland-surface.c:436
 msgid "Surface height"
 msgstr "Висина површине"
 
-#: ../clutter/wayland/clutter-wayland-surface.c:441
+#: ../clutter/wayland/clutter-wayland-surface.c:437
 msgid "The height of the underlying wayland surface"
 msgstr "Висина основне површине вејланда"
 
-#: ../clutter/x11/clutter-backend-x11.c:516
+#: ../clutter/x11/clutter-backend-x11.c:488
 msgid "X display to use"
 msgstr "Икс приказ за коришћење"
 
-#: ../clutter/x11/clutter-backend-x11.c:522
+#: ../clutter/x11/clutter-backend-x11.c:494
 msgid "X screen to use"
 msgstr "Икс екран за коришћење"
 
-#: ../clutter/x11/clutter-backend-x11.c:527
+#: ../clutter/x11/clutter-backend-x11.c:499
 msgid "Make X calls synchronous"
 msgstr "Чини Икс позиве усклађеним"
 
-#: ../clutter/x11/clutter-backend-x11.c:534
-#| msgid "Enable XInput support"
+#: ../clutter/x11/clutter-backend-x11.c:506
 msgid "Disable XInput support"
 msgstr "Искључује подршку Х-уноса"
 
-#: ../clutter/x11/clutter-keymap-x11.c:317
+#: ../clutter/x11/clutter-keymap-x11.c:322
 msgid "The Clutter backend"
 msgstr "Позадинац Галамџије"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:539
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:534
 msgid "Pixmap"
 msgstr "Мапа тачака"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:540
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:535
 msgid "The X11 Pixmap to be bound"
 msgstr "Х11 пиксмапа за повезивање"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:548
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:543
 msgid "Pixmap width"
 msgstr "Ширина пиксмапе"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:549
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:544
 msgid "The width of the pixmap bound to this texture"
 msgstr "Ширина везе пиксмапе за ову текстуру"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:557
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:552
 msgid "Pixmap height"
 msgstr "Висина пиксмапе"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:558
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:553
 msgid "The height of the pixmap bound to this texture"
 msgstr "Висина везе пиксмапе за ову текстуру"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:566
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:561
 msgid "Pixmap Depth"
 msgstr "Дубина пиксмапе"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:567
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:562
 msgid "The depth (in number of bits) of the pixmap bound to this texture"
 msgstr "Дубина (у броју бита) везе пиксмапе за ову текстуру"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:575
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:570
 msgid "Automatic Updates"
 msgstr "Аутоматска ажурирања"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:576
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:571
 msgid "If the texture should be kept in sync with any pixmap changes."
 msgstr ""
 "Ако текстура треба бити држана у усклађености са свим пиксмап променама."
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:584
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:579
 msgid "Window"
 msgstr "Прозор"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:585
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:580
 msgid "The X11 Window to be bound"
 msgstr "Х11 прозор за повезивање"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:593
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:588
 msgid "Window Redirect Automatic"
 msgstr "Самостално преусмерење прозора"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:594
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:589
 msgid "If composite window redirects are set to Automatic (or Manual if false)"
 msgstr ""
 "Ако су преусмерења композитног прозора постављена на Самостално (или Ручно "
 "ако нису)"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:604
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:599
 msgid "Window Mapped"
 msgstr "Прозор је мапиран"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:605
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:600
 msgid "If window is mapped"
 msgstr "Ако је прозор мапиран"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:614
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:609
 msgid "Destroyed"
 msgstr "Уништен"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:615
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:610
 msgid "If window has been destroyed"
 msgstr "Ако је прозор био уништен"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:623
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:618
 msgid "Window X"
 msgstr "X прозора"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:624
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:619
 msgid "X position of window on screen according to X11"
 msgstr "X положај прозора на екрану у складу са Х11"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:632
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:627
 msgid "Window Y"
 msgstr "Y прозора"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:633
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:628
 msgid "Y position of window on screen according to X11"
 msgstr "Y положај прозора на екрану у складу са Х11"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:640
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:635
 msgid "Window Override Redirect"
 msgstr "Преусмерење надјачаног прозора"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:641
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:636
 msgid "If this is an override-redirect window"
 msgstr "Ако је ово надјачани-преусмерени прозор"
diff --git a/po/sr@latin.po b/po/sr@latin.po
index d84ae6ffc..2b15c8984 100644
--- a/po/sr@latin.po
+++ b/po/sr@latin.po
@@ -1,14 +1,14 @@
 # Serbian translation for clutter.
 # Copyright (C) 2011 clutter's COPYRIGHT HOLDER
 # This file is distributed under the same license as the clutter package.
-# Miroslav Nikolić <miroslavnikolic@rocketmail.com>, 2011, 2012, 2013.
+# Miroslav Nikolić <miroslavnikolic@rocketmail.com>, 2011—2014.
 msgid ""
 msgstr ""
 "Project-Id-Version: clutter master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=clutte"
 "r&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2012-12-18 02:00+0000\n"
-"PO-Revision-Date: 2013-01-18 10:01+0200\n"
+"POT-Creation-Date: 2014-02-24 16:09+0000\n"
+"PO-Revision-Date: 2014-02-24 22:38+0200\n"
 "Last-Translator: Miroslav Nikolić <miroslavnikolic@rocketmail.com>\n"
 "Language-Team: Serbian <gnom@prevod.org>\n"
 "Language: sr\n"
@@ -19,690 +19,690 @@ msgstr ""
 "n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 "X-Project-Style: gnome\n"
 
-#: ../clutter/clutter-actor.c:6144
+#: ../clutter/clutter-actor.c:6214
 msgid "X coordinate"
 msgstr "X koordinata"
 
-#: ../clutter/clutter-actor.c:6145
+#: ../clutter/clutter-actor.c:6215
 msgid "X coordinate of the actor"
 msgstr "X koordinata činioca"
 
-#: ../clutter/clutter-actor.c:6163
+#: ../clutter/clutter-actor.c:6233
 msgid "Y coordinate"
 msgstr "Y koordinata"
 
-#: ../clutter/clutter-actor.c:6164
+#: ../clutter/clutter-actor.c:6234
 msgid "Y coordinate of the actor"
 msgstr "Y koordinata činioca"
 
-#: ../clutter/clutter-actor.c:6186
+#: ../clutter/clutter-actor.c:6256
 msgid "Position"
 msgstr "Položaj"
 
-#: ../clutter/clutter-actor.c:6187
+#: ../clutter/clutter-actor.c:6257
 msgid "The position of the origin of the actor"
 msgstr "Položaj porekla činioca"
 
-#: ../clutter/clutter-actor.c:6204 ../clutter/clutter-canvas.c:215
-#: ../clutter/clutter-grid-layout.c:1238
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:481
+#: ../clutter/clutter-actor.c:6274 ../clutter/clutter-canvas.c:247
+#: ../clutter/clutter-grid-layout.c:1239
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:474
 msgid "Width"
 msgstr "Širina"
 
-#: ../clutter/clutter-actor.c:6205
+#: ../clutter/clutter-actor.c:6275
 msgid "Width of the actor"
 msgstr "Širina činioca"
 
-#: ../clutter/clutter-actor.c:6223 ../clutter/clutter-canvas.c:231
-#: ../clutter/clutter-grid-layout.c:1245
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:497
+#: ../clutter/clutter-actor.c:6293 ../clutter/clutter-canvas.c:263
+#: ../clutter/clutter-grid-layout.c:1246
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:490
 msgid "Height"
 msgstr "Visina"
 
-#: ../clutter/clutter-actor.c:6224
+#: ../clutter/clutter-actor.c:6294
 msgid "Height of the actor"
 msgstr "Visina činioca"
 
-#: ../clutter/clutter-actor.c:6245
+#: ../clutter/clutter-actor.c:6315
 msgid "Size"
 msgstr "Veličina"
 
-#: ../clutter/clutter-actor.c:6246
+#: ../clutter/clutter-actor.c:6316
 msgid "The size of the actor"
 msgstr "Veličina činioca"
 
-#: ../clutter/clutter-actor.c:6264
+#: ../clutter/clutter-actor.c:6334
 msgid "Fixed X"
 msgstr "Utvrđeno H"
 
-#: ../clutter/clutter-actor.c:6265
+#: ../clutter/clutter-actor.c:6335
 msgid "Forced X position of the actor"
 msgstr "Prisiljeni X položaj činioca"
 
-#: ../clutter/clutter-actor.c:6282
+#: ../clutter/clutter-actor.c:6352
 msgid "Fixed Y"
 msgstr "Utvrđeno Y"
 
-#: ../clutter/clutter-actor.c:6283
+#: ../clutter/clutter-actor.c:6353
 msgid "Forced Y position of the actor"
 msgstr "Prisiljeni Y položaj činioca"
 
-#: ../clutter/clutter-actor.c:6298
+#: ../clutter/clutter-actor.c:6368
 msgid "Fixed position set"
 msgstr "Podešavanje utvrđenog položaja"
 
-#: ../clutter/clutter-actor.c:6299
+#: ../clutter/clutter-actor.c:6369
 msgid "Whether to use fixed positioning for the actor"
 msgstr "Da li će biti korišćeno utvrđeno postavljanje činioca"
 
-#: ../clutter/clutter-actor.c:6317
+#: ../clutter/clutter-actor.c:6387
 msgid "Min Width"
 msgstr "Najmanja širina"
 
-#: ../clutter/clutter-actor.c:6318
+#: ../clutter/clutter-actor.c:6388
 msgid "Forced minimum width request for the actor"
 msgstr "Prisiljena najmanja širina zahtevana za činioca"
 
-#: ../clutter/clutter-actor.c:6336
+#: ../clutter/clutter-actor.c:6406
 msgid "Min Height"
 msgstr "Najmanja visina"
 
-#: ../clutter/clutter-actor.c:6337
+#: ../clutter/clutter-actor.c:6407
 msgid "Forced minimum height request for the actor"
 msgstr "Prisiljena najmanja visina zahtevana za činioca"
 
-#: ../clutter/clutter-actor.c:6355
+#: ../clutter/clutter-actor.c:6425
 msgid "Natural Width"
 msgstr "Uobičajena širina"
 
-#: ../clutter/clutter-actor.c:6356
+#: ../clutter/clutter-actor.c:6426
 msgid "Forced natural width request for the actor"
 msgstr "Prisiljena uobičajena širina zahtevana za činioca"
 
-#: ../clutter/clutter-actor.c:6374
+#: ../clutter/clutter-actor.c:6444
 msgid "Natural Height"
 msgstr "Uobičajena visina"
 
-#: ../clutter/clutter-actor.c:6375
+#: ../clutter/clutter-actor.c:6445
 msgid "Forced natural height request for the actor"
 msgstr "Prisiljena uobičajena visina zahtevana za činioca"
 
-#: ../clutter/clutter-actor.c:6390
+#: ../clutter/clutter-actor.c:6460
 msgid "Minimum width set"
 msgstr "Podešavanje najmanje širine"
 
-#: ../clutter/clutter-actor.c:6391
+#: ../clutter/clutter-actor.c:6461
 msgid "Whether to use the min-width property"
 msgstr "Da li će biti korišćeno svojstvo najmanje širine"
 
-#: ../clutter/clutter-actor.c:6405
+#: ../clutter/clutter-actor.c:6475
 msgid "Minimum height set"
 msgstr "Podešavanje najmanje visine"
 
-#: ../clutter/clutter-actor.c:6406
+#: ../clutter/clutter-actor.c:6476
 msgid "Whether to use the min-height property"
 msgstr "Da li će biti korišćeno svojstvo najmanje visine"
 
-#: ../clutter/clutter-actor.c:6420
+#: ../clutter/clutter-actor.c:6490
 msgid "Natural width set"
 msgstr "Podešavanje uobičajene širine"
 
-#: ../clutter/clutter-actor.c:6421
+#: ../clutter/clutter-actor.c:6491
 msgid "Whether to use the natural-width property"
 msgstr "Da li će biti korišćeno svojstvo uobičajene širine"
 
-#: ../clutter/clutter-actor.c:6435
+#: ../clutter/clutter-actor.c:6505
 msgid "Natural height set"
 msgstr "Podešavanje uobičajene visine"
 
-#: ../clutter/clutter-actor.c:6436
+#: ../clutter/clutter-actor.c:6506
 msgid "Whether to use the natural-height property"
 msgstr "Da li će biti korišćeno svojstvo uobičajene visine"
 
-#: ../clutter/clutter-actor.c:6452
+#: ../clutter/clutter-actor.c:6522
 msgid "Allocation"
 msgstr "Raspoređivanje"
 
-#: ../clutter/clutter-actor.c:6453
+#: ../clutter/clutter-actor.c:6523
 msgid "The actor's allocation"
 msgstr "Raspoređivanje činioca"
 
-#: ../clutter/clutter-actor.c:6510
+#: ../clutter/clutter-actor.c:6580
 msgid "Request Mode"
 msgstr "Režim zahteva"
 
-#: ../clutter/clutter-actor.c:6511
+#: ../clutter/clutter-actor.c:6581
 msgid "The actor's request mode"
 msgstr "Režim zahteva činioca"
 
-#: ../clutter/clutter-actor.c:6535
+#: ../clutter/clutter-actor.c:6605
 msgid "Depth"
 msgstr "Dubina"
 
-#: ../clutter/clutter-actor.c:6536
+#: ../clutter/clutter-actor.c:6606
 msgid "Position on the Z axis"
 msgstr "Položaj na Z osi"
 
-#: ../clutter/clutter-actor.c:6563
+#: ../clutter/clutter-actor.c:6633
 msgid "Z Position"
 msgstr "Z položaj"
 
-#: ../clutter/clutter-actor.c:6564
+#: ../clutter/clutter-actor.c:6634
 msgid "The actor's position on the Z axis"
 msgstr "Položaj činioca na Z osi"
 
-#: ../clutter/clutter-actor.c:6581
+#: ../clutter/clutter-actor.c:6651
 msgid "Opacity"
 msgstr "Neprovidnost"
 
-#: ../clutter/clutter-actor.c:6582
+#: ../clutter/clutter-actor.c:6652
 msgid "Opacity of an actor"
 msgstr "Neprovidnost činioca"
 
-#: ../clutter/clutter-actor.c:6602
+#: ../clutter/clutter-actor.c:6672
 msgid "Offscreen redirect"
 msgstr "Preusmeravanje van ekrana"
 
-#: ../clutter/clutter-actor.c:6603
+#: ../clutter/clutter-actor.c:6673
 msgid "Flags controlling when to flatten the actor into a single image"
 msgstr "Opcije koje kontrolišu kada će činilac biti izravnat u jednu sliku"
 
-#: ../clutter/clutter-actor.c:6617
+#: ../clutter/clutter-actor.c:6687
 msgid "Visible"
 msgstr "Vidljiv"
 
-#: ../clutter/clutter-actor.c:6618
+#: ../clutter/clutter-actor.c:6688
 msgid "Whether the actor is visible or not"
 msgstr "Da li će činilac biti vidljiv ili ne"
 
-#: ../clutter/clutter-actor.c:6632
+#: ../clutter/clutter-actor.c:6702
 msgid "Mapped"
 msgstr "Mapiran"
 
-#: ../clutter/clutter-actor.c:6633
+#: ../clutter/clutter-actor.c:6703
 msgid "Whether the actor will be painted"
 msgstr "Da li će činilac biti obojen"
 
-#: ../clutter/clutter-actor.c:6646
+#: ../clutter/clutter-actor.c:6716
 msgid "Realized"
 msgstr "Ostvaren"
 
-#: ../clutter/clutter-actor.c:6647
+#: ../clutter/clutter-actor.c:6717
 msgid "Whether the actor has been realized"
 msgstr "Da li će činilac biti ostvaren"
 
-#: ../clutter/clutter-actor.c:6662
+#: ../clutter/clutter-actor.c:6732
 msgid "Reactive"
 msgstr "Reaktivan"
 
-#: ../clutter/clutter-actor.c:6663
+#: ../clutter/clutter-actor.c:6733
 msgid "Whether the actor is reactive to events"
 msgstr "Da li će činilac biti osetljiv na događaje"
 
-#: ../clutter/clutter-actor.c:6674
+#: ../clutter/clutter-actor.c:6744
 msgid "Has Clip"
 msgstr "Poseduje isecanje"
 
-#: ../clutter/clutter-actor.c:6675
+#: ../clutter/clutter-actor.c:6745
 msgid "Whether the actor has a clip set"
 msgstr "Da li činilac ima podešeno isecanje"
 
-#: ../clutter/clutter-actor.c:6688
+#: ../clutter/clutter-actor.c:6758
 msgid "Clip"
 msgstr "Isecanje"
 
-#: ../clutter/clutter-actor.c:6689
+#: ../clutter/clutter-actor.c:6759
 msgid "The clip region for the actor"
 msgstr "Oblast isecanja za činioca"
 
-#: ../clutter/clutter-actor.c:6708
+#: ../clutter/clutter-actor.c:6778
 msgid "Clip Rectangle"
 msgstr "Pravougaonik isecanja"
 
-#: ../clutter/clutter-actor.c:6709
+#: ../clutter/clutter-actor.c:6779
 msgid "The visible region of the actor"
 msgstr "Vidljiva oblast činioca"
 
-#: ../clutter/clutter-actor.c:6723 ../clutter/clutter-actor-meta.c:207
-#: ../clutter/clutter-binding-pool.c:319 ../clutter/clutter-input-device.c:258
+#: ../clutter/clutter-actor.c:6793 ../clutter/clutter-actor-meta.c:205
+#: ../clutter/clutter-binding-pool.c:319 ../clutter/clutter-input-device.c:247
 msgid "Name"
 msgstr "Naziv"
 
-#: ../clutter/clutter-actor.c:6724
+#: ../clutter/clutter-actor.c:6794
 msgid "Name of the actor"
 msgstr "Naziv činioca"
 
-#: ../clutter/clutter-actor.c:6745
+#: ../clutter/clutter-actor.c:6815
 msgid "Pivot Point"
 msgstr "Tačka obrtanja"
 
-#: ../clutter/clutter-actor.c:6746
+#: ../clutter/clutter-actor.c:6816
 msgid "The point around which the scaling and rotation occur"
 msgstr "Tačka oko koje se odigravaju razmeravanje i obrtanje"
 
-#: ../clutter/clutter-actor.c:6764
+#: ../clutter/clutter-actor.c:6834
 msgid "Pivot Point Z"
 msgstr "Z tačka obrtanja"
 
-#: ../clutter/clutter-actor.c:6765
+#: ../clutter/clutter-actor.c:6835
 msgid "Z component of the pivot point"
 msgstr "Z deo tačke obrtanja"
 
-#: ../clutter/clutter-actor.c:6783
+#: ../clutter/clutter-actor.c:6853
 msgid "Scale X"
 msgstr "X razmera"
 
-#: ../clutter/clutter-actor.c:6784
+#: ../clutter/clutter-actor.c:6854
 msgid "Scale factor on the X axis"
 msgstr "Faktor razmere na X osi"
 
-#: ../clutter/clutter-actor.c:6802
+#: ../clutter/clutter-actor.c:6872
 msgid "Scale Y"
 msgstr "Y razmera"
 
-#: ../clutter/clutter-actor.c:6803
+#: ../clutter/clutter-actor.c:6873
 msgid "Scale factor on the Y axis"
 msgstr "Faktor razmere na Y osi"
 
-#: ../clutter/clutter-actor.c:6821
+#: ../clutter/clutter-actor.c:6891
 msgid "Scale Z"
 msgstr "Z razmera"
 
-#: ../clutter/clutter-actor.c:6822
+#: ../clutter/clutter-actor.c:6892
 msgid "Scale factor on the Z axis"
 msgstr "Faktor razmere na Z osi"
 
-#: ../clutter/clutter-actor.c:6840
+#: ../clutter/clutter-actor.c:6910
 msgid "Scale Center X"
 msgstr "Središte X razmere"
 
-#: ../clutter/clutter-actor.c:6841
+#: ../clutter/clutter-actor.c:6911
 msgid "Horizontal scale center"
 msgstr "Središte vodoravne razmere"
 
-#: ../clutter/clutter-actor.c:6859
+#: ../clutter/clutter-actor.c:6929
 msgid "Scale Center Y"
 msgstr "Središte Y razmere"
 
-#: ../clutter/clutter-actor.c:6860
+#: ../clutter/clutter-actor.c:6930
 msgid "Vertical scale center"
 msgstr "Središte uspravne razmere"
 
-#: ../clutter/clutter-actor.c:6878
+#: ../clutter/clutter-actor.c:6948
 msgid "Scale Gravity"
 msgstr "Težište razmere"
 
-#: ../clutter/clutter-actor.c:6879
+#: ../clutter/clutter-actor.c:6949
 msgid "The center of scaling"
 msgstr "Središte razmere"
 
-#: ../clutter/clutter-actor.c:6897
+#: ../clutter/clutter-actor.c:6967
 msgid "Rotation Angle X"
 msgstr "Ugao X okretanja"
 
-#: ../clutter/clutter-actor.c:6898
+#: ../clutter/clutter-actor.c:6968
 msgid "The rotation angle on the X axis"
 msgstr "Ugao okretanja na H osi"
 
-#: ../clutter/clutter-actor.c:6916
+#: ../clutter/clutter-actor.c:6986
 msgid "Rotation Angle Y"
 msgstr "Ugao Y okretanja"
 
-#: ../clutter/clutter-actor.c:6917
+#: ../clutter/clutter-actor.c:6987
 msgid "The rotation angle on the Y axis"
 msgstr "Ugao okretanja na Y osi"
 
-#: ../clutter/clutter-actor.c:6935
+#: ../clutter/clutter-actor.c:7005
 msgid "Rotation Angle Z"
 msgstr "Ugao Z okretanja"
 
-#: ../clutter/clutter-actor.c:6936
+#: ../clutter/clutter-actor.c:7006
 msgid "The rotation angle on the Z axis"
 msgstr "Ugao okretanja na Z osi"
 
-#: ../clutter/clutter-actor.c:6954
+#: ../clutter/clutter-actor.c:7024
 msgid "Rotation Center X"
 msgstr "Središte X okretanja"
 
-#: ../clutter/clutter-actor.c:6955
+#: ../clutter/clutter-actor.c:7025
 msgid "The rotation center on the X axis"
 msgstr "Središte okretanja na H osi"
 
-#: ../clutter/clutter-actor.c:6972
+#: ../clutter/clutter-actor.c:7042
 msgid "Rotation Center Y"
 msgstr "Središte Y okretanja"
 
-#: ../clutter/clutter-actor.c:6973
+#: ../clutter/clutter-actor.c:7043
 msgid "The rotation center on the Y axis"
 msgstr "Središte okretanja na Y osi"
 
-#: ../clutter/clutter-actor.c:6990
+#: ../clutter/clutter-actor.c:7060
 msgid "Rotation Center Z"
 msgstr "Središte Z okretanja"
 
-#: ../clutter/clutter-actor.c:6991
+#: ../clutter/clutter-actor.c:7061
 msgid "The rotation center on the Z axis"
 msgstr "Središte okretanja na Z osi"
 
-#: ../clutter/clutter-actor.c:7008
+#: ../clutter/clutter-actor.c:7078
 msgid "Rotation Center Z Gravity"
 msgstr "Težište središta Z okretanja"
 
-#: ../clutter/clutter-actor.c:7009
+#: ../clutter/clutter-actor.c:7079
 msgid "Center point for rotation around the Z axis"
 msgstr "Središnja tačka za okretanje oko Z ose"
 
-#: ../clutter/clutter-actor.c:7037
+#: ../clutter/clutter-actor.c:7107
 msgid "Anchor X"
 msgstr "H učvršćenje"
 
-#: ../clutter/clutter-actor.c:7038
+#: ../clutter/clutter-actor.c:7108
 msgid "X coordinate of the anchor point"
 msgstr "X koordinate tačke učvršćavanja"
 
-#: ../clutter/clutter-actor.c:7066
+#: ../clutter/clutter-actor.c:7136
 msgid "Anchor Y"
 msgstr "Y učvršćenje"
 
-#: ../clutter/clutter-actor.c:7067
+#: ../clutter/clutter-actor.c:7137
 msgid "Y coordinate of the anchor point"
 msgstr "Y koordinate tačke učvršćavanja"
 
-#: ../clutter/clutter-actor.c:7094
+#: ../clutter/clutter-actor.c:7164
 msgid "Anchor Gravity"
 msgstr "Težište učvršćenja"
 
-#: ../clutter/clutter-actor.c:7095
+#: ../clutter/clutter-actor.c:7165
 msgid "The anchor point as a ClutterGravity"
 msgstr "Tačka učvršćavanja kao težište Galamdžije"
 
-#: ../clutter/clutter-actor.c:7114
+#: ../clutter/clutter-actor.c:7184
 msgid "Translation X"
 msgstr "X prevod"
 
-#: ../clutter/clutter-actor.c:7115
+#: ../clutter/clutter-actor.c:7185
 msgid "Translation along the X axis"
 msgstr "Prevod duž X ose"
 
-#: ../clutter/clutter-actor.c:7134
+#: ../clutter/clutter-actor.c:7204
 msgid "Translation Y"
 msgstr "Y prevod"
 
-#: ../clutter/clutter-actor.c:7135
+#: ../clutter/clutter-actor.c:7205
 msgid "Translation along the Y axis"
 msgstr "Prevod duž Y ose"
 
-#: ../clutter/clutter-actor.c:7154
+#: ../clutter/clutter-actor.c:7224
 msgid "Translation Z"
 msgstr "Z prevod"
 
-#: ../clutter/clutter-actor.c:7155
+#: ../clutter/clutter-actor.c:7225
 msgid "Translation along the Z axis"
 msgstr "Prevod duž Z ose"
 
-#: ../clutter/clutter-actor.c:7185
+#: ../clutter/clutter-actor.c:7255
 msgid "Transform"
 msgstr "Preobražaj"
 
-#: ../clutter/clutter-actor.c:7186
+#: ../clutter/clutter-actor.c:7256
 msgid "Transformation matrix"
 msgstr "Matrica preobražaja"
 
-#: ../clutter/clutter-actor.c:7201
+#: ../clutter/clutter-actor.c:7271
 msgid "Transform Set"
 msgstr "Podešavanje preobražaja"
 
-#: ../clutter/clutter-actor.c:7202
+#: ../clutter/clutter-actor.c:7272
 msgid "Whether the transform property is set"
 msgstr "Da li je podešeno svojstvo preobražaja"
 
-#: ../clutter/clutter-actor.c:7223
+#: ../clutter/clutter-actor.c:7293
 msgid "Child Transform"
 msgstr "Preobražaj poroda"
 
-#: ../clutter/clutter-actor.c:7224
+#: ../clutter/clutter-actor.c:7294
 msgid "Children transformation matrix"
 msgstr "Matrica preobražaja poroda"
 
-#: ../clutter/clutter-actor.c:7239
+#: ../clutter/clutter-actor.c:7309
 msgid "Child Transform Set"
 msgstr "Podešavanje preobražaja poroda"
 
-#: ../clutter/clutter-actor.c:7240
+#: ../clutter/clutter-actor.c:7310
 msgid "Whether the child-transform property is set"
 msgstr "Da li je podešeno svojstvo preobražaja poroda"
 
-#: ../clutter/clutter-actor.c:7257
+#: ../clutter/clutter-actor.c:7327
 msgid "Show on set parent"
 msgstr "Prikaz na skupu roditelja"
 
-#: ../clutter/clutter-actor.c:7258
+#: ../clutter/clutter-actor.c:7328
 msgid "Whether the actor is shown when parented"
 msgstr "Da li će činilac biti prikazan kada je prisvojen"
 
-#: ../clutter/clutter-actor.c:7275
+#: ../clutter/clutter-actor.c:7345
 msgid "Clip to Allocation"
 msgstr "Isecanje do raspoređivanja"
 
-#: ../clutter/clutter-actor.c:7276
+#: ../clutter/clutter-actor.c:7346
 msgid "Sets the clip region to track the actor's allocation"
 msgstr "Postavlja oblast isecanja za praćenje raspoređivanje činioca"
 
-#: ../clutter/clutter-actor.c:7289
+#: ../clutter/clutter-actor.c:7359
 msgid "Text Direction"
 msgstr "Smer teksta"
 
-#: ../clutter/clutter-actor.c:7290
+#: ../clutter/clutter-actor.c:7360
 msgid "Direction of the text"
 msgstr "Pravac usmerenja teksta"
 
-#: ../clutter/clutter-actor.c:7305
+#: ../clutter/clutter-actor.c:7375
 msgid "Has Pointer"
 msgstr "Poseduje pokazivač"
 
-#: ../clutter/clutter-actor.c:7306
+#: ../clutter/clutter-actor.c:7376
 msgid "Whether the actor contains the pointer of an input device"
 msgstr "Da li činilac sadrži pokazivač nekog ulaznog uređaja"
 
-#: ../clutter/clutter-actor.c:7319
+#: ../clutter/clutter-actor.c:7389
 msgid "Actions"
 msgstr "Radnje"
 
-#: ../clutter/clutter-actor.c:7320
+#: ../clutter/clutter-actor.c:7390
 msgid "Adds an action to the actor"
 msgstr "Dodaje radnju činiocu"
 
-#: ../clutter/clutter-actor.c:7333
+#: ../clutter/clutter-actor.c:7403
 msgid "Constraints"
 msgstr "Ograničenja"
 
-#: ../clutter/clutter-actor.c:7334
+#: ../clutter/clutter-actor.c:7404
 msgid "Adds a constraint to the actor"
 msgstr "Dodaje ograničenja činiocu"
 
-#: ../clutter/clutter-actor.c:7347
+#: ../clutter/clutter-actor.c:7417
 msgid "Effect"
 msgstr "Dejstvo"
 
-#: ../clutter/clutter-actor.c:7348
+#: ../clutter/clutter-actor.c:7418
 msgid "Add an effect to be applied on the actor"
 msgstr "Dodaje dejstvo koje će biti primenjeno na činiocu"
 
-#: ../clutter/clutter-actor.c:7362
+#: ../clutter/clutter-actor.c:7432
 msgid "Layout Manager"
 msgstr "Upravnik rasporeda"
 
-#: ../clutter/clutter-actor.c:7363
+#: ../clutter/clutter-actor.c:7433
 msgid "The object controlling the layout of an actor's children"
 msgstr "Objekat koji upravlja rasporedom nekog poroda činioca"
 
-#: ../clutter/clutter-actor.c:7377
+#: ../clutter/clutter-actor.c:7447
 msgid "X Expand"
 msgstr "X širenje"
 
-#: ../clutter/clutter-actor.c:7378
+#: ../clutter/clutter-actor.c:7448
 msgid "Whether extra horizontal space should be assigned to the actor"
 msgstr "Da li dodatni vodoravni prostor treba biti dodeljen činiocu"
 
-#: ../clutter/clutter-actor.c:7393
+#: ../clutter/clutter-actor.c:7463
 msgid "Y Expand"
 msgstr "Y širenje"
 
-#: ../clutter/clutter-actor.c:7394
+#: ../clutter/clutter-actor.c:7464
 msgid "Whether extra vertical space should be assigned to the actor"
 msgstr "Da li dodatni uspravni prostor treba biti dodeljen činiocu"
 
-#: ../clutter/clutter-actor.c:7410
+#: ../clutter/clutter-actor.c:7480
 msgid "X Alignment"
 msgstr "H poravnanje"
 
-#: ../clutter/clutter-actor.c:7411
+#: ../clutter/clutter-actor.c:7481
 msgid "The alignment of the actor on the X axis within its allocation"
 msgstr "Poravnanje činioca na iks osi unutar njegove raspodele"
 
-#: ../clutter/clutter-actor.c:7426
+#: ../clutter/clutter-actor.c:7496
 msgid "Y Alignment"
 msgstr "Y poravnanje"
 
-#: ../clutter/clutter-actor.c:7427
+#: ../clutter/clutter-actor.c:7497
 msgid "The alignment of the actor on the Y axis within its allocation"
 msgstr "Poravnanje činioca na ipsilon osi unutar njegove raspodele"
 
-#: ../clutter/clutter-actor.c:7446
+#: ../clutter/clutter-actor.c:7516
 msgid "Margin Top"
 msgstr "Gornja margina"
 
-#: ../clutter/clutter-actor.c:7447
+#: ../clutter/clutter-actor.c:7517
 msgid "Extra space at the top"
 msgstr "Dodatni prostor na vrhu"
 
-#: ../clutter/clutter-actor.c:7468
+#: ../clutter/clutter-actor.c:7538
 msgid "Margin Bottom"
 msgstr "Donja margina"
 
-#: ../clutter/clutter-actor.c:7469
+#: ../clutter/clutter-actor.c:7539
 msgid "Extra space at the bottom"
 msgstr "Dodatni prostor na dnu"
 
-#: ../clutter/clutter-actor.c:7490
+#: ../clutter/clutter-actor.c:7560
 msgid "Margin Left"
 msgstr "Leva margina"
 
-#: ../clutter/clutter-actor.c:7491
+#: ../clutter/clutter-actor.c:7561
 msgid "Extra space at the left"
 msgstr "Dodatni prostor na levoj strani"
 
-#: ../clutter/clutter-actor.c:7512
+#: ../clutter/clutter-actor.c:7582
 msgid "Margin Right"
 msgstr "Desna margina"
 
-#: ../clutter/clutter-actor.c:7513
+#: ../clutter/clutter-actor.c:7583
 msgid "Extra space at the right"
 msgstr "Dodatni prostor na desnoj strani"
 
-#: ../clutter/clutter-actor.c:7529
+#: ../clutter/clutter-actor.c:7599
 msgid "Background Color Set"
 msgstr "Podešavanje boje pozadine"
 
-#: ../clutter/clutter-actor.c:7530 ../clutter/deprecated/clutter-box.c:275
+#: ../clutter/clutter-actor.c:7600 ../clutter/deprecated/clutter-box.c:271
 msgid "Whether the background color is set"
 msgstr "Da li je podešena boja pozadine"
 
-#: ../clutter/clutter-actor.c:7546
+#: ../clutter/clutter-actor.c:7616
 msgid "Background color"
 msgstr "Boja pozadine"
 
-#: ../clutter/clutter-actor.c:7547
+#: ../clutter/clutter-actor.c:7617
 msgid "The actor's background color"
 msgstr "Boja pozadine činioca"
 
-#: ../clutter/clutter-actor.c:7562
+#: ../clutter/clutter-actor.c:7632
 msgid "First Child"
 msgstr "Prvi porod"
 
-#: ../clutter/clutter-actor.c:7563
+#: ../clutter/clutter-actor.c:7633
 msgid "The actor's first child"
 msgstr "Prvi porod činioca"
 
-#: ../clutter/clutter-actor.c:7576
+#: ../clutter/clutter-actor.c:7646
 msgid "Last Child"
 msgstr "Poslednji porod"
 
-#: ../clutter/clutter-actor.c:7577
+#: ../clutter/clutter-actor.c:7647
 msgid "The actor's last child"
 msgstr "Poslednji porod činioca"
 
-#: ../clutter/clutter-actor.c:7591
+#: ../clutter/clutter-actor.c:7661
 msgid "Content"
 msgstr "Sadržaj"
 
-#: ../clutter/clutter-actor.c:7592
+#: ../clutter/clutter-actor.c:7662
 msgid "Delegate object for painting the actor's content"
 msgstr "Određuje objekat za bojenje sadržaja činioca"
 
-#: ../clutter/clutter-actor.c:7617
+#: ../clutter/clutter-actor.c:7687
 msgid "Content Gravity"
 msgstr "Težište sadržaja"
 
-#: ../clutter/clutter-actor.c:7618
+#: ../clutter/clutter-actor.c:7688
 msgid "Alignment of the actor's content"
 msgstr "Poravnanje sadržaja činioca"
 
-#: ../clutter/clutter-actor.c:7638
+#: ../clutter/clutter-actor.c:7708
 msgid "Content Box"
 msgstr "Polje sadržaja"
 
-#: ../clutter/clutter-actor.c:7639
+#: ../clutter/clutter-actor.c:7709
 msgid "The bounding box of the actor's content"
 msgstr "Granično polje sadržaja činioca"
 
-#: ../clutter/clutter-actor.c:7647
+#: ../clutter/clutter-actor.c:7717
 msgid "Minification Filter"
 msgstr "Filter umanjivanja"
 
-#: ../clutter/clutter-actor.c:7648
+#: ../clutter/clutter-actor.c:7718
 msgid "The filter used when reducing the size of the content"
 msgstr "Filter koji se koristi prilikom smanjivanja veličine sadržaja"
 
-#: ../clutter/clutter-actor.c:7655
+#: ../clutter/clutter-actor.c:7725
 msgid "Magnification Filter"
 msgstr "Filter uvećavanja"
 
-#: ../clutter/clutter-actor.c:7656
+#: ../clutter/clutter-actor.c:7726
 msgid "The filter used when increasing the size of the content"
 msgstr "Filter koji se koristi prilikom uvećavanja veličine sadržaja"
 
-#: ../clutter/clutter-actor.c:7670
+#: ../clutter/clutter-actor.c:7740
 msgid "Content Repeat"
 msgstr "Ponavljanje sadržaja"
 
-#: ../clutter/clutter-actor.c:7671
+#: ../clutter/clutter-actor.c:7741
 msgid "The repeat policy for the actor's content"
 msgstr "Politika ponavljanja sadržaja činioca"
 
-#: ../clutter/clutter-actor-meta.c:193 ../clutter/clutter-child-meta.c:142
+#: ../clutter/clutter-actor-meta.c:191 ../clutter/clutter-child-meta.c:142
 msgid "Actor"
 msgstr "Činilac"
 
-#: ../clutter/clutter-actor-meta.c:194
+#: ../clutter/clutter-actor-meta.c:192
 msgid "The actor attached to the meta"
 msgstr "Činilac pridodat meti"
 
-#: ../clutter/clutter-actor-meta.c:208
+#: ../clutter/clutter-actor-meta.c:206
 msgid "The name of the meta"
 msgstr "Naziv mete"
 
-#: ../clutter/clutter-actor-meta.c:221 ../clutter/clutter-input-device.c:337
-#: ../clutter/deprecated/clutter-shader.c:313
+#: ../clutter/clutter-actor-meta.c:219 ../clutter/clutter-input-device.c:326
+#: ../clutter/deprecated/clutter-shader.c:309
 msgid "Enabled"
 msgstr "Uključeno"
 
-#: ../clutter/clutter-actor-meta.c:222
+#: ../clutter/clutter-actor-meta.c:220
 msgid "Whether the meta is enabled"
 msgstr "Da li je meta uključena"
 
 #: ../clutter/clutter-align-constraint.c:279
-#: ../clutter/clutter-bind-constraint.c:358 ../clutter/clutter-clone.c:345
+#: ../clutter/clutter-bind-constraint.c:358 ../clutter/clutter-clone.c:341
 #: ../clutter/clutter-snap-constraint.c:321
 msgid "Source"
 msgstr "Izvor"
@@ -728,11 +728,11 @@ msgstr "Faktor"
 msgid "The alignment factor, between 0.0 and 1.0"
 msgstr "Faktor poravnanja, između 0.0 i 1.0"
 
-#: ../clutter/clutter-backend.c:379
+#: ../clutter/clutter-backend.c:380
 msgid "Unable to initialize the Clutter backend"
 msgstr "Ne mogu da pokrenem pozadinca Galamdžije"
 
-#: ../clutter/clutter-backend.c:453
+#: ../clutter/clutter-backend.c:454
 #, c-format
 msgid "The backend of type '%s' does not support creating multiple stages"
 msgstr "Pozadinac vrste „%s“ ne podržava stvaranje više scena"
@@ -763,45 +763,49 @@ msgstr "Pomeraj u tačkama koji će biti primenjen na povezivanje"
 msgid "The unique name of the binding pool"
 msgstr "Jedinstveni naziv za udruženje prečica"
 
-#: ../clutter/clutter-bin-layout.c:240 ../clutter/clutter-bin-layout.c:655
-#: ../clutter/clutter-box-layout.c:390 ../clutter/clutter-table-layout.c:610
+#: ../clutter/clutter-bin-layout.c:238 ../clutter/clutter-bin-layout.c:651
+#: ../clutter/clutter-box-layout.c:388
+#: ../clutter/deprecated/clutter-table-layout.c:610
 msgid "Horizontal Alignment"
 msgstr "Vodoravno poravnanje"
 
-#: ../clutter/clutter-bin-layout.c:241
+#: ../clutter/clutter-bin-layout.c:239
 msgid "Horizontal alignment for the actor inside the layout manager"
 msgstr "Vodoravno poravnanje za činioca unutar upravnika rasporeda"
 
-#: ../clutter/clutter-bin-layout.c:249 ../clutter/clutter-bin-layout.c:675
-#: ../clutter/clutter-box-layout.c:399 ../clutter/clutter-table-layout.c:625
+#: ../clutter/clutter-bin-layout.c:247 ../clutter/clutter-bin-layout.c:671
+#: ../clutter/clutter-box-layout.c:397
+#: ../clutter/deprecated/clutter-table-layout.c:625
 msgid "Vertical Alignment"
 msgstr "Uspravno poravnanje"
 
-#: ../clutter/clutter-bin-layout.c:250
+#: ../clutter/clutter-bin-layout.c:248
 msgid "Vertical alignment for the actor inside the layout manager"
 msgstr "Uspravno poravnanje za činioca unutar upravnika rasporeda"
 
-#: ../clutter/clutter-bin-layout.c:656
+#: ../clutter/clutter-bin-layout.c:652
 msgid "Default horizontal alignment for the actors inside the layout manager"
 msgstr "Osnovno vodoravno poravnanje za činioca unutar upravnika rasporeda"
 
-#: ../clutter/clutter-bin-layout.c:676
+#: ../clutter/clutter-bin-layout.c:672
 msgid "Default vertical alignment for the actors inside the layout manager"
 msgstr "Osnovno uspravno poravnanje za činioca unutar upravnika rasporeda"
 
-#: ../clutter/clutter-box-layout.c:365
+#: ../clutter/clutter-box-layout.c:363
 msgid "Expand"
 msgstr "Rašireno"
 
-#: ../clutter/clutter-box-layout.c:366
+#: ../clutter/clutter-box-layout.c:364
 msgid "Allocate extra space for the child"
 msgstr "Dodeljuje dodatni prostor za porod"
 
-#: ../clutter/clutter-box-layout.c:372 ../clutter/clutter-table-layout.c:589
+#: ../clutter/clutter-box-layout.c:370
+#: ../clutter/deprecated/clutter-table-layout.c:589
 msgid "Horizontal Fill"
 msgstr "Vodoravno ispunjenje"
 
-#: ../clutter/clutter-box-layout.c:373 ../clutter/clutter-table-layout.c:590
+#: ../clutter/clutter-box-layout.c:371
+#: ../clutter/deprecated/clutter-table-layout.c:590
 msgid ""
 "Whether the child should receive priority when the container is allocating "
 "spare space on the horizontal axis"
@@ -809,11 +813,13 @@ msgstr ""
 "Da li porod treba da dobije prioritet kada sadržalac dodeljuje rezervni "
 "prostor na vodoravnoj osi"
 
-#: ../clutter/clutter-box-layout.c:381 ../clutter/clutter-table-layout.c:596
+#: ../clutter/clutter-box-layout.c:379
+#: ../clutter/deprecated/clutter-table-layout.c:596
 msgid "Vertical Fill"
 msgstr "Uspravno ispunjenje"
 
-#: ../clutter/clutter-box-layout.c:382 ../clutter/clutter-table-layout.c:597
+#: ../clutter/clutter-box-layout.c:380
+#: ../clutter/deprecated/clutter-table-layout.c:597
 msgid ""
 "Whether the child should receive priority when the container is allocating "
 "spare space on the vertical axis"
@@ -821,79 +827,87 @@ msgstr ""
 "Da li porod treba da dobije prioritet kada sadržalac dodeljuje rezervni "
 "prostor na uspravnoj osi"
 
-#: ../clutter/clutter-box-layout.c:391 ../clutter/clutter-table-layout.c:611
+#: ../clutter/clutter-box-layout.c:389
+#: ../clutter/deprecated/clutter-table-layout.c:611
 msgid "Horizontal alignment of the actor within the cell"
 msgstr "Vodoravno poravnanje činioca unutar ćelije"
 
-#: ../clutter/clutter-box-layout.c:400 ../clutter/clutter-table-layout.c:626
+#: ../clutter/clutter-box-layout.c:398
+#: ../clutter/deprecated/clutter-table-layout.c:626
 msgid "Vertical alignment of the actor within the cell"
 msgstr "Uspravno poravnanje činioca unutar ćelije"
 
-#: ../clutter/clutter-box-layout.c:1365
+#: ../clutter/clutter-box-layout.c:1359
 msgid "Vertical"
 msgstr "Uspravno"
 
-#: ../clutter/clutter-box-layout.c:1366
+#: ../clutter/clutter-box-layout.c:1360
 msgid "Whether the layout should be vertical, rather than horizontal"
 msgstr "Da li raspored treba da bude uspravan, umesto vodoravnog"
 
-#: ../clutter/clutter-box-layout.c:1383 ../clutter/clutter-flow-layout.c:890
-#: ../clutter/clutter-grid-layout.c:1550
+#: ../clutter/clutter-box-layout.c:1377 ../clutter/clutter-flow-layout.c:942
+#: ../clutter/clutter-grid-layout.c:1549
 msgid "Orientation"
 msgstr "Usmerenje"
 
-#: ../clutter/clutter-box-layout.c:1384 ../clutter/clutter-flow-layout.c:891
-#: ../clutter/clutter-grid-layout.c:1551
+#: ../clutter/clutter-box-layout.c:1378 ../clutter/clutter-flow-layout.c:943
+#: ../clutter/clutter-grid-layout.c:1550
 msgid "The orientation of the layout"
 msgstr "Usmerenje rasporeda"
 
-#: ../clutter/clutter-box-layout.c:1400 ../clutter/clutter-flow-layout.c:906
+#: ../clutter/clutter-box-layout.c:1394 ../clutter/clutter-flow-layout.c:958
 msgid "Homogeneous"
 msgstr "Istorodnost"
 
-#: ../clutter/clutter-box-layout.c:1401
+#: ../clutter/clutter-box-layout.c:1395
 msgid ""
 "Whether the layout should be homogeneous, i.e. all childs get the same size"
 msgstr ""
 "Da li raspored treba da bude istorodan, tj. sav porod dobija istu veličinu"
 
-#: ../clutter/clutter-box-layout.c:1416
+#: ../clutter/clutter-box-layout.c:1410
 msgid "Pack Start"
 msgstr "Početak svežnja"
 
-#: ../clutter/clutter-box-layout.c:1417
+#: ../clutter/clutter-box-layout.c:1411
 msgid "Whether to pack items at the start of the box"
 msgstr "Da li će stavke biti napakovane na početak okvira"
 
-#: ../clutter/clutter-box-layout.c:1430
+#: ../clutter/clutter-box-layout.c:1424
 msgid "Spacing"
 msgstr "Razmaci"
 
-#: ../clutter/clutter-box-layout.c:1431
+#: ../clutter/clutter-box-layout.c:1425
 msgid "Spacing between children"
 msgstr "Razmai između poroda"
 
-#: ../clutter/clutter-box-layout.c:1448 ../clutter/clutter-table-layout.c:1675
+#: ../clutter/clutter-box-layout.c:1442
+#: ../clutter/deprecated/clutter-table-layout.c:1677
 msgid "Use Animations"
 msgstr "Koristi animiranja"
 
-#: ../clutter/clutter-box-layout.c:1449 ../clutter/clutter-table-layout.c:1676
+#: ../clutter/clutter-box-layout.c:1443
+#: ../clutter/deprecated/clutter-table-layout.c:1678
 msgid "Whether layout changes should be animated"
 msgstr "Da li će izmene rasporeda biti animirane"
 
-#: ../clutter/clutter-box-layout.c:1473 ../clutter/clutter-table-layout.c:1700
+#: ../clutter/clutter-box-layout.c:1467
+#: ../clutter/deprecated/clutter-table-layout.c:1702
 msgid "Easing Mode"
 msgstr "Režim olakšavanja"
 
-#: ../clutter/clutter-box-layout.c:1474 ../clutter/clutter-table-layout.c:1701
+#: ../clutter/clutter-box-layout.c:1468
+#: ../clutter/deprecated/clutter-table-layout.c:1703
 msgid "The easing mode of the animations"
 msgstr "Režim olakšavanja animiranja"
 
-#: ../clutter/clutter-box-layout.c:1494 ../clutter/clutter-table-layout.c:1721
+#: ../clutter/clutter-box-layout.c:1488
+#: ../clutter/deprecated/clutter-table-layout.c:1723
 msgid "Easing Duration"
 msgstr "Trajanje olakšavanja"
 
-#: ../clutter/clutter-box-layout.c:1495 ../clutter/clutter-table-layout.c:1722
+#: ../clutter/clutter-box-layout.c:1489
+#: ../clutter/deprecated/clutter-table-layout.c:1724
 msgid "The duration of the animations"
 msgstr "Trajanje animiranja"
 
@@ -913,14 +927,30 @@ msgstr "Kontrast"
 msgid "The contrast change to apply"
 msgstr "Promena kontrasta za primenu"
 
-#: ../clutter/clutter-canvas.c:216
+#: ../clutter/clutter-canvas.c:248
 msgid "The width of the canvas"
 msgstr "Širina platna"
 
-#: ../clutter/clutter-canvas.c:232
+#: ../clutter/clutter-canvas.c:264
 msgid "The height of the canvas"
 msgstr "Visina platna"
 
+#: ../clutter/clutter-canvas.c:283
+msgid "Scale Factor Set"
+msgstr "Podešeni činilac srazmere"
+
+#: ../clutter/clutter-canvas.c:284
+msgid "Whether the scale-factor property is set"
+msgstr "Da li je podešeno svojstvo činioca srazmere"
+
+#: ../clutter/clutter-canvas.c:305
+msgid "Scale Factor"
+msgstr "Činilac srazmere"
+
+#: ../clutter/clutter-canvas.c:306
+msgid "The scaling factor for the surface"
+msgstr "Činilac srazmere za površinu"
+
 #: ../clutter/clutter-child-meta.c:127
 msgid "Container"
 msgstr "Sadržalac"
@@ -933,39 +963,39 @@ msgstr "Sadržalac koji je stvorio ovaj podatak"
 msgid "The actor wrapped by this data"
 msgstr "Činilac obavijen ovim podatkom"
 
-#: ../clutter/clutter-click-action.c:559
+#: ../clutter/clutter-click-action.c:586
 msgid "Pressed"
 msgstr "Pritisnut"
 
-#: ../clutter/clutter-click-action.c:560
+#: ../clutter/clutter-click-action.c:587
 msgid "Whether the clickable should be in pressed state"
 msgstr "Da li klikljiv treba da bude u pritisnutom stanju"
 
-#: ../clutter/clutter-click-action.c:573
+#: ../clutter/clutter-click-action.c:600
 msgid "Held"
 msgstr "Zadržan"
 
-#: ../clutter/clutter-click-action.c:574
+#: ../clutter/clutter-click-action.c:601
 msgid "Whether the clickable has a grab"
 msgstr "Da li klikljiv ima zahvat"
 
-#: ../clutter/clutter-click-action.c:591 ../clutter/clutter-settings.c:599
+#: ../clutter/clutter-click-action.c:618 ../clutter/clutter-settings.c:653
 msgid "Long Press Duration"
 msgstr "Trajanje dugog pritiska"
 
-#: ../clutter/clutter-click-action.c:592
+#: ../clutter/clutter-click-action.c:619
 msgid "The minimum duration of a long press to recognize the gesture"
 msgstr "Najmanje trajanje dugog pritiska za prepoznavanje poteza"
 
-#: ../clutter/clutter-click-action.c:610
+#: ../clutter/clutter-click-action.c:637
 msgid "Long Press Threshold"
 msgstr "Prag dugog pritiska"
 
-#: ../clutter/clutter-click-action.c:611
+#: ../clutter/clutter-click-action.c:638
 msgid "The maximum threshold before a long press is cancelled"
 msgstr "Najveći prag pre otkazivanja dugog pritiska"
 
-#: ../clutter/clutter-clone.c:346
+#: ../clutter/clutter-clone.c:342
 msgid "Specifies the actor to be cloned"
 msgstr "Određuje činioca koji će biti kloniran"
 
@@ -977,27 +1007,27 @@ msgstr "Boja"
 msgid "The tint to apply"
 msgstr "Boja za primenu"
 
-#: ../clutter/clutter-deform-effect.c:588
+#: ../clutter/clutter-deform-effect.c:592
 msgid "Horizontal Tiles"
 msgstr "Vodoravne pločice"
 
-#: ../clutter/clutter-deform-effect.c:589
+#: ../clutter/clutter-deform-effect.c:593
 msgid "The number of horizontal tiles"
 msgstr "Broj vodoravnih pločica"
 
-#: ../clutter/clutter-deform-effect.c:604
+#: ../clutter/clutter-deform-effect.c:608
 msgid "Vertical Tiles"
 msgstr "Uspravne pločice"
 
-#: ../clutter/clutter-deform-effect.c:605
+#: ../clutter/clutter-deform-effect.c:609
 msgid "The number of vertical tiles"
 msgstr "Broj uspravnih pločica"
 
-#: ../clutter/clutter-deform-effect.c:622
+#: ../clutter/clutter-deform-effect.c:626
 msgid "Back Material"
 msgstr "Materijal poleđine"
 
-#: ../clutter/clutter-deform-effect.c:623
+#: ../clutter/clutter-deform-effect.c:627
 msgid "The material to be used when painting the back of the actor"
 msgstr "Materijal koji će biti korišćen prilikom bojenja poleđine činioca"
 
@@ -1005,258 +1035,300 @@ msgstr "Materijal koji će biti korišćen prilikom bojenja poleđine činioca"
 msgid "The desaturation factor"
 msgstr "Faktor obezbojavanja"
 
-#: ../clutter/clutter-device-manager.c:131
-#: ../clutter/clutter-input-device.c:366
-#: ../clutter/x11/clutter-keymap-x11.c:316
+#: ../clutter/clutter-device-manager.c:127
+#: ../clutter/clutter-input-device.c:355
+#: ../clutter/x11/clutter-keymap-x11.c:321
 msgid "Backend"
 msgstr "Pozadinac"
 
-#: ../clutter/clutter-device-manager.c:132
+#: ../clutter/clutter-device-manager.c:128
 msgid "The ClutterBackend of the device manager"
 msgstr "Pozadinac Galamdžije upravnika uređaja"
 
-#: ../clutter/clutter-drag-action.c:742
+#: ../clutter/clutter-drag-action.c:741
 msgid "Horizontal Drag Threshold"
 msgstr "Vodoravni prag prevlačenja"
 
-#: ../clutter/clutter-drag-action.c:743
+#: ../clutter/clutter-drag-action.c:742
 msgid "The horizontal amount of pixels required to start dragging"
 msgstr "Vodoravni iznos tačaka potrebnih za početak prevlačenja"
 
-#: ../clutter/clutter-drag-action.c:770
+#: ../clutter/clutter-drag-action.c:769
 msgid "Vertical Drag Threshold"
 msgstr "Uspravni prag prevlačenja"
 
-#: ../clutter/clutter-drag-action.c:771
+#: ../clutter/clutter-drag-action.c:770
 msgid "The vertical amount of pixels required to start dragging"
 msgstr "Uspravni iznos tačaka potrebnih za početak prevlačenja"
 
-#: ../clutter/clutter-drag-action.c:792
+#: ../clutter/clutter-drag-action.c:791
 msgid "Drag Handle"
 msgstr "Ručica prevlačenja"
 
-#: ../clutter/clutter-drag-action.c:793
+#: ../clutter/clutter-drag-action.c:792
 msgid "The actor that is being dragged"
 msgstr "Činilac koji je prevučen"
 
-#: ../clutter/clutter-drag-action.c:806
+#: ../clutter/clutter-drag-action.c:805
 msgid "Drag Axis"
 msgstr "Osa prevlačenja"
 
-#: ../clutter/clutter-drag-action.c:807
+#: ../clutter/clutter-drag-action.c:806
 msgid "Constraints the dragging to an axis"
 msgstr "Ograničava prevlačenje na osu"
 
-#: ../clutter/clutter-drag-action.c:823
+#: ../clutter/clutter-drag-action.c:822
 msgid "Drag Area"
 msgstr "Oblast prevlačenja"
 
-#: ../clutter/clutter-drag-action.c:824
+#: ../clutter/clutter-drag-action.c:823
 msgid "Constrains the dragging to a rectangle"
 msgstr "Ograničava prevlačenje na pravougaonik"
 
-#: ../clutter/clutter-drag-action.c:837
+#: ../clutter/clutter-drag-action.c:836
 msgid "Drag Area Set"
 msgstr "Podešenost oblasti prevlačenja"
 
-#: ../clutter/clutter-drag-action.c:838
+#: ../clutter/clutter-drag-action.c:837
 msgid "Whether the drag area is set"
 msgstr "Da li je podešena oblast prevlačenja"
 
-#: ../clutter/clutter-flow-layout.c:907
+#: ../clutter/clutter-flow-layout.c:959
 msgid "Whether each item should receive the same allocation"
 msgstr "Da li svaka stavka treba da primi isto raspoređivanje"
 
-#: ../clutter/clutter-flow-layout.c:922 ../clutter/clutter-table-layout.c:1637
+#: ../clutter/clutter-flow-layout.c:974
+#: ../clutter/deprecated/clutter-table-layout.c:1637
 msgid "Column Spacing"
 msgstr "Razmak kolona"
 
-#: ../clutter/clutter-flow-layout.c:923
+#: ../clutter/clutter-flow-layout.c:975
 msgid "The spacing between columns"
 msgstr "Razmak između kolona"
 
-#: ../clutter/clutter-flow-layout.c:939 ../clutter/clutter-table-layout.c:1651
+#: ../clutter/clutter-flow-layout.c:991
+#: ../clutter/deprecated/clutter-table-layout.c:1653
 msgid "Row Spacing"
 msgstr "Razmak redova"
 
-#: ../clutter/clutter-flow-layout.c:940
+#: ../clutter/clutter-flow-layout.c:992
 msgid "The spacing between rows"
 msgstr "Razmak između redova"
 
-#: ../clutter/clutter-flow-layout.c:954
+#: ../clutter/clutter-flow-layout.c:1006
 msgid "Minimum Column Width"
 msgstr "Najmanja širina kolone"
 
-#: ../clutter/clutter-flow-layout.c:955
+#: ../clutter/clutter-flow-layout.c:1007
 msgid "Minimum width for each column"
 msgstr "Najmanja širina za svaku kolonu"
 
-#: ../clutter/clutter-flow-layout.c:970
+#: ../clutter/clutter-flow-layout.c:1022
 msgid "Maximum Column Width"
 msgstr "Najveća širina kolone"
 
-#: ../clutter/clutter-flow-layout.c:971
+#: ../clutter/clutter-flow-layout.c:1023
 msgid "Maximum width for each column"
 msgstr "Najveća širina za svaku kolonu"
 
-#: ../clutter/clutter-flow-layout.c:985
+#: ../clutter/clutter-flow-layout.c:1037
 msgid "Minimum Row Height"
 msgstr "Najmanja visina reda"
 
-#: ../clutter/clutter-flow-layout.c:986
+#: ../clutter/clutter-flow-layout.c:1038
 msgid "Minimum height for each row"
 msgstr "Najmanja visina za svaki red"
 
-#: ../clutter/clutter-flow-layout.c:1001
+#: ../clutter/clutter-flow-layout.c:1053
 msgid "Maximum Row Height"
 msgstr "Najveća visina reda"
 
-#: ../clutter/clutter-flow-layout.c:1002
+#: ../clutter/clutter-flow-layout.c:1054
 msgid "Maximum height for each row"
 msgstr "Najveća visina za svaki red"
 
-#: ../clutter/clutter-grid-layout.c:1222
+#: ../clutter/clutter-flow-layout.c:1069 ../clutter/clutter-flow-layout.c:1070
+msgid "Snap to grid"
+msgstr "Prioni na mrežu"
+
+#: ../clutter/clutter-gesture-action.c:668
+msgid "Number touch points"
+msgstr "Broj tačaka dodira"
+
+#: ../clutter/clutter-gesture-action.c:669
+msgid "Number of touch points"
+msgstr "Broj dodirnih tačaka"
+
+#: ../clutter/clutter-gesture-action.c:684
+msgid "Threshold Trigger Edge"
+msgstr "Osetljivost ivice okidača"
+
+#: ../clutter/clutter-gesture-action.c:685
+msgid "The trigger edge used by the action"
+msgstr "Ivica okidača koju koristi radnja"
+
+#: ../clutter/clutter-gesture-action.c:704
+#| msgid "Threshold Trigger Edge"
+msgid "Threshold Trigger Horizontal Distance"
+msgstr "Osetljivost vodoravne udaljenosti okidača"
+
+#: ../clutter/clutter-gesture-action.c:705
+#| msgid "The trigger edge used by the action"
+msgid "The horizontal trigger distance used by the action"
+msgstr "Vodoravno odstojanje okidača koju koristi radnja"
+
+#: ../clutter/clutter-gesture-action.c:723
+#| msgid "Threshold Trigger Edge"
+msgid "Threshold Trigger Vertical Distance"
+msgstr "Osetljivost uspravne udaljenosti okidača"
+
+#: ../clutter/clutter-gesture-action.c:724
+#| msgid "The trigger edge used by the action"
+msgid "The vertical trigger distance used by the action"
+msgstr "Uspravno odstojanje okidača koju koristi radnja"
+
+#: ../clutter/clutter-grid-layout.c:1223
 msgid "Left attachment"
 msgstr "Levo pripajanje"
 
-#: ../clutter/clutter-grid-layout.c:1223
+#: ../clutter/clutter-grid-layout.c:1224
 msgid "The column number to attach the left side of the child to"
 msgstr "Broj stupca za koji prikačiti levu stranu sadržanog elementa"
 
-#: ../clutter/clutter-grid-layout.c:1230
+#: ../clutter/clutter-grid-layout.c:1231
 msgid "Top attachment"
 msgstr "Gornje pripajanje"
 
-#: ../clutter/clutter-grid-layout.c:1231
+#: ../clutter/clutter-grid-layout.c:1232
 msgid "The row number to attach the top side of a child widget to"
 msgstr "Broj reda za koji prikačiti gornju stranu sadržanog elementa"
 
-#: ../clutter/clutter-grid-layout.c:1239
+#: ../clutter/clutter-grid-layout.c:1240
 msgid "The number of columns that a child spans"
 msgstr "Broj kolona koje sadržani element obuhvata"
 
-#: ../clutter/clutter-grid-layout.c:1246
+#: ../clutter/clutter-grid-layout.c:1247
 msgid "The number of rows that a child spans"
 msgstr "Broj redova koje sadržani element obuhvata"
 
-#: ../clutter/clutter-grid-layout.c:1565
+#: ../clutter/clutter-grid-layout.c:1564
 msgid "Row spacing"
 msgstr "Razmak redova"
 
-#: ../clutter/clutter-grid-layout.c:1566
+#: ../clutter/clutter-grid-layout.c:1565
 msgid "The amount of space between two consecutive rows"
 msgstr "Razmak između dva susedna reda"
 
-#: ../clutter/clutter-grid-layout.c:1579
+#: ../clutter/clutter-grid-layout.c:1578
 msgid "Column spacing"
 msgstr "Razmak kolona"
 
-#: ../clutter/clutter-grid-layout.c:1580
+#: ../clutter/clutter-grid-layout.c:1579
 msgid "The amount of space between two consecutive columns"
 msgstr "Razmak između dva susedna stupca"
 
-#: ../clutter/clutter-grid-layout.c:1594
+#: ../clutter/clutter-grid-layout.c:1593
 msgid "Row Homogeneous"
 msgstr "Istorodnost reda"
 
-#: ../clutter/clutter-grid-layout.c:1595
+#: ../clutter/clutter-grid-layout.c:1594
 msgid "If TRUE, the rows are all the same height"
 msgstr "Ukoliko je postavljeno, onda svi redovi imaju istu visinu"
 
-#: ../clutter/clutter-grid-layout.c:1608
+#: ../clutter/clutter-grid-layout.c:1607
 msgid "Column Homogeneous"
 msgstr "Istorodnost kolone"
 
-#: ../clutter/clutter-grid-layout.c:1609
+#: ../clutter/clutter-grid-layout.c:1608
 msgid "If TRUE, the columns are all the same width"
 msgstr "Ukoliko je postavljeno, onda sve kolone imaju istu visinu"
 
-#: ../clutter/clutter-image.c:248 ../clutter/clutter-image.c:311
-#: ../clutter/clutter-image.c:399
+#: ../clutter/clutter-image.c:249 ../clutter/clutter-image.c:312
+#: ../clutter/clutter-image.c:400
 msgid "Unable to load image data"
 msgstr "Ne mogu da učitam podatke slike"
 
-#: ../clutter/clutter-input-device.c:242
+#: ../clutter/clutter-input-device.c:231
 msgid "Id"
 msgstr "Id"
 
-#: ../clutter/clutter-input-device.c:243
+#: ../clutter/clutter-input-device.c:232
 msgid "Unique identifier of the device"
 msgstr "Jedinstveni identifikator uređaja"
 
-#: ../clutter/clutter-input-device.c:259
+#: ../clutter/clutter-input-device.c:248
 msgid "The name of the device"
 msgstr "Naziv uređaja"
 
-#: ../clutter/clutter-input-device.c:273
+#: ../clutter/clutter-input-device.c:262
 msgid "Device Type"
 msgstr "Vrsta uređaja"
 
-#: ../clutter/clutter-input-device.c:274
+#: ../clutter/clutter-input-device.c:263
 msgid "The type of the device"
 msgstr "Vrsta uređaja"
 
-#: ../clutter/clutter-input-device.c:289
+#: ../clutter/clutter-input-device.c:278
 msgid "Device Manager"
 msgstr "Upravnik uređaja"
 
-#: ../clutter/clutter-input-device.c:290
+#: ../clutter/clutter-input-device.c:279
 msgid "The device manager instance"
 msgstr "Primerak upravnika uređaja"
 
-#: ../clutter/clutter-input-device.c:303
+#: ../clutter/clutter-input-device.c:292
 msgid "Device Mode"
 msgstr "Režim uređaja"
 
-#: ../clutter/clutter-input-device.c:304
+#: ../clutter/clutter-input-device.c:293
 msgid "The mode of the device"
 msgstr "Režim uređaja"
 
-#: ../clutter/clutter-input-device.c:318
+#: ../clutter/clutter-input-device.c:307
 msgid "Has Cursor"
 msgstr "Poseduje kursor"
 
-#: ../clutter/clutter-input-device.c:319
+#: ../clutter/clutter-input-device.c:308
 msgid "Whether the device has a cursor"
 msgstr "Da li uređaj ima kursor"
 
-#: ../clutter/clutter-input-device.c:338
+#: ../clutter/clutter-input-device.c:327
 msgid "Whether the device is enabled"
 msgstr "Da li je uređaj uključen"
 
-#: ../clutter/clutter-input-device.c:351
+#: ../clutter/clutter-input-device.c:340
 msgid "Number of Axes"
 msgstr "Broj osa"
 
-#: ../clutter/clutter-input-device.c:352
+#: ../clutter/clutter-input-device.c:341
 msgid "The number of axes on the device"
 msgstr "Broj osa na uređaju"
 
-#: ../clutter/clutter-input-device.c:367
+#: ../clutter/clutter-input-device.c:356
 msgid "The backend instance"
 msgstr "Primerak pozadinca"
 
-#: ../clutter/clutter-interval.c:506
+#: ../clutter/clutter-interval.c:553
 msgid "Value Type"
 msgstr "Vrsta vrednosti"
 
-#: ../clutter/clutter-interval.c:507
+#: ../clutter/clutter-interval.c:554
 msgid "The type of the values in the interval"
 msgstr "Vrsta vrednosti u periodu"
 
-#: ../clutter/clutter-interval.c:522
+#: ../clutter/clutter-interval.c:569
 msgid "Initial Value"
 msgstr "Početna vrednost"
 
-#: ../clutter/clutter-interval.c:523
+#: ../clutter/clutter-interval.c:570
 msgid "Initial value of the interval"
 msgstr "Početna vrednost perioda"
 
-#: ../clutter/clutter-interval.c:537
+#: ../clutter/clutter-interval.c:584
 msgid "Final Value"
 msgstr "Krajnja vrednost"
 
-#: ../clutter/clutter-interval.c:538
+#: ../clutter/clutter-interval.c:585
 msgid "Final value of the interval"
 msgstr "Krajnja vrednost perioda"
 
@@ -1275,96 +1347,96 @@ msgstr "Upravnik koji je stvorio ovaj podatak"
 #. * Do NOT translate it to non-English e.g. "predefinito:LTR"! If
 #. * it isn't default:LTR or default:RTL it will not work.
 #.
-#: ../clutter/clutter-main.c:772
+#: ../clutter/clutter-main.c:795
 msgid "default:LTR"
 msgstr "default:LTR"
 
-#: ../clutter/clutter-main.c:1646
+#: ../clutter/clutter-main.c:1622
 msgid "Show frames per second"
 msgstr "Prikazuje kadrove u sekundi"
 
-#: ../clutter/clutter-main.c:1648
+#: ../clutter/clutter-main.c:1624
 msgid "Default frame rate"
 msgstr "Osnovni protok kadra"
 
-#: ../clutter/clutter-main.c:1650
+#: ../clutter/clutter-main.c:1626
 msgid "Make all warnings fatal"
 msgstr "Čini sva upozorenja kobnim"
 
-#: ../clutter/clutter-main.c:1653
+#: ../clutter/clutter-main.c:1629
 msgid "Direction for the text"
 msgstr "Pravac usmerenja za tekst"
 
-#: ../clutter/clutter-main.c:1656
+#: ../clutter/clutter-main.c:1632
 msgid "Disable mipmapping on text"
 msgstr "Isključuje mip mapiranje na tekstu"
 
-#: ../clutter/clutter-main.c:1659
+#: ../clutter/clutter-main.c:1635
 msgid "Use 'fuzzy' picking"
 msgstr "Koristi „nejasno“ prebiranje"
 
-#: ../clutter/clutter-main.c:1662
+#: ../clutter/clutter-main.c:1638
 msgid "Clutter debugging flags to set"
 msgstr "Opcije Galamdžije za uklanjanje grešaka za postavljanje"
 
-#: ../clutter/clutter-main.c:1664
+#: ../clutter/clutter-main.c:1640
 msgid "Clutter debugging flags to unset"
 msgstr "Opcije Galamdžije za uklanjanje grešaka za isključivanje"
 
-#: ../clutter/clutter-main.c:1668
+#: ../clutter/clutter-main.c:1644
 msgid "Clutter profiling flags to set"
 msgstr "Opcije profilisanja Galamdžije za postavljanje"
 
-#: ../clutter/clutter-main.c:1670
+#: ../clutter/clutter-main.c:1646
 msgid "Clutter profiling flags to unset"
 msgstr "Opcije profilisanja Galamdžije za isključivanje"
 
-#: ../clutter/clutter-main.c:1673
+#: ../clutter/clutter-main.c:1649
 msgid "Enable accessibility"
 msgstr "Uključuje pristupačnost"
 
-#: ../clutter/clutter-main.c:1865
+#: ../clutter/clutter-main.c:1841
 msgid "Clutter Options"
 msgstr "Opcije Galamdžije"
 
-#: ../clutter/clutter-main.c:1866
+#: ../clutter/clutter-main.c:1842
 msgid "Show Clutter Options"
 msgstr "Prikazuje opcije Galamdžije"
 
-#: ../clutter/clutter-pan-action.c:448
+#: ../clutter/clutter-pan-action.c:455
 msgid "Pan Axis"
 msgstr "Osa pomeranja"
 
-#: ../clutter/clutter-pan-action.c:449
+#: ../clutter/clutter-pan-action.c:456
 msgid "Constraints the panning to an axis"
 msgstr "Ograničava pomeranje na osu"
 
-#: ../clutter/clutter-pan-action.c:463
+#: ../clutter/clutter-pan-action.c:470
 msgid "Interpolate"
 msgstr "Utapanje"
 
-#: ../clutter/clutter-pan-action.c:464
+#: ../clutter/clutter-pan-action.c:471
 msgid "Whether interpolated events emission is enabled."
 msgstr "Da li je uključeno odašiljanje utopljenih događaja"
 
-#: ../clutter/clutter-pan-action.c:480
+#: ../clutter/clutter-pan-action.c:487
 msgid "Deceleration"
 msgstr "Usporavanje"
 
-#: ../clutter/clutter-pan-action.c:481
+#: ../clutter/clutter-pan-action.c:488
 msgid "Rate at which the interpolated panning will decelerate in"
 msgstr "Odnos pri u kome će utopljeno pomeranje da uspori"
 
-#: ../clutter/clutter-pan-action.c:498
+#: ../clutter/clutter-pan-action.c:505
 msgid "Initial acceleration factor"
 msgstr "Sastojak početnog ubrzanja"
 
-#: ../clutter/clutter-pan-action.c:499
+#: ../clutter/clutter-pan-action.c:506
 msgid "Factor applied to the momentum when starting the interpolated phase"
 msgstr "Sastojak koji se primenjuje na zamah prilikom pokretanja faze utapanja"
 
 #: ../clutter/clutter-path-constraint.c:212
-#: ../clutter/deprecated/clutter-behaviour-path.c:225
+#: ../clutter/deprecated/clutter-behaviour-path.c:221
 msgid "Path"
 msgstr "Putanja"
 
@@ -1376,85 +1448,85 @@ msgstr "Putanja korišćena za ograničavanje činioca"
 msgid "The offset along the path, between -1.0 and 2.0"
 msgstr "Pomeraj duž putanje, između -1.0 i 2.0"
 
-#: ../clutter/clutter-property-transition.c:271
+#: ../clutter/clutter-property-transition.c:269
 msgid "Property Name"
 msgstr "Naziv svojstva"
 
-#: ../clutter/clutter-property-transition.c:272
+#: ../clutter/clutter-property-transition.c:270
 msgid "The name of the property to animate"
 msgstr "Naziv svojstva za animiranje"
 
-#: ../clutter/clutter-script.c:466
+#: ../clutter/clutter-script.c:464
 msgid "Filename Set"
 msgstr "Izbor naziva datoteke"
 
-#: ../clutter/clutter-script.c:467
+#: ../clutter/clutter-script.c:465
 msgid "Whether the :filename property is set"
 msgstr "Da li je postavljena osobina :naziv_datoteke"
 
-#: ../clutter/clutter-script.c:481
-#: ../clutter/deprecated/clutter-texture.c:1082
+#: ../clutter/clutter-script.c:479
+#: ../clutter/deprecated/clutter-texture.c:1080
 msgid "Filename"
 msgstr "Naziv datoteke"
 
-#: ../clutter/clutter-script.c:482
+#: ../clutter/clutter-script.c:480
 msgid "The path of the currently parsed file"
 msgstr "Putanja trenutno obrađivane datoteke"
 
-#: ../clutter/clutter-script.c:499
+#: ../clutter/clutter-script.c:497
 msgid "Translation Domain"
 msgstr "Domen prevoda"
 
-#: ../clutter/clutter-script.c:500
+#: ../clutter/clutter-script.c:498
 msgid "The translation domain used to localize string"
 msgstr "Domen prevoda korišćen za lokalizaciju niske"
 
-#: ../clutter/clutter-scroll-actor.c:263
+#: ../clutter/clutter-scroll-actor.c:189
 msgid "Scroll Mode"
 msgstr "Režim klizanja"
 
-#: ../clutter/clutter-scroll-actor.c:264
+#: ../clutter/clutter-scroll-actor.c:190
 msgid "The scrolling direction"
 msgstr "Smer klizanja"
 
-#: ../clutter/clutter-settings.c:440
+#: ../clutter/clutter-settings.c:486
 msgid "Double Click Time"
 msgstr "Vreme duplog klika"
 
-#: ../clutter/clutter-settings.c:441
+#: ../clutter/clutter-settings.c:487
 msgid "The time between clicks necessary to detect a multiple click"
 msgstr "Vreme između klikova potrebno za otkrivanje višestrukog klika"
 
-#: ../clutter/clutter-settings.c:456
+#: ../clutter/clutter-settings.c:502
 msgid "Double Click Distance"
 msgstr "Razmak duplog klika"
 
-#: ../clutter/clutter-settings.c:457
+#: ../clutter/clutter-settings.c:503
 msgid "The distance between clicks necessary to detect a multiple click"
 msgstr "Razmak između klikova potreban za otkrivanje višestrukog klika"
 
-#: ../clutter/clutter-settings.c:472
+#: ../clutter/clutter-settings.c:518
 msgid "Drag Threshold"
 msgstr "Prag prevlačenja"
 
-#: ../clutter/clutter-settings.c:473
+#: ../clutter/clutter-settings.c:519
 msgid "The distance the cursor should travel before starting to drag"
 msgstr "Rastojanje koje kursor treba da pređe pre početka prevlačenja"
 
-#: ../clutter/clutter-settings.c:488 ../clutter/clutter-text.c:3369
+#: ../clutter/clutter-settings.c:534 ../clutter/clutter-text.c:3404
 msgid "Font Name"
 msgstr "Naziv slovnog lika"
 
-#: ../clutter/clutter-settings.c:489
+#: ../clutter/clutter-settings.c:535
 msgid ""
 "The description of the default font, as one that could be parsed by Pango"
 msgstr "Opis osnovnog slovnog lika, kao ono koje bi Pango trebao da obradi"
 
-#: ../clutter/clutter-settings.c:504
+#: ../clutter/clutter-settings.c:550
 msgid "Font Antialias"
 msgstr "Umekšavanje slovnog lika"
 
-#: ../clutter/clutter-settings.c:505
+#: ../clutter/clutter-settings.c:551
 msgid ""
 "Whether to use antialiasing (1 to enable, 0 to disable, and -1 to use the "
 "default)"
@@ -1462,70 +1534,78 @@ msgstr ""
 "Da li će biti korišćeno umekšavanje (1 za uključivanje, 0 za isključivanje, i -1 "
 "za korišćenje osnovnog)"
 
-#: ../clutter/clutter-settings.c:521
+#: ../clutter/clutter-settings.c:567 ../clutter/clutter-settings.c:575
 msgid "Font DPI"
 msgstr "TPI slovnog lika"
 
-#: ../clutter/clutter-settings.c:522
+#: ../clutter/clutter-settings.c:568 ../clutter/clutter-settings.c:576
 msgid ""
 "The resolution of the font, in 1024 * dots/inch, or -1 to use the default"
 msgstr ""
 "Rezolucija slovnog lika, u 1024 * tačaka/inču, ili -1 za korišćenje osnovne"
 
-#: ../clutter/clutter-settings.c:538
+#: ../clutter/clutter-settings.c:592
 msgid "Font Hinting"
 msgstr "Nagoveštaj slovnog lika"
 
-#: ../clutter/clutter-settings.c:539
+#: ../clutter/clutter-settings.c:593
 msgid ""
 "Whether to use hinting (1 to enable, 0 to disable and -1 to use the default)"
 msgstr ""
 "Da li će biti korišćeno nagoveštavanje (1 za uključivanje, 0 za isključivanje, i "
 "-1 za korišćenje osnovnog)"
 
-#: ../clutter/clutter-settings.c:560
+#: ../clutter/clutter-settings.c:614
 msgid "Font Hint Style"
 msgstr "Stil nagoveštaja slovnog lika"
 
-#: ../clutter/clutter-settings.c:561
+#: ../clutter/clutter-settings.c:615
 msgid "The style of hinting (hintnone, hintslight, hintmedium, hintfull)"
 msgstr ""
 "Stil nagoveštavanja („hintnone“ (ništa), „hintslight“ (blago), "
 "„hintmedium“ (srednje), „hintfull“ (puno))"
 
-#: ../clutter/clutter-settings.c:582
+#: ../clutter/clutter-settings.c:636
 msgid "Font Subpixel Order"
 msgstr "Poredak podtačaka slovnog lika"
 
-#: ../clutter/clutter-settings.c:583
+#: ../clutter/clutter-settings.c:637
 msgid "The type of subpixel antialiasing (none, rgb, bgr, vrgb, vbgr)"
 msgstr "Vrsta umekšavanja podtačaka (none, rgb, bgr, vrgb, vbgr)"
 
-#: ../clutter/clutter-settings.c:600
+#: ../clutter/clutter-settings.c:654
 msgid "The minimum duration for a long press gesture to be recognized"
 msgstr "Najmanje trajanje poteza dugog pritiska da bi bio prepoznat"
 
-#: ../clutter/clutter-settings.c:607
+#: ../clutter/clutter-settings.c:661
+msgid "Window Scaling Factor"
+msgstr "Činilac srazmeravanja prozora"
+
+#: ../clutter/clutter-settings.c:662
+msgid "The scaling factor to be applied to windows"
+msgstr "Činilac srazmeravanja koji će se primenjivati nad prozorima"
+
+#: ../clutter/clutter-settings.c:669
 msgid "Fontconfig configuration timestamp"
 msgstr "Vreme i datum podešavanja slovnog lika"
 
-#: ../clutter/clutter-settings.c:608
+#: ../clutter/clutter-settings.c:670
 msgid "Timestamp of the current fontconfig configuration"
 msgstr "Vreme i datum trenutnog podešavanja slovnog lika"
 
-#: ../clutter/clutter-settings.c:625
+#: ../clutter/clutter-settings.c:687
 msgid "Password Hint Time"
 msgstr "Vreme nagoveštaja lozinke"
 
-#: ../clutter/clutter-settings.c:626
+#: ../clutter/clutter-settings.c:688
 msgid "How long to show the last input character in hidden entries"
 msgstr "Koliko dugo će biti prikazan poslednji znak unosa u skrivenim stavkama"
 
-#: ../clutter/clutter-shader-effect.c:486
+#: ../clutter/clutter-shader-effect.c:485
 msgid "Shader Type"
 msgstr "Vrsta nijansera"
 
-#: ../clutter/clutter-shader-effect.c:487
+#: ../clutter/clutter-shader-effect.c:486
 msgid "The type of shader used"
 msgstr "Vrsta korišćenog nijansera"
 
@@ -1553,761 +1633,705 @@ msgstr "Ivica izvora koja treba da bude obuhvaćena"
 msgid "The offset in pixels to apply to the constraint"
 msgstr "Pomeraj u tačkama koji će biti primenjen na ograničenje"
 
-#: ../clutter/clutter-stage.c:1895
+#: ../clutter/clutter-stage.c:1899
 msgid "Fullscreen Set"
 msgstr "Izbor celog ekrana"
 
-#: ../clutter/clutter-stage.c:1896
+#: ../clutter/clutter-stage.c:1900
 msgid "Whether the main stage is fullscreen"
 msgstr "Da li je glavna scena preko celog ekrana"
 
-#: ../clutter/clutter-stage.c:1910
+#: ../clutter/clutter-stage.c:1914
 msgid "Offscreen"
 msgstr "Van ekrana"
 
-#: ../clutter/clutter-stage.c:1911
+#: ../clutter/clutter-stage.c:1915
 msgid "Whether the main stage should be rendered offscreen"
 msgstr "Da li glavna scena treba da bude iscrtana van ekrana"
 
-#: ../clutter/clutter-stage.c:1923 ../clutter/clutter-text.c:3483
+#: ../clutter/clutter-stage.c:1927 ../clutter/clutter-text.c:3518
 msgid "Cursor Visible"
 msgstr "Kursor je vidljiv"
 
-#: ../clutter/clutter-stage.c:1924
+#: ../clutter/clutter-stage.c:1928
 msgid "Whether the mouse pointer is visible on the main stage"
 msgstr "Da li je pokazivač miša vidljiv na glavnoj sceni"
 
-#: ../clutter/clutter-stage.c:1938
+#: ../clutter/clutter-stage.c:1942
 msgid "User Resizable"
 msgstr "Korisnik menja veličinu"
 
-#: ../clutter/clutter-stage.c:1939
+#: ../clutter/clutter-stage.c:1943
 msgid "Whether the stage is able to be resized via user interaction"
 msgstr "Da li je moguće promeniti veličanu scene posredstvom dejstva korisnika"
 
-#: ../clutter/clutter-stage.c:1954 ../clutter/deprecated/clutter-box.c:260
-#: ../clutter/deprecated/clutter-rectangle.c:273
+#: ../clutter/clutter-stage.c:1958 ../clutter/deprecated/clutter-box.c:256
+#: ../clutter/deprecated/clutter-rectangle.c:270
 msgid "Color"
 msgstr "Boja"
 
-#: ../clutter/clutter-stage.c:1955
+#: ../clutter/clutter-stage.c:1959
 msgid "The color of the stage"
 msgstr "Boja scene"
 
-#: ../clutter/clutter-stage.c:1970
+#: ../clutter/clutter-stage.c:1974
 msgid "Perspective"
 msgstr "Vidokrug"
 
-#: ../clutter/clutter-stage.c:1971
+#: ../clutter/clutter-stage.c:1975
 msgid "Perspective projection parameters"
 msgstr "Parametri projekcije vidokruga"
 
-#: ../clutter/clutter-stage.c:1986
+#: ../clutter/clutter-stage.c:1990
 msgid "Title"
 msgstr "Naslov"
 
-#: ../clutter/clutter-stage.c:1987
+#: ../clutter/clutter-stage.c:1991
 msgid "Stage Title"
 msgstr "Naslov scene"
 
-#: ../clutter/clutter-stage.c:2004
+#: ../clutter/clutter-stage.c:2008
 msgid "Use Fog"
 msgstr "Koristi maglu"
 
-#: ../clutter/clutter-stage.c:2005
+#: ../clutter/clutter-stage.c:2009
 msgid "Whether to enable depth cueing"
 msgstr "Da li će biti uključeno signaliziranje dubine"
 
-#: ../clutter/clutter-stage.c:2021
+#: ../clutter/clutter-stage.c:2025
 msgid "Fog"
 msgstr "Magla"
 
-#: ../clutter/clutter-stage.c:2022
+#: ../clutter/clutter-stage.c:2026
 msgid "Settings for the depth cueing"
 msgstr "Podešavanja za signaliziranje dubine"
 
-#: ../clutter/clutter-stage.c:2038
+#: ../clutter/clutter-stage.c:2042
 msgid "Use Alpha"
 msgstr "Koristi providnost"
 
-#: ../clutter/clutter-stage.c:2039
+#: ../clutter/clutter-stage.c:2043
 msgid "Whether to honour the alpha component of the stage color"
 msgstr "Da li da ispoštuje komponentu providnosti boje scene"
 
-#: ../clutter/clutter-stage.c:2055
+#: ../clutter/clutter-stage.c:2059
 msgid "Key Focus"
 msgstr "Prvi plan tastera"
 
-#: ../clutter/clutter-stage.c:2056
+#: ../clutter/clutter-stage.c:2060
 msgid "The currently key focused actor"
 msgstr "Trenutni činilac tasterom u prvi plan"
 
-#: ../clutter/clutter-stage.c:2072
+#: ../clutter/clutter-stage.c:2076
 msgid "No Clear Hint"
 msgstr "Bez brisanja saveta"
 
-#: ../clutter/clutter-stage.c:2073
+#: ../clutter/clutter-stage.c:2077
 msgid "Whether the stage should clear its contents"
 msgstr "Da li scena treba da očisti svoj sadržaj"
 
-#: ../clutter/clutter-stage.c:2086
+#: ../clutter/clutter-stage.c:2090
 msgid "Accept Focus"
 msgstr "Prihvatanje u prvi plan"
 
-#: ../clutter/clutter-stage.c:2087
+#: ../clutter/clutter-stage.c:2091
 msgid "Whether the stage should accept focus on show"
 msgstr "Da li scena treba da prihvati prvi plan pri prikazu"
 
-#: ../clutter/clutter-table-layout.c:543
-msgid "Column Number"
-msgstr "Broj kolone"
-
-#: ../clutter/clutter-table-layout.c:544
-msgid "The column the widget resides in"
-msgstr "Kolona u kojoj se nalazi element"
-
-#: ../clutter/clutter-table-layout.c:551
-msgid "Row Number"
-msgstr "Broj reda"
-
-#: ../clutter/clutter-table-layout.c:552
-msgid "The row the widget resides in"
-msgstr "Red u kome se nalazi element"
-
-#: ../clutter/clutter-table-layout.c:559
-msgid "Column Span"
-msgstr "Raspon kolone"
-
-#: ../clutter/clutter-table-layout.c:560
-msgid "The number of columns the widget should span"
-msgstr "Broj kolona koje element treba da obuhvati"
-
-#: ../clutter/clutter-table-layout.c:567
-msgid "Row Span"
-msgstr "Raspon reda"
-
-#: ../clutter/clutter-table-layout.c:568
-msgid "The number of rows the widget should span"
-msgstr "Broj redova koje element treba da obuhvati"
-
-#: ../clutter/clutter-table-layout.c:575
-msgid "Horizontal Expand"
-msgstr "Vodoravno širenje"
-
-#: ../clutter/clutter-table-layout.c:576
-msgid "Allocate extra space for the child in horizontal axis"
-msgstr "Dodeljuje dodatni prostor za porod na vodoravnoj osi"
-
-#: ../clutter/clutter-table-layout.c:582
-msgid "Vertical Expand"
-msgstr "Uspravno širenje"
-
-#: ../clutter/clutter-table-layout.c:583
-msgid "Allocate extra space for the child in vertical axis"
-msgstr "Dodeljuje dodatni prostor za porod na uspravnoj osi"
-
-#: ../clutter/clutter-table-layout.c:1638
-msgid "Spacing between columns"
-msgstr "Razmak između kolona"
-
-#: ../clutter/clutter-table-layout.c:1652
-msgid "Spacing between rows"
-msgstr "Razmak između redova"
-
-#: ../clutter/clutter-text-buffer.c:351 ../clutter/clutter-text.c:3404
+#: ../clutter/clutter-text-buffer.c:347 ../clutter/clutter-text.c:3439
 msgid "Text"
 msgstr "Tekst"
 
-#: ../clutter/clutter-text-buffer.c:352
+#: ../clutter/clutter-text-buffer.c:348
 msgid "The contents of the buffer"
 msgstr "Sadržaj priručne memorije"
 
-#: ../clutter/clutter-text-buffer.c:365
+#: ../clutter/clutter-text-buffer.c:361
 msgid "Text length"
 msgstr "Dužina teksta"
 
-#: ../clutter/clutter-text-buffer.c:366
+#: ../clutter/clutter-text-buffer.c:362
 msgid "Length of the text currently in the buffer"
 msgstr "Dužina teksta koji je trenutno u priručnoj memoriji"
 
-#: ../clutter/clutter-text-buffer.c:379
+#: ../clutter/clutter-text-buffer.c:375
 msgid "Maximum length"
 msgstr "Najveća dužina"
 
-#: ../clutter/clutter-text-buffer.c:380
+#: ../clutter/clutter-text-buffer.c:376
 msgid "Maximum number of characters for this entry. Zero if no maximum"
 msgstr "Najveći broj znakova za ovu stavku. Nula ako nema ograničenja"
 
-#: ../clutter/clutter-text.c:3351
+#: ../clutter/clutter-text.c:3386
 msgid "Buffer"
 msgstr "Priručna memorija"
 
-#: ../clutter/clutter-text.c:3352
+#: ../clutter/clutter-text.c:3387
 msgid "The buffer for the text"
 msgstr "Priručna memorija za tekst"
 
-#: ../clutter/clutter-text.c:3370
+#: ../clutter/clutter-text.c:3405
 msgid "The font to be used by the text"
 msgstr "Slovni lik koji će tekst da koristi"
 
-#: ../clutter/clutter-text.c:3387
+#: ../clutter/clutter-text.c:3422
 msgid "Font Description"
 msgstr "Opis slovnog lika"
 
-#: ../clutter/clutter-text.c:3388
+#: ../clutter/clutter-text.c:3423
 msgid "The font description to be used"
 msgstr "Opis slovnog lika koji će biti korišćen"
 
-#: ../clutter/clutter-text.c:3405
+#: ../clutter/clutter-text.c:3440
 msgid "The text to render"
 msgstr "Tekst za prikazivanje"
 
-#: ../clutter/clutter-text.c:3419
+#: ../clutter/clutter-text.c:3454
 msgid "Font Color"
 msgstr "Boja slovnog lika"
 
-#: ../clutter/clutter-text.c:3420
+#: ../clutter/clutter-text.c:3455
 msgid "Color of the font used by the text"
 msgstr "Boja slovnog lika kog koristi tekst"
 
-#: ../clutter/clutter-text.c:3435
+#: ../clutter/clutter-text.c:3470
 msgid "Editable"
 msgstr "Izmenjiv"
 
-#: ../clutter/clutter-text.c:3436
+#: ../clutter/clutter-text.c:3471
 msgid "Whether the text is editable"
 msgstr "Da li se tekst može menjati"
 
-#: ../clutter/clutter-text.c:3451
+#: ../clutter/clutter-text.c:3486
 msgid "Selectable"
 msgstr "Izbirljiv"
 
-#: ../clutter/clutter-text.c:3452
+#: ../clutter/clutter-text.c:3487
 msgid "Whether the text is selectable"
 msgstr "Da li se tekst može izabrati"
 
-#: ../clutter/clutter-text.c:3466
+#: ../clutter/clutter-text.c:3501
 msgid "Activatable"
 msgstr "Aktivirljiv"
 
-#: ../clutter/clutter-text.c:3467
+#: ../clutter/clutter-text.c:3502
 msgid "Whether pressing return causes the activate signal to be emitted"
 msgstr "Da li pritisak na povratak izaziva emitovanje signala aktiviranja"
 
-#: ../clutter/clutter-text.c:3484
+#: ../clutter/clutter-text.c:3519
 msgid "Whether the input cursor is visible"
 msgstr "Da li je kursor unosa vidljiv"
 
-#: ../clutter/clutter-text.c:3498 ../clutter/clutter-text.c:3499
+#: ../clutter/clutter-text.c:3533 ../clutter/clutter-text.c:3534
 msgid "Cursor Color"
 msgstr "Boja kursora"
 
-#: ../clutter/clutter-text.c:3514
+#: ../clutter/clutter-text.c:3549
 msgid "Cursor Color Set"
 msgstr "Izbor boje kursora"
 
-#: ../clutter/clutter-text.c:3515
+#: ../clutter/clutter-text.c:3550
 msgid "Whether the cursor color has been set"
 msgstr "Da li je boja kursora postavljena"
 
-#: ../clutter/clutter-text.c:3530
+#: ../clutter/clutter-text.c:3565
 msgid "Cursor Size"
 msgstr "Veličina kursora"
 
-#: ../clutter/clutter-text.c:3531
+#: ../clutter/clutter-text.c:3566
 msgid "The width of the cursor, in pixels"
 msgstr "Širina kursora, u tačkama"
 
-#: ../clutter/clutter-text.c:3547 ../clutter/clutter-text.c:3565
+#: ../clutter/clutter-text.c:3582 ../clutter/clutter-text.c:3600
 msgid "Cursor Position"
 msgstr "Položaj kursora"
 
-#: ../clutter/clutter-text.c:3548 ../clutter/clutter-text.c:3566
+#: ../clutter/clutter-text.c:3583 ../clutter/clutter-text.c:3601
 msgid "The cursor position"
 msgstr "Položaj kursora"
 
-#: ../clutter/clutter-text.c:3581
+#: ../clutter/clutter-text.c:3616
 msgid "Selection-bound"
 msgstr "Granica izbora"
 
-#: ../clutter/clutter-text.c:3582
+#: ../clutter/clutter-text.c:3617
 msgid "The cursor position of the other end of the selection"
 msgstr "Položaj kursora na drugom kraju izbora"
 
-#: ../clutter/clutter-text.c:3597 ../clutter/clutter-text.c:3598
+#: ../clutter/clutter-text.c:3632 ../clutter/clutter-text.c:3633
 msgid "Selection Color"
 msgstr "Boja izbora"
 
-#: ../clutter/clutter-text.c:3613
+#: ../clutter/clutter-text.c:3648
 msgid "Selection Color Set"
 msgstr "Izbor boje izbora"
 
-#: ../clutter/clutter-text.c:3614
+#: ../clutter/clutter-text.c:3649
 msgid "Whether the selection color has been set"
 msgstr "Da li je boja izbora postavljena"
 
-#: ../clutter/clutter-text.c:3629
+#: ../clutter/clutter-text.c:3664
 msgid "Attributes"
 msgstr "Osobine"
 
-#: ../clutter/clutter-text.c:3630
+#: ../clutter/clutter-text.c:3665
 msgid "A list of style attributes to apply to the contents of the actor"
 msgstr "Spisak osobina stila koje će biti primenjene na sadržaj činioca"
 
-#: ../clutter/clutter-text.c:3652
+#: ../clutter/clutter-text.c:3687
 msgid "Use markup"
 msgstr "Koristi označavanje"
 
-#: ../clutter/clutter-text.c:3653
+#: ../clutter/clutter-text.c:3688
 msgid "Whether or not the text includes Pango markup"
 msgstr "Da li tekst obuhvata Pango označavanje ili ne"
 
-#: ../clutter/clutter-text.c:3669
+#: ../clutter/clutter-text.c:3704
 msgid "Line wrap"
 msgstr "Prelom reda"
 
-#: ../clutter/clutter-text.c:3670
+#: ../clutter/clutter-text.c:3705
 msgid "If set, wrap the lines if the text becomes too wide"
 msgstr ""
 "Ako je podešeno, vršiće prelamanje redova ako tekst postane suviše širok"
 
-#: ../clutter/clutter-text.c:3685
+#: ../clutter/clutter-text.c:3720
 msgid "Line wrap mode"
 msgstr "Način preloma reda"
 
-#: ../clutter/clutter-text.c:3686
+#: ../clutter/clutter-text.c:3721
 msgid "Control how line-wrapping is done"
 msgstr "Kontroliše kako je obavljeno prelamanje reda"
 
-#: ../clutter/clutter-text.c:3701
+#: ../clutter/clutter-text.c:3736
 msgid "Ellipsize"
 msgstr "Skraćivanje"
 
-#: ../clutter/clutter-text.c:3702
+#: ../clutter/clutter-text.c:3737
 msgid "The preferred place to ellipsize the string"
 msgstr "Željeno mesto za skraćivanje niske"
 
-#: ../clutter/clutter-text.c:3718
+#: ../clutter/clutter-text.c:3753
 msgid "Line Alignment"
 msgstr "Poravnanje reda"
 
-#: ../clutter/clutter-text.c:3719
+#: ../clutter/clutter-text.c:3754
 msgid "The preferred alignment for the string, for multi-line text"
 msgstr "Željeno poravnanja za nisku, za više-linijski tekst"
 
-#: ../clutter/clutter-text.c:3735
+#: ../clutter/clutter-text.c:3770
 msgid "Justify"
 msgstr "Slaganje"
 
-#: ../clutter/clutter-text.c:3736
+#: ../clutter/clutter-text.c:3771
 msgid "Whether the text should be justified"
 msgstr "Da li tekst treba da bude složen"
 
-#: ../clutter/clutter-text.c:3751
+#: ../clutter/clutter-text.c:3786
 msgid "Password Character"
 msgstr "Znak lozinke"
 
-#: ../clutter/clutter-text.c:3752
+#: ../clutter/clutter-text.c:3787
 msgid "If non-zero, use this character to display the actor's contents"
 msgstr "Ako nije nula, koristiće ovaj znak za prikazivanje sadržaja činioca"
 
-#: ../clutter/clutter-text.c:3766
+#: ../clutter/clutter-text.c:3801
 msgid "Max Length"
 msgstr "Najveća dužina"
 
-#: ../clutter/clutter-text.c:3767
+#: ../clutter/clutter-text.c:3802
 msgid "Maximum length of the text inside the actor"
 msgstr "Najveća dužina teksta unutar činioca"
 
-#: ../clutter/clutter-text.c:3790
+#: ../clutter/clutter-text.c:3825
 msgid "Single Line Mode"
 msgstr "Režim jednog reda"
 
-#: ../clutter/clutter-text.c:3791
+#: ../clutter/clutter-text.c:3826
 msgid "Whether the text should be a single line"
 msgstr "Da li tekst treba da bude jedan red"
 
-#: ../clutter/clutter-text.c:3805 ../clutter/clutter-text.c:3806
+#: ../clutter/clutter-text.c:3840 ../clutter/clutter-text.c:3841
 msgid "Selected Text Color"
 msgstr "Boja izabranog teksta"
 
-#: ../clutter/clutter-text.c:3821
+#: ../clutter/clutter-text.c:3856
 msgid "Selected Text Color Set"
 msgstr "Postavka boje izabranog teksta"
 
-#: ../clutter/clutter-text.c:3822
+#: ../clutter/clutter-text.c:3857
 msgid "Whether the selected text color has been set"
 msgstr "Da li je boja izabranog teksta postavljena"
 
-#: ../clutter/clutter-timeline.c:561
-#: ../clutter/deprecated/clutter-animation.c:560
+#: ../clutter/clutter-timeline.c:593
+#: ../clutter/deprecated/clutter-animation.c:557
 msgid "Loop"
 msgstr "Ponavljanje"
 
-#: ../clutter/clutter-timeline.c:562
+#: ../clutter/clutter-timeline.c:594
 msgid "Should the timeline automatically restart"
 msgstr "Da li linija vremena treba samostalno da se ponovo pokrene"
 
-#: ../clutter/clutter-timeline.c:576
+#: ../clutter/clutter-timeline.c:608
 msgid "Delay"
 msgstr "Zastoj"
 
-#: ../clutter/clutter-timeline.c:577
+#: ../clutter/clutter-timeline.c:609
 msgid "Delay before start"
 msgstr "Zastoj pre početka"
 
-#: ../clutter/clutter-timeline.c:592
-#: ../clutter/deprecated/clutter-animation.c:544
-#: ../clutter/deprecated/clutter-animator.c:1804
+#: ../clutter/clutter-timeline.c:624
+#: ../clutter/deprecated/clutter-animation.c:541
+#: ../clutter/deprecated/clutter-animator.c:1801
 #: ../clutter/deprecated/clutter-media.c:224
-#: ../clutter/deprecated/clutter-state.c:1523
+#: ../clutter/deprecated/clutter-state.c:1517
 msgid "Duration"
 msgstr "Trajanje"
 
-#: ../clutter/clutter-timeline.c:593
+#: ../clutter/clutter-timeline.c:625
 msgid "Duration of the timeline in milliseconds"
 msgstr "Trajanje linije vremena, u milisekundama"
 
-#: ../clutter/clutter-timeline.c:608
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:528
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:337
+#: ../clutter/clutter-timeline.c:640
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:521
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:330
 msgid "Direction"
 msgstr "Pravac"
 
-#: ../clutter/clutter-timeline.c:609
+#: ../clutter/clutter-timeline.c:641
 msgid "Direction of the timeline"
 msgstr "Smer linije vremena"
 
-#: ../clutter/clutter-timeline.c:624
+#: ../clutter/clutter-timeline.c:656
 msgid "Auto Reverse"
 msgstr "Samostalno obrtanje"
 
-#: ../clutter/clutter-timeline.c:625
+#: ../clutter/clutter-timeline.c:657
 msgid "Whether the direction should be reversed when reaching the end"
 msgstr "Da li smer treba da bude preokrenut kada stigne do kraja"
 
-#: ../clutter/clutter-timeline.c:643
+#: ../clutter/clutter-timeline.c:675
 msgid "Repeat Count"
 msgstr "Broj ponavljanja"
 
-#: ../clutter/clutter-timeline.c:644
+#: ../clutter/clutter-timeline.c:676
 msgid "How many times the timeline should repeat"
 msgstr "Koliko puta vremenska linija treba da se ponovi"
 
-#: ../clutter/clutter-timeline.c:658
+#: ../clutter/clutter-timeline.c:690
 msgid "Progress Mode"
 msgstr "Režim napretka"
 
-#: ../clutter/clutter-timeline.c:659
+#: ../clutter/clutter-timeline.c:691
 msgid "How the timeline should compute the progress"
 msgstr "Kako vremenska linija treba da izračuna napredak"
 
-#: ../clutter/clutter-transition.c:246
+#: ../clutter/clutter-transition.c:244
 msgid "Interval"
 msgstr "Period"
 
-#: ../clutter/clutter-transition.c:247
+#: ../clutter/clutter-transition.c:245
 msgid "The interval of values to transition"
 msgstr "Period vrednosti za prelaz"
 
-#: ../clutter/clutter-transition.c:261
+#: ../clutter/clutter-transition.c:259
 msgid "Animatable"
 msgstr "Animirljiv"
 
-#: ../clutter/clutter-transition.c:262
+#: ../clutter/clutter-transition.c:260
 msgid "The animatable object"
 msgstr "Objekat za animiranje"
 
-#: ../clutter/clutter-transition.c:283
+#: ../clutter/clutter-transition.c:281
 msgid "Remove on Complete"
 msgstr "Ukloni kada je obavljeno"
 
-#: ../clutter/clutter-transition.c:284
+#: ../clutter/clutter-transition.c:282
 msgid "Detach the transition when completed"
 msgstr "Otkačiće prelaz nakon što je obavljen"
 
-#: ../clutter/clutter-zoom-action.c:354
+#: ../clutter/clutter-zoom-action.c:365
 msgid "Zoom Axis"
 msgstr "Osa uvećanja"
 
-#: ../clutter/clutter-zoom-action.c:355
+#: ../clutter/clutter-zoom-action.c:366
 msgid "Constraints the zoom to an axis"
 msgstr "Ograničava uvećavanje na osu"
 
-#: ../clutter/deprecated/clutter-alpha.c:355
-#: ../clutter/deprecated/clutter-animation.c:575
-#: ../clutter/deprecated/clutter-animator.c:1821
+#: ../clutter/deprecated/clutter-alpha.c:354
+#: ../clutter/deprecated/clutter-animation.c:572
+#: ../clutter/deprecated/clutter-animator.c:1818
 msgid "Timeline"
 msgstr "Linija vremena"
 
-#: ../clutter/deprecated/clutter-alpha.c:356
+#: ../clutter/deprecated/clutter-alpha.c:355
 msgid "Timeline used by the alpha"
 msgstr "Linija vremena koju koristi providnost"
 
-#: ../clutter/deprecated/clutter-alpha.c:372
+#: ../clutter/deprecated/clutter-alpha.c:371
 msgid "Alpha value"
 msgstr "Vrednost providnosti"
 
-#: ../clutter/deprecated/clutter-alpha.c:373
+#: ../clutter/deprecated/clutter-alpha.c:372
 msgid "Alpha value as computed by the alpha"
 msgstr "Vrednost providnosti koju proračunava providnost"
 
-#: ../clutter/deprecated/clutter-alpha.c:394
-#: ../clutter/deprecated/clutter-animation.c:528
+#: ../clutter/deprecated/clutter-alpha.c:393
+#: ../clutter/deprecated/clutter-animation.c:525
 msgid "Mode"
 msgstr "Režim"
 
-#: ../clutter/deprecated/clutter-alpha.c:395
+#: ../clutter/deprecated/clutter-alpha.c:394
 msgid "Progress mode"
 msgstr "Režim napretka"
 
-#: ../clutter/deprecated/clutter-animation.c:511
+#: ../clutter/deprecated/clutter-animation.c:508
 msgid "Object"
 msgstr "Objekat"
 
-#: ../clutter/deprecated/clutter-animation.c:512
+#: ../clutter/deprecated/clutter-animation.c:509
 msgid "Object to which the animation applies"
 msgstr "Objekat na koji se primenjuje animiranje"
 
-#: ../clutter/deprecated/clutter-animation.c:529
+#: ../clutter/deprecated/clutter-animation.c:526
 msgid "The mode of the animation"
 msgstr "Režim animiranja"
 
-#: ../clutter/deprecated/clutter-animation.c:545
+#: ../clutter/deprecated/clutter-animation.c:542
 msgid "Duration of the animation, in milliseconds"
 msgstr "Trajanje animiranja, u milisekundama"
 
-#: ../clutter/deprecated/clutter-animation.c:561
+#: ../clutter/deprecated/clutter-animation.c:558
 msgid "Whether the animation should loop"
 msgstr "Da li animiranje treba da se ponavlja"
 
-#: ../clutter/deprecated/clutter-animation.c:576
+#: ../clutter/deprecated/clutter-animation.c:573
 msgid "The timeline used by the animation"
 msgstr "Linija vremena koju koristi animiranje"
 
-#: ../clutter/deprecated/clutter-animation.c:592
-#: ../clutter/deprecated/clutter-behaviour.c:241
+#: ../clutter/deprecated/clutter-animation.c:589
+#: ../clutter/deprecated/clutter-behaviour.c:237
 msgid "Alpha"
 msgstr "Providnost"
 
-#: ../clutter/deprecated/clutter-animation.c:593
+#: ../clutter/deprecated/clutter-animation.c:590
 msgid "The alpha used by the animation"
 msgstr "Providnost koju koristi animiranje"
 
-#: ../clutter/deprecated/clutter-animator.c:1805
+#: ../clutter/deprecated/clutter-animator.c:1802
 msgid "The duration of the animation"
 msgstr "Trajanje animiranja"
 
-#: ../clutter/deprecated/clutter-animator.c:1822
+#: ../clutter/deprecated/clutter-animator.c:1819
 msgid "The timeline of the animation"
 msgstr "Linija vremena animiranja"
 
-#: ../clutter/deprecated/clutter-behaviour.c:242
+#: ../clutter/deprecated/clutter-behaviour.c:238
 msgid "Alpha Object to drive the behaviour"
 msgstr "Objekat providnosti koji upravlja ponašanjem"
 
-#: ../clutter/deprecated/clutter-behaviour-depth.c:182
+#: ../clutter/deprecated/clutter-behaviour-depth.c:180
 msgid "Start Depth"
 msgstr "Početna dubina"
 
-#: ../clutter/deprecated/clutter-behaviour-depth.c:183
+#: ../clutter/deprecated/clutter-behaviour-depth.c:181
 msgid "Initial depth to apply"
 msgstr "Početna dubina koja će biti primenjena"
 
-#: ../clutter/deprecated/clutter-behaviour-depth.c:198
+#: ../clutter/deprecated/clutter-behaviour-depth.c:196
 msgid "End Depth"
 msgstr "Krajnja dubina"
 
-#: ../clutter/deprecated/clutter-behaviour-depth.c:199
+#: ../clutter/deprecated/clutter-behaviour-depth.c:197
 msgid "Final depth to apply"
 msgstr "Krajnja dubina koja će biti primenjena"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:401
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:394
 msgid "Start Angle"
 msgstr "Početni ugao"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:402
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:284
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:395
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:277
 msgid "Initial angle"
 msgstr "Početni ugao"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:417
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:410
 msgid "End Angle"
 msgstr "Krajnji ugao"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:418
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:302
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:411
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:295
 msgid "Final angle"
 msgstr "Krajnji ugao"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:433
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:426
 msgid "Angle x tilt"
 msgstr "Ugao x nagiba"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:434
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:427
 msgid "Tilt of the ellipse around x axis"
 msgstr "Nagib elipse oko h ose"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:449
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:442
 msgid "Angle y tilt"
 msgstr "Ugao y nagiba"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:450
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:443
 msgid "Tilt of the ellipse around y axis"
 msgstr "Nagib elipse oko y ose"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:465
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:458
 msgid "Angle z tilt"
 msgstr "Ugao z nagiba"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:466
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:459
 msgid "Tilt of the ellipse around z axis"
 msgstr "Nagib elipse oko z ose"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:482
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:475
 msgid "Width of the ellipse"
 msgstr "Širina elipse"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:498
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:491
 msgid "Height of ellipse"
 msgstr "Visina elipse"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:513
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:506
 msgid "Center"
 msgstr "Središte"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:514
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:507
 msgid "Center of ellipse"
 msgstr "Središte elipse"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:529
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:338
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:522
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:331
 msgid "Direction of rotation"
 msgstr "Pravac okretanja"
 
-#: ../clutter/deprecated/clutter-behaviour-opacity.c:184
+#: ../clutter/deprecated/clutter-behaviour-opacity.c:177
 msgid "Opacity Start"
 msgstr "Početak providnosti"
 
-#: ../clutter/deprecated/clutter-behaviour-opacity.c:185
+#: ../clutter/deprecated/clutter-behaviour-opacity.c:178
 msgid "Initial opacity level"
 msgstr "Nivo početne providnosti"
 
-#: ../clutter/deprecated/clutter-behaviour-opacity.c:202
+#: ../clutter/deprecated/clutter-behaviour-opacity.c:195
 msgid "Opacity End"
 msgstr "Kraj providnosti"
 
-#: ../clutter/deprecated/clutter-behaviour-opacity.c:203
+#: ../clutter/deprecated/clutter-behaviour-opacity.c:196
 msgid "Final opacity level"
 msgstr "Nivo krajnje providnosti"
 
-#: ../clutter/deprecated/clutter-behaviour-path.c:226
+#: ../clutter/deprecated/clutter-behaviour-path.c:222
 msgid "The ClutterPath object representing the path to animate along"
 msgstr ""
 "Objekat putanje Galamdžije koji predstavlja putanju koja će biti zajedno "
 "animirana"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:283
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:276
 msgid "Angle Begin"
 msgstr "Početak ugla"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:301
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:294
 msgid "Angle End"
 msgstr "Kraj ugla"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:319
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:312
 msgid "Axis"
 msgstr "Osa"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:320
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:313
 msgid "Axis of rotation"
 msgstr "Osa okretanja"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:355
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:348
 msgid "Center X"
 msgstr "X središte"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:356
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:349
 msgid "X coordinate of the center of rotation"
 msgstr "H koordinata središta okretanja"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:373
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:366
 msgid "Center Y"
 msgstr "Y središte"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:374
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:367
 msgid "Y coordinate of the center of rotation"
 msgstr "Y koordinata središta okretanja"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:391
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:384
 msgid "Center Z"
 msgstr "Z središte"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:392
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:385
 msgid "Z coordinate of the center of rotation"
 msgstr "Z koordinata središta okretanja"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:226
+#: ../clutter/deprecated/clutter-behaviour-scale.c:222
 msgid "X Start Scale"
 msgstr "Početna H razmera"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:227
+#: ../clutter/deprecated/clutter-behaviour-scale.c:223
 msgid "Initial scale on the X axis"
 msgstr "Početna razmera na H osi"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:245
+#: ../clutter/deprecated/clutter-behaviour-scale.c:241
 msgid "X End Scale"
 msgstr "Krajnja H razmera"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:246
+#: ../clutter/deprecated/clutter-behaviour-scale.c:242
 msgid "Final scale on the X axis"
 msgstr "Krajnja razmera na H osi"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:264
+#: ../clutter/deprecated/clutter-behaviour-scale.c:260
 msgid "Y Start Scale"
 msgstr "Početna Y razmera"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:265
+#: ../clutter/deprecated/clutter-behaviour-scale.c:261
 msgid "Initial scale on the Y axis"
 msgstr "Početna razmera na Y osi"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:283
+#: ../clutter/deprecated/clutter-behaviour-scale.c:279
 msgid "Y End Scale"
 msgstr "Krajnja Y razmera"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:284
+#: ../clutter/deprecated/clutter-behaviour-scale.c:280
 msgid "Final scale on the Y axis"
 msgstr "Krajnja razmera na Y osi"
 
-#: ../clutter/deprecated/clutter-box.c:261
+#: ../clutter/deprecated/clutter-box.c:257
 msgid "The background color of the box"
 msgstr "Boja pozadine okvira"
 
-#: ../clutter/deprecated/clutter-box.c:274
+#: ../clutter/deprecated/clutter-box.c:270
 msgid "Color Set"
 msgstr "Podešavanje boje"
 
-#: ../clutter/deprecated/clutter-cairo-texture.c:597
+#: ../clutter/deprecated/clutter-cairo-texture.c:593
 msgid "Surface Width"
 msgstr "Širina površine"
 
-#: ../clutter/deprecated/clutter-cairo-texture.c:598
+#: ../clutter/deprecated/clutter-cairo-texture.c:594
 msgid "The width of the Cairo surface"
 msgstr "Širina Kairo površine"
 
-#: ../clutter/deprecated/clutter-cairo-texture.c:615
+#: ../clutter/deprecated/clutter-cairo-texture.c:611
 msgid "Surface Height"
 msgstr "Visina površine"
 
-#: ../clutter/deprecated/clutter-cairo-texture.c:616
+#: ../clutter/deprecated/clutter-cairo-texture.c:612
 msgid "The height of the Cairo surface"
 msgstr "Visina Kairo površine"
 
-#: ../clutter/deprecated/clutter-cairo-texture.c:636
+#: ../clutter/deprecated/clutter-cairo-texture.c:632
 msgid "Auto Resize"
 msgstr "Samostalna promena veličine"
 
-#: ../clutter/deprecated/clutter-cairo-texture.c:637
+#: ../clutter/deprecated/clutter-cairo-texture.c:633
 msgid "Whether the surface should match the allocation"
 msgstr "Da li površina treba da odgovara raspoređivanju"
 
@@ -2379,100 +2403,156 @@ msgstr "Nivo popunjavanja priručne memorije"
 msgid "The duration of the stream, in seconds"
 msgstr "Trajanje toka, u sekundama"
 
-#: ../clutter/deprecated/clutter-rectangle.c:274
+#: ../clutter/deprecated/clutter-rectangle.c:271
 msgid "The color of the rectangle"
 msgstr "Boja pravougaonika"
 
-#: ../clutter/deprecated/clutter-rectangle.c:287
+#: ../clutter/deprecated/clutter-rectangle.c:284
 msgid "Border Color"
 msgstr "Boja ivice"
 
-#: ../clutter/deprecated/clutter-rectangle.c:288
+#: ../clutter/deprecated/clutter-rectangle.c:285
 msgid "The color of the border of the rectangle"
 msgstr "Boja ivice pravougaonika"
 
-#: ../clutter/deprecated/clutter-rectangle.c:303
+#: ../clutter/deprecated/clutter-rectangle.c:300
 msgid "Border Width"
 msgstr "Širina ivice"
 
-#: ../clutter/deprecated/clutter-rectangle.c:304
+#: ../clutter/deprecated/clutter-rectangle.c:301
 msgid "The width of the border of the rectangle"
 msgstr "Širina ivice pravougaonika"
 
-#: ../clutter/deprecated/clutter-rectangle.c:318
+#: ../clutter/deprecated/clutter-rectangle.c:315
 msgid "Has Border"
 msgstr "Poseduje ivicu"
 
-#: ../clutter/deprecated/clutter-rectangle.c:319
+#: ../clutter/deprecated/clutter-rectangle.c:316
 msgid "Whether the rectangle should have a border"
 msgstr "Da li pravougaonik treba da ima ivice"
 
-#: ../clutter/deprecated/clutter-shader.c:261
+#: ../clutter/deprecated/clutter-shader.c:257
 msgid "Vertex Source"
 msgstr "Izvor vrhunca"
 
-#: ../clutter/deprecated/clutter-shader.c:262
+#: ../clutter/deprecated/clutter-shader.c:258
 msgid "Source of vertex shader"
 msgstr "Izvor nijansera vrhunca"
 
-#: ../clutter/deprecated/clutter-shader.c:278
+#: ../clutter/deprecated/clutter-shader.c:274
 msgid "Fragment Source"
 msgstr "Izvor odlomka"
 
-#: ../clutter/deprecated/clutter-shader.c:279
+#: ../clutter/deprecated/clutter-shader.c:275
 msgid "Source of fragment shader"
 msgstr "Izvor nijansera odlomka"
 
-#: ../clutter/deprecated/clutter-shader.c:296
+#: ../clutter/deprecated/clutter-shader.c:292
 msgid "Compiled"
 msgstr "Sastavljen"
 
-#: ../clutter/deprecated/clutter-shader.c:297
+#: ../clutter/deprecated/clutter-shader.c:293
 msgid "Whether the shader is compiled and linked"
 msgstr "Da li je nijanser sastavljen i povezan"
 
-#: ../clutter/deprecated/clutter-shader.c:314
+#: ../clutter/deprecated/clutter-shader.c:310
 msgid "Whether the shader is enabled"
 msgstr "Da li je nijanser uključen"
 
-#: ../clutter/deprecated/clutter-shader.c:525
+#: ../clutter/deprecated/clutter-shader.c:521
 #, c-format
 msgid "%s compilation failed: %s"
 msgstr "Sastavljanje %s nije uspelo: %s"
 
-#: ../clutter/deprecated/clutter-shader.c:526
+#: ../clutter/deprecated/clutter-shader.c:522
 msgid "Vertex shader"
 msgstr "Nijanser vrhunca"
 
-#: ../clutter/deprecated/clutter-shader.c:527
+#: ../clutter/deprecated/clutter-shader.c:523
 msgid "Fragment shader"
 msgstr "Nijanser odlomka"
 
-#: ../clutter/deprecated/clutter-state.c:1505
+#: ../clutter/deprecated/clutter-state.c:1499
 msgid "State"
 msgstr "Stanje"
 
-#: ../clutter/deprecated/clutter-state.c:1506
+#: ../clutter/deprecated/clutter-state.c:1500
 msgid "Currently set state, (transition to this state might not be complete)"
 msgstr "Trenutno izabrano stanje, (prelaz na ovo stanje ne može biti potpun)"
 
-#: ../clutter/deprecated/clutter-state.c:1524
+#: ../clutter/deprecated/clutter-state.c:1518
 msgid "Default transition duration"
 msgstr "Osnovno trajanje prelaza"
 
-#: ../clutter/deprecated/clutter-texture.c:994
+#: ../clutter/deprecated/clutter-table-layout.c:543
+msgid "Column Number"
+msgstr "Broj kolone"
+
+#: ../clutter/deprecated/clutter-table-layout.c:544
+msgid "The column the widget resides in"
+msgstr "Kolona u kojoj se nalazi element"
+
+#: ../clutter/deprecated/clutter-table-layout.c:551
+msgid "Row Number"
+msgstr "Broj reda"
+
+#: ../clutter/deprecated/clutter-table-layout.c:552
+msgid "The row the widget resides in"
+msgstr "Red u kome se nalazi element"
+
+#: ../clutter/deprecated/clutter-table-layout.c:559
+msgid "Column Span"
+msgstr "Raspon kolone"
+
+#: ../clutter/deprecated/clutter-table-layout.c:560
+msgid "The number of columns the widget should span"
+msgstr "Broj kolona koje element treba da obuhvati"
+
+#: ../clutter/deprecated/clutter-table-layout.c:567
+msgid "Row Span"
+msgstr "Raspon reda"
+
+#: ../clutter/deprecated/clutter-table-layout.c:568
+msgid "The number of rows the widget should span"
+msgstr "Broj redova koje element treba da obuhvati"
+
+#: ../clutter/deprecated/clutter-table-layout.c:575
+msgid "Horizontal Expand"
+msgstr "Vodoravno širenje"
+
+#: ../clutter/deprecated/clutter-table-layout.c:576
+msgid "Allocate extra space for the child in horizontal axis"
+msgstr "Dodeljuje dodatni prostor za porod na vodoravnoj osi"
+
+#: ../clutter/deprecated/clutter-table-layout.c:582
+msgid "Vertical Expand"
+msgstr "Uspravno širenje"
+
+#: ../clutter/deprecated/clutter-table-layout.c:583
+msgid "Allocate extra space for the child in vertical axis"
+msgstr "Dodeljuje dodatni prostor za porod na uspravnoj osi"
+
+#: ../clutter/deprecated/clutter-table-layout.c:1638
+msgid "Spacing between columns"
+msgstr "Razmak između kolona"
+
+#: ../clutter/deprecated/clutter-table-layout.c:1654
+msgid "Spacing between rows"
+msgstr "Razmak između redova"
+
+#: ../clutter/deprecated/clutter-texture.c:992
 msgid "Sync size of actor"
 msgstr "Veličina usklađenja činioca"
 
-#: ../clutter/deprecated/clutter-texture.c:995
+#: ../clutter/deprecated/clutter-texture.c:993
 msgid "Auto sync size of actor to underlying pixbuf dimensions"
 msgstr "Veličina samousklađenja činioca za podvlačenje dimenzija sličice"
 
-#: ../clutter/deprecated/clutter-texture.c:1002
+#: ../clutter/deprecated/clutter-texture.c:1000
 msgid "Disable Slicing"
 msgstr "Onemogući odsecanje"
 
-#: ../clutter/deprecated/clutter-texture.c:1003
+#: ../clutter/deprecated/clutter-texture.c:1001
 msgid ""
 "Forces the underlying texture to be singular and not made of smaller space "
 "saving individual textures"
@@ -2480,95 +2560,95 @@ msgstr ""
 "Primorava osnovnu teksturu da bude jedna, a ne sastavljena od manjih prostora "
 "čuvajući pojedinačne teksture"
 
-#: ../clutter/deprecated/clutter-texture.c:1012
+#: ../clutter/deprecated/clutter-texture.c:1010
 msgid "Tile Waste"
 msgstr "Gubitak pločice"
 
-#: ../clutter/deprecated/clutter-texture.c:1013
+#: ../clutter/deprecated/clutter-texture.c:1011
 msgid "Maximum waste area of a sliced texture"
 msgstr "Najveća izgubljena oblast iseckane teksture"
 
-#: ../clutter/deprecated/clutter-texture.c:1021
+#: ../clutter/deprecated/clutter-texture.c:1019
 msgid "Horizontal repeat"
 msgstr "Vodoravno ponavljanje"
 
-#: ../clutter/deprecated/clutter-texture.c:1022
+#: ../clutter/deprecated/clutter-texture.c:1020
 msgid "Repeat the contents rather than scaling them horizontally"
 msgstr "Ponavlja sadržaje radije nego da im menja razmeru vodoravno"
 
-#: ../clutter/deprecated/clutter-texture.c:1029
+#: ../clutter/deprecated/clutter-texture.c:1027
 msgid "Vertical repeat"
 msgstr "Uspravno ponavljanje"
 
-#: ../clutter/deprecated/clutter-texture.c:1030
+#: ../clutter/deprecated/clutter-texture.c:1028
 msgid "Repeat the contents rather than scaling them vertically"
 msgstr "Ponavlja sadržaje radije nego da im menja razmeru uspravno"
 
-#: ../clutter/deprecated/clutter-texture.c:1037
+#: ../clutter/deprecated/clutter-texture.c:1035
 msgid "Filter Quality"
 msgstr "Kvalitet filtera"
 
-#: ../clutter/deprecated/clutter-texture.c:1038
+#: ../clutter/deprecated/clutter-texture.c:1036
 msgid "Rendering quality used when drawing the texture"
 msgstr "Kvalitet prikaza korišćen prilikom iscrtavanja teksture"
 
-#: ../clutter/deprecated/clutter-texture.c:1046
+#: ../clutter/deprecated/clutter-texture.c:1044
 msgid "Pixel Format"
 msgstr "Format tačkice"
 
-#: ../clutter/deprecated/clutter-texture.c:1047
+#: ../clutter/deprecated/clutter-texture.c:1045
 msgid "The Cogl pixel format to use"
 msgstr "Kogl format tačkice za korišćenje"
 
-#: ../clutter/deprecated/clutter-texture.c:1055
-#: ../clutter/wayland/clutter-wayland-surface.c:449
+#: ../clutter/deprecated/clutter-texture.c:1053
+#: ../clutter/wayland/clutter-wayland-surface.c:445
 msgid "Cogl Texture"
 msgstr "Kogl tekstura"
 
-#: ../clutter/deprecated/clutter-texture.c:1056
-#: ../clutter/wayland/clutter-wayland-surface.c:450
+#: ../clutter/deprecated/clutter-texture.c:1054
+#: ../clutter/wayland/clutter-wayland-surface.c:446
 msgid "The underlying Cogl texture handle used to draw this actor"
 msgstr "Ručica osnovne Kogl tekstura korišćene za crtanje ovog činioca"
 
-#: ../clutter/deprecated/clutter-texture.c:1063
+#: ../clutter/deprecated/clutter-texture.c:1061
 msgid "Cogl Material"
 msgstr "Kogl materijal"
 
-#: ../clutter/deprecated/clutter-texture.c:1064
+#: ../clutter/deprecated/clutter-texture.c:1062
 msgid "The underlying Cogl material handle used to draw this actor"
 msgstr "Ručica osnovnog Kogl materijala korišćena za crtanje ovog činioca"
 
-#: ../clutter/deprecated/clutter-texture.c:1083
+#: ../clutter/deprecated/clutter-texture.c:1081
 msgid "The path of the file containing the image data"
 msgstr "Putanja datoteke koja sadrži podatke o slici"
 
-#: ../clutter/deprecated/clutter-texture.c:1090
+#: ../clutter/deprecated/clutter-texture.c:1088
 msgid "Keep Aspect Ratio"
 msgstr "Zadrži odnos razmere"
 
-#: ../clutter/deprecated/clutter-texture.c:1091
+#: ../clutter/deprecated/clutter-texture.c:1089
 msgid ""
 "Keep the aspect ratio of the texture when requesting the preferred width or "
 "height"
 msgstr ""
 "Zadržava odnos širine i visine teksture kada zahteva željenu širinu i visinu"
 
-#: ../clutter/deprecated/clutter-texture.c:1119
+#: ../clutter/deprecated/clutter-texture.c:1117
 msgid "Load asynchronously"
 msgstr "Učitaj neusklađeno"
 
-#: ../clutter/deprecated/clutter-texture.c:1120
+#: ../clutter/deprecated/clutter-texture.c:1118
 msgid ""
 "Load files inside a thread to avoid blocking when loading images from disk"
 msgstr ""
 "Učitava datoteke unutar niti da bi se izbeglo blokiranje prilikom učitavanja "
 "slika sa diska"
 
-#: ../clutter/deprecated/clutter-texture.c:1138
+#: ../clutter/deprecated/clutter-texture.c:1136
 msgid "Load data asynchronously"
 msgstr "Učitaj podatke neusklađeno"
 
-#: ../clutter/deprecated/clutter-texture.c:1139
+#: ../clutter/deprecated/clutter-texture.c:1137
 msgid ""
 "Decode image data files inside a thread to reduce blocking when loading "
 "images from disk"
@@ -2576,194 +2656,193 @@ msgstr ""
 "Dešifruje datoteke podataka slika unutar niti da bi se smanjilo blokiranje "
 "prilikom učitavanja slika sa diska"
 
-#: ../clutter/deprecated/clutter-texture.c:1165
+#: ../clutter/deprecated/clutter-texture.c:1163
 msgid "Pick With Alpha"
 msgstr "Izaberi sa providnošću"
 
-#: ../clutter/deprecated/clutter-texture.c:1166
+#: ../clutter/deprecated/clutter-texture.c:1164
 msgid "Shape actor with alpha channel when picking"
 msgstr "Oblik činioca sa kanalom providnosti prilikom izbora"
 
-#: ../clutter/deprecated/clutter-texture.c:1599
-#: ../clutter/deprecated/clutter-texture.c:1994
-#: ../clutter/deprecated/clutter-texture.c:2090
-#: ../clutter/deprecated/clutter-texture.c:2388
+#: ../clutter/deprecated/clutter-texture.c:1597
+#: ../clutter/deprecated/clutter-texture.c:1992
+#: ../clutter/deprecated/clutter-texture.c:2088
+#: ../clutter/deprecated/clutter-texture.c:2386
 #, c-format
 msgid "Failed to load the image data"
 msgstr "Nisam uspeo da učitam podatke slike"
 
-#: ../clutter/deprecated/clutter-texture.c:1758
+#: ../clutter/deprecated/clutter-texture.c:1756
 #, c-format
 msgid "YUV textures are not supported"
 msgstr "JUV teksture nisu podržane"
 
-#: ../clutter/deprecated/clutter-texture.c:1767
+#: ../clutter/deprecated/clutter-texture.c:1765
 #, c-format
 msgid "YUV2 textues are not supported"
 msgstr "JUV2 teksture nisu podržane"
 
-#: ../clutter/evdev/clutter-input-device-evdev.c:159
+#: ../clutter/evdev/clutter-input-device-evdev.c:154
 msgid "sysfs Path"
 msgstr "Putanja sistema datoteka sistema"
 
-#: ../clutter/evdev/clutter-input-device-evdev.c:160
+#: ../clutter/evdev/clutter-input-device-evdev.c:155
 msgid "Path of the device in sysfs"
 msgstr "Put uređaja u sistemu datoteka sistema"
 
-#: ../clutter/evdev/clutter-input-device-evdev.c:175
+#: ../clutter/evdev/clutter-input-device-evdev.c:170
 msgid "Device Path"
 msgstr "Putanja uređaja"
 
-#: ../clutter/evdev/clutter-input-device-evdev.c:176
+#: ../clutter/evdev/clutter-input-device-evdev.c:171
 msgid "Path of the device node"
 msgstr "Put čvora uređaja"
 
-#: ../clutter/gdk/clutter-backend-gdk.c:296
+#: ../clutter/gdk/clutter-backend-gdk.c:289
 #, c-format
 msgid "Could not find a suitable CoglWinsys for a GdkDisplay of type %s"
 msgstr ""
 "Ne mogu da pronađem odgovarajući Kogl Vindouz sistema za Gdk prikaz vrste %s"
 
-#: ../clutter/wayland/clutter-wayland-surface.c:423
+#: ../clutter/wayland/clutter-wayland-surface.c:419
 msgid "Surface"
 msgstr "Površina"
 
-#: ../clutter/wayland/clutter-wayland-surface.c:424
+#: ../clutter/wayland/clutter-wayland-surface.c:420
 msgid "The underlying wayland surface"
 msgstr "Osnovna površina vejlanda"
 
-#: ../clutter/wayland/clutter-wayland-surface.c:431
+#: ../clutter/wayland/clutter-wayland-surface.c:427
 msgid "Surface width"
 msgstr "Širina površine"
 
-#: ../clutter/wayland/clutter-wayland-surface.c:432
+#: ../clutter/wayland/clutter-wayland-surface.c:428
 msgid "The width of the underlying wayland surface"
 msgstr "Širina osnovne površine vejlanda"
 
-#: ../clutter/wayland/clutter-wayland-surface.c:440
+#: ../clutter/wayland/clutter-wayland-surface.c:436
 msgid "Surface height"
 msgstr "Visina površine"
 
-#: ../clutter/wayland/clutter-wayland-surface.c:441
+#: ../clutter/wayland/clutter-wayland-surface.c:437
 msgid "The height of the underlying wayland surface"
 msgstr "Visina osnovne površine vejlanda"
 
-#: ../clutter/x11/clutter-backend-x11.c:516
+#: ../clutter/x11/clutter-backend-x11.c:488
 msgid "X display to use"
 msgstr "Iks prikaz za korišćenje"
 
-#: ../clutter/x11/clutter-backend-x11.c:522
+#: ../clutter/x11/clutter-backend-x11.c:494
 msgid "X screen to use"
 msgstr "Iks ekran za korišćenje"
 
-#: ../clutter/x11/clutter-backend-x11.c:527
+#: ../clutter/x11/clutter-backend-x11.c:499
 msgid "Make X calls synchronous"
 msgstr "Čini Iks pozive usklađenim"
 
-#: ../clutter/x11/clutter-backend-x11.c:534
-#| msgid "Enable XInput support"
+#: ../clutter/x11/clutter-backend-x11.c:506
 msgid "Disable XInput support"
 msgstr "Isključuje podršku H-unosa"
 
-#: ../clutter/x11/clutter-keymap-x11.c:317
+#: ../clutter/x11/clutter-keymap-x11.c:322
 msgid "The Clutter backend"
 msgstr "Pozadinac Galamdžije"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:539
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:534
 msgid "Pixmap"
 msgstr "Mapa tačaka"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:540
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:535
 msgid "The X11 Pixmap to be bound"
 msgstr "H11 piksmapa za povezivanje"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:548
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:543
 msgid "Pixmap width"
 msgstr "Širina piksmape"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:549
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:544
 msgid "The width of the pixmap bound to this texture"
 msgstr "Širina veze piksmape za ovu teksturu"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:557
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:552
 msgid "Pixmap height"
 msgstr "Visina piksmape"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:558
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:553
 msgid "The height of the pixmap bound to this texture"
 msgstr "Visina veze piksmape za ovu teksturu"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:566
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:561
 msgid "Pixmap Depth"
 msgstr "Dubina piksmape"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:567
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:562
 msgid "The depth (in number of bits) of the pixmap bound to this texture"
 msgstr "Dubina (u broju bita) veze piksmape za ovu teksturu"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:575
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:570
 msgid "Automatic Updates"
 msgstr "Automatska ažuriranja"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:576
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:571
 msgid "If the texture should be kept in sync with any pixmap changes."
 msgstr ""
 "Ako tekstura treba biti držana u usklađenosti sa svim piksmap promenama."
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:584
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:579
 msgid "Window"
 msgstr "Prozor"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:585
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:580
 msgid "The X11 Window to be bound"
 msgstr "H11 prozor za povezivanje"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:593
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:588
 msgid "Window Redirect Automatic"
 msgstr "Samostalno preusmerenje prozora"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:594
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:589
 msgid "If composite window redirects are set to Automatic (or Manual if false)"
 msgstr ""
 "Ako su preusmerenja kompozitnog prozora postavljena na Samostalno (ili Ručno "
 "ako nisu)"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:604
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:599
 msgid "Window Mapped"
 msgstr "Prozor je mapiran"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:605
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:600
 msgid "If window is mapped"
 msgstr "Ako je prozor mapiran"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:614
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:609
 msgid "Destroyed"
 msgstr "Uništen"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:615
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:610
 msgid "If window has been destroyed"
 msgstr "Ako je prozor bio uništen"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:623
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:618
 msgid "Window X"
 msgstr "X prozora"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:624
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:619
 msgid "X position of window on screen according to X11"
 msgstr "X položaj prozora na ekranu u skladu sa H11"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:632
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:627
 msgid "Window Y"
 msgstr "Y prozora"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:633
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:628
 msgid "Y position of window on screen according to X11"
 msgstr "Y položaj prozora na ekranu u skladu sa H11"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:640
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:635
 msgid "Window Override Redirect"
 msgstr "Preusmerenje nadjačanog prozora"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:641
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:636
 msgid "If this is an override-redirect window"
 msgstr "Ako je ovo nadjačani-preusmereni prozor"
diff --git a/po/uk.po b/po/uk.po
index c9bc7da06..808048f8c 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -2,708 +2,717 @@
 # This file is distributed under the same license as the PACKAGE package.
 # Yuri Chornoivan <yurchor@ukr.net>, 2011, 2012.
 # Korostil Daniel <ted.korostiled@gmail.com>, 2011, 2012.
+# Daniel Korostil <ted.korostiled@gmail.com>, 2014.
 msgid ""
 msgstr ""
 "Project-Id-Version: clutter\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
-"product=clutter&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2012-07-26 13:09+0000\n"
-"PO-Revision-Date: 2012-08-07 18:40+0300\n"
-"Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
-"Language-Team: Ukrainian <kde-i18n-uk@kde.org>\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=clutte"
+"r&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2014-02-13 04:08+0000\n"
+"PO-Revision-Date: 2014-02-14 10:23+0300\n"
+"Last-Translator: Daniel Korostil <ted.korostiled@gmail.com>\n"
+"Language-Team: linux.org.ua\n"
 "Language: uk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-"X-Generator: Lokalize 1.5\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Virtaal 0.7.1\n"
+"X-Project-Style: gnome\n"
 
-#: ../clutter/clutter-actor.c:6059
+#: ../clutter/clutter-actor.c:6214
 msgid "X coordinate"
 msgstr "Координата за X"
 
-#: ../clutter/clutter-actor.c:6060
+#: ../clutter/clutter-actor.c:6215
 msgid "X coordinate of the actor"
 msgstr "Координата актора за X"
 
-#: ../clutter/clutter-actor.c:6078
+#: ../clutter/clutter-actor.c:6233
 msgid "Y coordinate"
 msgstr "Координата за Y"
 
-#: ../clutter/clutter-actor.c:6079
+#: ../clutter/clutter-actor.c:6234
 msgid "Y coordinate of the actor"
 msgstr "Координата актора за Y"
 
-#: ../clutter/clutter-actor.c:6101
-#| msgid "Cursor Position"
+#: ../clutter/clutter-actor.c:6256
 msgid "Position"
 msgstr "Розташування"
 
-#: ../clutter/clutter-actor.c:6102
-#| msgid "The cursor position of the other end of the selection"
+#: ../clutter/clutter-actor.c:6257
 msgid "The position of the origin of the actor"
 msgstr "Розташування початку координат актора"
 
-#: ../clutter/clutter-actor.c:6119 ../clutter/clutter-canvas.c:215
-#: ../clutter/clutter-grid-layout.c:1238
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:481
+#: ../clutter/clutter-actor.c:6274 ../clutter/clutter-canvas.c:247
+#: ../clutter/clutter-grid-layout.c:1239
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:474
 msgid "Width"
 msgstr "Ширина"
 
-#: ../clutter/clutter-actor.c:6120
+#: ../clutter/clutter-actor.c:6275
 msgid "Width of the actor"
 msgstr "Ширина актора"
 
-#: ../clutter/clutter-actor.c:6138 ../clutter/clutter-canvas.c:231
-#: ../clutter/clutter-grid-layout.c:1245
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:497
+#: ../clutter/clutter-actor.c:6293 ../clutter/clutter-canvas.c:263
+#: ../clutter/clutter-grid-layout.c:1246
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:490
 msgid "Height"
 msgstr "Висота"
 
-#: ../clutter/clutter-actor.c:6139
+#: ../clutter/clutter-actor.c:6294
 msgid "Height of the actor"
 msgstr "Висота актора"
 
-#: ../clutter/clutter-actor.c:6160
+#: ../clutter/clutter-actor.c:6315
 msgid "Size"
 msgstr "Розмір"
 
-#: ../clutter/clutter-actor.c:6161
-#| msgid "Height of the actor"
+#: ../clutter/clutter-actor.c:6316
 msgid "The size of the actor"
 msgstr "Розмір актора"
 
-#: ../clutter/clutter-actor.c:6179
+#: ../clutter/clutter-actor.c:6334
 msgid "Fixed X"
 msgstr "Фіксована координата X"
 
-#: ../clutter/clutter-actor.c:6180
+#: ../clutter/clutter-actor.c:6335
 msgid "Forced X position of the actor"
 msgstr "Зафіксувати координату X актора"
 
-#: ../clutter/clutter-actor.c:6197
+#: ../clutter/clutter-actor.c:6352
 msgid "Fixed Y"
 msgstr "Фіксована координата Y"
 
-#: ../clutter/clutter-actor.c:6198
+#: ../clutter/clutter-actor.c:6353
 msgid "Forced Y position of the actor"
 msgstr "Зафіксувати координату Y актора"
 
-#: ../clutter/clutter-actor.c:6213
+#: ../clutter/clutter-actor.c:6368
 msgid "Fixed position set"
 msgstr "Фіксоване розташування"
 
-#: ../clutter/clutter-actor.c:6214
+#: ../clutter/clutter-actor.c:6369
 msgid "Whether to use fixed positioning for the actor"
 msgstr "Визначає, чи слід фіксувати розташування актора"
 
-#: ../clutter/clutter-actor.c:6232
+#: ../clutter/clutter-actor.c:6387
 msgid "Min Width"
 msgstr "Мін. ширина"
 
-#: ../clutter/clutter-actor.c:6233
+#: ../clutter/clutter-actor.c:6388
 msgid "Forced minimum width request for the actor"
 msgstr "Використовувати мінімальне значення ширини актора"
 
-#: ../clutter/clutter-actor.c:6251
+#: ../clutter/clutter-actor.c:6406
 msgid "Min Height"
 msgstr "Мін. висота"
 
-#: ../clutter/clutter-actor.c:6252
+#: ../clutter/clutter-actor.c:6407
 msgid "Forced minimum height request for the actor"
 msgstr "Використовувати мінімальне значення висоти актора"
 
-#: ../clutter/clutter-actor.c:6270
+#: ../clutter/clutter-actor.c:6425
 msgid "Natural Width"
 msgstr "Природна ширина"
 
-#: ../clutter/clutter-actor.c:6271
+#: ../clutter/clutter-actor.c:6426
 msgid "Forced natural width request for the actor"
 msgstr "Використовувати природне значення ширини актора"
 
-#: ../clutter/clutter-actor.c:6289
+#: ../clutter/clutter-actor.c:6444
 msgid "Natural Height"
 msgstr "Природна висота"
 
-#: ../clutter/clutter-actor.c:6290
+#: ../clutter/clutter-actor.c:6445
 msgid "Forced natural height request for the actor"
 msgstr "Використовувати природне значення висоти актора"
 
-#: ../clutter/clutter-actor.c:6305
+#: ../clutter/clutter-actor.c:6460
 msgid "Minimum width set"
 msgstr "Встановлення мінімальної ширини"
 
-#: ../clutter/clutter-actor.c:6306
+#: ../clutter/clutter-actor.c:6461
 msgid "Whether to use the min-width property"
 msgstr "Визначає, чи слід використовувати властивість мінімальної ширини"
 
-#: ../clutter/clutter-actor.c:6320
+#: ../clutter/clutter-actor.c:6475
 msgid "Minimum height set"
 msgstr "Встановлення мінімальної висоти"
 
-#: ../clutter/clutter-actor.c:6321
+#: ../clutter/clutter-actor.c:6476
 msgid "Whether to use the min-height property"
 msgstr "Визначає, чи слід використовувати властивість мінімальної висоти"
 
-#: ../clutter/clutter-actor.c:6335
+#: ../clutter/clutter-actor.c:6490
 msgid "Natural width set"
 msgstr "Встановлення природної ширини"
 
-#: ../clutter/clutter-actor.c:6336
+#: ../clutter/clutter-actor.c:6491
 msgid "Whether to use the natural-width property"
 msgstr "Визначає, чи слід використовувати властивість природної ширини"
 
-#: ../clutter/clutter-actor.c:6350
+#: ../clutter/clutter-actor.c:6505
 msgid "Natural height set"
 msgstr "Встановлення природної висоти"
 
-#: ../clutter/clutter-actor.c:6351
+#: ../clutter/clutter-actor.c:6506
 msgid "Whether to use the natural-height property"
 msgstr "Визначає, чи слід використовувати властивість природної висоти"
 
-#: ../clutter/clutter-actor.c:6367
+#: ../clutter/clutter-actor.c:6522
 msgid "Allocation"
 msgstr "Розподіл"
 
-#: ../clutter/clutter-actor.c:6368
+#: ../clutter/clutter-actor.c:6523
 msgid "The actor's allocation"
 msgstr "Розподіл актора"
 
-#: ../clutter/clutter-actor.c:6425
+#: ../clutter/clutter-actor.c:6580
 msgid "Request Mode"
 msgstr "Режим запиту"
 
-#: ../clutter/clutter-actor.c:6426
+#: ../clutter/clutter-actor.c:6581
 msgid "The actor's request mode"
 msgstr "Режим запиту актора"
 
-#: ../clutter/clutter-actor.c:6450
+#: ../clutter/clutter-actor.c:6605
 msgid "Depth"
 msgstr "Глибина"
 
-#: ../clutter/clutter-actor.c:6451
+#: ../clutter/clutter-actor.c:6606
 msgid "Position on the Z axis"
 msgstr "Розташування за віссю Z"
 
-#: ../clutter/clutter-actor.c:6478
-#| msgid "Cursor Position"
+#: ../clutter/clutter-actor.c:6633
 msgid "Z Position"
 msgstr "Розташування за Z"
 
-#: ../clutter/clutter-actor.c:6479
-#| msgid "Position on the Z axis"
+#: ../clutter/clutter-actor.c:6634
 msgid "The actor's position on the Z axis"
 msgstr "Розташування актора за віссю Z"
 
-#: ../clutter/clutter-actor.c:6496
+#: ../clutter/clutter-actor.c:6651
 msgid "Opacity"
 msgstr "Непрозорість"
 
-#: ../clutter/clutter-actor.c:6497
+#: ../clutter/clutter-actor.c:6652
 msgid "Opacity of an actor"
 msgstr "Рівень непрозорості актора"
 
-#: ../clutter/clutter-actor.c:6517
+#: ../clutter/clutter-actor.c:6672
 msgid "Offscreen redirect"
 msgstr "Закадрове переспрямування"
 
-#: ../clutter/clutter-actor.c:6518
+#: ../clutter/clutter-actor.c:6673
 msgid "Flags controlling when to flatten the actor into a single image"
 msgstr "Прапорці, які керують збиранням актора у єдине зображення"
 
-#: ../clutter/clutter-actor.c:6532
+#: ../clutter/clutter-actor.c:6687
 msgid "Visible"
 msgstr "Видимий"
 
-#: ../clutter/clutter-actor.c:6533
+#: ../clutter/clutter-actor.c:6688
 msgid "Whether the actor is visible or not"
 msgstr "Визначає, чи буде актор видимим"
 
-#: ../clutter/clutter-actor.c:6547
+#: ../clutter/clutter-actor.c:6702
 msgid "Mapped"
 msgstr "Відображення"
 
-#: ../clutter/clutter-actor.c:6548
+#: ../clutter/clutter-actor.c:6703
 msgid "Whether the actor will be painted"
 msgstr "Визначає, чи буде намальовано актора"
 
-#: ../clutter/clutter-actor.c:6561
+#: ../clutter/clutter-actor.c:6716
 msgid "Realized"
 msgstr "Спостереження"
 
-#: ../clutter/clutter-actor.c:6562
+#: ../clutter/clutter-actor.c:6717
 msgid "Whether the actor has been realized"
 msgstr "Визначає, чи можна спостерігати за актором"
 
-#: ../clutter/clutter-actor.c:6577
+#: ../clutter/clutter-actor.c:6732
 msgid "Reactive"
 msgstr "Реагування"
 
-#: ../clutter/clutter-actor.c:6578
+#: ../clutter/clutter-actor.c:6733
 msgid "Whether the actor is reactive to events"
 msgstr "Чи реагує актор на події"
 
-#: ../clutter/clutter-actor.c:6589
+#: ../clutter/clutter-actor.c:6744
 msgid "Has Clip"
 msgstr "Обрізано"
 
-#: ../clutter/clutter-actor.c:6590
+#: ../clutter/clutter-actor.c:6745
 msgid "Whether the actor has a clip set"
 msgstr "Чи встановлено обрізання для актора"
 
-#: ../clutter/clutter-actor.c:6604
+#: ../clutter/clutter-actor.c:6758
 msgid "Clip"
 msgstr "Обрізання"
 
-#: ../clutter/clutter-actor.c:6605
+#: ../clutter/clutter-actor.c:6759
 msgid "The clip region for the actor"
 msgstr "Область обрізання для актора"
 
-#: ../clutter/clutter-actor.c:6618 ../clutter/clutter-actor-meta.c:207
-#: ../clutter/clutter-binding-pool.c:319 ../clutter/clutter-input-device.c:258
+#: ../clutter/clutter-actor.c:6778
+msgid "Clip Rectangle"
+msgstr "Обрізати прямокутник"
+
+#: ../clutter/clutter-actor.c:6779
+#| msgid "The clip region for the actor"
+msgid "The visible region of the actor"
+msgstr "Видима ділянка актора"
+
+#: ../clutter/clutter-actor.c:6793 ../clutter/clutter-actor-meta.c:205
+#: ../clutter/clutter-binding-pool.c:319 ../clutter/clutter-input-device.c:247
 msgid "Name"
 msgstr "Назва"
 
-#: ../clutter/clutter-actor.c:6619
+#: ../clutter/clutter-actor.c:6794
 msgid "Name of the actor"
 msgstr "Назва актора"
 
-#: ../clutter/clutter-actor.c:6640
+#: ../clutter/clutter-actor.c:6815
 msgid "Pivot Point"
 msgstr "Точка закріплення"
 
-#: ../clutter/clutter-actor.c:6641
+#: ../clutter/clutter-actor.c:6816
 msgid "The point around which the scaling and rotation occur"
 msgstr "Точка, навколо якої відбувається масштабування та обертання"
 
-#: ../clutter/clutter-actor.c:6659
+#: ../clutter/clutter-actor.c:6834
 msgid "Pivot Point Z"
 msgstr "Z точки закріплення"
 
-#: ../clutter/clutter-actor.c:6660
-#| msgid "X coordinate of the anchor point"
+#: ../clutter/clutter-actor.c:6835
 msgid "Z component of the pivot point"
 msgstr "Координата за Z точки закріплення"
 
-#: ../clutter/clutter-actor.c:6678
+#: ../clutter/clutter-actor.c:6853
 msgid "Scale X"
 msgstr "Масштаб за X"
 
-#: ../clutter/clutter-actor.c:6679
+#: ../clutter/clutter-actor.c:6854
 msgid "Scale factor on the X axis"
 msgstr "Масштаб за віссю X"
 
-#: ../clutter/clutter-actor.c:6697
+#: ../clutter/clutter-actor.c:6872
 msgid "Scale Y"
 msgstr "Масштаб за Y"
 
-#: ../clutter/clutter-actor.c:6698
+#: ../clutter/clutter-actor.c:6873
 msgid "Scale factor on the Y axis"
 msgstr "Масштаб за віссю Y"
 
-#: ../clutter/clutter-actor.c:6716
-#| msgid "Scale X"
+#: ../clutter/clutter-actor.c:6891
 msgid "Scale Z"
 msgstr "Масштаб за Z"
 
-#: ../clutter/clutter-actor.c:6717
-#| msgid "Scale factor on the X axis"
+#: ../clutter/clutter-actor.c:6892
 msgid "Scale factor on the Z axis"
 msgstr "Коефіцієнт масштабування за віссю Z"
 
-#: ../clutter/clutter-actor.c:6735
+#: ../clutter/clutter-actor.c:6910
 msgid "Scale Center X"
 msgstr "Центр зміни масштабу за X"
 
-#: ../clutter/clutter-actor.c:6736
+#: ../clutter/clutter-actor.c:6911
 msgid "Horizontal scale center"
 msgstr "Центр зміни масштабу за горизонталлю"
 
-#: ../clutter/clutter-actor.c:6754
+#: ../clutter/clutter-actor.c:6929
 msgid "Scale Center Y"
 msgstr "Центр зміни масштабу за Y"
 
-#: ../clutter/clutter-actor.c:6755
+#: ../clutter/clutter-actor.c:6930
 msgid "Vertical scale center"
 msgstr "Центр зміни масштабу за вертикаллю"
 
-#: ../clutter/clutter-actor.c:6773
+#: ../clutter/clutter-actor.c:6948
 msgid "Scale Gravity"
 msgstr "Центр ваги масштабування"
 
-#: ../clutter/clutter-actor.c:6774
+#: ../clutter/clutter-actor.c:6949
 msgid "The center of scaling"
 msgstr "Центр зміни масштабу"
 
-#: ../clutter/clutter-actor.c:6792
+#: ../clutter/clutter-actor.c:6967
 msgid "Rotation Angle X"
 msgstr "Кут обертання за X"
 
-#: ../clutter/clutter-actor.c:6793
+#: ../clutter/clutter-actor.c:6968
 msgid "The rotation angle on the X axis"
 msgstr "Кут обертання навколо вісі X"
 
-#: ../clutter/clutter-actor.c:6811
+#: ../clutter/clutter-actor.c:6986
 msgid "Rotation Angle Y"
 msgstr "Кут обертання за Y"
 
-#: ../clutter/clutter-actor.c:6812
+#: ../clutter/clutter-actor.c:6987
 msgid "The rotation angle on the Y axis"
 msgstr "Кут обертання навколо вісі Y"
 
-#: ../clutter/clutter-actor.c:6830
+#: ../clutter/clutter-actor.c:7005
 msgid "Rotation Angle Z"
 msgstr "Кут обертання за Z"
 
-#: ../clutter/clutter-actor.c:6831
+#: ../clutter/clutter-actor.c:7006
 msgid "The rotation angle on the Z axis"
 msgstr "Кут обертання навколо вісі Z"
 
-#: ../clutter/clutter-actor.c:6849
+#: ../clutter/clutter-actor.c:7024
 msgid "Rotation Center X"
 msgstr "Центр обертання за X"
 
-#: ../clutter/clutter-actor.c:6850
+#: ../clutter/clutter-actor.c:7025
 msgid "The rotation center on the X axis"
 msgstr "Координата центра обертання за віссю X"
 
-#: ../clutter/clutter-actor.c:6867
+#: ../clutter/clutter-actor.c:7042
 msgid "Rotation Center Y"
 msgstr "Центр обертання за Y"
 
-#: ../clutter/clutter-actor.c:6868
+#: ../clutter/clutter-actor.c:7043
 msgid "The rotation center on the Y axis"
 msgstr "Координата центра обертання за віссю Y"
 
-#: ../clutter/clutter-actor.c:6885
+#: ../clutter/clutter-actor.c:7060
 msgid "Rotation Center Z"
 msgstr "Центр обертання за Z"
 
-#: ../clutter/clutter-actor.c:6886
+#: ../clutter/clutter-actor.c:7061
 msgid "The rotation center on the Z axis"
 msgstr "Координата центра обертання за віссю Z"
 
-#: ../clutter/clutter-actor.c:6903
+#: ../clutter/clutter-actor.c:7078
 msgid "Rotation Center Z Gravity"
 msgstr "Центр ваги обертання за Z"
 
-#: ../clutter/clutter-actor.c:6904
+#: ../clutter/clutter-actor.c:7079
 msgid "Center point for rotation around the Z axis"
 msgstr "Центральна точка обертання навколо вісі Z"
 
-#: ../clutter/clutter-actor.c:6932
+#: ../clutter/clutter-actor.c:7107
 msgid "Anchor X"
 msgstr "X фіксатора"
 
-#: ../clutter/clutter-actor.c:6933
+#: ../clutter/clutter-actor.c:7108
 msgid "X coordinate of the anchor point"
 msgstr "Координата точки-фіксатора за віссю X"
 
-#: ../clutter/clutter-actor.c:6961
+#: ../clutter/clutter-actor.c:7136
 msgid "Anchor Y"
 msgstr "Y фіксатора"
 
-#: ../clutter/clutter-actor.c:6962
+#: ../clutter/clutter-actor.c:7137
 msgid "Y coordinate of the anchor point"
 msgstr "Координата точки-фіксатора за віссю Y"
 
-#: ../clutter/clutter-actor.c:6989
+#: ../clutter/clutter-actor.c:7164
 msgid "Anchor Gravity"
 msgstr "Тяжіння фіксатора"
 
-#: ../clutter/clutter-actor.c:6990
+#: ../clutter/clutter-actor.c:7165
 msgid "The anchor point as a ClutterGravity"
 msgstr "Значення ClutterGravity точки-фіксатора"
 
-#: ../clutter/clutter-actor.c:7009
-#| msgid "Translation Domain"
+#: ../clutter/clutter-actor.c:7184
 msgid "Translation X"
 msgstr "Перенесення за X"
 
-#: ../clutter/clutter-actor.c:7010
-#| msgid "The rotation angle on the X axis"
+#: ../clutter/clutter-actor.c:7185
 msgid "Translation along the X axis"
 msgstr "Перенесення вздовж вісі X"
 
-#: ../clutter/clutter-actor.c:7029
-#| msgid "Translation Domain"
+#: ../clutter/clutter-actor.c:7204
 msgid "Translation Y"
 msgstr "Перенесення за Y"
 
-#: ../clutter/clutter-actor.c:7030
-#| msgid "The rotation angle on the Y axis"
+#: ../clutter/clutter-actor.c:7205
 msgid "Translation along the Y axis"
 msgstr "Перенесення вздовж вісі Y"
 
-#: ../clutter/clutter-actor.c:7049
-#| msgid "Translation Domain"
+#: ../clutter/clutter-actor.c:7224
 msgid "Translation Z"
 msgstr "Перенесення за Z"
 
-#: ../clutter/clutter-actor.c:7050
-#| msgid "The rotation angle on the Z axis"
+#: ../clutter/clutter-actor.c:7225
 msgid "Translation along the Z axis"
 msgstr "Перенесення вздовж вісі Z"
 
-#: ../clutter/clutter-actor.c:7078
+#: ../clutter/clutter-actor.c:7255
 msgid "Transform"
 msgstr "Перетворення"
 
-#: ../clutter/clutter-actor.c:7079
-#| msgid "Translation Domain"
+#: ../clutter/clutter-actor.c:7256
 msgid "Transformation matrix"
 msgstr "Матриця перетворення"
 
-#: ../clutter/clutter-actor.c:7093
+#: ../clutter/clutter-actor.c:7271
 msgid "Transform Set"
 msgstr "Встановлено перетворення"
 
-#: ../clutter/clutter-actor.c:7094
-#| msgid "Whether the :filename property is set"
+#: ../clutter/clutter-actor.c:7272
 msgid "Whether the transform property is set"
 msgstr "Визначає, чи встановлено властивість перетворення"
 
-#: ../clutter/clutter-actor.c:7111
+#: ../clutter/clutter-actor.c:7293
+#| msgid "Transform"
+msgid "Child Transform"
+msgstr "Перетворення нащадка"
+
+#: ../clutter/clutter-actor.c:7294
+#| msgid "Transformation matrix"
+msgid "Children transformation matrix"
+msgstr "Матриця перетворення нащадка"
+
+#: ../clutter/clutter-actor.c:7309
+#| msgid "Transform Set"
+msgid "Child Transform Set"
+msgstr "Вказати перетворення нащадка"
+
+#: ../clutter/clutter-actor.c:7310
+#| msgid "Whether the transform property is set"
+msgid "Whether the child-transform property is set"
+msgstr "Визначає, чи властивість перетворення нащадка вказано"
+
+#: ../clutter/clutter-actor.c:7327
 msgid "Show on set parent"
 msgstr "Показувати у списку батьківських"
 
-#: ../clutter/clutter-actor.c:7112
+#: ../clutter/clutter-actor.c:7328
 msgid "Whether the actor is shown when parented"
 msgstr ""
 "Визначає, чи слід показувати пункт актора у списку батьківських акторів"
 
-#: ../clutter/clutter-actor.c:7129
+#: ../clutter/clutter-actor.c:7345
 msgid "Clip to Allocation"
 msgstr "Обрізати за розташуванням"
 
-#: ../clutter/clutter-actor.c:7130
+#: ../clutter/clutter-actor.c:7346
 msgid "Sets the clip region to track the actor's allocation"
 msgstr "Змінювати область обрізання відповідно до розташування об’єкта"
 
-#: ../clutter/clutter-actor.c:7143
+#: ../clutter/clutter-actor.c:7359
 msgid "Text Direction"
 msgstr "Напрям тексту"
 
-#: ../clutter/clutter-actor.c:7144
+#: ../clutter/clutter-actor.c:7360
 msgid "Direction of the text"
 msgstr "Напрям запису тексту"
 
-#: ../clutter/clutter-actor.c:7159
+#: ../clutter/clutter-actor.c:7375
 msgid "Has Pointer"
 msgstr "Містить вказівник"
 
-#: ../clutter/clutter-actor.c:7160
+#: ../clutter/clutter-actor.c:7376
 msgid "Whether the actor contains the pointer of an input device"
 msgstr "Визначає, чи містить актор вказівник на пристрій введення даних"
 
-#: ../clutter/clutter-actor.c:7173
+#: ../clutter/clutter-actor.c:7389
 msgid "Actions"
 msgstr "Дії"
 
-#: ../clutter/clutter-actor.c:7174
+#: ../clutter/clutter-actor.c:7390
 msgid "Adds an action to the actor"
 msgstr "Додати дію до актора"
 
-#: ../clutter/clutter-actor.c:7187
+#: ../clutter/clutter-actor.c:7403
 msgid "Constraints"
 msgstr "Обмеження"
 
-#: ../clutter/clutter-actor.c:7188
+#: ../clutter/clutter-actor.c:7404
 msgid "Adds a constraint to the actor"
 msgstr "Додати обмеження до актора"
 
-#: ../clutter/clutter-actor.c:7201
+#: ../clutter/clutter-actor.c:7417
 msgid "Effect"
 msgstr "Ефект"
 
-#: ../clutter/clutter-actor.c:7202
+#: ../clutter/clutter-actor.c:7418
 msgid "Add an effect to be applied on the actor"
 msgstr "Додати ефект для застосування до актора"
 
-#: ../clutter/clutter-actor.c:7216
+#: ../clutter/clutter-actor.c:7432
 msgid "Layout Manager"
 msgstr "Керування компонуванням"
 
-#: ../clutter/clutter-actor.c:7217
+#: ../clutter/clutter-actor.c:7433
 msgid "The object controlling the layout of an actor's children"
 msgstr "Контролювальний об'єкт компонентів підакторів"
 
-#: ../clutter/clutter-actor.c:7231
-#| msgid "Expand"
+#: ../clutter/clutter-actor.c:7447
 msgid "X Expand"
 msgstr "Розширення за X"
 
-#: ../clutter/clutter-actor.c:7232
-#| msgid "Whether the surface should match the allocation"
+#: ../clutter/clutter-actor.c:7448
 msgid "Whether extra horizontal space should be assigned to the actor"
 msgstr ""
 "Визначає, чи слід пов’язувати з актором додатковий горизонтальний простір"
 
-#: ../clutter/clutter-actor.c:7247
-#| msgid "Expand"
+#: ../clutter/clutter-actor.c:7463
 msgid "Y Expand"
 msgstr "Розширення за Y"
 
-#: ../clutter/clutter-actor.c:7248
-#| msgid "Whether the surface should match the allocation"
+#: ../clutter/clutter-actor.c:7464
 msgid "Whether extra vertical space should be assigned to the actor"
 msgstr ""
 "Визначає, чи слід пов’язувати з актором додатковий вертикальний простір"
 
-#: ../clutter/clutter-actor.c:7264
+#: ../clutter/clutter-actor.c:7480
 msgid "X Alignment"
 msgstr "Вирівнювання за X"
 
-#: ../clutter/clutter-actor.c:7265
+#: ../clutter/clutter-actor.c:7481
 msgid "The alignment of the actor on the X axis within its allocation"
 msgstr "Вирівнювання актора на осі X у межах його розподілу "
 
-#: ../clutter/clutter-actor.c:7280
+#: ../clutter/clutter-actor.c:7496
 msgid "Y Alignment"
 msgstr "Вирівнювання за Y"
 
-#: ../clutter/clutter-actor.c:7281
+#: ../clutter/clutter-actor.c:7497
 msgid "The alignment of the actor on the Y axis within its allocation"
 msgstr "Вирівнювання актора на осі Y у межах його розподілу"
 
-#: ../clutter/clutter-actor.c:7300
+#: ../clutter/clutter-actor.c:7516
 msgid "Margin Top"
 msgstr "Верхня межа"
 
-#: ../clutter/clutter-actor.c:7301
+#: ../clutter/clutter-actor.c:7517
 msgid "Extra space at the top"
 msgstr "Додатковий простір на вершині"
 
-#: ../clutter/clutter-actor.c:7322
+#: ../clutter/clutter-actor.c:7538
 msgid "Margin Bottom"
 msgstr "Нижня межа"
 
-#: ../clutter/clutter-actor.c:7323
+#: ../clutter/clutter-actor.c:7539
 msgid "Extra space at the bottom"
 msgstr "Додаткове місце на дні"
 
-#: ../clutter/clutter-actor.c:7344
+#: ../clutter/clutter-actor.c:7560
 msgid "Margin Left"
 msgstr "Ліва межа"
 
-#: ../clutter/clutter-actor.c:7345
+#: ../clutter/clutter-actor.c:7561
 msgid "Extra space at the left"
 msgstr "Додатковий простір зліва"
 
-#: ../clutter/clutter-actor.c:7366
+#: ../clutter/clutter-actor.c:7582
 msgid "Margin Right"
 msgstr "Права межа"
 
-#: ../clutter/clutter-actor.c:7367
+#: ../clutter/clutter-actor.c:7583
 msgid "Extra space at the right"
 msgstr "Додатковий простір справа"
 
-#: ../clutter/clutter-actor.c:7383
+#: ../clutter/clutter-actor.c:7599
 msgid "Background Color Set"
 msgstr "Встановлення кольору тла"
 
-#: ../clutter/clutter-actor.c:7384 ../clutter/deprecated/clutter-box.c:275
+#: ../clutter/clutter-actor.c:7600 ../clutter/deprecated/clutter-box.c:271
 msgid "Whether the background color is set"
 msgstr "Визначає, чи встановлено колір тла"
 
-#: ../clutter/clutter-actor.c:7400
+#: ../clutter/clutter-actor.c:7616
 msgid "Background color"
 msgstr "Колір тла"
 
-#: ../clutter/clutter-actor.c:7401
+#: ../clutter/clutter-actor.c:7617
 msgid "The actor's background color"
 msgstr "Колір акторового тла"
 
-#: ../clutter/clutter-actor.c:7416
+#: ../clutter/clutter-actor.c:7632
 msgid "First Child"
 msgstr "Перша дитина"
 
-#: ../clutter/clutter-actor.c:7417
+#: ../clutter/clutter-actor.c:7633
 msgid "The actor's first child"
 msgstr "Перший підактор"
 
-#: ../clutter/clutter-actor.c:7430
+#: ../clutter/clutter-actor.c:7646
 msgid "Last Child"
 msgstr "Остання дитина"
 
-#: ../clutter/clutter-actor.c:7431
+#: ../clutter/clutter-actor.c:7647
 msgid "The actor's last child"
 msgstr "Останній підактор"
 
-#: ../clutter/clutter-actor.c:7445
+#: ../clutter/clutter-actor.c:7661
 msgid "Content"
 msgstr "Вміст"
 
-#: ../clutter/clutter-actor.c:7446
+#: ../clutter/clutter-actor.c:7662
 msgid "Delegate object for painting the actor's content"
 msgstr "Надати об’єкт для малювання вмісту актора"
 
-#: ../clutter/clutter-actor.c:7471
+#: ../clutter/clutter-actor.c:7687
 msgid "Content Gravity"
 msgstr "Тяжіння для вмісту"
 
-#: ../clutter/clutter-actor.c:7472
+#: ../clutter/clutter-actor.c:7688
 msgid "Alignment of the actor's content"
 msgstr "Вирівнювання вмісту актора"
 
-#: ../clutter/clutter-actor.c:7492
+#: ../clutter/clutter-actor.c:7708
 msgid "Content Box"
 msgstr "Рамка вмісту"
 
-#: ../clutter/clutter-actor.c:7493
+#: ../clutter/clutter-actor.c:7709
 msgid "The bounding box of the actor's content"
 msgstr "Рамка для вмісту актора"
 
-#: ../clutter/clutter-actor.c:7501
+#: ../clutter/clutter-actor.c:7717
 msgid "Minification Filter"
 msgstr "Фільтр мініатюризації"
 
-#: ../clutter/clutter-actor.c:7502
+#: ../clutter/clutter-actor.c:7718
 msgid "The filter used when reducing the size of the content"
 msgstr "Фільтр, який буде використано у разі зменшення розміру зображення"
 
-#: ../clutter/clutter-actor.c:7509
+#: ../clutter/clutter-actor.c:7725
 msgid "Magnification Filter"
 msgstr "Фільтр збільшення"
 
-#: ../clutter/clutter-actor.c:7510
+#: ../clutter/clutter-actor.c:7726
 msgid "The filter used when increasing the size of the content"
 msgstr "Фільтр, який буде використано у разі збільшення розміру зображення"
 
-#: ../clutter/clutter-actor.c:7524
-#| msgid "Content Gravity"
+#: ../clutter/clutter-actor.c:7740
 msgid "Content Repeat"
 msgstr "Повторення даних"
 
-#: ../clutter/clutter-actor.c:7525
-#| msgid "The bounding box of the actor's content"
+#: ../clutter/clutter-actor.c:7741
 msgid "The repeat policy for the actor's content"
 msgstr "Правила повторення даних актора"
 
-#: ../clutter/clutter-actor-meta.c:193 ../clutter/clutter-child-meta.c:142
+#: ../clutter/clutter-actor-meta.c:191 ../clutter/clutter-child-meta.c:142
 msgid "Actor"
 msgstr "Актор"
 
-#: ../clutter/clutter-actor-meta.c:194
+#: ../clutter/clutter-actor-meta.c:192
 msgid "The actor attached to the meta"
 msgstr "Актор долучено до метаоб’єкта"
 
-#: ../clutter/clutter-actor-meta.c:208
+#: ../clutter/clutter-actor-meta.c:206
 msgid "The name of the meta"
 msgstr "Назва метаоб’єкта"
 
-#: ../clutter/clutter-actor-meta.c:221 ../clutter/clutter-input-device.c:337
-#: ../clutter/deprecated/clutter-shader.c:313
+#: ../clutter/clutter-actor-meta.c:219 ../clutter/clutter-input-device.c:326
+#: ../clutter/deprecated/clutter-shader.c:309
 msgid "Enabled"
 msgstr "Увімкнено"
 
-#: ../clutter/clutter-actor-meta.c:222
+#: ../clutter/clutter-actor-meta.c:220
 msgid "Whether the meta is enabled"
 msgstr "Визначає, чи увімкнено метаоб’єкт"
 
 #: ../clutter/clutter-align-constraint.c:279
-#: ../clutter/clutter-bind-constraint.c:358 ../clutter/clutter-clone.c:345
+#: ../clutter/clutter-bind-constraint.c:358 ../clutter/clutter-clone.c:341
 #: ../clutter/clutter-snap-constraint.c:321
 msgid "Source"
 msgstr "Початок"
@@ -729,11 +738,11 @@ msgstr "Коефіцієнт"
 msgid "The alignment factor, between 0.0 and 1.0"
 msgstr "Коефіцієнт вирівнювання, значення між 0.0 і 1.0"
 
-#: ../clutter/clutter-backend.c:376
+#: ../clutter/clutter-backend.c:380
 msgid "Unable to initialize the Clutter backend"
 msgstr "Неможливо запустити модуль Clutter"
 
-#: ../clutter/clutter-backend.c:450
+#: ../clutter/clutter-backend.c:454
 #, c-format
 msgid "The backend of type '%s' does not support creating multiple stages"
 msgstr "Модуль типу «%s» не підтримує створення кількох етапів"
@@ -764,47 +773,51 @@ msgstr "Відступ у пікселях для застосування пр
 msgid "The unique name of the binding pool"
 msgstr "Унікальна назва набору прив’язки"
 
-#: ../clutter/clutter-bin-layout.c:240 ../clutter/clutter-bin-layout.c:626
-#: ../clutter/clutter-box-layout.c:373 ../clutter/clutter-table-layout.c:610
+#: ../clutter/clutter-bin-layout.c:238 ../clutter/clutter-bin-layout.c:651
+#: ../clutter/clutter-box-layout.c:388
+#: ../clutter/deprecated/clutter-table-layout.c:610
 msgid "Horizontal Alignment"
 msgstr "Горизонтальне вирівнювання"
 
-#: ../clutter/clutter-bin-layout.c:241
+#: ../clutter/clutter-bin-layout.c:239
 msgid "Horizontal alignment for the actor inside the layout manager"
 msgstr "Горизонтальне вирівнювання актора у межах керування компонуванням"
 
-#: ../clutter/clutter-bin-layout.c:249 ../clutter/clutter-bin-layout.c:646
-#: ../clutter/clutter-box-layout.c:382 ../clutter/clutter-table-layout.c:625
+#: ../clutter/clutter-bin-layout.c:247 ../clutter/clutter-bin-layout.c:671
+#: ../clutter/clutter-box-layout.c:397
+#: ../clutter/deprecated/clutter-table-layout.c:625
 msgid "Vertical Alignment"
 msgstr "Вертикальне вирівнювання"
 
-#: ../clutter/clutter-bin-layout.c:250
+#: ../clutter/clutter-bin-layout.c:248
 msgid "Vertical alignment for the actor inside the layout manager"
 msgstr "Вертикальне вирівнювання актора у межах керування компонуванням"
 
-#: ../clutter/clutter-bin-layout.c:627
+#: ../clutter/clutter-bin-layout.c:652
 msgid "Default horizontal alignment for the actors inside the layout manager"
 msgstr ""
 "Типове горизонтальне вирівнювання акторів у межах керування компонуванням"
 
-#: ../clutter/clutter-bin-layout.c:647
+#: ../clutter/clutter-bin-layout.c:672
 msgid "Default vertical alignment for the actors inside the layout manager"
 msgstr ""
 "Типове вертикальне вирівнювання акторів у межах керування компонуванням"
 
-#: ../clutter/clutter-box-layout.c:348
+#: ../clutter/clutter-box-layout.c:363
 msgid "Expand"
 msgstr "Розгорнути"
 
-#: ../clutter/clutter-box-layout.c:349
+#: ../clutter/clutter-box-layout.c:364
 msgid "Allocate extra space for the child"
 msgstr "Надання додаткового простору для дочірнього об’єкта"
 
-#: ../clutter/clutter-box-layout.c:355 ../clutter/clutter-table-layout.c:589
+#: ../clutter/clutter-box-layout.c:370
+#: ../clutter/deprecated/clutter-table-layout.c:589
 msgid "Horizontal Fill"
 msgstr "Горизонтальне заповнення"
 
-#: ../clutter/clutter-box-layout.c:356 ../clutter/clutter-table-layout.c:590
+#: ../clutter/clutter-box-layout.c:371
+#: ../clutter/deprecated/clutter-table-layout.c:590
 msgid ""
 "Whether the child should receive priority when the container is allocating "
 "spare space on the horizontal axis"
@@ -812,11 +825,13 @@ msgstr ""
 "Визначає, чи має надаватися додатковий розмір для дочірнього об’єкта під час "
 "заповнення додаткового простору за горизонтальною віссю"
 
-#: ../clutter/clutter-box-layout.c:364 ../clutter/clutter-table-layout.c:596
+#: ../clutter/clutter-box-layout.c:379
+#: ../clutter/deprecated/clutter-table-layout.c:596
 msgid "Vertical Fill"
 msgstr "Вертикальне заповнення"
 
-#: ../clutter/clutter-box-layout.c:365 ../clutter/clutter-table-layout.c:597
+#: ../clutter/clutter-box-layout.c:380
+#: ../clutter/deprecated/clutter-table-layout.c:597
 msgid ""
 "Whether the child should receive priority when the container is allocating "
 "spare space on the vertical axis"
@@ -824,108 +839,136 @@ msgstr ""
 "Визначає, чи має надаватися додатковий розмір для дочірнього об’єкта під час "
 "заповнення додаткового простору за вертикальною віссю"
 
-#: ../clutter/clutter-box-layout.c:374 ../clutter/clutter-table-layout.c:611
+#: ../clutter/clutter-box-layout.c:389
+#: ../clutter/deprecated/clutter-table-layout.c:611
 msgid "Horizontal alignment of the actor within the cell"
 msgstr "Горизонтальне вирівнювання актора у комірці"
 
-#: ../clutter/clutter-box-layout.c:383 ../clutter/clutter-table-layout.c:626
+#: ../clutter/clutter-box-layout.c:398
+#: ../clutter/deprecated/clutter-table-layout.c:626
 msgid "Vertical alignment of the actor within the cell"
 msgstr "Вертикальне вирівнювання актора у комірці"
 
-#: ../clutter/clutter-box-layout.c:1233
+#: ../clutter/clutter-box-layout.c:1359
 msgid "Vertical"
 msgstr "Вертикальне"
 
-#: ../clutter/clutter-box-layout.c:1234
+#: ../clutter/clutter-box-layout.c:1360
 msgid "Whether the layout should be vertical, rather than horizontal"
 msgstr ""
 "Визначає, чи має бути компонування вертикальним, замість горизонтального"
 
-#: ../clutter/clutter-box-layout.c:1251 ../clutter/clutter-flow-layout.c:890
-#: ../clutter/clutter-grid-layout.c:1547
+#: ../clutter/clutter-box-layout.c:1377 ../clutter/clutter-flow-layout.c:942
+#: ../clutter/clutter-grid-layout.c:1549
 msgid "Orientation"
 msgstr "Орієнтація"
 
-#: ../clutter/clutter-box-layout.c:1252 ../clutter/clutter-flow-layout.c:891
-#: ../clutter/clutter-grid-layout.c:1548
+#: ../clutter/clutter-box-layout.c:1378 ../clutter/clutter-flow-layout.c:943
+#: ../clutter/clutter-grid-layout.c:1550
 msgid "The orientation of the layout"
 msgstr "Орієнтація компонування"
 
-#: ../clutter/clutter-box-layout.c:1268 ../clutter/clutter-flow-layout.c:906
+#: ../clutter/clutter-box-layout.c:1394 ../clutter/clutter-flow-layout.c:958
 msgid "Homogeneous"
 msgstr "Однорідність"
 
-#: ../clutter/clutter-box-layout.c:1269
+#: ../clutter/clutter-box-layout.c:1395
 msgid ""
 "Whether the layout should be homogeneous, i.e. all childs get the same size"
 msgstr ""
 "Визначає, чи має бути компонування однорідним, тобто чи повинні всі дочірні "
 "об’єкти мати однакові розміри"
 
-#: ../clutter/clutter-box-layout.c:1284
+#: ../clutter/clutter-box-layout.c:1410
 msgid "Pack Start"
 msgstr "Пакування початку"
 
-#: ../clutter/clutter-box-layout.c:1285
+#: ../clutter/clutter-box-layout.c:1411
 msgid "Whether to pack items at the start of the box"
 msgstr "Визначає, чи слід пакувати елементи на початку області"
 
-#: ../clutter/clutter-box-layout.c:1298
+#: ../clutter/clutter-box-layout.c:1424
 msgid "Spacing"
 msgstr "Інтервал"
 
-#: ../clutter/clutter-box-layout.c:1299
+#: ../clutter/clutter-box-layout.c:1425
 msgid "Spacing between children"
 msgstr "Інтервал між дочірніми об’єктами"
 
-#: ../clutter/clutter-box-layout.c:1316 ../clutter/clutter-table-layout.c:1675
+#: ../clutter/clutter-box-layout.c:1442
+#: ../clutter/deprecated/clutter-table-layout.c:1677
 msgid "Use Animations"
 msgstr "Використовувати анімацію"
 
-#: ../clutter/clutter-box-layout.c:1317 ../clutter/clutter-table-layout.c:1676
+#: ../clutter/clutter-box-layout.c:1443
+#: ../clutter/deprecated/clutter-table-layout.c:1678
 msgid "Whether layout changes should be animated"
 msgstr "Визначає, чи слід використовувати анімацію для змін компонування"
 
-#: ../clutter/clutter-box-layout.c:1341 ../clutter/clutter-table-layout.c:1700
+#: ../clutter/clutter-box-layout.c:1467
+#: ../clutter/deprecated/clutter-table-layout.c:1702
 msgid "Easing Mode"
 msgstr "Режим влаштування"
 
-#: ../clutter/clutter-box-layout.c:1342 ../clutter/clutter-table-layout.c:1701
+#: ../clutter/clutter-box-layout.c:1468
+#: ../clutter/deprecated/clutter-table-layout.c:1703
 msgid "The easing mode of the animations"
 msgstr "Режим влаштування для анімацій"
 
-#: ../clutter/clutter-box-layout.c:1362 ../clutter/clutter-table-layout.c:1721
+#: ../clutter/clutter-box-layout.c:1488
+#: ../clutter/deprecated/clutter-table-layout.c:1723
 msgid "Easing Duration"
 msgstr "Тривалість влаштування"
 
-#: ../clutter/clutter-box-layout.c:1363 ../clutter/clutter-table-layout.c:1722
+#: ../clutter/clutter-box-layout.c:1489
+#: ../clutter/deprecated/clutter-table-layout.c:1724
 msgid "The duration of the animations"
 msgstr "Тривалість анімації"
 
-#: ../clutter/clutter-brightness-contrast-effect.c:307
+#: ../clutter/clutter-brightness-contrast-effect.c:321
 msgid "Brightness"
 msgstr "Яскравість"
 
-#: ../clutter/clutter-brightness-contrast-effect.c:308
+#: ../clutter/clutter-brightness-contrast-effect.c:322
 msgid "The brightness change to apply"
 msgstr "Зміна яскравості, яку слід застосувати"
 
-#: ../clutter/clutter-brightness-contrast-effect.c:327
+#: ../clutter/clutter-brightness-contrast-effect.c:341
 msgid "Contrast"
 msgstr "Контрастність"
 
-#: ../clutter/clutter-brightness-contrast-effect.c:328
+#: ../clutter/clutter-brightness-contrast-effect.c:342
 msgid "The contrast change to apply"
 msgstr "Зміна контрастності, яку слід застосувати"
 
-#: ../clutter/clutter-canvas.c:216
+#: ../clutter/clutter-canvas.c:248
 msgid "The width of the canvas"
 msgstr "Ширина полотна"
 
-#: ../clutter/clutter-canvas.c:232
+#: ../clutter/clutter-canvas.c:264
 msgid "The height of the canvas"
 msgstr "Висота полотна"
 
+#: ../clutter/clutter-canvas.c:283
+#| msgid "Selection Color Set"
+msgid "Scale Factor Set"
+msgstr "Вказати масштаб"
+
+#: ../clutter/clutter-canvas.c:284
+#| msgid "Whether the transform property is set"
+msgid "Whether the scale-factor property is set"
+msgstr "Визначає, чи властивість масштабу вказано"
+
+#: ../clutter/clutter-canvas.c:305
+#| msgid "Factor"
+msgid "Scale Factor"
+msgstr "Масштаб"
+
+#: ../clutter/clutter-canvas.c:306
+#| msgid "The height of the Cairo surface"
+msgid "The scaling factor for the surface"
+msgstr "Масштаб для поверхні"
+
 #: ../clutter/clutter-child-meta.c:127
 msgid "Container"
 msgstr "Контейнер"
@@ -938,39 +981,39 @@ msgstr "Контейнер, яким було створено ці дані"
 msgid "The actor wrapped by this data"
 msgstr "Актор, який описується цими даними"
 
-#: ../clutter/clutter-click-action.c:546
+#: ../clutter/clutter-click-action.c:586
 msgid "Pressed"
 msgstr "Натиснуто"
 
-#: ../clutter/clutter-click-action.c:547
+#: ../clutter/clutter-click-action.c:587
 msgid "Whether the clickable should be in pressed state"
 msgstr "Визначає, чи можна буде клацати на об’єкті, коли його натиснуто"
 
-#: ../clutter/clutter-click-action.c:560
+#: ../clutter/clutter-click-action.c:600
 msgid "Held"
 msgstr "Утримання"
 
-#: ../clutter/clutter-click-action.c:561
+#: ../clutter/clutter-click-action.c:601
 msgid "Whether the clickable has a grab"
 msgstr "Визначає, чи отримує фокусування об’єкт, на якому можна клацати"
 
-#: ../clutter/clutter-click-action.c:578 ../clutter/clutter-settings.c:599
+#: ../clutter/clutter-click-action.c:618 ../clutter/clutter-settings.c:653
 msgid "Long Press Duration"
 msgstr "Тривалість довгого натискання"
 
-#: ../clutter/clutter-click-action.c:579
+#: ../clutter/clutter-click-action.c:619
 msgid "The minimum duration of a long press to recognize the gesture"
 msgstr "Мінімальна тривалість довгого натискання для визначення жесту"
 
-#: ../clutter/clutter-click-action.c:597
+#: ../clutter/clutter-click-action.c:637
 msgid "Long Press Threshold"
 msgstr "Порогова тривалість довгого натискання"
 
-#: ../clutter/clutter-click-action.c:598
+#: ../clutter/clutter-click-action.c:638
 msgid "The maximum threshold before a long press is cancelled"
 msgstr "Максимальна тривалість до скасування довгого натискання"
 
-#: ../clutter/clutter-clone.c:346
+#: ../clutter/clutter-clone.c:342
 msgid "Specifies the actor to be cloned"
 msgstr "Вказати актор, який слід клонувати"
 
@@ -982,27 +1025,27 @@ msgstr "Зміна відтінку"
 msgid "The tint to apply"
 msgstr "Зміна відтінку, яку слід застосувати"
 
-#: ../clutter/clutter-deform-effect.c:588
+#: ../clutter/clutter-deform-effect.c:592
 msgid "Horizontal Tiles"
 msgstr "Горизонтальні плитки"
 
-#: ../clutter/clutter-deform-effect.c:589
+#: ../clutter/clutter-deform-effect.c:593
 msgid "The number of horizontal tiles"
 msgstr "Кількість горизонтальних плиток"
 
-#: ../clutter/clutter-deform-effect.c:604
+#: ../clutter/clutter-deform-effect.c:608
 msgid "Vertical Tiles"
 msgstr "Вертикальні плитки"
 
-#: ../clutter/clutter-deform-effect.c:605
+#: ../clutter/clutter-deform-effect.c:609
 msgid "The number of vertical tiles"
 msgstr "Кількість вертикальних плиток"
 
-#: ../clutter/clutter-deform-effect.c:622
+#: ../clutter/clutter-deform-effect.c:626
 msgid "Back Material"
 msgstr "Матеріал тла"
 
-#: ../clutter/clutter-deform-effect.c:623
+#: ../clutter/clutter-deform-effect.c:627
 msgid "The material to be used when painting the back of the actor"
 msgstr "Матеріал, який буде використано для малювання тла актора"
 
@@ -1010,257 +1053,290 @@ msgstr "Матеріал, який буде використано для мал
 msgid "The desaturation factor"
 msgstr "Коефіцієнт зменшення насиченості"
 
-#: ../clutter/clutter-device-manager.c:131
-#: ../clutter/clutter-input-device.c:366
-#: ../clutter/x11/clutter-keymap-x11.c:316
+#: ../clutter/clutter-device-manager.c:127
+#: ../clutter/clutter-input-device.c:355
+#: ../clutter/x11/clutter-keymap-x11.c:321
 msgid "Backend"
 msgstr "Сервер"
 
-#: ../clutter/clutter-device-manager.c:132
+#: ../clutter/clutter-device-manager.c:128
 msgid "The ClutterBackend of the device manager"
 msgstr "ClutterBackend керування пристроями"
 
-#: ../clutter/clutter-drag-action.c:678
+#: ../clutter/clutter-drag-action.c:741
 msgid "Horizontal Drag Threshold"
 msgstr "Порогове значення перетягування за горизонталлю"
 
-#: ../clutter/clutter-drag-action.c:679
+#: ../clutter/clutter-drag-action.c:742
 msgid "The horizontal amount of pixels required to start dragging"
 msgstr "Кількість пікселів за горизонталлю, потрібна для початку перетягування"
 
-#: ../clutter/clutter-drag-action.c:706
+#: ../clutter/clutter-drag-action.c:769
 msgid "Vertical Drag Threshold"
 msgstr "Порогове значення перетягування за вертикаллю"
 
-#: ../clutter/clutter-drag-action.c:707
+#: ../clutter/clutter-drag-action.c:770
 msgid "The vertical amount of pixels required to start dragging"
 msgstr "Кількість пікселів за вертикаллю, потрібна для початку перетягування"
 
-#: ../clutter/clutter-drag-action.c:728
+#: ../clutter/clutter-drag-action.c:791
 msgid "Drag Handle"
 msgstr "Елемент керування перетягуванням"
 
-#: ../clutter/clutter-drag-action.c:729
+#: ../clutter/clutter-drag-action.c:792
 msgid "The actor that is being dragged"
 msgstr "Актор, який перетягується"
 
-#: ../clutter/clutter-drag-action.c:742
+#: ../clutter/clutter-drag-action.c:805
 msgid "Drag Axis"
 msgstr "Вісь перетягування"
 
-#: ../clutter/clutter-drag-action.c:743
+#: ../clutter/clutter-drag-action.c:806
 msgid "Constraints the dragging to an axis"
 msgstr "Обмеження перетягування вісі"
 
-#: ../clutter/clutter-flow-layout.c:907
+#: ../clutter/clutter-drag-action.c:822
+#| msgid "Drag Axis"
+msgid "Drag Area"
+msgstr "Перетягнути ділянку"
+
+#: ../clutter/clutter-drag-action.c:823
+#| msgid "Constraints the dragging to an axis"
+msgid "Constrains the dragging to a rectangle"
+msgstr "Обмежує перетягування в прямокутник"
+
+#: ../clutter/clutter-drag-action.c:836
+msgid "Drag Area Set"
+msgstr "Вказати ділянку перетягування"
+
+#: ../clutter/clutter-drag-action.c:837
+#| msgid "Whether the transform property is set"
+msgid "Whether the drag area is set"
+msgstr "Визначає, чи перетягування ділянки вказано"
+
+#: ../clutter/clutter-flow-layout.c:959
 msgid "Whether each item should receive the same allocation"
 msgstr ""
 "Визначає, чи має кожен елемент отримувати однаковий простір для "
 "розташовування"
 
-#: ../clutter/clutter-flow-layout.c:922 ../clutter/clutter-table-layout.c:1637
+#: ../clutter/clutter-flow-layout.c:974
+#: ../clutter/deprecated/clutter-table-layout.c:1637
 msgid "Column Spacing"
 msgstr "Інтервал між стовпчиками"
 
-#: ../clutter/clutter-flow-layout.c:923
+#: ../clutter/clutter-flow-layout.c:975
 msgid "The spacing between columns"
 msgstr "Інтервал між стовпчиками"
 
-#: ../clutter/clutter-flow-layout.c:939 ../clutter/clutter-table-layout.c:1651
+#: ../clutter/clutter-flow-layout.c:991
+#: ../clutter/deprecated/clutter-table-layout.c:1653
 msgid "Row Spacing"
 msgstr "Інтервал між рядками"
 
-#: ../clutter/clutter-flow-layout.c:940
+#: ../clutter/clutter-flow-layout.c:992
 msgid "The spacing between rows"
 msgstr "Інтервал між рядками"
 
-#: ../clutter/clutter-flow-layout.c:954
+#: ../clutter/clutter-flow-layout.c:1006
 msgid "Minimum Column Width"
 msgstr "Мінімальна ширина стовпчика"
 
-#: ../clutter/clutter-flow-layout.c:955
+#: ../clutter/clutter-flow-layout.c:1007
 msgid "Minimum width for each column"
 msgstr "Мінімальна ширина всіх стовпчиків"
 
-#: ../clutter/clutter-flow-layout.c:970
+#: ../clutter/clutter-flow-layout.c:1022
 msgid "Maximum Column Width"
 msgstr "Максимальна ширина стовпчиків"
 
-#: ../clutter/clutter-flow-layout.c:971
+#: ../clutter/clutter-flow-layout.c:1023
 msgid "Maximum width for each column"
 msgstr "Максимальна ширина всіх стовпчиків"
 
-#: ../clutter/clutter-flow-layout.c:985
+#: ../clutter/clutter-flow-layout.c:1037
 msgid "Minimum Row Height"
 msgstr "Мінімальна висота рядка"
 
-#: ../clutter/clutter-flow-layout.c:986
+#: ../clutter/clutter-flow-layout.c:1038
 msgid "Minimum height for each row"
 msgstr "Мінімальна висота всіх рядків"
 
-#: ../clutter/clutter-flow-layout.c:1001
+#: ../clutter/clutter-flow-layout.c:1053
 msgid "Maximum Row Height"
 msgstr "Максимальна висота рядка"
 
-#: ../clutter/clutter-flow-layout.c:1002
+#: ../clutter/clutter-flow-layout.c:1054
 msgid "Maximum height for each row"
 msgstr "Максимальна висота всіх рядків"
 
-#: ../clutter/clutter-grid-layout.c:1222
+#: ../clutter/clutter-flow-layout.c:1069 ../clutter/clutter-flow-layout.c:1070
+msgid "Snap to grid"
+msgstr "Приєднати до ґратки"
+
+#: ../clutter/clutter-gesture-action.c:639
+#| msgid "Number of Axes"
+msgid "Number touch points"
+msgstr "Кількість точок дотику"
+
+#: ../clutter/clutter-gesture-action.c:640
+#| msgid "Number of Axes"
+msgid "Number of touch points"
+msgstr "Кількість точок дотику"
+
+#: ../clutter/clutter-gesture-action.c:655
+msgid "Threshold Trigger Edge"
+msgstr "Поріг перемикача країв"
+
+#: ../clutter/clutter-gesture-action.c:656
+#| msgid "The timeline used by the animation"
+msgid "The trigger edge used by the action"
+msgstr "Дії використовують перемикача країв"
+
+#: ../clutter/clutter-grid-layout.c:1223
 msgid "Left attachment"
 msgstr "Ліва прив’язка"
 
-#: ../clutter/clutter-grid-layout.c:1223
+#: ../clutter/clutter-grid-layout.c:1224
 msgid "The column number to attach the left side of the child to"
 msgstr ""
 "Номер стовпчика, до якого слід прив’язувати лівий бік дочірнього віджета"
 
-#: ../clutter/clutter-grid-layout.c:1230
+#: ../clutter/clutter-grid-layout.c:1231
 msgid "Top attachment"
 msgstr "Верхня прив’язка"
 
-#: ../clutter/clutter-grid-layout.c:1231
+#: ../clutter/clutter-grid-layout.c:1232
 msgid "The row number to attach the top side of a child widget to"
 msgstr ""
 "Номер рядка, до якого слід прив’язувати верхній край дочірнього віджета"
 
-#: ../clutter/clutter-grid-layout.c:1239
-#| msgid "The number of columns the widget should span"
+#: ../clutter/clutter-grid-layout.c:1240
 msgid "The number of columns that a child spans"
 msgstr "Кількість стовпчиків, які займає дочірній віджет"
 
-#: ../clutter/clutter-grid-layout.c:1246
-#| msgid "The number of rows the widget should span"
+#: ../clutter/clutter-grid-layout.c:1247
 msgid "The number of rows that a child spans"
 msgstr "Кількість рядків, які займає дочірній віджет"
 
-#: ../clutter/clutter-grid-layout.c:1562
-#| msgid "Row Spacing"
+#: ../clutter/clutter-grid-layout.c:1564
 msgid "Row spacing"
 msgstr "Інтервал між рядками"
 
-#: ../clutter/clutter-grid-layout.c:1563
+#: ../clutter/clutter-grid-layout.c:1565
 msgid "The amount of space between two consecutive rows"
 msgstr "Простір між двома послідовними рядками"
 
-#: ../clutter/clutter-grid-layout.c:1576
-#| msgid "Column Spacing"
+#: ../clutter/clutter-grid-layout.c:1578
 msgid "Column spacing"
 msgstr "Інтервал між стовпчиками"
 
-#: ../clutter/clutter-grid-layout.c:1577
-#| msgid "The spacing between columns"
+#: ../clutter/clutter-grid-layout.c:1579
 msgid "The amount of space between two consecutive columns"
 msgstr "Простір між двома послідовними стовпчиками"
 
-#: ../clutter/clutter-grid-layout.c:1591
-#| msgid "Homogeneous"
+#: ../clutter/clutter-grid-layout.c:1593
 msgid "Row Homogeneous"
 msgstr "Однорідність рядків"
 
-#: ../clutter/clutter-grid-layout.c:1592
+#: ../clutter/clutter-grid-layout.c:1594
 msgid "If TRUE, the rows are all the same height"
 msgstr "Якщо має значення TRUE, висота рядків є однаковою"
 
-#: ../clutter/clutter-grid-layout.c:1605
-#| msgid "Homogeneous"
+#: ../clutter/clutter-grid-layout.c:1607
 msgid "Column Homogeneous"
 msgstr "Однорідність стовпчиків"
 
-#: ../clutter/clutter-grid-layout.c:1606
+#: ../clutter/clutter-grid-layout.c:1608
 msgid "If TRUE, the columns are all the same width"
 msgstr "Якщо має значення TRUE, ширина стовпчиків є однаковою"
 
-#: ../clutter/clutter-image.c:248 ../clutter/clutter-image.c:311
-#: ../clutter/clutter-image.c:399
+#: ../clutter/clutter-image.c:249 ../clutter/clutter-image.c:312
+#: ../clutter/clutter-image.c:400
 msgid "Unable to load image data"
 msgstr "Не вдалося завантажити дані зображення"
 
-#: ../clutter/clutter-input-device.c:242
+#: ../clutter/clutter-input-device.c:231
 msgid "Id"
 msgstr "Ід."
 
-#: ../clutter/clutter-input-device.c:243
+#: ../clutter/clutter-input-device.c:232
 msgid "Unique identifier of the device"
 msgstr "Унікальний ідентифікатор пристрою"
 
-#: ../clutter/clutter-input-device.c:259
+#: ../clutter/clutter-input-device.c:248
 msgid "The name of the device"
 msgstr "Назва пристрою"
 
-#: ../clutter/clutter-input-device.c:273
+#: ../clutter/clutter-input-device.c:262
 msgid "Device Type"
 msgstr "Тип пристрою"
 
-#: ../clutter/clutter-input-device.c:274
+#: ../clutter/clutter-input-device.c:263
 msgid "The type of the device"
 msgstr "Тип пристрою"
 
-#: ../clutter/clutter-input-device.c:289
+#: ../clutter/clutter-input-device.c:278
 msgid "Device Manager"
 msgstr "Керування пристроями"
 
-#: ../clutter/clutter-input-device.c:290
+#: ../clutter/clutter-input-device.c:279
 msgid "The device manager instance"
 msgstr "Екземпляр керування пристроями"
 
-#: ../clutter/clutter-input-device.c:303
+#: ../clutter/clutter-input-device.c:292
 msgid "Device Mode"
 msgstr "Режим пристрою"
 
-#: ../clutter/clutter-input-device.c:304
+#: ../clutter/clutter-input-device.c:293
 msgid "The mode of the device"
 msgstr "Режим роботи пристрою"
 
-#: ../clutter/clutter-input-device.c:318
+#: ../clutter/clutter-input-device.c:307
 msgid "Has Cursor"
 msgstr "Має курсор"
 
-#: ../clutter/clutter-input-device.c:319
+#: ../clutter/clutter-input-device.c:308
 msgid "Whether the device has a cursor"
 msgstr "Чи передбачено у пристрої курсор"
 
-#: ../clutter/clutter-input-device.c:338
+#: ../clutter/clutter-input-device.c:327
 msgid "Whether the device is enabled"
 msgstr "Чи увімкнено пристрій"
 
-#: ../clutter/clutter-input-device.c:351
+#: ../clutter/clutter-input-device.c:340
 msgid "Number of Axes"
 msgstr "Кількість осей"
 
-#: ../clutter/clutter-input-device.c:352
+#: ../clutter/clutter-input-device.c:341
 msgid "The number of axes on the device"
 msgstr "Кількість осей керування пристрою"
 
-#: ../clutter/clutter-input-device.c:367
+#: ../clutter/clutter-input-device.c:356
 msgid "The backend instance"
 msgstr "Екземпляр модуля обробки"
 
-#: ../clutter/clutter-interval.c:506
+#: ../clutter/clutter-interval.c:553
 msgid "Value Type"
 msgstr "Тип значень"
 
-#: ../clutter/clutter-interval.c:507
+#: ../clutter/clutter-interval.c:554
 msgid "The type of the values in the interval"
 msgstr "Тип значень у інтервалі"
 
-#: ../clutter/clutter-interval.c:522
-#| msgid "Initial angle"
+#: ../clutter/clutter-interval.c:569
 msgid "Initial Value"
 msgstr "Початкове значення"
 
-#: ../clutter/clutter-interval.c:523
-#| msgid "Initial scale on the X axis"
+#: ../clutter/clutter-interval.c:570
 msgid "Initial value of the interval"
 msgstr "Початкове значення інтервалу"
 
-#: ../clutter/clutter-interval.c:537
-#| msgid "Final angle"
+#: ../clutter/clutter-interval.c:584
 msgid "Final Value"
 msgstr "Остаточне значення"
 
-#: ../clutter/clutter-interval.c:538
-#| msgid "Final scale on the X axis"
+#: ../clutter/clutter-interval.c:585
 msgid "Final value of the interval"
 msgstr "Кінцеве значення інтервалу"
 
@@ -1279,64 +1355,103 @@ msgstr "Інструмент керування, яким було створе
 #. * Do NOT translate it to non-English e.g. "predefinito:LTR"! If
 #. * it isn't default:LTR or default:RTL it will not work.
 #.
-#: ../clutter/clutter-main.c:762
+#: ../clutter/clutter-main.c:795
 msgid "default:LTR"
 msgstr "типово:LTR"
 
-#: ../clutter/clutter-main.c:1633
+#: ../clutter/clutter-main.c:1622
 msgid "Show frames per second"
 msgstr "Показувати частоту кадрів"
 
-#: ../clutter/clutter-main.c:1635
+#: ../clutter/clutter-main.c:1624
 msgid "Default frame rate"
 msgstr "Типова частота кадрів"
 
-#: ../clutter/clutter-main.c:1637
+#: ../clutter/clutter-main.c:1626
 msgid "Make all warnings fatal"
 msgstr "Всі попередження — критичні"
 
-#: ../clutter/clutter-main.c:1640
+#: ../clutter/clutter-main.c:1629
 msgid "Direction for the text"
 msgstr "Напрям запису"
 
-#: ../clutter/clutter-main.c:1643
+#: ../clutter/clutter-main.c:1632
 msgid "Disable mipmapping on text"
 msgstr "Вимкнути послідовне відображення для тексту"
 
-#: ../clutter/clutter-main.c:1646
+#: ../clutter/clutter-main.c:1635
 msgid "Use 'fuzzy' picking"
 msgstr "«Нечітке» впорядкування"
 
-#: ../clutter/clutter-main.c:1649
+#: ../clutter/clutter-main.c:1638
 msgid "Clutter debugging flags to set"
 msgstr "Діагностичні параметри Clutter, які слід використати"
 
-#: ../clutter/clutter-main.c:1651
+#: ../clutter/clutter-main.c:1640
 msgid "Clutter debugging flags to unset"
 msgstr "Діагностичні параметри Clutter, які не слід використовувати"
 
-#: ../clutter/clutter-main.c:1655
+#: ../clutter/clutter-main.c:1644
 msgid "Clutter profiling flags to set"
 msgstr "Параметри профілювання Clutter, які слід використати"
 
-#: ../clutter/clutter-main.c:1657
+#: ../clutter/clutter-main.c:1646
 msgid "Clutter profiling flags to unset"
 msgstr "Параметри профілювання Clutter, які не слід використовувати"
 
-#: ../clutter/clutter-main.c:1660
+#: ../clutter/clutter-main.c:1649
 msgid "Enable accessibility"
 msgstr "Увімкнути можливості доступності"
 
-#: ../clutter/clutter-main.c:1852
+#: ../clutter/clutter-main.c:1841
 msgid "Clutter Options"
 msgstr "Параметри Clutter"
 
-#: ../clutter/clutter-main.c:1853
+#: ../clutter/clutter-main.c:1842
 msgid "Show Clutter Options"
 msgstr "Показати параметри Clutter"
 
+#: ../clutter/clutter-pan-action.c:446
+#| msgid "Drag Axis"
+msgid "Pan Axis"
+msgstr "Панорма вісі"
+
+#: ../clutter/clutter-pan-action.c:447
+#| msgid "Constraints the dragging to an axis"
+msgid "Constraints the panning to an axis"
+msgstr "Обмеження створення панорам вісі"
+
+#: ../clutter/clutter-pan-action.c:461
+#| msgid "Interval"
+msgid "Interpolate"
+msgstr "Інтерполювати"
+
+#: ../clutter/clutter-pan-action.c:462
+#| msgid "Whether the device is enabled"
+msgid "Whether interpolated events emission is enabled."
+msgstr "Чи випускання інтерпольованих подій увімкнено."
+
+#: ../clutter/clutter-pan-action.c:478
+#| msgid "Duration"
+msgid "Deceleration"
+msgstr "Заповільнення"
+
+#: ../clutter/clutter-pan-action.c:479
+msgid "Rate at which the interpolated panning will decelerate in"
+msgstr "Швидкість, до якої інтерпольоване панорамування буде сповільнено"
+
+#: ../clutter/clutter-pan-action.c:496
+#| msgid "The desaturation factor"
+msgid "Initial acceleration factor"
+msgstr "Початкове прискорення"
+
+#: ../clutter/clutter-pan-action.c:497
+msgid "Factor applied to the momentum when starting the interpolated phase"
+msgstr ""
+"Фактор застосовується до імпульсу, коли запускається інтерпольована фаза"
+
 #: ../clutter/clutter-path-constraint.c:212
-#: ../clutter/deprecated/clutter-behaviour-path.c:225
+#: ../clutter/deprecated/clutter-behaviour-path.c:221
 msgid "Path"
 msgstr "Контур"
 
@@ -1348,88 +1463,87 @@ msgstr "Контур, використаний для руху обмеженн
 msgid "The offset along the path, between -1.0 and 2.0"
 msgstr "Відступ вздовж контуру, значення у діапазоні від -1.0 до 2.0"
 
-#: ../clutter/clutter-property-transition.c:271
+#: ../clutter/clutter-property-transition.c:269
 msgid "Property Name"
 msgstr "Назва властивості"
 
-#: ../clutter/clutter-property-transition.c:272
+#: ../clutter/clutter-property-transition.c:270
 msgid "The name of the property to animate"
 msgstr "Назва властивості для анімування"
 
-#: ../clutter/clutter-script.c:466
+#: ../clutter/clutter-script.c:464
 msgid "Filename Set"
 msgstr "Встановлено назву файла"
 
-#: ../clutter/clutter-script.c:467
+#: ../clutter/clutter-script.c:465
 msgid "Whether the :filename property is set"
 msgstr "Визначає, чи встановлено властивість «:filename»"
 
-#: ../clutter/clutter-script.c:481
-#: ../clutter/deprecated/clutter-texture.c:1082
+#: ../clutter/clutter-script.c:479
+#: ../clutter/deprecated/clutter-texture.c:1080
 msgid "Filename"
 msgstr "Назва файла"
 
-#: ../clutter/clutter-script.c:482
+#: ../clutter/clutter-script.c:480
 msgid "The path of the currently parsed file"
 msgstr "Шлях до поточного файла для обробки"
 
-#: ../clutter/clutter-script.c:499
+#: ../clutter/clutter-script.c:497
 msgid "Translation Domain"
 msgstr "Домен перекладу"
 
-#: ../clutter/clutter-script.c:500
+#: ../clutter/clutter-script.c:498
 msgid "The translation domain used to localize string"
 msgstr "Домен перекладу, який використовується для локалізації рядка"
 
-#: ../clutter/clutter-scroll-actor.c:263
+#: ../clutter/clutter-scroll-actor.c:189
 msgid "Scroll Mode"
 msgstr "Режим гортання"
 
-#: ../clutter/clutter-scroll-actor.c:264
-#| msgid "The cursor position"
+#: ../clutter/clutter-scroll-actor.c:190
 msgid "The scrolling direction"
 msgstr "Напрям гортання"
 
-#: ../clutter/clutter-settings.c:440
+#: ../clutter/clutter-settings.c:486
 msgid "Double Click Time"
 msgstr "Інтервал подвійного клацання"
 
-#: ../clutter/clutter-settings.c:441
+#: ../clutter/clutter-settings.c:487
 msgid "The time between clicks necessary to detect a multiple click"
 msgstr "Інтервал між клацаннями, потрібний для визначення кратного клацання"
 
-#: ../clutter/clutter-settings.c:456
+#: ../clutter/clutter-settings.c:502
 msgid "Double Click Distance"
 msgstr "Відстань подвійного клацання"
 
-#: ../clutter/clutter-settings.c:457
+#: ../clutter/clutter-settings.c:503
 msgid "The distance between clicks necessary to detect a multiple click"
 msgstr ""
 "Відстань між точками клацань, потрібна для визначення кратного клацання"
 
-#: ../clutter/clutter-settings.c:472
+#: ../clutter/clutter-settings.c:518
 msgid "Drag Threshold"
 msgstr "Поріг перетягування"
 
-#: ../clutter/clutter-settings.c:473
+#: ../clutter/clutter-settings.c:519
 msgid "The distance the cursor should travel before starting to drag"
 msgstr ""
 "Відстань, на яку має бути пересунуто вказівник, щоб розпочати перетягування"
 
-#: ../clutter/clutter-settings.c:488 ../clutter/clutter-text.c:3359
+#: ../clutter/clutter-settings.c:534 ../clutter/clutter-text.c:3404
 msgid "Font Name"
 msgstr "Назва шрифту"
 
-#: ../clutter/clutter-settings.c:489
+#: ../clutter/clutter-settings.c:535
 msgid ""
 "The description of the default font, as one that could be parsed by Pango"
 msgstr "Опис типового шрифту у форматі, придатному для обробки Pango"
 
-#: ../clutter/clutter-settings.c:504
+#: ../clutter/clutter-settings.c:550
 msgid "Font Antialias"
 msgstr "Згладжування шрифту"
 
-#: ../clutter/clutter-settings.c:505
+#: ../clutter/clutter-settings.c:551
 msgid ""
 "Whether to use antialiasing (1 to enable, 0 to disable, and -1 to use the "
 "default)"
@@ -1437,69 +1551,78 @@ msgstr ""
 "Визначає, чи слід використовувати згладжування (1 — увімкнути, 0 — вимкнути, "
 "-1 — використовувати типове)"
 
-#: ../clutter/clutter-settings.c:521
+#: ../clutter/clutter-settings.c:567 ../clutter/clutter-settings.c:575
 msgid "Font DPI"
 msgstr "Роздільність шрифту"
 
-#: ../clutter/clutter-settings.c:522
+#: ../clutter/clutter-settings.c:568 ../clutter/clutter-settings.c:576
 msgid ""
 "The resolution of the font, in 1024 * dots/inch, or -1 to use the default"
 msgstr ""
 "Роздільність шрифту у 1024 * точок/дюйм або -1, якщо слід використовувати "
 "типову"
 
-#: ../clutter/clutter-settings.c:538
+#: ../clutter/clutter-settings.c:592
 msgid "Font Hinting"
 msgstr "Гінтінґ шрифту"
 
-#: ../clutter/clutter-settings.c:539
+#: ../clutter/clutter-settings.c:593
 msgid ""
 "Whether to use hinting (1 to enable, 0 to disable and -1 to use the default)"
 msgstr ""
 "Визначає, чи слід використовувати гінтінґ (1 — увімкнути, 0 — вимкнути, -1 — "
 "використовувати типовий)"
 
-#: ../clutter/clutter-settings.c:560
+#: ../clutter/clutter-settings.c:614
 msgid "Font Hint Style"
 msgstr "Стиль гінтінґу шрифту"
 
-#: ../clutter/clutter-settings.c:561
+#: ../clutter/clutter-settings.c:615
 msgid "The style of hinting (hintnone, hintslight, hintmedium, hintfull)"
 msgstr "Стиль гінтінґу (hintnone, hintslight, hintmedium, hintfull)"
 
-#: ../clutter/clutter-settings.c:582
+#: ../clutter/clutter-settings.c:636
 msgid "Font Subpixel Order"
 msgstr "Порядок підпікселів шрифту"
 
-#: ../clutter/clutter-settings.c:583
+#: ../clutter/clutter-settings.c:637
 msgid "The type of subpixel antialiasing (none, rgb, bgr, vrgb, vbgr)"
 msgstr "Тип згладжування підпікселів шрифту (none, rgb, bgr, vrgb, vbgr)"
 
-#: ../clutter/clutter-settings.c:600
+#: ../clutter/clutter-settings.c:654
 msgid "The minimum duration for a long press gesture to be recognized"
 msgstr "Мінімальна тривалість для розпізнавання жесту довгого натискання"
 
-#: ../clutter/clutter-settings.c:607
+#: ../clutter/clutter-settings.c:661
+msgid "Window Scaling Factor"
+msgstr "Масштаб вікна"
+
+#: ../clutter/clutter-settings.c:662
+#| msgid "Add an effect to be applied on the actor"
+msgid "The scaling factor to be applied to windows"
+msgstr "Масштаб, який застосовується до вікон"
+
+#: ../clutter/clutter-settings.c:669
 msgid "Fontconfig configuration timestamp"
 msgstr "Часова позначка налаштувань Fontconfig"
 
-#: ../clutter/clutter-settings.c:608
+#: ../clutter/clutter-settings.c:670
 msgid "Timestamp of the current fontconfig configuration"
 msgstr "Часова позначка поточних налаштувань fontconfig"
 
-#: ../clutter/clutter-settings.c:625
+#: ../clutter/clutter-settings.c:687
 msgid "Password Hint Time"
 msgstr "Час підказування паролю"
 
-#: ../clutter/clutter-settings.c:626
+#: ../clutter/clutter-settings.c:688
 msgid "How long to show the last input character in hidden entries"
 msgstr "Як довго показувати останній введений символ у прихованих полях"
 
-#: ../clutter/clutter-shader-effect.c:486
+#: ../clutter/clutter-shader-effect.c:485
 msgid "Shader Type"
 msgstr "Тип шейдера"
 
-#: ../clutter/clutter-shader-effect.c:487
+#: ../clutter/clutter-shader-effect.c:486
 msgid "The type of shader used"
 msgstr "Тип використаної програми для побудови тіней"
 
@@ -1527,760 +1650,714 @@ msgstr "Край джерела, до якого липниме актор"
 msgid "The offset in pixels to apply to the constraint"
 msgstr "Відступ у пікселях, який слід застосувати до обмеження"
 
-#: ../clutter/clutter-stage.c:1895
+#: ../clutter/clutter-stage.c:1899
 msgid "Fullscreen Set"
 msgstr "Повноекранний режим"
 
-#: ../clutter/clutter-stage.c:1896
+#: ../clutter/clutter-stage.c:1900
 msgid "Whether the main stage is fullscreen"
 msgstr "Визначає, чи основна сцена працює у режимі повного екрана"
 
-#: ../clutter/clutter-stage.c:1910
+#: ../clutter/clutter-stage.c:1914
 msgid "Offscreen"
 msgstr "Поза екраном"
 
-#: ../clutter/clutter-stage.c:1911
+#: ../clutter/clutter-stage.c:1915
 msgid "Whether the main stage should be rendered offscreen"
 msgstr "Визначає, чи слід обробляти основну сцену поза екраном"
 
-#: ../clutter/clutter-stage.c:1923 ../clutter/clutter-text.c:3473
+#: ../clutter/clutter-stage.c:1927 ../clutter/clutter-text.c:3518
 msgid "Cursor Visible"
 msgstr "Видимий вказівник"
 
-#: ../clutter/clutter-stage.c:1924
+#: ../clutter/clutter-stage.c:1928
 msgid "Whether the mouse pointer is visible on the main stage"
 msgstr "Визначає, чи має бути показано вказівник миші на основній сцені"
 
-#: ../clutter/clutter-stage.c:1938
+#: ../clutter/clutter-stage.c:1942
 msgid "User Resizable"
 msgstr "Зміна розмірів користувачем"
 
-#: ../clutter/clutter-stage.c:1939
+#: ../clutter/clutter-stage.c:1943
 msgid "Whether the stage is able to be resized via user interaction"
 msgstr "Визначає, чи слід змінювати розміри сцени за наказом користувача"
 
-#: ../clutter/clutter-stage.c:1954 ../clutter/deprecated/clutter-box.c:260
-#: ../clutter/deprecated/clutter-rectangle.c:272
+#: ../clutter/clutter-stage.c:1958 ../clutter/deprecated/clutter-box.c:256
+#: ../clutter/deprecated/clutter-rectangle.c:270
 msgid "Color"
 msgstr "Колір"
 
-#: ../clutter/clutter-stage.c:1955
+#: ../clutter/clutter-stage.c:1959
 msgid "The color of the stage"
 msgstr "Колір сцени"
 
-#: ../clutter/clutter-stage.c:1970
+#: ../clutter/clutter-stage.c:1974
 msgid "Perspective"
 msgstr "Перспектива"
 
-#: ../clutter/clutter-stage.c:1971
+#: ../clutter/clutter-stage.c:1975
 msgid "Perspective projection parameters"
 msgstr "Параметри проектування перспективи"
 
-#: ../clutter/clutter-stage.c:1986
+#: ../clutter/clutter-stage.c:1990
 msgid "Title"
 msgstr "Заголовок"
 
-#: ../clutter/clutter-stage.c:1987
+#: ../clutter/clutter-stage.c:1991
 msgid "Stage Title"
 msgstr "Заголовок сцени"
 
-#: ../clutter/clutter-stage.c:2004
+#: ../clutter/clutter-stage.c:2008
 msgid "Use Fog"
 msgstr "Використання туману"
 
-#: ../clutter/clutter-stage.c:2005
+#: ../clutter/clutter-stage.c:2009
 msgid "Whether to enable depth cueing"
 msgstr "Визначає, чи слід вмикати глибину стека сигналів"
 
-#: ../clutter/clutter-stage.c:2021
+#: ../clutter/clutter-stage.c:2025
 msgid "Fog"
 msgstr "Туман"
 
-#: ../clutter/clutter-stage.c:2022
+#: ../clutter/clutter-stage.c:2026
 msgid "Settings for the depth cueing"
 msgstr "Параметри глибини стека сигналів"
 
-#: ../clutter/clutter-stage.c:2038
+#: ../clutter/clutter-stage.c:2042
 msgid "Use Alpha"
 msgstr "Канал прозорості"
 
-#: ../clutter/clutter-stage.c:2039
+#: ../clutter/clutter-stage.c:2043
 msgid "Whether to honour the alpha component of the stage color"
 msgstr "Визначає, чи слід зважати на компонент прозорості кольорів сцени"
 
-#: ../clutter/clutter-stage.c:2055
+#: ../clutter/clutter-stage.c:2059
 msgid "Key Focus"
 msgstr "Ключ фокусування"
 
-#: ../clutter/clutter-stage.c:2056
+#: ../clutter/clutter-stage.c:2060
 msgid "The currently key focused actor"
 msgstr "Поточний актор з ключем фокусування"
 
-#: ../clutter/clutter-stage.c:2072
+#: ../clutter/clutter-stage.c:2076
 msgid "No Clear Hint"
 msgstr "Підказка щодо спорожнення"
 
-#: ../clutter/clutter-stage.c:2073
+#: ../clutter/clutter-stage.c:2077
 msgid "Whether the stage should clear its contents"
 msgstr "Визначає, чи слід спорожняти вміст сцени"
 
-#: ../clutter/clutter-stage.c:2086
+#: ../clutter/clutter-stage.c:2090
 msgid "Accept Focus"
 msgstr "Прийняття фокуса"
 
-#: ../clutter/clutter-stage.c:2087
+#: ../clutter/clutter-stage.c:2091
 msgid "Whether the stage should accept focus on show"
 msgstr "Визначає, чи має сцена приймати фокус під час показу"
 
-#: ../clutter/clutter-table-layout.c:543
-msgid "Column Number"
-msgstr "Номер стовпчика"
-
-#: ../clutter/clutter-table-layout.c:544
-msgid "The column the widget resides in"
-msgstr "Стовпчик, у якому розташовуватиметься віджет"
-
-#: ../clutter/clutter-table-layout.c:551
-msgid "Row Number"
-msgstr "Номер рядка"
-
-#: ../clutter/clutter-table-layout.c:552
-msgid "The row the widget resides in"
-msgstr "Рядок, у якому розташовуватиметься віджет"
-
-#: ../clutter/clutter-table-layout.c:559
-msgid "Column Span"
-msgstr "Кількість стовпчиків"
-
-#: ../clutter/clutter-table-layout.c:560
-msgid "The number of columns the widget should span"
-msgstr "Кількість стовпчиків, у яких розміщуватиметься віджет"
-
-#: ../clutter/clutter-table-layout.c:567
-msgid "Row Span"
-msgstr "Кількість рядків"
-
-#: ../clutter/clutter-table-layout.c:568
-msgid "The number of rows the widget should span"
-msgstr "Кількість рядків, у яких розміщуватиметься віджет"
-
-#: ../clutter/clutter-table-layout.c:575
-msgid "Horizontal Expand"
-msgstr "Горизонтальне розширення"
-
-#: ../clutter/clutter-table-layout.c:576
-msgid "Allocate extra space for the child in horizontal axis"
-msgstr "Додатковий інтервал для дочірнього об’єкта за горизонтальною віссю"
-
-#: ../clutter/clutter-table-layout.c:582
-msgid "Vertical Expand"
-msgstr "Вертикальне розширення"
-
-#: ../clutter/clutter-table-layout.c:583
-msgid "Allocate extra space for the child in vertical axis"
-msgstr "Додатковий інтервал для дочірнього об’єкта за вертикальною віссю"
-
-#: ../clutter/clutter-table-layout.c:1638
-msgid "Spacing between columns"
-msgstr "Інтервал між стовпчиками"
-
-#: ../clutter/clutter-table-layout.c:1652
-msgid "Spacing between rows"
-msgstr "Інтервал між рядками"
-
-#: ../clutter/clutter-text-buffer.c:351 ../clutter/clutter-text.c:3394
+#: ../clutter/clutter-text-buffer.c:347 ../clutter/clutter-text.c:3439
 msgid "Text"
 msgstr "Текст"
 
-#: ../clutter/clutter-text-buffer.c:352
+#: ../clutter/clutter-text-buffer.c:348
 msgid "The contents of the buffer"
 msgstr "Вміст буфера"
 
-#: ../clutter/clutter-text-buffer.c:365
+#: ../clutter/clutter-text-buffer.c:361
 msgid "Text length"
 msgstr "Довжина тексту"
 
-#: ../clutter/clutter-text-buffer.c:366
+#: ../clutter/clutter-text-buffer.c:362
 msgid "Length of the text currently in the buffer"
 msgstr "Довжина поточного тексту в буфері"
 
-#: ../clutter/clutter-text-buffer.c:379
+#: ../clutter/clutter-text-buffer.c:375
 msgid "Maximum length"
 msgstr "Максимальна довжина"
 
-#: ../clutter/clutter-text-buffer.c:380
+#: ../clutter/clutter-text-buffer.c:376
 msgid "Maximum number of characters for this entry. Zero if no maximum"
 msgstr ""
 "Максимальна кількість символів для цього запису. Нуль, якщо без максимуму"
 
-#: ../clutter/clutter-text.c:3341
+#: ../clutter/clutter-text.c:3386
 msgid "Buffer"
 msgstr "Буфер"
 
-#: ../clutter/clutter-text.c:3342
+#: ../clutter/clutter-text.c:3387
 msgid "The buffer for the text"
 msgstr "Буфер для тексту"
 
-#: ../clutter/clutter-text.c:3360
+#: ../clutter/clutter-text.c:3405
 msgid "The font to be used by the text"
 msgstr "Шрифт, який буде використано для тексту"
 
-#: ../clutter/clutter-text.c:3377
+#: ../clutter/clutter-text.c:3422
 msgid "Font Description"
 msgstr "Опис шрифту"
 
-#: ../clutter/clutter-text.c:3378
+#: ../clutter/clutter-text.c:3423
 msgid "The font description to be used"
 msgstr "Опис шрифту, який буде використано"
 
-#: ../clutter/clutter-text.c:3395
+#: ../clutter/clutter-text.c:3440
 msgid "The text to render"
 msgstr "Текст для показу"
 
-#: ../clutter/clutter-text.c:3409
+#: ../clutter/clutter-text.c:3454
 msgid "Font Color"
 msgstr "Колір шрифту"
 
-#: ../clutter/clutter-text.c:3410
+#: ../clutter/clutter-text.c:3455
 msgid "Color of the font used by the text"
 msgstr "Колір символів шрифту, які буде використано для показу тексту"
 
-#: ../clutter/clutter-text.c:3425
+#: ../clutter/clutter-text.c:3470
 msgid "Editable"
 msgstr "Можна редагувати"
 
-#: ../clutter/clutter-text.c:3426
+#: ../clutter/clutter-text.c:3471
 msgid "Whether the text is editable"
 msgstr "Визначає, чи можна редагувати текст"
 
-#: ../clutter/clutter-text.c:3441
+#: ../clutter/clutter-text.c:3486
 msgid "Selectable"
 msgstr "Можна позначати"
 
-#: ../clutter/clutter-text.c:3442
+#: ../clutter/clutter-text.c:3487
 msgid "Whether the text is selectable"
 msgstr "Визначає, чи можна позначати фрагменти тексту"
 
-#: ../clutter/clutter-text.c:3456
+#: ../clutter/clutter-text.c:3501
 msgid "Activatable"
 msgstr "Можна активувати"
 
-#: ../clutter/clutter-text.c:3457
+#: ../clutter/clutter-text.c:3502
 msgid "Whether pressing return causes the activate signal to be emitted"
 msgstr ""
 "Визначає, чи буде випущено сигнал активації у відповідь на натискання "
 "клавіші Enter"
 
-#: ../clutter/clutter-text.c:3474
+#: ../clutter/clutter-text.c:3519
 msgid "Whether the input cursor is visible"
 msgstr "Визначає, чи буде видимим курсор введення тексту"
 
-#: ../clutter/clutter-text.c:3488 ../clutter/clutter-text.c:3489
+#: ../clutter/clutter-text.c:3533 ../clutter/clutter-text.c:3534
 msgid "Cursor Color"
 msgstr "Колір курсора"
 
-#: ../clutter/clutter-text.c:3504
+#: ../clutter/clutter-text.c:3549
 msgid "Cursor Color Set"
 msgstr "Встановлення кольору курсора"
 
-#: ../clutter/clutter-text.c:3505
+#: ../clutter/clutter-text.c:3550
 msgid "Whether the cursor color has been set"
 msgstr "Визначає, чи встановлено колір курсора"
 
-#: ../clutter/clutter-text.c:3520
+#: ../clutter/clutter-text.c:3565
 msgid "Cursor Size"
 msgstr "Розмір курсора"
 
-#: ../clutter/clutter-text.c:3521
+#: ../clutter/clutter-text.c:3566
 msgid "The width of the cursor, in pixels"
 msgstr "Ширина курсора у пікселях"
 
-#: ../clutter/clutter-text.c:3537 ../clutter/clutter-text.c:3555
+#: ../clutter/clutter-text.c:3582 ../clutter/clutter-text.c:3600
 msgid "Cursor Position"
 msgstr "Розташування курсора"
 
-#: ../clutter/clutter-text.c:3538 ../clutter/clutter-text.c:3556
+#: ../clutter/clutter-text.c:3583 ../clutter/clutter-text.c:3601
 msgid "The cursor position"
 msgstr "Розташування курсора"
 
-#: ../clutter/clutter-text.c:3571
+#: ../clutter/clutter-text.c:3616
 msgid "Selection-bound"
 msgstr "Межа позначеного"
 
-#: ../clutter/clutter-text.c:3572
+#: ../clutter/clutter-text.c:3617
 msgid "The cursor position of the other end of the selection"
 msgstr "Розташування курсора на іншому кінці позначеного фрагмента"
 
-#: ../clutter/clutter-text.c:3587 ../clutter/clutter-text.c:3588
+#: ../clutter/clutter-text.c:3632 ../clutter/clutter-text.c:3633
 msgid "Selection Color"
 msgstr "Колір позначення"
 
-#: ../clutter/clutter-text.c:3603
+#: ../clutter/clutter-text.c:3648
 msgid "Selection Color Set"
 msgstr "Встановлення кольору позначеного"
 
-#: ../clutter/clutter-text.c:3604
+#: ../clutter/clutter-text.c:3649
 msgid "Whether the selection color has been set"
 msgstr "Визначає, чи встановлено колір позначеного фрагмента"
 
-#: ../clutter/clutter-text.c:3619
+#: ../clutter/clutter-text.c:3664
 msgid "Attributes"
 msgstr "Атрибути"
 
-#: ../clutter/clutter-text.c:3620
+#: ../clutter/clutter-text.c:3665
 msgid "A list of style attributes to apply to the contents of the actor"
 msgstr "Список стилів атрибутів, який слід застосувати до даних актора"
 
-#: ../clutter/clutter-text.c:3642
+#: ../clutter/clutter-text.c:3687
 msgid "Use markup"
 msgstr "Використовувати розмітку"
 
-#: ../clutter/clutter-text.c:3643
+#: ../clutter/clutter-text.c:3688
 msgid "Whether or not the text includes Pango markup"
 msgstr "Визначає, чи є розмітка Pango частиною тексту"
 
-#: ../clutter/clutter-text.c:3659
+#: ../clutter/clutter-text.c:3704
 msgid "Line wrap"
 msgstr "Розбиття на рядки"
 
-#: ../clutter/clutter-text.c:3660
+#: ../clutter/clutter-text.c:3705
 msgid "If set, wrap the lines if the text becomes too wide"
 msgstr ""
 "Якщо встановлено, поділяти текст на рядки, якщо текст буде занадто широким"
 
-#: ../clutter/clutter-text.c:3675
+#: ../clutter/clutter-text.c:3720
 msgid "Line wrap mode"
 msgstr "Режим розбиття на рядки"
 
-#: ../clutter/clutter-text.c:3676
+#: ../clutter/clutter-text.c:3721
 msgid "Control how line-wrapping is done"
 msgstr "Керувати способом розбиття на рядки"
 
-#: ../clutter/clutter-text.c:3691
+#: ../clutter/clutter-text.c:3736
 msgid "Ellipsize"
 msgstr "Трикрапка"
 
-#: ../clutter/clutter-text.c:3692
+#: ../clutter/clutter-text.c:3737
 msgid "The preferred place to ellipsize the string"
 msgstr "Бажане місце розташування трикрапки у рядку"
 
-#: ../clutter/clutter-text.c:3708
+#: ../clutter/clutter-text.c:3753
 msgid "Line Alignment"
 msgstr "Вирівнювання рядка"
 
-#: ../clutter/clutter-text.c:3709
+#: ../clutter/clutter-text.c:3754
 msgid "The preferred alignment for the string, for multi-line text"
 msgstr "Бажане вирівнювання рядка для багаторядкового тексту"
 
-#: ../clutter/clutter-text.c:3725
+#: ../clutter/clutter-text.c:3770
 msgid "Justify"
 msgstr "За шириною"
 
-#: ../clutter/clutter-text.c:3726
+#: ../clutter/clutter-text.c:3771
 msgid "Whether the text should be justified"
 msgstr "Визначає, чи має бути текст вирівняно за шириною"
 
-#: ../clutter/clutter-text.c:3741
+#: ../clutter/clutter-text.c:3786
 msgid "Password Character"
 msgstr "Символ для паролів"
 
-#: ../clutter/clutter-text.c:3742
+#: ../clutter/clutter-text.c:3787
 msgid "If non-zero, use this character to display the actor's contents"
 msgstr ""
 "Якщо має ненульове значення, використовувати цей символ для показу даних "
 "актора"
 
-#: ../clutter/clutter-text.c:3756
+#: ../clutter/clutter-text.c:3801
 msgid "Max Length"
 msgstr "Максимальна довжина"
 
-#: ../clutter/clutter-text.c:3757
+#: ../clutter/clutter-text.c:3802
 msgid "Maximum length of the text inside the actor"
 msgstr "Максимальна довжина тексту у акторі"
 
-#: ../clutter/clutter-text.c:3780
+#: ../clutter/clutter-text.c:3825
 msgid "Single Line Mode"
 msgstr "Режим єдиного рядка"
 
-#: ../clutter/clutter-text.c:3781
+#: ../clutter/clutter-text.c:3826
 msgid "Whether the text should be a single line"
 msgstr "Визначає, чи слід розташовувати текст у єдиному рядку"
 
-#: ../clutter/clutter-text.c:3795 ../clutter/clutter-text.c:3796
+#: ../clutter/clutter-text.c:3840 ../clutter/clutter-text.c:3841
 msgid "Selected Text Color"
 msgstr "Колір позначеного тексту"
 
-#: ../clutter/clutter-text.c:3811
+#: ../clutter/clutter-text.c:3856
 msgid "Selected Text Color Set"
 msgstr "Встановлення кольору позначеного тексту"
 
-#: ../clutter/clutter-text.c:3812
+#: ../clutter/clutter-text.c:3857
 msgid "Whether the selected text color has been set"
 msgstr "Визначає, чи встановлено колір позначеного тексту"
 
-#: ../clutter/clutter-timeline.c:561
-#: ../clutter/deprecated/clutter-animation.c:560
+#: ../clutter/clutter-timeline.c:593
+#: ../clutter/deprecated/clutter-animation.c:557
 msgid "Loop"
 msgstr "Цикл"
 
-#: ../clutter/clutter-timeline.c:562
+#: ../clutter/clutter-timeline.c:594
 msgid "Should the timeline automatically restart"
 msgstr "Визначає, чи слід автоматично перезапускати рух у часі"
 
-#: ../clutter/clutter-timeline.c:576
+#: ../clutter/clutter-timeline.c:608
 msgid "Delay"
 msgstr "Затримка"
 
-#: ../clutter/clutter-timeline.c:577
+#: ../clutter/clutter-timeline.c:609
 msgid "Delay before start"
 msgstr "Затримка перед початком"
 
-#: ../clutter/clutter-timeline.c:592
-#: ../clutter/deprecated/clutter-animation.c:544
-#: ../clutter/deprecated/clutter-animator.c:1803
+#: ../clutter/clutter-timeline.c:624
+#: ../clutter/deprecated/clutter-animation.c:541
+#: ../clutter/deprecated/clutter-animator.c:1801
 #: ../clutter/deprecated/clutter-media.c:224
-#: ../clutter/deprecated/clutter-state.c:1522
+#: ../clutter/deprecated/clutter-state.c:1517
 msgid "Duration"
 msgstr "Тривалість"
 
-#: ../clutter/clutter-timeline.c:593
+#: ../clutter/clutter-timeline.c:625
 msgid "Duration of the timeline in milliseconds"
 msgstr "Тривалість за часом у мілісекундах"
 
-#: ../clutter/clutter-timeline.c:608
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:528
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:337
+#: ../clutter/clutter-timeline.c:640
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:521
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:330
 msgid "Direction"
 msgstr "Напрямок"
 
-#: ../clutter/clutter-timeline.c:609
+#: ../clutter/clutter-timeline.c:641
 msgid "Direction of the timeline"
 msgstr "Напрямок руху часу"
 
-#: ../clutter/clutter-timeline.c:624
+#: ../clutter/clutter-timeline.c:656
 msgid "Auto Reverse"
 msgstr "Автоматичне перевертання"
 
-#: ../clutter/clutter-timeline.c:625
+#: ../clutter/clutter-timeline.c:657
 msgid "Whether the direction should be reversed when reaching the end"
 msgstr ""
 "Визначає, чи слід автоматично виконувати зворотний рух після повного "
 "виконання прямого руху"
 
-#: ../clutter/clutter-timeline.c:643
+#: ../clutter/clutter-timeline.c:675
 msgid "Repeat Count"
 msgstr "Кількість повторів"
 
-#: ../clutter/clutter-timeline.c:644
+#: ../clutter/clutter-timeline.c:676
 msgid "How many times the timeline should repeat"
 msgstr "Скільки разів шкалі часу слід повторитись"
 
-#: ../clutter/clutter-timeline.c:658
+#: ../clutter/clutter-timeline.c:690
 msgid "Progress Mode"
 msgstr "Режим поступу"
 
-#: ../clutter/clutter-timeline.c:659
+#: ../clutter/clutter-timeline.c:691
 msgid "How the timeline should compute the progress"
 msgstr "Як шкалі часу слід обчислювати поступ"
 
-#: ../clutter/clutter-transition.c:246
+#: ../clutter/clutter-transition.c:244
 msgid "Interval"
 msgstr "Інтервал"
 
-#: ../clutter/clutter-transition.c:247
+#: ../clutter/clutter-transition.c:245
 msgid "The interval of values to transition"
 msgstr "Інтервал значень для переходу"
 
-#: ../clutter/clutter-transition.c:261
+#: ../clutter/clutter-transition.c:259
 msgid "Animatable"
 msgstr "Можна анімувати"
 
-#: ../clutter/clutter-transition.c:262
+#: ../clutter/clutter-transition.c:260
 msgid "The animatable object"
 msgstr "Придатний до анімування об’єкт"
 
-#: ../clutter/clutter-transition.c:283
+#: ../clutter/clutter-transition.c:281
 msgid "Remove on Complete"
 msgstr "Вилучати по завершенню"
 
-#: ../clutter/clutter-transition.c:284
+#: ../clutter/clutter-transition.c:282
 msgid "Detach the transition when completed"
 msgstr "Від’єднати перехід після завершення"
 
-#: ../clutter/deprecated/clutter-alpha.c:355
-#: ../clutter/deprecated/clutter-animation.c:575
-#: ../clutter/deprecated/clutter-animator.c:1820
+#: ../clutter/clutter-zoom-action.c:355
+#| msgid "Axis"
+msgid "Zoom Axis"
+msgstr "Масштабувати вісь "
+
+#: ../clutter/clutter-zoom-action.c:356
+#| msgid "Constraints the dragging to an axis"
+msgid "Constraints the zoom to an axis"
+msgstr "Обмеження масштабування до вісі"
+
+#: ../clutter/deprecated/clutter-alpha.c:354
+#: ../clutter/deprecated/clutter-animation.c:572
+#: ../clutter/deprecated/clutter-animator.c:1818
 msgid "Timeline"
 msgstr "Шкала часу"
 
-#: ../clutter/deprecated/clutter-alpha.c:356
+#: ../clutter/deprecated/clutter-alpha.c:355
 msgid "Timeline used by the alpha"
 msgstr "Шкала часу, яку слід використати для прозорості"
 
-#: ../clutter/deprecated/clutter-alpha.c:372
+#: ../clutter/deprecated/clutter-alpha.c:371
 msgid "Alpha value"
 msgstr "Рівень прозорості"
 
-#: ../clutter/deprecated/clutter-alpha.c:373
+#: ../clutter/deprecated/clutter-alpha.c:372
 msgid "Alpha value as computed by the alpha"
 msgstr "Обчислене значення прозорості"
 
-#: ../clutter/deprecated/clutter-alpha.c:394
-#: ../clutter/deprecated/clutter-animation.c:528
+#: ../clutter/deprecated/clutter-alpha.c:393
+#: ../clutter/deprecated/clutter-animation.c:525
 msgid "Mode"
 msgstr "Режим"
 
-#: ../clutter/deprecated/clutter-alpha.c:395
+#: ../clutter/deprecated/clutter-alpha.c:394
 msgid "Progress mode"
 msgstr "Режим показу поступу"
 
-#: ../clutter/deprecated/clutter-animation.c:511
+#: ../clutter/deprecated/clutter-animation.c:508
 msgid "Object"
 msgstr "Об'єкт"
 
-#: ../clutter/deprecated/clutter-animation.c:512
+#: ../clutter/deprecated/clutter-animation.c:509
 msgid "Object to which the animation applies"
 msgstr "Об’єкт, до якого застосовано анімацію"
 
-#: ../clutter/deprecated/clutter-animation.c:529
+#: ../clutter/deprecated/clutter-animation.c:526
 msgid "The mode of the animation"
 msgstr "Режим анімації"
 
-#: ../clutter/deprecated/clutter-animation.c:545
+#: ../clutter/deprecated/clutter-animation.c:542
 msgid "Duration of the animation, in milliseconds"
 msgstr "Тривалість анімації у мілісекундах"
 
-#: ../clutter/deprecated/clutter-animation.c:561
+#: ../clutter/deprecated/clutter-animation.c:558
 msgid "Whether the animation should loop"
 msgstr "Визначає, чи слід циклічно відтворювати анімацію"
 
-#: ../clutter/deprecated/clutter-animation.c:576
+#: ../clutter/deprecated/clutter-animation.c:573
 msgid "The timeline used by the animation"
 msgstr "Лінійка часу, використана для анімації"
 
-#: ../clutter/deprecated/clutter-animation.c:592
-#: ../clutter/deprecated/clutter-behaviour.c:241
+#: ../clutter/deprecated/clutter-animation.c:589
+#: ../clutter/deprecated/clutter-behaviour.c:237
 msgid "Alpha"
 msgstr "Прозорість"
 
-#: ../clutter/deprecated/clutter-animation.c:593
+#: ../clutter/deprecated/clutter-animation.c:590
 msgid "The alpha used by the animation"
 msgstr "Рівень прозорості, використаний для анімації"
 
-#: ../clutter/deprecated/clutter-animator.c:1804
+#: ../clutter/deprecated/clutter-animator.c:1802
 msgid "The duration of the animation"
 msgstr "Тривалість анімації"
 
-#: ../clutter/deprecated/clutter-animator.c:1821
+#: ../clutter/deprecated/clutter-animator.c:1819
 msgid "The timeline of the animation"
 msgstr "Лінійка часу, використана для анімації"
 
-#: ../clutter/deprecated/clutter-behaviour.c:242
+#: ../clutter/deprecated/clutter-behaviour.c:238
 msgid "Alpha Object to drive the behaviour"
 msgstr "Альфа-об’єкт (об’єкт прозорості), що керує поведінкою"
 
-#: ../clutter/deprecated/clutter-behaviour-depth.c:182
+#: ../clutter/deprecated/clutter-behaviour-depth.c:180
 msgid "Start Depth"
 msgstr "Початкова глибина"
 
-#: ../clutter/deprecated/clutter-behaviour-depth.c:183
+#: ../clutter/deprecated/clutter-behaviour-depth.c:181
 msgid "Initial depth to apply"
 msgstr "Початкова глибина"
 
-#: ../clutter/deprecated/clutter-behaviour-depth.c:198
+#: ../clutter/deprecated/clutter-behaviour-depth.c:196
 msgid "End Depth"
 msgstr "Кінцева глибина"
 
-#: ../clutter/deprecated/clutter-behaviour-depth.c:199
+#: ../clutter/deprecated/clutter-behaviour-depth.c:197
 msgid "Final depth to apply"
 msgstr "Остаточна глибина"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:401
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:394
 msgid "Start Angle"
 msgstr "Початковий кут"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:402
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:284
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:395
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:277
 msgid "Initial angle"
 msgstr "Початковий кут"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:417
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:410
 msgid "End Angle"
 msgstr "Кінцевий кут"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:418
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:302
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:411
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:295
 msgid "Final angle"
 msgstr "Остаточний кут"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:433
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:426
 msgid "Angle x tilt"
 msgstr "Кут нахилу за X"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:434
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:427
 msgid "Tilt of the ellipse around x axis"
 msgstr "Нахил еліпса за віссю X"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:449
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:442
 msgid "Angle y tilt"
 msgstr "Кут нахилу за Y"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:450
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:443
 msgid "Tilt of the ellipse around y axis"
 msgstr "Нахил еліпса за віссю Y"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:465
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:458
 msgid "Angle z tilt"
 msgstr "Кут нахилу за Z"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:466
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:459
 msgid "Tilt of the ellipse around z axis"
 msgstr "Нахил еліпса за віссю Z"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:482
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:475
 msgid "Width of the ellipse"
 msgstr "Ширина еліпса"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:498
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:491
 msgid "Height of ellipse"
 msgstr "Висота еліпса"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:513
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:506
 msgid "Center"
 msgstr "Центр"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:514
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:507
 msgid "Center of ellipse"
 msgstr "Центр еліпса"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:529
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:338
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:522
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:331
 msgid "Direction of rotation"
 msgstr "Напрямок обертання"
 
-#: ../clutter/deprecated/clutter-behaviour-opacity.c:184
+#: ../clutter/deprecated/clutter-behaviour-opacity.c:177
 msgid "Opacity Start"
 msgstr "Початкова непрозорість"
 
-#: ../clutter/deprecated/clutter-behaviour-opacity.c:185
+#: ../clutter/deprecated/clutter-behaviour-opacity.c:178
 msgid "Initial opacity level"
 msgstr "Початковий рівень непрозорості"
 
-#: ../clutter/deprecated/clutter-behaviour-opacity.c:202
+#: ../clutter/deprecated/clutter-behaviour-opacity.c:195
 msgid "Opacity End"
 msgstr "Кінцева непрозорість"
 
-#: ../clutter/deprecated/clutter-behaviour-opacity.c:203
+#: ../clutter/deprecated/clutter-behaviour-opacity.c:196
 msgid "Final opacity level"
 msgstr "Остаточний рівень непрозорості"
 
-#: ../clutter/deprecated/clutter-behaviour-path.c:226
+#: ../clutter/deprecated/clutter-behaviour-path.c:222
 msgid "The ClutterPath object representing the path to animate along"
 msgstr ""
 "Об’єкт ClutterPath, що відповідає контуру, вздовж якого відбуватиметься "
 "анімація"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:283
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:276
 msgid "Angle Begin"
 msgstr "Початковий кут"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:301
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:294
 msgid "Angle End"
 msgstr "Кінцевий кут"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:319
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:312
 msgid "Axis"
 msgstr "Вісь"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:320
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:313
 msgid "Axis of rotation"
 msgstr "Вісь обертання"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:355
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:348
 msgid "Center X"
 msgstr "X центра"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:356
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:349
 msgid "X coordinate of the center of rotation"
 msgstr "Координата X центра обертання"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:373
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:366
 msgid "Center Y"
 msgstr "Y центра"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:374
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:367
 msgid "Y coordinate of the center of rotation"
 msgstr "Координата Y центра обертання"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:391
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:384
 msgid "Center Z"
 msgstr "Z центра"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:392
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:385
 msgid "Z coordinate of the center of rotation"
 msgstr "Координата Z центра обертання"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:226
+#: ../clutter/deprecated/clutter-behaviour-scale.c:222
 msgid "X Start Scale"
 msgstr "Початковий масштаб за X"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:227
+#: ../clutter/deprecated/clutter-behaviour-scale.c:223
 msgid "Initial scale on the X axis"
 msgstr "Початковий масштаб за віссю X"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:245
+#: ../clutter/deprecated/clutter-behaviour-scale.c:241
 msgid "X End Scale"
 msgstr "Кінцевий масштаб за X"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:246
+#: ../clutter/deprecated/clutter-behaviour-scale.c:242
 msgid "Final scale on the X axis"
 msgstr "Кінцевий масштаб за віссю X"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:264
+#: ../clutter/deprecated/clutter-behaviour-scale.c:260
 msgid "Y Start Scale"
 msgstr "Початковий масштаб за Y"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:265
+#: ../clutter/deprecated/clutter-behaviour-scale.c:261
 msgid "Initial scale on the Y axis"
 msgstr "Початковий масштаб за віссю Y"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:283
+#: ../clutter/deprecated/clutter-behaviour-scale.c:279
 msgid "Y End Scale"
 msgstr "Кінцевий масштаб за Y"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:284
+#: ../clutter/deprecated/clutter-behaviour-scale.c:280
 msgid "Final scale on the Y axis"
 msgstr "Кінцевий масштаб за віссю Y"
 
-#: ../clutter/deprecated/clutter-box.c:261
+#: ../clutter/deprecated/clutter-box.c:257
 msgid "The background color of the box"
 msgstr "Колір тла області"
 
-#: ../clutter/deprecated/clutter-box.c:274
+#: ../clutter/deprecated/clutter-box.c:270
 msgid "Color Set"
 msgstr "Встановлення кольору"
 
-#: ../clutter/deprecated/clutter-cairo-texture.c:597
+#: ../clutter/deprecated/clutter-cairo-texture.c:593
 msgid "Surface Width"
 msgstr "Ширина поверхні"
 
-#: ../clutter/deprecated/clutter-cairo-texture.c:598
+#: ../clutter/deprecated/clutter-cairo-texture.c:594
 msgid "The width of the Cairo surface"
 msgstr "Ширина поверхні Cairo"
 
-#: ../clutter/deprecated/clutter-cairo-texture.c:615
+#: ../clutter/deprecated/clutter-cairo-texture.c:611
 msgid "Surface Height"
 msgstr "Висота поверхні"
 
-#: ../clutter/deprecated/clutter-cairo-texture.c:616
+#: ../clutter/deprecated/clutter-cairo-texture.c:612
 msgid "The height of the Cairo surface"
 msgstr "Висота поверхні Cairo"
 
-#: ../clutter/deprecated/clutter-cairo-texture.c:636
+#: ../clutter/deprecated/clutter-cairo-texture.c:632
 msgid "Auto Resize"
 msgstr "Автоматична зміна розмірів"
 
-#: ../clutter/deprecated/clutter-cairo-texture.c:637
+#: ../clutter/deprecated/clutter-cairo-texture.c:633
 msgid "Whether the surface should match the allocation"
 msgstr "Визначає, чи має поверхня відповідати виділеній для неї області"
 
@@ -2352,100 +2429,156 @@ msgstr "Рівень заповнення рамки"
 msgid "The duration of the stream, in seconds"
 msgstr "Тривалість відтворення потокових даних, у секундах"
 
-#: ../clutter/deprecated/clutter-rectangle.c:273
+#: ../clutter/deprecated/clutter-rectangle.c:271
 msgid "The color of the rectangle"
 msgstr "Колір прямокутника"
 
-#: ../clutter/deprecated/clutter-rectangle.c:286
+#: ../clutter/deprecated/clutter-rectangle.c:284
 msgid "Border Color"
 msgstr "Колір рамки"
 
-#: ../clutter/deprecated/clutter-rectangle.c:287
+#: ../clutter/deprecated/clutter-rectangle.c:285
 msgid "The color of the border of the rectangle"
 msgstr "Колір межі прямокутника"
 
-#: ../clutter/deprecated/clutter-rectangle.c:302
+#: ../clutter/deprecated/clutter-rectangle.c:300
 msgid "Border Width"
 msgstr "Ширина рамки"
 
-#: ../clutter/deprecated/clutter-rectangle.c:303
+#: ../clutter/deprecated/clutter-rectangle.c:301
 msgid "The width of the border of the rectangle"
 msgstr "Ширина межі прямокутника"
 
-#: ../clutter/deprecated/clutter-rectangle.c:317
+#: ../clutter/deprecated/clutter-rectangle.c:315
 msgid "Has Border"
 msgstr "Має рамку"
 
-#: ../clutter/deprecated/clutter-rectangle.c:318
+#: ../clutter/deprecated/clutter-rectangle.c:316
 msgid "Whether the rectangle should have a border"
 msgstr "Визначає, чи має прямокутник межу"
 
-#: ../clutter/deprecated/clutter-shader.c:261
+#: ../clutter/deprecated/clutter-shader.c:257
 msgid "Vertex Source"
 msgstr "Джерело вертекса"
 
-#: ../clutter/deprecated/clutter-shader.c:262
+#: ../clutter/deprecated/clutter-shader.c:258
 msgid "Source of vertex shader"
 msgstr "Джерело вершинної програми для побудови тіней"
 
-#: ../clutter/deprecated/clutter-shader.c:278
+#: ../clutter/deprecated/clutter-shader.c:274
 msgid "Fragment Source"
 msgstr "Джерело фрагмента"
 
-#: ../clutter/deprecated/clutter-shader.c:279
+#: ../clutter/deprecated/clutter-shader.c:275
 msgid "Source of fragment shader"
 msgstr "Джерело програми для побудови тіней фрагментів"
 
-#: ../clutter/deprecated/clutter-shader.c:296
+#: ../clutter/deprecated/clutter-shader.c:292
 msgid "Compiled"
 msgstr "Зібрано"
 
-#: ../clutter/deprecated/clutter-shader.c:297
+#: ../clutter/deprecated/clutter-shader.c:293
 msgid "Whether the shader is compiled and linked"
 msgstr "Визначає, чи програму для побудови тіней зібрано і скомпоновано"
 
-#: ../clutter/deprecated/clutter-shader.c:314
+#: ../clutter/deprecated/clutter-shader.c:310
 msgid "Whether the shader is enabled"
 msgstr "Визначає, чи увімкнено програму для побудови тіней"
 
-#: ../clutter/deprecated/clutter-shader.c:525
+#: ../clutter/deprecated/clutter-shader.c:521
 #, c-format
 msgid "%s compilation failed: %s"
 msgstr "Спроба збирання %s зазнала невдачі: %s"
 
-#: ../clutter/deprecated/clutter-shader.c:526
+#: ../clutter/deprecated/clutter-shader.c:522
 msgid "Vertex shader"
 msgstr "Шейдер вершин"
 
-#: ../clutter/deprecated/clutter-shader.c:527
+#: ../clutter/deprecated/clutter-shader.c:523
 msgid "Fragment shader"
 msgstr "Шейдер фрагментів"
 
-#: ../clutter/deprecated/clutter-state.c:1504
+#: ../clutter/deprecated/clutter-state.c:1499
 msgid "State"
 msgstr "Стан"
 
-#: ../clutter/deprecated/clutter-state.c:1505
+#: ../clutter/deprecated/clutter-state.c:1500
 msgid "Currently set state, (transition to this state might not be complete)"
 msgstr "Поточний встановлений стан (перехід до цього стану може бути неповним)"
 
-#: ../clutter/deprecated/clutter-state.c:1523
+#: ../clutter/deprecated/clutter-state.c:1518
 msgid "Default transition duration"
 msgstr "Типова тривалість переходу"
 
-#: ../clutter/deprecated/clutter-texture.c:994
+#: ../clutter/deprecated/clutter-table-layout.c:543
+msgid "Column Number"
+msgstr "Номер стовпчика"
+
+#: ../clutter/deprecated/clutter-table-layout.c:544
+msgid "The column the widget resides in"
+msgstr "Стовпчик, у якому розташовуватиметься віджет"
+
+#: ../clutter/deprecated/clutter-table-layout.c:551
+msgid "Row Number"
+msgstr "Номер рядка"
+
+#: ../clutter/deprecated/clutter-table-layout.c:552
+msgid "The row the widget resides in"
+msgstr "Рядок, у якому розташовуватиметься віджет"
+
+#: ../clutter/deprecated/clutter-table-layout.c:559
+msgid "Column Span"
+msgstr "Кількість стовпчиків"
+
+#: ../clutter/deprecated/clutter-table-layout.c:560
+msgid "The number of columns the widget should span"
+msgstr "Кількість стовпчиків, у яких розміщуватиметься віджет"
+
+#: ../clutter/deprecated/clutter-table-layout.c:567
+msgid "Row Span"
+msgstr "Кількість рядків"
+
+#: ../clutter/deprecated/clutter-table-layout.c:568
+msgid "The number of rows the widget should span"
+msgstr "Кількість рядків, у яких розміщуватиметься віджет"
+
+#: ../clutter/deprecated/clutter-table-layout.c:575
+msgid "Horizontal Expand"
+msgstr "Горизонтальне розширення"
+
+#: ../clutter/deprecated/clutter-table-layout.c:576
+msgid "Allocate extra space for the child in horizontal axis"
+msgstr "Додатковий інтервал для дочірнього об’єкта за горизонтальною віссю"
+
+#: ../clutter/deprecated/clutter-table-layout.c:582
+msgid "Vertical Expand"
+msgstr "Вертикальне розширення"
+
+#: ../clutter/deprecated/clutter-table-layout.c:583
+msgid "Allocate extra space for the child in vertical axis"
+msgstr "Додатковий інтервал для дочірнього об’єкта за вертикальною віссю"
+
+#: ../clutter/deprecated/clutter-table-layout.c:1638
+msgid "Spacing between columns"
+msgstr "Інтервал між стовпчиками"
+
+#: ../clutter/deprecated/clutter-table-layout.c:1654
+msgid "Spacing between rows"
+msgstr "Інтервал між рядками"
+
+#: ../clutter/deprecated/clutter-texture.c:992
 msgid "Sync size of actor"
 msgstr "Синхронізація розмірів актора"
 
-#: ../clutter/deprecated/clutter-texture.c:995
+#: ../clutter/deprecated/clutter-texture.c:993
 msgid "Auto sync size of actor to underlying pixbuf dimensions"
 msgstr "Автоматична синхронізація розмірів актора за розмірами буфера пікселів"
 
-#: ../clutter/deprecated/clutter-texture.c:1002
+#: ../clutter/deprecated/clutter-texture.c:1000
 msgid "Disable Slicing"
 msgstr "Вимикання зрізання"
 
-#: ../clutter/deprecated/clutter-texture.c:1003
+#: ../clutter/deprecated/clutter-texture.c:1001
 msgid ""
 "Forces the underlying texture to be singular and not made of smaller space "
 "saving individual textures"
@@ -2453,77 +2586,77 @@ msgstr ""
 "Примусове використання єдиної підлеглої текстури, замість меншого простору "
 "зі збереженими окремими текстурами"
 
-#: ../clutter/deprecated/clutter-texture.c:1012
+#: ../clutter/deprecated/clutter-texture.c:1010
 msgid "Tile Waste"
 msgstr "Залишок плитки"
 
-#: ../clutter/deprecated/clutter-texture.c:1013
+#: ../clutter/deprecated/clutter-texture.c:1011
 msgid "Maximum waste area of a sliced texture"
 msgstr "Максимальна залишкова область зрізаної текстури"
 
-#: ../clutter/deprecated/clutter-texture.c:1021
+#: ../clutter/deprecated/clutter-texture.c:1019
 msgid "Horizontal repeat"
 msgstr "Горизонтальне повторення"
 
-#: ../clutter/deprecated/clutter-texture.c:1022
+#: ../clutter/deprecated/clutter-texture.c:1020
 msgid "Repeat the contents rather than scaling them horizontally"
 msgstr "Повторювати дані замість їх горизонтального масштабування"
 
-#: ../clutter/deprecated/clutter-texture.c:1029
+#: ../clutter/deprecated/clutter-texture.c:1027
 msgid "Vertical repeat"
 msgstr "Вертикальне повторення"
 
-#: ../clutter/deprecated/clutter-texture.c:1030
+#: ../clutter/deprecated/clutter-texture.c:1028
 msgid "Repeat the contents rather than scaling them vertically"
 msgstr "Повторювати дані замість їх вертикального масштабування"
 
-#: ../clutter/deprecated/clutter-texture.c:1037
+#: ../clutter/deprecated/clutter-texture.c:1035
 msgid "Filter Quality"
 msgstr "Якість фільтрування"
 
-#: ../clutter/deprecated/clutter-texture.c:1038
+#: ../clutter/deprecated/clutter-texture.c:1036
 msgid "Rendering quality used when drawing the texture"
 msgstr "Якість показу для малювання текстури"
 
-#: ../clutter/deprecated/clutter-texture.c:1046
+#: ../clutter/deprecated/clutter-texture.c:1044
 msgid "Pixel Format"
 msgstr "Формат пікселя"
 
-#: ../clutter/deprecated/clutter-texture.c:1047
+#: ../clutter/deprecated/clutter-texture.c:1045
 msgid "The Cogl pixel format to use"
 msgstr "Формат пікселя бібліотеки Cogl, який слід використати"
 
-#: ../clutter/deprecated/clutter-texture.c:1055
-#: ../clutter/wayland/clutter-wayland-surface.c:449
+#: ../clutter/deprecated/clutter-texture.c:1053
+#: ../clutter/wayland/clutter-wayland-surface.c:445
 msgid "Cogl Texture"
 msgstr "Текстура Cogl"
 
-#: ../clutter/deprecated/clutter-texture.c:1056
-#: ../clutter/wayland/clutter-wayland-surface.c:450
+#: ../clutter/deprecated/clutter-texture.c:1054
+#: ../clutter/wayland/clutter-wayland-surface.c:446
 msgid "The underlying Cogl texture handle used to draw this actor"
 msgstr ""
 "Елемент керування підлеглою текстурою Cogl, який використано для малювання "
 "цього актора"
 
-#: ../clutter/deprecated/clutter-texture.c:1063
+#: ../clutter/deprecated/clutter-texture.c:1061
 msgid "Cogl Material"
 msgstr "Матеріал Cogl"
 
-#: ../clutter/deprecated/clutter-texture.c:1064
+#: ../clutter/deprecated/clutter-texture.c:1062
 msgid "The underlying Cogl material handle used to draw this actor"
 msgstr ""
 "Елемент керування підлеглим матеріалом Cogl, який використано для малювання "
 "цього актора"
 
-#: ../clutter/deprecated/clutter-texture.c:1083
+#: ../clutter/deprecated/clutter-texture.c:1081
 msgid "The path of the file containing the image data"
 msgstr "Шлях до файла з даними зображення"
 
-#: ../clutter/deprecated/clutter-texture.c:1090
+#: ../clutter/deprecated/clutter-texture.c:1088
 msgid "Keep Aspect Ratio"
 msgstr "Зберігати співвідношення"
 
-#: ../clutter/deprecated/clutter-texture.c:1091
+#: ../clutter/deprecated/clutter-texture.c:1089
 msgid ""
 "Keep the aspect ratio of the texture when requesting the preferred width or "
 "height"
@@ -2531,22 +2664,22 @@ msgstr ""
 "Зберігати співвідношення розмірів текстури під час виконання запитів щодо "
 "бажаної ширини і висоти"
 
-#: ../clutter/deprecated/clutter-texture.c:1119
+#: ../clutter/deprecated/clutter-texture.c:1117
 msgid "Load asynchronously"
 msgstr "Асинхронне завантаження"
 
-#: ../clutter/deprecated/clutter-texture.c:1120
+#: ../clutter/deprecated/clutter-texture.c:1118
 msgid ""
 "Load files inside a thread to avoid blocking when loading images from disk"
 msgstr ""
 "Завантажувати файли у потоці з метою уникнення блокування під час "
 "завантаження зображень з диска"
 
-#: ../clutter/deprecated/clutter-texture.c:1138
+#: ../clutter/deprecated/clutter-texture.c:1136
 msgid "Load data asynchronously"
 msgstr "Завантаження даних у асинхронному режимі"
 
-#: ../clutter/deprecated/clutter-texture.c:1139
+#: ../clutter/deprecated/clutter-texture.c:1137
 msgid ""
 "Decode image data files inside a thread to reduce blocking when loading "
 "images from disk"
@@ -2554,193 +2687,194 @@ msgstr ""
 "Декодувати файли даних зображень у окремому потоці, щоб усунути блокування "
 "під час завантаження зображень з диска"
 
-#: ../clutter/deprecated/clutter-texture.c:1165
+#: ../clutter/deprecated/clutter-texture.c:1163
 msgid "Pick With Alpha"
 msgstr "Брати з прозорістю"
 
-#: ../clutter/deprecated/clutter-texture.c:1166
+#: ../clutter/deprecated/clutter-texture.c:1164
 msgid "Shape actor with alpha channel when picking"
 msgstr "Вибирати актор з каналом прозорості"
 
-#: ../clutter/deprecated/clutter-texture.c:1599
-#: ../clutter/deprecated/clutter-texture.c:1994
-#: ../clutter/deprecated/clutter-texture.c:2090
-#: ../clutter/deprecated/clutter-texture.c:2388
+#: ../clutter/deprecated/clutter-texture.c:1597
+#: ../clutter/deprecated/clutter-texture.c:1992
+#: ../clutter/deprecated/clutter-texture.c:2088
+#: ../clutter/deprecated/clutter-texture.c:2386
 #, c-format
 msgid "Failed to load the image data"
 msgstr "Не вдалося завантажити дані зображення"
 
-#: ../clutter/deprecated/clutter-texture.c:1758
+#: ../clutter/deprecated/clutter-texture.c:1756
 #, c-format
 msgid "YUV textures are not supported"
 msgstr "Підтримки текстур YUV не передбачено"
 
-#: ../clutter/deprecated/clutter-texture.c:1767
+#: ../clutter/deprecated/clutter-texture.c:1765
 #, c-format
 msgid "YUV2 textues are not supported"
 msgstr "Підтримки текстур YUV2 не передбачено"
 
-#: ../clutter/evdev/clutter-input-device-evdev.c:159
+#: ../clutter/evdev/clutter-input-device-evdev.c:154
 msgid "sysfs Path"
 msgstr "Шлях sysfs"
 
-#: ../clutter/evdev/clutter-input-device-evdev.c:160
+#: ../clutter/evdev/clutter-input-device-evdev.c:155
 msgid "Path of the device in sysfs"
 msgstr "Шлях до пристрою у sysfs"
 
-#: ../clutter/evdev/clutter-input-device-evdev.c:175
+#: ../clutter/evdev/clutter-input-device-evdev.c:170
 msgid "Device Path"
 msgstr "Шлях до пристрою"
 
-#: ../clutter/evdev/clutter-input-device-evdev.c:176
+#: ../clutter/evdev/clutter-input-device-evdev.c:171
 msgid "Path of the device node"
 msgstr "Шлях до вузла пристрою"
 
-#: ../clutter/gdk/clutter-backend-gdk.c:294
+#: ../clutter/gdk/clutter-backend-gdk.c:289
 #, c-format
 msgid "Could not find a suitable CoglWinsys for a GdkDisplay of type %s"
 msgstr "Неможливо знайти зручний CoglWinsys для GdkDisplay типу %s"
 
-#: ../clutter/wayland/clutter-wayland-surface.c:423
+#: ../clutter/wayland/clutter-wayland-surface.c:419
 msgid "Surface"
 msgstr "Поверхня"
 
-#: ../clutter/wayland/clutter-wayland-surface.c:424
+#: ../clutter/wayland/clutter-wayland-surface.c:420
 msgid "The underlying wayland surface"
 msgstr "Основна поверхня wayland"
 
-#: ../clutter/wayland/clutter-wayland-surface.c:431
+#: ../clutter/wayland/clutter-wayland-surface.c:427
 msgid "Surface width"
 msgstr "Ширина поверхні"
 
-#: ../clutter/wayland/clutter-wayland-surface.c:432
+#: ../clutter/wayland/clutter-wayland-surface.c:428
 msgid "The width of the underlying wayland surface"
 msgstr "Ширина основної поверхні wayland"
 
-#: ../clutter/wayland/clutter-wayland-surface.c:440
+#: ../clutter/wayland/clutter-wayland-surface.c:436
 msgid "Surface height"
 msgstr "Висота поверхні"
 
-#: ../clutter/wayland/clutter-wayland-surface.c:441
+#: ../clutter/wayland/clutter-wayland-surface.c:437
 msgid "The height of the underlying wayland surface"
 msgstr "Висота основної поверхні wayland"
 
-#: ../clutter/x11/clutter-backend-x11.c:516
+#: ../clutter/x11/clutter-backend-x11.c:488
 msgid "X display to use"
 msgstr "Дисплей сервера X, який буде використано"
 
-#: ../clutter/x11/clutter-backend-x11.c:522
+#: ../clutter/x11/clutter-backend-x11.c:494
 msgid "X screen to use"
 msgstr "Екран сервера X, який буде використано"
 
-#: ../clutter/x11/clutter-backend-x11.c:527
+#: ../clutter/x11/clutter-backend-x11.c:499
 msgid "Make X calls synchronous"
 msgstr "Зробити виклики X синхронними"
 
-#: ../clutter/x11/clutter-backend-x11.c:534
-msgid "Enable XInput support"
-msgstr "Увімкнути підтримку XInput"
+#: ../clutter/x11/clutter-backend-x11.c:506
+#| msgid "Enable XInput support"
+msgid "Disable XInput support"
+msgstr "Вимкнути підтримування XInput"
 
-#: ../clutter/x11/clutter-keymap-x11.c:317
+#: ../clutter/x11/clutter-keymap-x11.c:322
 msgid "The Clutter backend"
 msgstr "Модуль обробки даних Clutter"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:539
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:534
 msgid "Pixmap"
 msgstr "Растр"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:540
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:535
 msgid "The X11 Pixmap to be bound"
 msgstr "Растрові дані X11, які буде прив’язано"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:548
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:543
 msgid "Pixmap width"
 msgstr "Ширина растру"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:549
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:544
 msgid "The width of the pixmap bound to this texture"
 msgstr "Ширина прив’язки растра до цієї текстури"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:557
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:552
 msgid "Pixmap height"
 msgstr "Висота растра"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:558
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:553
 msgid "The height of the pixmap bound to this texture"
 msgstr "Висота прив’язки растра до цієї текстури"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:566
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:561
 msgid "Pixmap Depth"
 msgstr "Глибина растра"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:567
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:562
 msgid "The depth (in number of bits) of the pixmap bound to this texture"
 msgstr "Глибина (у кількості бітів) прив’язки растра до цієї текстури"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:575
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:570
 msgid "Automatic Updates"
 msgstr "Автоматичні оновлення"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:576
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:571
 msgid "If the texture should be kept in sync with any pixmap changes."
 msgstr ""
 "Визначає, чи слід зберігати синхронізацію текстури зі змінами у растрі."
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:584
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:579
 msgid "Window"
 msgstr "Вікно"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:585
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:580
 msgid "The X11 Window to be bound"
 msgstr "Вікно X11 для прив’язки"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:593
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:588
 msgid "Window Redirect Automatic"
 msgstr "Автоматика переспрямування вікна"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:594
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:589
 msgid "If composite window redirects are set to Automatic (or Manual if false)"
 msgstr ""
 "Визначає, чи слід виконувати автоматичне переспрямування композитних вікон "
 "(переспрямування вручну, якщо false)"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:604
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:599
 msgid "Window Mapped"
 msgstr "Відображеність вікна"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:605
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:600
 msgid "If window is mapped"
 msgstr "Визначає, чи відображено вікно"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:614
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:609
 msgid "Destroyed"
 msgstr "Знищеність"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:615
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:610
 msgid "If window has been destroyed"
 msgstr "Визначає, чи було вікно знищено"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:623
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:618
 msgid "Window X"
 msgstr "X вікна"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:624
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:619
 msgid "X position of window on screen according to X11"
 msgstr "Розташування вікна на екрані за X, за даними X11"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:632
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:627
 msgid "Window Y"
 msgstr "Y вікна"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:633
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:628
 msgid "Y position of window on screen according to X11"
 msgstr "Розташування вікна на екрані за Y, за даними X11"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:640
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:635
 msgid "Window Override Redirect"
 msgstr "Переспрямування-перевизначення вікна"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:641
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:636
 msgid "If this is an override-redirect window"
 msgstr ""
 "Визначає, чи вікно належить до вікон з перевизначенням-переспрямуванням"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 31629f805..3fffbe274 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -2,2189 +2,2830 @@
 # clutter 软件包的简体中文翻译.
 # Copyright (C) 2010 Free Software Foundation, Inc.
 # This file is distributed under the same license as the clutter package.
+#
 # Aron Xu <happyaron.xu@gmail.com>, 2010.
+# Sphinx Jiang <yishanj13@gmail.com>, 2013.
+# Wylmer Wang <wantinghard@gmail.com>, 2014.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: clutter master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.clutter-project.org/enter_bug.cgi?"
-"product=clutter\n"
-"POT-Creation-Date: 2011-09-12 13:51+0100\n"
-"PO-Revision-Date: 2011-09-10 15:31+0800\n"
-"Last-Translator: Aron Xu <happyaron.xu@gmail.com>\n"
-"Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+"product=clutter&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2014-03-08 10:36+0000\n"
+"PO-Revision-Date: 2013-12-25 00:25+0800\n"
+"Last-Translator: Wylmer Wang <wantinghard@gmail.com>\n"
+"Language-Team: Chinese Simplified <i18n-zh@googlegroups.com>\n"
 "Language: zh_CN\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"
+"X-Generator: Lokalize 1.5\n"
 
-#: clutter/clutter-actor.c:3852
+#: ../clutter/clutter-actor.c:6214
 msgid "X coordinate"
 msgstr "X 坐标"
 
-#: clutter/clutter-actor.c:3853
+#: ../clutter/clutter-actor.c:6215
 msgid "X coordinate of the actor"
-msgstr ""
+msgstr "角色(actor)的 X 坐标"
 
-#: clutter/clutter-actor.c:3868
+#: ../clutter/clutter-actor.c:6233
 msgid "Y coordinate"
 msgstr "Y 坐标"
 
-#: clutter/clutter-actor.c:3869
+#: ../clutter/clutter-actor.c:6234
 msgid "Y coordinate of the actor"
-msgstr ""
+msgstr "角色(actor)的 Y 坐标"
 
-#: clutter/clutter-actor.c:3884 clutter/clutter-behaviour-ellipse.c:477
+#: ../clutter/clutter-actor.c:6256
+msgid "Position"
+msgstr "位置"
+
+#: ../clutter/clutter-actor.c:6257
+msgid "The position of the origin of the actor"
+msgstr "角色(actor)原点的位置"
+
+#: ../clutter/clutter-actor.c:6274 ../clutter/clutter-canvas.c:247
+#: ../clutter/clutter-grid-layout.c:1239
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:474
 msgid "Width"
 msgstr "宽度"
 
-#: clutter/clutter-actor.c:3885
+#: ../clutter/clutter-actor.c:6275
 msgid "Width of the actor"
-msgstr ""
+msgstr "角色(actor)的宽度"
 
-#: clutter/clutter-actor.c:3899 clutter/clutter-behaviour-ellipse.c:493
+#: ../clutter/clutter-actor.c:6293 ../clutter/clutter-canvas.c:263
+#: ../clutter/clutter-grid-layout.c:1246
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:490
 msgid "Height"
 msgstr "高度"
 
-#: clutter/clutter-actor.c:3900
+#: ../clutter/clutter-actor.c:6294
 msgid "Height of the actor"
-msgstr ""
+msgstr "角色(actor)高度"
 
-#: clutter/clutter-actor.c:3918
+#: ../clutter/clutter-actor.c:6315
+msgid "Size"
+msgstr "尺寸"
+
+#: ../clutter/clutter-actor.c:6316
+msgid "The size of the actor"
+msgstr "角色(actor)的大小"
+
+#: ../clutter/clutter-actor.c:6334
 msgid "Fixed X"
 msgstr "固定 X 坐标"
 
-#: clutter/clutter-actor.c:3919
+#: ../clutter/clutter-actor.c:6335
 msgid "Forced X position of the actor"
-msgstr ""
+msgstr "强制设置角色(actor)的 X 位置"
 
-#: clutter/clutter-actor.c:3937
+#: ../clutter/clutter-actor.c:6352
 msgid "Fixed Y"
 msgstr "固定 Y 坐标"
 
-#: clutter/clutter-actor.c:3938
+#: ../clutter/clutter-actor.c:6353
 msgid "Forced Y position of the actor"
-msgstr ""
+msgstr "强制设置角色(actor)的 Y 位置"
 
-#: clutter/clutter-actor.c:3954
+#: ../clutter/clutter-actor.c:6368
 msgid "Fixed position set"
-msgstr ""
+msgstr "固定位置设置"
 
-#: clutter/clutter-actor.c:3955
+#: ../clutter/clutter-actor.c:6369
 msgid "Whether to use fixed positioning for the actor"
-msgstr ""
+msgstr "是否对角色(actor)使用固定位置"
 
-#: clutter/clutter-actor.c:3977
+#: ../clutter/clutter-actor.c:6387
 msgid "Min Width"
 msgstr "最小宽度"
 
-#: clutter/clutter-actor.c:3978
+#: ../clutter/clutter-actor.c:6388
 msgid "Forced minimum width request for the actor"
-msgstr ""
+msgstr "角色(actor)的强制最小宽度要求"
 
-#: clutter/clutter-actor.c:3997
+#: ../clutter/clutter-actor.c:6406
 msgid "Min Height"
 msgstr "最小高度"
 
-#: clutter/clutter-actor.c:3998
+#: ../clutter/clutter-actor.c:6407
 msgid "Forced minimum height request for the actor"
-msgstr ""
+msgstr "角色(actor)的强制最小高度要求"
 
-#: clutter/clutter-actor.c:4017
+#: ../clutter/clutter-actor.c:6425
 msgid "Natural Width"
-msgstr ""
+msgstr "自然宽度"
 
-#: clutter/clutter-actor.c:4018
+#: ../clutter/clutter-actor.c:6426
 msgid "Forced natural width request for the actor"
-msgstr ""
+msgstr "角色(actor)的强制自然宽度要求"
 
-#: clutter/clutter-actor.c:4037
+#: ../clutter/clutter-actor.c:6444
 msgid "Natural Height"
-msgstr ""
+msgstr "自然高度"
 
-#: clutter/clutter-actor.c:4038
+#: ../clutter/clutter-actor.c:6445
 msgid "Forced natural height request for the actor"
-msgstr ""
+msgstr "角色(actor)的强制自然高度要求"
 
-#: clutter/clutter-actor.c:4054
+#: ../clutter/clutter-actor.c:6460
 msgid "Minimum width set"
-msgstr ""
+msgstr "最小宽度设置"
 
-#: clutter/clutter-actor.c:4055
+#: ../clutter/clutter-actor.c:6461
 msgid "Whether to use the min-width property"
-msgstr ""
+msgstr "是否使用 min-width 属性"
 
-#: clutter/clutter-actor.c:4070
+#: ../clutter/clutter-actor.c:6475
 msgid "Minimum height set"
-msgstr ""
+msgstr "最小高度设置"
 
-#: clutter/clutter-actor.c:4071
+#: ../clutter/clutter-actor.c:6476
 msgid "Whether to use the min-height property"
-msgstr ""
+msgstr "是否使用 min-height 属性"
 
-#: clutter/clutter-actor.c:4086
+#: ../clutter/clutter-actor.c:6490
 msgid "Natural width set"
-msgstr ""
+msgstr "自然宽度设置"
 
-#: clutter/clutter-actor.c:4087
+#: ../clutter/clutter-actor.c:6491
 msgid "Whether to use the natural-width property"
-msgstr ""
+msgstr "是否使用自然宽度属性"
 
-#: clutter/clutter-actor.c:4104
+#: ../clutter/clutter-actor.c:6505
 msgid "Natural height set"
-msgstr ""
+msgstr "自然高度设置"
 
-#: clutter/clutter-actor.c:4105
+#: ../clutter/clutter-actor.c:6506
 msgid "Whether to use the natural-height property"
-msgstr ""
+msgstr "是否使用自然高度属性"
 
-#: clutter/clutter-actor.c:4124
+#: ../clutter/clutter-actor.c:6522
 msgid "Allocation"
 msgstr "分配"
 
-#: clutter/clutter-actor.c:4125
+#: ../clutter/clutter-actor.c:6523
 msgid "The actor's allocation"
-msgstr ""
+msgstr "角色(actor)的分配"
 
-#: clutter/clutter-actor.c:4181
+#: ../clutter/clutter-actor.c:6580
 msgid "Request Mode"
 msgstr "请求模式"
 
-#: clutter/clutter-actor.c:4182
+#: ../clutter/clutter-actor.c:6581
 msgid "The actor's request mode"
-msgstr ""
+msgstr "角色(actor)的请求模式"
 
-#: clutter/clutter-actor.c:4197
+#: ../clutter/clutter-actor.c:6605
 msgid "Depth"
 msgstr "色深"
 
-#: clutter/clutter-actor.c:4198
+#: ../clutter/clutter-actor.c:6606
 msgid "Position on the Z axis"
-msgstr ""
+msgstr "Z 轴位置"
 
-#: clutter/clutter-actor.c:4212
+#: ../clutter/clutter-actor.c:6633
+msgid "Z Position"
+msgstr "Z 位置"
+
+#: ../clutter/clutter-actor.c:6634
+msgid "The actor's position on the Z axis"
+msgstr "角色(actor)的 Z 轴位置"
+
+#: ../clutter/clutter-actor.c:6651
 msgid "Opacity"
 msgstr "透明度"
 
-#: clutter/clutter-actor.c:4213
+#: ../clutter/clutter-actor.c:6652
 msgid "Opacity of an actor"
-msgstr ""
+msgstr "角色(actor)的透明度"
 
-#: clutter/clutter-actor.c:4232
+#: ../clutter/clutter-actor.c:6672
 msgid "Offscreen redirect"
-msgstr ""
+msgstr "幕后重定向"
 
-#: clutter/clutter-actor.c:4233
+#: ../clutter/clutter-actor.c:6673
 msgid "Flags controlling when to flatten the actor into a single image"
-msgstr ""
+msgstr "控制何时将角色(actor)扁平化到单一图像的标志"
 
-#: clutter/clutter-actor.c:4251
+#: ../clutter/clutter-actor.c:6687
 msgid "Visible"
 msgstr "可见性"
 
-#: clutter/clutter-actor.c:4252
+#: ../clutter/clutter-actor.c:6688
 msgid "Whether the actor is visible or not"
-msgstr ""
+msgstr "角色(actor)是否可见"
 
-#: clutter/clutter-actor.c:4267
+#: ../clutter/clutter-actor.c:6702
 msgid "Mapped"
-msgstr ""
+msgstr "已映射"
 
-#: clutter/clutter-actor.c:4268
+#: ../clutter/clutter-actor.c:6703
 msgid "Whether the actor will be painted"
-msgstr ""
+msgstr "角色(actor)是否会绘制"
 
-#: clutter/clutter-actor.c:4282
+#: ../clutter/clutter-actor.c:6716
 msgid "Realized"
-msgstr ""
+msgstr "已实现"
 
-#: clutter/clutter-actor.c:4283
+#: ../clutter/clutter-actor.c:6717
 msgid "Whether the actor has been realized"
-msgstr ""
+msgstr "角色(actor)是否已实现"
 
-#: clutter/clutter-actor.c:4299
+#: ../clutter/clutter-actor.c:6732
 msgid "Reactive"
 msgstr "重新激活"
 
-#: clutter/clutter-actor.c:4300
+#: ../clutter/clutter-actor.c:6733
 msgid "Whether the actor is reactive to events"
-msgstr ""
+msgstr "角色(actor)是否对事件反应"
 
-#: clutter/clutter-actor.c:4312
+#: ../clutter/clutter-actor.c:6744
 msgid "Has Clip"
-msgstr ""
+msgstr "有剪切"
 
-#: clutter/clutter-actor.c:4313
+#: ../clutter/clutter-actor.c:6745
 msgid "Whether the actor has a clip set"
-msgstr ""
+msgstr "角色(actor)是否有剪切设置"
 
-#: clutter/clutter-actor.c:4328
+#: ../clutter/clutter-actor.c:6758
 msgid "Clip"
-msgstr ""
+msgstr "剪切"
 
-#: clutter/clutter-actor.c:4329
-#, fuzzy
+#: ../clutter/clutter-actor.c:6759
 msgid "The clip region for the actor"
-msgstr "文本方向"
+msgstr "角色(actor)的剪切区域"
 
-#: clutter/clutter-actor.c:4343 clutter/clutter-actor-meta.c:207
-#: clutter/clutter-binding-pool.c:319 clutter/clutter-input-device.c:236
+#: ../clutter/clutter-actor.c:6778
+msgid "Clip Rectangle"
+msgstr "剪切矩形"
+
+#: ../clutter/clutter-actor.c:6779
+msgid "The visible region of the actor"
+msgstr "角色(actor)的可见区域"
+
+#: ../clutter/clutter-actor.c:6793 ../clutter/clutter-actor-meta.c:205
+#: ../clutter/clutter-binding-pool.c:319 ../clutter/clutter-input-device.c:247
 msgid "Name"
 msgstr "名称"
 
-#: clutter/clutter-actor.c:4344
+#: ../clutter/clutter-actor.c:6794
 msgid "Name of the actor"
-msgstr ""
+msgstr "角色(actor)名称"
 
-#: clutter/clutter-actor.c:4358
+#: ../clutter/clutter-actor.c:6815
+msgid "Pivot Point"
+msgstr "旋转中心"
+
+#: ../clutter/clutter-actor.c:6816
+msgid "The point around which the scaling and rotation occur"
+msgstr "缩放和旋转的中心点"
+
+#: ../clutter/clutter-actor.c:6834
+msgid "Pivot Point Z"
+msgstr "旋转中心 Z"
+
+#: ../clutter/clutter-actor.c:6835
+msgid "Z component of the pivot point"
+msgstr "旋转中心的 Z 分量"
+
+#: ../clutter/clutter-actor.c:6853
 msgid "Scale X"
-msgstr "缩放 X 坐标"
+msgstr "缩放 X"
 
-#: clutter/clutter-actor.c:4359
+#: ../clutter/clutter-actor.c:6854
 msgid "Scale factor on the X axis"
-msgstr ""
+msgstr "X 轴缩放系数"
 
-#: clutter/clutter-actor.c:4374
+#: ../clutter/clutter-actor.c:6872
 msgid "Scale Y"
-msgstr "缩放 Y 坐标"
+msgstr "缩放 Y"
 
-#: clutter/clutter-actor.c:4375
+#: ../clutter/clutter-actor.c:6873
 msgid "Scale factor on the Y axis"
-msgstr ""
+msgstr "Y 轴缩放系数"
 
-#: clutter/clutter-actor.c:4390
+#: ../clutter/clutter-actor.c:6891
+msgid "Scale Z"
+msgstr "缩放 Z"
+
+#: ../clutter/clutter-actor.c:6892
+msgid "Scale factor on the Z axis"
+msgstr "Z 轴缩放系数"
+
+#: ../clutter/clutter-actor.c:6910
 msgid "Scale Center X"
-msgstr ""
+msgstr "X 轴缩放中心"
 
-#: clutter/clutter-actor.c:4391
+#: ../clutter/clutter-actor.c:6911
 msgid "Horizontal scale center"
-msgstr ""
+msgstr "水平缩放中心"
 
-#: clutter/clutter-actor.c:4406
+#: ../clutter/clutter-actor.c:6929
 msgid "Scale Center Y"
-msgstr ""
+msgstr "Y 轴缩放中心"
 
-#: clutter/clutter-actor.c:4407
+#: ../clutter/clutter-actor.c:6930
 msgid "Vertical scale center"
-msgstr ""
+msgstr "竖直旋转中心"
 
-#: clutter/clutter-actor.c:4422
+#: ../clutter/clutter-actor.c:6948
 msgid "Scale Gravity"
-msgstr ""
+msgstr "缩放重心"
 
-#: clutter/clutter-actor.c:4423
+#: ../clutter/clutter-actor.c:6949
 msgid "The center of scaling"
-msgstr ""
+msgstr "缩放中心"
 
-#: clutter/clutter-actor.c:4440
+#: ../clutter/clutter-actor.c:6967
 msgid "Rotation Angle X"
-msgstr ""
+msgstr "旋转角 X"
 
-#: clutter/clutter-actor.c:4441
+#: ../clutter/clutter-actor.c:6968
 msgid "The rotation angle on the X axis"
-msgstr ""
+msgstr "X 轴旋转角"
 
-#: clutter/clutter-actor.c:4456
+#: ../clutter/clutter-actor.c:6986
 msgid "Rotation Angle Y"
-msgstr ""
+msgstr "旋转角 Y"
 
-#: clutter/clutter-actor.c:4457
+#: ../clutter/clutter-actor.c:6987
 msgid "The rotation angle on the Y axis"
-msgstr ""
+msgstr "Y 轴旋转角"
 
-#: clutter/clutter-actor.c:4472
+#: ../clutter/clutter-actor.c:7005
 msgid "Rotation Angle Z"
-msgstr ""
+msgstr "旋转角 Z"
 
-#: clutter/clutter-actor.c:4473
+#: ../clutter/clutter-actor.c:7006
 msgid "The rotation angle on the Z axis"
-msgstr ""
+msgstr "Z 轴旋转角"
 
-#: clutter/clutter-actor.c:4488
+#: ../clutter/clutter-actor.c:7024
 msgid "Rotation Center X"
-msgstr ""
+msgstr "旋转中心 X"
 
-#: clutter/clutter-actor.c:4489
+#: ../clutter/clutter-actor.c:7025
 msgid "The rotation center on the X axis"
-msgstr ""
+msgstr "X 轴旋转中心"
 
-#: clutter/clutter-actor.c:4505
+#: ../clutter/clutter-actor.c:7042
 msgid "Rotation Center Y"
-msgstr ""
+msgstr "旋转中心 Y"
 
-#: clutter/clutter-actor.c:4506
+#: ../clutter/clutter-actor.c:7043
 msgid "The rotation center on the Y axis"
-msgstr ""
+msgstr "Y 轴旋转中心"
 
-#: clutter/clutter-actor.c:4522
+#: ../clutter/clutter-actor.c:7060
 msgid "Rotation Center Z"
-msgstr ""
+msgstr "旋转中心 Z"
 
-#: clutter/clutter-actor.c:4523
+#: ../clutter/clutter-actor.c:7061
 msgid "The rotation center on the Z axis"
-msgstr ""
+msgstr "Z 轴旋转中心"
 
-#: clutter/clutter-actor.c:4539
+#: ../clutter/clutter-actor.c:7078
 msgid "Rotation Center Z Gravity"
-msgstr ""
+msgstr "旋转中心 Z 重心"
 
-#: clutter/clutter-actor.c:4540
+#: ../clutter/clutter-actor.c:7079
 msgid "Center point for rotation around the Z axis"
-msgstr ""
+msgstr "绕 Z 轴旋转的中心点"
 
-#: clutter/clutter-actor.c:4558
+#: ../clutter/clutter-actor.c:7107
 msgid "Anchor X"
-msgstr ""
+msgstr "锚点 X"
 
-#: clutter/clutter-actor.c:4559
+#: ../clutter/clutter-actor.c:7108
 msgid "X coordinate of the anchor point"
-msgstr ""
+msgstr "锚点的 X 坐标"
 
-#: clutter/clutter-actor.c:4575
+#: ../clutter/clutter-actor.c:7136
 msgid "Anchor Y"
-msgstr ""
+msgstr "锚点 Y"
 
-#: clutter/clutter-actor.c:4576
+#: ../clutter/clutter-actor.c:7137
 msgid "Y coordinate of the anchor point"
-msgstr ""
+msgstr "锚点的 Y 坐标"
 
-#: clutter/clutter-actor.c:4591
+#: ../clutter/clutter-actor.c:7164
 msgid "Anchor Gravity"
-msgstr ""
+msgstr "锚点重心"
 
-#: clutter/clutter-actor.c:4592
+#: ../clutter/clutter-actor.c:7165
 msgid "The anchor point as a ClutterGravity"
-msgstr ""
+msgstr "作为 ClutterGravity 的锚点"
 
-#: clutter/clutter-actor.c:4611
+#: ../clutter/clutter-actor.c:7184
+msgid "Translation X"
+msgstr "平移 X"
+
+#: ../clutter/clutter-actor.c:7185
+msgid "Translation along the X axis"
+msgstr "沿 X 轴平移"
+
+#: ../clutter/clutter-actor.c:7204
+msgid "Translation Y"
+msgstr "平移 Y"
+
+#: ../clutter/clutter-actor.c:7205
+msgid "Translation along the Y axis"
+msgstr "沿 Y 轴平移"
+
+#: ../clutter/clutter-actor.c:7224
+msgid "Translation Z"
+msgstr "平移 Z"
+
+#: ../clutter/clutter-actor.c:7225
+msgid "Translation along the Z axis"
+msgstr "沿 Z 轴平移"
+
+#: ../clutter/clutter-actor.c:7255
+msgid "Transform"
+msgstr "变换"
+
+#: ../clutter/clutter-actor.c:7256
+msgid "Transformation matrix"
+msgstr "变换矩阵"
+
+#: ../clutter/clutter-actor.c:7271
+msgid "Transform Set"
+msgstr "变换已设置"
+
+#: ../clutter/clutter-actor.c:7272
+msgid "Whether the transform property is set"
+msgstr "是否设置了 transform 属性"
+
+#: ../clutter/clutter-actor.c:7293
+msgid "Child Transform"
+msgstr "子对象变换"
+
+#: ../clutter/clutter-actor.c:7294
+msgid "Children transformation matrix"
+msgstr "子对象变换矩阵"
+
+#: ../clutter/clutter-actor.c:7309
+msgid "Child Transform Set"
+msgstr "子对象变换设置"
+
+#: ../clutter/clutter-actor.c:7310
+msgid "Whether the child-transform property is set"
+msgstr "是否设置了 child-transform 属性"
+
+#: ../clutter/clutter-actor.c:7327
 msgid "Show on set parent"
-msgstr ""
+msgstr "设置了父对角时显示"
 
-#: clutter/clutter-actor.c:4612
+#: ../clutter/clutter-actor.c:7328
 msgid "Whether the actor is shown when parented"
-msgstr ""
+msgstr "角色(actor)成为子对象时是否显示"
 
-#: clutter/clutter-actor.c:4632
+#: ../clutter/clutter-actor.c:7345
 msgid "Clip to Allocation"
-msgstr ""
+msgstr "要分配的剪切区域"
 
-#: clutter/clutter-actor.c:4633
+#: ../clutter/clutter-actor.c:7346
 msgid "Sets the clip region to track the actor's allocation"
-msgstr ""
+msgstr "设置要追踪角色(actor)分配的剪切区域"
 
-#: clutter/clutter-actor.c:4643
+#: ../clutter/clutter-actor.c:7359
 msgid "Text Direction"
 msgstr "文本方向"
 
-#: clutter/clutter-actor.c:4644
+#: ../clutter/clutter-actor.c:7360
 msgid "Direction of the text"
 msgstr "文本的方向"
 
-#: clutter/clutter-actor.c:4662
+#: ../clutter/clutter-actor.c:7375
 msgid "Has Pointer"
-msgstr ""
+msgstr "有指针"
 
-#: clutter/clutter-actor.c:4663
+#: ../clutter/clutter-actor.c:7376
 msgid "Whether the actor contains the pointer of an input device"
-msgstr ""
+msgstr "角色(actor)中是否包含输入设备的指针"
 
-#: clutter/clutter-actor.c:4680
+#: ../clutter/clutter-actor.c:7389
 msgid "Actions"
 msgstr "动作"
 
-#: clutter/clutter-actor.c:4681
+#: ../clutter/clutter-actor.c:7390
 msgid "Adds an action to the actor"
-msgstr ""
+msgstr "向角色(actor)添加动作"
 
-#: clutter/clutter-actor.c:4695
+#: ../clutter/clutter-actor.c:7403
 msgid "Constraints"
-msgstr ""
+msgstr "约束"
 
-#: clutter/clutter-actor.c:4696
+#: ../clutter/clutter-actor.c:7404
 msgid "Adds a constraint to the actor"
-msgstr ""
+msgstr "向角色(actor)添加约束"
 
-#: clutter/clutter-actor-meta.c:193 clutter/clutter-child-meta.c:142
-msgid "Actor"
-msgstr ""
+#: ../clutter/clutter-actor.c:7417
+msgid "Effect"
+msgstr "效果"
 
-#: clutter/clutter-actor-meta.c:194
-msgid "The actor attached to the meta"
-msgstr ""
+#: ../clutter/clutter-actor.c:7418
+msgid "Add an effect to be applied on the actor"
+msgstr "添加要应用于角色(actor)的效果"
 
-#: clutter/clutter-actor-meta.c:208
-msgid "The name of the meta"
-msgstr ""
-
-#: clutter/clutter-actor-meta.c:221 clutter/clutter-input-device.c:315
-#: clutter/clutter-shader.c:307
-msgid "Enabled"
-msgstr "启用"
-
-#: clutter/clutter-actor-meta.c:222
-msgid "Whether the meta is enabled"
-msgstr ""
-
-#: clutter/clutter-align-constraint.c:270
-#: clutter/clutter-bind-constraint.c:349 clutter/clutter-clone.c:340
-#: clutter/clutter-snap-constraint.c:321
-msgid "Source"
-msgstr "来源"
-
-#: clutter/clutter-align-constraint.c:271
-msgid "The source of the alignment"
-msgstr ""
-
-#: clutter/clutter-align-constraint.c:284
-msgid "Align Axis"
-msgstr ""
-
-#: clutter/clutter-align-constraint.c:285
-msgid "The axis to align the position to"
-msgstr ""
-
-#: clutter/clutter-align-constraint.c:304
-#: clutter/clutter-desaturate-effect.c:304
-msgid "Factor"
-msgstr ""
-
-#: clutter/clutter-align-constraint.c:305
-msgid "The alignment factor, between 0.0 and 1.0"
-msgstr ""
-
-#: clutter/clutter-alpha.c:345 clutter/clutter-animation.c:538
-#: clutter/clutter-animator.c:1802
-msgid "Timeline"
-msgstr "时间轴"
-
-#: clutter/clutter-alpha.c:346
-msgid "Timeline used by the alpha"
-msgstr "Alpha 使用的时间轴"
-
-#: clutter/clutter-alpha.c:361
-msgid "Alpha value"
-msgstr "Alpha 值"
-
-#: clutter/clutter-alpha.c:362
-msgid "Alpha value as computed by the alpha"
-msgstr ""
-
-#: clutter/clutter-alpha.c:382 clutter/clutter-animation.c:494
-msgid "Mode"
-msgstr "模式"
-
-#: clutter/clutter-alpha.c:383
-msgid "Progress mode"
-msgstr "进度模式"
-
-#: clutter/clutter-animation.c:478
-msgid "Object"
-msgstr "对象"
-
-#: clutter/clutter-animation.c:479
-msgid "Object to which the animation applies"
-msgstr "应用动画的对象"
-
-#: clutter/clutter-animation.c:495
-msgid "The mode of the animation"
-msgstr "动画的模式"
-
-#: clutter/clutter-animation.c:509 clutter/clutter-animator.c:1786
-#: clutter/clutter-media.c:194 clutter/clutter-state.c:1486
-#: clutter/clutter-timeline.c:294
-msgid "Duration"
-msgstr "时长"
-
-#: clutter/clutter-animation.c:510
-msgid "Duration of the animation, in milliseconds"
-msgstr "动画时长，以毫秒计"
-
-#: clutter/clutter-animation.c:524 clutter/clutter-timeline.c:263
-msgid "Loop"
-msgstr "循环"
-
-#: clutter/clutter-animation.c:525
-msgid "Whether the animation should loop"
-msgstr "动画是否循环"
-
-#: clutter/clutter-animation.c:539
-msgid "The timeline used by the animation"
-msgstr "动画使用的时间轴"
-
-#: clutter/clutter-animation.c:552 clutter/clutter-behaviour.c:304
-msgid "Alpha"
-msgstr "Alpha"
-
-#: clutter/clutter-animation.c:553
-msgid "The alpha used by the animation"
-msgstr "动画使用的 alpha"
-
-#: clutter/clutter-animator.c:1787
-msgid "The duration of the animation"
-msgstr "动画的时长"
-
-#: clutter/clutter-animator.c:1803
-msgid "The timeline of the animation"
-msgstr "动画的时间轴"
-
-#: clutter/clutter-behaviour.c:305
-msgid "Alpha Object to drive the behaviour"
-msgstr ""
-
-#: clutter/clutter-behaviour-depth.c:178
-msgid "Start Depth"
-msgstr "起始色深"
-
-#: clutter/clutter-behaviour-depth.c:179
-msgid "Initial depth to apply"
-msgstr "应用的初始色深"
-
-#: clutter/clutter-behaviour-depth.c:194
-msgid "End Depth"
-msgstr "终点色深"
-
-#: clutter/clutter-behaviour-depth.c:195
-msgid "Final depth to apply"
-msgstr "应用的终点色深"
-
-#: clutter/clutter-behaviour-ellipse.c:397
-msgid "Start Angle"
-msgstr "起始角度"
-
-#: clutter/clutter-behaviour-ellipse.c:398
-#: clutter/clutter-behaviour-rotate.c:280
-msgid "Initial angle"
-msgstr "初始的角度"
-
-#: clutter/clutter-behaviour-ellipse.c:413
-msgid "End Angle"
-msgstr "终点角度"
-
-#: clutter/clutter-behaviour-ellipse.c:414
-#: clutter/clutter-behaviour-rotate.c:298
-msgid "Final angle"
-msgstr "终点的角度"
-
-#: clutter/clutter-behaviour-ellipse.c:429
-msgid "Angle x tilt"
-msgstr ""
-
-#: clutter/clutter-behaviour-ellipse.c:430
-msgid "Tilt of the ellipse around x axis"
-msgstr ""
-
-#: clutter/clutter-behaviour-ellipse.c:445
-msgid "Angle y tilt"
-msgstr ""
-
-#: clutter/clutter-behaviour-ellipse.c:446
-msgid "Tilt of the ellipse around y axis"
-msgstr ""
-
-#: clutter/clutter-behaviour-ellipse.c:461
-msgid "Angle z tilt"
-msgstr ""
-
-#: clutter/clutter-behaviour-ellipse.c:462
-msgid "Tilt of the ellipse around z axis"
-msgstr ""
-
-#: clutter/clutter-behaviour-ellipse.c:478
-msgid "Width of the ellipse"
-msgstr ""
-
-#: clutter/clutter-behaviour-ellipse.c:494
-msgid "Height of ellipse"
-msgstr ""
-
-#: clutter/clutter-behaviour-ellipse.c:509
-msgid "Center"
-msgstr ""
-
-#: clutter/clutter-behaviour-ellipse.c:510
-msgid "Center of ellipse"
-msgstr ""
-
-#: clutter/clutter-behaviour-ellipse.c:524
-#: clutter/clutter-behaviour-rotate.c:333 clutter/clutter-timeline.c:310
-msgid "Direction"
-msgstr "方向"
-
-#: clutter/clutter-behaviour-ellipse.c:525
-#: clutter/clutter-behaviour-rotate.c:334
-#, fuzzy
-msgid "Direction of rotation"
-msgstr "文本方向"
-
-#: clutter/clutter-behaviour-opacity.c:181
-msgid "Opacity Start"
-msgstr ""
-
-#: clutter/clutter-behaviour-opacity.c:182
-msgid "Initial opacity level"
-msgstr ""
-
-#: clutter/clutter-behaviour-opacity.c:199
-msgid "Opacity End"
-msgstr ""
-
-#: clutter/clutter-behaviour-opacity.c:200
-msgid "Final opacity level"
-msgstr ""
-
-#: clutter/clutter-behaviour-path.c:222 clutter/clutter-path-constraint.c:212
-msgid "Path"
-msgstr "路径"
-
-#: clutter/clutter-behaviour-path.c:223
-msgid "The ClutterPath object representing the path to animate along"
-msgstr ""
-
-#: clutter/clutter-behaviour-rotate.c:279
-msgid "Angle Begin"
-msgstr ""
-
-#: clutter/clutter-behaviour-rotate.c:297
-msgid "Angle End"
-msgstr ""
-
-#: clutter/clutter-behaviour-rotate.c:315
-msgid "Axis"
-msgstr ""
-
-#: clutter/clutter-behaviour-rotate.c:316
-msgid "Axis of rotation"
-msgstr ""
-
-#: clutter/clutter-behaviour-rotate.c:351
-msgid "Center X"
-msgstr ""
-
-#: clutter/clutter-behaviour-rotate.c:352
-msgid "X coordinate of the center of rotation"
-msgstr ""
-
-#: clutter/clutter-behaviour-rotate.c:369
-msgid "Center Y"
-msgstr ""
-
-#: clutter/clutter-behaviour-rotate.c:370
-msgid "Y coordinate of the center of rotation"
-msgstr ""
-
-#: clutter/clutter-behaviour-rotate.c:387
-msgid "Center Z"
-msgstr "中心 Z"
-
-#: clutter/clutter-behaviour-rotate.c:388
-msgid "Z coordinate of the center of rotation"
-msgstr "旋转中心的 Z 坐标"
-
-#: clutter/clutter-behaviour-scale.c:222
-msgid "X Start Scale"
-msgstr ""
-
-#: clutter/clutter-behaviour-scale.c:223
-msgid "Initial scale on the X axis"
-msgstr ""
-
-#: clutter/clutter-behaviour-scale.c:241
-msgid "X End Scale"
-msgstr ""
-
-#: clutter/clutter-behaviour-scale.c:242
-msgid "Final scale on the X axis"
-msgstr ""
-
-#: clutter/clutter-behaviour-scale.c:260
-msgid "Y Start Scale"
-msgstr ""
-
-#: clutter/clutter-behaviour-scale.c:261
-msgid "Initial scale on the Y axis"
-msgstr ""
-
-#: clutter/clutter-behaviour-scale.c:279
-msgid "Y End Scale"
-msgstr ""
-
-#: clutter/clutter-behaviour-scale.c:280
-msgid "Final scale on the Y axis"
-msgstr ""
-
-#: clutter/clutter-bind-constraint.c:350
-msgid "The source of the binding"
-msgstr ""
-
-#: clutter/clutter-bind-constraint.c:363
-msgid "Coordinate"
-msgstr "坐标"
-
-#: clutter/clutter-bind-constraint.c:364
-msgid "The coordinate to bind"
-msgstr ""
-
-#: clutter/clutter-bind-constraint.c:378 clutter/clutter-path-constraint.c:226
-#: clutter/clutter-snap-constraint.c:366
-msgid "Offset"
-msgstr "偏移"
-
-#: clutter/clutter-bind-constraint.c:379
-msgid "The offset in pixels to apply to the binding"
-msgstr ""
-
-#: clutter/clutter-binding-pool.c:320
-msgid "The unique name of the binding pool"
-msgstr ""
-
-#: clutter/clutter-bin-layout.c:261 clutter/clutter-bin-layout.c:585
-#: clutter/clutter-box-layout.c:395 clutter/clutter-table-layout.c:652
-msgid "Horizontal Alignment"
-msgstr "水平对齐"
-
-#: clutter/clutter-bin-layout.c:262
-msgid "Horizontal alignment for the actor inside the layout manager"
-msgstr ""
-
-#: clutter/clutter-bin-layout.c:270 clutter/clutter-bin-layout.c:602
-#: clutter/clutter-box-layout.c:404 clutter/clutter-table-layout.c:667
-msgid "Vertical Alignment"
-msgstr "竖直对齐"
-
-#: clutter/clutter-bin-layout.c:271
-msgid "Vertical alignment for the actor inside the layout manager"
-msgstr ""
-
-#: clutter/clutter-bin-layout.c:586
-msgid "Default horizontal alignment for the actors inside the layout manager"
-msgstr ""
-
-#: clutter/clutter-bin-layout.c:603
-msgid "Default vertical alignment for the actors inside the layout manager"
-msgstr ""
-
-#: clutter/clutter-box.c:544
+#: ../clutter/clutter-actor.c:7432
 msgid "Layout Manager"
 msgstr "样式管理器"
 
-#: clutter/clutter-box.c:545
-msgid "The layout manager used by the box"
-msgstr ""
+#: ../clutter/clutter-actor.c:7433
+msgid "The object controlling the layout of an actor's children"
+msgstr "控制角色(actor)的子角色布局的对象"
 
-#: clutter/clutter-box.c:564 clutter/clutter-rectangle.c:267
-#: clutter/clutter-stage.c:1765
-msgid "Color"
-msgstr "色彩"
+#: ../clutter/clutter-actor.c:7447
+msgid "X Expand"
+msgstr "X 伸展"
 
-#: clutter/clutter-box.c:565
-msgid "The background color of the box"
-msgstr "框的背景颜色"
+#: ../clutter/clutter-actor.c:7448
+msgid "Whether extra horizontal space should be assigned to the actor"
+msgstr "是否将额外的水平空间分配给角色(actor)"
 
-#: clutter/clutter-box.c:579
-msgid "Color Set"
-msgstr "颜色设置"
+#: ../clutter/clutter-actor.c:7463
+msgid "Y Expand"
+msgstr "Y 伸展"
 
-#: clutter/clutter-box.c:580
+#: ../clutter/clutter-actor.c:7464
+msgid "Whether extra vertical space should be assigned to the actor"
+msgstr "是否将额外的竖直空间分配给角色(actor)"
+
+#: ../clutter/clutter-actor.c:7480
+msgid "X Alignment"
+msgstr "X 对齐方式"
+
+#: ../clutter/clutter-actor.c:7481
+msgid "The alignment of the actor on the X axis within its allocation"
+msgstr "在角色(actor)分配范围内，角色沿 X 轴的对齐方式"
+
+#: ../clutter/clutter-actor.c:7496
+msgid "Y Alignment"
+msgstr "Y 对齐方式"
+
+#: ../clutter/clutter-actor.c:7497
+msgid "The alignment of the actor on the Y axis within its allocation"
+msgstr "在角色(actor)分配范围内，角色沿 Y 轴的对齐方式"
+
+#: ../clutter/clutter-actor.c:7516
+msgid "Margin Top"
+msgstr "顶部边界"
+
+#: ../clutter/clutter-actor.c:7517
+msgid "Extra space at the top"
+msgstr "顶部的额外空间"
+
+#: ../clutter/clutter-actor.c:7538
+msgid "Margin Bottom"
+msgstr "底部边界"
+
+#: ../clutter/clutter-actor.c:7539
+msgid "Extra space at the bottom"
+msgstr "底部的额外空间"
+
+#: ../clutter/clutter-actor.c:7560
+msgid "Margin Left"
+msgstr "左边界"
+
+#: ../clutter/clutter-actor.c:7561
+msgid "Extra space at the left"
+msgstr "左侧的额外空间"
+
+#: ../clutter/clutter-actor.c:7582
+msgid "Margin Right"
+msgstr "右边界"
+
+#: ../clutter/clutter-actor.c:7583
+msgid "Extra space at the right"
+msgstr "右侧的额外空间"
+
+#: ../clutter/clutter-actor.c:7599
+msgid "Background Color Set"
+msgstr "背景颜色设置"
+
+#: ../clutter/clutter-actor.c:7600 ../clutter/deprecated/clutter-box.c:271
 msgid "Whether the background color is set"
 msgstr "是否设置了背景色"
 
-#: clutter/clutter-box-layout.c:370
+#: ../clutter/clutter-actor.c:7616
+msgid "Background color"
+msgstr "背景颜色"
+
+#: ../clutter/clutter-actor.c:7617
+msgid "The actor's background color"
+msgstr "角色(actor)的背景颜色"
+
+#: ../clutter/clutter-actor.c:7632
+msgid "First Child"
+msgstr "首个子角色"
+
+#: ../clutter/clutter-actor.c:7633
+msgid "The actor's first child"
+msgstr "角色(actor)的首个子角色"
+
+#: ../clutter/clutter-actor.c:7646
+msgid "Last Child"
+msgstr "最后子角色"
+
+#: ../clutter/clutter-actor.c:7647
+msgid "The actor's last child"
+msgstr "角色(actor)的最后一个子角色"
+
+#: ../clutter/clutter-actor.c:7661
+msgid "Content"
+msgstr "内容"
+
+#: ../clutter/clutter-actor.c:7662
+msgid "Delegate object for painting the actor's content"
+msgstr "绘制角色(actor)内容的委托对象"
+
+#: ../clutter/clutter-actor.c:7687
+msgid "Content Gravity"
+msgstr "内容重心"
+
+#: ../clutter/clutter-actor.c:7688
+msgid "Alignment of the actor's content"
+msgstr "角色(actor)内容的对齐方式"
+
+#: ../clutter/clutter-actor.c:7708
+msgid "Content Box"
+msgstr "内容框"
+
+#: ../clutter/clutter-actor.c:7709
+msgid "The bounding box of the actor's content"
+msgstr "角色(actor)内容的边界框(bounding box)"
+
+#: ../clutter/clutter-actor.c:7717
+msgid "Minification Filter"
+msgstr "缩小过滤器"
+
+#: ../clutter/clutter-actor.c:7718
+msgid "The filter used when reducing the size of the content"
+msgstr "缩小内容尺寸时使用的过滤器"
+
+#: ../clutter/clutter-actor.c:7725
+msgid "Magnification Filter"
+msgstr "放大过滤器"
+
+#: ../clutter/clutter-actor.c:7726
+msgid "The filter used when increasing the size of the content"
+msgstr "放大内容尺寸时使用的过滤器"
+
+#: ../clutter/clutter-actor.c:7740
+msgid "Content Repeat"
+msgstr "重复内容"
+
+#: ../clutter/clutter-actor.c:7741
+msgid "The repeat policy for the actor's content"
+msgstr "角色(actor)的内容重复策略"
+
+#: ../clutter/clutter-actor-meta.c:191 ../clutter/clutter-child-meta.c:142
+msgid "Actor"
+msgstr "角色"
+
+#: ../clutter/clutter-actor-meta.c:192
+msgid "The actor attached to the meta"
+msgstr "附到元(meta)的角色(actor)"
+
+#: ../clutter/clutter-actor-meta.c:206
+msgid "The name of the meta"
+msgstr "元(meta)的名称"
+
+#: ../clutter/clutter-actor-meta.c:219 ../clutter/clutter-input-device.c:326
+#: ../clutter/deprecated/clutter-shader.c:309
+msgid "Enabled"
+msgstr "启用"
+
+#: ../clutter/clutter-actor-meta.c:220
+msgid "Whether the meta is enabled"
+msgstr "是否启用元(meta)"
+
+#: ../clutter/clutter-align-constraint.c:279
+#: ../clutter/clutter-bind-constraint.c:358 ../clutter/clutter-clone.c:341
+#: ../clutter/clutter-snap-constraint.c:321
+msgid "Source"
+msgstr "来源"
+
+#: ../clutter/clutter-align-constraint.c:280
+msgid "The source of the alignment"
+msgstr "对齐的依据"
+
+#: ../clutter/clutter-align-constraint.c:293
+msgid "Align Axis"
+msgstr "对齐轴"
+
+#: ../clutter/clutter-align-constraint.c:294
+msgid "The axis to align the position to"
+msgstr "对齐位置的轴"
+
+#: ../clutter/clutter-align-constraint.c:313
+#: ../clutter/clutter-desaturate-effect.c:270
+msgid "Factor"
+msgstr "系数"
+
+#: ../clutter/clutter-align-constraint.c:314
+msgid "The alignment factor, between 0.0 and 1.0"
+msgstr "对齐系数，0.0 到 1.0 之间"
+
+#: ../clutter/clutter-backend.c:380
+msgid "Unable to initialize the Clutter backend"
+msgstr "无法初始化 Clutter 后端"
+
+#: ../clutter/clutter-backend.c:454
+#, c-format
+msgid "The backend of type '%s' does not support creating multiple stages"
+msgstr "“%s”类型的后端不支持创建多个舞台(stage)"
+
+#: ../clutter/clutter-bind-constraint.c:359
+msgid "The source of the binding"
+msgstr "绑定的源"
+
+#: ../clutter/clutter-bind-constraint.c:372
+msgid "Coordinate"
+msgstr "坐标"
+
+#: ../clutter/clutter-bind-constraint.c:373
+msgid "The coordinate to bind"
+msgstr "要绑定的坐标"
+
+#: ../clutter/clutter-bind-constraint.c:387
+#: ../clutter/clutter-path-constraint.c:226
+#: ../clutter/clutter-snap-constraint.c:366
+msgid "Offset"
+msgstr "偏移"
+
+#: ../clutter/clutter-bind-constraint.c:388
+msgid "The offset in pixels to apply to the binding"
+msgstr "要应用于绑定的偏移(像素)"
+
+#: ../clutter/clutter-binding-pool.c:320
+msgid "The unique name of the binding pool"
+msgstr "绑定池的的惟一限定名称"
+
+#: ../clutter/clutter-bin-layout.c:238 ../clutter/clutter-bin-layout.c:651
+#: ../clutter/clutter-box-layout.c:388
+#: ../clutter/deprecated/clutter-table-layout.c:610
+msgid "Horizontal Alignment"
+msgstr "水平对齐"
+
+#: ../clutter/clutter-bin-layout.c:239
+msgid "Horizontal alignment for the actor inside the layout manager"
+msgstr "布局管理器中的角色(actor)的水平对齐方式"
+
+#: ../clutter/clutter-bin-layout.c:247 ../clutter/clutter-bin-layout.c:671
+#: ../clutter/clutter-box-layout.c:397
+#: ../clutter/deprecated/clutter-table-layout.c:625
+msgid "Vertical Alignment"
+msgstr "竖直对齐"
+
+#: ../clutter/clutter-bin-layout.c:248
+msgid "Vertical alignment for the actor inside the layout manager"
+msgstr "布局管理器中的角色(actor)的竖直对齐方式"
+
+#: ../clutter/clutter-bin-layout.c:652
+msgid "Default horizontal alignment for the actors inside the layout manager"
+msgstr "布局管理器中的角色(actor)的默认水平对齐方式"
+
+#: ../clutter/clutter-bin-layout.c:672
+msgid "Default vertical alignment for the actors inside the layout manager"
+msgstr "布局管理器中的角色(actor)的默认竖直对齐方式"
+
+#: ../clutter/clutter-box-layout.c:363
 msgid "Expand"
 msgstr "展开"
 
-#: clutter/clutter-box-layout.c:371
+#: ../clutter/clutter-box-layout.c:364
 msgid "Allocate extra space for the child"
-msgstr ""
+msgstr "为子角色分配额外空间"
 
-#: clutter/clutter-box-layout.c:377 clutter/clutter-table-layout.c:631
+#: ../clutter/clutter-box-layout.c:370
+#: ../clutter/deprecated/clutter-table-layout.c:589
 msgid "Horizontal Fill"
 msgstr "水平填充"
 
-#: clutter/clutter-box-layout.c:378 clutter/clutter-table-layout.c:632
+#: ../clutter/clutter-box-layout.c:371
+#: ../clutter/deprecated/clutter-table-layout.c:590
 msgid ""
 "Whether the child should receive priority when the container is allocating "
 "spare space on the horizontal axis"
-msgstr ""
+msgstr "窗口沿水平轴分配空闲空间时，子对象是否获得优先权"
 
-#: clutter/clutter-box-layout.c:386 clutter/clutter-table-layout.c:638
+#: ../clutter/clutter-box-layout.c:379
+#: ../clutter/deprecated/clutter-table-layout.c:596
 msgid "Vertical Fill"
 msgstr "竖直填充"
 
-#: clutter/clutter-box-layout.c:387 clutter/clutter-table-layout.c:639
+#: ../clutter/clutter-box-layout.c:380
+#: ../clutter/deprecated/clutter-table-layout.c:597
 msgid ""
 "Whether the child should receive priority when the container is allocating "
 "spare space on the vertical axis"
-msgstr ""
+msgstr "窗口沿竖直轴分配空闲空间时，子对象是否获得优先权"
 
-#: clutter/clutter-box-layout.c:396 clutter/clutter-table-layout.c:653
+#: ../clutter/clutter-box-layout.c:389
+#: ../clutter/deprecated/clutter-table-layout.c:611
 msgid "Horizontal alignment of the actor within the cell"
-msgstr ""
+msgstr "单元格内角色(actor)的水平对齐方式"
 
-#: clutter/clutter-box-layout.c:405 clutter/clutter-table-layout.c:668
+#: ../clutter/clutter-box-layout.c:398
+#: ../clutter/deprecated/clutter-table-layout.c:626
 msgid "Vertical alignment of the actor within the cell"
-msgstr ""
+msgstr "单元格内角色(actor)的竖直对齐方式"
 
-#: clutter/clutter-box-layout.c:1305
+#: ../clutter/clutter-box-layout.c:1359
 msgid "Vertical"
 msgstr "竖直"
 
-#: clutter/clutter-box-layout.c:1306
+#: ../clutter/clutter-box-layout.c:1360
 msgid "Whether the layout should be vertical, rather than horizontal"
 msgstr "布局是否为竖直而非水平"
 
-#: clutter/clutter-box-layout.c:1321 clutter/clutter-flow-layout.c:901
-msgid "Homogeneous"
-msgstr ""
-
-#: clutter/clutter-box-layout.c:1322
-msgid ""
-"Whether the layout should be homogeneous, i.e. all childs get the same size"
-msgstr ""
-
-#: clutter/clutter-box-layout.c:1337
-msgid "Pack Start"
-msgstr ""
-
-#: clutter/clutter-box-layout.c:1338
-msgid "Whether to pack items at the start of the box"
-msgstr ""
-
-#: clutter/clutter-box-layout.c:1351
-msgid "Spacing"
-msgstr "间距"
-
-#: clutter/clutter-box-layout.c:1352
-msgid "Spacing between children"
-msgstr ""
-
-#: clutter/clutter-box-layout.c:1366 clutter/clutter-table-layout.c:1742
-msgid "Use Animations"
-msgstr "使用动画"
-
-#: clutter/clutter-box-layout.c:1367 clutter/clutter-table-layout.c:1743
-msgid "Whether layout changes should be animated"
-msgstr "是否对布局更改使用动画"
-
-#: clutter/clutter-box-layout.c:1388 clutter/clutter-table-layout.c:1764
-msgid "Easing Mode"
-msgstr "擦除方式"
-
-#: clutter/clutter-box-layout.c:1389 clutter/clutter-table-layout.c:1765
-msgid "The easing mode of the animations"
-msgstr "动画的擦除方式"
-
-#: clutter/clutter-box-layout.c:1406 clutter/clutter-table-layout.c:1782
-msgid "Easing Duration"
-msgstr "擦除持续时间"
-
-#: clutter/clutter-box-layout.c:1407 clutter/clutter-table-layout.c:1783
-msgid "The duration of the animations"
-msgstr "动画持续时间"
-
-#: clutter/clutter-cairo-texture.c:582
-msgid "Surface Width"
-msgstr "表明宽度"
-
-#: clutter/clutter-cairo-texture.c:583
-msgid "The width of the Cairo surface"
-msgstr "Cairo 表明的宽度"
-
-#: clutter/clutter-cairo-texture.c:597
-msgid "Surface Height"
-msgstr "表明高度"
-
-#: clutter/clutter-cairo-texture.c:598
-msgid "The height of the Cairo surface"
-msgstr "Cairo 表明的高度"
-
-#: clutter/clutter-cairo-texture.c:615
-msgid "Auto Resize"
-msgstr "自动缩放"
-
-#: clutter/clutter-cairo-texture.c:616
-msgid "Whether the surface should match the allocation"
-msgstr "表面是否应适应分配的空间"
-
-#: clutter/clutter-child-meta.c:127
-msgid "Container"
-msgstr "容器"
-
-#: clutter/clutter-child-meta.c:128
-msgid "The container that created this data"
-msgstr "创建此数据的容器"
-
-#: clutter/clutter-child-meta.c:143
-msgid "The actor wrapped by this data"
-msgstr ""
-
-#: clutter/clutter-click-action.c:542
-msgid "Pressed"
-msgstr "按下时"
-
-#: clutter/clutter-click-action.c:543
-msgid "Whether the clickable should be in pressed state"
-msgstr ""
-
-#: clutter/clutter-click-action.c:556
-msgid "Held"
-msgstr "保持时"
-
-#: clutter/clutter-click-action.c:557
-msgid "Whether the clickable has a grab"
-msgstr ""
-
-#: clutter/clutter-click-action.c:574 clutter/clutter-settings.c:573
-msgid "Long Press Duration"
-msgstr "长按时长"
-
-#: clutter/clutter-click-action.c:575
-msgid "The minimum duration of a long press to recognize the gesture"
-msgstr ""
-
-#: clutter/clutter-click-action.c:593
-msgid "Long Press Threshold"
-msgstr "长按阈值"
-
-#: clutter/clutter-click-action.c:594
-msgid "The maximum threshold before a long press is cancelled"
-msgstr ""
-
-#: clutter/clutter-clone.c:341
-msgid "Specifies the actor to be cloned"
-msgstr ""
-
-#: clutter/clutter-colorize-effect.c:307
-msgid "Tint"
-msgstr ""
-
-#: clutter/clutter-colorize-effect.c:308
-msgid "The tint to apply"
-msgstr ""
-
-#: clutter/clutter-deform-effect.c:527
-#, fuzzy
-msgid "Horizontal Tiles"
-msgstr "水平填充"
-
-#: clutter/clutter-deform-effect.c:528
-msgid "The number of horizontal tiles"
-msgstr ""
-
-#: clutter/clutter-deform-effect.c:543
-msgid "Vertical Tiles"
-msgstr ""
-
-#: clutter/clutter-deform-effect.c:544
-msgid "The number of vertical tiles"
-msgstr ""
-
-#: clutter/clutter-deform-effect.c:561
-msgid "Back Material"
-msgstr ""
-
-#: clutter/clutter-deform-effect.c:562
-msgid "The material to be used when painting the back of the actor"
-msgstr ""
-
-#: clutter/clutter-desaturate-effect.c:305
-msgid "The desaturation factor"
-msgstr ""
-
-#: clutter/clutter-device-manager.c:131 clutter/clutter-input-device.c:344
-#: clutter/x11/clutter-keymap-x11.c:316
-msgid "Backend"
-msgstr "后端"
-
-#: clutter/clutter-device-manager.c:132
-msgid "The ClutterBackend of the device manager"
-msgstr "设备管理器的 Clutter 后端"
-
-#: clutter/clutter-drag-action.c:596
-msgid "Horizontal Drag Threshold"
-msgstr "水平拖动阈值"
-
-#: clutter/clutter-drag-action.c:597
-msgid "The horizontal amount of pixels required to start dragging"
-msgstr "开始拖动所需移动的水平像素数"
-
-#: clutter/clutter-drag-action.c:624
-msgid "Vertical Drag Threshold"
-msgstr "竖直拖动阈值"
-
-#: clutter/clutter-drag-action.c:625
-msgid "The vertical amount of pixels required to start dragging"
-msgstr "开始拖动所需移动的竖直像素数"
-
-#: clutter/clutter-drag-action.c:646
-msgid "Drag Handle"
-msgstr "拖拽手柄"
-
-#: clutter/clutter-drag-action.c:647
-msgid "The actor that is being dragged"
-msgstr ""
-
-#: clutter/clutter-drag-action.c:660
-msgid "Drag Axis"
-msgstr "拖动坐标轴"
-
-#: clutter/clutter-drag-action.c:661
-msgid "Constraints the dragging to an axis"
-msgstr "将拖动限制在坐标轴"
-
-#: clutter/clutter-flow-layout.c:885
+#: ../clutter/clutter-box-layout.c:1377 ../clutter/clutter-flow-layout.c:942
+#: ../clutter/clutter-grid-layout.c:1549
 msgid "Orientation"
 msgstr "方向"
 
-#: clutter/clutter-flow-layout.c:886
+#: ../clutter/clutter-box-layout.c:1378 ../clutter/clutter-flow-layout.c:943
+#: ../clutter/clutter-grid-layout.c:1550
 msgid "The orientation of the layout"
 msgstr "布局方向"
 
-#: clutter/clutter-flow-layout.c:902
-msgid "Whether each item should receive the same allocation"
-msgstr ""
+#: ../clutter/clutter-box-layout.c:1394 ../clutter/clutter-flow-layout.c:958
+msgid "Homogeneous"
+msgstr "均一的"
 
-#: clutter/clutter-flow-layout.c:917 clutter/clutter-table-layout.c:1713
+#: ../clutter/clutter-box-layout.c:1395
+msgid ""
+"Whether the layout should be homogeneous, i.e. all childs get the same size"
+msgstr "布局是否是均一的，即所有子角色大小相同"
+
+#: ../clutter/clutter-box-layout.c:1410
+msgid "Pack Start"
+msgstr "堆叠开头"
+
+#: ../clutter/clutter-box-layout.c:1411
+msgid "Whether to pack items at the start of the box"
+msgstr "是否堆叠框开头位置的项目"
+
+#: ../clutter/clutter-box-layout.c:1424
+msgid "Spacing"
+msgstr "间距"
+
+#: ../clutter/clutter-box-layout.c:1425
+msgid "Spacing between children"
+msgstr "子对象间距"
+
+#: ../clutter/clutter-box-layout.c:1442
+#: ../clutter/deprecated/clutter-table-layout.c:1677
+msgid "Use Animations"
+msgstr "使用动画"
+
+#: ../clutter/clutter-box-layout.c:1443
+#: ../clutter/deprecated/clutter-table-layout.c:1678
+msgid "Whether layout changes should be animated"
+msgstr "是否对布局更改使用动画"
+
+#: ../clutter/clutter-box-layout.c:1467
+#: ../clutter/deprecated/clutter-table-layout.c:1702
+msgid "Easing Mode"
+msgstr "擦除方式"
+
+#: ../clutter/clutter-box-layout.c:1468
+#: ../clutter/deprecated/clutter-table-layout.c:1703
+msgid "The easing mode of the animations"
+msgstr "动画的擦除方式"
+
+#: ../clutter/clutter-box-layout.c:1488
+#: ../clutter/deprecated/clutter-table-layout.c:1723
+msgid "Easing Duration"
+msgstr "擦除持续时间"
+
+#: ../clutter/clutter-box-layout.c:1489
+#: ../clutter/deprecated/clutter-table-layout.c:1724
+msgid "The duration of the animations"
+msgstr "动画持续时间"
+
+#: ../clutter/clutter-brightness-contrast-effect.c:321
+msgid "Brightness"
+msgstr "亮度"
+
+#: ../clutter/clutter-brightness-contrast-effect.c:322
+msgid "The brightness change to apply"
+msgstr "要应用的亮度更改"
+
+#: ../clutter/clutter-brightness-contrast-effect.c:341
+msgid "Contrast"
+msgstr "对比度"
+
+#: ../clutter/clutter-brightness-contrast-effect.c:342
+msgid "The contrast change to apply"
+msgstr "要应用的对比度更改"
+
+#: ../clutter/clutter-canvas.c:248
+msgid "The width of the canvas"
+msgstr "画布的宽度"
+
+#: ../clutter/clutter-canvas.c:264
+msgid "The height of the canvas"
+msgstr "画布的高度"
+
+#: ../clutter/clutter-canvas.c:283
+#| msgid "Selection Color Set"
+msgid "Scale Factor Set"
+msgstr "缩放系数设置"
+
+#: ../clutter/clutter-canvas.c:284
+#| msgid "Whether the transform property is set"
+msgid "Whether the scale-factor property is set"
+msgstr "是否设置了 scale-factor 属性"
+
+#: ../clutter/clutter-canvas.c:305
+#| msgid "Factor"
+msgid "Scale Factor"
+msgstr "缩放系数"
+
+#: ../clutter/clutter-canvas.c:306
+#| msgid "The height of the Cairo surface"
+msgid "The scaling factor for the surface"
+msgstr "表面的缩放系数"
+
+#: ../clutter/clutter-child-meta.c:127
+msgid "Container"
+msgstr "容器"
+
+#: ../clutter/clutter-child-meta.c:128
+msgid "The container that created this data"
+msgstr "创建此数据的容器"
+
+#: ../clutter/clutter-child-meta.c:143
+msgid "The actor wrapped by this data"
+msgstr "由该数据包装的角色(actor)"
+
+#: ../clutter/clutter-click-action.c:586
+msgid "Pressed"
+msgstr "按下时"
+
+#: ../clutter/clutter-click-action.c:587
+msgid "Whether the clickable should be in pressed state"
+msgstr "可点击对象是否在按下状态"
+
+#: ../clutter/clutter-click-action.c:600
+msgid "Held"
+msgstr "保持时"
+
+#: ../clutter/clutter-click-action.c:601
+msgid "Whether the clickable has a grab"
+msgstr "可点击对象是否在拖动状态"
+
+#: ../clutter/clutter-click-action.c:618 ../clutter/clutter-settings.c:653
+msgid "Long Press Duration"
+msgstr "长按持续时间"
+
+#: ../clutter/clutter-click-action.c:619
+msgid "The minimum duration of a long press to recognize the gesture"
+msgstr "识别长按动作的最小持续时间"
+
+#: ../clutter/clutter-click-action.c:637
+msgid "Long Press Threshold"
+msgstr "长按阈值"
+
+#: ../clutter/clutter-click-action.c:638
+msgid "The maximum threshold before a long press is cancelled"
+msgstr "取消长按的最大阈值"
+
+#: ../clutter/clutter-clone.c:342
+msgid "Specifies the actor to be cloned"
+msgstr "指定要克隆的角色(actor)"
+
+#: ../clutter/clutter-colorize-effect.c:251
+msgid "Tint"
+msgstr "色泽"
+
+#: ../clutter/clutter-colorize-effect.c:252
+msgid "The tint to apply"
+msgstr "要应用的色泽"
+
+#: ../clutter/clutter-deform-effect.c:592
+msgid "Horizontal Tiles"
+msgstr "水平图块数"
+
+#: ../clutter/clutter-deform-effect.c:593
+msgid "The number of horizontal tiles"
+msgstr "水平图块(tile)的数量"
+
+#: ../clutter/clutter-deform-effect.c:608
+msgid "Vertical Tiles"
+msgstr "竖直图块数"
+
+#: ../clutter/clutter-deform-effect.c:609
+msgid "The number of vertical tiles"
+msgstr "竖直图块(tile)的数量"
+
+#: ../clutter/clutter-deform-effect.c:626
+msgid "Back Material"
+msgstr "背景素材"
+
+#: ../clutter/clutter-deform-effect.c:627
+msgid "The material to be used when painting the back of the actor"
+msgstr "绘制角色(actor)背景使用的素材"
+
+#: ../clutter/clutter-desaturate-effect.c:271
+msgid "The desaturation factor"
+msgstr "饱和因子"
+
+#: ../clutter/clutter-device-manager.c:127
+#: ../clutter/clutter-input-device.c:355
+#: ../clutter/x11/clutter-keymap-x11.c:457
+msgid "Backend"
+msgstr "后端"
+
+#: ../clutter/clutter-device-manager.c:128
+msgid "The ClutterBackend of the device manager"
+msgstr "设备管理器的 Clutter 后端"
+
+#: ../clutter/clutter-drag-action.c:741
+msgid "Horizontal Drag Threshold"
+msgstr "水平拖动阈值"
+
+#: ../clutter/clutter-drag-action.c:742
+msgid "The horizontal amount of pixels required to start dragging"
+msgstr "开始拖动所需移动的水平像素数"
+
+#: ../clutter/clutter-drag-action.c:769
+msgid "Vertical Drag Threshold"
+msgstr "竖直拖动阈值"
+
+#: ../clutter/clutter-drag-action.c:770
+msgid "The vertical amount of pixels required to start dragging"
+msgstr "开始拖动所需移动的竖直像素数"
+
+#: ../clutter/clutter-drag-action.c:791
+msgid "Drag Handle"
+msgstr "拖拽手柄"
+
+#: ../clutter/clutter-drag-action.c:792
+msgid "The actor that is being dragged"
+msgstr "正在拖动的角色(actor)"
+
+#: ../clutter/clutter-drag-action.c:805
+msgid "Drag Axis"
+msgstr "拖动坐标轴"
+
+#: ../clutter/clutter-drag-action.c:806
+msgid "Constraints the dragging to an axis"
+msgstr "将拖动限制在坐标轴"
+
+#: ../clutter/clutter-drag-action.c:822
+msgid "Drag Area"
+msgstr "拖动区域"
+
+#: ../clutter/clutter-drag-action.c:823
+msgid "Constrains the dragging to a rectangle"
+msgstr "将拖动限制为矩形区域"
+
+#: ../clutter/clutter-drag-action.c:836
+msgid "Drag Area Set"
+msgstr "拖动区域设置"
+
+#: ../clutter/clutter-drag-action.c:837
+msgid "Whether the drag area is set"
+msgstr "是否设置了拖动区域"
+
+#: ../clutter/clutter-flow-layout.c:959
+msgid "Whether each item should receive the same allocation"
+msgstr "每一项是否得到同样的分配"
+
+#: ../clutter/clutter-flow-layout.c:974
+#: ../clutter/deprecated/clutter-table-layout.c:1637
 msgid "Column Spacing"
 msgstr "列间距"
 
-#: clutter/clutter-flow-layout.c:918
+#: ../clutter/clutter-flow-layout.c:975
 msgid "The spacing between columns"
 msgstr "列之间的距离"
 
-#: clutter/clutter-flow-layout.c:934 clutter/clutter-table-layout.c:1727
+#: ../clutter/clutter-flow-layout.c:991
+#: ../clutter/deprecated/clutter-table-layout.c:1653
 msgid "Row Spacing"
 msgstr "行间距"
 
-#: clutter/clutter-flow-layout.c:935
+#: ../clutter/clutter-flow-layout.c:992
 msgid "The spacing between rows"
 msgstr "行之间的距离"
 
-#: clutter/clutter-flow-layout.c:949
+#: ../clutter/clutter-flow-layout.c:1006
 msgid "Minimum Column Width"
 msgstr "最小列宽"
 
-#: clutter/clutter-flow-layout.c:950
+#: ../clutter/clutter-flow-layout.c:1007
 msgid "Minimum width for each column"
 msgstr "每列的最小宽度"
 
-#: clutter/clutter-flow-layout.c:965
+#: ../clutter/clutter-flow-layout.c:1022
 msgid "Maximum Column Width"
 msgstr "最大列宽"
 
-#: clutter/clutter-flow-layout.c:966
+#: ../clutter/clutter-flow-layout.c:1023
 msgid "Maximum width for each column"
 msgstr "每列的最大宽度"
 
-#: clutter/clutter-flow-layout.c:980
+#: ../clutter/clutter-flow-layout.c:1037
 msgid "Minimum Row Height"
 msgstr "最小行高"
 
-#: clutter/clutter-flow-layout.c:981
+#: ../clutter/clutter-flow-layout.c:1038
 msgid "Minimum height for each row"
 msgstr "每行的最小高度"
 
-#: clutter/clutter-flow-layout.c:996
+#: ../clutter/clutter-flow-layout.c:1053
 msgid "Maximum Row Height"
 msgstr "最大行高"
 
-#: clutter/clutter-flow-layout.c:997
+#: ../clutter/clutter-flow-layout.c:1054
 msgid "Maximum height for each row"
 msgstr "每行的最大高度"
 
-#: clutter/clutter-input-device.c:220
+#: ../clutter/clutter-flow-layout.c:1069 ../clutter/clutter-flow-layout.c:1070
+msgid "Snap to grid"
+msgstr "吸附到网格"
+
+#: ../clutter/clutter-gesture-action.c:668
+msgid "Number touch points"
+msgstr "触摸点数量"
+
+#: ../clutter/clutter-gesture-action.c:669
+msgid "Number of touch points"
+msgstr "触摸点的数量"
+
+#: ../clutter/clutter-gesture-action.c:684
+msgid "Threshold Trigger Edge"
+msgstr "触发边缘阈值"
+
+#: ../clutter/clutter-gesture-action.c:685
+msgid "The trigger edge used by the action"
+msgstr "动作使用的触发边缘"
+
+#: ../clutter/clutter-gesture-action.c:704
+#| msgid "Threshold Trigger Edge"
+msgid "Threshold Trigger Horizontal Distance"
+msgstr "阈值触发器水平距离"
+
+#: ../clutter/clutter-gesture-action.c:705
+#| msgid "The trigger edge used by the action"
+msgid "The horizontal trigger distance used by the action"
+msgstr "动作使用的水平触发器距离"
+
+#: ../clutter/clutter-gesture-action.c:723
+#| msgid "Threshold Trigger Edge"
+msgid "Threshold Trigger Vertical Distance"
+msgstr "阈值触发器竖直距离"
+
+#: ../clutter/clutter-gesture-action.c:724
+#| msgid "The trigger edge used by the action"
+msgid "The vertical trigger distance used by the action"
+msgstr "动作使用的竖直触发器距离"
+
+#: ../clutter/clutter-grid-layout.c:1223
+msgid "Left attachment"
+msgstr "左侧附加"
+
+#: ../clutter/clutter-grid-layout.c:1224
+msgid "The column number to attach the left side of the child to"
+msgstr "将子角色的左侧附加到第几列"
+
+#: ../clutter/clutter-grid-layout.c:1231
+msgid "Top attachment"
+msgstr "顶部附加"
+
+#: ../clutter/clutter-grid-layout.c:1232
+msgid "The row number to attach the top side of a child widget to"
+msgstr "将子角色的顶部附加到第几行"
+
+#: ../clutter/clutter-grid-layout.c:1240
+msgid "The number of columns that a child spans"
+msgstr "子角色跨越的列数"
+
+#: ../clutter/clutter-grid-layout.c:1247
+msgid "The number of rows that a child spans"
+msgstr "子角色跨越的行数"
+
+#: ../clutter/clutter-grid-layout.c:1564
+msgid "Row spacing"
+msgstr "行间距"
+
+#: ../clutter/clutter-grid-layout.c:1565
+msgid "The amount of space between two consecutive rows"
+msgstr "相邻行之间的距离"
+
+#: ../clutter/clutter-grid-layout.c:1578
+msgid "Column spacing"
+msgstr "列间距"
+
+#: ../clutter/clutter-grid-layout.c:1579
+msgid "The amount of space between two consecutive columns"
+msgstr "相邻列之间的距离"
+
+#: ../clutter/clutter-grid-layout.c:1593
+msgid "Row Homogeneous"
+msgstr "行对齐"
+
+#: ../clutter/clutter-grid-layout.c:1594
+msgid "If TRUE, the rows are all the same height"
+msgstr "如果设为 TRUE，所有行高度相同"
+
+#: ../clutter/clutter-grid-layout.c:1607
+msgid "Column Homogeneous"
+msgstr "列对齐"
+
+#: ../clutter/clutter-grid-layout.c:1608
+msgid "If TRUE, the columns are all the same width"
+msgstr "如果设为 TRUE，所有列宽度相同"
+
+#: ../clutter/clutter-image.c:249 ../clutter/clutter-image.c:312
+#: ../clutter/clutter-image.c:400
+msgid "Unable to load image data"
+msgstr "无法加载图像数据"
+
+#: ../clutter/clutter-input-device.c:231
 msgid "Id"
 msgstr "ID"
 
-#: clutter/clutter-input-device.c:221
+#: ../clutter/clutter-input-device.c:232
 msgid "Unique identifier of the device"
 msgstr "设备识别符"
 
-#: clutter/clutter-input-device.c:237
+#: ../clutter/clutter-input-device.c:248
 msgid "The name of the device"
 msgstr "设备名称"
 
-#: clutter/clutter-input-device.c:251
+#: ../clutter/clutter-input-device.c:262
 msgid "Device Type"
 msgstr "设备类型"
 
-#: clutter/clutter-input-device.c:252
+#: ../clutter/clutter-input-device.c:263
 msgid "The type of the device"
 msgstr "设备的类型"
 
-#: clutter/clutter-input-device.c:267
+#: ../clutter/clutter-input-device.c:278
 msgid "Device Manager"
 msgstr "设备管理器"
 
-#: clutter/clutter-input-device.c:268
+#: ../clutter/clutter-input-device.c:279
 msgid "The device manager instance"
 msgstr "设备管理器的实例"
 
-#: clutter/clutter-input-device.c:281
+#: ../clutter/clutter-input-device.c:292
 msgid "Device Mode"
 msgstr "设备型号"
 
-#: clutter/clutter-input-device.c:282
+#: ../clutter/clutter-input-device.c:293
 msgid "The mode of the device"
 msgstr "设备的型号"
 
-#: clutter/clutter-input-device.c:296
+#: ../clutter/clutter-input-device.c:307
 msgid "Has Cursor"
 msgstr "包含指针"
 
-#: clutter/clutter-input-device.c:297
+#: ../clutter/clutter-input-device.c:308
 msgid "Whether the device has a cursor"
 msgstr "设备是否具有光标"
 
-#: clutter/clutter-input-device.c:316
+#: ../clutter/clutter-input-device.c:327
 msgid "Whether the device is enabled"
 msgstr "设备是否启用"
 
-#: clutter/clutter-input-device.c:329
-#, fuzzy
+#: ../clutter/clutter-input-device.c:340
 msgid "Number of Axes"
 msgstr "坐标轴数"
 
-#: clutter/clutter-input-device.c:330
-#, fuzzy
+#: ../clutter/clutter-input-device.c:341
 msgid "The number of axes on the device"
-msgstr "设备名称"
+msgstr "设备上的坐标轴数"
 
-#: clutter/clutter-input-device.c:345
+#: ../clutter/clutter-input-device.c:356
 msgid "The backend instance"
 msgstr "后端的实例"
 
-#: clutter/clutter-interval.c:397
+#: ../clutter/clutter-interval.c:553
 msgid "Value Type"
 msgstr "值类型"
 
-#: clutter/clutter-interval.c:398
+#: ../clutter/clutter-interval.c:554
 msgid "The type of the values in the interval"
 msgstr "内部的值类型"
 
-#: clutter/clutter-layout-meta.c:117
+#: ../clutter/clutter-interval.c:569
+msgid "Initial Value"
+msgstr "初始值"
+
+#: ../clutter/clutter-interval.c:570
+msgid "Initial value of the interval"
+msgstr "间隔的初始值"
+
+#: ../clutter/clutter-interval.c:584
+msgid "Final Value"
+msgstr "终止值"
+
+#: ../clutter/clutter-interval.c:585
+msgid "Final value of the interval"
+msgstr "间隔的终止值"
+
+#: ../clutter/clutter-layout-meta.c:117
 msgid "Manager"
 msgstr "管理器"
 
-#: clutter/clutter-layout-meta.c:118
+#: ../clutter/clutter-layout-meta.c:118
 msgid "The manager that created this data"
 msgstr "创建此数据的管理器"
 
-#: clutter/clutter-main.c:490
+#. Translators: Leave this UNTRANSLATED if your language is
+#. * left-to-right.  If your language is right-to-left
+#. * (e.g. Hebrew, Arabic), translate it to "default:RTL".
+#. *
+#. * Do NOT translate it to non-English e.g. "predefinito:LTR"! If
+#. * it isn't default:LTR or default:RTL it will not work.
+#.
+#: ../clutter/clutter-main.c:795
 msgid "default:LTR"
 msgstr "default:LTR"
 
-#: clutter/clutter-main.c:1321
+#: ../clutter/clutter-main.c:1622
 msgid "Show frames per second"
 msgstr "显示帧速率"
 
-#: clutter/clutter-main.c:1323
+#: ../clutter/clutter-main.c:1624
 msgid "Default frame rate"
 msgstr "默认帧率"
 
-#: clutter/clutter-main.c:1325
+#: ../clutter/clutter-main.c:1626
 msgid "Make all warnings fatal"
 msgstr "视所有警告为致命错误"
 
-#: clutter/clutter-main.c:1328
+#: ../clutter/clutter-main.c:1629
 msgid "Direction for the text"
 msgstr "文本方向"
 
-#: clutter/clutter-main.c:1331
+#: ../clutter/clutter-main.c:1632
 msgid "Disable mipmapping on text"
 msgstr "在文本上禁用 MIP 映射"
 
-#: clutter/clutter-main.c:1334
+#: ../clutter/clutter-main.c:1635
 msgid "Use 'fuzzy' picking"
 msgstr "使用模糊选取"
 
-#: clutter/clutter-main.c:1337
+#: ../clutter/clutter-main.c:1638
 msgid "Clutter debugging flags to set"
 msgstr "要设置的 Clutter 调试标志"
 
-#: clutter/clutter-main.c:1339
+#: ../clutter/clutter-main.c:1640
 msgid "Clutter debugging flags to unset"
 msgstr "要取消设置的 Clutter 调试标志"
 
-#: clutter/clutter-main.c:1343
+#: ../clutter/clutter-main.c:1644
 msgid "Clutter profiling flags to set"
 msgstr "要设置的 Clutter 性能分析标志"
 
-#: clutter/clutter-main.c:1345
+#: ../clutter/clutter-main.c:1646
 msgid "Clutter profiling flags to unset"
 msgstr "要取消设置的 Clutter 性能分析标志"
 
-#: clutter/clutter-main.c:1348
+#: ../clutter/clutter-main.c:1649
 msgid "Enable accessibility"
 msgstr "启用辅助功能"
 
-#: clutter/clutter-main.c:1530
+#: ../clutter/clutter-main.c:1841
 msgid "Clutter Options"
 msgstr "Clutter 选项"
 
-#: clutter/clutter-main.c:1531
+#: ../clutter/clutter-main.c:1842
 msgid "Show Clutter Options"
 msgstr "显示 Clutter 选项"
 
-#: clutter/clutter-media.c:77
-msgid "URI"
-msgstr "URI"
+#: ../clutter/clutter-pan-action.c:455
+msgid "Pan Axis"
+msgstr "平移轴"
 
-#: clutter/clutter-media.c:78
-msgid "URI of a media file"
-msgstr "媒体文件的 URI"
+#: ../clutter/clutter-pan-action.c:456
+msgid "Constraints the panning to an axis"
+msgstr "将平移限制为沿坐标轴"
 
-#: clutter/clutter-media.c:91
-msgid "Playing"
-msgstr "正在播放"
+#: ../clutter/clutter-pan-action.c:470
+msgid "Interpolate"
+msgstr "插入"
 
-#: clutter/clutter-media.c:92
-#, fuzzy
-msgid "Whether the actor is playing"
-msgstr "文本是否可以选择"
+#: ../clutter/clutter-pan-action.c:471
+msgid "Whether interpolated events emission is enabled."
+msgstr "是否启用插入式(interpolated)事件发射。"
 
-#: clutter/clutter-media.c:106
-msgid "Progress"
-msgstr "进度"
+#: ../clutter/clutter-pan-action.c:487
+msgid "Deceleration"
+msgstr "减速"
 
-#: clutter/clutter-media.c:107
-msgid "Current progress of the playback"
-msgstr "当前的播放进度"
+#: ../clutter/clutter-pan-action.c:488
+msgid "Rate at which the interpolated panning will decelerate in"
+msgstr "插入的平移的减速比率"
 
-#: clutter/clutter-media.c:120
-msgid "Subtitle URI"
-msgstr "字幕 URI"
+#: ../clutter/clutter-pan-action.c:505
+msgid "Initial acceleration factor"
+msgstr "初始加速系数"
 
-#: clutter/clutter-media.c:121
-msgid "URI of a subtitle file"
-msgstr "字幕文件的 URI"
+#: ../clutter/clutter-pan-action.c:506
+msgid "Factor applied to the momentum when starting the interpolated phase"
+msgstr "开始相位插入(interpolated phase)时应用于初速(momentum)的加速系数"
 
-#: clutter/clutter-media.c:136
-msgid "Subtitle Font Name"
-msgstr "字幕字体名称"
+#: ../clutter/clutter-path-constraint.c:212
+#: ../clutter/deprecated/clutter-behaviour-path.c:221
+msgid "Path"
+msgstr "路径"
 
-#: clutter/clutter-media.c:137
-msgid "The font used to display subtitles"
-msgstr "显示字幕时使用的字体"
-
-#: clutter/clutter-media.c:151
-msgid "Audio Volume"
-msgstr "音频音量"
-
-#: clutter/clutter-media.c:152
-msgid "The volume of the audio"
-msgstr "音频的音量"
-
-#: clutter/clutter-media.c:165
-msgid "Can Seek"
-msgstr "可搜寻"
-
-#: clutter/clutter-media.c:166
-msgid "Whether the current stream is seekable"
-msgstr "当前媒体流是否可搜寻"
-
-#: clutter/clutter-media.c:180
-msgid "Buffer Fill"
-msgstr "缓冲区填充"
-
-#: clutter/clutter-media.c:181
-#, fuzzy
-msgid "The fill level of the buffer"
-msgstr "缓冲区的填充量"
-
-#: clutter/clutter-media.c:195
-#, fuzzy
-msgid "The duration of the stream, in seconds"
-msgstr "媒体流的持续时间，单位为秒"
-
-#: clutter/clutter-path-constraint.c:213
-#, fuzzy
+#: ../clutter/clutter-path-constraint.c:213
 msgid "The path used to constrain an actor"
-msgstr "动画使用的 alpha"
+msgstr "用于包含角色(actor)的路径"
 
-#: clutter/clutter-path-constraint.c:227
+#: ../clutter/clutter-path-constraint.c:227
 msgid "The offset along the path, between -1.0 and 2.0"
-msgstr ""
+msgstr "沿路径的偏移量，介于 -1.0 和 2.0 之间"
 
-#: clutter/clutter-rectangle.c:268
-msgid "The color of the rectangle"
-msgstr "矩形的颜色"
+#: ../clutter/clutter-property-transition.c:269
+msgid "Property Name"
+msgstr "属性名称"
 
-#: clutter/clutter-rectangle.c:281
-msgid "Border Color"
-msgstr "边框颜色"
+#: ../clutter/clutter-property-transition.c:270
+msgid "The name of the property to animate"
+msgstr "要加动画的属性的名称"
 
-#: clutter/clutter-rectangle.c:282
-msgid "The color of the border of the rectangle"
-msgstr "矩形边框的颜色"
-
-#: clutter/clutter-rectangle.c:297
-msgid "Border Width"
-msgstr "边框宽度"
-
-#: clutter/clutter-rectangle.c:298
-msgid "The width of the border of the rectangle"
-msgstr "矩形的边框宽度"
-
-#: clutter/clutter-rectangle.c:312
-msgid "Has Border"
-msgstr "带有边框"
-
-#: clutter/clutter-rectangle.c:313
-msgid "Whether the rectangle should have a border"
-msgstr "矩形是否有边框"
-
-#: clutter/clutter-script.c:434
+#: ../clutter/clutter-script.c:464
 msgid "Filename Set"
 msgstr "文件名设置"
 
-#: clutter/clutter-script.c:435
+#: ../clutter/clutter-script.c:465
 msgid "Whether the :filename property is set"
 msgstr "是否设置了 :filename 属性"
 
-#: clutter/clutter-script.c:449 clutter/clutter-texture.c:1081
+#: ../clutter/clutter-script.c:479
+#: ../clutter/deprecated/clutter-texture.c:1080
 msgid "Filename"
 msgstr "文件名"
 
-#: clutter/clutter-script.c:450
+#: ../clutter/clutter-script.c:480
 msgid "The path of the currently parsed file"
 msgstr "当前解析文件的路径"
 
-#: clutter/clutter-settings.c:414
+#: ../clutter/clutter-script.c:497
+msgid "Translation Domain"
+msgstr "翻译域"
+
+#: ../clutter/clutter-script.c:498
+msgid "The translation domain used to localize string"
+msgstr "用于将字符串本地化的翻译域"
+
+#: ../clutter/clutter-scroll-actor.c:189
+msgid "Scroll Mode"
+msgstr "滚动模式"
+
+#: ../clutter/clutter-scroll-actor.c:190
+msgid "The scrolling direction"
+msgstr "滚动方向"
+
+#: ../clutter/clutter-settings.c:486
 msgid "Double Click Time"
 msgstr "双击时间"
 
-#: clutter/clutter-settings.c:415
+#: ../clutter/clutter-settings.c:487
 msgid "The time between clicks necessary to detect a multiple click"
 msgstr "足以将点击判断为多次点击的时间差"
 
-#: clutter/clutter-settings.c:430
+#: ../clutter/clutter-settings.c:502
 msgid "Double Click Distance"
 msgstr "双击距离"
 
-#: clutter/clutter-settings.c:431
+#: ../clutter/clutter-settings.c:503
 msgid "The distance between clicks necessary to detect a multiple click"
 msgstr "足以将点击判断为多次点击的距离差"
 
-#: clutter/clutter-settings.c:446
+#: ../clutter/clutter-settings.c:518
 msgid "Drag Threshold"
 msgstr "拖动阈值"
 
-#: clutter/clutter-settings.c:447
+#: ../clutter/clutter-settings.c:519
 msgid "The distance the cursor should travel before starting to drag"
 msgstr "光标移动多远距离后才开始拖动"
 
-#: clutter/clutter-settings.c:462 clutter/clutter-text.c:2939
+#: ../clutter/clutter-settings.c:534 ../clutter/clutter-text.c:3437
 msgid "Font Name"
 msgstr "字体名称"
 
-#: clutter/clutter-settings.c:463
+#: ../clutter/clutter-settings.c:535
 msgid ""
 "The description of the default font, as one that could be parsed by Pango"
-msgstr ""
+msgstr "默认字体的描述，以一种 Pango 可解析的格式"
 
-#: clutter/clutter-settings.c:478
+#: ../clutter/clutter-settings.c:550
 msgid "Font Antialias"
 msgstr "字体平滑"
 
-#: clutter/clutter-settings.c:479
+#: ../clutter/clutter-settings.c:551
 msgid ""
 "Whether to use antialiasing (1 to enable, 0 to disable, and -1 to use the "
 "default)"
 msgstr "是否使用平滑(1 启动，0 禁用，-1 使用默认设置)"
 
-#: clutter/clutter-settings.c:495
+#: ../clutter/clutter-settings.c:567 ../clutter/clutter-settings.c:575
 msgid "Font DPI"
 msgstr "字体 DPI"
 
-#: clutter/clutter-settings.c:496
+#: ../clutter/clutter-settings.c:568 ../clutter/clutter-settings.c:576
 msgid ""
 "The resolution of the font, in 1024 * dots/inch, or -1 to use the default"
 msgstr "字体的分辨率，单位为 1024 * 点/英寸，或设为 -1 来使用默认设置"
 
-#: clutter/clutter-settings.c:512
-#, fuzzy
+#: ../clutter/clutter-settings.c:592
 msgid "Font Hinting"
-msgstr "字体描述"
+msgstr "字体微调"
 
-#: clutter/clutter-settings.c:513
+#: ../clutter/clutter-settings.c:593
 msgid ""
 "Whether to use hinting (1 to enable, 0 to disable and -1 to use the default)"
-msgstr ""
+msgstr "是否使用微调(1 启用，0 禁用，-1 使用默认值)"
 
-#: clutter/clutter-settings.c:534
+#: ../clutter/clutter-settings.c:614
 msgid "Font Hint Style"
-msgstr ""
+msgstr "字体微调样式"
 
-#: clutter/clutter-settings.c:535
+#: ../clutter/clutter-settings.c:615
 msgid "The style of hinting (hintnone, hintslight, hintmedium, hintfull)"
-msgstr ""
+msgstr "微调样式(hintnone, hintslight, hintmedium, hintfull)"
 
-#: clutter/clutter-settings.c:556
+#: ../clutter/clutter-settings.c:636
 msgid "Font Subpixel Order"
 msgstr "字体次像素平滑顺序"
 
-#: clutter/clutter-settings.c:557
+#: ../clutter/clutter-settings.c:637
 msgid "The type of subpixel antialiasing (none, rgb, bgr, vrgb, vbgr)"
 msgstr "次像素平滑的类型(无、rgb、bgr、vrgb、vbgr)"
 
-#: clutter/clutter-settings.c:574
+#: ../clutter/clutter-settings.c:654
 msgid "The minimum duration for a long press gesture to be recognized"
-msgstr ""
+msgstr "识别为长按手势的最小持续时间"
 
-#: clutter/clutter-settings.c:581
+#: ../clutter/clutter-settings.c:661
+msgid "Window Scaling Factor"
+msgstr "窗口缩放系数"
+
+#: ../clutter/clutter-settings.c:662
+#| msgid "Add an effect to be applied on the actor"
+msgid "The scaling factor to be applied to windows"
+msgstr "添加要应用于角色(actor)的缩放系数"
+
+#: ../clutter/clutter-settings.c:669
 msgid "Fontconfig configuration timestamp"
-msgstr ""
+msgstr "Fontconfig 配置时间戳"
 
-#: clutter/clutter-settings.c:582
+#: ../clutter/clutter-settings.c:670
 msgid "Timestamp of the current fontconfig configuration"
-msgstr ""
+msgstr "当前 fontconfig 配置的时间戳"
 
-#: clutter/clutter-shader.c:255
-#, fuzzy
+#: ../clutter/clutter-settings.c:687
+msgid "Password Hint Time"
+msgstr "密码提示时长"
+
+#: ../clutter/clutter-settings.c:688
+msgid "How long to show the last input character in hidden entries"
+msgstr "隐藏式输入的最后一个字符显示多长时间"
+
+#: ../clutter/clutter-shader-effect.c:485
+msgid "Shader Type"
+msgstr "着色引擎类型"
+
+#: ../clutter/clutter-shader-effect.c:486
+msgid "The type of shader used"
+msgstr "使用的着色引擎类型"
+
+#: ../clutter/clutter-snap-constraint.c:322
+msgid "The source of the constraint"
+msgstr "约束的源"
+
+#: ../clutter/clutter-snap-constraint.c:335
+msgid "From Edge"
+msgstr "从边缘"
+
+#: ../clutter/clutter-snap-constraint.c:336
+msgid "The edge of the actor that should be snapped"
+msgstr "要吸附的角色(actor)边缘"
+
+#: ../clutter/clutter-snap-constraint.c:350
+msgid "To Edge"
+msgstr "到边缘"
+
+#: ../clutter/clutter-snap-constraint.c:351
+msgid "The edge of the source that should be snapped"
+msgstr "要吸附的源的边缘"
+
+#: ../clutter/clutter-snap-constraint.c:367
+msgid "The offset in pixels to apply to the constraint"
+msgstr "应用于约束的偏移量(像素)"
+
+#: ../clutter/clutter-stage.c:1899
+msgid "Fullscreen Set"
+msgstr "全屏设置"
+
+#: ../clutter/clutter-stage.c:1900
+msgid "Whether the main stage is fullscreen"
+msgstr "主舞台(stage)是否全屏"
+
+#: ../clutter/clutter-stage.c:1914
+msgid "Offscreen"
+msgstr "幕后"
+
+#: ../clutter/clutter-stage.c:1915
+msgid "Whether the main stage should be rendered offscreen"
+msgstr "主舞台是否应在幕后渲染(rendered offscreen)"
+
+#: ../clutter/clutter-stage.c:1927 ../clutter/clutter-text.c:3551
+msgid "Cursor Visible"
+msgstr "光标可见"
+
+#: ../clutter/clutter-stage.c:1928
+msgid "Whether the mouse pointer is visible on the main stage"
+msgstr "鼠标指针在主舞台(stage)是否可见"
+
+#: ../clutter/clutter-stage.c:1942
+msgid "User Resizable"
+msgstr "用户可改变大小"
+
+#: ../clutter/clutter-stage.c:1943
+msgid "Whether the stage is able to be resized via user interaction"
+msgstr "舞台(stage)是否可由用户操作改变大小"
+
+#: ../clutter/clutter-stage.c:1958 ../clutter/deprecated/clutter-box.c:256
+#: ../clutter/deprecated/clutter-rectangle.c:270
+msgid "Color"
+msgstr "色彩"
+
+#: ../clutter/clutter-stage.c:1959
+msgid "The color of the stage"
+msgstr "舞台(stage)的色彩"
+
+#: ../clutter/clutter-stage.c:1974
+msgid "Perspective"
+msgstr "透视"
+
+#: ../clutter/clutter-stage.c:1975
+msgid "Perspective projection parameters"
+msgstr "透视投射参数"
+
+#: ../clutter/clutter-stage.c:1990
+msgid "Title"
+msgstr "标题"
+
+#: ../clutter/clutter-stage.c:1991
+msgid "Stage Title"
+msgstr "舞台(stage)标题"
+
+#: ../clutter/clutter-stage.c:2008
+msgid "Use Fog"
+msgstr "使用迷雾"
+
+#: ../clutter/clutter-stage.c:2009
+msgid "Whether to enable depth cueing"
+msgstr "是否启用景深处理(depth cueing)"
+
+#: ../clutter/clutter-stage.c:2025
+msgid "Fog"
+msgstr "迷雾"
+
+#: ../clutter/clutter-stage.c:2026
+msgid "Settings for the depth cueing"
+msgstr "景深处理(depth cueing)设置"
+
+#: ../clutter/clutter-stage.c:2042
+msgid "Use Alpha"
+msgstr "使用 Alpha"
+
+#: ../clutter/clutter-stage.c:2043
+msgid "Whether to honour the alpha component of the stage color"
+msgstr "是否考虑舞台(stage)色彩的 alpha 分量"
+
+#: ../clutter/clutter-stage.c:2059
+msgid "Key Focus"
+msgstr "按键聚焦"
+
+#: ../clutter/clutter-stage.c:2060
+msgid "The currently key focused actor"
+msgstr "当前按键聚焦的角色(actor)"
+
+#: ../clutter/clutter-stage.c:2076
+msgid "No Clear Hint"
+msgstr "没有明确的提示"
+
+#: ../clutter/clutter-stage.c:2077
+msgid "Whether the stage should clear its contents"
+msgstr "舞台(stage)是否清除其内容"
+
+#: ../clutter/clutter-stage.c:2090
+msgid "Accept Focus"
+msgstr "接受焦点"
+
+#: ../clutter/clutter-stage.c:2091
+msgid "Whether the stage should accept focus on show"
+msgstr "舞台(stage)显示时是否接受焦点"
+
+#: ../clutter/clutter-text-buffer.c:347 ../clutter/clutter-text.c:3472
+msgid "Text"
+msgstr "文本"
+
+#: ../clutter/clutter-text-buffer.c:348
+msgid "The contents of the buffer"
+msgstr "缓冲区的内容"
+
+#: ../clutter/clutter-text-buffer.c:361
+msgid "Text length"
+msgstr "文本长度"
+
+#: ../clutter/clutter-text-buffer.c:362
+msgid "Length of the text currently in the buffer"
+msgstr "当前缓冲区内文本的长度"
+
+#: ../clutter/clutter-text-buffer.c:375
+msgid "Maximum length"
+msgstr "最大长度"
+
+#: ../clutter/clutter-text-buffer.c:376
+msgid "Maximum number of characters for this entry. Zero if no maximum"
+msgstr "此输入部件的最大字符数量。0 为不限。"
+
+#: ../clutter/clutter-text.c:3419
+msgid "Buffer"
+msgstr "缓冲区"
+
+#: ../clutter/clutter-text.c:3420
+msgid "The buffer for the text"
+msgstr "文本的缓冲区"
+
+#: ../clutter/clutter-text.c:3438
+msgid "The font to be used by the text"
+msgstr "文本使用的字体"
+
+#: ../clutter/clutter-text.c:3455
+msgid "Font Description"
+msgstr "字体描述"
+
+#: ../clutter/clutter-text.c:3456
+msgid "The font description to be used"
+msgstr "使用的字体描述"
+
+#: ../clutter/clutter-text.c:3473
+msgid "The text to render"
+msgstr "要渲染的文本"
+
+#: ../clutter/clutter-text.c:3487
+msgid "Font Color"
+msgstr "字体颜色"
+
+#: ../clutter/clutter-text.c:3488
+msgid "Color of the font used by the text"
+msgstr "文本字体使用的颜色"
+
+#: ../clutter/clutter-text.c:3503
+msgid "Editable"
+msgstr "可编辑"
+
+#: ../clutter/clutter-text.c:3504
+msgid "Whether the text is editable"
+msgstr "文本是否可以编辑"
+
+#: ../clutter/clutter-text.c:3519
+msgid "Selectable"
+msgstr "可选择"
+
+#: ../clutter/clutter-text.c:3520
+msgid "Whether the text is selectable"
+msgstr "文本是否可以选择"
+
+#: ../clutter/clutter-text.c:3534
+msgid "Activatable"
+msgstr "可激活"
+
+#: ../clutter/clutter-text.c:3535
+msgid "Whether pressing return causes the activate signal to be emitted"
+msgstr "按下回车键时是否发射激活信号"
+
+#: ../clutter/clutter-text.c:3552
+msgid "Whether the input cursor is visible"
+msgstr "输入光标是否可见"
+
+#: ../clutter/clutter-text.c:3566 ../clutter/clutter-text.c:3567
+msgid "Cursor Color"
+msgstr "指针颜色"
+
+#: ../clutter/clutter-text.c:3582
+msgid "Cursor Color Set"
+msgstr "光标颜色设置"
+
+#: ../clutter/clutter-text.c:3583
+msgid "Whether the cursor color has been set"
+msgstr "是否设置了光标颜色"
+
+#: ../clutter/clutter-text.c:3598
+msgid "Cursor Size"
+msgstr "指针大小"
+
+#: ../clutter/clutter-text.c:3599
+msgid "The width of the cursor, in pixels"
+msgstr "指针的宽度，以像素计"
+
+#: ../clutter/clutter-text.c:3615 ../clutter/clutter-text.c:3633
+msgid "Cursor Position"
+msgstr "光标位置"
+
+#: ../clutter/clutter-text.c:3616 ../clutter/clutter-text.c:3634
+msgid "The cursor position"
+msgstr "光标的位置"
+
+#: ../clutter/clutter-text.c:3649
+msgid "Selection-bound"
+msgstr "选区边界"
+
+#: ../clutter/clutter-text.c:3650
+msgid "The cursor position of the other end of the selection"
+msgstr "选区另一端光标的位置"
+
+#: ../clutter/clutter-text.c:3665 ../clutter/clutter-text.c:3666
+msgid "Selection Color"
+msgstr "选区颜色"
+
+#: ../clutter/clutter-text.c:3681
+msgid "Selection Color Set"
+msgstr "选区颜色设置"
+
+#: ../clutter/clutter-text.c:3682
+msgid "Whether the selection color has been set"
+msgstr "是否设置了选区颜色"
+
+#: ../clutter/clutter-text.c:3697
+msgid "Attributes"
+msgstr "属性"
+
+#: ../clutter/clutter-text.c:3698
+msgid "A list of style attributes to apply to the contents of the actor"
+msgstr "应用到角色(actor)内容的风格属性列表"
+
+#: ../clutter/clutter-text.c:3720
+msgid "Use markup"
+msgstr "使用标记"
+
+#: ../clutter/clutter-text.c:3721
+msgid "Whether or not the text includes Pango markup"
+msgstr "文本是否包括 Pango 标记"
+
+#: ../clutter/clutter-text.c:3737
+msgid "Line wrap"
+msgstr "换行"
+
+#: ../clutter/clutter-text.c:3738
+msgid "If set, wrap the lines if the text becomes too wide"
+msgstr "如果设置，在文本过宽时将换行显示"
+
+#: ../clutter/clutter-text.c:3753
+msgid "Line wrap mode"
+msgstr "换行模式"
+
+#: ../clutter/clutter-text.c:3754
+msgid "Control how line-wrapping is done"
+msgstr "控制换行行为"
+
+#: ../clutter/clutter-text.c:3769
+msgid "Ellipsize"
+msgstr "简略"
+
+#: ../clutter/clutter-text.c:3770
+msgid "The preferred place to ellipsize the string"
+msgstr "简略字符串的首选位置"
+
+#: ../clutter/clutter-text.c:3786
+msgid "Line Alignment"
+msgstr "行对齐方式"
+
+#: ../clutter/clutter-text.c:3787
+msgid "The preferred alignment for the string, for multi-line text"
+msgstr "多行文本首选的字符串对齐方式"
+
+#: ../clutter/clutter-text.c:3803
+msgid "Justify"
+msgstr "调整"
+
+#: ../clutter/clutter-text.c:3804
+msgid "Whether the text should be justified"
+msgstr "是否对齐文本"
+
+#: ../clutter/clutter-text.c:3819
+msgid "Password Character"
+msgstr "密码字符"
+
+#: ../clutter/clutter-text.c:3820
+msgid "If non-zero, use this character to display the actor's contents"
+msgstr "若字符非零，用此字符显示角色(actor)的内容"
+
+#: ../clutter/clutter-text.c:3834
+msgid "Max Length"
+msgstr "最大长度"
+
+#: ../clutter/clutter-text.c:3835
+msgid "Maximum length of the text inside the actor"
+msgstr "角色(actor)内部文本的最大长度"
+
+#: ../clutter/clutter-text.c:3858
+msgid "Single Line Mode"
+msgstr "单行模式"
+
+#: ../clutter/clutter-text.c:3859
+msgid "Whether the text should be a single line"
+msgstr "文本是否只应使用一行"
+
+#: ../clutter/clutter-text.c:3873 ../clutter/clutter-text.c:3874
+msgid "Selected Text Color"
+msgstr "选中文本颜色"
+
+#: ../clutter/clutter-text.c:3889
+msgid "Selected Text Color Set"
+msgstr "选中文本颜色设置"
+
+#: ../clutter/clutter-text.c:3890
+msgid "Whether the selected text color has been set"
+msgstr "是否设置了选中文本颜色"
+
+#: ../clutter/clutter-timeline.c:593
+#: ../clutter/deprecated/clutter-animation.c:557
+msgid "Loop"
+msgstr "循环"
+
+#: ../clutter/clutter-timeline.c:594
+msgid "Should the timeline automatically restart"
+msgstr "时间线是否自动重新开始"
+
+#: ../clutter/clutter-timeline.c:608
+msgid "Delay"
+msgstr "延时"
+
+#: ../clutter/clutter-timeline.c:609
+msgid "Delay before start"
+msgstr "开始前的延时"
+
+#: ../clutter/clutter-timeline.c:624
+#: ../clutter/deprecated/clutter-animation.c:541
+#: ../clutter/deprecated/clutter-animator.c:1801
+#: ../clutter/deprecated/clutter-media.c:224
+#: ../clutter/deprecated/clutter-state.c:1517
+msgid "Duration"
+msgstr "时长"
+
+#: ../clutter/clutter-timeline.c:625
+msgid "Duration of the timeline in milliseconds"
+msgstr "时间线长度(毫秒)"
+
+#: ../clutter/clutter-timeline.c:640
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:521
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:330
+msgid "Direction"
+msgstr "方向"
+
+#: ../clutter/clutter-timeline.c:641
+msgid "Direction of the timeline"
+msgstr "时间线方向"
+
+#: ../clutter/clutter-timeline.c:656
+msgid "Auto Reverse"
+msgstr "自动反转"
+
+#: ../clutter/clutter-timeline.c:657
+msgid "Whether the direction should be reversed when reaching the end"
+msgstr "在到达末尾时是否自动反转方向"
+
+#: ../clutter/clutter-timeline.c:675
+msgid "Repeat Count"
+msgstr "重复次数"
+
+#: ../clutter/clutter-timeline.c:676
+msgid "How many times the timeline should repeat"
+msgstr "时间线重复多少次"
+
+#: ../clutter/clutter-timeline.c:690
+msgid "Progress Mode"
+msgstr "进度模式"
+
+#: ../clutter/clutter-timeline.c:691
+msgid "How the timeline should compute the progress"
+msgstr "时间线如何计算进度"
+
+#: ../clutter/clutter-transition.c:244
+msgid "Interval"
+msgstr "间隔"
+
+#: ../clutter/clutter-transition.c:245
+msgid "The interval of values to transition"
+msgstr "值之间的过渡间隔"
+
+#: ../clutter/clutter-transition.c:259
+msgid "Animatable"
+msgstr "可动画"
+
+#: ../clutter/clutter-transition.c:260
+msgid "The animatable object"
+msgstr "可动画显示的对象"
+
+#: ../clutter/clutter-transition.c:281
+msgid "Remove on Complete"
+msgstr "在完成时移除"
+
+#: ../clutter/clutter-transition.c:282
+msgid "Detach the transition when completed"
+msgstr "完成时去除过渡"
+
+#: ../clutter/clutter-zoom-action.c:365
+msgid "Zoom Axis"
+msgstr "缩放轴"
+
+#: ../clutter/clutter-zoom-action.c:366
+msgid "Constraints the zoom to an axis"
+msgstr "将缩放限制为沿某个坐标轴"
+
+#: ../clutter/deprecated/clutter-alpha.c:354
+#: ../clutter/deprecated/clutter-animation.c:572
+#: ../clutter/deprecated/clutter-animator.c:1818
+msgid "Timeline"
+msgstr "时间轴"
+
+#: ../clutter/deprecated/clutter-alpha.c:355
+msgid "Timeline used by the alpha"
+msgstr "Alpha 使用的时间轴"
+
+#: ../clutter/deprecated/clutter-alpha.c:371
+msgid "Alpha value"
+msgstr "Alpha 值"
+
+#: ../clutter/deprecated/clutter-alpha.c:372
+msgid "Alpha value as computed by the alpha"
+msgstr "alpha 函数所计算出的 Alpha 值"
+
+#: ../clutter/deprecated/clutter-alpha.c:393
+#: ../clutter/deprecated/clutter-animation.c:525
+msgid "Mode"
+msgstr "模式"
+
+#: ../clutter/deprecated/clutter-alpha.c:394
+msgid "Progress mode"
+msgstr "进度模式"
+
+#: ../clutter/deprecated/clutter-animation.c:508
+msgid "Object"
+msgstr "对象"
+
+#: ../clutter/deprecated/clutter-animation.c:509
+msgid "Object to which the animation applies"
+msgstr "应用动画的对象"
+
+#: ../clutter/deprecated/clutter-animation.c:526
+msgid "The mode of the animation"
+msgstr "动画的模式"
+
+#: ../clutter/deprecated/clutter-animation.c:542
+msgid "Duration of the animation, in milliseconds"
+msgstr "动画时长，以毫秒计"
+
+#: ../clutter/deprecated/clutter-animation.c:558
+msgid "Whether the animation should loop"
+msgstr "动画是否循环"
+
+#: ../clutter/deprecated/clutter-animation.c:573
+msgid "The timeline used by the animation"
+msgstr "动画使用的时间轴"
+
+#: ../clutter/deprecated/clutter-animation.c:589
+#: ../clutter/deprecated/clutter-behaviour.c:237
+msgid "Alpha"
+msgstr "Alpha"
+
+#: ../clutter/deprecated/clutter-animation.c:590
+msgid "The alpha used by the animation"
+msgstr "动画使用的 alpha"
+
+#: ../clutter/deprecated/clutter-animator.c:1802
+msgid "The duration of the animation"
+msgstr "动画的时长"
+
+#: ../clutter/deprecated/clutter-animator.c:1819
+msgid "The timeline of the animation"
+msgstr "动画的时间轴"
+
+#: ../clutter/deprecated/clutter-behaviour.c:238
+msgid "Alpha Object to drive the behaviour"
+msgstr "驱动行为的 Alpha 对象"
+
+#: ../clutter/deprecated/clutter-behaviour-depth.c:180
+msgid "Start Depth"
+msgstr "起始色深"
+
+#: ../clutter/deprecated/clutter-behaviour-depth.c:181
+msgid "Initial depth to apply"
+msgstr "应用的初始色深"
+
+#: ../clutter/deprecated/clutter-behaviour-depth.c:196
+msgid "End Depth"
+msgstr "终点色深"
+
+#: ../clutter/deprecated/clutter-behaviour-depth.c:197
+msgid "Final depth to apply"
+msgstr "应用的终点色深"
+
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:394
+msgid "Start Angle"
+msgstr "起始角度"
+
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:395
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:277
+msgid "Initial angle"
+msgstr "初始的角度"
+
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:410
+msgid "End Angle"
+msgstr "终点角度"
+
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:411
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:295
+msgid "Final angle"
+msgstr "终点的角度"
+
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:426
+msgid "Angle x tilt"
+msgstr "倾角 x"
+
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:427
+msgid "Tilt of the ellipse around x axis"
+msgstr "x 轴倾斜角"
+
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:442
+msgid "Angle y tilt"
+msgstr "倾角 y"
+
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:443
+msgid "Tilt of the ellipse around y axis"
+msgstr "y 轴倾斜角"
+
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:458
+msgid "Angle z tilt"
+msgstr "倾角 z"
+
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:459
+msgid "Tilt of the ellipse around z axis"
+msgstr "z 轴倾斜角"
+
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:475
+msgid "Width of the ellipse"
+msgstr "椭圆宽度"
+
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:491
+msgid "Height of ellipse"
+msgstr "椭圆高度"
+
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:506
+msgid "Center"
+msgstr "中心"
+
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:507
+msgid "Center of ellipse"
+msgstr "椭圆中心"
+
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:522
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:331
+msgid "Direction of rotation"
+msgstr "旋转方向"
+
+#: ../clutter/deprecated/clutter-behaviour-opacity.c:177
+msgid "Opacity Start"
+msgstr "起始不透明度"
+
+#: ../clutter/deprecated/clutter-behaviour-opacity.c:178
+msgid "Initial opacity level"
+msgstr "初始不透明度级别"
+
+#: ../clutter/deprecated/clutter-behaviour-opacity.c:195
+msgid "Opacity End"
+msgstr "终止不透明度"
+
+#: ../clutter/deprecated/clutter-behaviour-opacity.c:196
+msgid "Final opacity level"
+msgstr "最终不透明度级别"
+
+#: ../clutter/deprecated/clutter-behaviour-path.c:222
+msgid "The ClutterPath object representing the path to animate along"
+msgstr "代表动画所沿路径的 ClutterPath 对象"
+
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:276
+msgid "Angle Begin"
+msgstr "开始角度"
+
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:294
+msgid "Angle End"
+msgstr "结束角度"
+
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:312
+msgid "Axis"
+msgstr "坐标轴"
+
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:313
+msgid "Axis of rotation"
+msgstr "旋转轴"
+
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:348
+msgid "Center X"
+msgstr "中心 X"
+
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:349
+msgid "X coordinate of the center of rotation"
+msgstr "旋转中心的 X 坐标"
+
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:366
+msgid "Center Y"
+msgstr "中心 Y"
+
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:367
+msgid "Y coordinate of the center of rotation"
+msgstr "旋转中心的 Y 坐标"
+
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:384
+msgid "Center Z"
+msgstr "中心 Z"
+
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:385
+msgid "Z coordinate of the center of rotation"
+msgstr "旋转中心的 Z 坐标"
+
+#: ../clutter/deprecated/clutter-behaviour-scale.c:222
+msgid "X Start Scale"
+msgstr "X 起始刻度"
+
+#: ../clutter/deprecated/clutter-behaviour-scale.c:223
+msgid "Initial scale on the X axis"
+msgstr "X 轴起始刻度"
+
+#: ../clutter/deprecated/clutter-behaviour-scale.c:241
+msgid "X End Scale"
+msgstr "X 终止刻度"
+
+#: ../clutter/deprecated/clutter-behaviour-scale.c:242
+msgid "Final scale on the X axis"
+msgstr "X 轴终止刻度"
+
+#: ../clutter/deprecated/clutter-behaviour-scale.c:260
+msgid "Y Start Scale"
+msgstr "Y 起始刻度"
+
+#: ../clutter/deprecated/clutter-behaviour-scale.c:261
+msgid "Initial scale on the Y axis"
+msgstr "Y 轴起始刻度"
+
+#: ../clutter/deprecated/clutter-behaviour-scale.c:279
+msgid "Y End Scale"
+msgstr "Y 终止刻度"
+
+#: ../clutter/deprecated/clutter-behaviour-scale.c:280
+msgid "Final scale on the Y axis"
+msgstr "Y 轴终止刻度"
+
+#: ../clutter/deprecated/clutter-box.c:257
+msgid "The background color of the box"
+msgstr "框的背景颜色"
+
+#: ../clutter/deprecated/clutter-box.c:270
+msgid "Color Set"
+msgstr "颜色设置"
+
+#: ../clutter/deprecated/clutter-cairo-texture.c:593
+msgid "Surface Width"
+msgstr "表明宽度"
+
+#: ../clutter/deprecated/clutter-cairo-texture.c:594
+msgid "The width of the Cairo surface"
+msgstr "Cairo 表明的宽度"
+
+#: ../clutter/deprecated/clutter-cairo-texture.c:611
+msgid "Surface Height"
+msgstr "表明高度"
+
+#: ../clutter/deprecated/clutter-cairo-texture.c:612
+msgid "The height of the Cairo surface"
+msgstr "Cairo 表明的高度"
+
+#: ../clutter/deprecated/clutter-cairo-texture.c:632
+msgid "Auto Resize"
+msgstr "自动缩放"
+
+#: ../clutter/deprecated/clutter-cairo-texture.c:633
+msgid "Whether the surface should match the allocation"
+msgstr "表面是否应适应分配的空间"
+
+#: ../clutter/deprecated/clutter-media.c:83
+msgid "URI"
+msgstr "URI"
+
+#: ../clutter/deprecated/clutter-media.c:84
+msgid "URI of a media file"
+msgstr "媒体文件的 URI"
+
+#: ../clutter/deprecated/clutter-media.c:100
+msgid "Playing"
+msgstr "正在播放"
+
+#: ../clutter/deprecated/clutter-media.c:101
+msgid "Whether the actor is playing"
+msgstr "角色(actor)是否在播放"
+
+#: ../clutter/deprecated/clutter-media.c:118
+msgid "Progress"
+msgstr "进度"
+
+#: ../clutter/deprecated/clutter-media.c:119
+msgid "Current progress of the playback"
+msgstr "当前的播放进度"
+
+#: ../clutter/deprecated/clutter-media.c:135
+msgid "Subtitle URI"
+msgstr "字幕 URI"
+
+#: ../clutter/deprecated/clutter-media.c:136
+msgid "URI of a subtitle file"
+msgstr "字幕文件的 URI"
+
+#: ../clutter/deprecated/clutter-media.c:154
+msgid "Subtitle Font Name"
+msgstr "字幕字体名称"
+
+#: ../clutter/deprecated/clutter-media.c:155
+msgid "The font used to display subtitles"
+msgstr "显示字幕时使用的字体"
+
+#: ../clutter/deprecated/clutter-media.c:172
+msgid "Audio Volume"
+msgstr "音频音量"
+
+#: ../clutter/deprecated/clutter-media.c:173
+msgid "The volume of the audio"
+msgstr "音频的音量"
+
+#: ../clutter/deprecated/clutter-media.c:189
+msgid "Can Seek"
+msgstr "可搜寻"
+
+#: ../clutter/deprecated/clutter-media.c:190
+msgid "Whether the current stream is seekable"
+msgstr "当前媒体流是否可搜寻"
+
+#: ../clutter/deprecated/clutter-media.c:207
+msgid "Buffer Fill"
+msgstr "缓冲区填充"
+
+#: ../clutter/deprecated/clutter-media.c:208
+msgid "The fill level of the buffer"
+msgstr "缓冲区的填充量"
+
+#: ../clutter/deprecated/clutter-media.c:225
+msgid "The duration of the stream, in seconds"
+msgstr "媒体流的持续时间(秒)"
+
+#: ../clutter/deprecated/clutter-rectangle.c:271
+msgid "The color of the rectangle"
+msgstr "矩形的颜色"
+
+#: ../clutter/deprecated/clutter-rectangle.c:284
+msgid "Border Color"
+msgstr "边框颜色"
+
+#: ../clutter/deprecated/clutter-rectangle.c:285
+msgid "The color of the border of the rectangle"
+msgstr "矩形边框的颜色"
+
+#: ../clutter/deprecated/clutter-rectangle.c:300
+msgid "Border Width"
+msgstr "边框宽度"
+
+#: ../clutter/deprecated/clutter-rectangle.c:301
+msgid "The width of the border of the rectangle"
+msgstr "矩形的边框宽度"
+
+#: ../clutter/deprecated/clutter-rectangle.c:315
+msgid "Has Border"
+msgstr "带有边框"
+
+#: ../clutter/deprecated/clutter-rectangle.c:316
+msgid "Whether the rectangle should have a border"
+msgstr "矩形是否有边框"
+
+#: ../clutter/deprecated/clutter-shader.c:257
 msgid "Vertex Source"
-msgstr "顶点着色引擎"
+msgstr "顶点源"
 
-#: clutter/clutter-shader.c:256
-#, fuzzy
+#: ../clutter/deprecated/clutter-shader.c:258
 msgid "Source of vertex shader"
-msgstr "顶点着色引擎"
+msgstr "顶点着色引擎的源"
 
-#: clutter/clutter-shader.c:272
-#, fuzzy
+#: ../clutter/deprecated/clutter-shader.c:274
 msgid "Fragment Source"
-msgstr "片段着色引擎"
+msgstr "片段源"
 
-#: clutter/clutter-shader.c:273
-#, fuzzy
+#: ../clutter/deprecated/clutter-shader.c:275
 msgid "Source of fragment shader"
-msgstr "片段着色引擎"
+msgstr "片段着色引擎的源"
 
-#: clutter/clutter-shader.c:290
+#: ../clutter/deprecated/clutter-shader.c:292
 msgid "Compiled"
-msgstr ""
+msgstr "已编译"
 
-#: clutter/clutter-shader.c:291
+#: ../clutter/deprecated/clutter-shader.c:293
 msgid "Whether the shader is compiled and linked"
-msgstr ""
+msgstr "着色引擎是否已编译和链接"
 
-#: clutter/clutter-shader.c:308
+#: ../clutter/deprecated/clutter-shader.c:310
 msgid "Whether the shader is enabled"
-msgstr ""
+msgstr "着色引擎是否已启用"
 
-#: clutter/clutter-shader.c:519
+#: ../clutter/deprecated/clutter-shader.c:521
 #, c-format
 msgid "%s compilation failed: %s"
 msgstr "%s 编译失败：%s"
 
-#: clutter/clutter-shader.c:520
+#: ../clutter/deprecated/clutter-shader.c:522
 msgid "Vertex shader"
 msgstr "顶点着色引擎"
 
-#: clutter/clutter-shader.c:521
+#: ../clutter/deprecated/clutter-shader.c:523
 msgid "Fragment shader"
 msgstr "片段着色引擎"
 
-#: clutter/clutter-shader-effect.c:415
-msgid "Shader Type"
-msgstr "着色引擎类型"
-
-#: clutter/clutter-shader-effect.c:416
-msgid "The type of shader used"
-msgstr "使用的着色引擎类型"
-
-#: clutter/clutter-snap-constraint.c:322
-#, fuzzy
-msgid "The source of the constraint"
-msgstr "动画的模式"
-
-#: clutter/clutter-snap-constraint.c:335
-msgid "From Edge"
-msgstr ""
-
-#: clutter/clutter-snap-constraint.c:336
-msgid "The edge of the actor that should be snapped"
-msgstr ""
-
-#: clutter/clutter-snap-constraint.c:350
-msgid "To Edge"
-msgstr ""
-
-#: clutter/clutter-snap-constraint.c:351
-msgid "The edge of the source that should be snapped"
-msgstr ""
-
-#: clutter/clutter-snap-constraint.c:367
-msgid "The offset in pixels to apply to the constraint"
-msgstr ""
-
-#: clutter/clutter-stage.c:1707
-msgid "Fullscreen Set"
-msgstr ""
-
-#: clutter/clutter-stage.c:1708
-msgid "Whether the main stage is fullscreen"
-msgstr ""
-
-#: clutter/clutter-stage.c:1724
-msgid "Offscreen"
-msgstr ""
-
-#: clutter/clutter-stage.c:1725
-msgid "Whether the main stage should be rendered offscreen"
-msgstr ""
-
-#: clutter/clutter-stage.c:1737 clutter/clutter-text.c:3052
-msgid "Cursor Visible"
-msgstr "光标可见"
-
-#: clutter/clutter-stage.c:1738
-msgid "Whether the mouse pointer is visible on the main stage"
-msgstr ""
-
-#: clutter/clutter-stage.c:1752
-msgid "User Resizable"
-msgstr "用户可改变大小"
-
-#: clutter/clutter-stage.c:1753
-msgid "Whether the stage is able to be resized via user interaction"
-msgstr ""
-
-#: clutter/clutter-stage.c:1766
-msgid "The color of the stage"
-msgstr ""
-
-#: clutter/clutter-stage.c:1780
-msgid "Perspective"
-msgstr ""
-
-#: clutter/clutter-stage.c:1781
-msgid "Perspective projection parameters"
-msgstr ""
-
-#: clutter/clutter-stage.c:1796
-msgid "Title"
-msgstr "标题"
-
-#: clutter/clutter-stage.c:1797
-msgid "Stage Title"
-msgstr ""
-
-#: clutter/clutter-stage.c:1812
-msgid "Use Fog"
-msgstr ""
-
-#: clutter/clutter-stage.c:1813
-msgid "Whether to enable depth cueing"
-msgstr ""
-
-#: clutter/clutter-stage.c:1827
-msgid "Fog"
-msgstr ""
-
-#: clutter/clutter-stage.c:1828
-msgid "Settings for the depth cueing"
-msgstr ""
-
-#: clutter/clutter-stage.c:1844
-msgid "Use Alpha"
-msgstr "使用 Alpha"
-
-#: clutter/clutter-stage.c:1845
-msgid "Whether to honour the alpha component of the stage color"
-msgstr ""
-
-#: clutter/clutter-stage.c:1861
-msgid "Key Focus"
-msgstr ""
-
-#: clutter/clutter-stage.c:1862
-msgid "The currently key focused actor"
-msgstr ""
-
-#: clutter/clutter-stage.c:1878
-msgid "No Clear Hint"
-msgstr ""
-
-#: clutter/clutter-stage.c:1879
-msgid "Whether the stage should clear its contents"
-msgstr ""
-
-#: clutter/clutter-stage.c:1892
-msgid "Accept Focus"
-msgstr ""
-
-#: clutter/clutter-stage.c:1893
-#, fuzzy
-msgid "Whether the stage should accept focus on show"
-msgstr "文本是否只应使用一行"
-
-#: clutter/clutter-state.c:1472
+#: ../clutter/deprecated/clutter-state.c:1499
 msgid "State"
 msgstr "状态"
 
-#: clutter/clutter-state.c:1473
+#: ../clutter/deprecated/clutter-state.c:1500
 msgid "Currently set state, (transition to this state might not be complete)"
-msgstr ""
+msgstr "当前的设置状态，(可能还未完成到该状态的过渡)"
 
-#: clutter/clutter-state.c:1487
-#, fuzzy
+#: ../clutter/deprecated/clutter-state.c:1518
 msgid "Default transition duration"
-msgstr "默认帧率"
+msgstr "默认过渡时长"
 
-#: clutter/clutter-table-layout.c:585
+#: ../clutter/deprecated/clutter-table-layout.c:543
 msgid "Column Number"
 msgstr "列号"
 
-#: clutter/clutter-table-layout.c:586
+#: ../clutter/deprecated/clutter-table-layout.c:544
 msgid "The column the widget resides in"
-msgstr ""
+msgstr "部件所在的列"
 
-#: clutter/clutter-table-layout.c:593
+#: ../clutter/deprecated/clutter-table-layout.c:551
 msgid "Row Number"
 msgstr "行号"
 
-#: clutter/clutter-table-layout.c:594
+#: ../clutter/deprecated/clutter-table-layout.c:552
 msgid "The row the widget resides in"
-msgstr ""
+msgstr "部件所在的行"
 
-#: clutter/clutter-table-layout.c:601
+#: ../clutter/deprecated/clutter-table-layout.c:559
 msgid "Column Span"
-msgstr ""
+msgstr "列跨度"
 
-#: clutter/clutter-table-layout.c:602
-#, fuzzy
+#: ../clutter/deprecated/clutter-table-layout.c:560
 msgid "The number of columns the widget should span"
-msgstr "设备名称"
+msgstr "部件所跨的列数"
 
-#: clutter/clutter-table-layout.c:609
+#: ../clutter/deprecated/clutter-table-layout.c:567
 msgid "Row Span"
-msgstr ""
+msgstr "行跨度"
 
-#: clutter/clutter-table-layout.c:610
-#, fuzzy
+#: ../clutter/deprecated/clutter-table-layout.c:568
 msgid "The number of rows the widget should span"
-msgstr "设备名称"
+msgstr "部件所跨的行数"
 
-#: clutter/clutter-table-layout.c:617
-#, fuzzy
+#: ../clutter/deprecated/clutter-table-layout.c:575
 msgid "Horizontal Expand"
-msgstr "水平填充"
+msgstr "水平伸展"
 
-#: clutter/clutter-table-layout.c:618
+#: ../clutter/deprecated/clutter-table-layout.c:576
 msgid "Allocate extra space for the child in horizontal axis"
-msgstr ""
+msgstr "为子对象分配横向的额外空间"
 
-#: clutter/clutter-table-layout.c:624
+#: ../clutter/deprecated/clutter-table-layout.c:582
 msgid "Vertical Expand"
-msgstr "竖直展开"
+msgstr "竖直伸展"
 
-#: clutter/clutter-table-layout.c:625
+#: ../clutter/deprecated/clutter-table-layout.c:583
 msgid "Allocate extra space for the child in vertical axis"
-msgstr ""
+msgstr "子对象分配纵向的额外空间"
 
-#: clutter/clutter-table-layout.c:1714
+#: ../clutter/deprecated/clutter-table-layout.c:1638
 msgid "Spacing between columns"
-msgstr ""
+msgstr "列间距"
 
-#: clutter/clutter-table-layout.c:1728
+#: ../clutter/deprecated/clutter-table-layout.c:1654
 msgid "Spacing between rows"
-msgstr ""
+msgstr "行间距"
 
-#: clutter/clutter-text.c:2940
-msgid "The font to be used by the text"
-msgstr "文本使用的字体"
-
-#: clutter/clutter-text.c:2957
-msgid "Font Description"
-msgstr "字体描述"
-
-#: clutter/clutter-text.c:2958
-msgid "The font description to be used"
-msgstr "使用的字体描述"
-
-#: clutter/clutter-text.c:2974
-msgid "Text"
-msgstr "文本"
-
-#: clutter/clutter-text.c:2975
-msgid "The text to render"
-msgstr "要渲染的文本"
-
-#: clutter/clutter-text.c:2989
-msgid "Font Color"
-msgstr "字体颜色"
-
-#: clutter/clutter-text.c:2990
-msgid "Color of the font used by the text"
-msgstr "文本字体使用的颜色"
-
-#: clutter/clutter-text.c:3004
-msgid "Editable"
-msgstr "可编辑"
-
-#: clutter/clutter-text.c:3005
-msgid "Whether the text is editable"
-msgstr "文本是否可以编辑"
-
-#: clutter/clutter-text.c:3020
-msgid "Selectable"
-msgstr "可选择"
-
-#: clutter/clutter-text.c:3021
-msgid "Whether the text is selectable"
-msgstr "文本是否可以选择"
-
-#: clutter/clutter-text.c:3035
-msgid "Activatable"
-msgstr "可激活"
-
-#: clutter/clutter-text.c:3036
-msgid "Whether pressing return causes the activate signal to be emitted"
-msgstr "按下回车键时是否发射激活信号"
-
-#: clutter/clutter-text.c:3053
-msgid "Whether the input cursor is visible"
-msgstr "输入光标是否可见"
-
-#: clutter/clutter-text.c:3067 clutter/clutter-text.c:3068
-msgid "Cursor Color"
-msgstr "指针颜色"
-
-#: clutter/clutter-text.c:3082
-msgid "Cursor Color Set"
-msgstr "光标颜色设置"
-
-#: clutter/clutter-text.c:3083
-msgid "Whether the cursor color has been set"
-msgstr "是否设置了光标颜色"
-
-#: clutter/clutter-text.c:3098
-msgid "Cursor Size"
-msgstr "指针大小"
-
-#: clutter/clutter-text.c:3099
-msgid "The width of the cursor, in pixels"
-msgstr "指针的宽度，以像素计"
-
-#: clutter/clutter-text.c:3113
-#, fuzzy
-msgid "Cursor Position"
-msgstr "指针位置"
-
-#: clutter/clutter-text.c:3114
-msgid "The cursor position"
-msgstr "指针位置"
-
-#: clutter/clutter-text.c:3129
-msgid "Selection-bound"
-msgstr "选区边界"
-
-#: clutter/clutter-text.c:3130
-msgid "The cursor position of the other end of the selection"
-msgstr "选区另一端光标的位置"
-
-#: clutter/clutter-text.c:3145 clutter/clutter-text.c:3146
-msgid "Selection Color"
-msgstr "选区颜色"
-
-#: clutter/clutter-text.c:3160
-msgid "Selection Color Set"
-msgstr "选区颜色设置"
-
-#: clutter/clutter-text.c:3161
-msgid "Whether the selection color has been set"
-msgstr "是否设置了选区颜色"
-
-#: clutter/clutter-text.c:3176
-msgid "Attributes"
-msgstr "属性"
-
-#: clutter/clutter-text.c:3177
-msgid "A list of style attributes to apply to the contents of the actor"
-msgstr ""
-
-#: clutter/clutter-text.c:3199
-msgid "Use markup"
-msgstr "使用标记"
-
-#: clutter/clutter-text.c:3200
-msgid "Whether or not the text includes Pango markup"
-msgstr "文本是否包括 Pango 标记"
-
-#: clutter/clutter-text.c:3216
-msgid "Line wrap"
-msgstr "换行"
-
-#: clutter/clutter-text.c:3217
-msgid "If set, wrap the lines if the text becomes too wide"
-msgstr "如果设置，在文本过宽时将换行显示"
-
-#: clutter/clutter-text.c:3232
-msgid "Line wrap mode"
-msgstr "换行模式"
-
-#: clutter/clutter-text.c:3233
-msgid "Control how line-wrapping is done"
-msgstr "控制换行行为"
-
-#: clutter/clutter-text.c:3248
-msgid "Ellipsize"
-msgstr "简略"
-
-#: clutter/clutter-text.c:3249
-msgid "The preferred place to ellipsize the string"
-msgstr "简略字符串的首选位置"
-
-#: clutter/clutter-text.c:3265
-msgid "Line Alignment"
-msgstr "行对齐方式"
-
-#: clutter/clutter-text.c:3266
-msgid "The preferred alignment for the string, for multi-line text"
-msgstr "多行文本首选的字符串对齐方式"
-
-#: clutter/clutter-text.c:3282
-msgid "Justify"
-msgstr "调整"
-
-#: clutter/clutter-text.c:3283
-msgid "Whether the text should be justified"
-msgstr ""
-
-#: clutter/clutter-text.c:3298
-msgid "Password Character"
-msgstr "密码字符"
-
-#: clutter/clutter-text.c:3299
-msgid "If non-zero, use this character to display the actor's contents"
-msgstr ""
-
-#: clutter/clutter-text.c:3313
-msgid "Max Length"
-msgstr "最大长度"
-
-#: clutter/clutter-text.c:3314
-msgid "Maximum length of the text inside the actor"
-msgstr ""
-
-#: clutter/clutter-text.c:3337
-msgid "Single Line Mode"
-msgstr "单行模式"
-
-#: clutter/clutter-text.c:3338
-msgid "Whether the text should be a single line"
-msgstr "文本是否只应使用一行"
-
-#: clutter/clutter-text.c:3352 clutter/clutter-text.c:3353
-#, fuzzy
-msgid "Selected Text Color"
-msgstr "选区颜色"
-
-#: clutter/clutter-text.c:3367
-#, fuzzy
-msgid "Selected Text Color Set"
-msgstr "选区颜色设置"
-
-#: clutter/clutter-text.c:3368
-#, fuzzy
-msgid "Whether the selected text color has been set"
-msgstr "是否设置了选区颜色"
-
-#: clutter/clutter-texture.c:995
+#: ../clutter/deprecated/clutter-texture.c:992
 msgid "Sync size of actor"
-msgstr ""
+msgstr "同步角色(actor)大小"
 
-#: clutter/clutter-texture.c:996
+#: ../clutter/deprecated/clutter-texture.c:993
 msgid "Auto sync size of actor to underlying pixbuf dimensions"
-msgstr ""
+msgstr "根据对应的 pixbuf 尺寸自动同步角色(actor)大小"
 
-#: clutter/clutter-texture.c:1003
+#: ../clutter/deprecated/clutter-texture.c:1000
 msgid "Disable Slicing"
-msgstr ""
+msgstr "禁用切片"
 
-#: clutter/clutter-texture.c:1004
+#: ../clutter/deprecated/clutter-texture.c:1001
 msgid ""
 "Forces the underlying texture to be singular and not made of smaller space "
 "saving individual textures"
 msgstr ""
+"强制保持相应的纹理设置为单个的纹理，而不是为了节省空间而由更小的独立纹理组成"
 
-#: clutter/clutter-texture.c:1013
+#: ../clutter/deprecated/clutter-texture.c:1010
 msgid "Tile Waste"
-msgstr ""
+msgstr "图块留白(waste)"
 
-#: clutter/clutter-texture.c:1014
+#: ../clutter/deprecated/clutter-texture.c:1011
 msgid "Maximum waste area of a sliced texture"
-msgstr ""
+msgstr "切分纹理的最大留白(waste)空间"
 
-#: clutter/clutter-texture.c:1022
+#: ../clutter/deprecated/clutter-texture.c:1019
 msgid "Horizontal repeat"
-msgstr ""
+msgstr "水平重复"
 
-#: clutter/clutter-texture.c:1023
+#: ../clutter/deprecated/clutter-texture.c:1020
 msgid "Repeat the contents rather than scaling them horizontally"
-msgstr ""
+msgstr "重复内容而不是水平缩放它们"
 
-#: clutter/clutter-texture.c:1030
+#: ../clutter/deprecated/clutter-texture.c:1027
 msgid "Vertical repeat"
-msgstr ""
+msgstr "竖直重复"
 
-#: clutter/clutter-texture.c:1031
+#: ../clutter/deprecated/clutter-texture.c:1028
 msgid "Repeat the contents rather than scaling them vertically"
-msgstr ""
+msgstr "重复内容而不是竖直缩放它们"
 
-#: clutter/clutter-texture.c:1038
+#: ../clutter/deprecated/clutter-texture.c:1035
 msgid "Filter Quality"
 msgstr "过滤器质量"
 
-#: clutter/clutter-texture.c:1039
+#: ../clutter/deprecated/clutter-texture.c:1036
 msgid "Rendering quality used when drawing the texture"
-msgstr ""
+msgstr "绘制纹理时使用的渲染质量"
 
-#: clutter/clutter-texture.c:1047
+#: ../clutter/deprecated/clutter-texture.c:1044
 msgid "Pixel Format"
 msgstr "像素格式"
 
-#: clutter/clutter-texture.c:1048
+#: ../clutter/deprecated/clutter-texture.c:1045
 msgid "The Cogl pixel format to use"
-msgstr ""
+msgstr "要使用的 Cogl 像素格式"
 
-#: clutter/clutter-texture.c:1056
+#: ../clutter/deprecated/clutter-texture.c:1053
+#: ../clutter/wayland/clutter-wayland-surface.c:445
 msgid "Cogl Texture"
-msgstr ""
+msgstr "Cogl 纹理"
 
-#: clutter/clutter-texture.c:1057
+#: ../clutter/deprecated/clutter-texture.c:1054
+#: ../clutter/wayland/clutter-wayland-surface.c:446
 msgid "The underlying Cogl texture handle used to draw this actor"
-msgstr ""
+msgstr "绘制当前角色(actor)时使用的相应 Cogl 纹理"
 
-#: clutter/clutter-texture.c:1064
+#: ../clutter/deprecated/clutter-texture.c:1061
 msgid "Cogl Material"
-msgstr ""
+msgstr "Cogl 素材"
 
-#: clutter/clutter-texture.c:1065
+#: ../clutter/deprecated/clutter-texture.c:1062
 msgid "The underlying Cogl material handle used to draw this actor"
-msgstr ""
+msgstr "绘制当前角色(actor)时使用的相应 Cogl 素材"
 
-#: clutter/clutter-texture.c:1082
+#: ../clutter/deprecated/clutter-texture.c:1081
 msgid "The path of the file containing the image data"
 msgstr "包含图像数据的文件路径"
 
-#: clutter/clutter-texture.c:1089
+#: ../clutter/deprecated/clutter-texture.c:1088
 msgid "Keep Aspect Ratio"
 msgstr "保持宽高比"
 
-#: clutter/clutter-texture.c:1090
+#: ../clutter/deprecated/clutter-texture.c:1089
 msgid ""
 "Keep the aspect ratio of the texture when requesting the preferred width or "
 "height"
-msgstr ""
+msgstr "当请求首选的纹理宽度或高度时保持宽高比"
 
-#: clutter/clutter-texture.c:1116
+#: ../clutter/deprecated/clutter-texture.c:1117
 msgid "Load asynchronously"
 msgstr "同步加载"
 
-#: clutter/clutter-texture.c:1117
+#: ../clutter/deprecated/clutter-texture.c:1118
 msgid ""
 "Load files inside a thread to avoid blocking when loading images from disk"
 msgstr "在从磁盘载入图像时，在线程中加载文件以减少停顿"
 
-#: clutter/clutter-texture.c:1133
+#: ../clutter/deprecated/clutter-texture.c:1136
 msgid "Load data asynchronously"
 msgstr "同步加载数据"
 
-#: clutter/clutter-texture.c:1134
+#: ../clutter/deprecated/clutter-texture.c:1137
 msgid ""
 "Decode image data files inside a thread to reduce blocking when loading "
 "images from disk"
 msgstr "在从磁盘载入图像时，在线程中解码图像数据以减少停顿"
 
-#: clutter/clutter-texture.c:1158
-#, fuzzy
+#: ../clutter/deprecated/clutter-texture.c:1163
 msgid "Pick With Alpha"
-msgstr "选取 Alpha 通道"
+msgstr "使用 Alpha 通道拾取"
 
-#: clutter/clutter-texture.c:1159
+#: ../clutter/deprecated/clutter-texture.c:1164
 msgid "Shape actor with alpha channel when picking"
-msgstr ""
+msgstr "在拾取时使用 alpha 通道寻找角色(actor)轮廓"
 
-#: clutter/clutter-texture.c:1557 clutter/clutter-texture.c:1967
-#: clutter/clutter-texture.c:2062 clutter/clutter-texture.c:2343
-#, fuzzy
+#: ../clutter/deprecated/clutter-texture.c:1597
+#: ../clutter/deprecated/clutter-texture.c:1992
+#: ../clutter/deprecated/clutter-texture.c:2088
+#: ../clutter/deprecated/clutter-texture.c:2386
+#, c-format
 msgid "Failed to load the image data"
-msgstr "包含图像数据的文件路径"
+msgstr "加载图像数据失败"
 
-#: clutter/clutter-texture.c:1703
+#: ../clutter/deprecated/clutter-texture.c:1756
+#, c-format
 msgid "YUV textures are not supported"
-msgstr ""
+msgstr "不支持 YUV 纹理"
 
-#: clutter/clutter-texture.c:1712
+#: ../clutter/deprecated/clutter-texture.c:1765
+#, c-format
 msgid "YUV2 textues are not supported"
-msgstr ""
+msgstr "不支持 YUV2 纹理"
 
-#: clutter/clutter-timeline.c:264
-msgid "Should the timeline automatically restart"
-msgstr "时间线是否自动重新开始"
+#: ../clutter/gdk/clutter-backend-gdk.c:289
+#, c-format
+msgid "Could not find a suitable CoglWinsys for a GdkDisplay of type %s"
+msgstr "找不到适合 %s 类型的 GdkDisplay 的 CoglWinsys"
 
-#: clutter/clutter-timeline.c:278
-msgid "Delay"
-msgstr "延时"
+#: ../clutter/wayland/clutter-wayland-surface.c:419
+msgid "Surface"
+msgstr "表面"
 
-#: clutter/clutter-timeline.c:279
-msgid "Delay before start"
-msgstr "开始前的延时"
+#: ../clutter/wayland/clutter-wayland-surface.c:420
+msgid "The underlying wayland surface"
+msgstr "对应的 wayland 表面"
 
-#: clutter/clutter-timeline.c:295
-#, fuzzy
-msgid "Duration of the timeline in milliseconds"
-msgstr "动画时长，以毫秒计"
+#: ../clutter/wayland/clutter-wayland-surface.c:427
+msgid "Surface width"
+msgstr "表面宽度"
 
-#: clutter/clutter-timeline.c:311
-#, fuzzy
-msgid "Direction of the timeline"
-msgstr "文本的方向"
+#: ../clutter/wayland/clutter-wayland-surface.c:428
+msgid "The width of the underlying wayland surface"
+msgstr "对应 wayland 表面的宽度"
 
-#: clutter/clutter-timeline.c:326
-msgid "Auto Reverse"
-msgstr "自动反转"
+#: ../clutter/wayland/clutter-wayland-surface.c:436
+msgid "Surface height"
+msgstr "表面高度"
 
-#: clutter/clutter-timeline.c:327
-msgid "Whether the direction should be reversed when reaching the end"
-msgstr "在到达末尾时是否自动反转方向"
+#: ../clutter/wayland/clutter-wayland-surface.c:437
+msgid "The height of the underlying wayland surface"
+msgstr "对应 wayland 表面的高度"
 
-#: clutter/evdev/clutter-input-device-evdev.c:147
-msgid "sysfs Path"
-msgstr "sysfs 路径"
-
-#: clutter/evdev/clutter-input-device-evdev.c:148
-#, fuzzy
-msgid "Path of the device in sysfs"
-msgstr "设备名称"
-
-#: clutter/evdev/clutter-input-device-evdev.c:163
-#, fuzzy
-msgid "Device Path"
-msgstr "管理器"
-
-#: clutter/evdev/clutter-input-device-evdev.c:164
-#, fuzzy
-msgid "Path of the device node"
-msgstr "设备名称"
-
-#: clutter/x11/clutter-backend-x11.c:483
+#: ../clutter/x11/clutter-backend-x11.c:488
 msgid "X display to use"
 msgstr "要使用的 X 显示"
 
-#: clutter/x11/clutter-backend-x11.c:489
+#: ../clutter/x11/clutter-backend-x11.c:494
 msgid "X screen to use"
 msgstr "要使用的 X 屏幕"
 
-#: clutter/x11/clutter-backend-x11.c:494
+#: ../clutter/x11/clutter-backend-x11.c:499
 msgid "Make X calls synchronous"
 msgstr "使 X 调用同步"
 
-#: clutter/x11/clutter-backend-x11.c:501
-msgid "Enable XInput support"
-msgstr "启用 XInput 支持"
+#: ../clutter/x11/clutter-backend-x11.c:506
+msgid "Disable XInput support"
+msgstr "禁用 XInput 支持"
 
-#: clutter/x11/clutter-keymap-x11.c:317
+#: ../clutter/x11/clutter-keymap-x11.c:458
 msgid "The Clutter backend"
 msgstr "Clutter 后端"
 
-#: clutter/x11/clutter-x11-texture-pixmap.c:545
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:534
 msgid "Pixmap"
 msgstr "位图"
 
-#: clutter/x11/clutter-x11-texture-pixmap.c:546
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:535
 msgid "The X11 Pixmap to be bound"
 msgstr "要绑定的 X11 位图"
 
-#: clutter/x11/clutter-x11-texture-pixmap.c:554
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:543
 msgid "Pixmap width"
 msgstr "位图宽度"
 
-#: clutter/x11/clutter-x11-texture-pixmap.c:555
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:544
 msgid "The width of the pixmap bound to this texture"
 msgstr "与此纹理绑定的位图的宽度"
 
-#: clutter/x11/clutter-x11-texture-pixmap.c:563
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:552
 msgid "Pixmap height"
 msgstr "位图高度"
 
-#: clutter/x11/clutter-x11-texture-pixmap.c:564
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:553
 msgid "The height of the pixmap bound to this texture"
 msgstr "与此纹理绑定的位图的高度"
 
-#: clutter/x11/clutter-x11-texture-pixmap.c:572
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:561
 msgid "Pixmap Depth"
 msgstr "位图色深"
 
-#: clutter/x11/clutter-x11-texture-pixmap.c:573
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:562
 msgid "The depth (in number of bits) of the pixmap bound to this texture"
 msgstr "与此纹理绑定的位图的色深(位数)"
 
-#: clutter/x11/clutter-x11-texture-pixmap.c:581
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:570
 msgid "Automatic Updates"
 msgstr "自动更新"
 
-#: clutter/x11/clutter-x11-texture-pixmap.c:582
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:571
 msgid "If the texture should be kept in sync with any pixmap changes."
 msgstr "纹理是否应与任何的位图更改保持同步。"
 
-#: clutter/x11/clutter-x11-texture-pixmap.c:590
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:579
 msgid "Window"
 msgstr "窗口"
 
-#: clutter/x11/clutter-x11-texture-pixmap.c:591
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:580
 msgid "The X11 Window to be bound"
-msgstr ""
+msgstr "要绑定的 X11 窗口"
 
-#: clutter/x11/clutter-x11-texture-pixmap.c:599
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:588
 msgid "Window Redirect Automatic"
-msgstr ""
+msgstr "窗口自动重定向"
 
-#: clutter/x11/clutter-x11-texture-pixmap.c:600
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:589
 msgid "If composite window redirects are set to Automatic (or Manual if false)"
-msgstr ""
+msgstr "如果复合窗口重定向设为自动(若 false 则为手动)"
 
-#: clutter/x11/clutter-x11-texture-pixmap.c:610
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:599
 msgid "Window Mapped"
 msgstr "窗口已映射"
 
-#: clutter/x11/clutter-x11-texture-pixmap.c:611
-#, fuzzy
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:600
 msgid "If window is mapped"
 msgstr "窗口是否已映射"
 
-#: clutter/x11/clutter-x11-texture-pixmap.c:620
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:609
 msgid "Destroyed"
 msgstr "已销毁"
 
-#: clutter/x11/clutter-x11-texture-pixmap.c:621
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:610
 msgid "If window has been destroyed"
 msgstr "窗口是否已销毁"
 
-#: clutter/x11/clutter-x11-texture-pixmap.c:629
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:618
 msgid "Window X"
 msgstr "窗口 X 坐标"
 
-#: clutter/x11/clutter-x11-texture-pixmap.c:630
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:619
 msgid "X position of window on screen according to X11"
 msgstr "X11 中给出的窗口在屏幕中的竖直位置"
 
-#: clutter/x11/clutter-x11-texture-pixmap.c:638
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:627
 msgid "Window Y"
 msgstr "窗口 Y 坐标"
 
-#: clutter/x11/clutter-x11-texture-pixmap.c:639
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:628
 msgid "Y position of window on screen according to X11"
 msgstr "X11 中给出的窗口在屏幕中的水平位置"
 
-#: clutter/x11/clutter-x11-texture-pixmap.c:646
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:635
 msgid "Window Override Redirect"
-msgstr ""
+msgstr "窗口覆盖重定向"
 
-#: clutter/x11/clutter-x11-texture-pixmap.c:647
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:636
 msgid "If this is an override-redirect window"
-msgstr ""
+msgstr "这是否为覆盖重定向窗口"
+
+#~ msgid "sysfs Path"
+#~ msgstr "sysfs 路径"
+
+#~ msgid "Path of the device in sysfs"
+#~ msgstr "sysfs 中设备的路径"
+
+#~ msgid "Device Path"
+#~ msgstr "设备路径"
+
+#~ msgid "Path of the device node"
+#~ msgstr "设备节点的路径"
 
 #, fuzzy
 #~ msgid "Cogl debugging flags to set"
@@ -2204,6 +2845,3 @@ msgstr ""
 
 #~ msgid "VBlank method to be used (none, dri or glx)"
 #~ msgstr "要使用的 VBlank 方式(none、dir 或 glx)"
-
-#~ msgid "Position"
-#~ msgstr "位置"
diff --git a/po/zh_HK.po b/po/zh_HK.po
index 0bdaf8ccd..c7466ab72 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: clutter 1.9.15\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
-"product=clutter\n"
-"POT-Creation-Date: 2013-03-01 22:12+0800\n"
-"PO-Revision-Date: 2013-03-01 22:12+0800\n"
+"product=clutter&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2014-03-06 04:09+0000\n"
+"PO-Revision-Date: 2014-03-09 11:29+0800\n"
 "Last-Translator: Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>\n"
 "Language-Team: Chinese (Hong Kong) <community@linuxhall.org>\n"
 "Language: zh_TW\n"
@@ -17,692 +17,692 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Poedit 1.5.4\n"
+"X-Generator: Poedit 1.6.3\n"
 
-#: ../clutter/clutter-actor.c:6144
+#: ../clutter/clutter-actor.c:6214
 msgid "X coordinate"
 msgstr "X 坐標"
 
-#: ../clutter/clutter-actor.c:6145
+#: ../clutter/clutter-actor.c:6215
 msgid "X coordinate of the actor"
 msgstr "參與者的 X 坐標"
 
-#: ../clutter/clutter-actor.c:6163
+#: ../clutter/clutter-actor.c:6233
 msgid "Y coordinate"
 msgstr "Y 坐標"
 
-#: ../clutter/clutter-actor.c:6164
+#: ../clutter/clutter-actor.c:6234
 msgid "Y coordinate of the actor"
 msgstr "參與者的 Y 坐標"
 
-#: ../clutter/clutter-actor.c:6186
+#: ../clutter/clutter-actor.c:6256
 msgid "Position"
 msgstr "位置"
 
-#: ../clutter/clutter-actor.c:6187
+#: ../clutter/clutter-actor.c:6257
 msgid "The position of the origin of the actor"
 msgstr "參與者的原始位置"
 
-#: ../clutter/clutter-actor.c:6204 ../clutter/clutter-canvas.c:215
-#: ../clutter/clutter-grid-layout.c:1238
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:481
+#: ../clutter/clutter-actor.c:6274 ../clutter/clutter-canvas.c:247
+#: ../clutter/clutter-grid-layout.c:1239
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:474
 msgid "Width"
 msgstr "闊度"
 
-#: ../clutter/clutter-actor.c:6205
+#: ../clutter/clutter-actor.c:6275
 msgid "Width of the actor"
 msgstr "參與者的闊度"
 
-#: ../clutter/clutter-actor.c:6223 ../clutter/clutter-canvas.c:231
-#: ../clutter/clutter-grid-layout.c:1245
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:497
+#: ../clutter/clutter-actor.c:6293 ../clutter/clutter-canvas.c:263
+#: ../clutter/clutter-grid-layout.c:1246
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:490
 msgid "Height"
 msgstr "高度"
 
-#: ../clutter/clutter-actor.c:6224
+#: ../clutter/clutter-actor.c:6294
 msgid "Height of the actor"
 msgstr "參與者的高度"
 
-#: ../clutter/clutter-actor.c:6245
+#: ../clutter/clutter-actor.c:6315
 msgid "Size"
 msgstr "大小"
 
-#: ../clutter/clutter-actor.c:6246
+#: ../clutter/clutter-actor.c:6316
 msgid "The size of the actor"
 msgstr "參與者的大小"
 
-#: ../clutter/clutter-actor.c:6264
+#: ../clutter/clutter-actor.c:6334
 msgid "Fixed X"
 msgstr "固定 X 坐標"
 
-#: ../clutter/clutter-actor.c:6265
+#: ../clutter/clutter-actor.c:6335
 msgid "Forced X position of the actor"
 msgstr "參與者的強制 X 位置"
 
-#: ../clutter/clutter-actor.c:6282
+#: ../clutter/clutter-actor.c:6352
 msgid "Fixed Y"
 msgstr "固定 Y 坐標"
 
-#: ../clutter/clutter-actor.c:6283
+#: ../clutter/clutter-actor.c:6353
 msgid "Forced Y position of the actor"
 msgstr "參與者的強制 Y 位置"
 
-#: ../clutter/clutter-actor.c:6298
+#: ../clutter/clutter-actor.c:6368
 msgid "Fixed position set"
 msgstr "固定的位置設定"
 
-#: ../clutter/clutter-actor.c:6299
+#: ../clutter/clutter-actor.c:6369
 msgid "Whether to use fixed positioning for the actor"
 msgstr "參與者是否要使用固定的位置"
 
-#: ../clutter/clutter-actor.c:6317
+#: ../clutter/clutter-actor.c:6387
 msgid "Min Width"
 msgstr "最小闊度"
 
-#: ../clutter/clutter-actor.c:6318
+#: ../clutter/clutter-actor.c:6388
 msgid "Forced minimum width request for the actor"
 msgstr "參與者要求強制最小闊度"
 
-#: ../clutter/clutter-actor.c:6336
+#: ../clutter/clutter-actor.c:6406
 msgid "Min Height"
 msgstr "最小高度"
 
-#: ../clutter/clutter-actor.c:6337
+#: ../clutter/clutter-actor.c:6407
 msgid "Forced minimum height request for the actor"
 msgstr "參與者要求強制最小高度"
 
-#: ../clutter/clutter-actor.c:6355
+#: ../clutter/clutter-actor.c:6425
 msgid "Natural Width"
 msgstr "自然闊度"
 
-#: ../clutter/clutter-actor.c:6356
+#: ../clutter/clutter-actor.c:6426
 msgid "Forced natural width request for the actor"
 msgstr "參與者要求強制自然闊度"
 
-#: ../clutter/clutter-actor.c:6374
+#: ../clutter/clutter-actor.c:6444
 msgid "Natural Height"
 msgstr "自然高度"
 
-#: ../clutter/clutter-actor.c:6375
+#: ../clutter/clutter-actor.c:6445
 msgid "Forced natural height request for the actor"
 msgstr "參與者要求強制自然高度"
 
-#: ../clutter/clutter-actor.c:6390
+#: ../clutter/clutter-actor.c:6460
 msgid "Minimum width set"
 msgstr "最小闊度設定"
 
-#: ../clutter/clutter-actor.c:6391
+#: ../clutter/clutter-actor.c:6461
 msgid "Whether to use the min-width property"
 msgstr "是否使用最小闊度屬性"
 
-#: ../clutter/clutter-actor.c:6405
+#: ../clutter/clutter-actor.c:6475
 msgid "Minimum height set"
 msgstr "最小高度設定"
 
-#: ../clutter/clutter-actor.c:6406
+#: ../clutter/clutter-actor.c:6476
 msgid "Whether to use the min-height property"
 msgstr "是否使用最小高度屬性"
 
-#: ../clutter/clutter-actor.c:6420
+#: ../clutter/clutter-actor.c:6490
 msgid "Natural width set"
 msgstr "自然闊度設定"
 
-#: ../clutter/clutter-actor.c:6421
+#: ../clutter/clutter-actor.c:6491
 msgid "Whether to use the natural-width property"
 msgstr "是否使用自然闊度屬性"
 
-#: ../clutter/clutter-actor.c:6435
+#: ../clutter/clutter-actor.c:6505
 msgid "Natural height set"
 msgstr "自然高度設定"
 
-#: ../clutter/clutter-actor.c:6436
+#: ../clutter/clutter-actor.c:6506
 msgid "Whether to use the natural-height property"
 msgstr "是否使用自然高度屬性"
 
-#: ../clutter/clutter-actor.c:6452
+#: ../clutter/clutter-actor.c:6522
 msgid "Allocation"
 msgstr "定位"
 
-#: ../clutter/clutter-actor.c:6453
+#: ../clutter/clutter-actor.c:6523
 msgid "The actor's allocation"
 msgstr "參與者的定位"
 
-#: ../clutter/clutter-actor.c:6510
+#: ../clutter/clutter-actor.c:6580
 msgid "Request Mode"
 msgstr "請求模式"
 
-#: ../clutter/clutter-actor.c:6511
+#: ../clutter/clutter-actor.c:6581
 msgid "The actor's request mode"
 msgstr "參與者的要求模式"
 
-#: ../clutter/clutter-actor.c:6535
+#: ../clutter/clutter-actor.c:6605
 msgid "Depth"
 msgstr "色深"
 
-#: ../clutter/clutter-actor.c:6536
+#: ../clutter/clutter-actor.c:6606
 msgid "Position on the Z axis"
 msgstr "在 Z 軸上的位置"
 
-#: ../clutter/clutter-actor.c:6563
+#: ../clutter/clutter-actor.c:6633
 msgid "Z Position"
 msgstr "Z 位置"
 
-#: ../clutter/clutter-actor.c:6564
+#: ../clutter/clutter-actor.c:6634
 msgid "The actor's position on the Z axis"
 msgstr "參與者在 Z 軸上的位置"
 
-#: ../clutter/clutter-actor.c:6581
+#: ../clutter/clutter-actor.c:6651
 msgid "Opacity"
 msgstr "濁度"
 
-#: ../clutter/clutter-actor.c:6582
+#: ../clutter/clutter-actor.c:6652
 msgid "Opacity of an actor"
 msgstr "參與者的濁度"
 
-#: ../clutter/clutter-actor.c:6602
+#: ../clutter/clutter-actor.c:6672
 msgid "Offscreen redirect"
 msgstr "螢幕外重新導向"
 
-#: ../clutter/clutter-actor.c:6603
+#: ../clutter/clutter-actor.c:6673
 msgid "Flags controlling when to flatten the actor into a single image"
 msgstr "控制何時將參與者扁平化為單一影像的旗標"
 
-#: ../clutter/clutter-actor.c:6617
+#: ../clutter/clutter-actor.c:6687
 msgid "Visible"
 msgstr "可見度"
 
-#: ../clutter/clutter-actor.c:6618
+#: ../clutter/clutter-actor.c:6688
 msgid "Whether the actor is visible or not"
 msgstr "是否參與者為可見"
 
-#: ../clutter/clutter-actor.c:6632
+#: ../clutter/clutter-actor.c:6702
 msgid "Mapped"
 msgstr "映射"
 
-#: ../clutter/clutter-actor.c:6633
+#: ../clutter/clutter-actor.c:6703
 msgid "Whether the actor will be painted"
 msgstr "是否參與者將被繪製"
 
-#: ../clutter/clutter-actor.c:6646
+#: ../clutter/clutter-actor.c:6716
 msgid "Realized"
 msgstr "實現"
 
-#: ../clutter/clutter-actor.c:6647
+#: ../clutter/clutter-actor.c:6717
 msgid "Whether the actor has been realized"
 msgstr "是否參與者已被實現"
 
-#: ../clutter/clutter-actor.c:6662
+#: ../clutter/clutter-actor.c:6732
 msgid "Reactive"
 msgstr "重新活躍"
 
-#: ../clutter/clutter-actor.c:6663
+#: ../clutter/clutter-actor.c:6733
 msgid "Whether the actor is reactive to events"
 msgstr "是否參與者對於事件重新活躍"
 
-#: ../clutter/clutter-actor.c:6674
+#: ../clutter/clutter-actor.c:6744
 msgid "Has Clip"
 msgstr "具有裁剪"
 
-#: ../clutter/clutter-actor.c:6675
+#: ../clutter/clutter-actor.c:6745
 msgid "Whether the actor has a clip set"
 msgstr "是否參與者有裁剪設定"
 
-#: ../clutter/clutter-actor.c:6688
+#: ../clutter/clutter-actor.c:6758
 msgid "Clip"
 msgstr "裁剪"
 
-#: ../clutter/clutter-actor.c:6689
+#: ../clutter/clutter-actor.c:6759
 msgid "The clip region for the actor"
 msgstr "參與者的裁剪區域"
 
-#: ../clutter/clutter-actor.c:6708
+#: ../clutter/clutter-actor.c:6778
 msgid "Clip Rectangle"
 msgstr "剪裁矩形"
 
-#: ../clutter/clutter-actor.c:6709
+#: ../clutter/clutter-actor.c:6779
 msgid "The visible region of the actor"
 msgstr "參與者的可視區域"
 
-#: ../clutter/clutter-actor.c:6723 ../clutter/clutter-actor-meta.c:207
-#: ../clutter/clutter-binding-pool.c:319 ../clutter/clutter-input-device.c:258
+#: ../clutter/clutter-actor.c:6793 ../clutter/clutter-actor-meta.c:205
+#: ../clutter/clutter-binding-pool.c:319 ../clutter/clutter-input-device.c:247
 msgid "Name"
 msgstr "名稱"
 
-#: ../clutter/clutter-actor.c:6724
+#: ../clutter/clutter-actor.c:6794
 msgid "Name of the actor"
 msgstr "參與者的名稱"
 
-#: ../clutter/clutter-actor.c:6745
+#: ../clutter/clutter-actor.c:6815
 msgid "Pivot Point"
 msgstr "樞軸點"
 
-#: ../clutter/clutter-actor.c:6746
+#: ../clutter/clutter-actor.c:6816
 msgid "The point around which the scaling and rotation occur"
 msgstr "縮放和旋轉繞着這個點"
 
-#: ../clutter/clutter-actor.c:6764
+#: ../clutter/clutter-actor.c:6834
 msgid "Pivot Point Z"
 msgstr "樞軸點 Z"
 
-#: ../clutter/clutter-actor.c:6765
+#: ../clutter/clutter-actor.c:6835
 msgid "Z component of the pivot point"
 msgstr "樞軸點的 Z 元件"
 
-#: ../clutter/clutter-actor.c:6783
+#: ../clutter/clutter-actor.c:6853
 msgid "Scale X"
 msgstr "伸縮 X 坐標"
 
-#: ../clutter/clutter-actor.c:6784
+#: ../clutter/clutter-actor.c:6854
 msgid "Scale factor on the X axis"
 msgstr "在 X 軸上的伸縮比值"
 
-#: ../clutter/clutter-actor.c:6802
+#: ../clutter/clutter-actor.c:6872
 msgid "Scale Y"
 msgstr "伸縮 Y 坐標"
 
-#: ../clutter/clutter-actor.c:6803
+#: ../clutter/clutter-actor.c:6873
 msgid "Scale factor on the Y axis"
 msgstr "在 Y 軸上的伸縮比值"
 
-#: ../clutter/clutter-actor.c:6821
+#: ../clutter/clutter-actor.c:6891
 msgid "Scale Z"
 msgstr "縮放 Z"
 
-#: ../clutter/clutter-actor.c:6822
+#: ../clutter/clutter-actor.c:6892
 msgid "Scale factor on the Z axis"
 msgstr "在 Z 軸上的伸縮比值"
 
-#: ../clutter/clutter-actor.c:6840
+#: ../clutter/clutter-actor.c:6910
 msgid "Scale Center X"
 msgstr "伸縮中心 X 坐標"
 
-#: ../clutter/clutter-actor.c:6841
+#: ../clutter/clutter-actor.c:6911
 msgid "Horizontal scale center"
 msgstr "水平伸縮中心"
 
-#: ../clutter/clutter-actor.c:6859
+#: ../clutter/clutter-actor.c:6929
 msgid "Scale Center Y"
 msgstr "伸縮中心 Y 坐標"
 
-#: ../clutter/clutter-actor.c:6860
+#: ../clutter/clutter-actor.c:6930
 msgid "Vertical scale center"
 msgstr "垂直伸縮中心"
 
-#: ../clutter/clutter-actor.c:6878
+#: ../clutter/clutter-actor.c:6948
 msgid "Scale Gravity"
 msgstr "伸縮引力"
 
-#: ../clutter/clutter-actor.c:6879
+#: ../clutter/clutter-actor.c:6949
 msgid "The center of scaling"
 msgstr "伸縮的中心"
 
-#: ../clutter/clutter-actor.c:6897
+#: ../clutter/clutter-actor.c:6967
 msgid "Rotation Angle X"
 msgstr "旋轉角度 X 坐標"
 
-#: ../clutter/clutter-actor.c:6898
+#: ../clutter/clutter-actor.c:6968
 msgid "The rotation angle on the X axis"
 msgstr "在 X 軸上的旋轉角度"
 
-#: ../clutter/clutter-actor.c:6916
+#: ../clutter/clutter-actor.c:6986
 msgid "Rotation Angle Y"
 msgstr "旋轉角度 Y 坐標"
 
-#: ../clutter/clutter-actor.c:6917
+#: ../clutter/clutter-actor.c:6987
 msgid "The rotation angle on the Y axis"
 msgstr "在 Y 軸上的旋轉角度"
 
-#: ../clutter/clutter-actor.c:6935
+#: ../clutter/clutter-actor.c:7005
 msgid "Rotation Angle Z"
 msgstr "旋轉角度 Z 坐標"
 
-#: ../clutter/clutter-actor.c:6936
+#: ../clutter/clutter-actor.c:7006
 msgid "The rotation angle on the Z axis"
 msgstr "在 Z 軸上的旋轉角度"
 
-#: ../clutter/clutter-actor.c:6954
+#: ../clutter/clutter-actor.c:7024
 msgid "Rotation Center X"
 msgstr "旋轉中心 X 坐標"
 
-#: ../clutter/clutter-actor.c:6955
+#: ../clutter/clutter-actor.c:7025
 msgid "The rotation center on the X axis"
 msgstr "在 X 軸上的旋轉中心"
 
-#: ../clutter/clutter-actor.c:6972
+#: ../clutter/clutter-actor.c:7042
 msgid "Rotation Center Y"
 msgstr "旋轉中心 Y 坐標"
 
-#: ../clutter/clutter-actor.c:6973
+#: ../clutter/clutter-actor.c:7043
 msgid "The rotation center on the Y axis"
 msgstr "在 Y 軸上的旋轉中心"
 
-#: ../clutter/clutter-actor.c:6990
+#: ../clutter/clutter-actor.c:7060
 msgid "Rotation Center Z"
 msgstr "旋轉中心 Z 坐標"
 
-#: ../clutter/clutter-actor.c:6991
+#: ../clutter/clutter-actor.c:7061
 msgid "The rotation center on the Z axis"
 msgstr "在 Z 軸上的旋轉中心"
 
-#: ../clutter/clutter-actor.c:7008
+#: ../clutter/clutter-actor.c:7078
 msgid "Rotation Center Z Gravity"
 msgstr "旋轉中心 Z 引力"
 
-#: ../clutter/clutter-actor.c:7009
+#: ../clutter/clutter-actor.c:7079
 msgid "Center point for rotation around the Z axis"
 msgstr "圍繞 Z 軸旋轉的中心點"
 
-#: ../clutter/clutter-actor.c:7037
+#: ../clutter/clutter-actor.c:7107
 msgid "Anchor X"
 msgstr "錨點 X 坐標"
 
-#: ../clutter/clutter-actor.c:7038
+#: ../clutter/clutter-actor.c:7108
 msgid "X coordinate of the anchor point"
 msgstr "錨點的 X 坐標"
 
-#: ../clutter/clutter-actor.c:7066
+#: ../clutter/clutter-actor.c:7136
 msgid "Anchor Y"
 msgstr "錨點 Y 坐標"
 
-#: ../clutter/clutter-actor.c:7067
+#: ../clutter/clutter-actor.c:7137
 msgid "Y coordinate of the anchor point"
 msgstr "錨點的 Y 坐標"
 
-#: ../clutter/clutter-actor.c:7094
+#: ../clutter/clutter-actor.c:7164
 msgid "Anchor Gravity"
 msgstr "錨點引力"
 
-#: ../clutter/clutter-actor.c:7095
+#: ../clutter/clutter-actor.c:7165
 msgid "The anchor point as a ClutterGravity"
 msgstr "錨點做為 ClutterGravity"
 
-#: ../clutter/clutter-actor.c:7114
+#: ../clutter/clutter-actor.c:7184
 msgid "Translation X"
 msgstr "轉換 X"
 
-#: ../clutter/clutter-actor.c:7115
+#: ../clutter/clutter-actor.c:7185
 msgid "Translation along the X axis"
 msgstr "沿 X 軸的轉換"
 
-#: ../clutter/clutter-actor.c:7134
+#: ../clutter/clutter-actor.c:7204
 msgid "Translation Y"
 msgstr "轉換 Y"
 
-#: ../clutter/clutter-actor.c:7135
+#: ../clutter/clutter-actor.c:7205
 msgid "Translation along the Y axis"
 msgstr "沿 Y 軸的轉換"
 
-#: ../clutter/clutter-actor.c:7154
+#: ../clutter/clutter-actor.c:7224
 msgid "Translation Z"
 msgstr "轉換 Z"
 
-#: ../clutter/clutter-actor.c:7155
+#: ../clutter/clutter-actor.c:7225
 msgid "Translation along the Z axis"
 msgstr "沿 Z 軸的轉換"
 
-#: ../clutter/clutter-actor.c:7185
+#: ../clutter/clutter-actor.c:7255
 msgid "Transform"
 msgstr "轉換"
 
-#: ../clutter/clutter-actor.c:7186
+#: ../clutter/clutter-actor.c:7256
 msgid "Transformation matrix"
 msgstr "轉換矩陣"
 
-#: ../clutter/clutter-actor.c:7201
+#: ../clutter/clutter-actor.c:7271
 msgid "Transform Set"
 msgstr "轉換設定"
 
-#: ../clutter/clutter-actor.c:7202
+#: ../clutter/clutter-actor.c:7272
 msgid "Whether the transform property is set"
 msgstr "是否已經設定轉換屬性"
 
-#: ../clutter/clutter-actor.c:7223
+#: ../clutter/clutter-actor.c:7293
 msgid "Child Transform"
 msgstr "子項變形"
 
-#: ../clutter/clutter-actor.c:7224
+#: ../clutter/clutter-actor.c:7294
 msgid "Children transformation matrix"
 msgstr "子項變形矩陣"
 
-#: ../clutter/clutter-actor.c:7239
+#: ../clutter/clutter-actor.c:7309
 msgid "Child Transform Set"
 msgstr "子項變形設定"
 
-#: ../clutter/clutter-actor.c:7240
+#: ../clutter/clutter-actor.c:7310
 msgid "Whether the child-transform property is set"
 msgstr "是否已經設定子項轉換屬性"
 
-#: ../clutter/clutter-actor.c:7257
+#: ../clutter/clutter-actor.c:7327
 msgid "Show on set parent"
 msgstr "設定為上層時顯示"
 
-#: ../clutter/clutter-actor.c:7258
+#: ../clutter/clutter-actor.c:7328
 msgid "Whether the actor is shown when parented"
 msgstr "參與者設定為上層時是否顯示"
 
-#: ../clutter/clutter-actor.c:7275
+#: ../clutter/clutter-actor.c:7345
 msgid "Clip to Allocation"
 msgstr "裁剪到定位"
 
-#: ../clutter/clutter-actor.c:7276
+#: ../clutter/clutter-actor.c:7346
 msgid "Sets the clip region to track the actor's allocation"
 msgstr "設定裁剪區域以追蹤參與者的定位"
 
-#: ../clutter/clutter-actor.c:7289
+#: ../clutter/clutter-actor.c:7359
 msgid "Text Direction"
 msgstr "文字方向"
 
-#: ../clutter/clutter-actor.c:7290
+#: ../clutter/clutter-actor.c:7360
 msgid "Direction of the text"
 msgstr "文字的方向"
 
-#: ../clutter/clutter-actor.c:7305
+#: ../clutter/clutter-actor.c:7375
 msgid "Has Pointer"
 msgstr "具有指標"
 
-#: ../clutter/clutter-actor.c:7306
+#: ../clutter/clutter-actor.c:7376
 msgid "Whether the actor contains the pointer of an input device"
 msgstr "是否參與者含有輸入裝置的指標"
 
-#: ../clutter/clutter-actor.c:7319
+#: ../clutter/clutter-actor.c:7389
 msgid "Actions"
 msgstr "動作"
 
-#: ../clutter/clutter-actor.c:7320
+#: ../clutter/clutter-actor.c:7390
 msgid "Adds an action to the actor"
 msgstr "加入一項動作給參與者"
 
-#: ../clutter/clutter-actor.c:7333
+#: ../clutter/clutter-actor.c:7403
 msgid "Constraints"
 msgstr "條件約束"
 
-#: ../clutter/clutter-actor.c:7334
+#: ../clutter/clutter-actor.c:7404
 msgid "Adds a constraint to the actor"
 msgstr "加入條件約束給參與者"
 
-#: ../clutter/clutter-actor.c:7347
+#: ../clutter/clutter-actor.c:7417
 msgid "Effect"
 msgstr "效果"
 
-#: ../clutter/clutter-actor.c:7348
+#: ../clutter/clutter-actor.c:7418
 msgid "Add an effect to be applied on the actor"
 msgstr "加入一項效果給參與者"
 
-#: ../clutter/clutter-actor.c:7362
+#: ../clutter/clutter-actor.c:7432
 msgid "Layout Manager"
 msgstr "版面配置管理員"
 
-#: ../clutter/clutter-actor.c:7363
+#: ../clutter/clutter-actor.c:7433
 msgid "The object controlling the layout of an actor's children"
 msgstr "用來控制動作者子項配置的物件"
 
-#: ../clutter/clutter-actor.c:7377
+#: ../clutter/clutter-actor.c:7447
 msgid "X Expand"
 msgstr "X 擴展"
 
-#: ../clutter/clutter-actor.c:7378
+#: ../clutter/clutter-actor.c:7448
 msgid "Whether extra horizontal space should be assigned to the actor"
 msgstr "是否應指派給參與者額外的水平空間"
 
-#: ../clutter/clutter-actor.c:7393
+#: ../clutter/clutter-actor.c:7463
 msgid "Y Expand"
 msgstr "Y 擴展"
 
-#: ../clutter/clutter-actor.c:7394
+#: ../clutter/clutter-actor.c:7464
 msgid "Whether extra vertical space should be assigned to the actor"
 msgstr "是否應指派給參與者額外的垂直空間"
 
-#: ../clutter/clutter-actor.c:7410
+#: ../clutter/clutter-actor.c:7480
 msgid "X Alignment"
 msgstr "X 對齊"
 
-#: ../clutter/clutter-actor.c:7411
+#: ../clutter/clutter-actor.c:7481
 msgid "The alignment of the actor on the X axis within its allocation"
 msgstr "在 X 軸的配置之內參與者的垂直對齊"
 
-#: ../clutter/clutter-actor.c:7426
+#: ../clutter/clutter-actor.c:7496
 msgid "Y Alignment"
 msgstr "Y 對齊"
 
-#: ../clutter/clutter-actor.c:7427
+#: ../clutter/clutter-actor.c:7497
 msgid "The alignment of the actor on the Y axis within its allocation"
 msgstr "在 Y 軸的配置之內參與者的垂直對齊"
 
-#: ../clutter/clutter-actor.c:7446
+#: ../clutter/clutter-actor.c:7516
 msgid "Margin Top"
 msgstr "頂端邊界"
 
-#: ../clutter/clutter-actor.c:7447
+#: ../clutter/clutter-actor.c:7517
 msgid "Extra space at the top"
 msgstr "頂端額外的空間"
 
-#: ../clutter/clutter-actor.c:7468
+#: ../clutter/clutter-actor.c:7538
 msgid "Margin Bottom"
 msgstr "底部邊界"
 
-#: ../clutter/clutter-actor.c:7469
+#: ../clutter/clutter-actor.c:7539
 msgid "Extra space at the bottom"
 msgstr "底部額外的空間"
 
-#: ../clutter/clutter-actor.c:7490
+#: ../clutter/clutter-actor.c:7560
 msgid "Margin Left"
 msgstr "左邊邊界"
 
-#: ../clutter/clutter-actor.c:7491
+#: ../clutter/clutter-actor.c:7561
 msgid "Extra space at the left"
 msgstr "左側額外的空間"
 
-#: ../clutter/clutter-actor.c:7512
+#: ../clutter/clutter-actor.c:7582
 msgid "Margin Right"
 msgstr "右邊邊界"
 
-#: ../clutter/clutter-actor.c:7513
+#: ../clutter/clutter-actor.c:7583
 msgid "Extra space at the right"
 msgstr "右側額外的空間"
 
-#: ../clutter/clutter-actor.c:7529
+#: ../clutter/clutter-actor.c:7599
 msgid "Background Color Set"
 msgstr "背景顏色設定"
 
-#: ../clutter/clutter-actor.c:7530 ../clutter/deprecated/clutter-box.c:275
+#: ../clutter/clutter-actor.c:7600 ../clutter/deprecated/clutter-box.c:271
 msgid "Whether the background color is set"
 msgstr "是否已設定背景顏色"
 
-#: ../clutter/clutter-actor.c:7546
+#: ../clutter/clutter-actor.c:7616
 msgid "Background color"
 msgstr "背景顏色"
 
-#: ../clutter/clutter-actor.c:7547
+#: ../clutter/clutter-actor.c:7617
 msgid "The actor's background color"
 msgstr "參與者的背景顏色"
 
-#: ../clutter/clutter-actor.c:7562
+#: ../clutter/clutter-actor.c:7632
 msgid "First Child"
 msgstr "第一個子項目"
 
-#: ../clutter/clutter-actor.c:7563
+#: ../clutter/clutter-actor.c:7633
 msgid "The actor's first child"
 msgstr "參與者的第一個子項目"
 
-#: ../clutter/clutter-actor.c:7576
+#: ../clutter/clutter-actor.c:7646
 msgid "Last Child"
 msgstr "最後一個子項目"
 
-#: ../clutter/clutter-actor.c:7577
+#: ../clutter/clutter-actor.c:7647
 msgid "The actor's last child"
 msgstr "參與者的最後一個子項目"
 
-#: ../clutter/clutter-actor.c:7591
+#: ../clutter/clutter-actor.c:7661
 msgid "Content"
 msgstr "內容"
 
-#: ../clutter/clutter-actor.c:7592
+#: ../clutter/clutter-actor.c:7662
 msgid "Delegate object for painting the actor's content"
 msgstr "指派繪製參與者內容的物件"
 
-#: ../clutter/clutter-actor.c:7617
+#: ../clutter/clutter-actor.c:7687
 msgid "Content Gravity"
 msgstr "內容引力"
 
-#: ../clutter/clutter-actor.c:7618
+#: ../clutter/clutter-actor.c:7688
 msgid "Alignment of the actor's content"
 msgstr "參與者內容的排列"
 
-#: ../clutter/clutter-actor.c:7638
+#: ../clutter/clutter-actor.c:7708
 msgid "Content Box"
 msgstr "內容方塊"
 
-#: ../clutter/clutter-actor.c:7639
+#: ../clutter/clutter-actor.c:7709
 msgid "The bounding box of the actor's content"
 msgstr "參與者內容的綁定方塊"
 
-#: ../clutter/clutter-actor.c:7647
+#: ../clutter/clutter-actor.c:7717
 msgid "Minification Filter"
 msgstr "縮小過濾器"
 
-#: ../clutter/clutter-actor.c:7648
+#: ../clutter/clutter-actor.c:7718
 msgid "The filter used when reducing the size of the content"
 msgstr "縮小內容大小時所用的過濾器"
 
-#: ../clutter/clutter-actor.c:7655
+#: ../clutter/clutter-actor.c:7725
 msgid "Magnification Filter"
 msgstr "放大過濾器"
 
-#: ../clutter/clutter-actor.c:7656
+#: ../clutter/clutter-actor.c:7726
 msgid "The filter used when increasing the size of the content"
 msgstr "增加內容大小時所用的過濾器"
 
-#: ../clutter/clutter-actor.c:7670
+#: ../clutter/clutter-actor.c:7740
 msgid "Content Repeat"
 msgstr "內容重複"
 
-#: ../clutter/clutter-actor.c:7671
+#: ../clutter/clutter-actor.c:7741
 msgid "The repeat policy for the actor's content"
 msgstr "參與者內容的重複原則"
 
-#: ../clutter/clutter-actor-meta.c:193 ../clutter/clutter-child-meta.c:142
+#: ../clutter/clutter-actor-meta.c:191 ../clutter/clutter-child-meta.c:142
 msgid "Actor"
 msgstr "參與者"
 
-#: ../clutter/clutter-actor-meta.c:194
+#: ../clutter/clutter-actor-meta.c:192
 msgid "The actor attached to the meta"
 msgstr "參與者附加到中繼物件"
 
-#: ../clutter/clutter-actor-meta.c:208
+#: ../clutter/clutter-actor-meta.c:206
 msgid "The name of the meta"
 msgstr "中繼物件的名稱"
 
-#: ../clutter/clutter-actor-meta.c:221 ../clutter/clutter-input-device.c:337
-#: ../clutter/deprecated/clutter-shader.c:313
+#: ../clutter/clutter-actor-meta.c:219 ../clutter/clutter-input-device.c:326
+#: ../clutter/deprecated/clutter-shader.c:309
 msgid "Enabled"
 msgstr "已啟用"
 
-#: ../clutter/clutter-actor-meta.c:222
+#: ../clutter/clutter-actor-meta.c:220
 msgid "Whether the meta is enabled"
 msgstr "是否中繼物件已被啟用"
 
 #: ../clutter/clutter-align-constraint.c:279
-#: ../clutter/clutter-bind-constraint.c:358 ../clutter/clutter-clone.c:345
+#: ../clutter/clutter-bind-constraint.c:358 ../clutter/clutter-clone.c:341
 #: ../clutter/clutter-snap-constraint.c:321
 msgid "Source"
 msgstr "源頭"
@@ -728,11 +728,11 @@ msgstr "因子"
 msgid "The alignment factor, between 0.0 and 1.0"
 msgstr "對齊因子，在 0.0 和 1.0 之間"
 
-#: ../clutter/clutter-backend.c:379
+#: ../clutter/clutter-backend.c:380
 msgid "Unable to initialize the Clutter backend"
 msgstr "無法初始化 Clutter 後端"
 
-#: ../clutter/clutter-backend.c:453
+#: ../clutter/clutter-backend.c:454
 #, c-format
 msgid "The backend of type '%s' does not support creating multiple stages"
 msgstr "類型「%s」的後端不支援建立多重階段"
@@ -763,132 +763,146 @@ msgstr "套用到連結的像素偏移值"
 msgid "The unique name of the binding pool"
 msgstr "連結池的獨一名稱"
 
-#: ../clutter/clutter-bin-layout.c:240 ../clutter/clutter-bin-layout.c:655
-#: ../clutter/clutter-box-layout.c:390 ../clutter/clutter-table-layout.c:610
+#: ../clutter/clutter-bin-layout.c:238 ../clutter/clutter-bin-layout.c:651
+#: ../clutter/clutter-box-layout.c:388
+#: ../clutter/deprecated/clutter-table-layout.c:610
 msgid "Horizontal Alignment"
 msgstr "水平對齊"
 
-#: ../clutter/clutter-bin-layout.c:241
+#: ../clutter/clutter-bin-layout.c:239
 msgid "Horizontal alignment for the actor inside the layout manager"
 msgstr "用於版面管理器之內參與者的水平對齊"
 
-#: ../clutter/clutter-bin-layout.c:249 ../clutter/clutter-bin-layout.c:675
-#: ../clutter/clutter-box-layout.c:399 ../clutter/clutter-table-layout.c:625
+#: ../clutter/clutter-bin-layout.c:247 ../clutter/clutter-bin-layout.c:671
+#: ../clutter/clutter-box-layout.c:397
+#: ../clutter/deprecated/clutter-table-layout.c:625
 msgid "Vertical Alignment"
 msgstr "垂直對齊"
 
-#: ../clutter/clutter-bin-layout.c:250
+#: ../clutter/clutter-bin-layout.c:248
 msgid "Vertical alignment for the actor inside the layout manager"
 msgstr "用於版面管理器之內參與者的垂直對齊"
 
-#: ../clutter/clutter-bin-layout.c:656
+#: ../clutter/clutter-bin-layout.c:652
 msgid "Default horizontal alignment for the actors inside the layout manager"
 msgstr "用於版面配置管理員之內參與者的預設水平對齊"
 
-#: ../clutter/clutter-bin-layout.c:676
+#: ../clutter/clutter-bin-layout.c:672
 msgid "Default vertical alignment for the actors inside the layout manager"
 msgstr "用於版面配置管理員之內參與者的預設垂直對齊"
 
-#: ../clutter/clutter-box-layout.c:365
+#: ../clutter/clutter-box-layout.c:363
 msgid "Expand"
 msgstr "展開"
 
-#: ../clutter/clutter-box-layout.c:366
+#: ../clutter/clutter-box-layout.c:364
 msgid "Allocate extra space for the child"
 msgstr "配置額外空間給子物件"
 
-#: ../clutter/clutter-box-layout.c:372 ../clutter/clutter-table-layout.c:589
+#: ../clutter/clutter-box-layout.c:370
+#: ../clutter/deprecated/clutter-table-layout.c:589
 msgid "Horizontal Fill"
 msgstr "水平填充"
 
-#: ../clutter/clutter-box-layout.c:373 ../clutter/clutter-table-layout.c:590
+#: ../clutter/clutter-box-layout.c:371
+#: ../clutter/deprecated/clutter-table-layout.c:590
 msgid ""
 "Whether the child should receive priority when the container is allocating "
 "spare space on the horizontal axis"
 msgstr "當容器正在水平軸上配置備用空間時，子物件是否應該接收優先權"
 
-#: ../clutter/clutter-box-layout.c:381 ../clutter/clutter-table-layout.c:596
+#: ../clutter/clutter-box-layout.c:379
+#: ../clutter/deprecated/clutter-table-layout.c:596
 msgid "Vertical Fill"
 msgstr "垂直填充"
 
-#: ../clutter/clutter-box-layout.c:382 ../clutter/clutter-table-layout.c:597
+#: ../clutter/clutter-box-layout.c:380
+#: ../clutter/deprecated/clutter-table-layout.c:597
 msgid ""
 "Whether the child should receive priority when the container is allocating "
 "spare space on the vertical axis"
 msgstr "當容器正在垂直軸上配置備用空間時，子物件是否應該接收優先權"
 
-#: ../clutter/clutter-box-layout.c:391 ../clutter/clutter-table-layout.c:611
+#: ../clutter/clutter-box-layout.c:389
+#: ../clutter/deprecated/clutter-table-layout.c:611
 msgid "Horizontal alignment of the actor within the cell"
 msgstr "在方格之內參與者的水平對齊"
 
-#: ../clutter/clutter-box-layout.c:400 ../clutter/clutter-table-layout.c:626
+#: ../clutter/clutter-box-layout.c:398
+#: ../clutter/deprecated/clutter-table-layout.c:626
 msgid "Vertical alignment of the actor within the cell"
 msgstr "在方格之內參與者的垂直對齊"
 
-#: ../clutter/clutter-box-layout.c:1365
+#: ../clutter/clutter-box-layout.c:1359
 msgid "Vertical"
 msgstr "垂直"
 
-#: ../clutter/clutter-box-layout.c:1366
+#: ../clutter/clutter-box-layout.c:1360
 msgid "Whether the layout should be vertical, rather than horizontal"
 msgstr "版面配置是否應該是垂直而非水平"
 
-#: ../clutter/clutter-box-layout.c:1383 ../clutter/clutter-flow-layout.c:890
-#: ../clutter/clutter-grid-layout.c:1550
+#: ../clutter/clutter-box-layout.c:1377 ../clutter/clutter-flow-layout.c:942
+#: ../clutter/clutter-grid-layout.c:1549
 msgid "Orientation"
 msgstr "方向"
 
-#: ../clutter/clutter-box-layout.c:1384 ../clutter/clutter-flow-layout.c:891
-#: ../clutter/clutter-grid-layout.c:1551
+#: ../clutter/clutter-box-layout.c:1378 ../clutter/clutter-flow-layout.c:943
+#: ../clutter/clutter-grid-layout.c:1550
 msgid "The orientation of the layout"
 msgstr "版面配置的方向"
 
-#: ../clutter/clutter-box-layout.c:1400 ../clutter/clutter-flow-layout.c:906
+#: ../clutter/clutter-box-layout.c:1394 ../clutter/clutter-flow-layout.c:958
 msgid "Homogeneous"
 msgstr "同質的"
 
-#: ../clutter/clutter-box-layout.c:1401
+#: ../clutter/clutter-box-layout.c:1395
 msgid ""
 "Whether the layout should be homogeneous, i.e. all childs get the same size"
 msgstr "版面配置是否應該是同質的，也就是所有子物件都具有相同的大小"
 
-#: ../clutter/clutter-box-layout.c:1416
+#: ../clutter/clutter-box-layout.c:1410
 msgid "Pack Start"
 msgstr "包裝開始"
 
-#: ../clutter/clutter-box-layout.c:1417
+#: ../clutter/clutter-box-layout.c:1411
 msgid "Whether to pack items at the start of the box"
 msgstr "是否要從方框的起始去包裝各個項目"
 
-#: ../clutter/clutter-box-layout.c:1430
+#: ../clutter/clutter-box-layout.c:1424
 msgid "Spacing"
 msgstr "間隔"
 
-#: ../clutter/clutter-box-layout.c:1431
+#: ../clutter/clutter-box-layout.c:1425
 msgid "Spacing between children"
 msgstr "子物件之間的間隔"
 
-#: ../clutter/clutter-box-layout.c:1448 ../clutter/clutter-table-layout.c:1675
+#: ../clutter/clutter-box-layout.c:1442
+#: ../clutter/deprecated/clutter-table-layout.c:1677
 msgid "Use Animations"
 msgstr "使用動畫"
 
-#: ../clutter/clutter-box-layout.c:1449 ../clutter/clutter-table-layout.c:1676
+#: ../clutter/clutter-box-layout.c:1443
+#: ../clutter/deprecated/clutter-table-layout.c:1678
 msgid "Whether layout changes should be animated"
 msgstr "是否版面配置的更改應該以動畫顯示"
 
-#: ../clutter/clutter-box-layout.c:1473 ../clutter/clutter-table-layout.c:1700
+#: ../clutter/clutter-box-layout.c:1467
+#: ../clutter/deprecated/clutter-table-layout.c:1702
 msgid "Easing Mode"
 msgstr "簡易模式"
 
-#: ../clutter/clutter-box-layout.c:1474 ../clutter/clutter-table-layout.c:1701
+#: ../clutter/clutter-box-layout.c:1468
+#: ../clutter/deprecated/clutter-table-layout.c:1703
 msgid "The easing mode of the animations"
 msgstr "簡易模式的動畫"
 
-#: ../clutter/clutter-box-layout.c:1494 ../clutter/clutter-table-layout.c:1721
+#: ../clutter/clutter-box-layout.c:1488
+#: ../clutter/deprecated/clutter-table-layout.c:1723
 msgid "Easing Duration"
 msgstr "簡易持續時間"
 
-#: ../clutter/clutter-box-layout.c:1495 ../clutter/clutter-table-layout.c:1722
+#: ../clutter/clutter-box-layout.c:1489
+#: ../clutter/deprecated/clutter-table-layout.c:1724
 msgid "The duration of the animations"
 msgstr "動畫的持續時間"
 
@@ -908,14 +922,30 @@ msgstr "對比"
 msgid "The contrast change to apply"
 msgstr "要套用的對比"
 
-#: ../clutter/clutter-canvas.c:216
+#: ../clutter/clutter-canvas.c:248
 msgid "The width of the canvas"
 msgstr "畫布的闊度"
 
-#: ../clutter/clutter-canvas.c:232
+#: ../clutter/clutter-canvas.c:264
 msgid "The height of the canvas"
 msgstr "畫布的高度"
 
+#: ../clutter/clutter-canvas.c:283
+msgid "Scale Factor Set"
+msgstr "縮放因素設定"
+
+#: ../clutter/clutter-canvas.c:284
+msgid "Whether the scale-factor property is set"
+msgstr "是否已經設定縮放因素屬性"
+
+#: ../clutter/clutter-canvas.c:305
+msgid "Scale Factor"
+msgstr "縮放因素"
+
+#: ../clutter/clutter-canvas.c:306
+msgid "The scaling factor for the surface"
+msgstr "表面的縮放因素"
+
 #: ../clutter/clutter-child-meta.c:127
 msgid "Container"
 msgstr "容器"
@@ -928,39 +958,39 @@ msgstr "用以建立此資料的容器"
 msgid "The actor wrapped by this data"
 msgstr "由此資料所換列的參與者"
 
-#: ../clutter/clutter-click-action.c:559
+#: ../clutter/clutter-click-action.c:586
 msgid "Pressed"
 msgstr "已按下"
 
-#: ../clutter/clutter-click-action.c:560
+#: ../clutter/clutter-click-action.c:587
 msgid "Whether the clickable should be in pressed state"
 msgstr "可點選者是否應該處於已按下狀態"
 
-#: ../clutter/clutter-click-action.c:573
+#: ../clutter/clutter-click-action.c:600
 msgid "Held"
 msgstr "持有"
 
-#: ../clutter/clutter-click-action.c:574
+#: ../clutter/clutter-click-action.c:601
 msgid "Whether the clickable has a grab"
 msgstr "可點選者是否可抓取"
 
-#: ../clutter/clutter-click-action.c:591 ../clutter/clutter-settings.c:607
+#: ../clutter/clutter-click-action.c:618 ../clutter/clutter-settings.c:653
 msgid "Long Press Duration"
 msgstr "長時間按壓期間"
 
-#: ../clutter/clutter-click-action.c:592
+#: ../clutter/clutter-click-action.c:619
 msgid "The minimum duration of a long press to recognize the gesture"
 msgstr "長時間按壓辨識為手勢的最小持續時間"
 
-#: ../clutter/clutter-click-action.c:610
+#: ../clutter/clutter-click-action.c:637
 msgid "Long Press Threshold"
 msgstr "長時間按壓界限"
 
-#: ../clutter/clutter-click-action.c:611
+#: ../clutter/clutter-click-action.c:638
 msgid "The maximum threshold before a long press is cancelled"
 msgstr "取消長時間按壓前的最大界限"
 
-#: ../clutter/clutter-clone.c:346
+#: ../clutter/clutter-clone.c:342
 msgid "Specifies the actor to be cloned"
 msgstr "指定用來製做仿本的參與者"
 
@@ -972,27 +1002,27 @@ msgstr "色調"
 msgid "The tint to apply"
 msgstr "套用的色調"
 
-#: ../clutter/clutter-deform-effect.c:588
+#: ../clutter/clutter-deform-effect.c:592
 msgid "Horizontal Tiles"
 msgstr "水平並排"
 
-#: ../clutter/clutter-deform-effect.c:589
+#: ../clutter/clutter-deform-effect.c:593
 msgid "The number of horizontal tiles"
 msgstr "水平並排數量"
 
-#: ../clutter/clutter-deform-effect.c:604
+#: ../clutter/clutter-deform-effect.c:608
 msgid "Vertical Tiles"
 msgstr "垂直並排"
 
-#: ../clutter/clutter-deform-effect.c:605
+#: ../clutter/clutter-deform-effect.c:609
 msgid "The number of vertical tiles"
 msgstr "垂直並排數量"
 
-#: ../clutter/clutter-deform-effect.c:622
+#: ../clutter/clutter-deform-effect.c:626
 msgid "Back Material"
 msgstr "背景材質"
 
-#: ../clutter/clutter-deform-effect.c:623
+#: ../clutter/clutter-deform-effect.c:627
 msgid "The material to be used when painting the back of the actor"
 msgstr "繪製參與者背景時所用的材質"
 
@@ -1000,258 +1030,300 @@ msgstr "繪製參與者背景時所用的材質"
 msgid "The desaturation factor"
 msgstr "稀化因子"
 
-#: ../clutter/clutter-device-manager.c:131
-#: ../clutter/clutter-input-device.c:366
-#: ../clutter/x11/clutter-keymap-x11.c:321
+#: ../clutter/clutter-device-manager.c:127
+#: ../clutter/clutter-input-device.c:355
+#: ../clutter/x11/clutter-keymap-x11.c:457
 msgid "Backend"
 msgstr "後端程式"
 
-#: ../clutter/clutter-device-manager.c:132
+#: ../clutter/clutter-device-manager.c:128
 msgid "The ClutterBackend of the device manager"
 msgstr "裝置管理器的 Clutter 後端程式"
 
-#: ../clutter/clutter-drag-action.c:742
+#: ../clutter/clutter-drag-action.c:741
 msgid "Horizontal Drag Threshold"
 msgstr "水平拖曳臨界值"
 
-#: ../clutter/clutter-drag-action.c:743
+#: ../clutter/clutter-drag-action.c:742
 msgid "The horizontal amount of pixels required to start dragging"
 msgstr "啟動拖曳所需的水平像素數目"
 
-#: ../clutter/clutter-drag-action.c:770
+#: ../clutter/clutter-drag-action.c:769
 msgid "Vertical Drag Threshold"
 msgstr "垂直拖曳臨界值"
 
-#: ../clutter/clutter-drag-action.c:771
+#: ../clutter/clutter-drag-action.c:770
 msgid "The vertical amount of pixels required to start dragging"
 msgstr "啟動拖曳所需的垂直像素數目"
 
-#: ../clutter/clutter-drag-action.c:792
+#: ../clutter/clutter-drag-action.c:791
 msgid "Drag Handle"
 msgstr "拖曳控柄"
 
-#: ../clutter/clutter-drag-action.c:793
+#: ../clutter/clutter-drag-action.c:792
 msgid "The actor that is being dragged"
 msgstr "正在拖曳的參與者"
 
-#: ../clutter/clutter-drag-action.c:806
+#: ../clutter/clutter-drag-action.c:805
 msgid "Drag Axis"
 msgstr "拖曳軸線"
 
-#: ../clutter/clutter-drag-action.c:807
+#: ../clutter/clutter-drag-action.c:806
 msgid "Constraints the dragging to an axis"
 msgstr "約束拖曳之於軸線"
 
-#: ../clutter/clutter-drag-action.c:823
+#: ../clutter/clutter-drag-action.c:822
 msgid "Drag Area"
 msgstr "拖曳區域"
 
-#: ../clutter/clutter-drag-action.c:824
+#: ../clutter/clutter-drag-action.c:823
 msgid "Constrains the dragging to a rectangle"
 msgstr "限制矩形拖曳"
 
-#: ../clutter/clutter-drag-action.c:837
+#: ../clutter/clutter-drag-action.c:836
 msgid "Drag Area Set"
 msgstr "拖曳區域設定"
 
-#: ../clutter/clutter-drag-action.c:838
+#: ../clutter/clutter-drag-action.c:837
 msgid "Whether the drag area is set"
 msgstr "是否已經設定拖曳區域"
 
-#: ../clutter/clutter-flow-layout.c:907
+#: ../clutter/clutter-flow-layout.c:959
 msgid "Whether each item should receive the same allocation"
 msgstr "每個項目是否應該獲得相同的配置"
 
-#: ../clutter/clutter-flow-layout.c:922 ../clutter/clutter-table-layout.c:1637
+#: ../clutter/clutter-flow-layout.c:974
+#: ../clutter/deprecated/clutter-table-layout.c:1637
 msgid "Column Spacing"
 msgstr "欄間隔"
 
-#: ../clutter/clutter-flow-layout.c:923
+#: ../clutter/clutter-flow-layout.c:975
 msgid "The spacing between columns"
 msgstr "直欄之間的間隔"
 
-#: ../clutter/clutter-flow-layout.c:939 ../clutter/clutter-table-layout.c:1651
+#: ../clutter/clutter-flow-layout.c:991
+#: ../clutter/deprecated/clutter-table-layout.c:1653
 msgid "Row Spacing"
 msgstr "列間隔"
 
-#: ../clutter/clutter-flow-layout.c:940
+#: ../clutter/clutter-flow-layout.c:992
 msgid "The spacing between rows"
 msgstr "橫列之間的間隔"
 
-#: ../clutter/clutter-flow-layout.c:954
+#: ../clutter/clutter-flow-layout.c:1006
 msgid "Minimum Column Width"
 msgstr "最小欄寬"
 
-#: ../clutter/clutter-flow-layout.c:955
+#: ../clutter/clutter-flow-layout.c:1007
 msgid "Minimum width for each column"
 msgstr "每一欄的最小闊度"
 
-#: ../clutter/clutter-flow-layout.c:970
+#: ../clutter/clutter-flow-layout.c:1022
 msgid "Maximum Column Width"
 msgstr "最大欄寬"
 
-#: ../clutter/clutter-flow-layout.c:971
+#: ../clutter/clutter-flow-layout.c:1023
 msgid "Maximum width for each column"
 msgstr "每一欄的最大闊度"
 
-#: ../clutter/clutter-flow-layout.c:985
+#: ../clutter/clutter-flow-layout.c:1037
 msgid "Minimum Row Height"
 msgstr "最小列高"
 
-#: ../clutter/clutter-flow-layout.c:986
+#: ../clutter/clutter-flow-layout.c:1038
 msgid "Minimum height for each row"
 msgstr "每一列的最小高度"
 
-#: ../clutter/clutter-flow-layout.c:1001
+#: ../clutter/clutter-flow-layout.c:1053
 msgid "Maximum Row Height"
 msgstr "最大列高"
 
-#: ../clutter/clutter-flow-layout.c:1002
+#: ../clutter/clutter-flow-layout.c:1054
 msgid "Maximum height for each row"
 msgstr "每一列的最大高度"
 
-#: ../clutter/clutter-grid-layout.c:1222
+#: ../clutter/clutter-flow-layout.c:1069 ../clutter/clutter-flow-layout.c:1070
+msgid "Snap to grid"
+msgstr "貼齊格線"
+
+#: ../clutter/clutter-gesture-action.c:668
+msgid "Number touch points"
+msgstr "觸控點數目"
+
+#: ../clutter/clutter-gesture-action.c:669
+msgid "Number of touch points"
+msgstr "觸控點數目"
+
+#: ../clutter/clutter-gesture-action.c:684
+msgid "Threshold Trigger Edge"
+msgstr "界限觸發邊緣"
+
+#: ../clutter/clutter-gesture-action.c:685
+msgid "The trigger edge used by the action"
+msgstr "動作使用的觸發邊緣"
+
+#: ../clutter/clutter-gesture-action.c:704
+#| msgid "Threshold Trigger Edge"
+msgid "Threshold Trigger Horizontal Distance"
+msgstr "界限觸發水平距離"
+
+#: ../clutter/clutter-gesture-action.c:705
+#| msgid "The trigger edge used by the action"
+msgid "The horizontal trigger distance used by the action"
+msgstr "動作使用的水平觸發距離"
+
+#: ../clutter/clutter-gesture-action.c:723
+#| msgid "Threshold Trigger Edge"
+msgid "Threshold Trigger Vertical Distance"
+msgstr "界限觸發垂直距離"
+
+#: ../clutter/clutter-gesture-action.c:724
+#| msgid "The trigger edge used by the action"
+msgid "The vertical trigger distance used by the action"
+msgstr "動作使用的垂直觸發距離"
+
+#: ../clutter/clutter-grid-layout.c:1223
 msgid "Left attachment"
 msgstr "左側附加"
 
-#: ../clutter/clutter-grid-layout.c:1223
+#: ../clutter/clutter-grid-layout.c:1224
 msgid "The column number to attach the left side of the child to"
 msgstr "附加於子項的左側的欄數"
 
-#: ../clutter/clutter-grid-layout.c:1230
+#: ../clutter/clutter-grid-layout.c:1231
 msgid "Top attachment"
 msgstr "頂端附加"
 
-#: ../clutter/clutter-grid-layout.c:1231
+#: ../clutter/clutter-grid-layout.c:1232
 msgid "The row number to attach the top side of a child widget to"
 msgstr "附加於子元件的頂端的列數"
 
-#: ../clutter/clutter-grid-layout.c:1239
+#: ../clutter/clutter-grid-layout.c:1240
 msgid "The number of columns that a child spans"
 msgstr "子項跨過的欄數"
 
-#: ../clutter/clutter-grid-layout.c:1246
+#: ../clutter/clutter-grid-layout.c:1247
 msgid "The number of rows that a child spans"
 msgstr "子項跨過的列數"
 
-#: ../clutter/clutter-grid-layout.c:1565
+#: ../clutter/clutter-grid-layout.c:1564
 msgid "Row spacing"
 msgstr "列距"
 
-#: ../clutter/clutter-grid-layout.c:1566
+#: ../clutter/clutter-grid-layout.c:1565
 msgid "The amount of space between two consecutive rows"
 msgstr "兩連續列之間的空間總數"
 
-#: ../clutter/clutter-grid-layout.c:1579
+#: ../clutter/clutter-grid-layout.c:1578
 msgid "Column spacing"
 msgstr "欄距"
 
-#: ../clutter/clutter-grid-layout.c:1580
+#: ../clutter/clutter-grid-layout.c:1579
 msgid "The amount of space between two consecutive columns"
 msgstr "兩連續欄之間的空間總數"
 
-#: ../clutter/clutter-grid-layout.c:1594
+#: ../clutter/clutter-grid-layout.c:1593
 msgid "Row Homogeneous"
 msgstr "列高一致"
 
-#: ../clutter/clutter-grid-layout.c:1595
+#: ../clutter/clutter-grid-layout.c:1594
 msgid "If TRUE, the rows are all the same height"
 msgstr "如果設定為「TRUE」，表示所有列的高度都一樣"
 
-#: ../clutter/clutter-grid-layout.c:1608
+#: ../clutter/clutter-grid-layout.c:1607
 msgid "Column Homogeneous"
 msgstr "欄寬一致"
 
-#: ../clutter/clutter-grid-layout.c:1609
+#: ../clutter/clutter-grid-layout.c:1608
 msgid "If TRUE, the columns are all the same width"
 msgstr "如果設定為「TRUE」，表示所有欄的闊度都一樣"
 
-#: ../clutter/clutter-image.c:248 ../clutter/clutter-image.c:311
-#: ../clutter/clutter-image.c:399
+#: ../clutter/clutter-image.c:249 ../clutter/clutter-image.c:312
+#: ../clutter/clutter-image.c:400
 msgid "Unable to load image data"
 msgstr "無法載入圖片資料"
 
-#: ../clutter/clutter-input-device.c:242
+#: ../clutter/clutter-input-device.c:231
 msgid "Id"
 msgstr "識別號"
 
-#: ../clutter/clutter-input-device.c:243
+#: ../clutter/clutter-input-device.c:232
 msgid "Unique identifier of the device"
 msgstr "裝置唯一識別號"
 
-#: ../clutter/clutter-input-device.c:259
+#: ../clutter/clutter-input-device.c:248
 msgid "The name of the device"
 msgstr "裝置名稱"
 
-#: ../clutter/clutter-input-device.c:273
+#: ../clutter/clutter-input-device.c:262
 msgid "Device Type"
 msgstr "裝置類型"
 
-#: ../clutter/clutter-input-device.c:274
+#: ../clutter/clutter-input-device.c:263
 msgid "The type of the device"
 msgstr "裝置的類型"
 
-#: ../clutter/clutter-input-device.c:289
+#: ../clutter/clutter-input-device.c:278
 msgid "Device Manager"
 msgstr "裝置管理程式"
 
-#: ../clutter/clutter-input-device.c:290
+#: ../clutter/clutter-input-device.c:279
 msgid "The device manager instance"
 msgstr "裝置管理程式實體"
 
-#: ../clutter/clutter-input-device.c:303
+#: ../clutter/clutter-input-device.c:292
 msgid "Device Mode"
 msgstr "裝置模式"
 
-#: ../clutter/clutter-input-device.c:304
+#: ../clutter/clutter-input-device.c:293
 msgid "The mode of the device"
 msgstr "裝置的模式"
 
-#: ../clutter/clutter-input-device.c:318
+#: ../clutter/clutter-input-device.c:307
 msgid "Has Cursor"
 msgstr "具有游標"
 
-#: ../clutter/clutter-input-device.c:319
+#: ../clutter/clutter-input-device.c:308
 msgid "Whether the device has a cursor"
 msgstr "裝置是否有游標"
 
-#: ../clutter/clutter-input-device.c:338
+#: ../clutter/clutter-input-device.c:327
 msgid "Whether the device is enabled"
 msgstr "裝置是否已啟用"
 
-#: ../clutter/clutter-input-device.c:351
+#: ../clutter/clutter-input-device.c:340
 msgid "Number of Axes"
 msgstr "軸的數目"
 
-#: ../clutter/clutter-input-device.c:352
+#: ../clutter/clutter-input-device.c:341
 msgid "The number of axes on the device"
 msgstr "裝置中的軸數"
 
-#: ../clutter/clutter-input-device.c:367
+#: ../clutter/clutter-input-device.c:356
 msgid "The backend instance"
 msgstr "後端實體"
 
-#: ../clutter/clutter-interval.c:506
+#: ../clutter/clutter-interval.c:553
 msgid "Value Type"
 msgstr "變數值類型"
 
-#: ../clutter/clutter-interval.c:507
+#: ../clutter/clutter-interval.c:554
 msgid "The type of the values in the interval"
 msgstr "在間隔之中的變數值型態"
 
-#: ../clutter/clutter-interval.c:522
+#: ../clutter/clutter-interval.c:569
 msgid "Initial Value"
 msgstr "初始值"
 
-#: ../clutter/clutter-interval.c:523
+#: ../clutter/clutter-interval.c:570
 msgid "Initial value of the interval"
 msgstr "間隔的初始值"
 
-#: ../clutter/clutter-interval.c:537
+#: ../clutter/clutter-interval.c:584
 msgid "Final Value"
 msgstr "最終值"
 
-#: ../clutter/clutter-interval.c:538
+#: ../clutter/clutter-interval.c:585
 msgid "Final value of the interval"
 msgstr "間隔的最終值"
 
@@ -1270,96 +1342,96 @@ msgstr "用以建立此資料的管理器"
 #. * Do NOT translate it to non-English e.g. "predefinito:LTR"! If
 #. * it isn't default:LTR or default:RTL it will not work.
 #.
-#: ../clutter/clutter-main.c:772
+#: ../clutter/clutter-main.c:795
 msgid "default:LTR"
 msgstr "default:LTR"
 
-#: ../clutter/clutter-main.c:1646
+#: ../clutter/clutter-main.c:1622
 msgid "Show frames per second"
 msgstr "顯示圖框速率"
 
-#: ../clutter/clutter-main.c:1648
+#: ../clutter/clutter-main.c:1624
 msgid "Default frame rate"
 msgstr "預設圖框率"
 
-#: ../clutter/clutter-main.c:1650
+#: ../clutter/clutter-main.c:1626
 msgid "Make all warnings fatal"
 msgstr "所有警告視為嚴重錯誤"
 
-#: ../clutter/clutter-main.c:1653
+#: ../clutter/clutter-main.c:1629
 msgid "Direction for the text"
 msgstr "文字方向"
 
-#: ../clutter/clutter-main.c:1656
+#: ../clutter/clutter-main.c:1632
 msgid "Disable mipmapping on text"
 msgstr "在文字上停用 MIP 對應"
 
-#: ../clutter/clutter-main.c:1659
+#: ../clutter/clutter-main.c:1635
 msgid "Use 'fuzzy' picking"
 msgstr "使用「模糊」挑選"
 
-#: ../clutter/clutter-main.c:1662
+#: ../clutter/clutter-main.c:1638
 msgid "Clutter debugging flags to set"
 msgstr "要設定的 Clutter 除錯標記"
 
-#: ../clutter/clutter-main.c:1664
+#: ../clutter/clutter-main.c:1640
 msgid "Clutter debugging flags to unset"
 msgstr "要取消設定的 Clutter 除錯標記"
 
-#: ../clutter/clutter-main.c:1668
+#: ../clutter/clutter-main.c:1644
 msgid "Clutter profiling flags to set"
 msgstr "要設定的 Clutter 效能分析標記"
 
-#: ../clutter/clutter-main.c:1670
+#: ../clutter/clutter-main.c:1646
 msgid "Clutter profiling flags to unset"
 msgstr "要取消設定的 Clutter 效能分析標記"
 
-#: ../clutter/clutter-main.c:1673
+#: ../clutter/clutter-main.c:1649
 msgid "Enable accessibility"
 msgstr "啟用輔助工具"
 
-#: ../clutter/clutter-main.c:1865
+#: ../clutter/clutter-main.c:1841
 msgid "Clutter Options"
 msgstr "Clutter 選項"
 
-#: ../clutter/clutter-main.c:1866
+#: ../clutter/clutter-main.c:1842
 msgid "Show Clutter Options"
 msgstr "顯示 Clutter 選項"
 
-#: ../clutter/clutter-pan-action.c:448
+#: ../clutter/clutter-pan-action.c:455
 msgid "Pan Axis"
 msgstr "平移軸線"
 
-#: ../clutter/clutter-pan-action.c:449
+#: ../clutter/clutter-pan-action.c:456
 msgid "Constraints the panning to an axis"
 msgstr "限制平移至軸線"
 
-#: ../clutter/clutter-pan-action.c:463
+#: ../clutter/clutter-pan-action.c:470
 msgid "Interpolate"
 msgstr "插值法"
 
-#: ../clutter/clutter-pan-action.c:464
+#: ../clutter/clutter-pan-action.c:471
 msgid "Whether interpolated events emission is enabled."
 msgstr "內插事件散發是否已啟用。"
 
-#: ../clutter/clutter-pan-action.c:480
+#: ../clutter/clutter-pan-action.c:487
 msgid "Deceleration"
 msgstr "減速"
 
-#: ../clutter/clutter-pan-action.c:481
+#: ../clutter/clutter-pan-action.c:488
 msgid "Rate at which the interpolated panning will decelerate in"
 msgstr "內插平移要減速的速率"
 
-#: ../clutter/clutter-pan-action.c:498
+#: ../clutter/clutter-pan-action.c:505
 msgid "Initial acceleration factor"
 msgstr "初始加速系數"
 
-#: ../clutter/clutter-pan-action.c:499
+#: ../clutter/clutter-pan-action.c:506
 msgid "Factor applied to the momentum when starting the interpolated phase"
 msgstr "當開始內插階段時套用到動量的系數"
 
 #: ../clutter/clutter-path-constraint.c:212
-#: ../clutter/deprecated/clutter-behaviour-path.c:225
+#: ../clutter/deprecated/clutter-behaviour-path.c:221
 msgid "Path"
 msgstr "路徑"
 
@@ -1371,149 +1443,157 @@ msgstr "用來限制參與者的路徑"
 msgid "The offset along the path, between -1.0 and 2.0"
 msgstr "路徑的補償，在 -1.0 和 2.0 之間"
 
-#: ../clutter/clutter-property-transition.c:271
+#: ../clutter/clutter-property-transition.c:269
 msgid "Property Name"
 msgstr "屬性名稱"
 
-#: ../clutter/clutter-property-transition.c:272
+#: ../clutter/clutter-property-transition.c:270
 msgid "The name of the property to animate"
 msgstr "要動畫化的屬性名稱"
 
-#: ../clutter/clutter-script.c:466
+#: ../clutter/clutter-script.c:464
 msgid "Filename Set"
 msgstr "檔名設定"
 
-#: ../clutter/clutter-script.c:467
+#: ../clutter/clutter-script.c:465
 msgid "Whether the :filename property is set"
 msgstr "是否已經設定 :filename 屬性"
 
-#: ../clutter/clutter-script.c:481
-#: ../clutter/deprecated/clutter-texture.c:1082
+#: ../clutter/clutter-script.c:479
+#: ../clutter/deprecated/clutter-texture.c:1080
 msgid "Filename"
 msgstr "檔名"
 
-#: ../clutter/clutter-script.c:482
+#: ../clutter/clutter-script.c:480
 msgid "The path of the currently parsed file"
 msgstr "目前剖析檔案的路徑"
 
-#: ../clutter/clutter-script.c:499
+#: ../clutter/clutter-script.c:497
 msgid "Translation Domain"
 msgstr "翻譯域名"
 
-#: ../clutter/clutter-script.c:500
+#: ../clutter/clutter-script.c:498
 msgid "The translation domain used to localize string"
 msgstr "用來本地化字串的翻譯域名"
 
-#: ../clutter/clutter-scroll-actor.c:190
+#: ../clutter/clutter-scroll-actor.c:189
 msgid "Scroll Mode"
 msgstr "捲動模式"
 
-#: ../clutter/clutter-scroll-actor.c:191
+#: ../clutter/clutter-scroll-actor.c:190
 msgid "The scrolling direction"
 msgstr "捲動方向"
 
-#: ../clutter/clutter-settings.c:448
+#: ../clutter/clutter-settings.c:486
 msgid "Double Click Time"
 msgstr "連按兩下時間"
 
-#: ../clutter/clutter-settings.c:449
+#: ../clutter/clutter-settings.c:487
 msgid "The time between clicks necessary to detect a multiple click"
 msgstr "偵測多重點擊時每個點擊間隔的時間"
 
-#: ../clutter/clutter-settings.c:464
+#: ../clutter/clutter-settings.c:502
 msgid "Double Click Distance"
 msgstr "連按兩下間距"
 
-#: ../clutter/clutter-settings.c:465
+#: ../clutter/clutter-settings.c:503
 msgid "The distance between clicks necessary to detect a multiple click"
 msgstr "偵測多重點擊時每個點擊間隔的距離"
 
-#: ../clutter/clutter-settings.c:480
+#: ../clutter/clutter-settings.c:518
 msgid "Drag Threshold"
 msgstr "拖曳距離界限"
 
-#: ../clutter/clutter-settings.c:481
+#: ../clutter/clutter-settings.c:519
 msgid "The distance the cursor should travel before starting to drag"
 msgstr "開始拖曳前游標移動的距離"
 
-#: ../clutter/clutter-settings.c:496 ../clutter/clutter-text.c:3367
+#: ../clutter/clutter-settings.c:534 ../clutter/clutter-text.c:3437
 msgid "Font Name"
 msgstr "字型名稱"
 
-#: ../clutter/clutter-settings.c:497
+#: ../clutter/clutter-settings.c:535
 msgid ""
 "The description of the default font, as one that could be parsed by Pango"
 msgstr "預設字型的描述，等同由 Pango 分析的資料"
 
-#: ../clutter/clutter-settings.c:512
+#: ../clutter/clutter-settings.c:550
 msgid "Font Antialias"
 msgstr "字型平滑化"
 
-#: ../clutter/clutter-settings.c:513
+#: ../clutter/clutter-settings.c:551
 msgid ""
 "Whether to use antialiasing (1 to enable, 0 to disable, and -1 to use the "
 "default)"
 msgstr "是否使用平滑化 (1 為啟用，0 為停用，而 -1 為使用預設值)"
 
-#: ../clutter/clutter-settings.c:529
+#: ../clutter/clutter-settings.c:567 ../clutter/clutter-settings.c:575
 msgid "Font DPI"
 msgstr "字型 DPI"
 
-#: ../clutter/clutter-settings.c:530
+#: ../clutter/clutter-settings.c:568 ../clutter/clutter-settings.c:576
 msgid ""
 "The resolution of the font, in 1024 * dots/inch, or -1 to use the default"
 msgstr "字型的解像度，單位為 1024 * 點數/英吋，或是 -1 為使用預設值"
 
-#: ../clutter/clutter-settings.c:546
+#: ../clutter/clutter-settings.c:592
 msgid "Font Hinting"
 msgstr "字型 Hinting"
 
-#: ../clutter/clutter-settings.c:547
+#: ../clutter/clutter-settings.c:593
 msgid ""
 "Whether to use hinting (1 to enable, 0 to disable and -1 to use the default)"
 msgstr "是否使用 hinting (1 為啟用，0 為停用，而 -1 為使用預設值)"
 
-#: ../clutter/clutter-settings.c:568
+#: ../clutter/clutter-settings.c:614
 msgid "Font Hint Style"
 msgstr "字型 Hint 樣式"
 
-#: ../clutter/clutter-settings.c:569
+#: ../clutter/clutter-settings.c:615
 msgid "The style of hinting (hintnone, hintslight, hintmedium, hintfull)"
 msgstr "hinting 的類型 (hintnone, hintslight, hintmedium, hintfull)"
 
-#: ../clutter/clutter-settings.c:590
+#: ../clutter/clutter-settings.c:636
 msgid "Font Subpixel Order"
 msgstr "字型次像素順序"
 
-#: ../clutter/clutter-settings.c:591
+#: ../clutter/clutter-settings.c:637
 msgid "The type of subpixel antialiasing (none, rgb, bgr, vrgb, vbgr)"
 msgstr "次像素平滑化的類型 (none, rgb, bgr, vrgb, vbgr)"
 
-#: ../clutter/clutter-settings.c:608
+#: ../clutter/clutter-settings.c:654
 msgid "The minimum duration for a long press gesture to be recognized"
 msgstr "辨識長時間按壓手勢的最小持續時間"
 
-#: ../clutter/clutter-settings.c:615
+#: ../clutter/clutter-settings.c:661
+msgid "Window Scaling Factor"
+msgstr "視窗縮放因素"
+
+#: ../clutter/clutter-settings.c:662
+msgid "The scaling factor to be applied to windows"
+msgstr "套用到視窗的縮放因素"
+
+#: ../clutter/clutter-settings.c:669
 msgid "Fontconfig configuration timestamp"
 msgstr "Fontconfig 組態時刻戳記"
 
-#: ../clutter/clutter-settings.c:616
+#: ../clutter/clutter-settings.c:670
 msgid "Timestamp of the current fontconfig configuration"
 msgstr "目前的 fontconfig 組態的時刻戳記"
 
-#: ../clutter/clutter-settings.c:633
+#: ../clutter/clutter-settings.c:687
 msgid "Password Hint Time"
 msgstr "密碼提示時間"
 
-#: ../clutter/clutter-settings.c:634
+#: ../clutter/clutter-settings.c:688
 msgid "How long to show the last input character in hidden entries"
 msgstr "要顯示隱藏項目中最後輸入的字符多長的時間"
 
-#: ../clutter/clutter-shader-effect.c:486
+#: ../clutter/clutter-shader-effect.c:485
 msgid "Shader Type"
 msgstr "着色引擎類型"
 
-#: ../clutter/clutter-shader-effect.c:487
+#: ../clutter/clutter-shader-effect.c:486
 msgid "The type of shader used"
 msgstr "使用的着色引擎類型"
 
@@ -1541,758 +1621,702 @@ msgstr "來源要貼齊的邊緣"
 msgid "The offset in pixels to apply to the constraint"
 msgstr "套用到限制的像素偏移值"
 
-#: ../clutter/clutter-stage.c:1929
+#: ../clutter/clutter-stage.c:1899
 msgid "Fullscreen Set"
 msgstr "全螢幕設定"
 
-#: ../clutter/clutter-stage.c:1930
+#: ../clutter/clutter-stage.c:1900
 msgid "Whether the main stage is fullscreen"
 msgstr "主舞臺是否為全螢幕"
 
-#: ../clutter/clutter-stage.c:1944
+#: ../clutter/clutter-stage.c:1914
 msgid "Offscreen"
 msgstr "螢幕外"
 
-#: ../clutter/clutter-stage.c:1945
+#: ../clutter/clutter-stage.c:1915
 msgid "Whether the main stage should be rendered offscreen"
 msgstr "主舞臺是否應該在幕後潤算"
 
-#: ../clutter/clutter-stage.c:1957 ../clutter/clutter-text.c:3481
+#: ../clutter/clutter-stage.c:1927 ../clutter/clutter-text.c:3551
 msgid "Cursor Visible"
 msgstr "游標可見"
 
-#: ../clutter/clutter-stage.c:1958
+#: ../clutter/clutter-stage.c:1928
 msgid "Whether the mouse pointer is visible on the main stage"
 msgstr "鼠標是可見於主舞臺之上"
 
-#: ../clutter/clutter-stage.c:1972
+#: ../clutter/clutter-stage.c:1942
 msgid "User Resizable"
 msgstr "使用者可更改大小"
 
-#: ../clutter/clutter-stage.c:1973
+#: ../clutter/clutter-stage.c:1943
 msgid "Whether the stage is able to be resized via user interaction"
 msgstr "舞臺是否能夠透過使用者交互作用而調整大小"
 
-#: ../clutter/clutter-stage.c:1988 ../clutter/deprecated/clutter-box.c:260
-#: ../clutter/deprecated/clutter-rectangle.c:273
+#: ../clutter/clutter-stage.c:1958 ../clutter/deprecated/clutter-box.c:256
+#: ../clutter/deprecated/clutter-rectangle.c:270
 msgid "Color"
 msgstr "顏色"
 
-#: ../clutter/clutter-stage.c:1989
+#: ../clutter/clutter-stage.c:1959
 msgid "The color of the stage"
 msgstr "舞臺的顏色"
 
-#: ../clutter/clutter-stage.c:2004
+#: ../clutter/clutter-stage.c:1974
 msgid "Perspective"
 msgstr "視角"
 
-#: ../clutter/clutter-stage.c:2005
+#: ../clutter/clutter-stage.c:1975
 msgid "Perspective projection parameters"
 msgstr "視角投影參數"
 
-#: ../clutter/clutter-stage.c:2020
+#: ../clutter/clutter-stage.c:1990
 msgid "Title"
 msgstr "標題"
 
-#: ../clutter/clutter-stage.c:2021
+#: ../clutter/clutter-stage.c:1991
 msgid "Stage Title"
 msgstr "舞臺標題"
 
-#: ../clutter/clutter-stage.c:2038
+#: ../clutter/clutter-stage.c:2008
 msgid "Use Fog"
 msgstr "使用霧化效果"
 
-#: ../clutter/clutter-stage.c:2039
+#: ../clutter/clutter-stage.c:2009
 msgid "Whether to enable depth cueing"
 msgstr "是否要啟用景深暗示"
 
-#: ../clutter/clutter-stage.c:2055
+#: ../clutter/clutter-stage.c:2025
 msgid "Fog"
 msgstr "霧化"
 
-#: ../clutter/clutter-stage.c:2056
+#: ../clutter/clutter-stage.c:2026
 msgid "Settings for the depth cueing"
 msgstr "景深暗示的設定值"
 
-#: ../clutter/clutter-stage.c:2072
+#: ../clutter/clutter-stage.c:2042
 msgid "Use Alpha"
 msgstr "使用α組成"
 
-#: ../clutter/clutter-stage.c:2073
+#: ../clutter/clutter-stage.c:2043
 msgid "Whether to honour the alpha component of the stage color"
 msgstr "是否要考量舞臺顏色的α組成"
 
-#: ../clutter/clutter-stage.c:2089
+#: ../clutter/clutter-stage.c:2059
 msgid "Key Focus"
 msgstr "按鍵焦點"
 
-#: ../clutter/clutter-stage.c:2090
+#: ../clutter/clutter-stage.c:2060
 msgid "The currently key focused actor"
 msgstr "目前按鍵焦點的參與者"
 
-#: ../clutter/clutter-stage.c:2106
+#: ../clutter/clutter-stage.c:2076
 msgid "No Clear Hint"
 msgstr "無清空提示"
 
-#: ../clutter/clutter-stage.c:2107
+#: ../clutter/clutter-stage.c:2077
 msgid "Whether the stage should clear its contents"
 msgstr "舞臺是否應該清空它的內容"
 
-#: ../clutter/clutter-stage.c:2120
+#: ../clutter/clutter-stage.c:2090
 msgid "Accept Focus"
 msgstr "接受聚焦"
 
-#: ../clutter/clutter-stage.c:2121
+#: ../clutter/clutter-stage.c:2091
 msgid "Whether the stage should accept focus on show"
 msgstr "階段是否應該套用顯示的焦點"
 
-#: ../clutter/clutter-table-layout.c:543
-msgid "Column Number"
-msgstr "欄編號"
-
-#: ../clutter/clutter-table-layout.c:544
-msgid "The column the widget resides in"
-msgstr "視窗元件所在的欄編號"
-
-#: ../clutter/clutter-table-layout.c:551
-msgid "Row Number"
-msgstr "列編號"
-
-#: ../clutter/clutter-table-layout.c:552
-msgid "The row the widget resides in"
-msgstr "視窗元件所在的列編號"
-
-#: ../clutter/clutter-table-layout.c:559
-msgid "Column Span"
-msgstr "合併欄"
-
-#: ../clutter/clutter-table-layout.c:560
-msgid "The number of columns the widget should span"
-msgstr "視窗元件要跨越的欄數"
-
-#: ../clutter/clutter-table-layout.c:567
-msgid "Row Span"
-msgstr "合併列"
-
-#: ../clutter/clutter-table-layout.c:568
-msgid "The number of rows the widget should span"
-msgstr "視窗元件要跨越的列數"
-
-#: ../clutter/clutter-table-layout.c:575
-msgid "Horizontal Expand"
-msgstr "水平擴展"
-
-#: ../clutter/clutter-table-layout.c:576
-msgid "Allocate extra space for the child in horizontal axis"
-msgstr "在水平軸網上配置額外空間給子物件"
-
-#: ../clutter/clutter-table-layout.c:582
-msgid "Vertical Expand"
-msgstr "垂直擴展"
-
-#: ../clutter/clutter-table-layout.c:583
-msgid "Allocate extra space for the child in vertical axis"
-msgstr "在垂直軸線配置額外空間給子物件"
-
-#: ../clutter/clutter-table-layout.c:1638
-msgid "Spacing between columns"
-msgstr "欄之間的間隔"
-
-#: ../clutter/clutter-table-layout.c:1652
-msgid "Spacing between rows"
-msgstr "列之間的間隔"
-
-#: ../clutter/clutter-text-buffer.c:351 ../clutter/clutter-text.c:3402
+#: ../clutter/clutter-text-buffer.c:347 ../clutter/clutter-text.c:3472
 msgid "Text"
 msgstr "文字"
 
-#: ../clutter/clutter-text-buffer.c:352
+#: ../clutter/clutter-text-buffer.c:348
 msgid "The contents of the buffer"
 msgstr "緩衝區的內容"
 
-#: ../clutter/clutter-text-buffer.c:365
+#: ../clutter/clutter-text-buffer.c:361
 msgid "Text length"
 msgstr "文字闊度"
 
-#: ../clutter/clutter-text-buffer.c:366
+#: ../clutter/clutter-text-buffer.c:362
 msgid "Length of the text currently in the buffer"
 msgstr "目前在緩衝區中文字的長度"
 
-#: ../clutter/clutter-text-buffer.c:379
+#: ../clutter/clutter-text-buffer.c:375
 msgid "Maximum length"
 msgstr "最大長度"
 
-#: ../clutter/clutter-text-buffer.c:380
+#: ../clutter/clutter-text-buffer.c:376
 msgid "Maximum number of characters for this entry. Zero if no maximum"
 msgstr "這個項目中字符數目的上限。0 為沒有上限"
 
-#: ../clutter/clutter-text.c:3349
+#: ../clutter/clutter-text.c:3419
 msgid "Buffer"
 msgstr "緩衝區"
 
-#: ../clutter/clutter-text.c:3350
+#: ../clutter/clutter-text.c:3420
 msgid "The buffer for the text"
 msgstr "文字的緩衝區"
 
-#: ../clutter/clutter-text.c:3368
+#: ../clutter/clutter-text.c:3438
 msgid "The font to be used by the text"
 msgstr "文字所用的字型"
 
-#: ../clutter/clutter-text.c:3385
+#: ../clutter/clutter-text.c:3455
 msgid "Font Description"
 msgstr "字型描述"
 
-#: ../clutter/clutter-text.c:3386
+#: ../clutter/clutter-text.c:3456
 msgid "The font description to be used"
 msgstr "所用的字型描述"
 
-#: ../clutter/clutter-text.c:3403
+#: ../clutter/clutter-text.c:3473
 msgid "The text to render"
 msgstr "要潤算的文字"
 
-#: ../clutter/clutter-text.c:3417
+#: ../clutter/clutter-text.c:3487
 msgid "Font Color"
 msgstr "字型顏色"
 
-#: ../clutter/clutter-text.c:3418
+#: ../clutter/clutter-text.c:3488
 msgid "Color of the font used by the text"
 msgstr "文字字型所用的顏色"
 
-#: ../clutter/clutter-text.c:3433
+#: ../clutter/clutter-text.c:3503
 msgid "Editable"
 msgstr "可編輯"
 
-#: ../clutter/clutter-text.c:3434
+#: ../clutter/clutter-text.c:3504
 msgid "Whether the text is editable"
 msgstr "文字是否可以編輯"
 
-#: ../clutter/clutter-text.c:3449
+#: ../clutter/clutter-text.c:3519
 msgid "Selectable"
 msgstr "可選取"
 
-#: ../clutter/clutter-text.c:3450
+#: ../clutter/clutter-text.c:3520
 msgid "Whether the text is selectable"
 msgstr "文字是否可以選取"
 
-#: ../clutter/clutter-text.c:3464
+#: ../clutter/clutter-text.c:3534
 msgid "Activatable"
 msgstr "可啟用"
 
-#: ../clutter/clutter-text.c:3465
+#: ../clutter/clutter-text.c:3535
 msgid "Whether pressing return causes the activate signal to be emitted"
 msgstr "按下輸入鍵是否會造成發出啟用信號"
 
-#: ../clutter/clutter-text.c:3482
+#: ../clutter/clutter-text.c:3552
 msgid "Whether the input cursor is visible"
 msgstr "輸入游標是否可見"
 
-#: ../clutter/clutter-text.c:3496 ../clutter/clutter-text.c:3497
+#: ../clutter/clutter-text.c:3566 ../clutter/clutter-text.c:3567
 msgid "Cursor Color"
 msgstr "游標顏色"
 
-#: ../clutter/clutter-text.c:3512
+#: ../clutter/clutter-text.c:3582
 msgid "Cursor Color Set"
 msgstr "游標顏色設定"
 
-#: ../clutter/clutter-text.c:3513
+#: ../clutter/clutter-text.c:3583
 msgid "Whether the cursor color has been set"
 msgstr "游標顏色是否已設定"
 
-#: ../clutter/clutter-text.c:3528
+#: ../clutter/clutter-text.c:3598
 msgid "Cursor Size"
 msgstr "游標大小"
 
-#: ../clutter/clutter-text.c:3529
+#: ../clutter/clutter-text.c:3599
 msgid "The width of the cursor, in pixels"
 msgstr "游標的像素闊度"
 
-#: ../clutter/clutter-text.c:3545 ../clutter/clutter-text.c:3563
+#: ../clutter/clutter-text.c:3615 ../clutter/clutter-text.c:3633
 msgid "Cursor Position"
 msgstr "游標位置"
 
-#: ../clutter/clutter-text.c:3546 ../clutter/clutter-text.c:3564
+#: ../clutter/clutter-text.c:3616 ../clutter/clutter-text.c:3634
 msgid "The cursor position"
 msgstr "游標的位置"
 
-#: ../clutter/clutter-text.c:3579
+#: ../clutter/clutter-text.c:3649
 msgid "Selection-bound"
 msgstr "選取區邊界"
 
-#: ../clutter/clutter-text.c:3580
+#: ../clutter/clutter-text.c:3650
 msgid "The cursor position of the other end of the selection"
 msgstr "選取區另一端的游標位置"
 
-#: ../clutter/clutter-text.c:3595 ../clutter/clutter-text.c:3596
+#: ../clutter/clutter-text.c:3665 ../clutter/clutter-text.c:3666
 msgid "Selection Color"
 msgstr "選取區顏色"
 
-#: ../clutter/clutter-text.c:3611
+#: ../clutter/clutter-text.c:3681
 msgid "Selection Color Set"
 msgstr "選取區顏色設定"
 
-#: ../clutter/clutter-text.c:3612
+#: ../clutter/clutter-text.c:3682
 msgid "Whether the selection color has been set"
 msgstr "選取區顏色是否已設定"
 
-#: ../clutter/clutter-text.c:3627
+#: ../clutter/clutter-text.c:3697
 msgid "Attributes"
 msgstr "屬性"
 
-#: ../clutter/clutter-text.c:3628
+#: ../clutter/clutter-text.c:3698
 msgid "A list of style attributes to apply to the contents of the actor"
 msgstr "要套用到參與者內容的樣式屬性清單"
 
-#: ../clutter/clutter-text.c:3650
+#: ../clutter/clutter-text.c:3720
 msgid "Use markup"
 msgstr "使用標記"
 
-#: ../clutter/clutter-text.c:3651
+#: ../clutter/clutter-text.c:3721
 msgid "Whether or not the text includes Pango markup"
 msgstr "文字是否包含 Pango 標記"
 
-#: ../clutter/clutter-text.c:3667
+#: ../clutter/clutter-text.c:3737
 msgid "Line wrap"
 msgstr "自動換列"
 
-#: ../clutter/clutter-text.c:3668
+#: ../clutter/clutter-text.c:3738
 msgid "If set, wrap the lines if the text becomes too wide"
 msgstr "設定之後如果文字變得太寬就會換列"
 
-#: ../clutter/clutter-text.c:3683
+#: ../clutter/clutter-text.c:3753
 msgid "Line wrap mode"
 msgstr "自動換列模式"
 
-#: ../clutter/clutter-text.c:3684
+#: ../clutter/clutter-text.c:3754
 msgid "Control how line-wrapping is done"
 msgstr "控制換列行為"
 
-#: ../clutter/clutter-text.c:3699
+#: ../clutter/clutter-text.c:3769
 msgid "Ellipsize"
 msgstr "略寫"
 
-#: ../clutter/clutter-text.c:3700
+#: ../clutter/clutter-text.c:3770
 msgid "The preferred place to ellipsize the string"
 msgstr "略寫字串的偏好位置"
 
-#: ../clutter/clutter-text.c:3716
+#: ../clutter/clutter-text.c:3786
 msgid "Line Alignment"
 msgstr "對齊"
 
-#: ../clutter/clutter-text.c:3717
+#: ../clutter/clutter-text.c:3787
 msgid "The preferred alignment for the string, for multi-line text"
 msgstr "多列文字中偏好的字串對齊方式"
 
-#: ../clutter/clutter-text.c:3733
+#: ../clutter/clutter-text.c:3803
 msgid "Justify"
 msgstr "調整"
 
-#: ../clutter/clutter-text.c:3734
+#: ../clutter/clutter-text.c:3804
 msgid "Whether the text should be justified"
 msgstr "文字是否應該調整"
 
-#: ../clutter/clutter-text.c:3749
+#: ../clutter/clutter-text.c:3819
 msgid "Password Character"
 msgstr "密碼字符"
 
-#: ../clutter/clutter-text.c:3750
+#: ../clutter/clutter-text.c:3820
 msgid "If non-zero, use this character to display the actor's contents"
 msgstr "如果不是空值就使用這個字符以顯示參與者內容"
 
-#: ../clutter/clutter-text.c:3764
+#: ../clutter/clutter-text.c:3834
 msgid "Max Length"
 msgstr "最大長度"
 
-#: ../clutter/clutter-text.c:3765
+#: ../clutter/clutter-text.c:3835
 msgid "Maximum length of the text inside the actor"
 msgstr "參與者內部文字的最大長度值"
 
-#: ../clutter/clutter-text.c:3788
+#: ../clutter/clutter-text.c:3858
 msgid "Single Line Mode"
 msgstr "單列模式"
 
-#: ../clutter/clutter-text.c:3789
+#: ../clutter/clutter-text.c:3859
 msgid "Whether the text should be a single line"
 msgstr "文字是否只應使用一列"
 
-#: ../clutter/clutter-text.c:3803 ../clutter/clutter-text.c:3804
+#: ../clutter/clutter-text.c:3873 ../clutter/clutter-text.c:3874
 msgid "Selected Text Color"
 msgstr "選取的文字顏色"
 
-#: ../clutter/clutter-text.c:3819
+#: ../clutter/clutter-text.c:3889
 msgid "Selected Text Color Set"
 msgstr "選取的文字顏色設定"
 
-#: ../clutter/clutter-text.c:3820
+#: ../clutter/clutter-text.c:3890
 msgid "Whether the selected text color has been set"
 msgstr "選取的文字顏色是否已設定"
 
-#: ../clutter/clutter-timeline.c:594
-#: ../clutter/deprecated/clutter-animation.c:560
+#: ../clutter/clutter-timeline.c:593
+#: ../clutter/deprecated/clutter-animation.c:557
 msgid "Loop"
 msgstr "循環"
 
-#: ../clutter/clutter-timeline.c:595
+#: ../clutter/clutter-timeline.c:594
 msgid "Should the timeline automatically restart"
 msgstr "時間軸應自動重新啟動"
 
-#: ../clutter/clutter-timeline.c:609
+#: ../clutter/clutter-timeline.c:608
 msgid "Delay"
 msgstr "延遲"
 
-#: ../clutter/clutter-timeline.c:610
+#: ../clutter/clutter-timeline.c:609
 msgid "Delay before start"
 msgstr "啟動前延遲"
 
-#: ../clutter/clutter-timeline.c:625
-#: ../clutter/deprecated/clutter-animation.c:544
-#: ../clutter/deprecated/clutter-animator.c:1804
+#: ../clutter/clutter-timeline.c:624
+#: ../clutter/deprecated/clutter-animation.c:541
+#: ../clutter/deprecated/clutter-animator.c:1801
 #: ../clutter/deprecated/clutter-media.c:224
-#: ../clutter/deprecated/clutter-state.c:1523
+#: ../clutter/deprecated/clutter-state.c:1517
 msgid "Duration"
 msgstr "持續時間"
 
-#: ../clutter/clutter-timeline.c:626
+#: ../clutter/clutter-timeline.c:625
 msgid "Duration of the timeline in milliseconds"
 msgstr "時間軸持續期間 (亳秒)"
 
-#: ../clutter/clutter-timeline.c:641
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:528
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:337
+#: ../clutter/clutter-timeline.c:640
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:521
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:330
 msgid "Direction"
 msgstr "方向"
 
-#: ../clutter/clutter-timeline.c:642
+#: ../clutter/clutter-timeline.c:641
 msgid "Direction of the timeline"
 msgstr "時間軸方向"
 
-#: ../clutter/clutter-timeline.c:657
+#: ../clutter/clutter-timeline.c:656
 msgid "Auto Reverse"
 msgstr "自動反轉"
 
-#: ../clutter/clutter-timeline.c:658
+#: ../clutter/clutter-timeline.c:657
 msgid "Whether the direction should be reversed when reaching the end"
 msgstr "到達結尾時是否應反轉方向"
 
-#: ../clutter/clutter-timeline.c:676
+#: ../clutter/clutter-timeline.c:675
 msgid "Repeat Count"
 msgstr "重複計數"
 
-#: ../clutter/clutter-timeline.c:677
+#: ../clutter/clutter-timeline.c:676
 msgid "How many times the timeline should repeat"
 msgstr "時間軸要重複幾次"
 
-#: ../clutter/clutter-timeline.c:691
+#: ../clutter/clutter-timeline.c:690
 msgid "Progress Mode"
 msgstr "進度模式"
 
-#: ../clutter/clutter-timeline.c:692
+#: ../clutter/clutter-timeline.c:691
 msgid "How the timeline should compute the progress"
 msgstr "時間軸要如何計算進度"
 
-#: ../clutter/clutter-transition.c:246
+#: ../clutter/clutter-transition.c:244
 msgid "Interval"
 msgstr "間隔"
 
-#: ../clutter/clutter-transition.c:247
+#: ../clutter/clutter-transition.c:245
 msgid "The interval of values to transition"
 msgstr "轉換的數值間隔"
 
-#: ../clutter/clutter-transition.c:261
+#: ../clutter/clutter-transition.c:259
 msgid "Animatable"
 msgstr "具有動畫"
 
-#: ../clutter/clutter-transition.c:262
+#: ../clutter/clutter-transition.c:260
 msgid "The animatable object"
 msgstr "動畫物件"
 
-#: ../clutter/clutter-transition.c:283
+#: ../clutter/clutter-transition.c:281
 msgid "Remove on Complete"
 msgstr "完成時移除"
 
-#: ../clutter/clutter-transition.c:284
+#: ../clutter/clutter-transition.c:282
 msgid "Detach the transition when completed"
 msgstr "完成時分離轉換"
 
-#: ../clutter/clutter-zoom-action.c:354
+#: ../clutter/clutter-zoom-action.c:365
 msgid "Zoom Axis"
 msgstr "縮放軸線"
 
-#: ../clutter/clutter-zoom-action.c:355
+#: ../clutter/clutter-zoom-action.c:366
 msgid "Constraints the zoom to an axis"
 msgstr "限制縮放至軸線"
 
-#: ../clutter/deprecated/clutter-alpha.c:355
-#: ../clutter/deprecated/clutter-animation.c:575
-#: ../clutter/deprecated/clutter-animator.c:1821
+#: ../clutter/deprecated/clutter-alpha.c:354
+#: ../clutter/deprecated/clutter-animation.c:572
+#: ../clutter/deprecated/clutter-animator.c:1818
 msgid "Timeline"
 msgstr "時間軸"
 
-#: ../clutter/deprecated/clutter-alpha.c:356
+#: ../clutter/deprecated/clutter-alpha.c:355
 msgid "Timeline used by the alpha"
 msgstr "Alpha 使用的時間軸"
 
-#: ../clutter/deprecated/clutter-alpha.c:372
+#: ../clutter/deprecated/clutter-alpha.c:371
 msgid "Alpha value"
 msgstr "Alpha 值"
 
-#: ../clutter/deprecated/clutter-alpha.c:373
+#: ../clutter/deprecated/clutter-alpha.c:372
 msgid "Alpha value as computed by the alpha"
 msgstr "由 alpha 所計算的 Alpha 值"
 
-#: ../clutter/deprecated/clutter-alpha.c:394
-#: ../clutter/deprecated/clutter-animation.c:528
+#: ../clutter/deprecated/clutter-alpha.c:393
+#: ../clutter/deprecated/clutter-animation.c:525
 msgid "Mode"
 msgstr "模式"
 
-#: ../clutter/deprecated/clutter-alpha.c:395
+#: ../clutter/deprecated/clutter-alpha.c:394
 msgid "Progress mode"
 msgstr "進行模式"
 
-#: ../clutter/deprecated/clutter-animation.c:511
+#: ../clutter/deprecated/clutter-animation.c:508
 msgid "Object"
 msgstr "物件"
 
-#: ../clutter/deprecated/clutter-animation.c:512
+#: ../clutter/deprecated/clutter-animation.c:509
 msgid "Object to which the animation applies"
 msgstr "套用動畫的物件"
 
-#: ../clutter/deprecated/clutter-animation.c:529
+#: ../clutter/deprecated/clutter-animation.c:526
 msgid "The mode of the animation"
 msgstr "動畫的模式"
 
-#: ../clutter/deprecated/clutter-animation.c:545
+#: ../clutter/deprecated/clutter-animation.c:542
 msgid "Duration of the animation, in milliseconds"
 msgstr "動畫的持續時間，以毫秒計"
 
-#: ../clutter/deprecated/clutter-animation.c:561
+#: ../clutter/deprecated/clutter-animation.c:558
 msgid "Whether the animation should loop"
 msgstr "動畫是否循環"
 
-#: ../clutter/deprecated/clutter-animation.c:576
+#: ../clutter/deprecated/clutter-animation.c:573
 msgid "The timeline used by the animation"
 msgstr "動畫使用的時間軸"
 
-#: ../clutter/deprecated/clutter-animation.c:592
-#: ../clutter/deprecated/clutter-behaviour.c:241
+#: ../clutter/deprecated/clutter-animation.c:589
+#: ../clutter/deprecated/clutter-behaviour.c:237
 msgid "Alpha"
 msgstr "Alpha"
 
-#: ../clutter/deprecated/clutter-animation.c:593
+#: ../clutter/deprecated/clutter-animation.c:590
 msgid "The alpha used by the animation"
 msgstr "動畫使用的 alpha"
 
-#: ../clutter/deprecated/clutter-animator.c:1805
+#: ../clutter/deprecated/clutter-animator.c:1802
 msgid "The duration of the animation"
 msgstr "動畫的持續時間"
 
-#: ../clutter/deprecated/clutter-animator.c:1822
+#: ../clutter/deprecated/clutter-animator.c:1819
 msgid "The timeline of the animation"
 msgstr "動畫的時間軸"
 
-#: ../clutter/deprecated/clutter-behaviour.c:242
+#: ../clutter/deprecated/clutter-behaviour.c:238
 msgid "Alpha Object to drive the behaviour"
 msgstr "驅動行為的 Alpha 物件"
 
-#: ../clutter/deprecated/clutter-behaviour-depth.c:182
+#: ../clutter/deprecated/clutter-behaviour-depth.c:180
 msgid "Start Depth"
 msgstr "起始色深"
 
-#: ../clutter/deprecated/clutter-behaviour-depth.c:183
+#: ../clutter/deprecated/clutter-behaviour-depth.c:181
 msgid "Initial depth to apply"
 msgstr "套用的初始色深"
 
-#: ../clutter/deprecated/clutter-behaviour-depth.c:198
+#: ../clutter/deprecated/clutter-behaviour-depth.c:196
 msgid "End Depth"
 msgstr "結束色深"
 
-#: ../clutter/deprecated/clutter-behaviour-depth.c:199
+#: ../clutter/deprecated/clutter-behaviour-depth.c:197
 msgid "Final depth to apply"
 msgstr "套用的結束色深"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:401
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:394
 msgid "Start Angle"
 msgstr "起始角度"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:402
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:284
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:395
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:277
 msgid "Initial angle"
 msgstr "初始的角度"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:417
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:410
 msgid "End Angle"
 msgstr "結束角度"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:418
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:302
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:411
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:295
 msgid "Final angle"
 msgstr "最後的角度"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:433
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:426
 msgid "Angle x tilt"
 msgstr "角度 X 斜度"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:434
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:427
 msgid "Tilt of the ellipse around x axis"
 msgstr "圍繞 X 軸的橢圓斜度"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:449
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:442
 msgid "Angle y tilt"
 msgstr "角度 Y 斜度"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:450
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:443
 msgid "Tilt of the ellipse around y axis"
 msgstr "圍繞 Y 軸的橢圓斜度"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:465
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:458
 msgid "Angle z tilt"
 msgstr "角度 Z 斜度"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:466
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:459
 msgid "Tilt of the ellipse around z axis"
 msgstr "圍繞 Z 軸的橢圓斜度"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:482
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:475
 msgid "Width of the ellipse"
 msgstr "橢圓的闊度"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:498
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:491
 msgid "Height of ellipse"
 msgstr "橢圓的高度"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:513
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:506
 msgid "Center"
 msgstr "中心"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:514
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:507
 msgid "Center of ellipse"
 msgstr "橢圓的中心"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:529
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:338
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:522
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:331
 msgid "Direction of rotation"
 msgstr "旋轉的方向"
 
-#: ../clutter/deprecated/clutter-behaviour-opacity.c:184
+#: ../clutter/deprecated/clutter-behaviour-opacity.c:177
 msgid "Opacity Start"
 msgstr "濁度起始"
 
-#: ../clutter/deprecated/clutter-behaviour-opacity.c:185
+#: ../clutter/deprecated/clutter-behaviour-opacity.c:178
 msgid "Initial opacity level"
 msgstr "初始濁度等級"
 
-#: ../clutter/deprecated/clutter-behaviour-opacity.c:202
+#: ../clutter/deprecated/clutter-behaviour-opacity.c:195
 msgid "Opacity End"
 msgstr "濁度結束"
 
-#: ../clutter/deprecated/clutter-behaviour-opacity.c:203
+#: ../clutter/deprecated/clutter-behaviour-opacity.c:196
 msgid "Final opacity level"
 msgstr "最後的濁度等級"
 
-#: ../clutter/deprecated/clutter-behaviour-path.c:226
+#: ../clutter/deprecated/clutter-behaviour-path.c:222
 msgid "The ClutterPath object representing the path to animate along"
 msgstr "ClutterPath 物件表述動畫所經過的路徑"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:283
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:276
 msgid "Angle Begin"
 msgstr "角度起始"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:301
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:294
 msgid "Angle End"
 msgstr "角度結束"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:319
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:312
 msgid "Axis"
 msgstr "軸線"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:320
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:313
 msgid "Axis of rotation"
 msgstr "旋轉的軸線"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:355
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:348
 msgid "Center X"
 msgstr "中心 X 坐標"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:356
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:349
 msgid "X coordinate of the center of rotation"
 msgstr "旋轉中心的 X 坐標"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:373
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:366
 msgid "Center Y"
 msgstr "中心 Y 坐標"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:374
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:367
 msgid "Y coordinate of the center of rotation"
 msgstr "旋轉中心的 Y 坐標"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:391
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:384
 msgid "Center Z"
 msgstr "中心 Z 坐標"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:392
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:385
 msgid "Z coordinate of the center of rotation"
 msgstr "旋轉中心的 Z 坐標"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:226
+#: ../clutter/deprecated/clutter-behaviour-scale.c:222
 msgid "X Start Scale"
 msgstr "X 軸起始伸縮"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:227
+#: ../clutter/deprecated/clutter-behaviour-scale.c:223
 msgid "Initial scale on the X axis"
 msgstr "在 X 軸上的初始伸縮"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:245
+#: ../clutter/deprecated/clutter-behaviour-scale.c:241
 msgid "X End Scale"
 msgstr "X 軸結束伸縮"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:246
+#: ../clutter/deprecated/clutter-behaviour-scale.c:242
 msgid "Final scale on the X axis"
 msgstr "在 X 軸上的最後伸縮"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:264
+#: ../clutter/deprecated/clutter-behaviour-scale.c:260
 msgid "Y Start Scale"
 msgstr "Y 軸起始伸縮"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:265
+#: ../clutter/deprecated/clutter-behaviour-scale.c:261
 msgid "Initial scale on the Y axis"
 msgstr "在 Y 軸上的初始伸縮"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:283
+#: ../clutter/deprecated/clutter-behaviour-scale.c:279
 msgid "Y End Scale"
 msgstr "Y 軸結束伸縮"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:284
+#: ../clutter/deprecated/clutter-behaviour-scale.c:280
 msgid "Final scale on the Y axis"
 msgstr "在 Y 軸上的最後伸縮"
 
-#: ../clutter/deprecated/clutter-box.c:261
+#: ../clutter/deprecated/clutter-box.c:257
 msgid "The background color of the box"
 msgstr "方框的背景顏色"
 
-#: ../clutter/deprecated/clutter-box.c:274
+#: ../clutter/deprecated/clutter-box.c:270
 msgid "Color Set"
 msgstr "顏色集"
 
-#: ../clutter/deprecated/clutter-cairo-texture.c:597
+#: ../clutter/deprecated/clutter-cairo-texture.c:593
 msgid "Surface Width"
 msgstr "表面闊度"
 
-#: ../clutter/deprecated/clutter-cairo-texture.c:598
+#: ../clutter/deprecated/clutter-cairo-texture.c:594
 msgid "The width of the Cairo surface"
 msgstr "Cairo 表面的闊度"
 
-#: ../clutter/deprecated/clutter-cairo-texture.c:615
+#: ../clutter/deprecated/clutter-cairo-texture.c:611
 msgid "Surface Height"
 msgstr "表面高度"
 
-#: ../clutter/deprecated/clutter-cairo-texture.c:616
+#: ../clutter/deprecated/clutter-cairo-texture.c:612
 msgid "The height of the Cairo surface"
 msgstr "Cairo 表面的高度"
 
-#: ../clutter/deprecated/clutter-cairo-texture.c:636
+#: ../clutter/deprecated/clutter-cairo-texture.c:632
 msgid "Auto Resize"
 msgstr "自動調整大小"
 
-#: ../clutter/deprecated/clutter-cairo-texture.c:637
+#: ../clutter/deprecated/clutter-cairo-texture.c:633
 msgid "Whether the surface should match the allocation"
 msgstr "表面是否應符合配置"
 
@@ -2364,379 +2388,431 @@ msgstr "緩衝區的填充等級"
 msgid "The duration of the stream, in seconds"
 msgstr "以秒計數的串流持續時間"
 
-#: ../clutter/deprecated/clutter-rectangle.c:274
+#: ../clutter/deprecated/clutter-rectangle.c:271
 msgid "The color of the rectangle"
 msgstr "矩形的顏色"
 
-#: ../clutter/deprecated/clutter-rectangle.c:287
+#: ../clutter/deprecated/clutter-rectangle.c:284
 msgid "Border Color"
 msgstr "邊框顏色"
 
-#: ../clutter/deprecated/clutter-rectangle.c:288
+#: ../clutter/deprecated/clutter-rectangle.c:285
 msgid "The color of the border of the rectangle"
 msgstr "矩形邊框的顏色"
 
-#: ../clutter/deprecated/clutter-rectangle.c:303
+#: ../clutter/deprecated/clutter-rectangle.c:300
 msgid "Border Width"
 msgstr "邊框闊度"
 
-#: ../clutter/deprecated/clutter-rectangle.c:304
+#: ../clutter/deprecated/clutter-rectangle.c:301
 msgid "The width of the border of the rectangle"
 msgstr "矩形邊框的闊度"
 
-#: ../clutter/deprecated/clutter-rectangle.c:318
+#: ../clutter/deprecated/clutter-rectangle.c:315
 msgid "Has Border"
 msgstr "具有邊框"
 
-#: ../clutter/deprecated/clutter-rectangle.c:319
+#: ../clutter/deprecated/clutter-rectangle.c:316
 msgid "Whether the rectangle should have a border"
 msgstr "矩形是否應該有邊框"
 
-#: ../clutter/deprecated/clutter-shader.c:261
+#: ../clutter/deprecated/clutter-shader.c:257
 msgid "Vertex Source"
 msgstr "下角着色來源"
 
-#: ../clutter/deprecated/clutter-shader.c:262
+#: ../clutter/deprecated/clutter-shader.c:258
 msgid "Source of vertex shader"
 msgstr "下角着色引擎的來源"
 
-#: ../clutter/deprecated/clutter-shader.c:278
+#: ../clutter/deprecated/clutter-shader.c:274
 msgid "Fragment Source"
 msgstr "片段着色來源"
 
-#: ../clutter/deprecated/clutter-shader.c:279
+#: ../clutter/deprecated/clutter-shader.c:275
 msgid "Source of fragment shader"
 msgstr "片段着色引擎的來源"
 
-#: ../clutter/deprecated/clutter-shader.c:296
+#: ../clutter/deprecated/clutter-shader.c:292
 msgid "Compiled"
 msgstr "已編譯"
 
-#: ../clutter/deprecated/clutter-shader.c:297
+#: ../clutter/deprecated/clutter-shader.c:293
 msgid "Whether the shader is compiled and linked"
 msgstr "陰影是否已被編譯和鏈結"
 
-#: ../clutter/deprecated/clutter-shader.c:314
+#: ../clutter/deprecated/clutter-shader.c:310
 msgid "Whether the shader is enabled"
 msgstr "陰影是否已被啟用"
 
-#: ../clutter/deprecated/clutter-shader.c:525
+#: ../clutter/deprecated/clutter-shader.c:521
 #, c-format
 msgid "%s compilation failed: %s"
 msgstr "%s 編譯失敗：%s"
 
-#: ../clutter/deprecated/clutter-shader.c:526
+#: ../clutter/deprecated/clutter-shader.c:522
 msgid "Vertex shader"
 msgstr "下角着色引擎"
 
-#: ../clutter/deprecated/clutter-shader.c:527
+#: ../clutter/deprecated/clutter-shader.c:523
 msgid "Fragment shader"
 msgstr "片段着色引擎"
 
-#: ../clutter/deprecated/clutter-state.c:1505
+#: ../clutter/deprecated/clutter-state.c:1499
 msgid "State"
 msgstr "狀態"
 
-#: ../clutter/deprecated/clutter-state.c:1506
+#: ../clutter/deprecated/clutter-state.c:1500
 msgid "Currently set state, (transition to this state might not be complete)"
 msgstr "目前設定狀態，(有可能尚未完全轉換到這個狀態)"
 
-#: ../clutter/deprecated/clutter-state.c:1524
+#: ../clutter/deprecated/clutter-state.c:1518
 msgid "Default transition duration"
 msgstr "預設轉換時間"
 
-#: ../clutter/deprecated/clutter-texture.c:994
+#: ../clutter/deprecated/clutter-table-layout.c:543
+msgid "Column Number"
+msgstr "欄編號"
+
+#: ../clutter/deprecated/clutter-table-layout.c:544
+msgid "The column the widget resides in"
+msgstr "視窗元件所在的欄編號"
+
+#: ../clutter/deprecated/clutter-table-layout.c:551
+msgid "Row Number"
+msgstr "列編號"
+
+#: ../clutter/deprecated/clutter-table-layout.c:552
+msgid "The row the widget resides in"
+msgstr "視窗元件所在的列編號"
+
+#: ../clutter/deprecated/clutter-table-layout.c:559
+msgid "Column Span"
+msgstr "合併欄"
+
+#: ../clutter/deprecated/clutter-table-layout.c:560
+msgid "The number of columns the widget should span"
+msgstr "視窗元件要跨越的欄數"
+
+#: ../clutter/deprecated/clutter-table-layout.c:567
+msgid "Row Span"
+msgstr "合併列"
+
+#: ../clutter/deprecated/clutter-table-layout.c:568
+msgid "The number of rows the widget should span"
+msgstr "視窗元件要跨越的列數"
+
+#: ../clutter/deprecated/clutter-table-layout.c:575
+msgid "Horizontal Expand"
+msgstr "水平擴展"
+
+#: ../clutter/deprecated/clutter-table-layout.c:576
+msgid "Allocate extra space for the child in horizontal axis"
+msgstr "在水平軸網上配置額外空間給子物件"
+
+#: ../clutter/deprecated/clutter-table-layout.c:582
+msgid "Vertical Expand"
+msgstr "垂直擴展"
+
+#: ../clutter/deprecated/clutter-table-layout.c:583
+msgid "Allocate extra space for the child in vertical axis"
+msgstr "在垂直軸線配置額外空間給子物件"
+
+#: ../clutter/deprecated/clutter-table-layout.c:1638
+msgid "Spacing between columns"
+msgstr "欄之間的間隔"
+
+#: ../clutter/deprecated/clutter-table-layout.c:1654
+msgid "Spacing between rows"
+msgstr "列之間的間隔"
+
+#: ../clutter/deprecated/clutter-texture.c:992
 msgid "Sync size of actor"
 msgstr "同步參與者的大小"
 
-#: ../clutter/deprecated/clutter-texture.c:995
+#: ../clutter/deprecated/clutter-texture.c:993
 msgid "Auto sync size of actor to underlying pixbuf dimensions"
 msgstr "參與者大小自動與下層的像素緩衝區尺寸同步"
 
-#: ../clutter/deprecated/clutter-texture.c:1002
+#: ../clutter/deprecated/clutter-texture.c:1000
 msgid "Disable Slicing"
 msgstr "停用切片"
 
-#: ../clutter/deprecated/clutter-texture.c:1003
+#: ../clutter/deprecated/clutter-texture.c:1001
 msgid ""
 "Forces the underlying texture to be singular and not made of smaller space "
 "saving individual textures"
 msgstr "強制下層的花紋為單體，而不是由小空間所儲存的個別花紋。"
 
-#: ../clutter/deprecated/clutter-texture.c:1012
+#: ../clutter/deprecated/clutter-texture.c:1010
 msgid "Tile Waste"
 msgstr "並排耗費"
 
-#: ../clutter/deprecated/clutter-texture.c:1013
+#: ../clutter/deprecated/clutter-texture.c:1011
 msgid "Maximum waste area of a sliced texture"
 msgstr "切片花紋的最大耗費區域"
 
-#: ../clutter/deprecated/clutter-texture.c:1021
+#: ../clutter/deprecated/clutter-texture.c:1019
 msgid "Horizontal repeat"
 msgstr "水平重複"
 
-#: ../clutter/deprecated/clutter-texture.c:1022
+#: ../clutter/deprecated/clutter-texture.c:1020
 msgid "Repeat the contents rather than scaling them horizontally"
 msgstr "重複內容而非將其水平伸展。"
 
-#: ../clutter/deprecated/clutter-texture.c:1029
+#: ../clutter/deprecated/clutter-texture.c:1027
 msgid "Vertical repeat"
 msgstr "垂直重複"
 
-#: ../clutter/deprecated/clutter-texture.c:1030
+#: ../clutter/deprecated/clutter-texture.c:1028
 msgid "Repeat the contents rather than scaling them vertically"
 msgstr "重複內容而非將其垂直伸展。"
 
-#: ../clutter/deprecated/clutter-texture.c:1037
+#: ../clutter/deprecated/clutter-texture.c:1035
 msgid "Filter Quality"
 msgstr "過濾器品質"
 
-#: ../clutter/deprecated/clutter-texture.c:1038
+#: ../clutter/deprecated/clutter-texture.c:1036
 msgid "Rendering quality used when drawing the texture"
 msgstr "繪製花紋時所用的潤算品質。"
 
-#: ../clutter/deprecated/clutter-texture.c:1046
+#: ../clutter/deprecated/clutter-texture.c:1044
 msgid "Pixel Format"
 msgstr "像素格式"
 
-#: ../clutter/deprecated/clutter-texture.c:1047
+#: ../clutter/deprecated/clutter-texture.c:1045
 msgid "The Cogl pixel format to use"
 msgstr "所用的 Cogl 像素格式。"
 
-#: ../clutter/deprecated/clutter-texture.c:1055
-#: ../clutter/wayland/clutter-wayland-surface.c:449
+#: ../clutter/deprecated/clutter-texture.c:1053
+#: ../clutter/wayland/clutter-wayland-surface.c:445
 msgid "Cogl Texture"
 msgstr "Cogl 花紋"
 
-#: ../clutter/deprecated/clutter-texture.c:1056
-#: ../clutter/wayland/clutter-wayland-surface.c:450
+#: ../clutter/deprecated/clutter-texture.c:1054
+#: ../clutter/wayland/clutter-wayland-surface.c:446
 msgid "The underlying Cogl texture handle used to draw this actor"
 msgstr "用來繪製這個參與者的下層 C0gl 花紋控柄"
 
-#: ../clutter/deprecated/clutter-texture.c:1063
+#: ../clutter/deprecated/clutter-texture.c:1061
 msgid "Cogl Material"
 msgstr "Cogl 材質"
 
-#: ../clutter/deprecated/clutter-texture.c:1064
+#: ../clutter/deprecated/clutter-texture.c:1062
 msgid "The underlying Cogl material handle used to draw this actor"
 msgstr "用來繪製這個參與者下層 Cogl 材質控柄"
 
-#: ../clutter/deprecated/clutter-texture.c:1083
+#: ../clutter/deprecated/clutter-texture.c:1081
 msgid "The path of the file containing the image data"
 msgstr "包含影像資料檔案的路徑"
 
-#: ../clutter/deprecated/clutter-texture.c:1090
+#: ../clutter/deprecated/clutter-texture.c:1088
 msgid "Keep Aspect Ratio"
 msgstr "維持外觀比率"
 
-#: ../clutter/deprecated/clutter-texture.c:1091
+#: ../clutter/deprecated/clutter-texture.c:1089
 msgid ""
 "Keep the aspect ratio of the texture when requesting the preferred width or "
 "height"
 msgstr "要求偏好的闊度或高度時保持花紋的外觀比率"
 
-#: ../clutter/deprecated/clutter-texture.c:1119
+#: ../clutter/deprecated/clutter-texture.c:1117
 msgid "Load asynchronously"
 msgstr "非同步載入"
 
-#: ../clutter/deprecated/clutter-texture.c:1120
+#: ../clutter/deprecated/clutter-texture.c:1118
 msgid ""
 "Load files inside a thread to avoid blocking when loading images from disk"
 msgstr "從磁碟載入影像時於執行緒內載入檔案以避免阻塞。"
 
-#: ../clutter/deprecated/clutter-texture.c:1138
+#: ../clutter/deprecated/clutter-texture.c:1136
 msgid "Load data asynchronously"
 msgstr "同步載入資料"
 
-#: ../clutter/deprecated/clutter-texture.c:1139
+#: ../clutter/deprecated/clutter-texture.c:1137
 msgid ""
 "Decode image data files inside a thread to reduce blocking when loading "
 "images from disk"
 msgstr "從磁碟載入影像時於執行緒內解碼影像資料檔案以降低阻塞。"
 
-#: ../clutter/deprecated/clutter-texture.c:1165
+#: ../clutter/deprecated/clutter-texture.c:1163
 msgid "Pick With Alpha"
 msgstr "揀取時附帶α"
 
-#: ../clutter/deprecated/clutter-texture.c:1166
+#: ../clutter/deprecated/clutter-texture.c:1164
 msgid "Shape actor with alpha channel when picking"
 msgstr "揀取時附帶參與者的α通道狀態"
 
-#: ../clutter/deprecated/clutter-texture.c:1599
-#: ../clutter/deprecated/clutter-texture.c:1994
-#: ../clutter/deprecated/clutter-texture.c:2090
-#: ../clutter/deprecated/clutter-texture.c:2388
+#: ../clutter/deprecated/clutter-texture.c:1597
+#: ../clutter/deprecated/clutter-texture.c:1992
+#: ../clutter/deprecated/clutter-texture.c:2088
+#: ../clutter/deprecated/clutter-texture.c:2386
 #, c-format
 msgid "Failed to load the image data"
 msgstr "無法載入圖片資料"
 
-#: ../clutter/deprecated/clutter-texture.c:1758
+#: ../clutter/deprecated/clutter-texture.c:1756
 #, c-format
 msgid "YUV textures are not supported"
 msgstr "不支援 YUV 材質"
 
-#: ../clutter/deprecated/clutter-texture.c:1767
+#: ../clutter/deprecated/clutter-texture.c:1765
 #, c-format
 msgid "YUV2 textues are not supported"
 msgstr "不支援 YUV2 材質"
 
-#: ../clutter/evdev/clutter-input-device-evdev.c:159
-msgid "sysfs Path"
-msgstr "sysfs 路徑"
-
-#: ../clutter/evdev/clutter-input-device-evdev.c:160
-msgid "Path of the device in sysfs"
-msgstr "sysfs 裝置的路徑"
-
-#: ../clutter/evdev/clutter-input-device-evdev.c:175
-msgid "Device Path"
-msgstr "裝置路徑"
-
-#: ../clutter/evdev/clutter-input-device-evdev.c:176
-msgid "Path of the device node"
-msgstr "裝置節點的路徑"
-
-#: ../clutter/gdk/clutter-backend-gdk.c:287
+#: ../clutter/gdk/clutter-backend-gdk.c:289
 #, c-format
 msgid "Could not find a suitable CoglWinsys for a GdkDisplay of type %s"
 msgstr "找不到用於類型 %s 的 GdkDisplay 合適的 CoglWinsys"
 
-#: ../clutter/wayland/clutter-wayland-surface.c:423
+#: ../clutter/wayland/clutter-wayland-surface.c:419
 msgid "Surface"
 msgstr "表面"
 
-#: ../clutter/wayland/clutter-wayland-surface.c:424
+#: ../clutter/wayland/clutter-wayland-surface.c:420
 msgid "The underlying wayland surface"
 msgstr "底層 wayland 表面"
 
-#: ../clutter/wayland/clutter-wayland-surface.c:431
+#: ../clutter/wayland/clutter-wayland-surface.c:427
 msgid "Surface width"
 msgstr "表面闊度"
 
-#: ../clutter/wayland/clutter-wayland-surface.c:432
+#: ../clutter/wayland/clutter-wayland-surface.c:428
 msgid "The width of the underlying wayland surface"
 msgstr "底層 wayland 表面的闊度"
 
-#: ../clutter/wayland/clutter-wayland-surface.c:440
+#: ../clutter/wayland/clutter-wayland-surface.c:436
 msgid "Surface height"
 msgstr "表面高度"
 
-#: ../clutter/wayland/clutter-wayland-surface.c:441
+#: ../clutter/wayland/clutter-wayland-surface.c:437
 msgid "The height of the underlying wayland surface"
 msgstr "底層 wayland 表面的高度"
 
-#: ../clutter/x11/clutter-backend-x11.c:512
+#: ../clutter/x11/clutter-backend-x11.c:488
 msgid "X display to use"
 msgstr "所用的 X 顯示"
 
-#: ../clutter/x11/clutter-backend-x11.c:518
+#: ../clutter/x11/clutter-backend-x11.c:494
 msgid "X screen to use"
 msgstr "所用的 X 螢幕"
 
-#: ../clutter/x11/clutter-backend-x11.c:523
+#: ../clutter/x11/clutter-backend-x11.c:499
 msgid "Make X calls synchronous"
 msgstr "使 X 呼叫同步"
 
-#: ../clutter/x11/clutter-backend-x11.c:530
+#: ../clutter/x11/clutter-backend-x11.c:506
 msgid "Disable XInput support"
 msgstr "停用 XInput 支援"
 
-#: ../clutter/x11/clutter-keymap-x11.c:322
+#: ../clutter/x11/clutter-keymap-x11.c:458
 msgid "The Clutter backend"
 msgstr "Clutter 後端程式"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:539
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:534
 msgid "Pixmap"
 msgstr "像素圖"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:540
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:535
 msgid "The X11 Pixmap to be bound"
 msgstr "關連的 X11 像素圖"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:548
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:543
 msgid "Pixmap width"
 msgstr "像素圖闊度"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:549
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:544
 msgid "The width of the pixmap bound to this texture"
 msgstr "關連這個花紋的像素圖闊度"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:557
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:552
 msgid "Pixmap height"
 msgstr "像素圖高度"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:558
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:553
 msgid "The height of the pixmap bound to this texture"
 msgstr "關連這個花紋的像素圖高度"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:566
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:561
 msgid "Pixmap Depth"
 msgstr "像素圖深度"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:567
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:562
 msgid "The depth (in number of bits) of the pixmap bound to this texture"
 msgstr "與這個花紋相關連的像素圖深度 (以位元數計算)"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:575
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:570
 msgid "Automatic Updates"
 msgstr "自動更新"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:576
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:571
 msgid "If the texture should be kept in sync with any pixmap changes."
 msgstr "花紋是否應該保持與任何像素圖更改同步。"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:584
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:579
 msgid "Window"
 msgstr "視窗"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:585
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:580
 msgid "The X11 Window to be bound"
 msgstr "相關連的 X11 視窗"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:593
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:588
 msgid "Window Redirect Automatic"
 msgstr "視窗自動重新導向"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:594
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:589
 msgid "If composite window redirects are set to Automatic (or Manual if false)"
 msgstr "合成視窗是否設定為自動重新導向 (或是設為手動)"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:604
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:599
 msgid "Window Mapped"
 msgstr "視窗已映射"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:605
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:600
 msgid "If window is mapped"
 msgstr "視窗是否已映射"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:614
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:609
 msgid "Destroyed"
 msgstr "已銷毀"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:615
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:610
 msgid "If window has been destroyed"
 msgstr "視窗是否已銷毀"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:623
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:618
 msgid "Window X"
 msgstr "視窗 X 坐標"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:624
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:619
 msgid "X position of window on screen according to X11"
 msgstr "根據 X11 所得螢幕上視窗的 X 坐標"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:632
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:627
 msgid "Window Y"
 msgstr "視窗 Y 坐標"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:633
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:628
 msgid "Y position of window on screen according to X11"
 msgstr "根據 X11 所得螢幕上視窗的 Y 坐標"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:640
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:635
 msgid "Window Override Redirect"
 msgstr "視窗覆寫重新導向"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:641
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:636
 msgid "If this is an override-redirect window"
 msgstr "是否這是個覆寫重新導向的視窗"
+
+#~ msgid "sysfs Path"
+#~ msgstr "sysfs 路徑"
+
+#~ msgid "Path of the device in sysfs"
+#~ msgstr "sysfs 裝置的路徑"
+
+#~ msgid "Device Path"
+#~ msgstr "裝置路徑"
+
+#~ msgid "Path of the device node"
+#~ msgstr "裝置節點的路徑"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 981917a28..7da4495c9 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: clutter 1.9.15\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
-"product=clutter\n"
-"POT-Creation-Date: 2013-03-01 22:12+0800\n"
-"PO-Revision-Date: 2013-02-28 08:42+0800\n"
+"product=clutter&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2014-03-06 04:09+0000\n"
+"PO-Revision-Date: 2014-03-08 18:37+0800\n"
 "Last-Translator: Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>\n"
 "Language-Team: Chinese Traditional <zh_TW@li.org>\n"
 "Language: zh_TW\n"
@@ -17,692 +17,692 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Poedit 1.5.4\n"
+"X-Generator: Poedit 1.6.3\n"
 
-#: ../clutter/clutter-actor.c:6144
+#: ../clutter/clutter-actor.c:6214
 msgid "X coordinate"
 msgstr "X 坐標"
 
-#: ../clutter/clutter-actor.c:6145
+#: ../clutter/clutter-actor.c:6215
 msgid "X coordinate of the actor"
 msgstr "參與者的 X 坐標"
 
-#: ../clutter/clutter-actor.c:6163
+#: ../clutter/clutter-actor.c:6233
 msgid "Y coordinate"
 msgstr "Y 坐標"
 
-#: ../clutter/clutter-actor.c:6164
+#: ../clutter/clutter-actor.c:6234
 msgid "Y coordinate of the actor"
 msgstr "參與者的 Y 坐標"
 
-#: ../clutter/clutter-actor.c:6186
+#: ../clutter/clutter-actor.c:6256
 msgid "Position"
 msgstr "位置"
 
-#: ../clutter/clutter-actor.c:6187
+#: ../clutter/clutter-actor.c:6257
 msgid "The position of the origin of the actor"
 msgstr "參與者的原始位置"
 
-#: ../clutter/clutter-actor.c:6204 ../clutter/clutter-canvas.c:215
-#: ../clutter/clutter-grid-layout.c:1238
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:481
+#: ../clutter/clutter-actor.c:6274 ../clutter/clutter-canvas.c:247
+#: ../clutter/clutter-grid-layout.c:1239
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:474
 msgid "Width"
 msgstr "寬度"
 
-#: ../clutter/clutter-actor.c:6205
+#: ../clutter/clutter-actor.c:6275
 msgid "Width of the actor"
 msgstr "參與者的寬度"
 
-#: ../clutter/clutter-actor.c:6223 ../clutter/clutter-canvas.c:231
-#: ../clutter/clutter-grid-layout.c:1245
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:497
+#: ../clutter/clutter-actor.c:6293 ../clutter/clutter-canvas.c:263
+#: ../clutter/clutter-grid-layout.c:1246
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:490
 msgid "Height"
 msgstr "高度"
 
-#: ../clutter/clutter-actor.c:6224
+#: ../clutter/clutter-actor.c:6294
 msgid "Height of the actor"
 msgstr "參與者的高度"
 
-#: ../clutter/clutter-actor.c:6245
+#: ../clutter/clutter-actor.c:6315
 msgid "Size"
 msgstr "大小"
 
-#: ../clutter/clutter-actor.c:6246
+#: ../clutter/clutter-actor.c:6316
 msgid "The size of the actor"
 msgstr "參與者的大小"
 
-#: ../clutter/clutter-actor.c:6264
+#: ../clutter/clutter-actor.c:6334
 msgid "Fixed X"
 msgstr "固定 X 坐標"
 
-#: ../clutter/clutter-actor.c:6265
+#: ../clutter/clutter-actor.c:6335
 msgid "Forced X position of the actor"
 msgstr "參與者的強制 X 位置"
 
-#: ../clutter/clutter-actor.c:6282
+#: ../clutter/clutter-actor.c:6352
 msgid "Fixed Y"
 msgstr "固定 Y 坐標"
 
-#: ../clutter/clutter-actor.c:6283
+#: ../clutter/clutter-actor.c:6353
 msgid "Forced Y position of the actor"
 msgstr "參與者的強制 Y 位置"
 
-#: ../clutter/clutter-actor.c:6298
+#: ../clutter/clutter-actor.c:6368
 msgid "Fixed position set"
 msgstr "固定的位置設定"
 
-#: ../clutter/clutter-actor.c:6299
+#: ../clutter/clutter-actor.c:6369
 msgid "Whether to use fixed positioning for the actor"
 msgstr "參與者是否要使用固定的位置"
 
-#: ../clutter/clutter-actor.c:6317
+#: ../clutter/clutter-actor.c:6387
 msgid "Min Width"
 msgstr "最小寬度"
 
-#: ../clutter/clutter-actor.c:6318
+#: ../clutter/clutter-actor.c:6388
 msgid "Forced minimum width request for the actor"
 msgstr "參與者要求強制最小寬度"
 
-#: ../clutter/clutter-actor.c:6336
+#: ../clutter/clutter-actor.c:6406
 msgid "Min Height"
 msgstr "最小高度"
 
-#: ../clutter/clutter-actor.c:6337
+#: ../clutter/clutter-actor.c:6407
 msgid "Forced minimum height request for the actor"
 msgstr "參與者要求強制最小高度"
 
-#: ../clutter/clutter-actor.c:6355
+#: ../clutter/clutter-actor.c:6425
 msgid "Natural Width"
 msgstr "自然寬度"
 
-#: ../clutter/clutter-actor.c:6356
+#: ../clutter/clutter-actor.c:6426
 msgid "Forced natural width request for the actor"
 msgstr "參與者要求強制自然寬度"
 
-#: ../clutter/clutter-actor.c:6374
+#: ../clutter/clutter-actor.c:6444
 msgid "Natural Height"
 msgstr "自然高度"
 
-#: ../clutter/clutter-actor.c:6375
+#: ../clutter/clutter-actor.c:6445
 msgid "Forced natural height request for the actor"
 msgstr "參與者要求強制自然高度"
 
-#: ../clutter/clutter-actor.c:6390
+#: ../clutter/clutter-actor.c:6460
 msgid "Minimum width set"
 msgstr "最小寬度設定"
 
-#: ../clutter/clutter-actor.c:6391
+#: ../clutter/clutter-actor.c:6461
 msgid "Whether to use the min-width property"
 msgstr "是否使用最小寬度屬性"
 
-#: ../clutter/clutter-actor.c:6405
+#: ../clutter/clutter-actor.c:6475
 msgid "Minimum height set"
 msgstr "最小高度設定"
 
-#: ../clutter/clutter-actor.c:6406
+#: ../clutter/clutter-actor.c:6476
 msgid "Whether to use the min-height property"
 msgstr "是否使用最小高度屬性"
 
-#: ../clutter/clutter-actor.c:6420
+#: ../clutter/clutter-actor.c:6490
 msgid "Natural width set"
 msgstr "自然寬度設定"
 
-#: ../clutter/clutter-actor.c:6421
+#: ../clutter/clutter-actor.c:6491
 msgid "Whether to use the natural-width property"
 msgstr "是否使用自然寬度屬性"
 
-#: ../clutter/clutter-actor.c:6435
+#: ../clutter/clutter-actor.c:6505
 msgid "Natural height set"
 msgstr "自然高度設定"
 
-#: ../clutter/clutter-actor.c:6436
+#: ../clutter/clutter-actor.c:6506
 msgid "Whether to use the natural-height property"
 msgstr "是否使用自然高度屬性"
 
-#: ../clutter/clutter-actor.c:6452
+#: ../clutter/clutter-actor.c:6522
 msgid "Allocation"
 msgstr "定位"
 
-#: ../clutter/clutter-actor.c:6453
+#: ../clutter/clutter-actor.c:6523
 msgid "The actor's allocation"
 msgstr "參與者的定位"
 
-#: ../clutter/clutter-actor.c:6510
+#: ../clutter/clutter-actor.c:6580
 msgid "Request Mode"
 msgstr "請求模式"
 
-#: ../clutter/clutter-actor.c:6511
+#: ../clutter/clutter-actor.c:6581
 msgid "The actor's request mode"
 msgstr "參與者的要求模式"
 
-#: ../clutter/clutter-actor.c:6535
+#: ../clutter/clutter-actor.c:6605
 msgid "Depth"
 msgstr "色深"
 
-#: ../clutter/clutter-actor.c:6536
+#: ../clutter/clutter-actor.c:6606
 msgid "Position on the Z axis"
 msgstr "在 Z 軸上的位置"
 
-#: ../clutter/clutter-actor.c:6563
+#: ../clutter/clutter-actor.c:6633
 msgid "Z Position"
 msgstr "Z 位置"
 
-#: ../clutter/clutter-actor.c:6564
+#: ../clutter/clutter-actor.c:6634
 msgid "The actor's position on the Z axis"
 msgstr "參與者在 Z 軸上的位置"
 
-#: ../clutter/clutter-actor.c:6581
+#: ../clutter/clutter-actor.c:6651
 msgid "Opacity"
 msgstr "濁度"
 
-#: ../clutter/clutter-actor.c:6582
+#: ../clutter/clutter-actor.c:6652
 msgid "Opacity of an actor"
 msgstr "參與者的濁度"
 
-#: ../clutter/clutter-actor.c:6602
+#: ../clutter/clutter-actor.c:6672
 msgid "Offscreen redirect"
 msgstr "螢幕外重新導向"
 
-#: ../clutter/clutter-actor.c:6603
+#: ../clutter/clutter-actor.c:6673
 msgid "Flags controlling when to flatten the actor into a single image"
 msgstr "控制何時將參與者扁平化為單一影像的旗標"
 
-#: ../clutter/clutter-actor.c:6617
+#: ../clutter/clutter-actor.c:6687
 msgid "Visible"
 msgstr "可見度"
 
-#: ../clutter/clutter-actor.c:6618
+#: ../clutter/clutter-actor.c:6688
 msgid "Whether the actor is visible or not"
 msgstr "是否參與者為可見"
 
-#: ../clutter/clutter-actor.c:6632
+#: ../clutter/clutter-actor.c:6702
 msgid "Mapped"
 msgstr "映射"
 
-#: ../clutter/clutter-actor.c:6633
+#: ../clutter/clutter-actor.c:6703
 msgid "Whether the actor will be painted"
 msgstr "是否參與者將被繪製"
 
-#: ../clutter/clutter-actor.c:6646
+#: ../clutter/clutter-actor.c:6716
 msgid "Realized"
 msgstr "實現"
 
-#: ../clutter/clutter-actor.c:6647
+#: ../clutter/clutter-actor.c:6717
 msgid "Whether the actor has been realized"
 msgstr "是否參與者已被實現"
 
-#: ../clutter/clutter-actor.c:6662
+#: ../clutter/clutter-actor.c:6732
 msgid "Reactive"
 msgstr "重新活躍"
 
-#: ../clutter/clutter-actor.c:6663
+#: ../clutter/clutter-actor.c:6733
 msgid "Whether the actor is reactive to events"
 msgstr "是否參與者對於事件重新活躍"
 
-#: ../clutter/clutter-actor.c:6674
+#: ../clutter/clutter-actor.c:6744
 msgid "Has Clip"
 msgstr "具有裁剪"
 
-#: ../clutter/clutter-actor.c:6675
+#: ../clutter/clutter-actor.c:6745
 msgid "Whether the actor has a clip set"
 msgstr "是否參與者有裁剪設定"
 
-#: ../clutter/clutter-actor.c:6688
+#: ../clutter/clutter-actor.c:6758
 msgid "Clip"
 msgstr "裁剪"
 
-#: ../clutter/clutter-actor.c:6689
+#: ../clutter/clutter-actor.c:6759
 msgid "The clip region for the actor"
 msgstr "參與者的裁剪區域"
 
-#: ../clutter/clutter-actor.c:6708
+#: ../clutter/clutter-actor.c:6778
 msgid "Clip Rectangle"
 msgstr "剪裁矩形"
 
-#: ../clutter/clutter-actor.c:6709
+#: ../clutter/clutter-actor.c:6779
 msgid "The visible region of the actor"
 msgstr "參與者的可視區域"
 
-#: ../clutter/clutter-actor.c:6723 ../clutter/clutter-actor-meta.c:207
-#: ../clutter/clutter-binding-pool.c:319 ../clutter/clutter-input-device.c:258
+#: ../clutter/clutter-actor.c:6793 ../clutter/clutter-actor-meta.c:205
+#: ../clutter/clutter-binding-pool.c:319 ../clutter/clutter-input-device.c:247
 msgid "Name"
 msgstr "名稱"
 
-#: ../clutter/clutter-actor.c:6724
+#: ../clutter/clutter-actor.c:6794
 msgid "Name of the actor"
 msgstr "參與者的名稱"
 
-#: ../clutter/clutter-actor.c:6745
+#: ../clutter/clutter-actor.c:6815
 msgid "Pivot Point"
 msgstr "樞軸點"
 
-#: ../clutter/clutter-actor.c:6746
+#: ../clutter/clutter-actor.c:6816
 msgid "The point around which the scaling and rotation occur"
 msgstr "縮放和旋轉繞著這個點"
 
-#: ../clutter/clutter-actor.c:6764
+#: ../clutter/clutter-actor.c:6834
 msgid "Pivot Point Z"
 msgstr "樞軸點 Z"
 
-#: ../clutter/clutter-actor.c:6765
+#: ../clutter/clutter-actor.c:6835
 msgid "Z component of the pivot point"
 msgstr "樞軸點的 Z 元件"
 
-#: ../clutter/clutter-actor.c:6783
+#: ../clutter/clutter-actor.c:6853
 msgid "Scale X"
 msgstr "伸縮 X 坐標"
 
-#: ../clutter/clutter-actor.c:6784
+#: ../clutter/clutter-actor.c:6854
 msgid "Scale factor on the X axis"
 msgstr "在 X 軸上的伸縮比值"
 
-#: ../clutter/clutter-actor.c:6802
+#: ../clutter/clutter-actor.c:6872
 msgid "Scale Y"
 msgstr "伸縮 Y 坐標"
 
-#: ../clutter/clutter-actor.c:6803
+#: ../clutter/clutter-actor.c:6873
 msgid "Scale factor on the Y axis"
 msgstr "在 Y 軸上的伸縮比值"
 
-#: ../clutter/clutter-actor.c:6821
+#: ../clutter/clutter-actor.c:6891
 msgid "Scale Z"
 msgstr "縮放 Z"
 
-#: ../clutter/clutter-actor.c:6822
+#: ../clutter/clutter-actor.c:6892
 msgid "Scale factor on the Z axis"
 msgstr "在 Z 軸上的伸縮比值"
 
-#: ../clutter/clutter-actor.c:6840
+#: ../clutter/clutter-actor.c:6910
 msgid "Scale Center X"
 msgstr "伸縮中心 X 坐標"
 
-#: ../clutter/clutter-actor.c:6841
+#: ../clutter/clutter-actor.c:6911
 msgid "Horizontal scale center"
 msgstr "水平伸縮中心"
 
-#: ../clutter/clutter-actor.c:6859
+#: ../clutter/clutter-actor.c:6929
 msgid "Scale Center Y"
 msgstr "伸縮中心 Y 坐標"
 
-#: ../clutter/clutter-actor.c:6860
+#: ../clutter/clutter-actor.c:6930
 msgid "Vertical scale center"
 msgstr "垂直伸縮中心"
 
-#: ../clutter/clutter-actor.c:6878
+#: ../clutter/clutter-actor.c:6948
 msgid "Scale Gravity"
 msgstr "伸縮引力"
 
-#: ../clutter/clutter-actor.c:6879
+#: ../clutter/clutter-actor.c:6949
 msgid "The center of scaling"
 msgstr "伸縮的中心"
 
-#: ../clutter/clutter-actor.c:6897
+#: ../clutter/clutter-actor.c:6967
 msgid "Rotation Angle X"
 msgstr "旋轉角度 X 坐標"
 
-#: ../clutter/clutter-actor.c:6898
+#: ../clutter/clutter-actor.c:6968
 msgid "The rotation angle on the X axis"
 msgstr "在 X 軸上的旋轉角度"
 
-#: ../clutter/clutter-actor.c:6916
+#: ../clutter/clutter-actor.c:6986
 msgid "Rotation Angle Y"
 msgstr "旋轉角度 Y 坐標"
 
-#: ../clutter/clutter-actor.c:6917
+#: ../clutter/clutter-actor.c:6987
 msgid "The rotation angle on the Y axis"
 msgstr "在 Y 軸上的旋轉角度"
 
-#: ../clutter/clutter-actor.c:6935
+#: ../clutter/clutter-actor.c:7005
 msgid "Rotation Angle Z"
 msgstr "旋轉角度 Z 坐標"
 
-#: ../clutter/clutter-actor.c:6936
+#: ../clutter/clutter-actor.c:7006
 msgid "The rotation angle on the Z axis"
 msgstr "在 Z 軸上的旋轉角度"
 
-#: ../clutter/clutter-actor.c:6954
+#: ../clutter/clutter-actor.c:7024
 msgid "Rotation Center X"
 msgstr "旋轉中心 X 坐標"
 
-#: ../clutter/clutter-actor.c:6955
+#: ../clutter/clutter-actor.c:7025
 msgid "The rotation center on the X axis"
 msgstr "在 X 軸上的旋轉中心"
 
-#: ../clutter/clutter-actor.c:6972
+#: ../clutter/clutter-actor.c:7042
 msgid "Rotation Center Y"
 msgstr "旋轉中心 Y 坐標"
 
-#: ../clutter/clutter-actor.c:6973
+#: ../clutter/clutter-actor.c:7043
 msgid "The rotation center on the Y axis"
 msgstr "在 Y 軸上的旋轉中心"
 
-#: ../clutter/clutter-actor.c:6990
+#: ../clutter/clutter-actor.c:7060
 msgid "Rotation Center Z"
 msgstr "旋轉中心 Z 坐標"
 
-#: ../clutter/clutter-actor.c:6991
+#: ../clutter/clutter-actor.c:7061
 msgid "The rotation center on the Z axis"
 msgstr "在 Z 軸上的旋轉中心"
 
-#: ../clutter/clutter-actor.c:7008
+#: ../clutter/clutter-actor.c:7078
 msgid "Rotation Center Z Gravity"
 msgstr "旋轉中心 Z 引力"
 
-#: ../clutter/clutter-actor.c:7009
+#: ../clutter/clutter-actor.c:7079
 msgid "Center point for rotation around the Z axis"
 msgstr "圍繞 Z 軸旋轉的中心點"
 
-#: ../clutter/clutter-actor.c:7037
+#: ../clutter/clutter-actor.c:7107
 msgid "Anchor X"
 msgstr "錨點 X 坐標"
 
-#: ../clutter/clutter-actor.c:7038
+#: ../clutter/clutter-actor.c:7108
 msgid "X coordinate of the anchor point"
 msgstr "錨點的 X 坐標"
 
-#: ../clutter/clutter-actor.c:7066
+#: ../clutter/clutter-actor.c:7136
 msgid "Anchor Y"
 msgstr "錨點 Y 坐標"
 
-#: ../clutter/clutter-actor.c:7067
+#: ../clutter/clutter-actor.c:7137
 msgid "Y coordinate of the anchor point"
 msgstr "錨點的 Y 坐標"
 
-#: ../clutter/clutter-actor.c:7094
+#: ../clutter/clutter-actor.c:7164
 msgid "Anchor Gravity"
 msgstr "錨點引力"
 
-#: ../clutter/clutter-actor.c:7095
+#: ../clutter/clutter-actor.c:7165
 msgid "The anchor point as a ClutterGravity"
 msgstr "錨點做為 ClutterGravity"
 
-#: ../clutter/clutter-actor.c:7114
+#: ../clutter/clutter-actor.c:7184
 msgid "Translation X"
 msgstr "轉換 X"
 
-#: ../clutter/clutter-actor.c:7115
+#: ../clutter/clutter-actor.c:7185
 msgid "Translation along the X axis"
 msgstr "沿 X 軸的轉換"
 
-#: ../clutter/clutter-actor.c:7134
+#: ../clutter/clutter-actor.c:7204
 msgid "Translation Y"
 msgstr "轉換 Y"
 
-#: ../clutter/clutter-actor.c:7135
+#: ../clutter/clutter-actor.c:7205
 msgid "Translation along the Y axis"
 msgstr "沿 Y 軸的轉換"
 
-#: ../clutter/clutter-actor.c:7154
+#: ../clutter/clutter-actor.c:7224
 msgid "Translation Z"
 msgstr "轉換 Z"
 
-#: ../clutter/clutter-actor.c:7155
+#: ../clutter/clutter-actor.c:7225
 msgid "Translation along the Z axis"
 msgstr "沿 Z 軸的轉換"
 
-#: ../clutter/clutter-actor.c:7185
+#: ../clutter/clutter-actor.c:7255
 msgid "Transform"
 msgstr "轉換"
 
-#: ../clutter/clutter-actor.c:7186
+#: ../clutter/clutter-actor.c:7256
 msgid "Transformation matrix"
 msgstr "轉換矩陣"
 
-#: ../clutter/clutter-actor.c:7201
+#: ../clutter/clutter-actor.c:7271
 msgid "Transform Set"
 msgstr "轉換設定"
 
-#: ../clutter/clutter-actor.c:7202
+#: ../clutter/clutter-actor.c:7272
 msgid "Whether the transform property is set"
 msgstr "是否已經設定轉換屬性"
 
-#: ../clutter/clutter-actor.c:7223
+#: ../clutter/clutter-actor.c:7293
 msgid "Child Transform"
 msgstr "子項變形"
 
-#: ../clutter/clutter-actor.c:7224
+#: ../clutter/clutter-actor.c:7294
 msgid "Children transformation matrix"
 msgstr "子項變形矩陣"
 
-#: ../clutter/clutter-actor.c:7239
+#: ../clutter/clutter-actor.c:7309
 msgid "Child Transform Set"
 msgstr "子項變形設定"
 
-#: ../clutter/clutter-actor.c:7240
+#: ../clutter/clutter-actor.c:7310
 msgid "Whether the child-transform property is set"
 msgstr "是否已經設定子項轉換屬性"
 
-#: ../clutter/clutter-actor.c:7257
+#: ../clutter/clutter-actor.c:7327
 msgid "Show on set parent"
 msgstr "設定為上層時顯示"
 
-#: ../clutter/clutter-actor.c:7258
+#: ../clutter/clutter-actor.c:7328
 msgid "Whether the actor is shown when parented"
 msgstr "參與者設定為上層時是否顯示"
 
-#: ../clutter/clutter-actor.c:7275
+#: ../clutter/clutter-actor.c:7345
 msgid "Clip to Allocation"
 msgstr "裁剪到定位"
 
-#: ../clutter/clutter-actor.c:7276
+#: ../clutter/clutter-actor.c:7346
 msgid "Sets the clip region to track the actor's allocation"
 msgstr "設定裁剪區域以追蹤參與者的定位"
 
-#: ../clutter/clutter-actor.c:7289
+#: ../clutter/clutter-actor.c:7359
 msgid "Text Direction"
 msgstr "文字方向"
 
-#: ../clutter/clutter-actor.c:7290
+#: ../clutter/clutter-actor.c:7360
 msgid "Direction of the text"
 msgstr "文字的方向"
 
-#: ../clutter/clutter-actor.c:7305
+#: ../clutter/clutter-actor.c:7375
 msgid "Has Pointer"
 msgstr "具有指標"
 
-#: ../clutter/clutter-actor.c:7306
+#: ../clutter/clutter-actor.c:7376
 msgid "Whether the actor contains the pointer of an input device"
 msgstr "是否參與者含有輸入裝置的指標"
 
-#: ../clutter/clutter-actor.c:7319
+#: ../clutter/clutter-actor.c:7389
 msgid "Actions"
 msgstr "動作"
 
-#: ../clutter/clutter-actor.c:7320
+#: ../clutter/clutter-actor.c:7390
 msgid "Adds an action to the actor"
 msgstr "加入一項動作給參與者"
 
-#: ../clutter/clutter-actor.c:7333
+#: ../clutter/clutter-actor.c:7403
 msgid "Constraints"
 msgstr "條件約束"
 
-#: ../clutter/clutter-actor.c:7334
+#: ../clutter/clutter-actor.c:7404
 msgid "Adds a constraint to the actor"
 msgstr "加入條件約束給參與者"
 
-#: ../clutter/clutter-actor.c:7347
+#: ../clutter/clutter-actor.c:7417
 msgid "Effect"
 msgstr "效果"
 
-#: ../clutter/clutter-actor.c:7348
+#: ../clutter/clutter-actor.c:7418
 msgid "Add an effect to be applied on the actor"
 msgstr "加入一項效果給參與者"
 
-#: ../clutter/clutter-actor.c:7362
+#: ../clutter/clutter-actor.c:7432
 msgid "Layout Manager"
 msgstr "版面配置管理員"
 
-#: ../clutter/clutter-actor.c:7363
+#: ../clutter/clutter-actor.c:7433
 msgid "The object controlling the layout of an actor's children"
 msgstr "用來控制動作者子項配置的物件"
 
-#: ../clutter/clutter-actor.c:7377
+#: ../clutter/clutter-actor.c:7447
 msgid "X Expand"
 msgstr "X 擴展"
 
-#: ../clutter/clutter-actor.c:7378
+#: ../clutter/clutter-actor.c:7448
 msgid "Whether extra horizontal space should be assigned to the actor"
 msgstr "是否應指派給參與者額外的水平空間"
 
-#: ../clutter/clutter-actor.c:7393
+#: ../clutter/clutter-actor.c:7463
 msgid "Y Expand"
 msgstr "Y 擴展"
 
-#: ../clutter/clutter-actor.c:7394
+#: ../clutter/clutter-actor.c:7464
 msgid "Whether extra vertical space should be assigned to the actor"
 msgstr "是否應指派給參與者額外的垂直空間"
 
-#: ../clutter/clutter-actor.c:7410
+#: ../clutter/clutter-actor.c:7480
 msgid "X Alignment"
 msgstr "X 對齊"
 
-#: ../clutter/clutter-actor.c:7411
+#: ../clutter/clutter-actor.c:7481
 msgid "The alignment of the actor on the X axis within its allocation"
 msgstr "在 X 軸的配置之內參與者的垂直對齊"
 
-#: ../clutter/clutter-actor.c:7426
+#: ../clutter/clutter-actor.c:7496
 msgid "Y Alignment"
 msgstr "Y 對齊"
 
-#: ../clutter/clutter-actor.c:7427
+#: ../clutter/clutter-actor.c:7497
 msgid "The alignment of the actor on the Y axis within its allocation"
 msgstr "在 Y 軸的配置之內參與者的垂直對齊"
 
-#: ../clutter/clutter-actor.c:7446
+#: ../clutter/clutter-actor.c:7516
 msgid "Margin Top"
 msgstr "頂端邊界"
 
-#: ../clutter/clutter-actor.c:7447
+#: ../clutter/clutter-actor.c:7517
 msgid "Extra space at the top"
 msgstr "頂端額外的空間"
 
-#: ../clutter/clutter-actor.c:7468
+#: ../clutter/clutter-actor.c:7538
 msgid "Margin Bottom"
 msgstr "底部邊界"
 
-#: ../clutter/clutter-actor.c:7469
+#: ../clutter/clutter-actor.c:7539
 msgid "Extra space at the bottom"
 msgstr "底部額外的空間"
 
-#: ../clutter/clutter-actor.c:7490
+#: ../clutter/clutter-actor.c:7560
 msgid "Margin Left"
 msgstr "左邊邊界"
 
-#: ../clutter/clutter-actor.c:7491
+#: ../clutter/clutter-actor.c:7561
 msgid "Extra space at the left"
 msgstr "左側額外的空間"
 
-#: ../clutter/clutter-actor.c:7512
+#: ../clutter/clutter-actor.c:7582
 msgid "Margin Right"
 msgstr "右邊邊界"
 
-#: ../clutter/clutter-actor.c:7513
+#: ../clutter/clutter-actor.c:7583
 msgid "Extra space at the right"
 msgstr "右側額外的空間"
 
-#: ../clutter/clutter-actor.c:7529
+#: ../clutter/clutter-actor.c:7599
 msgid "Background Color Set"
 msgstr "背景顏色設定"
 
-#: ../clutter/clutter-actor.c:7530 ../clutter/deprecated/clutter-box.c:275
+#: ../clutter/clutter-actor.c:7600 ../clutter/deprecated/clutter-box.c:271
 msgid "Whether the background color is set"
 msgstr "是否已設定背景顏色"
 
-#: ../clutter/clutter-actor.c:7546
+#: ../clutter/clutter-actor.c:7616
 msgid "Background color"
 msgstr "背景顏色"
 
-#: ../clutter/clutter-actor.c:7547
+#: ../clutter/clutter-actor.c:7617
 msgid "The actor's background color"
 msgstr "參與者的背景顏色"
 
-#: ../clutter/clutter-actor.c:7562
+#: ../clutter/clutter-actor.c:7632
 msgid "First Child"
 msgstr "第一個子項目"
 
-#: ../clutter/clutter-actor.c:7563
+#: ../clutter/clutter-actor.c:7633
 msgid "The actor's first child"
 msgstr "參與者的第一個子項目"
 
-#: ../clutter/clutter-actor.c:7576
+#: ../clutter/clutter-actor.c:7646
 msgid "Last Child"
 msgstr "最後一個子項目"
 
-#: ../clutter/clutter-actor.c:7577
+#: ../clutter/clutter-actor.c:7647
 msgid "The actor's last child"
 msgstr "參與者的最後一個子項目"
 
-#: ../clutter/clutter-actor.c:7591
+#: ../clutter/clutter-actor.c:7661
 msgid "Content"
 msgstr "內容"
 
-#: ../clutter/clutter-actor.c:7592
+#: ../clutter/clutter-actor.c:7662
 msgid "Delegate object for painting the actor's content"
 msgstr "指派繪製參與者內容的物件"
 
-#: ../clutter/clutter-actor.c:7617
+#: ../clutter/clutter-actor.c:7687
 msgid "Content Gravity"
 msgstr "內容引力"
 
-#: ../clutter/clutter-actor.c:7618
+#: ../clutter/clutter-actor.c:7688
 msgid "Alignment of the actor's content"
 msgstr "參與者內容的排列"
 
-#: ../clutter/clutter-actor.c:7638
+#: ../clutter/clutter-actor.c:7708
 msgid "Content Box"
 msgstr "內容方塊"
 
-#: ../clutter/clutter-actor.c:7639
+#: ../clutter/clutter-actor.c:7709
 msgid "The bounding box of the actor's content"
 msgstr "參與者內容的綁定方塊"
 
-#: ../clutter/clutter-actor.c:7647
+#: ../clutter/clutter-actor.c:7717
 msgid "Minification Filter"
 msgstr "縮小過濾器"
 
-#: ../clutter/clutter-actor.c:7648
+#: ../clutter/clutter-actor.c:7718
 msgid "The filter used when reducing the size of the content"
 msgstr "縮小內容大小時所用的過濾器"
 
-#: ../clutter/clutter-actor.c:7655
+#: ../clutter/clutter-actor.c:7725
 msgid "Magnification Filter"
 msgstr "放大過濾器"
 
-#: ../clutter/clutter-actor.c:7656
+#: ../clutter/clutter-actor.c:7726
 msgid "The filter used when increasing the size of the content"
 msgstr "增加內容大小時所用的過濾器"
 
-#: ../clutter/clutter-actor.c:7670
+#: ../clutter/clutter-actor.c:7740
 msgid "Content Repeat"
 msgstr "內容重複"
 
-#: ../clutter/clutter-actor.c:7671
+#: ../clutter/clutter-actor.c:7741
 msgid "The repeat policy for the actor's content"
 msgstr "參與者內容的重複原則"
 
-#: ../clutter/clutter-actor-meta.c:193 ../clutter/clutter-child-meta.c:142
+#: ../clutter/clutter-actor-meta.c:191 ../clutter/clutter-child-meta.c:142
 msgid "Actor"
 msgstr "參與者"
 
-#: ../clutter/clutter-actor-meta.c:194
+#: ../clutter/clutter-actor-meta.c:192
 msgid "The actor attached to the meta"
 msgstr "參與者附加到中繼物件"
 
-#: ../clutter/clutter-actor-meta.c:208
+#: ../clutter/clutter-actor-meta.c:206
 msgid "The name of the meta"
 msgstr "中繼物件的名稱"
 
-#: ../clutter/clutter-actor-meta.c:221 ../clutter/clutter-input-device.c:337
-#: ../clutter/deprecated/clutter-shader.c:313
+#: ../clutter/clutter-actor-meta.c:219 ../clutter/clutter-input-device.c:326
+#: ../clutter/deprecated/clutter-shader.c:309
 msgid "Enabled"
 msgstr "已啟用"
 
-#: ../clutter/clutter-actor-meta.c:222
+#: ../clutter/clutter-actor-meta.c:220
 msgid "Whether the meta is enabled"
 msgstr "是否中繼物件已被啟用"
 
 #: ../clutter/clutter-align-constraint.c:279
-#: ../clutter/clutter-bind-constraint.c:358 ../clutter/clutter-clone.c:345
+#: ../clutter/clutter-bind-constraint.c:358 ../clutter/clutter-clone.c:341
 #: ../clutter/clutter-snap-constraint.c:321
 msgid "Source"
 msgstr "源頭"
@@ -728,11 +728,11 @@ msgstr "因子"
 msgid "The alignment factor, between 0.0 and 1.0"
 msgstr "對齊因子，在 0.0 和 1.0 之間"
 
-#: ../clutter/clutter-backend.c:379
+#: ../clutter/clutter-backend.c:380
 msgid "Unable to initialize the Clutter backend"
 msgstr "無法初始化 Clutter 後端"
 
-#: ../clutter/clutter-backend.c:453
+#: ../clutter/clutter-backend.c:454
 #, c-format
 msgid "The backend of type '%s' does not support creating multiple stages"
 msgstr "類型「%s」的後端不支援建立多重階段"
@@ -763,132 +763,146 @@ msgstr "套用到連結的像素偏移值"
 msgid "The unique name of the binding pool"
 msgstr "連結池的獨一名稱"
 
-#: ../clutter/clutter-bin-layout.c:240 ../clutter/clutter-bin-layout.c:655
-#: ../clutter/clutter-box-layout.c:390 ../clutter/clutter-table-layout.c:610
+#: ../clutter/clutter-bin-layout.c:238 ../clutter/clutter-bin-layout.c:651
+#: ../clutter/clutter-box-layout.c:388
+#: ../clutter/deprecated/clutter-table-layout.c:610
 msgid "Horizontal Alignment"
 msgstr "水平對齊"
 
-#: ../clutter/clutter-bin-layout.c:241
+#: ../clutter/clutter-bin-layout.c:239
 msgid "Horizontal alignment for the actor inside the layout manager"
 msgstr "用於版面管理器之內參與者的水平對齊"
 
-#: ../clutter/clutter-bin-layout.c:249 ../clutter/clutter-bin-layout.c:675
-#: ../clutter/clutter-box-layout.c:399 ../clutter/clutter-table-layout.c:625
+#: ../clutter/clutter-bin-layout.c:247 ../clutter/clutter-bin-layout.c:671
+#: ../clutter/clutter-box-layout.c:397
+#: ../clutter/deprecated/clutter-table-layout.c:625
 msgid "Vertical Alignment"
 msgstr "垂直對齊"
 
-#: ../clutter/clutter-bin-layout.c:250
+#: ../clutter/clutter-bin-layout.c:248
 msgid "Vertical alignment for the actor inside the layout manager"
 msgstr "用於版面管理器之內參與者的垂直對齊"
 
-#: ../clutter/clutter-bin-layout.c:656
+#: ../clutter/clutter-bin-layout.c:652
 msgid "Default horizontal alignment for the actors inside the layout manager"
 msgstr "用於版面配置管理員之內參與者的預設水平對齊"
 
-#: ../clutter/clutter-bin-layout.c:676
+#: ../clutter/clutter-bin-layout.c:672
 msgid "Default vertical alignment for the actors inside the layout manager"
 msgstr "用於版面配置管理員之內參與者的預設垂直對齊"
 
-#: ../clutter/clutter-box-layout.c:365
+#: ../clutter/clutter-box-layout.c:363
 msgid "Expand"
 msgstr "展開"
 
-#: ../clutter/clutter-box-layout.c:366
+#: ../clutter/clutter-box-layout.c:364
 msgid "Allocate extra space for the child"
 msgstr "配置額外空間給子物件"
 
-#: ../clutter/clutter-box-layout.c:372 ../clutter/clutter-table-layout.c:589
+#: ../clutter/clutter-box-layout.c:370
+#: ../clutter/deprecated/clutter-table-layout.c:589
 msgid "Horizontal Fill"
 msgstr "水平填充"
 
-#: ../clutter/clutter-box-layout.c:373 ../clutter/clutter-table-layout.c:590
+#: ../clutter/clutter-box-layout.c:371
+#: ../clutter/deprecated/clutter-table-layout.c:590
 msgid ""
 "Whether the child should receive priority when the container is allocating "
 "spare space on the horizontal axis"
 msgstr "當容器正在水平軸上配置備用空間時，子物件是否應該接收優先權"
 
-#: ../clutter/clutter-box-layout.c:381 ../clutter/clutter-table-layout.c:596
+#: ../clutter/clutter-box-layout.c:379
+#: ../clutter/deprecated/clutter-table-layout.c:596
 msgid "Vertical Fill"
 msgstr "垂直填充"
 
-#: ../clutter/clutter-box-layout.c:382 ../clutter/clutter-table-layout.c:597
+#: ../clutter/clutter-box-layout.c:380
+#: ../clutter/deprecated/clutter-table-layout.c:597
 msgid ""
 "Whether the child should receive priority when the container is allocating "
 "spare space on the vertical axis"
 msgstr "當容器正在垂直軸上配置備用空間時，子物件是否應該接收優先權"
 
-#: ../clutter/clutter-box-layout.c:391 ../clutter/clutter-table-layout.c:611
+#: ../clutter/clutter-box-layout.c:389
+#: ../clutter/deprecated/clutter-table-layout.c:611
 msgid "Horizontal alignment of the actor within the cell"
 msgstr "在方格之內參與者的水平對齊"
 
-#: ../clutter/clutter-box-layout.c:400 ../clutter/clutter-table-layout.c:626
+#: ../clutter/clutter-box-layout.c:398
+#: ../clutter/deprecated/clutter-table-layout.c:626
 msgid "Vertical alignment of the actor within the cell"
 msgstr "在方格之內參與者的垂直對齊"
 
-#: ../clutter/clutter-box-layout.c:1365
+#: ../clutter/clutter-box-layout.c:1359
 msgid "Vertical"
 msgstr "垂直"
 
-#: ../clutter/clutter-box-layout.c:1366
+#: ../clutter/clutter-box-layout.c:1360
 msgid "Whether the layout should be vertical, rather than horizontal"
 msgstr "版面配置是否應該是垂直而非水平"
 
-#: ../clutter/clutter-box-layout.c:1383 ../clutter/clutter-flow-layout.c:890
-#: ../clutter/clutter-grid-layout.c:1550
+#: ../clutter/clutter-box-layout.c:1377 ../clutter/clutter-flow-layout.c:942
+#: ../clutter/clutter-grid-layout.c:1549
 msgid "Orientation"
 msgstr "方向"
 
-#: ../clutter/clutter-box-layout.c:1384 ../clutter/clutter-flow-layout.c:891
-#: ../clutter/clutter-grid-layout.c:1551
+#: ../clutter/clutter-box-layout.c:1378 ../clutter/clutter-flow-layout.c:943
+#: ../clutter/clutter-grid-layout.c:1550
 msgid "The orientation of the layout"
 msgstr "版面配置的方向"
 
-#: ../clutter/clutter-box-layout.c:1400 ../clutter/clutter-flow-layout.c:906
+#: ../clutter/clutter-box-layout.c:1394 ../clutter/clutter-flow-layout.c:958
 msgid "Homogeneous"
 msgstr "同質的"
 
-#: ../clutter/clutter-box-layout.c:1401
+#: ../clutter/clutter-box-layout.c:1395
 msgid ""
 "Whether the layout should be homogeneous, i.e. all childs get the same size"
 msgstr "版面配置是否應該是同質的，也就是所有子物件都具有相同的大小"
 
-#: ../clutter/clutter-box-layout.c:1416
+#: ../clutter/clutter-box-layout.c:1410
 msgid "Pack Start"
 msgstr "包裝開始"
 
-#: ../clutter/clutter-box-layout.c:1417
+#: ../clutter/clutter-box-layout.c:1411
 msgid "Whether to pack items at the start of the box"
 msgstr "是否要從方框的起始去包裝各個項目"
 
-#: ../clutter/clutter-box-layout.c:1430
+#: ../clutter/clutter-box-layout.c:1424
 msgid "Spacing"
 msgstr "間隔"
 
-#: ../clutter/clutter-box-layout.c:1431
+#: ../clutter/clutter-box-layout.c:1425
 msgid "Spacing between children"
 msgstr "子物件之間的間隔"
 
-#: ../clutter/clutter-box-layout.c:1448 ../clutter/clutter-table-layout.c:1675
+#: ../clutter/clutter-box-layout.c:1442
+#: ../clutter/deprecated/clutter-table-layout.c:1677
 msgid "Use Animations"
 msgstr "使用動畫"
 
-#: ../clutter/clutter-box-layout.c:1449 ../clutter/clutter-table-layout.c:1676
+#: ../clutter/clutter-box-layout.c:1443
+#: ../clutter/deprecated/clutter-table-layout.c:1678
 msgid "Whether layout changes should be animated"
 msgstr "是否版面配置的變更應該以動畫顯示"
 
-#: ../clutter/clutter-box-layout.c:1473 ../clutter/clutter-table-layout.c:1700
+#: ../clutter/clutter-box-layout.c:1467
+#: ../clutter/deprecated/clutter-table-layout.c:1702
 msgid "Easing Mode"
 msgstr "簡易模式"
 
-#: ../clutter/clutter-box-layout.c:1474 ../clutter/clutter-table-layout.c:1701
+#: ../clutter/clutter-box-layout.c:1468
+#: ../clutter/deprecated/clutter-table-layout.c:1703
 msgid "The easing mode of the animations"
 msgstr "簡易模式的動畫"
 
-#: ../clutter/clutter-box-layout.c:1494 ../clutter/clutter-table-layout.c:1721
+#: ../clutter/clutter-box-layout.c:1488
+#: ../clutter/deprecated/clutter-table-layout.c:1723
 msgid "Easing Duration"
 msgstr "簡易持續時間"
 
-#: ../clutter/clutter-box-layout.c:1495 ../clutter/clutter-table-layout.c:1722
+#: ../clutter/clutter-box-layout.c:1489
+#: ../clutter/deprecated/clutter-table-layout.c:1724
 msgid "The duration of the animations"
 msgstr "動畫的持續時間"
 
@@ -908,14 +922,30 @@ msgstr "對比"
 msgid "The contrast change to apply"
 msgstr "要套用的對比"
 
-#: ../clutter/clutter-canvas.c:216
+#: ../clutter/clutter-canvas.c:248
 msgid "The width of the canvas"
 msgstr "畫布的寬度"
 
-#: ../clutter/clutter-canvas.c:232
+#: ../clutter/clutter-canvas.c:264
 msgid "The height of the canvas"
 msgstr "畫布的高度"
 
+#: ../clutter/clutter-canvas.c:283
+msgid "Scale Factor Set"
+msgstr "縮放因素設定"
+
+#: ../clutter/clutter-canvas.c:284
+msgid "Whether the scale-factor property is set"
+msgstr "是否已經設定縮放因素屬性"
+
+#: ../clutter/clutter-canvas.c:305
+msgid "Scale Factor"
+msgstr "縮放因素"
+
+#: ../clutter/clutter-canvas.c:306
+msgid "The scaling factor for the surface"
+msgstr "表面的縮放因素"
+
 #: ../clutter/clutter-child-meta.c:127
 msgid "Container"
 msgstr "容器"
@@ -928,39 +958,39 @@ msgstr "用以建立此資料的容器"
 msgid "The actor wrapped by this data"
 msgstr "由此資料所換列的參與者"
 
-#: ../clutter/clutter-click-action.c:559
+#: ../clutter/clutter-click-action.c:586
 msgid "Pressed"
 msgstr "已按下"
 
-#: ../clutter/clutter-click-action.c:560
+#: ../clutter/clutter-click-action.c:587
 msgid "Whether the clickable should be in pressed state"
 msgstr "可點選者是否應該處於已按下狀態"
 
-#: ../clutter/clutter-click-action.c:573
+#: ../clutter/clutter-click-action.c:600
 msgid "Held"
 msgstr "持有"
 
-#: ../clutter/clutter-click-action.c:574
+#: ../clutter/clutter-click-action.c:601
 msgid "Whether the clickable has a grab"
 msgstr "可點選者是否可抓取"
 
-#: ../clutter/clutter-click-action.c:591 ../clutter/clutter-settings.c:607
+#: ../clutter/clutter-click-action.c:618 ../clutter/clutter-settings.c:653
 msgid "Long Press Duration"
 msgstr "長時間按壓期間"
 
-#: ../clutter/clutter-click-action.c:592
+#: ../clutter/clutter-click-action.c:619
 msgid "The minimum duration of a long press to recognize the gesture"
 msgstr "長時間按壓辨識為手勢的最小持續時間"
 
-#: ../clutter/clutter-click-action.c:610
+#: ../clutter/clutter-click-action.c:637
 msgid "Long Press Threshold"
 msgstr "長時間按壓界限"
 
-#: ../clutter/clutter-click-action.c:611
+#: ../clutter/clutter-click-action.c:638
 msgid "The maximum threshold before a long press is cancelled"
 msgstr "取消長時間按壓前的最大界限"
 
-#: ../clutter/clutter-clone.c:346
+#: ../clutter/clutter-clone.c:342
 msgid "Specifies the actor to be cloned"
 msgstr "指定用來製做仿本的參與者"
 
@@ -972,27 +1002,27 @@ msgstr "色調"
 msgid "The tint to apply"
 msgstr "套用的色調"
 
-#: ../clutter/clutter-deform-effect.c:588
+#: ../clutter/clutter-deform-effect.c:592
 msgid "Horizontal Tiles"
 msgstr "水平並排"
 
-#: ../clutter/clutter-deform-effect.c:589
+#: ../clutter/clutter-deform-effect.c:593
 msgid "The number of horizontal tiles"
 msgstr "水平並排數量"
 
-#: ../clutter/clutter-deform-effect.c:604
+#: ../clutter/clutter-deform-effect.c:608
 msgid "Vertical Tiles"
 msgstr "垂直並排"
 
-#: ../clutter/clutter-deform-effect.c:605
+#: ../clutter/clutter-deform-effect.c:609
 msgid "The number of vertical tiles"
 msgstr "垂直並排數量"
 
-#: ../clutter/clutter-deform-effect.c:622
+#: ../clutter/clutter-deform-effect.c:626
 msgid "Back Material"
 msgstr "背景材質"
 
-#: ../clutter/clutter-deform-effect.c:623
+#: ../clutter/clutter-deform-effect.c:627
 msgid "The material to be used when painting the back of the actor"
 msgstr "繪製參與者背景時所用的材質"
 
@@ -1000,258 +1030,300 @@ msgstr "繪製參與者背景時所用的材質"
 msgid "The desaturation factor"
 msgstr "稀化因子"
 
-#: ../clutter/clutter-device-manager.c:131
-#: ../clutter/clutter-input-device.c:366
-#: ../clutter/x11/clutter-keymap-x11.c:321
+#: ../clutter/clutter-device-manager.c:127
+#: ../clutter/clutter-input-device.c:355
+#: ../clutter/x11/clutter-keymap-x11.c:457
 msgid "Backend"
 msgstr "後端程式"
 
-#: ../clutter/clutter-device-manager.c:132
+#: ../clutter/clutter-device-manager.c:128
 msgid "The ClutterBackend of the device manager"
 msgstr "裝置管理器的 Clutter 後端程式"
 
-#: ../clutter/clutter-drag-action.c:742
+#: ../clutter/clutter-drag-action.c:741
 msgid "Horizontal Drag Threshold"
 msgstr "水平拖曳臨界值"
 
-#: ../clutter/clutter-drag-action.c:743
+#: ../clutter/clutter-drag-action.c:742
 msgid "The horizontal amount of pixels required to start dragging"
 msgstr "啟動拖曳所需的水平像素數目"
 
-#: ../clutter/clutter-drag-action.c:770
+#: ../clutter/clutter-drag-action.c:769
 msgid "Vertical Drag Threshold"
 msgstr "垂直拖曳臨界值"
 
-#: ../clutter/clutter-drag-action.c:771
+#: ../clutter/clutter-drag-action.c:770
 msgid "The vertical amount of pixels required to start dragging"
 msgstr "啟動拖曳所需的垂直像素數目"
 
-#: ../clutter/clutter-drag-action.c:792
+#: ../clutter/clutter-drag-action.c:791
 msgid "Drag Handle"
 msgstr "拖曳控柄"
 
-#: ../clutter/clutter-drag-action.c:793
+#: ../clutter/clutter-drag-action.c:792
 msgid "The actor that is being dragged"
 msgstr "正在拖曳的參與者"
 
-#: ../clutter/clutter-drag-action.c:806
+#: ../clutter/clutter-drag-action.c:805
 msgid "Drag Axis"
 msgstr "拖曳軸線"
 
-#: ../clutter/clutter-drag-action.c:807
+#: ../clutter/clutter-drag-action.c:806
 msgid "Constraints the dragging to an axis"
 msgstr "約束拖曳之於軸線"
 
-#: ../clutter/clutter-drag-action.c:823
+#: ../clutter/clutter-drag-action.c:822
 msgid "Drag Area"
 msgstr "拖曳區域"
 
-#: ../clutter/clutter-drag-action.c:824
+#: ../clutter/clutter-drag-action.c:823
 msgid "Constrains the dragging to a rectangle"
 msgstr "限制矩形拖曳"
 
-#: ../clutter/clutter-drag-action.c:837
+#: ../clutter/clutter-drag-action.c:836
 msgid "Drag Area Set"
 msgstr "拖曳區域設定"
 
-#: ../clutter/clutter-drag-action.c:838
+#: ../clutter/clutter-drag-action.c:837
 msgid "Whether the drag area is set"
 msgstr "是否已經設定拖曳區域"
 
-#: ../clutter/clutter-flow-layout.c:907
+#: ../clutter/clutter-flow-layout.c:959
 msgid "Whether each item should receive the same allocation"
 msgstr "每個項目是否應該獲得相同的配置"
 
-#: ../clutter/clutter-flow-layout.c:922 ../clutter/clutter-table-layout.c:1637
+#: ../clutter/clutter-flow-layout.c:974
+#: ../clutter/deprecated/clutter-table-layout.c:1637
 msgid "Column Spacing"
 msgstr "欄間隔"
 
-#: ../clutter/clutter-flow-layout.c:923
+#: ../clutter/clutter-flow-layout.c:975
 msgid "The spacing between columns"
 msgstr "直欄之間的間隔"
 
-#: ../clutter/clutter-flow-layout.c:939 ../clutter/clutter-table-layout.c:1651
+#: ../clutter/clutter-flow-layout.c:991
+#: ../clutter/deprecated/clutter-table-layout.c:1653
 msgid "Row Spacing"
 msgstr "列間隔"
 
-#: ../clutter/clutter-flow-layout.c:940
+#: ../clutter/clutter-flow-layout.c:992
 msgid "The spacing between rows"
 msgstr "橫列之間的間隔"
 
-#: ../clutter/clutter-flow-layout.c:954
+#: ../clutter/clutter-flow-layout.c:1006
 msgid "Minimum Column Width"
 msgstr "最小欄寬"
 
-#: ../clutter/clutter-flow-layout.c:955
+#: ../clutter/clutter-flow-layout.c:1007
 msgid "Minimum width for each column"
 msgstr "每一欄的最小寬度"
 
-#: ../clutter/clutter-flow-layout.c:970
+#: ../clutter/clutter-flow-layout.c:1022
 msgid "Maximum Column Width"
 msgstr "最大欄寬"
 
-#: ../clutter/clutter-flow-layout.c:971
+#: ../clutter/clutter-flow-layout.c:1023
 msgid "Maximum width for each column"
 msgstr "每一欄的最大寬度"
 
-#: ../clutter/clutter-flow-layout.c:985
+#: ../clutter/clutter-flow-layout.c:1037
 msgid "Minimum Row Height"
 msgstr "最小列高"
 
-#: ../clutter/clutter-flow-layout.c:986
+#: ../clutter/clutter-flow-layout.c:1038
 msgid "Minimum height for each row"
 msgstr "每一列的最小高度"
 
-#: ../clutter/clutter-flow-layout.c:1001
+#: ../clutter/clutter-flow-layout.c:1053
 msgid "Maximum Row Height"
 msgstr "最大列高"
 
-#: ../clutter/clutter-flow-layout.c:1002
+#: ../clutter/clutter-flow-layout.c:1054
 msgid "Maximum height for each row"
 msgstr "每一列的最大高度"
 
-#: ../clutter/clutter-grid-layout.c:1222
+#: ../clutter/clutter-flow-layout.c:1069 ../clutter/clutter-flow-layout.c:1070
+msgid "Snap to grid"
+msgstr "貼齊格線"
+
+#: ../clutter/clutter-gesture-action.c:668
+msgid "Number touch points"
+msgstr "觸控點數目"
+
+#: ../clutter/clutter-gesture-action.c:669
+msgid "Number of touch points"
+msgstr "觸控點數目"
+
+#: ../clutter/clutter-gesture-action.c:684
+msgid "Threshold Trigger Edge"
+msgstr "界限觸發邊緣"
+
+#: ../clutter/clutter-gesture-action.c:685
+msgid "The trigger edge used by the action"
+msgstr "動作使用的觸發邊緣"
+
+#: ../clutter/clutter-gesture-action.c:704
+#| msgid "Threshold Trigger Edge"
+msgid "Threshold Trigger Horizontal Distance"
+msgstr "界限觸發水平距離"
+
+#: ../clutter/clutter-gesture-action.c:705
+#| msgid "The trigger edge used by the action"
+msgid "The horizontal trigger distance used by the action"
+msgstr "動作使用的水平觸發距離"
+
+#: ../clutter/clutter-gesture-action.c:723
+#| msgid "Threshold Trigger Edge"
+msgid "Threshold Trigger Vertical Distance"
+msgstr "界限觸發垂直距離"
+
+#: ../clutter/clutter-gesture-action.c:724
+#| msgid "The trigger edge used by the action"
+msgid "The vertical trigger distance used by the action"
+msgstr "動作使用的垂直觸發距離"
+
+#: ../clutter/clutter-grid-layout.c:1223
 msgid "Left attachment"
 msgstr "左側附加"
 
-#: ../clutter/clutter-grid-layout.c:1223
+#: ../clutter/clutter-grid-layout.c:1224
 msgid "The column number to attach the left side of the child to"
 msgstr "附加於子項的左側的欄數"
 
-#: ../clutter/clutter-grid-layout.c:1230
+#: ../clutter/clutter-grid-layout.c:1231
 msgid "Top attachment"
 msgstr "頂端附加"
 
-#: ../clutter/clutter-grid-layout.c:1231
+#: ../clutter/clutter-grid-layout.c:1232
 msgid "The row number to attach the top side of a child widget to"
 msgstr "附加於子元件的頂端的列數"
 
-#: ../clutter/clutter-grid-layout.c:1239
+#: ../clutter/clutter-grid-layout.c:1240
 msgid "The number of columns that a child spans"
 msgstr "子項跨過的欄數"
 
-#: ../clutter/clutter-grid-layout.c:1246
+#: ../clutter/clutter-grid-layout.c:1247
 msgid "The number of rows that a child spans"
 msgstr "子項跨過的列數"
 
-#: ../clutter/clutter-grid-layout.c:1565
+#: ../clutter/clutter-grid-layout.c:1564
 msgid "Row spacing"
 msgstr "列距"
 
-#: ../clutter/clutter-grid-layout.c:1566
+#: ../clutter/clutter-grid-layout.c:1565
 msgid "The amount of space between two consecutive rows"
 msgstr "兩連續列之間的空間總數"
 
-#: ../clutter/clutter-grid-layout.c:1579
+#: ../clutter/clutter-grid-layout.c:1578
 msgid "Column spacing"
 msgstr "欄距"
 
-#: ../clutter/clutter-grid-layout.c:1580
+#: ../clutter/clutter-grid-layout.c:1579
 msgid "The amount of space between two consecutive columns"
 msgstr "兩連續欄之間的空間總數"
 
-#: ../clutter/clutter-grid-layout.c:1594
+#: ../clutter/clutter-grid-layout.c:1593
 msgid "Row Homogeneous"
 msgstr "列高一致"
 
-#: ../clutter/clutter-grid-layout.c:1595
+#: ../clutter/clutter-grid-layout.c:1594
 msgid "If TRUE, the rows are all the same height"
 msgstr "如果設定為「TRUE」，表示所有列的高度都一樣"
 
-#: ../clutter/clutter-grid-layout.c:1608
+#: ../clutter/clutter-grid-layout.c:1607
 msgid "Column Homogeneous"
 msgstr "欄寬一致"
 
-#: ../clutter/clutter-grid-layout.c:1609
+#: ../clutter/clutter-grid-layout.c:1608
 msgid "If TRUE, the columns are all the same width"
 msgstr "如果設定為「TRUE」，表示所有欄的寬度都一樣"
 
-#: ../clutter/clutter-image.c:248 ../clutter/clutter-image.c:311
-#: ../clutter/clutter-image.c:399
+#: ../clutter/clutter-image.c:249 ../clutter/clutter-image.c:312
+#: ../clutter/clutter-image.c:400
 msgid "Unable to load image data"
 msgstr "無法載入圖片資料"
 
-#: ../clutter/clutter-input-device.c:242
+#: ../clutter/clutter-input-device.c:231
 msgid "Id"
 msgstr "識別號"
 
-#: ../clutter/clutter-input-device.c:243
+#: ../clutter/clutter-input-device.c:232
 msgid "Unique identifier of the device"
 msgstr "裝置唯一識別號"
 
-#: ../clutter/clutter-input-device.c:259
+#: ../clutter/clutter-input-device.c:248
 msgid "The name of the device"
 msgstr "裝置名稱"
 
-#: ../clutter/clutter-input-device.c:273
+#: ../clutter/clutter-input-device.c:262
 msgid "Device Type"
 msgstr "裝置類型"
 
-#: ../clutter/clutter-input-device.c:274
+#: ../clutter/clutter-input-device.c:263
 msgid "The type of the device"
 msgstr "裝置的類型"
 
-#: ../clutter/clutter-input-device.c:289
+#: ../clutter/clutter-input-device.c:278
 msgid "Device Manager"
 msgstr "裝置管理程式"
 
-#: ../clutter/clutter-input-device.c:290
+#: ../clutter/clutter-input-device.c:279
 msgid "The device manager instance"
 msgstr "裝置管理程式實體"
 
-#: ../clutter/clutter-input-device.c:303
+#: ../clutter/clutter-input-device.c:292
 msgid "Device Mode"
 msgstr "裝置模式"
 
-#: ../clutter/clutter-input-device.c:304
+#: ../clutter/clutter-input-device.c:293
 msgid "The mode of the device"
 msgstr "裝置的模式"
 
-#: ../clutter/clutter-input-device.c:318
+#: ../clutter/clutter-input-device.c:307
 msgid "Has Cursor"
 msgstr "具有游標"
 
-#: ../clutter/clutter-input-device.c:319
+#: ../clutter/clutter-input-device.c:308
 msgid "Whether the device has a cursor"
 msgstr "裝置是否有游標"
 
-#: ../clutter/clutter-input-device.c:338
+#: ../clutter/clutter-input-device.c:327
 msgid "Whether the device is enabled"
 msgstr "裝置是否已啟用"
 
-#: ../clutter/clutter-input-device.c:351
+#: ../clutter/clutter-input-device.c:340
 msgid "Number of Axes"
 msgstr "軸的數目"
 
-#: ../clutter/clutter-input-device.c:352
+#: ../clutter/clutter-input-device.c:341
 msgid "The number of axes on the device"
 msgstr "裝置中的軸數"
 
-#: ../clutter/clutter-input-device.c:367
+#: ../clutter/clutter-input-device.c:356
 msgid "The backend instance"
 msgstr "後端實體"
 
-#: ../clutter/clutter-interval.c:506
+#: ../clutter/clutter-interval.c:553
 msgid "Value Type"
 msgstr "變數值類型"
 
-#: ../clutter/clutter-interval.c:507
+#: ../clutter/clutter-interval.c:554
 msgid "The type of the values in the interval"
 msgstr "在間隔之中的變數值型態"
 
-#: ../clutter/clutter-interval.c:522
+#: ../clutter/clutter-interval.c:569
 msgid "Initial Value"
 msgstr "初始值"
 
-#: ../clutter/clutter-interval.c:523
+#: ../clutter/clutter-interval.c:570
 msgid "Initial value of the interval"
 msgstr "間隔的初始值"
 
-#: ../clutter/clutter-interval.c:537
+#: ../clutter/clutter-interval.c:584
 msgid "Final Value"
 msgstr "最終值"
 
-#: ../clutter/clutter-interval.c:538
+#: ../clutter/clutter-interval.c:585
 msgid "Final value of the interval"
 msgstr "間隔的最終值"
 
@@ -1270,96 +1342,96 @@ msgstr "用以建立此資料的管理器"
 #. * Do NOT translate it to non-English e.g. "predefinito:LTR"! If
 #. * it isn't default:LTR or default:RTL it will not work.
 #.
-#: ../clutter/clutter-main.c:772
+#: ../clutter/clutter-main.c:795
 msgid "default:LTR"
 msgstr "default:LTR"
 
-#: ../clutter/clutter-main.c:1646
+#: ../clutter/clutter-main.c:1622
 msgid "Show frames per second"
 msgstr "顯示圖框速率"
 
-#: ../clutter/clutter-main.c:1648
+#: ../clutter/clutter-main.c:1624
 msgid "Default frame rate"
 msgstr "預設圖框率"
 
-#: ../clutter/clutter-main.c:1650
+#: ../clutter/clutter-main.c:1626
 msgid "Make all warnings fatal"
 msgstr "所有警告視為嚴重錯誤"
 
-#: ../clutter/clutter-main.c:1653
+#: ../clutter/clutter-main.c:1629
 msgid "Direction for the text"
 msgstr "文字方向"
 
-#: ../clutter/clutter-main.c:1656
+#: ../clutter/clutter-main.c:1632
 msgid "Disable mipmapping on text"
 msgstr "在文字上停用 MIP 對應"
 
-#: ../clutter/clutter-main.c:1659
+#: ../clutter/clutter-main.c:1635
 msgid "Use 'fuzzy' picking"
 msgstr "使用「模糊」挑選"
 
-#: ../clutter/clutter-main.c:1662
+#: ../clutter/clutter-main.c:1638
 msgid "Clutter debugging flags to set"
 msgstr "要設定的 Clutter 除錯標記"
 
-#: ../clutter/clutter-main.c:1664
+#: ../clutter/clutter-main.c:1640
 msgid "Clutter debugging flags to unset"
 msgstr "要取消設定的 Clutter 除錯標記"
 
-#: ../clutter/clutter-main.c:1668
+#: ../clutter/clutter-main.c:1644
 msgid "Clutter profiling flags to set"
 msgstr "要設定的 Clutter 效能分析標記"
 
-#: ../clutter/clutter-main.c:1670
+#: ../clutter/clutter-main.c:1646
 msgid "Clutter profiling flags to unset"
 msgstr "要取消設定的 Clutter 效能分析標記"
 
-#: ../clutter/clutter-main.c:1673
+#: ../clutter/clutter-main.c:1649
 msgid "Enable accessibility"
 msgstr "啟用輔助工具"
 
-#: ../clutter/clutter-main.c:1865
+#: ../clutter/clutter-main.c:1841
 msgid "Clutter Options"
 msgstr "Clutter 選項"
 
-#: ../clutter/clutter-main.c:1866
+#: ../clutter/clutter-main.c:1842
 msgid "Show Clutter Options"
 msgstr "顯示 Clutter 選項"
 
-#: ../clutter/clutter-pan-action.c:448
+#: ../clutter/clutter-pan-action.c:455
 msgid "Pan Axis"
 msgstr "平移軸線"
 
-#: ../clutter/clutter-pan-action.c:449
+#: ../clutter/clutter-pan-action.c:456
 msgid "Constraints the panning to an axis"
 msgstr "限制平移至軸線"
 
-#: ../clutter/clutter-pan-action.c:463
+#: ../clutter/clutter-pan-action.c:470
 msgid "Interpolate"
 msgstr "內插法"
 
-#: ../clutter/clutter-pan-action.c:464
+#: ../clutter/clutter-pan-action.c:471
 msgid "Whether interpolated events emission is enabled."
 msgstr "內插事件散發是否已啟用。"
 
-#: ../clutter/clutter-pan-action.c:480
+#: ../clutter/clutter-pan-action.c:487
 msgid "Deceleration"
 msgstr "減速"
 
-#: ../clutter/clutter-pan-action.c:481
+#: ../clutter/clutter-pan-action.c:488
 msgid "Rate at which the interpolated panning will decelerate in"
 msgstr "內插平移要減速的速率"
 
-#: ../clutter/clutter-pan-action.c:498
+#: ../clutter/clutter-pan-action.c:505
 msgid "Initial acceleration factor"
 msgstr "初始加速係數"
 
-#: ../clutter/clutter-pan-action.c:499
+#: ../clutter/clutter-pan-action.c:506
 msgid "Factor applied to the momentum when starting the interpolated phase"
 msgstr "當開始內插階段時套用到動量的係數"
 
 #: ../clutter/clutter-path-constraint.c:212
-#: ../clutter/deprecated/clutter-behaviour-path.c:225
+#: ../clutter/deprecated/clutter-behaviour-path.c:221
 msgid "Path"
 msgstr "路徑"
 
@@ -1371,149 +1443,157 @@ msgstr "用來限制參與者的路徑"
 msgid "The offset along the path, between -1.0 and 2.0"
 msgstr "路徑的補償，在 -1.0 和 2.0 之間"
 
-#: ../clutter/clutter-property-transition.c:271
+#: ../clutter/clutter-property-transition.c:269
 msgid "Property Name"
 msgstr "屬性名稱"
 
-#: ../clutter/clutter-property-transition.c:272
+#: ../clutter/clutter-property-transition.c:270
 msgid "The name of the property to animate"
 msgstr "要動畫化的屬性名稱"
 
-#: ../clutter/clutter-script.c:466
+#: ../clutter/clutter-script.c:464
 msgid "Filename Set"
 msgstr "檔名設定"
 
-#: ../clutter/clutter-script.c:467
+#: ../clutter/clutter-script.c:465
 msgid "Whether the :filename property is set"
 msgstr "是否已經設定 :filename 屬性"
 
-#: ../clutter/clutter-script.c:481
-#: ../clutter/deprecated/clutter-texture.c:1082
+#: ../clutter/clutter-script.c:479
+#: ../clutter/deprecated/clutter-texture.c:1080
 msgid "Filename"
 msgstr "檔名"
 
-#: ../clutter/clutter-script.c:482
+#: ../clutter/clutter-script.c:480
 msgid "The path of the currently parsed file"
 msgstr "目前剖析檔案的路徑"
 
-#: ../clutter/clutter-script.c:499
+#: ../clutter/clutter-script.c:497
 msgid "Translation Domain"
 msgstr "翻譯域名"
 
-#: ../clutter/clutter-script.c:500
+#: ../clutter/clutter-script.c:498
 msgid "The translation domain used to localize string"
 msgstr "用來本地化字串的翻譯域名"
 
-#: ../clutter/clutter-scroll-actor.c:190
+#: ../clutter/clutter-scroll-actor.c:189
 msgid "Scroll Mode"
 msgstr "捲動模式"
 
-#: ../clutter/clutter-scroll-actor.c:191
+#: ../clutter/clutter-scroll-actor.c:190
 msgid "The scrolling direction"
 msgstr "捲動方向"
 
-#: ../clutter/clutter-settings.c:448
+#: ../clutter/clutter-settings.c:486
 msgid "Double Click Time"
 msgstr "雙擊時間"
 
-#: ../clutter/clutter-settings.c:449
+#: ../clutter/clutter-settings.c:487
 msgid "The time between clicks necessary to detect a multiple click"
 msgstr "偵測多重點擊時每個點擊間隔的時間"
 
-#: ../clutter/clutter-settings.c:464
+#: ../clutter/clutter-settings.c:502
 msgid "Double Click Distance"
 msgstr "雙擊間距"
 
-#: ../clutter/clutter-settings.c:465
+#: ../clutter/clutter-settings.c:503
 msgid "The distance between clicks necessary to detect a multiple click"
 msgstr "偵測多重點擊時每個點擊間隔的距離"
 
-#: ../clutter/clutter-settings.c:480
+#: ../clutter/clutter-settings.c:518
 msgid "Drag Threshold"
 msgstr "拖曳距離界限"
 
-#: ../clutter/clutter-settings.c:481
+#: ../clutter/clutter-settings.c:519
 msgid "The distance the cursor should travel before starting to drag"
 msgstr "開始拖曳前游標移動的距離"
 
-#: ../clutter/clutter-settings.c:496 ../clutter/clutter-text.c:3367
+#: ../clutter/clutter-settings.c:534 ../clutter/clutter-text.c:3437
 msgid "Font Name"
 msgstr "字型名稱"
 
-#: ../clutter/clutter-settings.c:497
+#: ../clutter/clutter-settings.c:535
 msgid ""
 "The description of the default font, as one that could be parsed by Pango"
 msgstr "預設字型的描述，等同由 Pango 分析的資料"
 
-#: ../clutter/clutter-settings.c:512
+#: ../clutter/clutter-settings.c:550
 msgid "Font Antialias"
 msgstr "字型平滑化"
 
-#: ../clutter/clutter-settings.c:513
+#: ../clutter/clutter-settings.c:551
 msgid ""
 "Whether to use antialiasing (1 to enable, 0 to disable, and -1 to use the "
 "default)"
 msgstr "是否使用平滑化 (1 為啟用，0 為停用，而 -1 為使用預設值)"
 
-#: ../clutter/clutter-settings.c:529
+#: ../clutter/clutter-settings.c:567 ../clutter/clutter-settings.c:575
 msgid "Font DPI"
 msgstr "字型 DPI"
 
-#: ../clutter/clutter-settings.c:530
+#: ../clutter/clutter-settings.c:568 ../clutter/clutter-settings.c:576
 msgid ""
 "The resolution of the font, in 1024 * dots/inch, or -1 to use the default"
 msgstr "字型的解析度，單位為 1024 * 點數/英吋，或是 -1 為使用預設值"
 
-#: ../clutter/clutter-settings.c:546
+#: ../clutter/clutter-settings.c:592
 msgid "Font Hinting"
 msgstr "字型 Hinting"
 
-#: ../clutter/clutter-settings.c:547
+#: ../clutter/clutter-settings.c:593
 msgid ""
 "Whether to use hinting (1 to enable, 0 to disable and -1 to use the default)"
 msgstr "是否使用 hinting (1 為啟用，0 為停用，而 -1 為使用預設值)"
 
-#: ../clutter/clutter-settings.c:568
+#: ../clutter/clutter-settings.c:614
 msgid "Font Hint Style"
 msgstr "字型 Hint 樣式"
 
-#: ../clutter/clutter-settings.c:569
+#: ../clutter/clutter-settings.c:615
 msgid "The style of hinting (hintnone, hintslight, hintmedium, hintfull)"
 msgstr "hinting 的類型 (hintnone, hintslight, hintmedium, hintfull)"
 
-#: ../clutter/clutter-settings.c:590
+#: ../clutter/clutter-settings.c:636
 msgid "Font Subpixel Order"
 msgstr "字型次像素順序"
 
-#: ../clutter/clutter-settings.c:591
+#: ../clutter/clutter-settings.c:637
 msgid "The type of subpixel antialiasing (none, rgb, bgr, vrgb, vbgr)"
 msgstr "次像素平滑化的類型 (none, rgb, bgr, vrgb, vbgr)"
 
-#: ../clutter/clutter-settings.c:608
+#: ../clutter/clutter-settings.c:654
 msgid "The minimum duration for a long press gesture to be recognized"
 msgstr "辨識長時間按壓手勢的最小持續時間"
 
-#: ../clutter/clutter-settings.c:615
+#: ../clutter/clutter-settings.c:661
+msgid "Window Scaling Factor"
+msgstr "視窗縮放因素"
+
+#: ../clutter/clutter-settings.c:662
+msgid "The scaling factor to be applied to windows"
+msgstr "套用到視窗的縮放因素"
+
+#: ../clutter/clutter-settings.c:669
 msgid "Fontconfig configuration timestamp"
 msgstr "Fontconfig 組態時刻戳記"
 
-#: ../clutter/clutter-settings.c:616
+#: ../clutter/clutter-settings.c:670
 msgid "Timestamp of the current fontconfig configuration"
 msgstr "目前的 fontconfig 組態的時刻戳記"
 
-#: ../clutter/clutter-settings.c:633
+#: ../clutter/clutter-settings.c:687
 msgid "Password Hint Time"
 msgstr "密碼提示時間"
 
-#: ../clutter/clutter-settings.c:634
+#: ../clutter/clutter-settings.c:688
 msgid "How long to show the last input character in hidden entries"
 msgstr "要顯示隱藏項目中最後輸入的字元多長的時間"
 
-#: ../clutter/clutter-shader-effect.c:486
+#: ../clutter/clutter-shader-effect.c:485
 msgid "Shader Type"
 msgstr "著色引擎類型"
 
-#: ../clutter/clutter-shader-effect.c:487
+#: ../clutter/clutter-shader-effect.c:486
 msgid "The type of shader used"
 msgstr "使用的著色引擎類型"
 
@@ -1541,758 +1621,702 @@ msgstr "來源要貼齊的邊緣"
 msgid "The offset in pixels to apply to the constraint"
 msgstr "套用到限制的像素偏移值"
 
-#: ../clutter/clutter-stage.c:1929
+#: ../clutter/clutter-stage.c:1899
 msgid "Fullscreen Set"
 msgstr "全螢幕設定"
 
-#: ../clutter/clutter-stage.c:1930
+#: ../clutter/clutter-stage.c:1900
 msgid "Whether the main stage is fullscreen"
 msgstr "主舞臺是否為全螢幕"
 
-#: ../clutter/clutter-stage.c:1944
+#: ../clutter/clutter-stage.c:1914
 msgid "Offscreen"
 msgstr "螢幕外"
 
-#: ../clutter/clutter-stage.c:1945
+#: ../clutter/clutter-stage.c:1915
 msgid "Whether the main stage should be rendered offscreen"
 msgstr "主舞臺是否應該在幕後潤算"
 
-#: ../clutter/clutter-stage.c:1957 ../clutter/clutter-text.c:3481
+#: ../clutter/clutter-stage.c:1927 ../clutter/clutter-text.c:3551
 msgid "Cursor Visible"
 msgstr "游標可見"
 
-#: ../clutter/clutter-stage.c:1958
+#: ../clutter/clutter-stage.c:1928
 msgid "Whether the mouse pointer is visible on the main stage"
 msgstr "滑鼠指標是可見於主舞臺之上"
 
-#: ../clutter/clutter-stage.c:1972
+#: ../clutter/clutter-stage.c:1942
 msgid "User Resizable"
 msgstr "使用者可變更大小"
 
-#: ../clutter/clutter-stage.c:1973
+#: ../clutter/clutter-stage.c:1943
 msgid "Whether the stage is able to be resized via user interaction"
 msgstr "舞臺是否能夠透過使用者交互作用而調整大小"
 
-#: ../clutter/clutter-stage.c:1988 ../clutter/deprecated/clutter-box.c:260
-#: ../clutter/deprecated/clutter-rectangle.c:273
+#: ../clutter/clutter-stage.c:1958 ../clutter/deprecated/clutter-box.c:256
+#: ../clutter/deprecated/clutter-rectangle.c:270
 msgid "Color"
 msgstr "顏色"
 
-#: ../clutter/clutter-stage.c:1989
+#: ../clutter/clutter-stage.c:1959
 msgid "The color of the stage"
 msgstr "舞臺的顏色"
 
-#: ../clutter/clutter-stage.c:2004
+#: ../clutter/clutter-stage.c:1974
 msgid "Perspective"
 msgstr "視角"
 
-#: ../clutter/clutter-stage.c:2005
+#: ../clutter/clutter-stage.c:1975
 msgid "Perspective projection parameters"
 msgstr "視角投影參數"
 
-#: ../clutter/clutter-stage.c:2020
+#: ../clutter/clutter-stage.c:1990
 msgid "Title"
 msgstr "標題"
 
-#: ../clutter/clutter-stage.c:2021
+#: ../clutter/clutter-stage.c:1991
 msgid "Stage Title"
 msgstr "舞臺標題"
 
-#: ../clutter/clutter-stage.c:2038
+#: ../clutter/clutter-stage.c:2008
 msgid "Use Fog"
 msgstr "使用霧化效果"
 
-#: ../clutter/clutter-stage.c:2039
+#: ../clutter/clutter-stage.c:2009
 msgid "Whether to enable depth cueing"
 msgstr "是否要啟用景深暗示"
 
-#: ../clutter/clutter-stage.c:2055
+#: ../clutter/clutter-stage.c:2025
 msgid "Fog"
 msgstr "霧化"
 
-#: ../clutter/clutter-stage.c:2056
+#: ../clutter/clutter-stage.c:2026
 msgid "Settings for the depth cueing"
 msgstr "景深暗示的設定值"
 
-#: ../clutter/clutter-stage.c:2072
+#: ../clutter/clutter-stage.c:2042
 msgid "Use Alpha"
 msgstr "使用α組成"
 
-#: ../clutter/clutter-stage.c:2073
+#: ../clutter/clutter-stage.c:2043
 msgid "Whether to honour the alpha component of the stage color"
 msgstr "是否要考量舞臺顏色的α組成"
 
-#: ../clutter/clutter-stage.c:2089
+#: ../clutter/clutter-stage.c:2059
 msgid "Key Focus"
 msgstr "按鍵焦點"
 
-#: ../clutter/clutter-stage.c:2090
+#: ../clutter/clutter-stage.c:2060
 msgid "The currently key focused actor"
 msgstr "目前按鍵焦點的參與者"
 
-#: ../clutter/clutter-stage.c:2106
+#: ../clutter/clutter-stage.c:2076
 msgid "No Clear Hint"
 msgstr "無清空提示"
 
-#: ../clutter/clutter-stage.c:2107
+#: ../clutter/clutter-stage.c:2077
 msgid "Whether the stage should clear its contents"
 msgstr "舞臺是否應該清空它的內容"
 
-#: ../clutter/clutter-stage.c:2120
+#: ../clutter/clutter-stage.c:2090
 msgid "Accept Focus"
 msgstr "接受聚焦"
 
-#: ../clutter/clutter-stage.c:2121
+#: ../clutter/clutter-stage.c:2091
 msgid "Whether the stage should accept focus on show"
 msgstr "階段是否應該套用顯示的焦點"
 
-#: ../clutter/clutter-table-layout.c:543
-msgid "Column Number"
-msgstr "欄編號"
-
-#: ../clutter/clutter-table-layout.c:544
-msgid "The column the widget resides in"
-msgstr "視窗元件所在的欄編號"
-
-#: ../clutter/clutter-table-layout.c:551
-msgid "Row Number"
-msgstr "列編號"
-
-#: ../clutter/clutter-table-layout.c:552
-msgid "The row the widget resides in"
-msgstr "視窗元件所在的列編號"
-
-#: ../clutter/clutter-table-layout.c:559
-msgid "Column Span"
-msgstr "合併欄"
-
-#: ../clutter/clutter-table-layout.c:560
-msgid "The number of columns the widget should span"
-msgstr "視窗元件要跨越的欄數"
-
-#: ../clutter/clutter-table-layout.c:567
-msgid "Row Span"
-msgstr "合併列"
-
-#: ../clutter/clutter-table-layout.c:568
-msgid "The number of rows the widget should span"
-msgstr "視窗元件要跨越的列數"
-
-#: ../clutter/clutter-table-layout.c:575
-msgid "Horizontal Expand"
-msgstr "水平擴展"
-
-#: ../clutter/clutter-table-layout.c:576
-msgid "Allocate extra space for the child in horizontal axis"
-msgstr "在水平軸線上配置額外空間給子物件"
-
-#: ../clutter/clutter-table-layout.c:582
-msgid "Vertical Expand"
-msgstr "垂直擴展"
-
-#: ../clutter/clutter-table-layout.c:583
-msgid "Allocate extra space for the child in vertical axis"
-msgstr "在垂直軸線配置額外空間給子物件"
-
-#: ../clutter/clutter-table-layout.c:1638
-msgid "Spacing between columns"
-msgstr "欄之間的間隔"
-
-#: ../clutter/clutter-table-layout.c:1652
-msgid "Spacing between rows"
-msgstr "列之間的間隔"
-
-#: ../clutter/clutter-text-buffer.c:351 ../clutter/clutter-text.c:3402
+#: ../clutter/clutter-text-buffer.c:347 ../clutter/clutter-text.c:3472
 msgid "Text"
 msgstr "文字"
 
-#: ../clutter/clutter-text-buffer.c:352
+#: ../clutter/clutter-text-buffer.c:348
 msgid "The contents of the buffer"
 msgstr "緩衝區的內容"
 
-#: ../clutter/clutter-text-buffer.c:365
+#: ../clutter/clutter-text-buffer.c:361
 msgid "Text length"
 msgstr "文字寬度"
 
-#: ../clutter/clutter-text-buffer.c:366
+#: ../clutter/clutter-text-buffer.c:362
 msgid "Length of the text currently in the buffer"
 msgstr "目前在緩衝區中文字的長度"
 
-#: ../clutter/clutter-text-buffer.c:379
+#: ../clutter/clutter-text-buffer.c:375
 msgid "Maximum length"
 msgstr "最大長度"
 
-#: ../clutter/clutter-text-buffer.c:380
+#: ../clutter/clutter-text-buffer.c:376
 msgid "Maximum number of characters for this entry. Zero if no maximum"
 msgstr "這個項目中字元數目的上限。0 為沒有上限"
 
-#: ../clutter/clutter-text.c:3349
+#: ../clutter/clutter-text.c:3419
 msgid "Buffer"
 msgstr "緩衝區"
 
-#: ../clutter/clutter-text.c:3350
+#: ../clutter/clutter-text.c:3420
 msgid "The buffer for the text"
 msgstr "文字的緩衝區"
 
-#: ../clutter/clutter-text.c:3368
+#: ../clutter/clutter-text.c:3438
 msgid "The font to be used by the text"
 msgstr "文字所用的字型"
 
-#: ../clutter/clutter-text.c:3385
+#: ../clutter/clutter-text.c:3455
 msgid "Font Description"
 msgstr "字型描述"
 
-#: ../clutter/clutter-text.c:3386
+#: ../clutter/clutter-text.c:3456
 msgid "The font description to be used"
 msgstr "所用的字型描述"
 
-#: ../clutter/clutter-text.c:3403
+#: ../clutter/clutter-text.c:3473
 msgid "The text to render"
 msgstr "要潤算的文字"
 
-#: ../clutter/clutter-text.c:3417
+#: ../clutter/clutter-text.c:3487
 msgid "Font Color"
 msgstr "字型顏色"
 
-#: ../clutter/clutter-text.c:3418
+#: ../clutter/clutter-text.c:3488
 msgid "Color of the font used by the text"
 msgstr "文字字型所用的顏色"
 
-#: ../clutter/clutter-text.c:3433
+#: ../clutter/clutter-text.c:3503
 msgid "Editable"
 msgstr "可編輯"
 
-#: ../clutter/clutter-text.c:3434
+#: ../clutter/clutter-text.c:3504
 msgid "Whether the text is editable"
 msgstr "文字是否可以編輯"
 
-#: ../clutter/clutter-text.c:3449
+#: ../clutter/clutter-text.c:3519
 msgid "Selectable"
 msgstr "可選取"
 
-#: ../clutter/clutter-text.c:3450
+#: ../clutter/clutter-text.c:3520
 msgid "Whether the text is selectable"
 msgstr "文字是否可以選取"
 
-#: ../clutter/clutter-text.c:3464
+#: ../clutter/clutter-text.c:3534
 msgid "Activatable"
 msgstr "可啟用"
 
-#: ../clutter/clutter-text.c:3465
+#: ../clutter/clutter-text.c:3535
 msgid "Whether pressing return causes the activate signal to be emitted"
 msgstr "按下輸入鍵是否會造成發出啟用信號"
 
-#: ../clutter/clutter-text.c:3482
+#: ../clutter/clutter-text.c:3552
 msgid "Whether the input cursor is visible"
 msgstr "輸入游標是否可見"
 
-#: ../clutter/clutter-text.c:3496 ../clutter/clutter-text.c:3497
+#: ../clutter/clutter-text.c:3566 ../clutter/clutter-text.c:3567
 msgid "Cursor Color"
 msgstr "游標顏色"
 
-#: ../clutter/clutter-text.c:3512
+#: ../clutter/clutter-text.c:3582
 msgid "Cursor Color Set"
 msgstr "游標顏色設定"
 
-#: ../clutter/clutter-text.c:3513
+#: ../clutter/clutter-text.c:3583
 msgid "Whether the cursor color has been set"
 msgstr "游標顏色是否已設定"
 
-#: ../clutter/clutter-text.c:3528
+#: ../clutter/clutter-text.c:3598
 msgid "Cursor Size"
 msgstr "游標大小"
 
-#: ../clutter/clutter-text.c:3529
+#: ../clutter/clutter-text.c:3599
 msgid "The width of the cursor, in pixels"
 msgstr "游標的像素寬度"
 
-#: ../clutter/clutter-text.c:3545 ../clutter/clutter-text.c:3563
+#: ../clutter/clutter-text.c:3615 ../clutter/clutter-text.c:3633
 msgid "Cursor Position"
 msgstr "游標位置"
 
-#: ../clutter/clutter-text.c:3546 ../clutter/clutter-text.c:3564
+#: ../clutter/clutter-text.c:3616 ../clutter/clutter-text.c:3634
 msgid "The cursor position"
 msgstr "游標的位置"
 
-#: ../clutter/clutter-text.c:3579
+#: ../clutter/clutter-text.c:3649
 msgid "Selection-bound"
 msgstr "選取區邊界"
 
-#: ../clutter/clutter-text.c:3580
+#: ../clutter/clutter-text.c:3650
 msgid "The cursor position of the other end of the selection"
 msgstr "選取區另一端的游標位置"
 
-#: ../clutter/clutter-text.c:3595 ../clutter/clutter-text.c:3596
+#: ../clutter/clutter-text.c:3665 ../clutter/clutter-text.c:3666
 msgid "Selection Color"
 msgstr "選取區顏色"
 
-#: ../clutter/clutter-text.c:3611
+#: ../clutter/clutter-text.c:3681
 msgid "Selection Color Set"
 msgstr "選取區顏色設定"
 
-#: ../clutter/clutter-text.c:3612
+#: ../clutter/clutter-text.c:3682
 msgid "Whether the selection color has been set"
 msgstr "選取區顏色是否已設定"
 
-#: ../clutter/clutter-text.c:3627
+#: ../clutter/clutter-text.c:3697
 msgid "Attributes"
 msgstr "屬性"
 
-#: ../clutter/clutter-text.c:3628
+#: ../clutter/clutter-text.c:3698
 msgid "A list of style attributes to apply to the contents of the actor"
 msgstr "要套用到參與者內容的樣式屬性清單"
 
-#: ../clutter/clutter-text.c:3650
+#: ../clutter/clutter-text.c:3720
 msgid "Use markup"
 msgstr "使用標記"
 
-#: ../clutter/clutter-text.c:3651
+#: ../clutter/clutter-text.c:3721
 msgid "Whether or not the text includes Pango markup"
 msgstr "文字是否包含 Pango 標記"
 
-#: ../clutter/clutter-text.c:3667
+#: ../clutter/clutter-text.c:3737
 msgid "Line wrap"
 msgstr "自動換列"
 
-#: ../clutter/clutter-text.c:3668
+#: ../clutter/clutter-text.c:3738
 msgid "If set, wrap the lines if the text becomes too wide"
 msgstr "設定之後如果文字變得太寬就會換列"
 
-#: ../clutter/clutter-text.c:3683
+#: ../clutter/clutter-text.c:3753
 msgid "Line wrap mode"
 msgstr "自動換列模式"
 
-#: ../clutter/clutter-text.c:3684
+#: ../clutter/clutter-text.c:3754
 msgid "Control how line-wrapping is done"
 msgstr "控制換列行為"
 
-#: ../clutter/clutter-text.c:3699
+#: ../clutter/clutter-text.c:3769
 msgid "Ellipsize"
 msgstr "略寫"
 
-#: ../clutter/clutter-text.c:3700
+#: ../clutter/clutter-text.c:3770
 msgid "The preferred place to ellipsize the string"
 msgstr "略寫字串的偏好位置"
 
-#: ../clutter/clutter-text.c:3716
+#: ../clutter/clutter-text.c:3786
 msgid "Line Alignment"
 msgstr "對齊"
 
-#: ../clutter/clutter-text.c:3717
+#: ../clutter/clutter-text.c:3787
 msgid "The preferred alignment for the string, for multi-line text"
 msgstr "多列文字中偏好的字串對齊方式"
 
-#: ../clutter/clutter-text.c:3733
+#: ../clutter/clutter-text.c:3803
 msgid "Justify"
 msgstr "調整"
 
-#: ../clutter/clutter-text.c:3734
+#: ../clutter/clutter-text.c:3804
 msgid "Whether the text should be justified"
 msgstr "文字是否應該調整"
 
-#: ../clutter/clutter-text.c:3749
+#: ../clutter/clutter-text.c:3819
 msgid "Password Character"
 msgstr "密碼字元"
 
-#: ../clutter/clutter-text.c:3750
+#: ../clutter/clutter-text.c:3820
 msgid "If non-zero, use this character to display the actor's contents"
 msgstr "如果不是空值就使用這個字元以顯示參與者內容"
 
-#: ../clutter/clutter-text.c:3764
+#: ../clutter/clutter-text.c:3834
 msgid "Max Length"
 msgstr "最大長度"
 
-#: ../clutter/clutter-text.c:3765
+#: ../clutter/clutter-text.c:3835
 msgid "Maximum length of the text inside the actor"
 msgstr "參與者內部文字的最大長度值"
 
-#: ../clutter/clutter-text.c:3788
+#: ../clutter/clutter-text.c:3858
 msgid "Single Line Mode"
 msgstr "單列模式"
 
-#: ../clutter/clutter-text.c:3789
+#: ../clutter/clutter-text.c:3859
 msgid "Whether the text should be a single line"
 msgstr "文字是否只應使用一列"
 
-#: ../clutter/clutter-text.c:3803 ../clutter/clutter-text.c:3804
+#: ../clutter/clutter-text.c:3873 ../clutter/clutter-text.c:3874
 msgid "Selected Text Color"
 msgstr "選取的文字顏色"
 
-#: ../clutter/clutter-text.c:3819
+#: ../clutter/clutter-text.c:3889
 msgid "Selected Text Color Set"
 msgstr "選取的文字顏色設定"
 
-#: ../clutter/clutter-text.c:3820
+#: ../clutter/clutter-text.c:3890
 msgid "Whether the selected text color has been set"
 msgstr "選取的文字顏色是否已設定"
 
-#: ../clutter/clutter-timeline.c:594
-#: ../clutter/deprecated/clutter-animation.c:560
+#: ../clutter/clutter-timeline.c:593
+#: ../clutter/deprecated/clutter-animation.c:557
 msgid "Loop"
 msgstr "循環"
 
-#: ../clutter/clutter-timeline.c:595
+#: ../clutter/clutter-timeline.c:594
 msgid "Should the timeline automatically restart"
 msgstr "時間軸應自動重新啟動"
 
-#: ../clutter/clutter-timeline.c:609
+#: ../clutter/clutter-timeline.c:608
 msgid "Delay"
 msgstr "延遲"
 
-#: ../clutter/clutter-timeline.c:610
+#: ../clutter/clutter-timeline.c:609
 msgid "Delay before start"
 msgstr "啟動前延遲"
 
-#: ../clutter/clutter-timeline.c:625
-#: ../clutter/deprecated/clutter-animation.c:544
-#: ../clutter/deprecated/clutter-animator.c:1804
+#: ../clutter/clutter-timeline.c:624
+#: ../clutter/deprecated/clutter-animation.c:541
+#: ../clutter/deprecated/clutter-animator.c:1801
 #: ../clutter/deprecated/clutter-media.c:224
-#: ../clutter/deprecated/clutter-state.c:1523
+#: ../clutter/deprecated/clutter-state.c:1517
 msgid "Duration"
 msgstr "持續時間"
 
-#: ../clutter/clutter-timeline.c:626
+#: ../clutter/clutter-timeline.c:625
 msgid "Duration of the timeline in milliseconds"
 msgstr "時間軸持續期間 (亳秒)"
 
-#: ../clutter/clutter-timeline.c:641
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:528
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:337
+#: ../clutter/clutter-timeline.c:640
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:521
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:330
 msgid "Direction"
 msgstr "方向"
 
-#: ../clutter/clutter-timeline.c:642
+#: ../clutter/clutter-timeline.c:641
 msgid "Direction of the timeline"
 msgstr "時間軸方向"
 
-#: ../clutter/clutter-timeline.c:657
+#: ../clutter/clutter-timeline.c:656
 msgid "Auto Reverse"
 msgstr "自動反轉"
 
-#: ../clutter/clutter-timeline.c:658
+#: ../clutter/clutter-timeline.c:657
 msgid "Whether the direction should be reversed when reaching the end"
 msgstr "到達結尾時是否應反轉方向"
 
-#: ../clutter/clutter-timeline.c:676
+#: ../clutter/clutter-timeline.c:675
 msgid "Repeat Count"
 msgstr "重複計數"
 
-#: ../clutter/clutter-timeline.c:677
+#: ../clutter/clutter-timeline.c:676
 msgid "How many times the timeline should repeat"
 msgstr "時間軸要重複幾次"
 
-#: ../clutter/clutter-timeline.c:691
+#: ../clutter/clutter-timeline.c:690
 msgid "Progress Mode"
 msgstr "進度模式"
 
-#: ../clutter/clutter-timeline.c:692
+#: ../clutter/clutter-timeline.c:691
 msgid "How the timeline should compute the progress"
 msgstr "時間軸要如何計算進度"
 
-#: ../clutter/clutter-transition.c:246
+#: ../clutter/clutter-transition.c:244
 msgid "Interval"
 msgstr "間隔"
 
-#: ../clutter/clutter-transition.c:247
+#: ../clutter/clutter-transition.c:245
 msgid "The interval of values to transition"
 msgstr "轉換的數值間隔"
 
-#: ../clutter/clutter-transition.c:261
+#: ../clutter/clutter-transition.c:259
 msgid "Animatable"
 msgstr "具有動畫"
 
-#: ../clutter/clutter-transition.c:262
+#: ../clutter/clutter-transition.c:260
 msgid "The animatable object"
 msgstr "動畫物件"
 
-#: ../clutter/clutter-transition.c:283
+#: ../clutter/clutter-transition.c:281
 msgid "Remove on Complete"
 msgstr "完成時移除"
 
-#: ../clutter/clutter-transition.c:284
+#: ../clutter/clutter-transition.c:282
 msgid "Detach the transition when completed"
 msgstr "完成時分離轉換"
 
-#: ../clutter/clutter-zoom-action.c:354
+#: ../clutter/clutter-zoom-action.c:365
 msgid "Zoom Axis"
 msgstr "縮放軸線"
 
-#: ../clutter/clutter-zoom-action.c:355
+#: ../clutter/clutter-zoom-action.c:366
 msgid "Constraints the zoom to an axis"
 msgstr "限制縮放至軸線"
 
-#: ../clutter/deprecated/clutter-alpha.c:355
-#: ../clutter/deprecated/clutter-animation.c:575
-#: ../clutter/deprecated/clutter-animator.c:1821
+#: ../clutter/deprecated/clutter-alpha.c:354
+#: ../clutter/deprecated/clutter-animation.c:572
+#: ../clutter/deprecated/clutter-animator.c:1818
 msgid "Timeline"
 msgstr "時間軸"
 
-#: ../clutter/deprecated/clutter-alpha.c:356
+#: ../clutter/deprecated/clutter-alpha.c:355
 msgid "Timeline used by the alpha"
 msgstr "Alpha 使用的時間軸"
 
-#: ../clutter/deprecated/clutter-alpha.c:372
+#: ../clutter/deprecated/clutter-alpha.c:371
 msgid "Alpha value"
 msgstr "Alpha 值"
 
-#: ../clutter/deprecated/clutter-alpha.c:373
+#: ../clutter/deprecated/clutter-alpha.c:372
 msgid "Alpha value as computed by the alpha"
 msgstr "由 alpha 所計算的 Alpha 值"
 
-#: ../clutter/deprecated/clutter-alpha.c:394
-#: ../clutter/deprecated/clutter-animation.c:528
+#: ../clutter/deprecated/clutter-alpha.c:393
+#: ../clutter/deprecated/clutter-animation.c:525
 msgid "Mode"
 msgstr "模式"
 
-#: ../clutter/deprecated/clutter-alpha.c:395
+#: ../clutter/deprecated/clutter-alpha.c:394
 msgid "Progress mode"
 msgstr "進行模式"
 
-#: ../clutter/deprecated/clutter-animation.c:511
+#: ../clutter/deprecated/clutter-animation.c:508
 msgid "Object"
 msgstr "物件"
 
-#: ../clutter/deprecated/clutter-animation.c:512
+#: ../clutter/deprecated/clutter-animation.c:509
 msgid "Object to which the animation applies"
 msgstr "套用動畫的物件"
 
-#: ../clutter/deprecated/clutter-animation.c:529
+#: ../clutter/deprecated/clutter-animation.c:526
 msgid "The mode of the animation"
 msgstr "動畫的模式"
 
-#: ../clutter/deprecated/clutter-animation.c:545
+#: ../clutter/deprecated/clutter-animation.c:542
 msgid "Duration of the animation, in milliseconds"
 msgstr "動畫的持續時間，以毫秒計"
 
-#: ../clutter/deprecated/clutter-animation.c:561
+#: ../clutter/deprecated/clutter-animation.c:558
 msgid "Whether the animation should loop"
 msgstr "動畫是否循環"
 
-#: ../clutter/deprecated/clutter-animation.c:576
+#: ../clutter/deprecated/clutter-animation.c:573
 msgid "The timeline used by the animation"
 msgstr "動畫使用的時間軸"
 
-#: ../clutter/deprecated/clutter-animation.c:592
-#: ../clutter/deprecated/clutter-behaviour.c:241
+#: ../clutter/deprecated/clutter-animation.c:589
+#: ../clutter/deprecated/clutter-behaviour.c:237
 msgid "Alpha"
 msgstr "Alpha"
 
-#: ../clutter/deprecated/clutter-animation.c:593
+#: ../clutter/deprecated/clutter-animation.c:590
 msgid "The alpha used by the animation"
 msgstr "動畫使用的 alpha"
 
-#: ../clutter/deprecated/clutter-animator.c:1805
+#: ../clutter/deprecated/clutter-animator.c:1802
 msgid "The duration of the animation"
 msgstr "動畫的持續時間"
 
-#: ../clutter/deprecated/clutter-animator.c:1822
+#: ../clutter/deprecated/clutter-animator.c:1819
 msgid "The timeline of the animation"
 msgstr "動畫的時間軸"
 
-#: ../clutter/deprecated/clutter-behaviour.c:242
+#: ../clutter/deprecated/clutter-behaviour.c:238
 msgid "Alpha Object to drive the behaviour"
 msgstr "驅動行為的 Alpha 物件"
 
-#: ../clutter/deprecated/clutter-behaviour-depth.c:182
+#: ../clutter/deprecated/clutter-behaviour-depth.c:180
 msgid "Start Depth"
 msgstr "起始色深"
 
-#: ../clutter/deprecated/clutter-behaviour-depth.c:183
+#: ../clutter/deprecated/clutter-behaviour-depth.c:181
 msgid "Initial depth to apply"
 msgstr "套用的初始色深"
 
-#: ../clutter/deprecated/clutter-behaviour-depth.c:198
+#: ../clutter/deprecated/clutter-behaviour-depth.c:196
 msgid "End Depth"
 msgstr "結束色深"
 
-#: ../clutter/deprecated/clutter-behaviour-depth.c:199
+#: ../clutter/deprecated/clutter-behaviour-depth.c:197
 msgid "Final depth to apply"
 msgstr "套用的結束色深"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:401
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:394
 msgid "Start Angle"
 msgstr "起始角度"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:402
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:284
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:395
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:277
 msgid "Initial angle"
 msgstr "初始的角度"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:417
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:410
 msgid "End Angle"
 msgstr "結束角度"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:418
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:302
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:411
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:295
 msgid "Final angle"
 msgstr "最後的角度"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:433
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:426
 msgid "Angle x tilt"
 msgstr "角度 X 斜度"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:434
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:427
 msgid "Tilt of the ellipse around x axis"
 msgstr "圍繞 X 軸的橢圓斜度"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:449
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:442
 msgid "Angle y tilt"
 msgstr "角度 Y 斜度"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:450
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:443
 msgid "Tilt of the ellipse around y axis"
 msgstr "圍繞 Y 軸的橢圓斜度"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:465
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:458
 msgid "Angle z tilt"
 msgstr "角度 Z 斜度"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:466
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:459
 msgid "Tilt of the ellipse around z axis"
 msgstr "圍繞 Z 軸的橢圓斜度"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:482
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:475
 msgid "Width of the ellipse"
 msgstr "橢圓的寬度"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:498
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:491
 msgid "Height of ellipse"
 msgstr "橢圓的高度"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:513
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:506
 msgid "Center"
 msgstr "中心"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:514
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:507
 msgid "Center of ellipse"
 msgstr "橢圓的中心"
 
-#: ../clutter/deprecated/clutter-behaviour-ellipse.c:529
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:338
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:522
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:331
 msgid "Direction of rotation"
 msgstr "旋轉的方向"
 
-#: ../clutter/deprecated/clutter-behaviour-opacity.c:184
+#: ../clutter/deprecated/clutter-behaviour-opacity.c:177
 msgid "Opacity Start"
 msgstr "濁度起始"
 
-#: ../clutter/deprecated/clutter-behaviour-opacity.c:185
+#: ../clutter/deprecated/clutter-behaviour-opacity.c:178
 msgid "Initial opacity level"
 msgstr "初始濁度等級"
 
-#: ../clutter/deprecated/clutter-behaviour-opacity.c:202
+#: ../clutter/deprecated/clutter-behaviour-opacity.c:195
 msgid "Opacity End"
 msgstr "濁度結束"
 
-#: ../clutter/deprecated/clutter-behaviour-opacity.c:203
+#: ../clutter/deprecated/clutter-behaviour-opacity.c:196
 msgid "Final opacity level"
 msgstr "最後的濁度等級"
 
-#: ../clutter/deprecated/clutter-behaviour-path.c:226
+#: ../clutter/deprecated/clutter-behaviour-path.c:222
 msgid "The ClutterPath object representing the path to animate along"
 msgstr "ClutterPath 物件表述動畫所經過的路徑"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:283
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:276
 msgid "Angle Begin"
 msgstr "角度起始"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:301
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:294
 msgid "Angle End"
 msgstr "角度結束"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:319
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:312
 msgid "Axis"
 msgstr "軸線"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:320
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:313
 msgid "Axis of rotation"
 msgstr "旋轉的軸線"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:355
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:348
 msgid "Center X"
 msgstr "中心 X 坐標"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:356
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:349
 msgid "X coordinate of the center of rotation"
 msgstr "旋轉中心的 X 坐標"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:373
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:366
 msgid "Center Y"
 msgstr "中心 Y 坐標"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:374
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:367
 msgid "Y coordinate of the center of rotation"
 msgstr "旋轉中心的 Y 坐標"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:391
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:384
 msgid "Center Z"
 msgstr "中心 Z 坐標"
 
-#: ../clutter/deprecated/clutter-behaviour-rotate.c:392
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:385
 msgid "Z coordinate of the center of rotation"
 msgstr "旋轉中心的 Z 坐標"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:226
+#: ../clutter/deprecated/clutter-behaviour-scale.c:222
 msgid "X Start Scale"
 msgstr "X 軸起始伸縮"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:227
+#: ../clutter/deprecated/clutter-behaviour-scale.c:223
 msgid "Initial scale on the X axis"
 msgstr "在 X 軸上的初始伸縮"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:245
+#: ../clutter/deprecated/clutter-behaviour-scale.c:241
 msgid "X End Scale"
 msgstr "X 軸結束伸縮"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:246
+#: ../clutter/deprecated/clutter-behaviour-scale.c:242
 msgid "Final scale on the X axis"
 msgstr "在 X 軸上的最後伸縮"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:264
+#: ../clutter/deprecated/clutter-behaviour-scale.c:260
 msgid "Y Start Scale"
 msgstr "Y 軸起始伸縮"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:265
+#: ../clutter/deprecated/clutter-behaviour-scale.c:261
 msgid "Initial scale on the Y axis"
 msgstr "在 Y 軸上的初始伸縮"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:283
+#: ../clutter/deprecated/clutter-behaviour-scale.c:279
 msgid "Y End Scale"
 msgstr "Y 軸結束伸縮"
 
-#: ../clutter/deprecated/clutter-behaviour-scale.c:284
+#: ../clutter/deprecated/clutter-behaviour-scale.c:280
 msgid "Final scale on the Y axis"
 msgstr "在 Y 軸上的最後伸縮"
 
-#: ../clutter/deprecated/clutter-box.c:261
+#: ../clutter/deprecated/clutter-box.c:257
 msgid "The background color of the box"
 msgstr "方框的背景顏色"
 
-#: ../clutter/deprecated/clutter-box.c:274
+#: ../clutter/deprecated/clutter-box.c:270
 msgid "Color Set"
 msgstr "顏色集"
 
-#: ../clutter/deprecated/clutter-cairo-texture.c:597
+#: ../clutter/deprecated/clutter-cairo-texture.c:593
 msgid "Surface Width"
 msgstr "表面寬度"
 
-#: ../clutter/deprecated/clutter-cairo-texture.c:598
+#: ../clutter/deprecated/clutter-cairo-texture.c:594
 msgid "The width of the Cairo surface"
 msgstr "Cairo 表面的寬度"
 
-#: ../clutter/deprecated/clutter-cairo-texture.c:615
+#: ../clutter/deprecated/clutter-cairo-texture.c:611
 msgid "Surface Height"
 msgstr "表面高度"
 
-#: ../clutter/deprecated/clutter-cairo-texture.c:616
+#: ../clutter/deprecated/clutter-cairo-texture.c:612
 msgid "The height of the Cairo surface"
 msgstr "Cairo 表面的高度"
 
-#: ../clutter/deprecated/clutter-cairo-texture.c:636
+#: ../clutter/deprecated/clutter-cairo-texture.c:632
 msgid "Auto Resize"
 msgstr "自動調整大小"
 
-#: ../clutter/deprecated/clutter-cairo-texture.c:637
+#: ../clutter/deprecated/clutter-cairo-texture.c:633
 msgid "Whether the surface should match the allocation"
 msgstr "表面是否應符合配置"
 
@@ -2364,379 +2388,431 @@ msgstr "緩衝區的填充等級"
 msgid "The duration of the stream, in seconds"
 msgstr "以秒計數的串流持續時間"
 
-#: ../clutter/deprecated/clutter-rectangle.c:274
+#: ../clutter/deprecated/clutter-rectangle.c:271
 msgid "The color of the rectangle"
 msgstr "矩形的顏色"
 
-#: ../clutter/deprecated/clutter-rectangle.c:287
+#: ../clutter/deprecated/clutter-rectangle.c:284
 msgid "Border Color"
 msgstr "邊框顏色"
 
-#: ../clutter/deprecated/clutter-rectangle.c:288
+#: ../clutter/deprecated/clutter-rectangle.c:285
 msgid "The color of the border of the rectangle"
 msgstr "矩形邊框的顏色"
 
-#: ../clutter/deprecated/clutter-rectangle.c:303
+#: ../clutter/deprecated/clutter-rectangle.c:300
 msgid "Border Width"
 msgstr "邊框寬度"
 
-#: ../clutter/deprecated/clutter-rectangle.c:304
+#: ../clutter/deprecated/clutter-rectangle.c:301
 msgid "The width of the border of the rectangle"
 msgstr "矩形邊框的寬度"
 
-#: ../clutter/deprecated/clutter-rectangle.c:318
+#: ../clutter/deprecated/clutter-rectangle.c:315
 msgid "Has Border"
 msgstr "具有邊框"
 
-#: ../clutter/deprecated/clutter-rectangle.c:319
+#: ../clutter/deprecated/clutter-rectangle.c:316
 msgid "Whether the rectangle should have a border"
 msgstr "矩形是否應該有邊框"
 
-#: ../clutter/deprecated/clutter-shader.c:261
+#: ../clutter/deprecated/clutter-shader.c:257
 msgid "Vertex Source"
 msgstr "下角著色來源"
 
-#: ../clutter/deprecated/clutter-shader.c:262
+#: ../clutter/deprecated/clutter-shader.c:258
 msgid "Source of vertex shader"
 msgstr "下角著色引擎的來源"
 
-#: ../clutter/deprecated/clutter-shader.c:278
+#: ../clutter/deprecated/clutter-shader.c:274
 msgid "Fragment Source"
 msgstr "片段著色來源"
 
-#: ../clutter/deprecated/clutter-shader.c:279
+#: ../clutter/deprecated/clutter-shader.c:275
 msgid "Source of fragment shader"
 msgstr "片段著色引擎的來源"
 
-#: ../clutter/deprecated/clutter-shader.c:296
+#: ../clutter/deprecated/clutter-shader.c:292
 msgid "Compiled"
 msgstr "已編譯"
 
-#: ../clutter/deprecated/clutter-shader.c:297
+#: ../clutter/deprecated/clutter-shader.c:293
 msgid "Whether the shader is compiled and linked"
 msgstr "陰影是否已被編譯和鏈結"
 
-#: ../clutter/deprecated/clutter-shader.c:314
+#: ../clutter/deprecated/clutter-shader.c:310
 msgid "Whether the shader is enabled"
 msgstr "陰影是否已被啟用"
 
-#: ../clutter/deprecated/clutter-shader.c:525
+#: ../clutter/deprecated/clutter-shader.c:521
 #, c-format
 msgid "%s compilation failed: %s"
 msgstr "%s 編譯失敗：%s"
 
-#: ../clutter/deprecated/clutter-shader.c:526
+#: ../clutter/deprecated/clutter-shader.c:522
 msgid "Vertex shader"
 msgstr "下角著色引擎"
 
-#: ../clutter/deprecated/clutter-shader.c:527
+#: ../clutter/deprecated/clutter-shader.c:523
 msgid "Fragment shader"
 msgstr "片段著色引擎"
 
-#: ../clutter/deprecated/clutter-state.c:1505
+#: ../clutter/deprecated/clutter-state.c:1499
 msgid "State"
 msgstr "狀態"
 
-#: ../clutter/deprecated/clutter-state.c:1506
+#: ../clutter/deprecated/clutter-state.c:1500
 msgid "Currently set state, (transition to this state might not be complete)"
 msgstr "目前設定狀態，(有可能尚未完全轉換到這個狀態)"
 
-#: ../clutter/deprecated/clutter-state.c:1524
+#: ../clutter/deprecated/clutter-state.c:1518
 msgid "Default transition duration"
 msgstr "預設轉換時間"
 
-#: ../clutter/deprecated/clutter-texture.c:994
+#: ../clutter/deprecated/clutter-table-layout.c:543
+msgid "Column Number"
+msgstr "欄編號"
+
+#: ../clutter/deprecated/clutter-table-layout.c:544
+msgid "The column the widget resides in"
+msgstr "視窗元件所在的欄編號"
+
+#: ../clutter/deprecated/clutter-table-layout.c:551
+msgid "Row Number"
+msgstr "列編號"
+
+#: ../clutter/deprecated/clutter-table-layout.c:552
+msgid "The row the widget resides in"
+msgstr "視窗元件所在的列編號"
+
+#: ../clutter/deprecated/clutter-table-layout.c:559
+msgid "Column Span"
+msgstr "合併欄"
+
+#: ../clutter/deprecated/clutter-table-layout.c:560
+msgid "The number of columns the widget should span"
+msgstr "視窗元件要跨越的欄數"
+
+#: ../clutter/deprecated/clutter-table-layout.c:567
+msgid "Row Span"
+msgstr "合併列"
+
+#: ../clutter/deprecated/clutter-table-layout.c:568
+msgid "The number of rows the widget should span"
+msgstr "視窗元件要跨越的列數"
+
+#: ../clutter/deprecated/clutter-table-layout.c:575
+msgid "Horizontal Expand"
+msgstr "水平擴展"
+
+#: ../clutter/deprecated/clutter-table-layout.c:576
+msgid "Allocate extra space for the child in horizontal axis"
+msgstr "在水平軸線上配置額外空間給子物件"
+
+#: ../clutter/deprecated/clutter-table-layout.c:582
+msgid "Vertical Expand"
+msgstr "垂直擴展"
+
+#: ../clutter/deprecated/clutter-table-layout.c:583
+msgid "Allocate extra space for the child in vertical axis"
+msgstr "在垂直軸線配置額外空間給子物件"
+
+#: ../clutter/deprecated/clutter-table-layout.c:1638
+msgid "Spacing between columns"
+msgstr "欄之間的間隔"
+
+#: ../clutter/deprecated/clutter-table-layout.c:1654
+msgid "Spacing between rows"
+msgstr "列之間的間隔"
+
+#: ../clutter/deprecated/clutter-texture.c:992
 msgid "Sync size of actor"
 msgstr "同步參與者的大小"
 
-#: ../clutter/deprecated/clutter-texture.c:995
+#: ../clutter/deprecated/clutter-texture.c:993
 msgid "Auto sync size of actor to underlying pixbuf dimensions"
 msgstr "參與者大小自動與下層的像素緩衝區尺寸同步"
 
-#: ../clutter/deprecated/clutter-texture.c:1002
+#: ../clutter/deprecated/clutter-texture.c:1000
 msgid "Disable Slicing"
 msgstr "停用切片"
 
-#: ../clutter/deprecated/clutter-texture.c:1003
+#: ../clutter/deprecated/clutter-texture.c:1001
 msgid ""
 "Forces the underlying texture to be singular and not made of smaller space "
 "saving individual textures"
 msgstr "強制下層的花紋為單體，而不是由小空間所儲存的個別花紋。"
 
-#: ../clutter/deprecated/clutter-texture.c:1012
+#: ../clutter/deprecated/clutter-texture.c:1010
 msgid "Tile Waste"
 msgstr "並排耗費"
 
-#: ../clutter/deprecated/clutter-texture.c:1013
+#: ../clutter/deprecated/clutter-texture.c:1011
 msgid "Maximum waste area of a sliced texture"
 msgstr "切片花紋的最大耗費區域"
 
-#: ../clutter/deprecated/clutter-texture.c:1021
+#: ../clutter/deprecated/clutter-texture.c:1019
 msgid "Horizontal repeat"
 msgstr "水平重複"
 
-#: ../clutter/deprecated/clutter-texture.c:1022
+#: ../clutter/deprecated/clutter-texture.c:1020
 msgid "Repeat the contents rather than scaling them horizontally"
 msgstr "重複內容而非將其水平伸展。"
 
-#: ../clutter/deprecated/clutter-texture.c:1029
+#: ../clutter/deprecated/clutter-texture.c:1027
 msgid "Vertical repeat"
 msgstr "垂直重複"
 
-#: ../clutter/deprecated/clutter-texture.c:1030
+#: ../clutter/deprecated/clutter-texture.c:1028
 msgid "Repeat the contents rather than scaling them vertically"
 msgstr "重複內容而非將其垂直伸展。"
 
-#: ../clutter/deprecated/clutter-texture.c:1037
+#: ../clutter/deprecated/clutter-texture.c:1035
 msgid "Filter Quality"
 msgstr "過濾器品質"
 
-#: ../clutter/deprecated/clutter-texture.c:1038
+#: ../clutter/deprecated/clutter-texture.c:1036
 msgid "Rendering quality used when drawing the texture"
 msgstr "繪製花紋時所用的潤算品質。"
 
-#: ../clutter/deprecated/clutter-texture.c:1046
+#: ../clutter/deprecated/clutter-texture.c:1044
 msgid "Pixel Format"
 msgstr "像素格式"
 
-#: ../clutter/deprecated/clutter-texture.c:1047
+#: ../clutter/deprecated/clutter-texture.c:1045
 msgid "The Cogl pixel format to use"
 msgstr "所用的 Cogl 像素格式。"
 
-#: ../clutter/deprecated/clutter-texture.c:1055
-#: ../clutter/wayland/clutter-wayland-surface.c:449
+#: ../clutter/deprecated/clutter-texture.c:1053
+#: ../clutter/wayland/clutter-wayland-surface.c:445
 msgid "Cogl Texture"
 msgstr "Cogl 花紋"
 
-#: ../clutter/deprecated/clutter-texture.c:1056
-#: ../clutter/wayland/clutter-wayland-surface.c:450
+#: ../clutter/deprecated/clutter-texture.c:1054
+#: ../clutter/wayland/clutter-wayland-surface.c:446
 msgid "The underlying Cogl texture handle used to draw this actor"
 msgstr "用來繪製這個參與者的下層 C0gl 花紋控柄"
 
-#: ../clutter/deprecated/clutter-texture.c:1063
+#: ../clutter/deprecated/clutter-texture.c:1061
 msgid "Cogl Material"
 msgstr "Cogl 材質"
 
-#: ../clutter/deprecated/clutter-texture.c:1064
+#: ../clutter/deprecated/clutter-texture.c:1062
 msgid "The underlying Cogl material handle used to draw this actor"
 msgstr "用來繪製這個參與者下層 Cogl 材質控柄"
 
-#: ../clutter/deprecated/clutter-texture.c:1083
+#: ../clutter/deprecated/clutter-texture.c:1081
 msgid "The path of the file containing the image data"
 msgstr "包含影像資料檔案的路徑"
 
-#: ../clutter/deprecated/clutter-texture.c:1090
+#: ../clutter/deprecated/clutter-texture.c:1088
 msgid "Keep Aspect Ratio"
 msgstr "維持外觀比率"
 
-#: ../clutter/deprecated/clutter-texture.c:1091
+#: ../clutter/deprecated/clutter-texture.c:1089
 msgid ""
 "Keep the aspect ratio of the texture when requesting the preferred width or "
 "height"
 msgstr "要求偏好的寬度或高度時保持花紋的外觀比率"
 
-#: ../clutter/deprecated/clutter-texture.c:1119
+#: ../clutter/deprecated/clutter-texture.c:1117
 msgid "Load asynchronously"
 msgstr "非同步載入"
 
-#: ../clutter/deprecated/clutter-texture.c:1120
+#: ../clutter/deprecated/clutter-texture.c:1118
 msgid ""
 "Load files inside a thread to avoid blocking when loading images from disk"
 msgstr "從磁碟載入影像時於執行緒內載入檔案以避免阻塞。"
 
-#: ../clutter/deprecated/clutter-texture.c:1138
+#: ../clutter/deprecated/clutter-texture.c:1136
 msgid "Load data asynchronously"
 msgstr "同步載入資料"
 
-#: ../clutter/deprecated/clutter-texture.c:1139
+#: ../clutter/deprecated/clutter-texture.c:1137
 msgid ""
 "Decode image data files inside a thread to reduce blocking when loading "
 "images from disk"
 msgstr "從磁碟載入影像時於執行緒內解碼影像資料檔案以降低阻塞。"
 
-#: ../clutter/deprecated/clutter-texture.c:1165
+#: ../clutter/deprecated/clutter-texture.c:1163
 msgid "Pick With Alpha"
 msgstr "揀取時附帶α"
 
-#: ../clutter/deprecated/clutter-texture.c:1166
+#: ../clutter/deprecated/clutter-texture.c:1164
 msgid "Shape actor with alpha channel when picking"
 msgstr "揀取時附帶參與者的α通道狀態"
 
-#: ../clutter/deprecated/clutter-texture.c:1599
-#: ../clutter/deprecated/clutter-texture.c:1994
-#: ../clutter/deprecated/clutter-texture.c:2090
-#: ../clutter/deprecated/clutter-texture.c:2388
+#: ../clutter/deprecated/clutter-texture.c:1597
+#: ../clutter/deprecated/clutter-texture.c:1992
+#: ../clutter/deprecated/clutter-texture.c:2088
+#: ../clutter/deprecated/clutter-texture.c:2386
 #, c-format
 msgid "Failed to load the image data"
 msgstr "無法載入圖片資料"
 
-#: ../clutter/deprecated/clutter-texture.c:1758
+#: ../clutter/deprecated/clutter-texture.c:1756
 #, c-format
 msgid "YUV textures are not supported"
 msgstr "不支援 YUV 材質"
 
-#: ../clutter/deprecated/clutter-texture.c:1767
+#: ../clutter/deprecated/clutter-texture.c:1765
 #, c-format
 msgid "YUV2 textues are not supported"
 msgstr "不支援 YUV2 材質"
 
-#: ../clutter/evdev/clutter-input-device-evdev.c:159
-msgid "sysfs Path"
-msgstr "sysfs 路徑"
-
-#: ../clutter/evdev/clutter-input-device-evdev.c:160
-msgid "Path of the device in sysfs"
-msgstr "sysfs 裝置的路徑"
-
-#: ../clutter/evdev/clutter-input-device-evdev.c:175
-msgid "Device Path"
-msgstr "裝置路徑"
-
-#: ../clutter/evdev/clutter-input-device-evdev.c:176
-msgid "Path of the device node"
-msgstr "裝置節點的路徑"
-
-#: ../clutter/gdk/clutter-backend-gdk.c:287
+#: ../clutter/gdk/clutter-backend-gdk.c:289
 #, c-format
 msgid "Could not find a suitable CoglWinsys for a GdkDisplay of type %s"
 msgstr "找不到用於類型 %s 的 GdkDisplay 合適的 CoglWinsys"
 
-#: ../clutter/wayland/clutter-wayland-surface.c:423
+#: ../clutter/wayland/clutter-wayland-surface.c:419
 msgid "Surface"
 msgstr "表面"
 
-#: ../clutter/wayland/clutter-wayland-surface.c:424
+#: ../clutter/wayland/clutter-wayland-surface.c:420
 msgid "The underlying wayland surface"
 msgstr "底層 wayland 表面"
 
-#: ../clutter/wayland/clutter-wayland-surface.c:431
+#: ../clutter/wayland/clutter-wayland-surface.c:427
 msgid "Surface width"
 msgstr "表面寬度"
 
-#: ../clutter/wayland/clutter-wayland-surface.c:432
+#: ../clutter/wayland/clutter-wayland-surface.c:428
 msgid "The width of the underlying wayland surface"
 msgstr "底層 wayland 表面的寬度"
 
-#: ../clutter/wayland/clutter-wayland-surface.c:440
+#: ../clutter/wayland/clutter-wayland-surface.c:436
 msgid "Surface height"
 msgstr "表面高度"
 
-#: ../clutter/wayland/clutter-wayland-surface.c:441
+#: ../clutter/wayland/clutter-wayland-surface.c:437
 msgid "The height of the underlying wayland surface"
 msgstr "底層 wayland 表面的高度"
 
-#: ../clutter/x11/clutter-backend-x11.c:512
+#: ../clutter/x11/clutter-backend-x11.c:488
 msgid "X display to use"
 msgstr "所用的 X 顯示"
 
-#: ../clutter/x11/clutter-backend-x11.c:518
+#: ../clutter/x11/clutter-backend-x11.c:494
 msgid "X screen to use"
 msgstr "所用的 X 螢幕"
 
-#: ../clutter/x11/clutter-backend-x11.c:523
+#: ../clutter/x11/clutter-backend-x11.c:499
 msgid "Make X calls synchronous"
 msgstr "使 X 呼叫同步"
 
-#: ../clutter/x11/clutter-backend-x11.c:530
+#: ../clutter/x11/clutter-backend-x11.c:506
 msgid "Disable XInput support"
 msgstr "停用 XInput 支援"
 
-#: ../clutter/x11/clutter-keymap-x11.c:322
+#: ../clutter/x11/clutter-keymap-x11.c:458
 msgid "The Clutter backend"
 msgstr "Clutter 後端程式"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:539
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:534
 msgid "Pixmap"
 msgstr "像素圖"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:540
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:535
 msgid "The X11 Pixmap to be bound"
 msgstr "關連的 X11 像素圖"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:548
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:543
 msgid "Pixmap width"
 msgstr "像素圖寬度"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:549
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:544
 msgid "The width of the pixmap bound to this texture"
 msgstr "關連這個花紋的像素圖寬度"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:557
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:552
 msgid "Pixmap height"
 msgstr "像素圖高度"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:558
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:553
 msgid "The height of the pixmap bound to this texture"
 msgstr "關連這個花紋的像素圖高度"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:566
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:561
 msgid "Pixmap Depth"
 msgstr "像素圖深度"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:567
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:562
 msgid "The depth (in number of bits) of the pixmap bound to this texture"
 msgstr "與這個花紋相關連的像素圖深度 (以位元數計算)"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:575
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:570
 msgid "Automatic Updates"
 msgstr "自動更新"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:576
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:571
 msgid "If the texture should be kept in sync with any pixmap changes."
 msgstr "花紋是否應該保持與任何像素圖變更同步。"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:584
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:579
 msgid "Window"
 msgstr "視窗"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:585
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:580
 msgid "The X11 Window to be bound"
 msgstr "相關連的 X11 視窗"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:593
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:588
 msgid "Window Redirect Automatic"
 msgstr "視窗自動重新導向"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:594
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:589
 msgid "If composite window redirects are set to Automatic (or Manual if false)"
 msgstr "合成視窗是否設定為自動重新導向 (或是設為手動)"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:604
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:599
 msgid "Window Mapped"
 msgstr "視窗已映射"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:605
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:600
 msgid "If window is mapped"
 msgstr "視窗是否已映射"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:614
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:609
 msgid "Destroyed"
 msgstr "已銷毀"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:615
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:610
 msgid "If window has been destroyed"
 msgstr "視窗是否已銷毀"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:623
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:618
 msgid "Window X"
 msgstr "視窗 X 坐標"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:624
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:619
 msgid "X position of window on screen according to X11"
 msgstr "根據 X11 所得螢幕上視窗的 X 坐標"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:632
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:627
 msgid "Window Y"
 msgstr "視窗 Y 坐標"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:633
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:628
 msgid "Y position of window on screen according to X11"
 msgstr "根據 X11 所得螢幕上視窗的 Y 坐標"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:640
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:635
 msgid "Window Override Redirect"
 msgstr "視窗覆寫重新導向"
 
-#: ../clutter/x11/clutter-x11-texture-pixmap.c:641
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:636
 msgid "If this is an override-redirect window"
 msgstr "是否這是個覆寫重新導向的視窗"
+
+#~ msgid "sysfs Path"
+#~ msgstr "sysfs 路徑"
+
+#~ msgid "Path of the device in sysfs"
+#~ msgstr "sysfs 裝置的路徑"
+
+#~ msgid "Device Path"
+#~ msgstr "裝置路徑"
+
+#~ msgid "Path of the device node"
+#~ msgstr "裝置節點的路徑"
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 48f253170..65b474a49 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,14 +1,3 @@
-SUBDIRS = accessibility data conform interactive micro-bench performance
+SUBDIRS = accessibility conform interactive micro-bench performance
 
-EXTRA_DIST = README
-
-test conform:
-	( cd ./conform && $(MAKE) $(AM_MAKEFLAGS) $@ ) || exit $$?
-
-test-report full-report:
-	( cd ./conform && $(MAKE) $(AM_MAKEFLAGS) $@ ) || exit $$?
-
-.PHONY: test conform test-report full-report
-
-# run make test as part of make check
-check-local: test
+EXTRA_DIST = README clutter-1.0.suppressions
diff --git a/tests/README b/tests/README
index 563fa4d8b..b5665e6ab 100644
--- a/tests/README
+++ b/tests/README
@@ -1,8 +1,9 @@
 Outline of test categories:
 
 The conform/ tests should be non-interactive unit-tests that verify a single
-feature is behaving as documented. See conform/ADDING_NEW_TESTS for more
-details.
+feature is behaving as documented. Use the GLib and Clutter test API and macros
+to write the test units. The conformance test suites are meant to be used with
+continuous integration builds.
 
 The performance/ tests are performance tests, both focused tests testing single
 metrics and larger tests. These tests are used to report one or more
@@ -17,24 +18,21 @@ do fps reporting.
 The interactive/ tests are any tests whose status can not be determined without
 a user looking at some visual output, or providing some manual input etc. This
 covers most of the original Clutter tests. Ideally some of these tests will be
-migrated into the conformance/ directory so they can be used in automated
-nightly tests.
+migrated into the conform/ directory.
 
 The accessibility/ tests are tests created to test the accessibility support of
 clutter, testing some of the atk interfaces.
 
-The data/ directory contains optional data (like images and ClutterScript
-definitions) that can be referenced by a test.
-
 Other notes:
 
 • All tests should ideally include a detailed description in the source
 explaining exactly what the test is for, how the test was designed to work,
-and possibly a rationale for the approach taken for testing.
+and possibly a rationale for the approach taken for testing. Tests for specific
+bugs should reference the bug report URL or number.
 
 • When running tests under Valgrind, you should follow the instructions
 available here:
 
-        http://live.gnome.org/Valgrind
+        https://wiki.gnome.org/Valgrind
 
-and also use the suppression file available inside the data/ directory.
+and also use the suppression file available in the Git repository.
diff --git a/tests/accessibility/Makefile.am b/tests/accessibility/Makefile.am
index 4c7a376d4..df713bd5d 100644
--- a/tests/accessibility/Makefile.am
+++ b/tests/accessibility/Makefile.am
@@ -7,18 +7,20 @@ common_sources = \
 	cally-examples-util.c	\
 	cally-examples-util.h
 
-INCLUDES = \
+AM_CPPFLAGS = \
+	-DPREFIXDIR=\"$(libdir)\" \
+	-DCLUTTER_DISABLE_DEPRECATION_WARNINGS \
+	-DGLIB_DISABLE_DEPRECATION_WARNINGS \
 	-I$(top_srcdir)	\
 	-I$(top_builddir) \
 	-I$(top_srcdir)/clutter \
 	-I$(top_builddir)/clutter \
 	-I$(top_srcdir)/tests/accessibility
 
-AM_CPPFLAGS = -DPREFIXDIR=\"$(libdir)\" -DCLUTTER_DISABLE_DEPRECATION_WARNINGS -DGLIB_DISABLE_DEPRECATION_WARNINGS
 AM_CFLAGS = $(CLUTTER_CFLAGS) $(MAINTAINER_CFLAGS)
 LDADD = $(common_ldadd) $(CLUTTER_LIBS)
 
-noinst_PROGRAMS = \
+check_PROGRAMS = \
 	cally-atkcomponent-example	\
 	cally-atkeditabletext-example   \
 	cally-atkevents-example		\
diff --git a/tests/data/clutter-1.0.suppressions b/tests/clutter-1.0.suppressions
similarity index 100%
rename from tests/data/clutter-1.0.suppressions
rename to tests/clutter-1.0.suppressions
diff --git a/tests/conform/ADDING_NEW_TESTS b/tests/conform/ADDING_NEW_TESTS
deleted file mode 100644
index 4a5a5dc5f..000000000
--- a/tests/conform/ADDING_NEW_TESTS
+++ /dev/null
@@ -1,65 +0,0 @@
-How to add new units to the Clutter Conformance test suite
--------------------------------------------------------------------------------
-
-If the new unit is not logically part of an existing file, you should create a
-new source file and add it to the build. The built files are listed in the
-Makefile.am template. Please, respect the sections already available there.
-
-When creating a new file, you should include "test-conform-common.h", as well
-as <clutter/clutter.h> and <glib.h>.
-
-Each new test unit should be contained in a function named following this
-pattern:
-
-  void
-  <section>_<unit> (void)
-  {
-  }
-
-For instance:
-
-  void
-  actor_allocation_changes (void)
-  {
-    /* test allocation changes */
-  }
-
-  void
-  rectangle_border (void)
-  {
-    /* test ClutterRectangle's border property */
-  }
-
-After adding the test unit, edit test-conform-main.c and add the unit to the
-list of tests, by using one of these three macros:
-
-  • TEST_CONFORM_SIMPLE (path, function_name);
-
-    @path is the unit path in the suite, and it's used to generate the
-          executable wrapper for running the unit as a stand-alone binary
-          and for the HTML report.
-    @function_name is the name of the function containing the newly added
-          test unit.
-
-    This is the simple form of test unit, and it will always be run.
-
-  • TEST_CONFORM_SKIP (condition, path, function_name);
-
-    @condition is used to decide whether to run the unit or not.
-
-    This macro will check @condition on start, and if it evaluates to TRUE
-    then the @function_name will be called and the unit executed; otherwise
-    the test will automatically succeed.
-
-  • TEST_CONFORM_TODO (path, function_name);
-
-    This macro will execute @function_name and will succeed if the unit
-    fails. This macro should be used for tests that are known to fail.
-
-Notes:
-
-  • Do not call clutter_init() in your units; initialization is handled
-    by the conformance test suite itself.
-
-  • All units are invoked in a new process, to prevent clobbering the
-    state.
diff --git a/tests/conform/Makefile.am b/tests/conform/Makefile.am
index 210cbe085..4568d1794 100644
--- a/tests/conform/Makefile.am
+++ b/tests/conform/Makefile.am
@@ -1,329 +1,94 @@
-include $(top_srcdir)/build/autotools/Makefile.am.silent
+include $(top_srcdir)/build/autotools/glib-tap.mk
 
-NULL =
+AM_CFLAGS = -g $(CLUTTER_CFLAGS) $(MAINTAINER_CFLAGS)
+LDADD = $(top_builddir)/clutter/libclutter-1.0.la $(CLUTTER_LIBS) -lm
+AM_LDFLAGS = -export-dynamic
+AM_CPPFLAGS = \
+	-DG_LOG_DOMAIN=\"Clutter-Conform\"	\
+	-I$(top_srcdir) 			\
+	-I$(top_builddir)			\
+	-DCOGL_DISABLE_DEPRECATION_WARNINGS	\
+	$(CLUTTER_DEPRECATED_CFLAGS)		\
+	$(CLUTTER_DEBUG_CFLAGS)			\
+	$(CLUTTER_PROFILE_CFLAGS)
 
-noinst_PROGRAMS = test-conformance
-
-# the common sources
-common_sources = \
-	test-conform-common.h 	\
-	test-conform-common.c 	\
-	test-conform-main.c	\
+# Basic actor API
+actor_tests = \
+	actor-anchors \
+	actor-destroy \
+	actor-graph \
+	actor-invariants \
+	actor-iter \
+	actor-layout \
+	actor-meta \
+	actor-offscreen-limit-max-size \
+	actor-offscreen-redirect \
+	actor-paint-opacity \
+	actor-pick \
+	actor-shader-effect \
+	actor-size \
 	$(NULL)
 
-# the unit-specific sources; please: keep all sections in alphabetical order!
-units_sources =
-
-# animation tests
-units_sources += \
-	animator.c			\
-	behaviours.c			\
-	score.c				\
-	state.c				\
-	timeline.c			\
-	timeline-interpolate.c 		\
-	timeline-progress.c		\
-	timeline-rewind.c 		\
+# Actor classes
+classes_tests = \
+	text \
 	$(NULL)
 
-# cogl tests
-units_sources += \
-	test-cogl-fixed.c 			\
-	test-cogl-materials.c			\
-	test-cogl-viewport.c			\
-	test-cogl-multitexture.c        	\
-	test-cogl-npot-texture.c        	\
-	test-cogl-object.c			\
-	test-cogl-premult.c			\
-	test-cogl-readpixels.c			\
-	test-cogl-texture-get-set-data.c 	\
-	test-cogl-texture-mipmaps.c     	\
-	test-cogl-texture-pixmap-x11.c  	\
-	test-cogl-texture-rectangle.c   	\
-	test-cogl-atlas-migration.c		\
-	test-cogl-vertex-buffer-contiguous.c 	\
-	test-cogl-vertex-buffer-interleved.c 	\
-	test-cogl-vertex-buffer-mutability.c 	\
+# General API
+general_tests = \
+	binding-pool \
+	color \
+	events-touch \
+	interval \
+	model \
+	script-parser \
+	units \
 	$(NULL)
 
-# actors tests
-units_sources += \
-	actor-anchors.c                	\
-	actor-graph.c			\
-	actor-destroy.c			\
-	actor-invariants.c 		\
-	actor-iter.c			\
-	actor-layout.c			\
-	actor-offscreen-redirect.c	\
-	actor-paint-opacity.c 		\
-	actor-pick.c 			\
-	actor-shader-effect.c		\
-	actor-size.c			\
-	binding-pool.c			\
-	cairo-texture.c    		\
-	group.c				\
-	interval.c			\
-	path.c 				\
-	rectangle.c 			\
-	texture-fbo.c			\
-	texture.c			\
-        text-cache.c               	\
-        text.c             		\
+# Test for deprecated functionality
+deprecated_tests = \
+	animator \
+	behaviours \
+	group \
+	rectangle \
+	texture \
 	$(NULL)
 
-# objects tests
-units_sources += \
-	color.c				\
-	model.c				\
-	script-parser.c			\
-	units.c				\
-        $(NULL)
+test_programs = $(actor_tests) $(general_tests) $(classes_tests) $(deprecated_tests)
 
-# cally tests
-units_sources += \
-	cally-text.c			\
-	$(NULL)
+dist_test_data = $(script_ui_files)
+script_ui_files = $(addprefix scripts/,$(script_tests))
+script_tests = \
+	test-animator-1.json \
+	test-animator-2.json \
+	test-animator-3.json \
+	test-script-animation.json \
+	test-script-child.json \
+	test-script-implicit-alpha.json \
+	test-script-interval.json \
+	test-script-layout-property.json \
+	test-script-margin.json \
+	test-script-model.json \
+	test-script-named-object.json \
+	test-script-object-property.json \
+	test-script-single.json \
+	test-script-timeline-markers.json \
+	test-state-1.json
 
-# events tests
-units_sources += \
-	events-touch.c			\
-	$(NULL)
+TESTS_ENVIRONMENT += G_ENABLE_DIAGNOSTIC=0 CLUTTER_ENABLE_DIAGNOSTIC=0
 
-test_conformance_SOURCES = $(common_sources) $(units_sources)
+# simple rules for generating a Git ignore file for the conformance test suite
+$(srcdir)/.gitignore: Makefile
+	$(AM_V_GEN)( echo "/*.trs" ; \
+		     echo "/*.log" ; \
+		     echo "/*.test" ; \
+		     echo "/.gitignore" ; \
+		     for p in $(test_programs); do \
+			echo "/$$p" ; \
+		     done ) > $(@F)
 
-if OS_WIN32
-SHEXT =
-else
-SHEXT = $(EXEEXT)
-endif
+gitignore: $(srcdir)/.gitignore
 
-# For convenience, this provides a way to easily run individual unit tests:
-.PHONY: wrappers clean-wrappers
+all-am: gitignore
 
-#UNIT_TESTS = `./test-conformance -l -m thorough | $(GREP) '^/'`
-
-wrappers: stamp-test-conformance
-	@true
-stamp-test-conformance: Makefile $(srcdir)/test-conform-main.c
-	@mkdir -p wrappers
-	@sed -n \
-		-e 's/^ \{1,\}TEST_CONFORM_SIMPLE *(.*"\([^",]\{1,\}\)", *\([a-zA-Z0-9_]\{1,\}\).*/\/conform\1\/\2/p' \
-		-e 's/^ \{1,\}TEST_CONFORM_SKIP *(.*"\([^",]\{1,\}\)", *\([a-zA-Z0-9_]\{1,\}\).*/\/conform\1\/\2/p' \
-		-e 's/^ \{1,\}TEST_CONFORM_TODO *(.*"\([^",]\{1,\}\)", *\([a-zA-Z0-9_]\{1,\}\).*/\/conform\1\/\2/p' \
-	$(srcdir)/test-conform-main.c > unit-tests
-	@chmod +x test-launcher.sh
-	@( echo "/stamp-test-conformance" ; \
-	   echo "/test-conformance" ; \
-	   echo "*.o" ; \
-	   echo "*.xml" ; \
-	   echo "*.html" ; \
-	   echo ".gitignore" ; \
-	   echo "unit-tests" ; \
-	   echo "/wrappers/" ) > .gitignore
-	@for i in `cat unit-tests`; \
-	do \
-		unit=`basename $$i | sed -e s/_/-/g`; \
-		echo "  GEN    $$unit"; \
-		( echo "#!/bin/sh" ; echo "$(abs_builddir)/test-launcher.sh '$$i' \"\$$@\"" ) > $$unit$(SHEXT) ; \
-		( echo "#!/bin/sh" ; echo "exec $(abs_builddir)/test-conformance$(EXEEXT) -p $$i \"\$$@\"" ) > wrappers/$$unit$(SHEXT) ; \
-		( echo "test-conformance-clutter$(EXEEXT) -p $$i" ) > $(top_builddir)/build/win32/$$unit-clutter.bat ; \
-		( echo "test-conformance-clutter$(EXEEXT) -p $$i" ) >> $(top_builddir)/build/win32/test-conformance-clutter.bat ; \
-		chmod +x $$unit$(SHEXT); \
-		chmod +x wrappers/$$unit$(SHEXT); \
-		echo "/$$unit$(SHEXT)" >> .gitignore; \
-	done \
-	&& echo timestamp > $(@F)
-
-clean-wrappers:
-	@for i in `cat unit-tests`; \
-	do \
-		unit=`basename $$i | sed -e s/_/-/g`; \
-		echo "  RM     $$unit"; \
-		rm -f $$unit$(SHEXT) ; \
-		rm -f wrappers/$$unit$(SHEXT) ; \
-	done \
-	&& rm -f unit-tests \
-	&& rm -f $(top_builddir)/build/win32/*.bat \
-	&& rm -f stamp-test-conformance
-
-# NB: BUILT_SOURCES here a misnomer. We aren't building source, just inserting
-# a phony rule that will generate symlink scripts for running individual tests
-BUILT_SOURCES = wrappers
-
-INCLUDES = \
-	-I$(top_srcdir) \
-	-I$(top_builddir) \
-	-I$(top_srcdir)/clutter \
-	-I$(top_builddir)/clutter
-
-test_conformance_CPPFLAGS = \
-	-DG_DISABLE_SINGLE_INCLUDES \
-	-DCOGL_ENABLE_EXPERIMENTAL_API \
-	-DG_DISABLE_DEPRECATION_WARNINGS \
-	-DCLUTTER_DISABLE_DEPRECATION_WARNINGS \
-	-DTESTS_DATADIR=\""$(top_srcdir)/tests/data"\"
-
-test_conformance_CFLAGS = -g $(CLUTTER_CFLAGS)
-
-test_conformance_LDADD = $(top_builddir)/clutter/libclutter-@CLUTTER_API_VERSION@.la $(CLUTTER_LIBS) -lm
-
-test_conformance_LDFLAGS = -export-dynamic
-
-test: wrappers
-	@$(top_srcdir)/tests/conform/run-tests.sh \
-	  ./test-conformance$(EXEEXT) -o test-report.xml
-
-test-verbose: wrappers
-	@$(top_srcdir)/tests/conform/run-tests.sh \
-	  ./test-conformance$(EXEEXT) -o test-report.xml --verbose
-
-GTESTER = gtester
-GTESTER_REPORT = gtester-report
-
-# XXX: we could prevent the conformance test suite from running
-#      by simply defining this variable conditionally
-TEST_PROGS = test-conformance
-
-.PHONY: test
-.PHONY: test-report perf-report full-report
-.PHONY: test-report-npot perf-report-npot full-report-npot
-
-# test-report: run tests and generate report
-# perf-report: run tests with -m perf and generate report
-# full-report: like test-report: with -m perf and -m slow
-test-report perf-report full-report:	${TEST_PROGS}
-	@test -z "${TEST_PROGS}" || { \
-	  export GTESTER_LOGDIR=`mktemp -d "$(srcdir)/.testlogs-XXXXXX"` ; \
-	  if test -d "$(top_srcdir)/.git"; then \
-	    export REVISION="`git describe`" ;  \
-	  else \
-	    export REVISION="$(VERSION) $(CLUTTER_RELEASE_STATUS)" ; \
-	  fi ; \
-	  export TIMESTAMP=`date +%Y-%m-%dT%H:%M:%S%z` ; \
-	  case $@ in \
-	  test-report) test_options="-k";; \
-	  perf-report) test_options="-k -m=perf";; \
-	  full-report) test_options="-k -m=perf -m=slow";; \
-	  esac ; \
-	  $(top_srcdir)/tests/conform/run-tests.sh \
-	    ./test-conformance$(EXEEXT) \
-	    --verbose \
-	    $$test_options \
-	    -o `mktemp "$$GTESTER_LOGDIR/log-XXXXXX"` ; \
-	  echo '<?xml version="1.0"?>'              > $@.xml ; \
-	  echo '<report-collection>'               >> $@.xml ; \
-	  echo '<info>'                            >> $@.xml ; \
-	  echo '  <package>$(PACKAGE)</package>'   >> $@.xml ; \
-	  echo '  <version>$(VERSION)</version>'   >> $@.xml ; \
-	  echo "  <revision>$$REVISION</revision>" >> $@.xml ; \
-	  echo "  <date>$$TIMESTAMP</date>"        >> $@.xml ; \
-	  echo '</info>'                           >> $@.xml ; \
-	  for lf in `ls -L "$$GTESTER_LOGDIR"/.` ; do \
-	    sed '1,1s/^<?xml\b[^>?]*?>//' <"$$GTESTER_LOGDIR"/"$$lf" >> $@.xml ; \
-	  done ; \
-	  echo >> $@.xml ; \
-	  echo '</report-collection>' >> $@.xml ; \
-	  ${GTESTER_REPORT} --version 2>/dev/null 1>&2 ; test "$$?" != 0 || ${GTESTER_REPORT} $@.xml >$@.html ; \
-	  rm -rf "$$GTESTER_LOGDIR" ; \
-	}
-
-# same as above, but with a wrapper that forcibly disables non-power of
-# two textures
-test-report-npot perf-report-npot full-report-npot:	${TEST_PROGS}
-	@test -z "${TEST_PROGS}" || { \
-	  export COGL_DEBUG="$COGL_DEBUG,disable-npot-textures"; \
-	  export GTESTER_LOGDIR=`mktemp -d "$(srcdir)/.testlogs-XXXXXX"` ; \
-	  if test -d "$(top_srcdir)/.git"; then \
-	    export REVISION="`git describe`" ;  \
-	  else \
-	    export REVISION="$(VERSION) $(CLUTTER_RELEASE_STATUS)" ; \
-	  fi ; \
-	  export TIMESTAMP=`date +%Y-%m-%dT%H:%M:%S%z` ; \
-	  case $@ in \
-	  test-report-npot) test_options="-k";; \
-	  perf-report-npot) test_options="-k -m=perf";; \
-	  full-report-npot) test_options="-k -m=perf -m=slow";; \
-	  esac ; \
-	  $(top_srcdir)/tests/conform/run-tests.sh \
-	    ./test-conformance$(EXEEXT) \
-	    --verbose \
-	    $$test_options \
-	    -o `mktemp "$$GTESTER_LOGDIR/log-XXXXXX"` ; \
-	  echo '<?xml version="1.0"?>'              > $@.xml ; \
-	  echo '<report-collection>'               >> $@.xml ; \
-	  echo '<info>'                            >> $@.xml ; \
-	  echo '  <package>$(PACKAGE)</package>'   >> $@.xml ; \
-	  echo '  <version>$(VERSION)</version>'   >> $@.xml ; \
-	  echo "  <revision>$$REVISION</revision>" >> $@.xml ; \
-	  echo "  <date>$$TIMESTAMP</date>"        >> $@.xml ; \
-	  echo '</info>'                           >> $@.xml ; \
-	  for lf in `ls -L "$$GTESTER_LOGDIR"/.` ; do \
-	    sed '1,1s/^<?xml\b[^>?]*?>//' <"$$GTESTER_LOGDIR"/"$$lf" >> $@.xml ; \
-	  done ; \
-	  echo >> $@.xml ; \
-	  echo '</report-collection>' >> $@.xml ; \
-	  ${GTESTER_REPORT} --version 2>/dev/null 1>&2 ; test "$$?" != 0 || ${GTESTER_REPORT} $@.xml >$@.html ; \
-	  rm -rf "$$GTESTER_LOGDIR" ; \
-	}
-
-XML_REPORTS = \
-	test-report.xml 	\
-	perf-report.xml 	\
-	full-report.xml 	\
-	test-report-npot.xml 	\
-	perf-report-npot.xml 	\
-	full-report-npot.xml
-
-HTML_REPORTS = \
-	test-report.html 	\
-	perf-report.html 	\
-	full-report.html 	\
-	test-report-npot.html 	\
-	perf-report-npot.html 	\
-	full-report-npot.html
-
-EXTRA_DIST = ADDING_NEW_TESTS test-launcher.sh.in run-tests.sh
-DISTCLEANFILES = test-launcher.sh .gitignore
-
-dist-hook: $(top_builddir)/build/win32/vs9/test-conformance-clutter.vcproj $(top_builddir)/build/win32/vs10/test-conformance-clutter.vcxproj $(top_builddir)/build/win32/vs10/test-conformance-clutter.vcxproj.filters
-
-$(top_builddir)/build/win32/vs9/test-conformance-clutter.vcproj: $(top_srcdir)/build/win32/vs9/test-conformance-clutter.vcprojin
-	@for F in $(test_conformance_SOURCES); do \
-		case $$F in \
-		*.c)	echo '   <File RelativePath="..\..\..\tests\conform\'$$F'" />' \
-			;; \
-		esac; \
-	done > testconformance.sourcefiles
-	$(CPP) -P - <$(top_srcdir)/build/win32/vs9/test-conformance-clutter.vcprojin >$@
-	rm -f testconformance.sourcefiles
-
-$(top_builddir)/build/win32/vs10/test-conformance-clutter.vcxproj: $(top_srcdir)/build/win32/vs10/test-conformance-clutter.vcxprojin
-	@for F in $(test_conformance_SOURCES); do \
-		case $$F in \
-		*.c)	echo '    <ClCompile Include="..\..\..\tests\conform\'$$F'" />' \
-			;; \
-		esac; \
-	done >testconformance.vs10.sourcefiles
-	$(CPP) -P - <$(top_srcdir)/build/win32/vs10/test-conformance-clutter.vcxprojin >$@
-	rm -f testconformance.vs10.sourcefiles
-	
-$(top_builddir)/build/win32/vs10/test-conformance-clutter.vcxproj.filters: $(top_srcdir)/build/win32/vs10/test-conformance-clutter.vcxproj.filtersin
-	@for F in $(test_conformance_SOURCES); do \
-		case $$F in \
-		*.c)	echo '    <ClCompile Include="..\..\..\tests\conform\'$$F'"><Filter>Sources</Filter></ClCompile>' \
-			;; \
-		esac; \
-	done > testconformance.vs10.sourcefiles.filters
-	$(CPP) -P - < $(top_srcdir)/build/win32/vs10/test-conformance-clutter.vcxproj.filtersin > $@
-	rm -f testconformance.vs10.sourcefiles.filters
-
-# Let the VS9/VS10 Project files be cleared out before they are re-expanded...
-DISTCLEANFILES += \
-	$(top_builddir)/build/win32/vs9/test-conformance-clutter.vcproj	\
-	$(top_builddir)/build/win32/vs10/test-conformance-clutter.vcxproj \
-	$(top_builddir)/build/win32/vs10/test-conformance-clutter.vcxproj.filters
-
-# we override the clean-generic target to clean up the wrappers so
-# we cannot use CLEANFILES
-clean-generic: clean-wrappers
-	$(QUIET_RM)rm -f $(XML_REPORTS) $(HTML_REPORTS)
+DISTCLEANFILES += .gitignore
diff --git a/tests/conform/actor-anchors.c b/tests/conform/actor-anchors.c
index 42e23ce0a..ee3b6a5e6 100644
--- a/tests/conform/actor-anchors.c
+++ b/tests/conform/actor-anchors.c
@@ -1,8 +1,8 @@
-#include <clutter/clutter.h>
 #include <stdlib.h>
 #include <string.h>
 
-#include "test-conform-common.h"
+#define CLUTTER_DISABLE_DEPRECATION_WARNINGS
+#include <clutter/clutter.h>
 
 #define NOTIFY_ANCHOR_X                  (1 << 0)
 #define NOTIFY_ANCHOR_Y                  (1 << 1)
@@ -671,16 +671,16 @@ idle_cb (gpointer data)
   return G_SOURCE_REMOVE;
 }
 
-void
+static void
 actor_anchors (void)
 {
   TestState state;
   ClutterActor *stage;
 
-  stage = clutter_stage_new ();
+  stage = clutter_test_get_stage ();
 
-  state.rect = clutter_rectangle_new ();
-  clutter_container_add (CLUTTER_CONTAINER (stage), state.rect, NULL);
+  state.rect = clutter_actor_new ();
+  clutter_actor_add_child (stage, state.rect);
   clutter_actor_set_position (state.rect, 100, 200);
   clutter_actor_set_size (state.rect, RECT_WIDTH, RECT_HEIGHT);
 
@@ -696,9 +696,46 @@ actor_anchors (void)
   clutter_actor_show (stage);
 
   clutter_main ();
-
-  g_idle_remove_by_data (&state);
-
-  clutter_actor_destroy (stage);
 }
 
+static void
+actor_pivot (void)
+{
+  ClutterActor *stage, *actor_implicit, *actor_explicit;
+  ClutterMatrix transform, result_implicit, result_explicit;
+  ClutterActorBox allocation = CLUTTER_ACTOR_BOX_INIT (0, 0, 90, 30);
+  gfloat angle = 30;
+
+  stage = clutter_test_get_stage ();
+
+  actor_implicit = clutter_actor_new ();
+  actor_explicit = clutter_actor_new ();
+
+  clutter_actor_add_child (stage, actor_implicit);
+  clutter_actor_add_child (stage, actor_explicit);
+
+  /* Fake allocation or pivot-point will not have any effect */
+  clutter_actor_allocate (actor_implicit, &allocation, CLUTTER_ALLOCATION_NONE);
+  clutter_actor_allocate (actor_explicit, &allocation, CLUTTER_ALLOCATION_NONE);
+
+  clutter_actor_set_pivot_point (actor_implicit, 0.5, 0.5);
+  clutter_actor_set_pivot_point (actor_explicit, 0.5, 0.5);
+
+  /* Implict transformation */
+  clutter_actor_set_rotation_angle (actor_implicit, CLUTTER_Z_AXIS, angle);
+
+  /* Explict transformation */
+  clutter_matrix_init_identity(&transform);
+  cogl_matrix_rotate (&transform, angle, 0, 0, 1.0);
+  clutter_actor_set_transform (actor_explicit, &transform);
+
+  clutter_actor_get_transform (actor_implicit, &result_implicit);
+  clutter_actor_get_transform (actor_explicit, &result_explicit);
+
+  g_assert (cogl_matrix_equal (&result_implicit, &result_explicit));
+}
+
+CLUTTER_TEST_SUITE (
+  CLUTTER_TEST_UNIT ("/actor/transforms/anchor-point", actor_anchors)
+  CLUTTER_TEST_UNIT ("/actor/transforms/pivot-point", actor_pivot)
+)
diff --git a/tests/conform/actor-destroy.c b/tests/conform/actor-destroy.c
index eed2aa63b..03092a010 100644
--- a/tests/conform/actor-destroy.c
+++ b/tests/conform/actor-destroy.c
@@ -1,5 +1,5 @@
+#define CLUTTER_DISABLE_DEPRECATION_WARNINGS
 #include <clutter/clutter.h>
-#include "test-conform-common.h"
 
 #define TEST_TYPE_DESTROY               (test_destroy_get_type ())
 #define TEST_DESTROY(obj)               (G_TYPE_CHECK_INSTANCE_CAST ((obj), TEST_TYPE_DESTROY, TestDestroy))
@@ -26,6 +26,8 @@ struct _TestDestroyClass
 
 static void clutter_container_init (ClutterContainerIface *iface);
 
+GType test_destroy_get_type (void);
+
 G_DEFINE_TYPE_WITH_CODE (TestDestroy, test_destroy, CLUTTER_TYPE_ACTOR,
                          G_IMPLEMENT_INTERFACE (CLUTTER_TYPE_CONTAINER,
                                                 clutter_container_init));
@@ -160,13 +162,18 @@ on_destroy (ClutterActor *actor,
   *destroy_called = TRUE;
 }
 
-void
+static void
 actor_destruction (void)
 {
   ClutterActor *test = g_object_new (TEST_TYPE_DESTROY, NULL);
   ClutterActor *child = clutter_rectangle_new ();
   gboolean destroy_called = FALSE;
 
+  g_object_ref_sink (test);
+
+  g_object_add_weak_pointer (G_OBJECT (test), (gpointer *) &test);
+  g_object_add_weak_pointer (G_OBJECT (child), (gpointer *) &child);
+
   if (g_test_verbose ())
     g_print ("Adding external child...\n");
 
@@ -179,4 +186,10 @@ actor_destruction (void)
 
   clutter_actor_destroy (test);
   g_assert (destroy_called);
+  g_assert_null (child);
+  g_assert_null (test);
 }
+
+CLUTTER_TEST_SUITE (
+  CLUTTER_TEST_UNIT ("/actor/destruction", actor_destruction)
+)
diff --git a/tests/conform/actor-graph.c b/tests/conform/actor-graph.c
index 7e4dcd293..22a28a660 100644
--- a/tests/conform/actor-graph.c
+++ b/tests/conform/actor-graph.c
@@ -1,14 +1,13 @@
 #include <clutter/clutter.h>
-#include "test-conform-common.h"
 
-void
-actor_add_child (TestConformSimpleFixture *fixture,
-                 gconstpointer dummy)
+static void
+actor_add_child (void)
 {
   ClutterActor *actor = clutter_actor_new ();
   ClutterActor *iter;
 
   g_object_ref_sink (actor);
+  g_object_add_weak_pointer (G_OBJECT (actor), (gpointer *) &actor);
 
   clutter_actor_add_child (actor, g_object_new (CLUTTER_TYPE_ACTOR,
                                                 "name", "foo",
@@ -45,17 +44,17 @@ actor_add_child (TestConformSimpleFixture *fixture,
   g_assert (clutter_actor_get_previous_sibling (iter) == NULL);
 
   clutter_actor_destroy (actor);
-  g_object_unref (actor);
+  g_assert (actor == NULL);
 }
 
-void
-actor_insert_child (TestConformSimpleFixture *fixture,
-                    gconstpointer data)
+static void
+actor_insert_child (void)
 {
   ClutterActor *actor = clutter_actor_new ();
   ClutterActor *iter;
 
   g_object_ref_sink (actor);
+  g_object_add_weak_pointer (G_OBJECT (actor), (gpointer *) &actor);
 
   clutter_actor_insert_child_at_index (actor,
                                        g_object_new (CLUTTER_TYPE_ACTOR,
@@ -132,17 +131,17 @@ actor_insert_child (TestConformSimpleFixture *fixture,
   g_assert (clutter_actor_get_last_child (actor) == iter);
 
   clutter_actor_destroy (actor);
-  g_object_unref (actor);
+  g_assert (actor == NULL);
 }
 
-void
-actor_remove_child (TestConformSimpleFixture *fixture,
-                    gconstpointer data)
+static void
+actor_remove_child (void)
 {
   ClutterActor *actor = clutter_actor_new ();
   ClutterActor *iter;
 
   g_object_ref_sink (actor);
+  g_object_add_weak_pointer (G_OBJECT (actor), (gpointer *) &actor);
 
   clutter_actor_add_child (actor, g_object_new (CLUTTER_TYPE_ACTOR,
                                                 "name", "foo",
@@ -176,18 +175,18 @@ actor_remove_child (TestConformSimpleFixture *fixture,
   g_assert (clutter_actor_get_last_child (actor) == NULL);
 
   clutter_actor_destroy (actor);
-  g_object_unref (actor);
+  g_assert (actor == NULL);
 }
 
-void
-actor_raise_child (TestConformSimpleFixture *fixture,
-                   gconstpointer dummy)
+static void
+actor_raise_child (void)
 {
   ClutterActor *actor = clutter_actor_new ();
   ClutterActor *iter;
   gboolean show_on_set_parent;
 
   g_object_ref_sink (actor);
+  g_object_add_weak_pointer (G_OBJECT (actor), (gpointer *) &actor);
 
   clutter_actor_add_child (actor, g_object_new (CLUTTER_TYPE_ACTOR,
                                                 "name", "foo",
@@ -225,6 +224,7 @@ actor_raise_child (TestConformSimpleFixture *fixture,
 
   iter = clutter_actor_get_child_at_index (actor, 0);
   clutter_actor_set_child_above_sibling (actor, iter, NULL);
+  g_object_add_weak_pointer (G_OBJECT (iter), (gpointer *) &iter);
 
   g_assert_cmpstr (clutter_actor_get_name (clutter_actor_get_child_at_index (actor, 0)),
                    ==,
@@ -240,18 +240,19 @@ actor_raise_child (TestConformSimpleFixture *fixture,
   g_assert (!show_on_set_parent);
 
   clutter_actor_destroy (actor);
-  g_object_unref (actor);
+  g_assert (actor == NULL);
+  g_assert (iter == NULL);
 }
 
-void
-actor_lower_child (TestConformSimpleFixture *fixture,
-                   gconstpointer dummy)
+static void
+actor_lower_child (void)
 {
   ClutterActor *actor = clutter_actor_new ();
   ClutterActor *iter;
   gboolean show_on_set_parent;
 
   g_object_ref_sink (actor);
+  g_object_add_weak_pointer (G_OBJECT (actor), (gpointer *) &actor);
 
   clutter_actor_add_child (actor, g_object_new (CLUTTER_TYPE_ACTOR,
                                                 "name", "foo",
@@ -304,17 +305,17 @@ actor_lower_child (TestConformSimpleFixture *fixture,
   g_assert (!show_on_set_parent);
 
   clutter_actor_destroy (actor);
-  g_object_unref (actor);
+  g_assert (actor == NULL);
 }
 
-void
-actor_replace_child (TestConformSimpleFixture *fixture,
-                     gconstpointer dummy)
+static void
+actor_replace_child (void)
 {
   ClutterActor *actor = clutter_actor_new ();
   ClutterActor *iter;
 
   g_object_ref_sink (actor);
+  g_object_add_weak_pointer (G_OBJECT (actor), (gpointer *) &actor);
 
   clutter_actor_add_child (actor, g_object_new (CLUTTER_TYPE_ACTOR,
                                                 "name", "foo",
@@ -364,16 +365,16 @@ actor_replace_child (TestConformSimpleFixture *fixture,
   g_assert_cmpstr (clutter_actor_get_name (iter), ==, "baz");
 
   clutter_actor_destroy (actor);
-  g_object_unref (actor);
+  g_assert (actor == NULL);
 }
 
-void
-actor_remove_all (TestConformSimpleFixture *fixture,
-                  gconstpointer dummy)
+static void
+actor_remove_all (void)
 {
   ClutterActor *actor = clutter_actor_new ();
 
   g_object_ref_sink (actor);
+  g_object_add_weak_pointer (G_OBJECT (actor), (gpointer *) &actor);
 
   clutter_actor_add_child (actor, g_object_new (CLUTTER_TYPE_ACTOR,
                                                 "name", "foo",
@@ -392,7 +393,7 @@ actor_remove_all (TestConformSimpleFixture *fixture,
   g_assert_cmpint (clutter_actor_get_n_children (actor), ==, 0);
 
   clutter_actor_destroy (actor);
-  g_object_unref (actor);
+  g_assert (actor == NULL);
 }
 
 static void
@@ -427,14 +428,14 @@ actor_removed (ClutterContainer *container,
   *counter += 1;
 }
 
-void
-actor_container_signals (TestConformSimpleFixture *fixture G_GNUC_UNUSED,
-                         gconstpointer data G_GNUC_UNUSED)
+static void
+actor_container_signals (void)
 {
   ClutterActor *actor = clutter_actor_new ();
   int add_count, remove_count;
 
   g_object_ref_sink (actor);
+  g_object_add_weak_pointer (G_OBJECT (actor), (gpointer *) &actor);
 
   add_count = remove_count = 0;
   g_signal_connect (actor,
@@ -466,5 +467,83 @@ actor_container_signals (TestConformSimpleFixture *fixture G_GNUC_UNUSED,
                                         &remove_count);
 
   clutter_actor_destroy (actor);
-  g_object_unref (actor);
+  g_assert (actor == NULL);
 }
+
+static void
+actor_contains (void)
+{
+  /* This build up the following tree:
+   *
+   *              a
+   *          ╱   │   ╲
+   *         ╱    │    ╲
+   *        b     c     d
+   *       ╱ ╲   ╱ ╲   ╱ ╲
+   *      e   f g   h i   j
+   */
+  struct {
+    ClutterActor *actor_a, *actor_b, *actor_c, *actor_d, *actor_e;
+    ClutterActor *actor_f, *actor_g, *actor_h, *actor_i, *actor_j;
+  } d;
+  int x, y;
+  ClutterActor **actor_array = &d.actor_a;
+
+  /* Matrix of expected results */
+  static const gboolean expected_results[] =
+    {         /* a, b, c, d, e, f, g, h, i, j */
+      /* a */    1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+      /* b */    0, 1, 0, 0, 1, 1, 0, 0, 0, 0,
+      /* c */    0, 0, 1, 0, 0, 0, 1, 1, 0, 0,
+      /* d */    0, 0, 0, 1, 0, 0, 0, 0, 1, 1,
+      /* e */    0, 0, 0, 0, 1, 0, 0, 0, 0, 0,
+      /* f */    0, 0, 0, 0, 0, 1, 0, 0, 0, 0,
+      /* g */    0, 0, 0, 0, 0, 0, 1, 0, 0, 0,
+      /* h */    0, 0, 0, 0, 0, 0, 0, 1, 0, 0,
+      /* i */    0, 0, 0, 0, 0, 0, 0, 0, 1, 0,
+      /* j */    0, 0, 0, 0, 0, 0, 0, 0, 0, 1
+    };
+
+  d.actor_a = clutter_actor_new ();
+  d.actor_b = clutter_actor_new ();
+  d.actor_c = clutter_actor_new ();
+  d.actor_d = clutter_actor_new ();
+  d.actor_e = clutter_actor_new ();
+  d.actor_f = clutter_actor_new ();
+  d.actor_g = clutter_actor_new ();
+  d.actor_h = clutter_actor_new ();
+  d.actor_i = clutter_actor_new ();
+  d.actor_j = clutter_actor_new ();
+
+  clutter_actor_add_child (d.actor_a, d.actor_b);
+  clutter_actor_add_child (d.actor_a, d.actor_c);
+  clutter_actor_add_child (d.actor_a, d.actor_d);
+
+  clutter_actor_add_child (d.actor_b, d.actor_e);
+  clutter_actor_add_child (d.actor_b, d.actor_f);
+
+  clutter_actor_add_child (d.actor_c, d.actor_g);
+  clutter_actor_add_child (d.actor_c, d.actor_h);
+
+  clutter_actor_add_child (d.actor_d, d.actor_i);
+  clutter_actor_add_child (d.actor_d, d.actor_j);
+
+  for (y = 0; y < 10; y++)
+    for (x = 0; x < 10; x++)
+      g_assert_cmpint (clutter_actor_contains (actor_array[x],
+                                               actor_array[y]),
+                       ==,
+                       expected_results[x * 10 + y]);
+}
+
+CLUTTER_TEST_SUITE (
+  CLUTTER_TEST_UNIT ("/actor/graph/add-child", actor_add_child)
+  CLUTTER_TEST_UNIT ("/actor/graph/insert-child", actor_insert_child)
+  CLUTTER_TEST_UNIT ("/actor/graph/remove-child", actor_remove_child)
+  CLUTTER_TEST_UNIT ("/actor/graph/raise-child", actor_raise_child)
+  CLUTTER_TEST_UNIT ("/actor/graph/lower-child", actor_lower_child)
+  CLUTTER_TEST_UNIT ("/actor/graph/replace-child", actor_replace_child)
+  CLUTTER_TEST_UNIT ("/actor/graph/remove-all", actor_remove_all)
+  CLUTTER_TEST_UNIT ("/actor/graph/container-signals", actor_container_signals)
+  CLUTTER_TEST_UNIT ("/actor/graph/contains", actor_contains)
+)
diff --git a/tests/conform/actor-invariants.c b/tests/conform/actor-invariants.c
index a9e21eeb8..cdab5d5c6 100644
--- a/tests/conform/actor-invariants.c
+++ b/tests/conform/actor-invariants.c
@@ -3,16 +3,14 @@
 
 #include <clutter/clutter.h>
 
-#include "test-conform-common.h"
-
-void
-actor_initial_state (TestConformSimpleFixture *fixture,
-                     gconstpointer             data)
+static void
+actor_initial_state (void)
 {
   ClutterActor *actor;
 
-  actor = clutter_rectangle_new ();
+  actor = clutter_actor_new ();
   g_object_ref_sink (actor);
+  g_object_add_weak_pointer (G_OBJECT (actor), (gpointer *) &actor);
 
   if (g_test_verbose ())
     g_print ("initial state - visible: %s, realized: %s, mapped: %s\n",
@@ -25,17 +23,17 @@ actor_initial_state (TestConformSimpleFixture *fixture,
   g_assert (!(CLUTTER_ACTOR_IS_VISIBLE (actor)));
 
   clutter_actor_destroy (actor);
-  g_object_unref (actor);
+  g_assert (actor == NULL);
 }
 
-void
-actor_shown_not_parented (TestConformSimpleFixture *fixture,
-                          gconstpointer             data)
+static void
+actor_shown_not_parented (void)
 {
   ClutterActor *actor;
 
-  actor = clutter_rectangle_new ();
+  actor = clutter_actor_new ();
   g_object_ref_sink (actor);
+  g_object_add_weak_pointer (G_OBJECT (actor), (gpointer *) &actor);
 
   clutter_actor_show (actor);
 
@@ -50,17 +48,16 @@ actor_shown_not_parented (TestConformSimpleFixture *fixture,
   g_assert (CLUTTER_ACTOR_IS_VISIBLE (actor));
 
   clutter_actor_destroy (actor);
-  g_object_unref (actor);
+  g_assert (actor == NULL);
 }
 
-void
-actor_realized (TestConformSimpleFixture *fixture,
-                gconstpointer             data)
+static void
+actor_realized (void)
 {
   ClutterActor *actor;
   ClutterActor *stage;
 
-  stage = clutter_stage_new ();
+  stage = clutter_test_get_stage ();
 
   actor = clutter_actor_new ();
 
@@ -74,18 +71,15 @@ actor_realized (TestConformSimpleFixture *fixture,
 
   g_assert (!(CLUTTER_ACTOR_IS_MAPPED (actor)));
   g_assert (!(CLUTTER_ACTOR_IS_VISIBLE (actor)));
-
-  clutter_actor_destroy (stage);
 }
 
-void
-actor_mapped (TestConformSimpleFixture *fixture,
-              gconstpointer             data)
+static void
+actor_mapped (void)
 {
   ClutterActor *actor;
   ClutterActor *stage;
 
-  stage = clutter_stage_new ();
+  stage = clutter_test_get_stage ();
   clutter_actor_show (stage);
 
   actor = clutter_actor_new ();
@@ -118,18 +112,16 @@ actor_mapped (TestConformSimpleFixture *fixture,
   g_assert (CLUTTER_ACTOR_IS_REALIZED (actor));
   g_assert (!CLUTTER_ACTOR_IS_MAPPED (actor));
   g_assert (!CLUTTER_ACTOR_IS_VISIBLE (actor));
-
-  clutter_actor_destroy (stage);
 }
 
-void
-actor_visibility_not_recursive (TestConformSimpleFixture *fixture,
-                                gconstpointer             data)
+static void
+actor_visibility_not_recursive (void)
 {
   ClutterActor *actor, *group;
   ClutterActor *stage;
 
-  stage = clutter_stage_new ();
+  stage = clutter_test_get_stage ();
+
   group = clutter_actor_new ();
   actor = clutter_actor_new ();
 
@@ -160,18 +152,15 @@ actor_visibility_not_recursive (TestConformSimpleFixture *fixture,
 
   clutter_actor_show (stage);
   g_assert (!CLUTTER_ACTOR_IS_VISIBLE (actor));
-
-  clutter_actor_destroy (stage);
 }
 
-void
-actor_realize_not_recursive (TestConformSimpleFixture *fixture,
-                             gconstpointer             data)
+static void
+actor_realize_not_recursive (void)
 {
   ClutterActor *actor, *group;
   ClutterActor *stage;
 
-  stage = clutter_stage_new ();
+  stage = clutter_test_get_stage ();
   clutter_actor_show (stage);
 
   group = clutter_actor_new ();
@@ -198,18 +187,15 @@ actor_realize_not_recursive (TestConformSimpleFixture *fixture,
   g_assert (!CLUTTER_ACTOR_IS_REALIZED (actor));
   g_assert (!(CLUTTER_ACTOR_IS_MAPPED (actor)));
   g_assert (!(CLUTTER_ACTOR_IS_VISIBLE (actor)));
-
-  clutter_actor_destroy (stage);
 }
 
-void
-actor_map_recursive (TestConformSimpleFixture *fixture,
-                     gconstpointer             data)
+static void
+actor_map_recursive (void)
 {
   ClutterActor *actor, *group;
   ClutterActor *stage;
 
-  stage = clutter_stage_new ();
+  stage = clutter_test_get_stage ();
   clutter_actor_show (stage);
 
   group = clutter_actor_new ();
@@ -246,19 +232,16 @@ actor_map_recursive (TestConformSimpleFixture *fixture,
   g_assert (CLUTTER_ACTOR_IS_MAPPED (actor));
   g_assert (CLUTTER_ACTOR_IS_VISIBLE (group));
   g_assert (CLUTTER_ACTOR_IS_VISIBLE (actor));
-
-  clutter_actor_destroy (stage);
 }
 
-void
-actor_show_on_set_parent (TestConformSimpleFixture *fixture,
-                          gconstpointer             data)
+static void
+actor_show_on_set_parent (void)
 {
   ClutterActor *actor, *group;
   gboolean show_on_set_parent;
   ClutterActor *stage;
 
-  stage = clutter_stage_new ();
+  stage = clutter_test_get_stage ();
 
   group = clutter_actor_new ();
 
@@ -319,36 +302,33 @@ actor_show_on_set_parent (TestConformSimpleFixture *fixture,
   g_assert (!show_on_set_parent);
 
   clutter_actor_destroy (actor);
-
-  clutter_actor_destroy (stage);
 }
 
-void
-clone_no_map (TestConformSimpleFixture *fixture,
-              gconstpointer             data)
+static void
+clone_no_map (void)
 {
   ClutterActor *stage;
   ClutterActor *group;
   ClutterActor *actor;
   ClutterActor *clone;
 
-  stage = clutter_stage_new ();
+  stage = clutter_test_get_stage ();
   clutter_actor_show (stage);
 
-  group = clutter_group_new ();
-  actor = clutter_rectangle_new ();
+  group = clutter_actor_new ();
+  actor = clutter_actor_new ();
 
   clutter_actor_hide (group);
 
-  clutter_container_add_actor (CLUTTER_CONTAINER (group), actor);
-  clutter_container_add_actor (CLUTTER_CONTAINER (stage), group);
+  clutter_actor_add_child (group, actor);
+  clutter_actor_add_child (stage, group);
 
   g_assert (!(CLUTTER_ACTOR_IS_MAPPED (group)));
   g_assert (!(CLUTTER_ACTOR_IS_MAPPED (actor)));
 
   clone = clutter_clone_new (group);
 
-  clutter_container_add_actor (CLUTTER_CONTAINER (stage), clone);
+  clutter_actor_add_child (stage, clone);
 
   g_assert (CLUTTER_ACTOR_IS_MAPPED (clone));
   g_assert (!(CLUTTER_ACTOR_IS_MAPPED (group)));
@@ -356,83 +336,15 @@ clone_no_map (TestConformSimpleFixture *fixture,
 
   clutter_actor_destroy (CLUTTER_ACTOR (clone));
   clutter_actor_destroy (CLUTTER_ACTOR (group));
-  clutter_actor_destroy (stage);
 }
 
-void
-actor_contains (TestConformSimpleFixture *fixture,
-                gconstpointer             data)
-{
-  /* This build up the following tree:
-   *
-   *              a
-   *          ╱   │   ╲
-   *         ╱    │    ╲
-   *        b     c     d
-   *       ╱ ╲   ╱ ╲   ╱ ╲
-   *      e   f g   h i   j
-   */
-  struct {
-    ClutterActor *actor_a, *actor_b, *actor_c, *actor_d, *actor_e;
-    ClutterActor *actor_f, *actor_g, *actor_h, *actor_i, *actor_j;
-  } d;
-  int x, y;
-  ClutterActor **actor_array = &d.actor_a;
-
-  /* Matrix of expected results */
-  static const gboolean expected_results[] =
-    {         /* a, b, c, d, e, f, g, h, i, j */
-      /* a */    1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-      /* b */    0, 1, 0, 0, 1, 1, 0, 0, 0, 0,
-      /* c */    0, 0, 1, 0, 0, 0, 1, 1, 0, 0,
-      /* d */    0, 0, 0, 1, 0, 0, 0, 0, 1, 1,
-      /* e */    0, 0, 0, 0, 1, 0, 0, 0, 0, 0,
-      /* f */    0, 0, 0, 0, 0, 1, 0, 0, 0, 0,
-      /* g */    0, 0, 0, 0, 0, 0, 1, 0, 0, 0,
-      /* h */    0, 0, 0, 0, 0, 0, 0, 1, 0, 0,
-      /* i */    0, 0, 0, 0, 0, 0, 0, 0, 1, 0,
-      /* j */    0, 0, 0, 0, 0, 0, 0, 0, 0, 1
-    };
-
-  d.actor_a = clutter_actor_new ();
-  d.actor_b = clutter_actor_new ();
-  d.actor_c = clutter_actor_new ();
-  d.actor_d = clutter_actor_new ();
-  d.actor_e = clutter_actor_new ();
-  d.actor_f = clutter_actor_new ();
-  d.actor_g = clutter_actor_new ();
-  d.actor_h = clutter_actor_new ();
-  d.actor_i = clutter_actor_new ();
-  d.actor_j = clutter_actor_new ();
-
-  clutter_actor_add_child (d.actor_a, d.actor_b);
-  clutter_actor_add_child (d.actor_a, d.actor_c);
-  clutter_actor_add_child (d.actor_a, d.actor_d);
-
-  clutter_actor_add_child (d.actor_b, d.actor_e);
-  clutter_actor_add_child (d.actor_b, d.actor_f);
-
-  clutter_actor_add_child (d.actor_c, d.actor_g);
-  clutter_actor_add_child (d.actor_c, d.actor_h);
-
-  clutter_actor_add_child (d.actor_d, d.actor_i);
-  clutter_actor_add_child (d.actor_d, d.actor_j);
-
-  for (y = 0; y < 10; y++)
-    for (x = 0; x < 10; x++)
-      g_assert_cmpint (clutter_actor_contains (actor_array[x],
-                                               actor_array[y]),
-                       ==,
-                       expected_results[x * 10 + y]);
-}
-
-void
-default_stage (TestConformSimpleFixture *fixture,
-               gconstpointer             data)
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
+static void
+default_stage (void)
 {
   ClutterActor *stage, *def_stage;
 
-  stage = clutter_stage_new ();
+  stage = clutter_test_get_stage ();
   def_stage = clutter_stage_get_default ();
 
   if (clutter_feature_available (CLUTTER_FEATURE_STAGE_MULTIPLE))
@@ -442,43 +354,17 @@ default_stage (TestConformSimpleFixture *fixture,
 
   g_assert (CLUTTER_ACTOR_IS_REALIZED (def_stage));
 }
+G_GNUC_END_IGNORE_DEPRECATIONS
 
-void
-actor_pivot_transformation (TestConformSimpleFixture *fixture,
-                            gconstpointer             data)
-{
-  ClutterActor *stage, *actor_implicit, *actor_explicit;
-  ClutterMatrix transform, result_implicit, result_explicit;
-  ClutterActorBox allocation = CLUTTER_ACTOR_BOX_INIT (0, 0, 90, 30);
-  gfloat angle = 30;
-
-  stage = clutter_stage_new ();
-
-  actor_implicit = clutter_actor_new ();
-  actor_explicit = clutter_actor_new ();
-
-  clutter_actor_add_child (stage, actor_implicit);
-  clutter_actor_add_child (stage, actor_explicit);
-
-  /* Fake allocation or pivot-point will not have any effect */
-  clutter_actor_allocate (actor_implicit, &allocation, CLUTTER_ALLOCATION_NONE);
-  clutter_actor_allocate (actor_explicit, &allocation, CLUTTER_ALLOCATION_NONE);
-
-  clutter_actor_set_pivot_point (actor_implicit, 0.5, 0.5);
-  clutter_actor_set_pivot_point (actor_explicit, 0.5, 0.5);
-
-  /* Implict transformation */
-  clutter_actor_set_rotation_angle (actor_implicit, CLUTTER_Z_AXIS, angle);
-
-  /* Explict transformation */
-  clutter_matrix_init_identity(&transform);
-  cogl_matrix_rotate (&transform, angle, 0, 0, 1.0);
-  clutter_actor_set_transform (actor_explicit, &transform);
-
-  clutter_actor_get_transform (actor_implicit, &result_implicit);
-  clutter_actor_get_transform (actor_explicit, &result_explicit);
-
-  clutter_actor_destroy (stage);
-
-  g_assert (cogl_matrix_equal (&result_implicit, &result_explicit));
-}
+CLUTTER_TEST_SUITE (
+  CLUTTER_TEST_UNIT ("/actor/invariants/initial-state", actor_initial_state)
+  CLUTTER_TEST_UNIT ("/actor/invariants/show-not-parented", actor_shown_not_parented)
+  CLUTTER_TEST_UNIT ("/actor/invariants/realized", actor_realized)
+  CLUTTER_TEST_UNIT ("/actor/invariants/mapped", actor_mapped)
+  CLUTTER_TEST_UNIT ("/actor/invariants/visibility-not-recursive", actor_visibility_not_recursive)
+  CLUTTER_TEST_UNIT ("/actor/invariants/realize-not-recursive", actor_realize_not_recursive)
+  CLUTTER_TEST_UNIT ("/actor/invariants/map-recursive", actor_map_recursive)
+  CLUTTER_TEST_UNIT ("/actor/invariants/show-on-set-parent", actor_show_on_set_parent)
+  CLUTTER_TEST_UNIT ("/actor/invariants/clone-no-map", clone_no_map)
+  CLUTTER_TEST_UNIT ("/actor/invariants/default-stage", default_stage)
+)
diff --git a/tests/conform/actor-iter.c b/tests/conform/actor-iter.c
index 4c550797b..193f63b27 100644
--- a/tests/conform/actor-iter.c
+++ b/tests/conform/actor-iter.c
@@ -1,10 +1,8 @@
 #include <glib.h>
 #include <clutter/clutter.h>
-#include "test-conform-common.h"
 
-void
-actor_iter_traverse_children (TestConformSimpleFixture *fixture G_GNUC_UNUSED,
-                              gconstpointer dummy G_GNUC_UNUSED)
+static void
+actor_iter_traverse_children (void)
 {
   ClutterActorIter iter;
   ClutterActor *actor;
@@ -78,9 +76,8 @@ actor_iter_traverse_children (TestConformSimpleFixture *fixture G_GNUC_UNUSED,
   g_object_unref (actor);
 }
 
-void
-actor_iter_traverse_remove (TestConformSimpleFixture *fixture G_GNUC_UNUSED,
-                            gconstpointer dummy G_GNUC_UNUSED)
+static void
+actor_iter_traverse_remove (void)
 {
   ClutterActorIter iter;
   ClutterActor *actor;
@@ -135,9 +132,8 @@ actor_iter_traverse_remove (TestConformSimpleFixture *fixture G_GNUC_UNUSED,
   g_assert_cmpint (0, ==, clutter_actor_get_n_children (actor));
 }
 
-void
-actor_iter_assignment (TestConformSimpleFixture *fixure G_GNUC_UNUSED,
-                       gconstpointer dummy G_GNUC_UNUSED)
+static void
+actor_iter_assignment (void)
 {
   ClutterActorIter iter_a, iter_b;
   ClutterActor *actor;
@@ -214,3 +210,9 @@ actor_iter_assignment (TestConformSimpleFixture *fixure G_GNUC_UNUSED,
 
   g_object_unref (actor);
 }
+
+CLUTTER_TEST_SUITE (
+  CLUTTER_TEST_UNIT ("/actor/iter/traverse-children", actor_iter_traverse_children)
+  CLUTTER_TEST_UNIT ("/actor/iter/traverse-remove", actor_iter_traverse_remove)
+  CLUTTER_TEST_UNIT ("/actor/iter/assignment", actor_iter_assignment)
+)
diff --git a/tests/conform/actor-layout.c b/tests/conform/actor-layout.c
index 2eeaeccf2..2cc89400c 100644
--- a/tests/conform/actor-layout.c
+++ b/tests/conform/actor-layout.c
@@ -1,218 +1,15 @@
-#include <math.h>
 #include <clutter/clutter.h>
-#include "test-conform-common.h"
-
-typedef struct _TestState       TestState;
-
-struct _TestState
-{
-  GPtrArray *actors;
-  GPtrArray *colors;
-
-  ClutterActor *stage;
-
-  gulong id;
-
-  gint in_validation;
-
-  guint is_running : 1;
-  guint success    : 1;
-};
-
-static TestState *
-test_state_new (void)
-{
-  return g_slice_new0 (TestState);
-}
-
-static void validate_state (ClutterActor *stage,
-                            TestState    *state);
 
 static void
-test_state_free (TestState *state)
+actor_basic_layout (void)
 {
-  if (state->id != 0)
-    g_source_remove (state->id);
-
-  if (state->actors != NULL)
-    g_ptr_array_unref (state->actors);
-
-  if (state->colors != NULL)
-    g_ptr_array_unref (state->colors);
-
-  if (state->stage != NULL)
-    {
-      g_signal_handlers_disconnect_by_func (state->stage,
-                                            G_CALLBACK (validate_state),
-                                            state);
-      clutter_actor_destroy (state->stage);
-    }
-
-  g_slice_free (TestState, state);
-}
-
-static void
-test_state_set_stage (TestState    *state,
-                      ClutterActor *stage)
-{
-  g_assert (!state->is_running);
-
-  state->stage = stage;
-}
-
-static void
-test_state_add_actor (TestState          *state,
-                      ClutterActor       *actor,
-                      const ClutterColor *color)
-{
-  g_assert (!state->is_running);
-
-  if (state->actors == NULL)
-    {
-      state->actors = g_ptr_array_new ();
-      g_ptr_array_set_free_func (state->actors,
-                                 (GDestroyNotify) g_object_unref);
-    }
-
-  g_ptr_array_add (state->actors, g_object_ref (actor));
-
-  if (state->colors == NULL)
-    {
-      state->colors = g_ptr_array_new ();
-      g_ptr_array_set_free_func (state->colors,
-                                 (GDestroyNotify) clutter_color_free);
-    }
-
-  g_ptr_array_add (state->colors, clutter_color_copy (color));
-}
-
-static void
-test_state_push_validation (TestState *state)
-{
-  state->in_validation += 1;
-}
-
-static void
-test_state_pop_validation (TestState *state)
-{
-  state->in_validation -= 1;
-}
-
-static gboolean
-test_state_in_validation (TestState *state)
-{
-  return state->in_validation > 0;
-}
-
-static gboolean
-check_color_at (ClutterActor *stage,
-                ClutterActor *actor,
-                ClutterColor *expected_color,
-                float         x,
-                float         y)
-{
-  guchar *buffer;
-
-  if (g_test_verbose ())
-    g_print ("Checking actor '%s'\n", clutter_actor_get_name (actor));
-
-  if (g_test_verbose ())
-    g_print ("Sampling at { %d, %d }\t", (int) x, (int) y);
-
-  buffer = clutter_stage_read_pixels (CLUTTER_STAGE (stage), x, y, 1, 1);
-  g_assert (buffer != NULL);
-
-  if (g_test_verbose ())
-    g_print ("Color: { %d, %d, %d } - Expected color { %d, %d, %d }\n",
-             buffer[0],
-             buffer[1],
-             buffer[2],
-             expected_color->red,
-             expected_color->green,
-             expected_color->blue);
-
-  g_assert_cmpint (buffer[0], ==, expected_color->red);
-  g_assert_cmpint (buffer[1], ==, expected_color->green);
-  g_assert_cmpint (buffer[2], ==, expected_color->blue);
-
-  g_free (buffer);
-
-  return TRUE;
-}
-
-static void
-validate_state (ClutterActor *stage,
-                TestState    *state)
-{
-  int i;
-
-  /* avoid recursion */
-  if (test_state_in_validation (state))
-    return;
-
-  g_assert (stage == state->stage);
-  g_assert (state->actors != NULL);
-  g_assert (state->colors != NULL);
-
-  g_assert_cmpint (state->actors->len, ==, state->colors->len);
-
-  test_state_push_validation (state);
-
-  if (g_test_verbose ())
-    g_print ("Sampling %d actors\n", state->actors->len);
-
-  for (i = 0; i < state->actors->len; i++)
-    {
-      ClutterActor *actor = g_ptr_array_index (state->actors, i);
-      ClutterColor *color = g_ptr_array_index (state->colors, i);
-      ClutterActorBox box;
-
-      clutter_actor_get_allocation_box (actor, &box);
-
-      g_assert (check_color_at (stage, actor, color, box.x1 + 2, box.y1 + 2));
-      g_assert (check_color_at (stage, actor, color, box.x2 - 2, box.y2 - 2));
-    }
-
-  test_state_pop_validation (state);
-
-  state->success = TRUE;
-
-  clutter_main_quit ();
-}
-
-static gboolean
-queue_redraw (gpointer data_)
-{
-  TestState *state = data_;
-
-  clutter_actor_queue_redraw (state->stage);
-
-  return TRUE;
-}
-
-static gboolean
-test_state_run (TestState *state)
-{
-  state->is_running = TRUE;
-
-  g_signal_connect_after (state->stage, "paint", G_CALLBACK (validate_state), state);
-  state->id = clutter_threads_add_idle (queue_redraw, state);
-
-  clutter_main ();
-
-  return state->success;
-}
-
-void
-actor_basic_layout (TestConformSimpleFixture *fixture,
-                    gconstpointer data)
-{
-  ClutterActor *stage = clutter_stage_new ();
+  ClutterActor *stage = clutter_test_get_stage ();
   ClutterActor *vase;
   ClutterActor *flower[3];
-  TestState *state;
+  ClutterPoint p;
 
   vase = clutter_actor_new ();
+  clutter_actor_set_name (vase, "Vase");
   clutter_actor_set_layout_manager (vase, clutter_flow_layout_new (CLUTTER_FLOW_HORIZONTAL));
   clutter_actor_add_child (stage, vase);
 
@@ -234,30 +31,27 @@ actor_basic_layout (TestConformSimpleFixture *fixture,
   clutter_actor_set_name (flower[2], "Green Flower");
   clutter_actor_add_child (vase, flower[2]);
 
-  clutter_actor_show_all (stage);
+  clutter_point_init (&p, 50, 50);
+  clutter_test_assert_actor_at_point (stage, &p, flower[0]);
 
-  state = test_state_new ();
-  test_state_set_stage (state, stage);
-  test_state_add_actor (state, flower[0], CLUTTER_COLOR_Red);
-  test_state_add_actor (state, flower[1], CLUTTER_COLOR_Yellow);
-  test_state_add_actor (state, flower[2], CLUTTER_COLOR_Green);
+  clutter_point_init (&p, 150, 50);
+  clutter_test_assert_actor_at_point (stage, &p, flower[1]);
 
-  g_assert (test_state_run (state));
-
-  test_state_free (state);
+  clutter_point_init (&p, 250, 50);
+  clutter_test_assert_actor_at_point (stage, &p, flower[2]);
 }
 
-void
-actor_margin_layout (TestConformSimpleFixture *fixture,
-                     gconstpointer data)
+static void
+actor_margin_layout (void)
 {
-  ClutterActor *stage = clutter_stage_new ();
+  ClutterActor *stage = clutter_test_get_stage ();
   ClutterActor *vase;
   ClutterActor *flower[3];
-  TestState *state;
+  ClutterPoint p;
 
   vase = clutter_actor_new ();
-  clutter_actor_set_layout_manager (vase, clutter_flow_layout_new (CLUTTER_FLOW_HORIZONTAL));
+  clutter_actor_set_name (vase, "Vase");
+  clutter_actor_set_layout_manager (vase, clutter_box_layout_new ());
   clutter_actor_add_child (stage, vase);
 
   flower[0] = clutter_actor_new ();
@@ -282,15 +76,17 @@ actor_margin_layout (TestConformSimpleFixture *fixture,
   clutter_actor_set_margin_bottom (flower[2], 6);
   clutter_actor_add_child (vase, flower[2]);
 
-  clutter_actor_show_all (stage);
+  clutter_point_init (&p, 0, 7);
+  clutter_test_assert_actor_at_point (stage, &p, flower[0]);
 
-  state = test_state_new ();
-  test_state_set_stage (state, stage);
-  test_state_add_actor (state, flower[0], CLUTTER_COLOR_Red);
-  test_state_add_actor (state, flower[1], CLUTTER_COLOR_Yellow);
-  test_state_add_actor (state, flower[2], CLUTTER_COLOR_Green);
+  clutter_point_init (&p, 106, 50);
+  clutter_test_assert_actor_at_point (stage, &p, flower[1]);
 
-  g_assert (test_state_run (state));
-
-  test_state_free (state);
+  clutter_point_init (&p, 212, 7);
+  clutter_test_assert_actor_at_point (stage, &p, flower[2]);
 }
+
+CLUTTER_TEST_SUITE (
+  CLUTTER_TEST_UNIT ("/actor/layout/basic", actor_basic_layout)
+  CLUTTER_TEST_UNIT ("/actor/layout/margin", actor_margin_layout)
+)
diff --git a/tests/conform/actor-meta.c b/tests/conform/actor-meta.c
new file mode 100644
index 000000000..52a313d22
--- /dev/null
+++ b/tests/conform/actor-meta.c
@@ -0,0 +1,40 @@
+#include <stdlib.h>
+#include <string.h>
+
+#include <clutter/clutter.h>
+
+static void
+actor_meta_clear (void)
+{
+  ClutterActor *actor, *stage;
+
+  stage = clutter_test_get_stage ();
+
+  actor = clutter_actor_new ();
+  g_object_ref_sink (actor);
+  g_object_add_weak_pointer (G_OBJECT (actor), (gpointer *) &actor);
+
+  clutter_actor_add_action (actor, clutter_click_action_new ());
+  clutter_actor_add_constraint (actor, clutter_bind_constraint_new (stage, CLUTTER_BIND_ALL, 0));
+  clutter_actor_add_effect (actor, clutter_blur_effect_new ());
+
+  g_assert (clutter_actor_has_actions (actor));
+  g_assert (clutter_actor_has_constraints (actor));
+  g_assert (clutter_actor_has_effects (actor));
+
+  clutter_actor_clear_actions (actor);
+  g_assert (!clutter_actor_has_actions (actor));
+
+  clutter_actor_clear_constraints (actor);
+  g_assert (!clutter_actor_has_constraints (actor));
+
+  clutter_actor_clear_effects (actor);
+  g_assert (!clutter_actor_has_effects (actor));
+
+  clutter_actor_destroy (actor);
+  g_assert (actor == NULL);
+}
+
+CLUTTER_TEST_SUITE (
+  CLUTTER_TEST_UNIT ("/actor/meta/clear", actor_meta_clear)
+)
diff --git a/tests/conform/actor-offscreen-limit-max-size.c b/tests/conform/actor-offscreen-limit-max-size.c
new file mode 100644
index 000000000..943c7d8a7
--- /dev/null
+++ b/tests/conform/actor-offscreen-limit-max-size.c
@@ -0,0 +1,119 @@
+#define CLUTTER_ENABLE_EXPERIMENTAL_API
+#include <clutter/clutter.h>
+
+#define STAGE_WIDTH (300)
+#define STAGE_HEIGHT (300)
+
+typedef struct
+{
+  ClutterActor *stage;
+
+  ClutterActor *actor_group1;
+  ClutterEffect *blur_effect1;
+
+  ClutterActor *actor_group2;
+  ClutterEffect *blur_effect2;
+} Data;
+
+static void
+check_results (ClutterStage *stage, gpointer user_data)
+{
+  Data *data = user_data;
+  gfloat width, height;
+  ClutterRect rect;
+
+  clutter_offscreen_effect_get_target_rect (CLUTTER_OFFSCREEN_EFFECT (data->blur_effect1),
+                                            &rect);
+
+  width = clutter_rect_get_width (&rect);
+  height = clutter_rect_get_height (&rect);
+
+  if (g_test_verbose ())
+    g_print ("Checking effect1 size: %.2f x %.2f\n",
+             clutter_rect_get_width (&rect),
+             clutter_rect_get_height (&rect));
+
+  g_assert_cmpint (width, <, STAGE_WIDTH);
+  g_assert_cmpint (height, <, STAGE_HEIGHT);
+
+  clutter_offscreen_effect_get_target_rect (CLUTTER_OFFSCREEN_EFFECT (data->blur_effect2),
+                                            &rect);
+
+  width = clutter_rect_get_width (&rect);
+  height = clutter_rect_get_height (&rect);
+
+  if (g_test_verbose ())
+    g_print ("Checking effect2 size: %.2f x %.2f\n", width, height);
+
+  g_assert_cmpint (width, ==, STAGE_WIDTH);
+  g_assert_cmpint (height, ==, STAGE_HEIGHT);
+
+
+  clutter_main_quit ();
+}
+
+static ClutterActor *
+create_actor (gfloat x, gfloat y,
+              gfloat width, gfloat height,
+              const ClutterColor *color)
+{
+  return g_object_new (CLUTTER_TYPE_ACTOR,
+                       "x", x,
+                       "y", y,
+                       "width", width,
+                       "height", height,
+                       "background-color", color,
+                       NULL);
+}
+
+static void
+actor_offscreen_limit_max_size (void)
+{
+  Data data;
+
+  if (!cogl_features_available (COGL_FEATURE_OFFSCREEN))
+    return;
+
+  data.stage = clutter_test_get_stage ();
+  g_signal_connect (data.stage, "after-paint",
+                    G_CALLBACK (check_results), &data);
+  clutter_actor_set_size (data.stage, STAGE_WIDTH, STAGE_HEIGHT);
+
+  data.actor_group1 = clutter_actor_new ();
+  clutter_actor_add_child (data.stage, data.actor_group1);
+  data.blur_effect1 = clutter_blur_effect_new ();
+  clutter_actor_add_effect (data.actor_group1, data.blur_effect1);
+  clutter_actor_add_child (data.actor_group1,
+                           create_actor (10, 10,
+                                         100, 100,
+                                         CLUTTER_COLOR_Blue));
+  clutter_actor_add_child (data.actor_group1,
+                           create_actor (100, 100,
+                                         100, 100,
+                                         CLUTTER_COLOR_Gray));
+
+  data.actor_group2 = clutter_actor_new ();
+  clutter_actor_add_child (data.stage, data.actor_group2);
+  data.blur_effect2 = clutter_blur_effect_new ();
+  clutter_actor_add_effect (data.actor_group2, data.blur_effect2);
+  clutter_actor_add_child (data.actor_group2,
+                           create_actor (-10, -10,
+                                         100, 100,
+                                         CLUTTER_COLOR_Yellow));
+  clutter_actor_add_child (data.actor_group2,
+                           create_actor (250, 10,
+                                         100, 100,
+                                         CLUTTER_COLOR_ScarletRed));
+  clutter_actor_add_child (data.actor_group2,
+                           create_actor (10, 250,
+                                         100, 100,
+                                         CLUTTER_COLOR_Yellow));
+
+  clutter_actor_show (data.stage);
+
+  clutter_main ();
+}
+
+CLUTTER_TEST_SUITE (
+  CLUTTER_TEST_UNIT ("/actor/offscreen/limit-max-size", actor_offscreen_limit_max_size)
+)
diff --git a/tests/conform/actor-offscreen-redirect.c b/tests/conform/actor-offscreen-redirect.c
index f4d1618f7..f47af3617 100644
--- a/tests/conform/actor-offscreen-redirect.c
+++ b/tests/conform/actor-offscreen-redirect.c
@@ -1,7 +1,6 @@
+#define CLUTTER_DISABLE_DEPRECATION_WARNINGS
 #include <clutter/clutter.h>
 
-#include "test-conform-common.h"
-
 typedef struct _FooActor      FooActor;
 typedef struct _FooActorClass FooActorClass;
 
@@ -26,6 +25,7 @@ typedef struct
   ClutterActor *container;
   ClutterActor *child;
   ClutterActor *unrelated_actor;
+  gboolean was_painted;
 } Data;
 
 GType foo_actor_get_type (void) G_GNUC_CONST;
@@ -89,15 +89,17 @@ typedef struct _FooGroupClass FooGroupClass;
 
 struct _FooGroupClass
 {
-  ClutterGroupClass parent_class;
+  ClutterActorClass parent_class;
 };
 
 struct _FooGroup
 {
-  ClutterGroup parent;
+  ClutterActor parent;
 };
 
-G_DEFINE_TYPE (FooGroup, foo_group, CLUTTER_TYPE_GROUP);
+GType foo_group_get_type (void);
+
+G_DEFINE_TYPE (FooGroup, foo_group, CLUTTER_TYPE_ACTOR)
 
 static gboolean
 foo_group_has_overlaps (ClutterActor *actor)
@@ -175,7 +177,7 @@ verify_redraw (Data *data, int expected_paint_count)
 }
 
 static gboolean
-timeout_cb (gpointer user_data)
+run_verify (gpointer user_data)
 {
   Data *data = user_data;
 
@@ -288,61 +290,48 @@ timeout_cb (gpointer user_data)
   clutter_actor_set_position (data->unrelated_actor, 0, 1);
   verify_redraw (data, 0);
 
-  clutter_main_quit ();
+  data->was_painted = TRUE;
 
   return G_SOURCE_REMOVE;
 }
 
-void
-actor_offscreen_redirect (TestConformSimpleFixture *fixture,
-                          gconstpointer test_data)
+static void
+actor_offscreen_redirect (void)
 {
-  if (cogl_features_available (COGL_FEATURE_OFFSCREEN))
-    {
-      Data data;
+  Data data;
 
-      data.stage = clutter_stage_new ();
+  if (!cogl_features_available (COGL_FEATURE_OFFSCREEN))
+    return;
 
-      data.parent_container = clutter_group_new ();
+  data.stage = clutter_test_get_stage ();
+  data.parent_container = clutter_actor_new ();
+  data.container = g_object_new (foo_group_get_type (), NULL);
+  data.foo_actor = g_object_new (foo_actor_get_type (), NULL);
+  clutter_actor_set_size (CLUTTER_ACTOR (data.foo_actor), 100, 100);
 
-      data.container = g_object_new (foo_group_get_type (), NULL);
+  clutter_actor_add_child (data.container, CLUTTER_ACTOR (data.foo_actor));
+  clutter_actor_add_child (data.parent_container, data.container);
+  clutter_actor_add_child (data.stage, data.parent_container);
 
-      data.foo_actor = g_object_new (foo_actor_get_type (), NULL);
-      clutter_actor_set_size (CLUTTER_ACTOR (data.foo_actor), 100, 100);
+  data.child = clutter_actor_new ();
+  clutter_actor_set_size (data.child, 1, 1);
+  clutter_actor_add_child (data.container, data.child);
 
-      clutter_container_add_actor (CLUTTER_CONTAINER (data.container),
-                                   CLUTTER_ACTOR (data.foo_actor));
+  data.unrelated_actor = clutter_actor_new ();
+  clutter_actor_set_size (data.child, 1, 1);
+  clutter_actor_add_child (data.stage, data.unrelated_actor);
 
-      clutter_container_add_actor (CLUTTER_CONTAINER (data.parent_container),
-                                   data.container);
+  clutter_actor_show (data.stage);
 
-      clutter_container_add_actor (CLUTTER_CONTAINER (data.stage),
-                                   data.parent_container);
+  clutter_threads_add_repaint_func_full (CLUTTER_REPAINT_FLAGS_POST_PAINT,
+                                         run_verify,
+                                         &data,
+                                         NULL);
 
-      data.child = clutter_rectangle_new ();
-      clutter_actor_set_size (data.child, 1, 1);
-      clutter_container_add_actor (CLUTTER_CONTAINER (data.container),
-                                   data.child);
-
-      data.unrelated_actor = clutter_rectangle_new ();
-      clutter_actor_set_size (data.child, 1, 1);
-      clutter_container_add_actor (CLUTTER_CONTAINER (data.stage),
-                                   data.unrelated_actor);
-
-      clutter_actor_show (data.stage);
-
-      /* Start the test after a short delay to allow the stage to
-         render its initial frames without affecting the results */
-      g_timeout_add_full (G_PRIORITY_LOW, 250, timeout_cb, &data, NULL);
-
-      clutter_main ();
-
-      clutter_actor_destroy (data.stage);
-
-      if (g_test_verbose ())
-        g_print ("OK\n");
-    }
-  else if (g_test_verbose ())
-    g_print ("Skipping\n");
+  while (!data.was_painted)
+    g_main_context_iteration (NULL, FALSE);
 }
 
+CLUTTER_TEST_SUITE (
+  CLUTTER_TEST_UNIT ("/actor/offscreen/redirect", actor_offscreen_redirect)
+)
diff --git a/tests/conform/actor-paint-opacity.c b/tests/conform/actor-paint-opacity.c
index 0ea219a63..6df240872 100644
--- a/tests/conform/actor-paint-opacity.c
+++ b/tests/conform/actor-paint-opacity.c
@@ -1,18 +1,15 @@
 #include <clutter/clutter.h>
 #include <stdlib.h>
 
-#include "test-conform-common.h"
-
-void
-opacity_label (TestConformSimpleFixture *fixture,
-               gpointer                  dummy)
+static void
+opacity_label (void)
 {
   ClutterActor *stage;
   ClutterActor *label;
   ClutterColor label_color = { 255, 0, 0, 128 };
   ClutterColor color_check = { 0, };
 
-  stage = clutter_stage_new ();
+  stage = clutter_test_get_stage ();
 
   label = clutter_text_new_with_text ("Sans 18px", "Label, 50% opacity");
   clutter_text_set_color (CLUTTER_TEXT (label), &label_color);
@@ -22,7 +19,7 @@ opacity_label (TestConformSimpleFixture *fixture,
   clutter_text_get_color (CLUTTER_TEXT (label), &color_check);
   g_assert (color_check.alpha == label_color.alpha);
 
-  clutter_container_add (CLUTTER_CONTAINER (stage), label, NULL);
+  clutter_actor_add_child (stage, label);
   clutter_actor_set_position (label, 10, 10);
 
   if (g_test_verbose ())
@@ -38,20 +35,18 @@ opacity_label (TestConformSimpleFixture *fixture,
     g_print ("label 50%%.get_paint_opacity()/2\n");
   clutter_actor_set_opacity (label, 128);
   g_assert (clutter_actor_get_paint_opacity (label) == 128);
-
-  clutter_actor_destroy (stage);
 }
 
-void
-opacity_rectangle (TestConformSimpleFixture *fixture,
-                   gpointer                  dummy)
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
+static void
+opacity_rectangle (void)
 {
   ClutterActor *stage;
   ClutterActor *rect;
   ClutterColor rect_color = { 0, 0, 255, 255 };
   ClutterColor color_check = { 0, };
 
-  stage = clutter_stage_new ();
+  stage = clutter_test_get_stage ();
 
   rect = clutter_rectangle_new_with_color (&rect_color);
   clutter_actor_set_size (rect, 128, 128);
@@ -62,7 +57,7 @@ opacity_rectangle (TestConformSimpleFixture *fixture,
   clutter_rectangle_get_color (CLUTTER_RECTANGLE (rect), &color_check);
   g_assert (color_check.alpha == rect_color.alpha);
 
-  clutter_container_add (CLUTTER_CONTAINER (stage), rect, NULL);
+  clutter_actor_add_child (stage, rect);
 
   if (g_test_verbose ())
     g_print ("rect 100%%.get_color()/2\n");
@@ -72,13 +67,12 @@ opacity_rectangle (TestConformSimpleFixture *fixture,
   if (g_test_verbose ())
     g_print ("rect 100%%.get_paint_opacity()\n");
   g_assert (clutter_actor_get_paint_opacity (rect) == 255);
-
-  clutter_actor_destroy (stage);
 }
+G_GNUC_END_IGNORE_DEPRECATIONS
 
-void
-opacity_paint (TestConformSimpleFixture *fixture,
-               gpointer                  dummy)
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
+static void
+opacity_paint (void)
 {
   ClutterActor *stage, *group1, *group2;
   ClutterActor *label, *rect;
@@ -86,7 +80,7 @@ opacity_paint (TestConformSimpleFixture *fixture,
   ClutterColor rect_color = { 0, 0, 255, 255 };
   ClutterColor color_check = { 0, };
 
-  stage = clutter_stage_new ();
+  stage = clutter_test_get_stage ();
 
   group1 = clutter_group_new ();
   clutter_actor_set_opacity (group1, 128);
@@ -137,6 +131,11 @@ opacity_paint (TestConformSimpleFixture *fixture,
   if (g_test_verbose ())
     g_print ("rect 100%%.get_paint_opacity()\n");
   g_assert (clutter_actor_get_paint_opacity (rect) == 128);
-
-  clutter_actor_destroy (stage);
 }
+G_GNUC_END_IGNORE_DEPRECATIONS
+
+CLUTTER_TEST_SUITE (
+  CLUTTER_TEST_UNIT ("/actor/opacity/text", opacity_label)
+  CLUTTER_TEST_UNIT ("/actor/opacity/rectangle", opacity_rectangle)
+  CLUTTER_TEST_UNIT ("/actor/opacity/paint", opacity_paint)
+)
diff --git a/tests/conform/actor-pick.c b/tests/conform/actor-pick.c
index e2399bae5..4db39c470 100644
--- a/tests/conform/actor-pick.c
+++ b/tests/conform/actor-pick.c
@@ -1,7 +1,6 @@
+#define CLUTTER_DISABLE_DEPRECATION_WARNINGS
 #include <clutter/clutter.h>
 
-#include "test-conform-common.h"
-
 #define STAGE_WIDTH  640
 #define STAGE_HEIGHT 480
 #define ACTORS_X 12
@@ -34,6 +33,8 @@ typedef struct _ShiftEffectClass  ShiftEffectClass;
 
 #define TYPE_SHIFT_EFFECT        (shift_effect_get_type ())
 
+GType shift_effect_get_type (void);
+
 G_DEFINE_TYPE (ShiftEffect,
                shift_effect,
                CLUTTER_TYPE_SHADER_EFFECT);
@@ -120,8 +121,7 @@ on_timeout (gpointer data)
              isn't visible so it shouldn't affect the picking */
           over_actor = clutter_rectangle_new_with_color (&red);
           clutter_actor_set_size (over_actor, STAGE_WIDTH, STAGE_HEIGHT);
-          clutter_container_add (CLUTTER_CONTAINER (state->stage),
-                                 over_actor, NULL);
+          clutter_actor_add_child (state->stage, over_actor);
           clutter_actor_hide (over_actor);
 
           if (g_test_verbose ())
@@ -165,8 +165,9 @@ on_timeout (gpointer data)
                                                "blur");
 
           clutter_actor_add_effect_with_name (CLUTTER_ACTOR (state->stage),
-            "shift",
-            g_object_new (TYPE_SHIFT_EFFECT, NULL));
+                                              "shift",
+                                              g_object_new (TYPE_SHIFT_EFFECT,
+                                                            NULL));
 
           if (g_test_verbose ())
             g_print ("With shift effect:\n");
@@ -190,12 +191,12 @@ on_timeout (gpointer data)
               if (test_num == 4)
                 pick_x -= SHIFT_STEP;
 
-              actor
-                = clutter_stage_get_actor_at_pos (CLUTTER_STAGE (state->stage),
-                                                  CLUTTER_PICK_ALL,
-                                                  pick_x,
-                                                  y * state->actor_height
-                                                  + state->actor_height / 2);
+              actor =
+                clutter_stage_get_actor_at_pos (CLUTTER_STAGE (state->stage),
+                                                CLUTTER_PICK_ALL,
+                                                pick_x,
+                                                y * state->actor_height
+                                                + state->actor_height / 2);
 
               if (g_test_verbose ())
                 g_print ("% 3i,% 3i / %p -> ",
@@ -239,7 +240,7 @@ on_timeout (gpointer data)
   return G_SOURCE_REMOVE;
 }
 
-void
+static void
 actor_pick (void)
 {
   int y, x;
@@ -247,7 +248,7 @@ actor_pick (void)
   
   state.pass = TRUE;
 
-  state.stage = clutter_stage_new ();
+  state.stage = clutter_test_get_stage ();
 
   state.actor_width = STAGE_WIDTH / ACTORS_X;
   state.actor_height = STAGE_HEIGHT / ACTORS_Y;
@@ -267,7 +268,7 @@ actor_pick (void)
                                 state.actor_width,
                                 state.actor_height);
 
-	clutter_container_add (CLUTTER_CONTAINER (state.stage), rect, NULL);
+	clutter_actor_add_child (state.stage, rect);
 
 	state.actors[y * ACTORS_X + x] = rect;
       }
@@ -278,10 +279,9 @@ actor_pick (void)
 
   clutter_main ();
 
-  if (g_test_verbose ())
-    g_print ("end result: %s\n", state.pass ? "pass" : "FAIL");
-
   g_assert (state.pass);
-
-  clutter_actor_destroy (state.stage);
 }
+
+CLUTTER_TEST_SUITE (
+  CLUTTER_TEST_UNIT ("/actor/pick", actor_pick)
+)
diff --git a/tests/conform/actor-shader-effect.c b/tests/conform/actor-shader-effect.c
index db3400b77..d3ddd384f 100644
--- a/tests/conform/actor-shader-effect.c
+++ b/tests/conform/actor-shader-effect.c
@@ -1,7 +1,7 @@
+#define CLUTTER_ENABLE_EXPERIMENTAL_API
+#define CLUTTER_DISABLE_DEPRECATION_WARNINGS
 #include <clutter/clutter.h>
 
-#include "test-conform-common.h"
-
 /****************************************************************
  Old style shader effect
  This uses clutter_shader_effect_set_source
@@ -27,6 +27,8 @@ typedef struct _FooOldShaderEffect
   ClutterShaderEffect parent;
 } FooOldShaderEffect;
 
+GType foo_old_shader_effect_get_type (void);
+
 G_DEFINE_TYPE (FooOldShaderEffect,
                foo_old_shader_effect,
                CLUTTER_TYPE_SHADER_EFFECT);
@@ -85,6 +87,8 @@ typedef struct _FooNewShaderEffect
   ClutterShaderEffect parent;
 } FooNewShaderEffect;
 
+GType foo_new_shader_effect_get_type (void);
+
 G_DEFINE_TYPE (FooNewShaderEffect,
                foo_new_shader_effect,
                CLUTTER_TYPE_SHADER_EFFECT);
@@ -160,6 +164,8 @@ typedef struct _FooAnotherNewShaderEffect
   ClutterShaderEffect parent;
 } FooAnotherNewShaderEffect;
 
+GType foo_another_new_shader_effect_get_type (void);
+
 G_DEFINE_TYPE (FooAnotherNewShaderEffect,
                foo_another_new_shader_effect,
                CLUTTER_TYPE_SHADER_EFFECT);
@@ -218,8 +224,11 @@ get_pixel (int x, int y)
 }
 
 static void
-paint_cb (ClutterActor *stage)
+paint_cb (ClutterStage *stage,
+          gpointer      data)
 {
+  gboolean *was_painted = data;
+
   /* old shader effect */
   g_assert_cmpint (get_pixel (50, 50), ==, 0xff0000);
   /* new shader effect */
@@ -229,15 +238,15 @@ paint_cb (ClutterActor *stage)
   /* new shader effect */
   g_assert_cmpint (get_pixel (350, 50), ==, 0x00ffff);
 
-  clutter_main_quit ();
+  *was_painted = TRUE;
 }
 
-void
-actor_shader_effect (TestConformSimpleFixture *fixture,
-                     gconstpointer data)
+static void
+actor_shader_effect (void)
 {
   ClutterActor *stage;
   ClutterActor *rect;
+  gboolean was_painted;
 
   if (!clutter_feature_available (CLUTTER_FEATURE_SHADERS_GLSL))
     return;
@@ -261,12 +270,15 @@ actor_shader_effect (TestConformSimpleFixture *fixture,
 
   clutter_actor_show (stage);
 
-  g_signal_connect_after (stage, "paint", G_CALLBACK (paint_cb), NULL);
+  was_painted = FALSE;
+  g_signal_connect (stage, "after-paint",
+                    G_CALLBACK (paint_cb),
+                    &was_painted);
 
-  clutter_main ();
-
-  clutter_actor_destroy (stage);
-
-  if (g_test_verbose ())
-    g_print ("OK\n");
+  while (!was_painted)
+    g_main_context_iteration (NULL, FALSE);
 }
+
+CLUTTER_TEST_SUITE (
+  CLUTTER_TEST_UNIT ("/actor/shader-effect", actor_shader_effect)
+)
diff --git a/tests/conform/actor-size.c b/tests/conform/actor-size.c
index 6d837c64c..7245f157d 100644
--- a/tests/conform/actor-size.c
+++ b/tests/conform/actor-size.c
@@ -3,8 +3,6 @@
 
 #include <clutter/clutter.h>
 
-#include "test-conform-common.h"
-
 #define TEST_TYPE_ACTOR         (test_actor_get_type ())
 
 typedef struct _TestActor               TestActor;
@@ -18,6 +16,8 @@ struct _TestActor
   guint preferred_height_called : 1;
 };
 
+GType test_actor_get_type (void);
+
 G_DEFINE_TYPE (TestActor, test_actor, CLUTTER_TYPE_ACTOR);
 
 static void
@@ -78,7 +78,7 @@ test_actor_init (TestActor *self)
 {
 }
 
-void
+static void
 actor_preferred_size (void)
 {
   ClutterActor *test;
@@ -138,7 +138,7 @@ actor_preferred_size (void)
   clutter_actor_destroy (test);
 }
 
-void
+static void
 actor_fixed_size (void)
 {
   ClutterActor *rect;
@@ -209,3 +209,8 @@ actor_fixed_size (void)
   clutter_actor_destroy (rect);
   g_object_unref (rect);
 }
+
+CLUTTER_TEST_SUITE (
+  CLUTTER_TEST_UNIT ("/actor/size/preferred", actor_preferred_size)
+  CLUTTER_TEST_UNIT ("/actor/size/fixed", actor_fixed_size)
+)
diff --git a/tests/conform/animator.c b/tests/conform/animator.c
index fb07e4019..971169903 100644
--- a/tests/conform/animator.c
+++ b/tests/conform/animator.c
@@ -1,10 +1,8 @@
+#define CLUTTER_DISABLE_DEPRECATION_WARNINGS
 #include <clutter/clutter.h>
 
-#include "test-conform-common.h"
-
-void
-animator_multi_properties (TestConformSimpleFixture *fixture,
-                           gconstpointer dummy)
+static void
+animator_multi_properties (void)
 {
   ClutterScript *script = clutter_script_new ();
   GObject *animator = NULL, *foo = NULL;
@@ -14,16 +12,15 @@ animator_multi_properties (TestConformSimpleFixture *fixture,
   ClutterAnimatorKey *key;
   GValue value = { 0, };
 
-  test_file = clutter_test_get_data_file ("test-animator-3.json");
+  test_file = g_test_build_filename (G_TEST_DIST,
+                                     "scripts",
+                                     "test-animator-3.json",
+                                     NULL);
   clutter_script_load_from_file (script, test_file, &error);
   if (g_test_verbose () && error)
     g_print ("Error: %s", error->message);
 
-#if GLIB_CHECK_VERSION (2, 20, 0)
   g_assert_no_error (error);
-#else
-  g_assert (error == NULL);
-#endif
 
   foo = clutter_script_get_object (script, "foo");
   g_assert (G_IS_OBJECT (foo));
@@ -105,9 +102,8 @@ animator_multi_properties (TestConformSimpleFixture *fixture,
   g_free (test_file);
 }
 
-void
-animator_properties (TestConformSimpleFixture *fixture,
-                          gconstpointer dummy)
+static void
+animator_properties (void)
 {
   ClutterScript *script = clutter_script_new ();
   GObject *animator = NULL;
@@ -117,16 +113,15 @@ animator_properties (TestConformSimpleFixture *fixture,
   ClutterAnimatorKey *key;
   GValue value = { 0, };
 
-  test_file = clutter_test_get_data_file ("test-animator-2.json");
+  test_file = g_test_build_filename (G_TEST_DIST,
+                                     "scripts",
+                                     "test-animator-2.json",
+                                     NULL);
   clutter_script_load_from_file (script, test_file, &error);
   if (g_test_verbose () && error)
     g_print ("Error: %s", error->message);
 
-#if GLIB_CHECK_VERSION (2, 20, 0)
   g_assert_no_error (error);
-#else
-  g_assert (error == NULL);
-#endif
 
   animator = clutter_script_get_object (script, "animator");
   g_assert (CLUTTER_IS_ANIMATOR (animator));
@@ -168,9 +163,8 @@ animator_properties (TestConformSimpleFixture *fixture,
   g_free (test_file);
 }
 
-void
-animator_base (TestConformSimpleFixture *fixture,
-               gconstpointer dummy)
+static void
+animator_base (void)
 {
   ClutterScript *script = clutter_script_new ();
   GObject *animator = NULL;
@@ -178,16 +172,15 @@ animator_base (TestConformSimpleFixture *fixture,
   guint duration = 0;
   gchar *test_file;
 
-  test_file = clutter_test_get_data_file ("test-animator-1.json");
+  test_file = g_test_build_filename (G_TEST_DIST,
+                                     "scripts",
+                                     "test-animator-1.json",
+                                     NULL);
   clutter_script_load_from_file (script, test_file, &error);
   if (g_test_verbose () && error)
     g_print ("Error: %s", error->message);
 
-#if GLIB_CHECK_VERSION (2, 20, 0)
   g_assert_no_error (error);
-#else
-  g_assert (error == NULL);
-#endif
 
   animator = clutter_script_get_object (script, "animator");
   g_assert (CLUTTER_IS_ANIMATOR (animator));
@@ -198,3 +191,9 @@ animator_base (TestConformSimpleFixture *fixture,
   g_object_unref (script);
   g_free (test_file);
 }
+
+CLUTTER_TEST_SUITE (
+  CLUTTER_TEST_UNIT ("/script/animator/base", animator_base)
+  CLUTTER_TEST_UNIT ("/script/animator/properties", animator_properties)
+  CLUTTER_TEST_UNIT ("/script/animator/multi-properties", animator_multi_properties)
+)
diff --git a/tests/conform/behaviours.c b/tests/conform/behaviours.c
index d4e6e8043..6c531beff 100644
--- a/tests/conform/behaviours.c
+++ b/tests/conform/behaviours.c
@@ -1,28 +1,21 @@
-#include <glib.h>
+#define CLUTTER_DISABLE_DEPRECATION_WARNINGS
 #include <clutter/clutter.h>
 
-#include "test-conform-common.h"
-
-typedef struct _BehaviourFixture BehaviourFixture;
-
-typedef void (* BehaviourTestFunc) (BehaviourFixture *fixture);
-
-struct _BehaviourFixture
-{
-  ClutterTimeline *timeline;
-  ClutterAlpha *alpha;
-  ClutterActor *rect;
-};
-
 static void
-opacity_behaviour (BehaviourFixture *fixture)
+behaviour_opacity (void)
 {
   ClutterBehaviour *behaviour;
+  ClutterTimeline *timeline;
+  ClutterAlpha *alpha;
   guint8 start, end;
   guint starti;
 
-  behaviour = clutter_behaviour_opacity_new (fixture->alpha, 0, 255);
+  timeline = clutter_timeline_new (500);
+  alpha = clutter_alpha_new_full (timeline, CLUTTER_LINEAR);
+  behaviour = clutter_behaviour_opacity_new (alpha, 0, 255);
   g_assert (CLUTTER_IS_BEHAVIOUR_OPACITY (behaviour));
+  g_object_add_weak_pointer (G_OBJECT (behaviour), (gpointer *) &behaviour);
+  g_object_add_weak_pointer (G_OBJECT (timeline), (gpointer *) &timeline);
 
   clutter_behaviour_opacity_get_bounds (CLUTTER_BEHAVIOUR_OPACITY (behaviour),
                                         &start,
@@ -51,40 +44,37 @@ opacity_behaviour (BehaviourFixture *fixture)
   g_assert_cmpint (starti, ==, 255);
 
   g_object_unref (behaviour);
+  g_object_unref (timeline);
+
+  g_assert_null (behaviour);
+  g_assert_null (timeline);
 }
 
-static const struct
+static struct
 {
-  const gchar *desc;
-  BehaviourTestFunc func;
+  const gchar *path;
+  GTestFunc func;
 } behaviour_tests[] = {
-  { "BehaviourOpacity", opacity_behaviour }
+  { "opacity", behaviour_opacity },
 };
 
-static const gint n_behaviour_tests = G_N_ELEMENTS (behaviour_tests);
+static const int n_behaviour_tests = G_N_ELEMENTS (behaviour_tests);
 
-void
-behaviours_base (TestConformSimpleFixture *fixture,
-                 gconstpointer dummy)
+int
+main (int argc, char *argv[])
 {
-  BehaviourFixture b_fixture;
-  gint i;
+  int i;
 
-  b_fixture.timeline = clutter_timeline_new (1000);
-  b_fixture.alpha = clutter_alpha_new_full (b_fixture.timeline, CLUTTER_LINEAR);
-  b_fixture.rect = clutter_rectangle_new ();
-
-  g_object_ref_sink (b_fixture.alpha);
-  g_object_unref (b_fixture.timeline);
+  clutter_test_init (&argc, &argv);
 
   for (i = 0; i < n_behaviour_tests; i++)
     {
-      if (g_test_verbose ())
-        g_print ("Testing: %s\n", behaviour_tests[i].desc);
+      char *path = g_strconcat ("/behaviours/", behaviour_tests[i].path, NULL);
 
-      behaviour_tests[i].func (&b_fixture);
+      clutter_test_add (path, behaviour_tests[i].func);
+
+      g_free (path);
     }
 
-  g_object_unref (b_fixture.alpha);
-  clutter_actor_destroy (b_fixture.rect);
+  return clutter_test_run ();
 }
diff --git a/tests/conform/binding-pool.c b/tests/conform/binding-pool.c
index 20ec634b9..4e4752b6b 100644
--- a/tests/conform/binding-pool.c
+++ b/tests/conform/binding-pool.c
@@ -1,11 +1,6 @@
 #include <string.h>
 
-#include <glib.h>
-
 #include <clutter/clutter.h>
-#include <clutter/clutter-keysyms.h>
-
-#include "test-conform-common.h"
 
 #define TYPE_KEY_GROUP                  (key_group_get_type ())
 #define KEY_GROUP(obj)                  (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_KEY_GROUP, KeyGroup))
@@ -18,20 +13,22 @@ typedef struct _KeyGroupClass   KeyGroupClass;
 
 struct _KeyGroup
 {
-  ClutterGroup parent_instance;
+  ClutterActor parent_instance;
 
   gint selected_index;
 };
 
 struct _KeyGroupClass
 {
-  ClutterGroupClass parent_class;
+  ClutterActorClass parent_class;
 
   void (* activate) (KeyGroup     *group,
                      ClutterActor *child);
 };
 
-G_DEFINE_TYPE (KeyGroup, key_group, CLUTTER_TYPE_GROUP);
+GType key_group_get_type (void);
+
+G_DEFINE_TYPE (KeyGroup, key_group, CLUTTER_TYPE_ACTOR)
 
 enum
 {
@@ -53,7 +50,7 @@ key_group_action_move_left (KeyGroup            *self,
   g_assert_cmpstr (action_name, ==, "move-left");
   g_assert_cmpint (key_val, ==, CLUTTER_KEY_Left);
 
-  n_children = clutter_group_get_n_children (CLUTTER_GROUP (self));
+  n_children = clutter_actor_get_n_children (CLUTTER_ACTOR (self));
 
   self->selected_index -= 1;
 
@@ -74,7 +71,7 @@ key_group_action_move_right (KeyGroup            *self,
   g_assert_cmpstr (action_name, ==, "move-right");
   g_assert_cmpint (key_val, ==, CLUTTER_KEY_Right);
 
-  n_children = clutter_group_get_n_children (CLUTTER_GROUP (self));
+  n_children = clutter_actor_get_n_children (CLUTTER_ACTOR (self));
 
   self->selected_index += 1;
 
@@ -100,10 +97,8 @@ key_group_action_activate (KeyGroup            *self,
   if (self->selected_index == -1)
     return FALSE;
 
-  child = clutter_group_get_nth_child (CLUTTER_GROUP (self),
-                                       self->selected_index);
-
-  if (child)
+  child = clutter_actor_get_child_at_index (CLUTTER_ACTOR (self), self->selected_index);
+  if (child != NULL)
     {
       g_signal_emit (self, group_signals[ACTIVATE], 0, child);
       return TRUE;
@@ -138,15 +133,13 @@ static void
 key_group_paint (ClutterActor *actor)
 {
   KeyGroup *self = KEY_GROUP (actor);
-  GList *children, *l;
-  gint i;
+  ClutterActorIter iter;
+  ClutterActor *child;
+  gint i = 0;
 
-  children = clutter_container_get_children (CLUTTER_CONTAINER (self));
-
-  for (l = children, i = 0; l != NULL; l = l->next, i++)
+  clutter_actor_iter_init (&iter, actor);
+  while (clutter_actor_iter_next (&iter, &child))
     {
-      ClutterActor *child = l->data;
-
       /* paint the selection rectangle */
       if (i == self->selected_index)
         {
@@ -165,14 +158,6 @@ key_group_paint (ClutterActor *actor)
 
       clutter_actor_paint (child);
     }
-
-  g_list_free (children);
-}
-
-static void
-key_group_finalize (GObject *gobject)
-{
-  G_OBJECT_CLASS (key_group_parent_class)->finalize (gobject);
 }
 
 static void
@@ -182,8 +167,6 @@ key_group_class_init (KeyGroupClass *klass)
   ClutterActorClass *actor_class = CLUTTER_ACTOR_CLASS (klass);
   ClutterBindingPool *binding_pool;
 
-  gobject_class->finalize = key_group_finalize;
-
   actor_class->paint = key_group_paint;
   actor_class->key_press_event = key_group_key_press;
 
@@ -261,29 +244,30 @@ on_activate (KeyGroup     *key_group,
   g_assert_cmpint (key_group->selected_index, ==, _index);
 }
 
-void
-binding_pool (TestConformSimpleFixture *fixture,
-              gconstpointer             data)
+static void
+binding_pool (void)
 {
   KeyGroup *key_group = g_object_new (TYPE_KEY_GROUP, NULL);
+  g_object_ref_sink (key_group);
 
-  clutter_container_add (CLUTTER_CONTAINER (key_group),
-                         g_object_new (CLUTTER_TYPE_RECTANGLE,
-                                       "width", 50.0,
-                                       "height", 50.0,
-                                       "x", 0.0, "y", 0.0,
-                                       NULL),
-                         g_object_new (CLUTTER_TYPE_RECTANGLE,
-                                       "width", 50.0,
-                                       "height", 50.0,
-                                       "x", 75.0, "y", 0.0,
-                                       NULL),
-                         g_object_new (CLUTTER_TYPE_RECTANGLE,
-                                       "width", 50.0,
-                                       "height", 50.0,
-                                       "x", 150.0, "y", 0.0,
-                                       NULL),
-                         NULL);
+  clutter_actor_add_child (CLUTTER_ACTOR (key_group),
+                           g_object_new (CLUTTER_TYPE_ACTOR,
+                                         "width", 50.0,
+                                         "height", 50.0,
+                                         "x", 0.0, "y", 0.0,
+                                         NULL));
+  clutter_actor_add_child (CLUTTER_ACTOR (key_group),
+                           g_object_new (CLUTTER_TYPE_ACTOR,
+                                         "width", 50.0,
+                                         "height", 50.0,
+                                         "x", 75.0, "y", 0.0,
+                                         NULL));
+  clutter_actor_add_child (CLUTTER_ACTOR (key_group),
+                           g_object_new (CLUTTER_TYPE_ACTOR,
+                                         "width", 50.0,
+                                         "height", 50.0,
+                                         "x", 150.0, "y", 0.0,
+                                         NULL));
 
   g_assert_cmpint (key_group->selected_index, ==, -1);
 
@@ -307,3 +291,7 @@ binding_pool (TestConformSimpleFixture *fixture,
 
   clutter_actor_destroy (CLUTTER_ACTOR (key_group));
 }
+
+CLUTTER_TEST_SUITE (
+  CLUTTER_TEST_UNIT ("/binding-pool", binding_pool)
+)
diff --git a/tests/conform/color.c b/tests/conform/color.c
index a0c9f56c1..03ecf3f08 100644
--- a/tests/conform/color.c
+++ b/tests/conform/color.c
@@ -1,20 +1,16 @@
-#include <stdio.h>
 #include <clutter/clutter.h>
 
-#include "test-conform-common.h"
-
-void
-color_hls_roundtrip (TestConformSimpleFixture *fixture,
-                     gconstpointer data)
+static void
+color_hls_roundtrip (void)
 {
   ClutterColor color;
   gfloat hue, luminance, saturation;
 
   /* test luminance only */
   clutter_color_from_string (&color, "#7f7f7f");
-  g_assert_cmpint (color.red,   ==, 0x7f);
-  g_assert_cmpint (color.green, ==, 0x7f);
-  g_assert_cmpint (color.blue,  ==, 0x7f);
+  g_assert_cmpuint (color.red, ==, 0x7f);
+  g_assert_cmpuint (color.green, ==, 0x7f);
+  g_assert_cmpuint (color.blue, ==, 0x7f);
 
   clutter_color_to_hls (&color, &hue, &luminance, &saturation);
   g_assert_cmpfloat (hue, ==, 0.0);
@@ -34,17 +30,17 @@ color_hls_roundtrip (TestConformSimpleFixture *fixture,
   color.red = color.green = color.blue = 0;
   clutter_color_from_hls (&color, hue, luminance, saturation);
 
-  g_assert_cmpint (color.red,   ==, 0x7f);
-  g_assert_cmpint (color.green, ==, 0x7f);
-  g_assert_cmpint (color.blue,  ==, 0x7f);
+  g_assert_cmpuint (color.red, ==, 0x7f);
+  g_assert_cmpuint (color.green, ==, 0x7f);
+  g_assert_cmpuint (color.blue, ==, 0x7f);
 
   /* full conversion */
   clutter_color_from_string (&color, "#7f8f7f");
   color.alpha = 255;
 
-  g_assert_cmpint (color.red,   ==, 0x7f);
-  g_assert_cmpint (color.green, ==, 0x8f);
-  g_assert_cmpint (color.blue,  ==, 0x7f);
+  g_assert_cmpuint (color.red, ==, 0x7f);
+  g_assert_cmpuint (color.green, ==, 0x8f);
+  g_assert_cmpuint (color.blue, ==, 0x7f);
 
   clutter_color_to_hls (&color, &hue, &luminance, &saturation);
   g_assert (hue >= 0.0 && hue < 360.0);
@@ -64,17 +60,16 @@ color_hls_roundtrip (TestConformSimpleFixture *fixture,
   color.red = color.green = color.blue = 0;
   clutter_color_from_hls (&color, hue, luminance, saturation);
 
-  g_assert_cmpint (color.red,   ==, 0x7f);
-  g_assert_cmpint (color.green, ==, 0x8f);
-  g_assert_cmpint (color.blue,  ==, 0x7f);
+  g_assert_cmpuint (color.red, ==, 0x7f);
+  g_assert_cmpuint (color.green, ==, 0x8f);
+  g_assert_cmpuint (color.blue, ==, 0x7f);
 
   /* the alpha channel should be untouched */
-  g_assert_cmpint (color.alpha, ==, 255);
+  g_assert_cmpuint (color.alpha, ==, 255);
 }
 
-void
-color_from_string_invalid (TestConformSimpleFixture *fixture,
-                           gconstpointer data)
+static void
+color_from_string_invalid (void)
 {
   ClutterColor color;
 
@@ -86,11 +81,11 @@ color_from_string_invalid (TestConformSimpleFixture *fixture,
   g_assert (!clutter_color_from_string (&color, "hsl(100, 0, 0)"));
   g_assert (!clutter_color_from_string (&color, "hsla(10%, 0%, 50%)"));
   g_assert (!clutter_color_from_string (&color, "hsla(100%, 0%, 50%, 20%)"));
+  g_assert (!clutter_color_from_string (&color, "hsla(0.5, 0.9, 0.2, 0.4)"));
 }
 
-void
-color_from_string_valid (TestConformSimpleFixture *fixture,
-                         gconstpointer data)
+static void
+color_from_string_valid (void)
 {
   ClutterColor color;
 
@@ -103,10 +98,10 @@ color_from_string_valid (TestConformSimpleFixture *fixture,
                color.blue,
                color.alpha);
     }
-  g_assert (color.red   == 0xff);
-  g_assert (color.green == 0);
-  g_assert (color.blue  == 0);
-  g_assert (color.alpha == 0xff);
+  g_assert_cmpuint (color.red, ==, 0xff);
+  g_assert_cmpuint (color.green, ==, 0);
+  g_assert_cmpuint (color.blue, ==, 0);
+  g_assert_cmpuint (color.alpha, ==, 0xff);
 
   g_assert (clutter_color_from_string (&color, "#0f0f"));
   if (g_test_verbose ())
@@ -117,10 +112,10 @@ color_from_string_valid (TestConformSimpleFixture *fixture,
                color.blue,
                color.alpha);
     }
-  g_assert (color.red   == 0);
-  g_assert (color.green == 0xff);
-  g_assert (color.blue  == 0);
-  g_assert (color.alpha == 0xff);
+  g_assert_cmpuint (color.red, ==, 0);
+  g_assert_cmpuint (color.green, ==, 0xff);
+  g_assert_cmpuint (color.blue, ==, 0);
+  g_assert_cmpuint (color.alpha, ==, 0xff);
 
   g_assert (clutter_color_from_string (&color, "#0000ff"));
   if (g_test_verbose ())
@@ -131,10 +126,10 @@ color_from_string_valid (TestConformSimpleFixture *fixture,
                color.blue,
                color.alpha);
     }
-  g_assert (color.red   == 0);
-  g_assert (color.green == 0);
-  g_assert (color.blue  == 0xff);
-  g_assert (color.alpha == 0xff);
+  g_assert_cmpuint (color.red, ==, 0);
+  g_assert_cmpuint (color.green, ==, 0);
+  g_assert_cmpuint (color.blue, ==, 0xff);
+  g_assert_cmpuint (color.alpha, ==, 0xff);
 
   g_assert (clutter_color_from_string (&color, "#abc"));
   if (g_test_verbose ())
@@ -145,10 +140,10 @@ color_from_string_valid (TestConformSimpleFixture *fixture,
                color.blue,
                color.alpha);
     }
-  g_assert (color.red   == 0xaa);
-  g_assert (color.green == 0xbb);
-  g_assert (color.blue  == 0xcc);
-  g_assert (color.alpha == 0xff);
+  g_assert_cmpuint (color.red, ==, 0xaa);
+  g_assert_cmpuint (color.green, ==, 0xbb);
+  g_assert_cmpuint (color.blue, ==, 0xcc);
+  g_assert_cmpuint (color.alpha, ==, 0xff);
 
   g_assert (clutter_color_from_string (&color, "#123abc"));
   if (g_test_verbose ())
@@ -173,10 +168,10 @@ color_from_string_valid (TestConformSimpleFixture *fixture,
                color.blue,
                color.alpha);
     }
-  g_assert_cmpint (color.red, ==, 255);
-  g_assert_cmpint (color.green, ==, 128);
-  g_assert_cmpint (color.blue, ==, 64);
-  g_assert_cmpint (color.alpha, ==, 255);
+  g_assert_cmpuint (color.red, ==, 255);
+  g_assert_cmpuint (color.green, ==, 128);
+  g_assert_cmpuint (color.blue, ==, 64);
+  g_assert_cmpuint (color.alpha, ==, 255);
 
   g_assert (clutter_color_from_string (&color, "rgba ( 30%, 0,    25%,  0.5 )   "));
   if (g_test_verbose ())
@@ -189,10 +184,10 @@ color_from_string_valid (TestConformSimpleFixture *fixture,
                CLAMP (255.0 / 100.0 * 30.0, 0, 255),
                CLAMP (255.0 / 100.0 * 25.0, 0, 255));
     }
-  g_assert_cmpint (color.red, ==, (255.0 / 100.0 * 30.0));
-  g_assert_cmpint (color.green, ==, 0);
-  g_assert_cmpint (color.blue, ==, (255.0 / 100.0 * 25.0));
-  g_assert_cmpint (color.alpha, ==, 127);
+  g_assert_cmpuint (color.red, ==, (255.0 / 100.0 * 30.0));
+  g_assert_cmpuint (color.green, ==, 0);
+  g_assert_cmpuint (color.blue, ==, (255.0 / 100.0 * 25.0));
+  g_assert_cmpuint (color.alpha, ==, 127);
 
   g_assert (clutter_color_from_string (&color, "rgb( 50%, -50%, 150% )"));
   if (g_test_verbose ())
@@ -203,10 +198,10 @@ color_from_string_valid (TestConformSimpleFixture *fixture,
                color.blue,
                color.alpha);
     }
-  g_assert_cmpint (color.red, ==, 127);
-  g_assert_cmpint (color.green, ==, 0);
-  g_assert_cmpint (color.blue, ==, 255);
-  g_assert_cmpint (color.alpha, ==, 255);
+  g_assert_cmpuint (color.red, ==, 127);
+  g_assert_cmpuint (color.green, ==, 0);
+  g_assert_cmpuint (color.blue, ==, 255);
+  g_assert_cmpuint (color.alpha, ==, 255);
 
   g_assert (clutter_color_from_string (&color, "hsl( 0, 100%, 50% )"));
   if (g_test_verbose ())
@@ -217,10 +212,12 @@ color_from_string_valid (TestConformSimpleFixture *fixture,
                color.blue,
                color.alpha);
     }
-  g_assert_cmpint (color.red, ==, 255);
-  g_assert_cmpint (color.green, ==, 0);
-  g_assert_cmpint (color.blue, ==, 0);
-  g_assert_cmpint (color.alpha, ==, 255);
+  g_assert_cmpuint (color.red, ==, 255);
+  g_assert_cmpuint (color.green, ==, 0);
+  g_assert_cmpuint (color.blue, ==, 0);
+  g_assert_cmpuint (color.alpha, ==, 255);
+
+  g_assert (clutter_color_from_string (&color, "hsl( 0, 100%, 50%     )"));
 
   g_assert (clutter_color_from_string (&color, "hsla( 0, 100%, 50%, 0.5 )"));
   if (g_test_verbose ())
@@ -231,15 +228,17 @@ color_from_string_valid (TestConformSimpleFixture *fixture,
                color.blue,
                color.alpha);
     }
-  g_assert_cmpint (color.red, ==, 255);
-  g_assert_cmpint (color.green, ==, 0);
-  g_assert_cmpint (color.blue, ==, 0);
-  g_assert_cmpint (color.alpha, ==, 127);
+  g_assert_cmpuint (color.red, ==, 255);
+  g_assert_cmpuint (color.green, ==, 0);
+  g_assert_cmpuint (color.blue, ==, 0);
+  g_assert_cmpuint (color.alpha, ==, 127);
+
+  g_test_bug ("662818");
+  g_assert (clutter_color_from_string (&color, "hsla(0,100%,50% , 0.5)"));
 }
 
-void
-color_to_string (TestConformSimpleFixture *fixture,
-                 gconstpointer data)
+static void
+color_to_string (void)
 {
   ClutterColor color;
   gchar *str;
@@ -255,24 +254,23 @@ color_to_string (TestConformSimpleFixture *fixture,
   g_free (str);
 }
 
-void
-color_operators (TestConformSimpleFixture *fixture,
-                 gconstpointer data)
+static void
+color_operators (void)
 {
   ClutterColor op1, op2;
   ClutterColor res;
 
   clutter_color_from_pixel (&op1, 0xff0000ff);
-  g_assert_cmpint (op1.red, ==, 0xff);
-  g_assert_cmpint (op1.green, ==, 0);
-  g_assert_cmpint (op1.blue, ==, 0);
-  g_assert_cmpint (op1.alpha, ==, 0xff);
+  g_assert_cmpuint (op1.red, ==, 0xff);
+  g_assert_cmpuint (op1.green, ==, 0);
+  g_assert_cmpuint (op1.blue, ==, 0);
+  g_assert_cmpuint (op1.alpha, ==, 0xff);
 
   clutter_color_from_pixel (&op2, 0x00ff00ff);
-  g_assert_cmpint (op2.red, ==, 0);
-  g_assert_cmpint (op2.green, ==, 0xff);
-  g_assert_cmpint (op2.blue, ==, 0);
-  g_assert_cmpint (op2.alpha, ==, 0xff);
+  g_assert_cmpuint (op2.red, ==, 0);
+  g_assert_cmpuint (op2.green, ==, 0xff);
+  g_assert_cmpuint (op2.blue, ==, 0);
+  g_assert_cmpuint (op2.alpha, ==, 0xff);
 
   if (g_test_verbose ())
     g_print ("Adding %x, %x; expected result: %x\n",
@@ -281,7 +279,7 @@ color_operators (TestConformSimpleFixture *fixture,
              0xffff00ff);
 
   clutter_color_add (&op1, &op2, &res);
-  g_assert_cmpint (clutter_color_to_pixel (&res), ==, 0xffff00ff);
+  g_assert_cmpuint (clutter_color_to_pixel (&res), ==, 0xffff00ff);
 
   if (g_test_verbose ())
     g_print ("Checking alpha channel on color add\n");
@@ -289,7 +287,7 @@ color_operators (TestConformSimpleFixture *fixture,
   op1.alpha = 0xdd;
   op2.alpha = 0xcc;
   clutter_color_add (&op1, &op2, &res);
-  g_assert_cmpint (clutter_color_to_pixel (&res), ==, 0xffff00dd);
+  g_assert_cmpuint (clutter_color_to_pixel (&res), ==, 0xffff00dd);
 
   clutter_color_from_pixel (&op1, 0xffffffff);
   clutter_color_from_pixel (&op2, 0xff00ffff);
@@ -301,7 +299,7 @@ color_operators (TestConformSimpleFixture *fixture,
              0x00ff00ff);
 
   clutter_color_subtract (&op1, &op2, &res);
-  g_assert_cmpint (clutter_color_to_pixel (&res), ==, 0x00ff00ff);
+  g_assert_cmpuint (clutter_color_to_pixel (&res), ==, 0x00ff00ff);
 
   if (g_test_verbose ())
     g_print ("Checking alpha channel on color subtract\n");
@@ -309,5 +307,13 @@ color_operators (TestConformSimpleFixture *fixture,
   op1.alpha = 0xdd;
   op2.alpha = 0xcc;
   clutter_color_subtract (&op1, &op2, &res);
-  g_assert_cmpint (clutter_color_to_pixel (&res), ==, 0x00ff00cc);
+  g_assert_cmpuint (clutter_color_to_pixel (&res), ==, 0x00ff00cc);
 }
+
+CLUTTER_TEST_SUITE (
+  CLUTTER_TEST_UNIT ("/color/hls-roundtrip", color_hls_roundtrip)
+  CLUTTER_TEST_UNIT ("/color/from-string/invalid", color_from_string_invalid)
+  CLUTTER_TEST_UNIT ("/color/from-string/valid", color_from_string_valid)
+  CLUTTER_TEST_UNIT ("/color/to-string", color_to_string)
+  CLUTTER_TEST_UNIT ("/color/operators", color_operators)
+)
diff --git a/tests/conform/events-touch.c b/tests/conform/events-touch.c
index 237a245ce..124b821af 100644
--- a/tests/conform/events-touch.c
+++ b/tests/conform/events-touch.c
@@ -19,7 +19,6 @@
  *
  */
 
-#include "config.h"
 #include <clutter/clutter.h>
 
 #if defined CLUTTER_WINDOWING_X11 && OS_LINUX && HAVE_XINPUT_2_2
@@ -36,8 +35,6 @@
 
 #include <clutter/x11/clutter-x11.h>
 
-#include "test-conform-common.h"
-
 #define ABS_MAX_X 32768
 #define ABS_MAX_Y 32768
 
@@ -148,7 +145,6 @@ screen_coords_to_device (int screen_x, int screen_y,
 static gboolean
 perform_gesture (gpointer data)
 {
-  State *state = data;
   int i;
 
   for (i = 0; i < TOUCH_POINTS; i++)
@@ -361,7 +357,7 @@ error:
 
 #endif /* defined CLUTTER_WINDOWING_X11 && OS_LINUX && HAVE_XINPUT_2_2 */
 
-void
+static void
 events_touch (void)
 {
 #if defined CLUTTER_WINDOWING_X11 && OS_LINUX && HAVE_XINPUT_2_2
@@ -375,7 +371,7 @@ events_touch (void)
   state.pass = TRUE;
   state.gesture_points = 0;
 
-  stage = clutter_stage_new ();
+  stage = clutter_test_get_stage ();
   g_signal_connect (stage, "event", G_CALLBACK (event_cb), &state);
   clutter_stage_set_fullscreen (CLUTTER_STAGE (stage), TRUE);
   clutter_actor_show (stage);
@@ -388,7 +384,9 @@ events_touch (void)
     g_print ("end result: %s\n", state.pass ? "pass" : "FAIL");
 
   g_assert (state.pass);
-
-  clutter_actor_destroy (stage);
 #endif /* defined CLUTTER_WINDOWING_X11 && OS_LINUX && HAVE_XINPUT_2_2 */
 }
+
+CLUTTER_TEST_SUITE (
+  CLUTTER_TEST_UNIT ("/events/touch", events_touch)
+)
diff --git a/tests/conform/group.c b/tests/conform/group.c
index c226f958c..3f7b1fb4b 100644
--- a/tests/conform/group.c
+++ b/tests/conform/group.c
@@ -1,9 +1,8 @@
+#define CLUTTER_DISABLE_DEPRECATION_WARNINGS
 #include <clutter/clutter.h>
-#include "test-conform-common.h"
 
-void
-group_depth_sorting (TestConformSimpleFixture *fixture,
-                     gconstpointer data)
+static void
+group_depth_sorting (void)
 {
   ClutterActor *group;
   ClutterActor *child, *test;
@@ -55,3 +54,7 @@ group_depth_sorting (TestConformSimpleFixture *fixture,
 
   clutter_actor_destroy (group);
 }
+
+CLUTTER_TEST_SUITE (
+  CLUTTER_TEST_UNIT ("/group/depth-sorting", group_depth_sorting)
+)
diff --git a/tests/conform/interval.c b/tests/conform/interval.c
index 2ee3ea897..520437894 100644
--- a/tests/conform/interval.c
+++ b/tests/conform/interval.c
@@ -1,10 +1,7 @@
 #include <clutter/clutter.h>
 
-#include "test-conform-common.h"
-
-void
-interval_initial_state (TestConformSimpleFixture *fixture G_GNUC_UNUSED,
-                        gconstpointer dummy G_GNUC_UNUSED)
+static void
+interval_initial_state (void)
 {
   ClutterInterval *interval;
   int initial, final;
@@ -38,9 +35,8 @@ interval_initial_state (TestConformSimpleFixture *fixture G_GNUC_UNUSED,
   g_object_unref (interval);
 }
 
-void
-interval_transform (TestConformSimpleFixture *fixture G_GNUC_UNUSED,
-                    gconstpointer dummy G_GNUC_UNUSED)
+static void
+interval_transform (void)
 {
   ClutterInterval *interval;
   GValue value = G_VALUE_INIT;
@@ -68,3 +64,54 @@ interval_transform (TestConformSimpleFixture *fixture G_GNUC_UNUSED,
 
   g_object_unref (interval);
 }
+
+static void
+interval_from_script (void)
+{
+  ClutterScript *script = clutter_script_new ();
+  ClutterInterval *interval;
+  gchar *test_file;
+  GError *error = NULL;
+  GValue *initial, *final;
+
+  test_file = g_test_build_filename (G_TEST_DIST,
+                                     "scripts",
+                                     "test-script-interval.json",
+                                     NULL);
+  clutter_script_load_from_file (script, test_file, &error);
+  if (g_test_verbose () && error)
+    g_printerr ("\tError: %s", error->message);
+
+  g_assert_no_error (error);
+
+  interval = CLUTTER_INTERVAL (clutter_script_get_object (script, "int-1"));
+  initial = clutter_interval_peek_initial_value (interval);
+  if (g_test_verbose ())
+    g_test_message ("\tinitial ['%s'] = '%.2f'",
+                    g_type_name (G_VALUE_TYPE (initial)),
+                    g_value_get_float (initial));
+  g_assert (G_VALUE_HOLDS (initial, G_TYPE_FLOAT));
+  g_assert_cmpfloat (g_value_get_float (initial), ==, 23.3f);
+  final = clutter_interval_peek_final_value (interval);
+  if (g_test_verbose ())
+    g_test_message ("\tfinal ['%s'] = '%.2f'",
+                    g_type_name (G_VALUE_TYPE (final)),
+                    g_value_get_float (final));
+  g_assert (G_VALUE_HOLDS (final, G_TYPE_FLOAT));
+  g_assert_cmpfloat (g_value_get_float (final), ==, 42.2f);
+
+  interval = CLUTTER_INTERVAL (clutter_script_get_object (script, "int-2"));
+  initial = clutter_interval_peek_initial_value (interval);
+  g_assert (G_VALUE_HOLDS (initial, CLUTTER_TYPE_COLOR));
+  final = clutter_interval_peek_final_value (interval);
+  g_assert (G_VALUE_HOLDS (final, CLUTTER_TYPE_COLOR));
+
+  g_object_unref (script);
+  g_free (test_file);
+}
+
+CLUTTER_TEST_SUITE (
+  CLUTTER_TEST_UNIT ("/interval/initial-state", interval_initial_state)
+  CLUTTER_TEST_UNIT ("/interval/transform", interval_transform)
+  CLUTTER_TEST_UNIT ("/interval/from-script", interval_from_script)
+)
diff --git a/tests/conform/model.c b/tests/conform/model.c
index 0f36a5e10..51c9eb7ff 100644
--- a/tests/conform/model.c
+++ b/tests/conform/model.c
@@ -2,8 +2,6 @@
 #include <string.h>
 #include <clutter/clutter.h>
 
-#include "test-conform-common.h"
-
 typedef struct _ModelData
 {
   ClutterModel *model;
@@ -171,9 +169,8 @@ filter_odd_rows (ClutterModel     *model,
   return FALSE;
 }
 
-void
-list_model_filter (TestConformSimpleFixture *fixture,
-                   gconstpointer             data)
+static void
+list_model_filter (void)
 {
   ModelData test_data = { NULL, 0 };
   ClutterModelIter *iter;
@@ -259,9 +256,8 @@ list_model_filter (TestConformSimpleFixture *fixture,
   g_object_unref (test_data.model);
 }
 
-void
-list_model_iterate (TestConformSimpleFixture *fixture,
-                    gconstpointer             data)
+static void
+list_model_iterate (void)
 {
   ModelData test_data = { NULL, 0 };
   ClutterModelIter *iter;
@@ -334,9 +330,8 @@ list_model_iterate (TestConformSimpleFixture *fixture,
   g_object_unref (test_data.model);
 }
 
-void
-list_model_populate (TestConformSimpleFixture *fixture,
-                     gconstpointer             data)
+static void
+list_model_populate (void)
 {
   ModelData test_data = { NULL, 0 };
   gint i;
@@ -365,9 +360,8 @@ list_model_populate (TestConformSimpleFixture *fixture,
   g_object_unref (test_data.model);
 }
 
-void
-list_model_from_script (TestConformSimpleFixture *fixture,
-                        gconstpointer dummy)
+static void
+list_model_from_script (void)
 {
   ClutterScript *script = clutter_script_new ();
   GObject *model;
@@ -378,7 +372,7 @@ list_model_from_script (TestConformSimpleFixture *fixture,
   ClutterModelIter *iter;
   GValue value = { 0, };
 
-  test_file = clutter_test_get_data_file ("test-script-model.json");
+  test_file = g_test_build_filename (G_TEST_DIST, "scripts", "test-script-model.json", NULL);
   clutter_script_load_from_file (script, test_file, &error);
   if (g_test_verbose () && error)
     g_print ("Error: %s", error->message);
@@ -406,7 +400,7 @@ list_model_from_script (TestConformSimpleFixture *fixture,
     g_print ("column[2]: %s, type: %s\n", name, g_type_name (type));
 
   g_assert (strcmp (name, "actor-column") == 0);
-  g_assert (type == CLUTTER_TYPE_RECTANGLE);
+  g_assert (g_type_is_a (type, CLUTTER_TYPE_ACTOR));
 
   g_assert (clutter_model_get_n_rows (CLUTTER_MODEL (model)) == 3);
 
@@ -429,13 +423,13 @@ list_model_from_script (TestConformSimpleFixture *fixture,
   iter = clutter_model_iter_next (iter);
   clutter_model_iter_get_value (iter, 2, &value);
   g_assert (G_VALUE_HOLDS_OBJECT (&value));
-  g_assert (CLUTTER_IS_RECTANGLE (g_value_get_object (&value)));
+  g_assert (CLUTTER_IS_ACTOR (g_value_get_object (&value)));
   g_value_unset (&value);
 
   iter = clutter_model_iter_next (iter);
   clutter_model_iter_get_value (iter, 2, &value);
   g_assert (G_VALUE_HOLDS_OBJECT (&value));
-  g_assert (CLUTTER_IS_RECTANGLE (g_value_get_object (&value)));
+  g_assert (CLUTTER_IS_ACTOR (g_value_get_object (&value)));
   g_assert (strcmp (clutter_actor_get_name (g_value_get_object (&value)),
                     "actor-row-3") == 0);
   g_value_unset (&value);
@@ -460,9 +454,8 @@ on_row_changed (ClutterModel *model,
   data->n_emissions += 1;
 }
 
-void
-list_model_row_changed (TestConformSimpleFixture *fixture,
-                        gconstpointer             data)
+static void
+list_model_row_changed (void)
 {
   ChangedData test_data = { NULL, NULL, 0, 0 };
   GValue value = { 0, };
@@ -524,3 +517,11 @@ list_model_row_changed (TestConformSimpleFixture *fixture,
   g_object_unref (test_data.iter);
   g_object_unref (test_data.model);
 }
+
+CLUTTER_TEST_SUITE (
+  CLUTTER_TEST_UNIT ("/list-model/populate", list_model_populate)
+  CLUTTER_TEST_UNIT ("/list-model/iterate", list_model_iterate)
+  CLUTTER_TEST_UNIT ("/list-model/filter", list_model_filter)
+  CLUTTER_TEST_UNIT ("/list-model/row-changed", list_model_row_changed)
+  CLUTTER_TEST_UNIT ("/list-model/from-script", list_model_from_script)
+)
diff --git a/tests/conform/rectangle.c b/tests/conform/rectangle.c
index 55edc361b..1c09f00b7 100644
--- a/tests/conform/rectangle.c
+++ b/tests/conform/rectangle.c
@@ -1,16 +1,8 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <glib.h>
-
+#define CLUTTER_DISABLE_DEPRECATION_WARNINGS
 #include <clutter/clutter.h>
 
-#include "test-conform-common.h"
-
-void
-rectangle_set_size (TestConformSimpleFixture *fixture,
-		    gconstpointer data)
+static void
+rectangle_set_size (void)
 {
   ClutterActor *rect = clutter_rectangle_new ();
 
@@ -32,9 +24,8 @@ rectangle_set_size (TestConformSimpleFixture *fixture,
   clutter_actor_destroy (rect);
 }
 
-void
-rectangle_set_color (TestConformSimpleFixture *fixture,
-		     gconstpointer data)
+static void
+rectangle_set_color (void)
 {
   ClutterActor *rect = clutter_rectangle_new ();
   ClutterColor white = { 255, 255, 255, 255 };
@@ -54,3 +45,7 @@ rectangle_set_color (TestConformSimpleFixture *fixture,
   clutter_actor_destroy (rect);
 }
 
+CLUTTER_TEST_SUITE (
+  CLUTTER_TEST_UNIT ("/rectangle/set-size", rectangle_set_size)
+  CLUTTER_TEST_UNIT ("/rectangle/set-color", rectangle_set_color)
+)
diff --git a/tests/conform/run-tests.sh b/tests/conform/run-tests.sh
deleted file mode 100755
index 03f5a7af3..000000000
--- a/tests/conform/run-tests.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-
-BINARY=$1
-shift
-
-TMP=`./$BINARY -l -m thorough | grep '^/' | sed -e s/_/-/g`
-for i in $TMP
-do
-  TESTS="$TESTS wrappers/`basename $i`"
-done
-
-G_DEBUG=gc-friendly MALLOC_CHECK_=2 MALLOC_PERTURB_=$((${RANDOM:-256} % 256)) gtester "$@" $TESTS
diff --git a/tests/conform/script-parser.c b/tests/conform/script-parser.c
index 0b455e180..c2e2dbd08 100644
--- a/tests/conform/script-parser.c
+++ b/tests/conform/script-parser.c
@@ -1,8 +1,8 @@
 #include <stdlib.h>
 #include <string.h>
-#include <clutter/clutter.h>
 
-#include "test-conform-common.h"
+#define CLUTTER_DISABLE_DEPRECATION_WARNINGS
+#include <clutter/clutter.h>
 
 #define TEST_TYPE_GROUP                 (test_group_get_type ())
 #define TEST_TYPE_GROUP_META            (test_group_meta_get_type ())
@@ -13,7 +13,8 @@
 #define TEST_GROUP_META(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), TEST_TYPE_GROUP_META, TestGroupMeta))
 #define TEST_IS_GROUP_META(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TEST_TYPE_GROUP_META))
 
-typedef struct _ClutterGroup            TestGroup;
+typedef struct _ClutterActor            TestGroup;
+typedef struct _ClutterActorClass       TestGroupClass;
 
 typedef struct _TestGroupMeta {
   ClutterChildMeta parent_instance;
@@ -21,10 +22,11 @@ typedef struct _TestGroupMeta {
   guint is_focus : 1;
 } TestGroupMeta;
 
-typedef struct _ClutterGroupClass       TestGroupClass;
 typedef struct _ClutterChildMetaClass   TestGroupMetaClass;
 
-G_DEFINE_TYPE (TestGroupMeta, test_group_meta, CLUTTER_TYPE_CHILD_META);
+GType test_group_meta_get_type (void);
+
+G_DEFINE_TYPE (TestGroupMeta, test_group_meta, CLUTTER_TYPE_CHILD_META)
 
 enum
 {
@@ -100,9 +102,11 @@ clutter_container_iface_init (ClutterContainerIface *iface)
   iface->child_meta_type = TEST_TYPE_GROUP_META;
 }
 
-G_DEFINE_TYPE_WITH_CODE (TestGroup, test_group, CLUTTER_TYPE_GROUP,
+GType test_group_get_type (void);
+
+G_DEFINE_TYPE_WITH_CODE (TestGroup, test_group, CLUTTER_TYPE_ACTOR,
                          G_IMPLEMENT_INTERFACE (CLUTTER_TYPE_CONTAINER,
-                                                clutter_container_iface_init));
+                                                clutter_container_iface_init))
 
 static void
 test_group_class_init (TestGroupClass *klass)
@@ -114,9 +118,8 @@ test_group_init (TestGroup *self)
 {
 }
 
-void
-script_child (TestConformSimpleFixture *fixture,
-              gconstpointer dummy)
+static void
+script_child (void)
 {
   ClutterScript *script = clutter_script_new ();
   GObject *container, *actor;
@@ -124,16 +127,12 @@ script_child (TestConformSimpleFixture *fixture,
   gboolean focus_ret;
   gchar *test_file;
 
-  test_file = clutter_test_get_data_file ("test-script-child.json");
+  test_file = g_test_build_filename (G_TEST_DIST, "scripts", "test-script-child.json", NULL);
   clutter_script_load_from_file (script, test_file, &error);
   if (g_test_verbose () && error)
     g_print ("Error: %s", error->message);
 
-#if GLIB_CHECK_VERSION (2, 20, 0)
   g_assert_no_error (error);
-#else
-  g_assert (error == NULL);
-#endif
 
   container = actor = NULL;
   clutter_script_get_objects (script,
@@ -164,9 +163,8 @@ script_child (TestConformSimpleFixture *fixture,
   g_free (test_file);
 }
 
-void
-script_single (TestConformSimpleFixture *fixture,
-               gconstpointer dummy)
+static void
+script_single (void)
 {
   ClutterScript *script = clutter_script_new ();
   ClutterColor color = { 0, };
@@ -175,16 +173,12 @@ script_single (TestConformSimpleFixture *fixture,
   ClutterActor *rect;
   gchar *test_file;
 
-  test_file = clutter_test_get_data_file ("test-script-single.json");
+  test_file = g_test_build_filename (G_TEST_DIST, "scripts", "test-script-single.json", NULL);
   clutter_script_load_from_file (script, test_file, &error);
   if (g_test_verbose () && error)
     g_print ("Error: %s", error->message);
 
-#if GLIB_CHECK_VERSION (2, 20, 0)
   g_assert_no_error (error);
-#else
-  g_assert (error == NULL);
-#endif
 
   actor = clutter_script_get_object (script, "test");
   g_assert (CLUTTER_IS_RECTANGLE (actor));
@@ -202,9 +196,8 @@ script_single (TestConformSimpleFixture *fixture,
   g_free (test_file);
 }
 
-void
-script_implicit_alpha (TestConformSimpleFixture *fixture,
-                       gconstpointer dummy)
+static void
+script_implicit_alpha (void)
 {
   ClutterScript *script = clutter_script_new ();
   ClutterTimeline *timeline;
@@ -213,7 +206,7 @@ script_implicit_alpha (TestConformSimpleFixture *fixture,
   ClutterAlpha *alpha;
   gchar *test_file;
 
-  test_file = clutter_test_get_data_file ("test-script-implicit-alpha.json");
+  test_file = g_test_build_filename (G_TEST_DIST, "scripts", "test-script-implicit-alpha.json", NULL);
   clutter_script_load_from_file (script, test_file, &error);
   if (g_test_verbose () && error)
     g_print ("Error: %s", error->message);
@@ -241,9 +234,8 @@ script_implicit_alpha (TestConformSimpleFixture *fixture,
   g_free (test_file);
 }
 
-void
-script_object_property (TestConformSimpleFixture *fixture,
-                        gconstpointer dummy)
+static void
+script_object_property (void)
 {
   ClutterScript *script = clutter_script_new ();
   ClutterLayoutManager *manager;
@@ -251,16 +243,12 @@ script_object_property (TestConformSimpleFixture *fixture,
   GError *error = NULL;
   gchar *test_file;
 
-  test_file = clutter_test_get_data_file ("test-script-object-property.json");
+  test_file = g_test_build_filename (G_TEST_DIST, "scripts", "test-script-object-property.json", NULL);
   clutter_script_load_from_file (script, test_file, &error);
   if (g_test_verbose () && error)
     g_print ("Error: %s", error->message);
 
-#if GLIB_CHECK_VERSION (2, 20, 0)
   g_assert_no_error (error);
-#else
-  g_assert (error == NULL);
-#endif
 
   actor = clutter_script_get_object (script, "test");
   g_assert (CLUTTER_IS_BOX (actor));
@@ -272,9 +260,8 @@ script_object_property (TestConformSimpleFixture *fixture,
   g_free (test_file);
 }
 
-void
-script_named_object (TestConformSimpleFixture *fixture,
-                     gconstpointer dummy)
+static void
+script_named_object (void)
 {
   ClutterScript *script = clutter_script_new ();
   ClutterLayoutManager *manager;
@@ -282,16 +269,12 @@ script_named_object (TestConformSimpleFixture *fixture,
   GError *error = NULL;
   gchar *test_file;
 
-  test_file = clutter_test_get_data_file ("test-script-named-object.json");
+  test_file = g_test_build_filename (G_TEST_DIST, "scripts", "test-script-named-object.json", NULL);
   clutter_script_load_from_file (script, test_file, &error);
   if (g_test_verbose () && error)
     g_print ("Error: %s", error->message);
 
-#if GLIB_CHECK_VERSION (2, 20, 0)
   g_assert_no_error (error);
-#else
-  g_assert (error == NULL);
-#endif
 
   actor = clutter_script_get_object (script, "test");
   g_assert (CLUTTER_IS_BOX (actor));
@@ -304,25 +287,20 @@ script_named_object (TestConformSimpleFixture *fixture,
   g_free (test_file);
 }
 
-void
-script_animation (TestConformSimpleFixture *fixture,
-                  gconstpointer dummy)
+static void
+script_animation (void)
 {
   ClutterScript *script = clutter_script_new ();
   GObject *animation = NULL;
   GError *error = NULL;
   gchar *test_file;
 
-  test_file = clutter_test_get_data_file ("test-script-animation.json");
+  test_file = g_test_build_filename (G_TEST_DIST, "scripts", "test-script-animation.json", NULL);
   clutter_script_load_from_file (script, test_file, &error);
   if (g_test_verbose () && error)
     g_print ("Error: %s", error->message);
 
-#if GLIB_CHECK_VERSION (2, 20, 0)
   g_assert_no_error (error);
-#else
-  g_assert (error == NULL);
-#endif
 
   animation = clutter_script_get_object (script, "test");
   g_assert (CLUTTER_IS_ANIMATION (animation));
@@ -331,9 +309,8 @@ script_animation (TestConformSimpleFixture *fixture,
   g_free (test_file);
 }
 
-void
-script_layout_property (TestConformSimpleFixture *fixture,
-                        gconstpointer dummy G_GNUC_UNUSED)
+static void
+script_layout_property (void)
 {
   ClutterScript *script = clutter_script_new ();
   GObject *manager, *container, *actor1, *actor2;
@@ -342,16 +319,12 @@ script_layout_property (TestConformSimpleFixture *fixture,
   gboolean x_fill, expand;
   ClutterBoxAlignment y_align;
 
-  test_file = clutter_test_get_data_file ("test-script-layout-property.json");
+  test_file = g_test_build_filename (G_TEST_DIST, "scripts", "test-script-layout-property.json", NULL);
   clutter_script_load_from_file (script, test_file, &error);
   if (g_test_verbose () && error)
     g_print ("Error: %s", error->message);
 
-#if GLIB_CHECK_VERSION (2, 20, 0)
   g_assert_no_error (error);
-#else
-  g_assert (error == NULL);
-#endif
 
   manager = container = actor1 = actor2 = NULL;
   clutter_script_get_objects (script,
@@ -399,16 +372,15 @@ script_layout_property (TestConformSimpleFixture *fixture,
   g_object_unref (script);
 }
 
-void
-script_margin (TestConformSimpleFixture *fixture,
-               gpointer                  dummy)
+static void
+script_margin (void)
 {
   ClutterScript *script = clutter_script_new ();
   ClutterActor *actor;
   gchar *test_file;
   GError *error = NULL;
 
-  test_file = clutter_test_get_data_file ("test-script-margin.json");
+  test_file = g_test_build_filename (G_TEST_DIST, "scripts", "test-script-margin.json", NULL);
   clutter_script_load_from_file (script, test_file, &error);
   if (g_test_verbose () && error)
     g_print ("Error: %s", error->message);
@@ -442,3 +414,14 @@ script_margin (TestConformSimpleFixture *fixture,
   g_object_unref (script);
   g_free (test_file);
 }
+
+CLUTTER_TEST_SUITE (
+  CLUTTER_TEST_UNIT ("/script/single-object", script_single)
+  CLUTTER_TEST_UNIT ("/script/container-child", script_child)
+  CLUTTER_TEST_UNIT ("/script/named-object", script_named_object)
+  CLUTTER_TEST_UNIT ("/script/animation", script_animation)
+  CLUTTER_TEST_UNIT ("/script/implicit-alpha", script_implicit_alpha)
+  CLUTTER_TEST_UNIT ("/script/object-property", script_object_property)
+  CLUTTER_TEST_UNIT ("/script/layout-property", script_layout_property)
+  CLUTTER_TEST_UNIT ("/script/actor-margin", script_margin)
+)
diff --git a/tests/data/test-animator-1.json b/tests/conform/scripts/test-animator-1.json
similarity index 100%
rename from tests/data/test-animator-1.json
rename to tests/conform/scripts/test-animator-1.json
diff --git a/tests/data/test-animator-2.json b/tests/conform/scripts/test-animator-2.json
similarity index 100%
rename from tests/data/test-animator-2.json
rename to tests/conform/scripts/test-animator-2.json
diff --git a/tests/data/test-animator-3.json b/tests/conform/scripts/test-animator-3.json
similarity index 100%
rename from tests/data/test-animator-3.json
rename to tests/conform/scripts/test-animator-3.json
diff --git a/tests/data/test-script-animation.json b/tests/conform/scripts/test-script-animation.json
similarity index 100%
rename from tests/data/test-script-animation.json
rename to tests/conform/scripts/test-script-animation.json
diff --git a/tests/data/test-script-child.json b/tests/conform/scripts/test-script-child.json
similarity index 100%
rename from tests/data/test-script-child.json
rename to tests/conform/scripts/test-script-child.json
diff --git a/tests/data/test-script-implicit-alpha.json b/tests/conform/scripts/test-script-implicit-alpha.json
similarity index 100%
rename from tests/data/test-script-implicit-alpha.json
rename to tests/conform/scripts/test-script-implicit-alpha.json
diff --git a/tests/conform/scripts/test-script-interval.json b/tests/conform/scripts/test-script-interval.json
new file mode 100644
index 000000000..35fe5c22c
--- /dev/null
+++ b/tests/conform/scripts/test-script-interval.json
@@ -0,0 +1,16 @@
+[
+  {
+    "id" : "int-1",
+    "type" : "ClutterInterval",
+    "value-type" : "gfloat",
+    "initial" : 23.3,
+    "final" : 42.2
+  },
+  {
+    "id" : "int-2",
+    "type" : "ClutterInterval",
+    "value-type" : "ClutterColor",
+    "initial" : "red",
+    "final" : "blue"
+  }
+]
diff --git a/tests/data/test-script-layout-property.json b/tests/conform/scripts/test-script-layout-property.json
similarity index 100%
rename from tests/data/test-script-layout-property.json
rename to tests/conform/scripts/test-script-layout-property.json
diff --git a/tests/data/test-script-margin.json b/tests/conform/scripts/test-script-margin.json
similarity index 100%
rename from tests/data/test-script-margin.json
rename to tests/conform/scripts/test-script-margin.json
diff --git a/tests/data/test-script-model.json b/tests/conform/scripts/test-script-model.json
similarity index 100%
rename from tests/data/test-script-model.json
rename to tests/conform/scripts/test-script-model.json
diff --git a/tests/data/test-script-named-object.json b/tests/conform/scripts/test-script-named-object.json
similarity index 96%
rename from tests/data/test-script-named-object.json
rename to tests/conform/scripts/test-script-named-object.json
index 7210321c9..6611b62a4 100644
--- a/tests/data/test-script-named-object.json
+++ b/tests/conform/scripts/test-script-named-object.json
@@ -2,7 +2,7 @@
   {
     "id" : "layout",
     "type" : "ClutterBoxLayout",
-    "vertical" : true,
+    "orientation" : "vertical",
     "spacing" : 12,
     "pack-start" : false
   },
diff --git a/tests/data/test-script-object-property.json b/tests/conform/scripts/test-script-object-property.json
similarity index 100%
rename from tests/data/test-script-object-property.json
rename to tests/conform/scripts/test-script-object-property.json
diff --git a/tests/data/test-script-single.json b/tests/conform/scripts/test-script-single.json
similarity index 100%
rename from tests/data/test-script-single.json
rename to tests/conform/scripts/test-script-single.json
diff --git a/tests/data/test-script-timeline-markers.json b/tests/conform/scripts/test-script-timeline-markers.json
similarity index 100%
rename from tests/data/test-script-timeline-markers.json
rename to tests/conform/scripts/test-script-timeline-markers.json
diff --git a/tests/data/test-state-1.json b/tests/conform/scripts/test-state-1.json
similarity index 100%
rename from tests/data/test-state-1.json
rename to tests/conform/scripts/test-state-1.json
diff --git a/tests/conform/test-cogl-atlas-migration.c b/tests/conform/test-cogl-atlas-migration.c
deleted file mode 100644
index 9042e8ae1..000000000
--- a/tests/conform/test-cogl-atlas-migration.c
+++ /dev/null
@@ -1,133 +0,0 @@
-#include <clutter/clutter.h>
-
-#include "test-conform-common.h"
-
-#define N_TEXTURES 128
-
-#define OPACITY_FOR_ROW(y) \
-  (0xff - ((y) & 0xf) * 0x10)
-
-#define COLOR_FOR_SIZE(size) \
-  (colors + (size) % 3)
-
-static const ClutterColor colors[] =
-  { { 0xff, 0x00, 0x00, 0xff },
-    { 0x00, 0xff, 0x00, 0xff },
-    { 0x00, 0x00, 0xff, 0xff } };
-
-static CoglHandle
-create_texture (int size)
-{
-  CoglHandle texture;
-  const ClutterColor *color;
-  guint8 *data, *p;
-  int x, y;
-
-  /* Create a red, green or blue texture depending on the size */
-  color = COLOR_FOR_SIZE (size);
-
-  p = data = g_malloc (size * size * 4);
-
-  /* Fill the data with the color but fade the opacity out with
-     increasing y coordinates so that we can see the blending it the
-     atlas migration accidentally blends with garbage in the
-     texture */
-  for (y = 0; y < size; y++)
-    {
-      int opacity = OPACITY_FOR_ROW (y);
-
-      for (x = 0; x < size; x++)
-        {
-          /* Store the colors premultiplied */
-          p[0] = color->red * opacity / 255;
-          p[1] = color->green * opacity / 255;
-          p[2] = color->blue * opacity / 255;
-          p[3] = opacity;
-
-          p += 4;
-        }
-    }
-
-  texture = cogl_texture_new_from_data (size, /* width */
-                                        size, /* height */
-                                        COGL_TEXTURE_NONE, /* flags */
-                                        /* format */
-                                        COGL_PIXEL_FORMAT_RGBA_8888,
-                                        /* internal format */
-                                        COGL_PIXEL_FORMAT_RGBA_8888,
-                                        /* rowstride */
-                                        size * 4,
-                                        data);
-
-  g_free (data);
-
-  return texture;
-}
-
-static void
-verify_texture (CoglHandle texture, int size)
-{
-  guint8 *data, *p;
-  int x, y;
-  const ClutterColor *color;
-
-  color = COLOR_FOR_SIZE (size);
-
-  p = data = g_malloc (size * size * 4);
-
-  cogl_texture_get_data (texture,
-                         COGL_PIXEL_FORMAT_RGBA_8888,
-                         size * 4,
-                         data);
-
-  for (y = 0; y < size; y++)
-    {
-      int opacity = OPACITY_FOR_ROW (y);
-
-      for (x = 0; x < size; x++)
-        {
-          g_assert_cmpint (p[0], ==, color->red * opacity / 255);
-          g_assert_cmpint (p[1], ==, color->green * opacity / 255);
-          g_assert_cmpint (p[2], ==, color->blue * opacity / 255);
-          g_assert_cmpint (p[3], ==, opacity);
-
-          p += 4;
-        }
-    }
-
-  g_free (data);
-}
-
-void
-test_cogl_atlas_migration (TestConformSimpleFixture *fixture,
-                           gconstpointer data)
-{
-  CoglHandle textures[N_TEXTURES];
-  int i, tex_num;
-
-  /* Create and destroy all of the textures a few times to increase
-     the chances that we'll end up reusing the buffers for previously
-     discarded atlases */
-  for (i = 0; i < 5; i++)
-    {
-      for (tex_num = 0; tex_num < N_TEXTURES; tex_num++)
-        textures[tex_num] = create_texture (tex_num + 1);
-      for (tex_num = 0; tex_num < N_TEXTURES; tex_num++)
-        cogl_object_unref (textures[tex_num]);
-    }
-
-  /* Create all the textures again */
-  for (tex_num = 0; tex_num < N_TEXTURES; tex_num++)
-    textures[tex_num] = create_texture (tex_num + 1);
-
-  /* Verify that they all still have the right data */
-  for (tex_num = 0; tex_num < N_TEXTURES; tex_num++)
-    verify_texture (textures[tex_num], tex_num + 1);
-
-  /* Destroy them all */
-  for (tex_num = 0; tex_num < N_TEXTURES; tex_num++)
-    cogl_object_unref (textures[tex_num]);
-
-  if (g_test_verbose ())
-    g_print ("OK\n");
-}
diff --git a/tests/conform/test-cogl-fixed.c b/tests/conform/test-cogl-fixed.c
deleted file mode 100644
index 69be33a24..000000000
--- a/tests/conform/test-cogl-fixed.c
+++ /dev/null
@@ -1,18 +0,0 @@
-#include <stdio.h>
-#include <clutter/clutter.h>
-
-#include "test-conform-common.h"
-
-void
-test_cogl_fixed (TestConformSimpleFixture *fixture,
-		 gconstpointer data)
-{
-  g_assert_cmpint (COGL_FIXED_1, ==, COGL_FIXED_FROM_FLOAT (1.0));
-  g_assert_cmpint (COGL_FIXED_1, ==, COGL_FIXED_FROM_INT (1));
-
-  g_assert_cmpint (COGL_FIXED_0_5, ==, COGL_FIXED_FROM_FLOAT (0.5));
-
-  g_assert_cmpfloat (COGL_FIXED_TO_FLOAT (COGL_FIXED_1), ==, 1.0);
-  g_assert_cmpfloat (COGL_FIXED_TO_FLOAT (COGL_FIXED_0_5), ==, 0.5);
-}
-
diff --git a/tests/conform/test-cogl-materials.c b/tests/conform/test-cogl-materials.c
deleted file mode 100644
index 323f36f47..000000000
--- a/tests/conform/test-cogl-materials.c
+++ /dev/null
@@ -1,383 +0,0 @@
-#include "config.h"
-
-/* XXX: we currently include config.h above as a hack so we can
- * determine if we are running with GLES2 or not but since Clutter
- * uses the experimental Cogl api that will also define
- * COGL_ENABLE_EXPERIMENTAL_2_0_API. The cogl_material_ api isn't
- * exposed if COGL_ENABLE_EXPERIMENTAL_2_0_API is defined though so we
- * undef it before cogl.h is included */
-#undef COGL_ENABLE_EXPERIMENTAL_2_0_API
-
-#include <clutter/clutter.h>
-#include <cogl/cogl.h>
-#include <string.h>
-
-#include "test-conform-common.h"
-
-static const ClutterColor stage_color = { 0x0, 0x0, 0x0, 0xff };
-
-static TestConformGLFunctions gl_functions;
-
-#define QUAD_WIDTH 20
-
-#define RED 0
-#define GREEN 1
-#define BLUE 2
-#define ALPHA 3
-
-#define MASK_RED(COLOR)   ((COLOR & 0xff000000) >> 24)
-#define MASK_GREEN(COLOR) ((COLOR & 0xff0000) >> 16)
-#define MASK_BLUE(COLOR)  ((COLOR & 0xff00) >> 8)
-#define MASK_ALPHA(COLOR) (COLOR & 0xff)
-
-#ifndef GL_VERSION
-#define GL_VERSION 0x1F02
-#endif
-
-#ifndef GL_MAX_TEXTURE_IMAGE_UNITS
-#define GL_MAX_TEXTURE_IMAGE_UNITS 0x8872
-#endif
-#ifndef GL_MAX_VERTEX_ATTRIBS
-#define GL_MAX_VERTEX_ATTRIBS 0x8869
-#endif
-#ifndef GL_MAX_TEXTURE_UNITS
-#define GL_MAX_TEXTURE_UNITS 0x84E2
-#endif
-
-typedef struct _TestState
-{
-  ClutterGeometry stage_geom;
-} TestState;
-
-
-static void
-check_pixel (TestState *state, int x, int y, guint32 color)
-{
-  int y_off;
-  int x_off;
-  guint8 pixel[4];
-  guint8 r = MASK_RED (color);
-  guint8 g = MASK_GREEN (color);
-  guint8 b = MASK_BLUE (color);
-  guint8 a = MASK_ALPHA (color);
-
-  /* See what we got... */
-
-  y_off = y * QUAD_WIDTH + (QUAD_WIDTH / 2);
-  x_off = x * QUAD_WIDTH + (QUAD_WIDTH / 2);
-
-  cogl_read_pixels (x_off, y_off, 1, 1,
-                    COGL_READ_PIXELS_COLOR_BUFFER,
-                    COGL_PIXEL_FORMAT_RGBA_8888_PRE,
-                    pixel);
-  if (g_test_verbose ())
-    g_print ("  result = %02x, %02x, %02x, %02x\n",
-             pixel[RED], pixel[GREEN], pixel[BLUE], pixel[ALPHA]);
-
-  if (g_test_verbose ())
-    g_print ("  expected = %x, %x, %x, %x\n",
-             r, g, b, a);
-  /* FIXME - allow for hardware in-precision */
-  g_assert (pixel[RED] == r);
-  g_assert (pixel[GREEN] == g);
-  g_assert (pixel[BLUE] == b);
-
-  /* FIXME
-   * We ignore the alpha, since we don't know if our render target is
-   * RGB or RGBA */
-  /* g_assert (pixel[ALPHA] == a); */
-}
-
-static void
-test_material_with_primitives (TestState *state,
-                               int x, int y,
-                               guint32 color)
-{
-  CoglTextureVertex verts[4];
-  CoglHandle vbo;
-
-  verts[0].x = 0;
-  verts[0].y = 0;
-  verts[0].z = 0;
-  verts[1].x = 0;
-  verts[1].y = QUAD_WIDTH;
-  verts[1].z = 0;
-  verts[2].x = QUAD_WIDTH;
-  verts[2].y = QUAD_WIDTH;
-  verts[2].z = 0;
-  verts[3].x = QUAD_WIDTH;
-  verts[3].y = 0;
-  verts[3].z = 0;
-
-  cogl_push_matrix ();
-
-  cogl_translate (x * QUAD_WIDTH, y * QUAD_WIDTH, 0);
-
-  cogl_rectangle (0, 0, QUAD_WIDTH, QUAD_WIDTH);
-
-  cogl_translate (0, QUAD_WIDTH, 0);
-  cogl_polygon (verts, 4, FALSE);
-
-  cogl_translate (0, QUAD_WIDTH, 0);
-  vbo = cogl_vertex_buffer_new (4);
-  cogl_vertex_buffer_add (vbo,
-                          "gl_Vertex",
-                          2, /* n components */
-                          COGL_ATTRIBUTE_TYPE_FLOAT,
-                          FALSE, /* normalized */
-                          sizeof (CoglTextureVertex), /* stride */
-                          verts);
-  cogl_vertex_buffer_draw (vbo,
-                           COGL_VERTICES_MODE_TRIANGLE_FAN,
-                           0, /* first */
-                           4); /* count */
-  cogl_handle_unref (vbo);
-
-  cogl_pop_matrix ();
-
-  check_pixel (state, x, y,   color);
-  check_pixel (state, x, y+1, color);
-  check_pixel (state, x, y+2, color);
-}
-
-static void
-test_invalid_texture_layers (TestState *state, int x, int y)
-{
-  CoglHandle        material = cogl_material_new ();
-
-  /* explicitly create a layer with an invalid handle. This may be desireable
-   * if the user also sets a texture combine string that e.g. refers to a
-   * constant color. */
-  cogl_material_set_layer (material, 0, COGL_INVALID_HANDLE);
-
-  cogl_set_source (material);
-
-  cogl_handle_unref (material);
-
-  /* We expect a white fallback material to be used */
-  test_material_with_primitives (state, x, y, 0xffffffff);
-}
-
-#ifdef COGL_HAS_GLES2
-static gboolean
-using_gles2_driver (void)
-{
-  /* FIXME: This should probably be replaced with some way to query
-     the driver from Cogl */
-  return g_str_has_prefix ((const char *) gl_functions.glGetString (GL_VERSION),
-                           "OpenGL ES 2");
-}
-#endif
-
-static void
-test_using_all_layers (TestState *state, int x, int y)
-{
-  CoglHandle material = cogl_material_new ();
-  guint8 white_pixel[] = { 0xff, 0xff, 0xff, 0xff };
-  guint8 red_pixel[] = { 0xff, 0x00, 0x00, 0xff };
-  CoglHandle white_texture;
-  CoglHandle red_texture;
-  int n_layers;
-  int i;
-
-  /* Create a material that uses the maximum number of layers. All but
-     the last layer will use a solid white texture. The last layer
-     will use a red texture. The layers will all be modulated together
-     so the final fragment should be red. */
-
-  white_texture = cogl_texture_new_from_data (1, 1, COGL_TEXTURE_NONE,
-                                              COGL_PIXEL_FORMAT_RGBA_8888_PRE,
-                                              COGL_PIXEL_FORMAT_ANY,
-                                              4, white_pixel);
-  red_texture = cogl_texture_new_from_data (1, 1, COGL_TEXTURE_NONE,
-                                            COGL_PIXEL_FORMAT_RGBA_8888_PRE,
-                                            COGL_PIXEL_FORMAT_ANY,
-                                            4, red_pixel);
-
-  /* FIXME: Cogl doesn't provide a way to query the maximum number of
-     texture layers so for now we'll just ask GL directly. */
-#ifdef COGL_HAS_GLES2
-  if (using_gles2_driver ())
-    {
-      int n_image_units, n_attribs;
-      /* GLES 2 doesn't have GL_MAX_TEXTURE_UNITS and it uses
-         GL_MAX_TEXTURE_IMAGE_UNITS instead */
-      gl_functions.glGetIntegerv (GL_MAX_TEXTURE_IMAGE_UNITS, &n_image_units);
-      /* Cogl needs a vertex attrib for each layer to upload the texture
-         coordinates */
-      gl_functions.glGetIntegerv (GL_MAX_VERTEX_ATTRIBS, &n_attribs);
-      /* We can't use two of the attribs because they are used by the
-         position and color */
-      n_attribs -= 2;
-      n_layers = MIN (n_attribs, n_image_units);
-    }
-  else
-#endif
-    {
-#if defined(COGL_HAS_GLES1) || defined(COGL_HAS_GL)
-      gl_functions.glGetIntegerv (GL_MAX_TEXTURE_UNITS, &n_layers);
-#endif
-    }
-
-  /* FIXME: is this still true? */
-  /* Cogl currently can't cope with more than 32 layers so we'll also
-     limit the maximum to that. */
-  if (n_layers > 32)
-    n_layers = 32;
-
-  for (i = 0; i < n_layers; i++)
-    {
-      cogl_material_set_layer_filters (material, i,
-                                       COGL_MATERIAL_FILTER_NEAREST,
-                                       COGL_MATERIAL_FILTER_NEAREST);
-      cogl_material_set_layer (material, i,
-                               i == n_layers - 1 ? red_texture : white_texture);
-    }
-
-  cogl_set_source (material);
-
-  cogl_handle_unref (material);
-  cogl_handle_unref (white_texture);
-  cogl_handle_unref (red_texture);
-
-  /* We expect the final fragment to be red */
-  test_material_with_primitives (state, x, y, 0xff0000ff);
-}
-
-static void
-test_invalid_texture_layers_with_constant_colors (TestState *state,
-                                                  int x, int y)
-{
-  CoglHandle material = cogl_material_new ();
-  CoglColor constant_color;
-
-  /* explicitly create a layer with an invalid handle */
-  cogl_material_set_layer (material, 0, COGL_INVALID_HANDLE);
-
-  /* ignore the fallback texture on the layer and use a constant color
-     instead */
-  cogl_color_init_from_4ub (&constant_color, 0, 0, 255, 255);
-  cogl_material_set_layer_combine (material, 0,
-                                   "RGBA=REPLACE(CONSTANT)",
-                                   NULL);
-  cogl_material_set_layer_combine_constant (material, 0, &constant_color);
-
-  cogl_set_source (material);
-
-  cogl_handle_unref (material);
-
-  /* We expect the final fragments to be green */
-  test_material_with_primitives (state, x, y, 0x0000ffff);
-}
-
-static void
-basic_ref_counting_destroy_cb (void *user_data)
-{
-  gboolean *destroyed_flag = user_data;
-
-  g_assert (*destroyed_flag == FALSE);
-
-  *destroyed_flag = TRUE;
-}
-
-static void
-test_basic_ref_counting (void)
-{
-  CoglMaterial *material_parent;
-  gboolean parent_destroyed = FALSE;
-  CoglMaterial *material_child;
-  gboolean child_destroyed = FALSE;
-  static CoglUserDataKey user_data_key;
-
-  /* This creates a material with a copy and then just unrefs them
-     both without setting them as a source. They should immediately be
-     freed. We can test whether they were freed or not by registering
-     a destroy callback with some user data */
-
-  material_parent = cogl_material_new ();
-  /* Set some user data so we can detect when the material is
-     destroyed */
-  cogl_object_set_user_data (COGL_OBJECT (material_parent),
-                             &user_data_key,
-                             &parent_destroyed,
-                             basic_ref_counting_destroy_cb);
-
-  material_child = cogl_material_copy (material_parent);
-  cogl_object_set_user_data (COGL_OBJECT (material_child),
-                             &user_data_key,
-                             &child_destroyed,
-                             basic_ref_counting_destroy_cb);
-
-  cogl_object_unref (material_child);
-  cogl_object_unref (material_parent);
-
-  g_assert (parent_destroyed);
-  g_assert (child_destroyed);
-}
-
-static void
-on_paint (ClutterActor *actor, TestState *state)
-{
-  test_invalid_texture_layers (state,
-                               0, 0 /* position */
-                               );
-  test_invalid_texture_layers_with_constant_colors (state,
-                                                    1, 0 /* position */
-                                                    );
-  test_using_all_layers (state,
-                         2, 0 /* position */
-                         );
-
-  test_basic_ref_counting ();
-
-  /* Comment this out if you want visual feedback for what this test paints */
-#if 1
-  clutter_main_quit ();
-#endif
-}
-
-static gboolean
-queue_redraw (gpointer stage)
-{
-  clutter_actor_queue_redraw (CLUTTER_ACTOR (stage));
-
-  return G_SOURCE_CONTINUE;
-}
-
-void
-test_cogl_materials (TestConformSimpleFixture *fixture,
-                     gconstpointer data)
-{
-  TestState state;
-  ClutterActor *stage;
-  ClutterActor *group;
-  guint idle_source;
-
-  test_conform_get_gl_functions (&gl_functions);
-
-  stage = clutter_stage_new ();
-
-  clutter_stage_set_color (CLUTTER_STAGE (stage), &stage_color);
-  clutter_actor_get_geometry (stage, &state.stage_geom);
-
-  group = clutter_group_new ();
-  clutter_container_add_actor (CLUTTER_CONTAINER (stage), group);
-
-  /* We force continuous redrawing of the stage, since we need to skip
-   * the first few frames, and we wont be doing anything else that
-   * will trigger redrawing. */
-  idle_source = clutter_threads_add_idle (queue_redraw, stage);
-
-  g_signal_connect (group, "paint", G_CALLBACK (on_paint), &state);
-
-  clutter_actor_show_all (stage);
-
-  clutter_main ();
-
-  g_source_remove (idle_source);
-
-  clutter_actor_destroy (stage);
-
-  if (g_test_verbose ())
-    g_print ("OK\n");
-}
diff --git a/tests/conform/test-cogl-multitexture.c b/tests/conform/test-cogl-multitexture.c
deleted file mode 100644
index 93ddd4530..000000000
--- a/tests/conform/test-cogl-multitexture.c
+++ /dev/null
@@ -1,208 +0,0 @@
-#include <clutter/clutter.h>
-#include <cogl/cogl.h>
-#include <string.h>
-
-#include "test-conform-common.h"
-
-static const ClutterColor stage_color = { 0x0, 0x0, 0x0, 0xff };
-
-#define QUAD_WIDTH 20
-
-#define RED   0
-#define GREEN 1
-#define BLUE  2
-#define ALPHA 3
-
-typedef struct _TestState
-{
-  guint padding;
-} TestState;
-
-static void
-assert_region_color (int x,
-                     int y,
-                     int width,
-                     int height,
-                     guint8 red,
-                     guint8 green,
-                     guint8 blue,
-                     guint8 alpha)
-{
-  guint8 *data = g_malloc0 (width * height * 4);
-  cogl_read_pixels (x, y, width, height,
-                    COGL_READ_PIXELS_COLOR_BUFFER,
-                    COGL_PIXEL_FORMAT_RGBA_8888_PRE,
-                    data);
-  for (y = 0; y < height; y++)
-    for (x = 0; x < width; x++)
-      {
-        guint8 *pixel = &data[y * width * 4 + x * 4];
-#if 1
-        g_assert (pixel[RED] == red &&
-                  pixel[GREEN] == green &&
-                  pixel[BLUE] == blue);
-#endif
-      }
-  g_free (data);
-}
-
-/* Creates a texture divided into 4 quads with colors arranged as follows:
- * (The same value are used in all channels for each texel)
- *
- * |-----------|
- * |0x11 |0x00 |
- * |+ref |     |
- * |-----------|
- * |0x00 |0x33 |
- * |     |+ref |
- * |-----------|
- *
- *
- */
-static CoglHandle
-make_texture (guchar ref)
-{
-  int x;
-  int y;
-  guchar *tex_data, *p;
-  CoglHandle tex;
-  guchar val;
-
-  tex_data = g_malloc (QUAD_WIDTH * QUAD_WIDTH * 16);
-
-  for (y = 0; y < QUAD_WIDTH * 2; y++)
-    for (x = 0; x < QUAD_WIDTH * 2; x++)
-      {
-        p = tex_data + (QUAD_WIDTH * 8 * y) + x * 4;
-        if (x < QUAD_WIDTH && y < QUAD_WIDTH)
-          val = 0x11 + ref;
-        else if (x >= QUAD_WIDTH && y >= QUAD_WIDTH)
-          val = 0x33 + ref;
-        else
-          val = 0x00;
-        p[0] = p[1] = p[2] = p[3] = val;
-      }
-
-  /* Note: we don't use COGL_PIXEL_FORMAT_ANY for the internal format here
-   * since we don't want to allow Cogl to premultiply our data. */
-  tex = cogl_texture_new_from_data (QUAD_WIDTH * 2,
-                                    QUAD_WIDTH * 2,
-                                    COGL_TEXTURE_NONE,
-                                    COGL_PIXEL_FORMAT_RGBA_8888,
-                                    COGL_PIXEL_FORMAT_RGBA_8888,
-                                    QUAD_WIDTH * 8,
-                                    tex_data);
-
-  g_free (tex_data);
-
-  return tex;
-}
-
-static void
-on_paint (ClutterActor *actor, TestState *state)
-{
-  CoglHandle tex0, tex1;
-  CoglHandle material;
-  gboolean status;
-  GError *error = NULL;
-  float tex_coords[] = {
-    0, 0, 0.5, 0.5, /* tex0 */
-    0.5, 0.5, 1, 1 /* tex1 */
-  };
-
-  tex0 = make_texture (0x00);
-  tex1 = make_texture (0x11);
-
-  material = cogl_material_new ();
-
-  /* An arbitrary color which should be replaced by the first texture layer */
-  cogl_material_set_color4ub (material, 0x80, 0x80, 0x80, 0x80);
-  cogl_material_set_blend (material, "RGBA = ADD (SRC_COLOR, 0)", NULL);
-
-  cogl_material_set_layer (material, 0, tex0);
-  cogl_material_set_layer_combine (material, 0,
-                                   "RGBA = REPLACE (TEXTURE)", NULL);
-  /* We'll use nearest filtering mode on the textures, otherwise the
-     edge of the quad can pull in texels from the neighbouring
-     quarters of the texture due to imprecision */
-  cogl_material_set_layer_filters (material, 0,
-                                   COGL_MATERIAL_FILTER_NEAREST,
-                                   COGL_MATERIAL_FILTER_NEAREST);
-
-  cogl_material_set_layer (material, 1, tex1);
-  cogl_material_set_layer_filters (material, 1,
-                                   COGL_MATERIAL_FILTER_NEAREST,
-                                   COGL_MATERIAL_FILTER_NEAREST);
-  status = cogl_material_set_layer_combine (material, 1,
-                                            "RGBA = ADD (PREVIOUS, TEXTURE)",
-                                            &error);
-  if (!status)
-    {
-      /* It's not strictly a test failure; you need a more capable GPU or
-       * driver to test this texture combine string. */
-      g_debug ("Failed to setup texture combine string "
-               "RGBA = ADD (PREVIOUS, TEXTURE): %s",
-               error->message);
-    }
-
-  cogl_set_source (material);
-  cogl_rectangle_with_multitexture_coords (0, 0, QUAD_WIDTH, QUAD_WIDTH,
-                                           tex_coords, 8);
-
-  cogl_handle_unref (material);
-  cogl_handle_unref (tex0);
-  cogl_handle_unref (tex1);
-
-  /* See what we got... */
-
-  assert_region_color (0, 0, QUAD_WIDTH, QUAD_WIDTH,
-                       0x55, 0x55, 0x55, 0x55);
-
-  /* Comment this out if you want visual feedback for what this test paints */
-#if 1
-  clutter_main_quit ();
-#endif
-}
-
-static gboolean
-queue_redraw (gpointer stage)
-{
-  clutter_actor_queue_redraw (CLUTTER_ACTOR (stage));
-
-  return G_SOURCE_CONTINUE;
-}
-
-void
-test_cogl_multitexture (TestConformSimpleFixture *fixture,
-                        gconstpointer data)
-{
-  TestState state;
-  ClutterActor *stage;
-  ClutterActor *group;
-  guint idle_source;
-
-  stage = clutter_stage_new ();
-
-  clutter_stage_set_color (CLUTTER_STAGE (stage), &stage_color);
-
-  group = clutter_group_new ();
-  clutter_container_add_actor (CLUTTER_CONTAINER (stage), group);
-
-  /* We force continuous redrawing incase someone comments out the
-   * clutter_main_quit and wants visual feedback for the test since we
-   * wont be doing anything else that will trigger redrawing. */
-  idle_source = clutter_threads_add_idle (queue_redraw, stage);
-
-  g_signal_connect (group, "paint", G_CALLBACK (on_paint), &state);
-
-  clutter_actor_show_all (stage);
-
-  clutter_main ();
-
-  g_source_remove (idle_source);
-
-  clutter_actor_destroy (stage);
-
-  if (g_test_verbose ())
-    g_print ("OK\n");
-}
diff --git a/tests/conform/test-cogl-npot-texture.c b/tests/conform/test-cogl-npot-texture.c
deleted file mode 100644
index 1f0d0f680..000000000
--- a/tests/conform/test-cogl-npot-texture.c
+++ /dev/null
@@ -1,240 +0,0 @@
-#include <clutter/clutter.h>
-#include <cogl/cogl.h>
-#include <string.h>
-
-#include "test-conform-common.h"
-
-static const ClutterColor stage_color = { 0x0, 0x0, 0x0, 0xff };
-
-/* Non-power-of-two sized texture that should cause slicing */
-#define TEXTURE_SIZE        384
-/* Number of times to split the texture up on each axis */
-#define PARTS               2
-/* The texture is split into four parts, each with a different colour */
-#define PART_SIZE           (TEXTURE_SIZE / PARTS)
-
-/* Amount of pixels to skip off the top, bottom, left and right of the
-   texture when reading back the stage */
-#define TEST_INSET          4
-
-/* Size to actually render the texture at */
-#define TEXTURE_RENDER_SIZE TEXTURE_SIZE
-/* The size of a part once rendered */
-#define PART_RENDER_SIZE    (TEXTURE_RENDER_SIZE / PARTS)
-
-static const ClutterColor corner_colors[PARTS * PARTS] =
-  {
-    /* Top left     - red */    { 255, 0,   0,   255 },
-    /* Top right    - green */  { 0,   255, 0,   255 },
-    /* Bottom left  - blue */   { 0,   0,   255, 255 },
-    /* Bottom right - yellow */ { 255, 255, 0,   255 }
-  };
-
-typedef struct _TestState
-{
-  ClutterActor *stage;
-  guint frame;
-  CoglHandle texture;
-} TestState;
-
-static gboolean
-validate_part (ClutterActor *stage,
-               int xnum,
-               int ynum,
-               const ClutterColor *color)
-{
-  guchar *pixels, *p;
-  gboolean ret = TRUE;
-
-  /* Read the appropriate part but skip out a few pixels around the
-     edges */
-  pixels = clutter_stage_read_pixels (CLUTTER_STAGE (stage),
-                                      xnum * PART_RENDER_SIZE + TEST_INSET,
-                                      ynum * PART_RENDER_SIZE + TEST_INSET,
-                                      PART_RENDER_SIZE - TEST_INSET * 2,
-                                      PART_RENDER_SIZE - TEST_INSET * 2);
-
-  /* Make sure every pixels is the appropriate color */
-  for (p = pixels;
-       p < pixels + ((PART_RENDER_SIZE - TEST_INSET * 2)
-                     * (PART_RENDER_SIZE - TEST_INSET * 2));
-       p += 4)
-    {
-      if (p[0] != color->red)
-        ret = FALSE;
-      if (p[1] != color->green)
-        ret = FALSE;
-      if (p[2] != color->blue)
-        ret = FALSE;
-    }
-
-  g_free (pixels);
-
-  return ret;
-}
-
-static void
-validate_result (TestState *state)
-{
-  /* Validate that all four corners of the texture are drawn in the
-     right color */
-  g_assert (validate_part (state->stage, 0, 0, corner_colors + 0));
-  g_assert (validate_part (state->stage, 1, 0, corner_colors + 1));
-  g_assert (validate_part (state->stage, 0, 1, corner_colors + 2));
-  g_assert (validate_part (state->stage, 1, 1, corner_colors + 3));
-
-  /* Comment this out if you want visual feedback of what this test
-   * paints.
-   */
-  clutter_main_quit ();
-}
-
-static void
-on_paint (ClutterActor *actor, TestState *state)
-{
-  int frame_num;
-  int y, x;
-
-  /* Just render the texture in the top left corner */
-  cogl_set_source_texture (state->texture);
-  /* Render the texture using four separate rectangles */
-  for (y = 0; y < 2; y++)
-    for (x = 0; x < 2; x++)
-      cogl_rectangle_with_texture_coords (x * TEXTURE_RENDER_SIZE / 2,
-                                          y * TEXTURE_RENDER_SIZE / 2,
-                                          (x + 1) * TEXTURE_RENDER_SIZE / 2,
-                                          (y + 1) * TEXTURE_RENDER_SIZE / 2,
-                                          x / 2.0f,
-                                          y / 2.0f,
-                                          (x + 1) / 2.0f,
-                                          (y + 1) / 2.0f);
-
-  /* XXX: validate_result calls clutter_stage_read_pixels which will result in
-   * another paint run so to avoid infinite recursion we only aim to validate
-   * the first frame. */
-  frame_num = state->frame++;
-  if (frame_num == 1)
-    validate_result (state);
-}
-
-static gboolean
-queue_redraw (gpointer stage)
-{
-  clutter_actor_queue_redraw (CLUTTER_ACTOR (stage));
-
-  return G_SOURCE_CONTINUE;
-}
-
-static CoglHandle
-make_texture (void)
-{
-  guchar *tex_data, *p;
-  CoglHandle tex;
-  int partx, party, width, height;
-
-  p = tex_data = g_malloc (TEXTURE_SIZE * TEXTURE_SIZE * 4);
-
-  /* Make a texture with a different color for each part */
-  for (party = 0; party < PARTS; party++)
-    {
-      height = (party < PARTS - 1
-                ? PART_SIZE
-                : TEXTURE_SIZE - PART_SIZE * (PARTS - 1));
-
-      for (partx = 0; partx < PARTS; partx++)
-        {
-          const ClutterColor *color = corner_colors + party * PARTS + partx;
-          width = (partx < PARTS - 1
-                   ? PART_SIZE
-                   : TEXTURE_SIZE - PART_SIZE * (PARTS - 1));
-
-          while (width-- > 0)
-            {
-              *(p++) = color->red;
-              *(p++) = color->green;
-              *(p++) = color->blue;
-              *(p++) = color->alpha;
-            }
-        }
-
-      while (--height > 0)
-        {
-          memcpy (p, p - TEXTURE_SIZE * 4, TEXTURE_SIZE * 4);
-          p += TEXTURE_SIZE * 4;
-        }
-    }
-
-  tex = cogl_texture_new_from_data (TEXTURE_SIZE,
-                                    TEXTURE_SIZE,
-                                    COGL_TEXTURE_NO_ATLAS,
-                                    COGL_PIXEL_FORMAT_RGBA_8888,
-                                    COGL_PIXEL_FORMAT_ANY,
-                                    TEXTURE_SIZE * 4,
-                                    tex_data);
-
-  g_free (tex_data);
-
-  if (g_test_verbose ())
-    {
-      if (cogl_texture_is_sliced (tex))
-        g_print ("Texture is sliced\n");
-      else
-        g_print ("Texture is not sliced\n");
-    }
-
-  /* The texture should be sliced unless NPOTs are supported */
-  g_assert (cogl_features_available (COGL_FEATURE_TEXTURE_NPOT)
-            ? !cogl_texture_is_sliced (tex)
-            : cogl_texture_is_sliced (tex));
-
-  return tex;
-}
-
-void
-test_cogl_npot_texture (TestConformSimpleFixture *fixture,
-                        gconstpointer data)
-{
-  TestState state;
-  ClutterActor *stage;
-  ClutterActor *group;
-  guint idle_source;
-
-  if (g_test_verbose ())
-    {
-      if (cogl_features_available (COGL_FEATURE_TEXTURE_NPOT))
-        g_print ("NPOT textures are supported\n");
-      else
-        g_print ("NPOT textures are not supported\n");
-    }
-
-  state.frame = 0;
-
-  state.texture = make_texture ();
-
-  state.stage = stage = clutter_stage_new ();
-
-  clutter_stage_set_color (CLUTTER_STAGE (stage), &stage_color);
-
-  group = clutter_group_new ();
-  clutter_container_add_actor (CLUTTER_CONTAINER (stage), group);
-
-  /* We force continuous redrawing of the stage, since we need to skip
-   * the first few frames, and we wont be doing anything else that
-   * will trigger redrawing. */
-  idle_source = clutter_threads_add_idle (queue_redraw, stage);
-
-  g_signal_connect (group, "paint", G_CALLBACK (on_paint), &state);
-
-  clutter_actor_show_all (stage);
-
-  clutter_main ();
-
-  g_source_remove (idle_source);
-
-  cogl_handle_unref (state.texture);
-
-  clutter_actor_destroy (state.stage);
-
-  if (g_test_verbose ())
-    g_print ("OK\n");
-}
diff --git a/tests/conform/test-cogl-object.c b/tests/conform/test-cogl-object.c
deleted file mode 100644
index 4fb1922c2..000000000
--- a/tests/conform/test-cogl-object.c
+++ /dev/null
@@ -1,86 +0,0 @@
-
-#include <clutter/clutter.h>
-#include <cogl/cogl.h>
-#include <string.h>
-
-#include "test-conform-common.h"
-
-CoglUserDataKey private_key0;
-CoglUserDataKey private_key1;
-CoglUserDataKey private_key2;
-
-static int user_data0;
-static int user_data1;
-static int user_data2;
-
-static int destroy0_count = 0;
-static int destroy1_count = 0;
-static int destroy2_count = 0;
-
-static void
-destroy0_cb (void *user_data)
-{
-  g_assert (user_data == &user_data0);
-  destroy0_count++;
-}
-
-static void
-destroy1_cb (void *user_data)
-{
-  g_assert (user_data == &user_data1);
-  destroy1_count++;
-}
-
-static void
-destroy2_cb (void *user_data)
-{
-  g_assert (user_data == &user_data2);
-  destroy2_count++;
-}
-
-void
-test_cogl_object (TestConformSimpleFixture *fixture,
-                  gconstpointer data)
-{
-  CoglPath *path;
-
-  /* Assuming that COGL_OBJECT_N_PRE_ALLOCATED_USER_DATA_ENTRIES == 2
-   * test associating 2 pointers to private data with an object */
-  cogl_path_new ();
-  path = cogl_get_path ();
-
-  cogl_object_set_user_data (COGL_OBJECT (path),
-                             &private_key0,
-                             &user_data0,
-                             destroy0_cb);
-
-  cogl_object_set_user_data (COGL_OBJECT (path),
-                             &private_key1,
-                             &user_data1,
-                             destroy1_cb);
-
-  cogl_object_set_user_data (COGL_OBJECT (path),
-                             &private_key2,
-                             &user_data2,
-                             destroy2_cb);
-
-  cogl_object_set_user_data (COGL_OBJECT (path),
-                             &private_key1,
-                             NULL,
-                             destroy1_cb);
-
-  cogl_object_set_user_data (COGL_OBJECT (path),
-                             &private_key1,
-                             &user_data1,
-                             destroy1_cb);
-
-  cogl_object_unref (path);
-
-  g_assert_cmpint (destroy0_count, ==, 1);
-  g_assert_cmpint (destroy1_count, ==, 2);
-  g_assert_cmpint (destroy2_count, ==, 1);
-
-  if (g_test_verbose ())
-    g_print ("OK\n");
-}
-
diff --git a/tests/conform/test-cogl-premult.c b/tests/conform/test-cogl-premult.c
deleted file mode 100644
index 25fb0e367..000000000
--- a/tests/conform/test-cogl-premult.c
+++ /dev/null
@@ -1,368 +0,0 @@
-
-#include <clutter/clutter.h>
-#include <cogl/cogl.h>
-#include <string.h>
-
-#include "test-conform-common.h"
-
-static const ClutterColor stage_color = { 0x0, 0x0, 0x0, 0xff };
-
-#define QUAD_WIDTH 20
-
-#define RED 0
-#define GREEN 1
-#define BLUE 2
-#define ALPHA 3
-
-#define MASK_RED(COLOR)   ((COLOR & 0xff000000) >> 24)
-#define MASK_GREEN(COLOR) ((COLOR & 0xff0000) >> 16)
-#define MASK_BLUE(COLOR)  ((COLOR & 0xff00) >> 8)
-#define MASK_ALPHA(COLOR) (COLOR & 0xff)
-
-typedef struct _TestState
-{
-  ClutterGeometry stage_geom;
-  CoglHandle passthrough_material;
-} TestState;
-
-
-static void
-check_pixel (guint8 *pixel, guint32 color)
-{
-  guint8 r = MASK_RED (color);
-  guint8 g = MASK_GREEN (color);
-  guint8 b = MASK_BLUE (color);
-  guint8 a = MASK_ALPHA (color);
-
-  if (g_test_verbose ())
-    g_print ("  expected = %x, %x, %x, %x\n",
-             r, g, b, a);
-  /* FIXME - allow for hardware in-precision */
-  g_assert (pixel[RED] == r);
-  g_assert (pixel[GREEN] == g);
-  g_assert (pixel[BLUE] == b);
-
-  /* FIXME
-   * We ignore the alpha, since we don't know if our render target is
-   * RGB or RGBA */
-  /* g_assert (pixel[ALPHA] == a); */
-}
-
-static guchar *
-gen_tex_data (guint32 color)
-{
-  guchar *tex_data, *p;
-  guint8 r = MASK_RED (color);
-  guint8 g = MASK_GREEN (color);
-  guint8 b = MASK_BLUE (color);
-  guint8 a = MASK_ALPHA (color);
-
-  tex_data = g_malloc (QUAD_WIDTH * QUAD_WIDTH * 4);
-
-  for (p = tex_data + QUAD_WIDTH * QUAD_WIDTH * 4; p > tex_data;)
-    {
-      *(--p) = a;
-      *(--p) = b;
-      *(--p) = g;
-      *(--p) = r;
-    }
-
-  return tex_data;
-}
-
-static CoglHandle
-make_texture (guint32 color,
-              CoglPixelFormat src_format,
-              CoglPixelFormat internal_format)
-{
-  CoglHandle tex;
-  guchar *tex_data = gen_tex_data (color);
-
-  tex = cogl_texture_new_from_data (QUAD_WIDTH,
-                                    QUAD_WIDTH,
-                                    COGL_TEXTURE_NONE,
-                                    src_format,
-                                    internal_format,
-                                    QUAD_WIDTH * 4,
-                                    tex_data);
-
-  g_free (tex_data);
-
-  return tex;
-}
-
-static void
-check_texture (TestState *state,
-               int x,
-               int y,
-               CoglHandle tex,
-               guint32 expected_result)
-{
-  guchar        pixel[4];
-  int           y_off;
-  int           x_off;
-
-  cogl_material_set_layer (state->passthrough_material, 0, tex);
-
-  cogl_set_source (state->passthrough_material);
-  cogl_rectangle (x * QUAD_WIDTH,
-                  y * QUAD_WIDTH,
-                  x * QUAD_WIDTH + QUAD_WIDTH,
-                  y * QUAD_WIDTH + QUAD_WIDTH);
-
-  /* See what we got... */
-
-  y_off = y * QUAD_WIDTH + (QUAD_WIDTH / 2);
-  x_off = x * QUAD_WIDTH + (QUAD_WIDTH / 2);
-
-  cogl_read_pixels (x_off, y_off, 1, 1,
-                    COGL_READ_PIXELS_COLOR_BUFFER,
-                    COGL_PIXEL_FORMAT_RGBA_8888_PRE,
-                    pixel);
-  if (g_test_verbose ())
-    {
-      g_print ("check texture (%d, %d):\n", x, y);
-      g_print ("  result = %02x, %02x, %02x, %02x\n",
-               pixel[RED], pixel[GREEN], pixel[BLUE], pixel[ALPHA]);
-    }
-
-  check_pixel (pixel, expected_result);
-}
-
-static void
-on_paint (ClutterActor *actor, TestState *state)
-{
-  CoglHandle tex;
-  guchar *tex_data;
-
-  /* If the user explicitly specifies an unmultiplied internal format then
-   * Cogl shouldn't automatically premultiply the given texture data... */
-  if (g_test_verbose ())
-    g_print ("make_texture (0xff00ff80, "
-                            "src = RGBA_8888, internal = RGBA_8888)\n");
-  tex = make_texture (0xff00ff80,
-                      COGL_PIXEL_FORMAT_RGBA_8888, /* src format */
-                      COGL_PIXEL_FORMAT_RGBA_8888); /* internal format */
-  check_texture (state, 0, 0, /* position */
-                 tex,
-                 0xff00ff80); /* expected */
-
-  /* If the user explicitly requests a premultiplied internal format and
-   * gives unmultiplied src data then Cogl should always premultiply that
-   * for us */
-  if (g_test_verbose ())
-    g_print ("make_texture (0xff00ff80, "
-                            "src = RGBA_8888, internal = RGBA_8888_PRE)\n");
-  tex = make_texture (0xff00ff80,
-                      COGL_PIXEL_FORMAT_RGBA_8888, /* src format */
-                      COGL_PIXEL_FORMAT_RGBA_8888_PRE); /* internal format */
-  check_texture (state, 1, 0, /* position */
-                 tex,
-                 0x80008080); /* expected */
-
-  /* If the user gives COGL_PIXEL_FORMAT_ANY for the internal format then
-   * by default Cogl should premultiply the given texture data...
-   * (In the future there will be additional Cogl API to control this
-   *  behaviour) */
-  if (g_test_verbose ())
-    g_print ("make_texture (0xff00ff80, "
-                            "src = RGBA_8888, internal = ANY)\n");
-  tex = make_texture (0xff00ff80,
-                      COGL_PIXEL_FORMAT_RGBA_8888, /* src format */
-                      COGL_PIXEL_FORMAT_ANY); /* internal format */
-  check_texture (state, 2, 0, /* position */
-                 tex,
-                 0x80008080); /* expected */
-
-  /* If the user requests a premultiplied internal texture format and supplies
-   * premultiplied source data, Cogl should never modify that source data...
-   */
-  if (g_test_verbose ())
-    g_print ("make_texture (0x80008080, "
-                            "src = RGBA_8888_PRE, "
-                            "internal = RGBA_8888_PRE)\n");
-  tex = make_texture (0x80008080,
-                      COGL_PIXEL_FORMAT_RGBA_8888_PRE, /* src format */
-                      COGL_PIXEL_FORMAT_RGBA_8888_PRE); /* internal format */
-  check_texture (state, 3, 0, /* position */
-                 tex,
-                 0x80008080); /* expected */
-
-  /* If the user requests an unmultiplied internal texture format, but
-   * supplies premultiplied source data, then Cogl should always
-   * un-premultiply the source data... */
-  if (g_test_verbose ())
-    g_print ("make_texture (0x80008080, "
-                            "src = RGBA_8888_PRE, internal = RGBA_8888)\n");
-  tex = make_texture (0x80008080,
-                      COGL_PIXEL_FORMAT_RGBA_8888_PRE, /* src format */
-                      COGL_PIXEL_FORMAT_RGBA_8888); /* internal format */
-  check_texture (state, 4, 0, /* position */
-                 tex,
-                 0xff00ff80); /* expected */
-
-  /* If the user allows any internal texture format and provides premultipled
-   * source data then by default Cogl shouldn't modify the source data...
-   * (In the future there will be additional Cogl API to control this
-   *  behaviour) */
-  if (g_test_verbose ())
-    g_print ("make_texture (0x80008080, "
-                            "src = RGBA_8888_PRE, internal = ANY)\n");
-  tex = make_texture (0x80008080,
-                      COGL_PIXEL_FORMAT_RGBA_8888_PRE, /* src format */
-                      COGL_PIXEL_FORMAT_ANY); /* internal format */
-  check_texture (state, 5, 0, /* position */
-                 tex,
-                 0x80008080); /* expected */
-
-  /*
-   * Test cogl_texture_set_region() ....
-   */
-
-  if (g_test_verbose ())
-    g_print ("make_texture (0xDEADBEEF, "
-                            "src = RGBA_8888, internal = RGBA_8888)\n");
-  tex = make_texture (0xDEADBEEF,
-                      COGL_PIXEL_FORMAT_RGBA_8888, /* src format */
-                      COGL_PIXEL_FORMAT_RGBA_8888); /* internal format */
-  if (g_test_verbose ())
-    g_print ("set_region (0xff00ff80, RGBA_8888)\n");
-  tex_data = gen_tex_data (0xff00ff80);
-  cogl_texture_set_region (tex,
-                           0, 0, /* src x, y */
-                           0, 0, /* dst x, y */
-                           QUAD_WIDTH, QUAD_WIDTH, /* dst width, height */
-                           QUAD_WIDTH, QUAD_WIDTH, /* src width, height */
-                           COGL_PIXEL_FORMAT_RGBA_8888,
-                           0, /* auto compute row stride */
-                           tex_data);
-  check_texture (state, 6, 0, /* position */
-                 tex,
-                 0xff00ff80); /* expected */
-
-  /* Updating a texture region for an unmultiplied texture using premultiplied
-   * region data should result in Cogl unmultiplying the given region data...
-   */
-  if (g_test_verbose ())
-    g_print ("make_texture (0xDEADBEEF, "
-                            "src = RGBA_8888, internal = RGBA_8888)\n");
-  tex = make_texture (0xDEADBEEF,
-                      COGL_PIXEL_FORMAT_RGBA_8888, /* src format */
-                      COGL_PIXEL_FORMAT_RGBA_8888); /* internal format */
-  if (g_test_verbose ())
-    g_print ("set_region (0x80008080, RGBA_8888_PRE)\n");
-  tex_data = gen_tex_data (0x80008080);
-  cogl_texture_set_region (tex,
-                           0, 0, /* src x, y */
-                           0, 0, /* dst x, y */
-                           QUAD_WIDTH, QUAD_WIDTH, /* dst width, height */
-                           QUAD_WIDTH, QUAD_WIDTH, /* src width, height */
-                           COGL_PIXEL_FORMAT_RGBA_8888_PRE,
-                           0, /* auto compute row stride */
-                           tex_data);
-  check_texture (state, 7, 0, /* position */
-                 tex,
-                 0xff00ff80); /* expected */
-
-
-  if (g_test_verbose ())
-    g_print ("make_texture (0xDEADBEEF, "
-                            "src = RGBA_8888_PRE, "
-                            "internal = RGBA_8888_PRE)\n");
-  tex = make_texture (0xDEADBEEF,
-                      COGL_PIXEL_FORMAT_RGBA_8888_PRE, /* src format */
-                      COGL_PIXEL_FORMAT_RGBA_8888_PRE); /* internal format */
-  if (g_test_verbose ())
-    g_print ("set_region (0x80008080, RGBA_8888_PRE)\n");
-  tex_data = gen_tex_data (0x80008080);
-  cogl_texture_set_region (tex,
-                           0, 0, /* src x, y */
-                           0, 0, /* dst x, y */
-                           QUAD_WIDTH, QUAD_WIDTH, /* dst width, height */
-                           QUAD_WIDTH, QUAD_WIDTH, /* src width, height */
-                           COGL_PIXEL_FORMAT_RGBA_8888_PRE,
-                           0, /* auto compute row stride */
-                           tex_data);
-  check_texture (state, 8, 0, /* position */
-                 tex,
-                 0x80008080); /* expected */
-
-
-  /* Updating a texture region for a premultiplied texture using unmultiplied
-   * region data should result in Cogl premultiplying the given region data...
-   */
-  if (g_test_verbose ())
-    g_print ("make_texture (0xDEADBEEF, "
-                            "src = RGBA_8888_PRE, "
-                            "internal = RGBA_8888_PRE)\n");
-  tex = make_texture (0xDEADBEEF,
-                      COGL_PIXEL_FORMAT_RGBA_8888_PRE, /* src format */
-                      COGL_PIXEL_FORMAT_RGBA_8888_PRE); /* internal format */
-  if (g_test_verbose ())
-    g_print ("set_region (0xff00ff80, RGBA_8888)\n");
-  tex_data = gen_tex_data (0xff00ff80);
-  cogl_texture_set_region (tex,
-                           0, 0, /* src x, y */
-                           0, 0, /* dst x, y */
-                           QUAD_WIDTH, QUAD_WIDTH, /* dst width, height */
-                           QUAD_WIDTH, QUAD_WIDTH, /* src width, height */
-                           COGL_PIXEL_FORMAT_RGBA_8888,
-                           0, /* auto compute row stride */
-                           tex_data);
-  check_texture (state, 9, 0, /* position */
-                 tex,
-                 0x80008080); /* expected */
-
-  /* Comment this out if you want visual feedback for what this test paints */
-  clutter_main_quit ();
-}
-
-static gboolean
-queue_redraw (gpointer stage)
-{
-  clutter_actor_queue_redraw (CLUTTER_ACTOR (stage));
-
-  return TRUE;
-}
-
-void
-test_cogl_premult (TestConformSimpleFixture *fixture,
-                   gconstpointer data)
-{
-  TestState state;
-  ClutterActor *stage;
-  ClutterActor *group;
-  guint idle_source;
-
-  state.passthrough_material = cogl_material_new ();
-  cogl_material_set_blend (state.passthrough_material,
-                           "RGBA = ADD (SRC_COLOR, 0)", NULL);
-  cogl_material_set_layer_combine (state.passthrough_material, 0,
-                                   "RGBA = REPLACE (TEXTURE)", NULL);
-
-  stage = clutter_stage_new ();
-
-  clutter_stage_set_color (CLUTTER_STAGE (stage), &stage_color);
-  clutter_actor_get_geometry (stage, &state.stage_geom);
-
-  group = clutter_group_new ();
-  clutter_container_add_actor (CLUTTER_CONTAINER (stage), group);
-
-  /* We force continuous redrawing incase someone comments out the
-   * clutter_main_quit and wants visual feedback for the test since we
-   * wont be doing anything else that will trigger redrawing. */
-  idle_source = g_idle_add (queue_redraw, stage);
-
-  g_signal_connect (group, "paint", G_CALLBACK (on_paint), &state);
-
-  clutter_actor_show_all (stage);
-
-  clutter_main ();
-
-  g_source_remove (idle_source);
-
-  clutter_actor_destroy (stage);
-
-  if (g_test_verbose ())
-    g_print ("OK\n");
-}
diff --git a/tests/conform/test-cogl-readpixels.c b/tests/conform/test-cogl-readpixels.c
deleted file mode 100644
index 646b24cbe..000000000
--- a/tests/conform/test-cogl-readpixels.c
+++ /dev/null
@@ -1,174 +0,0 @@
-
-#include <clutter/clutter.h>
-#include <cogl/cogl.h>
-
-#include "test-conform-common.h"
-
-#define RED 0
-#define GREEN 1
-#define BLUE 2
-
-#define FRAMEBUFFER_WIDTH  640
-#define FRAMEBUFFER_HEIGHT 480
-
-static const ClutterColor stage_color = { 0x0, 0x0, 0x0, 0xff };
-
-
-static void
-on_paint (ClutterActor *actor, void *state)
-{
-  float saved_viewport[4];
-  CoglMatrix saved_projection;
-  CoglMatrix projection;
-  CoglMatrix modelview;
-  guchar *data;
-  CoglHandle tex;
-  CoglHandle offscreen;
-  guint32 *pixels;
-  guint8 *pixelsc;
-
-  /* Save the Clutter viewport/matrices and load identity matrices */
-
-  cogl_get_viewport (saved_viewport);
-  cogl_get_projection_matrix (&saved_projection);
-  cogl_push_matrix ();
-
-  cogl_matrix_init_identity (&projection);
-  cogl_matrix_init_identity (&modelview);
-
-  cogl_set_projection_matrix (&projection);
-  cogl_set_modelview_matrix (&modelview);
-
-  /* All offscreen rendering is done upside down so the first thing we
-   * verify is reading back grid of colors from a CoglOffscreen framebuffer
-   */
-
-  data = g_malloc (FRAMEBUFFER_WIDTH * 4 * FRAMEBUFFER_HEIGHT);
-  tex = cogl_texture_new_from_data (FRAMEBUFFER_WIDTH, FRAMEBUFFER_HEIGHT,
-                                    COGL_TEXTURE_NO_SLICING,
-                                    COGL_PIXEL_FORMAT_RGBA_8888, /* data fmt */
-                                    COGL_PIXEL_FORMAT_ANY, /* internal fmt */
-                                    FRAMEBUFFER_WIDTH * 4, /* rowstride */
-                                    data);
-  g_free (data);
-  offscreen = cogl_offscreen_new_to_texture (tex);
-
-  cogl_push_framebuffer (offscreen);
-
-  /* red, top left */
-  cogl_set_source_color4ub (0xff, 0x00, 0x00, 0xff);
-  cogl_rectangle (-1, 1, 0, 0);
-  /* green, top right */
-  cogl_set_source_color4ub (0x00, 0xff, 0x00, 0xff);
-  cogl_rectangle (0, 1, 1, 0);
-  /* blue, bottom left */
-  cogl_set_source_color4ub (0x00, 0x00, 0xff, 0xff);
-  cogl_rectangle (-1, 0, 0, -1);
-  /* white, bottom right */
-  cogl_set_source_color4ub (0xff, 0xff, 0xff, 0xff);
-  cogl_rectangle (0, 0, 1, -1);
-
-  pixels = g_malloc0 (FRAMEBUFFER_WIDTH * 4 * FRAMEBUFFER_HEIGHT);
-  cogl_read_pixels (0, 0, FRAMEBUFFER_WIDTH, FRAMEBUFFER_HEIGHT,
-                    COGL_READ_PIXELS_COLOR_BUFFER,
-                    COGL_PIXEL_FORMAT_RGBA_8888_PRE,
-                    (guchar *)pixels);
-
-  g_assert_cmpint (pixels[0], ==, 0xff0000ff);
-  g_assert_cmpint (pixels[FRAMEBUFFER_WIDTH - 1], ==, 0xff00ff00);
-  g_assert_cmpint (pixels[(FRAMEBUFFER_HEIGHT - 1) * FRAMEBUFFER_WIDTH], ==, 0xffff0000);
-  g_assert_cmpint (pixels[(FRAMEBUFFER_HEIGHT - 1) * FRAMEBUFFER_WIDTH + FRAMEBUFFER_WIDTH - 1], ==, 0xffffffff);
-  g_free (pixels);
-
-  cogl_pop_framebuffer ();
-  cogl_handle_unref (offscreen);
-
-  /* Now verify reading back from an onscreen framebuffer...
-   */
-
-  cogl_set_source_texture (tex);
-  cogl_rectangle (-1, 1, 1, -1);
-
-  pixels = g_malloc0 (FRAMEBUFFER_WIDTH * 4 * FRAMEBUFFER_HEIGHT);
-  cogl_read_pixels (0, 0, FRAMEBUFFER_WIDTH, FRAMEBUFFER_HEIGHT,
-                    COGL_READ_PIXELS_COLOR_BUFFER,
-                    COGL_PIXEL_FORMAT_RGBA_8888_PRE,
-                    (guchar *)pixels);
-
-  g_assert_cmpint (pixels[0], ==, 0xff0000ff);
-  g_assert_cmpint (pixels[FRAMEBUFFER_WIDTH - 1], ==, 0xff00ff00);
-  g_assert_cmpint (pixels[(FRAMEBUFFER_HEIGHT - 1) * FRAMEBUFFER_WIDTH], ==, 0xffff0000);
-  g_assert_cmpint (pixels[(FRAMEBUFFER_HEIGHT - 1) * FRAMEBUFFER_WIDTH + FRAMEBUFFER_WIDTH - 1], ==, 0xffffffff);
-  g_free (pixels);
-
-  /* Verify using BGR format */
-
-  cogl_set_source_texture (tex);
-  cogl_rectangle (-1, 1, 1, -1);
-
-  pixelsc = g_malloc0 (FRAMEBUFFER_WIDTH * 3 * FRAMEBUFFER_HEIGHT);
-  cogl_read_pixels (0, 0, FRAMEBUFFER_WIDTH, FRAMEBUFFER_HEIGHT,
-                    COGL_READ_PIXELS_COLOR_BUFFER,
-                    COGL_PIXEL_FORMAT_BGR_888,
-                    (guchar *)pixelsc);
-
-  g_assert_cmpint (pixelsc[0], ==, 0x00);
-  g_assert_cmpint (pixelsc[1], ==, 0x00);
-  g_assert_cmpint (pixelsc[2], ==, 0xff);
-
-  g_assert_cmpint (pixelsc[(FRAMEBUFFER_WIDTH - 1) * 3 + 0], ==, 0x00);
-  g_assert_cmpint (pixelsc[(FRAMEBUFFER_WIDTH - 1) * 3 + 1], ==, 0xff);
-  g_assert_cmpint (pixelsc[(FRAMEBUFFER_WIDTH - 1) * 3 + 2], ==, 0x00);
-
-  g_free (pixelsc);
-
-  cogl_handle_unref (tex);
-
-  /* Restore the viewport and matrices state */
-  cogl_set_viewport (saved_viewport[0],
-                     saved_viewport[1],
-                     saved_viewport[2],
-                     saved_viewport[3]);
-  cogl_set_projection_matrix (&saved_projection);
-  cogl_pop_matrix ();
-
-  /* Comment this out if you want visual feedback of what this test
-   * paints.
-   */
-  clutter_main_quit ();
-}
-
-static gboolean
-queue_redraw (gpointer stage)
-{
-  clutter_actor_queue_redraw (CLUTTER_ACTOR (stage));
-
-  return TRUE;
-}
-
-void
-test_cogl_readpixels (TestConformSimpleFixture *fixture,
-                      gconstpointer data)
-{
-  guint idle_source;
-  ClutterActor *stage;
-
-  stage = clutter_stage_new ();
-  clutter_stage_set_color (CLUTTER_STAGE (stage), &stage_color);
-
-  /* We force continuous redrawing of the stage, since we need to skip
-   * the first few frames, and we wont be doing anything else that
-   * will trigger redrawing. */
-  idle_source = g_idle_add (queue_redraw, stage);
-  g_signal_connect_after (stage, "paint", G_CALLBACK (on_paint), NULL);
-
-  clutter_actor_show (stage);
-  clutter_main ();
-
-  g_source_remove (idle_source);
-
-  clutter_actor_destroy (stage);
-
-  if (g_test_verbose ())
-    g_print ("OK\n");
-}
diff --git a/tests/conform/test-cogl-texture-get-set-data.c b/tests/conform/test-cogl-texture-get-set-data.c
deleted file mode 100644
index 4bbf3802d..000000000
--- a/tests/conform/test-cogl-texture-get-set-data.c
+++ /dev/null
@@ -1,168 +0,0 @@
-#include <clutter/clutter.h>
-#include <glib.h>
-#include <string.h>
-
-#include "test-conform-common.h"
-
-static void
-check_texture (int width, int height, CoglTextureFlags flags)
-{
-  CoglHandle tex;
-  guint8 *data, *p;
-  int y, x;
-
-  p = data = g_malloc (width * height * 4);
-  for (y = 0; y < height; y++)
-    for (x = 0; x < width; x++)
-      {
-        *(p++) = x;
-        *(p++) = y;
-        *(p++) = 128;
-        *(p++) = (x ^ y);
-      }
-
-  tex = cogl_texture_new_from_data (width, height,
-                                    flags,
-                                    COGL_PIXEL_FORMAT_RGBA_8888,
-                                    COGL_PIXEL_FORMAT_RGBA_8888,
-                                    width * 4,
-                                    data);
-
-  /* Replace the bottom right quarter of the data with negated data to
-     test set_region */
-  p = data + (height + 1) * width * 2;
-  for (y = 0; y < height / 2; y++)
-    {
-      for (x = 0; x < width / 2; x++)
-        {
-          p[0] = ~p[0];
-          p[1] = ~p[1];
-          p[2] = ~p[2];
-          p[3] = ~p[3];
-          p += 4;
-        }
-      p += width * 2;
-    }
-  cogl_texture_set_region (tex,
-                           width / 2, /* src_x */
-                           height / 2, /* src_y */
-                           width / 2, /* dst_x */
-                           height / 2, /* dst_y */
-                           width / 2, /* dst_width */
-                           height / 2, /* dst_height */
-                           width,
-                           height,
-                           COGL_PIXEL_FORMAT_RGBA_8888,
-                           width * 4, /* rowstride */
-                           data);
-
-  /* Check passing a NULL pointer and a zero rowstride. The texture
-     should calculate the needed data size and return it */
-  g_assert_cmpint (cogl_texture_get_data (tex, COGL_PIXEL_FORMAT_ANY, 0, NULL),
-                   ==,
-                   width * height * 4);
-
-  /* Try first receiving the data as RGB. This should cause a
-   * conversion */
-  memset (data, 0, width * height * 4);
-
-  cogl_texture_get_data (tex, COGL_PIXEL_FORMAT_RGB_888,
-                         width * 3, data);
-
-  p = data;
-
-  for (y = 0; y < height; y++)
-    for (x = 0; x < width; x++)
-      {
-        if (x >= width / 2 && y >= height / 2)
-          {
-            g_assert_cmpint (p[0], ==, ~x & 0xff);
-            g_assert_cmpint (p[1], ==, ~y & 0xff);
-            g_assert_cmpint (p[2], ==, ~128 & 0xff);
-          }
-        else
-          {
-            g_assert_cmpint (p[0], ==, x & 0xff);
-            g_assert_cmpint (p[1], ==, y & 0xff);
-            g_assert_cmpint (p[2], ==, 128);
-          }
-        p += 3;
-      }
-
-  /* Now try receiving the data as RGBA. This should not cause a
-   * conversion and no unpremultiplication because we explicitly set
-   * the internal format when we created the texture */
-  memset (data, 0, width * height * 4);
-
-  cogl_texture_get_data (tex, COGL_PIXEL_FORMAT_RGBA_8888,
-                         width * 4, data);
-
-  p = data;
-
-  for (y = 0; y < height; y++)
-    for (x = 0; x < width; x++)
-      {
-        if (x >= width / 2 && y >= height / 2)
-          {
-            g_assert_cmpint (p[0], ==, ~x & 0xff);
-            g_assert_cmpint (p[1], ==, ~y & 0xff);
-            g_assert_cmpint (p[2], ==, ~128 & 0xff);
-            g_assert_cmpint (p[3], ==, ~(x ^ y) & 0xff);
-          }
-        else
-          {
-            g_assert_cmpint (p[0], ==, x & 0xff);
-            g_assert_cmpint (p[1], ==, y & 0xff);
-            g_assert_cmpint (p[2], ==, 128);
-            g_assert_cmpint (p[3], ==, (x ^ y) & 0xff);
-          }
-        p += 4;
-      }
-
-  cogl_handle_unref (tex);
-  g_free (data);
-}
-
-static void
-paint_cb (void)
-{
-  /* First try without atlasing */
-  check_texture (256, 256, COGL_TEXTURE_NO_ATLAS);
-  /* Try again with atlasing. This should end up testing the atlas
-     backend and the sub texture backend */
-  check_texture (256, 256, 0);
-  /* Try with a really big texture in the hope that it will end up
-     sliced. */
-  check_texture (4, 5128, COGL_TEXTURE_NO_ATLAS);
-  /* And in the other direction. */
-  check_texture (5128, 4, COGL_TEXTURE_NO_ATLAS);
-
-  clutter_main_quit ();
-}
-
-void
-test_cogl_texture_get_set_data (TestConformSimpleFixture *fixture,
-                                gconstpointer data)
-{
-  ClutterActor *stage;
-  guint paint_handler;
-
-  /* We create a stage even though we don't usually need it so that if
-     the draw-and-read texture fallback is needed then it will have
-     something to draw to */
-  stage = clutter_stage_new ();
-
-  paint_handler = g_signal_connect_after (stage, "paint",
-                                          G_CALLBACK (paint_cb), NULL);
-
-  clutter_actor_show (stage);
-
-  clutter_main ();
-
-  g_signal_handler_disconnect (stage, paint_handler);
-
-  clutter_actor_destroy (stage);
-
-  if (g_test_verbose ())
-    g_print ("OK\n");
-}
diff --git a/tests/conform/test-cogl-texture-mipmaps.c b/tests/conform/test-cogl-texture-mipmaps.c
deleted file mode 100644
index 37b4b0a6c..000000000
--- a/tests/conform/test-cogl-texture-mipmaps.c
+++ /dev/null
@@ -1,137 +0,0 @@
-#include <clutter/clutter.h>
-#include <cogl/cogl.h>
-#include <string.h>
-
-#include "test-conform-common.h"
-
-static const ClutterColor stage_color = { 0x00, 0x00, 0x00, 0xff };
-
-#define TEX_SIZE 64
-
-typedef struct _TestState
-{
-  guint padding;
-} TestState;
-
-/* Creates a texture where the pixels are evenly divided between
-   selecting just one of the R,G and B components */
-static CoglHandle
-make_texture (void)
-{
-  guchar *tex_data = g_malloc (TEX_SIZE * TEX_SIZE * 3), *p = tex_data;
-  CoglHandle tex;
-  int x, y;
-
-  for (y = 0; y < TEX_SIZE; y++)
-    for (x = 0; x < TEX_SIZE; x++)
-      {
-        memset (p, 0, 3);
-        /* Set one of the components to full. The components should be
-           evenly represented so that each gets a third of the
-           texture */
-        p[(p - tex_data) / (TEX_SIZE * TEX_SIZE * 3 / 3)] = 255;
-        p += 3;
-      }
-
-  tex = cogl_texture_new_from_data (TEX_SIZE, TEX_SIZE, COGL_TEXTURE_NONE,
-                                    COGL_PIXEL_FORMAT_RGB_888,
-                                    COGL_PIXEL_FORMAT_ANY,
-                                    TEX_SIZE * 3,
-                                    tex_data);
-
-  g_free (tex_data);
-
-  return tex;
-}
-
-static void
-on_paint (ClutterActor *actor, TestState *state)
-{
-  CoglHandle tex;
-  CoglHandle material;
-  guint8 pixels[8];
-
-  tex = make_texture ();
-  material = cogl_material_new ();
-  cogl_material_set_layer (material, 0, tex);
-  cogl_handle_unref (tex);
-
-  /* Render a 1x1 pixel quad without mipmaps */
-  cogl_set_source (material);
-  cogl_material_set_layer_filters (material, 0,
-                                   COGL_MATERIAL_FILTER_NEAREST,
-                                   COGL_MATERIAL_FILTER_NEAREST);
-  cogl_rectangle (0, 0, 1, 1);
-  /* Then with mipmaps */
-  cogl_material_set_layer_filters (material, 0,
-                                   COGL_MATERIAL_FILTER_NEAREST_MIPMAP_NEAREST,
-                                   COGL_MATERIAL_FILTER_NEAREST);
-  cogl_rectangle (1, 0, 2, 1);
-
-  cogl_handle_unref (material);
-
-  /* Read back the two pixels we rendered */
-  cogl_read_pixels (0, 0, 2, 1,
-                    COGL_READ_PIXELS_COLOR_BUFFER,
-                    COGL_PIXEL_FORMAT_RGBA_8888_PRE,
-                    pixels);
-
-  /* The first pixel should be just one of the colors from the
-     texture. It doesn't matter which one */
-  g_assert ((pixels[0] == 255 && pixels[1] == 0 && pixels[2] == 0) ||
-            (pixels[0] == 0 && pixels[1] == 255 && pixels[2] == 0) ||
-            (pixels[0] == 0 && pixels[1] == 0 && pixels[2] == 255));
-  /* The second pixel should be more or less the average of all of the
-     pixels in the texture. Each component gets a third of the image
-     so each component should be approximately 255/3 */
-  g_assert (ABS (pixels[4] - 255 / 3) <= 3 &&
-            ABS (pixels[5] - 255 / 3) <= 3 &&
-            ABS (pixels[6] - 255 / 3) <= 3);
-
-  /* Comment this out if you want visual feedback for what this test paints */
-#if 1
-  clutter_main_quit ();
-#endif
-}
-
-static gboolean
-queue_redraw (gpointer stage)
-{
-  clutter_actor_queue_redraw (CLUTTER_ACTOR (stage));
-
-  return TRUE;
-}
-
-void
-test_cogl_texture_mipmaps (TestConformSimpleFixture *fixture,
-                           gconstpointer data)
-{
-  TestState state;
-  ClutterActor *stage;
-  ClutterActor *group;
-  guint idle_source;
-
-  stage = clutter_stage_new ();
-  clutter_stage_set_color (CLUTTER_STAGE (stage), &stage_color);
-
-  group = clutter_group_new ();
-  clutter_container_add_actor (CLUTTER_CONTAINER (stage), group);
-
-  /* We force continuous redrawing of the stage, since we need to skip
-   * the first few frames, and we wont be doing anything else that
-   * will trigger redrawing. */
-  idle_source = g_idle_add (queue_redraw, stage);
-
-  g_signal_connect (group, "paint", G_CALLBACK (on_paint), &state);
-
-  clutter_actor_show_all (stage);
-
-  clutter_main ();
-
-  g_source_remove (idle_source);
-
-  clutter_actor_destroy (stage);
-
-  if (g_test_verbose ())
-    g_print ("OK\n");
-}
diff --git a/tests/conform/test-cogl-texture-pixmap-x11.c b/tests/conform/test-cogl-texture-pixmap-x11.c
deleted file mode 100644
index 1af92d12b..000000000
--- a/tests/conform/test-cogl-texture-pixmap-x11.c
+++ /dev/null
@@ -1,250 +0,0 @@
-#include <cogl/cogl.h>
-
-#define CLUTTER_ENABLE_EXPERIMENTAL_API
-#include <clutter/clutter.h>
-
-#include "test-conform-common.h"
-
-static const ClutterColor stage_color = { 0x00, 0x00, 0x00, 0xff };
-
-#ifdef CLUTTER_WINDOWING_X11
-
-#include <clutter/x11/clutter-x11.h>
-#include <cogl/cogl-texture-pixmap-x11.h>
-
-#define PIXMAP_WIDTH 512
-#define PIXMAP_HEIGHT 256
-#define GRID_SQUARE_SIZE 16
-
-/* Coordinates of a square that we'll update */
-#define PIXMAP_CHANGE_X 1
-#define PIXMAP_CHANGE_Y 1
-
-typedef struct _TestState
-{
-  ClutterActor *stage;
-  CoglHandle tfp;
-  Pixmap pixmap;
-  guint frame_count;
-  Display *display;
-} TestState;
-
-static Pixmap
-create_pixmap (TestState *state)
-{
-  Pixmap pixmap;
-  XGCValues gc_values = { 0, };
-  GC black_gc, white_gc;
-  int screen = DefaultScreen (state->display);
-  int x, y;
-
-  pixmap = XCreatePixmap (state->display,
-                          DefaultRootWindow (state->display),
-                          PIXMAP_WIDTH, PIXMAP_HEIGHT,
-                          DefaultDepth (state->display, screen));
-
-  gc_values.foreground = BlackPixel (state->display, screen);
-  black_gc = XCreateGC (state->display, pixmap, GCForeground, &gc_values);
-  gc_values.foreground = WhitePixel (state->display, screen);
-  white_gc = XCreateGC (state->display, pixmap, GCForeground, &gc_values);
-
-  /* Draw a grid of alternative black and white rectangles to the
-     pixmap */
-  for (y = 0; y < PIXMAP_HEIGHT / GRID_SQUARE_SIZE; y++)
-    for (x = 0; x < PIXMAP_WIDTH / GRID_SQUARE_SIZE; x++)
-      XFillRectangle (state->display, pixmap,
-                  ((x ^ y) & 1) ? black_gc : white_gc,
-                  x * GRID_SQUARE_SIZE,
-                  y * GRID_SQUARE_SIZE,
-                  GRID_SQUARE_SIZE,
-                  GRID_SQUARE_SIZE);
-
-  XFreeGC (state->display, black_gc);
-  XFreeGC (state->display, white_gc);
-
-  return pixmap;
-}
-
-static void
-update_pixmap (TestState *state)
-{
-  XGCValues gc_values = { 0, };
-  GC black_gc;
-  int screen = DefaultScreen (state->display);
-
-  gc_values.foreground = BlackPixel (state->display, screen);
-  black_gc = XCreateGC (state->display, state->pixmap,
-                        GCForeground, &gc_values);
-
-  /* Fill in one the rectangles with black */
-  XFillRectangle (state->display, state->pixmap,
-                  black_gc,
-                  PIXMAP_CHANGE_X * GRID_SQUARE_SIZE,
-                  PIXMAP_CHANGE_Y * GRID_SQUARE_SIZE,
-                  GRID_SQUARE_SIZE, GRID_SQUARE_SIZE);
-
-  XFreeGC (state->display, black_gc);
-}
-
-static gboolean
-check_paint (TestState *state, int x, int y, int scale)
-{
-  guint8 *data, *p, update_value = 0;
-
-  p = data = g_malloc (PIXMAP_WIDTH * PIXMAP_HEIGHT * 4);
-
-  cogl_read_pixels (x, y, PIXMAP_WIDTH / scale, PIXMAP_HEIGHT / scale,
-                    COGL_READ_PIXELS_COLOR_BUFFER,
-                    COGL_PIXEL_FORMAT_RGBA_8888_PRE,
-                    data);
-
-  for (y = 0; y < PIXMAP_HEIGHT / scale; y++)
-    for (x = 0; x < PIXMAP_WIDTH / scale; x++)
-      {
-        int grid_x = x * scale / GRID_SQUARE_SIZE;
-        int grid_y = y * scale / GRID_SQUARE_SIZE;
-
-        /* If this is the updatable square then we'll let it be either
-           color but we'll return which one it was */
-        if (grid_x == PIXMAP_CHANGE_X && grid_y == PIXMAP_CHANGE_Y)
-          {
-            if (x % (GRID_SQUARE_SIZE / scale) == 0 &&
-                y % (GRID_SQUARE_SIZE / scale) == 0)
-              update_value = *p;
-            else
-              g_assert_cmpint (p[0], ==, update_value);
-
-            g_assert (p[1] == update_value);
-            g_assert (p[2] == update_value);
-            p += 4;
-          }
-        else
-          {
-            guint8 value = ((grid_x ^ grid_y) & 1) ? 0x00 : 0xff;
-            g_assert_cmpint (*(p++), ==, value);
-            g_assert_cmpint (*(p++), ==, value);
-            g_assert_cmpint (*(p++), ==, value);
-            p++;
-          }
-      }
-
-  g_free (data);
-
-  return update_value == 0x00;
-}
-
-/* We skip these frames first */
-#define FRAME_COUNT_BASE 5
-/* First paint the tfp with no mipmaps */
-#define FRAME_COUNT_NORMAL 6
-/* Then use mipmaps */
-#define FRAME_COUNT_MIPMAP 7
-/* After this frame will start waiting for the pixmap to change */
-#define FRAME_COUNT_UPDATED 8
-
-static void
-on_paint (ClutterActor *actor, TestState *state)
-{
-  CoglHandle material;
-
-  material = cogl_material_new ();
-  cogl_material_set_layer (material, 0, state->tfp);
-  if (state->frame_count == FRAME_COUNT_MIPMAP)
-    {
-      const CoglMaterialFilter min_filter =
-        COGL_MATERIAL_FILTER_NEAREST_MIPMAP_NEAREST;
-      cogl_material_set_layer_filters (material, 0,
-                                       min_filter,
-                                       COGL_MATERIAL_FILTER_NEAREST);
-    }
-  else
-    cogl_material_set_layer_filters (material, 0,
-                                     COGL_MATERIAL_FILTER_NEAREST,
-                                     COGL_MATERIAL_FILTER_NEAREST);
-  cogl_set_source (material);
-
-  cogl_rectangle (0, 0, PIXMAP_WIDTH, PIXMAP_HEIGHT);
-
-  cogl_rectangle (0, PIXMAP_HEIGHT,
-                  PIXMAP_WIDTH / 4, PIXMAP_HEIGHT * 5 / 4);
-
-  if (state->frame_count >= 5)
-    {
-      gboolean big_updated, small_updated;
-
-      big_updated = check_paint (state, 0, 0, 1);
-      small_updated = check_paint (state, 0, PIXMAP_HEIGHT, 4);
-
-      g_assert (big_updated == small_updated);
-
-      if (state->frame_count < FRAME_COUNT_UPDATED)
-        g_assert (big_updated == FALSE);
-      else if (state->frame_count == FRAME_COUNT_UPDATED)
-        /* Change the pixmap and keep drawing until it updates */
-        update_pixmap (state);
-      else if (big_updated)
-        /* If we successfully got the update then the test is over */
-        clutter_main_quit ();
-    }
-
-  state->frame_count++;
-}
-
-static gboolean
-queue_redraw (gpointer stage)
-{
-  clutter_actor_queue_redraw (CLUTTER_ACTOR (stage));
-
-  return TRUE;
-}
-
-#endif /* CLUTTER_WINDOWING_X11 */
-
-void
-test_cogl_texture_pixmap_x11 (TestConformSimpleFixture *fixture,
-                              gconstpointer data)
-{
-#ifdef CLUTTER_WINDOWING_X11
-  if (clutter_check_windowing_backend (CLUTTER_WINDOWING_X11))
-    {
-      TestState state;
-      guint idle_handler;
-      guint paint_handler;
-      CoglContext *ctx =
-        clutter_backend_get_cogl_context (clutter_get_default_backend ());
-
-      state.frame_count = 0;
-      state.stage = clutter_stage_new ();
-
-      state.display = clutter_x11_get_default_display ();
-
-      state.pixmap = create_pixmap (&state);
-      state.tfp = cogl_texture_pixmap_x11_new (ctx, state.pixmap, TRUE, NULL);
-
-      clutter_stage_set_color (CLUTTER_STAGE (state.stage), &stage_color);
-
-      paint_handler = g_signal_connect_after (state.stage, "paint",
-                                              G_CALLBACK (on_paint), &state);
-
-      idle_handler = g_idle_add (queue_redraw, state.stage);
-
-      clutter_actor_show_all (state.stage);
-
-      clutter_main ();
-
-      g_signal_handler_disconnect (state.stage, paint_handler);
-
-      g_source_remove (idle_handler);
-
-      XFreePixmap (state.display, state.pixmap);
-
-      clutter_actor_destroy (state.stage);
-
-      if (g_test_verbose ())
-        g_print ("OK\n");
-    }
-  else
-#endif
-  if (g_test_verbose ())
-    g_print ("Skipping\n");
-}
diff --git a/tests/conform/test-cogl-texture-rectangle.c b/tests/conform/test-cogl-texture-rectangle.c
deleted file mode 100644
index 669284a4a..000000000
--- a/tests/conform/test-cogl-texture-rectangle.c
+++ /dev/null
@@ -1,307 +0,0 @@
-#include <clutter/clutter.h>
-#include <string.h>
-
-#include "test-conform-common.h"
-
-static const ClutterColor stage_color = { 0x0, 0x0, 0x0, 0xff };
-
-static TestConformGLFunctions gl_functions;
-
-typedef struct _TestState
-{
-  ClutterActor *stage;
-} TestState;
-
-#ifndef GL_EXTENSIONS
-#define GL_EXTENSIONS 0x1F03
-#endif
-#ifndef GL_TEXTURE_RECTANGLE_ARB
-#define GL_TEXTURE_RECTANGLE_ARB 0x84F5
-#endif
-#ifndef GL_UNPACK_ROW_LENGTH
-#define GL_UNPACK_ROW_LENGTH 0x0CF2
-#endif
-#ifndef GL_UNPACK_ALIGNMENT
-#define GL_UNPACK_ALIGNMENT 0x0CF5
-#endif
-#ifndef GL_UNPACK_SKIP_ROWS
-#define GL_UNPACK_SKIP_ROWS 0x0CF3
-#endif
-#ifndef GL_UNPACK_SKIP_PIXELS
-#define GL_UNPACK_SKIP_PIXELS 0x0CF4
-#endif
-#ifndef GL_RGBA
-#define GL_RGBA 0x1908
-#endif
-#ifndef GL_UNSIGNED_BYTE
-#define GL_UNSIGNED_BYTE 0x1401
-#endif
-#ifndef GL_NO_ERROR
-#define GL_NO_ERROR 0x0
-#endif
-#ifndef GL_TEXTURE_BINDING_RECTANGLE_ARB
-#define GL_TEXTURE_BINDING_RECTANGLE_ARB 0x84F6
-#endif
-
-static CoglHandle
-create_source_rect (void)
-{
-  int x, y;
-  int prev_unpack_row_length;
-  int prev_unpack_alignment;
-  int prev_unpack_skip_rows;
-  int prev_unpack_skip_pixles;
-  int prev_rectangle_binding;
-  guint8 *data = g_malloc (256 * 256 * 4), *p = data;
-  CoglHandle tex;
-  guint gl_tex;
-
-  for (y = 0; y < 256; y++)
-    for (x = 0; x < 256; x++)
-      {
-        *(p++) = x;
-        *(p++) = y;
-        *(p++) = 0;
-        *(p++) = 255;
-      }
-
-  /* We are about to use OpenGL directly to create a TEXTURE_RECTANGLE
-   * texture so we need to save the state that we modify so we can
-   * restore it afterwards and be sure not to interfere with any state
-   * caching that Cogl may do internally.
-   */
-  gl_functions.glGetIntegerv (GL_UNPACK_ROW_LENGTH, &prev_unpack_row_length);
-  gl_functions.glGetIntegerv (GL_UNPACK_ALIGNMENT, &prev_unpack_alignment);
-  gl_functions.glGetIntegerv (GL_UNPACK_SKIP_ROWS, &prev_unpack_skip_rows);
-  gl_functions.glGetIntegerv (GL_UNPACK_SKIP_PIXELS, &prev_unpack_skip_pixles);
-  gl_functions.glGetIntegerv (GL_TEXTURE_BINDING_RECTANGLE_ARB,
-                              &prev_rectangle_binding);
-
-  gl_functions.glPixelStorei (GL_UNPACK_ROW_LENGTH, 256);
-  gl_functions.glPixelStorei (GL_UNPACK_ALIGNMENT, 8);
-  gl_functions.glPixelStorei (GL_UNPACK_SKIP_ROWS, 0);
-  gl_functions.glPixelStorei (GL_UNPACK_SKIP_PIXELS, 0);
-
-  gl_functions.glGenTextures (1, &gl_tex);
-  gl_functions.glBindTexture (GL_TEXTURE_RECTANGLE_ARB, gl_tex);
-  gl_functions.glTexImage2D (GL_TEXTURE_RECTANGLE_ARB, 0,
-                             GL_RGBA, 256, 256, 0,
-                             GL_RGBA,
-                             GL_UNSIGNED_BYTE,
-                             data);
-
-  /* Now restore the original GL state as Cogl had left it */
-  gl_functions.glPixelStorei (GL_UNPACK_ROW_LENGTH, prev_unpack_row_length);
-  gl_functions.glPixelStorei (GL_UNPACK_ALIGNMENT, prev_unpack_alignment);
-  gl_functions.glPixelStorei (GL_UNPACK_SKIP_ROWS, prev_unpack_skip_rows);
-  gl_functions.glPixelStorei (GL_UNPACK_SKIP_PIXELS, prev_unpack_skip_pixles);
-  gl_functions.glBindTexture (GL_TEXTURE_RECTANGLE_ARB, prev_rectangle_binding);
-
-  g_assert (gl_functions.glGetError () == GL_NO_ERROR);
-
-  g_free (data);
-
-  tex = cogl_texture_new_from_foreign (gl_tex,
-                                       GL_TEXTURE_RECTANGLE_ARB,
-                                       256, 256, 0, 0,
-                                       COGL_PIXEL_FORMAT_RGBA_8888);
-
-  return tex;
-}
-
-static CoglHandle
-create_source_2d (void)
-{
-  int x, y;
-  guint8 *data = g_malloc (256 * 256 * 4), *p = data;
-  CoglHandle tex;
-
-  for (y = 0; y < 256; y++)
-    for (x = 0; x < 256; x++)
-      {
-        *(p++) = 0;
-        *(p++) = x;
-        *(p++) = y;
-        *(p++) = 255;
-      }
-
-  tex = cogl_texture_new_from_data (256, 256, COGL_TEXTURE_NONE,
-                                    COGL_PIXEL_FORMAT_RGBA_8888_PRE,
-                                    COGL_PIXEL_FORMAT_ANY,
-                                    256 * 4,
-                                    data);
-
-  g_free (data);
-
-  return tex;
-}
-
-static void
-draw_frame (TestState *state)
-{
-  guint gl_tex;
-  CoglHandle tex_rect = create_source_rect ();
-  CoglHandle material_rect = cogl_material_new ();
-  CoglHandle tex_2d = create_source_2d ();
-  CoglHandle material_2d = cogl_material_new ();
-
-  g_assert (tex_rect != COGL_INVALID_HANDLE);
-
-  cogl_material_set_layer (material_rect, 0, tex_rect);
-  cogl_material_set_layer_filters (material_rect, 0,
-                                   COGL_MATERIAL_FILTER_NEAREST,
-                                   COGL_MATERIAL_FILTER_NEAREST);
-
-  cogl_material_set_layer (material_2d, 0, tex_2d);
-  cogl_material_set_layer_filters (material_2d, 0,
-                                   COGL_MATERIAL_FILTER_NEAREST,
-                                   COGL_MATERIAL_FILTER_NEAREST);
-
-  cogl_set_source (material_rect);
-
-  /* Render the texture repeated horizontally twice */
-  cogl_rectangle_with_texture_coords (0.0f, 0.0f, 512.0f, 256.0f,
-                                      0.0f, 0.0f, 2.0f, 1.0f);
-  /* Render the top half of the texture to test without repeating */
-  cogl_rectangle_with_texture_coords (0.0f, 256.0f, 256.0f, 384.0f,
-                                      0.0f, 0.0f, 1.0f, 0.5f);
-
-  cogl_set_source (material_2d);
-
-  /* Render the top half of a regular 2D texture */
-  cogl_rectangle_with_texture_coords (256.0f, 256.0f, 512.0f, 384.0f,
-                                      0.0f, 0.0f, 1.0f, 0.5f);
-
-  /* Flush the rendering now so we can safely delete the texture */
-  cogl_flush ();
-
-  cogl_handle_unref (material_rect);
-
-  /* Cogl doesn't destroy foreign textures so we have to do it manually */
-  cogl_texture_get_gl_texture (tex_rect, &gl_tex, NULL);
-  gl_functions.glDeleteTextures (1, &gl_tex);
-  cogl_handle_unref (tex_rect);
-}
-
-static void
-validate_result (TestState *state)
-{
-  guint8 *data, *p;
-  int x, y;
-
-  p = data = g_malloc (512 * 384 * 4);
-
-  cogl_read_pixels (0, 0, 512, 384,
-                    COGL_READ_PIXELS_COLOR_BUFFER,
-                    COGL_PIXEL_FORMAT_RGBA_8888,
-                    data);
-
-  for (y = 0; y < 384; y++)
-    for (x = 0; x < 512; x++)
-      {
-        if (x >= 256 && y >= 256)
-          {
-            g_assert_cmpint (p[0], ==, 0);
-            g_assert_cmpint (p[1], ==, x & 0xff);
-            g_assert_cmpint (p[2], ==, y & 0xff);
-          }
-        else
-          {
-            g_assert_cmpint (p[0], ==, x & 0xff);
-            g_assert_cmpint (p[1], ==, y & 0xff);
-            g_assert_cmpint (p[2], ==, 0);
-          }
-        p += 4;
-      }
-
-  g_free (data);
-
-  /* Comment this out to see what the test paints */
-  clutter_main_quit ();
-}
-
-static void
-on_paint (ClutterActor *actor, TestState *state)
-{
-  draw_frame (state);
-
-  validate_result (state);
-}
-
-static gboolean
-queue_redraw (gpointer stage)
-{
-  clutter_actor_queue_redraw (CLUTTER_ACTOR (stage));
-
-  return TRUE;
-}
-
-static gboolean
-check_rectangle_extension (void)
-{
-  static const char rect_extension[] = "GL_ARB_texture_rectangle";
-  const char *extensions =
-    (const char *) gl_functions.glGetString (GL_EXTENSIONS);
-  const char *extensions_end;
-
-  extensions_end = extensions + strlen (extensions);
-
-  while (extensions < extensions_end)
-    {
-      const char *end = strchr (extensions, ' ');
-
-      if (end == NULL)
-        end = extensions_end;
-
-      if (end - extensions == sizeof (rect_extension) - 1 &&
-          !memcmp (extensions, rect_extension, sizeof (rect_extension) - 1))
-        return TRUE;
-
-      extensions = end + 1;
-    }
-
-  return FALSE;
-}
-
-void
-test_cogl_texture_rectangle (TestConformSimpleFixture *fixture,
-                             gconstpointer data)
-{
-  TestState state;
-  guint idle_source;
-  guint paint_handler;
-
-  state.stage = clutter_stage_new ();
-
-  test_conform_get_gl_functions (&gl_functions);
-
-  /* Check whether GL supports the rectangle extension. If not we'll
-     just assume the test passes */
-  if (check_rectangle_extension ())
-    {
-      clutter_stage_set_color (CLUTTER_STAGE (state.stage), &stage_color);
-
-      /* We force continuous redrawing of the stage, since we need to skip
-       * the first few frames, and we wont be doing anything else that
-       * will trigger redrawing. */
-      idle_source = g_idle_add (queue_redraw, state.stage);
-
-      paint_handler = g_signal_connect_after (state.stage, "paint",
-                                              G_CALLBACK (on_paint), &state);
-
-      clutter_actor_show_all (state.stage);
-
-      clutter_main ();
-
-      g_source_remove (idle_source);
-      g_signal_handler_disconnect (state.stage, paint_handler);
-
-      clutter_actor_destroy (state.stage);
-
-      if (g_test_verbose ())
-        g_print ("OK\n");
-    }
-  else if (g_test_verbose ())
-    g_print ("Skipping\n");
-}
-
diff --git a/tests/conform/test-cogl-vertex-buffer-contiguous.c b/tests/conform/test-cogl-vertex-buffer-contiguous.c
deleted file mode 100644
index 01128a686..000000000
--- a/tests/conform/test-cogl-vertex-buffer-contiguous.c
+++ /dev/null
@@ -1,258 +0,0 @@
-
-#include <clutter/clutter.h>
-#include <cogl/cogl.h>
-
-#include "test-conform-common.h"
-
-/* This test verifies that the simplest usage of the vertex buffer API,
- * where we add contiguous (x,y) GLfloat vertices, and RGBA GLubyte color
- * attributes to a buffer, submit, and draw.
- *
- * It also tries to verify that the enable/disable attribute APIs are working
- * too.
- *
- * If you want visual feedback of what this test paints for debugging purposes,
- * then remove the call to clutter_main_quit() in validate_result.
- */
-
-typedef struct _TestState
-{
-  CoglHandle buffer;
-  CoglHandle texture;
-  CoglHandle material;
-  ClutterGeometry stage_geom;
-} TestState;
-
-static void
-validate_result (TestState *state)
-{
-  guint8 pixel[4];
-  int y_off = 90;
-
-  if (g_test_verbose ())
-    g_print ("y_off = %d\n", y_off);
-
-  /* NB: We ignore the alpha, since we don't know if our render target is
-   * RGB or RGBA */
-
-#define RED 0
-#define GREEN 1
-#define BLUE 2
-
-  /* Should see a blue pixel */
-  cogl_read_pixels (10, y_off, 1, 1,
-                    COGL_READ_PIXELS_COLOR_BUFFER,
-                    COGL_PIXEL_FORMAT_RGBA_8888_PRE,
-                    pixel);
-  if (g_test_verbose ())
-    g_print ("pixel 0 = %x, %x, %x\n", pixel[RED], pixel[GREEN], pixel[BLUE]);
-  g_assert (pixel[RED] == 0 && pixel[GREEN] == 0 && pixel[BLUE] != 0);
-
-  /* Should see a red pixel */
-  cogl_read_pixels (110, y_off, 1, 1,
-                    COGL_READ_PIXELS_COLOR_BUFFER,
-                    COGL_PIXEL_FORMAT_RGBA_8888_PRE,
-                    pixel);
-  if (g_test_verbose ())
-    g_print ("pixel 1 = %x, %x, %x\n", pixel[RED], pixel[GREEN], pixel[BLUE]);
-  g_assert (pixel[RED] != 0 && pixel[GREEN] == 0 && pixel[BLUE] == 0);
-
-  /* Should see a blue pixel */
-  cogl_read_pixels (210, y_off, 1, 1,
-                    COGL_READ_PIXELS_COLOR_BUFFER,
-                    COGL_PIXEL_FORMAT_RGBA_8888_PRE,
-                    pixel);
-  if (g_test_verbose ())
-    g_print ("pixel 2 = %x, %x, %x\n", pixel[RED], pixel[GREEN], pixel[BLUE]);
-  g_assert (pixel[RED] == 0 && pixel[GREEN] == 0 && pixel[BLUE] != 0);
-
-  /* Should see a green pixel, at bottom of 4th triangle */
-  cogl_read_pixels (310, y_off, 1, 1,
-                    COGL_READ_PIXELS_COLOR_BUFFER,
-                    COGL_PIXEL_FORMAT_RGBA_8888_PRE,
-                    pixel);
-  if (g_test_verbose ())
-    g_print ("pixel 3 = %x, %x, %x\n", pixel[RED], pixel[GREEN], pixel[BLUE]);
-  g_assert (pixel[GREEN] > pixel[RED] && pixel[GREEN] > pixel[BLUE]);
-
-  /* Should see a red pixel, at top of 4th triangle */
-  cogl_read_pixels (310, y_off - 70, 1, 1,
-                    COGL_READ_PIXELS_COLOR_BUFFER,
-                    COGL_PIXEL_FORMAT_RGBA_8888_PRE,
-                    pixel);
-  if (g_test_verbose ())
-    g_print ("pixel 4 = %x, %x, %x\n", pixel[RED], pixel[GREEN], pixel[BLUE]);
-  g_assert (pixel[RED] > pixel[GREEN] && pixel[RED] > pixel[BLUE]);
-
-
-#undef RED
-#undef GREEN
-#undef BLUE
-
-  /* Comment this out if you want visual feedback of what this test
-   * paints.
-   */
-  clutter_main_quit ();
-}
-
-static void
-on_paint (ClutterActor *actor, TestState *state)
-{
-  /* Draw a faded blue triangle */
-  cogl_vertex_buffer_enable (state->buffer, "gl_Color::blue");
-  cogl_set_source_color4ub (0xff, 0x00, 0x00, 0xff);
-  cogl_vertex_buffer_draw (state->buffer,
-			   COGL_VERTICES_MODE_TRIANGLE_STRIP, /* mode */
-			   0, /* first */
-			   3); /* count */
-
-  /* Draw a red triangle */
-  /* Here we are testing that the disable attribute works; if it doesn't
-   * the triangle will remain faded blue */
-  cogl_translate (100, 0, 0);
-  cogl_vertex_buffer_disable (state->buffer, "gl_Color::blue");
-  cogl_set_source_color4ub (0xff, 0x00, 0x00, 0xff);
-  cogl_vertex_buffer_draw (state->buffer,
-			   COGL_VERTICES_MODE_TRIANGLE_STRIP, /* mode */
-			   0, /* first */
-			   3); /* count */
-
-  /* Draw a faded blue triangle */
-  /* Here we are testing that the re-enable works; if it doesn't
-   * the triangle will remain red */
-  cogl_translate (100, 0, 0);
-  cogl_vertex_buffer_enable (state->buffer, "gl_Color::blue");
-  cogl_set_source_color4ub (0xff, 0x00, 0x00, 0xff);
-  cogl_vertex_buffer_draw (state->buffer,
-			   COGL_VERTICES_MODE_TRIANGLE_STRIP, /* mode */
-			   0, /* first */
-			   3); /* count */
-
-  /* Draw a textured triangle */
-  cogl_translate (100, 0, 0);
-  cogl_vertex_buffer_disable (state->buffer, "gl_Color::blue");
-  cogl_set_source (state->material);
-  cogl_material_set_color4ub (state->material, 0xff, 0xff, 0xff, 0xff);
-  cogl_vertex_buffer_draw (state->buffer,
-                           COGL_VERTICES_MODE_TRIANGLE_STRIP, /* mode */
-                           0, /* first */
-                           3); /* count */
-
-  validate_result (state);
-}
-
-static gboolean
-queue_redraw (gpointer stage)
-{
-  clutter_actor_queue_redraw (CLUTTER_ACTOR (stage));
-
-  return TRUE;
-}
-
-
-
-void
-test_cogl_vertex_buffer_contiguous (TestConformSimpleFixture *fixture,
-		                    gconstpointer data)
-{
-  TestState state;
-  ClutterActor *stage;
-  ClutterColor stage_clr = {0x0, 0x0, 0x0, 0xff};
-  ClutterActor *group;
-  guint idle_source;
-  guchar tex_data[] = {
-    0xff, 0x00, 0x00, 0xff,
-    0xff, 0x00, 0x00, 0xff,
-    0x00, 0xff, 0x00, 0xff,
-    0x00, 0xff, 0x00, 0xff
-  };
-
-  stage = clutter_stage_new ();
-
-  clutter_stage_set_color (CLUTTER_STAGE (stage), &stage_clr);
-  clutter_actor_get_geometry (stage, &state.stage_geom);
-
-  group = clutter_group_new ();
-  clutter_actor_set_size (group,
-			  state.stage_geom.width,
-			  state.stage_geom.height);
-  clutter_container_add_actor (CLUTTER_CONTAINER (stage), group);
-
-  /* We force continuous redrawing incase someone comments out the
-   * clutter_main_quit and wants visual feedback for the test since we
-   * wont be doing anything else that will trigger redrawing. */
-  idle_source = g_idle_add (queue_redraw, stage);
-
-  g_signal_connect (group, "paint", G_CALLBACK (on_paint), &state);
-
-  state.texture = cogl_texture_new_from_data (2, 2,
-                                              COGL_TEXTURE_NO_SLICING,
-                                              COGL_PIXEL_FORMAT_RGBA_8888,
-                                              COGL_PIXEL_FORMAT_ANY,
-                                              0, /* auto calc row stride */
-                                              tex_data);
-
-  state.material = cogl_material_new ();
-  cogl_material_set_color4ub (state.material, 0x00, 0xff, 0x00, 0xff);
-  cogl_material_set_layer (state.material, 0, state.texture);
-
-  {
-    float triangle_verts[3][2] =
-      {
-	{0.0,	0.0},
-	{100.0, 100.0},
-	{0.0,	100.0}
-      };
-    guint8 triangle_colors[3][4] =
-      {
-	{0x00, 0x00, 0xff, 0xff}, /* blue */
-	{0x00, 0x00, 0xff, 0x00}, /* transparent blue */
-	{0x00, 0x00, 0xff, 0x00}  /* transparent blue */
-      };
-    float triangle_tex_coords[3][2] =
-      {
-        {0.0, 0.0},
-        {1.0, 1.0},
-        {0.0, 1.0}
-      };
-    state.buffer = cogl_vertex_buffer_new (3 /* n vertices */);
-    cogl_vertex_buffer_add (state.buffer,
-			    "gl_Vertex",
-			    2, /* n components */
-                            COGL_ATTRIBUTE_TYPE_FLOAT,
-			    FALSE, /* normalized */
-			    0, /* stride */
-			    triangle_verts);
-    cogl_vertex_buffer_add (state.buffer,
-			    "gl_Color::blue",
-			    4, /* n components */
-			    COGL_ATTRIBUTE_TYPE_UNSIGNED_BYTE,
-			    FALSE, /* normalized */
-			    0, /* stride */
-			    triangle_colors);
-    cogl_vertex_buffer_add (state.buffer,
-			    "gl_MultiTexCoord0",
-			    2, /* n components */
-			    COGL_ATTRIBUTE_TYPE_FLOAT,
-			    FALSE, /* normalized */
-			    0, /* stride */
-			    triangle_tex_coords);
-
-    cogl_vertex_buffer_submit (state.buffer);
-  }
-
-  clutter_actor_show_all (stage);
-
-  clutter_main ();
-
-  cogl_handle_unref (state.buffer);
-  cogl_handle_unref (state.material);
-  cogl_handle_unref (state.texture);
-
-  g_source_remove (idle_source);
-
-  clutter_actor_destroy (stage);
-
-  if (g_test_verbose ())
-    g_print ("OK\n");
-}
diff --git a/tests/conform/test-cogl-vertex-buffer-interleved.c b/tests/conform/test-cogl-vertex-buffer-interleved.c
deleted file mode 100644
index 5764544cc..000000000
--- a/tests/conform/test-cogl-vertex-buffer-interleved.c
+++ /dev/null
@@ -1,158 +0,0 @@
-
-#include <clutter/clutter.h>
-#include <cogl/cogl.h>
-
-#include "test-conform-common.h"
-
-/* This test verifies that interleved attributes work with the vertex buffer
- * API. We add (x,y) GLfloat vertices, interleved with RGBA GLubyte color
- * attributes to a buffer, submit and draw.
- *
- * If you want visual feedback of what this test paints for debugging purposes,
- * then remove the call to clutter_main_quit() in validate_result.
- */
-
-typedef struct _TestState
-{
-  CoglHandle buffer;
-  ClutterGeometry stage_geom;
-} TestState;
-
-typedef struct _InterlevedVertex
-{
-  float x, y;
-  guint8 r, g, b, a;
-} InterlevedVertex;
-
-
-static void
-validate_result (TestState *state)
-{
-  guint8 pixel[4];
-  int y_off = 90;
-
-  /* NB: We ignore the alpha, since we don't know if our render target is
-   * RGB or RGBA */
-
-#define RED 0
-#define GREEN 1
-#define BLUE 2
-
-  /* Should see a blue pixel */
-  cogl_read_pixels (10, y_off, 1, 1,
-                    COGL_READ_PIXELS_COLOR_BUFFER,
-                    COGL_PIXEL_FORMAT_RGBA_8888_PRE,
-                    pixel);
-  if (g_test_verbose ())
-    g_print ("pixel 0 = %x, %x, %x\n", pixel[RED], pixel[GREEN], pixel[BLUE]);
-  g_assert (pixel[RED] == 0 && pixel[GREEN] == 0 && pixel[BLUE] != 0);
-
-#undef RED
-#undef GREEN
-#undef BLUE
-
-  /* Comment this out if you want visual feedback of what this test
-   * paints.
-   */
-  clutter_main_quit ();
-}
-
-static void
-on_paint (ClutterActor *actor, TestState *state)
-{
-  /* Draw a faded blue triangle */
-  cogl_vertex_buffer_draw (state->buffer,
-                           COGL_VERTICES_MODE_TRIANGLE_STRIP, /* mode */
-			   0, /* first */
-			   3); /* count */
-
-  validate_result (state);
-}
-
-static gboolean
-queue_redraw (gpointer stage)
-{
-  clutter_actor_queue_redraw (CLUTTER_ACTOR (stage));
-
-  return TRUE;
-}
-
-void
-test_cogl_vertex_buffer_interleved (TestConformSimpleFixture *fixture,
-		                    gconstpointer data)
-{
-  TestState state;
-  ClutterActor *stage;
-  ClutterColor stage_clr = {0x0, 0x0, 0x0, 0xff};
-  ClutterActor *group;
-  guint idle_source;
-
-  stage = clutter_stage_new ();
-
-  clutter_stage_set_color (CLUTTER_STAGE (stage), &stage_clr);
-  clutter_actor_get_geometry (stage, &state.stage_geom);
-
-  group = clutter_group_new ();
-  clutter_actor_set_size (group,
-			  state.stage_geom.width,
-			  state.stage_geom.height);
-  clutter_container_add_actor (CLUTTER_CONTAINER (stage), group);
-
-  /* We force continuous redrawing incase someone comments out the
-   * clutter_main_quit and wants visual feedback for the test since we
-   * wont be doing anything else that will trigger redrawing. */
-  idle_source = g_idle_add (queue_redraw, stage);
-
-  g_signal_connect (group, "paint", G_CALLBACK (on_paint), &state);
-
-  {
-    InterlevedVertex verts[3] =
-      {
-	{ /* .x = */ 0.0, /* .y = */ 0.0,
-	  /* blue */
-	  /* .r = */ 0x00, /* .g = */ 0x00, /* .b = */ 0xff, /* .a = */ 0xff },
-
-	{ /* .x = */ 100.0, /* .y = */ 100.0,
-	  /* transparent blue */
-	  /* .r = */ 0x00, /* .g = */ 0x00, /* .b = */ 0xff, /* .a = */ 0x00 },
-
-	{ /* .x = */ 0.0, /* .y = */ 100.0,
-	  /* transparent blue */
-	  /* .r = */ 0x00, /* .g = */ 0x00, /* .b = */ 0xff, /* .a = */ 0x00 },
-      };
-
-    /* We assume the compiler is doing no funny struct padding for this test:
-     */
-    g_assert (sizeof (InterlevedVertex) == 12);
-
-    state.buffer = cogl_vertex_buffer_new (3 /* n vertices */);
-    cogl_vertex_buffer_add (state.buffer,
-			    "gl_Vertex",
-			    2, /* n components */
-                            COGL_ATTRIBUTE_TYPE_FLOAT,
-			    FALSE, /* normalized */
-                            12, /* stride */
-			    &verts[0].x);
-    cogl_vertex_buffer_add (state.buffer,
-                            "gl_Color",
-			    4, /* n components */
-			    COGL_ATTRIBUTE_TYPE_UNSIGNED_BYTE,
-			    FALSE, /* normalized */
-			    12, /* stride */
-			    &verts[0].r);
-    cogl_vertex_buffer_submit (state.buffer);
-  }
-
-  clutter_actor_show_all (stage);
-
-  clutter_main ();
-
-  cogl_handle_unref (state.buffer);
-
-  g_source_remove (idle_source);
-
-  clutter_actor_destroy (stage);
-
-  if (g_test_verbose ())
-    g_print ("OK\n");
-}
diff --git a/tests/conform/test-cogl-vertex-buffer-mutability.c b/tests/conform/test-cogl-vertex-buffer-mutability.c
deleted file mode 100644
index ade591ab6..000000000
--- a/tests/conform/test-cogl-vertex-buffer-mutability.c
+++ /dev/null
@@ -1,199 +0,0 @@
-
-#include <clutter/clutter.h>
-#include <cogl/cogl.h>
-
-#include "test-conform-common.h"
-
-/* This test verifies that modifying a vertex buffer works, by updating
- * vertex positions, and deleting and re-adding different color attributes.
- *
- * If you want visual feedback of what this test paints for debugging purposes,
- * then remove the call to clutter_main_quit() in validate_result.
- */
-
-typedef struct _TestState
-{
-  CoglHandle buffer;
-  ClutterGeometry stage_geom;
-} TestState;
-
-static void
-validate_result (TestState *state)
-{
-  guint8 pixel[4];
-  int y_off = 90;
-
-  /* NB: We ignore the alpha, since we don't know if our render target is
-   * RGB or RGBA */
-
-#define RED 0
-#define GREEN 1
-#define BLUE 2
-
-  /* Should see a red pixel */
-  cogl_read_pixels (110, y_off, 1, 1,
-                    COGL_READ_PIXELS_COLOR_BUFFER,
-                    COGL_PIXEL_FORMAT_RGBA_8888_PRE,
-                    pixel);
-  if (g_test_verbose ())
-    g_print ("pixel 0 = %x, %x, %x\n", pixel[RED], pixel[GREEN], pixel[BLUE]);
-  g_assert (pixel[RED] != 0 && pixel[GREEN] == 0 && pixel[BLUE] == 0);
-
-  /* Should see a green pixel */
-  cogl_read_pixels (210, y_off, 1, 1,
-                    COGL_READ_PIXELS_COLOR_BUFFER,
-                    COGL_PIXEL_FORMAT_RGBA_8888_PRE,
-                    pixel);
-  if (g_test_verbose ())
-    g_print ("pixel 1 = %x, %x, %x\n", pixel[RED], pixel[GREEN], pixel[BLUE]);
-  g_assert (pixel[RED] == 0 && pixel[GREEN] != 0 && pixel[BLUE] == 0);
-
-#undef RED
-#undef GREEN
-#undef BLUE
-
-  /* Comment this out if you want visual feedback of what this test
-   * paints.
-   */
-  clutter_main_quit ();
-}
-
-static void
-on_paint (ClutterActor *actor, TestState *state)
-{
-  float triangle_verts[3][2] =
-    {
-      {100.0, 0.0},
-      {200.0, 100.0},
-      {100.0, 100.0}
-    };
-  guint8 triangle_colors[3][4] =
-    {
-      {0x00, 0xff, 0x00, 0xff}, /* blue */
-      {0x00, 0xff, 0x00, 0x00}, /* transparent blue */
-      {0x00, 0xff, 0x00, 0x00}  /* transparent blue */
-    };
-
-  /*
-   * Draw a red triangle
-   */
-
-  cogl_set_source_color4ub (0xff, 0x00, 0x00, 0xff);
-
-  cogl_vertex_buffer_add (state->buffer,
-			  "gl_Vertex",
-			  2, /* n components */
-			  COGL_ATTRIBUTE_TYPE_FLOAT,
-			  FALSE, /* normalized */
-			  0, /* stride */
-			  triangle_verts);
-  cogl_vertex_buffer_delete (state->buffer, "gl_Color");
-  cogl_vertex_buffer_submit (state->buffer);
-
-  cogl_vertex_buffer_draw (state->buffer,
-			   COGL_VERTICES_MODE_TRIANGLE_STRIP, /* mode */
-			   0, /* first */
-			   3); /* count */
-
-  /*
-   * Draw a faded green triangle
-   */
-
-  cogl_vertex_buffer_add (state->buffer,
-			  "gl_Color",
-			  4, /* n components */
-                          COGL_ATTRIBUTE_TYPE_UNSIGNED_BYTE,
-			  FALSE, /* normalized */
-			  0, /* stride */
-			  triangle_colors);
-  cogl_vertex_buffer_submit (state->buffer);
-
-  cogl_translate (100, 0, 0);
-  cogl_vertex_buffer_draw (state->buffer,
-			   COGL_VERTICES_MODE_TRIANGLE_STRIP, /* mode */
-			   0, /* first */
-			   3); /* count */
-
-  validate_result (state);
-}
-
-static gboolean
-queue_redraw (gpointer stage)
-{
-  clutter_actor_queue_redraw (CLUTTER_ACTOR (stage));
-
-  return TRUE;
-}
-
-void
-test_cogl_vertex_buffer_mutability (TestConformSimpleFixture *fixture,
-		                    gconstpointer data)
-{
-  TestState state;
-  ClutterActor *stage;
-  ClutterColor stage_clr = {0x0, 0x0, 0x0, 0xff};
-  ClutterActor *group;
-  guint idle_source;
-
-  stage = clutter_stage_new ();
-
-  clutter_stage_set_color (CLUTTER_STAGE (stage), &stage_clr);
-  clutter_actor_get_geometry (stage, &state.stage_geom);
-
-  group = clutter_group_new ();
-  clutter_actor_set_size (group,
-			  state.stage_geom.width,
-			  state.stage_geom.height);
-  clutter_container_add_actor (CLUTTER_CONTAINER (stage), group);
-
-  /* We force continuous redrawing incase someone comments out the
-   * clutter_main_quit and wants visual feedback for the test since we
-   * wont be doing anything else that will trigger redrawing. */
-  idle_source = g_idle_add (queue_redraw, stage);
-
-  g_signal_connect (group, "paint", G_CALLBACK (on_paint), &state);
-
-  {
-    float triangle_verts[3][2] =
-      {
-	{0.0,	0.0},
-	{100.0, 100.0},
-	{0.0,	100.0}
-      };
-    guint8 triangle_colors[3][4] =
-      {
-	{0x00, 0x00, 0xff, 0xff}, /* blue */
-	{0x00, 0x00, 0xff, 0x00}, /* transparent blue */
-	{0x00, 0x00, 0xff, 0x00}  /* transparent blue */
-      };
-    state.buffer = cogl_vertex_buffer_new (3 /* n vertices */);
-    cogl_vertex_buffer_add (state.buffer,
-			    "gl_Vertex",
-			    2, /* n components */
-                            COGL_ATTRIBUTE_TYPE_FLOAT,
-			    FALSE, /* normalized */
-			    0, /* stride */
-			    triangle_verts);
-    cogl_vertex_buffer_add (state.buffer,
-			    "gl_Color",
-			    4, /* n components */
-                            COGL_ATTRIBUTE_TYPE_UNSIGNED_BYTE,
-			    FALSE, /* normalized */
-			    0, /* stride */
-			    triangle_colors);
-    cogl_vertex_buffer_submit (state.buffer);
-  }
-
-  clutter_actor_show_all (stage);
-
-  clutter_main ();
-
-  cogl_handle_unref (state.buffer);
-
-  g_source_remove (idle_source);
-
-  clutter_actor_destroy (stage);
-
-  if (g_test_verbose ())
-    g_print ("OK\n");
-}
diff --git a/tests/conform/test-cogl-viewport.c b/tests/conform/test-cogl-viewport.c
deleted file mode 100644
index b3226cd25..000000000
--- a/tests/conform/test-cogl-viewport.c
+++ /dev/null
@@ -1,412 +0,0 @@
-
-#include <clutter/clutter.h>
-#include <cogl/cogl.h>
-
-#include "test-conform-common.h"
-
-#define RED 0
-#define GREEN 1
-#define BLUE 2
-#define ALPHA 3
-
-#define FRAMEBUFFER_WIDTH  640
-#define FRAMEBUFFER_HEIGHT 480
-
-static const ClutterColor stage_color = { 0x0, 0x0, 0x0, 0xff };
-
-static void
-assert_region_color (int x,
-                     int y,
-                     int width,
-                     int height,
-                     guint8 red,
-                     guint8 green,
-                     guint8 blue,
-                     guint8 alpha)
-{
-  guint8 *data = g_malloc0 (width * height * 4);
-  cogl_read_pixels (x, y, width, height,
-                    COGL_READ_PIXELS_COLOR_BUFFER,
-                    COGL_PIXEL_FORMAT_RGBA_8888_PRE,
-                    data);
-  for (y = 0; y < height; y++)
-    for (x = 0; x < width; x++)
-      {
-        guint8 *pixel = &data[y*width*4 + x*4];
-#if 1
-        g_assert (pixel[RED] == red &&
-                  pixel[GREEN] == green &&
-                  pixel[BLUE] == blue &&
-                  pixel[ALPHA] == alpha);
-#endif
-      }
-  g_free (data);
-}
-
-static void
-assert_rectangle_color_and_black_border (int x,
-                                         int y,
-                                         int width,
-                                         int height,
-                                         guint8 red,
-                                         guint8 green,
-                                         guint8 blue)
-{
-  /* check the rectangle itself... */
-  assert_region_color (x, y, width, height, red, green, blue, 0xff);
-  /* black to left of the rectangle */
-  assert_region_color (x-10, y-10, 10, height+20, 0x00, 0x00, 0x00, 0xff);
-  /* black to right of the rectangle */
-  assert_region_color (x+width, y-10, 10, height+20, 0x00, 0x00, 0x00, 0xff);
-  /* black above the rectangle */
-  assert_region_color (x-10, y-10, width+20, 10, 0x00, 0x00, 0x00, 0xff);
-  /* and black below the rectangle */
-  assert_region_color (x-10, y+height, width+20, 10, 0x00, 0x00, 0x00, 0xff);
-}
-
-
-static void
-on_paint (ClutterActor *actor, void *state)
-{
-  float saved_viewport[4];
-  CoglMatrix saved_projection;
-  CoglMatrix projection;
-  CoglMatrix modelview;
-  guchar *data;
-  CoglHandle tex;
-  CoglHandle offscreen;
-  CoglColor black;
-  float x0;
-  float y0;
-  float width;
-  float height;
-
-  /* for clearing the offscreen framebuffer to black... */
-  cogl_color_init_from_4ub (&black, 0x00, 0x00, 0x00, 0xff);
-
-  cogl_get_viewport (saved_viewport);
-  cogl_get_projection_matrix (&saved_projection);
-  cogl_push_matrix ();
-
-  cogl_matrix_init_identity (&projection);
-  cogl_matrix_init_identity (&modelview);
-
-  cogl_set_projection_matrix (&projection);
-  cogl_set_modelview_matrix (&modelview);
-
-  /* - Create a 100x200 viewport (i.e. smaller than the onscreen framebuffer)
-   *   and position it a (20, 10) inside the framebuffer.
-   * - Fill the whole viewport with a purple rectangle
-   * - Verify that the framebuffer is black with a 100x200 purple rectangle at
-   *   (20, 10)
-   */
-  cogl_set_viewport (20, /* x */
-                     10, /* y */
-                     100, /* width */
-                     200); /* height */
-  /* clear everything... */
-  cogl_clear (&black, COGL_BUFFER_BIT_COLOR);
-  /* fill the viewport with purple.. */
-  cogl_set_source_color4ub (0xff, 0x00, 0xff, 0xff);
-  cogl_rectangle (-1, 1, 1, -1);
-  assert_rectangle_color_and_black_border (20, 10, 100, 200,
-                                           0xff, 0x00, 0xff);
-
-
-  /* - Create a viewport twice the size of the onscreen framebuffer with
-   *   a negative offset positioning it at (-20, -10) relative to the
-   *   buffer itself.
-   * - Draw a 100x200 green rectangle at (40, 20) within the viewport (which
-   *   is (20, 10) within the framebuffer)
-   * - Verify that the framebuffer is black with a 100x200 green rectangle at
-   *   (20, 10)
-   */
-  cogl_set_viewport (-20, /* x */
-                     -10, /* y */
-                     FRAMEBUFFER_WIDTH * 2, /* width */
-                     FRAMEBUFFER_HEIGHT * 2); /* height */
-  /* clear everything... */
-  cogl_clear (&black, COGL_BUFFER_BIT_COLOR);
-  /* draw a 100x200 green rectangle offset into the viewport such that its
-   * top left corner should be found at (20, 10) in the offscreen buffer */
-  /* (offset 40 pixels right from the left of the viewport) */
-  x0 = -1.0f + (1.0f / FRAMEBUFFER_WIDTH) * 40.f;
-  /* (offset 20 pixels down from the top of the viewport) */
-  y0 = 1.0f - (1.0f / FRAMEBUFFER_HEIGHT) * 20.0f;
-  width = (1.0f / FRAMEBUFFER_WIDTH) * 100;
-  height = (1.0f / FRAMEBUFFER_HEIGHT) * 200;
-  cogl_set_source_color4ub (0x00, 0xff, 0x00, 0xff);
-  cogl_rectangle (x0, y0, x0 + width, y0 - height);
-  assert_rectangle_color_and_black_border (20, 10, 100, 200,
-                                           0x00, 0xff, 0x00);
-
-
-  /* - Create a 200x400 viewport and position it a (20, 10) inside the draw
-   *   buffer.
-   * - Push a 100x200 window space clip rectangle at (20, 10)
-   * - Fill the whole viewport with a blue rectangle
-   * - Verify that the framebuffer is black with a 100x200 blue rectangle at
-   *   (20, 10)
-   */
-  cogl_set_viewport (20, /* x */
-                     10, /* y */
-                     200, /* width */
-                     400); /* height */
-  /* clear everything... */
-  cogl_clear (&black, COGL_BUFFER_BIT_COLOR);
-  cogl_clip_push_window_rectangle (20, 10, 100, 200);
-  /* fill the viewport with blue.. */
-  cogl_set_source_color4ub (0x00, 0x00, 0xff, 0xff);
-  cogl_rectangle (-1, 1, 1, -1);
-  cogl_clip_pop ();
-  assert_rectangle_color_and_black_border (20, 10, 100, 200,
-                                           0x00, 0x00, 0xff);
-
-
-  /* - Create a 200x400 viewport and position it a (20, 10) inside the draw
-   *   buffer.
-   * - Push a 100x200 model space clip rectangle at (20, 10) in the viewport
-   *   (i.e. (40, 20) inside the framebuffer)
-   * - Fill the whole viewport with a green rectangle
-   * - Verify that the framebuffer is black with a 100x200 green rectangle at
-   *   (40, 20)
-   */
-  cogl_set_viewport (20, /* x */
-                     10, /* y */
-                     200, /* width */
-                     400); /* height */
-  /* clear everything... */
-  cogl_clear (&black, COGL_BUFFER_BIT_COLOR);
-  /* figure out where to position our clip rectangle in model space
-   * coordinates... */
-  /* (offset 40 pixels right from the left of the viewport) */
-  x0 = -1.0f + (2.0f / 200) * 20.f;
-  /* (offset 20 pixels down from the top of the viewport) */
-  y0 = 1.0f - (2.0f / 400) * 10.0f;
-  width = (2.0f / 200) * 100;
-  height = (2.0f / 400) * 200;
-  /* add the clip rectangle... */
-  cogl_push_matrix ();
-  cogl_translate (x0 + (width/2.0), y0 - (height/2.0), 0);
-  /* XXX: Rotate just enough to stop Cogl from converting our model space
-   * rectangle into a window space rectangle.. */
-  cogl_rotate (0.1, 0, 0, 1);
-  cogl_clip_push_rectangle (-(width/2.0), -(height/2.0),
-                            width/2.0, height/2.0);
-  cogl_pop_matrix ();
-  /* fill the viewport with green.. */
-  cogl_set_source_color4ub (0x00, 0xff, 0x00, 0xff);
-  cogl_rectangle (-1, 1, 1, -1);
-  cogl_clip_pop ();
-  assert_rectangle_color_and_black_border (40, 20, 100, 200,
-                                           0x00, 0xff, 0x00);
-
-
-  /* Set the viewport to something specific so we can verify that it gets
-   * restored after we are done testing with an offscreen framebuffer... */
-  cogl_set_viewport (20, 10, 100, 200);
-
-  /*
-   * Next test offscreen drawing...
-   */
-  data = g_malloc (FRAMEBUFFER_WIDTH * 4 * FRAMEBUFFER_HEIGHT);
-  tex = cogl_texture_new_from_data (FRAMEBUFFER_WIDTH, FRAMEBUFFER_HEIGHT,
-                                    COGL_TEXTURE_NO_SLICING,
-                                    COGL_PIXEL_FORMAT_RGBA_8888, /* data fmt */
-                                    COGL_PIXEL_FORMAT_ANY, /* internal fmt */
-                                    FRAMEBUFFER_WIDTH * 4, /* rowstride */
-                                    data);
-  g_free (data);
-  offscreen = cogl_offscreen_new_to_texture (tex);
-
-  cogl_push_framebuffer (offscreen);
-
-
-  /* - Create a 100x200 viewport (i.e. smaller than the offscreen framebuffer)
-   *   and position it a (20, 10) inside the framebuffer.
-   * - Fill the whole viewport with a blue rectangle
-   * - Verify that the framebuffer is black with a 100x200 blue rectangle at
-   *   (20, 10)
-   */
-  cogl_set_viewport (20, /* x */
-                     10, /* y */
-                     100, /* width */
-                     200); /* height */
-  /* clear everything... */
-  cogl_clear (&black, COGL_BUFFER_BIT_COLOR);
-  /* fill the viewport with blue.. */
-  cogl_set_source_color4ub (0x00, 0x00, 0xff, 0xff);
-  cogl_rectangle (-1, 1, 1, -1);
-  assert_rectangle_color_and_black_border (20, 10, 100, 200,
-                                           0x00, 0x00, 0xff);
-
-
-  /* - Create a viewport twice the size of the offscreen framebuffer with
-   *   a negative offset positioning it at (-20, -10) relative to the
-   *   buffer itself.
-   * - Draw a 100x200 red rectangle at (40, 20) within the viewport (which
-   *   is (20, 10) within the framebuffer)
-   * - Verify that the framebuffer is black with a 100x200 red rectangle at
-   *   (20, 10)
-   */
-  cogl_set_viewport (-20, /* x */
-                     -10, /* y */
-                     FRAMEBUFFER_WIDTH * 2, /* width */
-                     FRAMEBUFFER_HEIGHT * 2); /* height */
-  /* clear everything... */
-  cogl_clear (&black, COGL_BUFFER_BIT_COLOR);
-  /* draw a 100x200 red rectangle offset into the viewport such that its
-   * top left corner should be found at (20, 10) in the offscreen buffer */
-  /* (offset 40 pixels right from the left of the viewport) */
-  x0 = -1.0f + (1.0f / FRAMEBUFFER_WIDTH) * 40.f;
-  /* (offset 20 pixels down from the top of the viewport) */
-  y0 = 1.0f - (1.0f / FRAMEBUFFER_HEIGHT) * 20.0f;
-  width = (1.0f / FRAMEBUFFER_WIDTH) * 100;
-  height = (1.0f / FRAMEBUFFER_HEIGHT) * 200;
-  cogl_set_source_color4ub (0xff, 0x00, 0x00, 0xff);
-  cogl_rectangle (x0, y0, x0 + width, y0 - height);
-  assert_rectangle_color_and_black_border (20, 10, 100, 200,
-                                           0xff, 0x00, 0x00);
-
-
-  /* - Create a 200x400 viewport and position it a (20, 10) inside the draw
-   *   buffer.
-   * - Push a 100x200 window space clip rectangle at (20, 10)
-   * - Fill the whole viewport with a blue rectangle
-   * - Verify that the framebuffer is black with a 100x200 blue rectangle at
-   *   (20, 10)
-   */
-  cogl_set_viewport (20, /* x */
-                     10, /* y */
-                     200, /* width */
-                     400); /* height */
-  /* clear everything... */
-  cogl_clear (&black, COGL_BUFFER_BIT_COLOR);
-  cogl_clip_push_window_rectangle (20, 10, 100, 200);
-  /* fill the viewport with blue.. */
-  cogl_set_source_color4ub (0x00, 0x00, 0xff, 0xff);
-  cogl_rectangle (-1, 1, 1, -1);
-  cogl_clip_pop ();
-  assert_rectangle_color_and_black_border (20, 10, 100, 200,
-                                           0x00, 0x00, 0xff);
-
-
-  /* - Create a 200x400 viewport and position it a (20, 10) inside the draw
-   *   buffer.
-   * - Push a 100x200 model space clip rectangle at (20, 10) in the viewport
-   *   (i.e. (40, 20) inside the framebuffer)
-   * - Fill the whole viewport with a green rectangle
-   * - Verify that the framebuffer is black with a 100x200 green rectangle at
-   *   (40, 20)
-   */
-  cogl_set_viewport (20, /* x */
-                     10, /* y */
-                     200, /* width */
-                     400); /* height */
-  /* clear everything... */
-  cogl_clear (&black, COGL_BUFFER_BIT_COLOR);
-  /* figure out where to position our clip rectangle in model space
-   * coordinates... */
-  /* (offset 40 pixels right from the left of the viewport) */
-  x0 = -1.0f + (2.0f / 200) * 20.f;
-  /* (offset 20 pixels down from the top of the viewport) */
-  y0 = 1.0f - (2.0f / 400) * 10.0f;
-  width = (2.0f / 200) * 100;
-  height = (2.0f / 400) * 200;
-  /* add the clip rectangle... */
-  cogl_push_matrix ();
-  cogl_translate (x0 + (width/2.0), y0 - (height/2.0), 0);
-  /* XXX: Rotate just enough to stop Cogl from converting our model space
-   * rectangle into a window space rectangle.. */
-  cogl_rotate (0.1, 0, 0, 1);
-  cogl_clip_push_rectangle (-(width/2.0), -(height/2.0),
-                            width/2, height/2);
-  cogl_pop_matrix ();
-  /* fill the viewport with green.. */
-  cogl_set_source_color4ub (0x00, 0xff, 0x00, 0xff);
-  cogl_rectangle (-1, 1, 1, -1);
-  cogl_clip_pop ();
-  assert_rectangle_color_and_black_border (40, 20, 100, 200,
-                                           0x00, 0xff, 0x00);
-
-
-  /* Set the viewport to something obscure to verify that it gets
-   * replace when we switch back to the onscreen framebuffer... */
-  cogl_set_viewport (0, 0, 10, 10);
-
-  cogl_pop_framebuffer ();
-  cogl_handle_unref (offscreen);
-
-  /*
-   * Verify that the previous onscreen framebuffer's viewport was restored
-   * by drawing a white rectangle across the whole viewport. This should
-   * draw a 100x200 rectangle at (20,10) relative to the onscreen draw
-   * buffer...
-   */
-  cogl_clear (&black, COGL_BUFFER_BIT_COLOR);
-  cogl_set_source_color4ub (0xff, 0xff, 0xff, 0xff);
-  cogl_rectangle (-1, 1, 1, -1);
-  assert_rectangle_color_and_black_border (20, 10, 100, 200,
-                                           0xff, 0xff, 0xff);
-
-
-  /* Uncomment to display the last contents of the offscreen framebuffer */
-#if 1
-  cogl_matrix_init_identity (&projection);
-  cogl_matrix_init_identity (&modelview);
-  cogl_set_viewport (0, 0, FRAMEBUFFER_WIDTH, FRAMEBUFFER_HEIGHT);
-  cogl_set_projection_matrix (&projection);
-  cogl_set_modelview_matrix (&modelview);
-  cogl_set_source_texture (tex);
-  cogl_rectangle (-1, 1, 1, -1);
-#endif
-
-  cogl_handle_unref (tex);
-
-  /* Finally restore the stage's original state... */
-  cogl_pop_matrix ();
-  cogl_set_projection_matrix (&saved_projection);
-  cogl_set_viewport (saved_viewport[0], saved_viewport[1],
-                     saved_viewport[2], saved_viewport[3]);
-
-
-  /* Comment this out if you want visual feedback of what this test
-   * paints.
-   */
-  clutter_main_quit ();
-}
-
-static gboolean
-queue_redraw (gpointer stage)
-{
-  clutter_actor_queue_redraw (CLUTTER_ACTOR (stage));
-
-  return TRUE;
-}
-
-void
-test_cogl_viewport (TestConformSimpleFixture *fixture,
-                    gconstpointer data)
-{
-  guint idle_source;
-  ClutterActor *stage;
-
-  stage = clutter_stage_new ();
-  clutter_stage_set_color (CLUTTER_STAGE (stage), &stage_color);
-
-  /* We force continuous redrawing of the stage, since we need to skip
-   * the first few frames, and we wont be doing anything else that
-   * will trigger redrawing. */
-  idle_source = g_idle_add (queue_redraw, stage);
-  g_signal_connect_after (stage, "paint", G_CALLBACK (on_paint), NULL);
-
-  clutter_actor_show (stage);
-  clutter_main ();
-
-  g_source_remove (idle_source);
-
-  clutter_actor_destroy (stage);
-
-  if (g_test_verbose ())
-    g_print ("OK\n");
-}
diff --git a/tests/conform/test-conform-common.c b/tests/conform/test-conform-common.c
deleted file mode 100644
index 881a6b1cd..000000000
--- a/tests/conform/test-conform-common.c
+++ /dev/null
@@ -1,105 +0,0 @@
-#include "config.h"
-
-#include <clutter/clutter.h>
-#include <stdlib.h>
-
-#ifdef CLUTTER_WINDOWING_X11
-#include <X11/Xlib.h>
-#include <clutter/x11/clutter-x11.h>
-#endif
-
-#include "test-conform-common.h"
-
-/**
- * test_conform_simple_fixture_setup:
- *
- * Initialise stuff before each test is run
- */
-void
-test_conform_simple_fixture_setup (TestConformSimpleFixture *fixture,
-				   gconstpointer data)
-{
-  const TestConformSharedState *shared_state = data;
-  static int counter = 0;
-
-  if (counter != 0)
-    g_critical ("We don't support running more than one test at a time\n"
-                "in a single test run due to the state leakage that often\n"
-                "causes subsequent tests to fail.\n"
-                "\n"
-                "If you want to run all the tests you should run\n"
-                "$ make test-report");
-  counter++;
-
-#ifdef CLUTTER_WINDOWING_X11
-  if (clutter_check_windowing_backend (CLUTTER_WINDOWING_X11))
-    {
-      /* on X11 we need a display connection to run the test suite */
-      const gchar *display = g_getenv ("DISPLAY");
-      if (!display || *display == '\0')
-        {
-          g_print ("No DISPLAY found. Unable to run the conformance "
-                   "test suite without a display.\n");
-
-          exit (EXIT_SUCCESS);
-        }
-
-      /* enable XInput support */
-      clutter_x11_enable_xinput ();
-    }
-#endif
-
-  g_assert (clutter_init (shared_state->argc_addr, shared_state->argv_addr)
-            == CLUTTER_INIT_SUCCESS);
-
-#ifdef CLUTTER_WINDOWING_X11
-  /* A lot of the tests depend on a specific stage / framebuffer size
-   * when they read pixels back to verify the results of the test.
-   *
-   * Normally the asynchronous nature of X means that setting the
-   * clutter stage size may really happen an indefinite amount of time
-   * later but since the tests are so short lived and may only render
-   * a single frame this is not an acceptable semantic.
-   */
-  if (clutter_check_windowing_backend (CLUTTER_WINDOWING_X11))
-    XSynchronize (clutter_x11_get_default_display(), TRUE);
-#endif
-}
-
-
-/**
- * test_conform_simple_fixture_teardown:
- *
- * Cleanup stuff after each test has finished
- */
-void
-test_conform_simple_fixture_teardown (TestConformSimpleFixture *fixture,
-				      gconstpointer data)
-{
-  /* const TestConformSharedState *shared_state = data; */
-}
-
-void
-test_conform_get_gl_functions (TestConformGLFunctions *functions)
-{
-  functions->glGetString = (void *) cogl_get_proc_address ("glGetString");
-  g_assert (functions->glGetString != NULL);
-  functions->glGetIntegerv = (void *) cogl_get_proc_address ("glGetIntegerv");
-  g_assert (functions->glGetIntegerv != NULL);
-  functions->glPixelStorei = (void *) cogl_get_proc_address ("glPixelStorei");
-  g_assert (functions->glPixelStorei != NULL);
-  functions->glBindTexture = (void *) cogl_get_proc_address ("glBindTexture");
-  g_assert (functions->glBindTexture != NULL);
-  functions->glGenTextures = (void *) cogl_get_proc_address ("glGenTextures");
-  g_assert (functions->glGenTextures != NULL);
-  functions->glGetError = (void *) cogl_get_proc_address ("glGetError");
-  g_assert (functions->glGetError != NULL);
-  functions->glDeleteTextures =
-    (void *) cogl_get_proc_address ("glDeleteTextures");
-  g_assert (functions->glDeleteTextures != NULL);
-  functions->glTexImage2D = (void *) cogl_get_proc_address ("glTexImage2D");
-  g_assert (functions->glTexImage2D != NULL);
-  functions->glTexParameteri =
-    (void *) cogl_get_proc_address ("glTexParameteri");
-  g_assert (functions->glTexParameteri != NULL);
-}
diff --git a/tests/conform/test-conform-common.h b/tests/conform/test-conform-common.h
deleted file mode 100644
index f2d50dedd..000000000
--- a/tests/conform/test-conform-common.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-/* Stuff you put in here is setup once in main() and gets passed around to
- * all test functions and fixture setup/teardown functions in the data
- * argument */
-typedef struct _TestConformSharedState
-{
-  int	 *argc_addr;
-  char ***argv_addr;
-} TestConformSharedState;
-
-
-/* This fixture structure is allocated by glib, and before running each test
- * the test_conform_simple_fixture_setup func (see below) is called to
- * initialise it, and test_conform_simple_fixture_teardown is called when
- * the test is finished. */
-typedef struct _TestConformSimpleFixture
-{
-  /**/
-  int dummy;
-} TestConformSimpleFixture;
-
-typedef struct _TestConformTodo
-{
-  gchar *name;
-  void (* func) (TestConformSimpleFixture *, gconstpointer);
-} TestConformTodo;
-
-typedef struct _TestConformGLFunctions
-{
-  const guint8 * (* glGetString) (guint name);
-  void (* glGetIntegerv) (guint pname, int *params);
-  void (* glPixelStorei) (guint pname, int param);
-  void (* glBindTexture) (guint target, guint texture);
-  void (* glGenTextures) (int n, guint *textures);
-  guint (* glGetError) (void);
-  void (* glDeleteTextures) (int n, const guint *textures);
-  void (* glTexImage2D) (guint target, int level,
-                         int internalFormat,
-                         int width, int height,
-                         int border, guint format, guint type,
-                         const void *pixels);
-  void (* glTexParameteri) (guint target, guint pname, int param);
-} TestConformGLFunctions;
-
-void test_conform_get_gl_functions (TestConformGLFunctions *functions);
-
-void test_conform_simple_fixture_setup (TestConformSimpleFixture *fixture,
-					gconstpointer data);
-void test_conform_simple_fixture_teardown (TestConformSimpleFixture *fixture,
-					   gconstpointer data);
-
-gchar *clutter_test_get_data_file (const gchar *filename);
diff --git a/tests/conform/test-conform-main.c b/tests/conform/test-conform-main.c
deleted file mode 100644
index b076e8f4c..000000000
--- a/tests/conform/test-conform-main.c
+++ /dev/null
@@ -1,272 +0,0 @@
-#include "config.h"
-
-#include <clutter/clutter.h>
-
-#include <glib.h>
-#include <locale.h>
-#include <stdlib.h>
-
-#include "test-conform-common.h"
-
-static void
-test_conform_skip_test (TestConformSimpleFixture *fixture,
-                        gconstpointer             data)
-{
-  /* void */
-}
-
-static void
-test_conform_todo_test (TestConformSimpleFixture *fixture,
-                        gconstpointer             data)
-{
-#ifdef G_OS_UNIX
-  const TestConformTodo *todo = data;
-
-  if (g_test_trap_fork (0, G_TEST_TRAP_SILENCE_STDOUT | G_TEST_TRAP_SILENCE_STDERR))
-    {
-      todo->func (fixture, NULL);
-      exit (0);
-    }
-
-  g_test_trap_assert_failed ();
-#endif
-}
-
-void
-verify_failure (TestConformSimpleFixture *fixture,
-                gconstpointer             data)
-{
-  g_assert (FALSE);
-}
-
-static TestConformSharedState *shared_state = NULL;
-
-/* This is a bit of sugar for adding new conformance tests:
- *
- * - It adds an extern function definition just to save maintaining a header
- *   that lists test entry points.
- * - It sets up callbacks for a fixture, which lets us share initialization
- *   *code* between tests. (see test-conform-common.c)
- * - It passes in a shared *data* pointer that is initialised once in main(),
- *   that gets passed to the fixture setup and test functions. (See the
- *   definition in test-conform-common.h)
- */
-#define TEST_CONFORM_SIMPLE(NAMESPACE, FUNC)            G_STMT_START {  \
-  extern void FUNC (TestConformSimpleFixture *, gconstpointer);         \
-  g_test_add ("/conform" NAMESPACE "/" #FUNC,                           \
-	      TestConformSimpleFixture,                                 \
-	      shared_state, /* data argument for test */                \
-	      test_conform_simple_fixture_setup,                        \
-	      FUNC,                                                     \
-	      test_conform_simple_fixture_teardown);    } G_STMT_END
-
-/* this is a macro that conditionally executes a test if CONDITION
- * evaluates to TRUE; otherwise, it will put the test under the
- * "/skipped" namespace and execute a dummy function that will always
- * pass.
- */
-#define TEST_CONFORM_SKIP(CONDITION, NAMESPACE, FUNC)   G_STMT_START {  \
-  if (CONDITION) { TEST_CONFORM_SIMPLE (NAMESPACE, FUNC); }             \
-  else {                                                                \
-    g_test_add ("/skipped" NAMESPACE "/" #FUNC,                         \
-                TestConformSimpleFixture,                               \
-                shared_state, /* data argument for test */              \
-                test_conform_simple_fixture_setup,                      \
-                test_conform_skip_test,                                 \
-                test_conform_simple_fixture_teardown);                  \
-  }                                                     } G_STMT_END
-
-#define TEST_CONFORM_TODO(NAMESPACE, FUNC)              G_STMT_START {  \
-   extern void FUNC (TestConformSimpleFixture *, gconstpointer);        \
-   TestConformTodo *_clos = g_new0 (TestConformTodo, 1);                \
-   _clos->name = g_strdup ( #FUNC );                                    \
-   _clos->func = FUNC;                                                  \
-   g_test_add ("/todo" NAMESPACE "/" #FUNC,                             \
-              TestConformSimpleFixture,                                 \
-              _clos,                                                    \
-              test_conform_simple_fixture_setup,                        \
-              test_conform_todo_test,                                   \
-              test_conform_simple_fixture_teardown);    } G_STMT_END
-
-gchar *
-clutter_test_get_data_file (const gchar *filename)
-{
-  return g_build_filename (TESTS_DATADIR, filename, NULL);
-}
-
-static void
-clutter_test_init (gint    *argc,
-                   gchar ***argv)
-{
-  /* Turning of sync-to-vblank removes a dependency on the specifics of the
-   * test environment. It also means that the timeline-only tests are
-   * throttled to a reasonable frame rate rather than running in tight
-   * infinite loop.
-   */
-  g_setenv ("CLUTTER_VBLANK", "none", FALSE);
-
-  g_test_init (argc, argv, NULL);
-
-  g_test_bug_base ("http://bugzilla.gnome.org/show_bug.cgi?id=%s");
-
-  /* Initialise the state you need to share with everything.
-   */
-  shared_state = g_new0 (TestConformSharedState, 1);
-  shared_state->argc_addr = argc;
-  shared_state->argv_addr = argv;
-}
-
-int
-main (int argc, char **argv)
-{
-  clutter_test_init (&argc, &argv);
-
-  /* This file is run through a sed script during the make step so the
-     lines containing the tests need to be formatted on a single line
-     each. To comment out a test use the SKIP or TODO macros. Using
-     #if 0 would break the script. */
-
-  /* sanity check for the test suite itself */
-  TEST_CONFORM_TODO ("/suite", verify_failure);
-
-  TEST_CONFORM_SIMPLE ("/actor", actor_add_child);
-  TEST_CONFORM_SIMPLE ("/actor", actor_insert_child);
-  TEST_CONFORM_SIMPLE ("/actor", actor_raise_child);
-  TEST_CONFORM_SIMPLE ("/actor", actor_lower_child);
-  TEST_CONFORM_SIMPLE ("/actor", actor_replace_child);
-  TEST_CONFORM_SIMPLE ("/actor", actor_remove_child);
-  TEST_CONFORM_SIMPLE ("/actor", actor_remove_all);
-  TEST_CONFORM_SIMPLE ("/actor", actor_container_signals);
-  TEST_CONFORM_SIMPLE ("/actor", actor_destruction);
-  TEST_CONFORM_SIMPLE ("/actor", actor_anchors);
-  TEST_CONFORM_SIMPLE ("/actor", actor_pick);
-  TEST_CONFORM_SIMPLE ("/actor", actor_fixed_size);
-  TEST_CONFORM_SIMPLE ("/actor", actor_preferred_size);
-  TEST_CONFORM_SIMPLE ("/actor", actor_basic_layout);
-  TEST_CONFORM_SIMPLE ("/actor", actor_margin_layout);
-  TEST_CONFORM_SIMPLE ("/actor", actor_offscreen_redirect);
-  TEST_CONFORM_SIMPLE ("/actor", actor_shader_effect);
-
-  TEST_CONFORM_SIMPLE ("/actor/iter", actor_iter_traverse_children);
-  TEST_CONFORM_SIMPLE ("/actor/iter", actor_iter_traverse_remove);
-  TEST_CONFORM_SIMPLE ("/actor/iter", actor_iter_assignment);
-
-  TEST_CONFORM_SIMPLE ("/actor/invariants", actor_initial_state);
-  TEST_CONFORM_SIMPLE ("/actor/invariants", actor_shown_not_parented);
-  TEST_CONFORM_SIMPLE ("/actor/invariants", actor_visibility_not_recursive);
-  TEST_CONFORM_SIMPLE ("/actor/invariants", actor_realized);
-  TEST_CONFORM_SIMPLE ("/actor/invariants", actor_realize_not_recursive);
-  TEST_CONFORM_SIMPLE ("/actor/invariants", actor_map_recursive);
-  TEST_CONFORM_SIMPLE ("/actor/invariants", actor_mapped);
-  TEST_CONFORM_SIMPLE ("/actor/invariants", actor_show_on_set_parent);
-  TEST_CONFORM_SIMPLE ("/actor/invariants", clone_no_map);
-  TEST_CONFORM_SIMPLE ("/actor/invariants", actor_contains);
-  TEST_CONFORM_SIMPLE ("/actor/invariants", default_stage);
-  TEST_CONFORM_SIMPLE ("/actor/invariants", actor_pivot_transformation);
-
-  TEST_CONFORM_SIMPLE ("/actor/opacity", opacity_label);
-  TEST_CONFORM_SIMPLE ("/actor/opacity", opacity_rectangle);
-  TEST_CONFORM_SIMPLE ("/actor/opacity", opacity_paint);
-
-  TEST_CONFORM_SIMPLE ("/text", text_utf8_validation);
-  TEST_CONFORM_SIMPLE ("/text", text_set_empty);
-  TEST_CONFORM_SIMPLE ("/text", text_set_text);
-  TEST_CONFORM_SIMPLE ("/text", text_append_some);
-  TEST_CONFORM_SIMPLE ("/text", text_prepend_some);
-  TEST_CONFORM_SIMPLE ("/text", text_insert);
-  TEST_CONFORM_SIMPLE ("/text", text_delete_chars);
-  TEST_CONFORM_SIMPLE ("/text", text_delete_text);
-  TEST_CONFORM_SIMPLE ("/text", text_cursor);
-  TEST_CONFORM_SIMPLE ("/text", text_event);
-  TEST_CONFORM_SIMPLE ("/text", text_get_chars);
-  TEST_CONFORM_SIMPLE ("/text", text_cache);
-  TEST_CONFORM_SIMPLE ("/text", text_password_char);
-  TEST_CONFORM_SIMPLE ("/text", text_idempotent_use_markup);
-
-  TEST_CONFORM_SIMPLE ("/rectangle", rectangle_set_size);
-  TEST_CONFORM_SIMPLE ("/rectangle", rectangle_set_color);
-
-  TEST_CONFORM_SIMPLE ("/texture", texture_pick_with_alpha);
-  TEST_CONFORM_SIMPLE ("/texture", texture_fbo);
-  TEST_CONFORM_SIMPLE ("/texture/cairo", texture_cairo);
-
-  TEST_CONFORM_SIMPLE ("/interval", interval_initial_state);
-  TEST_CONFORM_SIMPLE ("/interval", interval_transform);
-
-  TEST_CONFORM_SIMPLE ("/path", path_base);
-
-  TEST_CONFORM_SIMPLE ("/binding-pool", binding_pool);
-
-  TEST_CONFORM_SIMPLE ("/model", list_model_populate);
-  TEST_CONFORM_SIMPLE ("/model", list_model_iterate);
-  TEST_CONFORM_SIMPLE ("/model", list_model_filter);
-  TEST_CONFORM_SIMPLE ("/model", list_model_from_script);
-  TEST_CONFORM_SIMPLE ("/model", list_model_row_changed);
-
-  TEST_CONFORM_SIMPLE ("/color", color_from_string_valid);
-  TEST_CONFORM_SIMPLE ("/color", color_from_string_invalid);
-  TEST_CONFORM_SIMPLE ("/color", color_to_string);
-  TEST_CONFORM_SIMPLE ("/color", color_hls_roundtrip);
-  TEST_CONFORM_SIMPLE ("/color", color_operators);
-
-  TEST_CONFORM_SIMPLE ("/units", units_constructors);
-  TEST_CONFORM_SIMPLE ("/units", units_string);
-  TEST_CONFORM_SIMPLE ("/units", units_cache);
-
-  TEST_CONFORM_SIMPLE ("/group", group_depth_sorting);
-
-  TEST_CONFORM_SIMPLE ("/script", script_single);
-  TEST_CONFORM_SIMPLE ("/script", script_child);
-  TEST_CONFORM_SIMPLE ("/script", script_implicit_alpha);
-  TEST_CONFORM_SIMPLE ("/script", script_object_property);
-  TEST_CONFORM_SIMPLE ("/script", script_animation);
-  TEST_CONFORM_SIMPLE ("/script", script_named_object);
-  TEST_CONFORM_SIMPLE ("/script", script_layout_property);
-  TEST_CONFORM_SIMPLE ("/script", animator_base);
-  TEST_CONFORM_SIMPLE ("/script", animator_properties);
-  TEST_CONFORM_SIMPLE ("/script", animator_multi_properties);
-  TEST_CONFORM_SIMPLE ("/script", state_base);
-  TEST_CONFORM_SIMPLE ("/script", script_margin);
-
-  TEST_CONFORM_SIMPLE ("/timeline", timeline_base);
-  TEST_CONFORM_SIMPLE ("/timeline", timeline_markers_from_script);
-  TEST_CONFORM_SKIP (g_test_slow (), "/timeline", timeline_interpolation);
-  TEST_CONFORM_SKIP (g_test_slow (), "/timeline", timeline_rewind);
-  TEST_CONFORM_SIMPLE ("/timeline", timeline_progress_mode);
-  TEST_CONFORM_SIMPLE ("/timeline", timeline_progress_step);
-
-  TEST_CONFORM_SIMPLE ("/score", score_base);
-
-  TEST_CONFORM_SIMPLE ("/behaviours", behaviours_base);
-
-  TEST_CONFORM_SIMPLE ("/events", events_touch);
-
-  /* FIXME - see bug https://bugzilla.gnome.org/show_bug.cgi?id=655588 */
-  TEST_CONFORM_TODO ("/cally", cally_text);
-
-#if 0
-  TEST_CONFORM_SIMPLE ("/cogl", test_cogl_object);
-  TEST_CONFORM_SIMPLE ("/cogl", test_cogl_fixed);
-  TEST_CONFORM_SIMPLE ("/cogl", test_cogl_materials);
-  TEST_CONFORM_SIMPLE ("/cogl", test_cogl_premult);
-  TEST_CONFORM_SIMPLE ("/cogl", test_cogl_readpixels);
-
-  TEST_CONFORM_SIMPLE ("/cogl/texture", test_cogl_npot_texture);
-  TEST_CONFORM_SIMPLE ("/cogl/texture", test_cogl_multitexture);
-  TEST_CONFORM_SIMPLE ("/cogl/texture", test_cogl_texture_mipmaps);
-  TEST_CONFORM_SIMPLE ("/cogl/texture", test_cogl_texture_rectangle);
-  TEST_CONFORM_SIMPLE ("/cogl/texture", test_cogl_texture_pixmap_x11);
-  TEST_CONFORM_SIMPLE ("/cogl/texture", test_cogl_texture_get_set_data);
-  TEST_CONFORM_SIMPLE ("/cogl/texture", test_cogl_atlas_migration);
-
-  TEST_CONFORM_SIMPLE ("/cogl/vertex-buffer", test_cogl_vertex_buffer_contiguous);
-  TEST_CONFORM_SIMPLE ("/cogl/vertex-buffer", test_cogl_vertex_buffer_interleved);
-  TEST_CONFORM_SIMPLE ("/cogl/vertex-buffer", test_cogl_vertex_buffer_mutability);
-
-  /* left to the end because they aren't currently very orthogonal and tend to
-   * break subsequent tests! */
-  TEST_CONFORM_SIMPLE ("/cogl", test_cogl_viewport);
-#endif
-
-  return g_test_run ();
-}
diff --git a/tests/conform/test-launcher.sh.in b/tests/conform/test-launcher.sh.in
deleted file mode 100755
index 0be13bda5..000000000
--- a/tests/conform/test-launcher.sh.in
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/sh
-
-UNIT_TEST_PATH=$1
-shift
-
-test -z ${UNIT_TEST_PATH} && {
-        echo "Usage: $0 /path/to/unit_test"
-        exit 1
-}
-
-UNIT_TEST=`basename ${UNIT_TEST_PATH}`
-
-echo "Running: ./test-conformance -p ${UNIT_TEST_PATH} $@"
-echo ""
-@abs_builddir@/test-conformance -p ${UNIT_TEST_PATH} "$@"
-
-echo ""
-echo "NOTE: For debugging purposes, you can run this single test as follows:"
-echo "$ libtool --mode=execute \\"
-echo "          gdb --eval-command=\"b ${UNIT_TEST}\" \\"
-echo "          --args ./test-conformance -p ${UNIT_TEST_PATH}"
-echo "or:"
-echo "$ env G_SLICE=always-malloc \\"
-echo "  libtool --mode=execute \\"
-echo "          valgrind ./test-conformance -p ${UNIT_TEST_PATH}"
diff --git a/tests/conform/text.c b/tests/conform/text.c
index c00f2aed4..30101ce34 100644
--- a/tests/conform/text.c
+++ b/tests/conform/text.c
@@ -2,8 +2,6 @@
 #include <clutter/clutter.h>
 #include <string.h>
 
-#include "test-conform-common.h"
-
 typedef struct {
   gunichar   unichar;
   const char bytes[6];
@@ -16,7 +14,7 @@ test_text_data[] = {
   { 0x2665, "\xe2\x99\xa5", 3 }  /* BLACK HEART SUIT */
 };
 
-void
+static void
 text_utf8_validation (void)
 {
   int i;
@@ -32,11 +30,11 @@ text_utf8_validation (void)
 
       nbytes = g_unichar_to_utf8 (t->unichar, bytes);
       bytes[nbytes] = '\0';
-      g_assert (nbytes == t->nbytes);
+      g_assert_cmpint (nbytes, ==, t->nbytes);
       g_assert (memcmp (t->bytes, bytes, nbytes) == 0);
 
       unichar = g_utf8_get_char_validated (bytes, nbytes);
-      g_assert (unichar == t->unichar);
+      g_assert_cmpint (unichar, ==, t->unichar);
     }
 }
 
@@ -69,10 +67,11 @@ insert_unichar (ClutterText *text, gunichar unichar, int position)
   clutter_text_insert_unichar (text, unichar);
 }
 
-void
+static void
 text_set_empty (void)
 {
   ClutterText *text = CLUTTER_TEXT (clutter_text_new ());
+  g_object_ref_sink (text);
 
   g_assert_cmpstr (clutter_text_get_text (text), ==, "");
   g_assert_cmpint (*clutter_text_get_text (text), ==, '\0');
@@ -86,10 +85,11 @@ text_set_empty (void)
   clutter_actor_destroy (CLUTTER_ACTOR (text));
 }
 
-void
+static void
 text_set_text (void)
 {
   ClutterText *text = CLUTTER_TEXT (clutter_text_new ());
+  g_object_ref_sink (text);
 
   clutter_text_set_text (text, "abcdef");
   g_assert_cmpint (get_nchars (text), ==, 6);
@@ -107,12 +107,14 @@ text_set_text (void)
   clutter_actor_destroy (CLUTTER_ACTOR (text));
 }
 
-void
+static void
 text_append_some (void)
 {
   ClutterText *text = CLUTTER_TEXT (clutter_text_new ());
   int i;
 
+  g_object_ref_sink (text);
+
   for (i = 0; i < G_N_ELEMENTS (test_text_data); i++)
     {
       const TestData *t = &test_text_data[i];
@@ -133,12 +135,14 @@ text_append_some (void)
   clutter_actor_destroy (CLUTTER_ACTOR (text));
 }
 
-void
+static void
 text_prepend_some (void)
 {
   ClutterText *text = CLUTTER_TEXT (clutter_text_new ());
   int i;
 
+  g_object_ref_sink (text);
+
   for (i = 0; i < G_N_ELEMENTS (test_text_data); i++)
     {
       const TestData *t = &test_text_data[i];
@@ -165,12 +169,14 @@ text_prepend_some (void)
   clutter_actor_destroy (CLUTTER_ACTOR (text));
 }
 
-void
+static void
 text_insert (void)
 {
   ClutterText *text = CLUTTER_TEXT (clutter_text_new ());
   int i;
 
+  g_object_ref_sink (text);
+
   for (i = 0; i < G_N_ELEMENTS (test_text_data); i++)
     {
       const TestData *t = &test_text_data[i];
@@ -190,12 +196,14 @@ text_insert (void)
   clutter_actor_destroy (CLUTTER_ACTOR (text));
 }
 
-void
+static void
 text_delete_chars (void)
 {
   ClutterText *text = CLUTTER_TEXT (clutter_text_new ());
   int i;
 
+  g_object_ref_sink (text);
+
   for (i = 0; i < G_N_ELEMENTS (test_text_data); i++)
     {
       const TestData *t = &test_text_data[i];
@@ -204,14 +212,25 @@ text_delete_chars (void)
       for (j = 0; j < 4; j++)
         clutter_text_insert_unichar (text, t->unichar);
 
+      if (g_test_verbose ())
+        g_print ("text: %s\n", clutter_text_get_text (text));
+
       clutter_text_set_cursor_position (text, 2);
       clutter_text_delete_chars (text, 1);
+      if (g_test_verbose ())
+        g_print ("text: %s (cursor at: %d)\n",
+                 clutter_text_get_text (text),
+                 clutter_text_get_cursor_position (text));
       g_assert_cmpint (get_nchars (text), ==, 3);
       g_assert_cmpint (get_nbytes (text), ==, 3 * t->nbytes);
       g_assert_cmpint (clutter_text_get_cursor_position (text), ==, 1);
 
       clutter_text_set_cursor_position (text, 2);
       clutter_text_delete_chars (text, 1);
+      if (g_test_verbose ())
+        g_print ("text: %s (cursor at: %d)\n",
+                 clutter_text_get_text (text),
+                 clutter_text_get_cursor_position (text));
       g_assert_cmpint (get_nchars (text), ==, 2);
       g_assert_cmpint (get_nbytes (text), ==, 2 * t->nbytes);
       g_assert_cmpint (clutter_text_get_cursor_position (text), ==, 1);
@@ -222,12 +241,14 @@ text_delete_chars (void)
   clutter_actor_destroy (CLUTTER_ACTOR (text));
 }
 
-void
+static void
 text_get_chars (void)
 {
   ClutterText *text = CLUTTER_TEXT (clutter_text_new ());
   gchar *chars;
 
+  g_object_ref_sink (text);
+
   clutter_text_set_text (text, "00abcdef11");
   g_assert_cmpint (get_nchars (text), ==, 10);
   g_assert_cmpint (get_nbytes (text), ==, 10);
@@ -252,12 +273,14 @@ text_get_chars (void)
   clutter_actor_destroy (CLUTTER_ACTOR (text));
 }
 
-void
+static void
 text_delete_text (void)
 {
   ClutterText *text = CLUTTER_TEXT (clutter_text_new ());
   int i;
 
+  g_object_ref_sink (text);
+
   for (i = 0; i < G_N_ELEMENTS (test_text_data); i++)
     {
       const TestData *t = &test_text_data[i];
@@ -282,11 +305,13 @@ text_delete_text (void)
   clutter_actor_destroy (CLUTTER_ACTOR (text));
 }
 
-void
+static void
 text_password_char (void)
 {
   ClutterText *text = CLUTTER_TEXT (clutter_text_new ());
 
+  g_object_ref_sink (text);
+
   g_assert_cmpint (clutter_text_get_password_char (text), ==, 0);
 
   clutter_text_set_text (text, "hello");
@@ -339,12 +364,14 @@ send_unichar (ClutterText *text, gunichar unichar)
   clutter_event_free (event);
 }
 
-void
+static void
 text_cursor (void)
 {
   ClutterText *text = CLUTTER_TEXT (clutter_text_new ());
   int i;
 
+  g_object_ref_sink (text);
+
   /* only editable entries listen to events */
   clutter_text_set_editable (text, TRUE);
 
@@ -385,12 +412,14 @@ text_cursor (void)
   clutter_actor_destroy (CLUTTER_ACTOR (text));
 }
 
-void
+static void
 text_event (void)
 {
   ClutterText *text = CLUTTER_TEXT (clutter_text_new ());
   int i;
 
+  g_object_ref_sink (text);
+
   /* only editable entries listen to events */
   clutter_text_set_editable (text, TRUE);
 
@@ -449,7 +478,7 @@ validate_markup_attributes (ClutterText   *text,
   pango_attr_iterator_destroy (iter);
 }
 
-void
+static void
 text_idempotent_use_markup (void)
 {
   ClutterText *text;
@@ -465,6 +494,7 @@ text_idempotent_use_markup (void)
   text = g_object_new (CLUTTER_TYPE_TEXT,
                        "text", contents, "use-markup", TRUE,
                        NULL);
+  g_object_ref_sink (text);
 
   if (g_test_verbose ())
     g_print ("Contents: '%s' (expected: '%s')\n",
@@ -502,3 +532,19 @@ text_idempotent_use_markup (void)
 
   clutter_actor_destroy (CLUTTER_ACTOR (text));
 }
+
+CLUTTER_TEST_SUITE (
+  CLUTTER_TEST_UNIT ("/text/utf8-validation", text_utf8_validation)
+  CLUTTER_TEST_UNIT ("/text/set-empty", text_set_empty)
+  CLUTTER_TEST_UNIT ("/text/set-text", text_set_text)
+  CLUTTER_TEST_UNIT ("/text/append-some", text_append_some)
+  CLUTTER_TEST_UNIT ("/text/prepend-some", text_prepend_some)
+  CLUTTER_TEST_UNIT ("/text/insert", text_insert)
+  CLUTTER_TEST_UNIT ("/text/delete-chars", text_delete_chars)
+  CLUTTER_TEST_UNIT ("/text/get-chars", text_get_chars)
+  CLUTTER_TEST_UNIT ("/text/delete-text", text_delete_text)
+  CLUTTER_TEST_UNIT ("/text/password-char", text_password_char)
+  CLUTTER_TEST_UNIT ("/text/cursor", text_cursor)
+  CLUTTER_TEST_UNIT ("/text/event", text_event)
+  CLUTTER_TEST_UNIT ("/text/idempotent-use-markup", text_idempotent_use_markup)
+)
diff --git a/tests/conform/texture-fbo.c b/tests/conform/texture-fbo.c
index 0572447d1..4a30b383c 100644
--- a/tests/conform/texture-fbo.c
+++ b/tests/conform/texture-fbo.c
@@ -24,6 +24,7 @@ typedef struct _TestState
 {
   ClutterActor *stage;
   guint frame;
+  gboolean was_painted;
 } TestState;
 
 static ClutterActor *
@@ -71,13 +72,12 @@ post_paint_clip_cb (void)
   cogl_clip_pop ();
 }
 
-static gboolean
+static void
 validate_part (TestState *state,
                int xpos, int ypos,
                int clip_flags)
 {
   int x, y;
-  gboolean pass = TRUE;
 
   /* Check whether the center of each division is the right color */
   for (y = 0; y < SOURCE_DIVISIONS_Y; y++)
@@ -102,16 +102,13 @@ validate_part (TestState *state,
           /* Otherwise it should be the color for this division */
           correct_color = corner_colors + (y * SOURCE_DIVISIONS_X) + x;
 
-        if (pixels == NULL ||
-            pixels[0] != correct_color->red ||
-            pixels[1] != correct_color->green ||
-            pixels[2] != correct_color->blue)
-          pass = FALSE;
+        g_assert (pixels != NULL);
+        g_assert_cmpint (pixels[0], ==, correct_color->red);
+        g_assert_cmpint (pixels[1], ==, correct_color->green);
+        g_assert_cmpint (pixels[2], ==, correct_color->blue);
 
         g_free (pixels);
       }
-
-  return pass;
 }
 
 static void
@@ -121,35 +118,31 @@ validate_result (TestState *state)
 
   if (g_test_verbose ())
     g_print ("Testing onscreen clone...\n");
-  g_assert (validate_part (state, SOURCE_SIZE, ypos * SOURCE_SIZE, 0));
+  validate_part (state, SOURCE_SIZE, ypos * SOURCE_SIZE, 0);
   ypos++;
 
 #if 0 /* this doesn't work */
   if (g_test_verbose ())
     g_print ("Testing offscreen clone...\n");
-  g_assert (validate_part (state, SOURCE_SIZE, ypos * SOURCE_SIZE, 0));
+  validate_part (state, SOURCE_SIZE, ypos * SOURCE_SIZE, 0);
 #endif
   ypos++;
 
   if (g_test_verbose ())
     g_print ("Testing onscreen clone with rectangular clip...\n");
-  g_assert (validate_part (state, SOURCE_SIZE, ypos * SOURCE_SIZE, ~1));
+  validate_part (state, SOURCE_SIZE, ypos * SOURCE_SIZE, ~1);
   ypos++;
 
   if (g_test_verbose ())
     g_print ("Testing onscreen clone with path clip...\n");
-  g_assert (validate_part (state, SOURCE_SIZE, ypos * SOURCE_SIZE, 1));
+  validate_part (state, SOURCE_SIZE, ypos * SOURCE_SIZE, 1);
   ypos++;
-
-  /* Comment this out if you want visual feedback of what this test
-   * paints.
-   */
-  clutter_main_quit ();
 }
 
-static void
-on_paint (ClutterActor *actor, TestState *state)
+static gboolean
+on_paint (gpointer data)
 {
+  TestState *state = data;
   int frame_num;
 
   /* XXX: validate_result calls clutter_stage_read_pixels which will result in
@@ -158,14 +151,10 @@ on_paint (ClutterActor *actor, TestState *state)
   frame_num = state->frame++;
   if (frame_num == 1)
     validate_result (state);
-}
 
-static gboolean
-queue_redraw (gpointer stage)
-{
-  clutter_actor_queue_redraw (CLUTTER_ACTOR (stage));
+  state->was_painted = TRUE;
 
-  return G_SOURCE_CONTINUE;
+  return G_SOURCE_REMOVE;
 }
 
 void
@@ -176,6 +165,14 @@ texture_fbo (TestConformSimpleFixture *fixture,
   ClutterActor *actor;
   int ypos = 0;
 
+  if (!cogl_features_available (COGL_FEATURE_OFFSCREEN))
+    {
+      if (g_test_verbose ())
+        g_print ("Offscreen buffers are not available, skipping.\n");
+
+      return;
+    }
+
   state.frame = 0;
 
   state.stage = clutter_stage_new ();
@@ -224,18 +221,15 @@ texture_fbo (TestConformSimpleFixture *fixture,
   clutter_container_add (CLUTTER_CONTAINER (state.stage), actor, NULL);
   ypos++;
 
-  /* We force continuous redrawing of the stage, since we need to skip
-   * the first few frames, and we wont be doing anything else that
-   * will trigger redrawing. */
-  clutter_threads_add_idle (queue_redraw, state.stage);
-  g_signal_connect_after (state.stage, "paint", G_CALLBACK (on_paint), &state);
+  clutter_actor_show (state.stage);
 
-  clutter_actor_show_all (state.stage);
+  clutter_threads_add_repaint_func_full (CLUTTER_REPAINT_FLAGS_POST_PAINT,
+                                         on_paint,
+                                         &state,
+                                         NULL);
 
-  clutter_main ();
+  while (!state.was_painted)
+    g_main_context_iteration (NULL, FALSE);
 
   clutter_actor_destroy (state.stage);
-
-  if (g_test_verbose ())
-    g_print ("OK\n");
 }
diff --git a/tests/conform/texture.c b/tests/conform/texture.c
index 3397e4595..392fd5c47 100644
--- a/tests/conform/texture.c
+++ b/tests/conform/texture.c
@@ -1,9 +1,7 @@
-#include <glib.h>
+#define CLUTTER_DISABLE_DEPRECATION_WARNINGS
 #include <clutter/clutter.h>
 #include <string.h>
 
-#include "test-conform-common.h"
-
 static CoglHandle
 make_texture (void)
 {
@@ -28,17 +26,16 @@ make_texture (void)
                                      (guchar *)data);
 }
 
-void
-texture_pick_with_alpha (TestConformSimpleFixture *fixture,
-                         gconstpointer data)
+static void
+texture_pick_with_alpha (void)
 {
   ClutterTexture *tex = CLUTTER_TEXTURE (clutter_texture_new ());
-  ClutterStage *stage = CLUTTER_STAGE (clutter_stage_new ());
+  ClutterStage *stage = CLUTTER_STAGE (clutter_test_get_stage ());
   ClutterActor *actor;
 
   clutter_texture_set_cogl_texture (tex, make_texture ());
 
-  clutter_container_add_actor (CLUTTER_CONTAINER (stage), CLUTTER_ACTOR (tex));
+  clutter_actor_add_child (CLUTTER_ACTOR (stage), CLUTTER_ACTOR (tex));
 
   clutter_actor_show (CLUTTER_ACTOR (stage));
 
@@ -80,10 +77,8 @@ texture_pick_with_alpha (TestConformSimpleFixture *fixture,
   if (g_test_verbose ())
     g_print ("actor @ (10, 10) = %p\n", actor);
   g_assert (actor == CLUTTER_ACTOR (tex));
-
-  clutter_actor_destroy (CLUTTER_ACTOR (stage));
-
-  if (g_test_verbose ())
-    g_print ("OK\n");
 }
 
+CLUTTER_TEST_SUITE (
+  CLUTTER_TEST_UNIT ("/texture/pick-with-alpha", texture_pick_with_alpha)
+)
diff --git a/tests/conform/units.c b/tests/conform/units.c
index 3822e05e2..06bfaf513 100644
--- a/tests/conform/units.c
+++ b/tests/conform/units.c
@@ -1,11 +1,7 @@
-#include <stdio.h>
 #include <clutter/clutter.h>
 
-#include "test-conform-common.h"
-
-void
-units_cache (TestConformSimpleFixture *fixture,
-             gconstpointer data)
+static void
+units_cache (void)
 {
   ClutterUnits units;
   ClutterSettings *settings;
@@ -28,9 +24,8 @@ units_cache (TestConformSimpleFixture *fixture,
   g_object_set (settings, "font-dpi", old_dpi, NULL);
 }
 
-void
-units_constructors (TestConformSimpleFixture *fixture,
-                    gconstpointer data)
+static void
+units_constructors (void)
 {
   ClutterUnits units, units_cm;
 
@@ -56,9 +51,8 @@ units_constructors (TestConformSimpleFixture *fixture,
                      clutter_units_to_pixels (&units_cm));
 }
 
-void
-units_string (TestConformSimpleFixture *fixture,
-              gconstpointer data)
+static void
+units_string (void)
 {
   ClutterUnits units;
   gchar *string;
@@ -129,3 +123,9 @@ units_string (TestConformSimpleFixture *fixture,
 
   g_free (string);
 }
+
+CLUTTER_TEST_SUITE (
+  CLUTTER_TEST_UNIT ("/units/string", units_string)
+  CLUTTER_TEST_UNIT ("/units/cache", units_cache)
+  CLUTTER_TEST_UNIT ("/units/constructors", units_constructors)
+)
diff --git a/tests/data/Makefile.am b/tests/data/Makefile.am
deleted file mode 100644
index 896ed5b27..000000000
--- a/tests/data/Makefile.am
+++ /dev/null
@@ -1,28 +0,0 @@
-NULL =
-
-json_files = \
-	test-script-animation.json		\
-	test-script-child.json			\
-	test-script-layout-property.json	\
-	test-script-implicit-alpha.json		\
-	test-script.json			\
-	test-script-named-object.json		\
-	test-script-object-property.json	\
-	test-script-signals.json		\
-	test-script-single.json			\
-	test-script-model.json			\
-	test-animator-1.json			\
-	test-animator-2.json			\
-	test-animator-3.json			\
-	test-state-1.json			\
-	test-script-timeline-markers.json	\
-	test-script-margin.json 		\
-	$(NULL)
-
-png_files = \
-	redhand.png 		\
-	redhand_alpha.png	\
-	light0.png 		\
-	$(NULL)
-
-EXTRA_DIST = $(json_files) $(png_files) clutter-1.0.suppressions
diff --git a/tests/data/light0.png b/tests/data/light0.png
deleted file mode 100644
index 66871ddb3..000000000
Binary files a/tests/data/light0.png and /dev/null differ
diff --git a/tests/data/redhand_alpha.png b/tests/data/redhand_alpha.png
deleted file mode 100644
index 4270765ed..000000000
Binary files a/tests/data/redhand_alpha.png and /dev/null differ
diff --git a/tests/interactive/Makefile.am b/tests/interactive/Makefile.am
index 04c762d18..660107fdb 100644
--- a/tests/interactive/Makefile.am
+++ b/tests/interactive/Makefile.am
@@ -49,7 +49,8 @@ UNIT_TESTS = \
 	test-content.c \
 	test-keyframe-transition.c \
 	test-bind-constraint.c \
-	test-touch-events.c
+	test-touch-events.c \
+	test-rotate-zoom.c
 
 if X11_TESTS
 UNIT_TESTS += test-pixmap.c
@@ -67,32 +68,33 @@ SHEXT = $(EXEEXT)
 endif
 
 # For convenience, this provides a way to easily run individual unit tests:
-wrappers: stamp-test-interactive $(top_builddir)/build/win32/test-interactive-clutter.bat
+wrappers: stamp-test-interactive
 	@true
 
+GIT_IGNORE_EXTRA = \
+	stamp-test-interactive \
+	stamp-test-unit-names \
+	test-unit-names.h \
+	$(UNIT_TESTS:.c=$(SHEXT))
+
+include $(top_srcdir)/build/autotools/Makefile.am.gitignore
+
 stamp-test-interactive: Makefile
 	@wrapper=$(abs_builddir)/wrapper.sh ; \
 	chmod +x $$wrapper && \
-	( echo "/stamp-test-interactive" ; \
-	  echo "/stamp-test-unit-names" ; \
-	  echo "/test-interactive" ; \
-	  echo "/test-unit-names.h" ; \
-	  echo "*.o" ; \
-	  echo ".gitignore" ) > .gitignore ; \
 	for i in $(UNIT_TESTS); \
 	do \
 		test_bin=$${i%*.c} ; \
-		echo "  GEN    $$test_bin" ; \
+		echo "  GEN      $$test_bin" ; \
 		( echo "#!/bin/sh" ; \
 		  echo "$$wrapper $$test_bin \$$@" \
 		) > $$test_bin$(SHEXT) ; \
 		chmod +x $$test_bin$(SHEXT) ; \
-		echo "/$$test_bin$(SHEXT)" >> .gitignore ; \
 	done \
 	&& echo timestamp > $(@F)
 
-$(top_builddir)/build/win32/test-interactive-clutter.bat: Makefile test-interactive$(EXEEXT)
-	@echo "  GEN    test-interactive-clutter.bat" ; \
+$(top_builddir)/build/win32/test-interactive-clutter.bat: Makefile
+	@echo "  GEN      test-interactive-clutter.bat" ; \
 	for i in $(UNIT_TESTS); \
 	do \
 		case $$i in \
@@ -106,7 +108,7 @@ $(top_builddir)/build/win32/test-interactive-clutter.bat: Makefile test-interact
 	&& mv -f *.bat $(top_builddir)/build/win32/
 
 $(top_builddir)/build/win32/test-unit-names.h: test-unit-names.h
-	@echo "  CP     "; cp test-unit-names.h $(top_builddir)/build/win32/
+	@echo "  CP       "; cp test-unit-names.h $(top_builddir)/build/win32/
 
 test-unit-names.h: stamp-test-unit-names
 	@true
@@ -127,7 +129,7 @@ clean-wrappers:
 	@for i in $(UNIT_TESTS); \
 	do \
 		test_bin=$${i%*.c} ; \
-		echo "  RM    $$test_bin"; \
+		echo "  RM      $$test_bin"; \
 		rm -f $$test_bin$(SHEXT); \
 	done \
 	&& rm -f $(top_builddir)/build/win32/*.bat \
@@ -136,34 +138,37 @@ clean-wrappers:
 
 .PHONY: wrappers clean-wrappers
 
-INCLUDES = \
-	-I$(top_srcdir)			\
-	-I$(top_builddir)		\
-	-I$(top_srcdir)/clutter 	\
-	-I$(top_builddir)/clutter
-
 common_ldadd = $(top_builddir)/clutter/libclutter-@CLUTTER_API_VERSION@.la
 
-noinst_PROGRAMS = test-interactive
+check_PROGRAMS = test-interactive
+check_SCRIPTS = wrappers $(top_builddir)/build/win32/test-interactive-clutter.bat
 
 test_interactive_SOURCES = test-main.c $(UNIT_TESTS)
 nodist_test_interactive_SOURCES = test-unit-names.h
 test_interactive_CFLAGS = $(CLUTTER_CFLAGS) $(GDK_PIXBUF_CFLAGS)
 test_interactive_CPPFLAGS = \
-	-DTESTS_DATADIR=\""$(abs_top_srcdir)/tests/data"\" \
+	-DTESTS_DATADIR=\""$(abs_srcdir)"\" \
 	-DG_DISABLE_SINGLE_INCLUDES \
 	-DGLIB_DISABLE_DEPRECATION_WARNINGS \
-	-DCLUTTER_DISABLE_DEPRECATION_WARNINGS
+	-DCOGL_DISABLE_DEPRECATION_WARNINGS \
+	-DCLUTTER_DISABLE_DEPRECATION_WARNINGS \
+	-I$(top_srcdir)	\
+	-I$(top_builddir) \
+	-I$(top_srcdir)/clutter \
+	-I$(top_builddir)/clutter
 test_interactive_LDFLAGS = -export-dynamic
 test_interactive_LDADD = $(CLUTTER_LIBS) $(GDK_PIXBUF_LIBS) $(common_ldadd) -lm
 
 EXTRA_DIST = \
-	wrapper.sh.in			\
-	$(top_builddir)/build/win32/test-unit-names.h
+	wrapper.sh.in \
+	$(top_builddir)/build/win32/test-unit-names.h \
+	test-script.json \
+	test-script-signals.json \
+	redhand.png
 
 DISTCLEANFILES = wrapper.sh .gitignore test-unit-names.h
 
-BUILT_SOURCES = test-unit-names.h wrappers
+BUILT_SOURCES = test-unit-names.h
 
 dist-hook: $(top_builddir)/build/win32/vs9/test-interactive-clutter.vcproj $(top_builddir)/build/win32/vs10/test-interactive-clutter.vcxproj $(top_builddir)/build/win32/vs10/test-interactive-clutter.vcxproj.filters
 
diff --git a/tests/interactive/redhand.png b/tests/interactive/redhand.png
new file mode 100644
index 000000000..c07d8acd3
Binary files /dev/null and b/tests/interactive/redhand.png differ
diff --git a/tests/interactive/test-clip.c b/tests/interactive/test-clip.c
index 8e8d77015..1b4401f88 100644
--- a/tests/interactive/test-clip.c
+++ b/tests/interactive/test-clip.c
@@ -31,8 +31,9 @@ struct _CallbackData
 
 static const char
 instructions[] =
-  "Press and drag any of the three mouse buttons to add a clip with different "
-  "shapes. Press 'r' to reset or 'u' to undo the last clip.";
+  "Left button and drag to draw a rectangle, control+left to draw a rotated "
+  "rectangle or shift+left to draw a path. Press 'r' to reset or 'u' "
+  "to undo the last clip.";
 
 static void
 path_shapes (gint x, gint y, gint width, gint height)
@@ -231,10 +232,29 @@ on_button_press (ClutterActor *stage, ClutterButtonEvent *event,
   data->current_clip.x1 = data->current_clip.x2 = event->x;
   data->current_clip.y1 = data->current_clip.y2 = event->y;
 
-  data->current_clip.type
-    = event->button == CLUTTER_BUTTON_PRIMARY ? CLIP_RECTANGLE
-    : event->button == CLUTTER_BUTTON_MIDDLE ? CLIP_SHAPES
-    : CLIP_ROTATED_RECTANGLE;
+  switch (event->button)
+    {
+    case CLUTTER_BUTTON_PRIMARY:
+      if (clutter_event_has_shift_modifier ((ClutterEvent *) event))
+        data->current_clip.type = CLIP_SHAPES;
+      else if (clutter_event_has_control_modifier ((ClutterEvent *) event))
+        data->current_clip.type = CLIP_ROTATED_RECTANGLE;
+      else
+        data->current_clip.type = CLIP_RECTANGLE;
+      break;
+
+    case CLUTTER_BUTTON_SECONDARY:
+      data->current_clip.type = CLIP_ROTATED_RECTANGLE;
+      break;
+
+    case CLUTTER_BUTTON_MIDDLE:
+      data->current_clip.type = CLIP_SHAPES;
+      break;
+
+    default:
+      data->current_clip.type = CLIP_NONE;
+      break;
+    }
 
   clutter_actor_queue_redraw (stage);
 
diff --git a/tests/interactive/test-rotate-zoom.c b/tests/interactive/test-rotate-zoom.c
new file mode 100644
index 000000000..0e9cc0a39
--- /dev/null
+++ b/tests/interactive/test-rotate-zoom.c
@@ -0,0 +1,98 @@
+/*
+ * Copyright (C) 2013 Intel Corporation
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU Lesser General Public License,
+ * version 2.1, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
+ * Boston, MA 02111-1307, USA.
+ *
+ */
+#include <stdlib.h>
+#include <math.h>
+#include <cairo.h>
+#include <glib.h>
+#include <clutter/clutter.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
+#define STAGE_WIDTH 800
+#define STAGE_HEIGHT 550
+
+static ClutterActor *
+create_hand (void)
+{
+  GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (TESTS_DATADIR G_DIR_SEPARATOR_S "redhand.png", NULL);
+  ClutterContent *image = clutter_image_new ();
+  ClutterActor *actor = clutter_actor_new ();
+
+  clutter_image_set_data (CLUTTER_IMAGE (image),
+                          gdk_pixbuf_get_pixels (pixbuf),
+                          gdk_pixbuf_get_has_alpha (pixbuf)
+                            ? COGL_PIXEL_FORMAT_RGBA_8888
+                            : COGL_PIXEL_FORMAT_RGB_888,
+                          gdk_pixbuf_get_width (pixbuf),
+                          gdk_pixbuf_get_height (pixbuf),
+                          gdk_pixbuf_get_rowstride (pixbuf),
+                          NULL);
+  clutter_actor_set_content (actor, image);
+  clutter_actor_set_size (actor,
+                          gdk_pixbuf_get_width (pixbuf),
+                          gdk_pixbuf_get_height (pixbuf));
+  clutter_actor_set_reactive (actor, TRUE);
+
+  g_object_unref (pixbuf);
+
+  return actor;
+}
+
+G_MODULE_EXPORT int
+test_rotate_zoom_main (int argc, char *argv[])
+{
+  ClutterActor *stage, *actor;
+  gfloat width, height;
+
+#ifdef CLUTTER_WINDOWING_X11
+  clutter_x11_enable_xinput ();
+#endif
+
+  /* initialize Clutter */
+  if (clutter_init (&argc, &argv) != CLUTTER_INIT_SUCCESS)
+    return EXIT_FAILURE;
+
+  /* create a resizable stage */
+  stage = clutter_stage_new ();
+  g_signal_connect (stage, "destroy", G_CALLBACK (clutter_main_quit), NULL);
+  clutter_stage_set_title (CLUTTER_STAGE (stage), "Rotate and Zoom actions");
+  clutter_stage_set_user_resizable (CLUTTER_STAGE (stage), TRUE);
+  clutter_actor_set_size (stage, STAGE_WIDTH, STAGE_HEIGHT);
+  clutter_actor_set_reactive (stage, FALSE);
+  clutter_actor_show (stage);
+
+  actor = create_hand ();
+  clutter_actor_add_action (actor, clutter_rotate_action_new ());
+  clutter_actor_add_action (actor, clutter_zoom_action_new ());
+  clutter_actor_add_child (stage, actor);
+
+  clutter_actor_get_size (actor, &width, &height);
+  clutter_actor_set_position (actor,
+                              STAGE_WIDTH / 2 - width / 2,
+                              STAGE_HEIGHT / 2 - height / 2);
+
+  clutter_main ();
+
+  return EXIT_SUCCESS;
+}
+
+G_MODULE_EXPORT const char *
+test_rotate_zoom_describe (void)
+{
+  return "Rotates and zooms an actor using touch events";
+}
diff --git a/tests/data/test-script-signals.json b/tests/interactive/test-script-signals.json
similarity index 100%
rename from tests/data/test-script-signals.json
rename to tests/interactive/test-script-signals.json
diff --git a/tests/data/test-script.json b/tests/interactive/test-script.json
similarity index 100%
rename from tests/data/test-script.json
rename to tests/interactive/test-script.json
diff --git a/tests/interactive/test-state-script.c b/tests/interactive/test-state-script.c
index e777d89bc..34b1b8789 100644
--- a/tests/interactive/test-state-script.c
+++ b/tests/interactive/test-state-script.c
@@ -4,7 +4,7 @@
 
 #include <clutter/clutter.h>
 
-#define TEST_STATE_SCRIPT_FILE  TESTS_DATADIR G_DIR_SEPARATOR_S "test-script-signals.json"
+#define TEST_STATE_SCRIPT_FILE  "test-script-signals.json"
 
 gboolean
 on_button_press (ClutterActor *actor,
diff --git a/tests/micro-bench/Makefile.am b/tests/micro-bench/Makefile.am
index 0bb3d5889..e4cb8f12f 100644
--- a/tests/micro-bench/Makefile.am
+++ b/tests/micro-bench/Makefile.am
@@ -2,27 +2,26 @@ include $(top_srcdir)/build/autotools/Makefile.am.silent
 
 common_ldadd = $(top_builddir)/clutter/libclutter-@CLUTTER_API_VERSION@.la
 
-noinst_PROGRAMS = \
+check_PROGRAMS = \
 	test-text \
 	test-picking \
 	test-text-perf \
 	test-random-text \
 	test-cogl-perf
 
-INCLUDES = \
+AM_CFLAGS = $(CLUTTER_CFLAGS) $(MAINTAINER_CFLAGS)
+
+AM_CPPFLAGS = \
+	-DG_DISABLE_SINGLE_INCLUDES \
+	-DGLIB_DISABLE_DEPRECATION_WARNINGS \
+	-DCOGL_DISABLE_DEPRECATION_WARNINGS \
+	-DCLUTTER_DISABLE_DEPRECATION_WARNINGS \
+	-DTESTS_DATA_DIR=\""$(top_srcdir)/tests/data/"\" \
 	-I$(top_srcdir) \
 	-I$(top_builddir) \
 	-I$(top_srcdir)/clutter \
 	-I$(top_builddir)/clutter
 
-AM_CFLAGS = \
-	$(CLUTTER_CFLAGS) \
-	$(MAINTAINER_CFLAGS) \
-	-DG_DISABLE_SINGLE_INCLUDES \
-	-DGLIB_DISABLE_DEPRECATION_WARNINGS \
-	-DCLUTTER_DISABLE_DEPRECATION_WARNINGS \
-	-DTESTS_DATA_DIR=\""$(top_srcdir)/tests/data/"\"
-
 LDADD = $(common_ldadd) $(CLUTTER_LIBS) -lm
 
 test_text_SOURCES = test-text.c
diff --git a/tests/performance/Makefile.am b/tests/performance/Makefile.am
index 01262bfc0..ef7745ca6 100644
--- a/tests/performance/Makefile.am
+++ b/tests/performance/Makefile.am
@@ -1,6 +1,6 @@
 include $(top_srcdir)/build/autotools/Makefile.am.silent
 
-noinst_PROGRAMS = \
+check_PROGRAMS = \
 	test-picking \
 	test-text-perf \
 	test-state \
@@ -9,22 +9,22 @@ noinst_PROGRAMS = \
 	test-state-mini \
 	test-state-pick
 
-INCLUDES = \
-	-I$(top_srcdir) \
-	-I$(top_builddir) \
-	-I$(top_srcdir)/clutter \
-	-I$(top_builddir)/clutter
-
 common_ldadd = $(top_builddir)/clutter/libclutter-@CLUTTER_API_VERSION@.la
 
 LDADD = $(common_ldadd) $(CLUTTER_LIBS) -lm
 
-AM_CFLAGS = \
-	$(CLUTTER_CFLAGS) \
+AM_CFLAGS = $(CLUTTER_CFLAGS)
+
+AM_CPPFLAGS = \
 	-DG_DISABLE_SINGLE_INCLUDES \
 	-DGLIB_DISABLE_DEPRECATION_WARNINGS \
+	-DCOGL_DISABLE_DEPRECATION_WARNINGS \
 	-DCLUTTER_DISABLE_DEPRECATION_WARNINGS \
-	-DTESTS_DATA_DIR=\""$(top_srcdir)/tests/data/"\"
+	-DTESTS_DATA_DIR=\""$(top_srcdir)/tests/data/"\" \
+	-I$(top_srcdir) \
+	-I$(top_builddir) \
+	-I$(top_srcdir)/clutter \
+	-I$(top_builddir)/clutter
 
 perf-report: check