diff --git a/.bzrignore b/.bzrignore
index 71c6e1a0..ef43e1bc 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -1,3 +1,4 @@
+ABOUT-NLS
aclocal.m4
autom4te.cache
/build-aux/*
@@ -7,9 +8,6 @@ config.h.in
config.log
config.status
configure
-intltool-extract.in
-intltool-merge.in
-intltool-update.in
libtool
m4
mkinstalldirs
@@ -37,9 +35,13 @@ docs/gala
docs/libgala
lib/gala.vapi
po/*.gmo
-po/.intltool-merge-cache
+po/*.header
+po/*.sed
+po/*.sin
po/Makefile.in.in
+po/Makevars.template
po/POTFILES
-po/stamp-it
+po/Rules-quot
+po/stamp-po
src/gala
build
diff --git a/autogen.sh b/autogen.sh
index 634216fe..b49ccf1a 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -20,7 +20,6 @@ fi
set -x
aclocal --install || exit 1
-intltoolize --force --copy --automake || exit 1
autoreconf --verbose --force --install -Wno-portability || exit 1
set +x
diff --git a/configure.ac b/configure.ac
index 73c7c6d3..b465bf60 100644
--- a/configure.ac
+++ b/configure.ac
@@ -286,8 +286,9 @@ fi
GETTEXT_PACKAGE=AC_PACKAGE_NAME
AC_SUBST(GETTEXT_PACKAGE)
AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, ["$GETTEXT_PACKAGE"], [Define the gettext package to be used])
-IT_PROG_INTLTOOL([0.35.0])
+AM_GNU_GETTEXT_VERSION([0.19.6])
+AM_GNU_GETTEXT([external])
# -----------------------------------------------------------
# Final output
@@ -299,7 +300,6 @@ lib/Makefile
lib/gala.pc
docs/Makefile
data/Makefile
-data/org.pantheon.desktop.gala.gschema.xml.in
data/icons/Makefile
vapi/Makefile
plugins/Makefile
diff --git a/data/Makefile.am b/data/Makefile.am
index 58441498..3188820f 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -8,11 +8,11 @@ styles_DATA = gala.css texture.png close.svg
applicationsdir = $(datadir)/applications
applications_DATA = gala.desktop gala-wayland.desktop gala-other.desktop gala-multitaskingview.desktop
-@INTLTOOL_DESKTOP_RULE@
-
gsettings_SCHEMAS = org.pantheon.desktop.gala.gschema.xml
-@INTLTOOL_XML_NOMERGE_RULE@
+%.gschema.xml: %.gschema.xml.in Makefile
+ $(AM_V_GEN) sed -e 's|@GETTEXT_PACKAGE[@]|$(GETTEXT_PACKAGE)|g' \
+ $< > $@ || rm $@
@GSETTINGS_RULES@
@@ -21,6 +21,12 @@ gschemas.compiled: Makefile $(gsettings_SCHEMAS:.xml=.valid)
all-local: gschemas.compiled
+%.desktop: %.desktop.in
+ $(AM_V_GEN)$(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
+
+%.appdata.xml: %.appdata.xml.in
+ $(AM_V_GEN)$(MSGFMT) --xml --template $< -d $(top_srcdir)/po -o $@
+
EXTRA_DIST = \
gala.css \
gala.desktop \
@@ -29,7 +35,7 @@ EXTRA_DIST = \
gala-multitaskingview.desktop.in \
texture.png \
close.svg \
- org.pantheon.desktop.gala.gschema.xml.in.in \
+ org.pantheon.desktop.gala.gschema.xml.in \
$(NULL)
CLEANFILES = \
@@ -37,6 +43,5 @@ CLEANFILES = \
gala-multitaskingview.desktop \
gschemas.compiled \
org.pantheon.desktop.gala.gschema.xml \
- org.pantheon.desktop.gala.gschema.xml.in \
$(NULL)
diff --git a/data/gala-multitaskingview.desktop.in b/data/gala-multitaskingview.desktop.in
index 28ca58a4..8889a62a 100644
--- a/data/gala-multitaskingview.desktop.in
+++ b/data/gala-multitaskingview.desktop.in
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=Application
-_Name=Multitasking View
-_Comment=View all open windows and workspaces
+Name=Multitasking View
+Comment=View all open windows and workspaces
GenericName=Multitasking View
Icon=multitasking-view
Terminal=false
diff --git a/data/org.pantheon.desktop.gala.gschema.xml.in.in b/data/org.pantheon.desktop.gala.gschema.xml.in
similarity index 54%
rename from data/org.pantheon.desktop.gala.gschema.xml.in.in
rename to data/org.pantheon.desktop.gala.gschema.xml.in
index 348cba1c..c1b226fb 100644
--- a/data/org.pantheon.desktop.gala.gschema.xml.in.in
+++ b/data/org.pantheon.desktop.gala.gschema.xml.in
@@ -18,127 +18,127 @@
'none'
- <_summary>Action for the top left corner
- <_description>
+ Action for the top left corner
+
'grid'
- <_summary>Algorithm for window overview layout
- <_description>Choose the algorithm used for exposing the windows
+ Algorithm for window overview layout
+ Choose the algorithm used for exposing the windows
'none'
- <_summary>Action for the top right corner
- <_description>
+ Action for the top right corner
+
'none'
- <_summary>Action for the bottom left corner
- <_description>
+ Action for the bottom left corner
+
'none'
- <_summary>Action for the bottom right corner
- <_description>
+ Action for the bottom right corner
+
''
- <_summary>The command that will be executed for the hotcorner action 'custom-command' or multiple
- <_description>If you just put a single command, it will be used for every hotcorner assigned to
+ The command that will be executed for the hotcorner action 'custom-command' or multiple
+ If you just put a single command, it will be used for every hotcorner assigned to
'custom-command'. If you instead use the pattern
'hotcorner-topleft:command;;hotcorner-bottomright:command' the specific commands will be used
per hotcorner. Possible identifiers are 'hotcorner-[topleft; topright; bottomleft; bottomright]'
followed by a ':' and then the command. ';;' is used as delimiter between command defintions.
-
+
true
- <_summary>Enable edge tiling when dropping windows on screen edges
- <_description>If enabled, dropping windows on vertical screen edges maximizes them vertically and resizes them horizontally to cover half of the available area. Dropping windows on the top screen edge maximizes them completely.
+ Enable edge tiling when dropping windows on screen edges
+ If enabled, dropping windows on vertical screen edges maximizes them vertically and resizes them horizontally to cover half of the available area. Dropping windows on the top screen edge maximizes them completely.
''
- <_summary>Panel main menu action
- <_description>Sets the command to run when the panel-main-menu keybinding is pressed
+ Panel main menu action
+ Sets the command to run when the panel-main-menu keybinding is pressed
''
- <_summary>
- <_description>
+
+
''
- <_summary>
- <_description>
+
+
true
- <_summary>Enable dynamic workspace instead of static ones
- <_description>Use a dynamically increasing or decreseasing number, as needed, of workspaces instead of a static, fixed number
+ Enable dynamic workspace instead of static ones
+ Use a dynamically increasing or decreseasing number, as needed, of workspaces instead of a static, fixed number
- <_summary>Names that are recognized as dock windows for the window switcher
- <_description>When launching the window-switcher, gala iterates over this list and attempts to find a window matching the names. If it does, it will hide this window and fade it back in, once the the switcher is closed.
+ Names that are recognized as dock windows for the window switcher
+ When launching the window-switcher, gala iterates over this list and attempts to find a window matching the names. If it does, it will hide this window and fade it back in, once the the switcher is closed.
Home']]]>
- <_summary>Shortcut to move to first workspace
- <_description>
+ Shortcut to move to first workspace
+
End', '0']]]>
- <_summary>Shortcut to move to last workspace
- <_description>
+ Shortcut to move to last workspace
+
Home']]]>
- <_summary>Shortcut to move the current window to first workspace
- <_description>
+ Shortcut to move the current window to first workspace
+
End', '0']]]>
- <_summary>Shortcut to move the current window to last workspace
- <_description>
+ Shortcut to move the current window to last workspace
+
plus', 'KP_Add']]]>
- <_summary>Zoom in
- <_description>
+ Zoom in
+
minus', 'KP_Subtract']]]>
- <_summary>Zoom out
+ Zoom out
w']]]>
- <_summary>Shortcut to open the window overview
- <_description>
+ Shortcut to open the window overview
+
a']]]>
- <_summary>Shortcut to open the window overview for all windows
- <_description>
+ Shortcut to open the window overview for all windows
+
Tab']]]>
- <_summary>Cycle to the next workspace to the right or to back to the first
+ Cycle to the next workspace to the right or to back to the first
Tab']]]>
- <_summary>Cycle to the next workspace to the right or to back to the first
+ Cycle to the next workspace to the right or to back to the first
space']]]>
- <_summary>Cycle to next keyboard layout
+ Cycle to next keyboard layout
DEPRECATED: This key is deprecated and ignored.
- <_summary>Cycle to previous keyboard layout
+ Cycle to previous keyboard layout
DEPRECATED: This key is deprecated and ignored.
@@ -146,92 +146,92 @@
false
- <_summary>Attach modal dialogs
- <_description>When true, instead of having independent titlebars, modal dialogs appear attached to the titlebar of the parent window and are moved together with the parent window.
+ Attach modal dialogs
+ When true, instead of having independent titlebars, modal dialogs appear attached to the titlebar of the parent window and are moved together with the parent window.
'close:maximize'
- <_summary>Arrangement of buttons on the titlebar
- <_description>Arrangement of buttons on the titlebar. The value should be a string, such as "menu:minimize,maximize,spacer,close"; the colon separates the left corner of the window from the right corner, and the button names are comma-separated. Duplicate buttons are not allowed. Unknown button names are silently ignored so that buttons can be added in future metacity versions without breaking older versions. A special spacer tag can be used to insert some space between two adjacent buttons.
+ Arrangement of buttons on the titlebar
+ Arrangement of buttons on the titlebar. The value should be a string, such as "menu:minimize,maximize,spacer,close"; the colon separates the left corner of the window from the right corner, and the button names are comma-separated. Duplicate buttons are not allowed. Unknown button names are silently ignored so that buttons can be added in future metacity versions without breaking older versions. A special spacer tag can be used to insert some space between two adjacent buttons.
false
- <_summary>Make parent windows that spawn a modal attached dialog being dimmed
+ Make parent windows that spawn a modal attached dialog being dimmed
0.0
- <_summary>The opacity of the windows located in the background in the alt-tab-switcher.
+ The opacity of the windows located in the background in the alt-tab-switcher.
''
- <_summary>Background-image used in the workspace-switcher
+ Background-image used in the workspace-switcher
true
- <_summary>Enable Animations
- <_description>Whether animations should be displayed. Note: This is a global key, it changes the behaviour of the window manager, the panel etc.
+ Enable Animations
+ Whether animations should be displayed. Note: This is a global key, it changes the behaviour of the window manager, the panel etc.
350
250
- <_summary>Duration of the snap animation as used by maximize/unmaximize
+ Duration of the snap animation as used by maximize/unmaximize
300
- <_summary>Duration of the close animation
+ Duration of the close animation
200
- <_summary>Duration of the minimize animation
+ Duration of the minimize animation
300
- <_summary>Duration of the workspace switch animation
+ Duration of the workspace switch animation
150
- <_summary>Duration of the menu mapping animation
+ Duration of the menu mapping animation
['20', '-1', '0', '15', '220']
- <_summary>Defines the shadow of normal focused windows
- <_description>The first value is the radius of the blur of the shadow, the second one the top fade (which is usually just -1), the third and fourth the x- and y-offset and the last the opacity. So [blur-radius, top-fade, x-offset, y-offset, opacity]
+ Defines the shadow of normal focused windows
+ The first value is the radius of the blur of the shadow, the second one the top fade (which is usually just -1), the third and fourth the x- and y-offset and the last the opacity. So [blur-radius, top-fade, x-offset, y-offset, opacity]
['8', '-1', '0', '6', '150']
- <_summary>Defines the shadow of a normal unfocused window
- <_description>See normal-focused
+ Defines the shadow of a normal unfocused window
+ See normal-focused
['7', '-1', '0', '5', '130']
- <_summary>Defines the shadow of a menu
- <_description>See normal-focused
+ Defines the shadow of a menu
+ See normal-focused
['12', '-1', '0', '7', '190']
- <_summary>Defines the shadow of a focused dialog
- <_description>See normal-focused
+ Defines the shadow of a focused dialog
+ See normal-focused
['7', '-1', '0', '4', '130']
- <_summary>Defines the shadow of an unfocused dialog
- <_description>See normal-focused
+ Defines the shadow of an unfocused dialog
+ See normal-focused
false
- <_summary>Disable all notifications
+ Disable all notifications
@@ -239,36 +239,36 @@
true
- <_summary>Enable bubbles
+ Enable bubbles
true
- <_summary>Enable sounds
+ Enable sounds
true
- <_summary>Show missed notifications in notification center
+ Show missed notifications in notification center
true
- <_summary>Enable rounded corner mask
+ Enable rounded corner mask
4
- <_summary>Corner radius
+ Corner radius
true
- <_summary>Disable corner mask on fullscreen
+ Disable corner mask on fullscreen
If enabled, when an application is fullscreen (fills the monitor), the corner masks will be disabled on that monitor.
false
- <_summary>Only show corner masks on primary monitor
+ Only show corner masks on primary monitor
diff --git a/po/Makevars b/po/Makevars
new file mode 100644
index 00000000..35f8f5fe
--- /dev/null
+++ b/po/Makevars
@@ -0,0 +1,78 @@
+# Makefile variables for PO directory in any package using GNU gettext.
+
+# Usually the message domain is the same as the package name.
+DOMAIN = $(PACKAGE)
+
+# These two variables depend on the location of this directory.
+subdir = po
+top_builddir = ..
+
+# These options get passed to xgettext.
+XGETTEXT_OPTIONS = --from-code=UTF-8 --keyword=_ --keyword=N_
+
+# This is the copyright holder that gets inserted into the header of the
+# $(DOMAIN).pot file. Set this to the copyright holder of the surrounding
+# package. (Note that the msgstr strings, extracted from the package's
+# sources, belong to the copyright holder of the package.) Translators are
+# expected to transfer the copyright for their translations to this person
+# or entity, or to disclaim their copyright. The empty string stands for
+# the public domain; in this case the translators are expected to disclaim
+# their copyright.
+COPYRIGHT_HOLDER = The Gala Developers
+
+# This tells whether or not to prepend "GNU " prefix to the package
+# name that gets inserted into the header of the $(DOMAIN).pot file.
+# Possible values are "yes", "no", or empty. If it is empty, try to
+# detect it automatically by scanning the files in $(top_srcdir) for
+# "GNU packagename" string.
+PACKAGE_GNU = no
+
+# This is the email address or URL to which the translators shall report
+# bugs in the untranslated strings:
+# - Strings which are not entire sentences, see the maintainer guidelines
+# in the GNU gettext documentation, section 'Preparing Strings'.
+# - Strings which use unclear terms or require additional context to be
+# understood.
+# - Strings which make invalid assumptions about notation of date, time or
+# money.
+# - Pluralisation problems.
+# - Incorrect English spelling.
+# - Incorrect formatting.
+# It can be your email address, or a mailing list address where translators
+# can write to without being subscribed, or the URL of a web page through
+# which the translators can contact you.
+MSGID_BUGS_ADDRESS = https://bugs.launchpad.net/gala
+
+# This is the list of locale categories, beyond LC_MESSAGES, for which the
+# message catalogs shall be used. It is usually empty.
+EXTRA_LOCALE_CATEGORIES =
+
+# This tells whether the $(DOMAIN).pot file contains messages with an 'msgctxt'
+# context. Possible values are "yes" and "no". Set this to yes if the
+# package uses functions taking also a message context, like pgettext(), or
+# if in $(XGETTEXT_OPTIONS) you define keywords with a context argument.
+USE_MSGCTXT = no
+
+# These options get passed to msgmerge.
+# Useful options are in particular:
+# --previous to keep previous msgids of translated messages,
+# --quiet to reduce the verbosity.
+MSGMERGE_OPTIONS =
+
+# These options get passed to msginit.
+# If you want to disable line wrapping when writing PO files, add
+# --no-wrap to MSGMERGE_OPTIONS, XGETTEXT_OPTIONS, and
+# MSGINIT_OPTIONS.
+MSGINIT_OPTIONS =
+
+# This tells whether or not to regenerate a PO file when $(DOMAIN).pot
+# has changed. Possible values are "yes" and "no". Set this to no if
+# the POT file is checked in the repository and the version control
+# program ignores timestamps.
+PO_DEPENDS_ON_POT = no
+
+# This tells whether or not to forcibly update $(DOMAIN).pot and
+# regenerate PO files on "make dist". Possible values are "yes" and
+# "no". Set this to no if the POT file and PO files are maintained
+# externally.
+DIST_DEPENDS_ON_UPDATE_PO = no
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 0f754bf5..417f3750 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -2,4 +2,4 @@ src/WindowManager.vala
src/Widgets/WindowMenu.vala
data/gala-multitaskingview.desktop.in
data/gala-other.desktop.in
-data/org.pantheon.desktop.gala.gschema.xml.in.in
+data/org.pantheon.desktop.gala.gschema.xml.in
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index 2281604f..1bd1e2e8 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -1,3 +1,3 @@
-data/org.pantheon.desktop.gala.gschema.xml.in
+data/org.pantheon.desktop.gala.gschema.xml
src/WindowManager.c
src/Widgets/WindowMenu.c
diff --git a/po/gala.pot b/po/gala.pot
index 57716254..2cde0b13 100644
--- a/po/gala.pot
+++ b/po/gala.pot
@@ -1,14 +1,14 @@
# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
+# Copyright (C) YEAR The Gala Developers
+# This file is distributed under the same license as the gala package.
# FIRST AUTHOR , YEAR.
#
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-03 13:27+0200\n"
+"Project-Id-Version: gala 0.3.0.559\n"
+"Report-Msgid-Bugs-To: https://bugs.launchpad.net/gala\n"
+"POT-Creation-Date: 2017-02-17 14:00+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -17,105 +17,106 @@ msgstr ""
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../src/WindowManager.vala:1636
+#: src/WindowManager.vala:1636
msgid "Does the display look OK?"
msgstr ""
-#: ../src/WindowManager.vala:1639
+#: src/WindowManager.vala:1639
msgid "Keep This Configuration"
msgstr ""
-#: ../src/WindowManager.vala:1640
+#: src/WindowManager.vala:1640
msgid "Restore Previous Configuration"
msgstr ""
-#: ../src/Widgets/WindowMenu.vala:56
+#: src/Widgets/WindowMenu.vala:56
msgid "Minimize"
msgstr ""
-#: ../src/Widgets/WindowMenu.vala:71
+#: src/Widgets/WindowMenu.vala:71
msgid "Move"
msgstr ""
-#: ../src/Widgets/WindowMenu.vala:78
+#: src/Widgets/WindowMenu.vala:78
msgid "Resize"
msgstr ""
-#: ../src/Widgets/WindowMenu.vala:85
+#: src/Widgets/WindowMenu.vala:85
msgid "Always on Top"
msgstr ""
-#: ../src/Widgets/WindowMenu.vala:94
+#: src/Widgets/WindowMenu.vala:94
msgid "Always on Visible Workspace"
msgstr ""
-#: ../src/Widgets/WindowMenu.vala:103
+#: src/Widgets/WindowMenu.vala:103
msgid "Move to Workspace Left"
msgstr ""
-#: ../src/Widgets/WindowMenu.vala:111
+#: src/Widgets/WindowMenu.vala:111
msgid "Move to Workspace Right"
msgstr ""
-#: ../src/Widgets/WindowMenu.vala:119
+#: src/Widgets/WindowMenu.vala:119
msgid "Close"
msgstr ""
-#: ../src/Widgets/WindowMenu.vala:131
+#: src/Widgets/WindowMenu.vala:131
msgid "Unmaximize"
msgstr ""
-#: ../src/Widgets/WindowMenu.vala:131
+#: src/Widgets/WindowMenu.vala:131
msgid "Maximize"
msgstr ""
-#: ../data/gala-multitaskingview.desktop.in.h:1
+#: data/gala-multitaskingview.desktop.in:4
+#: data/gala-multitaskingview.desktop.in:6
msgid "Multitasking View"
msgstr ""
-#: ../data/gala-multitaskingview.desktop.in.h:2
+#: data/gala-multitaskingview.desktop.in:5
msgid "View all open windows and workspaces"
msgstr ""
-#: ../data/gala-other.desktop.in.h:1
-msgid "Other"
+#: data/gala-multitaskingview.desktop.in:7
+msgid "multitasking-view"
msgstr ""
-#: ../data/gala-other.desktop.in.h:2
-msgid "Fallback desktop file for notifications from outdated applications."
+#: data/gala-other.desktop.in:6
+msgid "applications-other"
msgstr ""
-#: ../data/org.pantheon.desktop.gala.gschema.xml.in.in.h:1
+#: data/org.pantheon.desktop.gala.gschema.xml.in:21
msgid "Action for the top left corner"
msgstr ""
-#: ../data/org.pantheon.desktop.gala.gschema.xml.in.in.h:2
+#: data/org.pantheon.desktop.gala.gschema.xml.in:26
msgid "Algorithm for window overview layout"
msgstr ""
-#: ../data/org.pantheon.desktop.gala.gschema.xml.in.in.h:3
+#: data/org.pantheon.desktop.gala.gschema.xml.in:27
msgid "Choose the algorithm used for exposing the windows"
msgstr ""
-#: ../data/org.pantheon.desktop.gala.gschema.xml.in.in.h:4
+#: data/org.pantheon.desktop.gala.gschema.xml.in:31
msgid "Action for the top right corner"
msgstr ""
-#: ../data/org.pantheon.desktop.gala.gschema.xml.in.in.h:5
+#: data/org.pantheon.desktop.gala.gschema.xml.in:36
msgid "Action for the bottom left corner"
msgstr ""
-#: ../data/org.pantheon.desktop.gala.gschema.xml.in.in.h:6
+#: data/org.pantheon.desktop.gala.gschema.xml.in:41
msgid "Action for the bottom right corner"
msgstr ""
-#: ../data/org.pantheon.desktop.gala.gschema.xml.in.in.h:7
+#: data/org.pantheon.desktop.gala.gschema.xml.in:46
msgid ""
"The command that will be executed for the hotcorner action 'custom-command' "
"or multiple"
msgstr ""
-#: ../data/org.pantheon.desktop.gala.gschema.xml.in.in.h:8
+#: data/org.pantheon.desktop.gala.gschema.xml.in:47
msgid ""
"If you just put a single command, it will be used for every hotcorner "
"assigned to 'custom-command'. If you instead use the pattern 'hotcorner-"
@@ -125,106 +126,112 @@ msgid ""
"';;' is used as delimiter between command defintions."
msgstr ""
-#: ../data/org.pantheon.desktop.gala.gschema.xml.in.in.h:9
+#: data/org.pantheon.desktop.gala.gschema.xml.in:56
msgid "Enable edge tiling when dropping windows on screen edges"
msgstr ""
-#: ../data/org.pantheon.desktop.gala.gschema.xml.in.in.h:10
+#: data/org.pantheon.desktop.gala.gschema.xml.in:57
msgid ""
"If enabled, dropping windows on vertical screen edges maximizes them "
"vertically and resizes them horizontally to cover half of the available "
"area. Dropping windows on the top screen edge maximizes them completely."
msgstr ""
-#: ../data/org.pantheon.desktop.gala.gschema.xml.in.in.h:11
+#: data/org.pantheon.desktop.gala.gschema.xml.in:61
msgid "Panel main menu action"
msgstr ""
-#: ../data/org.pantheon.desktop.gala.gschema.xml.in.in.h:12
+#: data/org.pantheon.desktop.gala.gschema.xml.in:62
msgid "Sets the command to run when the panel-main-menu keybinding is pressed"
msgstr ""
-#: ../data/org.pantheon.desktop.gala.gschema.xml.in.in.h:13
+#: data/org.pantheon.desktop.gala.gschema.xml.in:76
msgid "Enable dynamic workspace instead of static ones"
msgstr ""
-#: ../data/org.pantheon.desktop.gala.gschema.xml.in.in.h:14
+#: data/org.pantheon.desktop.gala.gschema.xml.in:77
msgid ""
"Use a dynamically increasing or decreseasing number, as needed, of "
"workspaces instead of a static, fixed number"
msgstr ""
-#: ../data/org.pantheon.desktop.gala.gschema.xml.in.in.h:15
+#: data/org.pantheon.desktop.gala.gschema.xml.in:81
msgid "Names that are recognized as dock windows for the window switcher"
msgstr ""
-#: ../data/org.pantheon.desktop.gala.gschema.xml.in.in.h:16
+#: data/org.pantheon.desktop.gala.gschema.xml.in:82
msgid ""
"When launching the window-switcher, gala iterates over this list and "
"attempts to find a window matching the names. If it does, it will hide this "
"window and fade it back in, once the the switcher is closed."
msgstr ""
-#: ../data/org.pantheon.desktop.gala.gschema.xml.in.in.h:17
+#: data/org.pantheon.desktop.gala.gschema.xml.in:89
msgid "Shortcut to move to first workspace"
msgstr ""
-#: ../data/org.pantheon.desktop.gala.gschema.xml.in.in.h:18
+#: data/org.pantheon.desktop.gala.gschema.xml.in:94
msgid "Shortcut to move to last workspace"
msgstr ""
-#: ../data/org.pantheon.desktop.gala.gschema.xml.in.in.h:19
+#: data/org.pantheon.desktop.gala.gschema.xml.in:99
msgid "Shortcut to move the current window to first workspace"
msgstr ""
-#: ../data/org.pantheon.desktop.gala.gschema.xml.in.in.h:20
+#: data/org.pantheon.desktop.gala.gschema.xml.in:104
msgid "Shortcut to move the current window to last workspace"
msgstr ""
-#: ../data/org.pantheon.desktop.gala.gschema.xml.in.in.h:21
+#: data/org.pantheon.desktop.gala.gschema.xml.in:109
msgid "Zoom in"
msgstr ""
-#: ../data/org.pantheon.desktop.gala.gschema.xml.in.in.h:22
+#: data/org.pantheon.desktop.gala.gschema.xml.in:114
msgid "Zoom out"
msgstr ""
-#: ../data/org.pantheon.desktop.gala.gschema.xml.in.in.h:23
+#: data/org.pantheon.desktop.gala.gschema.xml.in:118
msgid "Shortcut to open the window overview"
msgstr ""
-#: ../data/org.pantheon.desktop.gala.gschema.xml.in.in.h:24
+#: data/org.pantheon.desktop.gala.gschema.xml.in:123
msgid "Shortcut to open the window overview for all windows"
msgstr ""
-#: ../data/org.pantheon.desktop.gala.gschema.xml.in.in.h:25
+#: data/org.pantheon.desktop.gala.gschema.xml.in:128
+#: data/org.pantheon.desktop.gala.gschema.xml.in:132
msgid "Cycle to the next workspace to the right or to back to the first"
msgstr ""
-#: ../data/org.pantheon.desktop.gala.gschema.xml.in.in.h:26
+#: data/org.pantheon.desktop.gala.gschema.xml.in:136
msgid "Cycle to next keyboard layout"
msgstr ""
-#: ../data/org.pantheon.desktop.gala.gschema.xml.in.in.h:27
+#: data/org.pantheon.desktop.gala.gschema.xml.in:137
+#: data/org.pantheon.desktop.gala.gschema.xml.in:142
+msgid "DEPRECATED: This key is deprecated and ignored."
+msgstr ""
+
+#: data/org.pantheon.desktop.gala.gschema.xml.in:141
msgid "Cycle to previous keyboard layout"
msgstr ""
-#: ../data/org.pantheon.desktop.gala.gschema.xml.in.in.h:28
+#: data/org.pantheon.desktop.gala.gschema.xml.in:149
msgid "Attach modal dialogs"
msgstr ""
-#: ../data/org.pantheon.desktop.gala.gschema.xml.in.in.h:29
+#: data/org.pantheon.desktop.gala.gschema.xml.in:150
msgid ""
"When true, instead of having independent titlebars, modal dialogs appear "
"attached to the titlebar of the parent window and are moved together with "
"the parent window."
msgstr ""
-#: ../data/org.pantheon.desktop.gala.gschema.xml.in.in.h:30
+#: data/org.pantheon.desktop.gala.gschema.xml.in:154
msgid "Arrangement of buttons on the titlebar"
msgstr ""
-#: ../data/org.pantheon.desktop.gala.gschema.xml.in.in.h:31
+#: data/org.pantheon.desktop.gala.gschema.xml.in:155
msgid ""
"Arrangement of buttons on the titlebar. The value should be a string, such "
"as \"menu:minimize,maximize,spacer,close\"; the colon separates the left "
@@ -235,54 +242,54 @@ msgid ""
"some space between two adjacent buttons."
msgstr ""
-#: ../data/org.pantheon.desktop.gala.gschema.xml.in.in.h:32
+#: data/org.pantheon.desktop.gala.gschema.xml.in:159
msgid "Make parent windows that spawn a modal attached dialog being dimmed"
msgstr ""
-#: ../data/org.pantheon.desktop.gala.gschema.xml.in.in.h:33
+#: data/org.pantheon.desktop.gala.gschema.xml.in:164
msgid ""
"The opacity of the windows located in the background in the alt-tab-switcher."
msgstr ""
-#: ../data/org.pantheon.desktop.gala.gschema.xml.in.in.h:34
+#: data/org.pantheon.desktop.gala.gschema.xml.in:168
msgid "Background-image used in the workspace-switcher"
msgstr ""
-#: ../data/org.pantheon.desktop.gala.gschema.xml.in.in.h:35
+#: data/org.pantheon.desktop.gala.gschema.xml.in:175
msgid "Enable Animations"
msgstr ""
-#: ../data/org.pantheon.desktop.gala.gschema.xml.in.in.h:36
+#: data/org.pantheon.desktop.gala.gschema.xml.in:176
msgid ""
"Whether animations should be displayed. Note: This is a global key, it "
"changes the behaviour of the window manager, the panel etc."
msgstr ""
-#: ../data/org.pantheon.desktop.gala.gschema.xml.in.in.h:37
+#: data/org.pantheon.desktop.gala.gschema.xml.in:183
msgid "Duration of the snap animation as used by maximize/unmaximize"
msgstr ""
-#: ../data/org.pantheon.desktop.gala.gschema.xml.in.in.h:38
+#: data/org.pantheon.desktop.gala.gschema.xml.in:187
msgid "Duration of the close animation"
msgstr ""
-#: ../data/org.pantheon.desktop.gala.gschema.xml.in.in.h:39
+#: data/org.pantheon.desktop.gala.gschema.xml.in:191
msgid "Duration of the minimize animation"
msgstr ""
-#: ../data/org.pantheon.desktop.gala.gschema.xml.in.in.h:40
+#: data/org.pantheon.desktop.gala.gschema.xml.in:195
msgid "Duration of the workspace switch animation"
msgstr ""
-#: ../data/org.pantheon.desktop.gala.gschema.xml.in.in.h:41
+#: data/org.pantheon.desktop.gala.gschema.xml.in:199
msgid "Duration of the menu mapping animation"
msgstr ""
-#: ../data/org.pantheon.desktop.gala.gschema.xml.in.in.h:42
+#: data/org.pantheon.desktop.gala.gschema.xml.in:206
msgid "Defines the shadow of normal focused windows"
msgstr ""
-#: ../data/org.pantheon.desktop.gala.gschema.xml.in.in.h:43
+#: data/org.pantheon.desktop.gala.gschema.xml.in:207
msgid ""
"The first value is the radius of the blur of the shadow, the second one the "
"top fade (which is usually just -1), the third and fourth the x- and y-"
@@ -290,54 +297,63 @@ msgid ""
"offset, opacity]"
msgstr ""
-#: ../data/org.pantheon.desktop.gala.gschema.xml.in.in.h:44
+#: data/org.pantheon.desktop.gala.gschema.xml.in:211
msgid "Defines the shadow of a normal unfocused window"
msgstr ""
-#: ../data/org.pantheon.desktop.gala.gschema.xml.in.in.h:45
+#: data/org.pantheon.desktop.gala.gschema.xml.in:212
+#: data/org.pantheon.desktop.gala.gschema.xml.in:217
+#: data/org.pantheon.desktop.gala.gschema.xml.in:222
+#: data/org.pantheon.desktop.gala.gschema.xml.in:227
msgid "See normal-focused"
msgstr ""
-#: ../data/org.pantheon.desktop.gala.gschema.xml.in.in.h:46
+#: data/org.pantheon.desktop.gala.gschema.xml.in:216
msgid "Defines the shadow of a menu"
msgstr ""
-#: ../data/org.pantheon.desktop.gala.gschema.xml.in.in.h:47
+#: data/org.pantheon.desktop.gala.gschema.xml.in:221
msgid "Defines the shadow of a focused dialog"
msgstr ""
-#: ../data/org.pantheon.desktop.gala.gschema.xml.in.in.h:48
+#: data/org.pantheon.desktop.gala.gschema.xml.in:226
msgid "Defines the shadow of an unfocused dialog"
msgstr ""
-#: ../data/org.pantheon.desktop.gala.gschema.xml.in.in.h:49
+#: data/org.pantheon.desktop.gala.gschema.xml.in:234
msgid "Disable all notifications"
msgstr ""
-#: ../data/org.pantheon.desktop.gala.gschema.xml.in.in.h:50
+#: data/org.pantheon.desktop.gala.gschema.xml.in:242
msgid "Enable bubbles"
msgstr ""
-#: ../data/org.pantheon.desktop.gala.gschema.xml.in.in.h:51
+#: data/org.pantheon.desktop.gala.gschema.xml.in:246
msgid "Enable sounds"
msgstr ""
-#: ../data/org.pantheon.desktop.gala.gschema.xml.in.in.h:52
+#: data/org.pantheon.desktop.gala.gschema.xml.in:250
msgid "Show missed notifications in notification center"
msgstr ""
-#: ../data/org.pantheon.desktop.gala.gschema.xml.in.in.h:53
+#: data/org.pantheon.desktop.gala.gschema.xml.in:257
msgid "Enable rounded corner mask"
msgstr ""
-#: ../data/org.pantheon.desktop.gala.gschema.xml.in.in.h:54
+#: data/org.pantheon.desktop.gala.gschema.xml.in:262
msgid "Corner radius"
msgstr ""
-#: ../data/org.pantheon.desktop.gala.gschema.xml.in.in.h:55
+#: data/org.pantheon.desktop.gala.gschema.xml.in:266
msgid "Disable corner mask on fullscreen"
msgstr ""
-#: ../data/org.pantheon.desktop.gala.gschema.xml.in.in.h:56
+#: data/org.pantheon.desktop.gala.gschema.xml.in:267
+msgid ""
+"If enabled, when an application is fullscreen (fills the monitor), the "
+"corner masks will be disabled on that monitor."
+msgstr ""
+
+#: data/org.pantheon.desktop.gala.gschema.xml.in:271
msgid "Only show corner masks on primary monitor"
msgstr ""