brl/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into datetime

Browse Source
This commit is contained in:
David Zeuthen 2011-01-28 11:06:58 -05:00
commit 803e74101c
15 changed files with 161 additions and 352 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@ -60,7 +60,7 @@ fi
AM_CONDITIONAL(BUILD_RECORDER, $build_recorder) 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 GOBJECT_INTROSPECTION_MIN_VERSION=0.10.1
GJS_MIN_VERSION=0.7.8 GJS_MIN_VERSION=0.7.8
MUTTER_MIN_VERSION=2.91.4 MUTTER_MIN_VERSION=2.91.4

1
data/Makefile.am
View File

@ -31,7 +31,6 @@ dist_theme_DATA = \
theme/close.svg \ theme/close.svg \
theme/corner-ripple.png \ theme/corner-ripple.png \
theme/dash-placeholder.svg \ theme/dash-placeholder.svg \
theme/dialog-error.svg \
theme/filter-selected.svg \ theme/filter-selected.svg \
theme/gnome-shell.css \ theme/gnome-shell.css \
theme/mosaic-view-active.svg \ theme/mosaic-view-active.svg \

2
data/gnome-shell.desktop.in.in
View File

@ -7,7 +7,7 @@ X-GNOME-Bugzilla-Bugzilla=GNOME
X-GNOME-Bugzilla-Product=gnome-shell X-GNOME-Bugzilla-Product=gnome-shell
X-GNOME-Bugzilla-Component=general X-GNOME-Bugzilla-Component=general
X-GNOME-Bugzilla-Version=@VERSION@ X-GNOME-Bugzilla-Version=@VERSION@
Categories=GNOME;GTK;Utility;Core; Categories=GNOME;GTK;Core;
OnlyShowIn=GNOME; OnlyShowIn=GNOME;
NoDisplay=true NoDisplay=true
X-GNOME-Autostart-Phase=WindowManager X-GNOME-Autostart-Phase=WindowManager

4
data/gs-applications.menu
View File

@ -77,10 +77,6 @@
<OnlyUnallocated/> <OnlyUnallocated/>
<Include> <Include>
<And> <And>
<Or>
<Category>Documentation</Category>
<Not><Category>Core</Category></Not>
</Or>
<Not><Category>Settings</Category></Not> <Not><Category>Settings</Category></Not>
<Not><Category>Screensaver</Category></Not> <Not><Category>Screensaver</Category></Not>
</And> </And>

222
data/theme/dialog-error.svg
View File

@ -1,222 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="24"
height="24"
id="svg4908"
sodipodi:version="0.32"
inkscape:version="0.47 r22583"
sodipodi:docname="dialog-error.svg"
inkscape:output_extension="org.inkscape.output.svg.inkscape"
inkscape:export-filename="/home/andreas/project/gnome-icon-theme/scalable/actions/process-stop.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90"
version="1.0">
<defs
id="defs4910">
<inkscape:perspective
sodipodi:type="inkscape:persp3d"
inkscape:vp_x="0 : 24 : 1"
inkscape:vp_y="0 : 1000 : 0"
inkscape:vp_z="48 : 24 : 1"
inkscape:persp3d-origin="24 : 16 : 1"
id="perspective25" />
<radialGradient
gradientTransform="matrix(1.349881,0,0,1.349881,-3.498814,-1.810859)"
gradientUnits="userSpaceOnUse"
r="9.7183542"
fy="4.9892726"
fx="9.6893959"
cy="4.9892726"
cx="9.6893959"
id="radialGradient5177"
xlink:href="#linearGradient5171"
inkscape:collect="always" />
<radialGradient
gradientTransform="matrix(2.417917,0,0,2.417917,-14.17917,-4.903184)"
gradientUnits="userSpaceOnUse"
r="9.7785711"
fy="3.458019"
fx="10"
cy="3.458019"
cx="10"
id="radialGradient5157"
xlink:href="#linearGradient5151"
inkscape:collect="always" />
<radialGradient
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0.928125,0,0,0.3143011,0.7718789,12.358015)"
r="9.0598059"
fy="18.022524"
fx="10.739184"
cy="18.022524"
cx="10.739184"
id="radialGradient5145"
xlink:href="#linearGradient5139"
inkscape:collect="always" />
<linearGradient
id="linearGradient5139"
inkscape:collect="always">
<stop
id="stop5141"
offset="0"
style="stop-color:black;stop-opacity:1;" />
<stop
id="stop5143"
offset="1"
style="stop-color:black;stop-opacity:0;" />
</linearGradient>
<linearGradient
id="linearGradient5151"
inkscape:collect="always">
<stop
id="stop5153"
offset="0"
style="stop-color:white;stop-opacity:1;" />
<stop
id="stop5155"
offset="1"
style="stop-color:white;stop-opacity:0;" />
</linearGradient>
<linearGradient
id="linearGradient5171">
<stop
id="stop5173"
offset="0"
style="stop-color:#fe3a00;stop-opacity:1" />
<stop
id="stop5175"
offset="1"
style="stop-color:#c00;stop-opacity:1;" />
</linearGradient>
</defs>
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="22.627417"
inkscape:cx="24.442987"
inkscape:cy="10.142308"
inkscape:current-layer="g7001"
showgrid="false"
inkscape:grid-bbox="true"
inkscape:document-units="px"
showguides="true"
inkscape:guide-bbox="true"
inkscape:window-width="1674"
inkscape:window-height="970"
inkscape:window-x="0"
inkscape:window-y="26"
width="48px"
height="48px"
inkscape:window-maximized="0" />
<metadata
id="metadata4913">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title>Stop Process</dc:title>
<dc:date>December 2006</dc:date>
<dc:creator>
<cc:Agent>
<dc:title>Jakub Steiner</dc:title>
</cc:Agent>
</dc:creator>
<dc:contributor>
<cc:Agent>
<dc:title>Andreas Nilsson</dc:title>
</cc:Agent>
</dc:contributor>
<cc:license
rdf:resource="http://creativecommons.org/licenses/GPL/2.0/" />
<dc:subject>
<rdf:Bag>
<rdf:li>stop</rdf:li>
<rdf:li>halt</rdf:li>
</rdf:Bag>
</dc:subject>
</cc:Work>
<cc:License
rdf:about="http://creativecommons.org/licenses/GPL/2.0/">
<cc:permits
rdf:resource="http://web.resource.org/cc/Reproduction" />
<cc:permits
rdf:resource="http://web.resource.org/cc/Distribution" />
<cc:requires
rdf:resource="http://web.resource.org/cc/Notice" />
<cc:permits
rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
<cc:requires
rdf:resource="http://web.resource.org/cc/ShareAlike" />
<cc:requires
rdf:resource="http://web.resource.org/cc/SourceCode" />
</cc:License>
</rdf:RDF>
</metadata>
<g
id="layer1"
inkscape:label="Layer 1"
inkscape:groupmode="layer"
transform="translate(0,-24)">
<g
inkscape:label="Layer 1"
id="g7001"
transform="matrix(1.4566048,0,0,1.4455352,0.4112881,1.2324709)">
<path
transform="matrix(0.91468137,0,0,0.70055266,-1.8812476,17.474032)"
d="m 19.79899,18.022524 a 9.0598059,3.0935922 0 1 1 -18.1196115,0 9.0598059,3.0935922 0 1 1 18.1196115,0 z"
sodipodi:ry="3.0935922"
sodipodi:rx="9.0598059"
sodipodi:cy="18.022524"
sodipodi:cx="10.739184"
id="path5137"
style="color:#000000;fill:url(#radialGradient5145);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible"
sodipodi:type="arc" />
<path
transform="matrix(0.87347736,0,0,0.83068052,-0.79308842,15.602788)"
d="m 19.25,9.625 a 9.25,9.25 0 1 1 -18.5,0 9.25,9.25 0 1 1 18.5,0 z"
sodipodi:ry="9.25"
sodipodi:rx="9.25"
sodipodi:cy="9.625"
sodipodi:cx="10"
id="path4262"
style="color:#000000;fill:url(#radialGradient5177);fill-opacity:1;fill-rule:nonzero;stroke:#a40000;stroke-width:0.47435912;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible"
sodipodi:type="arc" />
<path
sodipodi:type="arc"
style="opacity:0.35393258;color:#000000;fill:none;stroke:url(#radialGradient5157);stroke-width:0.49999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible"
id="path5149"
sodipodi:cx="10"
sodipodi:cy="9.625"
sodipodi:rx="9.25"
sodipodi:ry="9.25"
d="m 19.25,9.625 a 9.25,9.25 0 1 1 -18.5,0 9.25,9.25 0 1 1 18.5,0 z"
transform="matrix(0.82868359,0,0,0.78808147,-0.34515141,16.012803)" />
<path
sodipodi:nodetypes="cc"
id="path5159"
d="m 4.834121,20.642783 6.215127,5.91061"
style="color:#000000;fill:none;stroke:#ffffff;stroke-width:1.21219134;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible" />
<path
style="color:#000000;fill:none;stroke:#ffffff;stroke-width:1.21219146;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible"
d="M 11.04925,20.622826 4.8159529,26.553393"
id="path5161"
sodipodi:nodetypes="cc" />
</g>
</g>
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 8.0 KiB

13
data/theme/gnome-shell.css
View File

@ -1227,15 +1227,14 @@ StTooltip StLabel {
color: white; color: white;
} }
.run-dialog-error-icon { .run-dialog-error-label {
background-image: url("dialog-error.svg"); font-size: 12px;
width: 36px; color: white;
height: 36px;
} }
.run-dialog-error-label { .run-dialog-error-box {
font-size: 16px; padding-top: 15px;
color: white; spacing: 5px;
} }
.run-dialog-entry { .run-dialog-entry {

5
js/misc/util.js
View File

@ -82,12 +82,17 @@ function trySpawn(argv)
GLib.SpawnFlags.SEARCH_PATH, GLib.SpawnFlags.SEARCH_PATH,
null, null); null, null);
} catch (err) { } catch (err) {
if (err.code == GLib.SpawnError.G_SPAWN_ERROR_NOENT) {
err.message = _("Command not found");
} else {
// The exception from gjs contains an error string like: // The exception from gjs contains an error string like:
// Error invoking GLib.spawn_command_line_async: Failed to // Error invoking GLib.spawn_command_line_async: Failed to
// execute child process "foo" (No such file or directory) // execute child process "foo" (No such file or directory)
// We are only interested in the part in the parentheses. (And // We are only interested in the part in the parentheses. (And
// we can't pattern match the text, since it gets localized.) // we can't pattern match the text, since it gets localized.)
err.message = err.message.replace(/.*\((.+)\)/, '$1'); err.message = err.message.replace(/.*\((.+)\)/, '$1');
}
throw err; throw err;
} }
} }

13
js/ui/runDialog.js
View File

@ -219,20 +219,22 @@ __proto__: ModalDialog.ModalDialog.prototype,
this._entryText.grab_key_focus(); 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 }); 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._commandError = false;
this._errorMessage = new St.Label({ style_class: 'run-dialog-error-label' }); this._errorMessage = new St.Label({ style_class: 'run-dialog-error-label' });
this._errorMessage.clutter_text.line_wrap = true; 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(); this._errorBox.hide();
@ -348,8 +350,7 @@ __proto__: ModalDialog.ModalDialog.prototype,
} else { } else {
this._commandError = true; this._commandError = true;
let errorStr = _("Execution of '%s' failed:").format(command) + '\n' + e.message; this._errorMessage.set_text(e.message);
this._errorMessage.set_text(errorStr);
if (!this._errorBox.visible) { if (!this._errorBox.visible) {
let [errorBoxMinHeight, errorBoxNaturalHeight] = this._errorBox.get_preferred_height(-1); let [errorBoxMinHeight, errorBoxNaturalHeight] = this._errorBox.get_preferred_height(-1);

2
js/ui/searchDisplay.js
View File

@ -309,6 +309,8 @@ SearchResults.prototype = {
this._statusText.set_text(_("No matching results.")); this._statusText.set_text(_("No matching results."));
this._statusText.show(); this._statusText.show();
} else { } else {
this._selectedOpenSearchButton = -1;
this._updateOpenSearchButtonState();
this._statusText.hide(); this._statusText.hide();
} }

5
js/ui/statusIconDispatcher.js
View File

@ -16,7 +16,10 @@ const STANDARD_TRAY_ICON_IMPLEMENTATIONS = {
'nm-applet': 'network', 'nm-applet': 'network',
'gnome-power-manager': 'battery', 'gnome-power-manager': 'battery',
'keyboard': 'keyboard', 'keyboard': 'keyboard',
'gnome-settings-daemon': 'display' 'a11y-keyboard': 'a11y',
'kbd-scrolllock': 'keyboard',
'kbd-numlock': 'keyboard',
'kbd-capslock': 'keyboard'
}; };
function StatusIconDispatcher() { function StatusIconDispatcher() {

4
js/ui/workspace.js
View File

@ -1325,6 +1325,10 @@ Workspace.prototype = {
Lang.bind(this, function() { Lang.bind(this, function() {
this._windowIsZooming = false; this._windowIsZooming = false;
})); }));
win.connect('size-changed',
Lang.bind(this, function() {
this.positionWindows(0);
}));
this.actor.add_actor(clone.actor); this.actor.add_actor(clone.actor);

7
js/ui/xdndHandler.js
View File

@ -67,9 +67,7 @@ XdndHandler.prototype = {
if (!cursorWindow.is_override_redirect()) if (!cursorWindow.is_override_redirect())
return; return;
let constraint_x = new Clutter.BindConstraint({ coordinate : Clutter.BindCoordinate.X, let constraint_position = new Clutter.BindConstraint({ coordinate : Clutter.BindCoordinate.POSITION,
source: cursorWindow});
let constraint_y = new Clutter.BindConstraint({ coordinate : Clutter.BindCoordinate.Y,
source: cursorWindow}); source: cursorWindow});
this._cursorWindowClone = new Clutter.Clone({ source: cursorWindow }); this._cursorWindowClone = new Clutter.Clone({ source: cursorWindow });
@ -77,8 +75,7 @@ XdndHandler.prototype = {
Shell.util_set_hidden_from_pick(this._cursorWindowClone, true); Shell.util_set_hidden_from_pick(this._cursorWindowClone, true);
// Make sure that the clone has the same position as the source // Make sure that the clone has the same position as the source
this._cursorWindowClone.add_constraint(constraint_x); this._cursorWindowClone.add_constraint(constraint_position);
this._cursorWindowClone.add_constraint(constraint_y);
} else { } else {
if (this._cursorWindowClone) if (this._cursorWindowClone)
{ {

23
po/et.po
View File

@ -13,8 +13,8 @@ msgstr ""
"Project-Id-Version: gnome-shell MASTER\n" "Project-Id-Version: gnome-shell MASTER\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
"shell&component=general\n" "shell&component=general\n"
"POT-Creation-Date: 2011-01-15 00:23+0000\n" "POT-Creation-Date: 2011-01-21 18:46+0000\n"
"PO-Revision-Date: 2011-01-15 15:45+0200\n" "PO-Revision-Date: 2011-01-24 08:04+0200\n"
"Last-Translator: Ivar Smolin <okul@linux.ee>\n" "Last-Translator: Ivar Smolin <okul@linux.ee>\n"
"Language-Team: Estonian <gnome-et@linux.ee>\n" "Language-Team: Estonian <gnome-et@linux.ee>\n"
"MIME-Version: 1.0\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" msgid "List of desktop file IDs for favorite applications"
msgstr "Lemmikrakenduste töölauafailide ID-de loend" msgstr "Lemmikrakenduste töölauafailide ID-de loend"
#, no-c-format
msgid "" msgid ""
"Sets the GStreamer pipeline used to encode recordings. It follows the syntax " "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 " "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 " "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 " "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 " "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 "" msgstr ""
msgid "Show date in clock" msgid "Show date in clock"
@ -126,6 +129,9 @@ msgstr "Keelatavate laienduste UUID-d"
msgid "Whether to collect stats about applications usage" msgid "Whether to collect stats about applications usage"
msgstr "" msgstr ""
msgid "disabled OpenSearch providers"
msgstr ""
msgid "Clip the crosshairs at the center" msgid "Clip the crosshairs at the center"
msgstr "Niitristi keskel on auk" msgstr "Niitristi keskel on auk"
@ -293,24 +299,24 @@ msgstr ""
#, c-format #, c-format
msgid "%s will be logged out automatically in %d seconds." msgid "%s will be logged out automatically in %d seconds."
msgstr "" msgstr "%s logitakse %d sekundi pärast automaatselt välja."
#, c-format #, c-format
msgid "You will be logged out automatically in %d seconds." 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." msgid "Logging out of the system."
msgstr "Süsteemist väljalogimine" msgstr "Süsteemist väljalogimine"
msgid "Shut Down" msgid "Shut Down"
msgstr "Lülita välja" msgstr "Seiska"
msgid "Click Shut Down to quit these applications and shut down the system." msgid "Click Shut Down to quit these applications and shut down the system."
msgstr "" msgstr ""
#, c-format #, c-format
msgid "The system will shut down automatically in %d seconds." 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." msgid "Shutting down the system."
msgstr "Süsteemi seiskamine." msgstr "Süsteemi seiskamine."
@ -585,6 +591,9 @@ msgstr "Palun sisesta seadme poolt öeldav PIN-kood."
msgid "OK" msgid "OK"
msgstr "Olgu" msgstr "Olgu"
msgid "Localization Settings"
msgstr "Lokaliseerimissätted"
msgid "Power Settings" msgid "Power Settings"
msgstr "Toitesätted..." msgstr "Toitesätted..."

31
po/gl.po
View File

@ -10,8 +10,8 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: gnome-shell master\n" "Project-Id-Version: gnome-shell master\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2011-01-19 15:01+0100\n" "POT-Creation-Date: 2011-01-27 03:33+0100\n"
"PO-Revision-Date: 2011-01-19 15:01+0100\n" "PO-Revision-Date: 2011-01-26 21:02+0100\n"
"Last-Translator: Fran Diéguez <frandieguez@ubuntu.com>\n" "Last-Translator: Fran Diéguez <frandieguez@ubuntu.com>\n"
"Language-Team: Galician <gnome-gl-list@gnome.org>\n" "Language-Team: Galician <gnome-gl-list@gnome.org>\n"
"Language: gl\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" msgstr "Mostra os ID de ficheiros desktop para os aplicativos preferidos"
#: ../data/org.gnome.shell.gschema.xml.in.h:11 #: ../data/org.gnome.shell.gschema.xml.in.h:11
#, fuzzy
msgid "" msgid ""
"Sets the GStreamer pipeline used to encode recordings. It follows the syntax " "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 " "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 #: ../data/org.gnome.accessibility.magnifier.gschema.xml.in.h:16
msgid "Show or hide crosshairs" 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 #: ../data/org.gnome.accessibility.magnifier.gschema.xml.in.h:17
msgid "Show or hide the magnifier" 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 #: ../data/org.gnome.accessibility.magnifier.gschema.xml.in.h:18
msgid "Show or hide the magnifier and all of its zoom regions." msgid "Show or hide the magnifier and all of its zoom regions."
msgstr "" 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 #: ../data/org.gnome.accessibility.magnifier.gschema.xml.in.h:19
msgid "" msgid ""
@ -560,7 +561,7 @@ msgstr "Reintentar"
#: ../js/ui/placeDisplay.js:150 #: ../js/ui/placeDisplay.js:150
msgid "Connect to..." msgid "Connect to..."
msgstr "Conectar con..." msgstr "Conectar con…"
#: ../js/ui/placeDisplay.js:386 #: ../js/ui/placeDisplay.js:386
msgid "PLACES & DEVICES" msgid "PLACES & DEVICES"
@ -605,15 +606,15 @@ msgstr "Cambiar de usuario"
#: ../js/ui/statusMenu.js:135 #: ../js/ui/statusMenu.js:135
msgid "Log Out..." msgid "Log Out..."
msgstr "Saír da sesión..." msgstr "Saír da sesión…"
#: ../js/ui/statusMenu.js:142 #: ../js/ui/statusMenu.js:142
msgid "Suspend..." msgid "Suspend..."
msgstr "Suspender..." msgstr "Suspender…"
#: ../js/ui/statusMenu.js:146 #: ../js/ui/statusMenu.js:146
msgid "Shut Down..." msgid "Shut Down..."
msgstr "Apagar..." msgstr "Apagar…"
#: ../js/ui/status/accessibility.js:83 #: ../js/ui/status/accessibility.js:83
msgid "Zoom" msgid "Zoom"
@ -669,11 +670,11 @@ msgstr "Visibilidade"
#: ../js/ui/status/bluetooth.js:69 #: ../js/ui/status/bluetooth.js:69
msgid "Send Files to Device..." msgid "Send Files to Device..."
msgstr "Enviar ficheiros ao dispositivo..." msgstr "Enviar ficheiros ao dispositivo…"
#: ../js/ui/status/bluetooth.js:70 #: ../js/ui/status/bluetooth.js:70
msgid "Setup a New Device..." msgid "Setup a New Device..."
msgstr "Configurar un novo dispositivo..." msgstr "Configurar un novo dispositivo…"
#: ../js/ui/status/bluetooth.js:95 #: ../js/ui/status/bluetooth.js:95
msgid "Bluetooth Settings" msgid "Bluetooth Settings"
@ -685,11 +686,11 @@ msgstr "Conexión"
#: ../js/ui/status/bluetooth.js:228 #: ../js/ui/status/bluetooth.js:228
msgid "Send Files..." msgid "Send Files..."
msgstr "Enviar ficheiros..." msgstr "Enviar ficheiros…"
#: ../js/ui/status/bluetooth.js:233 #: ../js/ui/status/bluetooth.js:233
msgid "Browse Files..." msgid "Browse Files..."
msgstr "Explorar ficheiros..." msgstr "Explorar ficheiros…"
#: ../js/ui/status/bluetooth.js:242 #: ../js/ui/status/bluetooth.js:242
msgid "Error browsing device" msgid "Error browsing device"
@ -998,6 +999,10 @@ msgstr "Buscar"
msgid "%1$s: %2$s" msgid "%1$s: %2$s"
msgstr "%1$s: %2$s" msgstr "%1$s: %2$s"
#~| msgid "Sound Settings"
#~ msgid "Localization Settings"
#~ msgstr "Configuracións do son"
#~ msgid "Clock" #~ msgid "Clock"
#~ msgstr "Reloxo" #~ msgstr "Reloxo"

165
po/nb.po
View File

@ -2,14 +2,14 @@
# Copyright (C) 2009 THE PACKAGE'S COPYRIGHT HOLDER # Copyright (C) 2009 THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the gnome-shell package. # This file is distributed under the same license as the gnome-shell package.
# #
# Kjartan Maraas <kmaraas@gnome.org>, 2009-2010. # Kjartan Maraas <kmaraas@gnome.org>, 2009-2011.
# Torstein Adolf Winterseth <kvikende@fsfe.org>, 2010. # Torstein Adolf Winterseth <kvikende@fsfe.org>, 2010.
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: gnome-shell 2.91.x\n" "Project-Id-Version: gnome-shell 2.91.x\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2011-01-15 12:41+0100\n" "POT-Creation-Date: 2011-01-25 20:46+0100\n"
"PO-Revision-Date: 2011-01-15 12:44+0100\n" "PO-Revision-Date: 2011-01-25 20:47+0100\n"
"Last-Translator: Torstein Adolf Winterseth <kvikende@fsfe.org>\n" "Last-Translator: Torstein Adolf Winterseth <kvikende@fsfe.org>\n"
"Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.uio.no>\n" "Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.uio.no>\n"
"Language: \n" "Language: \n"
@ -73,7 +73,8 @@ msgstr ""
msgid "List of desktop file IDs for favorite applications" msgid "List of desktop file IDs for favorite applications"
msgstr "" msgstr ""
#: ../data/org.gnome.shell.gschema.xml.in.h:11 #: ../data/org.gnome.shell.gschema.xml.in.h:12
#, no-c-format
msgid "" msgid ""
"Sets the GStreamer pipeline used to encode recordings. It follows the syntax " "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 " "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 " "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 " "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 " "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 "" msgstr ""
#: ../data/org.gnome.shell.gschema.xml.in.h:12 #: ../data/org.gnome.shell.gschema.xml.in.h:13
msgid "Show date in clock" msgid "Show date in clock"
msgstr "Vis dato i klokken" 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" msgid "Show the week date in the calendar"
msgstr "Vis dato for uken i kalender" 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" msgid "Show time with seconds"
msgstr "Vis tid med sekunder" msgstr "Vis tid med sekunder"
#: ../data/org.gnome.shell.gschema.xml.in.h:15 #: ../data/org.gnome.shell.gschema.xml.in.h:16
msgid "" msgid ""
"The applications corresponding to these identifiers will be displayed in the " "The applications corresponding to these identifiers will be displayed in the "
"favorites area." "favorites area."
msgstr "" msgstr ""
#: ../data/org.gnome.shell.gschema.xml.in.h:16 #: ../data/org.gnome.shell.gschema.xml.in.h:17
msgid "" msgid ""
"The filename for recorded screencasts will be a unique filename based on the " "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 " "current date, and use this extension. It should be changed when recording to "
"a different container format." "a different container format."
msgstr "" msgstr ""
#: ../data/org.gnome.shell.gschema.xml.in.h:17 #: ../data/org.gnome.shell.gschema.xml.in.h:18
msgid "" msgid ""
"The framerate of the resulting screencast recordered by GNOME Shell's " "The framerate of the resulting screencast recordered by GNOME Shell's "
"screencast recorder in frames-per-second." "screencast recorder in frames-per-second."
msgstr "" 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" msgid "The gstreamer pipeline used to encode the screencast"
msgstr "" msgstr ""
#: ../data/org.gnome.shell.gschema.xml.in.h:19 #: ../data/org.gnome.shell.gschema.xml.in.h:20
msgid "" msgid ""
"The shell normally monitors active applications in order to present the most " "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 " "used ones (e.g. in launchers). While this data will be kept private, you may "
@ -128,14 +131,18 @@ msgid ""
"remove already saved data." "remove already saved data."
msgstr "" 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" msgid "Uuids of extensions to disable"
msgstr "Uuider på utvidelser som skal slås av" 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" msgid "Whether to collect stats about applications usage"
msgstr "Om det skal samles statistikk om bruk av programmer" 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 #: ../data/org.gnome.accessibility.magnifier.gschema.xml.in.h:1
msgid "Clip the crosshairs at the center" msgid "Clip the crosshairs at the center"
msgstr "" msgstr ""
@ -271,33 +278,33 @@ msgstr "Klarte ikke å lese kommando:"
msgid "No such application" msgid "No such application"
msgstr "Programmet finnes ikke" 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 #, c-format
msgid "Execution of '%s' failed:" msgid "Execution of '%s' failed:"
msgstr "Kjøring av «%s» feilet:" msgstr "Kjøring av «%s» feilet:"
#. Translators: Filter to display all applications #. Translators: Filter to display all applications
#: ../js/ui/appDisplay.js:155 #: ../js/ui/appDisplay.js:164
msgid "All" msgid "All"
msgstr "Alle" msgstr "Alle"
#: ../js/ui/appDisplay.js:236 #: ../js/ui/appDisplay.js:245
msgid "APPLICATIONS" msgid "APPLICATIONS"
msgstr "PROGRAMMER" msgstr "PROGRAMMER"
#: ../js/ui/appDisplay.js:266 #: ../js/ui/appDisplay.js:275
msgid "PREFERENCES" msgid "PREFERENCES"
msgstr "BRUKERVALG" msgstr "BRUKERVALG"
#: ../js/ui/appDisplay.js:563 #: ../js/ui/appDisplay.js:572
msgid "New Window" msgid "New Window"
msgstr "Nytt vindu" msgstr "Nytt vindu"
#: ../js/ui/appDisplay.js:567 #: ../js/ui/appDisplay.js:576
msgid "Remove from Favorites" msgid "Remove from Favorites"
msgstr "Fjern fra favoritter" msgstr "Fjern fra favoritter"
#: ../js/ui/appDisplay.js:568 #: ../js/ui/appDisplay.js:577
msgid "Add to Favorites" msgid "Add to Favorites"
msgstr "Legg til i favoritter" msgstr "Legg til i favoritter"
@ -330,7 +337,7 @@ msgstr "Logg ut …"
#: ../js/ui/endSessionDialog.js:65 #: ../js/ui/endSessionDialog.js:65
msgid "Click Log Out to quit these applications and log out of the system." 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 #: ../js/ui/endSessionDialog.js:66
#, c-format #, c-format
@ -352,7 +359,7 @@ msgstr "Avslutt"
#: ../js/ui/endSessionDialog.js:75 #: ../js/ui/endSessionDialog.js:75
msgid "Click Shut Down to quit these applications and shut down the system." 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 #: ../js/ui/endSessionDialog.js:76
#, c-format #, c-format
@ -369,7 +376,7 @@ msgstr "Start på nytt"
#: ../js/ui/endSessionDialog.js:85 #: ../js/ui/endSessionDialog.js:85
msgid "Click Restart to quit these applications and restart the system." 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 #: ../js/ui/endSessionDialog.js:86
#, c-format #, c-format
@ -384,7 +391,7 @@ msgstr "Starter systemet på nytt."
msgid "Confirm" msgid "Confirm"
msgstr "Bekreft" 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" msgid "Cancel"
msgstr "Avbryt" msgstr "Avbryt"
@ -418,88 +425,88 @@ msgstr "Vis kildekode"
msgid "Web Page" msgid "Web Page"
msgstr "Nettside" msgstr "Nettside"
#: ../js/ui/messageTray.js:1748 #: ../js/ui/messageTray.js:1765
msgid "System Information" msgid "System Information"
msgstr "Systeminformasjon" msgstr "Systeminformasjon"
#: ../js/ui/overview.js:75 #: ../js/ui/overview.js:88
msgid "Undo" msgid "Undo"
msgstr "Angre" msgstr "Angre"
#: ../js/ui/overview.js:140 #: ../js/ui/overview.js:159
msgid "Windows" msgid "Windows"
msgstr "Vinduer" msgstr "Vinduer"
#: ../js/ui/overview.js:143 #: ../js/ui/overview.js:162
msgid "Applications" msgid "Applications"
msgstr "Programmer" msgstr "Programmer"
#. TODO - _quit() doesn't really work on apps in state STARTING yet #. TODO - _quit() doesn't really work on apps in state STARTING yet
#: ../js/ui/panel.js:479 #: ../js/ui/panel.js:483
#, c-format #, c-format
msgid "Quit %s" msgid "Quit %s"
msgstr "Avslutt %s" msgstr "Avslutt %s"
#. Translators: This is the time format with date used #. Translators: This is the time format with date used
#. in 24-hour mode. #. in 24-hour mode.
#: ../js/ui/panel.js:564 #: ../js/ui/panel.js:568
msgid "%a %b %e, %R:%S" msgid "%a %b %e, %R:%S"
msgstr "%a %e %b, %R.%S" msgstr "%a %e %b, %R.%S"
#: ../js/ui/panel.js:565 #: ../js/ui/panel.js:569
msgid "%a %b %e, %R" msgid "%a %b %e, %R"
msgstr "%a %e %b, %R" msgstr "%a %e %b, %R"
#. Translators: This is the time format without date used #. Translators: This is the time format without date used
#. in 24-hour mode. #. in 24-hour mode.
#: ../js/ui/panel.js:569 #: ../js/ui/panel.js:573
msgid "%a %R:%S" msgid "%a %R:%S"
msgstr "%a %R.%S" msgstr "%a %R.%S"
#: ../js/ui/panel.js:570 #: ../js/ui/panel.js:574
msgid "%a %R" msgid "%a %R"
msgstr "%a %R" msgstr "%a %R"
#. Translators: This is a time format with date used #. Translators: This is a time format with date used
#. for AM/PM. #. for AM/PM.
#: ../js/ui/panel.js:577 #: ../js/ui/panel.js:581
msgid "%a %b %e, %l:%M:%S %p" msgid "%a %b %e, %l:%M:%S %p"
msgstr "%a %e %b, %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" msgid "%a %b %e, %l:%M %p"
msgstr "%a %e %b, %l.%M %p" msgstr "%a %e %b, %l.%M %p"
#. Translators: This is a time format without date used #. Translators: This is a time format without date used
#. for AM/PM. #. for AM/PM.
#: ../js/ui/panel.js:582 #: ../js/ui/panel.js:586
msgid "%a %l:%M:%S %p" msgid "%a %l:%M:%S %p"
msgstr "%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" msgid "%a %l:%M %p"
msgstr "%a %l.%M %p" msgstr "%a %l.%M %p"
#. Button on the left side of the panel. #. 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". #. 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" msgid "Activities"
msgstr "Aktiviteter" msgstr "Aktiviteter"
#: ../js/ui/placeDisplay.js:112 #: ../js/ui/placeDisplay.js:106
#, c-format #, c-format
msgid "Failed to unmount '%s'" msgid "Failed to unmount '%s'"
msgstr "Klarte ikke å avmontere «%s»" msgstr "Klarte ikke å avmontere «%s»"
#: ../js/ui/placeDisplay.js:115 #: ../js/ui/placeDisplay.js:109
msgid "Retry" msgid "Retry"
msgstr "Prøv igjen" msgstr "Prøv igjen"
#: ../js/ui/placeDisplay.js:160 #: ../js/ui/placeDisplay.js:150
msgid "Connect to..." msgid "Connect to..."
msgstr "Koble til …" msgstr "Koble til …"
#: ../js/ui/placeDisplay.js:559 #: ../js/ui/placeDisplay.js:386
msgid "PLACES & DEVICES" msgid "PLACES & DEVICES"
msgstr "STEDER & ENHETER" msgstr "STEDER & ENHETER"
@ -512,7 +519,7 @@ msgstr "STEDER & ENHETER"
msgid "toggle-switch-us" msgid "toggle-switch-us"
msgstr "toggle-switch-intl" msgstr "toggle-switch-intl"
#: ../js/ui/runDialog.js:222 #: ../js/ui/runDialog.js:209
msgid "Please enter a command:" msgid "Please enter a command:"
msgstr "Oppgi en kommando:" msgstr "Oppgi en kommando:"
@ -596,7 +603,7 @@ msgstr "Høy kontrast"
msgid "Large Text" msgid "Large Text"
msgstr "Stor tekst" 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" msgid "Bluetooth"
msgstr "Bluetooth" msgstr "Bluetooth"
@ -612,106 +619,110 @@ msgstr "Send filer til enhet..."
msgid "Setup a New Device..." msgid "Setup a New Device..."
msgstr "Sett opp en ny enhet..." msgstr "Sett opp en ny enhet..."
#: ../js/ui/status/bluetooth.js:94 #: ../js/ui/status/bluetooth.js:95
msgid "Bluetooth Settings" msgid "Bluetooth Settings"
msgstr "Innstillinger for Bluetooth" msgstr "Innstillinger for Bluetooth"
#: ../js/ui/status/bluetooth.js:191 #: ../js/ui/status/bluetooth.js:192
msgid "Connection" msgid "Connection"
msgstr "Tilkobling" msgstr "Tilkobling"
#: ../js/ui/status/bluetooth.js:227 #: ../js/ui/status/bluetooth.js:228
msgid "Send Files..." msgid "Send Files..."
msgstr "Send filer..." msgstr "Send filer..."
#: ../js/ui/status/bluetooth.js:232 #: ../js/ui/status/bluetooth.js:233
msgid "Browse Files..." msgid "Browse Files..."
msgstr "Bla gjennom filer..." msgstr "Bla gjennom filer..."
#: ../js/ui/status/bluetooth.js:241 #: ../js/ui/status/bluetooth.js:242
msgid "Error browsing device" msgid "Error browsing device"
msgstr "Feil under lesing av enhet" msgstr "Feil under lesing av enhet"
#: ../js/ui/status/bluetooth.js:242 #: ../js/ui/status/bluetooth.js:243
#, c-format #, c-format
msgid "The requested device cannot be browsed, error is '%s'" msgid "The requested device cannot be browsed, error is '%s'"
msgstr "Kan ikke bla gjennom forespurt enhet. Feilen er «%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" msgid "Keyboard Settings"
msgstr "Innstillinger for tastatur" msgstr "Innstillinger for tastatur"
#: ../js/ui/status/bluetooth.js:255 #: ../js/ui/status/bluetooth.js:256
msgid "Mouse Settings" msgid "Mouse Settings"
msgstr "Innstillinger for mus" 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" msgid "Sound Settings"
msgstr "Innstillinger for lyd" msgstr "Innstillinger for lyd"
#: ../js/ui/status/bluetooth.js:336 ../js/ui/status/bluetooth.js:370 #: ../js/ui/status/bluetooth.js:337 ../js/ui/status/bluetooth.js:371
#: ../js/ui/status/bluetooth.js:410 ../js/ui/status/bluetooth.js:443 #: ../js/ui/status/bluetooth.js:411 ../js/ui/status/bluetooth.js:444
msgid "Bluetooth Agent" msgid "Bluetooth Agent"
msgstr "Bluetooth-agent" msgstr "Bluetooth-agent"
#: ../js/ui/status/bluetooth.js:371 #: ../js/ui/status/bluetooth.js:372
#, c-format #, c-format
msgid "Authorization request from %s" msgid "Authorization request from %s"
msgstr "Forespørsel om autorisering fra %s" msgstr "Forespørsel om autorisering fra %s"
#: ../js/ui/status/bluetooth.js:377 #: ../js/ui/status/bluetooth.js:378
#, c-format #, c-format
msgid "Device %s wants access to the service '%s'" msgid "Device %s wants access to the service '%s'"
msgstr "Enhet %s vil ha tilgang til tjenesten «%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" msgid "Always grant access"
msgstr "Alltid gi tilgang" msgstr "Alltid gi tilgang"
#: ../js/ui/status/bluetooth.js:380 #: ../js/ui/status/bluetooth.js:381
msgid "Grant this time only" msgid "Grant this time only"
msgstr "Gi tilgang kun denne ene gangen" msgstr "Gi tilgang kun denne ene gangen"
#: ../js/ui/status/bluetooth.js:381 #: ../js/ui/status/bluetooth.js:382
msgid "Reject" msgid "Reject"
msgstr "Avvis" msgstr "Avvis"
#: ../js/ui/status/bluetooth.js:411 #: ../js/ui/status/bluetooth.js:412
#, c-format #, c-format
msgid "Pairing confirmation for %s" msgid "Pairing confirmation for %s"
msgstr "Bekreftelse for tilkobling 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 #, c-format
msgid "Device %s wants to pair with this computer" msgid "Device %s wants to pair with this computer"
msgstr "Enhet %s vil koble seg sammen med denne datamaskinen" msgstr "Enhet %s vil koble seg sammen med denne datamaskinen"
#: ../js/ui/status/bluetooth.js:418 #: ../js/ui/status/bluetooth.js:419
#, c-format #, c-format
msgid "Please confirm whether the PIN '%s' matches the one on the device." 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." 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" msgid "Matches"
msgstr "Stemmer overens" msgstr "Stemmer overens"
#: ../js/ui/status/bluetooth.js:421 #: ../js/ui/status/bluetooth.js:422
msgid "Does not match" msgid "Does not match"
msgstr "Stemmer ikke overens" msgstr "Stemmer ikke overens"
#: ../js/ui/status/bluetooth.js:444 #: ../js/ui/status/bluetooth.js:445
#, c-format #, c-format
msgid "Pairing request for %s" msgid "Pairing request for %s"
msgstr "Forespørsel om tilkobling 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." msgid "Please enter the PIN mentioned on the device."
msgstr "Vennligst oppgi PIN som oppgitt på enheten." msgstr "Vennligst oppgi PIN som oppgitt på enheten."
#: ../js/ui/status/bluetooth.js:468 #: ../js/ui/status/bluetooth.js:469
msgid "OK" msgid "OK"
msgstr "OK" msgstr "OK"
#: ../js/ui/status/keyboard.js:78
msgid "Localization Settings"
msgstr "Innstillinger for lokalisering"
#: ../js/ui/status/power.js:85 #: ../js/ui/status/power.js:85
msgid "Power Settings" msgid "Power Settings"
msgstr "Innstillinger for strøm" msgstr "Innstillinger for strøm"
@ -846,14 +857,14 @@ msgstr "%s er ferdig startet"
msgid "'%s' is ready" msgid "'%s' is ready"
msgstr "«%s» er klar" msgstr "«%s» er klar"
#: ../js/ui/workspacesView.js:244 #: ../js/ui/workspacesView.js:243
msgid "" msgid ""
"Can't add a new workspace because maximum workspaces limit has been reached." "Can't add a new workspace because maximum workspaces limit has been reached."
msgstr "" msgstr ""
"Kan ikke legge til nytt arbeidsområde fordi grensen for maksimalt antall " "Kan ikke legge til nytt arbeidsområde fordi grensen for maksimalt antall "
"arbeidsområder er nådd." "arbeidsområder er nådd."
#: ../js/ui/workspacesView.js:260 #: ../js/ui/workspacesView.js:259
msgid "Can't remove the first workspace." msgid "Can't remove the first workspace."
msgstr "Kan ikke fjerne første arbeidsområde" msgstr "Kan ikke fjerne første arbeidsområde"
@ -879,32 +890,32 @@ msgstr[1] "%u innganger"
msgid "System Sounds" msgid "System Sounds"
msgstr "Systemlyder" msgstr "Systemlyder"
#: ../src/shell-global.c:1233 #: ../src/shell-global.c:1365
msgid "Less than a minute ago" msgid "Less than a minute ago"
msgstr "Mindre enn ett minutt siden" msgstr "Mindre enn ett minutt siden"
#: ../src/shell-global.c:1237 #: ../src/shell-global.c:1369
#, c-format #, c-format
msgid "%d minute ago" msgid "%d minute ago"
msgid_plural "%d minutes ago" msgid_plural "%d minutes ago"
msgstr[0] "%d minutt siden" msgstr[0] "%d minutt siden"
msgstr[1] "%d minutter siden" msgstr[1] "%d minutter siden"
#: ../src/shell-global.c:1242 #: ../src/shell-global.c:1374
#, c-format #, c-format
msgid "%d hour ago" msgid "%d hour ago"
msgid_plural "%d hours ago" msgid_plural "%d hours ago"
msgstr[0] "%d time siden" msgstr[0] "%d time siden"
msgstr[1] "%d timer siden" msgstr[1] "%d timer siden"
#: ../src/shell-global.c:1247 #: ../src/shell-global.c:1379
#, c-format #, c-format
msgid "%d day ago" msgid "%d day ago"
msgid_plural "%d days ago" msgid_plural "%d days ago"
msgstr[0] "%d dag siden" msgstr[0] "%d dag siden"
msgstr[1] "%d dager siden" msgstr[1] "%d dager siden"
#: ../src/shell-global.c:1252 #: ../src/shell-global.c:1384
#, c-format #, c-format
msgid "%d week ago" msgid "%d week ago"
msgid_plural "%d weeks ago" msgid_plural "%d weeks ago"