Added Occitan translation

We don't want to block the shell start to load evolution-data-server
and open all calendars (which can involve network connections)

https://bugzilla.gnome.org/show_bug.cgi?id=694030

NEWS

@@ -1,3 +1,13 @@
+3.6.3.1
+=======
+* Fix regression in reentrancy fix for 3.6.3 [Giovanni; #689295]
+
+Contributors:
+  Giovanni Campagna
+
+Translations:
+  Rafael Ferreira [pt_BR]
+
 3.6.3
 =====
 * recorder: Set frame duration to fix broken video headers [Adel; #688487]

configure.ac

@@ -1,5 +1,5 @@
 AC_PREREQ(2.63)
-AC_INIT([gnome-shell],[3.6.3],[https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-shell],[gnome-shell])
+AC_INIT([gnome-shell],[3.6.3.1],[https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-shell],[gnome-shell])
 
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_SRCDIR([src/shell-global.c])

js/ui/calendar.js

@@ -2,6 +2,7 @@
 
 const Clutter = imports.gi.Clutter;
 const Gio = imports.gi.Gio;
+const GLib = imports.gi.GLib;
 const Lang = imports.lang;
 const St = imports.gi.St;
 const Signals = imports.signals;
@@ -203,15 +204,12 @@ const CalendarServerIface = <interface name="org.gnome.Shell.CalendarServer">
 const CalendarServerInfo  = Gio.DBusInterfaceInfo.new_for_xml(CalendarServerIface);
 
 function CalendarServer() {
-    var self = new Gio.DBusProxy({ g_connection: Gio.DBus.session,
+    return new Gio.DBusProxy({ g_connection: Gio.DBus.session,
                                g_interface_name: CalendarServerInfo.name,
                                g_interface_info: CalendarServerInfo,
                                g_name: 'org.gnome.Shell.CalendarServer',
                                g_object_path: '/org/gnome/Shell/CalendarServer',
                                g_flags: Gio.DBusProxyFlags.DO_NOT_LOAD_PROPERTIES });
-
-    self.init(null);
-    return self;
 }
 
 function _datesEqual(a, b) {
@@ -239,7 +237,16 @@ const DBusEventSource = new Lang.Class({
     _init: function() {
         this._resetCache();
 
+        this._initialized = false;
         this._dbusProxy = new CalendarServer();
+        this._dbusProxy.init_async(GLib.PRIORITY_DEFAULT, null, Lang.bind(this, function(object, result) {
+            try {
+                this._dbusProxy.init_finish(result);
+            } catch(e) {
+                log('Error loading calendars: ' + e.message);
+                return;
+            }
+
             this._dbusProxy.connectSignal('Changed', Lang.bind(this, this._onChanged));
 
             this._dbusProxy.connect('notify::g-name-owner', Lang.bind(this, function() {
@@ -248,6 +255,10 @@ const DBusEventSource = new Lang.Class({
                 else
                     this._onNameVanished();
             }));
+
+            this._initialized = true;
+            this._onNameAppeared();
+        }));
     },
 
     _resetCache: function() {
@@ -292,6 +303,10 @@ const DBusEventSource = new Lang.Class({
     },
 
     _loadEvents: function(forceReload) {
+        // Ignore while loading
+        if (!this._initialized)
+            return;
+
         if (this._curRequestBegin && this._curRequestEnd){
             let callFlags = Gio.DBusCallFlags.NO_AUTO_START;
             if (forceReload)

js/ui/messageTray.js

@@ -2200,40 +2200,28 @@ const MessageTray = new Lang.Class({
     _updateShowingNotification: function() {
         this._notification.acknowledged = true;
 
-        Tweener.removeTweens(this._notificationWidget);
-
         // We auto-expand notifications with CRITICAL urgency.
-        // We use Tweener.removeTweens() to remove a tween that was hiding the notification we are
+        if (this._notification.urgency == Urgency.CRITICAL)
-        // updating, in case that notification was in the process of being hidden. However,
-        // Tweener.removeTweens() would also remove a tween that was updating the position of the
-        // notification we are updating, in case that notification was already expanded and its height
-        // changed. Therefore we need to call this._expandNotification() for expanded notifications
-        // to make sure their position is updated.
-        if (this._notification.urgency == Urgency.CRITICAL || this._notification.expanded)
             this._expandNotification(true);
 
         // We tween all notifications to full opacity. This ensures that both new notifications and
         // notifications that might have been in the process of hiding get full opacity.
         //
-        // We tween any notification showing in the banner mode to banner height
+        // We tween any notification showing in the banner mode to the appropriate height
-        // (this._notificationWidget.y = -this._notificationWidget.height).
+        // (which is banner height or expanded height, depending on the notification state)
         // This ensures that both new notifications and notifications in the banner mode that might
-        // have been in the process of hiding are shown with the banner height.
+        // have been in the process of hiding are shown with the correct height.
         //
         // We use this._showNotificationCompleted() onComplete callback to extend the time the updated
         // notification is being shown.
-        //
+
-        // We don't set the y parameter for the tween for expanded notifications because
-        // this._expandNotification() will result in getting this._notificationWidget.y set to the appropriate
-        // fully expanded value.
         let tweenParams = { opacity: 255,
+                            y: -this._notificationWidget.height,
                             time: ANIMATION_TIME,
                             transition: 'easeOutQuad',
                             onComplete: this._showNotificationCompleted,
                             onCompleteScope: this
                           };
-        if (!this._notification.expanded)
-            tweenParams.y = -this._notificationWidget.height;
 
         this._tween(this._notificationWidget, '_notificationState', State.SHOWN, tweenParams);
    },

js/ui/modalDialog.js

@@ -57,7 +57,9 @@ const ModalDialog = new Lang.Class({
 
         this._group.connect('destroy', Lang.bind(this, this._onGroupDestroy));
 
+        this._pressedKey = null;
         this._actionKeys = {};
+        this._group.connect('key-press-event', Lang.bind(this, this._onKeyPressEvent));
         this._group.connect('key-release-event', Lang.bind(this, this._onKeyReleaseEvent));
 
         this._backgroundBin = new St.Bin();
@@ -186,8 +188,18 @@ const ModalDialog = new Lang.Class({
 
     },
 
+    _onKeyPressEvent: function(object, event) {
+        this._pressedKey = event.get_key_symbol();
+    },
+
     _onKeyReleaseEvent: function(object, event) {
+        let pressedKey = this._pressedKey;
+        this._pressedKey = null;
+
         let symbol = event.get_key_symbol();
+        if (symbol != pressedKey)
+            return false;
+
         let action = this._actionKeys[symbol];
 
         if (action) {

po/LINGUAS

@@ -44,6 +44,7 @@ ms
 nb
 nl
 nn
+oc
 or
 pa
 pl

po/id.po

@@ -2,7 +2,7 @@
 # Copyright (C) 2010 THE gnome-shell'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the gnome-shell package.
 #
-# Andika Triwidada <andika@gmail.com>, 2010, 2011, 2012.
+# Andika Triwidada <andika@gmail.com>, 2010, 2011, 2012, 2013.
 # Dirgita <dirgitadevina@yahoo.co.id>, 2011, 2012.
 # Wibiharto <wibinem@yahoo.com>, 2011.
 msgid ""
@@ -10,8 +10,8 @@ msgstr ""
 "Project-Id-Version: gnome-shell gnome-3-6\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
 "shell&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2012-11-26 09:33+0000\n"
+"POT-Creation-Date: 2013-10-02 07:56+0000\n"
-"PO-Revision-Date: 2012-11-26 19:52+0700\n"
+"PO-Revision-Date: 2013-10-08 17:11+0700\n"
 "Last-Translator: Andika Triwidada <andika@gmail.com>\n"
 "Language-Team: Indonesian <gnome@i15n.org>\n"
 "Language: id\n"
@@ -20,7 +20,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Poedit-SourceCharset: UTF-8\n"
-"X-Generator: Poedit 1.5.4\n"
+"X-Generator: Poedit 1.5.7\n"
 
 #: ../data/50-gnome-shell-screenshot.xml.in.h:1
 msgid "Screenshots"
@@ -47,7 +47,6 @@ msgid "Window management and application launching"
 msgstr "Manajemen jendela dan peluncuran aplikasi"
 
 #: ../data/gnome-shell-extension-prefs.desktop.in.in.h:1
-#: ../js/extensionPrefs/main.js:152
 msgid "GNOME Shell Extension Preferences"
 msgstr "Preferensi Ekstensi GNOME Shell"
 
@@ -246,15 +245,6 @@ msgstr ""
 "didasarkan atas tanggal kini, dan memakai ekstensi ini. Ini mesti diubah "
 "ketika merekam ke format wadah yang berbeda."
 
-#: ../js/extensionPrefs/main.js:124
-#, c-format
-msgid "There was an error loading the preferences dialog for %s:"
-msgstr "Terjadi galat sewaktu memuat dialog preferensi untuk %s:"
-
-#: ../js/extensionPrefs/main.js:164
-msgid "Extension"
-msgstr "Ekstensi"
-
 #: ../js/extensionPrefs/main.js:188
 msgid "Select an extension to configure using the combobox above."
 msgstr "Pilih ekstensi yang ingin dikonfigurasi pada kotak di atas."
@@ -268,9 +258,6 @@ msgctxt "title"
 msgid "Sign In"
 msgstr "Masuk"
 
-#. 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:740
 msgid "Not listed?"
 msgstr "Tak masuk daftar?"
@@ -287,9 +274,6 @@ msgctxt "button"
 msgid "Sign In"
 msgstr "Masuk"
 
-#. 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:962 ../js/ui/components/networkAgent.js:260
 #: ../js/ui/components/networkAgent.js:278
 msgid "Username: "
@@ -299,7 +283,7 @@ msgstr "Nama pengguna: "
 msgid "Login Window"
 msgstr "Jendela Log Masuk"
 
-#. Translators: accessible name of the power menu in the login screen
+#. Translators: accessible name of the power menu in the login screen */
 #: ../js/gdm/powerMenu.js:35
 msgid "Power"
 msgstr "Daya"
@@ -322,14 +306,11 @@ msgstr "Matikan"
 msgid "Authentication error"
 msgstr "Galat otentikasi"
 
-#. Translators: this message is shown below the password entry field
-#. to indicate the user can swipe their finger instead
 #: ../js/gdm/util.js:269
 msgid "(or swipe finger)"
 msgstr "(atau gesekkan jari)"
 
 #: ../js/gdm/util.js:294
-#, c-format
 msgid "(e.g., user or %s)"
 msgstr "(cth., pengguna dari %s)"
 
@@ -337,18 +318,15 @@ msgstr "(cth., pengguna dari %s)"
 msgid "Command not found"
 msgstr "Perintah tidak ditemukan"
 
-#. Replace "Error invoking GLib.shell_parse_argv: " with
-#. something nicer
 #: ../js/misc/util.js:125
 msgid "Could not parse command:"
 msgstr "Tidak dapat mengurai perintah:"
 
 #: ../js/misc/util.js:133
-#, c-format
 msgid "Execution of '%s' failed:"
 msgstr "Eksekusi '%s' gagal:"
 
-#. Translators: Filter to display all applications
+#. Translators: Filter to display all applications */
 #: ../js/ui/appDisplay.js:252
 msgid "All"
 msgstr "Semua"
@@ -374,31 +352,29 @@ msgid "Add to Favorites"
 msgstr "Tambah ke Favorit"
 
 #: ../js/ui/appFavorites.js:87
-#, c-format
 msgid "%s has been added to your favorites."
 msgstr "%s telah ditambahkan ke favorit Anda."
 
 #: ../js/ui/appFavorites.js:118
-#, c-format
 msgid "%s has been removed from your favorites."
 msgstr "%s telah dihapus dari favorit Anda."
 
 #. 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:62
+#: ../js/ui/calendar.js:63
 msgctxt "event list time"
 msgid "All Day"
 msgstr "Sepanjang Hari"
 
-#. Translators: Shown in calendar event list, if 24h format
+#. Translators: Shown in calendar event list, if 24h format */
-#: ../js/ui/calendar.js:67
+#: ../js/ui/calendar.js:68
 msgctxt "event list time"
 msgid "%H:%M"
 msgstr "%H:%M"
 
-#. Transators: Shown in calendar event list, if 12h format
+#. Transators: Shown in calendar event list, if 12h format */
-#: ../js/ui/calendar.js:74
+#: ../js/ui/calendar.js:75
 msgctxt "event list time"
 msgid "%l:%M %p"
 msgstr "%l:%M"
@@ -407,44 +383,44 @@ msgstr "%l:%M"
 #. *
 #. * NOTE: These grid abbreviations are always shown together
 #. * and in order, e.g. "S M T W T F S".
-#.
+#. */
-#: ../js/ui/calendar.js:114
+#: ../js/ui/calendar.js:115
 msgctxt "grid sunday"
 msgid "S"
 msgstr "M"
 
-#. Translators: Calendar grid abbreviation for Monday
+#. Translators: Calendar grid abbreviation for Monday */
-#: ../js/ui/calendar.js:116
+#: ../js/ui/calendar.js:117
 msgctxt "grid monday"
 msgid "M"
 msgstr "S"
 
-#. Translators: Calendar grid abbreviation for Tuesday
+#. Translators: Calendar grid abbreviation for Tuesday */
-#: ../js/ui/calendar.js:118
+#: ../js/ui/calendar.js:119
 msgctxt "grid tuesday"
 msgid "T"
 msgstr "S"
 
-#. Translators: Calendar grid abbreviation for Wednesday
+#. Translators: Calendar grid abbreviation for Wednesday */
-#: ../js/ui/calendar.js:120
+#: ../js/ui/calendar.js:121
 msgctxt "grid wednesday"
 msgid "W"
 msgstr "R"
 
-#. Translators: Calendar grid abbreviation for Thursday
+#. Translators: Calendar grid abbreviation for Thursday */
-#: ../js/ui/calendar.js:122
+#: ../js/ui/calendar.js:123
 msgctxt "grid thursday"
 msgid "T"
 msgstr "K"
 
-#. Translators: Calendar grid abbreviation for Friday
+#. Translators: Calendar grid abbreviation for Friday */
-#: ../js/ui/calendar.js:124
+#: ../js/ui/calendar.js:125
 msgctxt "grid friday"
 msgid "F"
 msgstr "J"
 
-#. Translators: Calendar grid abbreviation for Saturday
+#. Translators: Calendar grid abbreviation for Saturday */
-#: ../js/ui/calendar.js:126
+#: ../js/ui/calendar.js:127
 msgctxt "grid saturday"
 msgid "S"
 msgstr "S"
@@ -454,78 +430,82 @@ msgstr "S"
 #. * NOTE: These list abbreviations are normally not shown together
 #. * so they need to be unique (e.g. Tuesday and Thursday cannot
 #. * both be 'T').
-#.
+#. */
-#: ../js/ui/calendar.js:139
+#: ../js/ui/calendar.js:140
 msgctxt "list sunday"
 msgid "Su"
 msgstr "Min"
 
-#. Translators: Event list abbreviation for Monday
+#. Translators: Event list abbreviation for Monday */
-#: ../js/ui/calendar.js:141
+#: ../js/ui/calendar.js:142
 msgctxt "list monday"
 msgid "M"
 msgstr "Sen"
 
-#. Translators: Event list abbreviation for Tuesday
+#. Translators: Event list abbreviation for Tuesday */
-#: ../js/ui/calendar.js:143
+#: ../js/ui/calendar.js:144
 msgctxt "list tuesday"
 msgid "T"
 msgstr "Sel"
 
-#. Translators: Event list abbreviation for Wednesday
+#. Translators: Event list abbreviation for Wednesday */
-#: ../js/ui/calendar.js:145
+#: ../js/ui/calendar.js:146
 msgctxt "list wednesday"
 msgid "W"
 msgstr "Rab"
 
-#. Translators: Event list abbreviation for Thursday
+#. Translators: Event list abbreviation for Thursday */
-#: ../js/ui/calendar.js:147
+#: ../js/ui/calendar.js:148
 msgctxt "list thursday"
 msgid "Th"
 msgstr "Kam"
 
-#. Translators: Event list abbreviation for Friday
+#. Translators: Event list abbreviation for Friday */
-#: ../js/ui/calendar.js:149
+#: ../js/ui/calendar.js:150
 msgctxt "list friday"
 msgid "F"
 msgstr "Jum"
 
-#. Translators: Event list abbreviation for Saturday
+#. Translators: Event list abbreviation for Saturday */
-#: ../js/ui/calendar.js:151
+#: ../js/ui/calendar.js:152
 msgctxt "list saturday"
 msgid "S"
 msgstr "Sab"
 
-#. Translators: Text to show if there are no events
+#: ../js/ui/calendar.js:371
-#: ../js/ui/calendar.js:699
+msgid "calendar:MY"
+msgstr "calendar:MY"
+
+#. Translators: Text to show if there are no events */
+#: ../js/ui/calendar.js:714
 msgid "Nothing Scheduled"
 msgstr "Tidak Ada Jadwal"
 
-#. Translators: Shown on calendar heading when selected day occurs on current year
+#. Translators: Shown on calendar heading when selected day occurs on current year */
-#: ../js/ui/calendar.js:715
+#: ../js/ui/calendar.js:730
 msgctxt "calendar heading"
 msgid "%A, %B %d"
 msgstr "%A, %d %B"
 
-#. Translators: Shown on calendar heading when selected day occurs on different year
+#. Translators: Shown on calendar heading when selected day occurs on different year */
-#: ../js/ui/calendar.js:718
+#: ../js/ui/calendar.js:733
 msgctxt "calendar heading"
 msgid "%A, %B %d, %Y"
 msgstr "%A, %d %B %Y"
 
-#: ../js/ui/calendar.js:728
+#: ../js/ui/calendar.js:743
 msgid "Today"
 msgstr "Hari ini"
 
-#: ../js/ui/calendar.js:732
+#: ../js/ui/calendar.js:747
 msgid "Tomorrow"
 msgstr "Besok"
 
-#: ../js/ui/calendar.js:743
+#: ../js/ui/calendar.js:758
 msgid "This week"
 msgstr "Minggu ini"
 
-#: ../js/ui/calendar.js:751
+#: ../js/ui/calendar.js:766
 msgid "Next week"
 msgstr "Minggu depan"
 
@@ -534,7 +514,6 @@ msgid "Removable Devices"
 msgstr "Perangkat Yang Dapat Dicabut"
 
 #: ../js/ui/components/autorunManager.js:594
-#, c-format
 msgid "Open with %s"
 msgstr "Buka dengan %s"
 
@@ -554,7 +533,6 @@ msgstr "Ketik lagi:"
 msgid "Connect"
 msgstr "Sambung"
 
-#. Cisco LEAP
 #: ../js/ui/components/networkAgent.js:223
 #: ../js/ui/components/networkAgent.js:235
 #: ../js/ui/components/networkAgent.js:262
@@ -563,7 +541,6 @@ msgstr "Sambung"
 msgid "Password: "
 msgstr "Sandi: "
 
-#. static WEP
 #: ../js/ui/components/networkAgent.js:228
 msgid "Key: "
 msgstr "Tombol: "
@@ -585,7 +562,6 @@ msgid "Authentication required by wireless network"
 msgstr "Otentikasi dibutuhkan oleh jaringan nirkabel"
 
 #: ../js/ui/components/networkAgent.js:310
-#, c-format
 msgid ""
 "Passwords or encryption keys are required to access the wireless network "
 "'%s'."
@@ -622,7 +598,6 @@ msgid "Mobile broadband network password"
 msgstr "Sandi jaringan data seluler"
 
 #: ../js/ui/components/networkAgent.js:337
-#, c-format
 msgid "A password is required to connect to '%s'."
 msgstr "Sebuah kata sandi dibutuhkan untuk menyambung ke '%s'."
 
@@ -641,29 +616,24 @@ msgstr "Otentikasi"
 #. Translators: "that didn't work" refers to the fact that the
 #. * requested authentication was not gained; this can happen
 #. * because of an authentication error (like invalid password),
-#. * for instance.
+#. * for instance. */
 #: ../js/ui/components/polkitAgent.js:248 ../js/ui/shellMountOperation.js:381
 msgid "Sorry, that didn't work. Please try again."
 msgstr "Maaf, tidak berhasil. Silakan coba lagi."
 
-#. Translators: this is a filename used for screencast recording
+#. Translators: this is a filename used for screencast recording */
 #: ../js/ui/components/recorder.js:44
-#, no-c-format
 msgid "Screencast from %d %t"
 msgstr "Rekaman dari %d %t"
 
-#. FIXME: We don't have a 'chat room' icon (bgo #653737) use
-#. system-users for now as Empathy does.
 #: ../js/ui/components/telepathyClient.js:237
 msgid "Invitation"
 msgstr "Undangan"
 
-#. We got the TpContact
 #: ../js/ui/components/telepathyClient.js:297
 msgid "Call"
 msgstr "Panggil"
 
-#. We got the TpContact
 #: ../js/ui/components/telepathyClient.js:313
 msgid "File Transfer"
 msgstr "Transfer Berkas"
@@ -686,45 +656,39 @@ msgstr "Bisu"
 
 #. Translators: this is a time format string followed by a date.
 #. If applicable, replace %X with a strftime format valid for your
-#. locale, without seconds.
+#. locale, without seconds. */
 #: ../js/ui/components/telepathyClient.js:952
-#, no-c-format
 msgid "Sent at <b>%X</b> on <b>%A</b>"
 msgstr "Dikirim pada <b>%X</b> hari <b>%A</b>"
 
 #. Translators: this is a time format in the style of "Wednesday, May 25",
-#. shown when you get a chat message in the same year.
+#. shown when you get a chat message in the same year. */
 #: ../js/ui/components/telepathyClient.js:958
-#, no-c-format
 msgid "Sent on <b>%A</b>, <b>%B %d</b>"
 msgstr "Dikirim pada <b>%A</b>, <b>%d %B</b>"
 
 #. Translators: this is a time format in the style of "Wednesday, May 25, 2012",
-#. shown when you get a chat message in a different year.
+#. shown when you get a chat message in a different year. */
 #: ../js/ui/components/telepathyClient.js:963
-#, no-c-format
 msgid "Sent on <b>%A</b>, <b>%B %d</b>, %Y"
 msgstr "Dikirim pada <b>%A</b>, <b>%d %B</b> %Y"
 
 #. Translators: this is the other person changing their old IM name to their new
-#. IM name.
+#. IM name. */
 #: ../js/ui/components/telepathyClient.js:992
-#, c-format
 msgid "%s is now known as %s"
 msgstr "%s sekarang dikenal sebagai %s"
 
 #. translators: argument is a room name like
-#. * room@jabber.org for example.
+#. * room@jabber.org for example. */
 #: ../js/ui/components/telepathyClient.js:1092
-#, c-format
 msgid "Invitation to %s"
 msgstr "Undangan ke %s"
 
 #. translators: first argument is the name of a contact and the second
 #. * one the name of a room. "Alice is inviting you to join room@jabber.org
-#. * for example.
+#. * for example. */
 #: ../js/ui/components/telepathyClient.js:1100
-#, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s mengundang Anda untuk bergabung dengan %s"
 
@@ -740,15 +704,13 @@ msgstr "Tolak"
 msgid "Accept"
 msgstr "Terima"
 
-#. translators: argument is a contact name like Alice for example.
+#. translators: argument is a contact name like Alice for example. */
 #: ../js/ui/components/telepathyClient.js:1133
-#, c-format
 msgid "Video call from %s"
 msgstr "Panggilan video dari %s"
 
-#. translators: argument is a contact name like Alice for example.
+#. translators: argument is a contact name like Alice for example. */
 #: ../js/ui/components/telepathyClient.js:1136
-#, c-format
 msgid "Call from %s"
 msgstr "Panggilan dari %s"
 
@@ -757,7 +719,7 @@ msgstr "Panggilan dari %s"
 msgid "Reject"
 msgstr "Tolak"
 
-#. translators: this is a button label (verb), not a noun
+#. translators: this is a button label (verb), not a noun */
 #: ../js/ui/components/telepathyClient.js:1143
 msgid "Answer"
 msgstr "Jawab"
@@ -766,15 +728,13 @@ msgstr "Jawab"
 #. * the contact's alias and the second one is the
 #. * file name. The string will be something
 #. * like: "Alice is sending you test.ogg"
-#.
+#. */
 #: ../js/ui/components/telepathyClient.js:1175
-#, c-format
 msgid "%s is sending you %s"
 msgstr "%s sedang mengirimi Anda %s"
 
-#. To translators: The parameter is the contact's alias
+#. To translators: The parameter is the contact's alias */
 #: ../js/ui/components/telepathyClient.js:1210
-#, c-format
 msgid "%s would like permission to see when you are online"
 msgstr "%s ingin minta ijin melihat Anda ketika Anda daring"
 
@@ -884,9 +844,8 @@ msgid "Internal error"
 msgstr "Galat internal"
 
 #. translators: argument is the account name, like
-#. * name@jabber.org for example.
+#. * name@jabber.org for example. */
 #: ../js/ui/components/telepathyClient.js:1358
-#, c-format
 msgid "Connection to %s failed"
 msgstr "Sambungan ke %s gagal"
 
@@ -916,103 +875,16 @@ msgstr "Buka Kalender"
 
 #. Translators: This is the date format to use when the calendar popup is
 #. * shown - it is shown just below the time in the shell (e.g. "Tue 9:29 AM").
-#.
+#. */
 #: ../js/ui/dateMenu.js:201
 msgid "%A %B %e, %Y"
 msgstr "%A, %e %B %Y"
 
-#: ../js/ui/endSessionDialog.js:61
-#, c-format
-msgctxt "title"
-msgid "Log Out %s"
-msgstr "Keluar %s"
-
-#: ../js/ui/endSessionDialog.js:62
-msgctxt "title"
-msgid "Log Out"
-msgstr "Keluar"
-
-#: ../js/ui/endSessionDialog.js:63
-msgid "Click Log Out to quit these applications and log out of the system."
-msgstr "Klik Keluar untuk menutup aplikasi ini serta keluar dari sistem."
-
-#: ../js/ui/endSessionDialog.js:65
-#, c-format
-msgid "%s will be logged out automatically in %d second."
-msgid_plural "%s will be logged out automatically in %d seconds."
-msgstr[0] "%s akan log keluar otomatis dalam %d detik.\t\t"
-
-#: ../js/ui/endSessionDialog.js:70
-#, c-format
-msgid "You will be logged out automatically in %d second."
-msgid_plural "You will be logged out automatically in %d seconds."
-msgstr[0] "Anda akan log keluar otomatis dalam %d detik."
-
-#: ../js/ui/endSessionDialog.js:74
-msgid "Logging out of the system."
-msgstr "Keluar dari sistem."
-
-#: ../js/ui/endSessionDialog.js:76
-msgctxt "button"
-msgid "Log Out"
-msgstr "Keluar"
-
-#: ../js/ui/endSessionDialog.js:81
-msgctxt "title"
-msgid "Power Off"
-msgstr "Matikan"
-
-#: ../js/ui/endSessionDialog.js:82
-msgid "Click Power Off to quit these applications and power off the system."
-msgstr "Klik Matikan untuk keluar dari aplikasi dan mematikan sistem."
-
-#: ../js/ui/endSessionDialog.js:84
-#, c-format
-msgid "The system will power off automatically in %d second."
-msgid_plural "The system will power off automatically in %d seconds."
-msgstr[0] "Sistem ini akan otomatis dimatikan dalam %d detik."
-
-#: ../js/ui/endSessionDialog.js:88
-msgid "Powering off the system."
-msgstr "Mematikan sistem."
-
-#: ../js/ui/endSessionDialog.js:90 ../js/ui/endSessionDialog.js:107
-msgctxt "button"
-msgid "Restart"
-msgstr "Nyalakan Ulang"
-
-#: ../js/ui/endSessionDialog.js:92
-msgctxt "button"
-msgid "Power Off"
-msgstr "Matikan"
-
-#: ../js/ui/endSessionDialog.js:98
-msgctxt "title"
-msgid "Restart"
-msgstr "Nyalakan Ulang"
-
-#: ../js/ui/endSessionDialog.js:99
-msgid "Click Restart to quit these applications and restart the system."
-msgstr ""
-"Klik Nyalakan Ulang untuk menutup aplikasi ini serta menyalakan kembali "
-"sistem."
-
-#: ../js/ui/endSessionDialog.js:101
-#, c-format
-msgid "The system will restart automatically in %d second."
-msgid_plural "The system will restart automatically in %d seconds."
-msgstr[0] "Sistem ini akan otomatis dimulai ulang dalam %d detik."
-
-#: ../js/ui/endSessionDialog.js:105
-msgid "Restarting the system."
-msgstr "Menyalan ulang sistem."
-
 #: ../js/ui/extensionDownloader.js:199
 msgid "Install"
 msgstr "Pasang"
 
 #: ../js/ui/extensionDownloader.js:204
-#, c-format
 msgid "Download and install '%s' from extensions.gnome.org?"
 msgstr "Unduh dan pasang '%s' dari extensions.gnome.org?"
 
@@ -1029,9 +901,8 @@ msgstr "Papan Ketik"
 msgid "No extensions installed"
 msgstr "Tak ada ekstensi terpasang"
 
-#. Translators: argument is an extension UUID.
+#. Translators: argument is an extension UUID. */
 #: ../js/ui/lookingGlass.js:745
-#, c-format
 msgid "%s has not emitted any errors."
 msgstr "%s tidak menampilkan galat apa pun."
 
@@ -1085,7 +956,7 @@ msgstr "Hapus"
 msgid "Message Tray"
 msgstr "Baki Pesan"
 
-#: ../js/ui/messageTray.js:2543
+#: ../js/ui/messageTray.js:2553
 msgid "System Information"
 msgstr "Informasi Sistem"
 
@@ -1105,13 +976,11 @@ msgstr "Gambaran"
 #. Translators: this is the text displayed
 #. in the search entry when no search is
 #. active; it should not exceed ~30
-#. characters.
+#. characters. */
 #: ../js/ui/overview.js:201
 msgid "Type to search..."
 msgstr "Ketik yang ingin dicari..."
 
-#. Translators: this is the name of the dock/favorites area on
-#. the left of the overview
 #: ../js/ui/overview.js:222
 msgid "Dash"
 msgstr "Dash"
@@ -1121,7 +990,7 @@ msgid "Quit"
 msgstr "Keluar"
 
 #. Translators: If there is no suitable word for "Activities"
-#. in your language, you can use the word for "Overview".
+#. in your language, you can use the word for "Overview". */
 #: ../js/ui/panel.js:599
 msgid "Activities"
 msgstr "Aktivitas"
@@ -1131,11 +1000,6 @@ msgid "Top Bar"
 msgstr "Bar Atas"
 
 # Dirgita: Hayo, enaknya pake I/O atau ON/OFF?^^
-#. Translators: this MUST be either "toggle-switch-us"
-#. (for toggle switches containing the English words
-#. "ON" and "OFF") or "toggle-switch-intl" (for toggle
-#. switches containing "◯" and "|"). Other values will
-#. simply result in invisible toggle switches.
 #: ../js/ui/popupMenu.js:731
 msgid "toggle-switch-us"
 msgstr "toggle-switch-intl"
@@ -1145,19 +1009,17 @@ msgid "Please enter a command:"
 msgstr "Ketikkan perintah:"
 
 #. Translators: This is a time format for a date in
-#. long format
+#. long format */
-#: ../js/ui/screenShield.js:81
+#: ../js/ui/screenShield.js:82
 msgid "%A, %B %d"
 msgstr "%A, %d %B"
 
-#: ../js/ui/screenShield.js:145
+#: ../js/ui/screenShield.js:146
-#, c-format
 msgid "%d new message"
 msgid_plural "%d new messages"
 msgstr[0] "%d pesan baru"
 
-#: ../js/ui/screenShield.js:147
+#: ../js/ui/screenShield.js:148
-#, c-format
 msgid "%d new notification"
 msgid_plural "%d new notifications"
 msgstr[0] "%d pemberitahuan baru"
@@ -1269,7 +1131,7 @@ msgstr "Setel Perangkat Baru..."
 msgid "Bluetooth Settings"
 msgstr "Pengaturan Bluetooth"
 
-#. TRANSLATORS: this means that bluetooth was disabled by hardware rfkill
+#. TRANSLATORS: this means that bluetooth was disabled by hardware rfkill */
 #: ../js/ui/status/bluetooth.js:103 ../js/ui/status/network.js:208
 msgid "hardware disabled"
 msgstr "perangkat keras dinoaktifkan"
@@ -1300,7 +1162,6 @@ msgid "Error browsing device"
 msgstr "Galat ketika menelusuri perangkat"
 
 #: ../js/ui/status/bluetooth.js:253
-#, c-format
 msgid "The requested device cannot be browsed, error is '%s'"
 msgstr "Perangkat yang dipinta tidak dapat ditelusuri, dengan galat '%s'"
 
@@ -1317,12 +1178,10 @@ msgid "Sound Settings"
 msgstr "Pengaturan Suara"
 
 #: ../js/ui/status/bluetooth.js:336
-#, c-format
 msgid "Authorization request from %s"
 msgstr "Permintaan otorisasi dari %s"
 
 #: ../js/ui/status/bluetooth.js:342
-#, c-format
 msgid "Device %s wants access to the service '%s'"
 msgstr "Perangkat %s ingin mengakses layanan '%s'"
 
@@ -1335,17 +1194,14 @@ msgid "Grant this time only"
 msgstr "Hanya untuk saat ini"
 
 #: ../js/ui/status/bluetooth.js:372
-#, c-format
 msgid "Pairing confirmation for %s"
 msgstr "Konfirmasi berpasangan untuk %s"
 
 #: ../js/ui/status/bluetooth.js:378 ../js/ui/status/bluetooth.js:408
-#, c-format
 msgid "Device %s wants to pair with this computer"
 msgstr "Perangkat %s ingin berpasangan dengan komputer ini"
 
 #: ../js/ui/status/bluetooth.js:379
-#, c-format
 msgid "Please confirm whether the PIN '%06d' matches the one on the device."
 msgstr "Harap konfirmasi apakah PIN '%06d' sesuai dengan salah satu perangkat."
 
@@ -1358,7 +1214,6 @@ msgid "Does not match"
 msgstr "Tidak cocok"
 
 #: ../js/ui/status/bluetooth.js:401
-#, c-format
 msgid "Pairing request for %s"
 msgstr "Permintaan berpasangan untuk %s"
 
@@ -1386,35 +1241,35 @@ msgstr "Volume, jaringan, baterai"
 msgid "<unknown>"
 msgstr "<tak dikenal>"
 
-#. Translators: this indicates that wireless or wwan is disabled by hardware killswitch
+#. Translators: this indicates that wireless or wwan is disabled by hardware killswitch */
 #: ../js/ui/status/network.js:230
 msgid "disabled"
 msgstr "dinonaktifkan"
 
 #. Translators: this is for network devices that are physically present but are not
-#. under NetworkManager's control (and thus cannot be used in the menu)
+#. under NetworkManager's control (and thus cannot be used in the menu) */
 #: ../js/ui/status/network.js:456
 msgid "unmanaged"
 msgstr "tak dikelola"
 
-#. Translators: this is for network connections that require some kind of key or password
+#. Translators: this is for network connections that require some kind of key or password */
 #: ../js/ui/status/network.js:467 ../js/ui/status/network.js:937
 msgid "authentication required"
 msgstr "diperlukan otentikasi"
 
 #. Translators: this is for devices that require some kind of firmware or kernel
-#. module, which is missing
+#. module, which is missing */
 #: ../js/ui/status/network.js:477
 msgid "firmware missing"
 msgstr "firmware hilang"
 
-#. Translators: this is for wired network devices that are physically disconnected
+#. Translators: this is for wired network devices that are physically disconnected */
 #: ../js/ui/status/network.js:484
 msgid "cable unplugged"
 msgstr "kabel tidak tersambung"
 
 #. Translators: this is for a network device that cannot be activated (for example it
-#. is disabled by rfkill, or it has no coverage
+#. is disabled by rfkill, or it has no coverage */
 #: ../js/ui/status/network.js:489
 msgid "unavailable"
 msgstr "tidak tersedia"
@@ -1428,7 +1283,7 @@ msgid "More..."
 msgstr "Lainnya..."
 
 #. TRANSLATORS: this is the indication that a connection for another logged in user is active,
-#. and we cannot access its settings (including the name)
+#. and we cannot access its settings (including the name) */
 #: ../js/ui/status/network.js:588 ../js/ui/status/network.js:1459
 msgid "Connected (private)"
 msgstr "Termsabung (pribadi)"
@@ -1445,9 +1300,8 @@ msgstr "Seluler otomatis"
 msgid "Auto dial-up"
 msgstr "Dial-up otomatis"
 
-#. TRANSLATORS: this the automatic wireless connection name (including the network name)
+#. TRANSLATORS: this the automatic wireless connection name (including the network name) */
 #: ../js/ui/status/network.js:853 ../js/ui/status/network.js:1476
-#, c-format
 msgid "Auto %s"
 msgstr "%s otomatis"
 
@@ -1459,6 +1313,10 @@ msgstr "Bluetooth otomatis"
 msgid "Auto wireless"
 msgstr "Nirkabel otomatis"
 
+#: ../js/ui/status/network.js:1565
+msgid "Network"
+msgstr "Jaringan"
+
 #: ../js/ui/status/network.js:1575
 msgid "Enable networking"
 msgstr "Aktifkan jaringan"
@@ -1507,21 +1365,17 @@ msgstr "Baterai"
 msgid "Power Settings"
 msgstr "Pengaturan Daya"
 
-#. 0 is reported when UPower does not have enough data
-#. to estimate battery life
 #: ../js/ui/status/power.js:94
 msgid "Estimating..."
 msgstr "Memperkirakan..."
 
 #: ../js/ui/status/power.js:101
-#, c-format
 msgid "%d hour remaining"
 msgid_plural "%d hours remaining"
 msgstr[0] "%d jam lagi"
 
-#. TRANSLATORS: this is a time string, as in "%d hours %d minutes remaining"
+#. TRANSLATORS: this is a time string, as in "%d hours %d minutes remaining" */
 #: ../js/ui/status/power.js:104
-#, c-format
 msgid "%d %s %d %s remaining"
 msgstr "%d %s %d %s lagi"
 
@@ -1536,13 +1390,11 @@ msgid_plural "minutes"
 msgstr[0] "menit"
 
 #: ../js/ui/status/power.js:109
-#, c-format
 msgid "%d minute remaining"
 msgid_plural "%d minutes remaining"
 msgstr[0] "%d menit lagi"
 
 #: ../js/ui/status/power.js:112 ../js/ui/status/power.js:186
-#, c-format
 msgctxt "percent of battery remaining"
 msgid "%d%%"
 msgstr "%d%%"
@@ -1592,7 +1444,7 @@ msgctxt "device"
 msgid "Unknown"
 msgstr "Tak Dikenal"
 
-#. Translators: This is the label for audio volume
+#. Translators: This is the label for audio volume */
 #: ../js/ui/status/volume.js:47 ../js/ui/status/volume.js:221
 msgid "Volume"
 msgstr "Volume"
@@ -1679,7 +1531,6 @@ msgid "Search"
 msgstr "Cari"
 
 #: ../js/ui/wanda.js:117
-#, c-format
 msgid ""
 "Sorry, no wisdom for you today:\n"
 "%s"
@@ -1688,7 +1539,6 @@ msgstr ""
 "%s"
 
 #: ../js/ui/wanda.js:121
-#, c-format
 msgid "%s the Oracle says"
 msgstr "%s sang Peramal berkata"
 
@@ -1697,7 +1547,6 @@ msgid "Your favorite Easter Egg"
 msgstr "Easter Egg kesukaan Anda"
 
 #: ../js/ui/windowAttentionHandler.js:19
-#, c-format
 msgid "'%s' is ready"
 msgstr "'%s' telah siap"
 

po/pt_BR.po

@@ -10,13 +10,14 @@
 # Gabriel F. Vilar <cogumm@gmail.com>, 2011.
 # Adorilson Bezerra <adorilson@gmail.com>, 2011.
 # Djavan Fagundes <djavan@comum.org>, 2012.
+# Rafael Ferreira <rafael.f.f1@gmail.com>, 2013.
 msgid ""
 msgstr ""
-"Project-Id-Version: \n"
+"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: 2012-12-10 13:02+0000\n"
+"POT-Creation-Date: 2013-02-14 07:51+0000\n"
-"PO-Revision-Date: 2012-11-21 04:58-0300\n"
+"PO-Revision-Date: 2013-02-14 18:06-0300\n"
 "Last-Translator: Rafael Ferreira <rafael.f.f1@gmail.com>\n"
 "Language-Team: Brazilian Portuguese <gnome-pt_br-list@gnome.org>\n"
 "Language: pt_BR\n"
@@ -24,7 +25,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-Generator: Virtaal 0.7.1\n"
+"X-Generator: Poedit 1.5.4\n"
 "X-Project-Style: gnome\n"
 
 #: ../data/50-gnome-shell-screenshot.xml.in.h:1
@@ -41,7 +42,7 @@ msgstr "Sistema"
 
 #: ../data/50-gnome-shell-system.xml.in.h:2
 msgid "Show the message tray"
-msgstr "Exibe a área de notificações"
+msgstr "Mostra a área de notificação"
 
 #: ../data/gnome-shell.desktop.in.in.h:1
 msgid "GNOME Shell"
@@ -177,12 +178,12 @@ msgstr "Associação de tecla para abrir um menu de aplicativo."
 #: ../data/org.gnome.shell.gschema.xml.in.in.h:19
 msgid "Keybinding to toggle the visibility of the message tray"
 msgstr ""
-"Associação de tecla para alternar a visibilidade da bandeja de mensagens"
+"Associação de tecla para alternar a visibilidade da área de notificação"
 
 #: ../data/org.gnome.shell.gschema.xml.in.in.h:20
 msgid "Keybinding to toggle the visibility of the message tray."
 msgstr ""
-"Associação de tecla para alternar a visibilidade da bandeja de mensagens."
+"Associação de tecla para alternar a visibilidade da área de notificação."
 
 #: ../data/org.gnome.shell.gschema.xml.in.in.h:21
 msgid "Keybinding to toggle the screen recorder"
@@ -343,7 +344,7 @@ msgstr "(ou deslize o dedo)"
 #: ../js/gdm/util.js:294
 #, c-format
 msgid "(e.g., user or %s)"
-msgstr "(ex., usuário ou %s)"
+msgstr "(ex.: usuário ou %s)"
 
 #: ../js/misc/util.js:92
 msgid "Command not found"
@@ -517,13 +518,13 @@ msgstr "Nada agendado"
 #: ../js/ui/calendar.js:715
 msgctxt "calendar heading"
 msgid "%A, %B %d"
-msgstr "%A, %B %d"
+msgstr "%A, %d de %B"
 
 #. Translators: Shown on calendar heading when selected day occurs on different year
 #: ../js/ui/calendar.js:718
 msgctxt "calendar heading"
 msgid "%A, %B %d, %Y"
-msgstr "%A, %B %d, %Y"
+msgstr "%A, %d de %B, %Y"
 
 #: ../js/ui/calendar.js:728
 msgid "Today"
@@ -690,11 +691,11 @@ msgstr "Erro de conexão"
 
 #: ../js/ui/components/telepathyClient.js:491
 msgid "Unmute"
-msgstr "Ativar som"
+msgstr "Ativar áudio"
 
 #: ../js/ui/components/telepathyClient.js:491
 msgid "Mute"
-msgstr "Mudo"
+msgstr "Sem áudio"
 
 #. Translators: this is a time format string followed by a date.
 #. If applicable, replace %X with a strftime format valid for your
@@ -936,7 +937,7 @@ msgstr "%A, %e de %B de %Y"
 #, c-format
 msgctxt "title"
 msgid "Log Out %s"
-msgstr "Encerrar sessão %s"
+msgstr "Encerrar sessão de %s"
 
 #: ../js/ui/endSessionDialog.js:62
 msgctxt "title"
@@ -1099,7 +1100,7 @@ msgstr "Remover"
 msgid "Message Tray"
 msgstr "Área de notificações"
 
-#: ../js/ui/messageTray.js:2543
+#: ../js/ui/messageTray.js:2553
 msgid "System Information"
 msgstr "Informações do sistema"
 
@@ -1114,7 +1115,7 @@ msgstr "Desfazer"
 
 #: ../js/ui/overview.js:127
 msgid "Overview"
-msgstr "Visão Geral"
+msgstr "Visão geral"
 
 #. Translators: this is the text displayed
 #. in the search entry when no search is
@@ -1159,18 +1160,18 @@ msgstr "Por favor, digite um comando:"
 
 #. Translators: This is a time format for a date in
 #. long format
-#: ../js/ui/screenShield.js:81
+#: ../js/ui/screenShield.js:82
 msgid "%A, %B %d"
-msgstr "%A, %B %d"
+msgstr "%A, %d de %B"
 
-#: ../js/ui/screenShield.js:145
+#: ../js/ui/screenShield.js:146
 #, c-format
 msgid "%d new message"
 msgid_plural "%d new messages"
 msgstr[0] "%d nova mensagem"
 msgstr[1] "%d novas mensagens"
 
-#: ../js/ui/screenShield.js:147
+#: ../js/ui/screenShield.js:148
 #, c-format
 msgid "%d new notification"
 msgid_plural "%d new notifications"
@@ -1251,7 +1252,7 @@ msgstr "Teclas do mouse"
 
 #: ../js/ui/status/accessibility.js:75
 msgid "Universal Access Settings"
-msgstr "Configurações de acesso universal"
+msgstr "Configurações de acessibilidade"
 
 #: ../js/ui/status/accessibility.js:109
 msgid "High Contrast"