mutter/clutter/cogl merge build fixes

NEWS

@@ -1,29 +1,3 @@
-3.21.1
-======
-* Save screencasts in HOME if XDG_VIDEO_DIR doesn't exist [Florian; #765015]
-* Don't show orientation lock when g-s-d won't rotate [Florian; #765267]
-* Misc. bug fixes [Heiher, Florian, Marek, Rui; #722752, #765061, #763068,
-  #765607, #757676, #760439]
-
-Contributors:
-  Heiher, Marek Chalupa, Rui Matos, Florian Müllner
-
-Translations:
-  Arash Mousavi [fa], Kristjan SCHMIDT [eo], GNOME Translation Robot [gd]
-
-3.20.1
-======
-* Plug a memory leak [Aaron; #735705]
-
-Contributors:
-  Aaron Plattner
-
-Translations:
-  Daniel Korostil [uk], Matej Urbančič [sl], Inaki Larranaga Murgoitio [eu],
-  Cheng-Chia Tseng [zh_TW], Fabio Tomat [fur], Trần Ngọc Quân [vi],
-  YunQiang Su [zh_CN], Marek Černocký [cs], Arash Mousavi [fa],
-  Alexander Shopov [bg], Khaled Hosny [ar]
-
 3.20.0
 ======
 

configure.ac

@@ -1,5 +1,5 @@
 AC_PREREQ(2.63)
-AC_INIT([gnome-shell],[3.21.1],[https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-shell],[gnome-shell])
+AC_INIT([gnome-shell],[3.20.0],[https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-shell],[gnome-shell])
 AX_IS_RELEASE([git-directory])
 
 AC_CONFIG_HEADERS([config.h])
@@ -77,7 +77,7 @@ AC_MSG_RESULT($enable_systemd)
 CLUTTER_MIN_VERSION=1.21.5
 GOBJECT_INTROSPECTION_MIN_VERSION=1.45.4
 GJS_MIN_VERSION=1.39.0
-MUTTER_MIN_VERSION=3.21.1
+MUTTER_MIN_VERSION=3.20.0
 GTK_MIN_VERSION=3.15.0
 GIO_MIN_VERSION=2.45.3
 LIBECAL_MIN_VERSION=3.5.3
@@ -99,7 +99,6 @@ SHARED_PCS="gio-unix-2.0 >= $GIO_MIN_VERSION
             $recorder_modules
             gdk-x11-3.0 libsoup-2.4
             mutter-clutter-1.0 >= $CLUTTER_MIN_VERSION
-            mutter-cogl-pango-1.0
             libstartup-notification-1.0 >= $STARTUP_NOTIFICATION_MIN_VERSION
             gobject-introspection-1.0 >= $GOBJECT_INTROSPECTION_MIN_VERSION
             libcanberra libcanberra-gtk3

docs/reference/shell/Makefile.am

@@ -113,7 +113,7 @@ expand_content_files=
 # e.g. GTKDOC_CFLAGS=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS)
 # e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib)
 GTKDOC_CFLAGS=$(GNOME_SHELL_CFLAGS)
-GTKDOC_LIBS=$(GNOME_SHELL_LIBS) $(top_builddir)/src/libgnome-shell-menu.la $(top_builddir)/src/libgnome-shell-base.la $(top_builddir)/src/libgnome-shell.la -rpath $(MUTTER_TYPELIB_DIR)
+GTKDOC_LIBS=$(GNOME_SHELL_LIBS) $(top_builddir)/src/libgnome-shell-menu.la $(top_builddir)/src/libgnome-shell-base.la $(top_builddir)/src/libgnome-shell.la
 
 # This includes the standard gtk-doc make rules, copied by gtkdocize.
 include $(top_srcdir)/gtk-doc.make

docs/reference/st/Makefile.am

@@ -78,7 +78,7 @@ expand_content_files=
 # e.g. GTKDOC_CFLAGS=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS)
 # e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib)
 GTKDOC_CFLAGS=
-GTKDOC_LIBS=$(top_builddir)/src/libst-1.0.la -rpath $(MUTTER_TYPELIB_DIR)
+GTKDOC_LIBS=$(top_builddir)/src/libst-1.0.la
 
 # This includes the standard gtk-doc make rules, copied by gtkdocize.
 include $(top_srcdir)/gtk-doc.make

js/ui/dnd.js

@@ -571,13 +571,20 @@ const _Draggable = new Lang.Class({
             return;
         }
 
-        this._animateDragEnd(eventTime,
+        this._animationInProgress = true;
-                             { x: snapBackX,
+        // No target, so snap back
-                               y: snapBackY,
+        Tweener.addTween(this._dragActor,
-                               scale_x: snapBackScale,
+                         { x: snapBackX,
-                               scale_y: snapBackScale,
+                           y: snapBackY,
-                               time: SNAP_BACK_ANIMATION_TIME,
+                           scale_x: snapBackScale,
-                             });
+                           scale_y: snapBackScale,
+                           opacity: this._dragOrigOpacity,
+                           time: SNAP_BACK_ANIMATION_TIME,
+                           transition: 'easeOutQuad',
+                           onComplete: this._onAnimationComplete,
+                           onCompleteScope: this,
+                           onCompleteParams: [this._dragActor, eventTime]
+                         });
     },
 
     _restoreDragActor: function(eventTime) {
@@ -589,44 +596,18 @@ const _Draggable = new Lang.Class({
         this._dragActor.set_scale(restoreScale, restoreScale);
         this._dragActor.opacity = 0;
 
-        this._animateDragEnd(eventTime,
-                             { time: REVERT_ANIMATION_TIME });
-    },
-
-    _animateDragEnd: function (eventTime, params) {
         this._animationInProgress = true;
-
+        Tweener.addTween(this._dragActor,
-        // finish animation if the actor gets destroyed
+                         { opacity: this._dragOrigOpacity,
-        // during it
+                           time: REVERT_ANIMATION_TIME,
-        this._dragActorDestroyId =
+                           transition: 'easeOutQuad',
-            this._dragActor.connect('destroy',
+                           onComplete: this._onAnimationComplete,
-                                    Lang.bind(this, this._finishAnimation));
+                           onCompleteScope: this,
-
+                           onCompleteParams: [this._dragActor, eventTime]
-        params['opacity']          = this._dragOrigOpacity;
+                         });
-        params['transition']       = 'easeOutQuad';
-        params['onComplete']       = this._onAnimationComplete;
-        params['onCompleteScope']  = this;
-        params['onCompleteParams'] = [this._dragActor, eventTime];
-
-        // start the animation
-        Tweener.addTween(this._dragActor, params)
-    },
-
-    _finishAnimation : function () {
-        if (!this._animationInProgress)
-            return
-
-        this._animationInProgress = false;
-        if (!this._buttonDown)
-            this._dragComplete();
-
-        global.screen.set_cursor(Meta.Cursor.DEFAULT);
     },
 
     _onAnimationComplete : function (dragActor, eventTime) {
-        dragActor.disconnect(this._dragActorDestroyId);
-        this._dragActorDestroyId = 0;
-
         if (this._dragOrigParent) {
             Main.uiGroup.remove_child(this._dragActor);
             this._dragOrigParent.add_actor(this._dragActor);
@@ -635,9 +616,12 @@ const _Draggable = new Lang.Class({
         } else {
             dragActor.destroy();
         }
-
+        global.screen.set_cursor(Meta.Cursor.DEFAULT);
         this.emit('drag-end', eventTime, false);
-        this._finishAnimation();
+
+        this._animationInProgress = false;
+        if (!this._buttonDown)
+            this._dragComplete();
     },
 
     _dragComplete: function() {

js/ui/modalDialog.js

@@ -259,7 +259,7 @@ const ModalDialog = new Lang.Class({
         if (this.state == State.OPENED || this.state == State.OPENING)
             return true;
 
-        if (!this.pushModal(timestamp))
+        if (!this.pushModal({ timestamp: timestamp }))
             return false;
 
         this._fadeOpen(onPrimary);
@@ -318,11 +318,8 @@ const ModalDialog = new Lang.Class({
     pushModal: function (timestamp) {
         if (this._hasModal)
             return true;
-
+        if (!Main.pushModal(this._group, { timestamp: timestamp,
-        let params = { actionMode: this._actionMode };
+                                           actionMode: this._actionMode }))
-        if (timestamp)
-            params['timestamp'] = timestamp;
-        if (!Main.pushModal(this._group, params))
             return false;
 
         this._hasModal = true;

js/ui/status/system.js

@@ -6,7 +6,6 @@ const Gdm = imports.gi.Gdm;
 const Gio = imports.gi.Gio;
 const GLib = imports.gi.GLib;
 const Lang = imports.lang;
-const Meta = imports.gi.Meta;
 const Shell = imports.gi.Shell;
 const St = imports.gi.St;
 
@@ -111,7 +110,6 @@ const Indicator = new Lang.Class({
 
         this._session = new GnomeSession.SessionManager();
         this._loginManager = LoginManager.getLoginManager();
-        this._monitorManager = Meta.MonitorManager.get();
         this._haveShutdown = true;
         this._haveSuspend = true;
 
@@ -157,8 +155,6 @@ const Indicator = new Lang.Class({
 
         this._orientationSettings.connect('changed::orientation-lock',
                                           Lang.bind(this, this._updateOrientationLock));
-        Main.layoutManager.connect('monitors-changed',
-                                   Lang.bind(this, this._updateOrientationLock));
         Gio.DBus.system.watch_name(SENSOR_BUS_NAME,
                                    Gio.BusNameWatcherFlags.NONE,
                                    Lang.bind(this, this._sensorProxyAppeared),
@@ -268,8 +264,7 @@ const Indicator = new Lang.Class({
 
     _updateOrientationLock: function() {
         if (this._sensorProxy)
-            this._orientationLockAction.visible = this._sensorProxy.HasAccelerometer &&
+            this._orientationLockAction.visible = this._sensorProxy.HasAccelerometer;
-                                                  this._monitorManager.get_is_builtin_display_on();
         else
             this._orientationLockAction.visible = false;
 

js/ui/workspaceThumbnail.js

@@ -45,11 +45,11 @@ const PrimaryActorLayout = new Lang.Class({
         this.primaryActor = primaryActor;
     },
 
-    vfunc_get_preferred_width: function(container, forHeight) {
+    vfunc_get_preferred_width: function(forHeight) {
         return this.primaryActor.get_preferred_width(forHeight);
     },
 
-    vfunc_get_preferred_height: function(container, forWidth) {
+    vfunc_get_preferred_height: function(forWidth) {
         return this.primaryActor.get_preferred_height(forWidth);
     },
 });

po/fa.po

@@ -10,7 +10,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
 "shell&keywords=I18N+L10N&component=general\n"
 "POT-Creation-Date: 2016-04-08 09:40+0000\n"
-"PO-Revision-Date: 2016-04-14 22:53+0430\n"
+"PO-Revision-Date: 2016-04-08 20:41+0430\n"
 "Last-Translator: Arash Mousavi <mousavi.arash@gmail.com>\n"
 "Language-Team: Persian <>\n"
 "Language: fa\n"
@@ -69,7 +69,8 @@ msgstr ""
 #: ../data/org.gnome.shell.gschema.xml.in.in.h:2
 msgid ""
 "Allows access to internal debugging and monitoring tools using the Alt-F2 dialog."
-msgstr "اجازه دسترسی به ابزارهای اشکال‌زدا و پایشگر داخلی با استفاده از محاوره‌ی Alt-F2."
+msgstr ""
+"اجازه دسترسی به ابزارهای اشکال‌زدا و پایشگر داخلی با استفاده از محاوره‌ی Alt-F2."
 
 #: ../data/org.gnome.shell.gschema.xml.in.in.h:3
 msgid "UUIDs of extensions to enable"
@@ -77,15 +78,15 @@ msgstr "شناسه‌های UUID افزونه‌ها جهت فعال‌سازی"
 
 #: ../data/org.gnome.shell.gschema.xml.in.in.h:4
 msgid ""
-"GNOME Shell extensions have a UUID property; this key lists extensions which should "
+"GNOME Shell extensions have a UUID property; this key lists extensions which "
-"be loaded. Any extension that wants to be loaded needs to be in this list. You can "
+"should be loaded. Any extension that wants to be loaded needs to be in this "
-"also manipulate this list with the EnableExtension and DisableExtension D-Bus methods "
+"list. You can also manipulate this list with the EnableExtension and "
-"on org.gnome.Shell."
+"DisableExtension D-Bus methods on org.gnome.Shell."
 msgstr ""
-"افزونه‌های گنوم‌شل مشخصه‌ی UUID دارند؛ این کلید، افزونه‌هایی که باید بار شوند را فهرست "
+"افزونه‌های گنوم‌شل مشخصه‌ی UUID دارند؛ این کلید، افزونه‌هایی که باید بار شوند را "
-"می‌کند. هر افزونه‌ای که می‌خواهد بار شود، باید در این فهرست باشد. شما همچنین می‌توانید "
+"فهرست می‌کند. هر افزونه‌ای که می‌خواهد بار شود، باید در این فهرست باشد. شما همچنین "
-"این فهرست را از طریق EnableExtension و DisableExtension (روش‌های D-Bus) در org.gnome."
+"می‌توانید این فهرست را از طریق EnableExtension و DisableExtension (روش‌های D-Bus) "
-"Shell نیز بسازید."
+"در org.gnome.Shell نیز بسازید."
 
 #: ../data/org.gnome.shell.gschema.xml.in.in.h:5
 msgid "Disables the validation of extension version compatibility"
@@ -94,12 +95,12 @@ msgstr "غیرفعال‌سازی بررسی سازگاری نسخه‌ی افز
 #: ../data/org.gnome.shell.gschema.xml.in.in.h:6
 msgid ""
 "GNOME Shell will only load extensions that claim to support the current running "
-"version. Enabling this option will disable this check and try to load all extensions "
+"version. Enabling this option will disable this check and try to load all "
-"regardless of the versions they claim to support."
+"extensions regardless of the versions they claim to support."
 msgstr ""
 "گنوم‌شل تنها نسخه‌هایی از افزونه‌ها رو بارگیری می‌کند که ادعا می‌کنند از نسخه فعلی "
-"پشتیبانی می‌کند. فعال‌سازی این گزینه، بررسی این مورد را غیرفعال می‌کند و سعی خواهد شد که "
+"پشتیبانی می‌کند. فعال‌سازی این گزینه، بررسی این مورد را غیرفعال می‌کند و سعی خواهد "
-"تمام افزنه‌ها، بدون درنظر گرفتن سازگاری آنها بارگیری شوند."
+"شد که تمام افزنه‌ها، بدون درنظر گرفتن سازگاری آنها بارگیری شوند."
 
 #: ../data/org.gnome.shell.gschema.xml.in.in.h:7
 msgid "List of desktop file IDs for favorite applications"
@@ -134,8 +135,8 @@ msgstr "همیشه «خروج از سیستم» را در منو کاربر نم
 
 #: ../data/org.gnome.shell.gschema.xml.in.in.h:15
 msgid ""
-"This key overrides the automatic hiding of the 'Log out' menu item in single-user, "
+"This key overrides the automatic hiding of the 'Log out' menu item in single-"
-"single-session situations."
+"user, single-session situations."
 msgstr ""
 "این کلید مخفی‌سازی خودکار «خروج از سیستم» در منو را در حالت‌های یک-کاربر، یک-نشست "
 "بازنویسی می‌کند."
@@ -148,13 +149,15 @@ msgstr ""
 
 #: ../data/org.gnome.shell.gschema.xml.in.in.h:17
 msgid ""
-"The shell will request a password when an encrypted device or a remote filesystem is "
+"The shell will request a password when an encrypted device or a remote "
-"mounted. If the password can be saved for future use a 'Remember Password' checkbox "
+"filesystem is mounted. If the password can be saved for future use a 'Remember "
-"will be present. This key sets the default state of the checkbox."
+"Password' checkbox will be present. This key sets the default state of the "
+"checkbox."
 msgstr ""
-"پوسته هنگامی که یک دستگاه رمزنگاری شده و یا سیستم‌پرونده دوردست سوار می‌شود، درخواست "
+"پوسته هنگامی که یک دستگاه رمزنگاری شده و یا سیستم‌پرونده دوردست سوار می‌شود، "
-"گذرواژه می‌کند. اگر گذرواژه را بتوان برای استفاده آینده ذخیره کرد، گزینه «به‌خاطر سپردن "
+"درخواست گذرواژه می‌کند. اگر گذرواژه را بتوان برای استفاده آینده ذخیره کرد، گزینه "
-"گذرواژه» موجود خواهد بود. این کلید حالت پیش‌فرض این گزینه را تنظیم می‌کند."
+"«به‌خاطر سپردن گذرواژه» موجود خواهد بود. این کلید حالت پیش‌فرض این گزینه را تنظیم "
+"می‌کند."
 
 #: ../data/org.gnome.shell.gschema.xml.in.in.h:18
 msgid "Whether the default Bluetooth adapter had set up devices associated to it"
@@ -162,12 +165,13 @@ msgstr "اینکه آداپتور بلوتوث پیش‌فرض دستگاه‌ه
 
 #: ../data/org.gnome.shell.gschema.xml.in.in.h:19
 msgid ""
-"The shell will only show a Bluetooth menu item if a Bluetooth adapter is powered, or "
+"The shell will only show a Bluetooth menu item if a Bluetooth adapter is "
-"if there were devices set up associated with the default adapter. This will be reset "
+"powered, or if there were devices set up associated with the default adapter. "
-"if the default adapter is ever seen not to have devices associated to it."
+"This will be reset if the default adapter is ever seen not to have devices "
+"associated to it."
 msgstr ""
-"شل تنها زمانی منو بلوتوث را نمایش می‌دهد که آداپتور بلوتوث روشن باشد، یا دستگاه‌هایی به "
+"شل تنها زمانی منو بلوتوث را نمایش می‌دهد که آداپتور بلوتوث روشن باشد، یا "
-"گونه‌ای تنظیم شده باشند که به آداپتور پیش‌فرض متصل شوند."
+"دستگاه‌هایی به گونه‌ای تنظیم شده باشند که به آداپتور پیش‌فرض متصل شوند."
 
 #: ../data/org.gnome.shell.gschema.xml.in.in.h:20
 msgid "Show the week date in the calendar"
@@ -190,7 +194,8 @@ msgid "Keybinding to open the \"Show Applications\" view"
 msgstr "کلید مقید برای باز کردن نمای «نمایش برنامه‌ها»"
 
 #: ../data/org.gnome.shell.gschema.xml.in.in.h:25
-msgid "Keybinding to open the \"Show Applications\" view of the Activities Overview."
+msgid ""
+"Keybinding to open the \"Show Applications\" view of the Activities Overview."
 msgstr "کلید مقید برای باز کردن نمای «نمایش برنامه‌ها» در نمای‌کلی فعالیت‌ها."
 
 #: ../data/org.gnome.shell.gschema.xml.in.in.h:26
@@ -218,9 +223,11 @@ msgid "Keybinding to focus the active notification."
 msgstr "کلید مقید برای متمرکز کردن اعلان فعال."
 
 #: ../data/org.gnome.shell.gschema.xml.in.in.h:32
-msgid "Keybinding that pauses and resumes all running tweens, for debugging purposes"
+msgid ""
+"Keybinding that pauses and resumes all running tweens, for debugging purposes"
 msgstr ""
-"کلیدهای مقید برای مکث کردن و اجرا کردن تمام دوغلوهای در حال اجرا، برای مصارف رفع اشکال"
+"کلیدهای مقید برای مکث کردن و اجرا کردن تمام دوغلوهای در حال اجرا، برای مصارف رفع "
+"اشکال"
 
 #: ../data/org.gnome.shell.gschema.xml.in.in.h:33
 msgid "Which keyboard to use"
@@ -236,11 +243,11 @@ msgstr "محدود کردن تعویض‌گر به فضای‌کاری فعلی.
 
 #: ../data/org.gnome.shell.gschema.xml.in.in.h:36
 msgid ""
-"If true, only applications that have windows on the current workspace are shown in "
+"If true, only applications that have windows on the current workspace are shown "
-"the switcher. Otherwise, all applications are included."
+"in the switcher. Otherwise, all applications are included."
 msgstr ""
-"اگر درست باشد، تنها برنامه‌هایی که در فضای‌کاری فعلی پنجره دارند در تعویض‌گر نشان داده "
+"اگر درست باشد، تنها برنامه‌هایی که در فضای‌کاری فعلی پنجره دارند در تعویض‌گر نشان "
-"می‌شوند. در غیر این صورت، تمام برنامه‌ها نشان داده می‌شوند."
+"داده می‌شوند. در غیر این صورت، تمام برنامه‌ها نشان داده می‌شوند."
 
 #: ../data/org.gnome.shell.gschema.xml.in.in.h:37
 msgid "The application icon mode."
@@ -249,20 +256,20 @@ msgstr "حالت شمایلی برنامه."
 #: ../data/org.gnome.shell.gschema.xml.in.in.h:38
 msgid ""
 "Configures how the windows are shown in the switcher. Valid possibilities are "
-"'thumbnail-only' (shows a thumbnail of the window), 'app-icon-only' (shows only the "
+"'thumbnail-only' (shows a thumbnail of the window), 'app-icon-only' (shows only "
-"application icon) or 'both'."
+"the application icon) or 'both'."
 msgstr ""
-"نحوه نمایش پنجره‌ها را در تعویض‌کننده پیکربندی می‌کند. مقدار ممکن عبارتند از «thumbnail-"
+"نحوه نمایش پنجره‌ها را در تعویض‌کننده پیکربندی می‌کند. مقدار ممکن عبارتند از "
-"only» (نمایش تصویر بندانگشتی از پنجره)، «app-icon-only» (نمایش تنها شمایل برنامه) یا "
+"«thumbnail-only» (نمایش تصویر بندانگشتی از پنجره)، «app-icon-only» (نمایش تنها "
-"«both»."
+"شمایل برنامه) یا «both»."
 
 #: ../data/org.gnome.shell.gschema.xml.in.in.h:39
 msgid ""
 "If true, only windows from the current workspace are shown in the switcher. "
 "Otherwise, all windows are included."
 msgstr ""
-"اگر درست باشد، تنها پنجره‌های فضای‌کاری فعلی در تعویض‌گر نمایش داده می‌شود. در غیر این "
+"اگر درست باشد، تنها پنجره‌های فضای‌کاری فعلی در تعویض‌گر نمایش داده می‌شود. در غیر "
-"صورت، تمام پنجره‌ها اضافه می‌شوند."
+"این صورت، تمام پنجره‌ها اضافه می‌شوند."
 
 #: ../data/org.gnome.shell.gschema.xml.in.in.h:40
 msgid "Attach modal dialog to the parent window"
@@ -286,7 +293,8 @@ msgstr "فضاهای کاری تنها در صفحه‌نمایش اصلی"
 
 #: ../data/org.gnome.shell.gschema.xml.in.in.h:45
 msgid "Delay focus changes in mouse mode until the pointer stops moving"
-msgstr "به تاخیر انداختن تغییر تمرکز در حالت موشی تا زمانی که نشانگر از حرکت باز ایستد"
+msgstr ""
+"به تاخیر انداختن تغییر تمرکز در حالت موشی تا زمانی که نشانگر از حرکت باز ایستد"
 
 #: ../data/org.gnome.Shell.PortalHelper.desktop.in.h:1
 msgid "Network Login"
@@ -308,7 +316,8 @@ msgstr "افزونه‌های گنوم‌شل"
 msgid "Cancel"
 msgstr "لغو"
 
-#: ../js/gdm/authPrompt.js:169 ../js/gdm/authPrompt.js:216 ../js/gdm/authPrompt.js:448
+#: ../js/gdm/authPrompt.js:169 ../js/gdm/authPrompt.js:216
+#: ../js/gdm/authPrompt.js:448
 msgid "Next"
 msgstr "بعدی"
 
@@ -590,7 +599,7 @@ msgstr "ماه بعد"
 #, no-javascript-format
 msgctxt "date day number format"
 msgid "%d"
-msgstr "%Od"
+msgstr "%Id"
 
 #: ../js/ui/calendar.js:634
 msgid "Week %V"
@@ -686,7 +695,8 @@ msgstr "تایید هویت برای شبکه بی‌سیم لازم است"
 
 #: ../js/ui/components/networkAgent.js:321 ../js/ui/components/networkAgent.js:659
 #, javascript-format
-msgid "Passwords or encryption keys are required to access the wireless network “%s”."
+msgid ""
+"Passwords or encryption keys are required to access the wireless network “%s”."
 msgstr "گذرواژه یا کلیدهای رمزنگاری برای دسترسی به شبکه «%s» لازم است."
 
 #: ../js/ui/components/networkAgent.js:325 ../js/ui/components/networkAgent.js:662
@@ -873,11 +883,14 @@ msgstr "راه‌اندازی مجدد و نصب بروزرسانی‌ها"
 #: ../js/ui/endSessionDialog.js:121
 #, javascript-format
 msgid "The system will automatically restart and install updates in %d second."
-msgid_plural "The system will automatically restart and install updates in %d seconds."
+msgid_plural ""
+"The system will automatically restart and install updates in %d seconds."
 msgstr[0] ""
-"سیستم پس از %Id ثانیه به طور خودکار مجددا راه‌اندازی می‌شود و بروزرسانی‌های را نصب می‌کند."
+"سیستم پس از %Id ثانیه به طور خودکار مجددا راه‌اندازی می‌شود و بروزرسانی‌های را نصب "
+"می‌کند."
 msgstr[1] ""
-"سیستم پس از %Id ثانیه به طور خودکار مجددا راه‌اندازی می‌شود و بروزرسانی‌های را نصب می‌کند."
+"سیستم پس از %Id ثانیه به طور خودکار مجددا راه‌اندازی می‌شود و بروزرسانی‌های را نصب "
+"می‌کند."
 
 #: ../js/ui/endSessionDialog.js:127
 msgctxt "button"
@@ -896,7 +909,8 @@ msgstr "خاموش کردن بعد از نصب بروزرسانی‌ها"
 
 #: ../js/ui/endSessionDialog.js:338
 msgid "Running on battery power: please plug in before installing updates."
-msgstr "درحال اجرا بر روی انرژی باتری: لطفا قبل از نصب بروزرسانی‌ها، به برق وصل کنید."
+msgstr ""
+"درحال اجرا بر روی انرژی باتری: لطفا قبل از نصب بروزرسانی‌ها، به برق وصل کنید."
 
 #: ../js/ui/endSessionDialog.js:355
 msgid "Some applications are busy or have unsaved work."
@@ -1860,7 +1874,8 @@ msgstr "محاوره تایید هویت از طرف کاربر رد شد"
 #~ msgstr "این حساب قبلا به کارگزار متصل شده است"
 
 #~ msgid "Connection has been replaced by a new connection using the same resource"
-#~ msgstr "اتصال توسط یک اتصال جدید که از منبع مشابه استفاده می‌کند، جایگزین شده است"
+#~ msgstr ""
+#~ "اتصال توسط یک اتصال جدید که از منبع مشابه استفاده می‌کند، جایگزین شده است"
 
 #~ msgid "The account already exists on the server"
 #~ msgstr "حساب از قبل بر روی کارگزار وجود دارد"
@@ -1871,16 +1886,18 @@ msgstr "محاوره تایید هویت از طرف کاربر رد شد"
 #~ msgid "Certificate has been revoked"
 #~ msgstr "گواهینامه لغو شده است"
 
-#~ msgid "Certificate uses an insecure cipher algorithm or is cryptographically weak"
+#~ msgid ""
+#~ "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 #~ msgstr ""
-#~ "گواهینامه از الگوریتم رمزی نامطمئنی استفاده می‌کند یا از نظر cryptography ضعیف است"
+#~ "گواهینامه از الگوریتم رمزی نامطمئنی استفاده می‌کند یا از نظر cryptography ضعیف "
+#~ "است"
 
 #~ msgid ""
 #~ "The length of the server certificate, or the depth of the server certificate "
 #~ "chain, exceed the limits imposed by the cryptography library"
 #~ msgstr ""
-#~ "اندازه گواهینامه کارگزار، یا عمق حلقه‌ی گواهینامه کارگزار، از محدودیت اعمال شده "
+#~ "اندازه گواهینامه کارگزار، یا عمق حلقه‌ی گواهینامه کارگزار، از محدودیت اعمال "
-#~ "توسط کتابخانه cryptography تجاوز کرد"
+#~ "شده توسط کتابخانه cryptography تجاوز کرد"
 
 #~ msgid "Internal error"
 #~ msgstr "خطای داخلی"
@@ -1942,8 +1959,8 @@ msgstr "محاوره تایید هویت از طرف کاربر رد شد"
 #~ msgstr "فهرست دسته‌هایی که باید به شکل پوشه نمایش داده شوند"
 
 #~ msgid ""
-#~ "Each category name in this list will be represented as folder in the application "
+#~ "Each category name in this list will be represented as folder in the "
-#~ "view, rather than being displayed inline in the main view."
+#~ "application view, rather than being displayed inline in the main view."
 #~ msgstr ""
 #~ "هر نام دسته در این فهرست، بجای اینکه پشت سر هم در نمای اصلی نمایش داده شود، "
 #~ "به‌عنوان پوشه در نمای برنامه‌ها نشان داده می‌شود."
@@ -1952,11 +1969,11 @@ msgstr "محاوره تایید هویت از طرف کاربر رد شد"
 #~ msgstr "چیدمان دکمه‌ها در نوار عنوان"
 
 #~ msgid ""
-#~ "This key overrides the key in org.gnome.desktop.wm.preferences when running GNOME "
+#~ "This key overrides the key in org.gnome.desktop.wm.preferences when running "
-#~ "Shell."
+#~ "GNOME Shell."
 #~ msgstr ""
-#~ "این کلید، کلید org.gnome.desktop.wm.preferences را در زمان اجرای گنوم‌شل بازنویسی "
+#~ "این کلید، کلید org.gnome.desktop.wm.preferences را در زمان اجرای گنوم‌شل "
-#~ "می‌کند."
+#~ "بازنویسی می‌کند."
 
 #~ msgid "Select an extension to configure using the combobox above."
 #~ msgstr "با استفاده از جعبه‌ی بالا یک افزونه برای پیکربندی انتخاب کنید."
@@ -1999,8 +2016,8 @@ msgstr "محاوره تایید هویت از طرف کاربر رد شد"
 
 #~ msgid "Please confirm whether the Passkey '%06d' matches the one on the device."
 #~ msgstr ""
-#~ "لطفا تایید کنید که آیا کلید عبور مربوط به «%I06d» با همتای آن در دستگاه مطابقت "
+#~ "لطفا تایید کنید که آیا کلید عبور مربوط به «%I06d» با همتای آن در دستگاه "
-#~ "دارد یا خیر."
+#~ "مطابقت دارد یا خیر."
 
 #~ msgid "Matches"
 #~ msgstr "منطبق شد"
@@ -2037,32 +2054,34 @@ msgstr "محاوره تایید هویت از طرف کاربر رد شد"
 #~ msgstr "ضبط یک تصویربرداری از صفحه‌نمایش"
 
 #~ msgid "Whether to collect stats about applications usage"
-#~ msgstr "اینکه اطلاعات برنامه‌ها درباره‌ی میزان استفاده از منابع جمع‌آوری شود یا خیر"
+#~ msgstr ""
+#~ "اینکه اطلاعات برنامه‌ها درباره‌ی میزان استفاده از منابع جمع‌آوری شود یا خیر"
 
 #~ msgid ""
-#~ "The shell normally monitors active applications in order to present the most used "
+#~ "The shell normally monitors active applications in order to present the most "
-#~ "ones (e.g. in launchers). While this data will be kept private, you may want to "
+#~ "used ones (e.g. in launchers). While this data will be kept private, you may "
-#~ "disable this for privacy reasons. Please note that doing so won't remove already "
+#~ "want to disable this for privacy reasons. Please note that doing so won't "
-#~ "saved data."
+#~ "remove already saved data."
 #~ msgstr ""
-#~ "پوسته گنوم در حالت عادی برنامه‌های فعال را جهت ارائه برنامه‌های بیشتر استفاده شده "
+#~ "پوسته گنوم در حالت عادی برنامه‌های فعال را جهت ارائه برنامه‌های بیشتر استفاده "
-#~ "پایش می کند. (برای مثال در اجرا کننده‌ها). با اینکه که این اطلاعات به صورت خصوصی "
+#~ "شده پایش می کند. (برای مثال در اجرا کننده‌ها). با اینکه که این اطلاعات به صورت "
-#~ "نگاه‌داری می‌شود، ممکن است شما بخواهید این امکان را به دلایل امنیتی غیرفعال کنید. "
+#~ "خصوصی نگاه‌داری می‌شود، ممکن است شما بخواهید این امکان را به دلایل امنیتی "
-#~ "لطفا توجه کنید این کار باعث پاک شدن اطلاعاتی که تاکنون ذخیره شده‌اند نمی‌شود."
+#~ "غیرفعال کنید. لطفا توجه کنید این کار باعث پاک شدن اطلاعاتی که تاکنون ذخیره "
+#~ "شده‌اند نمی‌شود."
 
 #~ msgid ""
 #~ "Internally used to store the last IM presence explicitly set by the user. The "
 #~ "value here is from the TpConnectionPresenceType enumeration."
 #~ msgstr ""
-#~ "به‌طور داخلی جهت ذخیره‌ی آخرین وضعیتِ حاضرِ ثبت شده‌ی توسط کاربر استفاده می‌شود. مقدار "
+#~ "به‌طور داخلی جهت ذخیره‌ی آخرین وضعیتِ حاضرِ ثبت شده‌ی توسط کاربر استفاده می‌شود. "
-#~ "اینجا از محل محاسبه‌ی TpConnectionPresenceType است."
+#~ "مقدار اینجا از محل محاسبه‌ی TpConnectionPresenceType است."
 
 #~ msgid ""
-#~ "Internally used to store the last session presence status for the user. The value "
+#~ "Internally used to store the last session presence status for the user. The "
-#~ "here is from the GsmPresenceStatus enumeration."
+#~ "value here is from the GsmPresenceStatus enumeration."
 #~ msgstr ""
-#~ "به‌طور داخلی برای ذخیره آخرین نشستی که کاربر در آن وضعیت حاضر داشته است استفاده "
+#~ "به‌طور داخلی برای ذخیره آخرین نشستی که کاربر در آن وضعیت حاضر داشته است "
-#~ "می‌شود. مقدار اینجا از محاسبه GsmPresenceStatus است."
+#~ "استفاده می‌شود. مقدار اینجا از محاسبه GsmPresenceStatus است."
 
 #~ msgid "Keybinding to toggle the screen recorder"
 #~ msgstr "کلید مقید برای تغییر وضعیت ضبط کننده‌ی صفحه"
@@ -2074,49 +2093,49 @@ msgstr "محاوره تایید هویت از طرف کاربر رد شد"
 #~ msgstr "سرعت فریم استفاده شده در تصویربرداری از صفحه‌نمایش."
 
 #~ msgid ""
-#~ "The framerate of the resulting screencast recordered by GNOME Shell's screencast "
+#~ "The framerate of the resulting screencast recordered by GNOME Shell's "
-#~ "recorder in frames-per-second."
+#~ "screencast recorder in frames-per-second."
 #~ msgstr ""
-#~ "سرعت فریم حاصل از تصویربرداری از صفحه نمایش با استفاده از ضبط کننده نمایشگر پوسته‌ی "
+#~ "سرعت فریم حاصل از تصویربرداری از صفحه نمایش با استفاده از ضبط کننده نمایشگر "
-#~ "گنوم بر اساس فریم بر ثانیه"
+#~ "پوسته‌ی گنوم بر اساس فریم بر ثانیه"
 
 #~ msgid "The gstreamer pipeline used to encode the screencast"
 #~ msgstr "مجرای ارتباطی gstreamer برای کدگذاری تصویربرداری از صفحه نمایش"
 
 #~ msgid ""
-#~ "Sets the GStreamer pipeline used to encode recordings. It follows the syntax used "
+#~ "Sets the GStreamer pipeline used to encode recordings. It follows the syntax "
-#~ "for gst-launch. The pipeline should have an unconnected sink pad where the "
+#~ "used for gst-launch. The pipeline should have an unconnected sink pad where "
-#~ "recorded video is recorded. It will normally have a unconnected source pad; output "
+#~ "the recorded video is recorded. It will normally have a unconnected source "
-#~ "from that pad will be written into the output file. However the pipeline can also "
+#~ "pad; output from that pad will be written into the output file. However the "
-#~ "take care of its own output - this might be used to send the output to an icecast "
+#~ "pipeline can also take care of its own output - this might be used to send "
-#~ "server via shout2send or similar. When unset or set to an empty value, the default "
+#~ "the output to an icecast server via shout2send or similar. When unset or set "
-#~ "pipeline will be used. This is currently 'vp8enc min_quantizer=13 max_quantizer=13 "
+#~ "to an empty value, the default pipeline will be used. This is currently "
-#~ "cpu-used=5 deadline=1000000 threads=%T ! queue ! webmmux' and records to WEBM "
+#~ "'vp8enc min_quantizer=13 max_quantizer=13 cpu-used=5 deadline=1000000 threads="
-#~ "using the VP8 codec. %T is used as a placeholder for a guess at the optimal thread "
+#~ "%T ! queue ! webmmux' and records to WEBM using the VP8 codec. %T is used as "
-#~ "count on the system."
+#~ "a placeholder for a guess at the optimal thread count on the system."
 #~ msgstr ""
-#~ "Sets the GStreamer pipeline used to encode recordings. It follows the syntax used "
+#~ "Sets the GStreamer pipeline used to encode recordings. It follows the syntax "
-#~ "for gst-launch. The pipeline should have an unconnected sink pad where the "
+#~ "used for gst-launch. The pipeline should have an unconnected sink pad where "
-#~ "recorded video is recorded. It will normally have a unconnected source pad; output "
+#~ "the recorded video is recorded. It will normally have a unconnected source "
-#~ "from that pad will be written into the output file. However the pipeline can also "
+#~ "pad; output from that pad will be written into the output file. However the "
-#~ "take care of its own output - this might be used to send the output to an icecast "
+#~ "pipeline can also take care of its own output - this might be used to send "
-#~ "server via shout2send or similar. When unset or set to an empty value, the default "
+#~ "the output to an icecast server via shout2send or similar. When unset or set "
-#~ "pipeline will be used. This is currently 'vp8enc min_quantizer=13 max_quantizer=13 "
+#~ "to an empty value, the default pipeline will be used. This is currently "
-#~ "cpu-used=5 deadline=1000000 threads=%T ! queue ! webmmux' and records to WEBM "
+#~ "'vp8enc min_quantizer=13 max_quantizer=13 cpu-used=5 deadline=1000000 threads="
-#~ "using the VP8 codec. %T is used as a placeholder for a guess at the optimal thread "
+#~ "%T ! queue ! webmmux' and records to WEBM using the VP8 codec. %T is used as "
-#~ "count on the system."
+#~ "a placeholder for a guess at the optimal thread count on the system."
 
 #~ msgid "File extension used for storing the screencast"
 #~ msgstr "پسوند پرونده‌ی قابل استفاده برای ذخیره تصویربرداری از صفحه‌نمایش"
 
 #~ msgid ""
 #~ "The filename for recorded screencasts will be a unique filename based on the "
-#~ "current date, and use this extension. It should be changed when recording to a "
+#~ "current date, and use this extension. It should be changed when recording to "
-#~ "different container format."
+#~ "a different container format."
 #~ msgstr ""
-#~ "نام پرونده‌ی ضبط شده برای تصویربرداری از صفحه‌نمایش یکتا و براساس تاریخ جاری خواهد "
+#~ "نام پرونده‌ی ضبط شده برای تصویربرداری از صفحه‌نمایش یکتا و براساس تاریخ جاری "
-#~ "بود و از این افزونه استفاده خواهد کرد. اگر در زمان ضبط از قالب دیگری استفاده کنید "
+#~ "خواهد بود و از این افزونه استفاده خواهد کرد. اگر در زمان ضبط از قالب دیگری "
-#~ "باید تغییر کند."
+#~ "استفاده کنید باید تغییر کند."
 
 #~ msgid "Extension"
 #~ msgstr "افزونه"
@@ -2143,7 +2162,8 @@ msgstr "محاوره تایید هویت از طرف کاربر رد شد"
 #~ msgstr "ویدئو صفحه‌نمایش %Id %t"
 
 #~ msgid "Click Log Out to quit these applications and log out of the system."
-#~ msgstr "بر روی خروج از سیستم کلیک کنید تا از این برنامه‌ها خارج و از سیستم خارج شوید."
+#~ msgstr ""
+#~ "بر روی خروج از سیستم کلیک کنید تا از این برنامه‌ها خارج و از سیستم خارج شوید."
 
 #~ msgid "Logging out of the system."
 #~ msgstr "درحال خروج از سیستم."
@@ -2156,8 +2176,8 @@ msgstr "محاوره تایید هویت از طرف کاربر رد شد"
 
 #~ msgid "Click Restart to quit these applications and restart the system."
 #~ msgstr ""
-#~ "بر روی راه‌اندازی مجدد کلیک کنید تا از این برنامه‌ها خارج و سیستم مجددا راه‌اندازی "
+#~ "بر روی راه‌اندازی مجدد کلیک کنید تا از این برنامه‌ها خارج و سیستم مجددا "
-#~ "گردد."
+#~ "راه‌اندازی گردد."
 
 #~ msgid "Restarting the system."
 #~ msgstr "درحال راه‌اندازی مجدد سیستم."
@@ -2302,11 +2322,11 @@ msgstr "محاوره تایید هویت از طرف کاربر رد شد"
 #~ msgstr "وضعیت گپ شما «مشغول» تنظیم می‌شود"
 
 #~ msgid ""
-#~ "Notifications are now disabled, including chat messages. Your online status has "
+#~ "Notifications are now disabled, including chat messages. Your online status "
-#~ "been adjusted to let others know that you might not see their messages."
+#~ "has been adjusted to let others know that you might not see their messages."
 #~ msgstr ""
-#~ "هم‌اکنون اعلان‌ها، از جمله پیام‌های گپ، غیرفعال هستند. وضعیتِ برخطِ شما به گونه‌ای تنظیم "
+#~ "هم‌اکنون اعلان‌ها، از جمله پیام‌های گپ، غیرفعال هستند. وضعیتِ برخطِ شما به گونه‌ای "
-#~ "شده است که به دیگران نشان دهد ممکن است شما پیام‌هایشان را نبینید."
+#~ "تنظیم شده است که به دیگران نشان دهد ممکن است شما پیام‌هایشان را نبینید."
 
 #~ msgid "Shutting down might cause them to lose unsaved work."
 #~ msgstr "خاموش‌کردن ممکن است باعث شود که کارهای ذخیره نشده خود را از دست بدهند."

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, 2016.
+# GunChleoc <fios@foramnagaidhlig.net>, 2015.
 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: 2016-04-28 21:52+0000\n"
+"POT-Creation-Date: 2015-11-17 16:10+0000\n"
-"PO-Revision-Date: 2016-04-29 10:56+0100\n"
+"PO-Revision-Date: 2015-11-17 17:10+0100\n"
 "Last-Translator: GunChleoc <fios@foramnagaidhlig.net>\n"
 "Language-Team: Fòram na Gàidhlig\n"
 "Language: gd\n"
@@ -61,329 +61,85 @@ msgstr "Slige GNOME"
 msgid "Window management and application launching"
 msgstr "Stiùireadh uinneagan is tòiseachadh aplacaidean"
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:1
-msgid "Enable internal tools useful for developers and testers from Alt-F2"
-msgstr ""
-"Cuir an comas innealan airson luchd-leasachaidh 's luchd-deuchainn o Alt-F2"
-
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:2
-msgid ""
-"Allows access to internal debugging and monitoring tools using the Alt-F2 "
-"dialog."
-msgstr ""
-"Ceadaich inntrigeadh dha na h-innealan a chum dì-bhugachaidh 's sgrùdaidh le "
-"còmhradh Alt-F2."
-
 #: ../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:4
-msgid ""
-"GNOME Shell extensions have a UUID property; this key lists extensions which "
-"should be loaded. Any extension that wants to be loaded needs to be in this "
-"list. You can also manipulate this list with the EnableExtension and "
-"DisableExtension D-Bus methods on org.gnome.Shell."
-msgstr ""
-"Tha buadh UUID aig leudachain na Slige GNOME; seallaidh an iuchair sin na "
-"leudachain a bu chòir luchdadh. Feumaidh gach leudachan a tha ag iarraidh "
-"luchdadh a bhith air an liosta seo. 'S urrainn dhut an liosta seo "
-"atharrachadh cuideachd leis na modhan D-Bus EnableExtension agus "
-"DisableExtension air org.gnome.Shell."
-
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:5
-msgid "Disables the validation of extension version compatibility"
-msgstr ""
-"Cuiridh seo à comas dearbhadh na co-chòrdalachd airson tionndadh nan "
-"leudachan"
-
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:6
-msgid ""
-"GNOME Shell will only load extensions that claim to support the current "
-"running version. Enabling this option will disable this check and try to "
-"load all extensions regardless of the versions they claim to support."
-msgstr ""
-"Cha luchdaich an t-Slige GNOME ach leudachain a dh'innseas gu bheil iar co-"
-"chòrdail leis an tionndadh a tha 'ga ruith. Ma chuireas tu an roghainn seo "
-"an comas, thèid an dearbhadh a chur à comas agus feuchaidh sinn ris a h-uile "
-"leudachan a luchdadh ge b' e dè na tionndaidhean ris an cuir iad taic dhan "
-"rèir-san."
-
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:7
-msgid "List of desktop file IDs for favorite applications"
-msgstr ""
-"Liosta dhe IDan nam faidhlichean desktop airson nan aplacaidean as annsa "
-"leat"
-
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:8
-msgid ""
-"The applications corresponding to these identifiers will be displayed in the "
-"favorites area."
-msgstr ""
-"Thèid na h-aplacaidean a fhreagras ris na h-aithnichearan seo a shealltainn "
-"air raon nan annsachdan."
-
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:9
-msgid "App Picker View"
-msgstr "Sealladh roghnaichear nan aplacaid"
-
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:10
-msgid "Index of the currently selected view in the application picker."
-msgstr "Inneacs an t-seallaidh làithrich ann an roghnaichear nan aplacaid."
-
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:11
-msgid "History for command (Alt-F2) dialog"
-msgstr "Eachdraidh a' chòmhraidh-àithne (Alt-F2)"
-
-#. Translators: looking glass is a debugger and inspector tool, see https://live.gnome.org/GnomeShell/LookingGlass
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:13
-msgid "History for the looking glass dialog"
-msgstr "Eachdraidh a' chomhraidh aig looking glass"
-
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:14
-msgid "Always show the 'Log out' menu item in the user menu."
-msgstr ""
-"Seall nì \"Clàraich a-mach\" air clàr-taice a' chleachdaiche an-còmhnaidh."
-
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:15
-msgid ""
-"This key overrides the automatic hiding of the 'Log out' menu item in single-"
-"user, single-session situations."
-msgstr ""
-"Tar-àithnidh an iuchair seo am falach fèin-obrachail aig \"Clàraich a-mach\" "
-"air a' chlar-taice ann an suidheachaidhean le aon chleachdaiche 's aon "
-"seisean a-mhàin."
-
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:16
-msgid ""
-"Whether to remember password for mounting encrypted or remote filesystems"
-msgstr ""
-"Co-dhiù an dèid am facal-faire a chuimhneachadh airson munntachadh "
-"shiostaman-fhaidhlichean crioptaichte no cèine"
-
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:17
-msgid ""
-"The shell will request a password when an encrypted device or a remote "
-"filesystem is mounted. If the password can be saved for future use a "
-"'Remember Password' checkbox will be present. This key sets the default "
-"state of the checkbox."
-msgstr ""
-"Iarraidh an t-slige facal-fàire ort nuair a thèid siostam-fhaidhlichean "
-"crioptaichte no cèin a mhunntachadh. Ma ghabhas am facal-faire sàbhaladh "
-"airson na h-ama ri teachd, bidh bogsa-còmhraige \"Cuimhnich am facal-fàire\" "
-"ann. Suidhichidh an iuchair seo staid tùsail na bogsa-còmhraige ud."
-
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:18
-msgid ""
-"Whether the default Bluetooth adapter had set up devices associated to it"
-msgstr ""
-"Co-dhiù an robh uidheaman co-cheangailte ris an adaptar Bluetooth gus nach "
-"robh"
-
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:19
-msgid ""
-"The shell will only show a Bluetooth menu item if a Bluetooth adapter is "
-"powered, or if there were devices set up associated with the default "
-"adapter. This will be reset if the default adapter is ever seen not to have "
-"devices associated to it."
-msgstr ""
-"Cha seall an t-slige nì clàir-taice \"Bluetooth\" ach ma tha cumhachd aig "
-"adaptar Bluetooth na ma chaidh uidheaman co-cheangailte ris an adaptar "
-"tùsail roimhe. Thèid seo ath-shuidheachadh ma chithear an t-adaptar tùsail "
-"gun uidheam co-cheangailte ris."
-
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:20
-msgid "Show the week date in the calendar"
-msgstr "Seall latha na seachdaine air a' mhìosachan"
-
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:21
-msgid "If true, display the ISO week date in the calendar."
-msgstr "Mas e true a th' ann, seall latha na seachdaine ISO air a' mhìosachan."
-
 #: ../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:32
-msgid ""
-"Keybinding that pauses and resumes all running tweens, for debugging purposes"
-msgstr ""
-"Nasgadh iuchrach a chuir gach tween a tha 'ga ruith 'na stad 's a "
-"thòisicheas orra a-rithist a chum dì-bhugachaidh"
-
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:33
-msgid "Which keyboard to use"
-msgstr "Am meur-chlàr ri chleachdadh"
-
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:34
-msgid "The type of keyboard to use."
-msgstr "An seòrsa de mheur-chlàr a thèid a chleachdadh."
-
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:35
-msgid "Limit switcher to current workspace."
-msgstr "Cuingich an t-suidsear air an rum-obrach làithreach."
-
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:36
-msgid ""
-"If true, only applications that have windows on the current workspace are "
-"shown in the switcher. Otherwise, all applications are included."
-msgstr ""
-"Mas e true a th' ann, cha dèid a shealltainn san t-suidsear ach na "
-"h-aplacaidean aig a bheil uinneag san rum-obrach làithreach. Mur e, thèid a "
-"h-uile aplacaid a ghabhail a-steach."
-
 #: ../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."
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:38
-msgid ""
-"Configures how the windows are shown in the switcher. Valid possibilities "
-"are 'thumbnail-only' (shows a thumbnail of the window), 'app-icon-"
-"only' (shows only the application icon) or 'both'."
-msgstr ""
-"Rèitichidh seo an dòigh sa thèid na h-uinneagan a shealltainn san "
-"t-suidsear. 'S e \"thumbnail-only\" (seallaidh seo dealbhag na h-uinneige), "
-"\"app-icon-only\" (seallaidh seo ìomhaigheag na h-aplacaid) no \"both\" "
-"(seallaidh seo an dà chuid dhiubh) a tha sna luachan dligheach."
-
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:39
-msgid ""
-"If true, only windows from the current workspace are shown in the switcher. "
-"Otherwise, all windows are included."
-msgstr ""
-"Mas e true a th' ann, cha dèid a shealltainn san t-suidsear ach na "
-"h-uinneagan a tha san rum-obrach làithreach. Mur e, thèid a h-uile uinneag a "
-"ghabhail a-steach."
-
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:40
-msgid "Attach modal dialog to the parent window"
-msgstr "Ceangail còmhradh mòdach ris an uinneag-pàraint"
-
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:41
-msgid ""
-"This key overrides the key in org.gnome.mutter when running GNOME Shell."
-msgstr ""
-"Tar-àithnidh an iuchair seo an iuchair ann an org.gnome.mutter nuair a thèid "
-"Slige GNOME a ruith."
-
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:42
-msgid "Enable edge tiling when dropping windows on screen edges"
-msgstr ""
-"Cuir leacadh nan oirean an comas nuair a thèid uinneagan a leigeil às aig "
-"oir na sgrìn"
-
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:43
-msgid "Workspaces are managed dynamically"
-msgstr "Thèid na rumannan-obrach a stiùireadh a làimh"
-
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:44
-msgid "Workspaces only on primary monitor"
-msgstr "Rumannan-obrach air a' phrìomh-sgrìn a-mhàin"
-
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:45
-msgid "Delay focus changes in mouse mode until the pointer stops moving"
-msgstr ""
-"Cuir dàil air atharraichean an fòcais ann am modh luchaige gus an sguir an "
-"tomhaire air gluasad"
-
 #: ../data/org.gnome.Shell.PortalHelper.desktop.in.h:1
 msgid "Network Login"
 msgstr "Clàradh a-steach lìonraidh"
 
-#: ../js/extensionPrefs/main.js:117
+#: ../js/extensionPrefs/main.js:122
 #, 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:149
+#: ../js/extensionPrefs/main.js:154
 msgid "GNOME Shell Extensions"
 msgstr "Leudachain na Slige GNOME"
 
-#: ../js/gdm/authPrompt.js:147 ../js/ui/audioDeviceSelection.js:71
+#: ../js/gdm/authPrompt.js:147 ../js/ui/components/networkAgent.js:145
-#: ../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:216
+#: ../js/gdm/authPrompt.js:169 ../js/gdm/authPrompt.js:215
-#: ../js/gdm/authPrompt.js:448
+#: ../js/gdm/authPrompt.js:447
 msgid "Next"
 msgstr "Air adhart"
 
-#: ../js/gdm/authPrompt.js:212 ../js/ui/shellMountOperation.js:403
+#: ../js/gdm/authPrompt.js:211 ../js/ui/shellMountOperation.js:403
 #: ../js/ui/unlockDialog.js:59
 msgid "Unlock"
 msgstr "Neo-ghlais"
 
-#: ../js/gdm/authPrompt.js:214
+#: ../js/gdm/authPrompt.js:213
 msgctxt "button"
 msgid "Sign In"
 msgstr "Clàraich a-steach"
 
-#: ../js/gdm/loginDialog.js:285
+#: ../js/gdm/loginDialog.js:281
 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:435
+#: ../js/gdm/loginDialog.js:431
 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:854
+#: ../js/gdm/loginDialog.js:850
 #, javascript-format
 msgid "(e.g., user or %s)"
 msgstr "(m.e., cleachdaiche no %s)"
@@ -391,12 +147,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:859 ../js/ui/components/networkAgent.js:271
+#: ../js/gdm/loginDialog.js:855 ../js/ui/components/networkAgent.js:271
 #: ../js/ui/components/networkAgent.js:289
 msgid "Username: "
 msgstr "Ainm-cleachdaiche:"
 
-#: ../js/gdm/loginDialog.js:1196
+#: ../js/gdm/loginDialog.js:1180
 msgid "Login Window"
 msgstr "Uinneag a' chlàraidh a-steach"
 
@@ -532,37 +288,16 @@ msgstr "Cuir ris na h-annsachdan"
 msgid "Show Details"
 msgstr "Seall am mion-fhiosrachadh"
 
-#: ../js/ui/appFavorites.js:134
+#: ../js/ui/appFavorites.js:133
 #, javascript-format
 msgid "%s has been added to your favorites."
 msgstr "Chaidh %s a chur ris na h-annsachdan agad."
 
-#: ../js/ui/appFavorites.js:168
+#: ../js/ui/appFavorites.js:167
 #, 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…"
@@ -571,12 +306,12 @@ msgstr "Atharraich an cùlaibh…"
 msgid "Display Settings"
 msgstr "Roghainnean an t-seallaidh"
 
-#: ../js/ui/backgroundMenu.js:22 ../js/ui/status/system.js:371
+#: ../js/ui/backgroundMenu.js:22 ../js/ui/status/system.js:366
 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:47
+#: ../js/ui/calendar.js:55
 msgctxt "calendar-no-work"
 msgid "06"
 msgstr "06"
@@ -586,96 +321,100 @@ 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:76
+#: ../js/ui/calendar.js:84
 msgctxt "grid sunday"
 msgid "S"
 msgstr "Dò"
 
 #. Translators: Calendar grid abbreviation for Monday
-#: ../js/ui/calendar.js:78
+#: ../js/ui/calendar.js:86
 msgctxt "grid monday"
 msgid "M"
 msgstr "Lu"
 
 #. Translators: Calendar grid abbreviation for Tuesday
-#: ../js/ui/calendar.js:80
+#: ../js/ui/calendar.js:88
 msgctxt "grid tuesday"
 msgid "T"
 msgstr "Mà"
 
 #. Translators: Calendar grid abbreviation for Wednesday
-#: ../js/ui/calendar.js:82
+#: ../js/ui/calendar.js:90
 msgctxt "grid wednesday"
 msgid "W"
 msgstr "Ci"
 
 #. Translators: Calendar grid abbreviation for Thursday
-#: ../js/ui/calendar.js:84
+#: ../js/ui/calendar.js:92
 msgctxt "grid thursday"
 msgid "T"
 msgstr "Da"
 
 #. Translators: Calendar grid abbreviation for Friday
-#: ../js/ui/calendar.js:86
+#: ../js/ui/calendar.js:94
 msgctxt "grid friday"
 msgid "F"
 msgstr "hA"
 
 #. Translators: Calendar grid abbreviation for Saturday
-#: ../js/ui/calendar.js:88
+#: ../js/ui/calendar.js:96
 msgctxt "grid saturday"
 msgid "S"
 msgstr "Sa"
 
-#: ../js/ui/calendar.js:416
+#: ../js/ui/calendar.js:566
 msgid "Previous month"
 msgstr "Am mìos roimhe"
 
-#: ../js/ui/calendar.js:426
+#: ../js/ui/calendar.js:576
 msgid "Next month"
 msgstr "An ath mhìos"
 
-#: ../js/ui/calendar.js:579
+#: ../js/ui/calendar.js:728
-#, no-javascript-format
+#, javascript-format
 msgctxt "date day number format"
 msgid "%d"
 msgstr "%d"
 
-#: ../js/ui/calendar.js:634
+#: ../js/ui/calendar.js:783
 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:695
+#: ../js/ui/calendar.js:1188
 msgctxt "event list time"
 msgid "All Day"
 msgstr "Fad an latha"
 
-#: ../js/ui/calendar.js:821
+#: ../js/ui/calendar.js:1295
+msgid "Clear section"
+msgstr "Falamhaich an earrann"
+
+#: ../js/ui/calendar.js:1522
 msgid "Events"
 msgstr "Tachartasan"
 
-#: ../js/ui/calendar.js:830
+#: ../js/ui/calendar.js:1531
 msgctxt "calendar heading"
 msgid "%A, %B %d"
 msgstr "%A, %d %B"
 
-#: ../js/ui/calendar.js:834
+#: ../js/ui/calendar.js:1535
 msgctxt "calendar heading"
 msgid "%A, %B %d, %Y"
 msgstr "%A, %d %B, %Y"
 
-#: ../js/ui/calendar.js:919
+#: ../js/ui/calendar.js:1620
 msgid "Notifications"
 msgstr "Brathan"
 
-#: ../js/ui/calendar.js:1070
+#: ../js/ui/calendar.js:1771
 msgid "No Notifications"
 msgstr "Chan eil brath ann"
 
-#: ../js/ui/calendar.js:1073
+#: ../js/ui/calendar.js:1774
 msgid "No Events"
 msgstr "Chan eil tachartas ann"
 
@@ -814,7 +553,7 @@ msgstr ""
 
 #. Translators: this is the other person changing their old IM name to their new
 #. IM name.
-#: ../js/ui/components/telepathyClient.js:760
+#: ../js/ui/components/telepathyClient.js:759
 #, javascript-format
 msgid "%s is now known as %s"
 msgstr "thug %s %s air"
@@ -1023,11 +762,11 @@ msgid "Keyboard"
 msgstr "Am meur-chlàr"
 
 #. translators: 'Hide' is a verb
-#: ../js/ui/legacyTray.js:65
+#: ../js/ui/legacyTray.js:66
 msgid "Hide tray"
 msgstr "Falaich an treidhe"
 
-#: ../js/ui/legacyTray.js:106
+#: ../js/ui/legacyTray.js:107
 msgid "Status Icons"
 msgstr "Ìomhaigheagan staide"
 
@@ -1055,7 +794,7 @@ msgstr "An comas"
 
 #. translators:
 #. * The device has been disabled
-#: ../js/ui/lookingGlass.js:719 ../src/gvc/gvc-mixer-control.c:1866
+#: ../js/ui/lookingGlass.js:719 ../src/gvc/gvc-mixer-control.c:1828
 msgid "Disabled"
 msgstr "À comas"
 
@@ -1079,30 +818,10 @@ 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"
@@ -1183,7 +902,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:379
+#: ../js/ui/screenShield.js:432 ../js/ui/status/system.js:374
 msgid "Lock"
 msgstr "Glais"
 
@@ -1327,50 +1046,30 @@ msgstr "Soilleireachd"
 msgid "Show Keyboard Layout"
 msgstr "Seall co-dhealbhachd a' mheur-chlàir"
 
-#: ../js/ui/status/location.js:107 ../js/ui/status/location.js:215
+#: ../js/ui/status/location.js:71 ../js/ui/status/location.js:177
 msgid "Location Enabled"
 msgstr "Tha an t-ionad an comas"
 
-#: ../js/ui/status/location.js:108 ../js/ui/status/location.js:216
+#: ../js/ui/status/location.js:72 ../js/ui/status/location.js:178
 msgid "Disable"
 msgstr "Cuir à comas"
 
-#: ../js/ui/status/location.js:109
+#: ../js/ui/status/location.js:73
 msgid "Privacy Settings"
 msgstr "Roghainnean na prìobhaideachd"
 
-#: ../js/ui/status/location.js:214
+#: ../js/ui/status/location.js:176
 msgid "Location In Use"
 msgstr "Tha an t-ionad 'ga chleachdadh"
 
-#: ../js/ui/status/location.js:218
+#: ../js/ui/status/location.js:180
 msgid "Location Disabled"
 msgstr "Tha an t-ionad à comas"
 
-#: ../js/ui/status/location.js:219
+#: ../js/ui/status/location.js:181
 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>"
@@ -1555,37 +1254,34 @@ 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:61
+#: ../js/ui/status/power.js:49
 msgid "Power Settings"
 msgstr "Roghainnean na cumhachd"
 
-#: ../js/ui/status/power.js:77
+#: ../js/ui/status/power.js:65
 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:84 ../js/ui/status/power.js:90
+#: ../js/ui/status/power.js:72 ../js/ui/status/power.js:78
 msgid "Estimating…"
 msgstr "'Ga thuairmeas…"
 
 #. Translators: this is <hours>:<minutes> Remaining (<percentage>)
-#: ../js/ui/status/power.js:98
+#: ../js/ui/status/power.js:86
 #, 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:103
+#: ../js/ui/status/power.js:91
 #, 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.
@@ -1593,27 +1289,27 @@ msgstr "%d %%"
 msgid "Airplane Mode On"
 msgstr "Modh itealain air"
 
-#: ../js/ui/status/system.js:348
+#: ../js/ui/status/system.js:343
 msgid "Switch User"
 msgstr "Leum gu cleachdaiche eile"
 
-#: ../js/ui/status/system.js:353
+#: ../js/ui/status/system.js:348
 msgid "Log Out"
 msgstr "Clàraich a-mach"
 
-#: ../js/ui/status/system.js:358
+#: ../js/ui/status/system.js:353
 msgid "Account Settings"
 msgstr "Roghainnean a' chunntais"
 
-#: ../js/ui/status/system.js:375
+#: ../js/ui/status/system.js:370
 msgid "Orientation Lock"
 msgstr "Glais na comhair"
 
-#: ../js/ui/status/system.js:383
+#: ../js/ui/status/system.js:378
 msgid "Suspend"
 msgstr "Cuir 'na dhàil"
 
-#: ../js/ui/status/system.js:386
+#: ../js/ui/status/system.js:381
 msgid "Power Off"
 msgstr "Cuir a' chumhachd dheth"
 
@@ -1625,6 +1321,10 @@ 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"
@@ -1751,7 +1451,7 @@ msgstr "Mìosachan Evolution"
 
 #. translators:
 #. * The number of sound outputs on a particular device
-#: ../src/gvc/gvc-mixer-control.c:1873
+#: ../src/gvc/gvc-mixer-control.c:1835
 #, c-format
 msgid "%u Output"
 msgid_plural "%u Outputs"
@@ -1762,7 +1462,7 @@ msgstr[3] "%u às-chur"
 
 #. translators:
 #. * The number of sound inputs on a particular device
-#: ../src/gvc/gvc-mixer-control.c:1883
+#: ../src/gvc/gvc-mixer-control.c:1845
 #, c-format
 msgid "%u Input"
 msgid_plural "%u Inputs"
@@ -1771,7 +1471,7 @@ msgstr[1] "%u ion-chur"
 msgstr[2] "%u ion-chuir"
 msgstr[3] "%u ion-chur"
 
-#: ../src/gvc/gvc-mixer-control.c:2738
+#: ../src/gvc/gvc-mixer-control.c:2371
 msgid "System Sounds"
 msgstr "Fuaimean an t-siostaim"
 

src/Makefile.am

@@ -12,7 +12,7 @@ SUBDIRS = gvc
 
 -include $(INTROSPECTION_MAKEFILE)
 INTROSPECTION_GIRS =
-INTROSPECTION_SCANNER_ARGS = --warn-all --warn-error --add-include-path=$(srcdir) --add-include-path=$(MUTTER_GIR_DIR) -L$(MUTTER_TYPELIB_DIR)
+INTROSPECTION_SCANNER_ARGS = --warn-all --warn-error --add-include-path=$(srcdir) --add-include-path=$(MUTTER_GIR_DIR)
 INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir) --includedir=$(MUTTER_TYPELIB_DIR)
 
 typelibdir = $(pkglibdir)
@@ -201,7 +201,6 @@ gnome_shell_CPPFLAGS = \
 # Here, and after, we repeat mutter and bluetooth libraries just for the rpath
 # The dependency is already pulled in by libtool
 gnome_shell_LDADD = libgnome-shell.la libgnome-shell-js.la $(GNOME_SHELL_LIBS) $(MUTTER_LIBS)
-gnome_shell_LDFLAGS = -rpath $(MUTTER_TYPELIB_DIR)
 gnome_shell_DEPENDENCIES = libgnome-shell.la
 
 gnome_shell_extension_prefs_SOURCES = \

src/shell-recorder.c

@@ -944,9 +944,6 @@ get_absolute_path (char *maybe_relative)
   else
     {
       const char *video_dir = g_get_user_special_dir (G_USER_DIRECTORY_VIDEOS);
-      if (!g_file_test (video_dir, G_FILE_TEST_EXISTS))
-          video_dir = g_get_home_dir ();
-
       path = g_build_filename (video_dir, maybe_relative, NULL);
     }
 

src/st/st-private.c

@@ -347,7 +347,6 @@ _st_create_shadow_pipeline (StShadow    *shadow_spec,
 {
   ClutterBackend *backend = clutter_get_default_backend ();
   CoglContext *ctx = clutter_backend_get_cogl_context (backend);
-  CoglError *error = NULL;
 
   static CoglPipeline *shadow_pipeline_template = NULL;
 
@@ -378,13 +377,7 @@ _st_create_shadow_pipeline (StShadow    *shadow_spec,
                                                          COGL_PIXEL_FORMAT_A_8,
                                                          rowstride_out,
                                                          pixels_out,
-                                                         &error));
+                                                         NULL));
-
-  if (error)
-    {
-      g_warning ("Failed to allocate texture: %s", error->message);
-      cogl_error_free (error);
-    }
 
   g_free (pixels_out);
 
@@ -402,10 +395,7 @@ _st_create_shadow_pipeline (StShadow    *shadow_spec,
 
   pipeline = cogl_pipeline_copy (shadow_pipeline_template);
   cogl_pipeline_set_layer_texture (pipeline, 0, texture);
-
+  cogl_object_unref (texture);
-  if (texture)
-    cogl_object_unref (texture);
-
   return pipeline;
 }
 

src/st/st-texture-cache.c

@@ -461,24 +461,14 @@ pixbuf_to_cogl_texture (GdkPixbuf *pixbuf)
 {
   ClutterBackend *backend = clutter_get_default_backend ();
   CoglContext *ctx = clutter_backend_get_cogl_context (backend);
-  CoglError *error = NULL;
-  CoglTexture2D *texture;
 
-  texture = cogl_texture_2d_new_from_data (ctx,
+  return COGL_TEXTURE (cogl_texture_2d_new_from_data (ctx,
-                                           gdk_pixbuf_get_width (pixbuf),
+                                                      gdk_pixbuf_get_width (pixbuf),
-                                           gdk_pixbuf_get_height (pixbuf),
+                                                      gdk_pixbuf_get_height (pixbuf),
-                                           gdk_pixbuf_get_has_alpha (pixbuf) ? COGL_PIXEL_FORMAT_RGBA_8888 : COGL_PIXEL_FORMAT_RGB_888,
+                                                      gdk_pixbuf_get_has_alpha (pixbuf) ? COGL_PIXEL_FORMAT_RGBA_8888 : COGL_PIXEL_FORMAT_RGB_888,
-                                           gdk_pixbuf_get_rowstride (pixbuf),
+                                                      gdk_pixbuf_get_rowstride (pixbuf),
-                                           gdk_pixbuf_get_pixels (pixbuf),
+                                                      gdk_pixbuf_get_pixels (pixbuf),
-                                           &error);
+                                                      NULL));
-
-  if (error)
-    {
-      g_warning ("Failed to allocate texture: %s", error->message);
-      cogl_error_free (error);
-    }
-
-  return texture ? COGL_TEXTURE (texture) : NULL;
 }
 
 static cairo_surface_t *
@@ -642,8 +632,6 @@ st_texture_cache_reset_texture (StTextureCachePropertyBind *bind,
       (cairo_image_surface_get_format (surface) == CAIRO_FORMAT_ARGB32 ||
        cairo_image_surface_get_format (surface) == CAIRO_FORMAT_RGB24))
     {
-      CoglError *error = NULL;
-
       texdata = COGL_TEXTURE (cogl_texture_2d_new_from_data (ctx,
                                                              cairo_image_surface_get_width (surface),
                                                              cairo_image_surface_get_height (surface),
@@ -651,18 +639,9 @@ st_texture_cache_reset_texture (StTextureCachePropertyBind *bind,
                                                              COGL_PIXEL_FORMAT_BGRA_8888 : COGL_PIXEL_FORMAT_BGR_888,
                                                              cairo_image_surface_get_stride (surface),
                                                              cairo_image_surface_get_data (surface),
-                                                             &error));
+                                                             NULL));
-
+      clutter_texture_set_cogl_texture (bind->texture, texdata);
-      if (texdata)
+      cogl_object_unref (texdata);
-        {
-          clutter_texture_set_cogl_texture (bind->texture, texdata);
-          cogl_object_unref (texdata);
-        }
-      else if (error)
-        {
-          g_warning ("Failed to allocate texture: %s", error->message);
-          cogl_error_free (error);
-        }
 
       clutter_actor_set_opacity (CLUTTER_ACTOR (bind->texture), 255);
     }

src/st/st-theme-node-drawing.c

@@ -71,7 +71,6 @@ create_corner_material (StCornerSpec *corner)
 {
   ClutterBackend *backend = clutter_get_default_backend ();
   CoglContext *ctx = clutter_backend_get_cogl_context (backend);
-  CoglError *error = NULL;
   CoglHandle texture;
   cairo_t *cr;
   cairo_surface_t *surface;
@@ -173,15 +172,9 @@ create_corner_material (StCornerSpec *corner)
                                                          CLUTTER_CAIRO_FORMAT_ARGB32,
                                                          rowstride,
                                                          data,
-                                                         &error));
+                                                         NULL));
-
-  if (error)
-    {
-      g_warning ("Failed to allocate texture: %s", error->message);
-      cogl_error_free (error);
-    }
-
   g_free (data);
+  g_assert (texture != COGL_INVALID_HANDLE);
 
   return texture;
 }
@@ -354,7 +347,7 @@ st_theme_node_lookup_corner (StThemeNode    *node,
                              float           height,
                              StCorner        corner_id)
 {
-  CoglHandle texture, material = COGL_INVALID_HANDLE;
+  CoglHandle texture, material;
   char *key;
   StTextureCache *cache;
   StCornerSpec corner;
@@ -403,12 +396,8 @@ st_theme_node_lookup_corner (StThemeNode    *node,
 
   key = corner_to_string (&corner);
   texture = st_texture_cache_load (cache, key, ST_TEXTURE_CACHE_POLICY_NONE, load_corner, &corner, NULL);
-
+  material = _st_create_texture_pipeline (texture);
-  if (texture)
+  cogl_handle_unref (texture);
-    {
-      material = _st_create_texture_pipeline (texture);
-      cogl_handle_unref (texture);
-    }
 
   g_free (key);
 
@@ -969,7 +958,6 @@ st_theme_node_prerender_background (StThemeNode *node,
 {
   ClutterBackend *backend = clutter_get_default_backend ();
   CoglContext *ctx = clutter_backend_get_cogl_context (backend);
-  CoglError *error = NULL;
   StBorderImage *border_image;
   CoglHandle texture;
   guint radius[4];
@@ -1289,13 +1277,7 @@ st_theme_node_prerender_background (StThemeNode *node,
                                                          CLUTTER_CAIRO_FORMAT_ARGB32,
                                                          rowstride,
                                                          data,
-                                                         &error));
+                                                         NULL));
-
-  if (error)
-    {
-      g_warning ("Failed to allocate texture: %s", error->message);
-      cogl_error_free (error);
-    }
 
   cairo_destroy (cr);
   cairo_surface_destroy (surface);