Hello community,
here is the log from the commit of package gnome-settings-daemon for
openSUSE:Factory checked in at 2013-05-16 10:52:19
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/gnome-settings-daemon (Old)
and /work/SRC/openSUSE:Factory/.gnome-settings-daemon.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gnome-settings-daemon"
Changes:
--------
---
/work/SRC/openSUSE:Factory/gnome-settings-daemon/gnome-settings-daemon.changes
2013-04-26 15:47:56.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.gnome-settings-daemon.new/gnome-settings-daemon.changes
2013-05-16 10:52:21.000000000 +0200
@@ -1,0 +2,13 @@
+Tue May 14 11:34:50 UTC 2013 - [email protected]
+
+- Update to version 3.8.2:
+ + Color:
+ - Remove warning for some laptop docks.
+ - Don't try to parse temporary files we generate.
+ + Media-keys:
+ - Don't show a label for "analog-output" ports.
+ + Power:
+ - Fix brightness not being restored on resume on some systems.
+ - Make "Turn off screen when inactive" switch work.
+
+-------------------------------------------------------------------
Old:
----
gnome-settings-daemon-3.8.1.tar.xz
New:
----
gnome-settings-daemon-3.8.2.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gnome-settings-daemon.spec ++++++
--- /var/tmp/diff_new_pack.zj2Mph/_old 2013-05-16 10:52:22.000000000 +0200
+++ /var/tmp/diff_new_pack.zj2Mph/_new 2013-05-16 10:52:22.000000000 +0200
@@ -27,7 +27,7 @@
%define with_smartcard 0
Name: gnome-settings-daemon
-Version: 3.8.1
+Version: 3.8.2
Release: 0
Summary: Settings daemon for the GNOME desktop
License: GPL-2.0+
++++++ gnome-settings-daemon-3.8.1.tar.xz -> gnome-settings-daemon-3.8.2.tar.xz
++++++
++++ 3954 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/gnome-settings-daemon-3.8.1/NEWS new/gnome-settings-daemon-3.8.2/NEWS
--- old/gnome-settings-daemon-3.8.1/NEWS 2013-04-16 11:53:44.000000000
+0200
+++ new/gnome-settings-daemon-3.8.2/NEWS 2013-05-14 12:07:55.000000000
+0200
@@ -1,4 +1,19 @@
=============
+Version 3.8.2
+=============
+
+Media-keys:
+- Don't show a label for "analog-output" ports
+
+Color:
+- Remove warning for some laptop docks
+- Don't try to parse temporary files we generate
+
+Power:
+- Fix brightness not being restored on resume on some systems
+- Make "Turn off screen when inactive" switch work
+
+=============
Version 3.8.1
=============
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/gnome-settings-daemon-3.8.1/configure.ac
new/gnome-settings-daemon-3.8.2/configure.ac
--- old/gnome-settings-daemon-3.8.1/configure.ac 2013-04-16
11:53:51.000000000 +0200
+++ new/gnome-settings-daemon-3.8.2/configure.ac 2013-05-14
12:07:55.000000000 +0200
@@ -1,7 +1,7 @@
AC_PREREQ([2.60])
AC_INIT([gnome-settings-daemon],
- [3.8.1],
+ [3.8.2],
[http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-settings-daemon])
AC_CONFIG_SRCDIR([gnome-settings-daemon/gnome-settings-manager.c])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/gnome-settings-daemon-3.8.1/plugins/color/gcm-profile-store.c
new/gnome-settings-daemon-3.8.2/plugins/color/gcm-profile-store.c
--- old/gnome-settings-daemon-3.8.1/plugins/color/gcm-profile-store.c
2011-12-31 01:22:52.000000000 +0100
+++ new/gnome-settings-daemon-3.8.2/plugins/color/gcm-profile-store.c
2013-05-13 09:15:19.000000000 +0200
@@ -224,6 +224,13 @@
goto out;
}
+ /* ignore temp files */
+ path = g_file_get_path (file);
+ if (g_strrstr (path, ".goutputstream") != NULL) {
+ g_debug ("ignoring gvfs temporary file");
+ goto out;
+ }
+
/* only care about created objects */
if (event_type == G_FILE_MONITOR_EVENT_CREATED) {
g_file_query_info_async (file,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/gnome-settings-daemon-3.8.1/plugins/color/gsd-color-manager.c
new/gnome-settings-daemon-3.8.2/plugins/color/gsd-color-manager.c
--- old/gnome-settings-daemon-3.8.1/plugins/color/gsd-color-manager.c
2013-04-16 11:47:58.000000000 +0200
+++ new/gnome-settings-daemon-3.8.2/plugins/color/gsd-color-manager.c
2013-05-14 12:04:02.000000000 +0200
@@ -682,10 +682,7 @@
/* create a lookup table */
size = gnome_rr_output_get_gamma_size (output);
if (size == 0) {
- g_set_error_literal (error,
- GSD_COLOR_MANAGER_ERROR,
- GSD_COLOR_MANAGER_ERROR_FAILED,
- "gamma size is zero");
+ ret = TRUE;
goto out;
}
clut = gcm_session_generate_vcgt (profile, size);
@@ -723,11 +720,7 @@
clut = g_ptr_array_new_with_free_func (g_free);
size = gnome_rr_output_get_gamma_size (output);
if (size == 0) {
- ret = FALSE;
- g_set_error_literal (error,
- GSD_COLOR_MANAGER_ERROR,
- GSD_COLOR_MANAGER_ERROR_FAILED,
- "gamma size is zero");
+ ret = TRUE;
goto out;
}
for (i = 0; i < size; i++) {
@@ -1215,6 +1208,7 @@
static void
gcm_session_add_x11_output (GsdColorManager *manager, GnomeRROutput *output)
{
+ const gchar *edid_checksum = NULL;
const gchar *model = NULL;
const gchar *serial = NULL;
const gchar *vendor = NULL;
@@ -1242,6 +1236,7 @@
/* use EDID data if we have it */
if (edid != NULL) {
+ edid_checksum = gcm_edid_get_checksum (edid);
if (model == NULL)
model = gcm_edid_get_monitor_name (edid);
if (vendor == NULL)
@@ -1290,6 +1285,13 @@
(gpointer)
CD_DEVICE_METADATA_OUTPUT_PRIORITY_PRIMARY :
(gpointer)
CD_DEVICE_METADATA_OUTPUT_PRIORITY_SECONDARY);
#endif
+#if CD_CHECK_VERSION(0,1,34)
+ if (edid_checksum != NULL) {
+ g_hash_table_insert (device_props,
+ (gpointer)
CD_DEVICE_METADATA_OUTPUT_EDID_MD5,
+ (gpointer) edid_checksum);
+ }
+#endif
#if CD_CHECK_VERSION(0,1,27)
/* set this so we can call the device a 'Laptop Screen' in the
* control center main panel */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/gnome-settings-daemon-3.8.1/plugins/media-keys/gsd-media-keys-manager.c
new/gnome-settings-daemon-3.8.2/plugins/media-keys/gsd-media-keys-manager.c
--- old/gnome-settings-daemon-3.8.1/plugins/media-keys/gsd-media-keys-manager.c
2013-04-16 11:47:58.000000000 +0200
+++ new/gnome-settings-daemon-3.8.2/plugins/media-keys/gsd-media-keys-manager.c
2013-05-14 12:04:02.000000000 +0200
@@ -1036,7 +1036,9 @@
icon = get_icon_name_for_volume (!GVC_IS_MIXER_SINK (stream), muted,
vol);
port = gvc_mixer_stream_get_port (stream);
if (g_strcmp0 (gvc_mixer_stream_get_form_factor (stream), "internal")
!= 0 ||
- (port != NULL && g_strcmp0 (port->port, "analog-output-speaker")
!= 0)) {
+ (port != NULL &&
+ g_strcmp0 (port->port, "analog-output-speaker") != 0 &&
+ g_strcmp0 (port->port, "analog-output") != 0)) {
device = gvc_mixer_control_lookup_device_from_stream
(manager->priv->volume, stream);
show_osd (manager, icon,
gvc_mixer_ui_device_get_description (device), vol);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/gnome-settings-daemon-3.8.1/plugins/media-keys/shell-key-grabber.c
new/gnome-settings-daemon-3.8.2/plugins/media-keys/shell-key-grabber.c
--- old/gnome-settings-daemon-3.8.1/plugins/media-keys/shell-key-grabber.c
2013-04-16 12:05:10.000000000 +0200
+++ new/gnome-settings-daemon-3.8.2/plugins/media-keys/shell-key-grabber.c
2013-05-14 12:11:59.000000000 +0200
@@ -1,5 +1,5 @@
/*
- * Generated by gdbus-codegen 2.36.0. DO NOT EDIT.
+ * Generated by gdbus-codegen 2.37.0. DO NOT EDIT.
*
* The license of this code is the same as for the source it was derived from.
*/
@@ -432,6 +432,9 @@
* Virtual table for the D-Bus interface <link
linkend="gdbus-interface-org-gnome-Shell.top_of_page">org.gnome.Shell</link>.
*/
+typedef ShellKeyGrabberIface ShellKeyGrabberInterface;
+G_DEFINE_INTERFACE (ShellKeyGrabber, shell_key_grabber, G_TYPE_OBJECT);
+
static void
shell_key_grabber_default_init (ShellKeyGrabberIface *iface)
{
@@ -529,9 +532,6 @@
}
-typedef ShellKeyGrabberIface ShellKeyGrabberInterface;
-G_DEFINE_INTERFACE (ShellKeyGrabber, shell_key_grabber, G_TYPE_OBJECT);
-
/**
* shell_key_grabber_emit_accelerator_activated:
* @object: A #ShellKeyGrabber.
@@ -967,7 +967,7 @@
shell_key_grabber_proxy_get_property (GObject *object,
guint prop_id,
GValue *value,
- GParamSpec *pspec)
+ GParamSpec *pspec G_GNUC_UNUSED)
{
}
@@ -975,13 +975,13 @@
shell_key_grabber_proxy_set_property (GObject *object,
guint prop_id,
const GValue *value,
- GParamSpec *pspec)
+ GParamSpec *pspec G_GNUC_UNUSED)
{
}
static void
shell_key_grabber_proxy_g_signal (GDBusProxy *proxy,
- const gchar *sender_name,
+ const gchar *sender_name G_GNUC_UNUSED,
const gchar *signal_name,
GVariant *parameters)
{
@@ -1286,9 +1286,9 @@
static void
_shell_key_grabber_skeleton_handle_method_call (
- GDBusConnection *connection,
- const gchar *sender,
- const gchar *object_path,
+ GDBusConnection *connection G_GNUC_UNUSED,
+ const gchar *sender G_GNUC_UNUSED,
+ const gchar *object_path G_GNUC_UNUSED,
const gchar *interface_name,
const gchar *method_name,
GVariant *parameters,
@@ -1350,10 +1350,10 @@
static GVariant *
_shell_key_grabber_skeleton_handle_get_property (
- GDBusConnection *connection,
- const gchar *sender,
- const gchar *object_path,
- const gchar *interface_name,
+ GDBusConnection *connection G_GNUC_UNUSED,
+ const gchar *sender G_GNUC_UNUSED,
+ const gchar *object_path G_GNUC_UNUSED,
+ const gchar *interface_name G_GNUC_UNUSED,
const gchar *property_name,
GError **error,
gpointer user_data)
@@ -1383,10 +1383,10 @@
static gboolean
_shell_key_grabber_skeleton_handle_set_property (
- GDBusConnection *connection,
- const gchar *sender,
- const gchar *object_path,
- const gchar *interface_name,
+ GDBusConnection *connection G_GNUC_UNUSED,
+ const gchar *sender G_GNUC_UNUSED,
+ const gchar *object_path G_GNUC_UNUSED,
+ const gchar *interface_name G_GNUC_UNUSED,
const gchar *property_name,
GVariant *variant,
GError **error,
@@ -1427,13 +1427,13 @@
};
static GDBusInterfaceInfo *
-shell_key_grabber_skeleton_dbus_interface_get_info (GDBusInterfaceSkeleton
*skeleton)
+shell_key_grabber_skeleton_dbus_interface_get_info (GDBusInterfaceSkeleton
*skeleton G_GNUC_UNUSED)
{
return shell_key_grabber_interface_info ();
}
static GDBusInterfaceVTable *
-shell_key_grabber_skeleton_dbus_interface_get_vtable (GDBusInterfaceSkeleton
*skeleton)
+shell_key_grabber_skeleton_dbus_interface_get_vtable (GDBusInterfaceSkeleton
*skeleton G_GNUC_UNUSED)
{
return (GDBusInterfaceVTable *) &_shell_key_grabber_skeleton_vtable;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/gnome-settings-daemon-3.8.1/plugins/media-keys/shell-key-grabber.h
new/gnome-settings-daemon-3.8.2/plugins/media-keys/shell-key-grabber.h
--- old/gnome-settings-daemon-3.8.1/plugins/media-keys/shell-key-grabber.h
2013-04-16 12:05:10.000000000 +0200
+++ new/gnome-settings-daemon-3.8.2/plugins/media-keys/shell-key-grabber.h
2013-05-14 12:11:59.000000000 +0200
@@ -1,5 +1,5 @@
/*
- * Generated by gdbus-codegen 2.36.0. DO NOT EDIT.
+ * Generated by gdbus-codegen 2.37.0. DO NOT EDIT.
*
* The license of this code is the same as for the source it was derived from.
*/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/gnome-settings-daemon-3.8.1/plugins/media-keys/shell-keybinding-modes.h
new/gnome-settings-daemon-3.8.2/plugins/media-keys/shell-keybinding-modes.h
--- old/gnome-settings-daemon-3.8.1/plugins/media-keys/shell-keybinding-modes.h
2013-04-16 11:00:34.000000000 +0200
+++ new/gnome-settings-daemon-3.8.2/plugins/media-keys/shell-keybinding-modes.h
2013-05-13 09:19:09.000000000 +0200
@@ -15,6 +15,8 @@
* @SHELL_KEYBINDING_MODE_SYSTEM_MODAL: allow keybinding when a system modal
* dialog (e.g. authentification or session dialogs) is open
* @SHELL_KEYBINDING_MODE_LOOKING_GLASS: allow keybinding in looking glass
+ * @SHELL_KEYBINDING_MODE_TOPBAR_POPUP: allow keybinding while a top bar menu
+ * is open
* @SHELL_KEYBINDING_MODE_ALL: always allow keybinding
*
* Controls in which GNOME Shell states a keybinding should be handled.
@@ -29,6 +31,7 @@
SHELL_KEYBINDING_MODE_MESSAGE_TRAY = 1 << 5,
SHELL_KEYBINDING_MODE_SYSTEM_MODAL = 1 << 6,
SHELL_KEYBINDING_MODE_LOOKING_GLASS = 1 << 7,
+ SHELL_KEYBINDING_MODE_TOPBAR_POPUP = 1 << 8,
SHELL_KEYBINDING_MODE_ALL = ~SHELL_KEYBINDING_MODE_NONE
} ShellKeyBindingMode;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/gnome-settings-daemon-3.8.1/plugins/power/gsd-power-manager.c
new/gnome-settings-daemon-3.8.2/plugins/power/gsd-power-manager.c
--- old/gnome-settings-daemon-3.8.1/plugins/power/gsd-power-manager.c
2013-04-16 11:47:58.000000000 +0200
+++ new/gnome-settings-daemon-3.8.2/plugins/power/gsd-power-manager.c
2013-05-14 12:04:02.000000000 +0200
@@ -192,7 +192,6 @@
/* Brightness */
gboolean backlight_available;
gint pre_dim_brightness; /* level, not percentage
*/
- gint pre_dpms_brightness;
/* Keyboard */
GDBusProxy *upower_kdb_proxy;
@@ -1996,11 +1995,6 @@
g_error_free (error);
}
- if (manager->priv->backlight_available &&
- manager->priv->pre_dpms_brightness != -1) {
- backlight_set_abs (manager->priv->rr_screen,
manager->priv->pre_dpms_brightness, &error);
- manager->priv->pre_dpms_brightness = -1;
- }
g_debug ("TESTSUITE: Unblanked screen");
}
@@ -2010,21 +2004,6 @@
gboolean ret;
GError *error = NULL;
- /* Save the backlight, if DPMS isn't on yet, so we can capture it */
-#ifndef GSD_MOCK
- GnomeRRDpmsMode mode;
-
- if (manager->priv->backlight_available &&
- gnome_rr_screen_get_dpms_mode (manager->priv->rr_screen, &mode,
NULL) &&
- mode == GNOME_RR_DPMS_ON) {
- manager->priv->pre_dpms_brightness = backlight_get_abs
(manager->priv->rr_screen, NULL);
- }
-#else
- manager->priv->pre_dpms_brightness = backlight_get_abs
(manager->priv->rr_screen, NULL);
-#endif /* GSD_MOCK */
- if (manager->priv->pre_dpms_brightness != -1)
- backlight_set_abs (manager->priv->rr_screen, backlight_get_min
(manager->priv->rr_screen), NULL);
-
ret = gnome_rr_screen_set_dpms_mode (manager->priv->rr_screen,
GNOME_RR_DPMS_OFF,
&error);
@@ -3145,7 +3124,8 @@
return;
}
if (g_str_has_prefix (key, "sleep-inactive") ||
- g_str_equal (key, "idle-delay")) {
+ g_str_equal (key, "idle-delay") ||
+ g_str_equal (key, "idle-dim")) {
idle_configure (manager);
return;
}
@@ -3641,7 +3621,6 @@
manager->priv = GSD_POWER_MANAGER_GET_PRIVATE (manager);
manager->priv->inhibit_lid_switch_fd = -1;
manager->priv->inhibit_suspend_fd = -1;
- manager->priv->pre_dpms_brightness = -1;
manager->priv->screensaver_cancellable = g_cancellable_new ();
manager->priv->bus_cancellable = g_cancellable_new ();
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/gnome-settings-daemon-3.8.1/plugins/power/test.py
new/gnome-settings-daemon-3.8.2/plugins/power/test.py
--- old/gnome-settings-daemon-3.8.1/plugins/power/test.py 2013-04-16
11:47:58.000000000 +0200
+++ new/gnome-settings-daemon-3.8.2/plugins/power/test.py 2013-05-14
12:04:02.000000000 +0200
@@ -337,8 +337,6 @@
# blank is supposed to happen straight away
self.check_blank(2)
- # check that the brightness is at the minimum
- self.assertTrue(self.get_brightness() == 0, 'incorrect blank
brightness')
# wiggle the mouse now and check for unblank; this is expected to pop
up
# the locked screen saver
@@ -352,7 +350,6 @@
# and check for blank after the blank timeout
self.check_blank(10)
- self.assertTrue(self.get_brightness() == 0, 'incorrect blank
brightness')
# Drop inhibitor
self.obj_session_mgr.Uninhibit(dbus.UInt32(inhibit_id))
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/gnome-settings-daemon-3.8.1/po/nb.po
new/gnome-settings-daemon-3.8.2/po/nb.po
--- old/gnome-settings-daemon-3.8.1/po/nb.po 2013-04-16 11:47:58.000000000
+0200
+++ new/gnome-settings-daemon-3.8.2/po/nb.po 2013-05-14 12:07:55.000000000
+0200
@@ -8,8 +8,8 @@
msgstr ""
"Project-Id-Version: gnome-settings-daemon 3.8.x\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-03 13:27+0200\n"
-"PO-Revision-Date: 2013-04-03 13:30+0200\n"
+"POT-Creation-Date: 2013-05-13 10:25+0200\n"
+"PO-Revision-Date: 2013-05-13 10:27+0200\n"
"Last-Translator: Kjartan Maraas <[email protected]>\n"
"Language-Team: Norwegian bokmål <[email protected]>\n"
"Language: \n"
@@ -209,11 +209,10 @@
msgstr "Høyde-/breddeforhold for Wacom tegnebrett"
#: ../data/org.gnome.settings-daemon.peripherals.wacom.gschema.xml.in.in.h:10
-#, fuzzy
msgid ""
"Enable this to restrict the Wacom tablet area to match the aspect ratio of "
"the output."
-msgstr "Slå på dette for å sette tegnebrettet til absolutt modus."
+msgstr "Slå på dette for å begrense tegnebrettets område til
høyde-/breddeforholdet for utdata."
#: ../data/org.gnome.settings-daemon.peripherals.wacom.gschema.xml.in.in.h:11
msgid "Wacom tablet rotation"
@@ -231,7 +230,7 @@
#: ../data/org.gnome.settings-daemon.peripherals.wacom.gschema.xml.in.in.h:14
msgid "Enable this to move the cursor when the user touches the tablet."
-msgstr ""
+msgstr "Slå på dette for å flytte markøren når bruker berører tegnebrettet."
#: ../data/org.gnome.settings-daemon.peripherals.wacom.gschema.xml.in.in.h:15
msgid "Wacom tablet PC feature"
@@ -1106,7 +1105,7 @@
msgstr "Tillegg for utklippstavle"
#: ../plugins/color/color.gnome-settings-plugin.in.h:1
-#: ../plugins/color/gsd-color-manager.c:1664
+#: ../plugins/color/gsd-color-manager.c:1666
msgid "Color"
msgstr "Farger"
@@ -1114,40 +1113,40 @@
msgid "Color plugin"
msgstr "Tillegg for farger"
-#: ../plugins/color/gsd-color-manager.c:1669
+#: ../plugins/color/gsd-color-manager.c:1671
msgid "Recalibrate now"
msgstr "Kalibrer på nytt nå"
#. TRANSLATORS: this is when the device has not been recalibrated in a while
-#: ../plugins/color/gsd-color-manager.c:1712
+#: ../plugins/color/gsd-color-manager.c:1714
msgid "Recalibration required"
msgstr "Ny kalibrering kreves"
#. TRANSLATORS: this is when the display has not been recalibrated in a while
-#: ../plugins/color/gsd-color-manager.c:1724
+#: ../plugins/color/gsd-color-manager.c:1726
#, c-format
msgid "The display '%s' should be recalibrated soon."
msgstr "Skjermen «%s» bør kalibreres på nytt snart."
#. TRANSLATORS: this is when the printer has not been recalibrated in a while
-#: ../plugins/color/gsd-color-manager.c:1733
+#: ../plugins/color/gsd-color-manager.c:1735
#, c-format
msgid "The printer '%s' should be recalibrated soon."
msgstr "Skriver «%s» bør kalibreres på nytt snart."
#. TRANSLATORS: this is the application name
-#: ../plugins/color/gsd-color-manager.c:2057
-#: ../plugins/color/gsd-color-manager.c:2073
+#: ../plugins/color/gsd-color-manager.c:2059
+#: ../plugins/color/gsd-color-manager.c:2075
msgid "GNOME Settings Daemon Color Plugin"
msgstr "Fargetillegg for GNOME konfigurasjonstjeneste"
#. TRANSLATORS: this is a sound description
-#: ../plugins/color/gsd-color-manager.c:2059
+#: ../plugins/color/gsd-color-manager.c:2061
msgid "Color calibration device added"
msgstr "Enhet for kalibrering av farger ble lagt til"
#. TRANSLATORS: this is a sound description
-#: ../plugins/color/gsd-color-manager.c:2075
+#: ../plugins/color/gsd-color-manager.c:2077
msgid "Color calibration device removed"
msgstr "Enhet for kalibrering av farger ble fjernet"
@@ -1965,17 +1964,17 @@
#. TRANSLATORS: this is the sound description
#: ../plugins/power/gpm-common.c:1732
-#: ../plugins/power/gsd-power-manager.c:1628
-#: ../plugins/power/gsd-power-manager.c:1758
+#: ../plugins/power/gsd-power-manager.c:1627
+#: ../plugins/power/gsd-power-manager.c:1757
msgid "Battery is critically low"
msgstr "Batteri har kritisk lav kapasitet"
#. TRANSLATORS: the battery may be recalled by its vendor
-#: ../plugins/power/gsd-power-manager.c:929
+#: ../plugins/power/gsd-power-manager.c:928
msgid "Battery may be recalled"
msgstr "Batteriet kan ha blitt tilbakekalt"
-#: ../plugins/power/gsd-power-manager.c:932
+#: ../plugins/power/gsd-power-manager.c:931
#, c-format
msgid ""
"A battery in your computer may have been recalled by %s and you may be at "
@@ -1984,209 +1983,209 @@
"Et batteri i din datamaskin kan ha blitt tilbakekalt av %s og du kan være "
"utsatt for risiko."
-#: ../plugins/power/gsd-power-manager.c:935
+#: ../plugins/power/gsd-power-manager.c:934
msgid "For more information visit the battery recall website."
msgstr "For med informasjon besøk nettsted for tilbakekalling av batterier."
#. TRANSLATORS: button text, visit the manufacturers recall website
-#: ../plugins/power/gsd-power-manager.c:946
+#: ../plugins/power/gsd-power-manager.c:945
msgid "Visit recall website"
msgstr "Besøk nettsted for tilbakekalling"
#. TRANSLATORS: button text, do not show this bubble again
-#: ../plugins/power/gsd-power-manager.c:950
+#: ../plugins/power/gsd-power-manager.c:949
msgid "Do not show me this again"
msgstr "Ikke vis dette igjen"
#. TRANSLATORS: UPS is now discharging
-#: ../plugins/power/gsd-power-manager.c:1203
+#: ../plugins/power/gsd-power-manager.c:1202
msgid "UPS Discharging"
msgstr "UPS lades ut"
#. TRANSLATORS: tell the user how much time they have got
-#: ../plugins/power/gsd-power-manager.c:1208
+#: ../plugins/power/gsd-power-manager.c:1207
#, c-format
msgid "%s of UPS backup power remaining"
msgstr "%s UPS reservestrøm gjenstår"
#. TRANSLATORS: this is the notification application name
-#: ../plugins/power/gsd-power-manager.c:1229
-#: ../plugins/power/gsd-power-manager.c:1438
-#: ../plugins/power/gsd-power-manager.c:1611
-#: ../plugins/power/gsd-power-manager.c:1749
-#: ../plugins/power/gsd-power-manager.c:3088
+#: ../plugins/power/gsd-power-manager.c:1228
+#: ../plugins/power/gsd-power-manager.c:1437
+#: ../plugins/power/gsd-power-manager.c:1610
+#: ../plugins/power/gsd-power-manager.c:1748
+#: ../plugins/power/gsd-power-manager.c:3067
#: ../plugins/power/power.gnome-settings-plugin.in.h:1
msgid "Power"
msgstr "Strøm"
#. TRANSLATORS: laptop battery low, and we only have one battery
-#: ../plugins/power/gsd-power-manager.c:1348
+#: ../plugins/power/gsd-power-manager.c:1347
msgid "Battery low"
msgstr "Batteri har lav kapasitet"
#. TRANSLATORS: laptop battery low, and we have more than one kind of battery
-#: ../plugins/power/gsd-power-manager.c:1351
+#: ../plugins/power/gsd-power-manager.c:1350
msgid "Laptop battery low"
msgstr "Batteri på bærbar har lite strøm"
#. TRANSLATORS: tell the user how much time they have got
-#: ../plugins/power/gsd-power-manager.c:1358
+#: ../plugins/power/gsd-power-manager.c:1357
#, c-format
msgid "Approximately %s remaining (%.0f%%)"
msgstr "Omtrent %s gjenstår (%.0f%%)"
#. TRANSLATORS: UPS is starting to get a little low
-#: ../plugins/power/gsd-power-manager.c:1365
+#: ../plugins/power/gsd-power-manager.c:1364
msgid "UPS low"
msgstr "UPS har lite strøm"
#. TRANSLATORS: tell the user how much time they have got
-#: ../plugins/power/gsd-power-manager.c:1371
+#: ../plugins/power/gsd-power-manager.c:1370
#, c-format
msgid "Approximately %s of remaining UPS backup power (%.0f%%)"
msgstr "Omtrent %s gjenværende reservestrøm på UPS (%.0f%%)"
#. TRANSLATORS: mouse is getting a little low
#. TRANSLATORS: the mouse battery is very low
-#: ../plugins/power/gsd-power-manager.c:1376
-#: ../plugins/power/gsd-power-manager.c:1535
+#: ../plugins/power/gsd-power-manager.c:1375
+#: ../plugins/power/gsd-power-manager.c:1534
msgid "Mouse battery low"
msgstr "Mus har lite strøm"
#. TRANSLATORS: tell user more details
-#: ../plugins/power/gsd-power-manager.c:1379
+#: ../plugins/power/gsd-power-manager.c:1378
#, c-format
msgid "Wireless mouse is low in power (%.0f%%)"
msgstr "Trådløs mus har lite strøm (%.0f%%)"
#. TRANSLATORS: keyboard is getting a little low
#. TRANSLATORS: the keyboard battery is very low
-#: ../plugins/power/gsd-power-manager.c:1383
-#: ../plugins/power/gsd-power-manager.c:1543
+#: ../plugins/power/gsd-power-manager.c:1382
+#: ../plugins/power/gsd-power-manager.c:1542
msgid "Keyboard battery low"
msgstr "Batteri i tastatur har lav kapasitet"
#. TRANSLATORS: tell user more details
-#: ../plugins/power/gsd-power-manager.c:1386
+#: ../plugins/power/gsd-power-manager.c:1385
#, c-format
msgid "Wireless keyboard is low in power (%.0f%%)"
msgstr "Trådløst tastatur har lite strøm (%.0f%%)"
#. TRANSLATORS: PDA is getting a little low
#. TRANSLATORS: the PDA battery is very low
-#: ../plugins/power/gsd-power-manager.c:1390
-#: ../plugins/power/gsd-power-manager.c:1552
+#: ../plugins/power/gsd-power-manager.c:1389
+#: ../plugins/power/gsd-power-manager.c:1551
msgid "PDA battery low"
msgstr "Batteri i PDA har lav kapasitet"
#. TRANSLATORS: tell user more details
-#: ../plugins/power/gsd-power-manager.c:1393
+#: ../plugins/power/gsd-power-manager.c:1392
#, c-format
msgid "PDA is low in power (%.0f%%)"
msgstr "PDA har lite strøm (%.0f%%)"
#. TRANSLATORS: cell phone (mobile) is getting a little low
#. TRANSLATORS: the cell battery is very low
-#: ../plugins/power/gsd-power-manager.c:1397
-#: ../plugins/power/gsd-power-manager.c:1562
-#: ../plugins/power/gsd-power-manager.c:1571
+#: ../plugins/power/gsd-power-manager.c:1396
+#: ../plugins/power/gsd-power-manager.c:1561
+#: ../plugins/power/gsd-power-manager.c:1570
msgid "Cell phone battery low"
msgstr "Batteri i mobiltelefon har lav kapasitet"
#. TRANSLATORS: tell user more details
-#: ../plugins/power/gsd-power-manager.c:1400
+#: ../plugins/power/gsd-power-manager.c:1399
#, c-format
msgid "Cell phone is low in power (%.0f%%)"
msgstr "Mobiltelefon har lite strøm (%.0f%%)"
#. TRANSLATORS: media player, e.g. mp3 is getting a little low
-#: ../plugins/power/gsd-power-manager.c:1404
+#: ../plugins/power/gsd-power-manager.c:1403
msgid "Media player battery low"
msgstr "Batteri i mediespiller har lav kapasitet"
#. TRANSLATORS: tell user more details
-#: ../plugins/power/gsd-power-manager.c:1407
+#: ../plugins/power/gsd-power-manager.c:1406
#, c-format
msgid "Media player is low in power (%.0f%%)"
msgstr "Mediespiller har lite strøm (%.0f%%)"
#. TRANSLATORS: graphics tablet, e.g. wacom is getting a little low
#. TRANSLATORS: the cell battery is very low
-#: ../plugins/power/gsd-power-manager.c:1411
-#: ../plugins/power/gsd-power-manager.c:1580
+#: ../plugins/power/gsd-power-manager.c:1410
+#: ../plugins/power/gsd-power-manager.c:1579
msgid "Tablet battery low"
msgstr "Batteri i nettbrett har lav kapasitet"
#. TRANSLATORS: tell user more details
-#: ../plugins/power/gsd-power-manager.c:1414
+#: ../plugins/power/gsd-power-manager.c:1413
#, c-format
msgid "Tablet is low in power (%.0f%%)"
msgstr "Nettbrett har lite strøm (%.0f%%)"
#. TRANSLATORS: computer, e.g. ipad is getting a little low
#. TRANSLATORS: the cell battery is very low
-#: ../plugins/power/gsd-power-manager.c:1418
-#: ../plugins/power/gsd-power-manager.c:1589
+#: ../plugins/power/gsd-power-manager.c:1417
+#: ../plugins/power/gsd-power-manager.c:1588
msgid "Attached computer battery low"
msgstr "Batteri i tilkoblet datamaskin har lav kapasitet"
#. TRANSLATORS: tell user more details
-#: ../plugins/power/gsd-power-manager.c:1421
+#: ../plugins/power/gsd-power-manager.c:1420
#, c-format
msgid "Attached computer is low in power (%.0f%%)"
msgstr "Tilkoblet datamaskin har lite strøm (%.0f%%)"
#. TRANSLATORS: this is the sound description
-#: ../plugins/power/gsd-power-manager.c:1448
+#: ../plugins/power/gsd-power-manager.c:1447
msgid "Battery is low"
msgstr "Batteri har lav kapasitet"
#. TRANSLATORS: laptop battery critically low, and only have one kind of
battery
-#: ../plugins/power/gsd-power-manager.c:1489
+#: ../plugins/power/gsd-power-manager.c:1488
msgid "Battery critically low"
msgstr "Batteri har kritisk lav kapasitet"
#. TRANSLATORS: laptop battery critically low, and we have more than one type
of battery
#. TRANSLATORS: laptop battery is really, really, low
-#: ../plugins/power/gsd-power-manager.c:1492
-#: ../plugins/power/gsd-power-manager.c:1663
+#: ../plugins/power/gsd-power-manager.c:1491
+#: ../plugins/power/gsd-power-manager.c:1662
msgid "Laptop battery critically low"
msgstr "Batteri på bærbar har kritisk lav kapasitet"
#. TRANSLATORS: tell the use to insert the plug, as we're not going to do
anything
-#: ../plugins/power/gsd-power-manager.c:1501
+#: ../plugins/power/gsd-power-manager.c:1500
msgid "Plug in your AC adapter to avoid losing data."
msgstr "Koble til strøm for å unngå å tape data."
#. TRANSLATORS: give the user a ultimatum
-#: ../plugins/power/gsd-power-manager.c:1505
+#: ../plugins/power/gsd-power-manager.c:1504
#, c-format
msgid "Computer will suspend very soon unless it is plugged in."
msgstr ""
"Datamaskinen vil gå i hvilemodus meget snart med mindre den kobles til."
#. TRANSLATORS: give the user a ultimatum
-#: ../plugins/power/gsd-power-manager.c:1509
+#: ../plugins/power/gsd-power-manager.c:1508
#, c-format
msgid "Computer will hibernate very soon unless it is plugged in."
msgstr ""
"Datamaskinen vil gå i dvalemodus meget snart med mindre den kobles til."
#. TRANSLATORS: give the user a ultimatum
-#: ../plugins/power/gsd-power-manager.c:1513
+#: ../plugins/power/gsd-power-manager.c:1512
#, c-format
msgid "Computer will shutdown very soon unless it is plugged in."
msgstr "Datamaskinen vil slås av meget snart med mindre den kobles til."
#. TRANSLATORS: the UPS is very low
#. TRANSLATORS: UPS is really, really, low
-#: ../plugins/power/gsd-power-manager.c:1523
-#: ../plugins/power/gsd-power-manager.c:1701
+#: ../plugins/power/gsd-power-manager.c:1522
+#: ../plugins/power/gsd-power-manager.c:1700
msgid "UPS critically low"
msgstr "UPS har kritisk lav batterikapasitet"
#. TRANSLATORS: give the user a ultimatum
-#: ../plugins/power/gsd-power-manager.c:1529
+#: ../plugins/power/gsd-power-manager.c:1528
#, c-format
msgid ""
"Approximately %s of remaining UPS power (%.0f%%). Restore AC power to your "
@@ -2196,7 +2195,7 @@
"din datamaskin for å unngå å tape data."
#. TRANSLATORS: the device is just going to stop working
-#: ../plugins/power/gsd-power-manager.c:1538
+#: ../plugins/power/gsd-power-manager.c:1537
#, c-format
msgid ""
"Wireless mouse is very low in power (%.0f%%). This device will soon stop "
@@ -2206,7 +2205,7 @@
"hvis den ikke lades."
#. TRANSLATORS: the device is just going to stop working
-#: ../plugins/power/gsd-power-manager.c:1546
+#: ../plugins/power/gsd-power-manager.c:1545
#, c-format
msgid ""
"Wireless keyboard is very low in power (%.0f%%). This device will soon stop "
@@ -2216,7 +2215,7 @@
"virke hvis den ikke lades."
#. TRANSLATORS: the device is just going to stop working
-#: ../plugins/power/gsd-power-manager.c:1555
+#: ../plugins/power/gsd-power-manager.c:1554
#, c-format
msgid ""
"PDA is very low in power (%.0f%%). This device will soon stop functioning if "
@@ -2226,7 +2225,7 @@
"ikke lades."
#. TRANSLATORS: the device is just going to stop working
-#: ../plugins/power/gsd-power-manager.c:1565
+#: ../plugins/power/gsd-power-manager.c:1564
#, c-format
msgid ""
"Cell phone is very low in power (%.0f%%). This device will soon stop "
@@ -2236,7 +2235,7 @@
"virke hvis den ikke lades."
#. TRANSLATORS: the device is just going to stop working
-#: ../plugins/power/gsd-power-manager.c:1574
+#: ../plugins/power/gsd-power-manager.c:1573
#, c-format
msgid ""
"Media player is very low in power (%.0f%%). This device will soon stop "
@@ -2246,7 +2245,7 @@
"hvis den ikke lades."
#. TRANSLATORS: the device is just going to stop working
-#: ../plugins/power/gsd-power-manager.c:1583
+#: ../plugins/power/gsd-power-manager.c:1582
#, c-format
msgid ""
"Tablet is very low in power (%.0f%%). This device will soon stop functioning "
@@ -2256,7 +2255,7 @@
"hvis den ikke lades."
#. TRANSLATORS: the device is just going to stop working
-#: ../plugins/power/gsd-power-manager.c:1592
+#: ../plugins/power/gsd-power-manager.c:1591
#, c-format
msgid ""
"Attached computer is very low in power (%.0f%%). The device will soon "
@@ -2266,7 +2265,7 @@
"å virke hvis den ikke lades."
#. TRANSLATORS: computer will shutdown without saving data
-#: ../plugins/power/gsd-power-manager.c:1671
+#: ../plugins/power/gsd-power-manager.c:1670
msgid ""
"The battery is below the critical level and this computer will <b>power-off</"
"b> when the battery becomes completely empty."
@@ -2275,7 +2274,7 @@
"batteriet blir helt tomt."
#. TRANSLATORS: computer will suspend
-#: ../plugins/power/gsd-power-manager.c:1677
+#: ../plugins/power/gsd-power-manager.c:1676
msgid ""
"The battery is below the critical level and this computer is about to "
"suspend.\n"
@@ -2287,7 +2286,7 @@
"<b>MERK:</b> Det kreves noe strøm for å holde datamaskinen i hvilemodus."
#. TRANSLATORS: computer will hibernate
-#: ../plugins/power/gsd-power-manager.c:1684
+#: ../plugins/power/gsd-power-manager.c:1683
msgid ""
"The battery is below the critical level and this computer is about to "
"hibernate."
@@ -2296,7 +2295,7 @@
"dvalemodus."
#. TRANSLATORS: computer will just shutdown
-#: ../plugins/power/gsd-power-manager.c:1689
+#: ../plugins/power/gsd-power-manager.c:1688
msgid ""
"The battery is below the critical level and this computer is about to "
"shutdown."
@@ -2305,7 +2304,7 @@
"av."
#. TRANSLATORS: computer will shutdown without saving data
-#: ../plugins/power/gsd-power-manager.c:1709
+#: ../plugins/power/gsd-power-manager.c:1708
msgid ""
"UPS is below the critical level and this computer will <b>power-off</b> when "
"the UPS becomes completely empty."
@@ -2314,7 +2313,7 @@
"er helt tom."
#. TRANSLATORS: computer will hibernate
-#: ../plugins/power/gsd-power-manager.c:1715
+#: ../plugins/power/gsd-power-manager.c:1714
msgid ""
"UPS is below the critical level and this computer is about to hibernate."
msgstr ""
@@ -2322,39 +2321,39 @@
"dvalemodus."
#. TRANSLATORS: computer will just shutdown
-#: ../plugins/power/gsd-power-manager.c:1720
+#: ../plugins/power/gsd-power-manager.c:1719
msgid "UPS is below the critical level and this computer is about to shutdown."
msgstr ""
"UPS er under kritisk nivå og denne datamaskinen er i ferd med å slås av."
#. TRANSLATORS: this is the sound description
-#: ../plugins/power/gsd-power-manager.c:2223
+#: ../plugins/power/gsd-power-manager.c:2202
msgid "Lid has been opened"
msgstr "Lokket ble åpnet"
#. TRANSLATORS: this is the sound description
-#: ../plugins/power/gsd-power-manager.c:2261
+#: ../plugins/power/gsd-power-manager.c:2240
msgid "Lid has been closed"
msgstr "Lokket ble lukket"
-#: ../plugins/power/gsd-power-manager.c:3067
+#: ../plugins/power/gsd-power-manager.c:3046
msgid "Automatic logout"
msgstr "Automatisk utlogging"
-#: ../plugins/power/gsd-power-manager.c:3067
+#: ../plugins/power/gsd-power-manager.c:3046
msgid "You will soon log out because of inactivity."
msgstr "Du vil snart bli logget ut pga inaktivitet."
-#: ../plugins/power/gsd-power-manager.c:3072
+#: ../plugins/power/gsd-power-manager.c:3051
msgid "Automatic suspend"
msgstr "Automatisk hvilemodus"
-#: ../plugins/power/gsd-power-manager.c:3072
-#: ../plugins/power/gsd-power-manager.c:3077
+#: ../plugins/power/gsd-power-manager.c:3051
+#: ../plugins/power/gsd-power-manager.c:3056
msgid "Computer will suspend very soon because of inactivity."
msgstr "Datamaskinen vil gå i hvilemodus meget snart pga inaktivitet."
-#: ../plugins/power/gsd-power-manager.c:3077
+#: ../plugins/power/gsd-power-manager.c:3056
msgid "Automatic hibernation"
msgstr "Automatisk dvalemodus"
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
