Skip to content
Commits on Source (10)
Hide whitespace changes
Inline Side-by-side
NEWS
View file @ 7a2ea0c2
================
Version 3.38.4
================
- Updated translations
User Accounts:
- Properly handle claiming errors if we're already claiming.
- Always call EnrollStop on enrollment complete.
================
Version 3.38.3
================
......
debian/changelog
View file @ 7a2ea0c2
gnome-control-center (1:3.38.4-1ubuntu1) hirsute; urgency=medium
* New upstream version based on Debian
-- Sebastien Bacher <seb128@ubuntu.com> Fri, 19 Feb 2021 12:25:12 +0100
gnome-control-center (1:3.38.4-1) unstable; urgency=medium
* New upstream release
-- Sebastien Bacher <seb128@ubuntu.com> Fri, 19 Feb 2021 11:59:19 +0100
gnome-control-center (1:3.38.3-1ubuntu3) hirsute; urgency=medium
* d/p/0024-display-Allow-fractional-scaling-to-be-enabled.patch:
......
debian/patches/git_fingerprint_improvements.patch
View file @ 7a2ea0c2
From 269feb19407e0adbc48e5ff7707dcf6353075fc1 Mon Sep 17 00:00:00 2001
From a0f028671c7a7861bb1ea7e8e983a074f288dde1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= <mail@3v1n0.net>
Date: Fri, 11 Dec 2020 01:24:52 +0100
Subject: [PATCH 2/8] fingerprint-dialog: Always call EnrollStop on enrollment
completed
Date: Fri, 11 Dec 2020 03:52:15 +0100
Subject: [PATCH 4/8] fingerprint-dialog: Add generic dialog actions state
tracking
Even if we got an error we need to always call EnrollStop so don't unset
enrolling_finger status until we're really done with it.
Use flags to track the dialog actions state so that we can:
1. Remove multiple flags to track specific states
2. Prevent starting again an action we're still waiting for completion
3. Handle global visual elements (such as the busy spinner) correctly
Specifically point 3. allows to ensure that when doing concurrent
actions such as prints listing and device claiming, we will stop the
spinner only once all the operations are over.
---
panels/user-accounts/cc-fingerprint-dialog.c | 1 -
1 file changed, 1 deletion(-)
panels/user-accounts/cc-fingerprint-dialog.c | 133 ++++++++++++++-----
1 file changed, 97 insertions(+), 36 deletions(-)
Index: gnome-control-center/panels/user-accounts/cc-fingerprint-dialog.c
===================================================================
......@@ -42,12 +48,13 @@ Index: gnome-control-center/panels/user-accounts/cc-fingerprint-dialog.c
struct _CcFingerprintDialog
{
GtkWindow parent_instance;
@@ -68,13 +85,12 @@ struct _CcFingerprintDialog
@@ -68,14 +85,12 @@ struct _CcFingerprintDialog
GtkWidget *prints_manager;
CcFingerprintManager *manager;
+ DialogState dialog_state;
CcFprintdDevice *device;
- gboolean claiming;
- gboolean device_claimed;
gulong device_signal_id;
gulong device_name_owner_id;
......@@ -57,7 +64,7 @@ Index: gnome-control-center/panels/user-accounts/cc-fingerprint-dialog.c
guint enroll_stages_passed;
guint enroll_stage_passed_id;
gdouble enroll_progress;
@@ -143,6 +159,104 @@ cc_fingerprint_dialog_new (CcFingerprint
@@ -144,6 +159,104 @@ cc_fingerprint_dialog_new (CcFingerprint
NULL);
}
......@@ -162,7 +169,7 @@ Index: gnome-control-center/panels/user-accounts/cc-fingerprint-dialog.c
static void
disconnect_device_signals (CcFingerprintDialog *self)
{
@@ -169,11 +283,11 @@ cc_fingerprint_dialog_dispose (GObject *
@@ -170,11 +283,11 @@ cc_fingerprint_dialog_dispose (GObject *
g_clear_handle_id (&self->enroll_stage_passed_id, g_source_remove);
......@@ -176,7 +183,7 @@ Index: gnome-control-center/panels/user-accounts/cc-fingerprint-dialog.c
cc_fprintd_device_call_enroll_stop_sync (self->device, NULL, NULL);
cc_fprintd_device_call_release (self->device, NULL, NULL, NULL);
}
@@ -441,6 +555,7 @@ list_enrolled_cb (GObject *object,
@@ -442,6 +555,7 @@ list_enrolled_cb (GObject *object,
{
g_auto(GStrv) enrolled_fingers = NULL;
g_autoptr(GError) error = NULL;
......@@ -184,7 +191,7 @@ Index: gnome-control-center/panels/user-accounts/cc-fingerprint-dialog.c
CcFprintdDevice *fprintd_device = CC_FPRINTD_DEVICE (object);
CcFingerprintDialog *self = user_data;
guint n_enrolled_fingers = 0;
@@ -452,23 +567,23 @@ list_enrolled_cb (GObject *object,
@@ -453,23 +567,23 @@ list_enrolled_cb (GObject *object,
if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
return;
......@@ -213,7 +220,7 @@ Index: gnome-control-center/panels/user-accounts/cc-fingerprint-dialog.c
g_warning ("Listing of fingerprints on device %s failed: %s",
cc_fprintd_device_get_name (self->device), error->message);
notify_error (self, error_message);
@@ -500,7 +615,9 @@ update_prints_store (CcFingerprintDialog
@@ -501,7 +615,9 @@ update_prints_store (CcFingerprintDialog
g_assert_true (CC_FPRINTD_IS_DEVICE (self->device));
......@@ -224,7 +231,7 @@ Index: gnome-control-center/panels/user-accounts/cc-fingerprint-dialog.c
gtk_widget_set_sensitive (GTK_WIDGET (self->add_print_icon), FALSE);
gtk_widget_hide (GTK_WIDGET (self->delete_prints_button));
@@ -532,9 +649,8 @@ delete_prints_cb (GObject *object,
@@ -533,9 +649,8 @@ delete_prints_cb (GObject *object,
{
g_autofree char *error_message = NULL;
......@@ -235,7 +242,7 @@ Index: gnome-control-center/panels/user-accounts/cc-fingerprint-dialog.c
g_warning ("Deletion of fingerprints on device %s failed: %s",
cc_fprintd_device_get_name (self->device), error->message);
notify_error (self, error_message);
@@ -547,10 +663,12 @@ delete_prints_cb (GObject *object,
@@ -548,10 +663,12 @@ delete_prints_cb (GObject *object,
static void
delete_enrolled_prints (CcFingerprintDialog *self)
{
......@@ -250,7 +257,7 @@ Index: gnome-control-center/panels/user-accounts/cc-fingerprint-dialog.c
cc_fprintd_device_call_delete_enrolled_fingers2 (self->device,
self->cancellable,
@@ -650,7 +768,7 @@ handle_enroll_signal (CcFingerprintDialo
@@ -651,7 +768,7 @@ handle_enroll_signal (CcFingerprintDialo
{
gboolean completed;
......@@ -259,7 +266,7 @@ Index: gnome-control-center/panels/user-accounts/cc-fingerprint-dialog.c
g_debug ("Device enroll result message: %s, done: %d", result, done);
@@ -726,13 +844,20 @@ handle_enroll_signal (CcFingerprintDialo
@@ -727,11 +844,19 @@ handle_enroll_signal (CcFingerprintDialo
const char *message;
if (g_str_equal (result, "enroll-disconnected"))
......@@ -280,10 +287,8 @@ Index: gnome-control-center/panels/user-accounts/cc-fingerprint-dialog.c
+ message = _("Failed to enroll new fingerprint");
+ }
- self->enrolling_finger = NULL;
set_enroll_result_message (self, ENROLL_STATE_WARNING, message);
}
}
@@ -744,6 +869,7 @@ enroll_start_cb (GObject *object,
gpointer user_data)
{
......@@ -437,22 +442,23 @@ Index: gnome-control-center/panels/user-accounts/cc-fingerprint-dialog.c
CcFprintdDevice *fprintd_device = CC_FPRINTD_DEVICE (object);
CcFingerprintDialog *self = user_data;
@@ -1121,25 +1250,30 @@ claim_device_cb (GObject *object,
@@ -1121,28 +1250,30 @@ claim_device_cb (GObject *object,
if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
return;
- self->claiming = FALSE;
+ state_remover = auto_state_remover (self, DIALOG_STATE_DEVICE_CLAIMING);
+
if (error)
{
g_autofree char *dbus_error = g_dbus_error_get_remote_error (error);
g_autofree char *error_message = NULL;
- if (dbus_error && g_str_has_suffix (dbus_error, ".Error.AlreadyInUse"))
- self->device_claimed = TRUE;
- if (dbus_error && g_str_has_suffix (dbus_error, ".Error.AlreadyInUse") &&
- self->device_claimed)
+ if (dbus_error && g_str_equal (dbus_error, CC_FPRINTD_NAME ".Error.AlreadyInUse") &&
+ (self->dialog_state & DIALOG_STATE_DEVICE_CLAIMED))
+ return;
return;
- g_dbus_error_strip_remote_error (error);
error_message = g_strdup_printf (_("Failed to claim fingerprint device %s: %s"),
......@@ -474,19 +480,24 @@ Index: gnome-control-center/panels/user-accounts/cc-fingerprint-dialog.c
self->device_signal_id = g_signal_connect_object (self->device, "g-signal",
G_CALLBACK (on_device_signal),
self, G_CONNECT_SWAPPED);
@@ -1153,6 +1287,11 @@ claim_device (CcFingerprintDialog *self)
@@ -1156,14 +1287,13 @@ claim_device (CcFingerprintDialog *self)
{
ActUser *user;
- g_return_if_fail (!self->device_claimed);
+ g_return_if_fail (!(self->dialog_state & DIALOG_STATE_DEVICE_CLAIMED));
+
- if (self->claiming)
+ if (!add_dialog_state (self, DIALOG_STATE_DEVICE_CLAIMING))
+ return;
+
return;
user = cc_fingerprint_manager_get_user (self->manager);
gtk_widget_set_sensitive (self->prints_manager, FALSE);
- self->claiming = TRUE;
@@ -1185,7 +1324,7 @@ on_stack_child_changed (CcFingerprintDia
cc_fprintd_device_call_claim (self->device,
act_user_get_user_name (user),
@@ -1194,7 +1324,7 @@ on_stack_child_changed (CcFingerprintDia
notify_error (self, NULL);
update_prints_store (self);
......@@ -495,7 +506,7 @@ Index: gnome-control-center/panels/user-accounts/cc-fingerprint-dialog.c
claim_device (self);
}
else if (visible_child == self->enrollment_view)
@@ -1252,13 +1391,18 @@ on_devices_list (GObject *object,
@@ -1261,13 +1391,18 @@ on_devices_list (GObject *object,
gpointer user_data)
{
g_autolist (CcFprintdDevice) fprintd_devices = NULL;
......@@ -515,7 +526,7 @@ Index: gnome-control-center/panels/user-accounts/cc-fingerprint-dialog.c
if (fprintd_devices == NULL)
{
@@ -1266,10 +1410,9 @@ on_devices_list (GObject *object,
@@ -1275,10 +1410,9 @@ on_devices_list (GObject *object,
{
g_autofree char *error_message = NULL;
......@@ -528,7 +539,7 @@ Index: gnome-control-center/panels/user-accounts/cc-fingerprint-dialog.c
notify_error (self, error_message);
}
@@ -1313,7 +1456,7 @@ cc_fingerprint_dialog_constructed (GObje
@@ -1322,7 +1456,7 @@ cc_fingerprint_dialog_constructed (GObje
bindtextdomain ("fprintd", GNOMELOCALEDIR);
bind_textdomain_codeset ("fprintd", "UTF-8");
......@@ -537,7 +548,7 @@ Index: gnome-control-center/panels/user-accounts/cc-fingerprint-dialog.c
cc_fingerprint_manager_get_devices (self->manager, self->cancellable,
on_devices_list, self);
}
@@ -1355,7 +1498,7 @@ delete_prints_button_clicked_cb (CcFinge
@@ -1364,7 +1498,7 @@ delete_prints_button_clicked_cb (CcFinge
static void
cancel_button_clicked_cb (CcFingerprintDialog *self)
{
......@@ -546,7 +557,7 @@ Index: gnome-control-center/panels/user-accounts/cc-fingerprint-dialog.c
{
g_cancellable_cancel (self->cancellable);
g_set_object (&self->cancellable, g_cancellable_new ());
@@ -1372,7 +1515,7 @@ cancel_button_clicked_cb (CcFingerprintD
@@ -1381,7 +1515,7 @@ cancel_button_clicked_cb (CcFingerprintD
static void
done_button_clicked_cb (CcFingerprintDialog *self)
{
......
meson.build
View file @ 7a2ea0c2
project(
'gnome-control-center', 'c',
version : '3.38.3',
version : '3.38.4',
license : 'GPL2+',
meson_version : '>= 0.51.0'
)
......
panels/user-accounts/cc-fingerprint-dialog.c
View file @ 7a2ea0c2
......@@ -69,6 +69,7 @@ struct _CcFingerprintDialog
CcFingerprintManager *manager;
CcFprintdDevice *device;
gboolean claiming;
gboolean device_claimed;
gulong device_signal_id;
gulong device_name_owner_id;
......@@ -732,7 +733,6 @@ handle_enroll_signal (CcFingerprintDialog *self,
else
message = _("Failed to enroll new fingerprint");
self->enrolling_finger = NULL;
set_enroll_result_message (self, ENROLL_STATE_WARNING, message);
}
}
......@@ -1121,13 +1121,16 @@ claim_device_cb (GObject *object,
if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
return;
self->claiming = FALSE;
if (error)
{
g_autofree char *dbus_error = g_dbus_error_get_remote_error (error);
g_autofree char *error_message = NULL;
if (dbus_error && g_str_has_suffix (dbus_error, ".Error.AlreadyInUse"))
self->device_claimed = TRUE;
if (dbus_error && g_str_has_suffix (dbus_error, ".Error.AlreadyInUse") &&
self->device_claimed)
return;
g_dbus_error_strip_remote_error (error);
error_message = g_strdup_printf (_("Failed to claim fingerprint device %s: %s"),
......@@ -1153,8 +1156,14 @@ claim_device (CcFingerprintDialog *self)
{
ActUser *user;
g_return_if_fail (!self->device_claimed);
if (self->claiming)
return;
user = cc_fingerprint_manager_get_user (self->manager);
gtk_widget_set_sensitive (self->prints_manager, FALSE);
self->claiming = TRUE;
cc_fprintd_device_call_claim (self->device,
act_user_get_user_name (user),
......
po/nb.po
View file @ 7a2ea0c2
......@@ -8,9 +8,10 @@
msgid ""
msgstr ""
"Project-Id-Version: gnome-control-center 3.38.x\n"
"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-control-center/issues\n"
"POT-Creation-Date: 2020-10-23 19:17+0000\n"
"PO-Revision-Date: 2020-11-30 14:47+0100\n"
"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-control-center/"
"issues\n"
"POT-Creation-Date: 2020-11-30 13:49+0000\n"
"PO-Revision-Date: 2021-01-13 15:17+0100\n"
"Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
"Language-Team: Norwegian bokmål <i18n-nb@lister.ping.uio.no>\n"
"Language: nb\n"
......@@ -87,7 +88,9 @@ msgstr "Kan endre innstillinger"
msgid ""
"%s has the following permissions built-in. These cannot be altered. If you "
"are concerned about these permissions, consider removing this application."
msgstr "%s har følgende rettigheter innebygget. Disse kan ikke endres. Hvis du er bekymret for disse tilgangene bør du vurdere å fjerne dette programmet."
msgstr ""
"%s har følgende rettigheter innebygget. Disse kan ikke endres. Hvis du er "
"bekymret for disse tilgangene bør du vurdere å fjerne dette programmet."
#: panels/applications/cc-applications-panel.c:1016
msgid "Web Links"
......@@ -227,7 +230,9 @@ msgstr "Kan ikke endres"
msgid ""
"Individual permissions for applications can be reviewed in the <a href="
"\"privacy\">Privacy</a> Settings."
msgstr "Individuelle rettigheter for programmer kan gjennomgås i <a href=\"privacy\">Personvern</a> innstillingene."
msgstr ""
"Individuelle rettigheter for programmer kan gjennomgås i <a href=\"privacy"
"\">Personvern</a> innstillingene."
#: panels/applications/cc-applications-panel.ui:199
msgid "Integration"
......@@ -483,7 +488,9 @@ msgstr "Ingen programmer kan ta bilder eller video."
msgid ""
"Use of the camera allows applications to capture photos and video. Disabling "
"the camera may cause some applications to not function properly."
msgstr "Bruk av kamera lar programmer ta bilder og video. Hvis du slår av kamera vil noen programmer ikke lenger fungere korrekt."
msgstr ""
"Bruk av kamera lar programmer ta bilder og video. Hvis du slår av kamera vil "
"noen programmer ikke lenger fungere korrekt."
#: panels/camera/cc-camera-panel.ui:85
msgid "Allow the applications below to use your camera."
......@@ -1543,7 +1550,9 @@ msgstr "Rapporter problemene dine"
msgid ""
"screen;lock;diagnostics;crash;private;recent;temporary;tmp;index;name;"
"network;identity;privacy;"
msgstr "skjerm;lås;diagnostikk;krash;privat;nylige filer;midlertidig;tmp;indeks;navn;nettverk;identitet;personvern;"
msgstr ""
"skjerm;lås;diagnostikk;krash;privat;nylige filer;midlertidig;tmp;indeks;navn;"
"nettverk;identitet;personvern;"
#: panels/display/cc-display-panel.c:954
#: panels/network/connection-editor/connection-editor.ui:27
......@@ -1860,7 +1869,9 @@ msgstr "Endre navn på enhet"
msgid ""
"The device name is used to identify this device when it is viewed over the "
"network, or when pairing Bluetooth devices."
msgstr "Enhetsnavnet brukes til å identifisere denne enheten når den vises over nettverket eller ved paring med Bluetooth-enheter."
msgstr ""
"Enhetsnavnet brukes til å identifisere denne enheten når den vises over "
"nettverket eller ved paring med Bluetooth-enheter."
#: panels/info-overview/cc-info-overview-panel.ui:225
msgid "_Rename"
......@@ -2067,7 +2078,7 @@ msgstr "Tast for alternative tegn"
msgid ""
"The alternate characters key can be used to enter additional characters. "
"These are sometimes printed as a third-option on your keyboard."
msgstr ""
msgstr "Tasten for alternative taster kan brukes til å skrive flere tegn. Disse vises noen ganger som et tredje alternativ på tastaturet ditt."
#: panels/keyboard/cc-alt-chars-key-dialog.ui:45
msgid "Left Alt"
......@@ -2257,7 +2268,7 @@ msgstr "Legg til"
msgid "Replace"
msgstr "Erstatt"
#: panels/keyboard/cc-keyboard-shortcut-editor.ui:324
#: panels/keyboard/cc-keyboard-shortcut-editor.ui:325
msgid "Set"
msgstr "Sett"
......@@ -2298,7 +2309,7 @@ msgstr ""
msgid ""
"Uses Mozilla Location Service: <a href='https://location.services.mozilla."
"com/privacy'>Privacy Policy</a>"
msgstr ""
msgstr "Bruker Mozilla Location Service: <a href='https://location.services.mozilla.com/privacy'>Personvernregler</a>"
#: panels/location/cc-location-panel.ui:93
msgid "Allow the applications below to determine your location."
......@@ -2317,7 +2328,9 @@ msgstr "Beskytt din stedsinformasjon"
msgid ""
"Automatically locking the screen prevents others from accessing the computer "
"while you're away."
msgstr "Automatisk låsing av skjermen forhindrer andres tilgang til datamaskinen når du er borte."
msgstr ""
"Automatisk låsing av skjermen forhindrer andres tilgang til datamaskinen når "
"du er borte."
#: panels/lock/cc-lock-panel.ui:44
msgid "Blank Screen Delay"
......@@ -2351,7 +2364,9 @@ msgstr "Forby nye _USB-enheter"
msgid ""
"Prevent new USB devices from interacting with the system when the screen is "
"locked."
msgstr "Forhindre nye USB-enheter fra å ha interaksjon med systemet når skjermen er låst."
msgstr ""
"Forhindre nye USB-enheter fra å ha interaksjon med systemet når skjermen er "
"låst."
#. Translators: Option for "Lock screen after blank for" in "Screen Lock" dialog.
#: panels/lock/cc-lock-panel.ui:166
......@@ -2483,7 +2498,9 @@ msgid ""
"Use of the microphone allows applications to record and listen to audio. "
"Disabling the microphone may cause some applications to not function "
"properly."
msgstr "Bruk av mikrofonen lar programmer ta opp og lytte til lyd. Hvis du slår av mikrofonen kan dette medføre at noen programmer ikke fungerer slik de skal."
msgstr ""
"Bruk av mikrofonen lar programmer ta opp og lytte til lyd. Hvis du slår av "
"mikrofonen kan dette medføre at noen programmer ikke fungerer slik de skal."
#: panels/microphone/cc-microphone-panel.ui:85
msgid "Allow the applications below to use your microphone."
......@@ -2612,11 +2629,11 @@ msgstr ""
msgid "Trackpad;Pointer;Click;Tap;Double;Button;Trackball;Scroll;"
msgstr "Styrepute;Peker;Klikk;Tapp;Dobbel;Knapp;Styrekule;Rull;"
#: panels/network/cc-network-panel.c:648 panels/network/cc-wifi-panel.ui:359
#: panels/network/cc-network-panel.c:661 panels/network/cc-wifi-panel.ui:359
msgid "Oops, something has gone wrong. Please contact your software vendor."
msgstr "Oi! Noe gikk galt. Kontakt programvareleverandøren."
#: panels/network/cc-network-panel.c:654
#: panels/network/cc-network-panel.c:667
msgid "NetworkManager needs to be running."
msgstr "NetworkManager må kjøre."
......@@ -2674,7 +2691,7 @@ msgstr "Valg …"
msgid ""
"Turning on the hotspot will disconnect from %s, and it will not be possible "
"to access the internet through Wi-Fi."
msgstr ""
msgstr "Hvis du slår på hotspot vil du bli koblet fra %s, og det vil ikke være mulig å aksessere internett via Wi-Fi."
#: panels/network/cc-wifi-hotspot-dialog.c:248
msgid "Must have a minimum of 8 characters"
......@@ -2689,7 +2706,7 @@ msgid ""
"Wi-Fi hotspot allows others to share your internet connection, by creating a "
"Wi-Fi network that they can connect to. To do this, you must have an "
"internet connection through a source other than Wi-Fi."
msgstr ""
msgstr "Wi-Fi hotspot tillater andre å dele din internettforbindelse ved å lage et Wi-Fi nettverk de kan koble til. For å gjøre dette må du ha en internettforbindelse gjennom noe annet enn Wi-Fi."
#: panels/network/cc-wifi-hotspot-dialog.ui:44
msgid "Network Name"
......@@ -2805,7 +2822,7 @@ msgid ""
"The MAC address entered here will be used as hardware address for the "
"network device this connection is activated on. This feature is known as MAC "
"cloning or spoofing. Example: 00:11:22:33:44:55"
msgstr ""
msgstr "MAC-adressen som oppgis her vil bli brukt som maskinvareadresse for nettverksenheten denne tilkoblingen aktiveres på. Denne funksjonen er kjent som MAC-kloning eller spoofing. Eksempel: 00:11:22:33:44:55"
#: panels/network/connection-editor/ce-page.c:399
#, c-format
......@@ -3059,12 +3076,14 @@ msgstr "Gjør tilgjengelig for _andre brukere"
#: panels/network/connection-editor/details-page.ui:428
msgid "_Metered connection: has data limits or can incur charges"
msgstr ""
msgstr "_Målt tilkobling: har begrensninger på data eller kan forårsake kostnader"
#: panels/network/connection-editor/details-page.ui:439
msgid ""
"Software updates and other large downloads will not be started automatically."
msgstr "Programvareoppdateringer og andre store nedlastinger vil ikke startes automatisk."
msgstr ""
"Programvareoppdateringer og andre store nedlastinger vil ikke startes "
"automatisk."
#: panels/network/connection-editor/ethernet-page.ui:25
#: panels/network/connection-editor/vpn-page.ui:23
......@@ -4124,11 +4143,13 @@ msgstr "WEP-indeks"
msgid ""
"invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex "
"digits"
msgstr "ugyldig wpa-psk: ugyldig key-length %zu. Må være [8,63] bytes eller 64 hex sifre"
msgstr ""
"ugyldig wpa-psk: ugyldig key-length %zu. Må være [8,63] bytes eller 64 hex "
"sifre"
#: panels/network/wireless-security/ws-wpa-psk.c:79
msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
msgstr ""
msgstr "ugyldig wpa-psk: kan ikke tolke nøkkel med 64 bytes som hex"
#: panels/network/wireless-security/ws-wpa-psk.ui:42
msgid "_Type"
......@@ -4636,7 +4657,9 @@ msgstr "Vis batteristatus og endre innstillinger for strømsparing"
msgid ""
"Power;Sleep;Suspend;Hibernate;Battery;Brightness;Dim;Blank;Monitor;DPMS;Idle;"
"Energy;"
msgstr "Strøm;Sove;Hvile;Dvale;Batteri;Lysstyrke;Demp;Slå av;Skjerm;DPMS;Inaktiv;Energi;"
msgstr ""
"Strøm;Sove;Hvile;Dvale;Batteri;Lysstyrke;Demp;Slå av;Skjerm;DPMS;Inaktiv;"
"Energi;"
#: panels/printers/authentication-dialog.ui:11
msgid " "
......@@ -5268,12 +5291,12 @@ msgid "Ink Level"
msgstr "Blekknivå"
#. Translators: This is the message which follows the printer error.
#: panels/printers/printer-entry.ui:312
#: panels/printers/printer-entry.ui:313
msgid "Please restart when the problem is resolved."
msgstr "Vennligst start på nytt når problemet er løst."
#. Translators: This is the button which restarts the printer.
#: panels/printers/printer-entry.ui:319
#: panels/printers/printer-entry.ui:320
msgid "Restart"
msgstr "Start på nytt"
......@@ -6083,7 +6106,8 @@ msgstr "Autorisert"
#: panels/thunderbolt/cc-bolt-panel.c:175
msgid ""
"The Thunderbolt subsystem (boltd) is not installed or not set up properly."
msgstr "Thunderbolt støtte (boltd) er ikke installert eller ikke satt opp korrekt."
msgstr ""
"Thunderbolt støtte (boltd) er ikke installert eller ikke satt opp korrekt."
#: panels/thunderbolt/cc-bolt-panel.c:468
msgid ""
......@@ -6091,6 +6115,8 @@ msgid ""
"Either the system lacks Thunderbolt support, it has been disabled in the "
"BIOS or is set to an unsupported security level in the BIOS."
msgstr ""
"Thunderbolt ble ikke funnet.\n"
"Enten mangler systemet støtte for Thunderbolt eller så er det deaktivert eller satt til et sikkerhetsnivå i BIOS som ikke er støttet."
#: panels/thunderbolt/cc-bolt-panel.c:512
msgid "Thunderbolt support has been disabled in the BIOS."
......@@ -6103,7 +6129,7 @@ msgstr "Kunne ikke avgjøre sikkerhetsnivå for Thunderbolt."
#: panels/thunderbolt/cc-bolt-panel.c:621
#, c-format
msgid "Error switching direct mode: %s"
msgstr ""
msgstr "Feil ved bytting av direkte modus: %s"
#: panels/thunderbolt/cc-bolt-panel.ui:143
msgid "No Thunderbolt support"
......@@ -6115,11 +6141,11 @@ msgstr "Direkte tilgang"
#: panels/thunderbolt/cc-bolt-panel.ui:269
msgid "Allow direct access to devices such as docks and external GPUs."
msgstr ""
msgstr "Tillat direkte tilgang til enheter som dokkingstasjoner og eksterne GPUer."
#: panels/thunderbolt/cc-bolt-panel.ui:289
msgid "Only USB and Display Port devices can attach."
msgstr ""
msgstr "Kun USB og Display Port enheter kan koble til."
#: panels/thunderbolt/cc-bolt-panel.ui:397
msgid "Pending Devices"
......@@ -6507,7 +6533,11 @@ msgid ""
"Zoom;Screen;Reader;big;high;large;text;font;size;AccessX;Sticky;Keys;Slow;"
"Bounce;Mouse;Double;click;Delay;Speed;Assist;Repeat;Blink;visual;hearing;"
"audio;typing;"
msgstr "Tastatur;Mus;a11y;Tilgjengelighet;Kontrast for universell tilgang;Markør;Lyd;Zoom;Skjerm;Leser;stor;høy;tekst;skrift;størrelse;AccessX;Klebrige;Taster;Trege;Sprett;Mus;Dobbeltklikk;Pause;Hastighet;Assister;Gjenta;Blink;visuell;hørsel;lyd;skriving;"
msgstr ""
"Tastatur;Mus;a11y;Tilgjengelighet;Kontrast for universell tilgang;Markør;Lyd;"
"Zoom;Skjerm;Leser;stor;høy;tekst;skrift;størrelse;AccessX;Klebrige;Taster;"
"Trege;Sprett;Mus;Dobbeltklikk;Pause;Hastighet;Assister;Gjenta;Blink;visuell;"
"hørsel;lyd;skriving;"
#: panels/universal-access/zoom-options.c:303
msgctxt "Distance"
......@@ -7028,7 +7058,9 @@ msgstr "Fingeravtrykksleser"
msgid ""
"Fingerprint login allows you to unlock and log into your computer with your "
"finger"
msgstr "Fingeravtrykkspålogging lar deg låse opp og logge inn på datamaskinen med fingeren."
msgstr ""
"Fingeravtrykkspålogging lar deg låse opp og logge inn på datamaskinen med "
"fingeren."
#: panels/user-accounts/cc-fingerprint-dialog.ui:352
msgid "_Delete Fingerprints"
......@@ -7136,7 +7168,7 @@ msgstr "Klarte ikke å stoppe innlesing: %s"
msgid ""
"Repeatedly lift and place your finger on the reader to enroll your "
"fingerprint"
msgstr ""
msgstr "Legg fingeren din på leseren gjentatte ganger for å lagre fingeravtrykket ditt"
#. TRANSLATORS: This is the label for the button to enroll a new finger
#: panels/user-accounts/cc-fingerprint-dialog.c:989
......@@ -7990,7 +8022,9 @@ msgid ""
"This version of Settings should only be used for development purposes. You "
"may experience incorrect system behavior, data loss, and other unexpected "
"issues. "
msgstr "Denne versjonen av Innstillinger bør kun brukes for utviklingsformål. Du kan oppleve feil i systemets oppførsel, datatap og andre uventede feil."
msgstr ""
"Denne versjonen av Innstillinger bør kun brukes for utviklingsformål. Du kan "
"oppleve feil i systemets oppførsel, datatap og andre uventede feil."
#: shell/cc-window.ui:330
msgid "Help"
......