Finnish translation update by Jiri Grönroos
[l10n] Updated Catalan (Valencian) translation
Added uk translation
color: Fix potential crasher

If a GFileMonitor event occurs whilst we're stopping the color
plugin, it's possible that the file events will try to poke at things
at it shouldn't.

https://bugzilla.gnome.org/show_bug.cgi?id=663710
housekeeping: Really don't crash on exit

Function arg "notification" shadowed global var "notification"

https://bugzilla.gnome.org/show_bug.cgi?id=685133
housekeeping: Fix test crashed on notification

https://bugzilla.gnome.org/show_bug.cgi?id=685133
Clean up gsd_power_stop

Using g_clear_object makes this a bit nicer.
Updated Bulgarian translation
keygrab: Allow grabbing Menu unmodified by default

https://bugzilla.gnome.org/show_bug.cgi?id=685286
[l10n] Added Khmer translation
wacom: write to status_led{0,1}_select only

if a device has only one ring/strip, use status_led0_select;
otherwise the left ring/strip is controlled by status_led1_select
and the right ring/strip by status_led0_select.

https://bugzilla.gnome.org/show_bug.cgi?id=676558
keyboard: Apply variants and XKB options from IBus engine descriptions

The 'layout' in an IBus engine description might actually also include
a variant and XKB options.

https://bugzilla.gnome.org/show_bug.cgi?id=684855
keyboard: Add tests for previous commit

https://bugzilla.gnome.org/show_bug.cgi?id=684855
keyboard: Add link to upstream bug
main: Don't set Input Methods envvar without IBus

If IBus isn't installed, don't set the QT_IM_MODULE or XMODIFIERS
envvars, as that breaks other Input Methods.

As we advice people who don't want to use IBus to just uninstall
ibus itself, we should handle being built with IBus support but run-time
support not being there.

https://bugzilla.gnome.org/show_bug.cgi?id=685514
keyboard: Slight refactoring for upcoming changes

We're going to add some special handling that doesn't apply when
running under GDM so return early if that's the case.

https://bugzilla.gnome.org/show_bug.cgi?id=685457
keyboard: Add likely IBus engine for some locales if empty setting

If there are no input sources configured and we're running under one
of some specific locales where it's highly likely that the user will
need/want a specific IBus source to type we just add it to the list.

LC_CTYPE is used to determine the locale for this purpose since many
users in these locales set LC_MESSAGES to English.

https://bugzilla.gnome.org/show_bug.cgi?id=685457
keyboard: Convert old libgnomekbd and IBus settings

https://bugzilla.gnome.org/show_bug.cgi?id=685458
mouse: Also grab button presses so as to replay them on locate pointer

Applications might want to establish keyboard grabs on button presses
so we should also ungrab the keyboard when a button press occurs after
the locate pointer key is pressed.

https://bugzilla.gnome.org/show_bug.cgi?id=125618
updates: Never show the user a message about a cancelled transaction

This can happen if the user issues lots of commands using the native packaging
tool (e.g. yum) on the command line whilst gnome-settings-daemon is trying to
download either the updates list or the offline update packages themselves.

Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=863856