Update Chinese (China) translation

Unused variable definition. The fixup didn't make it to the previous
commit.

clutter/clutter/x11/clutter-device-manager-xi2.c

@@ -1160,7 +1160,7 @@ translate_pad_event (ClutterEvent       *event,
                 event->any.type == CLUTTER_PAD_RING
                 ? "pad ring  "
                 : "pad strip",
-                (unsigned int) stage_x11->xwin,
+                (unsigned int) xev->event,
                 device->id,
                 device->device_name,
                 event->any.time, value);

po/sl.po

@@ -9,19 +9,20 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mutter master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?"
 "product=mutter&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2017-02-14 08:48+0100\n"
-"PO-Revision-Date: 2017-02-14 08:48+0100\n"
+"POT-Creation-Date: 2017-08-10 22:40+0200\n"
+"PO-Revision-Date: 2017-08-10 22:40+0200\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"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n%100==4 ? 3 : 0);\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n"
+"%100==4 ? 3 : 0);\n"
 "X-Poedit-SourceCharset: utf-8\n"
-"X-Generator: Poedit 1.8.9\n"
+"X-Generator: Poedit 2.0.1\n"
 
 #: data/50-mutter-navigation.xml:6
 msgid "Navigation"
@@ -274,15 +275,15 @@ msgstr "Spremenilnik, ki naj se uporabi za upravljanje oken"
 
 #: data/org.gnome.mutter.gschema.xml.in:8
 msgid ""
-"This key will initiate the \"overlay\", which is a combination window "
-"overview and application launching system. The default is intended to be the "
-"\"Windows key\" on PC hardware. It's expected that this binding either the "
-"default or set to the empty string."
+"This key will initiate the “overlay”, which is a combination window overview "
+"and application launching system. The default is intended to be the “Windows "
+"key” on PC hardware. It’s expected that this binding either the default or "
+"set to the empty string."
 msgstr ""
-"Ta vrednost določa \"prevleko\", ki združuje predogled okna in zaganjalnik "
-"programa. Vrednost je zamišljena kot \"ključ oken\" na strojni opremi "
-"računalnika. Pričakovano je, da je vrednost določena privzeto ali pa ni "
-"določena."
+"Ta vrednost določa »prekrivno plast«, ki združuje predogled okna in "
+"zaganjalnik programa. Vrednost je zamišljena kot »ključ oken« na strojni "
+"opremi računalnika. Pričakovano je, da je vrednost določena privzeto ali pa "
+"ni določena."
 
 #: data/org.gnome.mutter.gschema.xml.in:20
 msgid "Attach modal dialogs"
@@ -317,7 +318,7 @@ msgstr "Število delovnih površin je spremenljivo"
 
 #: data/org.gnome.mutter.gschema.xml.in:41
 msgid ""
-"Determines whether workspaces are managed dynamically or whether there's a "
+"Determines whether workspaces are managed dynamically or whether there’s a "
 "static number of workspaces (determined by the num-workspaces key in org."
 "gnome.desktop.wm.preferences)."
 msgstr ""
@@ -355,12 +356,12 @@ msgstr "Zamakni spremembe žarišča, dokler se kazalnik še premika"
 
 #: data/org.gnome.mutter.gschema.xml.in:69
 msgid ""
-"If set to true, and the focus mode is either \"sloppy\" or \"mouse\" then "
-"the focus will not be changed immediately when entering a window, but only "
-"after the pointer stops moving."
+"If set to true, and the focus mode is either “sloppy” or “mouse” then the "
+"focus will not be changed immediately when entering a window, but only after "
+"the pointer stops moving."
 msgstr ""
-"Izbrana možnost omogoča, da se žarišče, v kolikor je izbran način \"sloppy\" "
-"ali \"miška\", ne spremeni takoj ob izbiri okna. Žarišče se spremeni, ko se "
+"Izbrana možnost omogoča, da se žarišče, v kolikor je izbran način »sloppy« "
+"ali »miška«, ne spremeni takoj ob izbiri okna. Žarišče se spremeni, ko se "
 "kazalnik preneha premikati."
 
 #: data/org.gnome.mutter.gschema.xml.in:79
@@ -369,11 +370,11 @@ msgstr "Prilagodljiva obroba pravokotnika"
 
 #: data/org.gnome.mutter.gschema.xml.in:80
 msgid ""
-"The amount of total draggable borders. If the theme's visible borders are "
+"The amount of total draggable borders. If the theme’s visible borders are "
 "not enough, invisible borders will be added to meet this value."
 msgstr ""
 "Delež skupne prilagodljive obrobe. V kolikor vidni robovi teme niso dovolj, "
-"so dodane nevidne obrobe, za dodatno prilagajanje."
+"so dodane nevidne obrobe za dodatno prilagajanje."
 
 #: data/org.gnome.mutter.gschema.xml.in:89
 msgid "Auto maximize nearly monitor sized windows"
@@ -457,7 +458,7 @@ msgstr "Preklopi na VT 12"
 #. TRANSLATORS: This string refers to a button that switches between
 #. * different modes.
 #.
-#: src/backends/meta-input-settings.c:1759
+#: src/backends/meta-input-settings.c:2141
 #, c-format
 msgid "Mode Switch (Group %d)"
 msgstr "Preklop načina (skupina %d)"
@@ -465,43 +466,42 @@ msgstr "Preklop načina (skupina %d)"
 #. TRANSLATORS: This string refers to an action, cycles drawing tablets'
 #. * mapping through the available outputs.
 #.
-#: src/backends/meta-input-settings.c:1781
+#: src/backends/meta-input-settings.c:2164
 msgid "Switch monitor"
 msgstr "Nadzornik preklopa"
 
-#: src/backends/meta-input-settings.c:1783
+#: src/backends/meta-input-settings.c:2166
 msgid "Show on-screen help"
 msgstr "Pokaži zaslonsko pomoč"
 
-#: src/backends/meta-monitor-manager.c:675
+#: src/backends/meta-monitor-manager.c:620
 msgid "Built-in display"
 msgstr "Vgrajen zaslon"
 
-#: src/backends/meta-monitor-manager.c:698
+#: src/backends/meta-monitor-manager.c:643
 msgid "Unknown"
 msgstr "Neznano"
 
-#: src/backends/meta-monitor-manager.c:700
+#: src/backends/meta-monitor-manager.c:645
 msgid "Unknown Display"
 msgstr "Neznan zaslon"
 
 #. TRANSLATORS: this is a monitor vendor name, followed by a
 #. * size in inches, like 'Dell 15"'
 #.
-#: src/backends/meta-monitor-manager.c:708
+#: src/backends/meta-monitor-manager.c:653
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"
 
 #. This probably means that a non-WM compositor like xcompmgr is running;
 #. * we have no way to get it to exit
-#: src/compositor/compositor.c:471
+#: src/compositor/compositor.c:476
 #, c-format
 msgid ""
-"Another compositing manager is already running on screen %i on display \"%s"
-"\"."
+"Another compositing manager is already running on screen %i on display “%s”."
 msgstr ""
-"Drug upravljalnik sestavljanja je že zagnan na zaslonu %i prikaza \"%s\"."
+"Drug upravljalnik sestavljanja je že zagnan na zaslonu %i prikaza »%s«."
 
 #: src/core/bell.c:194
 msgid "Bell event"
@@ -511,7 +511,7 @@ msgstr "Dogodek zvonjenja"
 #: src/core/delete.c:127
 #, c-format
 msgid "“%s” is not responding."
-msgstr "“%s” se ne odziva."
+msgstr "Okno »%s« se ne odziva."
 
 #: src/core/delete.c:129
 msgid "Application is not responding."
@@ -535,42 +535,42 @@ msgstr "_Počakaj"
 
 #: src/core/display.c:608
 #, c-format
-msgid "Failed to open X Window System display '%s'\n"
-msgstr "Ni mogoče odpreti zaslona '%s' okenskega sistema X\n"
+msgid "Failed to open X Window System display “%s”\n"
+msgstr "Odpiranje zaslona »%s« okenskega sistema X je spodletelo\n"
 
-#: src/core/main.c:187
+#: src/core/main.c:189
 msgid "Disable connection to session manager"
 msgstr "Onemogoči povezavo z upravljalnikom sej"
 
-#: src/core/main.c:193
+#: src/core/main.c:195
 msgid "Replace the running window manager"
 msgstr "Zamenjaj trenutni upravljalnik oken"
 
-#: src/core/main.c:199
+#: src/core/main.c:201
 msgid "Specify session management ID"
 msgstr "Navedite ID upravljanja seje"
 
-#: src/core/main.c:204
+#: src/core/main.c:206
 msgid "X Display to use"
 msgstr "Zaslon X za uporabo"
 
-#: src/core/main.c:210
+#: src/core/main.c:212
 msgid "Initialize session from savefile"
 msgstr "Začni sejo iz shranjene datoteke"
 
-#: src/core/main.c:216
+#: src/core/main.c:218
 msgid "Make X calls synchronous"
 msgstr "Uskladi klice X"
 
-#: src/core/main.c:223
+#: src/core/main.c:225
 msgid "Run as a wayland compositor"
 msgstr "Zaženi izbirnik wayland"
 
-#: src/core/main.c:229
+#: src/core/main.c:231
 msgid "Run as a nested compositor"
 msgstr "Zaženi kot gnezden vpisovalnik"
 
-#: src/core/main.c:237
+#: src/core/main.c:239
 msgid "Run as a full display server, rather than nested"
 msgstr "Zaženi kot polni strežnik zaslona in ne vstavljeno"
 
@@ -578,15 +578,14 @@ msgstr "Zaženi kot polni strežnik zaslona in ne vstavljeno"
 #, c-format
 msgid ""
 "mutter %s\n"
-"Copyright (C) 2001-%d Havoc Pennington, Red Hat, Inc., and others\n"
+"Copyright © 2001-%d Havoc Pennington, Red Hat, Inc., and others\n"
 "This is free software; see the source for copying conditions.\n"
 "There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A "
 "PARTICULAR PURPOSE.\n"
 msgstr ""
 "mutter %s\n"
 "Avtorske pravice pridržane (C) 2001-%d Havoc Pennington, Red Hat in drugi\n"
-"To je prosta programska oprema; za pogoje kopiranja si poglejte izvorno "
-"kodo.\n"
+"To je prosta programska oprema; za pogoje kopiranja si oglejte dovoljenje.\n"
 "Program je na voljo BREZ KAKRŠNIHKOLI ZAGOTOVIL.\n"
 
 #: src/core/mutter.c:53
@@ -606,16 +605,16 @@ msgstr "Delovna površina %d"
 #: src/core/screen.c:580
 #, c-format
 msgid ""
-"Display \"%s\" already has a window manager; try using the --replace option "
-"to replace the current window manager."
+"Display “%s” already has a window manager; try using the --replace option to "
+"replace the current window manager."
 msgstr ""
-"Zaslon \"%s\" že ima določen upravljalnik oken; poskušajte uporabiti možnost "
-"--replace za zamenjavo trenutnega upravljalnika zaslona."
+"Zaslon »%s« že ima določen upravljalnik oken; poskušajte uporabiti možnost --"
+"replace za zamenjavo trenutnega upravljalnika zaslona."
 
 #: src/core/screen.c:665
 #, c-format
-msgid "Screen %d on display '%s' is invalid\n"
-msgstr "Zaslon %d na prikazu '%s' ni veljaven\n"
+msgid "Screen %d on display “%s” is invalid\n"
+msgstr "Zaslon %d na prikazu »%s« ni veljaven\n"
 
 #: src/core/util.c:120
 msgid "Mutter was compiled without support for verbose mode\n"
@@ -630,17 +629,56 @@ msgstr "Način preklopa: način %d"
 # G:2 K:6 O:0
 #: src/x11/session.c:1815
 msgid ""
-"These windows do not support &quot;save current setup&quot; and will have to "
-"be restarted manually next time you log in."
+"These windows do not support “save current setup” and will have to be "
+"restarted manually next time you log in."
 msgstr ""
-"Ta okna ne podpirajo možnosti &quot;shranjevanja trenutnih nastavitev&quot;, "
-"zato jih bo treba ob naslednji prijavi zagnati ročno."
+"Ta okna ne podpirajo možnosti »shranjevanja trenutnih nastavitev«, zato jih "
+"bo treba ob naslednji prijavi zagnati ročno."
 
 #: src/x11/window-props.c:559
 #, c-format
 msgid "%s (on %s)"
 msgstr "%s (na %s)"
 
+#~ msgid "Enable experimental features"
+#~ msgstr "Omogoči preizkusne možnosti"
+
+#~ msgid ""
+#~ "To enable experimental features, add the feature keyword to the list. "
+#~ "Whether the feature requires restarting the compositor depends on the "
+#~ "given feature. Any experimental feature is not required to still be "
+#~ "available, or configurable. Don’t expect adding anything in this setting "
+#~ "to be future proof. Currently possible keywords: • “monitor-config-"
+#~ "manager” — use the new monitor configuration system, aimed to replace the "
+#~ "old one. This enables a higher level configuration API to be used by "
+#~ "configuration applications, as well as the ability to configure per "
+#~ "logical monitor scale. • “scale-monitor-framebuffer” — makes mutter "
+#~ "default to layout logical monitors in a logical pixel coordinate space, "
+#~ "while scaling monitor framebuffers instead of window content, to manage "
+#~ "HiDPI monitors. Does not require a restart. Also enabling “monitor-config-"
+#~ "manager” is required for this feature to be enabled."
+#~ msgstr ""
+#~ "Za omogočanje preizkusnih možnosti, dodajte ključno besedo možnosti na "
+#~ "seznam. Ali zahteva možnost ponovni zagon sestavljalnika, je odvisno od "
+#~ "posamezne možnosti. Te možnosti niso zahtevane niti nastavljive. Trenutno "
+#~ "so na voljo ključne besede: • »monitor-config-manager« – uporablja nov "
+#~ "sistem nastavitev, ki naj bi zamenjal obstoječega. Omogoča večjo "
+#~ "nastavljivost API, za uporabo pri prigramih za nastavitve lastnosti "
+#~ "zaslona. • »scale-monitor-framebuffer« – določi privzeto rabo sistema "
+#~ "mutter za logične zaslone v logičnem točkovnem koordinatnem prostoru, pri "
+#~ "čemer prilagaja predpomnilnik in ne vsebine za upravljanje z zasloni "
+#~ "HiDPI. Možnost ne zahteva ponovnega zagona. Za omogočanje te možnosti, "
+#~ "mora biti omogočena tudi možnost »monitor-config-manager«."
+
+#~ msgid "Switch monitor configurations"
+#~ msgstr "Nastavitve nadzornika preklopa"
+
+#~ msgid "Rotates the built-in monitor configuration"
+#~ msgstr "Zavrti vgrajene nastavitve zaslona"
+
+#~ msgid "Re-enable shortcuts"
+#~ msgstr "Ponovno omogoči tipkovne bližnjice"
+
 #~ msgid "Failed to scan themes directory: %s\n"
 #~ msgstr "Ni mogoče preiskati mape tem: %s\n"
 

po/zh_CN.po

@@ -1,6 +1,6 @@
-# translation of mutter.po to zh_CN
 # Simplified Chinese translation of mutter.
 # Copyright (C) 2002, 2003, 2004, 2009, 2010 Free Software Foundation, Inc.
+# This file is distributed under the same license as the mutter package.
 # Sun G11n <gnome_int_l10n@ireland.sun.com>, 2002.
 # He Qiangqiang <carton@linux.net.cn>, 2002
 # Xiong Jiang <jxiong@offtopic.org>, 2003
@@ -11,22 +11,25 @@
 # Lele Long <schemacs@gmail.com>, 2011.
 # YunQiang Su <wzssyqa@gmail.com>, 2011, 2012.
 # Tong Hui <tonghuix@gmail.com>, 2014.
+# Mandy Wang <wangmychn@gmail.com>, 2017.
+# Dingzhong Chen <wsxy162@gmail.com>, 2017.
+# Mingcong Bai <jeffbai@aosc.xyz>, 2017.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: mutter master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?"
 "product=mutter&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2017-02-03 10:06+0000\n"
-"PO-Revision-Date: 2017-01-04 21:52+0800\n"
-"Last-Translator: Mandy Wang <wangmychn@gmail.com>\n"
-"Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
+"POT-Creation-Date: 2017-07-03 12:32+0000\n"
+"PO-Revision-Date: 2017-06-10 14:49+0800\n"
+"Last-Translator: Mingcong Bai <jeffbai@aosc.xyz>\n"
+"Language-Team: Chinese (China) <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: Poedit 1.8.7.1\n"
+"X-Generator: Poedit 2.0.2\n"
 
 #: data/50-mutter-navigation.xml:6
 msgid "Navigation"
@@ -278,10 +281,10 @@ msgstr "用于修改窗口点击动作的修饰键 met"
 
 #: data/org.gnome.mutter.gschema.xml.in:8
 msgid ""
-"This key will initiate the \"overlay\", which is a combination window "
-"overview and application launching system. The default is intended to be the "
-"\"Windows key\" on PC hardware. It's expected that this binding either the "
-"default or set to the empty string."
+"This key will initiate the “overlay”, which is a combination window overview "
+"and application launching system. The default is intended to be the “Windows "
+"key” on PC hardware. It’s expected that this binding either the default or "
+"set to the empty string."
 msgstr ""
 "这个键指出的“覆盖”是一种混合窗口概述和应用程序运行的系统。默认要求使用 "
 "“Super 键”。可能使用默认或者空白。"
@@ -318,12 +321,12 @@ msgstr "动态管理工作区"
 
 #: data/org.gnome.mutter.gschema.xml.in:41
 msgid ""
-"Determines whether workspaces are managed dynamically or whether there's a "
+"Determines whether workspaces are managed dynamically or whether there’s a "
 "static number of workspaces (determined by the num-workspaces key in org."
 "gnome.desktop.wm.preferences)."
 msgstr ""
-"决定工作区动态管理还是静态数量的工作区(由 org.gnome.desktop.wm.preferences 中"
-"的 num-workspaces 键确定)。"
+"决定工作区动态管理还是静态数量的工作区（由 org.gnome.desktop.wm.preferences "
+"中的 num-workspaces 键确定）。"
 
 # 或者 只在主显示器上显示工作区
 #: data/org.gnome.mutter.gschema.xml.in:50
@@ -353,9 +356,9 @@ msgstr "将焦点改变推迟到光标停止移动之后"
 
 #: data/org.gnome.mutter.gschema.xml.in:69
 msgid ""
-"If set to true, and the focus mode is either \"sloppy\" or \"mouse\" then "
-"the focus will not be changed immediately when entering a window, but only "
-"after the pointer stops moving."
+"If set to true, and the focus mode is either “sloppy” or “mouse” then the "
+"focus will not be changed immediately when entering a window, but only after "
+"the pointer stops moving."
 msgstr ""
 "如果为 true，而聚焦模式为“sloppy”或“mouse”，那么进入某个窗口时焦点将不会立即"
 "改变，而是等到光标停止移动之后。"
@@ -366,7 +369,7 @@ msgstr "可拖拽的边界宽度"
 
 #: data/org.gnome.mutter.gschema.xml.in:80
 msgid ""
-"The amount of total draggable borders. If the theme's visible borders are "
+"The amount of total draggable borders. If the theme’s visible borders are "
 "not enough, invisible borders will be added to meet this value."
 msgstr ""
 "可拖拽的边界总数。如果主题的可见边界不足，将添加不可见的边界来满足此值。"
@@ -391,11 +394,39 @@ msgid ""
 "screen of the monitor."
 msgstr "为 true 时，新窗口将总是置于此显示器已激活屏幕的中央。"
 
-#: data/org.gnome.mutter.gschema.xml.in:120
+#: data/org.gnome.mutter.gschema.xml.in:107
+msgid "Enable experimental features"
+msgstr "开启实验性特性"
+
+#: data/org.gnome.mutter.gschema.xml.in:108
+msgid ""
+"To enable experimental features, add the feature keyword to the list. "
+"Whether the feature requires restarting the compositor depends on the given "
+"feature. Any experimental feature is not required to still be available, or "
+"configurable. Don’t expect adding anything in this setting to be future "
+"proof. Currently possible keywords: • “monitor-config-manager” — use the new "
+"monitor configuration system, aimed to replace the old one. This enables a "
+"higher level configuration API to be used by configuration applications, as "
+"well as the ability to configure per logical monitor scale. • “scale-monitor-"
+"framebuffer” — makes mutter default to layout logical monitors in a logical "
+"pixel coordinate space, while scaling monitor framebuffers instead of window "
+"content, to manage HiDPI monitors. Does not require a restart. Also enabling "
+"“monitor-config-manager” is required for this feature to be enabled."
+msgstr ""
+"要启用实验性特性，请将如下特性关键字添加到列表中。特性是否要求重启合成器取决"
+"于特性本身。实验性特性不需启用即可配置和使用。请不要将实验性特性作为未来保障"
+"的基础。当前可用的关键字：• “monitor-config-manager” — 使用新的监视器配置系"
+"统，用于替代老的系统。启用此特性将打开一个上级配置 API 以用于配置应用程序，并"
+"可提供基于每屏幕的逻辑缩放功能。• “scale-monitor-framebuffer” — 让 Mutter 默"
+"认基于像素座标排布多屏幕，并同时缩放监视器帧缓冲器而不是窗口内容，以便管理 "
+"HiDPI 监视器。该特性不需要重启来生效。该特性需要打开“monitor-config-"
+"manager”特性才能使用。"
+
+#: data/org.gnome.mutter.gschema.xml.in:151
 msgid "Select window from tab popup"
 msgstr "从 Tab 轮换弹出界面选择窗口"
 
-#: data/org.gnome.mutter.gschema.xml.in:125
+#: data/org.gnome.mutter.gschema.xml.in:156
 msgid "Cancel tab popup"
 msgstr "取消 Tab 轮换弹出"
 
@@ -447,127 +478,135 @@ msgstr "切换到 VT 11"
 msgid "Switch to VT 12"
 msgstr "切换到 VT 12"
 
+#. TRANSLATORS: This string refers to a button that switches between
+#. * different modes.
+#.
+#: src/backends/meta-input-settings.c:1871
+#, c-format
+msgid "Mode Switch (Group %d)"
+msgstr "模式切换（组别 %d）"
+
 #. TRANSLATORS: This string refers to an action, cycles drawing tablets'
 #. * mapping through the available outputs.
 #.
-#: src/backends/meta-input-settings.c:1861
+#: src/backends/meta-input-settings.c:1893
 msgid "Switch monitor"
 msgstr "切换显示器"
 
-#: src/backends/meta-input-settings.c:1863
+#: src/backends/meta-input-settings.c:1895
 msgid "Show on-screen help"
 msgstr "显示在屏帮助"
 
-#: src/backends/meta-monitor-manager.c:515
+#: src/backends/meta-monitor-manager.c:879
 msgid "Built-in display"
 msgstr "内置显示器"
 
-#: src/backends/meta-monitor-manager.c:538
+#: src/backends/meta-monitor-manager.c:902
 msgid "Unknown"
 msgstr "未知"
 
-#: src/backends/meta-monitor-manager.c:540
+#: src/backends/meta-monitor-manager.c:904
 msgid "Unknown Display"
 msgstr "未知的 Display"
 
 #. TRANSLATORS: this is a monitor vendor name, followed by a
 #. * size in inches, like 'Dell 15"'
 #.
-#: src/backends/meta-monitor-manager.c:548
+#: src/backends/meta-monitor-manager.c:912
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"
 
 #. This probably means that a non-WM compositor like xcompmgr is running;
 #. * we have no way to get it to exit
-#: src/compositor/compositor.c:471
+#: src/compositor/compositor.c:476
 #, c-format
 msgid ""
-"Another compositing manager is already running on screen %i on display \"%s"
-"\"."
+"Another compositing manager is already running on screen %i on display “%s”."
 msgstr "显示器 %2$s 的屏幕 %1$i 上已有另外一个混成窗口管理器正在运行。"
 
 #: src/core/bell.c:194
 msgid "Bell event"
 msgstr "响铃事件"
 
-#: src/core/delete.c:127
+#: src/core/display.c:608
+#, c-format
+msgid "Failed to open X Window System display “%s”\n"
+msgstr "无法打开 X Window System 显示器“%s”\n"
+
+#: src/core/main.c:189
+msgid "Disable connection to session manager"
+msgstr "禁止连接到会话管理器"
+
+#: src/core/main.c:195
+msgid "Replace the running window manager"
+msgstr "替换正在运行的窗口管理器"
+
+#: src/core/main.c:201
+msgid "Specify session management ID"
+msgstr "指定会话管理 ID"
+
+#: src/core/main.c:206
+msgid "X Display to use"
+msgstr "要使用的 X Display"
+
+#: src/core/main.c:212
+msgid "Initialize session from savefile"
+msgstr "从保存文件中初始化会话"
+
+#: src/core/main.c:218
+msgid "Make X calls synchronous"
+msgstr "使 X 调用同步"
+
+#: src/core/main.c:225
+msgid "Run as a wayland compositor"
+msgstr "作为 wayland 混成管理器运行"
+
+#: src/core/main.c:231
+msgid "Run as a nested compositor"
+msgstr "作为嵌套混成器运行"
+
+#: src/core/main.c:239
+msgid "Run as a full display server, rather than nested"
+msgstr "以完整显示服务器方式运行，而不是以嵌套方式"
+
+#. Translators: %s is a window title
+#: src/core/meta-close-dialog-default.c:147
 #, c-format
 msgid "“%s” is not responding."
 msgstr "“%s” 未响应。"
 
-#: src/core/delete.c:129
+#: src/core/meta-close-dialog-default.c:149
 msgid "Application is not responding."
 msgstr "应用程序未响应。"
 
-#: src/core/delete.c:134
+#: src/core/meta-close-dialog-default.c:154
 msgid ""
 "You may choose to wait a short while for it to continue or force the "
 "application to quit entirely."
 msgstr "您可以选择稍等一会儿，或者强制退出该应用程序。"
 
-#: src/core/delete.c:141
-msgid "_Wait"
-msgstr "等待(_W)"
-
-#: src/core/delete.c:141
+#: src/core/meta-close-dialog-default.c:161
 msgid "_Force Quit"
 msgstr "强制退出(_F)"
 
-#: src/core/display.c:590
-#, c-format
-msgid "Failed to open X Window System display '%s'\n"
-msgstr "无法打开 X Window System 显示器“%s”\n"
-
-#: src/core/main.c:182
-msgid "Disable connection to session manager"
-msgstr "禁止连接到会话管理器"
-
-#: src/core/main.c:188
-msgid "Replace the running window manager"
-msgstr "替换正在运行的窗口管理器"
-
-#: src/core/main.c:194
-msgid "Specify session management ID"
-msgstr "指定会话管理 ID"
-
-#: src/core/main.c:199
-msgid "X Display to use"
-msgstr "要使用的 X Display"
-
-#: src/core/main.c:205
-msgid "Initialize session from savefile"
-msgstr "从保存文件中初始化会话"
-
-#: src/core/main.c:211
-msgid "Make X calls synchronous"
-msgstr "使 X 调用同步"
-
-#: src/core/main.c:218
-msgid "Run as a wayland compositor"
-msgstr "作为 wayland 混成管理器运行"
-
-#: src/core/main.c:224
-msgid "Run as a nested compositor"
-msgstr "作为嵌套混成器运行"
-
-#: src/core/main.c:232
-msgid "Run as a full display server, rather than nested"
-msgstr "以完整显示服务器方式运行，而不是以嵌套方式"
+#: src/core/meta-close-dialog-default.c:161
+msgid "_Wait"
+msgstr "等待(_W)"
 
 #: src/core/mutter.c:39
 #, c-format
 msgid ""
 "mutter %s\n"
-"Copyright (C) 2001-%d Havoc Pennington, Red Hat, Inc., and others\n"
+"Copyright © 2001-%d Havoc Pennington, Red Hat, Inc., and others\n"
 "This is free software; see the source for copying conditions.\n"
 "There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A "
 "PARTICULAR PURPOSE.\n"
 msgstr ""
 "mutter %s\n"
-"版权所有 (C) 2001-%d Havoc Pennington, Red Hat, Inc., 以及其他\n"
-"本软件为自由软件：版权条款请参见源码\n"
-"不存在任何保证：即便是对商业性或者特定目的的适应性也不作保证。\n"
+"Copyright © 2001-%d Havoc Pennington, Red Hat, Inc., 以及其他\n"
+"本软件为自由软件；版权条款请参见源码\n"
+"不存在任何保证；即便是对商业性或者特定目的的适应性也不作保证。\n"
 
 #: src/core/mutter.c:53
 msgid "Print version"
@@ -582,41 +621,39 @@ msgstr "要使用的 Mutter 插件"
 msgid "Workspace %d"
 msgstr "工作区 %d"
 
-#: src/core/screen.c:521
+#: src/core/screen.c:580
 #, c-format
 msgid ""
-"Display \"%s\" already has a window manager; try using the --replace option "
-"to replace the current window manager."
+"Display “%s” already has a window manager; try using the --replace option to "
+"replace the current window manager."
 msgstr ""
 "Display“%s”已经有一个窗口管理器；请尝试使用 --replace 选项替换当前的窗口管理"
 "器。"
 
-#: src/core/screen.c:606
+#: src/core/screen.c:665
 #, c-format
-msgid "Screen %d on display '%s' is invalid\n"
+msgid "Screen %d on display “%s” is invalid\n"
 msgstr "显示“%2$s”上的屏幕 %1$d 无效\n"
 
 #: src/core/util.c:120
 msgid "Mutter was compiled without support for verbose mode\n"
 msgstr "Mutter 编译的时候没有加入详细模式的支持\n"
 
-#: src/wayland/meta-wayland-tablet-pad.c:595
+#: src/wayland/meta-wayland-tablet-pad.c:563
 #, c-format
 msgid "Mode Switch: Mode %d"
 msgstr "模式切换：%d 模式"
 
 #: src/x11/session.c:1815
 msgid ""
-"These windows do not support &quot;save current setup&quot; and will have to "
-"be restarted manually next time you log in."
-msgstr ""
-"这些窗口不支持 &quot;保存当前设置 &quot;  您在下次登录时，必须手动重启动它"
-"们。"
+"These windows do not support “save current setup” and will have to be "
+"restarted manually next time you log in."
+msgstr "这些窗口不支持“保存当前设置”，并且在您下次登录时，必须手动重启它们。"
 
-#: src/x11/window-props.c:548
+#: src/x11/window-props.c:559
 #, c-format
 msgid "%s (on %s)"
-msgstr "%s (于 %s)"
+msgstr "%s（于 %s）"
 
 #~ msgid "Failed to scan themes directory: %s\n"
 #~ msgstr "扫描主题目录失败：%s\n"

src/backends/meta-dnd-private.h

@@ -29,6 +29,7 @@ gboolean meta_dnd_handle_xdnd_event (MetaBackend    *backend,
 
 #ifdef HAVE_WAYLAND
 void meta_dnd_wayland_handle_begin_modal (MetaCompositor *compositor);
+void meta_dnd_wayland_handle_end_modal   (MetaCompositor *compositor);
 #endif
 
 #endif /* META_DND_PRIVATE_H */

src/compositor/compositor.c

@@ -420,7 +420,10 @@ meta_end_modal_for_plugin (MetaCompositor *compositor,
   meta_backend_ungrab_device (backend, META_VIRTUAL_CORE_KEYBOARD_ID, timestamp);
 
   if (meta_is_wayland_compositor ())
-    meta_display_sync_wayland_input_focus (display);
+    {
+      meta_dnd_wayland_handle_end_modal (compositor);
+      meta_display_sync_wayland_input_focus (display);
+    }
 }
 
 static void

src/compositor/meta-dnd.c

@@ -218,20 +218,9 @@ meta_dnd_wayland_end_notify (ClutterActor *actor,
                              MetaDnd      *dnd)
 {
   MetaDndPrivate *priv = meta_dnd_get_instance_private (dnd);
-  unsigned int i;
 
   meta_wayland_data_device_end_drag (&priv->wl_compositor->seat->data_device);
-
-  for (i = 0; i < G_N_ELEMENTS (priv->handler_id); i++)
-    {
-      g_signal_handler_disconnect (priv->compositor->stage, priv->handler_id[i]);
-      priv->handler_id[i] = 0;
-    }
-
-  priv->compositor = NULL;
-  priv->wl_compositor = NULL;
-
-  meta_dnd_notify_dnd_leave (dnd);
+  meta_dnd_wayland_handle_end_modal (priv->compositor);
 }
 
 static void
@@ -286,4 +275,26 @@ meta_dnd_wayland_handle_begin_modal (MetaCompositor *compositor)
       meta_dnd_notify_dnd_enter (dnd);
     }
 }
+
+void
+meta_dnd_wayland_handle_end_modal (MetaCompositor *compositor)
+{
+  MetaDnd *dnd = meta_backend_get_dnd (meta_get_backend ());
+  MetaDndPrivate *priv = meta_dnd_get_instance_private (dnd);
+  unsigned int i;
+
+  if (!priv->compositor)
+    return;
+
+  for (i = 0; i < G_N_ELEMENTS (priv->handler_id); i++)
+    {
+      g_signal_handler_disconnect (priv->compositor->stage, priv->handler_id[i]);
+      priv->handler_id[i] = 0;
+    }
+
+  priv->compositor = NULL;
+  priv->wl_compositor = NULL;
+
+  meta_dnd_notify_dnd_leave (dnd);
+}
 #endif

src/wayland/meta-wayland-buffer.c

@@ -221,7 +221,6 @@ egl_image_buffer_attach (MetaWaylandBuffer *buffer,
   ClutterBackend *clutter_backend = meta_backend_get_clutter_backend (backend);
   CoglContext *cogl_context = clutter_backend_get_cogl_context (clutter_backend);
   EGLDisplay egl_display = cogl_egl_context_get_egl_display (cogl_context);
-  EGLContext egl_context = cogl_egl_context_get_egl_context (cogl_context);
   int format, width, height, y_inverted;
   CoglPixelFormat cogl_format;
   EGLImageKHR egl_image;
@@ -265,7 +264,9 @@ egl_image_buffer_attach (MetaWaylandBuffer *buffer,
       return FALSE;
     }
 
-  egl_image = meta_egl_create_image (egl, egl_display, egl_context,
+  /* The WL_bind_wayland_display spec states that EGL_NO_CONTEXT is to be used
+   * in conjunction with the EGL_WAYLAND_BUFFER_WL target. */
+  egl_image = meta_egl_create_image (egl, egl_display, EGL_NO_CONTEXT,
                                      EGL_WAYLAND_BUFFER_WL, buffer->resource,
                                      NULL,
                                      error);

src/wayland/meta-wayland-surface.c

@@ -448,7 +448,7 @@ meta_wayland_surface_unref_buffer_use_count (MetaWaylandSurface *surface)
   g_return_if_fail (buffer);
 
   if (surface->buffer_ref.use_count == 0 && buffer->resource)
-    wl_resource_queue_event (buffer->resource, WL_BUFFER_RELEASE);
+    wl_buffer_send_release (buffer->resource);
 }
 
 static void

src/wayland/meta-wayland-tablet-tool.c

@@ -914,6 +914,7 @@ meta_wayland_tablet_tool_update (MetaWaylandTabletTool *tool,
       break;
     case CLUTTER_PROXIMITY_OUT:
       tool->current_tablet = NULL;
+      meta_wayland_tablet_tool_set_cursor_surface (tool, NULL);
       meta_wayland_tablet_tool_update_cursor_surface (tool);
       g_clear_object (&tool->cursor_renderer);
       break;