diff --git a/configure.ac b/configure.ac
index f4469c088..2cab70d09 100644
--- a/configure.ac
+++ b/configure.ac
@@ -60,7 +60,7 @@ fi
AM_CONDITIONAL(BUILD_RECORDER, $build_recorder)
-CLUTTER_MIN_VERSION=1.5.8
+CLUTTER_MIN_VERSION=1.5.15
GOBJECT_INTROSPECTION_MIN_VERSION=0.10.1
GJS_MIN_VERSION=0.7.8
MUTTER_MIN_VERSION=2.91.4
diff --git a/data/Makefile.am b/data/Makefile.am
index 8d7eedf08..2de2ff976 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -31,7 +31,6 @@ dist_theme_DATA = \
theme/close.svg \
theme/corner-ripple.png \
theme/dash-placeholder.svg \
- theme/dialog-error.svg \
theme/filter-selected.svg \
theme/gnome-shell.css \
theme/mosaic-view-active.svg \
diff --git a/data/gnome-shell.desktop.in.in b/data/gnome-shell.desktop.in.in
index a6765ba70..e64364ac1 100644
--- a/data/gnome-shell.desktop.in.in
+++ b/data/gnome-shell.desktop.in.in
@@ -7,7 +7,7 @@ X-GNOME-Bugzilla-Bugzilla=GNOME
X-GNOME-Bugzilla-Product=gnome-shell
X-GNOME-Bugzilla-Component=general
X-GNOME-Bugzilla-Version=@VERSION@
-Categories=GNOME;GTK;Utility;Core;
+Categories=GNOME;GTK;Core;
OnlyShowIn=GNOME;
NoDisplay=true
X-GNOME-Autostart-Phase=WindowManager
diff --git a/data/gs-applications.menu b/data/gs-applications.menu
index cb4db03a8..b26ed0066 100644
--- a/data/gs-applications.menu
+++ b/data/gs-applications.menu
@@ -77,10 +77,6 @@
-
- Documentation
- Core
- SettingsScreensaver
diff --git a/data/theme/dialog-error.svg b/data/theme/dialog-error.svg
deleted file mode 100644
index 88c4ef75d..000000000
--- a/data/theme/dialog-error.svg
+++ /dev/null
@@ -1,222 +0,0 @@
-
-
-
-
diff --git a/data/theme/gnome-shell.css b/data/theme/gnome-shell.css
index f16e3378c..a05418c60 100644
--- a/data/theme/gnome-shell.css
+++ b/data/theme/gnome-shell.css
@@ -1227,15 +1227,14 @@ StTooltip StLabel {
color: white;
}
-.run-dialog-error-icon {
- background-image: url("dialog-error.svg");
- width: 36px;
- height: 36px;
+.run-dialog-error-label {
+ font-size: 12px;
+ color: white;
}
-.run-dialog-error-label {
- font-size: 16px;
- color: white;
+.run-dialog-error-box {
+ padding-top: 15px;
+ spacing: 5px;
}
.run-dialog-entry {
diff --git a/js/misc/util.js b/js/misc/util.js
index fc515eb7b..e2ec2c164 100644
--- a/js/misc/util.js
+++ b/js/misc/util.js
@@ -82,12 +82,17 @@ function trySpawn(argv)
GLib.SpawnFlags.SEARCH_PATH,
null, null);
} catch (err) {
- // The exception from gjs contains an error string like:
- // Error invoking GLib.spawn_command_line_async: Failed to
- // execute child process "foo" (No such file or directory)
- // We are only interested in the part in the parentheses. (And
- // we can't pattern match the text, since it gets localized.)
- err.message = err.message.replace(/.*\((.+)\)/, '$1');
+ if (err.code == GLib.SpawnError.G_SPAWN_ERROR_NOENT) {
+ err.message = _("Command not found");
+ } else {
+ // The exception from gjs contains an error string like:
+ // Error invoking GLib.spawn_command_line_async: Failed to
+ // execute child process "foo" (No such file or directory)
+ // We are only interested in the part in the parentheses. (And
+ // we can't pattern match the text, since it gets localized.)
+ err.message = err.message.replace(/.*\((.+)\)/, '$1');
+ }
+
throw err;
}
}
diff --git a/js/ui/runDialog.js b/js/ui/runDialog.js
index 6d07ee223..5bf578b66 100644
--- a/js/ui/runDialog.js
+++ b/js/ui/runDialog.js
@@ -219,20 +219,22 @@ __proto__: ModalDialog.ModalDialog.prototype,
this._entryText.grab_key_focus();
}));
- this._errorBox = new St.BoxLayout();
+ this._errorBox = new St.BoxLayout({ style_class: 'run-dialog-error-box' });
this.contentLayout.add(this._errorBox, { expand: true });
- let errorIcon = new St.Button({ style_class: 'run-dialog-error-icon' });
+ let errorIcon = new St.Icon({ icon_name: 'dialog-error', icon_size: 24, style_class: 'run-dialog-error-icon' });
- this._errorBox.add(errorIcon);
+ this._errorBox.add(errorIcon, { y_align: St.Align.MIDDLE });
this._commandError = false;
this._errorMessage = new St.Label({ style_class: 'run-dialog-error-label' });
this._errorMessage.clutter_text.line_wrap = true;
- this._errorBox.add(this._errorMessage, { expand: true });
+ this._errorBox.add(this._errorMessage, { expand: true,
+ y_align: St.Align.MIDDLE,
+ y_fill: false });
this._errorBox.hide();
@@ -348,8 +350,7 @@ __proto__: ModalDialog.ModalDialog.prototype,
} else {
this._commandError = true;
- let errorStr = _("Execution of '%s' failed:").format(command) + '\n' + e.message;
- this._errorMessage.set_text(errorStr);
+ this._errorMessage.set_text(e.message);
if (!this._errorBox.visible) {
let [errorBoxMinHeight, errorBoxNaturalHeight] = this._errorBox.get_preferred_height(-1);
diff --git a/js/ui/searchDisplay.js b/js/ui/searchDisplay.js
index 45fccd6ea..3ed60ad5e 100644
--- a/js/ui/searchDisplay.js
+++ b/js/ui/searchDisplay.js
@@ -309,6 +309,8 @@ SearchResults.prototype = {
this._statusText.set_text(_("No matching results."));
this._statusText.show();
} else {
+ this._selectedOpenSearchButton = -1;
+ this._updateOpenSearchButtonState();
this._statusText.hide();
}
diff --git a/js/ui/statusIconDispatcher.js b/js/ui/statusIconDispatcher.js
index 874ffb40d..c48f2765e 100644
--- a/js/ui/statusIconDispatcher.js
+++ b/js/ui/statusIconDispatcher.js
@@ -16,7 +16,10 @@ const STANDARD_TRAY_ICON_IMPLEMENTATIONS = {
'nm-applet': 'network',
'gnome-power-manager': 'battery',
'keyboard': 'keyboard',
- 'gnome-settings-daemon': 'display'
+ 'a11y-keyboard': 'a11y',
+ 'kbd-scrolllock': 'keyboard',
+ 'kbd-numlock': 'keyboard',
+ 'kbd-capslock': 'keyboard'
};
function StatusIconDispatcher() {
diff --git a/js/ui/workspace.js b/js/ui/workspace.js
index e44f5584d..ddd82bcc0 100644
--- a/js/ui/workspace.js
+++ b/js/ui/workspace.js
@@ -1325,6 +1325,10 @@ Workspace.prototype = {
Lang.bind(this, function() {
this._windowIsZooming = false;
}));
+ win.connect('size-changed',
+ Lang.bind(this, function() {
+ this.positionWindows(0);
+ }));
this.actor.add_actor(clone.actor);
diff --git a/js/ui/xdndHandler.js b/js/ui/xdndHandler.js
index 02755591f..d33f8afce 100644
--- a/js/ui/xdndHandler.js
+++ b/js/ui/xdndHandler.js
@@ -67,18 +67,15 @@ XdndHandler.prototype = {
if (!cursorWindow.is_override_redirect())
return;
- let constraint_x = new Clutter.BindConstraint({ coordinate : Clutter.BindCoordinate.X,
- source: cursorWindow});
- let constraint_y = new Clutter.BindConstraint({ coordinate : Clutter.BindCoordinate.Y,
- source: cursorWindow});
+ let constraint_position = new Clutter.BindConstraint({ coordinate : Clutter.BindCoordinate.POSITION,
+ source: cursorWindow});
this._cursorWindowClone = new Clutter.Clone({ source: cursorWindow });
global.overlay_group.add_actor(this._cursorWindowClone);
Shell.util_set_hidden_from_pick(this._cursorWindowClone, true);
// Make sure that the clone has the same position as the source
- this._cursorWindowClone.add_constraint(constraint_x);
- this._cursorWindowClone.add_constraint(constraint_y);
+ this._cursorWindowClone.add_constraint(constraint_position);
} else {
if (this._cursorWindowClone)
{
diff --git a/po/et.po b/po/et.po
index bf15eb8e3..cfbad8470 100644
--- a/po/et.po
+++ b/po/et.po
@@ -13,8 +13,8 @@ msgstr ""
"Project-Id-Version: gnome-shell MASTER\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
"shell&component=general\n"
-"POT-Creation-Date: 2011-01-15 00:23+0000\n"
-"PO-Revision-Date: 2011-01-15 15:45+0200\n"
+"POT-Creation-Date: 2011-01-21 18:46+0000\n"
+"PO-Revision-Date: 2011-01-24 08:04+0200\n"
"Last-Translator: Ivar Smolin \n"
"Language-Team: Estonian \n"
"MIME-Version: 1.0\n"
@@ -70,6 +70,7 @@ msgstr "Kui määratud, kuvatakse kalendris kuupäeva ISO nädalavormingus."
msgid "List of desktop file IDs for favorite applications"
msgstr "Lemmikrakenduste töölauafailide ID-de loend"
+#, no-c-format
msgid ""
"Sets the GStreamer pipeline used to encode recordings. It follows the syntax "
"used for gst-launch. The pipeline should have an unconnected sink pad where "
@@ -78,7 +79,9 @@ msgid ""
"pipeline can also take care of its own output - this might be used to send "
"the output to an icecast server via shout2send or similar. When unset or set "
"to an empty value, the default pipeline will be used. This is currently "
-"'videorate ! theoraenc ! oggmux' and records to Ogg Theora."
+"'videorate ! vp8enc quality=10 speed=2 threads=%T ! queue ! webmmux' and "
+"records to WEBM using the VP8 codec. %T is used as a placeholder for a guess "
+"at the optimal thread count on the system."
msgstr ""
msgid "Show date in clock"
@@ -126,6 +129,9 @@ msgstr "Keelatavate laienduste UUID-d"
msgid "Whether to collect stats about applications usage"
msgstr ""
+msgid "disabled OpenSearch providers"
+msgstr ""
+
msgid "Clip the crosshairs at the center"
msgstr "Niitristi keskel on auk"
@@ -293,24 +299,24 @@ msgstr ""
#, c-format
msgid "%s will be logged out automatically in %d seconds."
-msgstr ""
+msgstr "%s logitakse %d sekundi pärast automaatselt välja."
#, c-format
msgid "You will be logged out automatically in %d seconds."
-msgstr ""
+msgstr "Sind logitakse %d sekundi pärast automaatselt välja."
msgid "Logging out of the system."
msgstr "Süsteemist väljalogimine"
msgid "Shut Down"
-msgstr "Lülita välja"
+msgstr "Seiska"
msgid "Click Shut Down to quit these applications and shut down the system."
msgstr ""
#, c-format
msgid "The system will shut down automatically in %d seconds."
-msgstr ""
+msgstr "Süsteem seisatakse automaatselt %d sekundi pärast."
msgid "Shutting down the system."
msgstr "Süsteemi seiskamine."
@@ -585,6 +591,9 @@ msgstr "Palun sisesta seadme poolt öeldav PIN-kood."
msgid "OK"
msgstr "Olgu"
+msgid "Localization Settings"
+msgstr "Lokaliseerimissätted"
+
msgid "Power Settings"
msgstr "Toitesätted..."
diff --git a/po/gl.po b/po/gl.po
index 7be837e71..48361fc2b 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: gnome-shell master\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-19 15:01+0100\n"
-"PO-Revision-Date: 2011-01-19 15:01+0100\n"
+"POT-Creation-Date: 2011-01-27 03:33+0100\n"
+"PO-Revision-Date: 2011-01-26 21:02+0100\n"
"Last-Translator: Fran Diéguez \n"
"Language-Team: Galician \n"
"Language: gl\n"
@@ -80,6 +80,7 @@ msgid "List of desktop file IDs for favorite applications"
msgstr "Mostra os ID de ficheiros desktop para os aplicativos preferidos"
#: ../data/org.gnome.shell.gschema.xml.in.h:11
+#, fuzzy
msgid ""
"Sets the GStreamer pipeline used to encode recordings. It follows the syntax "
"used for gst-launch. The pipeline should have an unconnected sink pad where "
@@ -270,16 +271,16 @@ msgstr "Mostrar os contidos magnificados máis aló dos bordos do escritorio"
#: ../data/org.gnome.accessibility.magnifier.gschema.xml.in.h:16
msgid "Show or hide crosshairs"
-msgstr "Mostrar ou agochar o punto de mira"
+msgstr "Mostrar ou ocultar o punto de mira"
#: ../data/org.gnome.accessibility.magnifier.gschema.xml.in.h:17
msgid "Show or hide the magnifier"
-msgstr "Mostrar ou agochar o magnificador"
+msgstr "Mostrar ou ocultar o magnificador"
#: ../data/org.gnome.accessibility.magnifier.gschema.xml.in.h:18
msgid "Show or hide the magnifier and all of its zoom regions."
msgstr ""
-"Mostrar ou agochar o magnificador e todas as súas rexións de magnificación."
+"Mostrar ou ocultar o magnificador e todas as súas rexións de magnificación."
#: ../data/org.gnome.accessibility.magnifier.gschema.xml.in.h:19
msgid ""
@@ -560,7 +561,7 @@ msgstr "Reintentar"
#: ../js/ui/placeDisplay.js:150
msgid "Connect to..."
-msgstr "Conectar con..."
+msgstr "Conectar con…"
#: ../js/ui/placeDisplay.js:386
msgid "PLACES & DEVICES"
@@ -605,15 +606,15 @@ msgstr "Cambiar de usuario"
#: ../js/ui/statusMenu.js:135
msgid "Log Out..."
-msgstr "Saír da sesión..."
+msgstr "Saír da sesión…"
#: ../js/ui/statusMenu.js:142
msgid "Suspend..."
-msgstr "Suspender..."
+msgstr "Suspender…"
#: ../js/ui/statusMenu.js:146
msgid "Shut Down..."
-msgstr "Apagar..."
+msgstr "Apagar…"
#: ../js/ui/status/accessibility.js:83
msgid "Zoom"
@@ -669,11 +670,11 @@ msgstr "Visibilidade"
#: ../js/ui/status/bluetooth.js:69
msgid "Send Files to Device..."
-msgstr "Enviar ficheiros ao dispositivo..."
+msgstr "Enviar ficheiros ao dispositivo…"
#: ../js/ui/status/bluetooth.js:70
msgid "Setup a New Device..."
-msgstr "Configurar un novo dispositivo..."
+msgstr "Configurar un novo dispositivo…"
#: ../js/ui/status/bluetooth.js:95
msgid "Bluetooth Settings"
@@ -685,11 +686,11 @@ msgstr "Conexión"
#: ../js/ui/status/bluetooth.js:228
msgid "Send Files..."
-msgstr "Enviar ficheiros..."
+msgstr "Enviar ficheiros…"
#: ../js/ui/status/bluetooth.js:233
msgid "Browse Files..."
-msgstr "Explorar ficheiros..."
+msgstr "Explorar ficheiros…"
#: ../js/ui/status/bluetooth.js:242
msgid "Error browsing device"
@@ -998,6 +999,10 @@ msgstr "Buscar"
msgid "%1$s: %2$s"
msgstr "%1$s: %2$s"
+#~| msgid "Sound Settings"
+#~ msgid "Localization Settings"
+#~ msgstr "Configuracións do son"
+
#~ msgid "Clock"
#~ msgstr "Reloxo"
diff --git a/po/nb.po b/po/nb.po
index 2cf41fc43..eb2dba78b 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -2,14 +2,14 @@
# Copyright (C) 2009 THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the gnome-shell package.
#
-# Kjartan Maraas , 2009-2010.
+# Kjartan Maraas , 2009-2011.
# Torstein Adolf Winterseth , 2010.
msgid ""
msgstr ""
"Project-Id-Version: gnome-shell 2.91.x\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-15 12:41+0100\n"
-"PO-Revision-Date: 2011-01-15 12:44+0100\n"
+"POT-Creation-Date: 2011-01-25 20:46+0100\n"
+"PO-Revision-Date: 2011-01-25 20:47+0100\n"
"Last-Translator: Torstein Adolf Winterseth \n"
"Language-Team: Norwegian Bokmål \n"
"Language: \n"
@@ -73,7 +73,8 @@ msgstr ""
msgid "List of desktop file IDs for favorite applications"
msgstr ""
-#: ../data/org.gnome.shell.gschema.xml.in.h:11
+#: ../data/org.gnome.shell.gschema.xml.in.h:12
+#, no-c-format
msgid ""
"Sets the GStreamer pipeline used to encode recordings. It follows the syntax "
"used for gst-launch. The pipeline should have an unconnected sink pad where "
@@ -82,45 +83,47 @@ msgid ""
"pipeline can also take care of its own output - this might be used to send "
"the output to an icecast server via shout2send or similar. When unset or set "
"to an empty value, the default pipeline will be used. This is currently "
-"'videorate ! theoraenc ! oggmux' and records to Ogg Theora."
+"'videorate ! vp8enc quality=10 speed=2 threads=%T ! queue ! webmmux' and "
+"records to WEBM using the VP8 codec. %T is used as a placeholder for a guess "
+"at the optimal thread count on the system."
msgstr ""
-#: ../data/org.gnome.shell.gschema.xml.in.h:12
+#: ../data/org.gnome.shell.gschema.xml.in.h:13
msgid "Show date in clock"
msgstr "Vis dato i klokken"
-#: ../data/org.gnome.shell.gschema.xml.in.h:13
+#: ../data/org.gnome.shell.gschema.xml.in.h:14
msgid "Show the week date in the calendar"
msgstr "Vis dato for uken i kalender"
-#: ../data/org.gnome.shell.gschema.xml.in.h:14
+#: ../data/org.gnome.shell.gschema.xml.in.h:15
msgid "Show time with seconds"
msgstr "Vis tid med sekunder"
-#: ../data/org.gnome.shell.gschema.xml.in.h:15
+#: ../data/org.gnome.shell.gschema.xml.in.h:16
msgid ""
"The applications corresponding to these identifiers will be displayed in the "
"favorites area."
msgstr ""
-#: ../data/org.gnome.shell.gschema.xml.in.h:16
+#: ../data/org.gnome.shell.gschema.xml.in.h:17
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 different container format."
msgstr ""
-#: ../data/org.gnome.shell.gschema.xml.in.h:17
+#: ../data/org.gnome.shell.gschema.xml.in.h:18
msgid ""
"The framerate of the resulting screencast recordered by GNOME Shell's "
"screencast recorder in frames-per-second."
msgstr ""
-#: ../data/org.gnome.shell.gschema.xml.in.h:18
+#: ../data/org.gnome.shell.gschema.xml.in.h:19
msgid "The gstreamer pipeline used to encode the screencast"
msgstr ""
-#: ../data/org.gnome.shell.gschema.xml.in.h:19
+#: ../data/org.gnome.shell.gschema.xml.in.h:20
msgid ""
"The shell normally monitors active applications in order to present the most "
"used ones (e.g. in launchers). While this data will be kept private, you may "
@@ -128,14 +131,18 @@ msgid ""
"remove already saved data."
msgstr ""
-#: ../data/org.gnome.shell.gschema.xml.in.h:20
+#: ../data/org.gnome.shell.gschema.xml.in.h:21
msgid "Uuids of extensions to disable"
msgstr "Uuider på utvidelser som skal slås av"
-#: ../data/org.gnome.shell.gschema.xml.in.h:21
+#: ../data/org.gnome.shell.gschema.xml.in.h:22
msgid "Whether to collect stats about applications usage"
msgstr "Om det skal samles statistikk om bruk av programmer"
+#: ../data/org.gnome.shell.gschema.xml.in.h:23
+msgid "disabled OpenSearch providers"
+msgstr ""
+
#: ../data/org.gnome.accessibility.magnifier.gschema.xml.in.h:1
msgid "Clip the crosshairs at the center"
msgstr ""
@@ -271,33 +278,33 @@ msgstr "Klarte ikke å lese kommando:"
msgid "No such application"
msgstr "Programmet finnes ikke"
-#: ../js/misc/util.js:143 ../js/ui/runDialog.js:364
+#: ../js/misc/util.js:143 ../js/ui/runDialog.js:351
#, c-format
msgid "Execution of '%s' failed:"
msgstr "Kjøring av «%s» feilet:"
#. Translators: Filter to display all applications
-#: ../js/ui/appDisplay.js:155
+#: ../js/ui/appDisplay.js:164
msgid "All"
msgstr "Alle"
-#: ../js/ui/appDisplay.js:236
+#: ../js/ui/appDisplay.js:245
msgid "APPLICATIONS"
msgstr "PROGRAMMER"
-#: ../js/ui/appDisplay.js:266
+#: ../js/ui/appDisplay.js:275
msgid "PREFERENCES"
msgstr "BRUKERVALG"
-#: ../js/ui/appDisplay.js:563
+#: ../js/ui/appDisplay.js:572
msgid "New Window"
msgstr "Nytt vindu"
-#: ../js/ui/appDisplay.js:567
+#: ../js/ui/appDisplay.js:576
msgid "Remove from Favorites"
msgstr "Fjern fra favoritter"
-#: ../js/ui/appDisplay.js:568
+#: ../js/ui/appDisplay.js:577
msgid "Add to Favorites"
msgstr "Legg til i favoritter"
@@ -330,7 +337,7 @@ msgstr "Logg ut …"
#: ../js/ui/endSessionDialog.js:65
msgid "Click Log Out to quit these applications and log out of the system."
-msgstr ""
+msgstr "Klikk Logg ut for å avslutte disse programmene og logge ut av systemet."
#: ../js/ui/endSessionDialog.js:66
#, c-format
@@ -352,7 +359,7 @@ msgstr "Avslutt"
#: ../js/ui/endSessionDialog.js:75
msgid "Click Shut Down to quit these applications and shut down the system."
-msgstr ""
+msgstr "Klikk Avslutt for å avslutte disse programmene og stenge ned systemet."
#: ../js/ui/endSessionDialog.js:76
#, c-format
@@ -369,7 +376,7 @@ msgstr "Start på nytt"
#: ../js/ui/endSessionDialog.js:85
msgid "Click Restart to quit these applications and restart the system."
-msgstr ""
+msgstr "Klikk Start på nytt for å avslutte disse programmene og starte systemet på nytt."
#: ../js/ui/endSessionDialog.js:86
#, c-format
@@ -384,7 +391,7 @@ msgstr "Starter systemet på nytt."
msgid "Confirm"
msgstr "Bekreft"
-#: ../js/ui/endSessionDialog.js:400 ../js/ui/status/bluetooth.js:469
+#: ../js/ui/endSessionDialog.js:400 ../js/ui/status/bluetooth.js:470
msgid "Cancel"
msgstr "Avbryt"
@@ -418,88 +425,88 @@ msgstr "Vis kildekode"
msgid "Web Page"
msgstr "Nettside"
-#: ../js/ui/messageTray.js:1748
+#: ../js/ui/messageTray.js:1765
msgid "System Information"
msgstr "Systeminformasjon"
-#: ../js/ui/overview.js:75
+#: ../js/ui/overview.js:88
msgid "Undo"
msgstr "Angre"
-#: ../js/ui/overview.js:140
+#: ../js/ui/overview.js:159
msgid "Windows"
msgstr "Vinduer"
-#: ../js/ui/overview.js:143
+#: ../js/ui/overview.js:162
msgid "Applications"
msgstr "Programmer"
#. TODO - _quit() doesn't really work on apps in state STARTING yet
-#: ../js/ui/panel.js:479
+#: ../js/ui/panel.js:483
#, c-format
msgid "Quit %s"
msgstr "Avslutt %s"
#. Translators: This is the time format with date used
#. in 24-hour mode.
-#: ../js/ui/panel.js:564
+#: ../js/ui/panel.js:568
msgid "%a %b %e, %R:%S"
msgstr "%a %e %b, %R.%S"
-#: ../js/ui/panel.js:565
+#: ../js/ui/panel.js:569
msgid "%a %b %e, %R"
msgstr "%a %e %b, %R"
#. Translators: This is the time format without date used
#. in 24-hour mode.
-#: ../js/ui/panel.js:569
+#: ../js/ui/panel.js:573
msgid "%a %R:%S"
msgstr "%a %R.%S"
-#: ../js/ui/panel.js:570
+#: ../js/ui/panel.js:574
msgid "%a %R"
msgstr "%a %R"
#. Translators: This is a time format with date used
#. for AM/PM.
-#: ../js/ui/panel.js:577
+#: ../js/ui/panel.js:581
msgid "%a %b %e, %l:%M:%S %p"
msgstr "%a %e %b, %l.%M.%S %p"
-#: ../js/ui/panel.js:578
+#: ../js/ui/panel.js:582
msgid "%a %b %e, %l:%M %p"
msgstr "%a %e %b, %l.%M %p"
#. Translators: This is a time format without date used
#. for AM/PM.
-#: ../js/ui/panel.js:582
+#: ../js/ui/panel.js:586
msgid "%a %l:%M:%S %p"
msgstr "%a %l.%M.%S %p"
-#: ../js/ui/panel.js:583
+#: ../js/ui/panel.js:587
msgid "%a %l:%M %p"
msgstr "%a %l.%M %p"
#. Button on the left side of the panel.
#. Translators: If there is no suitable word for "Activities" in your language, you can use the word for "Overview".
-#: ../js/ui/panel.js:728
+#: ../js/ui/panel.js:732
msgid "Activities"
msgstr "Aktiviteter"
-#: ../js/ui/placeDisplay.js:112
+#: ../js/ui/placeDisplay.js:106
#, c-format
msgid "Failed to unmount '%s'"
msgstr "Klarte ikke å avmontere «%s»"
-#: ../js/ui/placeDisplay.js:115
+#: ../js/ui/placeDisplay.js:109
msgid "Retry"
msgstr "Prøv igjen"
-#: ../js/ui/placeDisplay.js:160
+#: ../js/ui/placeDisplay.js:150
msgid "Connect to..."
msgstr "Koble til …"
-#: ../js/ui/placeDisplay.js:559
+#: ../js/ui/placeDisplay.js:386
msgid "PLACES & DEVICES"
msgstr "STEDER & ENHETER"
@@ -512,7 +519,7 @@ msgstr "STEDER & ENHETER"
msgid "toggle-switch-us"
msgstr "toggle-switch-intl"
-#: ../js/ui/runDialog.js:222
+#: ../js/ui/runDialog.js:209
msgid "Please enter a command:"
msgstr "Oppgi en kommando:"
@@ -596,7 +603,7 @@ msgstr "Høy kontrast"
msgid "Large Text"
msgstr "Stor tekst"
-#: ../js/ui/status/bluetooth.js:42 ../js/ui/status/bluetooth.js:240
+#: ../js/ui/status/bluetooth.js:42 ../js/ui/status/bluetooth.js:241
msgid "Bluetooth"
msgstr "Bluetooth"
@@ -612,106 +619,110 @@ msgstr "Send filer til enhet..."
msgid "Setup a New Device..."
msgstr "Sett opp en ny enhet..."
-#: ../js/ui/status/bluetooth.js:94
+#: ../js/ui/status/bluetooth.js:95
msgid "Bluetooth Settings"
msgstr "Innstillinger for Bluetooth"
-#: ../js/ui/status/bluetooth.js:191
+#: ../js/ui/status/bluetooth.js:192
msgid "Connection"
msgstr "Tilkobling"
-#: ../js/ui/status/bluetooth.js:227
+#: ../js/ui/status/bluetooth.js:228
msgid "Send Files..."
msgstr "Send filer..."
-#: ../js/ui/status/bluetooth.js:232
+#: ../js/ui/status/bluetooth.js:233
msgid "Browse Files..."
msgstr "Bla gjennom filer..."
-#: ../js/ui/status/bluetooth.js:241
+#: ../js/ui/status/bluetooth.js:242
msgid "Error browsing device"
msgstr "Feil under lesing av enhet"
-#: ../js/ui/status/bluetooth.js:242
+#: ../js/ui/status/bluetooth.js:243
#, c-format
msgid "The requested device cannot be browsed, error is '%s'"
msgstr "Kan ikke bla gjennom forespurt enhet. Feilen er «%s»"
-#: ../js/ui/status/bluetooth.js:250 ../js/ui/status/keyboard.js:78
+#: ../js/ui/status/bluetooth.js:251
msgid "Keyboard Settings"
msgstr "Innstillinger for tastatur"
-#: ../js/ui/status/bluetooth.js:255
+#: ../js/ui/status/bluetooth.js:256
msgid "Mouse Settings"
msgstr "Innstillinger for mus"
-#: ../js/ui/status/bluetooth.js:262 ../js/ui/status/volume.js:63
+#: ../js/ui/status/bluetooth.js:263 ../js/ui/status/volume.js:63
msgid "Sound Settings"
msgstr "Innstillinger for lyd"
-#: ../js/ui/status/bluetooth.js:336 ../js/ui/status/bluetooth.js:370
-#: ../js/ui/status/bluetooth.js:410 ../js/ui/status/bluetooth.js:443
+#: ../js/ui/status/bluetooth.js:337 ../js/ui/status/bluetooth.js:371
+#: ../js/ui/status/bluetooth.js:411 ../js/ui/status/bluetooth.js:444
msgid "Bluetooth Agent"
msgstr "Bluetooth-agent"
-#: ../js/ui/status/bluetooth.js:371
+#: ../js/ui/status/bluetooth.js:372
#, c-format
msgid "Authorization request from %s"
msgstr "Forespørsel om autorisering fra %s"
-#: ../js/ui/status/bluetooth.js:377
+#: ../js/ui/status/bluetooth.js:378
#, c-format
msgid "Device %s wants access to the service '%s'"
msgstr "Enhet %s vil ha tilgang til tjenesten «%s»"
-#: ../js/ui/status/bluetooth.js:379
+#: ../js/ui/status/bluetooth.js:380
msgid "Always grant access"
msgstr "Alltid gi tilgang"
-#: ../js/ui/status/bluetooth.js:380
+#: ../js/ui/status/bluetooth.js:381
msgid "Grant this time only"
msgstr "Gi tilgang kun denne ene gangen"
-#: ../js/ui/status/bluetooth.js:381
+#: ../js/ui/status/bluetooth.js:382
msgid "Reject"
msgstr "Avvis"
-#: ../js/ui/status/bluetooth.js:411
+#: ../js/ui/status/bluetooth.js:412
#, c-format
msgid "Pairing confirmation for %s"
msgstr "Bekreftelse for tilkobling for %s"
-#: ../js/ui/status/bluetooth.js:417 ../js/ui/status/bluetooth.js:451
+#: ../js/ui/status/bluetooth.js:418 ../js/ui/status/bluetooth.js:452
#, c-format
msgid "Device %s wants to pair with this computer"
msgstr "Enhet %s vil koble seg sammen med denne datamaskinen"
-#: ../js/ui/status/bluetooth.js:418
+#: ../js/ui/status/bluetooth.js:419
#, c-format
msgid "Please confirm whether the PIN '%s' matches the one on the device."
msgstr "Vennligst bekreft om PIN «%s» er lik den som brukes på enheten."
-#: ../js/ui/status/bluetooth.js:420
+#: ../js/ui/status/bluetooth.js:421
msgid "Matches"
msgstr "Stemmer overens"
-#: ../js/ui/status/bluetooth.js:421
+#: ../js/ui/status/bluetooth.js:422
msgid "Does not match"
msgstr "Stemmer ikke overens"
-#: ../js/ui/status/bluetooth.js:444
+#: ../js/ui/status/bluetooth.js:445
#, c-format
msgid "Pairing request for %s"
msgstr "Forespørsel om tilkobling for %s"
-#: ../js/ui/status/bluetooth.js:452
+#: ../js/ui/status/bluetooth.js:453
msgid "Please enter the PIN mentioned on the device."
msgstr "Vennligst oppgi PIN som oppgitt på enheten."
-#: ../js/ui/status/bluetooth.js:468
+#: ../js/ui/status/bluetooth.js:469
msgid "OK"
msgstr "OK"
+#: ../js/ui/status/keyboard.js:78
+msgid "Localization Settings"
+msgstr "Innstillinger for lokalisering"
+
#: ../js/ui/status/power.js:85
msgid "Power Settings"
msgstr "Innstillinger for strøm"
@@ -846,14 +857,14 @@ msgstr "%s er ferdig startet"
msgid "'%s' is ready"
msgstr "«%s» er klar"
-#: ../js/ui/workspacesView.js:244
+#: ../js/ui/workspacesView.js:243
msgid ""
"Can't add a new workspace because maximum workspaces limit has been reached."
msgstr ""
"Kan ikke legge til nytt arbeidsområde fordi grensen for maksimalt antall "
"arbeidsområder er nådd."
-#: ../js/ui/workspacesView.js:260
+#: ../js/ui/workspacesView.js:259
msgid "Can't remove the first workspace."
msgstr "Kan ikke fjerne første arbeidsområde"
@@ -879,32 +890,32 @@ msgstr[1] "%u innganger"
msgid "System Sounds"
msgstr "Systemlyder"
-#: ../src/shell-global.c:1233
+#: ../src/shell-global.c:1365
msgid "Less than a minute ago"
msgstr "Mindre enn ett minutt siden"
-#: ../src/shell-global.c:1237
+#: ../src/shell-global.c:1369
#, c-format
msgid "%d minute ago"
msgid_plural "%d minutes ago"
msgstr[0] "%d minutt siden"
msgstr[1] "%d minutter siden"
-#: ../src/shell-global.c:1242
+#: ../src/shell-global.c:1374
#, c-format
msgid "%d hour ago"
msgid_plural "%d hours ago"
msgstr[0] "%d time siden"
msgstr[1] "%d timer siden"
-#: ../src/shell-global.c:1247
+#: ../src/shell-global.c:1379
#, c-format
msgid "%d day ago"
msgid_plural "%d days ago"
msgstr[0] "%d dag siden"
msgstr[1] "%d dager siden"
-#: ../src/shell-global.c:1252
+#: ../src/shell-global.c:1384
#, c-format
msgid "%d week ago"
msgid_plural "%d weeks ago"