Update zh_CN translation

tests: Update markup test for function moved to messageList
https://bugzilla.gnome.org/show_bug.cgi?id=782802
2017-10-21 19:38:34 +08:00 · 2017-05-19 08:29:46 -04:00 · 2017-02-14 03:04:53 +01:00 · 2017-01-08 20:03:47 +00:00 · 2016-11-23 18:41:31 +01:00 · 2016-10-29 10:48:37 -05:00
16 changed files with 3171 additions and 1083 deletions
--- a/12
+++ b/12
@@ -1,3 +1,15 @@
+3.20.4
+======
+* Free old backgrounds immediately [Hyungwon; #766353]
+* Adjust to flatpak PermissionStore API changes [Florian; #766598]
+* calendar: Only hide dismissed occurrence of recurring event [Florian; #748226]
+
+Contributors:
+  Hyungwon Hwang, Florian Müllner
+
+Translations:
+  Bruce Cowan [en_GB], Piotr Drąg [pl]
+
 3.20.3
 ======
 * Fix sorting of hidden apps in app switcher [Florian; #766238]
--- a/browser-plugin/browser-plugin.c
+++ b/browser-plugin/browser-plugin.c
@@ -1029,6 +1029,7 @@ NPP_GetValue(NPP          instance,
    if (!instance->pdata)
      return NPERR_INVALID_INSTANCE_ERROR;

+    funcs.retainobject (instance->pdata);
    *(NPObject**)value = instance->pdata;
    break;

--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ(2.63)
-AC_INIT([gnome-shell],[3.20.3],[https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-shell],[gnome-shell])
+AC_INIT([gnome-shell],[3.20.4],[https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-shell],[gnome-shell])
 AX_IS_RELEASE([git-directory])

 AC_CONFIG_HEADERS([config.h])
--- a/js/gdm/loginDialog.js
+++ b/js/gdm/loginDialog.js
@@ -804,6 +804,11 @@ const LoginDialog = new Lang.Class({

        this._user = null;

+        if (this._nextSignalId) {
+            this._authPrompt.disconnect(this._nextSignalId);
+            this._nextSignalId = 0;
+        }
+
        if (beginRequest == AuthPrompt.BeginRequestType.PROVIDE_USERNAME) {
            if (!this._disableUserList)
                this._showUserList();
@@ -1220,7 +1225,7 @@ const LoginDialog = new Lang.Class({
    },

    addCharacter: function(unichar) {
-        this._authPrompt.addCharacter(unichar);
+        // Don't allow type ahead at the login screen
    },

    finish: function(onComplete) {
--- a/js/portalHelper/main.js
+++ b/js/portalHelper/main.js
@@ -50,7 +50,7 @@ const PortalWindow = new Lang.Class({
        this.parent({ application: application });

        if (!url) {
-            url = 'http://www.gnome.org';
+            url = 'http://nmcheck.gnome.org';
            this._originalUrlWasGnome = true;
        } else {
            this._originalUrlWasGnome = false;
@@ -112,12 +112,12 @@ const PortalWindow = new Lang.Class({
        let uri = new Soup.URI(request.get_uri());

        if (!uri.host_equal(this._uri) && this._originalUrlWasGnome) {
-            if (uri.get_host() == 'www.gnome.org' && this._everSeenRedirect) {
+            if (uri.get_host() == 'nmcheck.gnome.org' && this._everSeenRedirect) {
                // Yay, we got to gnome!
                decision.ignore();
                this._doneCallback(PortalHelperResult.COMPLETED);
                return true;
-            } else if (uri.get_host() != 'www.gnome.org') {
+            } else if (uri.get_host() != 'nmcheck.gnome.org') {
                this._everSeenRedirect = true;
            }
        }
--- a/js/ui/background.js
+++ b/js/ui/background.js
@@ -696,6 +696,7 @@ const BackgroundManager = new Lang.Class({
                           time: FADE_ANIMATION_TIME,
                           transition: 'easeOutQuad',
                           onComplete: function() {
+                               oldBackgroundActor.background.run_dispose();
                               oldBackgroundActor.destroy();
                           }
                         });
--- a/js/ui/status/location.js
+++ b/js/ui/status/location.js
@@ -62,8 +62,8 @@ var AgentIface = '<node> \
  </interface> \
 </node>';

-var XdgAppIface = '<node> \
-  <interface name="org.freedesktop.XdgApp.PermissionStore"> \
+var PermissionStoreIface = '<node> \
+  <interface name="org.freedesktop.impl.portal.PermissionStore"> \
    <method name="Lookup"> \
      <arg name="table" type="s" direction="in"/> \
      <arg name="id" type="s" direction="in"/> \
@@ -80,7 +80,7 @@ var XdgAppIface = '<node> \
  </interface> \
 </node>';

-const PermissionStore = Gio.DBusProxy.makeProxyWrapper(XdgAppIface);
+const PermissionStore = Gio.DBusProxy.makeProxyWrapper(PermissionStoreIface);

 const Indicator = new Lang.Class({
    Name: 'LocationIndicator',
@@ -254,8 +254,8 @@ const Indicator = new Lang.Class({
    _connectToPermissionStore: function() {
        this._permStoreProxy = null;
        new PermissionStore(Gio.DBus.session,
-                           'org.freedesktop.XdgApp',
-                           '/org/freedesktop/XdgApp/PermissionStore',
+                           'org.freedesktop.impl.portal.PermissionStore',
+                           '/org/freedesktop/impl/portal/PermissionStore',
                           Lang.bind(this, this._onPermStoreProxyReady));
    },

--- a/po/LINGUAS
+++ b/po/LINGUAS
@@ -29,6 +29,7 @@ gl
 gu
 he
 hi
+hr
 hu
 ia
 id
--- a/po/en_GB.po
+++ b/po/en_GB.po
--- a/po/gd.po
+++ b/po/gd.po
@@ -1,14 +1,14 @@
 # Scottish Gaelic translation for gnome-shell.
 # Copyright (C) 2015 gnome-shell's COPYRIGHT HOLDER
 # This file is distributed under the same license as the gnome-shell package.
-# GunChleoc <fios@foramnagaidhlig.net>, 2015.
+# GunChleoc <fios@foramnagaidhlig.net>, 2015, 2016.
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-shell master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
 "shell&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2015-11-17 16:10+0000\n"
-"PO-Revision-Date: 2015-11-17 17:10+0100\n"
+"POT-Creation-Date: 2016-09-10 21:51+0000\n"
+"PO-Revision-Date: 2016-09-13 10:42+0100\n"
 "Last-Translator: GunChleoc <fios@foramnagaidhlig.net>\n"
 "Language-Team: Fòram na Gàidhlig\n"
 "Language: gd\n"
@@ -62,32 +62,61 @@ msgid "Window management and application launching"
 msgstr "Stiùireadh uinneagan is tòiseachadh aplacaidean"

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:3
-#| msgid "No extensions installed"
 msgid "UUIDs of extensions to enable"
 msgstr "UUIDs nan leudachan ri an cur an comas"

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:22
-#| msgid "Open the application menu"
 msgid "Keybinding to open the application menu"
 msgstr "Nasgadh iuchrach gus clàr-taice na h-aplacaid fhosgladh"

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:23
-#| msgid "Open the application menu"
 msgid "Keybinding to open the application menu."
 msgstr "Nasgadh iuchrach gus clàr-taice na h-aplacaid fhosgladh."

+#: ../data/org.gnome.shell.gschema.xml.in.in.h:24
+#| msgid "Keybinding to open the application menu"
+msgid "Keybinding to open the \"Show Applications\" view"
+msgstr "Nasgadh iuchrach gus an sealladh \"Seall aplacaidean\" fhosgladh"
+
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:25
+#| msgid "Keybinding to open the application menu."
+msgid ""
+"Keybinding to open the \"Show Applications\" view of the Activities Overview."
+msgstr ""
+"Nasgadh iuchrach gus an sealladh \"Seall aplacaidean\" aig foir-shealladh na "
+"gnìomhachd fhosgladh."
+
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:26
+#| msgid "Keybinding to open the application menu"
+msgid "Keybinding to open the overview"
+msgstr "Nasgadh iuchrach gus am foir-shealladh fhosgladh"
+
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:27
+#| msgid "Keybinding to open the application menu."
+msgid "Keybinding to open the Activities Overview."
+msgstr "Nasgadh iuchrach gus foir-shealladh na gnìomhachd fhosgladh."
+
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:28
+#| msgid "Keybinding to focus the active notification"
+msgid "Keybinding to toggle the visibility of the notification list"
+msgstr ""
+"Nasgadh iuchrach gus an fhaicsinneachd air liosta nam brathan a thoglachadh"
+
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:29
+#| msgid "Keybinding to focus the active notification."
+msgid "Keybinding to toggle the visibility of the notification list."
+msgstr ""
+"Nasgadh iuchrach gus an fhaicsinneachd air liosta nam brathan a thoglachadh."
+
 #: ../data/org.gnome.shell.gschema.xml.in.in.h:30
-#| msgid "Focus the active notification"
 msgid "Keybinding to focus the active notification"
 msgstr "Nasgadh iuchrach gus am fòcas a chur air a' bhrath ghnìomhach"

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:31
-#| msgid "Focus the active notification"
 msgid "Keybinding to focus the active notification."
 msgstr "Nasgadh iuchrach gus am fòcas a chur air a' bhrath ghnìomhach."

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:37
-#| msgid "Open the application menu"
 msgid "The application icon mode."
 msgstr "Modh ìomhaigheag na h-aplacaid."

@@ -95,51 +124,52 @@ msgstr "Modh ìomhaigheag na h-aplacaid."
 msgid "Network Login"
 msgstr "Clàradh a-steach lìonraidh"

-#: ../js/extensionPrefs/main.js:122
+#: ../js/extensionPrefs/main.js:117
 #, javascript-format
 msgid "There was an error loading the preferences dialog for %s:"
 msgstr "Thachair mearachd le luchdadh còmhradh nan roghainnean airson %s:"

-#: ../js/extensionPrefs/main.js:154
+#: ../js/extensionPrefs/main.js:149
 msgid "GNOME Shell Extensions"
 msgstr "Leudachain na Slige GNOME"

-#: ../js/gdm/authPrompt.js:147 ../js/ui/components/networkAgent.js:145
+#: ../js/gdm/authPrompt.js:147 ../js/ui/audioDeviceSelection.js:71
+#: ../js/ui/components/networkAgent.js:145
 #: ../js/ui/components/polkitAgent.js:179 ../js/ui/endSessionDialog.js:452
 #: ../js/ui/extensionDownloader.js:195 ../js/ui/shellMountOperation.js:399
 #: ../js/ui/status/network.js:916
 msgid "Cancel"
 msgstr "Sguir dheth"

-#: ../js/gdm/authPrompt.js:169 ../js/gdm/authPrompt.js:215
-#: ../js/gdm/authPrompt.js:447
+#: ../js/gdm/authPrompt.js:169 ../js/gdm/authPrompt.js:216
+#: ../js/gdm/authPrompt.js:448
 msgid "Next"
 msgstr "Air adhart"

-#: ../js/gdm/authPrompt.js:211 ../js/ui/shellMountOperation.js:403
+#: ../js/gdm/authPrompt.js:212 ../js/ui/shellMountOperation.js:403
 #: ../js/ui/unlockDialog.js:59
 msgid "Unlock"
 msgstr "Neo-ghlais"

-#: ../js/gdm/authPrompt.js:213
+#: ../js/gdm/authPrompt.js:214
 msgctxt "button"
 msgid "Sign In"
 msgstr "Clàraich a-steach"

-#: ../js/gdm/loginDialog.js:281
+#: ../js/gdm/loginDialog.js:285
 msgid "Choose Session"
 msgstr "Tagh seisean"

 #. translators: this message is shown below the user list on the
 #. login screen. It can be activated to reveal an entry for
 #. manually entering the username.
-#: ../js/gdm/loginDialog.js:431
+#: ../js/gdm/loginDialog.js:435
 msgid "Not listed?"
 msgstr "Nach eil e air an liosta?"

 #. Translators: this message is shown below the username entry field
 #. to clue the user in on how to login to the local network realm
-#: ../js/gdm/loginDialog.js:850
+#: ../js/gdm/loginDialog.js:859
 #, javascript-format
 msgid "(e.g., user or %s)"
 msgstr "(m.e., cleachdaiche no %s)"
@@ -147,12 +177,12 @@ msgstr "(m.e., cleachdaiche no %s)"
 #. TTLS and PEAP are actually much more complicated, but this complication
 #. is not visible here since we only care about phase2 authentication
 #. (and don't even care of which one)
-#: ../js/gdm/loginDialog.js:855 ../js/ui/components/networkAgent.js:271
+#: ../js/gdm/loginDialog.js:864 ../js/ui/components/networkAgent.js:271
 #: ../js/ui/components/networkAgent.js:289
 msgid "Username: "
 msgstr "Ainm-cleachdaiche:"

-#: ../js/gdm/loginDialog.js:1180
+#: ../js/gdm/loginDialog.js:1201
 msgid "Login Window"
 msgstr "Uinneag a' chlàraidh a-steach"

@@ -288,16 +318,37 @@ msgstr "Cuir ris na h-annsachdan"
 msgid "Show Details"
 msgstr "Seall am mion-fhiosrachadh"

-#: ../js/ui/appFavorites.js:133
+#: ../js/ui/appFavorites.js:134
 #, javascript-format
 msgid "%s has been added to your favorites."
 msgstr "Chaidh %s a chur ris na h-annsachdan agad."

-#: ../js/ui/appFavorites.js:167
+#: ../js/ui/appFavorites.js:168
 #, javascript-format
 msgid "%s has been removed from your favorites."
 msgstr "Chaidh %s a toirt air falbh o na h-annsachdan agad."

+#: ../js/ui/audioDeviceSelection.js:59
+msgid "Select Audio Device"
+msgstr "Tagh uidheam fuaime"
+
+#: ../js/ui/audioDeviceSelection.js:69
+#| msgid "Account Settings"
+msgid "Sound Settings"
+msgstr "Roghainnean fuaime"
+
+#: ../js/ui/audioDeviceSelection.js:78
+msgid "Headphones"
+msgstr "Headphones"
+
+#: ../js/ui/audioDeviceSelection.js:80
+msgid "Headset"
+msgstr "Headset"
+
+#: ../js/ui/audioDeviceSelection.js:82 ../js/ui/status/volume.js:213
+msgid "Microphone"
+msgstr "Micreofon"
+
 #: ../js/ui/backgroundMenu.js:19
 msgid "Change Background…"
 msgstr "Atharraich an cùlaibh…"
@@ -306,12 +357,12 @@ msgstr "Atharraich an cùlaibh…"
 msgid "Display Settings"
 msgstr "Roghainnean an t-seallaidh"

-#: ../js/ui/backgroundMenu.js:22 ../js/ui/status/system.js:366
+#: ../js/ui/backgroundMenu.js:22 ../js/ui/status/system.js:371
 msgid "Settings"
 msgstr "Roghainnean"

 #. Translators: Enter 0-6 (Sunday-Saturday) for non-work days. Examples: "0" (Sunday) "6" (Saturday) "06" (Sunday and Saturday).
-#: ../js/ui/calendar.js:55
+#: ../js/ui/calendar.js:47
 msgctxt "calendar-no-work"
 msgid "06"
 msgstr "06"
@@ -321,100 +372,96 @@ msgstr "06"
 #. * NOTE: These grid abbreviations are always shown together
 #. * and in order, e.g. "S M T W T F S".
 #.
-#: ../js/ui/calendar.js:84
+#: ../js/ui/calendar.js:76
 msgctxt "grid sunday"
 msgid "S"
 msgstr "Dò"

 #. Translators: Calendar grid abbreviation for Monday
-#: ../js/ui/calendar.js:86
+#: ../js/ui/calendar.js:78
 msgctxt "grid monday"
 msgid "M"
 msgstr "Lu"

 #. Translators: Calendar grid abbreviation for Tuesday
-#: ../js/ui/calendar.js:88
+#: ../js/ui/calendar.js:80
 msgctxt "grid tuesday"
 msgid "T"
 msgstr "Mà"

 #. Translators: Calendar grid abbreviation for Wednesday
-#: ../js/ui/calendar.js:90
+#: ../js/ui/calendar.js:82
 msgctxt "grid wednesday"
 msgid "W"
 msgstr "Ci"

 #. Translators: Calendar grid abbreviation for Thursday
-#: ../js/ui/calendar.js:92
+#: ../js/ui/calendar.js:84
 msgctxt "grid thursday"
 msgid "T"
 msgstr "Da"

 #. Translators: Calendar grid abbreviation for Friday
-#: ../js/ui/calendar.js:94
+#: ../js/ui/calendar.js:86
 msgctxt "grid friday"
 msgid "F"
 msgstr "hA"

 #. Translators: Calendar grid abbreviation for Saturday
-#: ../js/ui/calendar.js:96
+#: ../js/ui/calendar.js:88
 msgctxt "grid saturday"
 msgid "S"
 msgstr "Sa"

-#: ../js/ui/calendar.js:566
+#: ../js/ui/calendar.js:416
 msgid "Previous month"
 msgstr "Am mìos roimhe"

-#: ../js/ui/calendar.js:576
+#: ../js/ui/calendar.js:426
 msgid "Next month"
 msgstr "An ath mhìos"

-#: ../js/ui/calendar.js:728
-#, javascript-format
+#: ../js/ui/calendar.js:579
+#, no-javascript-format
 msgctxt "date day number format"
 msgid "%d"
 msgstr "%d"

-#: ../js/ui/calendar.js:783
+#: ../js/ui/calendar.js:634
 msgid "Week %V"
 msgstr "Seachdain %V"

 #. Translators: Shown in calendar event list for all day events
 #. * Keep it short, best if you can use less then 10 characters
 #.
-#: ../js/ui/calendar.js:1188
+#: ../js/ui/calendar.js:695
 msgctxt "event list time"
 msgid "All Day"
 msgstr "Fad an latha"

-#: ../js/ui/calendar.js:1295
-msgid "Clear section"
-msgstr "Falamhaich an earrann"
-
-#: ../js/ui/calendar.js:1522
+#: ../js/ui/calendar.js:821
 msgid "Events"
 msgstr "Tachartasan"

-#: ../js/ui/calendar.js:1531
+#: ../js/ui/calendar.js:830
 msgctxt "calendar heading"
 msgid "%A, %B %d"
 msgstr "%A, %d %B"

-#: ../js/ui/calendar.js:1535
+#: ../js/ui/calendar.js:834
 msgctxt "calendar heading"
 msgid "%A, %B %d, %Y"
 msgstr "%A, %d %B, %Y"

-#: ../js/ui/calendar.js:1620
+#: ../js/ui/calendar.js:919
 msgid "Notifications"
 msgstr "Brathan"

-#: ../js/ui/calendar.js:1771
+#: ../js/ui/calendar.js:1070
 msgid "No Notifications"
 msgstr "Chan eil brath ann"

-#: ../js/ui/calendar.js:1774
+#: ../js/ui/calendar.js:1073
 msgid "No Events"
 msgstr "Chan eil tachartas ann"

@@ -553,7 +600,7 @@ msgstr ""

 #. Translators: this is the other person changing their old IM name to their new
 #. IM name.
-#: ../js/ui/components/telepathyClient.js:759
+#: ../js/ui/components/telepathyClient.js:760
 #, javascript-format
 msgid "%s is now known as %s"
 msgstr "thug %s %s air"
@@ -762,11 +809,11 @@ msgid "Keyboard"
 msgstr "Am meur-chlàr"

 #. translators: 'Hide' is a verb
-#: ../js/ui/legacyTray.js:66
+#: ../js/ui/legacyTray.js:65
 msgid "Hide tray"
 msgstr "Falaich an treidhe"

-#: ../js/ui/legacyTray.js:107
+#: ../js/ui/legacyTray.js:106
 msgid "Status Icons"
 msgstr "Ìomhaigheagan staide"

@@ -794,7 +841,7 @@ msgstr "An comas"

 #. translators:
 #. * The device has been disabled
-#: ../js/ui/lookingGlass.js:719 ../src/gvc/gvc-mixer-control.c:1828
+#: ../js/ui/lookingGlass.js:719 ../src/gvc/gvc-mixer-control.c:1866
 msgid "Disabled"
 msgstr "À comas"

@@ -818,10 +865,30 @@ msgstr "Seall am bun-tùs"
 msgid "Web Page"
 msgstr "Duilleag-lìn"

+#: ../js/ui/messageList.js:543
+msgid "Clear section"
+msgstr "Falamhaich an earrann"
+
 #: ../js/ui/messageTray.js:1486
 msgid "System Information"
 msgstr "Fiosrachadh an t-siostaim"

+#: ../js/ui/mpris.js:194
+#| msgctxt "program"
+#| msgid "Unknown"
+msgid "Unknown artist"
+msgstr "Neach-ciùil nach aithne dhuinn"
+
+#: ../js/ui/mpris.js:195
+#| msgctxt "program"
+#| msgid "Unknown"
+msgid "Unknown title"
+msgstr "Tiotal nach aithne dhuinn"
+
+#: ../js/ui/mpris.js:217
+msgid "Media"
+msgstr "Meadhanan"
+
 #: ../js/ui/overview.js:84
 msgid "Undo"
 msgstr "Neo-dhèan"
@@ -902,7 +969,7 @@ msgstr[1] "%d bhrath ùr"
 msgstr[2] "%d brathan ùra"
 msgstr[3] "%d brath ùr"

-#: ../js/ui/screenShield.js:432 ../js/ui/status/system.js:374
+#: ../js/ui/screenShield.js:432 ../js/ui/status/system.js:379
 msgid "Lock"
 msgstr "Glais"

@@ -1046,30 +1113,50 @@ msgstr "Soilleireachd"
 msgid "Show Keyboard Layout"
 msgstr "Seall co-dhealbhachd a' mheur-chlàir"

-#: ../js/ui/status/location.js:71 ../js/ui/status/location.js:177
+#: ../js/ui/status/location.js:107 ../js/ui/status/location.js:215
 msgid "Location Enabled"
 msgstr "Tha an t-ionad an comas"

-#: ../js/ui/status/location.js:72 ../js/ui/status/location.js:178
+#: ../js/ui/status/location.js:108 ../js/ui/status/location.js:216
 msgid "Disable"
 msgstr "Cuir à comas"

-#: ../js/ui/status/location.js:73
+#: ../js/ui/status/location.js:109
 msgid "Privacy Settings"
 msgstr "Roghainnean na prìobhaideachd"

-#: ../js/ui/status/location.js:176
+#: ../js/ui/status/location.js:214
 msgid "Location In Use"
 msgstr "Tha an t-ionad 'ga chleachdadh"

-#: ../js/ui/status/location.js:180
+#: ../js/ui/status/location.js:218
 msgid "Location Disabled"
 msgstr "Tha an t-ionad à comas"

-#: ../js/ui/status/location.js:181
+#: ../js/ui/status/location.js:219
 msgid "Enable"
 msgstr "Cuir an comas"

+#: ../js/ui/status/location.js:426
+msgid "Deny Access"
+msgstr "Diùlt an t-inntrigeadh"
+
+#: ../js/ui/status/location.js:429
+msgid "Grant Access"
+msgstr "Ceadaich an t-inntrigeadh"
+
+#. Translators: %s is an application name
+#: ../js/ui/status/location.js:435
+#, javascript-format
+msgid "Give %s access to your location?"
+msgstr "A bheil thu airson inntrigeadh dhan ionad agad a thoirt dha %s?"
+
+#: ../js/ui/status/location.js:437
+msgid "Location access can be changed at any time from the privacy settings."
+msgstr ""
+"'S urrainn dhut inntrigeadh an ionaid atharrachadh uair sam bith ann an "
+"roghainnean na prìobhaideachd."
+
 #: ../js/ui/status/network.js:101
 msgid "<unknown>"
 msgstr "<neo-aithnichte>"
@@ -1254,34 +1341,37 @@ msgstr "Dh'fhàillig leis a' cheangal"
 msgid "Activation of network connection failed"
 msgstr "Dh'fhàillig gnìomhachadh a' cheangail ris an lìonra"

-#: ../js/ui/status/power.js:49
+#: ../js/ui/status/power.js:61
 msgid "Power Settings"
 msgstr "Roghainnean na cumhachd"

-#: ../js/ui/status/power.js:65
+#: ../js/ui/status/power.js:77
 msgid "Fully Charged"
 msgstr "Air a làn-teairrdseadh"

 #. 0 is reported when UPower does not have enough data
 #. to estimate battery life
-#: ../js/ui/status/power.js:72 ../js/ui/status/power.js:78
+#: ../js/ui/status/power.js:84 ../js/ui/status/power.js:90
 msgid "Estimating…"
 msgstr "'Ga thuairmeas…"

 #. Translators: this is <hours>:<minutes> Remaining (<percentage>)
-#: ../js/ui/status/power.js:86
+#: ../js/ui/status/power.js:98
 #, javascript-format
-#| msgid "%d∶%02d Remaining (%d%%)"
 msgid "%d∶%02d Remaining (%d %%)"
 msgstr "%d∶%02d air fhàgail (%d %%)"

 #. Translators: this is <hours>:<minutes> Until Full (<percentage>)
-#: ../js/ui/status/power.js:91
+#: ../js/ui/status/power.js:103
 #, javascript-format
-#| msgid "%d∶%02d Until Full (%d%%)"
 msgid "%d∶%02d Until Full (%d %%)"
 msgstr "%d∶%02d gus am bi e làn (%d %%)"

+#: ../js/ui/status/power.js:131 ../js/ui/status/power.js:133
+#, javascript-format
+msgid "%d %%"
+msgstr "%d %%"
+
 #. The menu only appears when airplane mode is on, so just
 #. statically build it as if it was on, rather than dynamically
 #. changing the menu contents.
@@ -1289,27 +1379,27 @@ msgstr "%d∶%02d gus am bi e làn (%d %%)"
 msgid "Airplane Mode On"
 msgstr "Modh itealain air"

-#: ../js/ui/status/system.js:343
+#: ../js/ui/status/system.js:348
 msgid "Switch User"
 msgstr "Leum gu cleachdaiche eile"

-#: ../js/ui/status/system.js:348
+#: ../js/ui/status/system.js:353
 msgid "Log Out"
 msgstr "Clàraich a-mach"

-#: ../js/ui/status/system.js:353
+#: ../js/ui/status/system.js:358
 msgid "Account Settings"
 msgstr "Roghainnean a' chunntais"

-#: ../js/ui/status/system.js:370
+#: ../js/ui/status/system.js:375
 msgid "Orientation Lock"
 msgstr "Glais na comhair"

-#: ../js/ui/status/system.js:378
+#: ../js/ui/status/system.js:383
 msgid "Suspend"
 msgstr "Cuir 'na dhàil"

-#: ../js/ui/status/system.js:381
+#: ../js/ui/status/system.js:386
 msgid "Power Off"
 msgstr "Cuir a' chumhachd dheth"

@@ -1321,10 +1411,6 @@ msgstr "Dh'atharraich àirde na fuaime"
 msgid "Volume"
 msgstr "Àirde na fuaime"

-#: ../js/ui/status/volume.js:213
-msgid "Microphone"
-msgstr "Micreofon"
-
 #: ../js/ui/unlockDialog.js:67
 msgid "Log in as another user"
 msgstr "Clàraich an-steach mar chleachdaiche eile"
@@ -1451,7 +1537,7 @@ msgstr "Mìosachan Evolution"

 #. translators:
 #. * The number of sound outputs on a particular device
-#: ../src/gvc/gvc-mixer-control.c:1835
+#: ../src/gvc/gvc-mixer-control.c:1873
 #, c-format
 msgid "%u Output"
 msgid_plural "%u Outputs"
@@ -1462,7 +1548,7 @@ msgstr[3] "%u às-chur"

 #. translators:
 #. * The number of sound inputs on a particular device
-#: ../src/gvc/gvc-mixer-control.c:1845
+#: ../src/gvc/gvc-mixer-control.c:1883
 #, c-format
 msgid "%u Input"
 msgid_plural "%u Inputs"
@@ -1471,7 +1557,7 @@ msgstr[1] "%u ion-chur"
 msgstr[2] "%u ion-chuir"
 msgstr[3] "%u ion-chur"

-#: ../src/gvc/gvc-mixer-control.c:2371
+#: ../src/gvc/gvc-mixer-control.c:2738
 msgid "System Sounds"
 msgstr "Fuaimean an t-siostaim"

--- a/po/hr.po
+++ b/po/hr.po
--- a/po/pl.po
+++ b/po/pl.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-shell\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-10 17:25+0100\n"
-"PO-Revision-Date: 2016-03-10 17:27+0100\n"
+"POT-Creation-Date: 2016-07-12 21:20+0200\n"
+"PO-Revision-Date: 2016-07-12 21:21+0200\n"
 "Last-Translator: Piotr Drąg <piotrdrag@gmail.com>\n"
 "Language-Team: Polish <gnomepl@aviary.pl>\n"
 "Language: pl\n"
@@ -325,13 +325,13 @@ msgstr ""
 msgid "Network Login"
 msgstr "Logowanie do sieci"

-#: ../js/extensionPrefs/main.js:121
+#: ../js/extensionPrefs/main.js:117
 #, javascript-format
 msgid "There was an error loading the preferences dialog for %s:"
 msgstr ""
 "Wystąpił błąd podczas wczytywania okna preferencji dla rozszerzenia „%s”:"

-#: ../js/extensionPrefs/main.js:153
+#: ../js/extensionPrefs/main.js:149
 msgid "GNOME Shell Extensions"
 msgstr "Rozszerzenia powłoki GNOME"

@@ -558,7 +558,7 @@ msgstr "Zmień tło…"
 msgid "Display Settings"
 msgstr "Ustawienia ekranu"

-#: ../js/ui/backgroundMenu.js:22 ../js/ui/status/system.js:366
+#: ../js/ui/backgroundMenu.js:22 ../js/ui/status/system.js:371
 msgid "Settings"
 msgstr "Ustawienia"

@@ -800,7 +800,7 @@ msgstr "To nie zadziałało. Proszę spróbować ponownie."

 #. Translators: this is the other person changing their old IM name to their new
 #. IM name.
-#: ../js/ui/components/telepathyClient.js:759
+#: ../js/ui/components/telepathyClient.js:760
 #, javascript-format
 msgid "%s is now known as %s"
 msgstr "Użytkownik %s jest teraz znany jako %s"
@@ -1025,7 +1025,7 @@ msgstr "Włączone"

 #. translators:
 #. * The device has been disabled
-#: ../js/ui/lookingGlass.js:719 ../src/gvc/gvc-mixer-control.c:1828
+#: ../js/ui/lookingGlass.js:719 ../src/gvc/gvc-mixer-control.c:1866
 msgid "Disabled"
 msgstr "Wyłączone"

@@ -1115,7 +1115,7 @@ msgstr "toggle-switch-intl"

 #: ../js/ui/runDialog.js:71
 msgid "Enter a Command"
-msgstr "Proszę wprowadzić polecenie"
+msgstr "Proszę wprowadzić polecenie:"

 #: ../js/ui/runDialog.js:111 ../js/ui/windowMenu.js:162
 msgid "Close"
@@ -1147,7 +1147,7 @@ msgstr[0] "%d nowe powiadomienie"
 msgstr[1] "%d nowe powiadomienia"
 msgstr[2] "%d nowych powiadomień"

-#: ../js/ui/screenShield.js:432 ../js/ui/status/system.js:374
+#: ../js/ui/screenShield.js:432 ../js/ui/status/system.js:379
 msgid "Lock"
 msgstr "Zablokuj ekran"

@@ -1555,27 +1555,27 @@ msgstr "%d%%"
 msgid "Airplane Mode On"
 msgstr "Włączono tryb samolotowy"

-#: ../js/ui/status/system.js:343
+#: ../js/ui/status/system.js:348
 msgid "Switch User"
 msgstr "Przełącz użytkownika"

-#: ../js/ui/status/system.js:348
+#: ../js/ui/status/system.js:353
 msgid "Log Out"
 msgstr "Wyloguj się"

-#: ../js/ui/status/system.js:353
+#: ../js/ui/status/system.js:358
 msgid "Account Settings"
 msgstr "Ustawienia konta"

-#: ../js/ui/status/system.js:370
+#: ../js/ui/status/system.js:375
 msgid "Orientation Lock"
 msgstr "Blokada orientacji"

-#: ../js/ui/status/system.js:378
+#: ../js/ui/status/system.js:383
 msgid "Suspend"
 msgstr "Uśpij"

-#: ../js/ui/status/system.js:381
+#: ../js/ui/status/system.js:386
 msgid "Power Off"
 msgstr "Wyłącz komputer"

@@ -1708,7 +1708,7 @@ msgstr "Kalendarz programu Evolution"

 #. translators:
 #. * The number of sound outputs on a particular device
-#: ../src/gvc/gvc-mixer-control.c:1835
+#: ../src/gvc/gvc-mixer-control.c:1873
 #, c-format
 msgid "%u Output"
 msgid_plural "%u Outputs"
@@ -1718,7 +1718,7 @@ msgstr[2] "%u wyjść"

 #. translators:
 #. * The number of sound inputs on a particular device
-#: ../src/gvc/gvc-mixer-control.c:1845
+#: ../src/gvc/gvc-mixer-control.c:1883
 #, c-format
 msgid "%u Input"
 msgid_plural "%u Inputs"
@@ -1726,7 +1726,7 @@ msgstr[0] "%u wejście"
 msgstr[1] "%u wejścia"
 msgstr[2] "%u wejść"

-#: ../src/gvc/gvc-mixer-control.c:2371
+#: ../src/gvc/gvc-mixer-control.c:2738
 msgid "System Sounds"
 msgstr "Dźwięki systemowe"

@@ -1767,3 +1767,16 @@ msgstr "Hasło nie może być puste"
 #: ../src/shell-polkit-authentication-agent.c:353
 msgid "Authentication dialog was dismissed by the user"
 msgstr "Okno dialogowe uwierzytelnienia zostało odrzucone przez użytkownika"
+
+msgctxt "title"
+msgid "Restart & Install Upgrade"
+msgstr "Ponowne uruchomienie i instalacja aktualizacji"
+
+msgid ""
+"%s %s will be installed after restart. Upgrade installation can take a "
+"long time: ensure that you have backed up and that the computer is "
+"plugged in."
+msgstr ""
+"System %s %s zostanie zainstalowany po ponownym uruchomieniu. Instalacja "
+"aktualizacji może zająć dużo czasu. Proszę się upewnić, że wykonano kopię "
+"zapasową danych i podłączono komputer do prądu."
--- a/po/tr.po
+++ b/po/tr.po
@@ -14,7 +14,7 @@ msgstr ""
 "Project-Id-Version: gnome-shell\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
 "shell&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2016-03-19 10:22+0000\n"
+"POT-Creation-Date: 2016-09-10 21:51+0000\n"
 "PO-Revision-Date: 2016-03-19 20:56+0200\n"
 "Last-Translator: Muhammet Kara <muhammetk@gmail.com>\n"
 "Language-Team: Turkish <gnome-turk@gnome.org>\n"
@@ -368,7 +368,7 @@ msgstr "Listede yok mu?"

 #. Translators: this message is shown below the username entry field
 #. to clue the user in on how to login to the local network realm
-#: ../js/gdm/loginDialog.js:854
+#: ../js/gdm/loginDialog.js:859
 #, javascript-format
 msgid "(e.g., user or %s)"
 msgstr "(örneğin, kullanıcı veya %s)"
@@ -376,12 +376,12 @@ msgstr "(örneğin, kullanıcı veya %s)"
 #. TTLS and PEAP are actually much more complicated, but this complication
 #. is not visible here since we only care about phase2 authentication
 #. (and don't even care of which one)
-#: ../js/gdm/loginDialog.js:859 ../js/ui/components/networkAgent.js:271
+#: ../js/gdm/loginDialog.js:864 ../js/ui/components/networkAgent.js:271
 #: ../js/ui/components/networkAgent.js:289
 msgid "Username: "
 msgstr "Kullanıcı Adı: "

-#: ../js/gdm/loginDialog.js:1196
+#: ../js/gdm/loginDialog.js:1201
 msgid "Login Window"
 msgstr "Oturum Açma Penceresi"

@@ -532,7 +532,6 @@ msgid "Select Audio Device"
 msgstr "Ses Aygıtı Seç"

 #: ../js/ui/audioDeviceSelection.js:69
-#| msgid "Account Settings"
 msgid "Sound Settings"
 msgstr "Ses Ayarları"

@@ -556,7 +555,7 @@ msgstr "Arkaplanı Değiştir…"
 msgid "Display Settings"
 msgstr "Görüntü Ayarları"

-#: ../js/ui/backgroundMenu.js:22 ../js/ui/status/system.js:366
+#: ../js/ui/backgroundMenu.js:22 ../js/ui/status/system.js:371
 msgid "Settings"
 msgstr "Ayarlar"

@@ -1010,7 +1009,7 @@ msgstr "Etkin"

 #. translators:
 #. * The device has been disabled
-#: ../js/ui/lookingGlass.js:719 ../src/gvc/gvc-mixer-control.c:1828
+#: ../js/ui/lookingGlass.js:719 ../src/gvc/gvc-mixer-control.c:1866
 msgid "Disabled"
 msgstr "Devre dışı"

@@ -1043,13 +1042,10 @@ msgid "System Information"
 msgstr "Sistem Bilgisi"

 #: ../js/ui/mpris.js:194
-#| msgid "Unknown reason"
 msgid "Unknown artist"
 msgstr "Bilinmeyen sanatçı"

 #: ../js/ui/mpris.js:195
-#| msgctxt "program"
-#| msgid "Unknown"
 msgid "Unknown title"
 msgstr "Bilinmeyen başlık"

@@ -1131,7 +1127,7 @@ msgid "%d new notification"
 msgid_plural "%d new notifications"
 msgstr[0] "%d yeni bildirim"

-#: ../js/ui/screenShield.js:432 ../js/ui/status/system.js:374
+#: ../js/ui/screenShield.js:432 ../js/ui/status/system.js:379
 msgid "Lock"
 msgstr "Kilitle"

@@ -1536,27 +1532,27 @@ msgstr "%% %d"
 msgid "Airplane Mode On"
 msgstr "Uçak Kipi Açık"

-#: ../js/ui/status/system.js:343
+#: ../js/ui/status/system.js:348
 msgid "Switch User"
 msgstr "Kullanıcı Değiştir"

-#: ../js/ui/status/system.js:348
+#: ../js/ui/status/system.js:353
 msgid "Log Out"
 msgstr "Oturumu Kapat"

-#: ../js/ui/status/system.js:353
+#: ../js/ui/status/system.js:358
 msgid "Account Settings"
 msgstr "Hesap Ayarları"

-#: ../js/ui/status/system.js:370
+#: ../js/ui/status/system.js:375
 msgid "Orientation Lock"
 msgstr "Yönelim Kilidi"

-#: ../js/ui/status/system.js:378
+#: ../js/ui/status/system.js:383
 msgid "Suspend"
 msgstr "Beklet"

-#: ../js/ui/status/system.js:381
+#: ../js/ui/status/system.js:386
 msgid "Power Off"
 msgstr "Kapat"

@@ -1627,7 +1623,7 @@ msgstr "Önceki Boyut"

 #: ../js/ui/windowMenu.js:45
 msgid "Maximize"
-msgstr "En üst düzeye çıkar"
+msgstr "Ekranı kapla"

 #: ../js/ui/windowMenu.js:52
 msgid "Move"
@@ -1687,7 +1683,7 @@ msgstr "Evolution Takvim"

 #. translators:
 #. * The number of sound outputs on a particular device
-#: ../src/gvc/gvc-mixer-control.c:1835
+#: ../src/gvc/gvc-mixer-control.c:1873
 #, c-format
 msgid "%u Output"
 msgid_plural "%u Outputs"
@@ -1695,13 +1691,13 @@ msgstr[0] "%u Çıktı"

 #. translators:
 #. * The number of sound inputs on a particular device
-#: ../src/gvc/gvc-mixer-control.c:1845
+#: ../src/gvc/gvc-mixer-control.c:1883
 #, c-format
 msgid "%u Input"
 msgid_plural "%u Inputs"
 msgstr[0] "%u Girdi"

-#: ../src/gvc/gvc-mixer-control.c:2371
+#: ../src/gvc/gvc-mixer-control.c:2738
 msgid "System Sounds"
 msgstr "Sistem Sesleri"

--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -16,22 +16,23 @@
 # Tong Hui <tonghuix@gmail.com>, 2013, 2014, 2015.
 # Aron Xu <aronxu@gnome.org>, 2010, 2011, 2012, 2013, 2015, 2016.
 # liushuyu <liushuyu_011@126.com>, 2015.
+# Dingzhong Chen <wsxy162@gmail.com>, 2016.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-shell master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
 "shell&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2016-03-25 22:36+0000\n"
-"PO-Revision-Date: 2016-03-26 15:13+0800\n"
-"Last-Translator: Aron Xu <happyaron.xu@gmail.com>\n"
-"Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
+"POT-Creation-Date: 2017-05-19 12:32+0000\n"
+"PO-Revision-Date: 2016-05-14 00:34+0800\n"
+"Last-Translator: Dingzhong Chen <wsxy162@gmail.com>\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.7.6\n"
+"X-Generator: Gtranslator 2.91.7\n"

 #: ../data/50-gnome-shell-system.xml.in.h:1
 msgid "System"
@@ -345,7 +346,7 @@ msgstr "未列出？"

 #. Translators: this message is shown below the username entry field
 #. to clue the user in on how to login to the local network realm
-#: ../js/gdm/loginDialog.js:854
+#: ../js/gdm/loginDialog.js:859
 #, javascript-format
 msgid "(e.g., user or %s)"
 msgstr "(如 user 或 %s)"
@@ -353,12 +354,12 @@ msgstr "(如 user 或 %s)"
 #. TTLS and PEAP are actually much more complicated, but this complication
 #. is not visible here since we only care about phase2 authentication
 #. (and don't even care of which one)
-#: ../js/gdm/loginDialog.js:859 ../js/ui/components/networkAgent.js:271
+#: ../js/gdm/loginDialog.js:864 ../js/ui/components/networkAgent.js:271
 #: ../js/ui/components/networkAgent.js:289
 msgid "Username: "
 msgstr "用户名："

-#: ../js/gdm/loginDialog.js:1196
+#: ../js/gdm/loginDialog.js:1201
 msgid "Login Window"
 msgstr "登录窗口"

@@ -532,7 +533,7 @@ msgstr "更换壁纸..."
 msgid "Display Settings"
 msgstr "显示设置"

-#: ../js/ui/backgroundMenu.js:22 ../js/ui/status/system.js:366
+#: ../js/ui/backgroundMenu.js:22 ../js/ui/status/system.js:371
 msgid "Settings"
 msgstr "设置"

@@ -981,7 +982,7 @@ msgstr "已启用"

 #. translators:
 #. * The device has been disabled
-#: ../js/ui/lookingGlass.js:719 ../src/gvc/gvc-mixer-control.c:1828
+#: ../js/ui/lookingGlass.js:719 ../src/gvc/gvc-mixer-control.c:1866
 msgid "Disabled"
 msgstr "已禁用"

@@ -1099,7 +1100,7 @@ msgid "%d new notification"
 msgid_plural "%d new notifications"
 msgstr[0] "%d 条新通知"

-#: ../js/ui/screenShield.js:432 ../js/ui/status/system.js:374
+#: ../js/ui/screenShield.js:432 ../js/ui/status/system.js:379
 msgid "Lock"
 msgstr "锁定"

@@ -1213,9 +1214,11 @@ msgid "%d Connected"
 msgid_plural "%d Connected"
 msgstr[0] "%d 台设备已连接"

+# off 太短了，翻译成更具体的蓝牙已关闭，也能和其他字符串统一
 #: ../js/ui/status/bluetooth.js:138
+#, fuzzy
 msgid "Off"
-msgstr "关"
+msgstr "蓝牙已关闭"

 #: ../js/ui/status/bluetooth.js:140
 msgid "Not In Use"
@@ -1371,15 +1374,15 @@ msgstr "使用互联网连接"

 #: ../js/ui/status/network.js:813
 msgid "Airplane Mode is On"
-msgstr "已开启乘机模式"
+msgstr "已开启飞行模式"

 #: ../js/ui/status/network.js:814
 msgid "Wi-Fi is disabled when airplane mode is on."
-msgstr "启用乘机模式时 Wi-Fi 会关闭"
+msgstr "启用飞行模式时 Wi-Fi 会关闭"

 #: ../js/ui/status/network.js:815
 msgid "Turn Off Airplane Mode"
-msgstr "关闭乘机模式"
+msgstr "关闭飞行模式"

 #: ../js/ui/status/network.js:824
 msgid "Wi-Fi is Off"
@@ -1504,27 +1507,27 @@ msgstr "%d %%"
 msgid "Airplane Mode On"
 msgstr "已开启飞行模式"

-#: ../js/ui/status/system.js:343
+#: ../js/ui/status/system.js:348
 msgid "Switch User"
 msgstr "切换用户"

-#: ../js/ui/status/system.js:348
+#: ../js/ui/status/system.js:353
 msgid "Log Out"
 msgstr "注销"

-#: ../js/ui/status/system.js:353
+#: ../js/ui/status/system.js:358
 msgid "Account Settings"
 msgstr "帐号设置"

-#: ../js/ui/status/system.js:370
+#: ../js/ui/status/system.js:375
 msgid "Orientation Lock"
 msgstr "方向锁定"

-#: ../js/ui/status/system.js:378
+#: ../js/ui/status/system.js:383
 msgid "Suspend"
 msgstr "挂起"

-#: ../js/ui/status/system.js:381
+#: ../js/ui/status/system.js:386
 msgid "Power Off"
 msgstr "关机"

@@ -1655,7 +1658,7 @@ msgstr "Evolution 日历"

 #. translators:
 #. * The number of sound outputs on a particular device
-#: ../src/gvc/gvc-mixer-control.c:1835
+#: ../src/gvc/gvc-mixer-control.c:1873
 #, c-format
 msgid "%u Output"
 msgid_plural "%u Outputs"
@@ -1663,13 +1666,13 @@ msgstr[0] "%u 个输出"

 #. translators:
 #. * The number of sound inputs on a particular device
-#: ../src/gvc/gvc-mixer-control.c:1845
+#: ../src/gvc/gvc-mixer-control.c:1883
 #, c-format
 msgid "%u Input"
 msgid_plural "%u Inputs"
 msgstr[0] "%u 个输入"

-#: ../src/gvc/gvc-mixer-control.c:2371
+#: ../src/gvc/gvc-mixer-control.c:2738
 msgid "System Sounds"
 msgstr "系统声音"

--- a/src/calendar-server/gnome-shell-calendar-server.c
+++ b/src/calendar-server/gnome-shell-calendar-server.c
@@ -74,15 +74,15 @@ static App *_global_app = NULL;

 typedef struct
 {
+  char *rid;
  time_t start_time;
  time_t end_time;
 } CalendarOccurrence;

 typedef struct
 {
-  char   *id;
  char   *uid;
-  char   *rid;
+  char   *source_id;
  char   *backend_name;
  char   *summary;
  char   *description;
@@ -95,6 +95,12 @@ typedef struct
  GSList *occurrences;
 } CalendarAppointment;

+typedef struct
+{
+  ECalClient *client;
+  GHashTable *appointments;
+} CollectAppointmentsData;
+
 static time_t
 get_time_from_property (icalcomponent         *ical,
                        icalproperty_kind      prop_kind,
@@ -129,22 +135,6 @@ get_ical_uid (icalcomponent *ical)
  return g_strdup (icalcomponent_get_uid (ical));
 }

-static char *
-get_ical_rid (icalcomponent *ical)
-{
-  icalproperty        *prop;
-  struct icaltimetype  ical_time;
-
-  prop = icalcomponent_get_first_property (ical, ICAL_RECURRENCEID_PROPERTY);
-  if (!prop)
-    return NULL;
-
-  ical_time = icalproperty_get_recurrenceid (prop);
-
-  return icaltime_is_valid_time (ical_time) && !icaltime_is_null_time (ical_time) ?
-    g_strdup (icaltime_as_ical_string (ical_time)) : NULL;
-}
-
 static char *
 get_ical_summary (icalcomponent *ical)
 {
@@ -324,12 +314,14 @@ calendar_appointment_equal (CalendarAppointment *a,
      CalendarOccurrence *ob = lb->data;

      if (oa->start_time != ob->start_time ||
-          oa->end_time   != ob->end_time)
+          oa->end_time   != ob->end_time ||
+          null_safe_strcmp (oa->rid, ob->rid) != 0)
        return FALSE;
    }

  return
    null_safe_strcmp (a->uid,          b->uid)          == 0 &&
+    null_safe_strcmp (a->source_id,    b->source_id)    == 0 &&
    null_safe_strcmp (a->backend_name, b->backend_name) == 0 &&
    null_safe_strcmp (a->summary,      b->summary)      == 0 &&
    null_safe_strcmp (a->description,  b->description)  == 0 &&
@@ -345,18 +337,15 @@ calendar_appointment_free (CalendarAppointment *appointment)
  GSList *l;

  for (l = appointment->occurrences; l; l = l->next)
-    g_free (l->data);
-  g_slist_free (appointment->occurrences);
+    g_free (((CalendarOccurrence *)l->data)->rid);
+  g_slist_free_full (appointment->occurrences, g_free);
  appointment->occurrences = NULL;

-  g_free (appointment->id);
-  appointment->id = NULL;
-
  g_free (appointment->uid);
  appointment->uid = NULL;

-  g_free (appointment->rid);
-  appointment->rid = NULL;
+  g_free (appointment->source_id);
+  appointment->source_id = NULL;

  g_free (appointment->backend_name);
  appointment->backend_name = NULL;
@@ -377,13 +366,16 @@ calendar_appointment_free (CalendarAppointment *appointment)
 static void
 calendar_appointment_init (CalendarAppointment  *appointment,
                           icalcomponent        *ical,
-                           ECalClient           *cal,
-                           icaltimezone         *default_zone)
+                           ECalClient           *cal)
 {
-  const char *source_uid;
+  icaltimezone *default_zone;
+  const char *source_id;
+
+  source_id = e_source_get_uid (e_client_get_source (E_CLIENT (cal)));
+  default_zone = e_cal_client_get_default_timezone (cal);

  appointment->uid          = get_ical_uid (ical);
-  appointment->rid          = get_ical_rid (ical);
+  appointment->source_id    = g_strdup (source_id);
  appointment->backend_name = get_source_backend_name (cal);
  appointment->summary      = get_ical_summary (ical);
  appointment->description  = get_ical_description (ical);
@@ -393,16 +385,6 @@ calendar_appointment_init (CalendarAppointment  *appointment,
  appointment->is_all_day   = get_ical_is_all_day (ical,
                                                   appointment->start_time,
                                                   default_zone);
-
-  /* While the UID is usually enough to identify an event, only the triple
-   * of (source,UID,RID) is fully unambiguous; neither may contain '\n',
-   * so we can safely use it to create a unique ID from the triple
-   */
-  source_uid = e_source_get_uid (e_client_get_source (E_CLIENT (cal)));
-  appointment->id = g_strdup_printf ("%s\n%s\n%s",
-                                     source_uid,
-                                     appointment->uid,
-                                     appointment->rid ? appointment->rid : "");
 }

 static icaltimezone *
@@ -420,70 +402,52 @@ resolve_timezone_id (const char *tzid,
  return retval;
 }

-static gboolean
-calendar_appointment_collect_occurrence (ECalComponent  *component,
-                                         time_t          occurrence_start,
-                                         time_t          occurrence_end,
-                                         gpointer        data)
-{
-  CalendarOccurrence *occurrence;
-  GSList **collect_loc = data;
-
-  occurrence             = g_new0 (CalendarOccurrence, 1);
-  occurrence->start_time = occurrence_start;
-  occurrence->end_time   = occurrence_end;
-
-  *collect_loc = g_slist_prepend (*collect_loc, occurrence);
-
-  return TRUE;
-}
-
-static void
-calendar_appointment_generate_occurrences (CalendarAppointment *appointment,
-                                           icalcomponent       *ical,
-                                           ECalClient          *cal,
-                                           time_t               start,
-                                           time_t               end,
-                                           icaltimezone        *default_zone)
-{
-  ECalComponent *ecal;
-
-  g_assert (appointment->occurrences == NULL);
-
-  ecal = e_cal_component_new ();
-  e_cal_component_set_icalcomponent (ecal,
-                                     icalcomponent_new_clone (ical));
-
-  e_cal_recur_generate_instances (ecal,
-                                  start,
-                                  end,
-                                  calendar_appointment_collect_occurrence,
-                                  &appointment->occurrences,
-                                  (ECalRecurResolveTimezoneFn) resolve_timezone_id,
-                                  cal,
-                                  default_zone);
-
-  g_object_unref (ecal);
-
-  appointment->occurrences = g_slist_reverse (appointment->occurrences);
-}
-
 static CalendarAppointment *
 calendar_appointment_new (icalcomponent        *ical,
-                          ECalClient           *cal,
-                          icaltimezone         *default_zone)
+                          ECalClient           *cal)
 {
  CalendarAppointment *appointment;

  appointment = g_new0 (CalendarAppointment, 1);

-  calendar_appointment_init (appointment,
-                             ical,
-                             cal,
-                             default_zone);
+  calendar_appointment_init (appointment, ical, cal);
  return appointment;
 }

+static gboolean
+generate_instances_cb (ECalComponent *comp,
+                       time_t         start,
+                       time_t         end,
+                       gpointer       data)
+{
+  ECalClient *cal = ((CollectAppointmentsData *)data)->client;
+  GHashTable *appointments = ((CollectAppointmentsData *)data)->appointments;
+  CalendarAppointment *appointment;
+  CalendarOccurrence *occurrence;
+  const char *uid;
+
+  e_cal_component_get_uid (comp, &uid);
+  appointment = g_hash_table_lookup (appointments, uid);
+
+  if (appointment == NULL)
+    {
+      icalcomponent *ical = e_cal_component_get_icalcomponent (comp);
+
+      appointment = calendar_appointment_new (ical, cal);
+      g_hash_table_insert (appointments, g_strdup (uid), appointment);
+    }
+
+  occurrence             = g_new0 (CalendarOccurrence, 1);
+  occurrence->start_time = start;
+  occurrence->end_time   = end;
+  occurrence->rid        = e_cal_component_get_recurid_as_string (comp);
+
+  appointment->occurrences = g_slist_append (appointment->occurrences, occurrence);
+
+  return TRUE;
+}
+
+
 /* ---------------------------------------------------------------------------------------------------- */

 struct _App
@@ -526,6 +490,10 @@ app_update_timezone (App *app)
      app->timezone_location = location;
      print_debug ("Using timezone %s", app->timezone_location);
    }
+  else
+    {
+      g_free (location);
+    }
 }

 static gboolean
@@ -619,6 +587,7 @@ app_load_events (App *app)
  GList *ll;
  gchar *since_iso8601;
  gchar *until_iso8601;
+  gchar *query;

  /* out with the old */
  g_hash_table_remove_all (app->appointments);
@@ -645,14 +614,19 @@ app_load_events (App *app)
               since_iso8601,
               until_iso8601);

+  query = g_strdup_printf ("occur-in-time-range? (make-time \"%s\") "
+                           "(make-time \"%s\")",
+                           since_iso8601,
+                           until_iso8601);
+
  clients = calendar_sources_get_appointment_clients (app->sources);
  for (l = clients; l != NULL; l = l->next)
    {
      ECalClient *cal = E_CAL_CLIENT (l->data);
      GError *error;
-      gchar *query;
      GSList *objects, *j;
      ECalClientView *view;
+      CollectAppointmentsData data;

      e_cal_client_set_default_timezone (cal, app->zone);

@@ -666,45 +640,13 @@ app_load_events (App *app)
          continue;
        }

-      query = g_strdup_printf ("occur-in-time-range? (make-time \"%s\") "
-                               "(make-time \"%s\")",
-                               since_iso8601,
-                               until_iso8601);
-      error = NULL;
-      objects = NULL;
-      if (!e_cal_client_get_object_list_sync (cal,
-					      query,
-					      &objects,
-					      NULL, /* cancellable */
-					      &error))
-        {
-          ESource *source = e_client_get_source (E_CLIENT (cal));
-          g_warning ("Error querying calendar %s: %s\n",
-		     e_source_get_uid (source), error->message);
-          g_error_free (error);
-          g_free (query);
-          continue;
-        }
-
-      for (j = objects; j != NULL; j = j->next)
-        {
-          icalcomponent *ical = j->data;
-          CalendarAppointment *appointment;
-
-          appointment = calendar_appointment_new (ical, cal, app->zone);
-          if (appointment == NULL)
-            continue;
-
-          calendar_appointment_generate_occurrences (appointment,
-                                                     ical,
-                                                     cal,
-                                                     app->since,
-                                                     app->until,
-                                                     app->zone);
-          g_hash_table_insert (app->appointments, g_strdup (appointment->uid), appointment);
-        }
-
-      e_cal_client_free_icalcomp_slist (objects);
+      data.client = cal;
+      data.appointments = app->appointments;
+      e_cal_client_generate_instances_sync (cal,
+                                            app->since,
+                                            app->until,
+                                            generate_instances_cb,
+                                            &data);

      error = NULL;
      if (!e_cal_client_get_view_sync (cal,
@@ -733,12 +675,11 @@ app_load_events (App *app)
          e_cal_client_view_start (view, NULL);
          app->live_views = g_list_prepend (app->live_views, view);
        }
-
-      g_free (query);
    }
  g_list_free (clients);
  g_free (since_iso8601);
  g_free (until_iso8601);
+  g_free (query);
  app->cache_invalid = FALSE;
 }

@@ -929,16 +870,27 @@ handle_method_call (GDBusConnection       *connection,
                  (start_time <= app->since &&
                  (end_time - 1) > app->since))
                {
+                  /* While the UID is usually enough to identify an event,
+                   * only the triple of (source,UID,RID) is fully unambiguous;
+                   * neither may contain '\n', so we can safely use it to
+                   * create a unique ID from the triple
+                   */
+                  char *id = g_strdup_printf ("%s\n%s\n%s",
+                                              a->source_id,
+                                              a->uid,
+                                              o->rid ? o->rid : "");
+
                  g_variant_builder_init (&extras_builder, G_VARIANT_TYPE ("a{sv}"));
                  g_variant_builder_add (&builder,
                                         "(sssbxxa{sv})",
-                                         a->id,
+                                         id,
                                         a->summary != NULL ? a->summary : "",
                                         a->description != NULL ? a->description : "",
                                         (gboolean) a->is_all_day,
                                         (gint64) start_time,
                                         (gint64) end_time,
                                         extras_builder);
+                  g_free (id);
                }
            }
        }
--- a/tests/unit/markup.js
+++ b/tests/unit/markup.js
@@ -1,6 +1,6 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-

-// Test cases for Calendar markup parsing
+// Test cases for MessageList markup parsing

 const JsUnit = imports.jsUnit;
 const Pango = imports.gi.Pango;
@@ -8,7 +8,7 @@ const Pango = imports.gi.Pango;
 const Environment = imports.ui.environment;
 Environment.init();

-const Calendar = imports.ui.calendar;
+const MessageList = imports.ui.messageList;

 // Assert that @input, assumed to be markup, gets "fixed" to @output,
 // which is valid markup. If @output is null, @input is expected to
@@ -16,7 +16,7 @@ const Calendar = imports.ui.calendar;
 function assertConverts(input, output) {
    if (!output)
        output = input;
-    let fixed = Calendar._fixMarkup(input, true);
+    let fixed = MessageList._fixMarkup(input, true);
    JsUnit.assertEquals(output, fixed);

    let parsed = false;
@@ -30,7 +30,7 @@ function assertConverts(input, output) {
 // Assert that @input, assumed to be plain text, gets escaped to @output,
 // which is valid markup.
 function assertEscapes(input, output) {
-    let fixed = Calendar._fixMarkup(input, false);
+    let fixed = MessageList._fixMarkup(input, false);
    JsUnit.assertEquals(output, fixed);

    let parsed = false;
Author	SHA1	Message	Date
Dz Chen	5e290d06dd	Update zh_CN translation	2017-10-21 19:38:34 +08:00
Jeremy Bicha	b08270a750	tests: Update markup test for function moved to messageList https://bugzilla.gnome.org/show_bug.cgi?id=782802	2017-05-19 08:29:46 -04:00
Ray Strode	783f9b1739	loginDialog: don't allow type ahead at the login screen It's weird if after you select a username from the user list, there's a password already filled in. This commit disables at that feature for the login screen (but keeps it in tact for the unlock screen) https://bugzilla.gnome.org/show_bug.cgi?id=766139	2017-02-14 03:04:53 +01:00
Muhammet Kara	7db0729ea1	Update Turkish translation	2017-01-08 20:03:47 +00:00
Debarshi Ray	adcf275b86	portalHelper: Address intermittent TLS failures Users are currently experiencing intermittent (and hard to debug) TLS errors when loading the portal authentication page. This could be caused by using http://www.gnome.org/ for our connectivity checks because it redirects to HTTPS. We can completely remove TLS from the equation by not using HTTPS. http://nmcheck.gnome.org/ is a good choice because it doesn't redirect to HTTPS and was created for NetworkManager's connectivity check. https://bugzilla.gnome.org/show_bug.cgi?id=769940	2016-11-23 18:41:31 +01:00
Carlos Garcia Campos	f49e28aedc	browser-plugin: The NPObject returned by NPP_GetValue should be retained The Mozilla documentation says: "And as always when working with reference counted NPObjects, the caller is responsible for calling NPN_ReleaseObject on the NPObject to drop the reference." Browsers assume that the plugin does the right thing and always call NPN_ReleaseObject. At some point the object is released and deallocated and both the plugin and browser still have references to the object thinking that it's still alive. That's why the crash is sometimes in the plugin when it tries to use the np object, and sometimes in the browser. https://bugzilla.gnome.org/post_bug.cgi	2016-10-29 10:48:37 -05:00
gogo	80b2e810ed	Add Croatian translation	2016-10-09 19:25:11 +00:00
GNOME Translation Robot	d5dc463a87	Updated Scottish Gaelic translation	2016-09-13 09:43:19 +00:00
Michael Catanzaro	15e727e174	loginDialog: fix cancel button in ask for username mode If the user clicks Not Listed? to enter ask for username mode, clicks cancel, and then attempts to log in via the user list, the user will see "Authentication failed" after correctly typing the password, and then will become stuck in an empty screen with just the gray noise background. The problem is, we forgot to disconnect from the signal that's waiting for the next button to be pressed on the username entry screen. Since the signal handler that executes here is expecting the username to be input, and isn't prepared for us to have switched back to user list, various bad things happen. We try to start two gdm-password conversations at once, for instance, one using the user's password as the username. I stopped investigating here, because it's easy to fix by disconnecting from the signal at the right time. https://bugzilla.gnome.org/show_bug.cgi?id=770328	2016-09-10 16:51:19 -05:00
Florian Müllner	890a1f112b	calendar-server: Add back missing return value In commit `7e0e224e0`, when moving from e_cal_recur_generate_instances() to e_cal_client_generate_instances(), the return value of the ECalRecurInstanceFn callback was accidentally removed; add it back. https://bugzilla.gnome.org/show_bug.cgi?id=769156	2016-08-20 01:37:59 +02:00
Florian Müllner	a7ab0892e6	Update to 3.20.4 Update NEWS.	2016-08-19 22:58:50 +02:00
Piotr Drąg	1d9f48993e	Updated Polish translation	2016-07-12 21:22:04 +02:00
Florian Müllner	b21e4d1dee	calendar-server: Use the actual recurrence ID of events Instead of querying the client for a list of objects and using e_cal_recur_generate_instances() to get occurrences for each of them, we can use e_cal_client_generate_instances_sync() which combines the functionality of both functions. This doesn't only save us some lines of code (yay!), but also gives us access to the real recurrence ID of an event, so we can get rid of the hack of faking one. https://bugzilla.gnome.org/show_bug.cgi?id=748226	2016-07-08 18:09:22 +02:00
Florian Müllner	bea8def074	calendar-server: Get recurrence ID from occurrences We use the triplet of source ID, UID and recurrence ID to create an ID to unambiguously identify an event, which we use to implement hiding dismissed events from the calendar. However we currently try to fetch the recurrence ID from the objects returned by e_cal_client_get_object_list_sync(), which are always the primary events with no recurrence ID. Instead, we need a recurrence ID associated with each occurrence. https://bugzilla.gnome.org/show_bug.cgi?id=748226	2016-07-08 18:09:22 +02:00
Florian Müllner	0d862181f2	calendar-server: Fetch default zone from client We are already setting the default zone on the client, no need to pass it around. https://bugzilla.gnome.org/show_bug.cgi?id=748226	2016-07-08 18:09:22 +02:00
Florian Müllner	8994d53355	calendar-server: Fix a memory leak App will take ownership of the location string when the timezone changes, but not when there was no change - free the memory in that case. https://bugzilla.gnome.org/show_bug.cgi?id=748226	2016-07-08 18:09:22 +02:00
Florian Müllner	7327448f45	calendar-server: Minor optimization We use the same query string for all sources, so no need to allocate/free it on each loop iteration. https://bugzilla.gnome.org/show_bug.cgi?id=748226	2016-07-08 18:09:22 +02:00
Florian Müllner	8587fc7461	calendar-server: Remove an unnecessary check calendar_appointment_new() never returns %NULL, so no need to check for it.	2016-07-08 18:09:18 +02:00
Florian Müllner	7c44909da6	location: Update for PermissionStore DBus API changes As xdg-app has been renamed to Flatpak, the permission store's bus name and interface name have been changes as well. https://bugzilla.gnome.org/show_bug.cgi?id=766598	2016-07-08 13:15:24 +02:00
Bruce Cowan	6a93afa333	Updated British English translation	2016-07-01 17:17:05 +01:00
Hyungwon Hwang	71c26cc7ce	background: free MetaBackground explicitly when its MetaBackgroundActor is destroyed The memory which MetaBackground resides is freed automatically, when its wrapper object Background is freed by garbage collection. But because the memory for MetaBackground is huge, changing the background or changing the background mode repeatedly makes a lot of memory to be in use until garbage collection runs. This patch frees the MetaBackground object explicitly when its MetaBackgroundActor is destroyed which is the moment that the memory in the object is not used anymore. https://bugzilla.gnome.org/show_bug.cgi?id=766353 Signed-off-by: Hyungwon Hwang <hyungwon.hwang7@gmail.com>	2016-06-29 15:17:56 +02:00